5.15.68-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 38/121 drm/amd/display: fix memory leak when using debugfs_lookup()
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit cbfac7fa491651c57926c99edeb7495c6c1aeac2 upstream.
When calling debugfs_lookup() the result must have dput() called on it, otherwise the memory will leak over time. Fix this up by properly calling dput().
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +1 -1
@@ -3007,7 +3007,7 @@ void crtc_debugfs_init(struct drm_crtc * &crc_win_y_end_fops);debugfs_create_file_unsafe ("crc_win_update" ,0644 , dir, crtc, &crc_win_update_fops); - + dput(dir); }#endif /*
Greg Kroah-Hartman
maintainerPATCH 3/121 efi: capsule-loader: Fix use-after-free in efi_capsule_write
In reply to Greg Kroah-HartmanFrom: Hyunwoo Kim <[email protected]>
commit 9cb636b5f6a8cc6d1b50809ec8f8d33ae0c84c95 upstream.
A race condition may occur if the user calls close() on another thread during a write() operation on the device node of the efi capsule.
This is a race condition that occurs between the efi_capsule_write() and efi_capsule_flush() functions of efi_capsule_fops, which ultimately results in UAF.
So, the page freeing process is modified to be done in efi_capsule_release() instead of efi_capsule_flush().
--- drivers/firmware/efi/capsule-loader.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-)
drivers/firmware/efi/capsule-loader.c +7 -24
@@ -243,29 +243,6 @@ failed: }/** -* efi_capsule_flush - called by file close or file flush -* @file: file pointer -* @id: not used -* -* If a capsule is being partially uploaded then calling this function -* will be treated as upload termination and will free those completed -* buffer pages and -ECANCELED will be returned. -**/ -static int efi_capsule_flush (struct file *file,fl_owner_t id) -{ -int ret =0 ; -struct capsule_info *cap_info = file->private_data; - -if (cap_info->index >0 ) { -pr_err ("capsule upload not complete\n" ); -efi_free_all_buff_pages (cap_info); - ret = -ECANCELED ; - } - -return ret; -} - -/** * efi_capsule_release - called by file close * @inode: not used * @file: file pointer
@@ -277,6 +254,13 @@ static int efi_capsule_release(struct in {struct capsule_info *cap_info = file->private_data; +if (cap_info->index >0 && + (cap_info->header.headersize ==0 || + cap_info->count < cap_info->total_size)) { +pr_err ("capsule upload not complete\n" ); +efi_free_all_buff_pages (cap_info); + } +kfree (cap_info->pages);kfree (cap_info->phys);kfree (file->private_data);
@@ -324,7 +308,6 @@ static const struct file_operations efi_ .owner = THIS_MODULE, .open = efi_capsule_open, .write = efi_capsule_write, - .flush = efi_capsule_flush, .release = efi_capsule_release, .llseek = no_llseek, };
Greg Kroah-Hartman
maintainerPATCH 5/121 net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit fe2c9c61f668cde28dac2b188028c5299cedcc1e upstream.
When calling debugfs_lookup() the result must have dput() called on it, otherwise the memory will leak over time. Fix this up to be much simpler logic and only create the root debugfs directory once when the driver is first accessed. That resolves the memory leak and makes things more obvious as to what the intent is.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c +2 -2
@@ -700,10 +700,10 @@ void mvpp2_dbgfs_cleanup(struct mvpp2 *pvoid mvpp2_dbgfs_init (struct mvpp2 *priv,const char *name) { -struct dentry *mvpp2_dir, *mvpp2_root; +static struct dentry *mvpp2_root; +struct dentry *mvpp2_dir;int ret, i; - mvpp2_root =debugfs_lookup (MVPP2_DRIVER_NAME ,NULL );if (!mvpp2_root) mvpp2_root =debugfs_create_dir (MVPP2_DRIVER_NAME ,NULL );
Greg Kroah-Hartman
maintainerPATCH 20/121 netfilter: conntrack: work around exceeded receive window
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit cf97769c761abfeac8931b35fe0e1a8d5fabc9d8 ]
When a TCP sends more bytes than allowed by the receive window, all future packets can be marked as invalid.
This can clog up the conntrack table because of 5-day default timeout.
Sequence of packets:
01 initiator > responder: [S], seq 171, win 5840, options [mss 1330,sackOK,TS val 63 ecr 0,nop,wscale 1] 02 responder > initiator: [S.], seq 33211, ack 172, win 65535, options [mss 1460,sackOK,TS val 010 ecr 63,nop,wscale 8] 03 initiator > responder: [.], ack 33212, win 2920, options [nop,nop,TS val 068 ecr 010], length 0 04 initiator > responder: [P.], seq 172:240, ack 33212, win 2920, options [nop,nop,TS val 279 ecr 010], length 68
Window is 5840 starting from 33212 -> 39052.
05 responder > initiator: [.], ack 240, win 256, options [nop,nop,TS val 872 ecr 279], length 0 06 responder > initiator: [.], seq 33212:34530, ack 240, win 256, options [nop,nop,TS val 892 ecr 279], length 1318
This is fine, conntrack will flag the connection as having outstanding data (UNACKED), which lowers the conntrack timeout to 300s.
07 responder > initiator: [.], seq 34530:35848, ack 240, win 256, options [nop,nop,TS val 892 ecr 279], length 1318 08 responder > initiator: [.], seq 35848:37166, ack 240, win 256, options [nop,nop,TS val 892 ecr 279], length 1318 09 responder > initiator: [.], seq 37166:38484, ack 240, win 256, options [nop,nop,TS val 892 ecr 279], length 1318 10 responder > initiator: [.], seq 38484:39802, ack 240, win 256, options [nop,nop,TS val 892 ecr 279], length 1318
Packet 10 is already sending more than permitted, but conntrack doesn't validate this (only seq is tested vs. maxend, not 'seq+len').
38484 is acceptable, but only up to 39052, so this packet should not have been sent (or only 568 bytes, not 1318).
At this point, connection is still in '300s' mode.
Next packet however will get flagged:
11 responder > initiator: [P.], seq 39802:40128, ack 240, win 256, options [nop,nop,TS val 892 ecr 279], length 326
nf_ct_proto_6: SEQ is over the upper bound (over the window of the receiver) .. LEN=378 .. SEQ=39802 ACK=240 ACK PSH ..
Now, a couple of replies/acks comes in:
12 initiator > responder: [.], ack 34530, win 4368,
[.. irrelevant acks removed ]
16 initiator > responder: [.], ack 39802, win 8712, options [nop,nop,TS val 296201291 ecr 2982371892], length 0
This ack is significant -- this acks the last packet send by the responder that conntrack considered valid.
This means that ack == td_end. This will withdraw the 'unacked data' flag, the connection moves back to the 5-day timeout of established conntracks.
17 initiator > responder: ack 40128, win 10030, ...
This packet is also flagged as invalid.
Because conntrack only updates state based on packets that are considered valid, packet 11 'did not exist' and that gets us:
nf_ct_proto_6: ACK is over upper bound 39803 (ACKed data not seen yet) .. SEQ=240 ACK=40128 WINDOW=10030 RES=0x00 ACK URG
Because this received and processed by the endpoints, the conntrack entry remains in a bad state, no packets will ever be considered valid again:
30 responder > initiator: [F.], seq 40432, ack 2045, win 391, .. 31 initiator > responder: [.], ack 40433, win 11348, .. 32 initiator > responder: [F.], seq 2045, ack 40433, win 11348 ..
... all trigger 'ACK is over bound' test and we end up with non-early-evictable 5-day default timeout.
NB: This patch triggers a bunch of checkpatch warnings because of silly indent. I will resend the cleanup series linked below to reduce the indent level once this change has propagated to net-next.
I could route the cleanup via nf but that causes extra backport work for stable maintainers.
--- net/netfilter/nf_conntrack_proto_tcp.c | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
net/netfilter/nf_conntrack_proto_tcp.c +31 -0
@@ -671,6 +671,37 @@ static bool tcp_in_window(struct nf_conn *ct, tn->tcp_be_liberal) res = true;if (!res) { +bool seq_ok =before (seq, sender->td_maxend +1 ); + +if (!seq_ok) { +u32 overshot = end - sender->td_maxend +1 ; +bool ack_ok; + + ack_ok =after (sack, receiver->td_end -MAXACKWINDOW (sender) -1 ); + +if (in_recv_win && + ack_ok && + overshot <= receiver->td_maxwin && +before (sack, receiver->td_end +1 )) { +/* Work around TCPs that send more bytes than allowed by +* the receive window. +* +* If the (marked as invalid) packet is allowed to pass by +* the ruleset and the peer acks this data, then its possible +* all future packets will trigger 'ACK is over upper bound' check. +* +* Thus if only the sequence check fails then do update td_end so +* possible ACK for this data can update internal state. +*/ + sender->td_end = end; + sender->flags |=IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED ; + +nf_ct_l4proto_log_invalid (skb, ct, hook_state, +"%u bytes more than expected" , overshot); +return res; + } + } + nf_ct_l4proto_log_invalid(skb, ct, hook_state, "%s", before(seq, sender->td_maxend + 1) ?
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 21/121 cpufreq: check only freq_table in __resolve_freq()
In reply to Greg Kroah-HartmanFrom: Lukasz Luba <[email protected]>
[ Upstream commit 6ca7076fbfaeccce173aeab832d76b9e49e1034b ]
There is no need to check if the cpufreq driver implements callback cpufreq_driver::target_index. The logic in the __resolve_freq uses the frequency table available in the policy. It doesn't matter if the driver provides 'target_index' or 'target' callback. It just has to populate the 'policy->freq_table'.
Thus, check only frequency table during the frequency resolving call.
--- drivers/cpufreq/cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cpufreq.c +1 -1
@@ -532,7 +532,7 @@ static unsigned int __resolve_freq(struct cpufreq_policy *policy, target_freq =clamp_val (target_freq, policy->min, policy->max); -if (!cpufreq_driver->target_index) +if (!policy->freq_table)return target_freq; idx =cpufreq_frequency_table_target (policy, target_freq, relation);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 25/121 fbdev: chipsfb: Add missing pci_disable_device() in chipsfb_pci_init()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 07c55c9803dea748d17a054000cbf1913ce06399 ]
Add missing pci_disable_device() in error path in chipsfb_pci_init().
--- drivers/video/fbdev/chipsfb.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/fbdev/chipsfb.c +1 -0
@@ -430,6 +430,7 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent) err_release_fb:framebuffer_release (p); err_disable: +pci_disable_device (dp); err_out:return rc; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 29/121 ALSA: aloop: Fix random zeros in capture data when using jiffies timer
In reply to Greg Kroah-HartmanFrom: Pattara Teerapong <[email protected]>
commit 3e48940abee88b8dbbeeaf8a07e7b2b6be1271b3 upstream.
In loopback_jiffies_timer_pos_update(), we are getting jiffies twice. First time for playback, second time for capture. Jiffies can be updated between these two calls and if the capture jiffies is larger, extra zeros will be filled in the capture buffer.
Change to get jiffies once and use it for both playback and capture.
--- sound/drivers/aloop.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/drivers/aloop.c +4 -3
@@ -605,17 +605,18 @@ static unsigned int loopback_jiffies_tim cable->streams[SNDRV_PCM_STREAM_PLAYBACK ];struct loopback_pcm *dpcm_capt = cable->streams[SNDRV_PCM_STREAM_CAPTURE ]; -unsigned long delta_play =0 , delta_capt =0 ; +unsigned long delta_play =0 , delta_capt =0 , cur_jiffies;unsigned int running, count1, count2; + cur_jiffies = jiffies; running = cable->running ^ cable->pause;if (running & (1 <<SNDRV_PCM_STREAM_PLAYBACK )) { - delta_play = jiffies - dpcm_play->last_jiffies; + delta_play = cur_jiffies - dpcm_play->last_jiffies; dpcm_play->last_jiffies += delta_play; }if (running & (1 <<SNDRV_PCM_STREAM_CAPTURE )) { - delta_capt = jiffies - dpcm_capt->last_jiffies; + delta_capt = cur_jiffies - dpcm_capt->last_jiffies; dpcm_capt->last_jiffies += delta_capt; }
Greg Kroah-Hartman
maintainerPATCH 30/121 ALSA: usb-audio: Split endpoint setups for hw_params and prepare
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit ff878b408a03bef5d610b7e2302702e16a53636e upstream.
One of the former changes for the endpoint management was the more consistent setup of endpoints at hw_params. snd_usb_endpoint_configure() is a single function that does the full setup, and it's called from both PCM hw_params and prepare callbacks. Although the EP setup at the prepare phase is usually skipped (by checking need_setup flag), it may be still effective in some cases like suspend/resume that requires the interface setup again.
As it's a full and single setup, the invocation of snd_usb_endpoint_configure() includes not only the USB interface setup but also the buffer release and allocation. OTOH, doing the buffer release and re-allocation at PCM prepare phase is rather superfluous, and better to be done only in the hw_params phase.
For those optimizations, this patch splits the endpoint setup to two
phases: snd_usb_endpoint_set_params() and snd_usb_endpoint_prepare(), to be called from hw_params and from prepare, respectively.
Note that this patch changes the driver operation slightly, effectively moving the USB interface setup again to PCM prepare stage instead of hw_params stage, while the buffer allocation and such initializations are still done at hw_params stage.
And, the change of the USB interface setup timing (moving to prepare) gave an interesting "fix", too: it was reported that the recent kernels caused silent output at the beginning on playbacks on some devices on Android, and this change casually fixed the regression. It seems that those devices are picky about the sample rate change (or the interface change?), and don't follow the too immediate rate changes.
Meanwhile, Android operates the PCM in the following order:
- open, then hw_params with the possibly highest sample rate
- close without prepare
- re-open, hw_params with the normal sample rate
- prepare, and start streaming
This procedure ended up the hw_params twice with different rates, and because the recent kernel did set up the sample rate twice one and after, it screwed up the device. OTOH, the earlier kernels didn't set up the USB interface at hw_params, hence this problem didn't appear.
Now, with this patch, the USB interface setup is again back to the prepare phase, and it works around the problem automagically. Although we should address the sample rate problem in a more solid way in future, let's keep things working as before for now.
--- sound/usb/endpoint.c | 23 +++++++++-------------- sound/usb/endpoint.h | 6 ++++-- sound/usb/pcm.c | 14 ++++++++++---- 3 files changed, 23 insertions(+), 20 deletions(-)
sound/usb/endpoint.c +9 -14
@@ -731,7 +731,8 @@ bool snd_usb_endpoint_compatible(struct* The endpoint needs to be closed via snd_usb_endpoint_close() later. * * Note that this function doesn't configure the endpoint. The substream -* needs to set it up later via snd_usb_endpoint_configure(). +* needs to set it up later via snd_usb_endpoint_set_params() and +* snd_usb_endpoint_prepare(). */ struct snd_usb_endpoint * snd_usb_endpoint_open(struct snd_usb_audio *chip,
@@ -1254,12 +1255,13 @@ out_of_memory:/* * snd_usb_endpoint_set_params: configure an snd_usb_endpoint * +* It's called either from hw_params callback. * Determine the number of URBs to be used on this endpoint. * An endpoint must be configured before it can be started. * An endpoint that is already running can not be reconfigured. */ -static int snd_usb_endpoint_set_params (struct snd_usb_audio *chip, -struct snd_usb_endpoint *ep) +int snd_usb_endpoint_set_params (struct snd_usb_audio *chip, +struct snd_usb_endpoint *ep) {const struct audioformat *fmt = ep->cur_audiofmt;int err;
@@ -1315,18 +1317,18 @@ static int snd_usb_endpoint_set_params(s }/* -* snd_usb_endpoint_configure: Configure the endpoint +* snd_usb_endpoint_prepare: Prepare the endpoint * * This function sets up the EP to be fully usable state. -* It's called either from hw_params or prepare callback. +* It's called either from prepare callback. * The function checks need_setup flag, and performs nothing unless needed, * so it's safe to call this multiple times. * * This returns zero if unchanged, 1 if the configuration has changed, * or a negative error code. */ -int snd_usb_endpoint_configure (struct snd_usb_audio *chip, -struct snd_usb_endpoint *ep) +int snd_usb_endpoint_prepare (struct snd_usb_audio *chip, +struct snd_usb_endpoint *ep) {bool iface_first;int err =0 ;
@@ -1348,9 +1350,6 @@ int snd_usb_endpoint_configure(struct snif (err <0 ) goto unlock; } - err =snd_usb_endpoint_set_params (chip, ep); -if (err <0 ) - goto unlock; goto done; }
@@ -1378,10 +1377,6 @@ int snd_usb_endpoint_configure(struct snif (err <0 ) goto unlock; - err =snd_usb_endpoint_set_params (chip, ep); -if (err <0 ) - goto unlock; - err =snd_usb_select_mode_quirk (chip, ep->cur_audiofmt);if (err <0 ) goto unlock;
sound/usb/endpoint.h +4 -2
@@ -17,8 +17,10 @@ snd_usb_endpoint_open(struct snd_usb_aud bool is_sync_ep);void snd_usb_endpoint_close (struct snd_usb_audio *chip,struct snd_usb_endpoint *ep); -int snd_usb_endpoint_configure (struct snd_usb_audio *chip, -struct snd_usb_endpoint *ep); +int snd_usb_endpoint_set_params (struct snd_usb_audio *chip, +struct snd_usb_endpoint *ep); +int snd_usb_endpoint_prepare (struct snd_usb_audio *chip, +struct snd_usb_endpoint *ep);int snd_usb_endpoint_get_clock_rate (struct snd_usb_audio *chip,int clock); bool snd_usb_endpoint_compatible(struct snd_usb_audio *chip,
sound/usb/pcm.c +10 -4
@@ -443,17 +443,17 @@ static int configure_endpoints(struct snif (stop_endpoints (subs, false))sync_pending_stops (subs);if (subs->sync_endpoint) { - err =snd_usb_endpoint_configure (chip, subs->sync_endpoint); + err =snd_usb_endpoint_prepare (chip, subs->sync_endpoint);if (err <0 )return err; } - err =snd_usb_endpoint_configure (chip, subs->data_endpoint); + err =snd_usb_endpoint_prepare (chip, subs->data_endpoint);if (err <0 )return err;snd_usb_set_format_quirk (subs, subs->cur_audiofmt); }else {if (subs->sync_endpoint) { - err =snd_usb_endpoint_configure (chip, subs->sync_endpoint); + err =snd_usb_endpoint_prepare (chip, subs->sync_endpoint);if (err <0 )return err; }
@@ -551,7 +551,13 @@ static int snd_usb_hw_params(struct snd_ subs->cur_audiofmt = fmt;mutex_unlock (&chip->mutex); - ret =configure_endpoints (chip, subs); +if (subs->sync_endpoint) { + ret =snd_usb_endpoint_set_params (chip, subs->sync_endpoint); +if (ret <0 ) + goto unlock; + } + + ret =snd_usb_endpoint_set_params (chip, subs->data_endpoint); unlock:if (ret <0 )
Greg Kroah-Hartman
maintainerPATCH 31/121 ALSA: usb-audio: Fix an out-of-bounds bug in __snd_usb_parse_audio_interface()
In reply to Greg Kroah-HartmanFrom: Dongxiang Ke <[email protected]>
commit e53f47f6c1a56d2af728909f1cb894da6b43d9bf upstream.
There may be a bad USB audio device with a USB ID of (0x04fa, 0x4201) and the number of it's interfaces less than 4, an out-of-bounds read bug occurs when parsing the interface descriptor for this device.
Fix this by checking the number of interfaces.
--- sound/usb/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/stream.c +1 -1
@@ -1105,7 +1105,7 @@ static int __snd_usb_parse_audio_interfa* Dallas DS4201 workaround: It presents 5 altsettings, but the last * one misses syncpipe, and does not produce any sound. */ -if (chip->usb_id ==USB_ID (0x04fa ,0x4201 )) +if (chip->usb_id ==USB_ID (0x04fa ,0x4201 ) && num >=4 ) num =4 ;for (i =0 ; i < num; i++) {
Greg Kroah-Hartman
maintainerPATCH 9/121 scsi: megaraid_sas: Fix double kfree()
In reply to Greg Kroah-HartmanFrom: Guixin Liu <[email protected]>
[ Upstream commit 8c499e49240bd93628368c3588975cfb94169b8b ]
When allocating log_to_span fails, kfree(instance->ctrl_context) is called twice. Remove redundant call.
--- drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/megaraid/megaraid_sas_fusion.c +0 -1
@@ -5279,7 +5279,6 @@ megasas_alloc_fusion_context(struct megasas_instance *instance)if (!fusion->log_to_span) {dev_err (&instance->pdev->dev,"Failed from %s %d\n" , __func__, __LINE__); -kfree (instance->ctrl_context);return -ENOMEM ; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 27/121 ALSA: pcm: oss: Fix race at SNDCTL_DSP_SYNC
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 8423f0b6d513b259fdab9c9bf4aaa6188d054c2d upstream.
There is a small race window at snd_pcm_oss_sync() that is called from OSS PCM SNDCTL_DSP_SYNC ioctl; namely the function calls snd_pcm_oss_make_ready() at first, then takes the params_lock mutex for the rest. When the stream is set up again by another thread between them, it leads to inconsistency, and may result in unexpected results such as NULL dereference of OSS buffer as a fuzzer spotted recently.
The fix is simply to cover snd_pcm_oss_make_ready() call into the same params_lock mutex with snd_pcm_oss_make_ready_locked() variant.
--- sound/core/oss/pcm_oss.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/core/oss/pcm_oss.c +3 -3
@@ -1664,14 +1664,14 @@ static int snd_pcm_oss_sync(struct snd_p runtime = substream->runtime;if (atomic_read (&substream->mmap_count)) goto __direct; - err =snd_pcm_oss_make_ready (substream); -if (err <0 ) -return err;atomic_inc (&runtime->oss.rw_ref);if (mutex_lock_interruptible (&runtime->oss.params_lock)) {atomic_dec (&runtime->oss.rw_ref);return -ERESTARTSYS ; } + err =snd_pcm_oss_make_ready_locked (substream); +if (err <0 ) + goto unlock; format =snd_pcm_oss_format_from (runtime->oss.format); width =snd_pcm_format_physical_width (format);if (runtime->oss.buffer_used >0 ) {
Greg Kroah-Hartman
maintainerPATCH 11/121 drm/amdgpu: Move psp_xgmi_terminate call from amdgpu_xgmi_remove_device to psp_hw_fini
In reply to Greg Kroah-HartmanFrom: YiPeng Chai <[email protected]>
[ Upstream commit 9d705d7741ae70764f3d6d87e67fad3b5c30ffd0 ]
V1:
The amdgpu_xgmi_remove_device function will send unload command to psp through psp ring to terminate xgmi, but psp ring has been destroyed in psp_hw_fini.
V2:
1. Change the commit title.
2. Restore amdgpu_xgmi_remove_device to its original calling location. Move psp_xgmi_terminate call from amdgpu_xgmi_remove_device to psp_hw_fini.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +3 -0
@@ -2729,6 +2729,9 @@ static int psp_hw_fini(void *handle)psp_rap_terminate (psp);psp_dtm_terminate (psp);psp_hdcp_terminate (psp); + +if (adev->gmc.xgmi.num_physical_nodes >1 ) +psp_xgmi_terminate (psp); }psp_asd_unload (psp);
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +1 -1
@@ -723,7 +723,7 @@ int amdgpu_xgmi_remove_device(struct amdgpu_device *adev)amdgpu_put_xgmi_hive (hive); } -return psp_xgmi_terminate (&adev->psp); +return 0 ; }static int amdgpu_xgmi_ras_late_init (struct amdgpu_device *adev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 33/121 btrfs: zoned: set pseudo max append zone limit in zone emulation mode
In reply to Greg Kroah-HartmanFrom: Shin'ichiro Kawasaki <[email protected]>
commit cac5c44c48c9fb9cc31bea15ebd9ef0c6462314f upstream.
The commit 7d7672bc5d10 ("btrfs: convert count_max_extents() to use fs_info->max_extent_size") introduced a division by fs_info->max_extent_size. This max_extent_size is initialized with max zone append limit size of the device btrfs runs on. However, in zone emulation mode, the device is not zoned then its zone append limit is zero. This resulted in zero value of fs_info->max_extent_size and caused zero division error.
Fix the error by setting non-zero pseudo value to max append zone limit in zone emulation mode. Set the pseudo value based on max_segments as suggested in the commit c2ae7b772ef4 ("btrfs: zoned: revive max_zone_append_bytes").
--- fs/btrfs/zoned.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
fs/btrfs/zoned.c +12 -3
@@ -392,10 +392,19 @@ int btrfs_get_dev_zone_info(struct btrfs* since btrfs adds the pages one by one to a bio, and btrfs cannot * increase the metadata reservation even if it increases the number of * extents, it is safe to stick with the limit. +* +* With the zoned emulation, we can have non-zoned device on the zoned +* mode. In this case, we don't have a valid max zone append size. So, +* use max_segments * PAGE_SIZE as the pseudo max_zone_append_size. */ - zone_info->max_zone_append_size = -min_t (u64, (u64 )bdev_max_zone_append_sectors (bdev) <<SECTOR_SHIFT , - (u64 )bdev_max_segments (bdev) <<PAGE_SHIFT ); +if (bdev_is_zoned (bdev)) { + zone_info->max_zone_append_size =min_t (u64, + (u64 )bdev_max_zone_append_sectors (bdev) <<SECTOR_SHIFT , + (u64 )bdev_max_segments (bdev) <<PAGE_SHIFT ); + }else { + zone_info->max_zone_append_size = + (u64 )bdev_max_segments (bdev) <<PAGE_SHIFT ; + }if (!IS_ALIGNED (nr_sectors, zone_sectors)) zone_info->nr_zones++;
Greg Kroah-Hartman
maintainerPATCH 16/121 parisc: ccio-dma: Handle kmalloc failure in ccio_init_resources()
In reply to Greg Kroah-HartmanFrom: Li Qiong <[email protected]>
[ Upstream commit d46c742f827fa2326ab1f4faa1cccadb56912341 ]
As the possible failure of the kmalloc(), it should be better to fix this error path, check and return '-ENOMEM' error code.
--- drivers/parisc/ccio-dma.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/parisc/ccio-dma.c +8 -3
@@ -1380,15 +1380,17 @@ ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr) } } -static void __init ccio_init_resources (struct ioc *ioc) +static int __init ccio_init_resources (struct ioc *ioc) {struct resource *res = ioc->mmio_region;char *name =kmalloc (14 ,GFP_KERNEL ); - +if (unlikely (!name)) +return -ENOMEM ;snprintf (name,14 ,"GSC Bus [%d/]" , ioc->hw_path);ccio_init_resource (res, name, &ioc->ioc_regs->io_io_low);ccio_init_resource (res +1 , name, &ioc->ioc_regs->io_io_low_hv); +return 0 ; } static int new_ioc_area(struct resource *res, unsigned long size,
@@ -1543,7 +1545,10 @@ static int __init ccio_probe(struct parisc_device *dev)return -ENOMEM ; }ccio_ioc_init (ioc); -ccio_init_resources (ioc); +if (ccio_init_resources (ioc)) { +kfree (ioc); +return -ENOMEM ; + } hppa_dma_ops = &ccio_ops; hba =kzalloc (sizeof (*hba),GFP_KERNEL );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 2/121 efi: libstub: Disable struct randomization
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit 1a3887924a7e6edd331be76da7bf4c1e8eab4b1e upstream.
The EFI stub is a wrapper around the core kernel that makes it look like a EFI compatible PE/COFF application to the EFI firmware. EFI applications run on top of the EFI runtime, which is heavily based on so-called protocols, which are struct types consisting [mostly] of function pointer members that are instantiated and recorded in a protocol database.
These structs look like the ideal randomization candidates to the randstruct plugin (as they only carry function pointers), but of course, these protocols are contracts between the firmware that exposes them, and the EFI applications (including our stubbed kernel) that invoke them. This means that struct randomization for EFI protocols is not a great idea, and given that the stub shares very little data with the core kernel that is represented as a randomizable struct, we're better off just disabling it completely here.
--- drivers/firmware/efi/libstub/Makefile | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/firmware/efi/libstub/Makefile +7 -0
@@ -37,6 +37,13 @@ KBUILD_CFLAGS := $(cflags-y) -Os -DDIS $(call cc-option,-fno-addrsig) \ -D__DISABLE_EXPORTS +# +# struct randomization only makes sense for Linux internal types, which the EFI +# stub code never touches, so let's turn off struct randomization for the stub +# altogether +# +KBUILD_CFLAGS := $(filter-out $(RANDSTRUCT_CFLAGS), $(KBUILD_CFLAGS)) + # remove SCS flags from all objects in this directory KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS)) # disable LTO
Greg Kroah-Hartman
maintainerPATCH 47/121 cgroup: Fix threadgroup_rwsem <-> cpus_read_lock() deadlock
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
[ Upstream commit 4f7e7236435ca0abe005c674ebd6892c6e83aeb3 ]
Bringing up a CPU may involve creating and destroying tasks which requires read-locking threadgroup_rwsem, so threadgroup_rwsem nests inside cpus_read_lock(). However, cpuset's ->attach(), which may be called with thredagroup_rwsem write-locked, also wants to disable CPU hotplug and acquires cpus_read_lock(), leading to a deadlock.
Fix it by guaranteeing that ->attach() is always called with CPU hotplug disabled and removing cpus_read_lock() call from cpuset_attach().
--- kernel/cgroup/cgroup.c | 77 +++++++++++++++++++++++++++++------------- kernel/cgroup/cpuset.c | 3 +- 2 files changed, 55 insertions(+), 25 deletions(-)
kernel/cgroup/cgroup.c +54 -23
@@ -2345,6 +2345,47 @@ int task_cgroup_path(struct task_struct *task, char *buf, size_t buflen) }EXPORT_SYMBOL_GPL (task_cgroup_path); +/** +* cgroup_attach_lock - Lock for ->attach() +* @lock_threadgroup: whether to down_write cgroup_threadgroup_rwsem +* +* cgroup migration sometimes needs to stabilize threadgroups against forks and +* exits by write-locking cgroup_threadgroup_rwsem. However, some ->attach() +* implementations (e.g. cpuset), also need to disable CPU hotplug. +* Unfortunately, letting ->attach() operations acquire cpus_read_lock() can +* lead to deadlocks. +* +* Bringing up a CPU may involve creating and destroying tasks which requires +* read-locking threadgroup_rwsem, so threadgroup_rwsem nests inside +* cpus_read_lock(). If we call an ->attach() which acquires the cpus lock while +* write-locking threadgroup_rwsem, the locking order is reversed and we end up +* waiting for an on-going CPU hotplug operation which in turn is waiting for +* the threadgroup_rwsem to be released to create new tasks. For more details: +* +* http://lkml.kernel.org/r/20220711174629.uehfmqegcwn2lqzu@wubuntu +* +* Resolve the situation by always acquiring cpus_read_lock() before optionally +* write-locking cgroup_threadgroup_rwsem. This allows ->attach() to assume that +* CPU hotplug is disabled on entry. +*/ +static void cgroup_attach_lock (bool lock_threadgroup) +{ +cpus_read_lock (); +if (lock_threadgroup) +percpu_down_write (&cgroup_threadgroup_rwsem); +} + +/** +* cgroup_attach_unlock - Undo cgroup_attach_lock() +* @lock_threadgroup: whether to up_write cgroup_threadgroup_rwsem +*/ +static void cgroup_attach_unlock (bool lock_threadgroup) +{ +if (lock_threadgroup) +percpu_up_write (&cgroup_threadgroup_rwsem); +cpus_read_unlock (); +} +/** * cgroup_migrate_add_task - add a migration target task to a migration context * @task: target task
@@ -2821,8 +2862,7 @@ int cgroup_attach_task(struct cgroup *dst_cgrp, struct task_struct *leader, }struct task_struct *cgroup_procs_write_start (char *buf,bool threadgroup, -bool *locked) - __acquires(&cgroup_threadgroup_rwsem) +bool *threadgroup_locked) {struct task_struct *tsk;pid_t pid;
@@ -2839,12 +2879,8 @@ struct task_struct *cgroup_procs_write_start(char *buf, bool threadgroup,* Therefore, we can skip the global lock. */ lockdep_assert_held (&cgroup_mutex); -if (pid || threadgroup) { -percpu_down_write (&cgroup_threadgroup_rwsem); - *locked = true; - }else { - *locked = false; - } + *threadgroup_locked = pid || threadgroup; +cgroup_attach_lock (*threadgroup_locked);rcu_read_lock ();if (pid) {
@@ -2875,17 +2911,14 @@ struct task_struct *cgroup_procs_write_start(char *buf, bool threadgroup, goto out_unlock_rcu; out_unlock_threadgroup: -if (*locked) { -percpu_up_write (&cgroup_threadgroup_rwsem); - *locked = false; - } +cgroup_attach_unlock (*threadgroup_locked); + *threadgroup_locked = false; out_unlock_rcu:rcu_read_unlock ();return tsk; } -void cgroup_procs_write_finish (struct task_struct *task,bool locked) - __releases(&cgroup_threadgroup_rwsem) +void cgroup_procs_write_finish (struct task_struct *task,bool threadgroup_locked) {struct cgroup_subsys *ss;int ssid;
@@ -2893,8 +2926,8 @@ void cgroup_procs_write_finish(struct task_struct *task, bool locked)/* release reference from cgroup_procs_write_start() */ put_task_struct (task); -if (locked) -percpu_up_write (&cgroup_threadgroup_rwsem); +cgroup_attach_unlock (threadgroup_locked); +for_each_subsys (ss, ssid)if (ss->post_attach) ss->post_attach ();
@@ -2971,8 +3004,7 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp)* write-locking can be skipped safely. */ has_tasks = !list_empty (&mgctx.preloaded_src_csets); -if (has_tasks) -percpu_down_write (&cgroup_threadgroup_rwsem); +cgroup_attach_lock (has_tasks);/* NULL dst indicates self on default hierarchy */ ret =cgroup_migrate_prepare_dst (&mgctx);
@@ -2993,8 +3025,7 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp) ret =cgroup_migrate_execute (&mgctx); out_finish:cgroup_migrate_finish (&mgctx); -if (has_tasks) -percpu_up_write (&cgroup_threadgroup_rwsem); +cgroup_attach_unlock (has_tasks);return ret; }
@@ -4942,13 +4973,13 @@ static ssize_t __cgroup_procs_write(struct kernfs_open_file *of, char *buf,struct task_struct *task;const struct cred *saved_cred;ssize_t ret; -bool locked; +bool threadgroup_locked; dst_cgrp =cgroup_kn_lock_live (of->kn, false);if (!dst_cgrp)return -ENODEV ; - task =cgroup_procs_write_start (buf, threadgroup, &locked); + task =cgroup_procs_write_start (buf, threadgroup, &threadgroup_locked); ret =PTR_ERR_OR_ZERO (task);if (ret) goto out_unlock;
@@ -4974,7 +5005,7 @@ static ssize_t __cgroup_procs_write(struct kernfs_open_file *of, char *buf, ret =cgroup_attach_task (dst_cgrp, task, threadgroup); out_finish: -cgroup_procs_write_finish (task, locked); +cgroup_procs_write_finish (task, threadgroup_locked); out_unlock:cgroup_kn_unlock (of->kn);
kernel/cgroup/cpuset.c +1 -2
@@ -2249,7 +2249,7 @@ static void cpuset_attach(struct cgroup_taskset *tset)cgroup_taskset_first (tset, &css); cs =css_cs (css); -cpus_read_lock (); +lockdep_assert_cpus_held ();/* see cgroup_attach_lock() */ percpu_down_write (&cpuset_rwsem);guarantee_online_mems (cs, &cpuset_attach_nodemask_to);
@@ -2303,7 +2303,6 @@ static void cpuset_attach(struct cgroup_taskset *tset)wake_up (&cpuset_attach_wq);percpu_up_write (&cpuset_rwsem); -cpus_read_unlock (); }/* The various types of files and directories in a cpuset file system */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 4/121 wifi: iwlegacy: 4965: corrected fix for potential off-by-one overflow in il4965_rs_fill_link_cmd()
In reply to Greg Kroah-HartmanFrom: Stanislaw Gruszka <[email protected]>
commit 6d0ef7241553f3553a0a2764c69b07892705924c upstream.
This reverts commit a8eb8e6f7159c7c20c0ddac428bde3d110890aa7 as it can cause invalid link quality command sent to the firmware and address the off-by-one issue by fixing condition of while loop.
--- drivers/net/wireless/intel/iwlegacy/4965-rs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/wireless/intel/iwlegacy/4965-rs.c +1 -4
@@ -2403,7 +2403,7 @@ il4965_rs_fill_link_cmd(struct il_priv */* Repeat initial/next rate. * For legacy IL_NUMBER_TRY == 1, this loop will not execute. * For HT IL_HT_NUMBER_TRY == 3, this executes twice. */ -while (repeat_rate >0 ) { +while (repeat_rate >0 && idx < (LINK_QUAL_MAX_RETRY_NUM -1 )) {if (is_legacy (tbl_type.lq_type)) {if (ant_toggle_cnt <NUM_TRY_BEFORE_ANT_TOGGLE ) ant_toggle_cnt++;
@@ -2422,8 +2422,6 @@ il4965_rs_fill_link_cmd(struct il_priv *cpu_to_le32 (new_rate); repeat_rate--; idx++; -if (idx >=LINK_QUAL_MAX_RETRY_NUM ) - goto out; } il4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta->band,
@@ -2468,7 +2466,6 @@ il4965_rs_fill_link_cmd(struct il_priv * repeat_rate--; } -out: lq_cmd->agg_params.agg_frame_cnt_limit =LINK_QUAL_AGG_FRAME_LIMIT_DEF ; lq_cmd->agg_params.agg_dis_start_th =LINK_QUAL_AGG_DISABLE_START_DEF ;
Greg Kroah-Hartman
maintainerPATCH 17/121 parisc: Add runtime check to prevent PA2.0 kernels on PA1.x machines
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit 591d2108f3abc4db9f9073cae37cf3591fd250d6 ]
If a 32-bit kernel was compiled for PA2.0 CPUs, it won't be able to run on machines with PA1.x CPUs. Add a check and bail out early if a PA1.x machine is detected.
--- arch/parisc/kernel/head.S | 43 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-)
arch/parisc/kernel/head.S +42 -1
@@ -22,7 +22,7 @@ #include <linux/init.h> #include <linux/pgtable.h> - .level PA_ASM_LEVEL + .level 1.1 __INITDATA ENTRY(boot_args)
@@ -69,6 +69,47 @@ $bss_loop: stw,ma %arg2,4(%r1) stw,ma %arg3,4(%r1) +#if !defined(CONFIG_64BIT) && defined(CONFIG_PA20) + /* This 32-bit kernel was compiled for PA2.0 CPUs. Check current CPU + * and halt kernel if we detect a PA1.x CPU. */ + ldi 32,%r10 + mtctl %r10,%cr11 + .level 2.0 + mfctl,w %cr11,%r10 + .level 1.1 + comib,<>,n 0,%r10,$cpu_ok + + load32 PA(msg1),%arg0 + ldi msg1_end-msg1,%arg1 +$iodc_panic: + copy %arg0, %r10 + copy %arg1, %r11 + load32 PA(init_stack),%sp +#define MEM_CONS 0x3A0 + ldw MEM_CONS+32(%r0),%arg0 // HPA + ldi ENTRY_IO_COUT,%arg1 + ldw MEM_CONS+36(%r0),%arg2 // SPA + ldw MEM_CONS+8(%r0),%arg3 // layers + load32 PA(__bss_start),%r1 + stw %r1,-52(%sp) // arg4 + stw %r0,-56(%sp) // arg5 + stw %r10,-60(%sp) // arg6 = ptr to text + stw %r11,-64(%sp) // arg7 = len + stw %r0,-68(%sp) // arg8 + load32 PA(.iodc_panic_ret), %rp + ldw MEM_CONS+40(%r0),%r1 // ENTRY_IODC + bv,n (%r1) +.iodc_panic_ret: + b . /* wait endless with ... */ + or %r10,%r10,%r10 /* qemu idle sleep */ +msg1: .ascii "Can't boot kernel which was built for PA8x00 CPUs on this machine.\r\n" +msg1_end: + +$cpu_ok: +#endif + + .level PA_ASM_LEVEL + /* Initialize startup VM. Just map first 16/32 MB of memory */ load32 PA(swapper_pg_dir),%r4 mtctl %r4,%cr24 /* Initialize kernel root pointer */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 48/121 riscv: dts: microchip: mpfs: Fix reference clock node
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 9d7b3078628f591e4007210c0d5d3f94805cff55 ]
"make dtbs_check" reports:
arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: soc: refclk: {'compatible': ['fixed-clock'], '#clock-cells': [[0]], 'clock-frequency': [[600000000]], 'clock-output-names': ['msspllclk'], 'phandle': [[7]]} should not be valid under {'type': 'object'}
From schema: dtschema/schemas/simple-bus.yaml
Fix this by moving the node out of the "soc" subnode.
While at it, rename it to "msspllclk", and drop the now superfluous "clock-output-names" property.
Move the actual clock-frequency value to the board DTS, since it is not set until bitstream programming time.
--- .../boot/dts/microchip/microchip-mpfs-icicle-kit.dts | 4 ++++ arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 12 +++++------- 2 files changed, 9 insertions(+), 7 deletions(-)
arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts +4 -0
@@ -40,6 +40,10 @@ }; }; +&refclk { + clock-frequency = <600000000>; +}; + &serial0 { status = "okay"; };
arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi +5 -7
@@ -139,6 +139,11 @@ }; }; + refclk: msspllclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + }; + soc { #address-cells = <2>; #size-cells = <2>;
@@ -188,13 +193,6 @@ #dma-cells = <1>; }; - refclk: refclk { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <600000000>; - clock-output-names = "msspllclk"; - }; - clkcfg: clkcfg@20002000 { compatible = "microchip,mpfs-clkcfg"; reg = <0x0 0x20002000 0x0 0x1000>;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 53/121 soc: imx: gpcv2: Assert reset before ungating clock
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit df88005bd81b80c944d185554e264a4b0f993c37 ]
In case the power domain clock are ungated before the reset is asserted, the system might freeze completely. This is likely due to a device is an undefined state being attached to bus, which sporadically leads to a bus hang. Assert the reset before the clock are enabled to assure the device is in defined state before being attached to bus.
--- drivers/soc/imx/gpcv2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/soc/imx/gpcv2.c +4 -1
@@ -237,6 +237,8 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd) } } +reset_control_assert (domain->reset); +/* Enable reset clocks for all devices in the domain */ ret =clk_bulk_prepare_enable (domain->num_clks, domain->clks);if (ret) {
@@ -244,7 +246,8 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd) goto out_regulator_disable; } -reset_control_assert (domain->reset); +/* delays for reset to propagate */ +udelay (5 );if (domain->bits.pxx) {/* request the domain to power up */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 57/121 soc: brcmstb: pm-arm: Fix refcount leak and __iomem leak bugs
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 1085f5080647f0c9f357c270a537869191f7f2a1 ]
In brcmstb_pm_probe(), there are two kinds of leak bugs:
(1) we need to add of_node_put() when for_each__matching_node() breaks
(2) we need to add iounmap() for each iomap in fail path
--- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 50 ++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 11 deletions(-)
drivers/soc/bcm/brcmstb/pm/pm-arm.c +39 -11
@@ -684,13 +684,14 @@ static int brcmstb_pm_probe(struct platform_device *pdev)const struct of_device_id *of_id =NULL ;struct device_node *dn;void __iomem *base; -int ret, i; +int ret, i, s;/* AON ctrl registers */ base =brcmstb_ioremap_match (aon_ctrl_dt_ids,0 ,NULL );if (IS_ERR (base)) {pr_err ("error mapping AON_CTRL\n" ); -return PTR_ERR (base); + ret =PTR_ERR (base); + goto aon_err; } ctrl.aon_ctrl_base = base;
@@ -700,8 +701,10 @@ static int brcmstb_pm_probe(struct platform_device *pdev)/* Assume standard offset */ ctrl.aon_sram = ctrl.aon_ctrl_base +AON_CTRL_SYSTEM_DATA_RAM_OFS ; + s =0 ; }else { ctrl.aon_sram = base; + s =1 ; }writel_relaxed (0 , ctrl.aon_sram +AON_REG_PANIC );
@@ -711,7 +714,8 @@ static int brcmstb_pm_probe(struct platform_device *pdev) (const void **)&ddr_phy_data);if (IS_ERR (base)) {pr_err ("error mapping DDR PHY\n" ); -return PTR_ERR (base); + ret =PTR_ERR (base); + goto ddr_phy_err; } ctrl.support_warm_boot = ddr_phy_data->supports_warm_boot; ctrl.pll_status_offset = ddr_phy_data->pll_status_offset;
@@ -731,17 +735,20 @@ static int brcmstb_pm_probe(struct platform_device *pdev)for_each_matching_node (dn, ddr_shimphy_dt_ids) { i = ctrl.num_memc;if (i >=MAX_NUM_MEMC ) { +of_node_put (dn);pr_warn ("too many MEMCs (max %d)\n" ,MAX_NUM_MEMC );break ; } base =of_io_request_and_map (dn,0 , dn->full_name);if (IS_ERR (base)) { +of_node_put (dn);if (!ctrl.support_warm_boot)break ;pr_err ("error mapping DDR SHIMPHY %d\n" , i); -return PTR_ERR (base); + ret =PTR_ERR (base); + goto ddr_shimphy_err; } ctrl.memcs[i].ddr_shimphy_base = base; ctrl.num_memc++;
@@ -752,14 +759,18 @@ static int brcmstb_pm_probe(struct platform_device *pdev)for_each_matching_node (dn, brcmstb_memc_of_match) { base =of_iomap (dn,0 );if (!base) { +of_node_put (dn);pr_err ("error mapping DDR Sequencer %d\n" , i); -return -ENOMEM ; + ret = -ENOMEM ; + goto brcmstb_memc_err; } of_id =of_match_node (brcmstb_memc_of_match, dn);if (!of_id) {iounmap (base); -return -EINVAL ; +of_node_put (dn); + ret = -EINVAL ; + goto brcmstb_memc_err; } ddr_seq_data = of_id->data;
@@ -779,21 +790,24 @@ static int brcmstb_pm_probe(struct platform_device *pdev) dn =of_find_matching_node (NULL , sram_dt_ids);if (!dn) {pr_err ("SRAM not found\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto brcmstb_memc_err; } ret =brcmstb_init_sram (dn);of_node_put (dn);if (ret) {pr_err ("error setting up SRAM for PM\n" ); -return ret; + goto brcmstb_memc_err; } ctrl.pdev = pdev; ctrl.s3_params =kmalloc (sizeof (*ctrl.s3_params),GFP_KERNEL ); -if (!ctrl.s3_params) -return -ENOMEM ; +if (!ctrl.s3_params) { + ret = -ENOMEM ; + goto s3_params_err; + } ctrl.s3_params_pa =dma_map_single (&pdev->dev, ctrl.s3_params,sizeof (*ctrl.s3_params),DMA_TO_DEVICE );
@@ -813,7 +827,21 @@ static int brcmstb_pm_probe(struct platform_device *pdev) out:kfree (ctrl.s3_params); - +s3_params_err: +iounmap (ctrl.boot_sram); +brcmstb_memc_err: +for (i--; i >=0 ; i--) +iounmap (ctrl.memcs[i].ddr_ctrl); +ddr_shimphy_err: +for (i =0 ; i < ctrl.num_memc; i++) +iounmap (ctrl.memcs[i].ddr_shimphy_base); + +iounmap (ctrl.memcs[0 ].ddr_phy_base); +ddr_phy_err: +iounmap (ctrl.aon_ctrl_base); +if (s) +iounmap (ctrl.aon_sram); +aon_err:pr_warn ("PM: initialization failed with code %d\n" , ret);return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 12/121 drm/amdgpu: Check num_gfx_rings for gfx v9_0 rb setup.
In reply to Greg Kroah-HartmanFrom: Candice Li <[email protected]>
[ Upstream commit c351938350ab9b5e978dede2c321da43de7eb70c ]
No need to set up rb when no gfx rings.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -1
@@ -2624,7 +2624,8 @@ static void gfx_v9_0_constants_init(struct amdgpu_device *adev)gfx_v9_0_tiling_mode_table_init (adev); -gfx_v9_0_setup_rb (adev); +if (adev->gfx.num_gfx_rings) +gfx_v9_0_setup_rb (adev);gfx_v9_0_get_cu_info (adev, &adev->gfx.cu_info); adev->gfx.config.db_debug2 =RREG32_SOC15 (GC ,0 , mmDB_DEBUG2);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 6/121 fs: only do a memory barrier for the first set_buffer_uptodate()
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit 2f79cdfe58c13949bbbb65ba5926abfe9561d0ec upstream.
Commit d4252071b97d ("add barriers to buffer_uptodate and set_buffer_uptodate") added proper memory barriers to the buffer head BH_Uptodate bit, so that anybody who tests a buffer for being up-to-date will be guaranteed to actually see initialized state.
However, that commit didn't _just_ add the memory barrier, it also ended up dropping the "was it already set" logic that the BUFFER_FNS() macro had.
That's conceptually the right thing for a generic "this is a memory barrier" operation, but in the case of the buffer contents, we really only care about the memory barrier for the _first_ time we set the bit, in that the only memory ordering protection we need is to avoid anybody seeing uninitialized memory contents.
Any other access ordering wouldn't be about the BH_Uptodate bit anyway, and would require some other proper lock (typically BH_Lock or the folio lock). A reader that races with somebody invalidating the buffer head isn't an issue wrt the memory ordering, it's a serialization issue.
Now, you'd think that the buffer head operations don't matter in this day and age (and I certainly thought so), but apparently some loads still end up being heavy users of buffer heads. In particular, the kernel test robot reported that not having this bit access optimization in place caused a noticeable direct IO performance regression on ext4:
fxmark.ssd_ext4_no_jnl_DWTL_54_directio.works/sec -26.5% regression
although you presumably need a fast disk and a lot of cores to actually notice.
--- include/linux/buffer_head.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/linux/buffer_head.h +11 -0
@@ -137,6 +137,17 @@ BUFFER_FNS(Defer_Completion, defer_compl static __always_inline void set_buffer_uptodate(struct buffer_head *bh) {/* +* If somebody else already set this uptodate, they will +* have done the memory barrier, and a reader will thus +* see *some* valid buffer state. +* +* Any other serialization (with IO errors or whatever that +* might clear the bit) has to come from other state (eg BH_Lock). +*/ +if (test_bit (BH_Uptodate, &bh->b_state)) +return ; + +/* * make it consistent with folio_mark_uptodate * pairs with smp_load_acquire in buffer_uptodate */
Greg Kroah-Hartman
maintainerPATCH 7/121 Revert "mm: kmemleak: take a full lowmem check in kmemleak_*_phys()"
In reply to Greg Kroah-HartmanFrom: Yee Lee <[email protected]>
This reverts commit 23c2d497de21f25898fbea70aeb292ab8acc8c94.
Commit 23c2d497de21 ("mm: kmemleak: take a full lowmem check in kmemleak_*_phys()") brought false leak alarms on some archs like arm64 that does not init pfn boundary in early booting. The final solution lands on linux-6.0: commit 0c24e061196c ("mm: kmemleak: add rbtree and store physical address for objects allocated with PA").
Revert this commit before linux-6.0. The original issue of invalid PA can be mitigated by additional check in devicetree.
The false alarm report is as following: Kmemleak output: (Qemu/arm64) unreferenced object 0xffff0000c0170a00 (size 128):
comm "swapper/0", pid 1, jiffies 4294892404 (age 126.208s) hex dump (first 32 bytes):
62 61 73 65 00 00 00 00 00 00 00 00 00 00 00 00 base............
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<(____ptrval____)>] __kmalloc_track_caller+0x1b0/0x2e4
[<(____ptrval____)>] kstrdup_const+0x8c/0xc4
[<(____ptrval____)>] kvasprintf_const+0xbc/0xec
[<(____ptrval____)>] kobject_set_name_vargs+0x58/0xe4
[<(____ptrval____)>] kobject_add+0x84/0x100
[<(____ptrval____)>] __of_attach_node_sysfs+0x78/0xec
[<(____ptrval____)>] of_core_init+0x68/0x104
[<(____ptrval____)>] driver_init+0x28/0x48
[<(____ptrval____)>] do_basic_setup+0x14/0x28
[<(____ptrval____)>] kernel_init_freeable+0x110/0x178
[<(____ptrval____)>] kernel_init+0x20/0x1a0
[<(____ptrval____)>] ret_from_fork+0x10/0x20This pacth is also applicable to linux-5.17.y/linux-5.18.y/linux-5.19.y
--- mm/kmemleak.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/kmemleak.c +4 -4
@@ -1125,7 +1125,7 @@ EXPORT_SYMBOL(kmemleak_no_scan);void __ref kmemleak_alloc_phys (phys_addr_t phys,size_t size,int min_count,gfp_t gfp) { -if (PHYS_PFN (phys) >= min_low_pfn &&PHYS_PFN (phys) < max_low_pfn) +if (!IS_ENABLED (CONFIG_HIGHMEM ) ||PHYS_PFN (phys) < max_low_pfn)kmemleak_alloc (__va (phys), size, min_count, gfp); }EXPORT_SYMBOL (kmemleak_alloc_phys);
@@ -1139,7 +1139,7 @@ EXPORT_SYMBOL(kmemleak_alloc_phys);*/ void __ref kmemleak_free_part_phys (phys_addr_t phys,size_t size) { -if (PHYS_PFN (phys) >= min_low_pfn &&PHYS_PFN (phys) < max_low_pfn) +if (!IS_ENABLED (CONFIG_HIGHMEM ) ||PHYS_PFN (phys) < max_low_pfn)kmemleak_free_part (__va (phys), size); }EXPORT_SYMBOL (kmemleak_free_part_phys);
@@ -1151,7 +1151,7 @@ EXPORT_SYMBOL(kmemleak_free_part_phys);*/ void __ref kmemleak_not_leak_phys (phys_addr_t phys) { -if (PHYS_PFN (phys) >= min_low_pfn &&PHYS_PFN (phys) < max_low_pfn) +if (!IS_ENABLED (CONFIG_HIGHMEM ) ||PHYS_PFN (phys) < max_low_pfn)kmemleak_not_leak (__va (phys)); }EXPORT_SYMBOL (kmemleak_not_leak_phys);
@@ -1163,7 +1163,7 @@ EXPORT_SYMBOL(kmemleak_not_leak_phys);*/ void __ref kmemleak_ignore_phys (phys_addr_t phys) { -if (PHYS_PFN (phys) >= min_low_pfn &&PHYS_PFN (phys) < max_low_pfn) +if (!IS_ENABLED (CONFIG_HIGHMEM ) ||PHYS_PFN (phys) < max_low_pfn)kmemleak_ignore (__va (phys)); }EXPORT_SYMBOL (kmemleak_ignore_phys);
Greg Kroah-Hartman
maintainerPATCH 26/121 drm/amdgpu: mmVM_L2_CNTL3 register not initialized correctly
In reply to Greg Kroah-HartmanFrom: Qu Huang <[email protected]>
[ Upstream commit b8983d42524f10ac6bf35bbce6a7cc8e45f61e04 ]
The mmVM_L2_CNTL3 register is not assigned an initial value
--- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1 -0
@@ -176,6 +176,7 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL2 ,INVALIDATE_L2_CACHE ,1 );WREG32_SOC15 (MMHUB ,0 , mmVM_L2_CNTL2, tmp); + tmp = mmVM_L2_CNTL3_DEFAULT;if (adev->gmc.translate_further) { tmp =REG_SET_FIELD (tmp,VM_L2_CNTL3 ,BANK_SELECT ,12 ); tmp = REG_SET_FIELD(tmp, VM_L2_CNTL3,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 14/121 scsi: ufs: core: Reduce the power mode change timeout
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 8f2c96420c6ec3dcb18c8be923e24c6feaa5ccf6 ]
The current power mode change timeout (180 s) is so large that it can cause a watchdog timer to fire. Reduce the power mode change timeout to 10 seconds.
--- drivers/scsi/ufs/ufshcd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +8 -1
@@ -8476,6 +8476,8 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,struct scsi_device *sdp;unsigned long flags;int ret, retries; +unsigned long deadline; +int32_t remaining;spin_lock_irqsave (hba->host->host_lock, flags); sdp = hba->sdev_ufs_device;
@@ -8508,9 +8510,14 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,* callbacks hence set the RQF_PM flag so that it doesn't resume the * already suspended childs. */ + deadline = jiffies +10 *HZ ;for (retries =3 ; retries >0 ; --retries) { + ret = -ETIMEDOUT ; + remaining = deadline - jiffies; +if (remaining <=0 ) +break ; ret =scsi_execute (sdp, cmd,DMA_NONE ,NULL ,0 ,NULL , &sshdr, -START_STOP_TIMEOUT ,0 ,0 ,RQF_PM ,NULL ); + remaining /HZ ,0 ,0 ,RQF_PM ,NULL );if (!scsi_status_is_check_condition (ret) || !scsi_sense_valid (&sshdr) || sshdr.sense_key !=UNIT_ATTENTION )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 50/121 RDMA/rtrs-clt: Use the right sg_cnt after ib_dma_map_sg
In reply to Greg Kroah-HartmanFrom: Jack Wang <[email protected]>
[ Upstream commit b66905e04dc714825aa6cffb950e281b46bbeafe ]
When iommu is enabled, we hit warnings like this:
WARNING: at rtrs/rtrs.c:178 rtrs_iu_post_rdma_write_imm+0x9b/0x110
rtrs warn on one sge entry length is 0, which is unexpected.
The problem is ib_dma_map_sg augments the SGL into a 'dma mapped SGL'. This process may change the number of entries and the lengths of each entry.
Code that touches dma_address is iterating over the 'dma mapped SGL' and must use dma_nents which returned from ib_dma_map_sg(). So pass the count return from ib_dma_map_sg.
--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +5 -4
@@ -1011,7 +1011,8 @@ rtrs_clt_get_copy_req(struct rtrs_clt_path *alive_path,static int rtrs_post_rdma_write_sg (struct rtrs_clt_con *con,struct rtrs_clt_io_req *req,struct rtrs_rbuf *rbuf,bool fr_en, -u32 size,u32 imm,struct ib_send_wr *wr, +u32 count,u32 size,u32 imm, +struct ib_send_wr *wr,struct ib_send_wr *tail) {struct rtrs_clt_path *clt_path =to_clt_path (con->c.path);
@@ -1031,12 +1032,12 @@ static int rtrs_post_rdma_write_sg(struct rtrs_clt_con *con, num_sge =2 ; ptail = tail; }else { -for_each_sg (req->sglist, sg, req->sg_cnt, i) { +for_each_sg (req->sglist, sg, count, i) { sge[i].addr =sg_dma_address (sg); sge[i].length =sg_dma_len (sg); sge[i].lkey = clt_path->s.dev->ib_pd->local_dma_lkey; } - num_sge =1 + req->sg_cnt; + num_sge =1 + count; } sge[i].addr = req->iu->dma_addr; sge[i].length = size;
@@ -1149,7 +1150,7 @@ static int rtrs_clt_write_req(struct rtrs_clt_io_req *req)*/ rtrs_clt_update_all_stats (req,WRITE ); - ret =rtrs_post_rdma_write_sg (req->con, req, rbuf, fr_en, + ret =rtrs_post_rdma_write_sg (req->con, req, rbuf, fr_en, count, req->usr_len +sizeof (*msg), imm, wr, &inv_wr);if (ret) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 19/121 arm64/signal: Raise limit on stack frames
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit 7ddcaf78e93c9282b4d92184f511b4d5bee75355 ]
The signal code has a limit of 64K on the size of a stack frame that it will generate, if this limit is exceeded then a process will be killed if it receives a signal. Unfortunately with the advent of SME this limit is too small - the maximum possible size of the ZA register alone is 64K. This is not an issue for practical systems at present but is easily seen using virtual platforms.
Raise the limit to 256K, this is substantially more than could be used by any current architecture extension.
--- arch/arm64/kernel/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/signal.c +1 -1
@@ -91,7 +91,7 @@ static size_t sigframe_size(struct rt_sigframe_user_layout const *user)* not taken into account. This limit is not a guarantee and is * NOT ABI. */ -#define SIGFRAME_MAXSZ SZ_64K +#define SIGFRAME_MAXSZ SZ_256Kstatic int __sigframe_alloc (struct rt_sigframe_user_layout *user,unsigned long *offset,size_t size,bool extend)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 61/121 ARM: at91: pm: fix self-refresh for sama7g5
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit a02875c4cbd6f3d2f33d70cc158a19ef02d4b84f ]
It has been discovered that on some parts, from time to time, self-refresh procedure doesn't work as expected. Debugging and investigating it proved that disabling AC DLL introduce glitches in RAM controllers which leads to unexpected behavior. This is confirmed as a hardware bug. DLL bypass disables 3 DLLs: 2 DX DLLs and AC DLL. Thus, keep only DX DLLs disabled. This introduce 6mA extra current consumption on VDDCORE when switching to any ULP mode or standby mode but the self-refresh procedure still works.
--- arch/arm/mach-at91/pm_suspend.S | 24 +++++++++++++++++------- include/soc/at91/sama7-ddr.h | 4 ++++ 2 files changed, 21 insertions(+), 7 deletions(-)
arch/arm/mach-at91/pm_suspend.S +17 -7
@@ -172,9 +172,15 @@ sr_ena_2: /* Put DDR PHY's DLL in bypass mode for non-backup modes. */ cmp r7, #AT91_PM_BACKUP beq sr_ena_3 - ldr tmp1, [r3, #DDR3PHY_PIR] - orr tmp1, tmp1, #DDR3PHY_PIR_DLLBYP - str tmp1, [r3, #DDR3PHY_PIR] + + /* Disable DX DLLs. */ + ldr tmp1, [r3, #DDR3PHY_DX0DLLCR] + orr tmp1, tmp1, #DDR3PHY_DXDLLCR_DLLDIS + str tmp1, [r3, #DDR3PHY_DX0DLLCR] + + ldr tmp1, [r3, #DDR3PHY_DX1DLLCR] + orr tmp1, tmp1, #DDR3PHY_DXDLLCR_DLLDIS + str tmp1, [r3, #DDR3PHY_DX1DLLCR] sr_ena_3: /* Power down DDR PHY data receivers. */
@@ -221,10 +227,14 @@ sr_ena_3: bic tmp1, tmp1, #DDR3PHY_DSGCR_ODTPDD_ODT0 str tmp1, [r3, #DDR3PHY_DSGCR] - /* Take DDR PHY's DLL out of bypass mode. */ - ldr tmp1, [r3, #DDR3PHY_PIR] - bic tmp1, tmp1, #DDR3PHY_PIR_DLLBYP - str tmp1, [r3, #DDR3PHY_PIR] + /* Enable DX DLLs. */ + ldr tmp1, [r3, #DDR3PHY_DX0DLLCR] + bic tmp1, tmp1, #DDR3PHY_DXDLLCR_DLLDIS + str tmp1, [r3, #DDR3PHY_DX0DLLCR] + + ldr tmp1, [r3, #DDR3PHY_DX1DLLCR] + bic tmp1, tmp1, #DDR3PHY_DXDLLCR_DLLDIS + str tmp1, [r3, #DDR3PHY_DX1DLLCR] /* Enable quasi-dynamic programming. */ mov tmp1, #0
include/soc/at91/sama7-ddr.h +4 -0
@@ -41,6 +41,10 @@#define DDR3PHY_ZQ0SR0 (0x188)/* ZQ status register 0 */ +#define DDR3PHY_DX0DLLCR (0x1CC)/* DDR3PHY DATX8 DLL Control Register */ +#define DDR3PHY_DX1DLLCR (0x20C)/* DDR3PHY DATX8 DLL Control Register */ +#define DDR3PHY_DXDLLCR_DLLDIS (1 << 31)/* DLL Disable */ +/* UDDRC */ #define UDDRC_STAT (0x04)/* UDDRC Operating Mode Status Register */ #define UDDRC_STAT_SELFREF_TYPE_DIS (0x0 << 4)/* SDRAM is not in Self-refresh */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 18/121 arm64: cacheinfo: Fix incorrect assignment of signed error value to unsigned fw_level
In reply to Greg Kroah-HartmanFrom: Sudeep Holla <[email protected]>
[ Upstream commit e75d18cecbb3805895d8ed64da4f78575ec96043 ]
Though acpi_find_last_cache_level() always returned signed value and the document states it will return any errors caused by lack of a PPTT table, it never returned negative values before.
Commit 0c80f9e165f8 ("ACPI: PPTT: Leave the table mapped for the runtime usage") however changed it by returning -ENOENT if no PPTT was found. The value returned from acpi_find_last_cache_level() is then assigned to unsigned fw_level.
It will result in the number of cache leaves calculated incorrectly as a huge value which will then cause the following warning from __alloc_pages as the order would be great than MAX_ORDER because of incorrect and huge cache leaves value.
| WARNING: CPU: 0 PID: 1 at mm/page_alloc.c:5407 __alloc_pages+0x74/0x314 | Modules linked in: | CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.19.0-10393-g7c2a8d3ac4c0 #73 | pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) | pc : __alloc_pages+0x74/0x314 | lr : alloc_pages+0xe8/0x318 | Call trace: | __alloc_pages+0x74/0x314 | alloc_pages+0xe8/0x318 | kmalloc_order_trace+0x68/0x1dc | __kmalloc+0x240/0x338 | detect_cache_attributes+0xe0/0x56c | update_siblings_masks+0x38/0x284 | store_cpu_topology+0x78/0x84 | smp_prepare_cpus+0x48/0x134 | kernel_init_freeable+0xc4/0x14c | kernel_init+0x2c/0x1b4 | ret_from_fork+0x10/0x20
Fix the same by changing fw_level to be signed integer and return the error from init_cache_level() early in case of error.
--- arch/arm64/kernel/cacheinfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/kernel/cacheinfo.c +5 -1
@@ -45,7 +45,8 @@ static void ci_leaf_init(struct cacheinfo *this_leaf,int init_cache_level (unsigned int cpu) { -unsigned int ctype, level, leaves, fw_level; +unsigned int ctype, level, leaves; +int fw_level;struct cpu_cacheinfo *this_cpu_ci =get_cpu_cacheinfo (cpu);for (level =1 , leaves =0 ; level <=MAX_CACHE_LEVEL ; level++) {
@@ -63,6 +64,9 @@ int init_cache_level(unsigned int cpu)else fw_level =acpi_find_last_cache_level (cpu); +if (fw_level <0 ) +return fw_level; +if (level < fw_level) {/* * some external caches not specified in CLIDR_EL1
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 42/121 scsi: lpfc: Add missing destroy_workqueue() in error path
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
commit da6d507f5ff328f346b3c50e19e19993027b8ffd upstream.
Add the missing destroy_workqueue() before return from lpfc_sli4_driver_resource_setup() in the error path.
--- drivers/scsi/lpfc/lpfc_init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_init.c +4 -1
@@ -7893,7 +7893,7 @@ lpfc_sli4_driver_resource_setup(struct l/* Allocate device driver memory */ rc =lpfc_mem_alloc (phba,SGL_ALIGN_SZ );if (rc) -return -ENOMEM ; + goto out_destroy_workqueue;/* IF Type 2 ports get initialized now. */ if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) >=
@@ -8309,6 +8309,9 @@ out_free_bsmbx:lpfc_destroy_bootstrap_mbox (phba); out_free_mem:lpfc_mem_free (phba); +out_destroy_workqueue: +destroy_workqueue (phba->wq); + phba->wq =NULL ;return rc; }
Greg Kroah-Hartman
maintainerPATCH 24/121 fbdev: fbcon: Destroy mutex on freeing struct fb_info
In reply to Greg Kroah-HartmanFrom: Shigeru Yoshida <[email protected]>
[ Upstream commit 58559dfc1ebba2ae0c7627dc8f8991ae1984c6e3 ]
It's needed to destroy bl_curve_mutex on freeing struct fb_info since the mutex is embedded in the structure and initialized when it's allocated.
--- drivers/video/fbdev/core/fbsysfs.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/video/fbdev/core/fbsysfs.c +4 -0
@@ -84,6 +84,10 @@ void framebuffer_release(struct fb_info *info)if (WARN_ON (refcount_read (&info->count)))return ; +#if IS_ENABLED (CONFIG_FB_BACKLIGHT ) +mutex_destroy (&info->bl_curve_mutex); +#endif +kfree (info->apertures);kfree (info); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 39/121 nvmet: fix a use-after-free
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
commit 6a02a61e81c231cc5c680c5dbf8665275147ac52 upstream.
Fix the following use-after-free complaint triggered by blktests nvme/004:
BUG: KASAN: user-memory-access in blk_mq_complete_request_remote+0xac/0x350 Read of size 4 at addr 0000607bd1835943 by task kworker/13:1/460 Workqueue: nvmet-wq nvme_loop_execute_work [nvme_loop] Call Trace: show_stack+0x52/0x58 dump_stack_lvl+0x49/0x5e print_report.cold+0x36/0x1e2 kasan_report+0xb9/0xf0 __asan_load4+0x6b/0x80 blk_mq_complete_request_remote+0xac/0x350 nvme_loop_queue_response+0x1df/0x275 [nvme_loop] __nvmet_req_complete+0x132/0x4f0 [nvmet] nvmet_req_complete+0x15/0x40 [nvmet] nvmet_execute_io_connect+0x18a/0x1f0 [nvmet] nvme_loop_execute_work+0x20/0x30 [nvme_loop] process_one_work+0x56e/0xa70 worker_thread+0x2d1/0x640 kthread+0x183/0x1c0 ret_from_fork+0x1f/0x30
--- drivers/nvme/target/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/nvme/target/core.c +4 -2
@@ -736,6 +736,8 @@ static void nvmet_set_error(struct nvmetstatic void __nvmet_req_complete (struct nvmet_req *req,u16 status) { +struct nvmet_ns *ns = req->ns; +if (!req->sq->sqhd_disabled)nvmet_update_sq_head (req); req->cqe->sq_id =cpu_to_le16 (req->sq->qid);
@@ -746,9 +748,9 @@ static void __nvmet_req_complete(structtrace_nvmet_req_complete (req); -if (req->ns) -nvmet_put_namespace (req->ns); req->ops->queue_response (req); +if (ns) +nvmet_put_namespace (ns); }void nvmet_req_complete (struct nvmet_req *req,u16 status)
Greg Kroah-Hartman
maintainerPATCH 45/121 NFS: Fix another fsync() issue after a server reboot
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 67f4b5dc49913abcdb5cc736e73674e2f352f81d ]
Currently, when the writeback code detects a server reboot, it redirties any pages that were not committed to disk, and it sets the flag NFS_CONTEXT_RESEND_WRITES in the nfs_open_context of the file descriptor that dirtied the file. While this allows the file descriptor in question to redrive its own writes, it violates the fsync() requirement that we should be synchronising all writes to disk.
While the problem is infrequent, we do see corner cases where an untimely server reboot causes the fsync() call to abandon its attempt to sync data to disk and causing data corruption issues due to missed error conditions or similar.
In order to tighted up the client's ability to deal with this situation without introducing livelocks, add a counter that records the number of times pages are redirtied due to a server reboot-like condition, and use that in fsync() to redrive the sync to disk.
--- fs/nfs/file.c | 15 ++++++--------- fs/nfs/inode.c | 1 + fs/nfs/write.c | 6 ++++-- include/linux/nfs_fs.h | 1 + 4 files changed, 12 insertions(+), 11 deletions(-)
fs/nfs/file.c +6 -9
@@ -223,8 +223,10 @@ nfs_file_fsync_commit(struct file *file, int datasync)int nfs_file_fsync (struct file *file,loff_t start,loff_t end,int datasync) { -struct nfs_open_context *ctx =nfs_file_open_context (file);struct inode *inode =file_inode (file); +struct nfs_inode *nfsi =NFS_I (inode); +long save_nredirtied =atomic_long_read (&nfsi->redirtied_pages); +long nredirtied;int ret;trace_nfs_fsync_enter (inode);
@@ -239,15 +241,10 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync) ret =pnfs_sync_inode (inode, !!datasync);if (ret !=0 )break ; -if (!test_and_clear_bit (NFS_CONTEXT_RESEND_WRITES , &ctx->flags)) + nredirtied =atomic_long_read (&nfsi->redirtied_pages); +if (nredirtied == save_nredirtied)break ; -/* -* If nfs_file_fsync_commit detected a server reboot, then -* resend all dirty pages that might have been covered by -* the NFS_CONTEXT_RESEND_WRITES flag -*/ - start =0 ; - end =LLONG_MAX ; + save_nredirtied = nredirtied; }trace_nfs_fsync_exit (inode, ret);
fs/nfs/inode.c +1 -0
@@ -434,6 +434,7 @@ nfs_ilookup(struct super_block *sb, struct nfs_fattr *fattr, struct nfs_fh *fh)static void nfs_inode_init_regular (struct nfs_inode *nfsi) {atomic_long_set (&nfsi->nrequests,0 ); +atomic_long_set (&nfsi->redirtied_pages,0 );INIT_LIST_HEAD (&nfsi->commit_info.list);atomic_long_set (&nfsi->commit_info.ncommit,0 );atomic_set (&nfsi->commit_info.rpcs_out,0 );
fs/nfs/write.c +4 -2
@@ -1394,10 +1394,12 @@ static void nfs_initiate_write(struct nfs_pgio_header *hdr,*/ static void nfs_redirty_request (struct nfs_page *req) { +struct nfs_inode *nfsi =NFS_I (page_file_mapping (req->wb_page)->host); +/* Bump the transmission count */ req->wb_nio++;nfs_mark_request_dirty (req); -set_bit (NFS_CONTEXT_RESEND_WRITES , &nfs_req_openctx (req)->flags); +atomic_long_inc (&nfsi->redirtied_pages);nfs_end_page_writeback (req);nfs_release_request (req); }
@@ -1870,7 +1872,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)/* We have a mismatch. Write the page again */ dprintk_cont (" mismatch\n" );nfs_mark_request_dirty (req); -set_bit (NFS_CONTEXT_RESEND_WRITES , &nfs_req_openctx (req)->flags); +atomic_long_inc (&NFS_I (data->inode)->redirtied_pages); next:nfs_unlock_and_release_request (req);/* Latency breaker */
include/linux/nfs_fs.h +1 -0
@@ -180,6 +180,7 @@ struct nfs_inode {/* Regular file */ struct {atomic_long_t nrequests; +atomic_long_t redirtied_pages;struct nfs_mds_commit_info commit_info;struct mutex commit_mutex; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 15/121 Revert "parisc: Show error if wrong 32/64-bit compiler is being used"
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit b4b18f47f4f9682fbf5827682645da7c8dde8f80 ]
This reverts commit b160628e9ebcdc85d0db9d7f423c26b3c7c179d0.
There is no need any longer to have this sanity check, because the previous commit ("parisc: Make CONFIG_64BIT available for ARCH=parisc64 only") prevents that CONFIG_64BIT is set if ARCH==parisc.
--- arch/parisc/include/asm/bitops.h | 8 -------- 1 file changed, 8 deletions(-)
arch/parisc/include/asm/bitops.h +0 -8
@@ -12,14 +12,6 @@#include <asm/barrier.h> #include <linux/atomic.h> -/* compiler build environment sanity checks: */ -#if !defined(CONFIG_64BIT ) && defined(__LP64__) -#error "Please use 'ARCH=parisc' to build the 32-bit kernel." -#endif -#if defined(CONFIG_64BIT ) && !defined(__LP64__) -#error "Please use 'ARCH=parisc64' to build the 64-bit kernel." -#endif -/* See http://marc.theaimsgroup.com/?t=108826637900003 for discussion * on use of volatile and __*_bit() (set/clear/change): * *_bit() want use of volatile.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 74/121 rxrpc: Fix an insufficiently large sglist in rxkad_verify_packet_2()
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 0d40f728e28393a8817d1fcae923dfa3409e488c ]
rxkad_verify_packet_2() has a small stack-allocated sglist of 4 elements, but if that isn't sufficient for the number of fragments in the socket buffer, we try to allocate an sglist large enough to hold all the fragments.
However, for large packets with a lot of fragments, this isn't sufficient and we need at least one additional fragment.
The problem manifests as skb_to_sgvec() returning -EMSGSIZE and this then getting returned by userspace. Most of the time, this isn't a problem as rxrpc sets a limit of 5692, big enough for 4 jumbo subpackets to be glued together; occasionally, however, the server will ignore the reported limit and give a packet that's a lot bigger - say 19852 bytes with ->nr_frags being 7. skb_to_sgvec() then tries to return a "zeroth" fragment that seems to occur before the fragments counted by ->nr_frags and we hit the end of the sglist too early.
Note that __skb_to_sgvec() also has an skb_walk_frags() loop that is recursive up to 24 deep. I'm not sure if I need to take account of that too - or if there's an easy way of counting those frags too.
Fix this by counting an extra frag and allocating a larger sglist based on that.
--- net/rxrpc/rxkad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rxrpc/rxkad.c +1 -1
@@ -540,7 +540,7 @@ static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb,* directly into the target buffer. */ sg = _sg; - nsg =skb_shinfo (skb)->nr_frags; + nsg =skb_shinfo (skb)->nr_frags +1 ;if (nsg <=4 ) { nsg =4 ; }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 34/121 vfio/type1: Unpin zero pages
In reply to Greg Kroah-HartmanFrom: Alex Williamson <[email protected]>
commit 873aefb376bbc0ed1dd2381ea1d6ec88106fdbd4 upstream.
There's currently a reference count leak on the zero page. We increment the reference via pin_user_pages_remote(), but the page is later handled as an invalid/reserved page, therefore it's not accounted against the user and not unpinned by our put_pfn().
Introducing special zero page handling in put_pfn() would resolve the leak, but without accounting of the zero page, a single user could still create enough mappings to generate a reference count overflow.
The zero page is always resident, so for our purposes there's no reason to keep it pinned. Therefore, add a loop to walk pages returned from pin_user_pages_remote() and unpin any zero pages.
--- drivers/vfio/vfio_iommu_type1.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/vfio/vfio_iommu_type1.c +12 -0
@@ -561,6 +561,18 @@ static int vaddr_get_pfns(struct mm_stru ret =pin_user_pages_remote (mm, vaddr, npages, flags |FOLL_LONGTERM , pages,NULL ,NULL );if (ret >0 ) { +int i; + +/* +* The zero page is always resident, we don't need to pin it +* and it falls into our invalid/reserved test so we don't +* unpin in put_pfn(). Unpin all zero pages in the batch here. +*/ +for (i =0 ; i < ret; i++) { +if (unlikely (is_zero_pfn (page_to_pfn (pages[i])))) +unpin_user_page (pages[i]); + } + *pfn =page_to_pfn (pages[0 ]); goto done; }
Greg Kroah-Hartman
maintainerPATCH 77/121 sch_sfb: Dont assume the skb is still around after enqueueing to child
In reply to Greg Kroah-HartmanFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 9efd23297cca530bb35e1848665805d3fcdd7889 ]
The sch_sfb enqueue() routine assumes the skb is still alive after it has been enqueued into a child qdisc, using the data in the skb cb field in the increment_qlen() routine after enqueue. However, the skb may in fact have been freed, causing a use-after-free in this case. In particular, this happens if sch_cake is used as a child of sfb, and the GSO splitting mode of CAKE is enabled (in which case the skb will be split into segments and the original skb freed).
Fix this by copying the sfb cb data to the stack before enqueueing the skb, and using this stack copy in increment_qlen() instead of the skb pointer itself.
--- net/sched/sch_sfb.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/sched/sch_sfb.c +6 -4
@@ -135,15 +135,15 @@ static void increment_one_qlen(u32 sfbhash, u32 slot, struct sfb_sched_data *q) } } -static void increment_qlen (const struct sk_buff *skb,struct sfb_sched_data *q) +static void increment_qlen (const struct sfb_skb_cb *cb,struct sfb_sched_data *q) {u32 sfbhash; - sfbhash =sfb_hash (skb,0 ); + sfbhash = cb->hashes[0 ];if (sfbhash)increment_one_qlen (sfbhash,0 , q); - sfbhash =sfb_hash (skb,1 ); + sfbhash = cb->hashes[1 ];if (sfbhash)increment_one_qlen (sfbhash,1 , q); }
@@ -283,6 +283,7 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch,struct sfb_sched_data *q =qdisc_priv (sch);struct Qdisc *child = q->qdisc;struct tcf_proto *fl; +struct sfb_skb_cb cb;int i;u32 p_min = ~0 ;u32 minqlen = ~0 ;
@@ -399,11 +400,12 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch, } enqueue: +memcpy (&cb,sfb_skb_cb (skb),sizeof (cb)); ret =qdisc_enqueue (skb, child, to_free);if (likely (ret ==NET_XMIT_SUCCESS )) {qdisc_qstats_backlog_inc (sch, skb); sch->q.qlen++; -increment_qlen (skb, q); +increment_qlen (&cb, q); }else if (net_xmit_drop_count (ret)) { q->stats.childdrop++;qdisc_qstats_drop (sch);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 76/121 Revert "net: phy: meson-gxl: improve link-up behavior"
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit 7fdc77665f3d45c9da7c6edd4beadee9790f43aa ]
This reverts commit 2c87c6f9fbddc5b84d67b2fa3f432fcac6d99d93. Meanwhile it turned out that the following commit is the proper workaround for the issue that 2c87c6f9fbdd tries to address. a3a57bf07de2 ("net: stmmac: work around sporadic tx issue on link-up") It's nor clear why the to be reverted commit helped for one user, for others it didn't make a difference.
--- drivers/net/phy/meson-gxl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/net/phy/meson-gxl.c +1 -7
@@ -243,13 +243,7 @@ static irqreturn_t meson_gxl_handle_interrupt(struct phy_device *phydev) irq_status == INTSRC_ENERGY_DETECT)return IRQ_HANDLED ; -/* Give PHY some time before MAC starts sending data. This works -* around an issue where network doesn't come up properly. -*/ -if (!(irq_status &INTSRC_LINK_DOWN )) -phy_queue_state_machine (phydev,msecs_to_jiffies (100 )); -else -phy_trigger_machine (phydev); +phy_trigger_machine (phydev);return IRQ_HANDLED ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 56/121 RDMA/cma: Fix arguments order in net device validation
In reply to Greg Kroah-HartmanFrom: Michael Guralnik <[email protected]>
[ Upstream commit 27cfde795a96aef1e859a5480489944b95421e46 ]
Fix the order of source and destination addresses when resolving the route between server and client to validate use of correct net device.
The reverse order we had so far didn't actually validate the net device as the server would try to resolve the route to itself, thus always getting the server's net device.
The issue was discovered when running cm applications on a single host between 2 interfaces with same subnet and source based routing rules. When resolving the reverse route the source based route rules were ignored.
--- drivers/infiniband/core/cma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/core/cma.c +2 -2
@@ -1718,8 +1718,8 @@ cma_ib_id_from_event(struct ib_cm_id *cm_id, }if (!validate_net_dev (*net_dev, - (struct sockaddr *)&req->listen_addr_storage, - (struct sockaddr *)&req->src_addr_storage)) { + (struct sockaddr *)&req->src_addr_storage, + (struct sockaddr *)&req->listen_addr_storage)) { id_priv =ERR_PTR (-EHOSTUNREACH ); goto err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 46/121 cgroup: Elide write-locking threadgroup_rwsem when updating csses on an empty subtree
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
[ Upstream commit 671c11f0619e5ccb380bcf0f062f69ba95fc974a ]
cgroup_update_dfl_csses() write-lock the threadgroup_rwsem as updating the csses can trigger process migrations. However, if the subtree doesn't contain any tasks, there aren't gonna be any cgroup migrations. This condition can be trivially detected by testing whether mgctx.preloaded_src_csets is empty. Elide write-locking threadgroup_rwsem if the subtree is empty.
After this optimization, the usage pattern of creating a cgroup, enabling the necessary controllers, and then seeding it with CLONE_INTO_CGROUP and then removing the cgroup after it becomes empty doesn't need to write-lock threadgroup_rwsem at all.
--- kernel/cgroup/cgroup.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
kernel/cgroup/cgroup.c +13 -3
@@ -2949,12 +2949,11 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp)struct cgroup_subsys_state *d_css;struct cgroup *dsct;struct css_set *src_cset; +bool has_tasks;int ret;lockdep_assert_held (&cgroup_mutex); -percpu_down_write (&cgroup_threadgroup_rwsem); -/* look up all csses currently attached to @cgrp's subtree */ spin_lock_irq (&css_set_lock);cgroup_for_each_live_descendant_pre (dsct, d_css, cgrp) {
@@ -2965,6 +2964,16 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp) }spin_unlock_irq (&css_set_lock); +/* +* We need to write-lock threadgroup_rwsem while migrating tasks. +* However, if there are no source csets for @cgrp, changing its +* controllers isn't gonna produce any task migrations and the +* write-locking can be skipped safely. +*/ + has_tasks = !list_empty (&mgctx.preloaded_src_csets); +if (has_tasks) +percpu_down_write (&cgroup_threadgroup_rwsem); +/* NULL dst indicates self on default hierarchy */ ret =cgroup_migrate_prepare_dst (&mgctx);if (ret)
@@ -2984,7 +2993,8 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp) ret =cgroup_migrate_execute (&mgctx); out_finish:cgroup_migrate_finish (&mgctx); -percpu_up_write (&cgroup_threadgroup_rwsem); +if (has_tasks) +percpu_up_write (&cgroup_threadgroup_rwsem);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 49/121 ASoC: qcom: sm8250: add missing module owner
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit c6e14bb9f50df7126ca64405ae807d8bc7b39f9a ]
Add missing module owner to able to build and load this driver as module.
--- sound/soc/qcom/sm8250.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/qcom/sm8250.c +1 -0
@@ -191,6 +191,7 @@ static int sm8250_platform_probe(struct platform_device *pdev)if (!card)return -ENOMEM ; + card->owner =THIS_MODULE ;/* Allocate the private data */ data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 62/121 ARM: at91: pm: fix DDR recalibration when resuming from backup and self-refresh
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 7a94b83a7dc551607b6c4400df29151e6a951f07 ]
On SAMA7G5, when resuming from backup and self-refresh, the bootloader performs DDR PHY recalibration by restoring the value of ZQ0SR0 (stored in RAM by Linux before going to backup and self-refresh). It has been discovered that the current procedure doesn't work for all possible values that might go to ZQ0SR0 due to hardware bug. The workaround to this is to avoid storing some values in ZQ0SR0. Thus Linux will read the ZQ0SR0 register and cache its value in RAM after processing it (using modified_gray_code array). The bootloader will restore the processed value.
--- arch/arm/mach-at91/pm.c | 36 ++++++++++++++++++++++++++++++++---- include/soc/at91/sama7-ddr.h | 4 ++++ 2 files changed, 36 insertions(+), 4 deletions(-)
arch/arm/mach-at91/pm.c +32 -4
@@ -350,9 +350,41 @@ extern u32 at91_pm_suspend_in_sram_sz;static int at91_suspend_finish (unsigned long val) { +unsigned char modified_gray_code[] = { +0x00 ,0x01 ,0x02 ,0x03 ,0x06 ,0x07 ,0x04 ,0x05 ,0x0c ,0x0d , +0x0e ,0x0f ,0x0a ,0x0b ,0x08 ,0x09 ,0x18 ,0x19 ,0x1a ,0x1b , +0x1e ,0x1f ,0x1c ,0x1d ,0x14 ,0x15 ,0x16 ,0x17 ,0x12 ,0x13 , +0x10 ,0x11 , + }; +unsigned int tmp, index;int i;if (soc_pm.data.mode ==AT91_PM_BACKUP && soc_pm.data.ramc_phy) { +/* +* Bootloader will perform DDR recalibration and will try to +* restore the ZQ0SR0 with the value saved here. But the +* calibration is buggy and restoring some values from ZQ0SR0 +* is forbidden and risky thus we need to provide processed +* values for these (modified gray code values). +*/ + tmp =readl (soc_pm.data.ramc_phy +DDR3PHY_ZQ0SR0 ); + +/* Store pull-down output impedance select. */ + index = (tmp >>DDR3PHY_ZQ0SR0_PDO_OFF ) &0x1f ; + soc_pm.bu->ddr_phy_calibration[0 ] = modified_gray_code[index]; + +/* Store pull-up output impedance select. */ + index = (tmp >>DDR3PHY_ZQ0SR0_PUO_OFF ) &0x1f ; + soc_pm.bu->ddr_phy_calibration[0 ] |= modified_gray_code[index]; + +/* Store pull-down on-die termination impedance select. */ + index = (tmp >>DDR3PHY_ZQ0SR0_PDODT_OFF ) &0x1f ; + soc_pm.bu->ddr_phy_calibration[0 ] |= modified_gray_code[index]; + +/* Store pull-up on-die termination impedance select. */ + index = (tmp >>DDR3PHY_ZQ0SRO_PUODT_OFF ) &0x1f ; + soc_pm.bu->ddr_phy_calibration[0 ] |= modified_gray_code[index]; +/* * The 1st 8 words of memory might get corrupted in the process * of DDR PHY recalibration; it is saved here in securam and it
@@ -841,10 +873,6 @@ static int __init at91_pm_backup_init(void)of_scan_flat_dt (at91_pm_backup_scan_memcs, &located);if (!located) goto securam_fail; - -/* DDR3PHY_ZQ0SR0 */ - soc_pm.bu->ddr_phy_calibration[0 ] =readl (soc_pm.data.ramc_phy + -0x188 ); }return 0 ;
include/soc/at91/sama7-ddr.h +4 -0
@@ -40,6 +40,10 @@#define DDR3PHY_DSGCR_ODTPDD_ODT0 (1 << 20)/* ODT[0] Power Down Driver */ #define DDR3PHY_ZQ0SR0 (0x188)/* ZQ status register 0 */ +#define DDR3PHY_ZQ0SR0_PDO_OFF (0)/* Pull-down output impedance select offset */ +#define DDR3PHY_ZQ0SR0_PUO_OFF (5)/* Pull-up output impedance select offset */ +#define DDR3PHY_ZQ0SR0_PDODT_OFF (10)/* Pull-down on-die termination impedance select offset */ +#define DDR3PHY_ZQ0SRO_PUODT_OFF (15)/* Pull-up on-die termination impedance select offset */ #define DDR3PHY_DX0DLLCR (0x1CC)/* DDR3PHY DATX8 DLL Control Register */ #define DDR3PHY_DX1DLLCR (0x20C)/* DDR3PHY DATX8 DLL Control Register */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 37/121 sched/debug: fix dentry leak in update_sched_domain_debugfs
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit c2e406596571659451f4b95e37ddfd5a8ef1d0dc upstream.
Kuyo reports that the pattern of using debugfs_remove(debugfs_lookup()) leaks a dentry and with a hotplug stress test, the machine eventually runs out of memory.
Fix this up by using the newly created debugfs_lookup_and_remove() call instead which properly handles the dentry reference counting logic.
--- kernel/sched/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/debug.c +1 -1
@@ -416,7 +416,7 @@ void update_sched_domain_debugfs(void)char buf[32 ];snprintf (buf,sizeof (buf),"cpu%d" , cpu); -debugfs_remove (debugfs_lookup (buf, sd_dentry)); +debugfs_lookup_and_remove (buf, sd_dentry); d_cpu =debugfs_create_dir (buf, sd_dentry); i =0 ;
Greg Kroah-Hartman
maintainerPATCH 51/121 RDMA/rtrs-srv: Pass the correct number of entries for dma mapped SGL
In reply to Greg Kroah-HartmanFrom: Jack Wang <[email protected]>
[ Upstream commit 56c310de0b4b3aca1c4fdd9c1093fc48372a7335 ]
ib_dma_map_sg() augments the SGL into a 'dma mapped SGL'. This process may change the number of entries and the lengths of each entry.
Code that touches dma_address is iterating over the 'dma mapped SGL' and must use dma_nents which returned from ib_dma_map_sg().
We should use the return count from ib_dma_map_sg for futher usage.
--- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-srv.c +7 -7
@@ -600,7 +600,7 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path)struct sg_table *sgt = &srv_mr->sgt;struct scatterlist *s;struct ib_mr *mr; -int nr, chunks; +int nr, nr_sgt, chunks; chunks = chunks_per_mr * mri;if (!always_invalidate)
@@ -615,19 +615,19 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path)sg_set_page (s, srv->chunks[chunks + i], max_chunk_size,0 ); - nr =ib_dma_map_sg (srv_path->s.dev->ib_dev, sgt->sgl, + nr_sgt =ib_dma_map_sg (srv_path->s.dev->ib_dev, sgt->sgl, sgt->nents,DMA_BIDIRECTIONAL ); -if (nr < sgt->nents) { - err = nr <0 ? nr : -EINVAL ; +if (!nr_sgt) { + err = -EINVAL ; goto free_sg; } mr =ib_alloc_mr (srv_path->s.dev->ib_pd,IB_MR_TYPE_MEM_REG , - sgt->nents); + nr_sgt);if (IS_ERR (mr)) { err =PTR_ERR (mr); goto unmap_sg; } - nr =ib_map_mr_sg (mr, sgt->sgl, sgt->nents, + nr =ib_map_mr_sg (mr, sgt->sgl, nr_sgt,NULL , max_chunk_size);if (nr <0 || nr < sgt->nents) { err = nr <0 ? nr : -EINVAL ;
@@ -646,7 +646,7 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path) } }/* Eventually dma addr for each chunk can be cached */ -for_each_sg (sgt->sgl, s, sgt->orig_nents, i) +for_each_sg (sgt->sgl, s, nr_sgt, i) srv_path->dma_addr[chunks + i] =sg_dma_address (s);ib_update_fast_reg_key (mr,ib_inc_rkey (mr->rkey));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 86/121 RDMA/siw: Pass a pointer to virt_to_page()
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 0d1b756acf60da5004c1e20ca4462f0c257bf6e1 ]
Functions that work on a pointer to virtual memory such as virt_to_pfn() and users of that function such as virt_to_page() are supposed to pass a pointer to virtual memory, ideally a (void *) or other pointer. However since many architectures implement virt_to_pfn() as a macro, this function becomes polymorphic and accepts both a (unsigned long) and a (void *).
If we instead implement a proper virt_to_pfn(void *addr) function the following happens (occurred on arch/arm):
drivers/infiniband/sw/siw/siw_qp_tx.c:32:23: warning: incompatible
integer to pointer conversion passing 'dma_addr_t' (aka 'unsigned int') to parameter of type 'const void *' [-Wint-conversion]drivers/infiniband/sw/siw/siw_qp_tx.c:32:37: warning: passing argument
1 of 'virt_to_pfn' makes pointer from integer without a cast [-Wint-conversion]drivers/infiniband/sw/siw/siw_qp_tx.c:538:36: warning: incompatible
integer to pointer conversion passing 'unsigned long long' to parameter of type 'const void *' [-Wint-conversion]
Fix this with an explicit cast. In one case where the SIW SGE uses an unaligned u64 we need a double cast modifying the virtual address (va) to a platform-specific uintptr_t before casting to a (void *).
--- drivers/infiniband/sw/siw/siw_qp_tx.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/infiniband/sw/siw/siw_qp_tx.c +14 -4
@@ -29,7 +29,7 @@ static struct page *siw_get_pblpage(struct siw_mem *mem, u64 addr, int *idx)dma_addr_t paddr =siw_pbl_get_buffer (pbl, offset,NULL , idx);if (paddr) -return virt_to_page (paddr); +return virt_to_page ((void *)paddr);return NULL ; }
@@ -533,13 +533,23 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s)kunmap_local (kaddr); } }else { -u64 va = sge->laddr + sge_off; +/* +* Cast to an uintptr_t to preserve all 64 bits +* in sge->laddr. +*/ +uintptr_t va = (uintptr_t )(sge->laddr + sge_off); - page_array[seg] =virt_to_page (va &PAGE_MASK ); +/* +* virt_to_page() takes a (void *) pointer +* so cast to a (void *) meaning it will be 64 +* bits on a 64 bit platform and 32 bits on a +* 32 bit platform. +*/ + page_array[seg] =virt_to_page ((void *)(va &PAGE_MASK ));if (do_crc)crypto_shash_update ( c_tx->mpa_crc_hd, - (void *)(uintptr_t )va, + (void *)va, plen); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 43/121 NFS: Further optimisations for ls -l
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit ff81dfb5d721fff87bd516c558847f6effb70031 ]
If a user is doing 'ls -l', we have a heuristic in GETATTR that tells the readdir code to try to use READDIRPLUS in order to refresh the inode attributes. In certain cirumstances, we also try to invalidate the remaining directory entries in order to ensure this refresh.
If there are multiple readers of the directory, we probably should avoid invalidating the page cache, since the heuristic breaks down in that situation anyway.
--- fs/nfs/dir.c | 16 +++++++++++----- include/linux/nfs_fs.h | 5 ++--- 2 files changed, 13 insertions(+), 8 deletions(-)
fs/nfs/dir.c +11 -5
@@ -78,6 +78,7 @@ static struct nfs_open_dir_context *alloc_nfs_open_dir_context(struct inode *dir ctx->attr_gencount = nfsi->attr_gencount; ctx->dir_cookie =0 ; ctx->dup_cookie =0 ; + ctx->page_index =0 ;spin_lock (&dir->i_lock);if (list_empty (&nfsi->open_files) && (nfsi->cache_validity &NFS_INO_DATA_INVAL_DEFER ))
@@ -85,6 +86,7 @@ static struct nfs_open_dir_context *alloc_nfs_open_dir_context(struct inode *dirNFS_INO_INVALID_DATA | NFS_INO_REVAL_FORCED);list_add (&ctx->list, &nfsi->open_files); +clear_bit (NFS_INO_FORCE_READDIR , &nfsi->flags);spin_unlock (&dir->i_lock);return ctx; }
@@ -626,8 +628,7 @@ void nfs_force_use_readdirplus(struct inode *dir)if (nfs_server_capable (dir,NFS_CAP_READDIRPLUS ) && !list_empty (&nfsi->open_files)) {set_bit (NFS_INO_ADVISE_RDPLUS , &nfsi->flags); -invalidate_mapping_pages (dir->i_mapping, - nfsi->page_index +1 ,-1 ); +set_bit (NFS_INO_FORCE_READDIR , &nfsi->flags); } }
@@ -938,10 +939,8 @@ static int find_and_lock_cache_page(struct nfs_readdir_descriptor *desc) sizeof(nfsi->cookieverf)); } res =nfs_readdir_search_array (desc); -if (res ==0 ) { - nfsi->page_index = desc->page_index; +if (res ==0 )return 0 ; - }nfs_readdir_page_unlock_and_put_cached (desc);return res; }
@@ -1081,6 +1080,7 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx)struct nfs_inode *nfsi =NFS_I (inode);struct nfs_open_dir_context *dir_ctx = file->private_data;struct nfs_readdir_descriptor *desc; +pgoff_t page_index;int res; dfprintk(FILE, "NFS: readdir(%pD2) starting at cookie %llu\n",
@@ -1111,10 +1111,15 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx) desc->dir_cookie = dir_ctx->dir_cookie; desc->dup_cookie = dir_ctx->dup_cookie; desc->duped = dir_ctx->duped; + page_index = dir_ctx->page_index; desc->attr_gencount = dir_ctx->attr_gencount;memcpy (desc->verf, dir_ctx->verf,sizeof (desc->verf));spin_unlock (&file->f_lock); +if (test_and_clear_bit (NFS_INO_FORCE_READDIR , &nfsi->flags) && +list_is_singular (&nfsi->open_files)) +invalidate_mapping_pages (inode->i_mapping, page_index +1 ,-1 ); + do { res = readdir_search_pagecache(desc);
@@ -1151,6 +1156,7 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx) dir_ctx->dup_cookie = desc->dup_cookie; dir_ctx->duped = desc->duped; dir_ctx->attr_gencount = desc->attr_gencount; + dir_ctx->page_index = desc->page_index;memcpy (dir_ctx->verf, desc->verf,sizeof (dir_ctx->verf));spin_unlock (&file->f_lock);
include/linux/nfs_fs.h +2 -3
@@ -103,6 +103,7 @@ struct nfs_open_dir_context {__be32 verf[NFS_DIR_VERIFIER_SIZE ];__u64 dir_cookie;__u64 dup_cookie; +pgoff_t page_index;signed char duped; };
@@ -181,9 +182,6 @@ struct nfs_inode {struct rw_semaphore rmdir_sem;struct mutex commit_mutex; -/* track last access to cached pages */ -unsigned long page_index; -#if IS_ENABLED (CONFIG_NFS_V4 )struct nfs4_cached_acl *nfs4_acl;/* NFSv4 state */
@@ -272,6 +270,7 @@ struct nfs4_copy_state {#define NFS_INO_INVALIDATING (3)/* inode is being invalidated */ #define NFS_INO_FSCACHE (5)/* inode can be cached by FS-Cache */ #define NFS_INO_FSCACHE_LOCK (6)/* FS-Cache cookie management lock */ +#define NFS_INO_FORCE_READDIR (7)/* force readdirplus */ #define NFS_INO_LAYOUTCOMMIT (9)/* layoutcommit required */ #define NFS_INO_LAYOUTCOMMITTING (10)/* layoutcommit inflight */ #define NFS_INO_LAYOUTSTATS (11)/* layoutstats inflight */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 52/121 ARM: dts: imx6qdl-kontron-samx6i: remove duplicated node
In reply to Greg Kroah-HartmanFrom: Marco Felsch <[email protected]>
[ Upstream commit 204f67d86f55dd4fa757ed04757d7273f71a169c ]
The regulator node 'regulator-3p3v-s0' was dupplicated. Remove it to clean the DTS.
--- arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 10 ---------- 1 file changed, 10 deletions(-)
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi +0 -10
@@ -51,16 +51,6 @@ vin-supply = <®_3p3v_s5>; }; - reg_3p3v_s0: regulator-3p3v-s0 { - compatible = "regulator-fixed"; - regulator-name = "V_3V3_S0"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - regulator-boot-on; - vin-supply = <®_3p3v_s5>; - }; - reg_3p3v_s5: regulator-3p3v-s5 { compatible = "regulator-fixed"; regulator-name = "V_3V3_S5";
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 63/121 ARM: dts: at91: sama5d27_wlsom1: specify proper regulator output ranges
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit addf7efec23af2b67547800aa232d551945e7de2 ]
Min and max output ranges of regulators need to satisfy board requirements not PMIC requirements. Thus adjust device tree to cope with this.
--- arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi +10 -10
@@ -68,8 +68,8 @@ regulators { vdd_3v3: VDD_IO { regulator-name = "VDD_IO"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <3700000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-always-on;
@@ -87,8 +87,8 @@ vddio_ddr: VDD_DDR { regulator-name = "VDD_DDR"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1850000>; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-always-on;
@@ -110,8 +110,8 @@ vdd_core: VDD_CORE { regulator-name = "VDD_CORE"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1850000>; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1250000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-always-on;
@@ -152,8 +152,8 @@ LDO1 { regulator-name = "LDO1"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <3700000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; regulator-always-on; regulator-state-standby {
@@ -167,8 +167,8 @@ LDO2 { regulator-name = "LDO2"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <3700000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; regulator-always-on; regulator-state-standby {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 91/121 nvme-tcp: fix UAF when detecting digest errors
In reply to Greg Kroah-HartmanFrom: Sagi Grimberg <[email protected]>
[ Upstream commit 160f3549a907a50e51a8518678ba2dcf2541abea ]
We should also bail from the io_work loop when we set rd_enabled to true, so we don't attempt to read data from the socket when the TCP stream is already out-of-sync or corrupted.
--- drivers/nvme/host/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/tcp.c +1 -1
@@ -1209,7 +1209,7 @@ static void nvme_tcp_io_work(struct work_struct *w)else if (unlikely (result <0 ))return ; -if (!pending) +if (!pending || !queue->rd_enabled)return ; }while (!time_after (jiffies, deadline));/* quota is exhausted */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 44/121 NFS: Save some space in the inode
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit e591b298d7ecb851e200f65946e3d53fe78a3c4f ]
Save some space in the nfs_inode by setting up an anonymous union with the fields that are peculiar to a specific type of filesystem object.
--- fs/nfs/inode.c | 26 ++++++++++++++++++-------- include/linux/nfs_fs.h | 42 ++++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 26 deletions(-)
fs/nfs/inode.c +18 -8
@@ -431,6 +431,22 @@ nfs_ilookup(struct super_block *sb, struct nfs_fattr *fattr, struct nfs_fh *fh)return inode; } +static void nfs_inode_init_regular (struct nfs_inode *nfsi) +{ +atomic_long_set (&nfsi->nrequests,0 ); +INIT_LIST_HEAD (&nfsi->commit_info.list); +atomic_long_set (&nfsi->commit_info.ncommit,0 ); +atomic_set (&nfsi->commit_info.rpcs_out,0 ); +mutex_init (&nfsi->commit_mutex); +} + +static void nfs_inode_init_dir (struct nfs_inode *nfsi) +{ + nfsi->cache_change_attribute =0 ; +memset (nfsi->cookieverf,0 ,sizeof (nfsi->cookieverf)); +init_rwsem (&nfsi->rmdir_sem); +} +/* * This is our front-end to iget that looks up inodes by file handle * instead of inode number.
@@ -485,10 +501,12 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, stif (S_ISREG (inode->i_mode)) { inode->i_fop =NFS_SB (sb)->nfs_client->rpc_ops->file_ops; inode->i_data.a_ops = &nfs_file_aops; +nfs_inode_init_regular (nfsi); }else if (S_ISDIR (inode->i_mode)) { inode->i_op =NFS_SB (sb)->nfs_client->rpc_ops->dir_inode_ops; inode->i_fop = &nfs_dir_operations; inode->i_data.a_ops = &nfs_dir_aops; +nfs_inode_init_dir (nfsi);/* Deal with crossing mountpoints */ if (fattr->valid &NFS_ATTR_FATTR_MOUNTPOINT || fattr->valid &NFS_ATTR_FATTR_V4_REFERRAL ) {
@@ -514,7 +532,6 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st inode->i_uid =make_kuid (&init_user_ns,-2 ); inode->i_gid =make_kgid (&init_user_ns,-2 ); inode->i_blocks =0 ; -memset (nfsi->cookieverf,0 ,sizeof (nfsi->cookieverf)); nfsi->write_io =0 ; nfsi->read_io =0 ;
@@ -2282,14 +2299,7 @@ static void init_once(void *foo)INIT_LIST_HEAD (&nfsi->open_files);INIT_LIST_HEAD (&nfsi->access_cache_entry_lru);INIT_LIST_HEAD (&nfsi->access_cache_inode_lru); -INIT_LIST_HEAD (&nfsi->commit_info.list); -atomic_long_set (&nfsi->nrequests,0 ); -atomic_long_set (&nfsi->commit_info.ncommit,0 ); -atomic_set (&nfsi->commit_info.rpcs_out,0 ); -init_rwsem (&nfsi->rmdir_sem); -mutex_init (&nfsi->commit_mutex);nfs4_init_once (nfsi); - nfsi->cache_change_attribute =0 ; }static int __init nfs_init_inodecache (void )
include/linux/nfs_fs.h +24 -18
57 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 65/121 ARM: dts: at91: sama5d27_wlsom1: dont keep ldo2 enabled all the time
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 617a0d9fe6867bf5b3b7272629cd780c27c877d9 ]
ldo2 is not used by any consumer on sama5d27_wlsom1 board, thus don't keep it enabled all the time.
--- arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi +0 -1
@@ -169,7 +169,6 @@ regulator-name = "LDO2"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - regulator-always-on; regulator-state-standby { regulator-on-in-suspend;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 55/121 tee: fix compiler warning in tee_shm_register()
In reply to Greg Kroah-HartmanFrom: Jens Wiklander <[email protected]>
[ Upstream commit eccd7439709810127563e7e3e49b8b44c7b2791d ]
Include <linux/uaccess.h> to avoid the warning:
drivers/tee/tee_shm.c: In function 'tee_shm_register':
Quoted 1 line
Quoted 1 line
drivers/tee/tee_shm.c:242:14: error: implicit declaration of function 'access_ok' [-Werror=implicit-function-declaration]
242 | if (!access_ok((void __user *)addr, length))
| ^~~~~~~~~cc1: some warnings being treated as errors
--- drivers/tee/tee_shm.c | 1 + 1 file changed, 1 insertion(+)
drivers/tee/tee_shm.c +1 -0
@@ -9,6 +9,7 @@#include <linux/sched.h> #include <linux/slab.h> #include <linux/tee_drv.h> +#include <linux/uaccess.h> #include <linux/uio.h> #include "tee_private.h"
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 58/121 RDMA/hns: Fix supported page size
In reply to Greg Kroah-HartmanFrom: Chengchang Tang <[email protected]>
[ Upstream commit 55af9d498556f0860eb89ffa7677e8d73f6f643f ]
The supported page size for hns is (4K, 128M), not (4K, 2G).
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +1 -1
@@ -98,7 +98,7 @@#define HNS_ROCE_V2_QPC_TIMER_ENTRY_SZ PAGE_SIZE#define HNS_ROCE_V2_CQC_TIMER_ENTRY_SZ PAGE_SIZE -#define HNS_ROCE_V2_PAGE_SIZE_SUPPORTED 0xFFFFF000 +#define HNS_ROCE_V2_PAGE_SIZE_SUPPORTED 0xFFFF000#define HNS_ROCE_V2_MAX_INNER_MTPT_NUM 2#define HNS_ROCE_INVALID_LKEY 0x0#define HNS_ROCE_INVALID_SGE_LENGTH 0x80000000
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 60/121 wifi: wilc1000: fix DMA on stack objects
In reply to Greg Kroah-HartmanFrom: [email protected] <[email protected]>
[ Upstream commit 40b717bfcefab28a0656b8caa5e43d5449e5a671 ]
Sometimes 'wilc_sdio_cmd53' is called with addresses pointing to an object on the stack. Use dynamically allocated memory for cmd53 instead of stack address which is not DMA'able.
--- .../net/wireless/microchip/wilc1000/netdev.h | 1 + .../net/wireless/microchip/wilc1000/sdio.c | 39 ++++++++++++++++--- .../net/wireless/microchip/wilc1000/wlan.c | 15 ++++++- 3 files changed, 47 insertions(+), 8 deletions(-)
drivers/net/wireless/microchip/wilc1000/netdev.h +1 -0
@@ -252,6 +252,7 @@ struct wilc {u8 *rx_buffer;u32 rx_buffer_offset;u8 *tx_buffer; +u32 *vmm_table;struct txq_handle txq[NQUEUES ];int txq_entries;
drivers/net/wireless/microchip/wilc1000/sdio.c +33 -6
@@ -27,6 +27,7 @@ struct wilc_sdio {bool irq_gpio;u32 block_size;int has_thrpt_enh3; +u8 *cmd53_buf; };struct sdio_cmd52 {
@@ -46,6 +47,7 @@ struct sdio_cmd53 { u32 count: 9;u8 *buffer;u32 block_size; +bool use_global_buf; };static const struct wilc_hif_func wilc_hif_sdio;
@@ -90,6 +92,8 @@ static int wilc_sdio_cmd53(struct wilc *wilc, struct sdio_cmd53 *cmd) { struct sdio_func *func = container_of(wilc->dev, struct sdio_func, dev);int size, ret; +struct wilc_sdio *sdio_priv = wilc->bus_data; +u8 *buf = cmd->buffer;sdio_claim_host (func);
@@ -100,12 +104,23 @@ static int wilc_sdio_cmd53(struct wilc *wilc, struct sdio_cmd53 *cmd)else size = cmd->count; +if (cmd->use_global_buf) { +if (size >sizeof (u32)) +return -EINVAL ; + + buf = sdio_priv->cmd53_buf; + } +if (cmd->read_write) {/* write */ - ret =sdio_memcpy_toio (func, cmd->address, - (void *)cmd->buffer, size); +if (cmd->use_global_buf) +memcpy (buf, cmd->buffer, size); + + ret =sdio_memcpy_toio (func, cmd->address, buf, size); }else {/* read */ - ret =sdio_memcpy_fromio (func, (void *)cmd->buffer, - cmd->address, size); + ret =sdio_memcpy_fromio (func, buf, cmd->address, size); + +if (cmd->use_global_buf) +memcpy (cmd->buffer, buf, size); }sdio_release_host (func);
@@ -127,6 +142,12 @@ static int wilc_sdio_probe(struct sdio_func *func,if (!sdio_priv)return -ENOMEM ; + sdio_priv->cmd53_buf =kzalloc (sizeof (u32),GFP_KERNEL ); +if (!sdio_priv->cmd53_buf) { + ret = -ENOMEM ; + goto free; + } + ret =wilc_cfg80211_init (&wilc, &func->dev,WILC_HIF_SDIO , &wilc_hif_sdio);if (ret)
@@ -160,6 +181,7 @@ static int wilc_sdio_probe(struct sdio_func *func,irq_dispose_mapping (wilc->dev_irq_num);wilc_netdev_cleanup (wilc); free: +kfree (sdio_priv->cmd53_buf);kfree (sdio_priv);return ret; }
@@ -171,6 +193,7 @@ static void wilc_sdio_remove(struct sdio_func *func)clk_disable_unprepare (wilc->rtc_clk);wilc_netdev_cleanup (wilc); +kfree (sdio_priv->cmd53_buf);kfree (sdio_priv); }
@@ -367,8 +390,9 @@ static int wilc_sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) cmd.address =WILC_SDIO_FBR_DATA_REG ; cmd.block_mode =0 ; cmd.increment =1 ; - cmd.count =4 ; + cmd.count =sizeof (u32); cmd.buffer = (u8 *)&data; + cmd.use_global_buf = true; cmd.block_size = sdio_priv->block_size; ret =wilc_sdio_cmd53 (wilc, &cmd);if (ret)
@@ -406,6 +430,7 @@ static int wilc_sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) nblk = size / block_size; nleft = size % block_size; + cmd.use_global_buf = false;if (nblk >0 ) { cmd.block_mode =1 ; cmd.increment =1 ;
@@ -484,8 +509,9 @@ static int wilc_sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) cmd.address =WILC_SDIO_FBR_DATA_REG ; cmd.block_mode =0 ; cmd.increment =1 ; - cmd.count =4 ; + cmd.count =sizeof (u32); cmd.buffer = (u8 *)data; + cmd.use_global_buf = true; cmd.block_size = sdio_priv->block_size; ret =wilc_sdio_cmd53 (wilc, &cmd);
@@ -527,6 +553,7 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) nblk = size / block_size; nleft = size % block_size; + cmd.use_global_buf = false;if (nblk >0 ) { cmd.block_mode =1 ; cmd.increment =1 ;
drivers/net/wireless/microchip/wilc1000/wlan.c +13 -2
@@ -701,7 +701,7 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)int ret =0 ;int counter;int timeout; -u32 vmm_table[WILC_VMM_TBL_SIZE ]; +u32 *vmm_table = wilc->vmm_table;u8 ac_pkt_num_to_chip[NQUEUES ] = {0 ,0 ,0 ,0 };const struct wilc_hif_func *func;int srcu_idx;
@@ -1220,6 +1220,8 @@ void wilc_wlan_cleanup(struct net_device *dev)while ((rqe =wilc_wlan_rxq_remove (wilc)))kfree (rqe); +kfree (wilc->vmm_table); + wilc->vmm_table =NULL ;kfree (wilc->rx_buffer); wilc->rx_buffer =NULL ;kfree (wilc->tx_buffer);
@@ -1455,6 +1457,14 @@ int wilc_wlan_init(struct net_device *dev) goto fail; } +if (!wilc->vmm_table) + wilc->vmm_table =kzalloc (WILC_VMM_TBL_SIZE ,GFP_KERNEL ); + +if (!wilc->vmm_table) { + ret = -ENOBUFS ; + goto fail; + } +if (!wilc->tx_buffer) wilc->tx_buffer =kmalloc (WILC_TX_BUFF_SIZE ,GFP_KERNEL );
@@ -1479,7 +1489,8 @@ int wilc_wlan_init(struct net_device *dev)return 0 ; fail: - +kfree (wilc->vmm_table); + wilc->vmm_table =NULL ;kfree (wilc->rx_buffer); wilc->rx_buffer =NULL ;kfree (wilc->tx_buffer);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 85/121 xen-netback: only remove hotplug-status when the vif is actually destroyed
In reply to Greg Kroah-HartmanFrom: Paul Durrant <[email protected]>
[ Upstream commit c55f34b6aec2a8cb47eadaffea773e83bf85de91 ]
Removing 'hotplug-status' in backend_disconnected() means that it will be removed even in the case that the frontend unilaterally disconnects (which it is free to do at any time). The consequence of this is that, when the frontend attempts to re-connect, the backend gets stuck in 'InitWait' rather than moving straight to 'Connected' (which it can do because the hotplug script has already run).
Instead, the 'hotplug-status' mode should be removed in netback_remove() i.e. when the vif really is going away.
--- drivers/net/xen-netback/xenbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/xen-netback/xenbus.c +1 -1
@@ -256,7 +256,6 @@ static void backend_disconnect(struct backend_info *be)unsigned int queue_index;xen_unregister_watchers (vif); -xenbus_rm (XBT_NIL , be->dev->nodename,"hotplug-status" );#ifdef CONFIG_DEBUG_FS xenvif_debugfs_delif (vif);#endif /* CONFIG_DEBUG_FS */
@@ -984,6 +983,7 @@ static int netback_remove(struct xenbus_device *dev)struct backend_info *be =dev_get_drvdata (&dev->dev);unregister_hotplug_status_watch (be); +xenbus_rm (XBT_NIL , dev->nodename,"hotplug-status" );if (be->vif) {kobject_uevent (&dev->dev.kobj,KOBJ_OFFLINE );backend_disconnect (be);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 36/121 debugfs: add debugfs_lookup_and_remove()
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit dec9b2f1e0455a151a7293c367da22ab973f713e upstream.
There is a very common pattern of using debugfs_remove(debufs_lookup(..)) which results in a dentry leak of the dentry that was looked up. Instead of having to open-code the correct pattern of calling dput() on the dentry, create debugfs_lookup_and_remove() to handle this pattern automatically and properly without any memory leaks.
--- fs/debugfs/inode.c | 22 ++++++++++++++++++++++ include/linux/debugfs.h | 6 ++++++ 2 files changed, 28 insertions(+)
fs/debugfs/inode.c +22 -0
@@ -735,6 +735,28 @@ void debugfs_remove(struct dentry *dentrEXPORT_SYMBOL_GPL (debugfs_remove);/** +* debugfs_lookup_and_remove - lookup a directory or file and recursively remove it +* @name: a pointer to a string containing the name of the item to look up. +* @parent: a pointer to the parent dentry of the item. +* +* This is the equlivant of doing something like +* debugfs_remove(debugfs_lookup(..)) but with the proper reference counting +* handled for the directory being looked up. +*/ +void debugfs_lookup_and_remove (const char *name,struct dentry *parent) +{ +struct dentry *dentry; + + dentry =debugfs_lookup (name, parent); +if (!dentry) +return ; + +debugfs_remove (dentry); +dput (dentry); +} +EXPORT_SYMBOL_GPL (debugfs_lookup_and_remove); + +/** * debugfs_rename - rename a file/directory in the debugfs filesystem * @old_dir: a pointer to the parent dentry for the renamed object. This * should be a directory dentry.
include/linux/debugfs.h +6 -0
@@ -91,6 +91,8 @@ struct dentry *debugfs_create_automount(void debugfs_remove (struct dentry *dentry);#define debugfs_remove_recursive debugfs_remove +void debugfs_lookup_and_remove (const char *name,struct dentry *parent); +const struct file_operations *debugfs_real_fops (const struct file *filp);int debugfs_file_get (struct dentry *dentry);
@@ -225,6 +227,10 @@ static inline void debugfs_remove(structstatic inline void debugfs_remove_recursive (struct dentry *dentry) { } +static inline void debugfs_lookup_and_remove (const char *name, +struct dentry *parent) +{ } +const struct file_operations *debugfs_real_fops (const struct file *filp);static inline int debugfs_file_get (struct dentry *dentry)
Greg Kroah-Hartman
maintainerPATCH 59/121 RDMA/hns: Fix wrong fixed value of qp->rq.wqe_shift
In reply to Greg Kroah-HartmanFrom: Wenpeng Liang <[email protected]>
[ Upstream commit 0c8b5d6268d92d141bfd64d21c870d295a84dee1 ]
The value of qp->rq.wqe_shift of HIP08 is always determined by the number of sge. So delete the wrong branch.
--- drivers/infiniband/hw/hns/hns_roce_qp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/infiniband/hw/hns/hns_roce_qp.c +2 -5
@@ -495,11 +495,8 @@ static int set_rq_size(struct hns_roce_dev *hr_dev, struct ib_qp_cap *cap, hr_qp->rq.max_gs =roundup_pow_of_two (max (1U , cap->max_recv_sge) + hr_qp->rq.rsv_sge); -if (hr_dev->caps.max_rq_sg <=HNS_ROCE_SGE_IN_WQE ) - hr_qp->rq.wqe_shift =ilog2 (hr_dev->caps.max_rq_desc_sz); -else - hr_qp->rq.wqe_shift =ilog2 (hr_dev->caps.max_rq_desc_sz * - hr_qp->rq.max_gs); + hr_qp->rq.wqe_shift =ilog2 (hr_dev->caps.max_rq_desc_sz * + hr_qp->rq.max_gs); hr_qp->rq.wqe_cnt = cnt; if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RQ_INLINE &&
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 75/121 afs: Use the operation issue time instead of the reply time for callbacks
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 7903192c4b4a82d792cb0dc5e2779a2efe60d45b ]
rxrpc and kafs between them try to use the receive timestamp on the first data packet (ie. the one with sequence number 1) as a base from which to calculate the time at which callback promise and lock expiration occurs.
However, we don't know how long it took for the server to send us the reply from it having completed the basic part of the operation - it might then, for instance, have to send a bunch of a callback breaks, depending on the particular operation.
Fix this by using the time at which the operation is issued on the client as a base instead. That should never be longer than the server's idea of the expiry time.
--- fs/afs/flock.c | 2 +- fs/afs/fsclient.c | 2 +- fs/afs/internal.h | 3 +-- fs/afs/rxrpc.c | 7 +------ fs/afs/yfsclient.c | 3 +-- 5 files changed, 5 insertions(+), 12 deletions(-)
fs/afs/flock.c +1 -1
@@ -76,7 +76,7 @@ void afs_lock_op_done(struct afs_call *call)if (call->error ==0 ) {spin_lock (&vnode->lock);trace_afs_flock_ev (vnode,NULL , afs_flock_timestamp,0 ); - vnode->locked_at = call->reply_time; + vnode->locked_at = call->issue_time;afs_schedule_lock_extension (vnode);spin_unlock (&vnode->lock); }
fs/afs/fsclient.c +1 -1
@@ -131,7 +131,7 @@ static void xdr_decode_AFSFetchStatus(const __be32 **_bp,static time64_t xdr_decode_expiry (struct afs_call *call,u32 expiry) { -return ktime_divns (call->reply_time,NSEC_PER_SEC ) + expiry; +return ktime_divns (call->issue_time,NSEC_PER_SEC ) + expiry; } static void xdr_decode_AFSCallBack(const __be32 **_bp,
fs/afs/internal.h +1 -2
@@ -138,7 +138,6 @@ struct afs_call {bool need_attention;/* T if RxRPC poked us */ bool async;/* T if asynchronous */ bool upgrade;/* T to request service upgrade */ -bool have_reply_time;/* T if have got reply_time */ bool intr;/* T if interruptible */ bool unmarshalling_error;/* T if an unmarshalling error occurred */ u16 service_id;/* Actual service ID (after upgrade) */
@@ -152,7 +151,7 @@ struct afs_call { } __attribute__((packed));__be64 tmp64; }; -ktime_t reply_time;/* Time of first reply packet */ +ktime_t issue_time;/* Time of issue of operation */ };struct afs_call_type {
fs/afs/rxrpc.c +1 -6
@@ -347,6 +347,7 @@ void afs_make_call(struct afs_addr_cursor *ac, struct afs_call *call, gfp_t gfp)if (call->max_lifespan)rxrpc_kernel_set_max_life (call->net->socket, rxcall, call->max_lifespan); + call->issue_time =ktime_get_real ();/* send the request */ iov[0 ].iov_base = call->request;
@@ -497,12 +498,6 @@ static void afs_deliver_to_call(struct afs_call *call)return ; } -if (!call->have_reply_time && -rxrpc_kernel_get_reply_time (call->net->socket, - call->rxcall, - &call->reply_time)) - call->have_reply_time = true; - ret = call->type->deliver (call); state =READ_ONCE (call->state);if (ret ==0 && call->unmarshalling_error)
fs/afs/yfsclient.c +1 -2
@@ -239,8 +239,7 @@ static void xdr_decode_YFSCallBack(const __be32 **_bp,struct afs_callback *cb = &scb->callback;ktime_t cb_expiry; - cb_expiry = call->reply_time; - cb_expiry =ktime_add (cb_expiry,xdr_to_u64 (x->expiration_time) *100 ); + cb_expiry =ktime_add (call->issue_time,xdr_to_u64 (x->expiration_time) *100 ); cb->expires_at =ktime_divns (cb_expiry,NSEC_PER_SEC ); scb->have_cb = true; *_bp +=xdr_size (x);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 40/121 drm/i915: Implement WaEdpLinkRateDataReload
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
commit 672d6ca758651f0ec12cd0d59787067a5bde1c96 upstream.
A lot of modern laptops use the Parade PS8461E MUX for eDP switching. The MUX can operate in jitter cleaning mode or redriver mode, the first one resulting in higher link quality. The jitter cleaning mode needs to know the link rate used and the MUX achieves this by snooping the LINK_BW_SET, LINK_RATE_SELECT and SUPPORTED_LINK_RATES DPCD accesses.
When the MUX is powered down (seems this can happen whenever the display is turned off) it loses track of the snooped link rates so when we do the LINK_RATE_SELECT write it no longer knowns which link rate we're selecting, and thus it falls back to the lower quality redriver mode. This results in unstable high link rates (eg. usually 8.1Gbps link rate no longer works correctly).
In order to avoid all that let's re-snoop SUPPORTED_LINK_RATES from the sink at the start of every link training.
Unfortunately we don't have a way to detect the presence of the MUX. It looks like the set of laptops equipped with this MUX is fairly large and contains devices from multiple manufacturers. It may also still be growing with new models. So a quirk doesn't seem like a very easily maintainable option, thus we shall attempt to do this unconditionally on all machines that use LINK_RATE_SELECT. Hopefully this extra DPCD read doesn't cause issues for any unaffected machine. If that turns out to be the case we'll need to convert this into a quirk in the future.
--- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 22 ++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/gpu/drm/i915/display/intel_dp_link_training.c +22 -0
@@ -475,6 +475,28 @@ intel_dp_prepare_link_train(struct intelintel_dp_compute_rate (intel_dp, crtc_state->port_clock, &link_bw, &rate_select); +/* +* WaEdpLinkRateDataReload +* +* Parade PS8461E MUX (used on varius TGL+ laptops) needs +* to snoop the link rates reported by the sink when we +* use LINK_RATE_SET in order to operate in jitter cleaning +* mode (as opposed to redriver mode). Unfortunately it +* loses track of the snooped link rates when powered down, +* so we need to make it re-snoop often. Without this high +* link rates are not stable. +*/ +if (!link_bw) { +struct intel_connector *connector = intel_dp->attached_connector; +__le16 sink_rates[DP_MAX_SUPPORTED_RATES ]; + +drm_dbg_kms (&i915->drm,"[CONNECTOR:%d:%s] Reloading eDP link rates\n" , + connector->base.base.id, connector->base.name); + +drm_dp_dpcd_read (&intel_dp->aux,DP_SUPPORTED_LINK_RATES , + sink_rates,sizeof (sink_rates)); + } +if (link_bw)drm_dbg_kms (&i915->drm,"Using LINK_BW_SET value %02x\n" , link_bw);
Greg Kroah-Hartman
maintainerPATCH 68/121 netfilter: nf_tables: clean up hook list when offload flags check fails
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 77972a36ecc4db7fc7c68f0e80714263c5f03f65 ]
splice back the hook list so nft_chain_release_hook() has a chance to release the hooks.
BUG: memory leak
unreferenced object 0xffff88810180b100 (size 96):
comm "syz-executor133", pid 3619, jiffies 4294945714 (age 12.690s)
hex dump (first 32 bytes):
28 64 23 02 81 88 ff ff 28 64 23 02 81 88 ff ff (d#.....(d#.....
90 a8 aa 83 ff ff ff ff 00 00 b5 0f 81 88 ff ff ................
backtrace:
[<ffffffff83a8c59b>] kmalloc include/linux/slab.h:600 [inline]
[<ffffffff83a8c59b>] nft_netdev_hook_alloc+0x3b/0xc0 net/netfilter/nf_tables_api.c:1901
[<ffffffff83a9239a>] nft_chain_parse_netdev net/netfilter/nf_tables_api.c:1998 [inline]
[<ffffffff83a9239a>] nft_chain_parse_hook+0x33a/0x530 net/netfilter/nf_tables_api.c:2073
[<ffffffff83a9b14b>] nf_tables_addchain.constprop.0+0x10b/0x950 net/netfilter/nf_tables_api.c:2218
[<ffffffff83a9c41b>] nf_tables_newchain+0xa8b/0xc60 net/netfilter/nf_tables_api.c:2593
[<ffffffff83a3d6a6>] nfnetlink_rcv_batch+0xa46/0xd20 net/netfilter/nfnetlink.c:517
[<ffffffff83a3db79>] nfnetlink_rcv_skb_batch net/netfilter/nfnetlink.c:638 [inline]
[<ffffffff83a3db79>] nfnetlink_rcv+0x1f9/0x220 net/netfilter/nfnetlink.c:656
[<ffffffff83a13b17>] netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline]
[<ffffffff83a13b17>] netlink_unicast+0x397/0x4c0 net/netlink/af_netlink.c:1345
[<ffffffff83a13fd6>] netlink_sendmsg+0x396/0x710 net/netlink/af_netlink.c:1921
[<ffffffff83865ab6>] sock_sendmsg_nosec net/socket.c:714 [inline]
[<ffffffff83865ab6>] sock_sendmsg+0x56/0x80 net/socket.c:734
[<ffffffff8386601c>] ____sys_sendmsg+0x36c/0x390 net/socket.c:2482
[<ffffffff8386a918>] ___sys_sendmsg+0xa8/0x110 net/socket.c:2536
[<ffffffff8386aaa8>] __sys_sendmsg+0x88/0x100 net/socket.c:2565
[<ffffffff845e5955>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<ffffffff845e5955>] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80
[<ffffffff84800087>] entry_SYSCALL_64_after_hwframe+0x63/0xcd--- net/netfilter/nf_tables_api.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +3 -1
@@ -2072,8 +2072,10 @@ static int nft_basechain_init(struct nft_base_chain *basechain, u8 family, chain->flags |=NFT_CHAIN_BASE | flags; basechain->policy =NF_ACCEPT ;if (chain->flags &NFT_CHAIN_HW_OFFLOAD && - !nft_chain_offload_support (basechain)) + !nft_chain_offload_support (basechain)) { +list_splice_init (&basechain->hook_list, &hook->list);return -EOPNOTSUPP ; + }flow_block_init (&basechain->flow_block);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 67/121 netfilter: br_netfilter: Drop dst references before setting.
In reply to Greg Kroah-HartmanFrom: Harsh Modi <[email protected]>
[ Upstream commit d047283a7034140ea5da759a494fd2274affdd46 ]
The IPv6 path already drops dst in the daddr changed case, but the IPv4 path does not. This change makes the two code paths consistent.
Further, it is possible that there is already a metadata_dst allocated from ingress that might already be attached to skbuff->dst while following the bridge path. If it is not released before setting a new metadata_dst, it will be leaked. This is similar to what is done in bpf_set_tunnel_key() or ip6_route_input().
It is important to note that the memory being leaked is not the dst being set in the bridge code, but rather memory allocated from some other code path that is not being freed correctly before the skb dst is overwritten.
An example of the leakage fixed by this commit found using kmemleak:
unreferenced object 0xffff888010112b00 (size 256):
comm "softirq", pid 0, jiffies 4294762496 (age 32.012s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 80 16 f1 83 ff ff ff ff ................
e1 4e f6 82 ff ff ff ff 00 00 00 00 00 00 00 00 .N..............
backtrace:
[<00000000d79567ea>] metadata_dst_alloc+0x1b/0xe0
[<00000000be113e13>] udp_tun_rx_dst+0x174/0x1f0
[<00000000a36848f4>] geneve_udp_encap_recv+0x350/0x7b0
[<00000000d4afb476>] udp_queue_rcv_one_skb+0x380/0x560
[<00000000ac064aea>] udp_unicast_rcv_skb+0x75/0x90
[<000000009a8ee8c5>] ip_protocol_deliver_rcu+0xd8/0x230
[<00000000ef4980bb>] ip_local_deliver_finish+0x7a/0xa0
[<00000000d7533c8c>] __netif_receive_skb_one_core+0x89/0xa0
[<00000000a879497d>] process_backlog+0x93/0x190
[<00000000e41ade9f>] __napi_poll+0x28/0x170
[<00000000b4c0906b>] net_rx_action+0x14f/0x2a0
[<00000000b20dd5d4>] __do_softirq+0xf4/0x305
[<000000003a7d7e15>] __irq_exit_rcu+0xc3/0x140
[<00000000968d39a2>] sysvec_apic_timer_interrupt+0x9e/0xc0
[<000000009e920794>] asm_sysvec_apic_timer_interrupt+0x16/0x20
[<000000008942add0>] native_safe_halt+0x13/0x20Florian Westphal says: "Original code was likely fine because nothing ever did set a skb->dst entry earlier than bridge in those days."
--- net/bridge/br_netfilter_hooks.c | 2 ++ net/bridge/br_netfilter_ipv6.c | 1 + 2 files changed, 3 insertions(+)
net/bridge/br_netfilter_hooks.c +2 -0
@@ -384,6 +384,7 @@ static int br_nf_pre_routing_finish(struct net *net, struct sock *sk, struct sk_/* - Bridged-and-DNAT'ed traffic doesn't * require ip_forwarding. */ if (rt->dst.dev == dev) { +skb_dst_drop (skb);skb_dst_set (skb, &rt->dst); goto bridged_dnat; }
@@ -413,6 +414,7 @@ static int br_nf_pre_routing_finish(struct net *net, struct sock *sk, struct sk_kfree_skb (skb);return 0 ; } +skb_dst_drop (skb);skb_dst_set_noref (skb, &rt->dst); }
net/bridge/br_netfilter_ipv6.c +1 -0
@@ -197,6 +197,7 @@ static int br_nf_pre_routing_finish_ipv6(struct net *net, struct sock *sk, struckfree_skb (skb);return 0 ; } +skb_dst_drop (skb);skb_dst_set_noref (skb, &rt->dst); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 78/121 tipc: fix shift wrapping bug in map_get()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e2b224abd9bf45dcb55750479fc35970725a430b ]
There is a shift wrapping bug in this code so anything thing above 31 will return false.
--- net/tipc/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/monitor.c +1 -1
@@ -160,7 +160,7 @@ static void map_set(u64 *up_map, int i, unsigned int v)static int map_get (u64 up_map,int i) { -return (up_map & (1 << i)) >> i; +return (up_map & (1ULL << i)) >> i; }static struct tipc_peer *peer_prev (struct tipc_peer *peer)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 41/121 scsi: mpt3sas: Fix use-after-free warning
In reply to Greg Kroah-HartmanFrom: Sreekanth Reddy <[email protected]>
commit 991df3dd5144f2e6b1c38b8d20ed3d4d21e20b34 upstream.
Fix the following use-after-free warning which is observed during controller reset:
refcount_t: underflow; use-after-free.
WARNING: CPU: 23 PID: 5399 at lib/refcount.c:28 refcount_warn_saturate+0xa6/0xf0
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
@@ -3670,6 +3670,7 @@ static struct fw_event_work *dequeue_nex fw_event =list_first_entry (&ioc->fw_event_list, struct fw_event_work, list);list_del_init (&fw_event->list); +fw_event_work_put (fw_event); }spin_unlock_irqrestore (&ioc->fw_event_lock, flags);
@@ -3751,7 +3752,6 @@ _scsih_fw_event_cleanup_queue(struct MPTif (cancel_work_sync (&fw_event->work))fw_event_work_put (fw_event); -fw_event_work_put (fw_event); } ioc->fw_events_cleanup =0 ; }
Greg Kroah-Hartman
maintainerPATCH 69/121 netfilter: nf_conntrack_irc: Fix forged IP logic
In reply to Greg Kroah-HartmanFrom: David Leadbeater <[email protected]>
[ Upstream commit 0efe125cfb99e6773a7434f3463f7c2fa28f3a43 ]
Ensure the match happens in the right direction, previously the destination used was the server, not the NAT host, as the comment shows the code intended.
Additionally nf_nat_irc uses port 0 as a signal and there's no valid way it can appear in a DCC message, so consider port 0 also forged.
--- net/netfilter/nf_conntrack_irc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netfilter/nf_conntrack_irc.c +3 -2
@@ -188,8 +188,9 @@ static int help(struct sk_buff *skb, unsigned int protoff,/* dcc_ip can be the internal OR external (NAT'ed) IP */ tuple = &ct->tuplehash[dir].tuple; -if (tuple->src.u3.ip != dcc_ip && - tuple->dst.u3.ip != dcc_ip) { +if ((tuple->src.u3.ip != dcc_ip && + ct->tuplehash[!dir].tuple.dst.u3.ip != dcc_ip) || + dcc_port ==0 ) {net_warn_ratelimited ("Forged DCC command from %pI4: %pI4:%u\n" , &tuple->src.u3.ip, &dcc_ip, dcc_port);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 79/121 net: introduce __skb_fill_page_desc_noacc
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
[ Upstream commit 84ce071e38a6e25ea3ea91188e5482ac1f17b3af ]
Managed pages contain pinned userspace pages and controlled by upper layers, there is no need in tracking skb->pfmemalloc for them. Introduce a helper for filling frags but ignoring page tracking, it'll be needed later.
--- include/linux/skbuff.h | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
include/linux/skbuff.h +17 -11
@@ -2232,6 +2232,22 @@ static inline unsigned int skb_pagelen(const struct sk_buff *skb)return skb_headlen (skb) +__skb_pagelen (skb); } +static inline void __skb_fill_page_desc_noacc (struct skb_shared_info *shinfo, +int i,struct page *page, +int off,int size) +{ +skb_frag_t *frag = &shinfo->frags[i]; + +/* +* Propagate page pfmemalloc to the skb if we can. The problem is +* that not all callers have unique ownership of the page but rely +* on page_is_pfmemalloc doing the right thing(tm). +*/ + frag->bv_page = page; + frag->bv_offset = off; +skb_frag_size_set (frag, size); +} +/** * __skb_fill_page_desc - initialise a paged fragment in an skb * @skb: buffer containing fragment to be initialised
@@ -2248,17 +2264,7 @@ static inline unsigned int skb_pagelen(const struct sk_buff *skb)static inline void __skb_fill_page_desc (struct sk_buff *skb,int i,struct page *page,int off,int size) { -skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; - -/* -* Propagate page pfmemalloc to the skb if we can. The problem is -* that not all callers have unique ownership of the page but rely -* on page_is_pfmemalloc doing the right thing(tm). -*/ - frag->bv_page = page; - frag->bv_offset = off; -skb_frag_size_set (frag, size); - +__skb_fill_page_desc_noacc (skb_shinfo (skb), i, page, off, size); page =compound_head (page);if (page_is_pfmemalloc (page)) skb->pfmemalloc = true;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 81/121 ice: use bitmap_free instead of devm_kfree
In reply to Greg Kroah-HartmanFrom: Michal Swiatkowski <[email protected]>
[ Upstream commit 59ac325557b6c14f1f793b90d3946bc145ffa085 ]
pf->avail_txqs was allocated using bitmap_zalloc, bitmap_free should be used to free this memory.
--- drivers/net/ethernet/intel/ice/ice_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
@@ -3549,7 +3549,7 @@ static int ice_init_pf(struct ice_pf *pf) pf->avail_rxqs =bitmap_zalloc (pf->max_pf_rxqs,GFP_KERNEL );if (!pf->avail_rxqs) { -devm_kfree (ice_pf_to_dev (pf), pf->avail_txqs); +bitmap_free (pf->avail_txqs); pf->avail_txqs =NULL ;return -ENOMEM ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 82/121 i40e: Fix kernel crash during module removal
In reply to Greg Kroah-HartmanFrom: Ivan Vecera <[email protected]>
[ Upstream commit fb8396aeda5872369a8ed6d2301e2c86e303c520 ]
The driver incorrectly frees client instance and subsequent i40e module removal leads to kernel crash.
Reproducer:
1. Do ethtool offline test followed immediately by another one host# ethtool -t eth0 offline; ethtool -t eth0 offline
2. Remove recursively irdma module that also removes i40e module host# modprobe -r irdma
Result:
[ 8675.035651] i40e 0000:3d:00.0 eno1: offline testing starting [ 8675.193774] i40e 0000:3d:00.0 eno1: testing finished [ 8675.201316] i40e 0000:3d:00.0 eno1: offline testing starting [ 8675.358921] i40e 0000:3d:00.0 eno1: testing finished [ 8675.496921] i40e 0000:3d:00.0: IRDMA hardware initialization FAILED init_state=2 status=-110 [ 8686.188955] i40e 0000:3d:00.1: i40e_ptp_stop: removed PHC on eno2 [ 8686.943890] i40e 0000:3d:00.1: Deleted LAN device PF1 bus=0x3d dev=0x00 func=0x01 [ 8686.952669] i40e 0000:3d:00.0: i40e_ptp_stop: removed PHC on eno1 [ 8687.761787] BUG: kernel NULL pointer dereference, address: 0000000000000030 [ 8687.768755] #PF: supervisor read access in kernel mode [ 8687.773895] #PF: error_code(0x0000) - not-present page [ 8687.779034] PGD 0 P4D 0 [ 8687.781575] Oops: 0000 [#1] PREEMPT SMP NOPTI [ 8687.785935] CPU: 51 PID: 172891 Comm: rmmod Kdump: loaded Tainted: G W I 5.19.0+ #2 [ 8687.794800] Hardware name: Intel Corporation S2600WFD/S2600WFD, BIOS SE5C620.86B.0X.02.0001.051420190324 05/14/2019 [ 8687.805222] RIP: 0010:i40e_lan_del_device+0x13/0xb0 [i40e] [ 8687.810719] Code: d4 84 c0 0f 84 b8 25 01 00 e9 9c 25 01 00 41 bc f4 ff ff ff eb 91 90 0f 1f 44 00 00 41 54 55 53 48 8b 87 58 08 00 00 48 89 fb <48> 8b 68 30 48 89 ef e8 21 8a 0f d5 48 89 ef e8 a9 78 0f d5 48 8b [ 8687.829462] RSP: 0018:ffffa604072efce0 EFLAGS: 00010202 [ 8687.834689] RAX: 0000000000000000 RBX: ffff8f43833b2000 RCX: 0000000000000000 [ 8687.841821] RDX: 0000000000000000 RSI: ffff8f4b0545b298 RDI: ffff8f43833b2000 [ 8687.848955] RBP: ffff8f43833b2000 R08: 0000000000000001 R09: 0000000000000000 [ 8687.856086] R10: 0000000000000000 R11: 000ffffffffff000 R12: ffff8f43833b2ef0 [ 8687.863218] R13: ffff8f43833b2ef0 R14: ffff915103966000 R15: ffff8f43833b2008 [ 8687.870342] FS: 00007f79501c3740(0000) GS:ffff8f4adffc0000(0000) knlGS:0000000000000000 [ 8687.878427] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 8687.884174] CR2: 0000000000000030 CR3: 000000014276e004 CR4: 00000000007706e0 [ 8687.891306] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 8687.898441] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 8687.905572] PKRU: 55555554 [ 8687.908286] Call Trace: [ 8687.910737] <TASK> [ 8687.912843] i40e_remove+0x2c0/0x330 [i40e] [ 8687.917040] pci_device_remove+0x33/0xa0 [ 8687.920962] device_release_driver_internal+0x1aa/0x230 [ 8687.926188] driver_detach+0x44/0x90 [ 8687.929770] bus_remove_driver+0x55/0xe0 [ 8687.933693] pci_unregister_driver+0x2a/0xb0 [ 8687.937967] i40e_exit_module+0xc/0xf48 [i40e]
Two offline tests cause IRDMA driver failure (ETIMEDOUT) and this failure is indicated back to i40e_client_subtask() that calls i40e_client_del_instance() to free client instance referenced by pf->cinst and sets this pointer to NULL. During the module removal i40e_remove() calls i40e_lan_del_device() that dereferences pf->cinst that is NULL -> crash.
Do not remove client instance when client open callbacks fails and just clear __I40E_CLIENT_INSTANCE_OPENED bit. The driver also needs to take care about this situation (when netdev is up and client is NOT opened) in i40e_notify_client_of_netdev_close() and calls client close callback only when __I40E_CLIENT_INSTANCE_OPENED is set.
--- drivers/net/ethernet/intel/i40e/i40e_client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_client.c +4 -1
@@ -177,6 +177,10 @@ void i40e_notify_client_of_netdev_close(struct i40e_vsi *vsi, bool reset) "Cannot locate client instance close routine\n");return ; } +if (!test_bit (__I40E_CLIENT_INSTANCE_OPENED, &cdev->state)) { +dev_dbg (&pf->pdev->dev,"Client is not open, abort close\n" ); +return ; + } cdev->client->ops->close (&cdev->lan_info, cdev->client, reset);clear_bit (__I40E_CLIENT_INSTANCE_OPENED, &cdev->state);i40e_client_release_qvlist (&cdev->lan_info);
@@ -429,7 +433,6 @@ void i40e_client_subtask(struct i40e_pf *pf)/* Remove failed client instance */ clear_bit (__I40E_CLIENT_INSTANCE_OPENED, &cdev->state); -i40e_client_del_instance (pf);return ; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 89/121 RDMA/mlx5: Set local port to one when accessing counters
In reply to Greg Kroah-HartmanFrom: Chris Mi <[email protected]>
[ Upstream commit 74b30b3ad5cec95d2647e796d10137438a098bc1 ]
When accessing Ports Performance Counters Register (PPCNT), local port must be one if it is Function-Per-Port HCA that HCA_CAP.num_ports is 1.
The offending patch can change the local port to other values when accessing PPCNT after enabling switchdev mode. The following syndrome will be printed:
# cat /sys/class/infiniband/rdmap4s0f0/ports/2/counters/* # dmesg mlx5_core 0000:04:00.0: mlx5_cmd_check:756:(pid 12450): ACCESS_REG(0x805) op_mod(0x1) failed, status bad parameter(0x3), syndrome (0x1e5585)
Fix it by setting local port to one for Function-Per-Port HCA.
--- drivers/infiniband/hw/mlx5/mad.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/infiniband/hw/mlx5/mad.c +6 -0
@@ -166,6 +166,12 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num, mdev = dev->mdev; mdev_port_num =1 ; } +if (MLX5_CAP_GEN (dev->mdev, num_ports) ==1 ) { +/* set local port to one for Function-Per-Port HCA. */ + mdev = dev->mdev; + mdev_port_num =1 ; + } +/* Declaring support of extended counters */ if (in_mad->mad_hdr.attr_id ==IB_PMA_CLASS_PORT_INFO ) {struct ib_class_port_info cpi = {};
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/121 ALSA: usb-audio: Register card again for iface over delayed_register option
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 2027f114686e0f3f1f39971964dfc618637c88c2 ]
When the delayed registration is specified via either delayed_register option or the quirk, we delay the invocation of snd_card_register() until the given interface. But if a wrong value has been set there and there are more interfaces over the given interface number, snd_card_register() call would be missing for those interfaces.
This patch catches up those missing calls by fixing the comparison of the interface number. Now the call is skipped only if the processed interface is less than the given interface, instead of the exact match.
--- sound/usb/card.c | 2 +- sound/usb/quirks.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
sound/usb/card.c +1 -1
@@ -698,7 +698,7 @@ static bool check_delayed_register_option(struct snd_usb_audio *chip, int iface)if (delayed_register[i] &&sscanf (delayed_register[i],"%x:%x" , &id, &inum) ==2 && id == chip->usb_id) -return inum != iface; +return iface < inum; }return false;
sound/usb/quirks.c +1 -1
@@ -1764,7 +1764,7 @@ bool snd_usb_registration_quirk(struct snd_usb_audio *chip, int iface)for (q = registration_quirks; q->usb_id; q++)if (chip->usb_id == q->usb_id) -return iface != q->interface; +return iface < q->interface;/* Register as normal */ return false;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 88/121 IB/core: Fix a nested dead lock as part of ODP flow
In reply to Greg Kroah-HartmanFrom: Yishai Hadas <[email protected]>
[ Upstream commit 85eaeb5058f0f04dffb124c97c86b4f18db0b833 ]
Fix a nested dead lock as part of ODP flow by using mmput_async().
Quoted 1 line
From the below call trace [1] can see that calling
mmput()once we have
the umem_odp->umem_mutex locked as required by ib_umem_odp_map_dma_and_lock() might trigger in the same task the exit_mmap()->__mmu_notifier_release()->mlx5_ib_invalidate_range() which may dead lock when trying to lock the same mutex.
Moving to use mmput_async() will solve the problem as the above exit_mmap() flow will be called in other task and will be executed once the lock will be available.
[1]
[64843.077665] task:kworker/u133:2 state:D stack: 0 pid:80906 ppid: 2 flags:0x00004000 [64843.077672] Workqueue: mlx5_ib_page_fault mlx5_ib_eqe_pf_action [mlx5_ib] [64843.077719] Call Trace: [64843.077722] <TASK> [64843.077724] __schedule+0x23d/0x590 [64843.077729] schedule+0x4e/0xb0 [64843.077735] schedule_preempt_disabled+0xe/0x10 [64843.077740] __mutex_lock.constprop.0+0x263/0x490 [64843.077747] __mutex_lock_slowpath+0x13/0x20 [64843.077752] mutex_lock+0x34/0x40 [64843.077758] mlx5_ib_invalidate_range+0x48/0x270 [mlx5_ib] [64843.077808] __mmu_notifier_release+0x1a4/0x200 [64843.077816] exit_mmap+0x1bc/0x200 [64843.077822] ? walk_page_range+0x9c/0x120 [64843.077828] ? __cond_resched+0x1a/0x50 [64843.077833] ? mutex_lock+0x13/0x40 [64843.077839] ? uprobe_clear_state+0xac/0x120 [64843.077860] mmput+0x5f/0x140 [64843.077867] ib_umem_odp_map_dma_and_lock+0x21b/0x580 [ib_core] [64843.077931] pagefault_real_mr+0x9a/0x140 [mlx5_ib] [64843.077962] pagefault_mr+0xb4/0x550 [mlx5_ib] [64843.077992] pagefault_single_data_segment.constprop.0+0x2ac/0x560 [mlx5_ib] [64843.078022] mlx5_ib_eqe_pf_action+0x528/0x780 [mlx5_ib] [64843.078051] process_one_work+0x22b/0x3d0 [64843.078059] worker_thread+0x53/0x410 [64843.078065] ? process_one_work+0x3d0/0x3d0 [64843.078073] kthread+0x12a/0x150 [64843.078079] ? set_kthread_struct+0x50/0x50 [64843.078085] ret_from_fork+0x22/0x30 [64843.078093] </TASK>
--- drivers/infiniband/core/umem_odp.c | 2 +- kernel/fork.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/core/umem_odp.c +1 -1
@@ -463,7 +463,7 @@ int ib_umem_odp_map_dma_and_lock(struct ib_umem_odp *umem_odp, u64 user_virt,mutex_unlock (&umem_odp->umem_mutex); out_put_mm: -mmput (owning_mm); +mmput_async (owning_mm); out_put_task:if (owning_process)put_task_struct (owning_process);
kernel/fork.c +1 -0
@@ -1153,6 +1153,7 @@ void mmput_async(struct mm_struct *mm) schedule_work(&mm->async_put_work); } } +EXPORT_SYMBOL_GPL (mmput_async);#endif /**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 107/121 swiotlb: avoid potential left shift overflow
In reply to Greg Kroah-HartmanFrom: Chao Gao <[email protected]>
[ Upstream commit 3f0461613ebcdc8c4073e235053d06d5aa58750f ]
The second operand passed to slot_addr() is declared as int or unsigned int in all call sites. The left-shift to get the offset of a slot can overflow if swiotlb size is larger than 4G.
Convert the macro to an inline function and declare the second argument as phys_addr_t to avoid the potential overflow.
--- kernel/dma/swiotlb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/dma/swiotlb.c +4 -1
@@ -435,7 +435,10 @@ static void swiotlb_bounce(struct device *dev, phys_addr_t tlb_addr, size_t size } } -#define slot_addr (start, idx) ((start) + ((idx) << IO_TLB_SHIFT)) +static inline phys_addr_t slot_addr (phys_addr_t start,phys_addr_t idx) +{ +return start + (idx <<IO_TLB_SHIFT ); +}/* * Carefully handle integer overflow which can occur when boundary_mask == ~0UL.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 66/121 ARM: dts: at91: sama5d2_icp: dont keep vdd_other enabled all the time
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 3d074b750d2b4c91962f10ea1df1c289ce0d3ce8 ]
VDD_OTHER is not connected to any on board consumer thus it is not needed to keep it enabled all the time.
--- arch/arm/boot/dts/at91-sama5d2_icp.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/at91-sama5d2_icp.dts +0 -1
@@ -258,7 +258,6 @@ regulator-max-microvolt = <1850000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; - regulator-always-on; regulator-state-standby { regulator-on-in-suspend;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 84/121 net: fec: Use a spinlock to guard `fep->ptp_clk_on`
In reply to Greg Kroah-HartmanFrom: Csókás Bence <[email protected]>
[ Upstream commit b353b241f1eb9b6265358ffbe2632fdcb563354f ]
Mutexes cannot be taken in a non-preemptible context, causing a panic in fec_ptp_save_state(). Replacing ptp_clk_mutex by tmreg_lock fixes this.
--- drivers/net/ethernet/freescale/fec.h | 1 - drivers/net/ethernet/freescale/fec_main.c | 17 +++++++------- drivers/net/ethernet/freescale/fec_ptp.c | 28 ++++++++--------------- 3 files changed, 19 insertions(+), 27 deletions(-)
drivers/net/ethernet/freescale/fec.h +0 -1
@@ -557,7 +557,6 @@ struct fec_enet_private {struct clk *clk_2x_txclk;bool ptp_clk_on; -struct mutex ptp_clk_mutex;unsigned int num_tx_queues;unsigned int num_rx_queues;
drivers/net/ethernet/freescale/fec_main.c +9 -8
@@ -1984,6 +1984,7 @@ static void fec_enet_phy_reset_after_clk_enable(struct net_device *ndev)static int fec_enet_clk_enable (struct net_device *ndev,bool enable) {struct fec_enet_private *fep =netdev_priv (ndev); +unsigned long flags;int ret;if (enable) {
@@ -1992,15 +1993,15 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)return ret;if (fep->clk_ptp) { -mutex_lock (&fep->ptp_clk_mutex); +spin_lock_irqsave (&fep->tmreg_lock, flags); ret =clk_prepare_enable (fep->clk_ptp);if (ret) { -mutex_unlock (&fep->ptp_clk_mutex); +spin_unlock_irqrestore (&fep->tmreg_lock, flags); goto failed_clk_ptp; }else { fep->ptp_clk_on = true; } -mutex_unlock (&fep->ptp_clk_mutex); +spin_unlock_irqrestore (&fep->tmreg_lock, flags); } ret =clk_prepare_enable (fep->clk_ref);
@@ -2015,10 +2016,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) }else {clk_disable_unprepare (fep->clk_enet_out);if (fep->clk_ptp) { -mutex_lock (&fep->ptp_clk_mutex); +spin_lock_irqsave (&fep->tmreg_lock, flags);clk_disable_unprepare (fep->clk_ptp); fep->ptp_clk_on = false; -mutex_unlock (&fep->ptp_clk_mutex); +spin_unlock_irqrestore (&fep->tmreg_lock, flags); }clk_disable_unprepare (fep->clk_ref);clk_disable_unprepare (fep->clk_2x_txclk);
@@ -2031,10 +2032,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)clk_disable_unprepare (fep->clk_ref); failed_clk_ref:if (fep->clk_ptp) { -mutex_lock (&fep->ptp_clk_mutex); +spin_lock_irqsave (&fep->tmreg_lock, flags);clk_disable_unprepare (fep->clk_ptp); fep->ptp_clk_on = false; -mutex_unlock (&fep->ptp_clk_mutex); +spin_unlock_irqrestore (&fep->tmreg_lock, flags); } failed_clk_ptp:clk_disable_unprepare (fep->clk_enet_out);
@@ -3866,7 +3867,7 @@ fec_probe(struct platform_device *pdev) fep->clk_enet_out =NULL ; fep->ptp_clk_on = false; -mutex_init (&fep->ptp_clk_mutex); +spin_lock_init (&fep->tmreg_lock);/* clk_ref is optional, depends on board */ fep->clk_ref =devm_clk_get (&pdev->dev,"enet_clk_ref" );
drivers/net/ethernet/freescale/fec_ptp.c +10 -18
@@ -366,21 +366,19 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)*/ static int fec_ptp_gettime (struct ptp_clock_info *ptp,struct timespec64 *ts) { -struct fec_enet_private *adapter = +struct fec_enet_private *fep = container_of(ptp, struct fec_enet_private, ptp_caps);u64 ns;unsigned long flags; -mutex_lock (&adapter->ptp_clk_mutex); +spin_lock_irqsave (&fep->tmreg_lock, flags);/* Check the ptp clock */ -if (!adapter->ptp_clk_on) { -mutex_unlock (&adapter->ptp_clk_mutex); +if (!fep->ptp_clk_on) { +spin_unlock_irqrestore (&fep->tmreg_lock, flags);return -EINVAL ; } -spin_lock_irqsave (&adapter->tmreg_lock, flags); - ns =timecounter_read (&adapter->tc); -spin_unlock_irqrestore (&adapter->tmreg_lock, flags); -mutex_unlock (&adapter->ptp_clk_mutex); + ns =timecounter_read (&fep->tc); +spin_unlock_irqrestore (&fep->tmreg_lock, flags); *ts =ns_to_timespec64 (ns);
@@ -405,10 +403,10 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp,unsigned long flags;u32 counter; -mutex_lock (&fep->ptp_clk_mutex); +spin_lock_irqsave (&fep->tmreg_lock, flags);/* Check the ptp clock */ if (!fep->ptp_clk_on) { -mutex_unlock (&fep->ptp_clk_mutex); +spin_unlock_irqrestore (&fep->tmreg_lock, flags);return -EINVAL ; }
@@ -418,11 +416,9 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp,*/ counter = ns & fep->cc.mask; -spin_lock_irqsave (&fep->tmreg_lock, flags);writel (counter, fep->hwp +FEC_ATIME );timecounter_init (&fep->tc, &fep->cc, ns);spin_unlock_irqrestore (&fep->tmreg_lock, flags); -mutex_unlock (&fep->ptp_clk_mutex);return 0 ; }
@@ -523,13 +519,11 @@ static void fec_time_keep(struct work_struct *work) struct fec_enet_private *fep = container_of(dwork, struct fec_enet_private, time_keep);unsigned long flags; -mutex_lock (&fep->ptp_clk_mutex); +spin_lock_irqsave (&fep->tmreg_lock, flags);if (fep->ptp_clk_on) { -spin_lock_irqsave (&fep->tmreg_lock, flags);timecounter_read (&fep->tc); -spin_unlock_irqrestore (&fep->tmreg_lock, flags); } -mutex_unlock (&fep->ptp_clk_mutex); +spin_unlock_irqrestore (&fep->tmreg_lock, flags);schedule_delayed_work (&fep->time_keep,HZ ); }
@@ -604,8 +598,6 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx) } fep->ptp_inc =NSEC_PER_SEC / fep->cycle_speed; -spin_lock_init (&fep->tmreg_lock); -fec_ptp_start_cyclecounter (ndev);INIT_DELAYED_WORK (&fep->time_keep, fec_time_keep);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 80/121 tcp: TX zerocopy should not sense pfmemalloc status
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 3261400639463a853ba2b3be8bd009c2a8089775 ]
We got a recent syzbot report [1] showing a possible misuse of pfmemalloc page status in TCP zerocopy paths.
Indeed, for pages coming from user space or other layers, using page_is_pfmemalloc() is moot, and possibly could give false positives.
There has been attempts to make page_is_pfmemalloc() more robust, but not using it in the first place in this context is probably better, removing cpu cycles.
Note to stable teams :
You need to backport 84ce071e38a6 ("net: introduce __skb_fill_page_desc_noacc") as a prereq.
Race is more probable after commit c07aea3ef4d4
("mm: add a signature in struct page") because page_is_pfmemalloc() is now using low order bit from page->lru.next, which can change more often than page->index.
Low order bit should never be set for lru.next (when used as an anchor in LRU list), so KCSAN report is mostly a false positive.
Backporting to older kernel versions seems not necessary.
[1]
BUG: KCSAN: data-race in lru_add_fn / tcp_build_frag
write to 0xffffea0004a1d2c8 of 8 bytes by task 18600 on cpu 0:
__list_add include/linux/list.h:73 [inline] list_add include/linux/list.h:88 [inline] lruvec_add_folio include/linux/mm_inline.h:105 [inline] lru_add_fn+0x440/0x520 mm/swap.c:228 folio_batch_move_lru+0x1e1/0x2a0 mm/swap.c:246 folio_batch_add_and_move mm/swap.c:263 [inline] folio_add_lru+0xf1/0x140 mm/swap.c:490 filemap_add_folio+0xf8/0x150 mm/filemap.c:948 __filemap_get_folio+0x510/0x6d0 mm/filemap.c:1981 pagecache_get_page+0x26/0x190 mm/folio-compat.c:104 grab_cache_page_write_begin+0x2a/0x30 mm/folio-compat.c:116 ext4_da_write_begin+0x2dd/0x5f0 fs/ext4/inode.c:2988 generic_perform_write+0x1d4/0x3f0 mm/filemap.c:3738 ext4_buffered_write_iter+0x235/0x3e0 fs/ext4/file.c:270 ext4_file_write_iter+0x2e3/0x1210 call_write_iter include/linux/fs.h:2187 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x468/0x760 fs/read_write.c:578 ksys_write+0xe8/0x1a0 fs/read_write.c:631 __do_sys_write fs/read_write.c:643 [inline] __se_sys_write fs/read_write.c:640 [inline] __x64_sys_write+0x3e/0x50 fs/read_write.c:640 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
read to 0xffffea0004a1d2c8 of 8 bytes by task 18611 on cpu 1:
page_is_pfmemalloc include/linux/mm.h:1740 [inline] __skb_fill_page_desc include/linux/skbuff.h:2422 [inline] skb_fill_page_desc include/linux/skbuff.h:2443 [inline] tcp_build_frag+0x613/0xb20 net/ipv4/tcp.c:1018 do_tcp_sendpages+0x3e8/0xaf0 net/ipv4/tcp.c:1075 tcp_sendpage_locked net/ipv4/tcp.c:1140 [inline] tcp_sendpage+0x89/0xb0 net/ipv4/tcp.c:1150 inet_sendpage+0x7f/0xc0 net/ipv4/af_inet.c:833 kernel_sendpage+0x184/0x300 net/socket.c:3561 sock_sendpage+0x5a/0x70 net/socket.c:1054 pipe_to_sendpage+0x128/0x160 fs/splice.c:361 splice_from_pipe_feed fs/splice.c:415 [inline] __splice_from_pipe+0x222/0x4d0 fs/splice.c:559 splice_from_pipe fs/splice.c:594 [inline] generic_splice_sendpage+0x89/0xc0 fs/splice.c:743 do_splice_from fs/splice.c:764 [inline] direct_splice_actor+0x80/0xa0 fs/splice.c:931 splice_direct_to_actor+0x305/0x620 fs/splice.c:886 do_splice_direct+0xfb/0x180 fs/splice.c:974 do_sendfile+0x3bf/0x910 fs/read_write.c:1249 __do_sys_sendfile64 fs/read_write.c:1317 [inline] __se_sys_sendfile64 fs/read_write.c:1303 [inline] __x64_sys_sendfile64+0x10c/0x150 fs/read_write.c:1303 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
value changed: 0x0000000000000000 -> 0xffffea0004a1d288
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 18611 Comm: syz-executor.4 Not tainted 6.0.0-rc2-syzkaller-00248-ge022620b5d05-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/22/2022
--- include/linux/skbuff.h | 21 +++++++++++++++++++++ net/core/datagram.c | 2 +- net/ipv4/tcp.c | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-)
include/linux/skbuff.h +21 -0
@@ -2291,6 +2291,27 @@ static inline void skb_fill_page_desc(struct sk_buff *skb, int i,skb_shinfo (skb)->nr_frags = i +1 ; } +/** +* skb_fill_page_desc_noacc - initialise a paged fragment in an skb +* @skb: buffer containing fragment to be initialised +* @i: paged fragment index to initialise +* @page: the page to use for this fragment +* @off: the offset to the data with @page +* @size: the length of the data +* +* Variant of skb_fill_page_desc() which does not deal with +* pfmemalloc, if page is not owned by us. +*/ +static inline void skb_fill_page_desc_noacc (struct sk_buff *skb,int i, +struct page *page,int off, +int size) +{ +struct skb_shared_info *shinfo =skb_shinfo (skb); + +__skb_fill_page_desc_noacc (shinfo, i, page, off, size); + shinfo->nr_frags = i +1 ; +} +void skb_add_rx_frag (struct sk_buff *skb,int i,struct page *page,int off,int size,unsigned int truesize);
net/core/datagram.c +1 -1
@@ -677,7 +677,7 @@ int __zerocopy_sg_from_iter(struct sock *sk, struct sk_buff *skb,page_ref_sub (last_head, refs); refs =0 ; } -skb_fill_page_desc (skb, frag++, head, start, size); +skb_fill_page_desc_noacc (skb, frag++, head, start, size); }if (refs)page_ref_sub (last_head, refs);
net/ipv4/tcp.c +1 -1
@@ -1002,7 +1002,7 @@ struct sk_buff *tcp_build_frag(struct sock *sk, int size_goal, int flags,skb_frag_size_add (&skb_shinfo (skb)->frags[i -1 ], copy); }else {get_page (page); -skb_fill_page_desc (skb, i, page, offset, copy); +skb_fill_page_desc_noacc (skb, i, page, offset, copy); }if (!(flags &MSG_NO_SHARED_FRAGS ))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 92/121 nvme-tcp: fix regression that causes sporadic requests to time out
In reply to Greg Kroah-HartmanFrom: Sagi Grimberg <[email protected]>
[ Upstream commit 3770a42bb8ceb856877699257a43c0585a5d2996 ]
When we queue requests, we strive to batch as much as possible and also signal the network stack that more data is about to be sent over a socket with MSG_SENDPAGE_NOTLAST. This flag looks at the pending requests queued as well as queue->more_requests that is derived from the block layer last-in-batch indication.
We set more_request=true when we flush the request directly from .queue_rq submission context (in nvme_tcp_send_all), however this is wrongly assuming that no other requests may be queued during the execution of nvme_tcp_send_all.
Due to this, a race condition may happen where:
1. request X is queued as !last-in-batch
2. request X submission context calls nvme_tcp_send_all directly
3. nvme_tcp_send_all is preempted and schedules to a different cpu
4. request Y is queued as last-in-batch
5. nvme_tcp_send_all context sends request X+Y, however signals for
both MSG_SENDPAGE_NOTLAST because queue->more_requests=true.
==> none of the requests is pushed down to the wire as the network stack is waiting for more data, both requests timeout.
To fix this, we eliminate queue->more_requests and only rely on the queue req_list and send_list to be not-empty.
--- drivers/nvme/host/tcp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/nvme/host/tcp.c +1 -4
@@ -119,7 +119,6 @@ struct nvme_tcp_queue {struct mutex send_mutex;struct llist_head req_list;struct list_head send_list; -bool more_requests;/* recv state */ void *pdu;
@@ -315,7 +314,7 @@ static inline void nvme_tcp_send_all(struct nvme_tcp_queue *queue)static inline bool nvme_tcp_queue_more (struct nvme_tcp_queue *queue) {return !list_empty (&queue->send_list) || - !llist_empty (&queue->req_list) || queue->more_requests; + !llist_empty (&queue->req_list); } static inline void nvme_tcp_queue_request(struct nvme_tcp_request *req,
@@ -334,9 +333,7 @@ static inline void nvme_tcp_queue_request(struct nvme_tcp_request *req,*/ if (queue->io_cpu ==raw_smp_processor_id () && sync && empty &&mutex_trylock (&queue->send_mutex)) { - queue->more_requests = !last;nvme_tcp_send_all (queue); - queue->more_requests = false;mutex_unlock (&queue->send_mutex); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 83/121 iavf: Detach device during reset task
In reply to Greg Kroah-HartmanFrom: Ivan Vecera <[email protected]>
[ Upstream commit aa626da947e9cd30c4cf727493903e1adbb2c0a0 ]
iavf_reset_task() takes crit_lock at the beginning and holds it during whole call. The function subsequently calls iavf_init_interrupt_scheme() that grabs RTNL. Problem occurs when userspace initiates during the reset task any ndo callback that runs under RTNL like iavf_open() because some of that functions tries to take crit_lock. This leads to classic A-B B-A deadlock scenario.
To resolve this situation the device should be detached in iavf_reset_task() prior taking crit_lock to avoid subsequent ndos running under RTNL and reattach the device at the end.
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +11 -3
@@ -2222,6 +2222,11 @@ static void iavf_reset_task(struct work_struct *work)int i =0 , err;bool running; +/* Detach interface to avoid subsequent NDO callbacks */ +rtnl_lock (); +netif_device_detach (netdev); +rtnl_unlock (); +/* When device is being removed it doesn't make sense to run the reset * task, just return in such a case. */
@@ -2229,7 +2234,7 @@ static void iavf_reset_task(struct work_struct *work)if (adapter->state != __IAVF_REMOVE)queue_work (iavf_wq, &adapter->reset_task); -return ; + goto reset_finish; }while (!mutex_trylock (&adapter->client_lock))
@@ -2299,7 +2304,6 @@ static void iavf_reset_task(struct work_struct *work)if (running) {netif_carrier_off (netdev); -netif_tx_stop_all_queues (netdev); adapter->link_up = false;iavf_napi_disable_all (adapter); }
@@ -2412,7 +2416,7 @@ static void iavf_reset_task(struct work_struct *work)mutex_unlock (&adapter->client_lock);mutex_unlock (&adapter->crit_lock); -return ; + goto reset_finish; reset_err:if (running) {set_bit (__IAVF_VSI_DOWN, adapter->vsi.state);
@@ -2423,6 +2427,10 @@ static void iavf_reset_task(struct work_struct *work)mutex_unlock (&adapter->client_lock);mutex_unlock (&adapter->crit_lock);dev_err (&adapter->pdev->dev,"failed to allocate resources during reinit\n" ); +reset_finish: +rtnl_lock (); +netif_device_attach (netdev); +rtnl_unlock (); }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 87/121 ipv6: sr: fix out-of-bounds read when setting HMAC data.
In reply to Greg Kroah-HartmanFrom: David Lebrun <[email protected]>
[ Upstream commit 84a53580c5d2138c7361c7c3eea5b31827e63b35 ]
The SRv6 layer allows defining HMAC data that can later be used to sign IPv6 Segment Routing Headers. This configuration is realised via netlink through four attributes: SEG6_ATTR_HMACKEYID, SEG6_ATTR_SECRET, SEG6_ATTR_SECRETLEN and SEG6_ATTR_ALGID. Because the SECRETLEN attribute is decoupled from the actual length of the SECRET attribute, it is possible to provide invalid combinations (e.g., secret = "", secretlen = 64). This case is not checked in the code and with an appropriately crafted netlink message, an out-of-bounds read of up to 64 bytes (max secret length) can occur past the skb end pointer and into skb_shared_info:
Breakpoint 1, seg6_genl_sethmac (skb=<optimized out>, info=<optimized out>) at net/ipv6/seg6.c:208
208 memcpy(hinfo->secret, secret, slen);
(gdb) bt
#0 seg6_genl_sethmac (skb=<optimized out>, info=<optimized out>) at net/ipv6/seg6.c:208
#1 0xffffffff81e012e9 in genl_family_rcv_msg_doit (skb=skb@entry=0xffff88800b1f9f00, nlh=nlh@entry=0xffff88800b1b7600,
extack=extack@entry=0xffffc90000ba7af0, ops=ops@entry=0xffffc90000ba7a80, hdrlen=4, net=0xffffffff84237580 <init_net>, family=<optimized out>, family=<optimized out>) at net/netlink/genetlink.c:731
#2 0xffffffff81e01435 in genl_family_rcv_msg (extack=0xffffc90000ba7af0, nlh=0xffff88800b1b7600, skb=0xffff88800b1f9f00,
family=0xffffffff82fef6c0 <seg6_genl_family>) at net/netlink/genetlink.c:775
#3 genl_rcv_msg (skb=0xffff88800b1f9f00, nlh=0xffff88800b1b7600, extack=0xffffc90000ba7af0) at net/netlink/genetlink.c:792
#4 0xffffffff81dfffc3 in netlink_rcv_skb (skb=skb@entry=0xffff88800b1f9f00, cb=cb@entry=0xffffffff81e01350 <genl_rcv_msg>)
at net/netlink/af_netlink.c:2501
#5 0xffffffff81e00919 in genl_rcv (skb=0xffff88800b1f9f00) at net/netlink/genetlink.c:803
#6 0xffffffff81dff6ae in netlink_unicast_kernel (ssk=0xffff888010eec800, skb=0xffff88800b1f9f00, sk=0xffff888004aed000)
at net/netlink/af_netlink.c:1319
#7 netlink_unicast (ssk=ssk@entry=0xffff888010eec800, skb=skb@entry=0xffff88800b1f9f00, portid=portid@entry=0, nonblock=<optimized out>)
at net/netlink/af_netlink.c:1345
#8 0xffffffff81dff9a4 in netlink_sendmsg (sock=<optimized out>, msg=0xffffc90000ba7e48, len=<optimized out>) at net/netlink/af_netlink.c:1921...
(gdb) p/x ((struct sk_buff *)0xffff88800b1f9f00)->head + ((struct sk_buff *)0xffff88800b1f9f00)->end $1 = 0xffff88800b1b76c0
(gdb) p/x secret
$2 = 0xffff88800b1b76c0
(gdb) p slen
$3 = 64 '@'
The OOB data can then be read back from userspace by dumping HMAC state. This commit fixes this by ensuring SECRETLEN cannot exceed the actual length of SECRET.
Tested: verified that EINVAL is correctly returned when secretlen > len(secret)
--- net/ipv6/seg6.c | 5 +++++ 1 file changed, 5 insertions(+)
net/ipv6/seg6.c +5 -0
@@ -191,6 +191,11 @@ static int seg6_genl_sethmac(struct sk_buff *skb, struct genl_info *info) goto out_unlock; } +if (slen >nla_len (info->attrs[SEG6_ATTR_SECRET ])) { + err = -EINVAL ; + goto out_unlock; + } +if (hinfo) { err =seg6_hmac_info_del (net, hmackeyid);if (err)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 73/121 rxrpc: Fix ICMP/ICMP6 error handling
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit ac56a0b48da86fd1b4389632fb7c4c8a5d86eefa ]
Because rxrpc pretends to be a tunnel on top of a UDP/UDP6 socket, allowing it to siphon off UDP packets early in the handling of received UDP packets thereby avoiding the packet going through the UDP receive queue, it doesn't get ICMP packets through the UDP ->sk_error_report() callback. In fact, it doesn't appear that there's any usable option for getting hold of ICMP packets.
Fix this by adding a new UDP encap hook to distribute error messages for UDP tunnels. If the hook is set, then the tunnel driver will be able to see ICMP packets. The hook provides the offset into the packet of the UDP header of the original packet that caused the notification.
An alternative would be to call the ->error_handler() hook - but that requires that the skbuff be cloned (as ip_icmp_error() or ipv6_cmp_error() do, though isn't really necessary or desirable in rxrpc's case is we want to parse them there and then, not queue them).
Changes
=======
ver #3)
- Fixed an uninitialised variable.
ver #2)
- Fixed some missing CONFIG_AF_RXRPC_IPV6 conditionals.
--- include/linux/udp.h | 1 + include/net/udp_tunnel.h | 4 + net/ipv4/udp.c | 2 + net/ipv4/udp_tunnel_core.c | 1 + net/ipv6/udp.c | 5 +- net/rxrpc/ar-internal.h | 1 + net/rxrpc/local_object.c | 1 + net/rxrpc/peer_event.c | 293 ++++++++++++++++++++++++++++++++----- 8 files changed, 270 insertions(+), 38 deletions(-)
include/linux/udp.h +1 -0
@@ -75,6 +75,7 @@ struct udp_sock {* For encapsulation sockets. */ int (*encap_rcv)(struct sock *sk,struct sk_buff *skb); +void (*encap_err_rcv)(struct sock *sk,struct sk_buff *skb,unsigned int udp_offset);int (*encap_err_lookup)(struct sock *sk,struct sk_buff *skb);void (*encap_destroy)(struct sock *sk);
include/net/udp_tunnel.h +4 -0
@@ -67,6 +67,9 @@ static inline int udp_sock_create(struct net *net,typedef int (*udp_tunnel_encap_rcv_t )(struct sock *sk,struct sk_buff *skb);typedef int (*udp_tunnel_encap_err_lookup_t )(struct sock *sk,struct sk_buff *skb); +typedef void (*udp_tunnel_encap_err_rcv_t )(struct sock *sk, +struct sk_buff *skb, +unsigned int udp_offset);typedef void (*udp_tunnel_encap_destroy_t )(struct sock *sk); typedef struct sk_buff *(*udp_tunnel_gro_receive_t)(struct sock *sk, struct list_head *head,
@@ -80,6 +83,7 @@ struct udp_tunnel_sock_cfg {__u8 encap_type;udp_tunnel_encap_rcv_t encap_rcv;udp_tunnel_encap_err_lookup_t encap_err_lookup; +udp_tunnel_encap_err_rcv_t encap_err_rcv;udp_tunnel_encap_destroy_t encap_destroy;udp_tunnel_gro_receive_t gro_receive;udp_tunnel_gro_complete_t gro_complete;
net/ipv4/udp.c +2 -0
@@ -781,6 +781,8 @@ int __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)*/ if (tunnel) {/* ...not for tunnels though: we don't have a sending socket */ +if (udp_sk (sk)->encap_err_rcv) +udp_sk (sk)->encap_err_rcv (sk, skb, iph->ihl <<2 ); goto out; }if (!inet->recverr) {
net/ipv4/udp_tunnel_core.c +1 -0
@@ -75,6 +75,7 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,udp_sk (sk)->encap_type = cfg->encap_type;udp_sk (sk)->encap_rcv = cfg->encap_rcv; +udp_sk (sk)->encap_err_rcv = cfg->encap_err_rcv;udp_sk (sk)->encap_err_lookup = cfg->encap_err_lookup;udp_sk (sk)->encap_destroy = cfg->encap_destroy;udp_sk (sk)->gro_receive = cfg->gro_receive;
net/ipv6/udp.c +4 -1
@@ -614,8 +614,11 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, }/* Tunnels don't have an application socket: don't pass errors back */ -if (tunnel) +if (tunnel) { +if (udp_sk (sk)->encap_err_rcv) +udp_sk (sk)->encap_err_rcv (sk, skb, offset); goto out; + }if (!np->recverr) {if (!harderr || sk->sk_state !=TCP_ESTABLISHED )
net/rxrpc/ar-internal.h +1 -0
@@ -990,6 +990,7 @@ void rxrpc_send_keepalive(struct rxrpc_peer *);/* * peer_event.c */ +void rxrpc_encap_err_rcv (struct sock *sk,struct sk_buff *skb,unsigned int udp_offset);void rxrpc_error_report (struct sock *);void rxrpc_peer_keepalive_worker (struct work_struct *);
net/rxrpc/local_object.c +1 -0
@@ -137,6 +137,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net) tuncfg.encap_type =UDP_ENCAP_RXRPC ; tuncfg.encap_rcv = rxrpc_input_packet; + tuncfg.encap_err_rcv = rxrpc_encap_err_rcv; tuncfg.sk_user_data = local;setup_udp_tunnel_sock (net, local->socket, &tuncfg);
net/rxrpc/peer_event.c +256 -37
342 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 90/121 erofs: fix pcluster use-after-free on UP platforms
In reply to Greg Kroah-HartmanFrom: Gao Xiang <[email protected]>
[ Upstream commit 2f44013e39984c127c6efedf70e6b5f4e9dcf315 ]
During stress testing with CONFIG_SMP disabled, KASAN reports as below:
==================================================================
BUG: KASAN: use-after-free in __mutex_lock+0xe5/0xc30 Read of size 8 at addr ffff8881094223f8 by task stress/7789 CPU: 0 PID: 7789 Comm: stress Not tainted 6.0.0-rc1-00002-g0d53d2e882f9 #3 Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 Call Trace: <TASK>
..
__mutex_lock+0xe5/0xc30
..
z_erofs_do_read_page+0x8ce/0x1560
..
z_erofs_readahead+0x31c/0x580
..
Freed by task 7787 kasan_save_stack+0x1e/0x40 kasan_set_track+0x20/0x30 kasan_set_free_info+0x20/0x40 __kasan_slab_free+0x10c/0x190 kmem_cache_free+0xed/0x380 rcu_core+0x3d5/0xc90 __do_softirq+0x12d/0x389 Last potentially related work creation: kasan_save_stack+0x1e/0x40 __kasan_record_aux_stack+0x97/0xb0 call_rcu+0x3d/0x3f0 erofs_shrink_workstation+0x11f/0x210 erofs_shrink_scan+0xdc/0x170 shrink_slab.constprop.0+0x296/0x530 drop_slab+0x1c/0x70 drop_caches_sysctl_handler+0x70/0x80 proc_sys_call_handler+0x20a/0x2f0 vfs_write+0x555/0x6c0 ksys_write+0xbe/0x160 do_syscall_64+0x3b/0x90
The root cause is that erofs_workgroup_unfreeze() doesn't reset to orig_val thus it causes a race that the pcluster reuses unexpectedly before freeing.
Since UP platforms are quite rare now, such path becomes unnecessary. Let's drop such specific-designed path directly instead.
--- fs/erofs/internal.h | 29 ----------------------------- 1 file changed, 29 deletions(-)
fs/erofs/internal.h +0 -29
@@ -143,7 +143,6 @@ struct erofs_workgroup {atomic_t refcount; }; -#if defined(CONFIG_SMP )static inline bool erofs_workgroup_try_to_freeze (struct erofs_workgroup *grp,int val) {
@@ -172,34 +171,6 @@ static inline int erofs_wait_on_workgroup_freezed(struct erofs_workgroup *grp)return atomic_cond_read_relaxed (&grp->refcount, VAL != EROFS_LOCKED_MAGIC); } -#else -static inline bool erofs_workgroup_try_to_freeze (struct erofs_workgroup *grp, -int val) -{ -preempt_disable (); -/* no need to spin on UP platforms, let's just disable preemption. */ -if (val !=atomic_read (&grp->refcount)) { -preempt_enable (); -return false; - } -return true; -} - -static inline void erofs_workgroup_unfreeze (struct erofs_workgroup *grp, -int orig_val) -{ -preempt_enable (); -} - -static inline int erofs_wait_on_workgroup_freezed (struct erofs_workgroup *grp) -{ -int v =atomic_read (&grp->refcount); - -/* workgroup is never freezed on uniprocessor systems */ -DBG_BUGON (v ==EROFS_LOCKED_MAGIC ); -return v; -} -#endif /* !CONFIG_SMP */ #endif /* !CONFIG_EROFS_FS_ZIP */ /* we strictly follow PAGE_SIZE and no buffer head yet */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 71/121 ALSA: usb-audio: Inform the delayed registration more properly
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 7e1afce5866e02b45bf88c27dd7de1b9dfade1cc ]
The info message that was added in the commit a4aad5636c72 ("ALSA:
usb-audio: Inform devices that need delayed registration") is actually useful to know the need for the delayed registration. However, it turned out that this doesn't catch the all cases; namely, this warned only when a PCM stream is attached onto the existing PCM instance, but it doesn't count for a newly created PCM instance. This made confusion as if there were no further delayed registration.
This patch moves the check to the code path for either adding a stream or creating a PCM instance. Also, make it simpler by checking the card->registered flag instead of querying each snd_device state.
--- sound/usb/stream.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/usb/stream.c +4 -3
@@ -495,6 +495,10 @@ static int __snd_usb_add_audio_stream(struct snd_usb_audio *chip,return 0 ; } } + +if (chip->card->registered) + chip->need_delayed_register = true; +/* look for an empty stream */ list_for_each_entry (as, &chip->pcm_list, list) {if (as->fmt_type != fp->fmt_type)
@@ -502,9 +506,6 @@ static int __snd_usb_add_audio_stream(struct snd_usb_audio *chip, subs = &as->substream[stream];if (subs->ep_num)continue ; -if (snd_device_get_state (chip->card, as->pcm) != -SNDRV_DEV_BUILD ) - chip->need_delayed_register = true; err =snd_pcm_new_stream (as->pcm, stream,1 );if (err <0 )return err;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 94/121 nvmet: fix mar and mor off-by-one errors
In reply to Greg Kroah-HartmanFrom: Dennis Maisenbacher <[email protected]>
[ Upstream commit b7e97872a65e1d57b4451769610554c131f37a0a ]
Maximum Active Resources (MAR) and Maximum Open Resources (MOR) are 0's based vales where a value of 0xffffffff indicates that there is no limit.
Decrement the values that are returned by bdev_max_open_zones and bdev_max_active_zones as the block layer helpers are not 0's based. A 0 returned by the block layer helpers indicates no limit, thus convert it to 0xffffffff (U32_MAX).
--- drivers/nvme/target/zns.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/nvme/target/zns.c +15 -2
@@ -100,6 +100,7 @@ void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req)struct nvme_id_ns_zns *id_zns;u64 zsze;u16 status; +u32 mar, mor;if (le32_to_cpu (req->cmd->identify.nsid) ==NVME_NSID_ALL ) { req->error_loc = offsetof(struct nvme_identify , nsid);
@@ -126,8 +127,20 @@ void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req) zsze = (bdev_zone_sectors (req->ns->bdev) <<9 ) >> req->ns->blksize_shift; id_zns->lbafe[0 ].zsze =cpu_to_le64 (zsze); - id_zns->mor =cpu_to_le32 (bdev_max_open_zones (req->ns->bdev)); - id_zns->mar =cpu_to_le32 (bdev_max_active_zones (req->ns->bdev)); + + mor =bdev_max_open_zones (req->ns->bdev); +if (!mor) + mor =U32_MAX ; +else + mor--; + id_zns->mor =cpu_to_le32 (mor); + + mar =bdev_max_active_zones (req->ns->bdev); +if (!mar) + mar =U32_MAX ; +else + mar--; + id_zns->mar =cpu_to_le32 (mar); done: status =nvmet_copy_to_sgl (req,0 , id_zns,sizeof (*id_zns));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 104/121 kbuild: disable header exports for UML in a straightforward way
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 1b620d539ccc18a1aca1613d9ff078115a7891a1 ]
Previously 'make ARCH=um headers' stopped because of missing arch/um/include/uapi/asm/Kbuild.
The error is not shown since commit ed102bf2afed ("um: Fix W=1 missing-include-dirs warnings") added arch/um/include/uapi/asm/Kbuild.
Hard-code the unsupported architecture, so it works like before.
--- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Makefile +1 -2
@@ -1332,8 +1332,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj PHONY += headers headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts - $(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/Kbuild),, \ - $(error Headers not exportable for the $(SRCARCH) architecture)) + $(if $(filter um, $(SRCARCH)), $(error Headers not exportable for UML)) $(Q)$(MAKE) $(hdr-inst)=include/uapi $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 105/121 i40e: Refactor tc mqprio checks
In reply to Greg Kroah-HartmanFrom: Przemyslaw Patynowski <[email protected]>
[ Upstream commit 2313e69c84c024a85d017a60ae925085de47530a ]
Refactor bitwise checks for whether TC MQPRIO is enabled into one single method for improved readability.
Stable-dep-of: 45bb006d3c92 ("i40e: Fix ADQ rate limiting for PF")
--- drivers/net/ethernet/intel/i40e/i40e.h | 14 +++++++++++++ .../net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 20 +++++++++---------- 3 files changed, 25 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +14 -0
@@ -1286,4 +1286,18 @@ int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,int i40e_add_del_cloud_filter_big_buf (struct i40e_vsi *vsi,struct i40e_cloud_filter *filter,bool add); + +/** +* i40e_is_tc_mqprio_enabled - check if TC MQPRIO is enabled on PF +* @pf: pointer to a pf. +* +* Check and return value of flag I40E_FLAG_TC_MQPRIO. +* +* Return: I40E_FLAG_TC_MQPRIO set state. +**/ +static inline u32 i40e_is_tc_mqprio_enabled (struct i40e_pf *pf) +{ +return pf->flags &I40E_FLAG_TC_MQPRIO ; +} +#endif /* _I40E_H_ */
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +1 -1
@@ -4921,7 +4921,7 @@ static int i40e_set_channels(struct net_device *dev,/* We do not support setting channels via ethtool when TCs are * configured through mqprio */ -if (pf->flags &I40E_FLAG_TC_MQPRIO ) +if (i40e_is_tc_mqprio_enabled (pf))return -EINVAL ;/* verify they are not requesting separate vectors */
drivers/net/ethernet/intel/i40e/i40e_main.c +10 -10
@@ -5320,7 +5320,7 @@ static u8 i40e_pf_get_num_tc(struct i40e_pf *pf)u8 num_tc =0 ;struct i40e_dcbx_config *dcbcfg = &hw->local_dcbx_config; -if (pf->flags &I40E_FLAG_TC_MQPRIO ) +if (i40e_is_tc_mqprio_enabled (pf))return pf->vsi[pf->lan_vsi]->mqprio_qopt.qopt.num_tc;/* If neither MQPRIO nor DCB is enabled, then always use single TC */
@@ -5352,7 +5352,7 @@ static u8 i40e_pf_get_num_tc(struct i40e_pf *pf)**/ static u8 i40e_pf_get_tc_map (struct i40e_pf *pf) { -if (pf->flags &I40E_FLAG_TC_MQPRIO ) +if (i40e_is_tc_mqprio_enabled (pf))return i40e_mqprio_get_enabled_tc (pf);/* If neither MQPRIO nor DCB is enabled for this PF then just return
@@ -5449,7 +5449,7 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc,int i;/* There is no need to reset BW when mqprio mode is on. */ -if (pf->flags &I40E_FLAG_TC_MQPRIO ) +if (i40e_is_tc_mqprio_enabled (pf))return 0 ;if (!vsi->mqprio_qopt.qopt.hw && !(pf->flags &I40E_FLAG_DCB_ENABLED )) { ret =i40e_set_bw_limit (vsi, vsi->seid,0 );
@@ -5521,7 +5521,7 @@ static void i40e_vsi_config_netdev_tc(struct i40e_vsi *vsi, u8 enabled_tc) vsi->tc_config.tc_info[i].qoffset); } -if (pf->flags &I40E_FLAG_TC_MQPRIO ) +if (i40e_is_tc_mqprio_enabled (pf))return ;/* Assign UP2TC map for the VSI */
@@ -5682,7 +5682,7 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc) ctxt.vf_num =0 ; ctxt.uplink_seid = vsi->uplink_seid; ctxt.info = vsi->info; -if (vsi->back->flags &I40E_FLAG_TC_MQPRIO ) { +if (i40e_is_tc_mqprio_enabled (pf)) { ret =i40e_vsi_setup_queue_map_mqprio (vsi, &ctxt, enabled_tc);if (ret) goto out;
@@ -6406,7 +6406,7 @@ int i40e_create_queue_channel(struct i40e_vsi *vsi, pf->flags |=I40E_FLAG_VEB_MODE_ENABLED ;if (vsi->type ==I40E_VSI_MAIN ) { -if (pf->flags &I40E_FLAG_TC_MQPRIO ) +if (i40e_is_tc_mqprio_enabled (pf))i40e_do_reset (pf,I40E_PF_RESET_FLAG , true);else i40e_do_reset_safe (pf,I40E_PF_RESET_FLAG );
@@ -7800,7 +7800,7 @@ static void *i40e_fwd_add(struct net_device *netdev, struct net_device *vdev)netdev_info (netdev,"Macvlans are not supported when DCB is enabled\n" );return ERR_PTR (-EINVAL ); } -if ((pf->flags &I40E_FLAG_TC_MQPRIO )) { +if (i40e_is_tc_mqprio_enabled (pf)) {netdev_info (netdev,"Macvlans are not supported when HW TC offload is on\n" );return ERR_PTR (-EINVAL ); }
@@ -8053,7 +8053,7 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data)/* Quiesce VSI queues */ i40e_quiesce_vsi (vsi); -if (!hw && !(pf->flags &I40E_FLAG_TC_MQPRIO )) +if (!hw && !i40e_is_tc_mqprio_enabled (pf))i40e_remove_queue_channels (vsi);/* Configure VSI for enabled TCs */
@@ -8077,7 +8077,7 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data)"Setup channel (id:%u) utilizing num_queues %d\n" , vsi->seid, vsi->tc_config.tc_info[0].qcount); -if (pf->flags &I40E_FLAG_TC_MQPRIO ) { +if (i40e_is_tc_mqprio_enabled (pf)) {if (vsi->mqprio_qopt.max_rate[0 ]) {u64 max_tx_rate = vsi->mqprio_qopt.max_rate[0 ];
@@ -10731,7 +10731,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)* unless I40E_FLAG_TC_MQPRIO was enabled or DCB * is not supported with new link speed */ -if (pf->flags &I40E_FLAG_TC_MQPRIO ) { +if (i40e_is_tc_mqprio_enabled (pf)) {i40e_aq_set_dcb_parameters (hw, false,NULL ); }else { if (I40E_IS_X710TL_DEVICE(hw->device_id) &&
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 106/121 i40e: Fix ADQ rate limiting for PF
In reply to Greg Kroah-HartmanFrom: Przemyslaw Patynowski <[email protected]>
[ Upstream commit 45bb006d3c924b1201ed43c87a96b437662dcaa8 ]
Fix HW rate limiting for ADQ.
Fallback to kernel queue selection for ADQ, as it is network stack that decides which queue to use for transmit with ADQ configured. Reset PF after creation of VMDq2 VSIs required for ADQ, as to reprogram TX queue contexts in i40e_configure_tx_ring. Without this patch PF would limit TX rate only according to TC0.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +++ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +3 -0
@@ -6517,6 +6517,9 @@ static int i40e_configure_queue_channels(struct i40e_vsi *vsi) vsi->tc_seid_map[i] = ch->seid; } } + +/* reset to reconfigure TX queue contexts */ +i40e_do_reset (vsi->back,I40E_PF_RESET_FLAG , true);return ret; err_free:
drivers/net/ethernet/intel/i40e/i40e_txrx.c +2 -1
@@ -3651,7 +3651,8 @@ u16 i40e_lan_select_queue(struct net_device *netdev,u8 prio;/* is DCB enabled at all? */ -if (vsi->tc_config.numtc ==1 ) +if (vsi->tc_config.numtc ==1 || +i40e_is_tc_mqprio_enabled (vsi->back))return netdev_pick_tx (netdev, skb, sb_dev); prio = skb->priority;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 109/121 s390/boot: fix absolute zero lowcore corruption on boot
In reply to Greg Kroah-HartmanFrom: Alexander Gordeev <[email protected]>
[ Upstream commit 12dd19c159659ec9050f45dc8a2ff3c3917f4be3 ]
Crash dump always starts on CPU0. In case CPU0 is offline the prefix page is not installed and the absolute zero lowcore is used. However, struct lowcore::mcesad is never assigned and stays zero. That leads to __machine_kdump() -> save_vx_regs() call silently stores vector registers to the absolute lowcore at 0x11b0 offset.
--- arch/s390/kernel/nmi.c | 2 +- arch/s390/kernel/setup.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
arch/s390/kernel/nmi.c +1 -1
@@ -62,7 +62,7 @@ static inline unsigned long nmi_get_mcesa_size(void)* The structure is required for machine check happening early in * the boot process. */ -static struct mcesa boot_mcesa__initdata __aligned(MCESA_MAX_SIZE) ; +static struct mcesa boot_mcesa__aligned(MCESA_MAX_SIZE) ;void __init nmi_alloc_boot_cpu (struct lowcore *lc) {
arch/s390/kernel/setup.c +1 -0
@@ -484,6 +484,7 @@ static void __init setup_lowcore_dat_off(void)put_abs_lowcore (restart_data, lc->restart_data);put_abs_lowcore (restart_source, lc->restart_source);put_abs_lowcore (restart_psw, lc->restart_psw); +put_abs_lowcore (mcesad, lc->mcesad); lc->spinlock_lockval =arch_spin_lockval (0 ); lc->spinlock_index =0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 112/121 hwmon: (mr75203) fix voltage equation for negative source input
In reply to Greg Kroah-HartmanFrom: Eliav Farber <[email protected]>
[ Upstream commit 227a3a2fc31d8e4bb9c88d4804e19530af245b1b ]
According to Moortec Embedded Voltage Monitor (MEVM) series 3 data sheet, the minimum input signal is -100mv and maximum input signal is +1000mv.
The equation used to convert the digital word to voltage uses mixed types (*val signed and n unsigned), and on 64 bit machines also has different size, since sizeof(u32) = 4 and sizeof(long) = 8.
So when measuring a negative input, n will be small enough, such that PVT_N_CONST * n < PVT_R_CONST, and the result of (PVT_N_CONST * n - PVT_R_CONST) will overflow to a very big positive 32 bit number. Then when storing the result in *val it will be the same value just in 64 bit (instead of it representing a negative number which will what happen when sizeof(long) = 4).
When -1023 <= (PVT_N_CONST * n - PVT_R_CONST) <= -1
dividing the number by 1024 should result of in 0, but because ">> 10" is used, and the sign bit is used to fill the vacated bit positions, it results in -1 (0xf...fffff) which is wrong.
This change fixes the sign problem and supports negative values by casting n to long and replacing the shift right with div operation.
--- drivers/hwmon/mr75203.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/hwmon/mr75203.c +12 -2
@@ -201,8 +201,18 @@ static int pvt_read_in(struct device *dev, u32 attr, int channel, long *val)return ret; n &=SAMPLE_DATA_MSK ; -/* Convert the N bitstream count into voltage */ - *val = (PVT_N_CONST * n -PVT_R_CONST ) >>PVT_CONV_BITS ; +/* +* Convert the N bitstream count into voltage. +* To support negative voltage calculation for 64bit machines +* n must be cast to long, since n and *val differ both in +* signedness and in size. +* Division is used instead of right shift, because for signed +* numbers, the sign bit is used to fill the vacated bit +* positions, and if the number is negative, 1 is used. +* BIT(x) may not be used instead of (1 << x) because it's +* unsigned. +*/ + *val = (PVT_N_CONST * (long )n -PVT_R_CONST ) / (1 <<PVT_CONV_BITS );return 0 ;default :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 116/121 arm64/bti: Disable in kernel BTI when cross section thunks are broken
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
commit c0a454b9044fdc99486853aa424e5b3be2107078 upstream.
GCC does not insert a bti c instruction at the beginning of a function when it believes that all callers reach the function through a direct branch[1]. Unfortunately the logic it uses to determine this is not sufficiently robust, for example not taking account of functions being placed in different sections which may be loaded separately, so we may still see thunks being generated to these functions. If that happens, the first instruction in the callee function will result in a Branch Target Exception due to the missing landing pad.
While this has currently only been observed in the case of modules having their main code loaded sufficiently far from their init section to require thunks it could potentially happen for other cases so the safest thing is to disable BTI for the kernel when building with an affected toolchain.
[1]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106671
--- arch/arm64/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/Kconfig +2 -0
@@ -1626,6 +1626,8 @@ config ARM64_BTI_KERNEL depends on CC_HAS_BRANCH_PROT_PAC_RET_BTI # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94697 depends on !CC_IS_GCC || GCC_VERSION >= 100100 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106671 + depends on !CC_IS_GCC # https://github.com/llvm/llvm-project/commit/a88c722e687e6780dcd6a58718350dc76fcc4cc9 depends on !CC_IS_CLANG || CLANG_VERSION >= 120000 depends on (!FUNCTION_GRAPH_TRACER || DYNAMIC_FTRACE_WITH_REGS)
Greg Kroah-Hartman
maintainerPATCH 108/121 iommu/amd: use full 64-bit value in build_completion_wait()
In reply to Greg Kroah-HartmanFrom: John Sperbeck <[email protected]>
[ Upstream commit 94a568ce32038d8ff9257004bb4632e60eb43a49 ]
We started using a 64 bit completion value. Unfortunately, we only stored the low 32-bits, so a very large completion value would never be matched in iommu_completion_wait().
--- drivers/iommu/amd/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/amd/iommu.c +2 -1
@@ -852,7 +852,8 @@ static void build_completion_wait(struct iommu_cmd *cmd,memset (cmd,0 ,sizeof (*cmd)); cmd->data[0 ] =lower_32_bits (paddr) |CMD_COMPL_WAIT_STORE_MASK ; cmd->data[1 ] =upper_32_bits (paddr); - cmd->data[2 ] = data; + cmd->data[2 ] =lower_32_bits (data); + cmd->data[3 ] =upper_32_bits (data);CMD_SET_TYPE (cmd,CMD_COMPL_WAIT ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 97/121 RDMA/irdma: Report RNR NAK generation in device caps
In reply to Greg Kroah-HartmanFrom: Sindhu-Devale <[email protected]>
[ Upstream commit a261786fdc0a5bed2e5f994dcc0ffeeeb0d662c7 ]
Report RNR NAK generation when device capabilities are queried
--- drivers/infiniband/hw/irdma/verbs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/infiniband/hw/irdma/verbs.c +4 -1
@@ -43,8 +43,11 @@ static int irdma_query_device(struct ib_device *ibdev, props->max_sge_rd = hw_attrs->uk_attrs.max_hw_read_sges; props->max_qp_rd_atom = hw_attrs->max_hw_ird; props->max_qp_init_rd_atom = hw_attrs->max_hw_ord; -if (rdma_protocol_roce (ibdev,1 )) +if (rdma_protocol_roce (ibdev,1 )) { + props->device_cap_flags |=IB_DEVICE_RC_RNR_NAK_GEN ; props->max_pkeys =IRDMA_PKEY_TBL_SZ ; + } + props->max_ah = rf->max_ah; props->max_mcast_grp = rf->max_mcg; props->max_mcast_qp_attach =IRDMA_MAX_MGS_PER_CTX ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 111/121 hwmon: (mr75203) update pvt->v_num and vm_num to the actual number of used sensors
In reply to Greg Kroah-HartmanFrom: Eliav Farber <[email protected]>
[ Upstream commit bb9195bd6664d94d71647631593e09f705ff5edd ]
This issue is relevant when "intel,vm-map" is set in device-tree, and defines a lower number of VMs than actually supported.
This change is needed for all places that use pvt->v_num or vm_num later on in the code.
--- drivers/hwmon/mr75203.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hwmon/mr75203.c +2 -0
@@ -605,6 +605,8 @@ static int mr75203_probe(struct platform_device *pdev)if (pvt->vm_idx[i] >= vm_num || pvt->vm_idx[i] ==0xff ) { num = i; + pvt->v_num = i; + vm_num = i;break ; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 102/121 ASoC: mchp-spdiftx: Fix clang -Wbitfield-constant-conversion
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit 5c5c2baad2b55cc0a4b190266889959642298f79 upstream.
A recent change in clang strengthened its -Wbitfield-constant-conversion to warn when 1 is assigned to a 1-bit signed integer bitfield, as it can only be 0 or -1, not 1:
sound/soc/atmel/mchp-spdiftx.c:505:20: error: implicit truncation from 'int' to bit-field changes value from 1 to -1 [-Werror,-Wbitfield-constant-conversion]
dev->gclk_enabled = 1;
^ ~1 error generated.
The actual value of the field is never checked, just that it is not zero, so there is not a real bug here. However, it is simple enough to silence the warning by making the bitfield unsigned, which matches the mchp-spdifrx driver.
--- sound/soc/atmel/mchp-spdiftx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/atmel/mchp-spdiftx.c +1 -1
@@ -196,7 +196,7 @@ struct mchp_spdiftx_dev {struct clk *pclk;struct clk *gclk;unsigned int fmt; - int gclk_enabled:1; + unsigned int gclk_enabled:1; };static inline int mchp_spdiftx_is_running (struct mchp_spdiftx_dev *dev)
Greg Kroah-Hartman
maintainerPATCH 119/121 drm/bridge: display-connector: implement bus fmts callbacks
In reply to Greg Kroah-HartmanFrom: Neil Armstrong <[email protected]>
commit 7cd70656d1285b79c001f041a017fcfee4292ff9 upstream.
Since this bridge is tied to the connector, it acts like a passthrough, so concerning the output & input bus formats, either pass the bus formats from the previous bridge or return fallback data like done in the bridge function:drm_atomic_bridge_chain_select_bus_fmts() & select_bus_fmt_recursive.
This permits avoiding skipping the negociation if the remaining bridge chain has all the bits in place.
Without this bus fmt negociation breaks on drm/meson HDMI pipeline when attaching dw-hdmi with DRM_BRIDGE_ATTACH_NO_CONNECTOR, because the last bridge of the display-connector doesn't implement buf fmt callbacks and MEDIA_BUS_FMT_FIXED is used leading to select an unsupported default bus format from dw-hdmi.
--- drivers/gpu/drm/bridge/display-connector.c | 86 +++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)
drivers/gpu/drm/bridge/display-connector.c +86 -0
@@ -13,6 +13,7 @@#include <linux/platform_device.h> #include <linux/regulator/consumer.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_edid.h>
@@ -87,10 +88,95 @@ static struct edid *display_connector_gereturn drm_get_edid (connector, conn->bridge.ddc); } +/* +* Since this bridge is tied to the connector, it acts like a passthrough, +* so concerning the output bus formats, either pass the bus formats from the +* previous bridge or return fallback data like done in the bridge function: +* drm_atomic_bridge_chain_select_bus_fmts(). +* This supports negotiation if the bridge chain has all bits in place. +*/ +static u32 *display_connector_get_output_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +unsigned int *num_output_fmts) +{ +struct drm_bridge *prev_bridge =drm_bridge_get_prev_bridge (bridge); +struct drm_bridge_state *prev_bridge_state; + +if (!prev_bridge || !prev_bridge->funcs->atomic_get_output_bus_fmts) { +struct drm_connector *conn = conn_state->connector; +u32 *out_bus_fmts; + + *num_output_fmts =1 ; + out_bus_fmts =kmalloc (sizeof (*out_bus_fmts),GFP_KERNEL ); +if (!out_bus_fmts) +return NULL ; + +if (conn->display_info.num_bus_formats && + conn->display_info.bus_formats) + out_bus_fmts[0 ] = conn->display_info.bus_formats[0 ]; +else + out_bus_fmts[0 ] =MEDIA_BUS_FMT_FIXED ; + +return out_bus_fmts; + } + + prev_bridge_state =drm_atomic_get_new_bridge_state (crtc_state->state, + prev_bridge); + +return prev_bridge->funcs->atomic_get_output_bus_fmts (prev_bridge, prev_bridge_state, + crtc_state, conn_state, + num_output_fmts); +} + +/* +* Since this bridge is tied to the connector, it acts like a passthrough, +* so concerning the input bus formats, either pass the bus formats from the +* previous bridge or MEDIA_BUS_FMT_FIXED (like select_bus_fmt_recursive()) +* when atomic_get_input_bus_fmts is not supported. +* This supports negotiation if the bridge chain has all bits in place. +*/ +static u32 *display_connector_get_input_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +u32 output_fmt, +unsigned int *num_input_fmts) +{ +struct drm_bridge *prev_bridge =drm_bridge_get_prev_bridge (bridge); +struct drm_bridge_state *prev_bridge_state; + +if (!prev_bridge || !prev_bridge->funcs->atomic_get_input_bus_fmts) { +u32 *in_bus_fmts; + + *num_input_fmts =1 ; + in_bus_fmts =kmalloc (sizeof (*in_bus_fmts),GFP_KERNEL ); +if (!in_bus_fmts) +return NULL ; + + in_bus_fmts[0 ] =MEDIA_BUS_FMT_FIXED ; + +return in_bus_fmts; + } + + prev_bridge_state =drm_atomic_get_new_bridge_state (crtc_state->state, + prev_bridge); + +return prev_bridge->funcs->atomic_get_input_bus_fmts (prev_bridge, prev_bridge_state, + crtc_state, conn_state, output_fmt, + num_input_fmts); +} +static const struct drm_bridge_funcs display_connector_bridge_funcs = { .attach = display_connector_attach, .detect = display_connector_detect, .get_edid = display_connector_get_edid, + .atomic_get_output_bus_fmts = display_connector_get_output_bus_fmts, + .atomic_get_input_bus_fmts = display_connector_get_input_bus_fmts, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, };static irqreturn_t display_connector_hpd_irq (int irq,void *arg)
Greg Kroah-Hartman
maintainerPATCH 115/121 Revert "arm64: kasan: Revert "arm64: mte: reset the page tag in page->flags""
In reply to Greg Kroah-HartmanThis reverts commit add4bc9281e8704e5ab15616b429576c84f453a2.
Quoted 11 lines · Catalin Marinas
I missed this (holidays) and it looks like it's in stable already. On its own it will likely break
kasan_hwif used together with user-space MTE as this change relies on two previous commits:
70c248aca9e7("mm: kasan: Skip unpoisoning of user pages")6d05141a3930("mm: kasan: Skip page unpoisoning only if__GFP_SKIP_KASAN_UNPOISON")The reason I did not cc stable is that there are other dependencies in this area. The potential issues without the above commits were rather theoretical, so take these patches rather as clean-ups/refactoring than fixes.
--- arch/arm64/kernel/hibernate.c | 5 +++++ arch/arm64/kernel/mte.c | 9 +++++++++ arch/arm64/mm/copypage.c | 9 +++++++++ arch/arm64/mm/mteswap.c | 9 +++++++++ 4 files changed, 32 insertions(+)
arch/arm64/kernel/hibernate.c +5 -0
@@ -326,6 +326,11 @@ static void swsusp_mte_restore_tags(void)unsigned long pfn = xa_state.xa_index;struct page *page =pfn_to_online_page (pfn); +/* +* It is not required to invoke page_kasan_tag_reset(page) +* at this point since the tags stored in page->flags are +* already restored. +*/ mte_restore_page_tags (page_address (page), tags);mte_free_tag_storage (tags);
arch/arm64/kernel/mte.c +9 -0
@@ -44,6 +44,15 @@ static void mte_sync_page_tags(struct page *page, pte_t old_pte,if (!pte_is_tagged)return ; +page_kasan_tag_reset (page); +/* +* We need smp_wmb() in between setting the flags and clearing the +* tags because if another thread reads page->flags and builds a +* tagged address out of it, there is an actual dependency to the +* memory access, but on the current thread we do not guarantee that +* the new page->flags are visible before the tags were updated. +*/ +smp_wmb ();mte_clear_page_tags (page_address (page)); }
arch/arm64/mm/copypage.c +9 -0
@@ -23,6 +23,15 @@ void copy_highpage(struct page *to, struct page *from)if (system_supports_mte () &&test_bit (PG_mte_tagged, &from->flags)) {set_bit (PG_mte_tagged, &to->flags); +page_kasan_tag_reset (to); +/* +* We need smp_wmb() in between setting the flags and clearing the +* tags because if another thread reads page->flags and builds a +* tagged address out of it, there is an actual dependency to the +* memory access, but on the current thread we do not guarantee that +* the new page->flags are visible before the tags were updated. +*/ +smp_wmb ();mte_copy_page_tags (kto, kfrom); } }
arch/arm64/mm/mteswap.c +9 -0
@@ -53,6 +53,15 @@ bool mte_restore_tags(swp_entry_t entry, struct page *page)if (!tags)return false; +page_kasan_tag_reset (page); +/* +* We need smp_wmb() in between setting the flags and clearing the +* tags because if another thread reads page->flags and builds a +* tagged address out of it, there is an actual dependency to the +* memory access, but on the current thread we do not guarantee that +* the new page->flags are visible before the tags were updated. +*/ +smp_wmb ();mte_restore_page_tags (page_address (page), tags);return true;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 100/121 hwmon: (tps23861) fix byte order in resistance register
In reply to Greg Kroah-HartmanFrom: Alexandru Gagniuc <[email protected]>
commit 1f05f65bddd6958d25b133f886da49c1d4bff3fa upstream.
The tps23861 registers are little-endian, and regmap_read_bulk() does not do byte order conversion. On BE machines, the bytes were swapped, and the interpretation of the resistance value was incorrect.
To make it work on both big and little-endian machines, use le16_to_cpu() to convert the resitance register to host byte order.
--- drivers/hwmon/tps23861.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/hwmon/tps23861.c +6 -4
@@ -489,18 +489,20 @@ static char *tps23861_port_poe_plus_statstatic int tps23861_port_resistance (struct tps23861_data *data,int port) { -u16 regval; +unsigned int raw_val; +__le16 regval;regmap_bulk_read (data->regmap,PORT_1_RESISTANCE_LSB +PORT_N_RESISTANCE_LSB_OFFSET * (port -1 ), ®val,2 ); -switch (FIELD_GET (PORT_RESISTANCE_RSN_MASK , regval)) { + raw_val =le16_to_cpu (regval); +switch (FIELD_GET (PORT_RESISTANCE_RSN_MASK , raw_val)) {case PORT_RESISTANCE_RSN_OTHER : -return (FIELD_GET (PORT_RESISTANCE_MASK , regval) *RESISTANCE_LSB ) /10000 ; +return (FIELD_GET (PORT_RESISTANCE_MASK , raw_val) *RESISTANCE_LSB ) /10000 ;case PORT_RESISTANCE_RSN_LOW : -return (FIELD_GET (PORT_RESISTANCE_MASK , regval) *RESISTANCE_LSB_LOW ) /10000 ; +return (FIELD_GET (PORT_RESISTANCE_MASK , raw_val) *RESISTANCE_LSB_LOW ) /10000 ;case PORT_RESISTANCE_RSN_SHORT :case PORT_RESISTANCE_RSN_OPEN :default :
Greg Kroah-Hartman
maintainerPATCH 118/121 arm64: errata: add detection for AMEVCNTR01 incrementing incorrectly
In reply to Greg Kroah-HartmanFrom: Ionela Voinescu <[email protected]>
commit e89d120c4b720e232cc6a94f0fcbd59c15d41489 upstream.
The AMU counter AMEVCNTR01 (constant counter) should increment at the same rate as the system counter. On affected Cortex-A510 cores, AMEVCNTR01 increments incorrectly giving a significantly higher output value. This results in inaccurate task scheduler utilization tracking and incorrect feedback on CPU frequency.
Work around this problem by returning 0 when reading the affected counter in key locations that results in disabling all users of this counter from using it either for frequency invariance or as FFH reference counter. This effect is the same to firmware disabling affected counters.
Details on how the two features are affected by this erratum:
- AMU counters will not be used for frequency invariance for affected CPUs and CPUs in the same cpufreq policy. AMUs can still be used for frequency invariance for unaffected CPUs in the system. Although unlikely, if no alternative method can be found to support frequency invariance for affected CPUs (cpufreq based or solution based on platform counters) frequency invariance will be disabled. Please check the chapter on frequency invariance at Documentation/scheduler/sched-capacity.rst for details of its effect.
- Given that FFH can be used to fetch either the core or constant counter values, restrictions are lifted regarding any of these counters returning a valid (!0) value. Therefore FFH is considered supported if there is a least one CPU that support AMUs, independent of any counters being disabled or affected by this erratum. Clarifying comments are now added to the cpc_ffh_supported(), cpu_read_constcnt() and cpu_read_corecnt() functions.
The above is achieved through adding a new erratum: ARM64_ERRATUM_2457168.
--- Documentation/arm64/silicon-errata.rst | 2 ++ arch/arm64/Kconfig | 17 +++++++++++++++++ arch/arm64/kernel/cpu_errata.c | 9 +++++++++ arch/arm64/kernel/cpufeature.c | 5 ++++- arch/arm64/kernel/topology.c | 32 ++++++++++++++++++++++++++++++-- arch/arm64/tools/cpucaps | 1 + 6 files changed, 63 insertions(+), 3 deletions(-)
Documentation/arm64/silicon-errata.rst +2 -0
@@ -94,6 +94,8 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A510 | #2441009 | ARM64_ERRATUM_2441009 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A510 | #2457168 | ARM64_ERRATUM_2457168 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Neoverse-N1 | #1188873,1418040| ARM64_ERRATUM_1418040 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Neoverse-N1 | #1349291 | N/A |
arch/arm64/Kconfig +17 -0
@@ -683,6 +683,23 @@ config ARM64_ERRATUM_2441009 If unsure, say Y. +config ARM64_ERRATUM_2457168 + bool "Cortex-A510: 2457168: workaround for AMEVCNTR01 incrementing incorrectly" + depends on ARM64_AMU_EXTN + default y + help + This option adds the workaround for ARM Cortex-A510 erratum 2457168. + + The AMU counter AMEVCNTR01 (constant counter) should increment at the same rate + as the system counter. On affected Cortex-A510 cores AMEVCNTR01 increments + incorrectly giving a significantly higher output value. + + Work around this problem by returning 0 when reading the affected counter in + key locations that results in disabling all users of this counter. This effect + is the same to firmware disabling affected counters. + + If unsure, say Y. + config CAVIUM_ERRATUM_22375 bool "Cavium erratum 22375, 24313" default y
arch/arm64/kernel/cpu_errata.c +9 -0
@@ -551,6 +551,15 @@ const struct arm64_cpu_capabilities arm6 ERRATA_MIDR_ALL_VERSIONS(MIDR_NVIDIA_CARMEL), },#endif +#ifdef CONFIG_ARM64_ERRATUM_2457168 + { + .desc = "ARM erratum 2457168", + .capability = ARM64_WORKAROUND_2457168, + .type = ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE, + /* Cortex-A510 r0p0-r1p1 */ + CAP_MIDR_RANGE(MIDR_CORTEX_A510, 0, 0, 1, 1) + }, +#endif { } };
arch/arm64/kernel/cpufeature.c +4 -1
@@ -1736,7 +1736,10 @@ static void cpu_amu_enable(struct arm64_pr_info ("detected CPU%d: Activity Monitors Unit (AMU)\n" ,smp_processor_id ());cpumask_set_cpu (smp_processor_id (), &amu_cpus); -update_freq_counters_refs (); + +/* 0 reference values signal broken/disabled counters */ +if (!this_cpu_has_cap (ARM64_WORKAROUND_2457168 )) +update_freq_counters_refs (); } }
arch/arm64/kernel/topology.c +30 -2
@@ -308,12 +308,25 @@ core_initcall(init_amu_fie);static void cpu_read_corecnt (void *val) { +/* +* A value of 0 can be returned if the current CPU does not support AMUs +* or if the counter is disabled for this CPU. A return value of 0 at +* counter read is properly handled as an error case by the users of the +* counter. +*/ *(u64 *)val =read_corecnt (); }static void cpu_read_constcnt (void *val) { - *(u64 *)val =read_constcnt (); +/* +* Return 0 if the current CPU is affected by erratum 2457168. A value +* of 0 is also returned if the current CPU does not support AMUs or if +* the counter is disabled. A return value of 0 at counter read is +* properly handled as an error case by the users of the counter. +*/ + *(u64 *)val =this_cpu_has_cap (ARM64_WORKAROUND_2457168 ) ? +0UL :read_constcnt (); } static inline
@@ -340,7 +353,22 @@ int counters_read_on_cpu(int cpu, smp_ca*/ bool cpc_ffh_supported (void ) { -return freq_counters_valid (get_cpu_with_amu_feat ()); +int cpu =get_cpu_with_amu_feat (); + +/* +* FFH is considered supported if there is at least one present CPU that +* supports AMUs. Using FFH to read core and reference counters for CPUs +* that do not support AMUs, have counters disabled or that are affected +* by errata, will result in a return value of 0. +* +* This is done to allow any enabled and valid counters to be read +* through FFH, knowing that potentially returning 0 as counter value is +* properly handled by the users of these counters. +*/ +if ((cpu >= nr_cpu_ids) || !cpumask_test_cpu (cpu, cpu_present_mask)) +return false; + +return true; }int cpc_read_ffh (int cpu,struct cpc_reg *reg,u64 *val)
arch/arm64/tools/cpucaps +1 -0
@@ -54,6 +54,7 @@ WORKAROUND_1418040 WORKAROUND_1463225 WORKAROUND_1508412 WORKAROUND_1542419 +WORKAROUND_2457168 WORKAROUND_CAVIUM_23154 WORKAROUND_CAVIUM_27456 WORKAROUND_CAVIUM_30115
Greg Kroah-Hartman
maintainerPATCH 101/121 ASoC: mchp-spdiftx: remove references to mchp_i2s_caps
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
commit 403fcb5118a0f4091001a537e76923031fb45eaf upstream.
Remove references to struct mchp_i2s_caps as they are not used.
--- sound/soc/atmel/mchp-spdiftx.c | 8 -------- 1 file changed, 8 deletions(-)
sound/soc/atmel/mchp-spdiftx.c +0 -8
@@ -196,7 +196,6 @@ struct mchp_spdiftx_dev {struct clk *pclk;struct clk *gclk;unsigned int fmt; -const struct mchp_i2s_caps *caps; int gclk_enabled:1; };
@@ -766,8 +765,6 @@ static const struct of_device_id mchp_spMODULE_DEVICE_TABLE (of, mchp_spdiftx_dt_ids);static int mchp_spdiftx_probe (struct platform_device *pdev) { -struct device_node *np = pdev->dev.of_node; -const struct of_device_id *match;struct mchp_spdiftx_dev *dev;struct resource *mem;struct regmap *regmap;
@@ -781,11 +778,6 @@ static int mchp_spdiftx_probe(struct plaif (!dev)return -ENOMEM ; -/* Get hardware capabilities. */ - match =of_match_node (mchp_spdiftx_dt_ids, np); -if (match) - dev->caps = match->data; -/* Map I/O registers. */ base =devm_platform_get_and_ioremap_resource (pdev,0 , &mem);if (IS_ERR (base))
Greg Kroah-Hartman
maintainerPATCH 113/121 hwmon: (mr75203) fix multi-channel voltage reading
In reply to Greg Kroah-HartmanFrom: Eliav Farber <[email protected]>
[ Upstream commit 91a9e063cdcfca8fe642b078d6fae4ce49187975 ]
Fix voltage allocation and reading to support all channels in all VMs. Prior to this change allocation and reading were done only for the first channel in each VM.
This change counts the total number of channels for allocation, and takes into account the channel offset when reading the sample data register.
--- drivers/hwmon/mr75203.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
drivers/hwmon/mr75203.c +17 -12
@@ -68,8 +68,9 @@/* VM Individual Macro Register */ #define VM_COM_REG_SIZE 0x200 -#define VM_SDIF_DONE (n) (VM_COM_REG_SIZE + 0x34 + 0x200 * (n)) -#define VM_SDIF_DATA (n) (VM_COM_REG_SIZE + 0x40 + 0x200 * (n)) +#define VM_SDIF_DONE (vm) (VM_COM_REG_SIZE + 0x34 + 0x200 * (vm)) +#define VM_SDIF_DATA (vm, ch) \ + (VM_COM_REG_SIZE + 0x40 + 0x200 * (vm) + 0x4 * (ch))/* SDA Slave Register */ #define IP_CTRL 0x00
@@ -115,6 +116,7 @@ struct pvt_device {u32 t_num;u32 p_num;u32 v_num; +u32 c_num;u32 ip_freq;u8 *vm_idx; };
@@ -178,14 +180,15 @@ static int pvt_read_in(struct device *dev, u32 attr, int channel, long *val) {struct pvt_device *pvt =dev_get_drvdata (dev);struct regmap *v_map = pvt->v_map; +u8 vm_idx, ch_idx;u32 n, stat; -u8 vm_idx;int ret; -if (channel >= pvt->v_num) +if (channel >= pvt->v_num * pvt->c_num)return -EINVAL ; - vm_idx = pvt->vm_idx[channel]; + vm_idx = pvt->vm_idx[channel / pvt->c_num]; + ch_idx = channel % pvt->c_num;switch (attr) {case hwmon_in_input:
@@ -196,7 +199,7 @@ static int pvt_read_in(struct device *dev, u32 attr, int channel, long *val)if (ret)return ret; - ret =regmap_read (v_map,VM_SDIF_DATA (vm_idx), &n); + ret =regmap_read (v_map,VM_SDIF_DATA (vm_idx, ch_idx), &n);if (ret <0 )return ret;
@@ -509,8 +512,8 @@ static int pvt_reset_control_deassert(struct device *dev, struct pvt_device *pvtstatic int mr75203_probe (struct platform_device *pdev) { +u32 ts_num, vm_num, pd_num, ch_num, val, index, i;const struct hwmon_channel_info **pvt_info; -u32 ts_num, vm_num, pd_num, val, index, i;struct device *dev = &pdev->dev;u32 *temp_config, *in_config;struct device *hwmon_dev;
@@ -551,9 +554,11 @@ static int mr75203_probe(struct platform_device *pdev) ts_num = (val &TS_NUM_MSK ) >>TS_NUM_SFT ; pd_num = (val &PD_NUM_MSK ) >>PD_NUM_SFT ; vm_num = (val &VM_NUM_MSK ) >>VM_NUM_SFT ; + ch_num = (val &CH_NUM_MSK ) >>CH_NUM_SFT ; pvt->t_num = ts_num; pvt->p_num = pd_num; pvt->v_num = vm_num; + pvt->c_num = ch_num; val =0 ;if (ts_num) val++;
@@ -590,7 +595,7 @@ static int mr75203_probe(struct platform_device *pdev) }if (vm_num) { -u32 num = vm_num; +u32 total_ch; ret =pvt_get_regmap (pdev,"vm" , pvt);if (ret)
@@ -614,20 +619,20 @@ static int mr75203_probe(struct platform_device *pdev)for (i =0 ; i < vm_num; i++)if (pvt->vm_idx[i] >= vm_num || pvt->vm_idx[i] ==0xff ) { - num = i; pvt->v_num = i; vm_num = i;break ; } } - in_config =devm_kcalloc (dev, num +1 , + total_ch = ch_num * vm_num; + in_config =devm_kcalloc (dev, total_ch +1 ,sizeof (*in_config),GFP_KERNEL );if (!in_config)return -ENOMEM ; -memset32 (in_config,HWMON_I_INPUT , num); - in_config[num] =0 ; +memset32 (in_config,HWMON_I_INPUT , total_ch); + in_config[total_ch] =0 ; pvt_in.config = in_config; pvt_info[index++] = &pvt_in;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 96/121 RDMA/irdma: Return correct WC error for bind operation failure
In reply to Greg Kroah-HartmanFrom: Sindhu-Devale <[email protected]>
[ Upstream commit dcb23bbb1de7e009875fdfac2b8a9808a9319cc6 ]
When a QP and a MR on a local host are in different PDs, the HW generates an asynchronous event (AE). The same AE is generated when a QP and a MW are in different PDs during a bind operation. Return the more appropriate IBV_WC_MW_BIND_ERR for the latter case by checking the OP type from the CQE in error.
--- drivers/infiniband/hw/irdma/uk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/irdma/uk.c +3 -1
@@ -1068,6 +1068,7 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, struct irdma_cq_poll_info *info)enum irdma_status_code ret_code;bool move_cq_head = true;u8 polarity; +u8 op_type;bool ext_valid;__le64 *ext_cqe;
@@ -1250,7 +1251,6 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, struct irdma_cq_poll_info *info) do { __le64 *sw_wqe; u64 wqe_qword; - u8 op_type; u32 tail; tail = qp->sq_ring.tail;
@@ -1267,6 +1267,8 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, struct irdma_cq_poll_info *info)break ; } }while (1 ); +if (op_type ==IRDMA_OP_TYPE_BIND_MW && info->minor_err ==FLUSH_PROT_ERR ) + info->minor_err =FLUSH_MW_BIND_ERR ; qp->sq_flush_seen = true;if (!IRDMA_RING_MORE_WORK (qp->sq_ring)) qp->sq_flush_complete = true;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 10/121 drm/gem: Fix GEM handle release errors
In reply to Greg Kroah-HartmanFrom: Jeffy Chen <[email protected]>
[ Upstream commit ea2aa97ca37a9044ade001aef71dbc06318e8d44 ]
Currently we are assuming a one to one mapping between dmabuf and GEM handle when releasing GEM handles.
But that is not always true, since we would create extra handles for the GEM obj in cases like gem_open() and getfb{,2}().
A similar issue was reported at:
https://lore.kernel.org/all/[email protected]/
Another problem is that the imported dmabuf might not always have gem_obj->dma_buf set, which would cause leaks in drm_gem_remove_prime_handles().
Let's fix these for now by using handle to find the exact map to remove.
--- drivers/gpu/drm/drm_gem.c | 17 +---------------- drivers/gpu/drm/drm_internal.h | 4 ++-- drivers/gpu/drm/drm_prime.c | 20 ++++++++++++-------- 3 files changed, 15 insertions(+), 26 deletions(-)
drivers/gpu/drm/drm_gem.c +1 -16
@@ -167,21 +167,6 @@ void drm_gem_private_object_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_gem_private_object_init); -static void -drm_gem_remove_prime_handles (struct drm_gem_object *obj,struct drm_file *filp) -{ -/* -* Note: obj->dma_buf can't disappear as long as we still hold a -* handle reference in obj->handle_count. -*/ -mutex_lock (&filp->prime.lock); -if (obj->dma_buf) { -drm_prime_remove_buf_handle_locked (&filp->prime, - obj->dma_buf); - } -mutex_unlock (&filp->prime.lock); -} -/** * drm_gem_object_handle_free - release resources bound to userspace handles * @obj: GEM object to clean up.
@@ -252,7 +237,7 @@ drm_gem_object_release_handle(int id, void *ptr, void *data)if (obj->funcs->close) obj->funcs->close (obj, file_priv); -drm_gem_remove_prime_handles (obj, file_priv); +drm_prime_remove_buf_handle (&file_priv->prime, id);drm_vma_node_revoke (&obj->vma_node, file_priv);drm_gem_object_handle_put_unlocked (obj);
drivers/gpu/drm/drm_internal.h +2 -2
@@ -74,8 +74,8 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,void drm_prime_init_file_private (struct drm_prime_file_private *prime_fpriv);void drm_prime_destroy_file_private (struct drm_prime_file_private *prime_fpriv); -void drm_prime_remove_buf_handle_locked (struct drm_prime_file_private *prime_fpriv, -struct dma_buf *dma_buf); +void drm_prime_remove_buf_handle (struct drm_prime_file_private *prime_fpriv, +uint32_t handle);/* drm_drv.c */ struct drm_minor *drm_minor_acquire (unsigned int minor_id);
drivers/gpu/drm/drm_prime.c +12 -8
@@ -187,29 +187,33 @@ static int drm_prime_lookup_buf_handle(struct drm_prime_file_private *prime_fprireturn -ENOENT ; } -void drm_prime_remove_buf_handle_locked (struct drm_prime_file_private *prime_fpriv, -struct dma_buf *dma_buf) +void drm_prime_remove_buf_handle (struct drm_prime_file_private *prime_fpriv, +uint32_t handle) {struct rb_node *rb; - rb = prime_fpriv->dmabufs.rb_node; +mutex_lock (&prime_fpriv->lock); + + rb = prime_fpriv->handles.rb_node;while (rb) {struct drm_prime_member *member; - member = rb_entry(rb, struct drm_prime_member, dmabuf_rb); -if (member->dma_buf == dma_buf) { + member = rb_entry(rb, struct drm_prime_member, handle_rb); +if (member->handle == handle) {rb_erase (&member->handle_rb, &prime_fpriv->handles);rb_erase (&member->dmabuf_rb, &prime_fpriv->dmabufs); -dma_buf_put (dma_buf); +dma_buf_put (member->dma_buf);kfree (member); -return ; - }else if (member->dma_buf < dma_buf) { +break ; + }else if (member->handle < handle) { rb = rb->rb_right; }else { rb = rb->rb_left; } } + +mutex_unlock (&prime_fpriv->lock); }void drm_prime_init_file_private (struct drm_prime_file_private *prime_fpriv)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 23/121 md: Flush workqueue md_rdev_misc_wq in md_alloc()
In reply to Greg Kroah-HartmanFrom: David Sloan <[email protected]>
[ Upstream commit 5e8daf906f890560df430d30617c692a794acb73 ]
A race condition still exists when removing and re-creating md devices in test cases. However, it is only seen on some setups.
The race condition was tracked down to a reference still being held to the kobject by the rdev in the md_rdev_misc_wq which will be released in rdev_delayed_delete().
md_alloc() waits for previous deletions by waiting on the md_misc_wq, but the md_rdev_misc_wq may still be holding a reference to a recently removed device.
To fix this, also flush the md_rdev_misc_wq in md_alloc().
--- drivers/md/md.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/md.c +1 -0
@@ -5651,6 +5651,7 @@ static int md_alloc(dev_t dev, char *name)* removed (mddev_delayed_delete). */ flush_workqueue (md_misc_wq); +flush_workqueue (md_rdev_misc_wq);mutex_lock (&disks_mutex); mddev =mddev_alloc (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 28/121 ALSA: emu10k1: Fix out of bounds access in snd_emu10k1_pcm_channel_alloc()
In reply to Greg Kroah-HartmanFrom: Tasos Sahanidis <[email protected]>
commit d29f59051d3a07b81281b2df2b8c9dfe4716067f upstream.
The voice allocator sometimes begins allocating from near the end of the array and then wraps around, however snd_emu10k1_pcm_channel_alloc() accesses the newly allocated voices as if it never wrapped around.
This results in out of bounds access if the first voice has a high enough index so that first_voice + requested_voice_count > NUM_G (64). The more voices are requested, the more likely it is for this to occur.
This was initially discovered using PipeWire, however it can be reproduced by calling aplay multiple times with 16 channels:
aplay -r 48000 -D plughw:CARD=Live,DEV=3 -c 16 /dev/zero
UBSAN: array-index-out-of-bounds in sound/pci/emu10k1/emupcm.c:127:40 index 65 is out of range for type 'snd_emu10k1_voice [64]' CPU: 1 PID: 31977 Comm: aplay Tainted: G W IOE 6.0.0-rc2-emu10k1+ #7 Hardware name: ASUSTEK COMPUTER INC P5W DH Deluxe/P5W DH Deluxe, BIOS 3002 07/22/2010 Call Trace: <TASK> dump_stack_lvl+0x49/0x63 dump_stack+0x10/0x16 ubsan_epilogue+0x9/0x3f __ubsan_handle_out_of_bounds.cold+0x44/0x49 snd_emu10k1_playback_hw_params+0x3bc/0x420 [snd_emu10k1] snd_pcm_hw_params+0x29f/0x600 [snd_pcm] snd_pcm_common_ioctl+0x188/0x1410 [snd_pcm] ? exit_to_user_mode_prepare+0x35/0x170 ? do_syscall_64+0x69/0x90 ? syscall_exit_to_user_mode+0x26/0x50 ? do_syscall_64+0x69/0x90 ? exit_to_user_mode_prepare+0x35/0x170 snd_pcm_ioctl+0x27/0x40 [snd_pcm] __x64_sys_ioctl+0x95/0xd0 do_syscall_64+0x5c/0x90 ? do_syscall_64+0x69/0x90 ? do_syscall_64+0x69/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
--- sound/pci/emu10k1/emupcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/emu10k1/emupcm.c +1 -1
@@ -124,7 +124,7 @@ static int snd_emu10k1_pcm_channel_alloc epcm->voices[0 ]->epcm = epcm;if (voices >1 ) {for (i =1 ; i < voices; i++) { - epcm->voices[i] = &epcm->emu->voices[epcm->voices[0 ]->number + i]; + epcm->voices[i] = &epcm->emu->voices[(epcm->voices[0 ]->number + i) %NUM_G ]; epcm->voices[i]->epcm = epcm; } }
Greg Kroah-Hartman
maintainerPATCH 1/121 net: wwan: iosm: remove pointless null check
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
commit dbbc7d04c549a43ad343c69e17b27a57e2102041 upstream.
GCC 12 warns:
drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c: In function ‘ipc_protocol_dl_td_process’:drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c:406:13: warning: the comparison will always evaluate as ‘true’ for the address of ‘cb’ will never be NULL [-Waddress]
406 | if (!IPC_CB(skb)) {
| ^
Indeed the check seems entirely pointless. Hopefully the other validation checks will catch if the cb is bad, but it can't be NULL.
--- drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c +0 -10
@@ -372,8 +372,6 @@ bool ipc_protocol_dl_td_prepare(struct istruct sk_buff *ipc_protocol_dl_td_process (struct iosm_protocol *ipc_protocol,struct ipc_pipe *pipe) { -u32 tail = -le32_to_cpu (ipc_protocol->p_ap_shm->tail_array[pipe->pipe_nr]);struct ipc_protocol_td *p_td;struct sk_buff *skb;
@@ -401,14 +399,6 @@ struct sk_buff *ipc_protocol_dl_td_proceipc_pcie_kfree_skb (ipc_protocol->pcie, skb); skb =NULL ; goto ret; - } - -if (!IPC_CB (skb)) { -dev_err (ipc_protocol->dev,"pipe# %d, tail: %d skb_cb is NULL" , - pipe->pipe_nr, tail); -ipc_pcie_kfree_skb (ipc_protocol->pcie, skb); - skb =NULL ; - goto ret; }if (p_td->buffer.address !=IPC_CB (skb)->mapping) {
Greg Kroah-Hartman
maintainerPATCH 54/121 regulator: core: Clean up on enable failure
In reply to Greg Kroah-HartmanFrom: Andrew Halaney <[email protected]>
[ Upstream commit c32f1ebfd26bece77141257864ed7b4720da1557 ]
If regulator_enable() fails, enable_count is incremented still. A consumer, assuming no matching regulator_disable() is necessary on failure, will then get this error message upon regulator_put() since enable_count is non-zero:
[ 1.277418] WARNING: CPU: 3 PID: 1 at drivers/regulator/core.c:2304 _regulator_put.part.0+0x168/0x170
The consumer could try to fix this in their driver by cleaning up on error from regulator_enable() (i.e. call regulator_disable()), but that results in the following since regulator_enable() failed and didn't increment user_count:
[ 1.258112] unbalanced disables for vreg_l17c
[ 1.262606] WARNING: CPU: 4 PID: 1 at drivers/regulator/core.c:2899 _regulator_disable+0xd4/0x190Fix this by decrementing enable_count upon failure to enable.
With this in place, just the reason for failure to enable is printed as expected and developers can focus on the root cause of their issue instead of thinking their usage of the regulator consumer api is incorrect. For example, in my case:
[ 1.240426] vreg_l17c: invalid input voltage found
--- drivers/regulator/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/regulator/core.c +7 -2
@@ -2688,13 +2688,18 @@ static int _regulator_do_enable(struct regulator_dev *rdev)*/ static int _regulator_handle_consumer_enable (struct regulator *regulator) { +int ret;struct regulator_dev *rdev = regulator->rdev;lockdep_assert_held_once (&rdev->mutex.base); regulator->enable_count++; -if (regulator->uA_load && regulator->enable_count ==1 ) -return drms_uA_update (rdev); +if (regulator->uA_load && regulator->enable_count ==1 ) { + ret =drms_uA_update (rdev); +if (ret) + regulator->enable_count--; +return ret; + }return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 13/121 drm/radeon: add a force flush to delay work when radeon
In reply to Greg Kroah-HartmanFrom: Zhenneng Li <[email protected]>
[ Upstream commit f461950fdc374a3ada5a63c669d997de4600dffe ]
Although radeon card fence and wait for gpu to finish processing current batch rings, there is still a corner case that radeon lockup work queue may not be fully flushed, and meanwhile the radeon_suspend_kms() function has called pci_set_power_state() to put device in D3hot state.
Per PCI spec rev 4.0 on 5.3.1.4.1 D3hot State.
Quoted 3 lines
Configuration and Message requests are the only TLPs accepted by a Function in the D3hot state. All other received Requests must be handled as Unsupported Requests, and all received Completions may optionally be handled as Unexpected Completions.
This issue will happen in following logs:
Unable to handle kernel paging request at virtual address 00008800e0008010
CPU 0 kworker/0:3(131): Oops 0
pc = [<ffffffff811bea5c>] ra = [<ffffffff81240844>] ps = 0000 Tainted: G W
pc is at si_gpu_check_soft_reset+0x3c/0x240
ra is at si_dma_is_lockup+0x34/0xd0
v0 = 0000000000000000 t0 = fff08800e0008010 t1 = 0000000000010000 t2 = 0000000000008010 t3 = fff00007e3c00000 t4 = fff00007e3c00258 t5 = 000000000000ffff t6 = 0000000000000001 t7 = fff00007ef078000 s0 = fff00007e3c016e8 s1 = fff00007e3c00000 s2 = fff00007e3c00018 s3 = fff00007e3c00000 s4 = fff00007fff59d80 s5 = 0000000000000000 s6 = fff00007ef07bd98 a0 = fff00007e3c00000 a1 = fff00007e3c016e8 a2 = 0000000000000008 a3 = 0000000000000001 a4 = 8f5c28f5c28f5c29 a5 = ffffffff810f4338 t8 = 0000000000000275 t9 = ffffffff809b66f8 t10 = ff6769c5d964b800 t11= 000000000000b886 pv = ffffffff811bea20 at = 0000000000000000 gp = ffffffff81d89690 sp = 00000000aa814126 Disabling lock debugging due to kernel taint Trace: [<ffffffff81240844>] si_dma_is_lockup+0x34/0xd0 [<ffffffff81119610>] radeon_fence_check_lockup+0xd0/0x290 [<ffffffff80977010>] process_one_work+0x280/0x550 [<ffffffff80977350>] worker_thread+0x70/0x7c0 [<ffffffff80977410>] worker_thread+0x130/0x7c0 [<ffffffff80982040>] kthread+0x200/0x210 [<ffffffff809772e0>] worker_thread+0x0/0x7c0 [<ffffffff80981f8c>] kthread+0x14c/0x210 [<ffffffff80911658>] ret_from_kernel_thread+0x18/0x20 [<ffffffff80981e40>] kthread+0x0/0x210 Code: ad3e0008 43f0074a ad7e0018 ad9e0020 8c3001e8 40230101 <88210000> 4821ed21
So force lockup work queue flush to fix this problem.
--- drivers/gpu/drm/radeon/radeon_device.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/radeon/radeon_device.c +3 -0
@@ -1617,6 +1617,9 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,if (r) {/* delay GPU reset to resume */ radeon_fence_driver_force_completion (rdev, i); + }else { +/* finish executing delayed work */ +flush_delayed_work (&rdev->fence_drv[i].lockup_work); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/121 RDMA/srp: Set scmnd->result only when scmnd is not NULL
In reply to Greg Kroah-HartmanFrom: [email protected] <[email protected]>
[ Upstream commit 12f35199a2c0551187edbf8eb01379f0598659fa ]
This change fixes the following kernel NULL pointer dereference which is reproduced by blktests srp/007 occasionally.
BUG: kernel NULL pointer dereference, address: 0000000000000170 PGD 0 P4D 0 Oops: 0002 [#1] PREEMPT SMP NOPTI CPU: 0 PID: 9 Comm: kworker/0:1H Kdump: loaded Not tainted 6.0.0-rc1+ #37 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.15.0-29-g6a62e0cb0dfe-prebuilt.qemu.org 04/01/2014 Workqueue: 0x0 (kblockd) RIP: 0010:srp_recv_done+0x176/0x500 [ib_srp] Code: 00 4d 85 ff 0f 84 52 02 00 00 48 c7 82 80 02 00 00 00 00 00 00 4c 89 df 4c 89 14 24 e8 53 d3 4a f6 4c 8b 14 24 41 0f b6 42 13 <41> 89 87 70 01 00 00 41 0f b6 52 12 f6 c2 02 74 44 41 8b 42 1c b9 RSP: 0018:ffffaef7c0003e28 EFLAGS: 00000282 RAX: 0000000000000000 RBX: ffff9bc9486dea60 RCX: 0000000000000000 RDX: 0000000000000102 RSI: ffffffffb76bbd0e RDI: 00000000ffffffff RBP: ffff9bc980099a00 R08: 0000000000000001 R09: 0000000000000001 R10: ffff9bca53ef0000 R11: ffff9bc980099a10 R12: ffff9bc956e14000 R13: ffff9bc9836b9cb0 R14: ffff9bc9557b4480 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff9bc97ec00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000170 CR3: 0000000007e04000 CR4: 00000000000006f0 Call Trace: <IRQ> __ib_process_cq+0xb7/0x280 [ib_core] ib_poll_handler+0x2b/0x130 [ib_core] irq_poll_softirq+0x93/0x150 __do_softirq+0xee/0x4b8 irq_exit_rcu+0xf7/0x130 sysvec_apic_timer_interrupt+0x8e/0xc0 </IRQ>
--- drivers/infiniband/ulp/srp/ib_srp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/srp/ib_srp.c +2 -1
@@ -1955,7 +1955,8 @@ static void srp_process_rsp(struct srp_rdma_ch *ch, struct srp_rsp *rsp)if (scmnd) { req =scsi_cmd_priv (scmnd); scmnd =srp_claim_req (ch, req,NULL , scmnd); - }else { + } +if (!scmnd) {shost_printk (KERN_ERR , target->scsi_host,"Null scmnd for RSP w/tag %#016llx received on ch %td / QP %#x\n" , rsp->tag, ch - target->ch, ch->qp->qp_num);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 110/121 hwmon: (mr75203) fix VM sensor allocation when "intel,vm-map" not defined
In reply to Greg Kroah-HartmanFrom: Eliav Farber <[email protected]>
[ Upstream commit 81114fc3d27bf5b06b2137d2fd2b63da656a8b90 ]
Bug - in case "intel,vm-map" is missing in device-tree ,'num' is set to 0, and no voltage channel infos are allocated.
The reason num is set to 0 when "intel,vm-map" is missing is to set the entire pvt->vm_idx[] with incremental channel numbers, but it didn't take into consideration that same num is used later in devm_kcalloc().
If "intel,vm-map" does exist there is no need to set the unspecified channels with incremental numbers, because the unspecified channels can't be accessed in pvt_read_in() which is the only other place besides the probe functions that uses pvt->vm_idx[].
This change fixes the bug by moving the incremental channel numbers setting to be done only if "intel,vm-map" property is defined (starting loop from 0), and removing 'num = 0'.
--- drivers/hwmon/mr75203.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/hwmon/mr75203.c +6 -8
@@ -594,7 +594,12 @@ static int mr75203_probe(struct platform_device *pdev) ret =device_property_read_u8_array (dev,"intel,vm-map" , pvt->vm_idx, vm_num);if (ret) { - num =0 ; +/* +* Incase intel,vm-map property is not defined, we +* assume incremental channel numbers. +*/ +for (i =0 ; i < vm_num; i++) + pvt->vm_idx[i] = i; }else {for (i =0 ; i < vm_num; i++) if (pvt->vm_idx[i] >= vm_num ||
@@ -604,13 +609,6 @@ static int mr75203_probe(struct platform_device *pdev) } } -/* -* Incase intel,vm-map property is not defined, we assume -* incremental channel numbers. -*/ -for (i = num; i < vm_num; i++) - pvt->vm_idx[i] = i; - in_config =devm_kcalloc (dev, num +1 ,sizeof (*in_config),GFP_KERNEL );if (!in_config)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 103/121 MIPS: loongson32: ls1c: Fix hang during startup
In reply to Greg Kroah-HartmanFrom: Yang Ling <[email protected]>
[ Upstream commit 35508d2424097f9b6a1a17aac94f702767035616 ]
The RTCCTRL reg of LS1C is obselete.
Writing this reg will cause system hang.
--- arch/mips/loongson32/ls1c/board.c | 1 - 1 file changed, 1 deletion(-)
arch/mips/loongson32/ls1c/board.c +0 -1
@@ -15,7 +15,6 @@ static struct platform_device *ls1c_platform_devices[] __initdata = {static int __init ls1c_platform_init (void ) {ls1x_serial_set_uartclk (&ls1x_uart_pdev); -ls1x_rtc_set_extclk (&ls1x_rtc_pdev);return platform_add_devices (ls1c_platform_devices,ARRAY_SIZE (ls1c_platform_devices));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 8/121 scsi: qla2xxx: Disable ATIO interrupt coalesce for quad port ISP27XX
In reply to Greg Kroah-HartmanFrom: Tony Battersby <[email protected]>
[ Upstream commit 53661ded2460b414644532de6b99bd87f71987e9 ]
This partially reverts commit d2b292c3f6fd ("scsi: qla2xxx: Enable ATIO interrupt handshake for ISP27XX")
For some workloads where the host sends a batch of commands and then pauses, ATIO interrupt coalesce can cause some incoming ATIO entries to be ignored for extended periods of time, resulting in slow performance, timeouts, and aborted commands.
Disable interrupt coalesce and re-enable the dedicated ATIO MSI-X interrupt.
--- drivers/scsi/qla2xxx/qla_target.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +2 -8
@@ -6961,14 +6961,8 @@ qlt_24xx_config_rings(struct scsi_qla_host *vha)if (ha->flags.msix_enabled) {if (IS_QLA83XX (ha) ||IS_QLA27XX (ha) ||IS_QLA28XX (ha)) { -if (IS_QLA2071 (ha)) { -/* 4 ports Baker: Enable Interrupt Handshake */ - icb->msix_atio =0 ; - icb->firmware_options_2 |=cpu_to_le32 (BIT_26 ); - }else { - icb->msix_atio =cpu_to_le16 (msix->entry); - icb->firmware_options_2 &=cpu_to_le32 (~BIT_26 ); - } + icb->msix_atio =cpu_to_le16 (msix->entry); + icb->firmware_options_2 &=cpu_to_le32 (~BIT_26 );ql_dbg (ql_dbg_init, vha,0xf072 ,"Registering ICB vector 0x%x for atio que.\n" , msix->entry);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 22/121 net/core/skbuff: Check the return value of skb_copy_bits()
In reply to Greg Kroah-HartmanFrom: lily <[email protected]>
[ Upstream commit c624c58e08b15105662b9ab9be23d14a6b945a49 ]
skb_copy_bits() could fail, which requires a check on the return value.
--- net/core/skbuff.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/core/skbuff.c +2 -3
@@ -4188,9 +4188,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,SKB_GSO_CB (nskb)->csum_start =skb_headroom (nskb) + doffset; }else { -skb_copy_bits (head_skb, offset, -skb_put (nskb, len), - len); +if (skb_copy_bits (head_skb, offset,skb_put (nskb, len), len)) + goto err; }continue ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 121/121 ARM: at91: ddr: remove CONFIG_SOC_SAMA7 dependency
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit dc3005703f8cd893d325081c20b400e08377d9bb ]
Remove CONFIG_SOC_SAMA7 dependency to avoid having #ifdef preprocessor directives in driver code (arch/arm/mach-at91/pm.c). This prepares the code for next commits.
--- include/soc/at91/sama7-ddr.h | 4 ---- 1 file changed, 4 deletions(-)
include/soc/at91/sama7-ddr.h +0 -4
@@ -11,8 +11,6 @@#ifndef __SAMA7_DDR_H__#define __SAMA7_DDR_H__ -#ifdef CONFIG_SOC_SAMA7 -/* DDR3PHY */ #define DDR3PHY_PIR (0x04)/* DDR3PHY PHY Initialization Register */ #define DDR3PHY_PIR_DLLBYP (1 << 17)/* DLL Bypass */
@@ -83,6 +81,4 @@#define UDDRC_PCTRL_3 (0x6A0)/* UDDRC Port 3 Control Register */ #define UDDRC_PCTRL_4 (0x750)/* UDDRC Port 4 Control Register */ -#endif /* CONFIG_SOC_SAMA7 */ -#endif /* __SAMA7_DDR_H__ */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 120/121 perf machine: Use path__join() to compose a path instead of snprintf(dir, /, filename)
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
commit 9d5f0c36438eeae7566ca383b2b673179e3cc613 upstream.
Its more intention revealing, and if we're interested in the odd cases where this may end up truncating we can do debug checks at one centralized place.
Motivation, of all the container builds, fedora rawhide started complaining of:
util/machine.c: In function ‘machine__create_modules’:
util/machine.c:1419:50: error: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size between 0 and 4095 [-Werror=format-truncation=]
1419 | snprintf(path, sizeof(path), "%s/%s", dir_name, dent->d_name);
| ^~
In file included from /usr/include/stdio.h:894,
from util/branch.h:9,
from util/callchain.h:8,
from util/machine.c:7:
In function ‘snprintf’,
inlined from ‘maps__set_modules_path_dir’ at util/machine.c:1419:3,
inlined from ‘machine__set_modules_path’ at util/machine.c:1473:9,
inlined from ‘machine__create_modules’ at util/machine.c:1519:7:
/usr/include/bits/stdio2.h:71:10: note: ‘__builtin___snprintf_chk’ output between 2 and 4352 bytes into a destination of size 4096
There are other places where we should use path__join(), but lets get rid of this one first.
--- tools/perf/util/machine.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/util/machine.c +2 -1
@@ -16,6 +16,7 @@#include "map_symbol.h" #include "branch.h" #include "mem-events.h" +#include "path.h" #include "srcline.h" #include "symbol.h" #include "sort.h"
@@ -1407,7 +1408,7 @@ static int maps__set_modules_path_dir(ststruct stat st;/*sshfs might return bad dent->d_type, so we have to stat*/ -snprintf (path,sizeof (path),"%s/%s" , dir_name, dent->d_name); +path__join (path,sizeof (path), dir_name, dent->d_name);if (stat (path, &st))continue ;
Greg Kroah-Hartman
maintainerPATCH 99/121 perf script: Fix Cannot print iregs field for hybrid systems
In reply to Greg Kroah-HartmanFrom: Zhengjun Xing <[email protected]>
[ Upstream commit 82b2425fad2dd47204b3da589b679220f8aacc0e ]
Commit b91e5492f9d7ca89 ("perf record: Add a dummy event on hybrid systems to collect metadata records") adds a dummy event on hybrid systems to fix the symbol "unknown" issue when the workload is created in a P-core but runs on an E-core. The added dummy event will cause "perf script -F iregs" to fail. Dummy events do not have "iregs" attribute set, so when we do evsel__check_attr, the "iregs" attribute check will fail, so the issue happened.
The following commit [1] has fixed a similar issue by skipping the attr check for the dummy event because it does not have any samples anyway. It works okay for the normal mode, but the issue still happened when running the test in the pipe mode. In the pipe mode, it calls process_attr() which still checks the attr for the dummy event. This commit fixed the issue by skipping the attr check for the dummy event in the API evsel__check_attr, Otherwise, we have to patch everywhere when evsel__check_attr() is called.
Before:
#./perf record -o - --intr-regs=di,r8,dx,cx -e br_inst_retired.near_call:p -c 1000 --per-thread true 2>/dev/null|./perf script -F iregs |head -5 Samples for 'dummy:HG' event do not have IREGS attribute set. Cannot print 'iregs' field.
0x120 [0x90]: failed to process type: 64
#
After:
# ./perf record -o - --intr-regs=di,r8,dx,cx -e br_inst_retired.near_call:p -c 1000 --per-thread true 2>/dev/null|./perf script -F iregs |head -5 ABI:2 CX:0x55b8efa87000 DX:0x55b8efa7e000 DI:0xffffba5e625efbb0 R8:0xffff90e51f8ae100 ABI:2 CX:0x7f1dae1e4000 DX:0xd0 DI:0xffff90e18c675ac0 R8:0x71 ABI:2 CX:0xcc0 DX:0x1 DI:0xffff90e199880240 R8:0x0 ABI:2 CX:0xffff90e180dd7500 DX:0xffff90e180dd7500 DI:0xffff90e180043500 R8:0x1 ABI:2 CX:0x50 DX:0xffff90e18c583bd0 DI:0xffff90e1998803c0 R8:0x58 #
[1]https://lore.kernel.org/lkml/[email protected]/
--- tools/perf/builtin-script.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/builtin-script.c +3 -0
@@ -435,6 +435,9 @@ static int evsel__check_attr(struct evsel *evsel, struct perf_session *session)struct perf_event_attr *attr = &evsel->core.attr;bool allow_user_set; +if (evsel__is_dummy_event (evsel)) +return 0 ; +if (perf_header__has_feat (&session->header,HEADER_STAT ))return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 114/121 hwmon: (mr75203) enable polling for all VM channels
In reply to Greg Kroah-HartmanFrom: Eliav Farber <[email protected]>
[ Upstream commit e43212e0f55dc2d6b15d6c174cc0a64b25fab5e7 ]
Configure ip-polling register to enable polling for all voltage monitor channels.
This enables reading the voltage values for all inputs other than just input 0.
--- drivers/hwmon/mr75203.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/hwmon/mr75203.c +13 -0
@@ -398,6 +398,19 @@ static int pvt_init(struct pvt_device *pvt)if (ret)return ret; + val = (BIT (pvt->c_num) -1 ) |VM_CH_INIT | +IP_POLL <<SDIF_ADDR_SFT |SDIF_WRN_W |SDIF_PROG ; + ret =regmap_write (v_map,SDIF_W , val); +if (ret <0 ) +return ret; + + ret =regmap_read_poll_timeout (v_map,SDIF_STAT , + val, !(val &SDIF_BUSY ), +PVT_POLL_DELAY_US , +PVT_POLL_TIMEOUT_US ); +if (ret) +return ret; + val =CFG1_VOL_MEAS_MODE |CFG1_PARALLEL_OUT |CFG1_14_BIT |IP_CFG <<SDIF_ADDR_SFT |SDIF_WRN_W |SDIF_PROG ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainercover 5.15.68-rc1 review
This is the start of the stable review cycle for the 5.15.68 release. There are 121 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Sep 2022 14:03:27 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.68-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.68-rc1
Claudiu Beznea <[email protected]>
ARM: at91: ddr: remove CONFIG_SOC_SAMA7 dependency
Arnaldo Carvalho de Melo <[email protected]>
perf machine: Use path__join() to compose a path instead of snprintf(dir, '/', filename)
Neil Armstrong <[email protected]>
drm/bridge: display-connector: implement bus fmts callbacks
Ionela Voinescu <[email protected]>
arm64: errata: add detection for AMEVCNTR01 incrementing incorrectly
Lu Baolu <[email protected]>
iommu/vt-d: Correctly calculate sagaw value of IOMMU
Mark Brown <[email protected]>
arm64/bti: Disable in kernel BTI when cross section thunks are broken
Sasha Levin <[email protected]>
Revert "arm64: kasan: Revert "arm64: mte: reset the page tag in page->flags""
Eliav Farber <[email protected]>
hwmon: (mr75203) enable polling for all VM channels
Eliav Farber <[email protected]>
hwmon: (mr75203) fix multi-channel voltage reading
Eliav Farber <[email protected]>
hwmon: (mr75203) fix voltage equation for negative source input
Eliav Farber <[email protected]>
hwmon: (mr75203) update pvt->v_num and vm_num to the actual number of used sensors
Eliav Farber <[email protected]>
hwmon: (mr75203) fix VM sensor allocation when "intel,vm-map" not defined
Alexander Gordeev <[email protected]>
s390/boot: fix absolute zero lowcore corruption on boot
John Sperbeck <[email protected]>
iommu/amd: use full 64-bit value in build_completion_wait()
Chao Gao <[email protected]>
swiotlb: avoid potential left shift overflow
Przemyslaw Patynowski <[email protected]>
i40e: Fix ADQ rate limiting for PF
Przemyslaw Patynowski <[email protected]>
i40e: Refactor tc mqprio checks
Masahiro Yamada <[email protected]>
kbuild: disable header exports for UML in a straightforward way
Yang Ling <[email protected]>
MIPS: loongson32: ls1c: Fix hang during startup
Nathan Chancellor <[email protected]>
ASoC: mchp-spdiftx: Fix clang -Wbitfield-constant-conversion
Claudiu Beznea <[email protected]>
ASoC: mchp-spdiftx: remove references to mchp_i2s_caps
Alexandru Gagniuc <[email protected]>
hwmon: (tps23861) fix byte order in resistance register
Zhengjun Xing <[email protected]>
perf script: Fix Cannot print 'iregs' field for hybrid systems
Toke Høiland-Jørgensen <[email protected]>
sch_sfb: Also store skb len before calling child enqueue
Sindhu-Devale <[email protected]>
RDMA/irdma: Report RNR NAK generation in device caps
Sindhu-Devale <[email protected]>
RDMA/irdma: Return correct WC error for bind operation failure
Sindhu-Devale <[email protected]>
RDMA/irdma: Report the correct max cqes from query device
Dennis Maisenbacher <[email protected]>
nvmet: fix mar and mor off-by-one errors
Neal Cardwell <[email protected]>
tcp: fix early ETIMEDOUT after spurious non-SACK RTO
Sagi Grimberg <[email protected]>
nvme-tcp: fix regression that causes sporadic requests to time out
Sagi Grimberg <[email protected]>
nvme-tcp: fix UAF when detecting digest errors
Gao Xiang <[email protected]>
erofs: fix pcluster use-after-free on UP platforms
Chris Mi <[email protected]>
RDMA/mlx5: Set local port to one when accessing counters
Yishai Hadas <[email protected]>
IB/core: Fix a nested dead lock as part of ODP flow
David Lebrun <[email protected]>
ipv6: sr: fix out-of-bounds read when setting HMAC data.
Linus Walleij <[email protected]>
RDMA/siw: Pass a pointer to virt_to_page()
Paul Durrant <[email protected]>
xen-netback: only remove 'hotplug-status' when the vif is actually destroyed
Csókás Bence <[email protected]>
net: fec: Use a spinlock to guard `fep->ptp_clk_on`
Ivan Vecera <[email protected]>
iavf: Detach device during reset task
Ivan Vecera <[email protected]>
i40e: Fix kernel crash during module removal
Michal Swiatkowski <[email protected]>
ice: use bitmap_free instead of devm_kfree
Eric Dumazet <[email protected]>
tcp: TX zerocopy should not sense pfmemalloc status
Pavel Begunkov <[email protected]>
net: introduce __skb_fill_page_desc_noacc
Dan Carpenter <[email protected]>
tipc: fix shift wrapping bug in map_get()
Toke Høiland-Jørgensen <[email protected]>
sch_sfb: Don't assume the skb is still around after enqueueing to child
Heiner Kallweit <[email protected]>
Revert "net: phy: meson-gxl: improve link-up behavior"
David Howells <[email protected]>
afs: Use the operation issue time instead of the reply time for callbacks
David Howells <[email protected]>
rxrpc: Fix an insufficiently large sglist in rxkad_verify_packet_2()
David Howells <[email protected]>
rxrpc: Fix ICMP/ICMP6 error handling
Takashi Iwai <[email protected]>
ALSA: usb-audio: Register card again for iface over delayed_register option
Takashi Iwai <[email protected]>
ALSA: usb-audio: Inform the delayed registration more properly
[email protected] <[email protected]>
RDMA/srp: Set scmnd->result only when scmnd is not NULL
David Leadbeater <[email protected]>
netfilter: nf_conntrack_irc: Fix forged IP logic
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: clean up hook list when offload flags check fails
Harsh Modi <[email protected]>
netfilter: br_netfilter: Drop dst references before setting.
Claudiu Beznea <[email protected]>
ARM: dts: at91: sama5d2_icp: don't keep vdd_other enabled all the time
Claudiu Beznea <[email protected]>
ARM: dts: at91: sama5d27_wlsom1: don't keep ldo2 enabled all the time
Claudiu Beznea <[email protected]>
ARM: dts: at91: sama5d2_icp: specify proper regulator output ranges
Claudiu Beznea <[email protected]>
ARM: dts: at91: sama5d27_wlsom1: specify proper regulator output ranges
Claudiu Beznea <[email protected]>
ARM: at91: pm: fix DDR recalibration when resuming from backup and self-refresh
Claudiu Beznea <[email protected]>
ARM: at91: pm: fix self-refresh for sama7g5
[email protected] <[email protected]>
wifi: wilc1000: fix DMA on stack objects
Wenpeng Liang <[email protected]>
RDMA/hns: Fix wrong fixed value of qp->rq.wqe_shift
Chengchang Tang <[email protected]>
RDMA/hns: Fix supported page size
Liang He <[email protected]>
soc: brcmstb: pm-arm: Fix refcount leak and __iomem leak bugs
Michael Guralnik <[email protected]>
RDMA/cma: Fix arguments order in net device validation
Jens Wiklander <[email protected]>
tee: fix compiler warning in tee_shm_register()
Andrew Halaney <[email protected]>
regulator: core: Clean up on enable failure
Marek Vasut <[email protected]>
soc: imx: gpcv2: Assert reset before ungating clock
Marco Felsch <[email protected]>
ARM: dts: imx6qdl-kontron-samx6i: remove duplicated node
Jack Wang <[email protected]>
RDMA/rtrs-srv: Pass the correct number of entries for dma mapped SGL
Jack Wang <[email protected]>
RDMA/rtrs-clt: Use the right sg_cnt after ib_dma_map_sg
Srinivas Kandagatla <[email protected]>
ASoC: qcom: sm8250: add missing module owner
Geert Uytterhoeven <[email protected]>
riscv: dts: microchip: mpfs: Fix reference clock node
Tejun Heo <[email protected]>
cgroup: Fix threadgroup_rwsem <-> cpus_read_lock() deadlock
Tejun Heo <[email protected]>
cgroup: Elide write-locking threadgroup_rwsem when updating csses on an empty subtree
Trond Myklebust <[email protected]>
NFS: Fix another fsync() issue after a server reboot
Trond Myklebust <[email protected]>
NFS: Save some space in the inode
Trond Myklebust <[email protected]>
NFS: Further optimisations for 'ls -l'
Yang Yingliang <[email protected]>
scsi: lpfc: Add missing destroy_workqueue() in error path
Sreekanth Reddy <[email protected]>
scsi: mpt3sas: Fix use-after-free warning
Ville Syrjälä <[email protected]>
drm/i915: Implement WaEdpLinkRateDataReload
Bart Van Assche <[email protected]>
nvmet: fix a use-after-free
Greg Kroah-Hartman <[email protected]>
drm/amd/display: fix memory leak when using debugfs_lookup()
Greg Kroah-Hartman <[email protected]>
sched/debug: fix dentry leak in update_sched_domain_debugfs
Greg Kroah-Hartman <[email protected]>
debugfs: add debugfs_lookup_and_remove()
Christian A. Ehrhardt <[email protected]>
kprobes: Prohibit probes in gate area
Alex Williamson <[email protected]>
vfio/type1: Unpin zero pages
Shin'ichiro Kawasaki <[email protected]>
btrfs: zoned: set pseudo max append zone limit in zone emulation mode
Masami Hiramatsu (Google) <[email protected]>
tracing: Fix to check event_mutex is held while accessing trigger list
Dongxiang Ke <[email protected]>
ALSA: usb-audio: Fix an out-of-bounds bug in __snd_usb_parse_audio_interface()
Takashi Iwai <[email protected]>
ALSA: usb-audio: Split endpoint setups for hw_params and prepare
Pattara Teerapong <[email protected]>
ALSA: aloop: Fix random zeros in capture data when using jiffies timer
Tasos Sahanidis <[email protected]>
ALSA: emu10k1: Fix out of bounds access in snd_emu10k1_pcm_channel_alloc()
Takashi Iwai <[email protected]>
ALSA: pcm: oss: Fix race at SNDCTL_DSP_SYNC
Qu Huang <[email protected]>
drm/amdgpu: mmVM_L2_CNTL3 register not initialized correctly
Yang Yingliang <[email protected]>
fbdev: chipsfb: Add missing pci_disable_device() in chipsfb_pci_init()
Shigeru Yoshida <[email protected]>
fbdev: fbcon: Destroy mutex on freeing struct fb_info
David Sloan <[email protected]>
md: Flush workqueue md_rdev_misc_wq in md_alloc()
lily <[email protected]>
net/core/skbuff: Check the return value of skb_copy_bits()
Lukasz Luba <[email protected]>
cpufreq: check only freq_table in __resolve_freq()
Florian Westphal <[email protected]>
netfilter: conntrack: work around exceeded receive window
Mark Brown <[email protected]>
arm64/signal: Raise limit on stack frames
Sudeep Holla <[email protected]>
arm64: cacheinfo: Fix incorrect assignment of signed error value to unsigned fw_level
Helge Deller <[email protected]>
parisc: Add runtime check to prevent PA2.0 kernels on PA1.x machines
Li Qiong <[email protected]>
parisc: ccio-dma: Handle kmalloc failure in ccio_init_resources()
Helge Deller <[email protected]>
Revert "parisc: Show error if wrong 32/64-bit compiler is being used"
Bart Van Assche <[email protected]>
scsi: ufs: core: Reduce the power mode change timeout
Zhenneng Li <[email protected]>
drm/radeon: add a force flush to delay work when radeon
Candice Li <[email protected]>
drm/amdgpu: Check num_gfx_rings for gfx v9_0 rb setup.
YiPeng Chai <[email protected]>
drm/amdgpu: Move psp_xgmi_terminate call from amdgpu_xgmi_remove_device to psp_hw_fini
Jeffy Chen <[email protected]>
drm/gem: Fix GEM handle release errors
Guixin Liu <[email protected]>
scsi: megaraid_sas: Fix double kfree()
Tony Battersby <[email protected]>
scsi: qla2xxx: Disable ATIO interrupt coalesce for quad port ISP27XX
Yee Lee <[email protected]>
Revert "mm: kmemleak: take a full lowmem check in kmemleak_*_phys()"
Linus Torvalds <[email protected]>
fs: only do a memory barrier for the first set_buffer_uptodate()
Greg Kroah-Hartman <[email protected]>
net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()
Stanislaw Gruszka <[email protected]>
wifi: iwlegacy: 4965: corrected fix for potential off-by-one overflow in il4965_rs_fill_link_cmd()
Hyunwoo Kim <[email protected]>
efi: capsule-loader: Fix use-after-free in efi_capsule_write
Ard Biesheuvel <[email protected]>
efi: libstub: Disable struct randomization
Jakub Kicinski <[email protected]>
net: wwan: iosm: remove pointless null check
-------------
Diffstat:
Documentation/arm64/silicon-errata.rst | 2 + Makefile | 7 +- arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 21 +- arch/arm/boot/dts/at91-sama5d2_icp.dts | 21 +- arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 10 - arch/arm/mach-at91/pm.c | 36 ++- arch/arm/mach-at91/pm_suspend.S | 24 +- arch/arm64/Kconfig | 19 ++ arch/arm64/kernel/cacheinfo.c | 6 +- arch/arm64/kernel/cpu_errata.c | 9 + arch/arm64/kernel/cpufeature.c | 5 +- arch/arm64/kernel/hibernate.c | 5 + arch/arm64/kernel/mte.c | 9 + arch/arm64/kernel/signal.c | 2 +- arch/arm64/kernel/topology.c | 32 ++- arch/arm64/mm/copypage.c | 9 + arch/arm64/mm/mteswap.c | 9 + arch/arm64/tools/cpucaps | 1 + arch/mips/loongson32/ls1c/board.c | 1 - arch/parisc/include/asm/bitops.h | 8 - arch/parisc/kernel/head.S | 43 ++- .../dts/microchip/microchip-mpfs-icicle-kit.dts | 4 + arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 12 +- arch/s390/kernel/nmi.c | 2 +- arch/s390/kernel/setup.c | 1 + drivers/cpufreq/cpufreq.c | 2 +- drivers/firmware/efi/capsule-loader.c | 31 +-- drivers/firmware/efi/libstub/Makefile | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 1 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +- drivers/gpu/drm/bridge/display-connector.c | 86 ++++++ drivers/gpu/drm/drm_gem.c | 17 +- drivers/gpu/drm/drm_internal.h | 4 +- drivers/gpu/drm/drm_prime.c | 20 +- .../gpu/drm/i915/display/intel_dp_link_training.c | 22 ++ drivers/gpu/drm/radeon/radeon_device.c | 3 + drivers/hwmon/mr75203.c | 72 +++-- drivers/hwmon/tps23861.c | 10 +- drivers/infiniband/core/cma.c | 4 +- drivers/infiniband/core/umem_odp.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 7 +- drivers/infiniband/hw/irdma/uk.c | 4 +- drivers/infiniband/hw/irdma/verbs.c | 7 +- drivers/infiniband/hw/mlx5/mad.c | 6 + drivers/infiniband/sw/siw/siw_qp_tx.c | 18 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 9 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 14 +- drivers/infiniband/ulp/srp/ib_srp.c | 3 +- drivers/iommu/amd/iommu.c | 3 +- drivers/iommu/intel/iommu.c | 28 +- drivers/md/md.c | 1 + drivers/net/ethernet/freescale/fec.h | 1 - drivers/net/ethernet/freescale/fec_main.c | 17 +- drivers/net/ethernet/freescale/fec_ptp.c | 28 +- drivers/net/ethernet/intel/i40e/i40e.h | 14 + drivers/net/ethernet/intel/i40e/i40e_client.c | 5 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 23 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 14 +- drivers/net/ethernet/intel/ice/ice_main.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 +- drivers/net/phy/meson-gxl.c | 8 +- drivers/net/wireless/intel/iwlegacy/4965-rs.c | 5 +- drivers/net/wireless/microchip/wilc1000/netdev.h | 1 + drivers/net/wireless/microchip/wilc1000/sdio.c | 39 ++- drivers/net/wireless/microchip/wilc1000/wlan.c | 15 +- drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c | 10 - drivers/net/xen-netback/xenbus.c | 2 +- drivers/nvme/host/tcp.c | 7 +- drivers/nvme/target/core.c | 6 +- drivers/nvme/target/zns.c | 17 +- drivers/parisc/ccio-dma.c | 11 +- drivers/regulator/core.c | 9 +- drivers/scsi/lpfc/lpfc_init.c | 5 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 - drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/qla2xxx/qla_target.c | 10 +- drivers/scsi/ufs/ufshcd.c | 9 +- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 50 +++- drivers/soc/imx/gpcv2.c | 5 +- drivers/tee/tee_shm.c | 1 + drivers/vfio/vfio_iommu_type1.c | 12 + drivers/video/fbdev/chipsfb.c | 1 + drivers/video/fbdev/core/fbsysfs.c | 4 + fs/afs/flock.c | 2 +- fs/afs/fsclient.c | 2 +- fs/afs/internal.h | 3 +- fs/afs/rxrpc.c | 7 +- fs/afs/yfsclient.c | 3 +- fs/btrfs/zoned.c | 15 +- fs/debugfs/inode.c | 22 ++ fs/erofs/internal.h | 29 -- fs/nfs/dir.c | 16 +- fs/nfs/file.c | 15 +- fs/nfs/inode.c | 27 +- fs/nfs/write.c | 6 +- include/linux/buffer_head.h | 11 + include/linux/debugfs.h | 6 + include/linux/nfs_fs.h | 48 ++-- include/linux/skbuff.h | 49 +++- include/linux/udp.h | 1 + include/net/udp_tunnel.h | 4 + include/soc/at91/sama7-ddr.h | 12 +- kernel/cgroup/cgroup.c | 85 ++++-- kernel/cgroup/cpuset.c | 3 +- kernel/dma/swiotlb.c | 5 +- kernel/fork.c | 1 + kernel/kprobes.c | 1 + kernel/sched/debug.c | 2 +- kernel/trace/trace_events_trigger.c | 3 +- mm/kmemleak.c | 8 +- net/bridge/br_netfilter_hooks.c | 2 + net/bridge/br_netfilter_ipv6.c | 1 + net/core/datagram.c | 2 +- net/core/skbuff.c | 5 +- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 25 +- net/ipv4/udp.c | 2 + net/ipv4/udp_tunnel_core.c | 1 + net/ipv6/seg6.c | 5 + net/ipv6/udp.c | 5 +- net/netfilter/nf_conntrack_irc.c | 5 +- net/netfilter/nf_conntrack_proto_tcp.c | 31 +++ net/netfilter/nf_tables_api.c | 4 +- net/rxrpc/ar-internal.h | 1 + net/rxrpc/local_object.c | 1 + net/rxrpc/peer_event.c | 293 ++++++++++++++++++--- net/rxrpc/rxkad.c | 2 +- net/sched/sch_sfb.c | 13 +- net/tipc/monitor.c | 2 +- sound/core/oss/pcm_oss.c | 6 +- sound/drivers/aloop.c | 7 +- sound/pci/emu10k1/emupcm.c | 2 +- sound/soc/atmel/mchp-spdiftx.c | 10 +- sound/soc/qcom/sm8250.c | 1 + sound/usb/card.c | 2 +- sound/usb/endpoint.c | 23 +- sound/usb/endpoint.h | 6 +- sound/usb/pcm.c | 14 +- sound/usb/quirks.c | 2 +- sound/usb/stream.c | 9 +- tools/perf/builtin-script.c | 3 + tools/perf/util/machine.c | 3 +- 148 files changed, 1376 insertions(+), 534 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 98/121 sch_sfb: Also store skb len before calling child enqueue
From: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 2f09707d0c972120bf794cfe0f0c67e2c2ddb252 ]
Cong Wang noticed that the previous fix for sch_sfb accessing the queued skb after enqueueing it to a child qdisc was incomplete: the SFB enqueue function was also calling qdisc_qstats_backlog_inc() after enqueue, which reads the pkt len from the skb cb field. Fix this by also storing the skb len, and using the stored value to increment the backlog after enqueueing.
--- net/sched/sch_sfb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sched/sch_sfb.c +2 -1
@@ -281,6 +281,7 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch, {struct sfb_sched_data *q =qdisc_priv (sch); +unsigned int len =qdisc_pkt_len (skb);struct Qdisc *child = q->qdisc;struct tcf_proto *fl;struct sfb_skb_cb cb;
@@ -403,7 +404,7 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch,memcpy (&cb,sfb_skb_cb (skb),sizeof (cb)); ret =qdisc_enqueue (skb, child, to_free);if (likely (ret ==NET_XMIT_SUCCESS )) { -qdisc_qstats_backlog_inc (sch, skb); + sch->qstats.backlog += len; sch->q.qlen++;increment_qlen (&cb, q); }else if (net_xmit_drop_count (ret)) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 95/121 RDMA/irdma: Report the correct max cqes from query device
In reply to Greg Kroah-HartmanFrom: Sindhu-Devale <[email protected]>
[ Upstream commit 12faad5e5cf2372af2d51f348b697b5edf838daf ]
Report the correct max cqes available to an application taking into account a reserved entry to detect overflow.
--- drivers/infiniband/hw/irdma/verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/irdma/verbs.c +1 -1
@@ -36,7 +36,7 @@ static int irdma_query_device(struct ib_device *ibdev, props->max_send_sge = hw_attrs->uk_attrs.max_hw_wq_frags; props->max_recv_sge = hw_attrs->uk_attrs.max_hw_wq_frags; props->max_cq = rf->max_cq - rf->used_cqs; - props->max_cqe = rf->max_cqe; + props->max_cqe = rf->max_cqe -1 ; props->max_mr = rf->max_mr - rf->used_mrs; props->max_mw = props->max_mr; props->max_pd = rf->max_pd - rf->used_pds;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 35/121 kprobes: Prohibit probes in gate area
In reply to Greg Kroah-HartmanFrom: Christian A. Ehrhardt <[email protected]>
commit 1efda38d6f9ba26ac88b359c6277f1172db03f1e upstream.
The system call gate area counts as kernel text but trying to install a kprobe in this area fails with an Oops later on. To fix this explicitly disallow the gate area for kprobes.
Found by syzkaller with the following reproducer:
perf_event_open$cgroup(&(0x7f00000001c0)={0x6, 0x80, 0x0, 0x0, 0x0, 0x0, 0x80ffff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, @perf_config_ext={0x0, 0xffffffffff600000}}, 0xffffffffffffffff, 0x0, 0xffffffffffffffff, 0x0)
Sample report:
BUG: unable to handle page fault for address: fffffbfff3ac6000 PGD 6dfcb067 P4D 6dfcb067 PUD 6df8f067 PMD 6de4d067 PTE 0 Oops: 0000 [#1] PREEMPT SMP KASAN NOPTI CPU: 0 PID: 21978 Comm: syz-executor.2 Not tainted 6.0.0-rc3-00363-g7726d4c3e60b-dirty #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 RIP: 0010:__insn_get_emulate_prefix arch/x86/lib/insn.c:91 [inline] RIP: 0010:insn_get_emulate_prefix arch/x86/lib/insn.c:106 [inline] RIP: 0010:insn_get_prefixes.part.0+0xa8/0x1110 arch/x86/lib/insn.c:134 Code: 49 be 00 00 00 00 00 fc ff df 48 8b 40 60 48 89 44 24 08 e9 81 00 00 00 e8 e5 4b 39 ff 4c 89 fa 4c 89 f9 48 c1 ea 03 83 e1 07 <42> 0f b6 14 32 38 ca 7f 08 84 d2 0f 85 06 10 00 00 48 89 d8 48 89 RSP: 0018:ffffc900088bf860 EFLAGS: 00010246 RAX: 0000000000040000 RBX: ffffffff9b9bebc0 RCX: 0000000000000000 RDX: 1ffffffff3ac6000 RSI: ffffc90002d82000 RDI: ffffc900088bf9e8 RBP: ffffffff9d630001 R08: 0000000000000000 R09: ffffc900088bf9e8 R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000001 R13: ffffffff9d630000 R14: dffffc0000000000 R15: ffffffff9d630000 FS: 00007f63eef63640(0000) GS:ffff88806d000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: fffffbfff3ac6000 CR3: 0000000029d90005 CR4: 0000000000770ef0 PKRU: 55555554 Call Trace: <TASK> insn_get_prefixes arch/x86/lib/insn.c:131 [inline] insn_get_opcode arch/x86/lib/insn.c:272 [inline] insn_get_modrm+0x64a/0x7b0 arch/x86/lib/insn.c:343 insn_get_sib+0x29a/0x330 arch/x86/lib/insn.c:421 insn_get_displacement+0x350/0x6b0 arch/x86/lib/insn.c:464 insn_get_immediate arch/x86/lib/insn.c:632 [inline] insn_get_length arch/x86/lib/insn.c:707 [inline] insn_decode+0x43a/0x490 arch/x86/lib/insn.c:747 can_probe+0xfc/0x1d0 arch/x86/kernel/kprobes/core.c:282 arch_prepare_kprobe+0x79/0x1c0 arch/x86/kernel/kprobes/core.c:739 prepare_kprobe kernel/kprobes.c:1160 [inline] register_kprobe kernel/kprobes.c:1641 [inline] register_kprobe+0xb6e/0x1690 kernel/kprobes.c:1603 __register_trace_kprobe kernel/trace/trace_kprobe.c:509 [inline] __register_trace_kprobe+0x26a/0x2d0 kernel/trace/trace_kprobe.c:477 create_local_trace_kprobe+0x1f7/0x350 kernel/trace/trace_kprobe.c:1833 perf_kprobe_init+0x18c/0x280 kernel/trace/trace_event_perf.c:271 perf_kprobe_event_init+0xf8/0x1c0 kernel/events/core.c:9888 perf_try_init_event+0x12d/0x570 kernel/events/core.c:11261 perf_init_event kernel/events/core.c:11325 [inline] perf_event_alloc.part.0+0xf7f/0x36a0 kernel/events/core.c:11619 perf_event_alloc kernel/events/core.c:12059 [inline] __do_sys_perf_event_open+0x4a8/0x2a00 kernel/events/core.c:12157 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f63ef7efaed 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 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f63eef63028 EFLAGS: 00000246 ORIG_RAX: 000000000000012a RAX: ffffffffffffffda RBX: 00007f63ef90ff80 RCX: 00007f63ef7efaed RDX: 0000000000000000 RSI: ffffffffffffffff RDI: 00000000200001c0 RBP: 00007f63ef86019c R08: 0000000000000000 R09: 0000000000000000 R10: ffffffffffffffff R11: 0000000000000246 R12: 0000000000000000 R13: 0000000000000002 R14: 00007f63ef90ff80 R15: 00007f63eef43000 </TASK> Modules linked in: CR2: fffffbfff3ac6000 ---[ end trace 0000000000000000 ]--- RIP: 0010:__insn_get_emulate_prefix arch/x86/lib/insn.c:91 [inline] RIP: 0010:insn_get_emulate_prefix arch/x86/lib/insn.c:106 [inline] RIP: 0010:insn_get_prefixes.part.0+0xa8/0x1110 arch/x86/lib/insn.c:134 Code: 49 be 00 00 00 00 00 fc ff df 48 8b 40 60 48 89 44 24 08 e9 81 00 00 00 e8 e5 4b 39 ff 4c 89 fa 4c 89 f9 48 c1 ea 03 83 e1 07 <42> 0f b6 14 32 38 ca 7f 08 84 d2 0f 85 06 10 00 00 48 89 d8 48 89 RSP: 0018:ffffc900088bf860 EFLAGS: 00010246 RAX: 0000000000040000 RBX: ffffffff9b9bebc0 RCX: 0000000000000000 RDX: 1ffffffff3ac6000 RSI: ffffc90002d82000 RDI: ffffc900088bf9e8 RBP: ffffffff9d630001 R08: 0000000000000000 R09: ffffc900088bf9e8 R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000001 R13: ffffffff9d630000 R14: dffffc0000000000 R15: ffffffff9d630000 FS: 00007f63eef63640(0000) GS:ffff88806d000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: fffffbfff3ac6000 CR3: 0000000029d90005 CR4: 0000000000770ef0
PKRU: 55555554
==================================================================
--- kernel/kprobes.c | 1 + 1 file changed, 1 insertion(+)
kernel/kprobes.c +1 -0
@@ -1561,6 +1561,7 @@ static int check_kprobe_address_safe(str/* Ensure it is not in reserved area nor out of text */ if (!(core_kernel_text((unsigned long) p->addr) || is_module_text_address((unsigned long) p->addr)) || + in_gate_area_no_mm((unsigned long) p->addr) || within_kprobe_blacklist((unsigned long) p->addr) || jump_label_text_reserved(p->addr, p->addr) || static_call_text_reserved(p->addr, p->addr) ||
Greg Kroah-Hartman
maintainerPATCH 64/121 ARM: dts: at91: sama5d2_icp: specify proper regulator output ranges
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 7737d93666eea282febf95e5fa3b3fde1f2549f3 ]
Min and max output ranges of regulators need to satisfy board requirements not PMIC requirements. Thus adjust device tree to cope with this.
--- arch/arm/boot/dts/at91-sama5d2_icp.dts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/arm/boot/dts/at91-sama5d2_icp.dts +10 -10
@@ -197,8 +197,8 @@ regulators { vdd_io_reg: VDD_IO { regulator-name = "VDD_IO"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <3700000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-always-on;
@@ -216,8 +216,8 @@ VDD_DDR { regulator-name = "VDD_DDR"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1850000>; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-always-on;
@@ -235,8 +235,8 @@ VDD_CORE { regulator-name = "VDD_CORE"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1850000>; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1250000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-always-on;
@@ -273,8 +273,8 @@ LDO1 { regulator-name = "LDO1"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <3700000>; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; regulator-always-on; regulator-state-standby {
@@ -288,8 +288,8 @@ LDO2 { regulator-name = "LDO2"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <3700000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; regulator-always-on; regulator-state-standby {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 32/121 tracing: Fix to check event_mutex is held while accessing trigger list
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu (Google) <[email protected]>
commit cecf8e128ec69149fe53c9a7bafa505a4bee25d9 upstream.
Since the check_user_trigger() is called outside of RCU read lock, this list_for_each_entry_rcu() caused a suspicious RCU usage warning.
# echo hist:keys=pid > events/sched/sched_stat_runtime/trigger # cat events/sched/sched_stat_runtime/trigger [ 43.167032] [ 43.167418] ============================= [ 43.167992] WARNING: suspicious RCU usage [ 43.168567] 5.19.0-rc5-00029-g19ebe4651abf #59 Not tainted [ 43.169283] ----------------------------- [ 43.169863] kernel/trace/trace_events_trigger.c:145 RCU-list traversed in non-reader section!! ...
However, this file->triggers list is safe when it is accessed under event_mutex is held.
To fix this warning, adds a lockdep_is_held check to the list_for_each_entry_rcu().
--- kernel/trace/trace_events_trigger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/trace_events_trigger.c +2 -1
@@ -128,7 +128,8 @@ static bool check_user_trigger(struct tr {struct event_trigger_data *data; -list_for_each_entry_rcu (data, &file->triggers, list) { +list_for_each_entry_rcu (data, &file->triggers, list, +lockdep_is_held (&event_mutex)) {if (data->flags &EVENT_TRIGGER_FL_PROBE )continue ;return true;
Re: [PATCH 5.15 084/121] net: fec: Use a spinlock to guard `fep->ptp_clk_on`
In reply to Greg Kroah-HartmanQuoted 8 lines · Greg Kroah-Hartman
From: Csókás Bence <[email protected]>
[ Upstream commit
b353b241f1eb9b6265358ffbe2632fdcb563354f]Mutexes cannot be taken in a non-preemptible context, causing a panic in
fec_ptp_save_state(). Replacingptp_clk_mutexbytmreg_lockfixes this.
Quoted 9 lines
Fixes 6a4d7234ae9a ("net: fec: ptp: avoid register access when ipg clock is disabled")Fixes f79959220fa5 ("fec: Restart PPS after link state change")Reported-by Marc Kleine-Budde <[email protected]>Signed-off-by Csókás Bence <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>
If possible please drop this patch, a revert for this is pending. For details see:
https://lore.kernel.org/all/[email protected]/
regards,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH 5.15 048/121] riscv: dts: microchip: mpfs: Fix reference clock node
In reply to Greg Kroah-HartmanQuoted 17 lines · Greg Kroah-Hartman
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit
9d7b3078628f591e4007210c0d5d3f94805cff55]"make
dtbs_check" reports:
arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: soc: refclk: {'compatible': ['fixed-clock'], '#clock-cells': [[0]], 'clock-frequency': [[600000000]], 'clock-output-names': ['msspllclk'], 'phandle': [[7]]} should not be valid under {'type': 'object'}
From schema:dtschema/schemas/simple-bus.yamlFix this by moving the node out of the "soc" subnode.
While at it, rename it to "msspllclk", and drop the now superfluous "clock-output-names" property.
Move the actual clock-frequency value to the board DTS, since it is not set until bitstream programming time.
Quoted 6 lines
Signed-off-by Geert Uytterhoeven <[email protected]>Reviewed-by Conor Dooley <[email protected]>Tested-by Conor Dooley <[email protected]>Signed-off-by Palmer Dabbelt <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Hey,
I only got this patch and nothing else in my inbox related to the dts that depends on the patch. Has this been autoselected? I don't really think there's much benefit to backporting this one to 5.15 as the board itself didn't even boot for another three kernel releases. Thanks,
Conor.
Quoted 55 lines
--- .../boot/dts/microchip/microchip-mpfs-icicle-kit.dts | 4 ++++ arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 12 +++++------- 2 files changed, 9 insertions(+), 7 deletions(-)arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts +4
-0@@ -40,6 +40,10 @@ }; }; +&refclk { + clock-frequency = <600000000>; +}; + &serial0 { status = "okay"; };arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi +5
-8@@ -139,6 +139,11 @@ }; }; + refclk: msspllclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + }; + soc { #address-cells = <2>; #size-cells = <2>;@@ -188,13 +193,6 @@ #dma-cells = <1>; }; - refclk: refclk { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <600000000>; - clock-output-names = "msspllclk"; - }; - clkcfg: clkcfg@20002000 { compatible = "microchip,mpfs-clkcfg"; reg = <0x0 0x20002000 0x0 0x1000>; --2.35.1
Greg KH
maintainerRe: [PATCH 5.15 048/121] riscv: dts: microchip: mpfs: Fix reference clock node
Quoted 25 lines · On Tue, Sep 13, 2022 at 04:09:09PM +0000, [email protected] wrote:
Quoted 17 lines · Greg Kroah-Hartman
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit
9d7b3078628f591e4007210c0d5d3f94805cff55]"make
dtbs_check" reports:
arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: soc: refclk: {'compatible': ['fixed-clock'], '#clock-cells': [[0]], 'clock-frequency': [[600000000]], 'clock-output-names': ['msspllclk'], 'phandle': [[7]]} should not be valid under {'type': 'object'}
From schema:dtschema/schemas/simple-bus.yamlFix this by moving the node out of the "soc" subnode.
While at it, rename it to "msspllclk", and drop the now superfluous "clock-output-names" property.
Move the actual clock-frequency value to the board DTS, since it is not set until bitstream programming time.Quoted 6 lines
Signed-off-by Geert Uytterhoeven <[email protected]>Reviewed-by Conor Dooley <[email protected]>Tested-by Conor Dooley <[email protected]>Signed-off-by Palmer Dabbelt <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 5 lines
Hey,
I only got this patch and nothing else in my inbox related to the dts that depends on the patch. Has this been autoselected? I don't really think there's much benefit to backporting this one to 5.15 as the board itself didn't even boot for another three kernel releases.
Thanks for letting us know, now dropped from the 5.15 queue.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 93/121 tcp: fix early ETIMEDOUT after spurious non-SACK RTO
In reply to Greg Kroah-HartmanFrom: Neal Cardwell <[email protected]>
[ Upstream commit 686dc2db2a0fdc1d34b424ec2c0a735becd8d62b ]
Fix a bug reported and analyzed by Nagaraj Arankal, where the handling of a spurious non-SACK RTO could cause a connection to fail to clear retrans_stamp, causing a later RTO to very prematurely time out the connection with ETIMEDOUT.
Here is the buggy scenario, expanding upon Nagaraj Arankal's excellent report:
(*1) Send one data packet on a non-SACK connection
(*2) Because no ACK packet is received, the packet is retransmitted
and we enter CA_Loss; but this retransmission is spurious.
(*3) The ACK for the original data is received. The transmitted packet
is acknowledged. The TCP timestamp is before the retrans_stamp, so tcp_may_undo() returns true, and tcp_try_undo_loss() returns true without changing state to Open (because tcp_is_sack() is false), and tcp_process_loss() returns without calling tcp_try_undo_recovery(). Normally after undoing a CA_Loss episode, tcp_fastretrans_alert() would see that the connection has returned to CA_Open and fall through and call tcp_try_to_open(), which would set retrans_stamp to 0. However, for non-SACK connections we hold the connection in CA_Loss, so do not fall through to call tcp_try_to_open() and do not set retrans_stamp to 0. So retrans_stamp is (erroneously) still non-zero.
At this point the first "retransmission event" has passed and been recovered from. Any future retransmission is a completely new "event". However, retrans_stamp is erroneously still set. (And we are still in CA_Loss, which is correct.)
(*4) After 16 minutes (to correspond with tcp_retries2=15), a new data
packet is sent. Note: No data is transmitted between (*3) and (*4) and we disabled keep alives.
The socket's timeout SHOULD be calculated from this point in time, but instead it's calculated from the prior "event" 16 minutes ago (step (*2)).
(*5) Because no ACK packet is received, the packet is retransmitted.
(*6) At the time of the 2nd retransmission, the socket returns
ETIMEDOUT, prematurely, because retrans_stamp is (erroneously) too far in the past (set at the time of (*2)).
This commit fixes this bug by ensuring that we reuse in tcp_try_undo_loss() the same careful logic for non-SACK connections that we have in tcp_try_undo_recovery(). To avoid duplicating logic, we factor out that logic into a new tcp_is_non_sack_preventing_reopen() helper and call that helper from both undo functions.
--- net/ipv4/tcp_input.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
net/ipv4/tcp_input.c +18 -7
@@ -2506,6 +2506,21 @@ static inline bool tcp_may_undo(const struct tcp_sock *tp)return tp->undo_marker && (!tp->undo_retrans ||tcp_packet_delayed (tp)); } +static bool tcp_is_non_sack_preventing_reopen (struct sock *sk) +{ +struct tcp_sock *tp =tcp_sk (sk); + +if (tp->snd_una == tp->high_seq &&tcp_is_reno (tp)) { +/* Hold old state until something *above* high_seq +* is ACKed. For Reno it is MUST to prevent false +* fast retransmits (RFC2582). SACK TCP is safe. */ +if (!tcp_any_retrans_done (sk)) + tp->retrans_stamp =0 ; +return true; + } +return false; +} +/* People celebrate: "We love our President!" */ static bool tcp_try_undo_recovery (struct sock *sk) {
@@ -2528,14 +2543,8 @@ static bool tcp_try_undo_recovery(struct sock *sk) }else if (tp->rack.reo_wnd_persist) { tp->rack.reo_wnd_persist--; } -if (tp->snd_una == tp->high_seq &&tcp_is_reno (tp)) { -/* Hold old state until something *above* high_seq -* is ACKed. For Reno it is MUST to prevent false -* fast retransmits (RFC2582). SACK TCP is safe. */ -if (!tcp_any_retrans_done (sk)) - tp->retrans_stamp =0 ; +if (tcp_is_non_sack_preventing_reopen (sk))return true; - }tcp_set_ca_state (sk, TCP_CA_Open); tp->is_sack_reneg =0 ;return false;
@@ -2571,6 +2580,8 @@ static bool tcp_try_undo_loss(struct sock *sk, bool frto_undo)NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPSPURIOUSRTOS );inet_csk (sk)->icsk_retransmits =0 ; +if (tcp_is_non_sack_preventing_reopen (sk)) +return true;if (frto_undo ||tcp_is_sack (tp)) {tcp_set_ca_state (sk, TCP_CA_Open); tp->is_sack_reneg =0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 117/121 iommu/vt-d: Correctly calculate sagaw value of IOMMU
In reply to Greg Kroah-HartmanFrom: Lu Baolu <[email protected]>
commit 53fc7ad6edf210b497230ce74b61b322a202470c upstream.
The Intel IOMMU driver possibly selects between the first-level and the second-level translation tables for DMA address translation. However, the levels of page-table walks for the 4KB base page size are calculated from the SAGAW field of the capability register, which is only valid for the second-level page table. This causes the IOMMU driver to stop working if the hardware (or the emulated IOMMU) advertises only first-level translation capability and reports the SAGAW field as 0.
This solves the above problem by considering both the first level and the second level when calculating the supported page table levels.
--- drivers/iommu/intel/iommu.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/iommu/intel/iommu.c +25 -3
@@ -542,14 +542,36 @@ static inline int domain_pfn_supported(sreturn !(addr_width <BITS_PER_LONG && pfn >> addr_width); } +/* +* Calculate the Supported Adjusted Guest Address Widths of an IOMMU. +* Refer to 11.4.2 of the VT-d spec for the encoding of each bit of +* the returned SAGAW. +*/ +static unsigned long __iommu_calculate_sagaw (struct intel_iommu *iommu) +{ +unsigned long fl_sagaw, sl_sagaw; + + fl_sagaw =BIT (2 ) | (cap_fl1gp_support (iommu->cap) ?BIT (3 ) :0 ); + sl_sagaw =cap_sagaw (iommu->cap); + +/* Second level only. */ +if (!sm_supported (iommu) || !ecap_flts (iommu->ecap)) +return sl_sagaw; + +/* First level only. */ +if (!ecap_slts (iommu->ecap)) +return fl_sagaw; + +return fl_sagaw & sl_sagaw; +} +static int __iommu_calculate_agaw (struct intel_iommu *iommu,int max_gaw) {unsigned long sagaw;int agaw; - sagaw =cap_sagaw (iommu->cap); -for (agaw =width_to_agaw (max_gaw); - agaw >=0 ; agaw--) { + sagaw =__iommu_calculate_sagaw (iommu); +for (agaw =width_to_agaw (max_gaw); agaw >=0 ; agaw--) {if (test_bit (agaw, &sagaw))break ; }
Re: [PATCH 5.15 084/121] net: fec: Use a spinlock to guard `fep->ptp_clk_on`
In reply to Marc Kleine-BuddeQuoted 4 lines
If possible please drop this patch, a revert for this is pending. For details see:
Agreed, please hold off on this patch. An updated patch is in the works.
Bence
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.68 release. There are 121 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.
Successfully cross-compiled for arm64 (bcm2711_defconfig, GCC 10.2.0) and powerpc (ps3_defconfig, GCC 12.1.0).
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.68 release. There are 121 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Sep 2022 14:03:27 +0000. Anything received after that time might be too late.
Build test (gcc version 12.2.1 20220819):
mips: 62 configs -> no failure
arm: 99 configs -> no failure
arm64: 3 configs -> no failurex86_64: 4 configs -> no failure
alpha allmodconfig -> no failure
csky allmodconfig -> no failure
powerpc allmodconfig -> no failure
riscv allmodconfig -> no failure
s390 allmodconfig -> no failure
xtensa allmodconfig -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
mips: Booted on ci20 board. No regression. [3]
[1]. https://openqa.qa.codethink.co.uk/tests/1819
[2]. https://openqa.qa.codethink.co.uk/tests/1825
[3]. https://openqa.qa.codethink.co.uk/tests/1827
--
Regards
Sudip
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.68 release. There are 121 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Sep 2022 14:03:27 +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/v5.x/stable-review/patch-5.15.68-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro's test farm.
No regressions on arm64, arm, x86_64, and i386.
NOTE:
While running LTP syscalls, hugetlb and ssuite tests on x86 and arm64 Raspberry Pi 4 Model B.
Quoted 8 lines
Trond Myklebust <[email protected]>
NFS: Fix anotherfsync()issue after a server rebootTrond Myklebust <[email protected]>
NFS: Save some space in the inodeTrond Myklebust <[email protected]>
NFS: Further optimisations for 'ls -l'
I have not bisected the reported problem.
hugemmap05.c:99: TINFO: check /proc/meminfo before allocation. hugemmap05.c:278: TINFO: HugePages_Total is 3. hugemmap05.c:278: TINFO: HugePages_Free is 3. hugemmap05.c:278: TINFO: HugePages_Surp is 1.
hugemmap05.c:27[ 51.077819] ------------[ cut here ]------------
[ 51.082692] WARNING: CPU: 0 PID: 590 at fs/nfs/inode.c:123 nfs_evict_inode+0x58/0x70 [ 51.090451] Modules linked in: x86_pkg_temp_thermal [ 51.095329] CPU: 0 PID: 590 Comm: hugemmap05 Not tainted 5.15.68-rc1 #1 [ 51.101948] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.5 11/26/2020 [ 51.109340] RIP: 0010:nfs_evict_inode+0x58/0x70 [ 51.113872] Code: 29 49 8b 54 24 90 49 8d 44 24 90 48 39 c2 75 2b 4c 89 e7 e8 7a d8 ff ff 4c 89 e7 e8 82 74 ff ff 4c 8b 65 f8 c9 c3 cc cc cc cc <0f> 0b 49 8b 54 24 90 49 8d 44 24 90 48 39 c2 74 d5 0f 0b eb d1 0f [ 51.132626] RSP: 0018:ffffb6b140a8fb90 EFLAGS: 00010286 [ 51.137861] RAX: adacafaea9a8abaa RBX: ffff937fa606a2c0 RCX: ffffb6b140a8fbd0 [ 51.144986] RDX: ffff937fa606a2d0 RSI: ffffffffbc720682 RDI: ffffffffbc5ec05f [ 51.152120] RBP: ffffb6b140a8fb98 R08: 0000000000000000 R09: ffffb6b140a8fcf0 [ 51.159253] R10: 0000000000000000 R11: 0000000000000002 R12: ffff937fa606a1a8 [ 51.166395] R13: ffffffffbd851b40 R14: ffff937c40803870 R15: 0000000000000003 [ 51.173525] FS: 00007f5afcdf4740(0000) GS:ffff937fa7a00000(0000) knlGS:0000000000000000 [ 51.181602] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 51.187359] CR2: 00007f5afcf10680 CR3: 000000010360a006 CR4: 00000000003706f0 8: TINFO: HugePa[ 51.194499] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 51.203009] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 51.210135] Call Trace: [ 51.212585] <TASK> [ 51.214684] evict+0xc8/0x180 [ 51.217682] prune_icache_sb+0x81/0xc0 [ 51.221435] super_cache_scan+0x169/0x200 [ 51.225447] do_shrink_slab+0x13f/0x2b0 [ 51.229288] shrink_slab+0x186/0x2a0 [ 51.232868] drop_slab_node+0x4a/0xa0 [ 51.236533] drop_slab+0x41/0x90 [ 51.239765] drop_caches_sysctl_handler+0x79/0x90 [ 51.244471] proc_sys_call_handler+0x159/0x290 [ 51.248918] proc_sys_write+0x13/0x20 [ 51.252582] new_sync_write+0x111/0x1a0 [ 51.256423] vfs_write+0x1d5/0x270 [ 51.259828] ksys_write+0x67/0xf0 [ 51.263150] __x64_sys_write+0x19/0x20 [ 51.266901] do_syscall_64+0x38/0x90 [ 51.270479] entry_SYSCALL_64_after_hwframe+0x61/0xcb [ 51.275534] RIP: 0033:0x7f5afcef31d7 [ 51.279112] Code: 0f 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24 [ 51.297859] RSP: 002b:00007ffd40638738 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 51.305425] RAX: ffffffffffffffda RBX: 0000000000000001 RCX: 00007f5afcef31d7 [ 51.312557] RDX: 0000000000000001 RSI: 00000000016f1480 RDI: 0000000000000003 [ 51.319689] RBP: 00000000016f1480 R08: 0000000000000001 R09: 0000000000000001 [ 51.326812] R10: 0000000000001000 R11: 0000000000000246 R12: 0000000000000001 [ 51.333938] R13: 00000000016f12a0 R14: 0000000000000001 R15: 00007f5afcfe87a0 [ 51.341073] </TASK> [ 51.343264] ---[ end trace 3420625c1fbde9e9 ]--- ges_Rsvd is 3. [ 51.348004] hugemmap05 (590): drop_caches: 3
hugemmap05.c:253: TINFO: First hex is 7070707
Full test log link on x86_64
https://lkft.validation.linaro.org/scheduler/job/5522436#L1711
Crash log on arm64 Raspberry Pi 4 Model B.
linktest 1 TPASS: errors: 0
linktest 1 TINFO: test hard link, limit: 1000
linktest 1 TPASS: errors: 0
[ 1172.344209] ------------[ cut here ]------------ [ 1172.348913] WARNING: CPU: 3 PID: 4759 at fs/nfs/inode.c:123 nfs_clear_inode+0x54/0x90 [ 1172.356884] Modules linked in: algif_hash aes_neon_bs aes_neon_blk
xhci_pci xhci_pci_renesas snd_soc_hdmi_codec raspberrypi_cpufreq hci_uart btqca brcmfmac btbcm brcmutil bluetooth cfg80211 raspberrypi_hwmon rfkill clk_raspberrypi reset_raspberrypi vc4 pwm_bcm2835 cec bcm2711_thermal pcie_brcmstb drm_kms_helper i2c_bcm2835 iproc_rng200 rng_core crct10dif_ce fuse drm
[ 1172.389906] CPU: 3 PID: 4759 Comm: rm Not tainted 5.15.68-rc1 #1 [ 1172.396005] Hardware name: Raspberry Pi 4 Model B (DT) [ 1172.401217] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 1172.408284] pc : nfs_clear_inode+0x54/0x90 [ 1172.412444] lr : nfs_evict_inode+0x34/0x44 [ 1172.416604] sp : ffff800012babca0 [ 1172.419963] x29: ffff800012babca0 x28: ffff000040b40000 x27: 0000000000000000 [ 1172.427217] x26: ffff000049a61e88 x25: 0000000000000002 x24: 00000000ffffffec [ 1172.434468] x23: ffff80000a62ea28 x22: ffff8000092bf7b0 x21: ffff000049a61fa0 [ 1172.441718] x20: ffff000049a62088 x19: ffff000049a61e88 x18: 0000000000000000 [ 1172.448966] x17: 0000000000000000 x16: 0000000000000000 x15: 8107000128000000 [ 1172.456215] x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000088 [ 1172.463464] x11: 0000015a6a1d5174 x10: ffff8000ed98a000 x9 : ffff800008486634 [ 1172.470714] x8 : fffffc0001160848 x7 : fffffffffffffffe x6 : 0000000000000001 [ 1172.477962] x5 : ffff80000a62f000 x4 : ffff80000a62f260 x3 : 0000000000000000 [ 1172.485211] x2 : ffff000049a620a8 x1 : ffff000049a61fb0 x0 : ffff000049a61dc0 [ 1172.492460] Call trace: [ 1172.494938] nfs_clear_inode+0x54/0x90 [ 1172.498745] nfs_evict_inode+0x34/0x44 [ 1172.502551] evict+0xac/0x190 [ 1172.505564] iput+0x174/0x22c [ 1172.508572] do_unlinkat+0x1c0/0x26c [ 1172.512201] __arm64_sys_unlinkat+0x48/0x90 [ 1172.516446] invoke_syscall+0x50/0x120 [ 1172.520254] el0_svc_common.constprop.0+0x104/0x124 [ 1172.525207] do_el0_svc+0x30/0x9c [ 1172.528572] el0_svc+0x2c/0x90 [ 1172.531676] el0t_64_sync_handler+0xa4/0x130 [ 1172.536012] el0t_64_sync+0x1a0/0x1a4 [ 1172.539728] ---[ end trace 6eb5987f00ab00b7 ]---
Full test log log link on arm64
https://lkft.validation.linaro.org/scheduler/job/5524239#L1447
## Build
* kernel: 5.15.68-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.15.y
* git commit: 292041e8d6044e6398e95c0bffa9484edd678478
* git describe: v5.15.67-122-g292041e8d604
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.67-122-g292041e8d604
## No test Regressions (compared to v5.15.67)
## No metric Regressions (compared to v5.15.67)
## No test Fixes (compared to v5.15.67)
## No metric Fixes (compared to v5.15.67)
## Test result summary
total: 106655, pass: 93993, fail: 696, skip: 11659, xfail: 307
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 333 total, 333 passed, 0 failed
* arm64: 65 total, 63 passed, 2 failed
* i386: 55 total, 53 passed, 2 failed
* mips: 56 total, 56 passed, 0 failed
* parisc: 12 total, 12 passed, 0 failed
* powerpc: 63 total, 63 passed, 0 failed
* riscv: 22 total, 22 passed, 0 failed
* s390: 24 total, 24 passed, 0 failed
* sh: 24 total, 24 passed, 0 failed
* sparc: 12 total, 12 passed, 0 failed
* x86_64: 58 total, 56 passed, 2 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-open-posix-tests
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* packetdrill
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.68 release. There are 121 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Sep 2022 14:03:27 +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/v5.x/stable-review/patch-5.15.68-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.68 release. There are 121 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Sep 2022 14:03:27 +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/v5.x/stable-review/patch-5.15.68-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
114 tests: 114 pass, 0 failLinux version: 5.15.68-rc1-gdbbecf1f4a70
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.68 release. There are 121 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Sep 2022 14:03:27 +0000. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 486 pass: 486 fail: 0
New runtime warning:
BUG: sleeping function called from invalid context at drivers/clk/imx/clk-pllv3.c:68
Assuming that the offending patch will be dropped:
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.68 release. There are 121 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Sep 2022 14:03:27 +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/v5.x/stable-review/patch-5.15.68-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.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 6 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.68 release. There are 121 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Sep 2022 14:03:27 +0000.
Built and tested on WSL x86 and WSL arm64 - no regressions found.
Hi,
Quoted 65 lines
I have not bisected the reported problem.
hugemmap05.c:99: TINFO: check
/proc/meminfobefore allocation. hugemmap05.c:278: TINFO:HugePages_Totalis 3. hugemmap05.c:278: TINFO:HugePages_Freeis 3. hugemmap05.c:278: TINFO:HugePages_Surpis 1.
hugemmap05.c:27[ 51.077819] ------------[ cut here ]------------[ 51.082692] WARNING: CPU: 0 PID: 590 at fs/nfs/inode.c:123 nfs_evict_inode+0x58/0x70 [ 51.090451] Modules linked in: x86_pkg_temp_thermal [ 51.095329] CPU: 0 PID: 590 Comm: hugemmap05 Not tainted 5.15.68-rc1 #1 [ 51.101948] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.5 11/26/2020 [ 51.109340] RIP: 0010:nfs_evict_inode+0x58/0x70 [ 51.113872] Code: 29 49 8b 54 24 90 49 8d 44 24 90 48 39 c2 75 2b 4c 89 e7 e8 7a d8 ff ff 4c 89 e7 e8 82 74 ff ff 4c 8b 65 f8 c9 c3 cc cc cc cc <0f> 0b 49 8b 54 24 90 49 8d 44 24 90 48 39 c2 74 d5 0f 0b eb d1 0f [ 51.132626] RSP: 0018:ffffb6b140a8fb90 EFLAGS: 00010286 [ 51.137861] RAX: adacafaea9a8abaa RBX: ffff937fa606a2c0 RCX: ffffb6b140a8fbd0 [ 51.144986] RDX: ffff937fa606a2d0 RSI: ffffffffbc720682 RDI: ffffffffbc5ec05f [ 51.152120] RBP: ffffb6b140a8fb98 R08: 0000000000000000 R09: ffffb6b140a8fcf0 [ 51.159253] R10: 0000000000000000 R11: 0000000000000002 R12: ffff937fa606a1a8 [ 51.166395] R13: ffffffffbd851b40 R14: ffff937c40803870 R15: 0000000000000003 [ 51.173525] FS: 00007f5afcdf4740(0000) GS:ffff937fa7a00000(0000) knlGS:0000000000000000 [ 51.181602] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 51.187359] CR2: 00007f5afcf10680 CR3: 000000010360a006 CR4: 00000000003706f0 8: TINFO: HugePa[ 51.194499] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 51.203009] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 51.210135] Call Trace: [ 51.212585] <TASK> [ 51.214684] evict+0xc8/0x180 [ 51.217682] prune_icache_sb+0x81/0xc0 [ 51.221435] super_cache_scan+0x169/0x200 [ 51.225447] do_shrink_slab+0x13f/0x2b0 [ 51.229288] shrink_slab+0x186/0x2a0 [ 51.232868] drop_slab_node+0x4a/0xa0 [ 51.236533] drop_slab+0x41/0x90 [ 51.239765] drop_caches_sysctl_handler+0x79/0x90 [ 51.244471] proc_sys_call_handler+0x159/0x290 [ 51.248918] proc_sys_write+0x13/0x20 [ 51.252582] new_sync_write+0x111/0x1a0 [ 51.256423] vfs_write+0x1d5/0x270 [ 51.259828] ksys_write+0x67/0xf0 [ 51.263150] __x64_sys_write+0x19/0x20 [ 51.266901] do_syscall_64+0x38/0x90 [ 51.270479] entry_SYSCALL_64_after_hwframe+0x61/0xcb [ 51.275534] RIP: 0033:0x7f5afcef31d7 [ 51.279112] Code: 0f 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24 [ 51.297859] RSP: 002b:00007ffd40638738 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 51.305425] RAX: ffffffffffffffda RBX: 0000000000000001 RCX: 00007f5afcef31d7 [ 51.312557] RDX: 0000000000000001 RSI: 00000000016f1480 RDI: 0000000000000003 [ 51.319689] RBP: 00000000016f1480 R08: 0000000000000001 R09: 0000000000000001 [ 51.326812] R10: 0000000000001000 R11: 0000000000000246 R12: 0000000000000001 [ 51.333938] R13: 00000000016f12a0 R14: 0000000000000001 R15: 00007f5afcfe87a0 [ 51.341073] </TASK> [ 51.343264] ---[ end trace 3420625c1fbde9e9 ]--- ges_Rsvd is 3. [ 51.348004] hugemmap05 (590): drop_caches: 3
Quoted 1 line
hugemmap05.c:253: TINFO: First hex is 7070707
I hit this warning too.
It seems that we need this patch for 5.15.y
commit 0ebeebcf59601bcfa0284f4bb7abdec051eb856d
Author: Dave Wysochanski <[email protected]> Date: Sun Oct 10 18:23:13 2021 -0400
NFS: Fix WARN_ON due to unionization of nfs_inode.nrequests
Fixes the following WARN_ON
WARNING: CPU: 2 PID: 18678 at fs/nfs/inode.c:123 nfs_clear_inode+0x3b/0x50 [nfs]
...
Call Trace:
nfs4_evict_inode+0x57/0x70 [nfsv4]
evict+0xd1/0x180Best Regards
Wang Yugui ([email protected])
2022/09/15
Quoted 87 lines · Wang Yugui
Hi,
Quoted 65 lines
I have not bisected the reported problem.
hugemmap05.c:99: TINFO: check
/proc/meminfobefore allocation. hugemmap05.c:278: TINFO:HugePages_Totalis 3. hugemmap05.c:278: TINFO:HugePages_Freeis 3. hugemmap05.c:278: TINFO:HugePages_Surpis 1.
hugemmap05.c:27[ 51.077819] ------------[ cut here ]------------[ 51.082692] WARNING: CPU: 0 PID: 590 at fs/nfs/inode.c:123 nfs_evict_inode+0x58/0x70 [ 51.090451] Modules linked in: x86_pkg_temp_thermal [ 51.095329] CPU: 0 PID: 590 Comm: hugemmap05 Not tainted 5.15.68-rc1 #1 [ 51.101948] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.5 11/26/2020 [ 51.109340] RIP: 0010:nfs_evict_inode+0x58/0x70 [ 51.113872] Code: 29 49 8b 54 24 90 49 8d 44 24 90 48 39 c2 75 2b 4c 89 e7 e8 7a d8 ff ff 4c 89 e7 e8 82 74 ff ff 4c 8b 65 f8 c9 c3 cc cc cc cc <0f> 0b 49 8b 54 24 90 49 8d 44 24 90 48 39 c2 74 d5 0f 0b eb d1 0f [ 51.132626] RSP: 0018:ffffb6b140a8fb90 EFLAGS: 00010286 [ 51.137861] RAX: adacafaea9a8abaa RBX: ffff937fa606a2c0 RCX: ffffb6b140a8fbd0 [ 51.144986] RDX: ffff937fa606a2d0 RSI: ffffffffbc720682 RDI: ffffffffbc5ec05f [ 51.152120] RBP: ffffb6b140a8fb98 R08: 0000000000000000 R09: ffffb6b140a8fcf0 [ 51.159253] R10: 0000000000000000 R11: 0000000000000002 R12: ffff937fa606a1a8 [ 51.166395] R13: ffffffffbd851b40 R14: ffff937c40803870 R15: 0000000000000003 [ 51.173525] FS: 00007f5afcdf4740(0000) GS:ffff937fa7a00000(0000) knlGS:0000000000000000 [ 51.181602] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 51.187359] CR2: 00007f5afcf10680 CR3: 000000010360a006 CR4: 00000000003706f0 8: TINFO: HugePa[ 51.194499] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 51.203009] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 51.210135] Call Trace: [ 51.212585] <TASK> [ 51.214684] evict+0xc8/0x180 [ 51.217682] prune_icache_sb+0x81/0xc0 [ 51.221435] super_cache_scan+0x169/0x200 [ 51.225447] do_shrink_slab+0x13f/0x2b0 [ 51.229288] shrink_slab+0x186/0x2a0 [ 51.232868] drop_slab_node+0x4a/0xa0 [ 51.236533] drop_slab+0x41/0x90 [ 51.239765] drop_caches_sysctl_handler+0x79/0x90 [ 51.244471] proc_sys_call_handler+0x159/0x290 [ 51.248918] proc_sys_write+0x13/0x20 [ 51.252582] new_sync_write+0x111/0x1a0 [ 51.256423] vfs_write+0x1d5/0x270 [ 51.259828] ksys_write+0x67/0xf0 [ 51.263150] __x64_sys_write+0x19/0x20 [ 51.266901] do_syscall_64+0x38/0x90 [ 51.270479] entry_SYSCALL_64_after_hwframe+0x61/0xcb [ 51.275534] RIP: 0033:0x7f5afcef31d7 [ 51.279112] Code: 0f 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24 [ 51.297859] RSP: 002b:00007ffd40638738 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 51.305425] RAX: ffffffffffffffda RBX: 0000000000000001 RCX: 00007f5afcef31d7 [ 51.312557] RDX: 0000000000000001 RSI: 00000000016f1480 RDI: 0000000000000003 [ 51.319689] RBP: 00000000016f1480 R08: 0000000000000001 R09: 0000000000000001 [ 51.326812] R10: 0000000000001000 R11: 0000000000000246 R12: 0000000000000001 [ 51.333938] R13: 00000000016f12a0 R14: 0000000000000001 R15: 00007f5afcfe87a0 [ 51.341073] </TASK> [ 51.343264] ---[ end trace 3420625c1fbde9e9 ]--- ges_Rsvd is 3. [ 51.348004] hugemmap05 (590): drop_caches: 3Quoted 1 line
hugemmap05.c:253: TINFO: First hex is 7070707
I hit this warning too.
It seems that we need this patch for 5.15.y
commit
0ebeebcf59601bcfa0284f4bb7abdec051eb856dAuthor: Dave Wysochanski <[email protected]> Date: Sun Oct 10 18:23:13 2021 -0400NFS: Fix WARN_ON due to unionization of nfs_inode.nrequests Fixes the following WARN_ON WARNING: CPU: 2 PID: 18678 at fs/nfs/inode.c:123 nfs_clear_inode+0x3b/0x50 [nfs] ... Call Trace: nfs4_evict_inode+0x57/0x70 [nfsv4] evict+0xd1/0x180
Quoted 5 lines
Best Regards
Wang Yugui ([email protected])
2022/09/15
Sorry, commit 0ebeebcf59601bcfa0284f4bb7abdec051eb856d probably should have had this
Greg Kroah-Hartman
maintainerQuoted 94 lines · David Wysochanski
Quoted 87 lines · Wang Yugui
Hi,
Quoted 65 lines
I have not bisected the reported problem.
hugemmap05.c:99: TINFO: check
/proc/meminfobefore allocation. hugemmap05.c:278: TINFO:HugePages_Totalis 3. hugemmap05.c:278: TINFO:HugePages_Freeis 3. hugemmap05.c:278: TINFO:HugePages_Surpis 1.
hugemmap05.c:27[ 51.077819] ------------[ cut here ]------------[ 51.082692] WARNING: CPU: 0 PID: 590 at fs/nfs/inode.c:123 nfs_evict_inode+0x58/0x70 [ 51.090451] Modules linked in: x86_pkg_temp_thermal [ 51.095329] CPU: 0 PID: 590 Comm: hugemmap05 Not tainted 5.15.68-rc1 #1 [ 51.101948] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.5 11/26/2020 [ 51.109340] RIP: 0010:nfs_evict_inode+0x58/0x70 [ 51.113872] Code: 29 49 8b 54 24 90 49 8d 44 24 90 48 39 c2 75 2b 4c 89 e7 e8 7a d8 ff ff 4c 89 e7 e8 82 74 ff ff 4c 8b 65 f8 c9 c3 cc cc cc cc <0f> 0b 49 8b 54 24 90 49 8d 44 24 90 48 39 c2 74 d5 0f 0b eb d1 0f [ 51.132626] RSP: 0018:ffffb6b140a8fb90 EFLAGS: 00010286 [ 51.137861] RAX: adacafaea9a8abaa RBX: ffff937fa606a2c0 RCX: ffffb6b140a8fbd0 [ 51.144986] RDX: ffff937fa606a2d0 RSI: ffffffffbc720682 RDI: ffffffffbc5ec05f [ 51.152120] RBP: ffffb6b140a8fb98 R08: 0000000000000000 R09: ffffb6b140a8fcf0 [ 51.159253] R10: 0000000000000000 R11: 0000000000000002 R12: ffff937fa606a1a8 [ 51.166395] R13: ffffffffbd851b40 R14: ffff937c40803870 R15: 0000000000000003 [ 51.173525] FS: 00007f5afcdf4740(0000) GS:ffff937fa7a00000(0000) knlGS:0000000000000000 [ 51.181602] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 51.187359] CR2: 00007f5afcf10680 CR3: 000000010360a006 CR4: 00000000003706f0 8: TINFO: HugePa[ 51.194499] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 51.203009] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 51.210135] Call Trace: [ 51.212585] <TASK> [ 51.214684] evict+0xc8/0x180 [ 51.217682] prune_icache_sb+0x81/0xc0 [ 51.221435] super_cache_scan+0x169/0x200 [ 51.225447] do_shrink_slab+0x13f/0x2b0 [ 51.229288] shrink_slab+0x186/0x2a0 [ 51.232868] drop_slab_node+0x4a/0xa0 [ 51.236533] drop_slab+0x41/0x90 [ 51.239765] drop_caches_sysctl_handler+0x79/0x90 [ 51.244471] proc_sys_call_handler+0x159/0x290 [ 51.248918] proc_sys_write+0x13/0x20 [ 51.252582] new_sync_write+0x111/0x1a0 [ 51.256423] vfs_write+0x1d5/0x270 [ 51.259828] ksys_write+0x67/0xf0 [ 51.263150] __x64_sys_write+0x19/0x20 [ 51.266901] do_syscall_64+0x38/0x90 [ 51.270479] entry_SYSCALL_64_after_hwframe+0x61/0xcb [ 51.275534] RIP: 0033:0x7f5afcef31d7 [ 51.279112] Code: 0f 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24 [ 51.297859] RSP: 002b:00007ffd40638738 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 51.305425] RAX: ffffffffffffffda RBX: 0000000000000001 RCX: 00007f5afcef31d7 [ 51.312557] RDX: 0000000000000001 RSI: 00000000016f1480 RDI: 0000000000000003 [ 51.319689] RBP: 00000000016f1480 R08: 0000000000000001 R09: 0000000000000001 [ 51.326812] R10: 0000000000001000 R11: 0000000000000246 R12: 0000000000000001 [ 51.333938] R13: 00000000016f12a0 R14: 0000000000000001 R15: 00007f5afcfe87a0 [ 51.341073] </TASK> [ 51.343264] ---[ end trace 3420625c1fbde9e9 ]--- ges_Rsvd is 3. [ 51.348004] hugemmap05 (590): drop_caches: 3Quoted 1 line
hugemmap05.c:253: TINFO: First hex is 7070707
I hit this warning too.
It seems that we need this patch for 5.15.y
commit
0ebeebcf59601bcfa0284f4bb7abdec051eb856dAuthor: Dave Wysochanski <[email protected]> Date: Sun Oct 10 18:23:13 2021 -0400NFS: Fix WARN_ON due to unionization of nfs_inode.nrequests Fixes the following WARN_ON WARNING: CPU: 2 PID: 18678 at fs/nfs/inode.c:123 nfs_clear_inode+0x3b/0x50 [nfs] ... Call Trace: nfs4_evict_inode+0x57/0x70 [nfsv4] evict+0xd1/0x180Quoted 5 lines
Best Regards
Wang Yugui ([email protected])
2022/09/15
Quoted 3 lines
Sorry, commit
0ebeebcf59601bcfa0284f4bb7abdec051eb856dprobably should have had thisFixes e591b298d7ec "NFS: Save some space in the inode"
Now queued up, thanks.
greg k-h