6.6.89-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 1/204 module: sign with sha512 instead of sha1 by default
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Leemhuis <[email protected]>
commit f3b93547b91ad849b58eb5ab2dd070950ad7beb3 upstream.
Switch away from using sha1 for module signing by default and use the more modern sha512 instead, which is what among others Arch, Fedora, RHEL, and Ubuntu are currently using for their kernels.
Sha1 has not been considered secure against well-funded opponents since 2005[1]; since 2011 the NIST and other organizations furthermore recommended its replacement[2]. This is why OpenSSL on RHEL9, Fedora Linux 41+[3], and likely some other current and future distributions reject the creation of sha1 signatures, which leads to a build error of allmodconfig configurations:
80A20474797F0000:error:03000098:digital envelope routines:do_sigver_init:invalid digest:crypto/evp/m_sigver.c:342:
make[4]: *** [.../certs/Makefile:53: certs/signing_key.pem] Error 1
make[4]: *** Deleting file 'certs/signing_key.pem'
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [.../scripts/Makefile.build:478: certs] Error 2
make[2]: *** [.../Makefile:1936: .] Error 2
make[1]: *** [.../Makefile:224: __sub-make] Error 2
make[1]: Leaving directory '...'
make: *** [Makefile:224: __sub-make] Error 2
This change makes allmodconfig work again and sets a default that is more appropriate for current and future users, too.
--- kernel/module/Kconfig | 1 + 1 file changed, 1 insertion(+)
kernel/module/Kconfig +1 -0
@@ -229,6 +229,7 @@ comment "Do not forget to sign required choice prompt "Which hash algorithm should modules be signed with?" depends on MODULE_SIG || IMA_APPRAISE_MODSIG + default MODULE_SIG_SHA512 help This determines which sort of hashing algorithm will be used during signature generation. This algorithm _must_ be built into the kernel
Greg Kroah-Hartman
maintainerPATCH 10/204 media: subdev: Add v4l2_subdev_is_streaming()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 5f3ce14fae742d1d23061c3122d93edb879ebf53 ]
Add a helper function which returns whether the subdevice is streaming, i.e. if .s_stream or .enable_streams has been called successfully.
Stable-dep-of: 36cef585e2a3 ("media: vimc: skip .s_stream() for stopped entities")
--- drivers/media/v4l2-core/v4l2-subdev.c | 25 +++++++++++++++++++++++++ include/media/v4l2-subdev.h | 13 +++++++++++++ 2 files changed, 38 insertions(+)
drivers/media/v4l2-core/v4l2-subdev.c +25 -0
@@ -2240,6 +2240,31 @@ void v4l2_subdev_notify_event(struct v4l2_subdev *sd, }EXPORT_SYMBOL_GPL (v4l2_subdev_notify_event); +bool v4l2_subdev_is_streaming (struct v4l2_subdev *sd) +{ +struct v4l2_subdev_state *state; + +if (!v4l2_subdev_has_op (sd, pad, enable_streams)) +return sd->s_stream_enabled; + +if (!(sd->flags &V4L2_SUBDEV_FL_STREAMS )) +return !!sd->enabled_pads; + + state =v4l2_subdev_get_locked_active_state (sd); + +for (unsigned int i =0 ; i < state->stream_configs.num_configs; ++i) { +const struct v4l2_subdev_stream_config *cfg; + + cfg = &state->stream_configs.configs[i]; + +if (cfg->enabled) +return true; + } + +return false; +} +EXPORT_SYMBOL_GPL (v4l2_subdev_is_streaming); +int v4l2_subdev_get_privacy_led (struct v4l2_subdev *sd) {#if IS_REACHABLE (CONFIG_LEDS_CLASS )
include/media/v4l2-subdev.h +13 -0
@@ -1918,4 +1918,17 @@ extern const struct v4l2_subdev_ops v4l2_subdev_call_wrappers;void v4l2_subdev_notify_event (struct v4l2_subdev *sd,const struct v4l2_event *ev); +/** +* v4l2_subdev_is_streaming() - Returns if the subdevice is streaming +* @sd: The subdevice +* +* v4l2_subdev_is_streaming() tells if the subdevice is currently streaming. +* "Streaming" here means whether .s_stream() or .enable_streams() has been +* successfully called, and the streaming has not yet been disabled. +* +* If the subdevice implements .enable_streams() this function must be called +* while holding the active state lock. +*/ +bool v4l2_subdev_is_streaming (struct v4l2_subdev *sd); +#endif /* _V4L2_SUBDEV_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 11/204 media: vimc: skip .s_stream() for stopped entities
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
[ Upstream commit 36cef585e2a31e4ddf33a004b0584a7a572246de ]
Syzbot reported [1] a warning prompted by a check in call_s_stream() that checks whether .s_stream() operation is warranted for unstarted or stopped subdevs.
Add a simple fix in vimc_streamer_pipeline_terminate() ensuring that entities skip a call to .s_stream() unless they have been previously properly started.
[1] Syzbot report:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 5933 at drivers/media/v4l2-core/v4l2-subdev.c:460 call_s_stream+0x2df/0x350 drivers/media/v4l2-core/v4l2-subdev.c:460 Modules linked in: CPU: 0 UID: 0 PID: 5933 Comm: syz-executor330 Not tainted 6.13.0-rc2-syzkaller-00362-g2d8308bf5b67 #0 ... Call Trace: <TASK> vimc_streamer_pipeline_terminate+0x218/0x320 drivers/media/test-drivers/vimc/vimc-streamer.c:62 vimc_streamer_pipeline_init drivers/media/test-drivers/vimc/vimc-streamer.c:101 [inline] vimc_streamer_s_stream+0x650/0x9a0 drivers/media/test-drivers/vimc/vimc-streamer.c:203 vimc_capture_start_streaming+0xa1/0x130 drivers/media/test-drivers/vimc/vimc-capture.c:256 vb2_start_streaming+0x15f/0x5a0 drivers/media/common/videobuf2/videobuf2-core.c:1789 vb2_core_streamon+0x2a7/0x450 drivers/media/common/videobuf2/videobuf2-core.c:2348 vb2_streamon drivers/media/common/videobuf2/videobuf2-v4l2.c:875 [inline] vb2_ioctl_streamon+0xf4/0x170 drivers/media/common/videobuf2/videobuf2-v4l2.c:1118 __video_do_ioctl+0xaf0/0xf00 drivers/media/v4l2-core/v4l2-ioctl.c:3122 video_usercopy+0x4d2/0x1620 drivers/media/v4l2-core/v4l2-ioctl.c:3463 v4l2_ioctl+0x1ba/0x250 drivers/media/v4l2-core/v4l2-dev.c:366 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:906 [inline] __se_sys_ioctl fs/ioctl.c:892 [inline] __x64_sys_ioctl+0x190/0x200 fs/ioctl.c:892 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xcd/0x250 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f2b85c01b19
...
--- drivers/media/test-drivers/vimc/vimc-streamer.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/test-drivers/vimc/vimc-streamer.c +6 -0
@@ -59,6 +59,12 @@ static void vimc_streamer_pipeline_terminate(struct vimc_stream *stream)continue ; sd =media_entity_to_v4l2_subdev (ved->ent); +/* +* Do not call .s_stream() to stop an already +* stopped/unstarted subdev. +*/ +if (!v4l2_subdev_is_streaming (sd)) +continue ;v4l2_subdev_call (sd, video, s_stream,0 ); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 12/204 soc: qcom: ice: introduce devm_of_qcom_ice_get
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit 1c13d6060d612601a61423f2e8fbf9e48126acca ]
Callers of of_qcom_ice_get() leak the device reference taken by of_find_device_by_node(). Introduce devm variant for of_qcom_ice_get(). Existing consumers need the ICE instance for the entire life of their device, thus exporting qcom_ice_put() is not required.
Stable-dep-of: cbef7442fba5 ("mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get")
--- drivers/soc/qcom/ice.c | 48 ++++++++++++++++++++++++++++++++++++++++++ include/soc/qcom/ice.h | 2 ++ 2 files changed, 50 insertions(+)
drivers/soc/qcom/ice.c +48 -0
@@ -10,6 +10,7 @@#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/device.h> #include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_platform.h>
@@ -328,6 +329,53 @@ struct qcom_ice *of_qcom_ice_get(struct device *dev) }EXPORT_SYMBOL_GPL (of_qcom_ice_get); +static void qcom_ice_put (const struct qcom_ice *ice) +{ +struct platform_device *pdev =to_platform_device (ice->dev); + +if (!platform_get_resource_byname (pdev,IORESOURCE_MEM ,"ice" )) +platform_device_put (pdev); +} + +static void devm_of_qcom_ice_put (struct device *dev,void *res) +{ +qcom_ice_put (*(struct qcom_ice **)res); +} + +/** +* devm_of_qcom_ice_get() - Devres managed helper to get an ICE instance from +* a DT node. +* @dev: device pointer for the consumer device. +* +* This function will provide an ICE instance either by creating one for the +* consumer device if its DT node provides the 'ice' reg range and the 'ice' +* clock (for legacy DT style). On the other hand, if consumer provides a +* phandle via 'qcom,ice' property to an ICE DT, the ICE instance will already +* be created and so this function will return that instead. +* +* Return: ICE pointer on success, NULL if there is no ICE data provided by the +* consumer or ERR_PTR() on error. +*/ +struct qcom_ice *devm_of_qcom_ice_get (struct device *dev) +{ +struct qcom_ice *ice, **dr; + + dr =devres_alloc (devm_of_qcom_ice_put,sizeof (*dr),GFP_KERNEL ); +if (!dr) +return ERR_PTR (-ENOMEM ); + + ice =of_qcom_ice_get (dev); +if (!IS_ERR_OR_NULL (ice)) { + *dr = ice; +devres_add (dev, dr); + }else { +devres_free (dr); + } + +return ice; +} +EXPORT_SYMBOL_GPL (devm_of_qcom_ice_get); +static int qcom_ice_probe (struct platform_device *pdev) {struct qcom_ice *engine;
include/soc/qcom/ice.h +2 -0
@@ -34,4 +34,6 @@ int qcom_ice_program_key(struct qcom_ice *ice, int slot);int qcom_ice_evict_key (struct qcom_ice *ice,int slot);struct qcom_ice *of_qcom_ice_get (struct device *dev); +struct qcom_ice *devm_of_qcom_ice_get (struct device *dev); +#endif /* __QCOM_ICE_H__ */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 13/204 mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit cbef7442fba510b7eb229dcc9f39d3dde4a159a4 ]
The driver leaks the device reference taken with of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get().
--- drivers/mmc/host/sdhci-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-msm.c +1 -1
@@ -1866,7 +1866,7 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *msm_host,if (!(cqhci_readl (cq_host,CQHCI_CAP ) &CQHCI_CAP_CS ))return 0 ; - ice =of_qcom_ice_get (dev); + ice =devm_of_qcom_ice_get (dev);if (ice ==ERR_PTR (-EOPNOTSUPP )) {dev_warn (dev,"Disabling inline encryption support\n" ); ice =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 14/204 auxdisplay: hd44780: Convert to platform remove callback returning void
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 9ea02f7cc39d484d16e8a14f3713fefcd33407c0 ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 9b98a7d2e5f4 ("auxdisplay: hd44780: Fix an API misuse in hd44780.c")
--- drivers/auxdisplay/hd44780.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/auxdisplay/hd44780.c +2 -3
@@ -319,7 +319,7 @@ static int hd44780_probe(struct platform_device *pdev)return ret; } -static int hd44780_remove (struct platform_device *pdev) +static void hd44780_remove (struct platform_device *pdev) {struct charlcd *lcd =platform_get_drvdata (pdev);struct hd44780_common *hdc = lcd->drvdata;
@@ -329,7 +329,6 @@ static int hd44780_remove(struct platform_device *pdev)kfree (lcd->drvdata);kfree (lcd); -return 0 ; }static const struct of_device_id hd44780_of_match[] = {
@@ -340,7 +339,7 @@ MODULE_DEVICE_TABLE(of, hd44780_of_match);static struct platform_driver hd44780_driver = { .probe = hd44780_probe, - .remove = hd44780_remove, + .remove_new = hd44780_remove, .driver = { .name ="hd44780" , .of_match_table = hd44780_of_match,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 15/204 auxdisplay: hd44780: Fix an API misuse in hd44780.c
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
[ Upstream commit 9b98a7d2e5f4e2beeff88f6571da0cdc5883c7fb ]
Variable allocated by charlcd_alloc() should be released by charlcd_free(). The following patch changed kfree() to charlcd_free() to fix an API misuse.
--- drivers/auxdisplay/hd44780.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/auxdisplay/hd44780.c +2 -2
@@ -313,7 +313,7 @@ static int hd44780_probe(struct platform_device *pdev) fail3:kfree (hd); fail2: -kfree (lcd); +charlcd_free (lcd); fail1:kfree (hdc);return ret;
@@ -328,7 +328,7 @@ static void hd44780_remove(struct platform_device *pdev)kfree (hdc->hd44780);kfree (lcd->drvdata); -kfree (lcd); +charlcd_free (lcd); }static const struct of_device_id hd44780_of_match[] = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 16/204 net: dsa: mv88e6xxx: fix internal PHYs for 6320 family
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
[ Upstream commit 52fdc41c3278c981066a461d03d5477ebfcf270c ]
Fix internal PHYs definition for the 6320 family, which has only 2 internal PHYs (on ports 3 and 4).
--- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +4 -2
@@ -6114,7 +6114,8 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_databases = 4096, .num_macs = 8192, .num_ports = 7, - .num_internal_phys = 5, + .num_internal_phys = 2, + .internal_phys_offset = 3, .num_gpio = 15, .max_vid = 4095, .port_base_addr = 0x10,
@@ -6139,7 +6140,8 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_databases = 4096, .num_macs = 8192, .num_ports = 7, - .num_internal_phys = 5, + .num_internal_phys = 2, + .internal_phys_offset = 3, .num_gpio = 15, .max_vid = 4095, .port_base_addr = 0x10,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 17/204 net: dsa: mv88e6xxx: fix VTU methods for 6320 family
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
[ Upstream commit f9a457722cf5e3534be5ffab549d6b49737fca72 ]
The VTU registers of the 6320 family use the 6352 semantics, not 6185. Fix it.
--- drivers/net/dsa/mv88e6xxx/chip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +4 -4
@@ -5071,8 +5071,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops,
@@ -5120,8 +5120,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 18/204 ASoC: qcom: q6apm-dai: drop unused q6apm_dai_rtd fields
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit bd381c9d151467e784988bbacf22bd7ca02455d6 ]
Remove few unused fields from 'struct q6apm_dai_rtd'.
Stable-dep-of: 3d4a4411aa8b ("ASoC: q6apm-dai: schedule all available frames to avoid dsp under-runs")
--- sound/soc/qcom/qdsp6/q6apm-dai.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
sound/soc/qcom/qdsp6/q6apm-dai.c +2 -8
@@ -70,14 +70,10 @@ struct q6apm_dai_rtd {unsigned int bytes_received;unsigned int copied_total;uint16_t bits_per_sample; -uint16_t source;/* Encoding source bit mask */ -uint16_t session_id;bool next_track;enum stream_state state;struct q6apm_graph *graph;spinlock_t lock; -uint32_t initial_samples_drop; -uint32_t trailing_samples_drop;bool notify_on_drain; };
@@ -721,14 +717,12 @@ static int q6apm_dai_compr_set_metadata(struct snd_soc_component *component,switch (metadata->key) {case SNDRV_COMPRESS_ENCODER_PADDING : - prtd->trailing_samples_drop = metadata->value[0 ];q6apm_remove_trailing_silence (component->dev, prtd->graph, - prtd->trailing_samples_drop); + metadata->value[0 ]);break ;case SNDRV_COMPRESS_ENCODER_DELAY : - prtd->initial_samples_drop = metadata->value[0 ];q6apm_remove_initial_silence (component->dev, prtd->graph, - prtd->initial_samples_drop); + metadata->value[0 ]);break ;default : ret = -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 19/204 ASoC: q6apm-dai: schedule all available frames to avoid dsp under-runs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Kandagatla <[email protected]>
[ Upstream commit 3d4a4411aa8bbc3653ff22a1ff0432eb93d22ae0 ]
With the existing code, we are only setting up one period at a time, in a ping-pong buffer style. This triggers lot of underruns in the dsp leading to jitter noise during audio playback.
Fix this by scheduling all available periods, this will ensure that the dsp has enough buffer feed and ultimatley fixing the underruns and audio distortion.
--- sound/soc/qcom/qdsp6/q6apm-dai.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)
sound/soc/qcom/qdsp6/q6apm-dai.c +23 -5
@@ -70,6 +70,7 @@ struct q6apm_dai_rtd {unsigned int bytes_received;unsigned int copied_total;uint16_t bits_per_sample; +snd_pcm_uframes_t queue_ptr;bool next_track;enum stream_state state;struct q6apm_graph *graph;
@@ -134,8 +135,6 @@ static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, vo prtd->pos += prtd->pcm_count;spin_unlock_irqrestore (&prtd->lock, flags);snd_pcm_period_elapsed (substream); -if (prtd->state ==Q6APM_STREAM_RUNNING ) -q6apm_write_async (prtd->graph, prtd->pcm_count,0 ,0 ,0 );break ;case APM_CLIENT_EVENT_DATA_READ_DONE :
@@ -293,6 +292,27 @@ static int q6apm_dai_prepare(struct snd_soc_component *component,return 0 ; } +static int q6apm_dai_ack (struct snd_soc_component *component,struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; +struct q6apm_dai_rtd *prtd = runtime->private_data; +int i, ret =0 , avail_periods; + +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { + avail_periods = (runtime->control->appl_ptr - prtd->queue_ptr)/runtime->period_size; +for (i =0 ; i < avail_periods; i++) { + ret =q6apm_write_async (prtd->graph, prtd->pcm_count,0 ,0 ,NO_TIMESTAMP ); +if (ret <0 ) { +dev_err (component->dev,"Error queuing playback buffer %d\n" , ret); +return ret; + } + prtd->queue_ptr += runtime->period_size; + } + } + +return ret; +} +static int q6apm_dai_trigger (struct snd_soc_component *component,struct snd_pcm_substream *substream,int cmd) {
@@ -304,9 +324,6 @@ static int q6apm_dai_trigger(struct snd_soc_component *component,case SNDRV_PCM_TRIGGER_START :case SNDRV_PCM_TRIGGER_RESUME :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : -/* start writing buffers for playback only as we already queued capture buffers */ -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) - ret =q6apm_write_async (prtd->graph, prtd->pcm_count,0 ,0 ,0 );break ;case SNDRV_PCM_TRIGGER_STOP :/* TODO support be handled via SoftPause Module */
@@ -834,6 +851,7 @@ static const struct snd_soc_component_driver q6apm_fe_dai_component = { .hw_params = q6apm_dai_hw_params, .pointer = q6apm_dai_pointer, .trigger = q6apm_dai_trigger, + .ack = q6apm_dai_ack, .compress_ops = &q6apm_dai_compress_ops, .use_dai_pcm_id = true, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 2/204 memcg: drain obj stock on cpu hotplug teardown
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shakeel Butt <[email protected]>
[ Upstream commit 9f01b4954490d4ccdbcc2b9be34a9921ceee9cbb ]
Currently on cpu hotplug teardown, only memcg stock is drained but we need to drain the obj stock as well otherwise we will miss the stats accumulated on the target cpu as well as the nr_bytes cached. The stats include MEMCG_KMEM, NR_SLAB_RECLAIMABLE_B & NR_SLAB_UNRECLAIMABLE_B. In addition we are leaking reference to struct obj_cgroup object.
--- mm/memcontrol.c | 9 +++++++++ 1 file changed, 9 insertions(+)
mm/memcontrol.c +9 -0
@@ -2378,9 +2378,18 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)static int memcg_hotplug_cpu_dead (unsigned int cpu) {struct memcg_stock_pcp *stock; +struct obj_cgroup *old; +unsigned long flags; stock = &per_cpu (memcg_stock, cpu); + +/* drain_obj_stock requires stock_lock */ +local_lock_irqsave (&memcg_stock.stock_lock, flags); + old =drain_obj_stock (stock); +local_unlock_irqrestore (&memcg_stock.stock_lock, flags); +drain_stock (stock); +obj_cgroup_put (old);return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 20/204 ASoC: qcom: lpass: Make asoc_qcom_lpass_cpu_platform_remove() return void
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit d0cc676c426d1958989fac2a0d45179fb9992f0a ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void.
asoc_qcom_lpass_cpu_platform_remove() returned zero unconditionally. Make it return void instead and convert all users to struct platform_device::remove_new().
Stable-dep-of: a93dad6f4e6a ("ASoC: q6apm-dai: make use of q6apm_get_hw_pointer")
--- sound/soc/qcom/lpass-apq8016.c | 2 +- sound/soc/qcom/lpass-cpu.c | 5 +---- sound/soc/qcom/lpass-ipq806x.c | 2 +- sound/soc/qcom/lpass-sc7180.c | 2 +- sound/soc/qcom/lpass-sc7280.c | 2 +- sound/soc/qcom/lpass.h | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-)
sound/soc/qcom/lpass-apq8016.c +1 -1
@@ -300,7 +300,7 @@ static struct platform_driver apq8016_lpass_cpu_platform_driver = { .of_match_table = of_match_ptr(apq8016_lpass_cpu_device_id), }, .probe = asoc_qcom_lpass_cpu_platform_probe, - .remove = asoc_qcom_lpass_cpu_platform_remove, + .remove_new = asoc_qcom_lpass_cpu_platform_remove, };module_platform_driver (apq8016_lpass_cpu_platform_driver);
sound/soc/qcom/lpass-cpu.c +1 -4
@@ -1284,15 +1284,12 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) }EXPORT_SYMBOL_GPL (asoc_qcom_lpass_cpu_platform_probe); -int asoc_qcom_lpass_cpu_platform_remove (struct platform_device *pdev) +void asoc_qcom_lpass_cpu_platform_remove (struct platform_device *pdev) {struct lpass_data *drvdata =platform_get_drvdata (pdev);if (drvdata->variant->exit) drvdata->variant->exit (pdev); - - -return 0 ; }EXPORT_SYMBOL_GPL (asoc_qcom_lpass_cpu_platform_remove);
sound/soc/qcom/lpass-ipq806x.c +1 -1
@@ -172,7 +172,7 @@ static struct platform_driver ipq806x_lpass_cpu_platform_driver = { .of_match_table = of_match_ptr(ipq806x_lpass_cpu_device_id), }, .probe = asoc_qcom_lpass_cpu_platform_probe, - .remove = asoc_qcom_lpass_cpu_platform_remove, + .remove_new = asoc_qcom_lpass_cpu_platform_remove, };module_platform_driver (ipq806x_lpass_cpu_platform_driver);
sound/soc/qcom/lpass-sc7180.c +1 -1
@@ -315,7 +315,7 @@ static struct platform_driver sc7180_lpass_cpu_platform_driver = { .pm = &sc7180_lpass_pm_ops, }, .probe = asoc_qcom_lpass_cpu_platform_probe, - .remove = asoc_qcom_lpass_cpu_platform_remove, + .remove_new = asoc_qcom_lpass_cpu_platform_remove, .shutdown = asoc_qcom_lpass_cpu_platform_shutdown, };
sound/soc/qcom/lpass-sc7280.c +1 -1
@@ -445,7 +445,7 @@ static struct platform_driver sc7280_lpass_cpu_platform_driver = { .pm = &sc7280_lpass_pm_ops, }, .probe = asoc_qcom_lpass_cpu_platform_probe, - .remove = asoc_qcom_lpass_cpu_platform_remove, + .remove_new = asoc_qcom_lpass_cpu_platform_remove, .shutdown = asoc_qcom_lpass_cpu_platform_shutdown, };
sound/soc/qcom/lpass.h +1 -1
@@ -400,7 +400,7 @@ struct lpass_pcm_data {/* register the platform driver from the CPU DAI driver */ int asoc_qcom_lpass_platform_register (struct platform_device *); -int asoc_qcom_lpass_cpu_platform_remove (struct platform_device *pdev); +void asoc_qcom_lpass_cpu_platform_remove (struct platform_device *pdev);void asoc_qcom_lpass_cpu_platform_shutdown (struct platform_device *pdev);int asoc_qcom_lpass_cpu_platform_probe (struct platform_device *pdev);extern const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 21/204 ASoC: qcom: Fix trivial code style issues
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit bb3392453d3ba44e60b85381e3bfa3c551a44e5d ]
Fix few trivial code style issues, pointed out by checkpatch, so they do not get copied to new code (when old code is used as template):
WARNING: Prefer "GPL" over "GPL v2" - see commit bf7fbeeae6db ("module: Cure the MODULE_LICENSE "GPL" vs. "GPL v2" bogosity")
WARNING: function definition argument 'struct platform_device *' should also have an identifier name
ERROR: code indent should use tabs where possible
WARNING: please, no spaces at the start of a line
WARNING: Missing a blank line after declarations
WARNING: unnecessary whitespace before a quoted newline
Stable-dep-of: a93dad6f4e6a ("ASoC: q6apm-dai: make use of q6apm_get_hw_pointer")
--- sound/soc/qcom/apq8016_sbc.c | 2 +- sound/soc/qcom/apq8096.c | 2 +- sound/soc/qcom/common.c | 2 +- sound/soc/qcom/lpass-apq8016.c | 2 +- sound/soc/qcom/lpass-cpu.c | 2 +- sound/soc/qcom/lpass-hdmi.c | 2 +- sound/soc/qcom/lpass-ipq806x.c | 2 +- sound/soc/qcom/lpass-platform.c | 2 +- sound/soc/qcom/lpass-sc7180.c | 2 +- sound/soc/qcom/lpass.h | 2 +- sound/soc/qcom/qdsp6/q6afe.c | 8 ++++---- sound/soc/qcom/qdsp6/q6apm-dai.c | 4 ++-- sound/soc/qcom/qdsp6/q6asm.h | 20 ++++++++++---------- sound/soc/qcom/qdsp6/topology.c | 3 ++- sound/soc/qcom/sc7180.c | 2 +- sound/soc/qcom/sc8280xp.c | 2 +- sound/soc/qcom/sdm845.c | 2 +- sound/soc/qcom/sdw.c | 2 +- sound/soc/qcom/sm8250.c | 2 +- sound/soc/qcom/storm.c | 2 +- 20 files changed, 34 insertions(+), 33 deletions(-)
sound/soc/qcom/apq8016_sbc.c +1 -1
@@ -343,4 +343,4 @@ module_platform_driver(apq8016_sbc_platform_driver);MODULE_AUTHOR ("Srinivas Kandagatla <[email protected]" );MODULE_DESCRIPTION ("APQ8016 ASoC Machine Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/apq8096.c +1 -1
@@ -142,4 +142,4 @@ static struct platform_driver msm_snd_apq8096_driver = {module_platform_driver (msm_snd_apq8096_driver);MODULE_AUTHOR ("Srinivas Kandagatla <[email protected]" );MODULE_DESCRIPTION ("APQ8096 ASoC Machine Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/common.c +1 -1
@@ -239,4 +239,4 @@ int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd,return 0 ; }EXPORT_SYMBOL_GPL (qcom_snd_wcd_jack_setup); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/lpass-apq8016.c +1 -1
@@ -305,5 +305,5 @@ static struct platform_driver apq8016_lpass_cpu_platform_driver = {module_platform_driver (apq8016_lpass_cpu_platform_driver);MODULE_DESCRIPTION ("APQ8016 LPASS CPU Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/lpass-cpu.c +1 -1
@@ -1304,4 +1304,4 @@ void asoc_qcom_lpass_cpu_platform_shutdown(struct platform_device *pdev)EXPORT_SYMBOL_GPL (asoc_qcom_lpass_cpu_platform_shutdown);MODULE_DESCRIPTION ("QTi LPASS CPU Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/lpass-hdmi.c +1 -1
@@ -251,4 +251,4 @@ const struct snd_soc_dai_ops asoc_qcom_lpass_hdmi_dai_ops = {EXPORT_SYMBOL_GPL (asoc_qcom_lpass_hdmi_dai_ops);MODULE_DESCRIPTION ("QTi LPASS HDMI Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/lpass-ipq806x.c +1 -1
@@ -177,4 +177,4 @@ static struct platform_driver ipq806x_lpass_cpu_platform_driver = {module_platform_driver (ipq806x_lpass_cpu_platform_driver);MODULE_DESCRIPTION ("QTi LPASS CPU Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/lpass-platform.c +1 -1
@@ -1383,4 +1383,4 @@ int asoc_qcom_lpass_platform_register(struct platform_device *pdev)EXPORT_SYMBOL_GPL (asoc_qcom_lpass_platform_register);MODULE_DESCRIPTION ("QTi LPASS Platform Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/lpass-sc7180.c +1 -1
@@ -322,4 +322,4 @@ static struct platform_driver sc7180_lpass_cpu_platform_driver = {module_platform_driver (sc7180_lpass_cpu_platform_driver);MODULE_DESCRIPTION ("SC7180 LPASS CPU DRIVER" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/lpass.h +1 -1
@@ -399,7 +399,7 @@ struct lpass_pcm_data { };/* register the platform driver from the CPU DAI driver */ -int asoc_qcom_lpass_platform_register (struct platform_device *); +int asoc_qcom_lpass_platform_register (struct platform_device *pdev);void asoc_qcom_lpass_cpu_platform_remove (struct platform_device *pdev);void asoc_qcom_lpass_cpu_platform_shutdown (struct platform_device *pdev);int asoc_qcom_lpass_cpu_platform_probe (struct platform_device *pdev);
sound/soc/qcom/qdsp6/q6afe.c +4 -4
@@ -552,13 +552,13 @@ struct q6afe_port { };struct afe_cmd_remote_lpass_core_hw_vote_request { -uint32_t hw_block_id; -char client_name[8 ]; +uint32_t hw_block_id; +char client_name[8 ]; } __packed;struct afe_cmd_remote_lpass_core_hw_devote_request { -uint32_t hw_block_id; -uint32_t client_handle; +uint32_t hw_block_id; +uint32_t client_handle; } __packed;
sound/soc/qcom/qdsp6/q6apm-dai.c +2 -2
@@ -131,14 +131,14 @@ static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, vo prtd->state =Q6APM_STREAM_STOPPED ;break ;case APM_CLIENT_EVENT_DATA_WRITE_DONE : -spin_lock_irqsave (&prtd->lock, flags); +spin_lock_irqsave (&prtd->lock, flags); prtd->pos += prtd->pcm_count;spin_unlock_irqrestore (&prtd->lock, flags);snd_pcm_period_elapsed (substream);break ;case APM_CLIENT_EVENT_DATA_READ_DONE : -spin_lock_irqsave (&prtd->lock, flags); +spin_lock_irqsave (&prtd->lock, flags); prtd->pos += prtd->pcm_count;spin_unlock_irqrestore (&prtd->lock, flags);snd_pcm_period_elapsed (substream);
sound/soc/qcom/qdsp6/q6asm.h +10 -10
@@ -36,16 +36,16 @@ enum {#define ASM_LAST_BUFFER_FLAG BIT(30)struct q6asm_flac_cfg { -u32 sample_rate; -u32 ext_sample_rate; -u32 min_frame_size; -u32 max_frame_size; -u16 stream_info_present; -u16 min_blk_size; -u16 max_blk_size; -u16 ch_cfg; -u16 sample_size; -u16 md5_sum; +u32 sample_rate; +u32 ext_sample_rate; +u32 min_frame_size; +u32 max_frame_size; +u16 stream_info_present; +u16 min_blk_size; +u16 max_blk_size; +u16 ch_cfg; +u16 sample_size; +u16 md5_sum; };struct q6asm_wma_cfg {
sound/soc/qcom/qdsp6/topology.c +2 -1
@@ -545,6 +545,7 @@ static struct audioreach_module *audioreach_parse_common_tokens(struct q6apm *apif (mod) {int pn, id =0 ; + mod->module_id = module_id; mod->max_ip_port = max_ip_port; mod->max_op_port = max_op_port;
@@ -1271,7 +1272,7 @@ int audioreach_tplg_init(struct snd_soc_component *component) ret =request_firmware (&fw, tplg_fw_name, dev);if (ret <0 ) { -dev_err (dev,"tplg firmware loading %s failed %d \n" , tplg_fw_name, ret); +dev_err (dev,"tplg firmware loading %s failed %d\n" , tplg_fw_name, ret); goto err; }
sound/soc/qcom/sc7180.c +1 -1
@@ -428,4 +428,4 @@ static struct platform_driver sc7180_snd_driver = {module_platform_driver (sc7180_snd_driver);MODULE_DESCRIPTION ("sc7180 ASoC Machine Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/sc8280xp.c +1 -1
@@ -174,4 +174,4 @@ static struct platform_driver snd_sc8280xp_driver = {module_platform_driver (snd_sc8280xp_driver);MODULE_AUTHOR ("Srinivas Kandagatla <[email protected]" );MODULE_DESCRIPTION ("SC8280XP ASoC Machine Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/sdm845.c +1 -1
@@ -625,4 +625,4 @@ static struct platform_driver sdm845_snd_driver = {module_platform_driver (sdm845_snd_driver);MODULE_DESCRIPTION ("sdm845 ASoC Machine Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/sdw.c +1 -1
@@ -117,4 +117,4 @@ int qcom_snd_sdw_hw_free(struct snd_pcm_substream *substream,return 0 ; }EXPORT_SYMBOL_GPL (qcom_snd_sdw_hw_free); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/sm8250.c +1 -1
@@ -170,4 +170,4 @@ static struct platform_driver snd_sm8250_driver = {module_platform_driver (snd_sm8250_driver);MODULE_AUTHOR ("Srinivas Kandagatla <[email protected]" );MODULE_DESCRIPTION ("SM8250 ASoC Machine Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
sound/soc/qcom/storm.c +1 -1
@@ -140,4 +140,4 @@ static struct platform_driver storm_platform_driver = {module_platform_driver (storm_platform_driver);MODULE_DESCRIPTION ("QTi IPQ806x-based Storm Machine Driver" ); -MODULE_LICENSE ("GPL v2" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 22/204 ASoC: q6apm-dai: make use of q6apm_get_hw_pointer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Kandagatla <[email protected]>
[ Upstream commit a93dad6f4e6a04a5943f6ee5686585f24abf7063 ]
With the existing code, the buffer position is only reset in pointer callback, which leaves the possiblity of it going over the size of buffer size and reporting incorrect position to userspace.
Without this patch, its possible to see errors like:
snd-x1e80100 sound: invalid position: pcmC0D0p:0, pos = 12288, buffer size = 12288, period size = 1536 snd-x1e80100 sound: invalid position: pcmC0D0p:0, pos = 12288, buffer size = 12288, period size = 1536
--- sound/soc/qcom/qdsp6/q6apm-dai.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-)
sound/soc/qcom/qdsp6/q6apm-dai.c +4 -19
@@ -64,7 +64,6 @@ struct q6apm_dai_rtd {phys_addr_t phys;unsigned int pcm_size;unsigned int pcm_count; -unsigned int pos;/* Buffer position */ unsigned int periods;unsigned int bytes_sent;unsigned int bytes_received;
@@ -124,23 +123,16 @@ static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, vo {struct q6apm_dai_rtd *prtd = priv;struct snd_pcm_substream *substream = prtd->substream; -unsigned long flags;switch (opcode) {case APM_CLIENT_EVENT_CMD_EOS_DONE : prtd->state =Q6APM_STREAM_STOPPED ;break ;case APM_CLIENT_EVENT_DATA_WRITE_DONE : -spin_lock_irqsave (&prtd->lock, flags); - prtd->pos += prtd->pcm_count; -spin_unlock_irqrestore (&prtd->lock, flags);snd_pcm_period_elapsed (substream);break ;case APM_CLIENT_EVENT_DATA_READ_DONE : -spin_lock_irqsave (&prtd->lock, flags); - prtd->pos += prtd->pcm_count; -spin_unlock_irqrestore (&prtd->lock, flags);snd_pcm_period_elapsed (substream);if (prtd->state ==Q6APM_STREAM_RUNNING )q6apm_read (prtd->graph);
@@ -246,7 +238,6 @@ static int q6apm_dai_prepare(struct snd_soc_component *component, } prtd->pcm_count =snd_pcm_lib_period_bytes (substream); - prtd->pos =0 ;/* rate and channels are sent to audio driver */ ret =q6apm_graph_media_format_shmem (prtd->graph, &cfg);if (ret <0 ) {
@@ -445,16 +436,12 @@ static snd_pcm_uframes_t q6apm_dai_pointer(struct snd_soc_component *component,struct snd_pcm_runtime *runtime = substream->runtime;struct q6apm_dai_rtd *prtd = runtime->private_data;snd_pcm_uframes_t ptr; -unsigned long flags; -spin_lock_irqsave (&prtd->lock, flags); -if (prtd->pos == prtd->pcm_size) - prtd->pos =0 ; - - ptr =bytes_to_frames (runtime, prtd->pos); -spin_unlock_irqrestore (&prtd->lock, flags); + ptr =q6apm_get_hw_pointer (prtd->graph, substream->stream) * runtime->period_size; +if (ptr) +return ptr -1 ; -return ptr; +return 0 ; } static int q6apm_dai_hw_params(struct snd_soc_component *component,
@@ -669,8 +656,6 @@ static int q6apm_dai_compr_set_params(struct snd_soc_component *component, prtd->pcm_size = runtime->fragments * runtime->fragment_size; prtd->bits_per_sample =16 ; - prtd->pos =0 ; -if (prtd->next_track != true) {memcpy (&prtd->codec, codec,sizeof (*codec));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 23/204 iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Cameron <[email protected]>
[ Upstream commit 0af1c801a15225304a6328258efbf2bee245c654 ]
The data used is all in local variables so there is no advantage in setting *val = ret with the direct mode claim held. Move it later to after error check.
Stable-dep-of: 8236644f5ecb ("iio: adc: ad7768-1: Fix conversion result sign")
--- drivers/iio/adc/ad7768-1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/adc/ad7768-1.c +1 -2
@@ -370,12 +370,11 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,return ret; ret =ad7768_scan_direct (indio_dev); -if (ret >=0 ) - *val = ret;iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; + *val = ret;return IIO_VAL_INT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 24/204 iio: adc: ad7768-1: Fix conversion result sign
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergiu Cuciurean <[email protected]>
[ Upstream commit 8236644f5ecb180e80ad92d691c22bc509b747bb ]
The ad7768-1 ADC output code is two's complement, meaning that the voltage conversion result is a signed value.. Since the value is a 24 bit one, stored in a 32 bit variable, the sign should be extended in order to get the correct representation.
Also the channel description has been updated to signed representation, to match the ADC specifications.
--- drivers/iio/adc/ad7768-1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7768-1.c +2 -2
@@ -142,7 +142,7 @@ static const struct iio_chan_spec ad7768_channels[] = { .channel = 0, .scan_index = 0, .scan_type = { - .sign = 'u', + .sign = 's', .realbits = 24, .storagebits = 32, .shift = 8,
@@ -374,7 +374,7 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; - *val = ret; + *val =sign_extend32 (ret, chan->scan_type.realbits -1 );return IIO_VAL_INT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 25/204 arm64: tegra: Remove the Orin NX/Nano suspend key
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ninad Malwade <[email protected]>
[ Upstream commit bb8a3ad25f098b6ea9b1d0f522427b4ad53a7bba ]
As per the Orin Nano Dev Kit schematic, GPIO_G.02 is not available on this device family. It should not be used at all on Orin NX/Nano. Having this unused pin mapped as the suspend key can lead to unpredictable behavior for low power modes.
Orin NX/Nano uses GPIO_EE.04 as both a "power" button and a "suspend" button. However, we cannot have two gpio-keys mapped to the same GPIO. Therefore remove the "suspend" key.
--- arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi | 7 ------- 1 file changed, 7 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi +0 -7
@@ -196,13 +196,6 @@ key-power { wakeup-event-action = <EV_ACT_ASSERTED>; wakeup-source; }; - - key-suspend { - label = "Suspend"; - gpios = <&gpio TEGRA234_MAIN_GPIO(G, 2) GPIO_ACTIVE_LOW>; - linux,input-type = <EV_KEY>; - linux,code = <KEY_SLEEP>; - }; }; fan: pwm-fan {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 26/204 clk: renesas: rzg2l: Use u32 for flag and mux_flags
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 897a3e34d6e73d2386715d5c44c57992f2c0eada ]
flag and mux_flags are intended to keep bit masks. Use u32 type for it.
Stable-dep-of: 7f22a298d926 ("clk: renesas: r9a07g043: Fix HP clock source for RZ/Five")
--- drivers/clk/renesas/rzg2l-cpg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/renesas/rzg2l-cpg.h +2 -2
@@ -92,8 +92,8 @@ struct cpg_core_clk {unsigned int conf;const struct clk_div_table *dtable;const char *const *parent_names; -int flag; -int mux_flags; +u32 flag; +u32 mux_flags;int num_parents; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 27/204 clk: renesas: rzg2l: Add struct clk_hw_data
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 97c1c4ccda76d2919775d748cf223637cf0e82ae ]
Add clk_hw_data struct that keeps the core part of the clock data. sd_hw_data embeds a member of type struct clk_hw_data along with other members (in the next commits). This commit prepares the field for refactoring the SD MUX clock driver.
Stable-dep-of: 7f22a298d926 ("clk: renesas: r9a07g043: Fix HP clock source for RZ/Five")
--- drivers/clk/renesas/rzg2l-cpg.c | 52 +++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 18 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +34 -18
@@ -58,13 +58,29 @@#define MAX_VCLK_FREQ (148500000) -struct sd_hw_data { +/** +* struct clk_hw_data - clock hardware data +* @hw: clock hw +* @conf: clock configuration (register offset, shift, width) +* @priv: CPG private data structure +*/ +struct clk_hw_data {struct clk_hw hw;u32 conf;struct rzg2l_cpg_priv *priv; }; -#define to_sd_hw_data (_hw) container_of(_hw, struct sd_hw_data, hw) +#define to_clk_hw_data (_hw) container_of(_hw, struct clk_hw_data, hw) + +/** +* struct sd_hw_data - SD clock hardware data +* @hw_data: clock hw data +*/ +struct sd_hw_data { +struct clk_hw_data hw_data; +}; + +#define to_sd_hw_data (_hw) container_of(_hw, struct sd_hw_data, hw_data)struct rzg2l_pll5_param {u32 pl5_fracin;
@@ -183,10 +199,10 @@ rzg2l_cpg_mux_clk_register(const struct cpg_core_clk *core,static int rzg2l_cpg_sd_clk_mux_set_parent (struct clk_hw *hw,u8 index) { -struct sd_hw_data *hwdata =to_sd_hw_data (hw); -struct rzg2l_cpg_priv *priv = hwdata->priv; -u32 off =GET_REG_OFFSET (hwdata->conf); -u32 shift =GET_SHIFT (hwdata->conf); +struct clk_hw_data *clk_hw_data =to_clk_hw_data (hw); +struct rzg2l_cpg_priv *priv = clk_hw_data->priv; +u32 off =GET_REG_OFFSET (clk_hw_data->conf); +u32 shift =GET_SHIFT (clk_hw_data->conf);const u32 clk_src_266 =2 ;u32 msk, val, bitmask;unsigned long flags;
@@ -203,7 +219,7 @@ static int rzg2l_cpg_sd_clk_mux_set_parent(struct clk_hw *hw, u8 index)* The clock mux has 3 input clocks(533 MHz, 400 MHz, and 266 MHz), and * the index to value mapping is done by adding 1 to the index. */ - bitmask = (GENMASK (GET_WIDTH (hwdata->conf) -1 ,0 ) << shift) <<16 ; + bitmask = (GENMASK (GET_WIDTH (clk_hw_data->conf) -1 ,0 ) << shift) <<16 ; msk = off ?CPG_CLKSTATUS_SELSDHI1_STS :CPG_CLKSTATUS_SELSDHI0_STS ;spin_lock_irqsave (&priv->rmw_lock, flags);if (index != clk_src_266) {
@@ -232,12 +248,12 @@ static int rzg2l_cpg_sd_clk_mux_set_parent(struct clk_hw *hw, u8 index)static u8 rzg2l_cpg_sd_clk_mux_get_parent (struct clk_hw *hw) { -struct sd_hw_data *hwdata =to_sd_hw_data (hw); -struct rzg2l_cpg_priv *priv = hwdata->priv; -u32 val =readl (priv->base +GET_REG_OFFSET (hwdata->conf)); +struct clk_hw_data *clk_hw_data =to_clk_hw_data (hw); +struct rzg2l_cpg_priv *priv = clk_hw_data->priv; +u32 val =readl (priv->base +GET_REG_OFFSET (clk_hw_data->conf)); - val >>=GET_SHIFT (hwdata->conf); - val &=GENMASK (GET_WIDTH (hwdata->conf) -1 ,0 ); + val >>=GET_SHIFT (clk_hw_data->conf); + val &=GENMASK (GET_WIDTH (clk_hw_data->conf) -1 ,0 );return val ? val -1 :0 ; }
@@ -253,17 +269,17 @@ rzg2l_cpg_sd_mux_clk_register(const struct cpg_core_clk *core,void __iomem *base, struct rzg2l_cpg_priv *priv) { - struct sd_hw_data *clk_hw_data; + struct sd_hw_data *sd_hw_data;struct clk_init_data init;struct clk_hw *clk_hw;int ret; - clk_hw_data =devm_kzalloc (priv->dev,sizeof (*clk_hw_data),GFP_KERNEL ); -if (!clk_hw_data) + sd_hw_data =devm_kzalloc (priv->dev,sizeof (*sd_hw_data),GFP_KERNEL ); +if (!sd_hw_data)return ERR_PTR (-ENOMEM ); - clk_hw_data->priv = priv; - clk_hw_data->conf = core->conf; + sd_hw_data->hw_data.priv = priv; + sd_hw_data->hw_data.conf = core->conf; init.name =GET_SHIFT (core->conf) ?"sd1" :"sd0" ; init.ops = &rzg2l_cpg_sd_clk_mux_ops;
@@ -271,7 +287,7 @@ rzg2l_cpg_sd_mux_clk_register(const struct cpg_core_clk *core, init.num_parents = core->num_parents; init.parent_names = core->parent_names; - clk_hw = &clk_hw_data->hw; + clk_hw = &sd_hw_data->hw_data.hw; clk_hw->init = &init; ret =devm_clk_hw_register (priv->dev, clk_hw);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 28/204 clk: renesas: rzg2l: Remove CPG_SDHI_DSEL from generic header
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 3e8008fcf6b7f7c65ad2718c18fb79f37007f1a5 ]
Remove CPG_SDHI_DSEL and its bits from the generic header as RZ/G3S has different offset registers and bits for this, thus avoid mixing them.
Stable-dep-of: 7f22a298d926 ("clk: renesas: r9a07g043: Fix HP clock source for RZ/Five")
--- drivers/clk/renesas/r9a07g043-cpg.c | 7 +++++++ drivers/clk/renesas/r9a07g044-cpg.c | 7 +++++++ drivers/clk/renesas/rzg2l-cpg.h | 4 ---- 3 files changed, 14 insertions(+), 4 deletions(-)
drivers/clk/renesas/r9a07g043-cpg.c +7 -0
@@ -14,6 +14,13 @@#include "rzg2l-cpg.h" +/* Specific registers. */ +#define CPG_PL2SDHI_DSEL (0x218) + +/* Clock select configuration. */ +#define SEL_SDHI0 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 0, 2) +#define SEL_SDHI1 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 4, 2) +enum clk_ids {/* Core Clock Outputs exported to DT */ LAST_DT_CORE_CLK =R9A07G043_CLK_P0_DIV2 ,
drivers/clk/renesas/r9a07g044-cpg.c +7 -0
@@ -15,6 +15,13 @@#include "rzg2l-cpg.h" +/* Specific registers. */ +#define CPG_PL2SDHI_DSEL (0x218) + +/* Clock select configuration. */ +#define SEL_SDHI0 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 0, 2) +#define SEL_SDHI1 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 4, 2) +enum clk_ids {/* Core Clock Outputs exported to DT */ LAST_DT_CORE_CLK =R9A07G054_CLK_DRP_A ,
drivers/clk/renesas/rzg2l-cpg.h +0 -4
@@ -19,7 +19,6 @@#define CPG_PL2_DDIV (0x204)#define CPG_PL3A_DDIV (0x208)#define CPG_PL6_DDIV (0x210) -#define CPG_PL2SDHI_DSEL (0x218)#define CPG_CLKSTATUS (0x280)#define CPG_PL3_SSEL (0x408)#define CPG_PL6_SSEL (0x414)
@@ -69,9 +68,6 @@#define SEL_PLL6_2 SEL_PLL_PACK(CPG_PL6_ETH_SSEL, 0, 1)#define SEL_GPU2 SEL_PLL_PACK(CPG_PL6_SSEL, 12, 1) -#define SEL_SDHI0 DDIV_PACK(CPG_PL2SDHI_DSEL, 0, 2) -#define SEL_SDHI1 DDIV_PACK(CPG_PL2SDHI_DSEL, 4, 2) -#define EXTAL_FREQ_IN_MEGA_HZ (24)/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 29/204 clk: renesas: rzg2l: Refactor SD mux driver
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 16b86e5c03c5b3ef35bf5126b35384faa97428f0 ]
Refactor SD MUX driver to be able to reuse the same code on RZ/G3S. RZ/G2{L,UL} has a limitation with regards to switching the clock source for SD MUX (MUX clock source has to be switched to 266MHz before switching b/w 533MHz and 400MHz). Rework the handling of this limitation to use a clock notifier that is registered according to platform based initialization data, so the SD MUX code can be reused on RZ/G3S.
As RZ/G2{L,UL} and RZ/G3S use different bits in different registers to check if the clock switching has been done, this configuration (register offset, register bits and bitfield width) is now passed through struct cpg_core_clk::sconf (status configuration) from platform specific initialization code.
Along with struct cpg_core_clk::sconf the mux table indices are also passed from platform specific initialization code.
Also, mux flags are now passed to DEF_SD_MUX() as they will be used later by RZ/G3S.
CPG_WEN_BIT macro has been introduced to select properly the WEN bit of various registers.
Stable-dep-of: 7f22a298d926 ("clk: renesas: r9a07g043: Fix HP clock source for RZ/Five")
--- drivers/clk/renesas/r9a07g043-cpg.c | 12 ++- drivers/clk/renesas/r9a07g044-cpg.c | 12 ++- drivers/clk/renesas/rzg2l-cpg.c | 150 ++++++++++++++++++++-------- drivers/clk/renesas/rzg2l-cpg.h | 16 ++- 4 files changed, 139 insertions(+), 51 deletions(-)
drivers/clk/renesas/r9a07g043-cpg.c +10 -2
@@ -21,6 +21,10 @@#define SEL_SDHI0 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 0, 2)#define SEL_SDHI1 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 4, 2) +/* Clock status configuration. */ +#define SEL_SDHI0_STS SEL_PLL_PACK(CPG_CLKSTATUS, 28, 1) +#define SEL_SDHI1_STS SEL_PLL_PACK(CPG_CLKSTATUS, 29, 1) +enum clk_ids {/* Core Clock Outputs exported to DT */ LAST_DT_CORE_CLK =R9A07G043_CLK_P0_DIV2 ,
@@ -85,6 +89,8 @@ static const char * const sel_pll3_3[] = { ".pll3_533", ".pll3_400" };static const char *const sel_pll6_2[] = {".pll6_250" ,".pll5_250" };static const char *const sel_shdi[] = {".clk_533" ,".clk_400" ,".clk_266" }; +static const u32 mtable_sdhi[] = {1 ,2 ,3 }; +static const struct cpg_core_clk r9a07g043_core_clks[]__initconst = {/* External Clock Inputs */ DEF_INPUT ("extal" ,CLK_EXTAL ),
@@ -130,8 +136,10 @@ static const struct cpg_core_clk r9a07g043_core_clks[] __initconst = {DEF_MUX ("HP" ,R9A07G043_CLK_HP ,SEL_PLL6_2 , sel_pll6_2),DEF_FIXED ("SPI0" ,R9A07G043_CLK_SPI0 ,CLK_DIV_PLL3_C ,1 ,2 ),DEF_FIXED ("SPI1" ,R9A07G043_CLK_SPI1 ,CLK_DIV_PLL3_C ,1 ,4 ), -DEF_SD_MUX ("SD0" ,R9A07G043_CLK_SD0 ,SEL_SDHI0 , sel_shdi), -DEF_SD_MUX ("SD1" ,R9A07G043_CLK_SD1 ,SEL_SDHI1 , sel_shdi), +DEF_SD_MUX ("SD0" ,R9A07G043_CLK_SD0 ,SEL_SDHI0 ,SEL_SDHI0_STS , sel_shdi, + mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier), +DEF_SD_MUX ("SD1" ,R9A07G043_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI0_STS , sel_shdi, + mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier),DEF_FIXED ("SD0_DIV4" ,CLK_SD0_DIV4 ,R9A07G043_CLK_SD0 ,1 ,4 ), DEF_FIXED("SD1_DIV4", CLK_SD1_DIV4, R9A07G043_CLK_SD1, 1, 4), };
drivers/clk/renesas/r9a07g044-cpg.c +10 -2
@@ -22,6 +22,10 @@#define SEL_SDHI0 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 0, 2)#define SEL_SDHI1 SEL_PLL_PACK(CPG_PL2SDHI_DSEL, 4, 2) +/* Clock status configuration. */ +#define SEL_SDHI0_STS SEL_PLL_PACK(CPG_CLKSTATUS, 28, 1) +#define SEL_SDHI1_STS SEL_PLL_PACK(CPG_CLKSTATUS, 29, 1) +enum clk_ids {/* Core Clock Outputs exported to DT */ LAST_DT_CORE_CLK =R9A07G054_CLK_DRP_A ,
@@ -105,6 +109,8 @@ static const char * const sel_pll6_2[] = { ".pll6_250", ".pll5_250" };static const char *const sel_shdi[] = {".clk_533" ,".clk_400" ,".clk_266" };static const char *const sel_gpu2[] = {".pll6" ,".pll3_div2_2" }; +static const u32 mtable_sdhi[] = {1 ,2 ,3 }; + static const struct { struct cpg_core_clk common[56]; #ifdef CONFIG_CLK_R9A07G054
@@ -170,8 +176,10 @@ static const struct {DEF_MUX ("HP" ,R9A07G044_CLK_HP ,SEL_PLL6_2 , sel_pll6_2),DEF_FIXED ("SPI0" ,R9A07G044_CLK_SPI0 ,CLK_DIV_PLL3_C ,1 ,2 ),DEF_FIXED ("SPI1" ,R9A07G044_CLK_SPI1 ,CLK_DIV_PLL3_C ,1 ,4 ), -DEF_SD_MUX ("SD0" ,R9A07G044_CLK_SD0 ,SEL_SDHI0 , sel_shdi), -DEF_SD_MUX ("SD1" ,R9A07G044_CLK_SD1 ,SEL_SDHI1 , sel_shdi), +DEF_SD_MUX ("SD0" ,R9A07G044_CLK_SD0 ,SEL_SDHI0 ,SEL_SDHI0_STS , sel_shdi, + mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier), +DEF_SD_MUX ("SD1" ,R9A07G044_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI0_STS , sel_shdi, + mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier),DEF_FIXED ("SD0_DIV4" ,CLK_SD0_DIV4 ,R9A07G044_CLK_SD0 ,1 ,4 ),DEF_FIXED ("SD1_DIV4" ,CLK_SD1_DIV4 ,R9A07G044_CLK_SD1 ,1 ,4 ), DEF_DIV("G", R9A07G044_CLK_G, CLK_SEL_GPU2, DIVGPU, dtable_1_8),
drivers/clk/renesas/rzg2l-cpg.c +108 -42
237 lines not on this page · raw message
drivers/clk/renesas/rzg2l-cpg.h +11 -5
@@ -9,6 +9,8 @@#ifndef __RENESAS_RZG2L_CPG_H__#define __RENESAS_RZG2L_CPG_H__ +#include <linux/notifier.h> +#define CPG_SIPLL5_STBY (0x140)#define CPG_SIPLL5_CLK1 (0x144)#define CPG_SIPLL5_CLK3 (0x14C)
@@ -42,8 +44,6 @@#define CPG_CLKSTATUS_SELSDHI0_STS BIT(28)#define CPG_CLKSTATUS_SELSDHI1_STS BIT(29) -#define CPG_SDHI_CLK_SWITCH_STATUS_TIMEOUT_US 200 -/* n = 0/1/2 for PLL1/4/6 */ #define CPG_SAMPLL_CLK1 (n) (0x04 + (16 * n))#define CPG_SAMPLL_CLK2 (n) (0x08 + (16 * n))
@@ -86,8 +86,11 @@ struct cpg_core_clk {unsigned int mult;unsigned int type;unsigned int conf; +unsigned int sconf;const struct clk_div_table *dtable; +const u32 *mtable;const char *const *parent_names; +notifier_fn_t notifier;u32 flag;u32 mux_flags;int num_parents;
@@ -147,10 +150,11 @@ enum clk_types { .parent_names = _parent_names, \ .num_parents = ARRAY_SIZE(_parent_names), \ .mux_flags = CLK_MUX_READ_ONLY) -#define DEF_SD_MUX (_name, _id, _conf, _parent_names) \ - DEF_TYPE(_name, _id, CLK_TYPE_SD_MUX, .conf = _conf, \ +#define DEF_SD_MUX (_name, _id, _conf, _sconf, _parent_names, _mtable, _clk_flags, _notifier) \ + DEF_TYPE(_name, _id, CLK_TYPE_SD_MUX, .conf = _conf, .sconf = _sconf, \ .parent_names = _parent_names, \ - .num_parents = ARRAY_SIZE(_parent_names)) + .num_parents = ARRAY_SIZE(_parent_names), \ + .mtable = _mtable, .flag = _clk_flags, .notifier = _notifier)#define DEF_PLL5_FOUTPOSTDIV (_name, _id, _parent) \ DEF_TYPE(_name, _id, CLK_TYPE_SIPLL5, .parent = _parent)#define DEF_PLL5_4_MUX (_name, _id, _conf, _parent_names) \
@@ -269,4 +273,6 @@ extern const struct rzg2l_cpg_info r9a07g044_cpg_info;extern const struct rzg2l_cpg_info r9a07g054_cpg_info;extern const struct rzg2l_cpg_info r9a09g011_cpg_info; +int rzg2l_cpg_sd_clk_mux_notifier (struct notifier_block *nb,unsigned long event,void *data); +#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 3/204 x86/extable: Remove unused fixup type EX_TYPE_COPY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tong Tiangen <[email protected]>
[ Upstream commit cb517619f96718a4c3c2534a3124177633f8998d ]
After
034ff37d3407 ("x86: rewrite '__copy_user_nocache' function")
rewrote __copy_user_nocache() to use EX_TYPE_UACCESS instead of the EX_TYPE_COPY exception type, there are no more EX_TYPE_COPY users, so remove it.
[ bp: Massage commit message. ]
Stable-dep-of: 1a15bb8303b6 ("x86/mce: use is_copy_from_user() to determine copy-from-user context")
--- arch/x86/include/asm/asm.h | 3 --- arch/x86/include/asm/extable_fixup_types.h | 2 +- arch/x86/kernel/cpu/mce/severity.c | 1 - arch/x86/mm/extable.c | 9 --------- 4 files changed, 1 insertion(+), 14 deletions(-)
arch/x86/include/asm/asm.h +0 -3
@@ -229,9 +229,6 @@ register unsigned long current_stack_pointer asm(_ASM_SP);#define _ASM_EXTABLE_UA (from, to) \ _ASM_EXTABLE_TYPE(from, to, EX_TYPE_UACCESS) -#define _ASM_EXTABLE_CPY (from, to) \ - _ASM_EXTABLE_TYPE(from, to, EX_TYPE_COPY) -#define _ASM_EXTABLE_FAULT (from, to) \ _ASM_EXTABLE_TYPE(from, to, EX_TYPE_FAULT)
arch/x86/include/asm/extable_fixup_types.h +1 -1
@@ -36,7 +36,7 @@#define EX_TYPE_DEFAULT 1#define EX_TYPE_FAULT 2#define EX_TYPE_UACCESS 3 -#define EX_TYPE_COPY 4 +/* unused, was: #define EX_TYPE_COPY 4 */ #define EX_TYPE_CLEAR_FS 5#define EX_TYPE_FPU_RESTORE 6#define EX_TYPE_BPF 7
arch/x86/kernel/cpu/mce/severity.c +0 -1
@@ -290,7 +290,6 @@ static noinstr int error_context(struct mce *m, struct pt_regs *regs)switch (fixup_type) {case EX_TYPE_UACCESS : -case EX_TYPE_COPY :if (!copy_user)return IN_KERNEL ; m->kflags |=MCE_IN_KERNEL_COPYIN ;
arch/x86/mm/extable.c +0 -9
@@ -163,13 +163,6 @@ static bool ex_handler_uaccess(const struct exception_table_entry *fixup,return ex_handler_default (fixup, regs); } -static bool ex_handler_copy (const struct exception_table_entry *fixup, -struct pt_regs *regs,int trapnr) -{ -WARN_ONCE (trapnr ==X86_TRAP_GP ,"General protection fault in user access. Non-canonical address?" ); -return ex_handler_fault (fixup, regs, trapnr); -} -static bool ex_handler_msr (const struct exception_table_entry *fixup,struct pt_regs *regs,bool wrmsr,bool safe,int reg) {
@@ -267,8 +260,6 @@ int fixup_exception(struct pt_regs *regs, int trapnr, unsigned long error_code,return ex_handler_fault (e, regs, trapnr);case EX_TYPE_UACCESS :return ex_handler_uaccess (e, regs, trapnr, fault_addr); -case EX_TYPE_COPY : -return ex_handler_copy (e, regs, trapnr);case EX_TYPE_CLEAR_FS :return ex_handler_clear_fs (e, regs);case EX_TYPE_FPU_RESTORE :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 30/204 clk: renesas: r9a07g04[34]: Use SEL_SDHI1_STS status configuration for SD1 mux
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 9b2a11c83859c06233049b134bd8ee974b284559 ]
The status configuration for SD1 mux clock is SEL_SDHI1_STS. Fix it.
Stable-dep-of: 7f22a298d926 ("clk: renesas: r9a07g043: Fix HP clock source for RZ/Five")
--- drivers/clk/renesas/r9a07g043-cpg.c | 2 +- drivers/clk/renesas/r9a07g044-cpg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/clk/renesas/r9a07g043-cpg.c +1 -1
@@ -138,7 +138,7 @@ static const struct cpg_core_clk r9a07g043_core_clks[] __initconst = {DEF_FIXED ("SPI1" ,R9A07G043_CLK_SPI1 ,CLK_DIV_PLL3_C ,1 ,4 ),DEF_SD_MUX ("SD0" ,R9A07G043_CLK_SD0 ,SEL_SDHI0 ,SEL_SDHI0_STS , sel_shdi, mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier), -DEF_SD_MUX ("SD1" ,R9A07G043_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI0_STS , sel_shdi, +DEF_SD_MUX ("SD1" ,R9A07G043_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI1_STS , sel_shdi, mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier),DEF_FIXED ("SD0_DIV4" ,CLK_SD0_DIV4 ,R9A07G043_CLK_SD0 ,1 ,4 ), DEF_FIXED("SD1_DIV4", CLK_SD1_DIV4, R9A07G043_CLK_SD1, 1, 4),
drivers/clk/renesas/r9a07g044-cpg.c +1 -1
@@ -178,7 +178,7 @@ static const struct {DEF_FIXED ("SPI1" ,R9A07G044_CLK_SPI1 ,CLK_DIV_PLL3_C ,1 ,4 ),DEF_SD_MUX ("SD0" ,R9A07G044_CLK_SD0 ,SEL_SDHI0 ,SEL_SDHI0_STS , sel_shdi, mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier), -DEF_SD_MUX ("SD1" ,R9A07G044_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI0_STS , sel_shdi, +DEF_SD_MUX ("SD1" ,R9A07G044_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI1_STS , sel_shdi, mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier),DEF_FIXED ("SD0_DIV4" ,CLK_SD0_DIV4 ,R9A07G044_CLK_SD0 ,1 ,4 ), DEF_FIXED("SD1_DIV4", CLK_SD1_DIV4, R9A07G044_CLK_SD1, 1, 4),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 4/204 x86/mce: use is_copy_from_user() to determine copy-from-user context
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuai Xue <[email protected]>
[ Upstream commit 1a15bb8303b6b104e78028b6c68f76a0d4562134 ]
Patch series "mm/hwpoison: Fix regressions in memory failure handling", v4.
## 1. What am I trying to do:
This patchset resolves two critical regressions related to memory failure handling that have appeared in the upstream kernel since version 5.17, as compared to 5.10 LTS.
- copyin case: poison found in user page while kernel copying from user space
- instr case: poison found while instruction fetching in user space
## 2. What is the expected outcome and why
- For copyin case:
Kernel can recover from poison found where kernel is doing get_user() or copy_from_user() if those places get an error return and the kernel return -EFAULT to the process instead of crashing. More specifily, MCE handler checks the fixup handler type to decide whether an in kernel #MC can be recovered. When EX_TYPE_UACCESS is found, the PC jumps to recovery code specified in _ASM_EXTABLE_FAULT() and return a -EFAULT to user space.
- For instr case:
If a poison found while instruction fetching in user space, full recovery is possible. User process takes #PF, Linux allocates a new page and fills by reading from storage.
## 3. What actually happens and why
- For copyin case: kernel panic since v5.17
Commit 4c132d1d844a ("x86/futex: Remove .fixup usage") introduced a new extable fixup type, EX_TYPE_EFAULT_REG, and later patches updated the extable fixup type for copy-from-user operations, changing it from EX_TYPE_UACCESS to EX_TYPE_EFAULT_REG. It breaks previous EX_TYPE_UACCESS handling when posion found in get_user() or copy_from_user().
- For instr case: user process is killed by a SIGBUS signal due to #CMCI and #MCE race
When an uncorrected memory error is consumed there is a race between the CMCI from the memory controller reporting an uncorrected error with a UCNA signature, and the core reporting and SRAR signature machine check when the data is about to be consumed.
### Background: why *UN*corrected errors tied to *C*MCI in Intel platform [1]
Prior to Icelake memory controllers reported patrol scrub events that detected a previously unseen uncorrected error in memory by signaling a broadcast machine check with an SRAO (Software Recoverable Action Optional) signature in the machine check bank. This was overkill because it's not an urgent problem that no core is on the verge of consuming that bad data. It's also found that multi SRAO UCE may cause nested MCE interrupts and finally become an IERR.
Hence, Intel downgrades the machine check bank signature of patrol scrub from SRAO to UCNA (Uncorrected, No Action required), and signal changed to #CMCI. Just to add to the confusion, Linux does take an action (in uc_decode_notifier()) to try to offline the page despite the UC*NA* signature name.
### Background: why #CMCI and #MCE race when poison is consuming in
Intel platform [1]
Having decided that CMCI/UCNA is the best action for patrol scrub errors, the memory controller uses it for reads too. But the memory controller is executing asynchronously from the core, and can't tell the difference between a "real" read and a speculative read. So it will do CMCI/UCNA if an error is found in any read.
Thus:
1) Core is clever and thinks address A is needed soon, issues a speculative read.
2) Core finds it is going to use address A soon after sending the read request
3) The CMCI from the memory controller is in a race with MCE from the core that will soon try to retire the load from address A.
Quite often (because speculation has got better) the CMCI from the memory controller is delivered before the core is committed to the instruction reading address A, so the interrupt is taken, and Linux offlines the page (marking it as poison).
## Why user process is killed for instr case
Commit 046545a661af ("mm/hwpoison: fix error page recovered but reported "not recovered"") tries to fix noise message "Memory error not recovered" and skips duplicate SIGBUSs due to the race. But it also introduced a bug that kill_accessing_process() return -EHWPOISON for instr case, as result, kill_me_maybe() send a SIGBUS to user process.
# 4. The fix, in my opinion, should be:
- For copyin case:
The key point is whether the error context is in a read from user memory. We do not care about the ex-type if we know its a MOV reading from userspace.
is_copy_from_user() return true when both of the following two checks are true:
- the current instruction is copy
- source address is user memory
If copy_user is true, we set
m->kflags |= MCE_IN_KERNEL_COPYIN | MCE_IN_KERNEL_RECOV;
Then do_machine_check() will try fixup_exception() first.
- For instr case: let kill_accessing_process() return 0 to prevent a SIGBUS.
- For patch 3:
The return value of memory_failure() is quite important while discussed instr case regression with Tony and Miaohe for patch 2, so add comment about the return value.
This patch (of 3):
Commit 4c132d1d844a ("x86/futex: Remove .fixup usage") introduced a new extable fixup type, EX_TYPE_EFAULT_REG, and commit 4c132d1d844a ("x86/futex: Remove .fixup usage") updated the extable fixup type for copy-from-user operations, changing it from EX_TYPE_UACCESS to EX_TYPE_EFAULT_REG. The error context for copy-from-user operations no longer functions as an in-kernel recovery context. Consequently, the error context for copy-from-user operations no longer functions as an in-kernel recovery context, resulting in kernel panics with the message:
"Machine check: Data load in unrecoverable area of kernel."
To address this, it is crucial to identify if an error context involves a read operation from user memory. The function is_copy_from_user() can be utilized to determine:
- the current operation is copy
- when reading user memory
When these conditions are met, is_copy_from_user() will return true, confirming that it is indeed a direct copy from user memory. This check is essential for correctly handling the context of errors in these operations without relying on the extable fixup types that previously allowed for in-kernel recovery.
So, use is_copy_from_user() to determine if a context is copy user directly.
--- arch/x86/kernel/cpu/mce/severity.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/mce/severity.c +5 -6
@@ -288,13 +288,12 @@ static noinstr int error_context(struct mce *m, struct pt_regs *regs) copy_user =is_copy_from_user (regs);instrumentation_end (); -switch (fixup_type) { -case EX_TYPE_UACCESS : -if (!copy_user) -return IN_KERNEL ; - m->kflags |=MCE_IN_KERNEL_COPYIN ; - fallthrough; +if (copy_user) { + m->kflags |=MCE_IN_KERNEL_COPYIN |MCE_IN_KERNEL_RECOV ; +return IN_KERNEL_RECOV ; + } +switch (fixup_type) {case EX_TYPE_FAULT_MCE_SAFE :case EX_TYPE_DEFAULT_MCE_SAFE : m->kflags |=MCE_IN_KERNEL_RECOV ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 5/204 tracing: Add __string_len() example
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit dd6ae6d90a84d4bec49887c7aa2b22aa1c8b2897 ]
There's no example code that uses __string_len(), and since the sample code is used for testing the event logic, add a use case.
Stable-dep-of: ea8d7647f9dd ("tracing: Verify event formats that have "%*p.."")
--- samples/trace_events/trace-events-sample.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
samples/trace_events/trace-events-sample.h +5 -2
@@ -302,6 +302,7 @@ TRACE_EVENT(foo_bar, __bitmask( cpus, num_possible_cpus() )__cpumask ( cpum ) __vstring( vstr, fmt, va ) + __string_len( lstr, foo, bar / 2 < strlen(foo) ? bar / 2 : strlen(foo) ) ), TP_fast_assign(
@@ -310,12 +311,13 @@ TRACE_EVENT(foo_bar,memcpy (__get_dynamic_array (list), lst,__length_of (lst) *sizeof (int ));__assign_str (str, string); +__assign_str (lstr, foo);__assign_vstr (vstr, fmt, va);__assign_bitmask (cpus,cpumask_bits (mask),num_possible_cpus ());__assign_cpumask (cpum,cpumask_bits (mask)); ), - TP_printk("foo %s %d %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar, + TP_printk("foo %s %d %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar,/* * Notice here the use of some helper functions. This includes:
@@ -359,7 +361,8 @@ TRACE_EVENT(foo_bar,__print_array (__get_dynamic_array (list),__get_dynamic_array_len (list) /sizeof (int ),sizeof (int )), -__get_str (str),__get_bitmask (cpus),__get_cpumask (cpum), +__get_str (str),__get_str (lstr), +__get_bitmask (cpus),__get_cpumask (cpum), __get_str(vstr)) );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 6/204 tracing: Add __print_dynamic_array() helper
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
[ Upstream commit e52750fb1458ae9ea5860a08ed7a149185bc5b97 ]
When printing a dynamic array in a trace event, the method is rather ugly. It has the format of:
__print_array(__get_dynamic_array(array),
__get_dynmaic_array_len(array) / el_size, el_size)
Since dynamic arrays are known to the tracing infrastructure, create a helper macro that does the above for you.
__print_dynamic_array(array, el_size)
Which would expand to the same output.
Stable-dep-of: ea8d7647f9dd ("tracing: Verify event formats that have "%*p.."")
--- include/trace/stages/stage3_trace_output.h | 8 ++++++++ include/trace/stages/stage7_class_define.h | 1 + samples/trace_events/trace-events-sample.h | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-)
include/trace/stages/stage3_trace_output.h +8 -0
@@ -119,6 +119,14 @@trace_print_array_seq (p, array, count, el_size); \ }) +#undef __print_dynamic_array +#define __print_dynamic_array (array, el_size) \ + ({ \ + __print_array(__get_dynamic_array(array), \ + __get_dynamic_array_len(array) / (el_size), \ + (el_size)); \ + }) +#undef __print_hex_dump#define __print_hex_dump (prefix_str, prefix_type, \ rowsize, groupsize, buf, len, ascii) \
include/trace/stages/stage7_class_define.h +1 -0
@@ -22,6 +22,7 @@#undef __get_rel_cpumask#undef __get_rel_sockaddr#undef __print_array +#undef __print_dynamic_array#undef __print_hex_dump#undef __get_buf
samples/trace_events/trace-events-sample.h +6 -1
@@ -317,7 +317,7 @@ TRACE_EVENT(foo_bar,__assign_cpumask (cpum,cpumask_bits (mask)); ), - TP_printk("foo %s %d %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar, + TP_printk("foo %s %d %s %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar,/* * Notice here the use of some helper functions. This includes:
@@ -361,6 +361,11 @@ TRACE_EVENT(foo_bar,__print_array (__get_dynamic_array (list),__get_dynamic_array_len (list) /sizeof (int ),sizeof (int )), + +/* A shortcut is to use __print_dynamic_array for dynamic arrays */ + +__print_dynamic_array (list,sizeof (int )), +__get_str (str),__get_str (lstr),__get_bitmask (cpus),__get_cpumask (cpum), __get_str(vstr))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 7/204 tracing: Verify event formats that have "%*p.."
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
[ Upstream commit ea8d7647f9ddf1f81e2027ed305299797299aa03 ]
The trace event verifier checks the formats of trace events to make sure that they do not point at memory that is not in the trace event itself or in data that will never be freed. If an event references data that was allocated when the event triggered and that same data is freed before the event is read, then the kernel can crash by reading freed memory.
The verifier runs at boot up (or module load) and scans the print formats of the events and checks their arguments to make sure that dereferenced pointers are safe. If the format uses "%*p.." the verifier will ignore it, and that could be dangerous. Cover this case as well.
Also add to the sample code a use case of "%*pbl".
--- kernel/trace/trace_events.c | 7 +++++++ samples/trace_events/trace-events-sample.h | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)
kernel/trace/trace_events.c +7 -0
@@ -470,6 +470,7 @@ static void test_event_printk(struct trace_event_call *call)case '%' :continue ;case 'p' : + do_pointer:/* Find dereferencing fields */ switch (fmt[i +1 ]) {case 'B' :case 'R' :case 'r' :
@@ -498,6 +499,12 @@ static void test_event_printk(struct trace_event_call *call)continue ;if (fmt[i + j] =='*' ) { star = true; +/* Handle %*pbl case */ +if (!j && fmt[i +1 ] =='p' ) { + arg++; + i++; + goto do_pointer; + }continue ; }if ((fmt[i + j] =='s' )) {
samples/trace_events/trace-events-sample.h +6 -2
@@ -317,7 +317,8 @@ TRACE_EVENT(foo_bar,__assign_cpumask (cpum,cpumask_bits (mask)); ), - TP_printk("foo %s %d %s %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar, + TP_printk("foo %s %d %s %s %s %s %s %s (%s) (%s) %s [%d] %*pbl", + __entry->foo, __entry->bar,/* * Notice here the use of some helper functions. This includes:
@@ -368,7 +369,10 @@ TRACE_EVENT(foo_bar,__get_str (str),__get_str (lstr),__get_bitmask (cpus),__get_cpumask (cpum), - __get_str(vstr)) +__get_str (vstr), +__get_dynamic_array_len (cpus), +__get_dynamic_array_len (cpus), + __get_dynamic_array(cpus)) );/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 8/204 media: subdev: Fix use of sd->enabled_streams in call_s_stream()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 1d7804281df3f09f0a109d00406e859a00bae7ae ]
call_s_stream() uses sd->enabled_streams to track whether streaming has already been enabled. However, v4l2_subdev_enable/disable_streams_fallback(), which was the original user of this field, already uses it, and v4l2_subdev_enable/disable_streams_fallback() will call call_s_stream().
This leads to a conflict as both functions set the field. Afaics, both functions set the field to the same value, so it won't cause a runtime bug, but it's still wrong and if we, e.g., change how v4l2_subdev_enable/disable_streams_fallback() operates we might easily cause bugs.
Fix this by adding a new field, 's_stream_enabled', for call_s_stream().
Stable-dep-of: 36cef585e2a3 ("media: vimc: skip .s_stream() for stopped entities")
--- drivers/media/v4l2-core/v4l2-subdev.c | 8 ++------ include/media/v4l2-subdev.h | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/media/v4l2-core/v4l2-subdev.c +2 -6
@@ -363,12 +363,8 @@ static int call_s_stream(struct v4l2_subdev *sd, int enable)* The .s_stream() operation must never be called to start or stop an * already started or stopped subdev. Catch offenders but don't return * an error yet to avoid regressions. -* -* As .s_stream() is mutually exclusive with the .enable_streams() and -* .disable_streams() operation, we can use the enabled_streams field -* to store the subdev streaming state. */ -if (WARN_ON (!!sd->enabled_streams == !!enable)) +if (WARN_ON (sd->s_stream_enabled == !!enable))return 0 ; ret = sd->ops->video->s_stream (sd, enable);
@@ -379,7 +375,7 @@ static int call_s_stream(struct v4l2_subdev *sd, int enable) }if (!ret) { - sd->enabled_streams = enable ?BIT (0 ) :0 ; + sd->s_stream_enabled = enable;#if IS_REACHABLE (CONFIG_LEDS_CLASS )if (!IS_ERR_OR_NULL (sd->privacy_led)) {
include/media/v4l2-subdev.h +3 -0
@@ -1042,6 +1042,8 @@ struct v4l2_subdev_platform_data {* v4l2_subdev_enable_streams() and * v4l2_subdev_disable_streams() helper functions for fallback * cases. +* @s_stream_enabled: Tracks whether streaming has been enabled with s_stream. +* This is only for call_s_stream() internal use. * * Each instance of a subdev driver should create this struct, either * stand-alone or embedded in a larger struct.
@@ -1090,6 +1092,7 @@ struct v4l2_subdev {*/ struct v4l2_subdev_state *active_state;u64 enabled_streams; +bool s_stream_enabled; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 9/204 media: subdev: Improve v4l2_subdev_enable/disable_streams_fallback
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 61d6c8c896c1ccde350c281817847a32b0c6b83b ]
v4l2_subdev_enable/disable_streams_fallback() supports falling back to .s_stream() for subdevs with a single source pad. It also tracks the enabled streams for that one pad in the sd->enabled_streams field.
Tracking the enabled streams with sd->enabled_streams does not make sense, as with .s_stream() there can only be a single stream per pad. Thus, as the v4l2_subdev_enable/disable_streams_fallback() only supports a single source pad, all we really need is a boolean which tells whether streaming has been enabled on this pad or not.
However, as we only need a true/false state for a pad (instead of tracking which streams have been enabled for a pad), we can easily extend the fallback mechanism to support multiple source pads as we only need to keep track of which pads have been enabled.
Change the sd->enabled_streams field to sd->enabled_pads, which is a 64-bit bitmask tracking the enabled source pads. With this change we can remove the restriction that v4l2_subdev_enable/disable_streams_fallback() only supports a single source pad.
Stable-dep-of: 36cef585e2a3 ("media: vimc: skip .s_stream() for stopped entities")
--- drivers/media/v4l2-core/v4l2-subdev.c | 68 ++++++++++++++++----------- include/media/v4l2-subdev.h | 9 ++-- 2 files changed, 44 insertions(+), 33 deletions(-)
drivers/media/v4l2-core/v4l2-subdev.c +40 -28
@@ -1925,37 +1925,43 @@ static int v4l2_subdev_enable_streams_fallback(struct v4l2_subdev *sd, u32 pad, u64 streams_mask) {struct device *dev = sd->entity.graph_obj.mdev->dev; -unsigned int i;int ret;/* * The subdev doesn't implement pad-based stream enable, fall back -* on the .s_stream() operation. This can only be done for subdevs that -* have a single source pad, as sd->enabled_streams is global to the -* subdev. +* to the .s_stream() operation. */ if (!(sd->entity.pads[pad].flags &MEDIA_PAD_FL_SOURCE ))return -EOPNOTSUPP ; -for (i =0 ; i < sd->entity.num_pads; ++i) { -if (i != pad && sd->entity.pads[i].flags &MEDIA_PAD_FL_SOURCE ) -return -EOPNOTSUPP ; - } +/* +* .s_stream() means there is no streams support, so the only allowed +* stream is the implicit stream 0. +*/ +if (streams_mask !=BIT_ULL (0 )) +return -EOPNOTSUPP ; + +/* +* We use a 64-bit bitmask for tracking enabled pads, so only subdevices +* with 64 pads or less can be supported. +*/ +if (pad >=sizeof (sd->enabled_pads) *BITS_PER_BYTE ) +return -EOPNOTSUPP ; -if (sd->enabled_streams & streams_mask) { -dev_dbg (dev,"set of streams %#llx already enabled on %s:%u\n" , - streams_mask, sd->entity.name, pad); +if (sd->enabled_pads &BIT_ULL (pad)) { +dev_dbg (dev,"pad %u already enabled on %s\n" , + pad, sd->entity.name);return -EALREADY ; } -/* Start streaming when the first streams are enabled. */ -if (!sd->enabled_streams) { +/* Start streaming when the first pad is enabled. */ +if (!sd->enabled_pads) { ret =v4l2_subdev_call (sd, video, s_stream,1 );if (ret)return ret; } - sd->enabled_streams |= streams_mask; + sd->enabled_pads |=BIT_ULL (pad);return 0 ; }
@@ -2042,37 +2048,43 @@ static int v4l2_subdev_disable_streams_fallback(struct v4l2_subdev *sd, u32 pad, u64 streams_mask) {struct device *dev = sd->entity.graph_obj.mdev->dev; -unsigned int i;int ret;/* -* If the subdev doesn't implement pad-based stream enable, fall back -* on the .s_stream() operation. This can only be done for subdevs that -* have a single source pad, as sd->enabled_streams is global to the -* subdev. +* If the subdev doesn't implement pad-based stream enable, fall back +* to the .s_stream() operation. */ if (!(sd->entity.pads[pad].flags &MEDIA_PAD_FL_SOURCE ))return -EOPNOTSUPP ; -for (i =0 ; i < sd->entity.num_pads; ++i) { -if (i != pad && sd->entity.pads[i].flags &MEDIA_PAD_FL_SOURCE ) -return -EOPNOTSUPP ; - } +/* +* .s_stream() means there is no streams support, so the only allowed +* stream is the implicit stream 0. +*/ +if (streams_mask !=BIT_ULL (0 )) +return -EOPNOTSUPP ; + +/* +* We use a 64-bit bitmask for tracking enabled pads, so only subdevices +* with 64 pads or less can be supported. +*/ +if (pad >=sizeof (sd->enabled_pads) *BITS_PER_BYTE ) +return -EOPNOTSUPP ; -if ((sd->enabled_streams & streams_mask) != streams_mask) { -dev_dbg (dev,"set of streams %#llx already disabled on %s:%u\n" , - streams_mask, sd->entity.name, pad); +if (!(sd->enabled_pads &BIT_ULL (pad))) { +dev_dbg (dev,"pad %u already disabled on %s\n" , + pad, sd->entity.name);return -EALREADY ; }/* Stop streaming when the last streams are disabled. */ -if (!(sd->enabled_streams & ~streams_mask)) { +if (!(sd->enabled_pads & ~BIT_ULL (pad))) { ret =v4l2_subdev_call (sd, video, s_stream,0 );if (ret)return ret; } - sd->enabled_streams &= ~streams_mask; + sd->enabled_pads &= ~BIT_ULL (pad);return 0 ; }
include/media/v4l2-subdev.h +4 -5
@@ -1038,10 +1038,9 @@ struct v4l2_subdev_platform_data {* @active_state: Active state for the subdev (NULL for subdevs tracking the * state internally). Initialized by calling * v4l2_subdev_init_finalize(). -* @enabled_streams: Bitmask of enabled streams used by -* v4l2_subdev_enable_streams() and -* v4l2_subdev_disable_streams() helper functions for fallback -* cases. +* @enabled_pads: Bitmask of enabled pads used by v4l2_subdev_enable_streams() +* and v4l2_subdev_disable_streams() helper functions for +* fallback cases. * @s_stream_enabled: Tracks whether streaming has been enabled with s_stream. * This is only for call_s_stream() internal use. *
@@ -1091,7 +1090,7 @@ struct v4l2_subdev {* doesn't support it. */ struct v4l2_subdev_state *active_state; -u64 enabled_streams; +u64 enabled_pads;bool s_stream_enabled; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainercover 6.6.89-rc1 review
This is the start of the stable review cycle for the 6.6.89 release. There are 204 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.89-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.6.89-rc1
Josh Poimboeuf <[email protected]>
objtool: Silence more KCOV warnings, part 2
Josh Poimboeuf <[email protected]>
objtool: Ignore end-of-section jumps for KCOV/GCOV
Hannes Reinecke <[email protected]>
nvme: fixup scan failure for non-ANA multipath controllers
Thomas Bogendoerfer <[email protected]>
MIPS: cm: Fix warning if MIPS_CM is disabled
Robin Murphy <[email protected]>
iommu: Handle race with default domain setup
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: enable STU methods for 6320 family
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: enable PVT for 6321 switch
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family
Baokun Li <[email protected]>
ext4: goto right label 'out_mmap_sem' in ext4_setattr()
Ian Abbott <[email protected]>
comedi: jr3_pci: Fix synchronous deletion of timer
Daniel Borkmann <[email protected]>
vmxnet3: Fix malformed packet sizing in vmxnet3_process_xdp
Dmitry Torokhov <[email protected]>
driver core: fix potential NULL pointer dereference in dev_uevent()
Dmitry Torokhov <[email protected]>
driver core: introduce device_set_driver() helper
Dmitry Torokhov <[email protected]>
Revert "drivers: core: synchronize really_probe() and dev_uevent()"
Ard Biesheuvel <[email protected]>
x86/pvh: Call C code via the kernel virtual mapping
Tamura Dai <[email protected]>
spi: spi-imx: Add check for spi_imx_setupxfer()
Meir Elisha <[email protected]>
md/raid1: Add check for missing source disk in process_checks()
Pi Xiange <[email protected]>
x86/cpu: Add CPU model number for Bartlett Lake CPUs with Raptor Cove cores
Mostafa Saleh <[email protected]>
ubsan: Fix panic from test_ubsan_out_of_bounds
Breno Leitao <[email protected]>
spi: tegra210-quad: add rate limiting and simplify timeout error message
Breno Leitao <[email protected]>
spi: tegra210-quad: use WARN_ON_ONCE instead of WARN_ON for timeouts
Yunlong Xing <[email protected]>
loop: aio inherit the ioprio of original request
Andrew Jones <[email protected]>
riscv: Provide all alternative macros all the time
Gou Hao <[email protected]>
iomap: skip unnecessary ifs_block_is_uptodate check
Fernando Fernandez Mancera <[email protected]>
x86/i8253: Call clockevent_i8253_disable() with interrupts disabled
Igor Pylypiv <[email protected]>
scsi: pm80xx: Set phy_attached to zero when device is gone
Peter Griffin <[email protected]>
scsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init()
Xingui Yang <[email protected]>
scsi: hisi_sas: Fix I/O errors caused by hardware port ID changes
Ojaswin Mujoo <[email protected]>
ext4: make block validity check resistent to sb bh corruption
Pali Rohár <[email protected]>
cifs: Fix querying of WSL CHR and BLK reparse points over SMB1
Sebastian Andrzej Siewior <[email protected]>
timekeeping: Add a lockdep override in tick_freeze()
Pali Rohár <[email protected]>
cifs: Fix encoding of SMB1 Session Setup Kerberos Request in non-UNICODE mode
Daniel Wagner <[email protected]>
nvmet-fc: put ref when assoc->del_work is already scheduled
Daniel Wagner <[email protected]>
nvmet-fc: take tgtport reference only once
Josh Poimboeuf <[email protected]>
x86/bugs: Don't fill RSB on context switch with eIBRS
Josh Poimboeuf <[email protected]>
x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline
Josh Poimboeuf <[email protected]>
x86/bugs: Use SBPB in write_ibpb() if applicable
Qiuxu Zhuo <[email protected]>
selftests/mincore: Allow read-ahead pages to reach the end of the file
Andy Shevchenko <[email protected]>
gpiolib: of: Move Atmel HSMCI quirk up out of the regulator comment
Josh Poimboeuf <[email protected]>
objtool: Stop UNRET validation on UD2
Uday Shankar <[email protected]>
nvme: multipath: fix return value of nvme_available_path
Hannes Reinecke <[email protected]>
nvme: re-read ANA log page after ns scan completes
Jean-Marc Eurin <[email protected]>
ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls
Mario Limonciello <[email protected]>
ACPI: EC: Set ec_no_wakeup for Lenovo Go S
Hannes Reinecke <[email protected]>
nvme: requeue namespace scan on missed AENs
Jason Andryuk <[email protected]>
xen: Change xen-acpi-processor dom0 dependency
Gabriel Shahrouzi <[email protected]>
perf/core: Fix WARN_ON(!ctx) in __free_event() for partial init
Ming Lei <[email protected]>
selftests: ublk: fix test_stripe_04
Xiaogang Chen <[email protected]>
udmabuf: fix a buf size overflow issue during udmabuf creation
Thomas Weißschuh <[email protected]>
KVM: s390: Don't use %pK through debug printing
Thomas Weißschuh <[email protected]>
KVM: s390: Don't use %pK through tracepoints
Oleg Nesterov <[email protected]>
sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP
Pavel Begunkov <[email protected]>
io_uring: always do atomic put from iowq
Lukas Stockmann <[email protected]>
rtc: pcf85063: do a SW reset if POR failed
Dominique Martinet <[email protected]>
9p/net: fix improper handling of bogus negative read/write replies
Basavaraj Natikar <[email protected]>
ntb_hw_amd: Add NTB PCI ID for new gen CPU
Arnd Bergmann <[email protected]>
ntb: reduce stack usage in idt_scan_mws
Al Viro <[email protected]>
qibfs: fix _another_ leak
Josh Poimboeuf <[email protected]>
objtool, lkdtm: Obfuscate the do_nothing() pointer
Josh Poimboeuf <[email protected]>
objtool, regulator: rk808: Remove potential undefined behavior in rk806_set_mode_dcdc()
Josh Poimboeuf <[email protected]>
objtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler()
Josh Poimboeuf <[email protected]>
objtool, panic: Disable SMAP in __stack_chk_fail()
Josh Poimboeuf <[email protected]>
objtool: Silence more KCOV warnings
Mika Westerberg <[email protected]>
thunderbolt: Scan retimers after device router has been enumerated
Théo Lebrun <[email protected]>
usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func
Chenyuan Yang <[email protected]>
usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev()
Michal Pecio <[email protected]>
usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running
Vinicius Costa Gomes <[email protected]>
dmaengine: dmatest: Fix dmatest waiting less when interrupted
John Stultz <[email protected]>
sound/virtio: Fix cancel_sync warnings on uninitialized work_structs
Andy Shevchenko <[email protected]>
usb: dwc3: gadget: Avoid using reserved endpoints on Intel Merrifield
Andy Shevchenko <[email protected]>
usb: dwc3: gadget: Refactor loop to avoid NULL endpoints
Edward Adam Davis <[email protected]>
fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size
Alexander Stein <[email protected]>
usb: host: max3421-hcd: Add missing spi_device_id table
Sudeep Holla <[email protected]>
mailbox: pcc: Always clear the platform ack interrupt first
Huisong Li <[email protected]>
mailbox: pcc: Fix the possible race in updation of chan_in_use flag
Yafang Shao <[email protected]>
bpf: Reject attaching fexit/fmod_ret to __noreturn functions
Martin KaFai Lau <[email protected]>
bpf: Only fails the busy counter check in bpf_cgrp_storage_get if it creates storage
Sewon Nam <[email protected]>
bpf: bpftool: Setting error code in do_loader()
Haoxiang Li <[email protected]>
s390/tty: Fix a potential memory leak bug
Haoxiang Li <[email protected]>
s390/sclp: Add check for get_zeroed_page()
Yu-Chun Lin <[email protected]>
parisc: PDT: Fix missing prototype warning
Heiko Stuebner <[email protected]>
clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec()
Alexei Starovoitov <[email protected]>
bpf: Fix deadlock between rcu_tasks_trace and event_mutex.
Herbert Xu <[email protected]>
crypto: null - Use spin lock instead of mutex
Devaraj Rangasamy <[email protected]>
crypto: ccp - Add support for PCI device 0x1134
Gregory CLEMENT <[email protected]>
MIPS: cm: Detect CM quirks from device tree
Chenyuan Yang <[email protected]>
pinctrl: renesas: rza2: Fix potential NULL pointer dereference
Oliver Neukum <[email protected]>
USB: wdm: add annotation
Oliver Neukum <[email protected]>
USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context
Oliver Neukum <[email protected]>
USB: wdm: close race between wdm_open and wdm_wwan_port_stop
Oliver Neukum <[email protected]>
USB: wdm: handle IO errors in wdm_wwan_port_start
Oliver Neukum <[email protected]>
USB: VLI disk crashes if LPM is used
Miao Li <[email protected]>
usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive
Miao Li <[email protected]>
usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive
Mike Looijmans <[email protected]>
usb: dwc3: xilinx: Prevent spike in reset signal
Frode Isaksen <[email protected]>
usb: dwc3: gadget: check that event count does not exceed event buffer length
Huacai Chen <[email protected]>
USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02)
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: fix usbmisc handling
Ralph Siemsen <[email protected]>
usb: cdns3: Fix deadlock when using NCM gadget
Michal Pecio <[email protected]>
usb: xhci: Fix invalid pointer dereference in Etron workaround
Craig Hesling <[email protected]>
USB: serial: simple: add OWON HDS200 series oscilloscope support
Adam Xue <[email protected]>
USB: serial: option: add Sierra Wireless EM9291
Michael Ehrenreich <[email protected]>
USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe
Ryo Takakura <[email protected]>
serial: sifive: lock port in startup()/shutdown() callbacks
Stephan Gerhold <[email protected]>
serial: msm: Configure correct working mode before starting earlycon
Rengarajan S <[email protected]>
misc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack
Rengarajan S <[email protected]>
misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration
Thadeu Lima de Souza Cascardo <[email protected]>
char: misc: register chrdev region with all possible minors
Sean Christopherson <[email protected]>
KVM: x86: Reset IRTE to host control if *new* route isn't postable
Sean Christopherson <[email protected]>
KVM: x86: Explicitly treat routing entry type changes as changes
Alexander Usyskin <[email protected]>
mei: me: add panther lake H DID
Damien Le Moal <[email protected]>
scsi: Improve CDL control
Oliver Neukum <[email protected]>
USB: storage: quirk for ADATA Portable HDD CH94
Damien Le Moal <[email protected]>
ata: libata-scsi: Fix ata_msense_control_ata_feature()
Damien Le Moal <[email protected]>
ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type
Damien Le Moal <[email protected]>
ata: libata-scsi: Improve CDL control
Haoxiang Li <[email protected]>
mcb: fix a double free bug in chameleon_parse_gdd()
Smita Koralahalli <[email protected]>
cxl/core/regs.c: Skip Memory Space Enable check for RCD and RCH Ports
Sean Christopherson <[email protected]>
KVM: SVM: Allocate IR data using atomic allocation
Jens Axboe <[email protected]>
io_uring: fix 'sync' handling of io_fallback_tw()
Petr Tesarik <[email protected]>
LoongArch: Remove a bogus reference to ZONE_DMA
Ming Wang <[email protected]>
LoongArch: Return NULL from huge_pte_offset() for invalid PMD
Suzuki K Poulose <[email protected]>
irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()
Roman Li <[email protected]>
drm/amd/display: Force full update in gpu reset
Roman Li <[email protected]>
drm/amd/display: Fix gpu reset in multidisplay config
Fiona Klute <[email protected]>
net: phy: microchip: force IRQ polling mode for lan88xx
Oleksij Rempel <[email protected]>
net: selftests: initialize TCP header and skb payload with zero
Alexey Nepomnyashih <[email protected]>
xen-netfront: handle NULL returned by xdp_convert_buff_to_frame()
Marek Behún <[email protected]>
crypto: atmel-sha204a - Set hwrng quality to lowest possible
Halil Pasic <[email protected]>
virtio_console: fix missing byte order handling for cols and rows
Tiezhu Yang <[email protected]>
LoongArch: Make do_xyz() exception handlers more robust
Tiezhu Yang <[email protected]>
LoongArch: Make regs_irqs_disabled() more clear
Yuli Wang <[email protected]>
LoongArch: Select ARCH_USE_MEMTEST
Luo Gengkun <[email protected]>
perf/x86: Fix non-sampling (counting) events on certain x86 platforms
T.J. Mercier <[email protected]>
splice: remove duplicate noinline from pipe_clear_nowait
Björn Töpel <[email protected]>
riscv: uprobes: Add missing fence.i after building the XOL buffer
Sean Christopherson <[email protected]>
iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE
Shannon Nelson <[email protected]>
pds_core: make wait_context part of q_info
Brett Creeley <[email protected]>
pds_core: Remove unnecessary check in pds_client_adminq_cmd()
Brett Creeley <[email protected]>
pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result
Daniel Golle <[email protected]>
net: dsa: mt7530: sync driver-specific behavior of MT7531 variants
Cong Wang <[email protected]>
net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too
Cong Wang <[email protected]>
net_sched: hfsc: Fix a UAF vulnerability in class handling
Al Viro <[email protected]>
fix a couple of races in MNT_TREE_BENEATH handling by do_move_mount()
Bo-Cun Chen <[email protected]>
net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration
Tung Nguyen <[email protected]>
tipc: fix NULL pointer dereference in tipc_mon_reinit_self()
Qingfang Deng <[email protected]>
net: phy: leds: fix memory leak
Justin Iurman <[email protected]>
net: lwtunnel: disable BHs when required
Anastasia Kovaleva <[email protected]>
scsi: core: Clear flags for scsi_cmnd that did not complete
Qu Wenruo <[email protected]>
btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range()
Marc Zyngier <[email protected]>
cpufreq: cppc: Fix invalid return value in .get() callback
Chenyuan Yang <[email protected]>
scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort()
Henry Martin <[email protected]>
cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate()
Henry Martin <[email protected]>
cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate()
Henry Martin <[email protected]>
cpufreq: apple-soc: Fix null-ptr-deref in apple_soc_cpufreq_get_rate()
Arnd Bergmann <[email protected]>
dma/contiguous: avoid warning about unused size_bytes
David Howells <[email protected]>
ceph: Fix incorrect flush end position calculation
Rafael J. Wysocki <[email protected]>
cpufreq/sched: Explicitly synchronize limits_changed flag handling
Vincent Guittot <[email protected]>
sched/cpufreq: Rework schedutil governor performance estimation
Vincent Guittot <[email protected]>
sched/topology: Consolidate and clean up access to a CPU's max compute capacity
Niklas Schnelle <[email protected]>
s390/pci: Support mmap() of PCI resources except for ISM devices
Niklas Schnelle <[email protected]>
s390/pci: Report PCI error recovery results via SCLP
Niklas Schnelle <[email protected]>
s390/sclp: Allow user-space to provide PCI reports for optical modules
Tudor Ambarus <[email protected]>
scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get
David Hildenbrand <[email protected]>
s390/virtio_ccw: Don't allocate/assign airqs for non-existing queues
Halil Pasic <[email protected]>
s390/virtio_ccw: fix virtual vs physical address confusion
Ma Ke <[email protected]>
PCI: Fix reference leak in pci_register_host_bridge()
Zijun Hu <[email protected]>
of: resolver: Fix device node refcount leakage in of_resolve_phandles()
Rob Herring (Arm) <[email protected]>
of: resolver: Simplify of_resolve_phandles() using __free()
Lad Prabhakar <[email protected]>
clk: renesas: r9a07g043: Fix HP clock source for RZ/Five
Claudiu Beznea <[email protected]>
clk: renesas: r9a07g04[34]: Fix typo for sel_shdi variable
Claudiu Beznea <[email protected]>
clk: renesas: r9a07g04[34]: Use SEL_SDHI1_STS status configuration for SD1 mux
Claudiu Beznea <[email protected]>
clk: renesas: rzg2l: Refactor SD mux driver
Claudiu Beznea <[email protected]>
clk: renesas: rzg2l: Remove CPG_SDHI_DSEL from generic header
Claudiu Beznea <[email protected]>
clk: renesas: rzg2l: Add struct clk_hw_data
Claudiu Beznea <[email protected]>
clk: renesas: rzg2l: Use u32 for flag and mux_flags
Ninad Malwade <[email protected]>
arm64: tegra: Remove the Orin NX/Nano suspend key
Sergiu Cuciurean <[email protected]>
iio: adc: ad7768-1: Fix conversion result sign
Jonathan Cameron <[email protected]>
iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check
Srinivas Kandagatla <[email protected]>
ASoC: q6apm-dai: make use of q6apm_get_hw_pointer
Krzysztof Kozlowski <[email protected]>
ASoC: qcom: Fix trivial code style issues
Uwe Kleine-König <[email protected]>
ASoC: qcom: lpass: Make asoc_qcom_lpass_cpu_platform_remove() return void
Srinivas Kandagatla <[email protected]>
ASoC: q6apm-dai: schedule all available frames to avoid dsp under-runs
Krzysztof Kozlowski <[email protected]>
ASoC: qcom: q6apm-dai: drop unused 'q6apm_dai_rtd' fields
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: fix VTU methods for 6320 family
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: fix internal PHYs for 6320 family
Haoxiang Li <[email protected]>
auxdisplay: hd44780: Fix an API misuse in hd44780.c
Uwe Kleine-König <[email protected]>
auxdisplay: hd44780: Convert to platform remove callback returning void
Tudor Ambarus <[email protected]>
mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get
Tudor Ambarus <[email protected]>
soc: qcom: ice: introduce devm_of_qcom_ice_get
Nikita Zhandarovich <[email protected]>
media: vimc: skip .s_stream() for stopped entities
Tomi Valkeinen <[email protected]>
media: subdev: Add v4l2_subdev_is_streaming()
Tomi Valkeinen <[email protected]>
media: subdev: Improve v4l2_subdev_enable/disable_streams_fallback
Tomi Valkeinen <[email protected]>
media: subdev: Fix use of sd->enabled_streams in call_s_stream()
Steven Rostedt <[email protected]>
tracing: Verify event formats that have "%*p.."
Steven Rostedt <[email protected]>
tracing: Add __print_dynamic_array() helper
Steven Rostedt (Google) <[email protected]>
tracing: Add __string_len() example
Shuai Xue <[email protected]>
x86/mce: use is_copy_from_user() to determine copy-from-user context
Tong Tiangen <[email protected]>
x86/extable: Remove unused fixup type EX_TYPE_COPY
Shakeel Butt <[email protected]>
memcg: drain obj stock on cpu hotplug teardown
Thorsten Leemhuis <[email protected]>
module: sign with sha512 instead of sha1 by default
-------------
Diffstat:
Documentation/scheduler/sched-capacity.rst | 13 +- Makefile | 4 +- .../arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi | 7 - arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/ptrace.h | 4 +- arch/loongarch/kernel/traps.c | 20 ++- arch/loongarch/mm/hugetlbpage.c | 2 +- arch/loongarch/mm/init.c | 3 - arch/mips/include/asm/mips-cm.h | 22 +++ arch/mips/kernel/mips-cm.c | 14 ++ arch/parisc/kernel/pdt.c | 2 + arch/riscv/include/asm/alternative-macros.h | 21 +-- arch/riscv/kernel/probes/uprobes.c | 10 +- arch/s390/Kconfig | 4 +- arch/s390/include/asm/pci.h | 3 + arch/s390/include/asm/sclp.h | 33 ++++ arch/s390/kvm/intercept.c | 2 +- arch/s390/kvm/interrupt.c | 8 +- arch/s390/kvm/kvm-s390.c | 10 +- arch/s390/kvm/trace-s390.h | 4 +- arch/s390/pci/Makefile | 2 +- arch/s390/pci/pci_event.c | 21 ++- arch/s390/pci/pci_fixup.c | 23 +++ arch/s390/pci/pci_report.c | 111 +++++++++++++ arch/s390/pci/pci_report.h | 16 ++ arch/x86/entry/entry.S | 2 +- arch/x86/events/core.c | 2 +- arch/x86/include/asm/asm.h | 3 - arch/x86/include/asm/extable_fixup_types.h | 2 +- arch/x86/include/asm/intel-family.h | 2 + arch/x86/kernel/cpu/bugs.c | 36 ++--- arch/x86/kernel/cpu/mce/severity.c | 12 +- arch/x86/kernel/i8253.c | 3 +- arch/x86/kvm/svm/avic.c | 60 +++---- arch/x86/kvm/vmx/posted_intr.c | 28 ++-- arch/x86/kvm/x86.c | 3 +- arch/x86/mm/extable.c | 9 -- arch/x86/mm/tlb.c | 6 +- arch/x86/platform/pvh/head.S | 7 +- crypto/crypto_null.c | 37 +++-- drivers/acpi/ec.c | 28 ++++ drivers/acpi/pptt.c | 4 +- drivers/ata/libata-scsi.c | 25 ++- drivers/auxdisplay/hd44780.c | 9 +- drivers/base/base.h | 17 ++ drivers/base/bus.c | 2 +- drivers/base/core.c | 38 ++++- drivers/base/dd.c | 6 +- drivers/block/loop.c | 2 +- drivers/char/misc.c | 2 +- drivers/char/virtio_console.c | 7 +- drivers/clk/clk.c | 4 + drivers/clk/renesas/r9a07g043-cpg.c | 28 +++- drivers/clk/renesas/r9a07g044-cpg.c | 21 ++- drivers/clk/renesas/rzg2l-cpg.c | 178 +++++++++++++++------ drivers/clk/renesas/rzg2l-cpg.h | 24 +-- drivers/comedi/drivers/jr3_pci.c | 2 +- drivers/cpufreq/apple-soc-cpufreq.c | 10 +- drivers/cpufreq/cppc_cpufreq.c | 2 +- drivers/cpufreq/scmi-cpufreq.c | 10 +- drivers/cpufreq/scpi-cpufreq.c | 13 +- drivers/crypto/atmel-sha204a.c | 6 + drivers/crypto/ccp/sp-pci.c | 1 + drivers/cxl/core/regs.c | 4 - drivers/dma-buf/udmabuf.c | 2 +- drivers/dma/dmatest.c | 6 +- drivers/gpio/gpiolib-of.c | 6 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +- drivers/iio/adc/ad7768-1.c | 5 +- drivers/infiniband/hw/qib/qib_fs.c | 1 + drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/iommu.c | 16 ++ drivers/irqchip/irq-gic-v2m.c | 2 +- drivers/mailbox/pcc.c | 15 +- drivers/mcb/mcb-parse.c | 2 +- drivers/md/raid1.c | 26 +-- drivers/media/test-drivers/vimc/vimc-streamer.c | 6 + drivers/media/v4l2-core/v4l2-subdev.c | 101 ++++++++---- drivers/misc/lkdtm/perms.c | 14 +- drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 8 +- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + drivers/mmc/host/sdhci-msm.c | 2 +- drivers/net/dsa/mt7530.c | 6 +- drivers/net/dsa/mv88e6xxx/chip.c | 27 +++- drivers/net/ethernet/amd/pds_core/adminq.c | 36 ++--- drivers/net/ethernet/amd/pds_core/auxbus.c | 3 - drivers/net/ethernet/amd/pds_core/core.c | 4 +- drivers/net/ethernet/amd/pds_core/core.h | 2 +- drivers/net/ethernet/amd/pds_core/devlink.c | 4 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 24 ++- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 10 +- drivers/net/phy/microchip.c | 46 +----- drivers/net/phy/phy_led_triggers.c | 23 +-- drivers/net/vmxnet3/vmxnet3_xdp.c | 2 +- drivers/net/xen-netfront.c | 19 ++- drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + drivers/ntb/hw/idt/ntb_hw_idt.c | 18 +-- drivers/nvme/host/core.c | 9 ++ drivers/nvme/host/multipath.c | 2 +- drivers/nvme/target/fc.c | 25 ++- drivers/of/resolver.c | 37 ++--- drivers/pci/probe.c | 9 +- drivers/pinctrl/renesas/pinctrl-rza2.c | 3 + drivers/regulator/rk808-regulator.c | 4 +- drivers/rtc/rtc-pcf85063.c | 19 ++- drivers/s390/char/sclp.h | 14 -- drivers/s390/char/sclp_con.c | 17 ++ drivers/s390/char/sclp_pci.c | 19 +-- drivers/s390/char/sclp_tty.c | 12 ++ drivers/s390/net/ism_drv.c | 1 - drivers/s390/virtio/virtio_ccw.c | 94 ++++++----- drivers/scsi/hisi_sas/hisi_sas_main.c | 20 +++ drivers/scsi/pm8001/pm8001_sas.c | 1 + drivers/scsi/scsi.c | 36 +++-- drivers/scsi/scsi_lib.c | 6 +- drivers/soc/qcom/ice.c | 48 ++++++ drivers/spi/spi-imx.c | 5 +- drivers/spi/spi-tegra210-quad.c | 6 +- drivers/thunderbolt/tb.c | 16 +- drivers/tty/serial/msm_serial.c | 6 + drivers/tty/serial/sifive.c | 6 + drivers/ufs/core/ufs-mcq.c | 12 +- drivers/ufs/host/ufs-exynos.c | 10 +- drivers/ufs/host/ufs-qcom.c | 2 +- drivers/usb/cdns3/cdns3-gadget.c | 2 + drivers/usb/chipidea/ci_hdrc_imx.c | 44 +++-- drivers/usb/class/cdc-wdm.c | 21 ++- drivers/usb/core/quirks.c | 9 ++ drivers/usb/dwc3/dwc3-pci.c | 10 ++ drivers/usb/dwc3/dwc3-xilinx.c | 4 +- drivers/usb/dwc3/gadget.c | 28 +++- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 3 + drivers/usb/host/max3421-hcd.c | 7 + drivers/usb/host/ohci-pci.c | 23 +++ drivers/usb/host/xhci-mvebu.c | 10 -- drivers/usb/host/xhci-mvebu.h | 6 - drivers/usb/host/xhci-plat.c | 2 +- drivers/usb/host/xhci-ring.c | 13 +- drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 5 + drivers/usb/serial/option.c | 3 + drivers/usb/serial/usb-serial-simple.c | 7 + drivers/usb/storage/unusual_uas.h | 7 + drivers/xen/Kconfig | 2 +- fs/btrfs/file.c | 9 +- fs/ceph/inode.c | 2 +- fs/ext4/block_validity.c | 5 +- fs/ext4/inode.c | 9 +- fs/iomap/buffered-io.c | 2 +- fs/namespace.c | 69 ++++---- fs/ntfs3/file.c | 1 + fs/smb/client/sess.c | 60 ++++--- fs/smb/client/smb1ops.c | 36 +++++ fs/splice.c | 2 +- include/linux/energy_model.h | 1 - include/linux/pci_ids.h | 1 + include/media/v4l2-subdev.h | 25 ++- include/soc/qcom/ice.h | 2 + include/trace/stages/stage3_trace_output.h | 8 + include/trace/stages/stage7_class_define.h | 1 + init/Kconfig | 2 +- io_uring/io_uring.c | 15 +- io_uring/refs.h | 7 + kernel/bpf/bpf_cgrp_storage.c | 11 +- kernel/bpf/verifier.c | 32 ++++ kernel/dma/contiguous.c | 3 +- kernel/events/core.c | 6 +- kernel/module/Kconfig | 1 + kernel/panic.c | 6 + kernel/sched/core.c | 92 +++++------ kernel/sched/cpudeadline.c | 2 +- kernel/sched/cpufreq_schedutil.c | 63 ++++++-- kernel/sched/deadline.c | 4 +- kernel/sched/fair.c | 40 +++-- kernel/sched/rt.c | 2 +- kernel/sched/sched.h | 30 +--- kernel/sched/topology.c | 7 +- kernel/time/tick-common.c | 22 +++ kernel/trace/bpf_trace.c | 7 +- kernel/trace/trace_events.c | 7 + lib/test_ubsan.c | 18 ++- mm/memcontrol.c | 9 ++ net/9p/client.c | 30 ++-- net/core/lwtunnel.c | 26 ++- net/core/selftests.c | 18 ++- net/sched/sch_hfsc.c | 23 ++- net/tipc/monitor.c | 3 +- samples/trace_events/trace-events-sample.h | 18 ++- scripts/Makefile.lib | 2 +- sound/soc/codecs/wcd934x.c | 2 +- sound/soc/qcom/apq8016_sbc.c | 2 +- sound/soc/qcom/apq8096.c | 2 +- sound/soc/qcom/common.c | 2 +- sound/soc/qcom/lpass-apq8016.c | 4 +- sound/soc/qcom/lpass-cpu.c | 7 +- sound/soc/qcom/lpass-hdmi.c | 2 +- sound/soc/qcom/lpass-ipq806x.c | 4 +- sound/soc/qcom/lpass-platform.c | 2 +- sound/soc/qcom/lpass-sc7180.c | 4 +- sound/soc/qcom/lpass-sc7280.c | 2 +- sound/soc/qcom/lpass.h | 4 +- sound/soc/qcom/qdsp6/q6afe.c | 8 +- sound/soc/qcom/qdsp6/q6apm-dai.c | 61 ++++--- sound/soc/qcom/qdsp6/q6asm.h | 20 +-- sound/soc/qcom/qdsp6/topology.c | 3 +- sound/soc/qcom/sc7180.c | 2 +- sound/soc/qcom/sc8280xp.c | 2 +- sound/soc/qcom/sdm845.c | 2 +- sound/soc/qcom/sdw.c | 2 +- sound/soc/qcom/sm8250.c | 2 +- sound/soc/qcom/storm.c | 2 +- sound/virtio/virtio_pcm.c | 21 ++- tools/bpf/bpftool/prog.c | 1 + tools/objtool/check.c | 36 ++++- tools/testing/selftests/mincore/mincore_selftest.c | 3 - tools/testing/selftests/ublk/test_stripe_04.sh | 24 +++ 217 files changed, 2073 insertions(+), 1004 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 32/204 clk: renesas: r9a07g043: Fix HP clock source for RZ/Five
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lad Prabhakar <[email protected]>
[ Upstream commit 7f22a298d926664b51fcfe2f8ea5feb7f8b79952 ]
According to the Rev.1.20 hardware manual for the RZ/Five SoC, the clock source for HP is derived from PLL6 divided by 2. Correct the implementation by configuring HP as a fixed clock source instead of a MUX.
The `CPG_PL6_ETH_SSEL' register, which is available on the RZ/G2UL SoC, is not present on the RZ/Five SoC, necessitating this change.
--- drivers/clk/renesas/r9a07g043-cpg.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/clk/renesas/r9a07g043-cpg.c +7 -0
@@ -86,7 +86,9 @@ static const struct clk_div_table dtable_1_32[] = {/* Mux clock tables */ static const char *const sel_pll3_3[] = {".pll3_533" ,".pll3_400" }; +#ifdef CONFIG_ARM64 static const char *const sel_pll6_2[] = {".pll6_250" ,".pll5_250" }; +#endif static const char *const sel_sdhi[] = {".clk_533" ,".clk_400" ,".clk_266" };static const u32 mtable_sdhi[] = {1 ,2 ,3 };
@@ -133,7 +135,12 @@ static const struct cpg_core_clk r9a07g043_core_clks[] __initconst = {DEF_DIV ("P2" ,R9A07G043_CLK_P2 ,CLK_PLL3_DIV2_4_2 ,DIVPL3A , dtable_1_32),DEF_FIXED ("M0" ,R9A07G043_CLK_M0 ,CLK_PLL3_DIV2_4 ,1 ,1 ),DEF_FIXED ("ZT" ,R9A07G043_CLK_ZT ,CLK_PLL3_DIV2_4_2 ,1 ,1 ), +#ifdef CONFIG_ARM64DEF_MUX ("HP" ,R9A07G043_CLK_HP ,SEL_PLL6_2 , sel_pll6_2), +#endif +#ifdef CONFIG_RISCV +DEF_FIXED ("HP" ,R9A07G043_CLK_HP ,CLK_PLL6_250 ,1 ,1 ), +#endifDEF_FIXED ("SPI0" ,R9A07G043_CLK_SPI0 ,CLK_DIV_PLL3_C ,1 ,2 ),DEF_FIXED ("SPI1" ,R9A07G043_CLK_SPI1 ,CLK_DIV_PLL3_C ,1 ,4 ), DEF_SD_MUX("SD0", R9A07G043_CLK_SD0, SEL_SDHI0, SEL_SDHI0_STS, sel_sdhi,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 41/204 s390/pci: Support mmap() of PCI resources except for ISM devices
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Schnelle <[email protected]>
[ Upstream commit aa9f168d55dc47c0de564f7dfe0e90467c9fee71 ]
So far s390 does not allow mmap() of PCI resources to user-space via the usual mechanisms, though it does use it for RDMA. For the PCI sysfs resource files and /proc/bus/pci it defines neither HAVE_PCI_MMAP nor ARCH_GENERIC_PCI_MMAP_RESOURCE. For vfio-pci s390 previously relied on disabled VFIO_PCI_MMAP and now relies on setting pdev->non_mappable_bars for all devices.
This is partly because access to mapped PCI resources from user-space requires special PCI load/store memory-I/O (MIO) instructions, or the special MMIO syscalls when these are not available. Still, such access is possible and useful not just for RDMA, in fact not being able to mmap() PCI resources has previously caused extra work when testing devices.
One thing that doesn't work with PCI resources mapped to user-space though is the s390 specific virtual ISM device. Not only because the BAR size of 256 TiB prevents mapping the whole BAR but also because access requires use of the legacy PCI instructions which are not accessible to user-space on systems with the newer MIO PCI instructions.
Now with the pdev->non_mappable_bars flag ISM can be excluded from mapping its resources while making this functionality available for all other PCI devices. To this end introduce a minimal implementation of PCI_QUIRKS and use that to set pdev->non_mappable_bars for ISM devices only. Then also set ARCH_GENERIC_PCI_MMAP_RESOURCE to take advantage of the generic implementation of pci_mmap_resource_range() enabling only the newer sysfs mmap() interface. This follows the recommendation in Documentation/PCI/sysfs-pci.rst.
--- arch/s390/Kconfig | 4 +--- arch/s390/include/asm/pci.h | 3 +++ arch/s390/pci/Makefile | 2 +- arch/s390/pci/pci_fixup.c | 23 +++++++++++++++++++++++ drivers/s390/net/ism_drv.c | 1 - include/linux/pci_ids.h | 1 + 6 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 arch/s390/pci/pci_fixup.c
arch/s390/Kconfig +1 -3
@@ -38,9 +38,6 @@ config AUDIT_ARCH config NO_IOPORT_MAP def_bool y -config PCI_QUIRKS - def_bool n - config ARCH_SUPPORTS_UPROBES def_bool y
@@ -229,6 +226,7 @@ config S390 select PCI_DOMAINS if PCI select PCI_MSI if PCI select PCI_MSI_ARCH_FALLBACKS if PCI_MSI + select PCI_QUIRKS if PCI select SPARSE_IRQ select SWIOTLB select SYSCTL_EXCEPTION_TRACE
arch/s390/include/asm/pci.h +3 -0
@@ -11,6 +11,9 @@#include <asm/pci_insn.h> #include <asm/sclp.h> +#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1 +#define arch_can_pci_mmap_wc () 1 +#define PCIBIOS_MIN_IO 0x1000#define PCIBIOS_MIN_MEM 0x10000000
arch/s390/pci/Makefile +1 -1
@@ -5,5 +5,5 @@ obj-$(CONFIG_PCI) += pci.o pci_irq.o pci_dma.o pci_clp.o pci_sysfs.o \ pci_event.o pci_debug.o pci_insn.o pci_mmio.o \ - pci_bus.o pci_kvm_hook.o pci_report.o + pci_bus.o pci_kvm_hook.o pci_report.o pci_fixup.o obj-$(CONFIG_PCI_IOV) += pci_iov.o
arch/s390/pci/pci_fixup.c new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Exceptions for specific devices, +* +* Copyright IBM Corp. 2025 +* +* Author(s): +* Niklas Schnelle <[email protected]> +*/ +#include <linux/pci.h> + +static void zpci_ism_bar_no_mmap (struct pci_dev *pdev) +{ +/* +* ISM's BAR is special. Drivers written for ISM know +* how to handle this but others need to be aware of their +* special nature e.g. to prevent attempts to mmap() it. +*/ + pdev->non_mappable_bars =1 ; +} +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_IBM , +PCI_DEVICE_ID_IBM_ISM , + zpci_ism_bar_no_mmap);
drivers/s390/net/ism_drv.c +0 -1
@@ -20,7 +20,6 @@MODULE_DESCRIPTION ("ISM driver for s390" );MODULE_LICENSE ("GPL" ); -#define PCI_DEVICE_ID_IBM_ISM 0x04ED#define DRV_NAME "ism"static const struct pci_device_id ism_device_table[] = {
include/linux/pci_ids.h +1 -0
@@ -517,6 +517,7 @@#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM 0x0251#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE 0x0361#define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL 0x252 +#define PCI_DEVICE_ID_IBM_ISM 0x04ed#define PCI_SUBVENDOR_ID_IBM 0x1014#define PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT 0x03d4
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 42/204 sched/topology: Consolidate and clean up access to a CPUs max compute capacity
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Guittot <[email protected]>
[ Upstream commit 7bc263840bc3377186cb06b003ac287bb2f18ce2 ]
Remove the rq::cpu_capacity_orig field and use arch_scale_cpu_capacity() instead.
The scheduler uses 3 methods to get access to a CPU's max compute capacity:
- arch_scale_cpu_capacity(cpu) which is the default way to get a CPU's capacity.
- cpu_capacity_orig field which is periodically updated with arch_scale_cpu_capacity().
- capacity_orig_of(cpu) which encapsulates rq->cpu_capacity_orig.
There is no real need to save the value returned by arch_scale_cpu_capacity() in struct rq. arch_scale_cpu_capacity() returns:
- either a per_cpu variable.
- or a const value for systems which have only one capacity.
Remove rq::cpu_capacity_orig and use arch_scale_cpu_capacity() everywhere.
No functional changes.
Some performance tests on Arm64:
- small SMP device (hikey): no noticeable changes
- HMP device (RB5): hackbench shows minor improvement (1-2%)
- large smp (thx2): hackbench and tbench shows minor improvement (1%)
Stable-dep-of: 79443a7e9da3 ("cpufreq/sched: Explicitly synchronize limits_changed flag handling")
--- Documentation/scheduler/sched-capacity.rst | 13 +++++++------ kernel/sched/core.c | 2 +- kernel/sched/cpudeadline.c | 2 +- kernel/sched/deadline.c | 4 ++-- kernel/sched/fair.c | 18 ++++++++---------- kernel/sched/rt.c | 2 +- kernel/sched/sched.h | 6 ------ kernel/sched/topology.c | 7 +++++-- 8 files changed, 25 insertions(+), 29 deletions(-)
Documentation/scheduler/sched-capacity.rst +7 -6
@@ -39,14 +39,15 @@ per Hz, leading to:: ------------------- Two different capacity values are used within the scheduler. A CPU's -``capacity_orig`` is its maximum attainable capacity, i.e. its maximum -attainable performance level. A CPU's ``capacity`` is its ``capacity_orig`` to -which some loss of available performance (e.g. time spent handling IRQs) is -subtracted. +``original capacity`` is its maximum attainable capacity, i.e. its maximum +attainable performance level. This original capacity is returned by +the function arch_scale_cpu_capacity(). A CPU's ``capacity`` is its ``original +capacity`` to which some loss of available performance (e.g. time spent +handling IRQs) is subtracted. Note that a CPU's ``capacity`` is solely intended to be used by the CFS class, -while ``capacity_orig`` is class-agnostic. The rest of this document will use -the term ``capacity`` interchangeably with ``capacity_orig`` for the sake of +while ``original capacity`` is class-agnostic. The rest of this document will use +the term ``capacity`` interchangeably with ``original capacity`` for the sake of brevity. 1.3 Platform examples
kernel/sched/core.c +1 -1
@@ -10048,7 +10048,7 @@ void __init sched_init(void)#ifdef CONFIG_SMP rq->sd =NULL ; rq->rd =NULL ; - rq->cpu_capacity = rq->cpu_capacity_orig =SCHED_CAPACITY_SCALE ; + rq->cpu_capacity =SCHED_CAPACITY_SCALE ; rq->balance_callback = &balance_push_callback; rq->active_balance =0 ; rq->next_balance = jiffies;
kernel/sched/cpudeadline.c +1 -1
@@ -131,7 +131,7 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,if (!dl_task_fits_capacity (p, cpu)) {cpumask_clear_cpu (cpu, later_mask); - cap =capacity_orig_of (cpu); + cap =arch_scale_cpu_capacity (cpu);if (cap > max_cap || (cpu ==task_cpu (p) && cap == max_cap)) {
kernel/sched/deadline.c +2 -2
@@ -132,7 +132,7 @@ static inline unsigned long __dl_bw_capacity(const struct cpumask *mask)int i;for_each_cpu_and (i, mask, cpu_active_mask) - cap +=capacity_orig_of (i); + cap +=arch_scale_cpu_capacity (i);return cap; }
@@ -144,7 +144,7 @@ static inline unsigned long __dl_bw_capacity(const struct cpumask *mask)static inline unsigned long dl_bw_capacity (int i) {if (!sched_asym_cpucap_active () && -capacity_orig_of (i) ==SCHED_CAPACITY_SCALE ) { +arch_scale_cpu_capacity (i) ==SCHED_CAPACITY_SCALE ) {return dl_bw_cpus (i) <<SCHED_CAPACITY_SHIFT ; }else { RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held(),
kernel/sched/fair.c +8 -10
@@ -4951,7 +4951,7 @@ static inline void util_est_update(struct cfs_rq *cfs_rq,* To avoid overestimation of actual task utilization, skip updates if * we cannot grant there is idle time in this CPU. */ -if (task_util (p) >capacity_orig_of (cpu_of (rq_of (cfs_rq)))) +if (task_util (p) >arch_scale_cpu_capacity (cpu_of (rq_of (cfs_rq))))return ;/*
@@ -4999,14 +4999,14 @@ static inline int util_fits_cpu(unsigned long util,return fits;/* -* We must use capacity_orig_of() for comparing against uclamp_min and +* We must use arch_scale_cpu_capacity() for comparing against uclamp_min and * uclamp_max. We only care about capacity pressure (by using * capacity_of()) for comparing against the real util. * * If a task is boosted to 1024 for example, we don't want a tiny * pressure to skew the check whether it fits a CPU or not. * -* Similarly if a task is capped to capacity_orig_of(little_cpu), it +* Similarly if a task is capped to arch_scale_cpu_capacity(little_cpu), it * should fit a little cpu even if there's some pressure. * * Only exception is for thermal pressure since it has a direct impact
@@ -5018,7 +5018,7 @@ static inline int util_fits_cpu(unsigned long util,* For uclamp_max, we can tolerate a drop in performance level as the * goal is to cap the task. So it's okay if it's getting less. */ - capacity_orig =capacity_orig_of (cpu); + capacity_orig =arch_scale_cpu_capacity (cpu); capacity_orig_thermal = capacity_orig -arch_scale_thermal_pressure (cpu);/*
@@ -7515,7 +7515,7 @@ select_idle_capacity(struct task_struct *p, struct sched_domain *sd, int target)* Look for the CPU with best capacity. */ else if (fits < 0) - cpu_cap =capacity_orig_of (cpu) -thermal_load_avg (cpu_rq (cpu)); + cpu_cap =arch_scale_cpu_capacity (cpu) -thermal_load_avg (cpu_rq (cpu));/* * First, select CPU which fits better (-1 being better than 0).
@@ -7757,7 +7757,7 @@ cpu_util(int cpu, struct task_struct *p, int dst_cpu, int boost) util =max (util, util_est); } -return min (util,capacity_orig_of (cpu)); +return min (util,arch_scale_cpu_capacity (cpu)); }unsigned long cpu_util_cfs (int cpu)
@@ -9544,8 +9544,6 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu)unsigned long capacity =scale_rt_capacity (cpu);struct sched_group *sdg = sd->groups; -cpu_rq (cpu)->cpu_capacity_orig =arch_scale_cpu_capacity (cpu); -if (!capacity) capacity =1 ;
@@ -9621,7 +9619,7 @@ static inline int check_cpu_capacity(struct rq *rq, struct sched_domain *sd) {return ((rq->cpu_capacity * sd->imbalance_pct) < - (rq->cpu_capacity_orig *100 )); + (arch_scale_cpu_capacity (cpu_of (rq)) *100 )); }/*
@@ -9632,7 +9630,7 @@ check_cpu_capacity(struct rq *rq, struct sched_domain *sd)static inline int check_misfit_status (struct rq *rq,struct sched_domain *sd) {return rq->misfit_task_load && - (rq->cpu_capacity_orig < rq->rd->max_cpu_capacity || + (arch_scale_cpu_capacity (rq->cpu) < rq->rd->max_cpu_capacity ||check_cpu_capacity (rq, sd)); }
kernel/sched/rt.c +1 -1
@@ -519,7 +519,7 @@ static inline bool rt_task_fits_capacity(struct task_struct *p, int cpu) min_cap =uclamp_eff_value (p,UCLAMP_MIN ); max_cap =uclamp_eff_value (p,UCLAMP_MAX ); - cpu_cap =capacity_orig_of (cpu); + cpu_cap =arch_scale_cpu_capacity (cpu);return cpu_cap >=min (min_cap, max_cap); }
kernel/sched/sched.h +0 -6
@@ -1048,7 +1048,6 @@ struct rq {struct sched_domain __rcu *sd;unsigned long cpu_capacity; -unsigned long cpu_capacity_orig;struct balance_callback *balance_callback;
@@ -2985,11 +2984,6 @@ static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {}#endif #ifdef CONFIG_SMP -static inline unsigned long capacity_orig_of (int cpu) -{ -return cpu_rq (cpu)->cpu_capacity_orig; -} -/** * enum cpu_util_type - CPU utilization type * @FREQUENCY_UTIL: Utilization used to select frequency
kernel/sched/topology.c +5 -2
@@ -2486,12 +2486,15 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *att/* Attach the domains */ rcu_read_lock ();for_each_cpu (i, cpu_map) { +unsigned long capacity; + rq =cpu_rq (i); sd = *per_cpu_ptr (d.sd, i); + capacity =arch_scale_cpu_capacity (i);/* Use READ_ONCE()/WRITE_ONCE() to avoid load/store tearing: */ -if (rq->cpu_capacity_orig >READ_ONCE (d.rd->max_cpu_capacity)) -WRITE_ONCE (d.rd->max_cpu_capacity, rq->cpu_capacity_orig); +if (capacity >READ_ONCE (d.rd->max_cpu_capacity)) +WRITE_ONCE (d.rd->max_cpu_capacity, capacity);cpu_attach_domain (sd, d.rd, i); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 43/204 sched/cpufreq: Rework schedutil governor performance estimation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Guittot <[email protected]>
[ Upstream commit 9c0b4bb7f6303c9c4e2e34984c46f5a86478f84d ]
The current method to take into account uclamp hints when estimating the target frequency can end in a situation where the selected target frequency is finally higher than uclamp hints, whereas there are no real needs. Such cases mainly happen because we are currently mixing the traditional scheduler utilization signal with the uclamp performance hints. By adding these 2 metrics, we loose an important information when it comes to select the target frequency, and we have to make some assumptions which can't fit all cases.
Rework the interface between the scheduler and schedutil governor in order to propagate all information down to the cpufreq governor.
effective_cpu_util() interface changes and now returns the actual utilization of the CPU with 2 optional inputs:
- The minimum performance for this CPU; typically the capacity to handle the deadline task and the interrupt pressure. But also uclamp_min request when available.
- The maximum targeting performance for this CPU which reflects the maximum level that we would like to not exceed. By default it will be the CPU capacity but can be reduced because of some performance hints set with uclamp. The value can be lower than actual utilization and/or min performance level.
A new sugov_effective_cpu_perf() interface is also available to compute the final performance level that is targeted for the CPU, after applying some cpufreq headroom and taking into account all inputs.
With these 2 functions, schedutil is now able to decide when it must go above uclamp hints. It now also has a generic way to get the min performance level.
The dependency between energy model and cpufreq governor and its headroom policy doesn't exist anymore.
eenv_pd_max_util() asks schedutil for the targeted performance after applying the impact of the waking task.
[ mingo: Refined the changelog & C comments. ]
Stable-dep-of: 79443a7e9da3 ("cpufreq/sched: Explicitly synchronize limits_changed flag handling")
--- include/linux/energy_model.h | 1 - kernel/sched/core.c | 90 ++++++++++++++------------------ kernel/sched/cpufreq_schedutil.c | 35 +++++++++---- kernel/sched/fair.c | 22 ++++++-- kernel/sched/sched.h | 24 +++------ 5 files changed, 89 insertions(+), 83 deletions(-)
include/linux/energy_model.h +0 -1
@@ -243,7 +243,6 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd, scale_cpu =arch_scale_cpu_capacity (cpu); ps = &pd->table[pd->nr_perf_states -1 ]; - max_util =map_util_perf (max_util); max_util =min (max_util, allowed_cpu_cap); freq =map_util_freq (max_util, ps->frequency, scale_cpu);
kernel/sched/core.c +38 -52
129 lines not on this page · raw message
kernel/sched/cpufreq_schedutil.c +25 -10
@@ -47,7 +47,7 @@ struct sugov_cpu {u64 last_update;unsigned long util; -unsigned long bw_dl; +unsigned long bw_min;/* The field below is for single-CPU policies only: */ #ifdef CONFIG_NO_HZ_COMMON
@@ -155,7 +155,6 @@ static unsigned int get_next_freq(struct sugov_policy *sg_policy,unsigned int freq =arch_scale_freq_invariant () ? policy->cpuinfo.max_freq : policy->cur; - util =map_util_perf (util); freq =map_util_freq (util, freq, max);if (freq == sg_policy->cached_raw_freq && !sg_policy->need_freq_update)
@@ -165,14 +164,30 @@ static unsigned int get_next_freq(struct sugov_policy *sg_policy,return cpufreq_driver_resolve_freq (policy, freq); } +unsigned long sugov_effective_cpu_perf (int cpu,unsigned long actual, +unsigned long min, +unsigned long max) +{ +/* Add dvfs headroom to actual utilization */ + actual =map_util_perf (actual); +/* Actually we don't need to target the max performance */ +if (actual < max) + max = actual; + +/* +* Ensure at least minimum performance while providing more compute +* capacity when possible. +*/ +return max (min, max); +} +static void sugov_get_util (struct sugov_cpu *sg_cpu) { -unsigned long util =cpu_util_cfs_boost (sg_cpu->cpu); -struct rq *rq =cpu_rq (sg_cpu->cpu); +unsigned long min, max, util =cpu_util_cfs_boost (sg_cpu->cpu); - sg_cpu->bw_dl =cpu_bw_dl (rq); - sg_cpu->util =effective_cpu_util (sg_cpu->cpu, util, -FREQUENCY_UTIL ,NULL ); + util =effective_cpu_util (sg_cpu->cpu, util, &min, &max); + sg_cpu->bw_min = min; + sg_cpu->util =sugov_effective_cpu_perf (sg_cpu->cpu, util, min, max); }/**
@@ -318,7 +333,7 @@ static inline bool sugov_cpu_is_busy(struct sugov_cpu *sg_cpu) { return false; }*/ static inline void ignore_dl_rate_limit (struct sugov_cpu *sg_cpu) { -if (cpu_bw_dl (cpu_rq (sg_cpu->cpu)) > sg_cpu->bw_dl) +if (cpu_bw_dl (cpu_rq (sg_cpu->cpu)) > sg_cpu->bw_min) sg_cpu->sg_policy->limits_changed = true; }
@@ -419,8 +434,8 @@ static void sugov_update_single_perf(struct update_util_data *hook, u64 time, sugov_cpu_is_busy(sg_cpu) && sg_cpu->util < prev_util) sg_cpu->util = prev_util; -cpufreq_driver_adjust_perf (sg_cpu->cpu,map_util_perf (sg_cpu->bw_dl), -map_util_perf (sg_cpu->util), max_cap); +cpufreq_driver_adjust_perf (sg_cpu->cpu, sg_cpu->bw_min, + sg_cpu->util, max_cap); sg_cpu->sg_policy->last_freq_update_time = time; }
kernel/sched/fair.c +19 -3
@@ -7859,7 +7859,7 @@ static inline void eenv_pd_busy_time(struct energy_env *eenv,for_each_cpu (cpu, pd_cpus) {unsigned long util =cpu_util (cpu, p,-1 ,0 ); - busy_time +=effective_cpu_util (cpu, util,ENERGY_UTIL ,NULL ); + busy_time +=effective_cpu_util (cpu, util,NULL ,NULL ); } eenv->pd_busy_time =min (eenv->pd_cap, busy_time);
@@ -7882,7 +7882,7 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,for_each_cpu (cpu, pd_cpus) {struct task_struct *tsk = (cpu == dst_cpu) ? p :NULL ;unsigned long util =cpu_util (cpu, p, dst_cpu,1 ); -unsigned long eff_util; +unsigned long eff_util, min, max;/* * Performance domain frequency: utilization clamping
@@ -7891,7 +7891,23 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,* NOTE: in case RT tasks are running, by default the * FREQUENCY_UTIL's utilization can be max OPP. */ - eff_util =effective_cpu_util (cpu, util,FREQUENCY_UTIL , tsk); + eff_util =effective_cpu_util (cpu, util, &min, &max); + +/* Task's uclamp can modify min and max value */ +if (tsk &&uclamp_is_used ()) { + min =max (min,uclamp_eff_value (p,UCLAMP_MIN )); + +/* +* If there is no active max uclamp constraint, +* directly use task's one, otherwise keep max. +*/ +if (uclamp_rq_is_idle (cpu_rq (cpu))) + max =uclamp_eff_value (p,UCLAMP_MAX ); +else + max =max (max,uclamp_eff_value (p,UCLAMP_MAX )); + } + + eff_util =sugov_effective_cpu_perf (cpu, eff_util, min, max); max_util =max (max_util, eff_util); }
kernel/sched/sched.h +7 -17
@@ -2984,24 +2984,14 @@ static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {}#endif #ifdef CONFIG_SMP -/** -* enum cpu_util_type - CPU utilization type -* @FREQUENCY_UTIL: Utilization used to select frequency -* @ENERGY_UTIL: Utilization used during energy calculation -* -* The utilization signals of all scheduling classes (CFS/RT/DL) and IRQ time -* need to be aggregated differently depending on the usage made of them. This -* enum is used within effective_cpu_util() to differentiate the types of -* utilization expected by the callers, and adjust the aggregation accordingly. -*/ -enum cpu_util_type { -FREQUENCY_UTIL , -ENERGY_UTIL , -}; -unsigned long effective_cpu_util (int cpu,unsigned long util_cfs, -enum cpu_util_type type, -struct task_struct *p); +unsigned long *min, +unsigned long *max); + +unsigned long sugov_effective_cpu_perf (int cpu,unsigned long actual, +unsigned long min, +unsigned long max); +/* * Verify the fitness of task @p to run on @cpu taking into account the
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 44/204 cpufreq/sched: Explicitly synchronize limits_changed flag handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 79443a7e9da3c9f68290a8653837e23aba0fa89f ]
The handling of the limits_changed flag in struct sugov_policy needs to be explicitly synchronized to ensure that cpufreq policy limits updates will not be missed in some cases.
Without that synchronization it is theoretically possible that the limits_changed update in sugov_should_update_freq() will be reordered with respect to the reads of the policy limits in cpufreq_driver_resolve_freq() and in that case, if the limits_changed update in sugov_limits() clobbers the one in sugov_should_update_freq(), the new policy limits may not take effect for a long time.
Likewise, the limits_changed update in sugov_limits() may theoretically get reordered with respect to the updates of the policy limits in cpufreq_set_policy() and if sugov_should_update_freq() runs between them, the policy limits change may be missed.
To ensure that the above situations will not take place, add memory barriers preventing the reordering in question from taking place and add READ_ONCE() and WRITE_ONCE() annotations around all of the limits_changed flag updates to prevent the compiler from messing up with that code.
--- kernel/sched/cpufreq_schedutil.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
kernel/sched/cpufreq_schedutil.c +24 -4
@@ -81,9 +81,20 @@ static bool sugov_should_update_freq(struct sugov_policy *sg_policy, u64 time)if (!cpufreq_this_cpu_can_update (sg_policy->policy))return false; -if (unlikely (sg_policy->limits_changed)) { - sg_policy->limits_changed = false; +if (unlikely (READ_ONCE (sg_policy->limits_changed))) { +WRITE_ONCE (sg_policy->limits_changed, false); sg_policy->need_freq_update = true; + +/* +* The above limits_changed update must occur before the reads +* of policy limits in cpufreq_driver_resolve_freq() or a policy +* limits update might be missed, so use a memory barrier to +* ensure it. +* +* This pairs with the write memory barrier in sugov_limits(). +*/ +smp_mb (); +return true; }
@@ -334,7 +345,7 @@ static inline bool sugov_cpu_is_busy(struct sugov_cpu *sg_cpu) { return false; }static inline void ignore_dl_rate_limit (struct sugov_cpu *sg_cpu) {if (cpu_bw_dl (cpu_rq (sg_cpu->cpu)) > sg_cpu->bw_min) - sg_cpu->sg_policy->limits_changed = true; +WRITE_ONCE (sg_cpu->sg_policy->limits_changed, true); } static inline bool sugov_update_single_common(struct sugov_cpu *sg_cpu,
@@ -844,7 +855,16 @@ static void sugov_limits(struct cpufreq_policy *policy)mutex_unlock (&sg_policy->work_lock); } - sg_policy->limits_changed = true; +/* +* The limits_changed update below must take place before the updates +* of policy limits in cpufreq_set_policy() or a policy limits update +* might be missed, so use a memory barrier to ensure it. +* +* This pairs with the memory barrier in sugov_should_update_freq(). +*/ +smp_wmb (); + +WRITE_ONCE (sg_policy->limits_changed, true); }struct cpufreq_governor schedutil_gov = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 45/204 ceph: Fix incorrect flush end position calculation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit f452a2204614fc10e2c3b85904c4bd300c2789dc ]
In ceph, in fill_fscrypt_truncate(), the end flush position is calculated by:
loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SHIFT - 1;
but that's using the block shift not the block size.
Fix this to use the block size instead.
--- fs/ceph/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ceph/inode.c +1 -1
@@ -2319,7 +2319,7 @@ static int fill_fscrypt_truncate(struct inode *inode,/* Try to writeback the dirty pagecaches */ if (issued & (CEPH_CAP_FILE_BUFFER )) { -loff_t lend = orig_pos +CEPH_FSCRYPT_BLOCK_SHIFT -1 ; +loff_t lend = orig_pos +CEPH_FSCRYPT_BLOCK_SIZE -1 ; ret =filemap_write_and_wait_range (inode->i_mapping, orig_pos, lend);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 46/204 dma/contiguous: avoid warning about unused size_bytes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit d7b98ae5221007d3f202746903d4c21c7caf7ea9 ]
When building with W=1, this variable is unused for configs with CONFIG_CMA_SIZE_SEL_PERCENTAGE=y:
kernel/dma/contiguous.c:67:26: error: 'size_bytes' defined but not used [-Werror=unused-const-variable=]
Change this to a macro to avoid the warning.
--- kernel/dma/contiguous.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/dma/contiguous.c +1 -2
@@ -70,8 +70,7 @@ struct cma *dma_contiguous_default_area;* Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes__initconst = - (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; +#define size_bytes ((phys_addr_t)CMA_SIZE_MBYTES * SZ_1M)static phys_addr_t size_cmdline__initdata =-1 ;static phys_addr_t base_cmdline__initdata ;static phys_addr_t limit_cmdline__initdata ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 47/204 cpufreq: apple-soc: Fix null-ptr-deref in apple_soc_cpufreq_get_rate()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 9992649f6786921873a9b89dafa5e04d8c5fef2b ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. apple_soc_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference.
--- drivers/cpufreq/apple-soc-cpufreq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/cpufreq/apple-soc-cpufreq.c +8 -2
@@ -103,11 +103,17 @@ static const struct of_device_id apple_soc_cpufreq_of_match[] = {static unsigned int apple_soc_cpufreq_get_rate (unsigned int cpu) { -struct cpufreq_policy *policy =cpufreq_cpu_get_raw (cpu); -struct apple_cpu_priv *priv = policy->driver_data; +struct cpufreq_policy *policy; +struct apple_cpu_priv *priv;struct cpufreq_frequency_table *p;unsigned int pstate; + policy =cpufreq_cpu_get_raw (cpu); +if (unlikely (!policy)) +return 0 ; + + priv = policy->driver_data; +if (priv->info->cur_pstate_mask) {u64 reg =readq_relaxed (priv->reg_base +APPLE_DVFS_STATUS );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 48/204 cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 484d3f15cc6cbaa52541d6259778e715b2c83c54 ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. scmi_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference.
Add NULL check after cpufreq_cpu_get_raw() to prevent this issue.
--- drivers/cpufreq/scmi-cpufreq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/cpufreq/scmi-cpufreq.c +8 -2
@@ -33,11 +33,17 @@ static const struct scmi_perf_proto_ops *perf_ops;static unsigned int scmi_cpufreq_get_rate (unsigned int cpu) { -struct cpufreq_policy *policy =cpufreq_cpu_get_raw (cpu); -struct scmi_data *priv = policy->driver_data; +struct cpufreq_policy *policy; +struct scmi_data *priv;unsigned long rate;int ret; + policy =cpufreq_cpu_get_raw (cpu); +if (unlikely (!policy)) +return 0 ; + + priv = policy->driver_data; + ret = perf_ops->freq_get (ph, priv->domain_id, &rate, false);if (ret)return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 49/204 cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 73b24dc731731edf762f9454552cb3a5b7224949 ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. scpi_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference.
--- drivers/cpufreq/scpi-cpufreq.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/cpufreq/scpi-cpufreq.c +10 -3
@@ -29,9 +29,16 @@ static struct scpi_ops *scpi_ops;static unsigned int scpi_cpufreq_get_rate (unsigned int cpu) { -struct cpufreq_policy *policy =cpufreq_cpu_get_raw (cpu); -struct scpi_data *priv = policy->driver_data; -unsigned long rate =clk_get_rate (priv->clk); +struct cpufreq_policy *policy; +struct scpi_data *priv; +unsigned long rate; + + policy =cpufreq_cpu_get_raw (cpu); +if (unlikely (!policy)) +return 0 ; + + priv = policy->driver_data; + rate =clk_get_rate (priv->clk);return rate /1000 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 50/204 scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 4c324085062919d4e21c69e5e78456dcec0052fe ]
A race can occur between the MCQ completion path and the abort handler:
once a request completes, __blk_mq_free_request() sets rq->mq_hctx to NULL, meaning the subsequent ufshcd_mcq_req_to_hwq() call in ufshcd_mcq_abort() can return a NULL pointer. If this NULL pointer is dereferenced, the kernel will crash.
Add a NULL check for the returned hwq pointer. If hwq is NULL, log an error and return FAILED, preventing a potential NULL-pointer dereference. As suggested by Bart, the ufshcd_cmd_inflight() check is removed.
This is similar to the fix in commit 74736103fb41 ("scsi: ufs: core: Fix ufshcd_abort_one racing issue").
This is found by our static analysis tool KNighter.
--- drivers/ufs/core/ufs-mcq.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/ufs/core/ufs-mcq.c +5 -7
@@ -632,13 +632,6 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd)unsigned long flags;int err; -if (!ufshcd_cmd_inflight (lrbp->cmd)) { -dev_err (hba->dev, -"%s: skip abort. cmd at tag %d already completed.\n" , - __func__, tag); -return FAILED ; - } -/* Skip task abort in case previous aborts failed and report failure */ if (lrbp->req_abort_skip) { dev_err(hba->dev, "%s: skip abort. tag %d failed earlier\n",
@@ -647,6 +640,11 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd) } hwq =ufshcd_mcq_req_to_hwq (hba,scsi_cmd_to_rq (cmd)); +if (!hwq) { +dev_err (hba->dev,"%s: skip abort. cmd at tag %d already completed.\n" , + __func__, tag); +return FAILED ; + }if (ufshcd_mcq_sqe_search (hba, hwq, tag)) {/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 33/204 of: resolver: Simplify of_resolve_phandles() using __free()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring (Arm) <[email protected]>
[ Upstream commit 5275e8b5293f65cc82a5ee5eab02dd573b911d6e ]
Use the __free() cleanup to simplify of_resolve_phandles() and remove all the goto's.
Stable-dep-of: a46a0805635d ("of: resolver: Fix device node refcount leakage in of_resolve_phandles()")
--- drivers/of/resolver.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-)
drivers/of/resolver.c +11 -23
@@ -263,24 +263,20 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,int of_resolve_phandles (struct device_node *overlay) {struct device_node *child, *local_fixups, *refnode; -struct device_node *tree_symbols, *overlay_fixups; +struct device_node *overlay_fixups;struct property *prop;const char *refpath;phandle phandle, phandle_delta;int err; - tree_symbols =NULL ; -if (!overlay) {pr_err ("null overlay\n" ); - err = -EINVAL ; - goto out; +return -EINVAL ; }if (!of_node_check_flag (overlay,OF_DETACHED )) {pr_err ("overlay not detached\n" ); - err = -EINVAL ; - goto out; +return -EINVAL ; } phandle_delta =live_tree_max_phandle () +1 ;
@@ -292,7 +288,7 @@ int of_resolve_phandles(struct device_node *overlay) err =adjust_local_phandle_references (local_fixups, overlay, phandle_delta);if (err) - goto out; +return err; overlay_fixups =NULL ;
@@ -301,16 +297,13 @@ int of_resolve_phandles(struct device_node *overlay) overlay_fixups = child; } -if (!overlay_fixups) { - err =0 ; - goto out; - } +if (!overlay_fixups) +return 0 ; - tree_symbols =of_find_node_by_path ("/__symbols__" ); + struct device_node __free(device_node) *tree_symbols = of_find_node_by_path("/__symbols__");if (!tree_symbols) {pr_err ("no symbols in root of device tree.\n" ); - err = -EINVAL ; - goto out; +return -EINVAL ; }for_each_property_of_node (overlay_fixups, prop) {
@@ -324,14 +317,12 @@ int of_resolve_phandles(struct device_node *overlay)if (err) {pr_err ("node label '%s' not found in live devicetree symbols table\n" , prop->name); - goto out; +return err; } refnode =of_find_node_by_path (refpath); -if (!refnode) { - err = -ENOENT ; - goto out; - } +if (!refnode) +return -ENOENT ; phandle = refnode->phandle;of_node_put (refnode);
@@ -341,11 +332,8 @@ int of_resolve_phandles(struct device_node *overlay)break ; } -out:if (err)pr_err ("overlay phandle fixup failed: %d\n" , err); -of_node_put (tree_symbols); -return err; }EXPORT_SYMBOL_GPL (of_resolve_phandles);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 51/204 cpufreq: cppc: Fix invalid return value in .get() callback
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
[ Upstream commit 2b8e6b58889c672e1ae3601d9b2b070be4dc2fbc ]
Returning a negative error code in a function with an unsigned return type is a pretty bad idea. It is probably worse when the justification for the change is "our static analisys tool found it".
--- drivers/cpufreq/cppc_cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cppc_cpufreq.c +1 -1
@@ -773,7 +773,7 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu)int ret;if (!policy) -return -ENODEV ; +return 0 ; cpu_data = policy->driver_data;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 52/204 btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit bc2dbc4983afedd198490cca043798f57c93e9bf ]
[BUG]
When running btrfs/004 with 4K fs block size and 64K page size, sometimes fsstress workload can take 100% CPU for a while, but not long enough to trigger a 120s hang warning.
[CAUSE]
When such 100% CPU usage happens, btrfs_punch_hole_lock_range() is always in the call trace.
One example when this problem happens, the function btrfs_punch_hole_lock_range() got the following parameters:
lock_start = 4096, lockend = 20469
Then we calculate @page_lockstart by rounding up lock_start to page boundary, which is 64K (page size is 64K).
For @page_lockend, we round down the value towards page boundary, which result 0. Then since we need to pass an inclusive end to filemap_range_has_page(), we subtract 1 from the rounded down value, resulting in (u64)-1.
In the above case, the range is inside the same page, and we do not even need to call filemap_range_has_page(), not to mention to call it with (u64)-1 at the end.
This behavior will cause btrfs_punch_hole_lock_range() to busy loop waiting for irrelevant range to have its pages dropped.
[FIX]
Calculate @page_lockend by just rounding down @lockend, without decreasing the value by one. So @page_lockend will no longer overflow.
Then exit early if @page_lockend is no larger than @page_lockstart. As it means either the range is inside the same page, or the two pages are adjacent already.
Finally only decrease @page_lockend when calling filemap_range_has_page().
--- fs/btrfs/file.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/btrfs/file.c +7 -2
@@ -2225,15 +2225,20 @@ static void btrfs_punch_hole_lock_range(struct inode *inode,* will always return true. * So here we need to do extra page alignment for * filemap_range_has_page(). +* +* And do not decrease page_lockend right now, as it can be 0. */ const u64 page_lockstart =round_up (lockstart,PAGE_SIZE ); -const u64 page_lockend =round_down (lockend +1 ,PAGE_SIZE ) -1 ; +const u64 page_lockend =round_down (lockend +1 ,PAGE_SIZE );while (1 ) {truncate_pagecache_range (inode, lockstart, lockend);lock_extent (&BTRFS_I (inode)->io_tree, lockstart, lockend, cached_state); +/* The same page or adjacent pages. */ +if (page_lockend <= page_lockstart) +break ;/* * We can't have ordered extents in the range, nor dirty/writeback * pages, because we have locked the inode's VFS lock in exclusive
@@ -2245,7 +2250,7 @@ static void btrfs_punch_hole_lock_range(struct inode *inode,* we do, unlock the range and retry. */ if (!filemap_range_has_page (inode->i_mapping, page_lockstart, - page_lockend)) + page_lockend -1 ))break ; unlock_extent(&BTRFS_I(inode)->io_tree, lockstart, lockend,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 53/204 scsi: core: Clear flags for scsi_cmnd that did not complete
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anastasia Kovaleva <[email protected]>
[ Upstream commit 54bebe46871d4e56e05fcf55c1a37e7efa24e0a8 ]
Commands that have not been completed with scsi_done() do not clear the SCMD_INITIALIZED flag and therefore will not be properly reinitialized. Thus, the next time the scsi_cmnd structure is used, the command may fail in scsi_cmd_runtime_exceeded() due to the old jiffies_at_alloc value:
kernel: sd 16:0:1:84: [sdts] tag#405 timing out command, waited 720s
kernel: sd 16:0:1:84: [sdts] tag#405 FAILED Result: hostbyte=DID_OK driverbyte=DRIVER_OK cmd_age=66636s
Clear flags for commands that have not been completed by SCSI.
--- drivers/scsi/scsi_lib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/scsi/scsi_lib.c +5 -1
@@ -1152,8 +1152,12 @@ EXPORT_SYMBOL_GPL(scsi_alloc_request);*/ static void scsi_cleanup_rq (struct request *rq) { +struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq); + + cmd->flags =0 ; +if (rq->rq_flags &RQF_DONTPREP ) { -scsi_mq_uninit_cmd (blk_mq_rq_to_pdu (rq)); +scsi_mq_uninit_cmd (cmd); rq->rq_flags &= ~RQF_DONTPREP ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 54/204 net: lwtunnel: disable BHs when required
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
[ Upstream commit c03a49f3093a4903c8a93c8b5c9a297b5343b169 ]
In lwtunnel_{output|xmit}(), dev_xmit_recursion() may be called in preemptible scope for PREEMPT kernels. This patch disables BHs before calling dev_xmit_recursion(). BHs are re-enabled only at the end, since we must ensure the same CPU is used for both dev_xmit_recursion_inc() and dev_xmit_recursion_dec() (and any other recursion levels in some cases) in order to maintain valid per-cpu counters.
--- net/core/lwtunnel.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
net/core/lwtunnel.c +20 -6
@@ -332,6 +332,8 @@ int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb)struct dst_entry *dst;int ret; +local_bh_disable (); +if (dev_xmit_recursion ()) {net_crit_ratelimited ("%s(): recursion limit reached on datapath\n" , __func__);
@@ -347,8 +349,10 @@ int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb) lwtstate = dst->lwtstate;if (lwtstate->type ==LWTUNNEL_ENCAP_NONE || - lwtstate->type >LWTUNNEL_ENCAP_MAX ) -return 0 ; + lwtstate->type >LWTUNNEL_ENCAP_MAX ) { + ret =0 ; + goto out; + } ret = -EOPNOTSUPP ;rcu_read_lock ();
@@ -363,11 +367,13 @@ int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb)if (ret == -EOPNOTSUPP ) goto drop; -return ret; + goto out; drop:kfree_skb (skb); +out: +local_bh_enable ();return ret; }EXPORT_SYMBOL_GPL (lwtunnel_output);
@@ -379,6 +385,8 @@ int lwtunnel_xmit(struct sk_buff *skb)struct dst_entry *dst;int ret; +local_bh_disable (); +if (dev_xmit_recursion ()) {net_crit_ratelimited ("%s(): recursion limit reached on datapath\n" , __func__);
@@ -395,8 +403,10 @@ int lwtunnel_xmit(struct sk_buff *skb) lwtstate = dst->lwtstate;if (lwtstate->type ==LWTUNNEL_ENCAP_NONE || - lwtstate->type >LWTUNNEL_ENCAP_MAX ) -return 0 ; + lwtstate->type >LWTUNNEL_ENCAP_MAX ) { + ret =0 ; + goto out; + } ret = -EOPNOTSUPP ;rcu_read_lock ();
@@ -411,11 +421,13 @@ int lwtunnel_xmit(struct sk_buff *skb)if (ret == -EOPNOTSUPP ) goto drop; -return ret; + goto out; drop:kfree_skb (skb); +out: +local_bh_enable ();return ret; }EXPORT_SYMBOL_GPL (lwtunnel_xmit);
@@ -427,6 +439,8 @@ int lwtunnel_input(struct sk_buff *skb)struct dst_entry *dst;int ret; +DEBUG_NET_WARN_ON_ONCE (!in_softirq ()); +if (dev_xmit_recursion ()) {net_crit_ratelimited ("%s(): recursion limit reached on datapath\n" , __func__);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 55/204 net: phy: leds: fix memory leak
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qingfang Deng <[email protected]>
[ Upstream commit b7f0ee992adf601aa00c252418266177eb7ac2bc ]
A network restart test on a router led to an out-of-memory condition, which was traced to a memory leak in the PHY LED trigger code.
The root cause is misuse of the devm API. The registration function (phy_led_triggers_register) is called from phy_attach_direct, not phy_probe, and the unregister function (phy_led_triggers_unregister) is called from phy_detach, not phy_remove. This means the register and unregister functions can be called multiple times for the same PHY device, but devm-allocated memory is not freed until the driver is unbound.
This also prevents kmemleak from detecting the leak, as the devm API internally stores the allocated pointer.
Fix this by replacing devm_kzalloc/devm_kcalloc with standard kzalloc/kcalloc, and add the corresponding kfree calls in the unregister path.
--- drivers/net/phy/phy_led_triggers.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/net/phy/phy_led_triggers.c +13 -10
@@ -91,9 +91,8 @@ int phy_led_triggers_register(struct phy_device *phy)if (!phy->phy_num_led_triggers)return 0 ; - phy->led_link_trigger =devm_kzalloc (&phy->mdio.dev, -sizeof (*phy->led_link_trigger), -GFP_KERNEL ); + phy->led_link_trigger =kzalloc (sizeof (*phy->led_link_trigger), +GFP_KERNEL );if (!phy->led_link_trigger) { err = -ENOMEM ; goto out_clear;
@@ -103,10 +102,9 @@ int phy_led_triggers_register(struct phy_device *phy)if (err) goto out_free_link; - phy->phy_led_triggers =devm_kcalloc (&phy->mdio.dev, - phy->phy_num_led_triggers, -sizeof (struct phy_led_trigger ), -GFP_KERNEL ); + phy->phy_led_triggers =kcalloc (phy->phy_num_led_triggers, +sizeof (struct phy_led_trigger ), +GFP_KERNEL );if (!phy->phy_led_triggers) { err = -ENOMEM ; goto out_unreg_link;
@@ -127,11 +125,11 @@ int phy_led_triggers_register(struct phy_device *phy) out_unreg:while (i--)phy_led_trigger_unregister (&phy->phy_led_triggers[i]); -devm_kfree (&phy->mdio.dev, phy->phy_led_triggers); +kfree (phy->phy_led_triggers); out_unreg_link:phy_led_trigger_unregister (phy->led_link_trigger); out_free_link: -devm_kfree (&phy->mdio.dev, phy->led_link_trigger); +kfree (phy->led_link_trigger); phy->led_link_trigger =NULL ; out_clear: phy->phy_num_led_triggers =0 ;
@@ -145,8 +143,13 @@ void phy_led_triggers_unregister(struct phy_device *phy)for (i =0 ; i < phy->phy_num_led_triggers; i++)phy_led_trigger_unregister (&phy->phy_led_triggers[i]); +kfree (phy->phy_led_triggers); + phy->phy_led_triggers =NULL ; -if (phy->led_link_trigger) +if (phy->led_link_trigger) {phy_led_trigger_unregister (phy->led_link_trigger); +kfree (phy->led_link_trigger); + phy->led_link_trigger =NULL ; + } }EXPORT_SYMBOL_GPL (phy_led_triggers_unregister);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 56/204 tipc: fix NULL pointer dereference in tipc_mon_reinit_self()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tung Nguyen <[email protected]>
[ Upstream commit d63527e109e811ef11abb1c2985048fdb528b4cb ]
syzbot reported:
tipc: Node number set to 1055423674
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 3 UID: 0 PID: 6017 Comm: kworker/3:5 Not tainted 6.15.0-rc1-syzkaller-00246-g900241a5cc15 #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 Workqueue: events tipc_net_finalize_work RIP: 0010:tipc_mon_reinit_self+0x11c/0x210 net/tipc/monitor.c:719 ... RSP: 0018:ffffc9000356fb68 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 000000003ee87cba RDX: 0000000000000000 RSI: ffffffff8dbc56a7 RDI: ffff88804c2cc010 RBP: dffffc0000000000 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000007 R13: fffffbfff2111097 R14: ffff88804ead8000 R15: ffff88804ead9010 FS: 0000000000000000(0000) GS:ffff888097ab9000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000f720eb00 CR3: 000000000e182000 CR4: 0000000000352ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> tipc_net_finalize+0x10b/0x180 net/tipc/net.c:140 process_one_work+0x9cc/0x1b70 kernel/workqueue.c:3238 process_scheduled_works kernel/workqueue.c:3319 [inline] worker_thread+0x6c8/0xf10 kernel/workqueue.c:3400 kthread+0x3c2/0x780 kernel/kthread.c:464 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:153 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245 </TASK> ... RIP: 0010:tipc_mon_reinit_self+0x11c/0x210 net/tipc/monitor.c:719 ... RSP: 0018:ffffc9000356fb68 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 000000003ee87cba RDX: 0000000000000000 RSI: ffffffff8dbc56a7 RDI: ffff88804c2cc010 RBP: dffffc0000000000 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000007 R13: fffffbfff2111097 R14: ffff88804ead8000 R15: ffff88804ead9010 FS: 0000000000000000(0000) GS:ffff888097ab9000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000f720eb00 CR3: 000000000e182000 CR4: 0000000000352ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
There is a racing condition between workqueue created when enabling bearer and another thread created when disabling bearer right after that as follow:
enabling_bearer | disabling_bearer
--------------- | ----------------
tipc_disc_timeout() |
{ | bearer_disable()
... | {
schedule_work(&tn->work); | tipc_mon_delete()
... | {
} | ...
| write_lock_bh(&mon->lock);
| mon->self = NULL;
| write_unlock_bh(&mon->lock);
| ...
| }
tipc_net_finalize_work() | }
{ |
... |
tipc_net_finalize() |
{ |
... |
tipc_mon_reinit_self() |
{ |
... |
write_lock_bh(&mon->lock); |
mon->self->addr = tipc_own_addr(net); |
write_unlock_bh(&mon->lock); |
... |
} |
... |
} |
... |
} |'mon->self' is set to NULL in disabling_bearer thread and dereferenced later in enabling_bearer thread.
This commit fixes this issue by validating 'mon->self' before assigning node address to it.
--- net/tipc/monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/tipc/monitor.c +2 -1
@@ -716,7 +716,8 @@ void tipc_mon_reinit_self(struct net *net)if (!mon)continue ;write_lock_bh (&mon->lock); - mon->self->addr =tipc_own_addr (net); +if (mon->self) + mon->self->addr =tipc_own_addr (net);write_unlock_bh (&mon->lock); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 57/204 net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bo-Cun Chen <[email protected]>
[ Upstream commit 491ef1117c56476f199b481f8c68820fe4c3a7c2 ]
Change hardware configuration for the NETSYSv3.
- Enable PSE dummy page mechanism for the GDM1/2/3
- Enable PSE drop mechanism when the WDMA Rx ring full
- Enable PSE no-drop mechanism for packets from the WDMA Tx
- Correct PSE free drop threshold
- Correct PSE CDMA high threshold
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 24 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 10 ++++++++- 2 files changed, 29 insertions(+), 5 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +20 -4
@@ -3949,11 +3949,27 @@ static int mtk_hw_init(struct mtk_eth *eth, bool reset)mtk_w32 (eth,0x21021000 ,MTK_FE_INT_GRP );if (mtk_is_netsys_v3_or_greater (eth)) { -/* PSE should not drop port1, port8 and port9 packets */ -mtk_w32 (eth,0x00000302 ,PSE_DROP_CFG ); +/* PSE dummy page mechanism */ +mtk_w32 (eth,PSE_DUMMY_WORK_GDM (1 ) |PSE_DUMMY_WORK_GDM (2 ) | +PSE_DUMMY_WORK_GDM (3 ) |DUMMY_PAGE_THR ,PSE_DUMY_REQ ); + +/* PSE free buffer drop threshold */ +mtk_w32 (eth,0x00600009 ,PSE_IQ_REV (8 )); + +/* PSE should not drop port8, port9 and port13 packets from +* WDMA Tx +*/ +mtk_w32 (eth,0x00002300 ,PSE_DROP_CFG ); + +/* PSE should drop packets to port8, port9 and port13 on WDMA Rx +* ring full +*/ +mtk_w32 (eth,0x00002300 ,PSE_PPE_DROP (0 )); +mtk_w32 (eth,0x00002300 ,PSE_PPE_DROP (1 )); +mtk_w32 (eth,0x00002300 ,PSE_PPE_DROP (2 ));/* GDM and CDM Threshold */ -mtk_w32 (eth,0x00000707 ,MTK_CDMW0_THRES ); +mtk_w32 (eth,0x08000707 ,MTK_CDMW0_THRES );mtk_w32 (eth,0x00000077 ,MTK_CDMW1_THRES );/* Disable GDM1 RX CRC stripping */
@@ -3970,7 +3986,7 @@ static int mtk_hw_init(struct mtk_eth *eth, bool reset)mtk_w32 (eth,0x00000300 ,PSE_DROP_CFG );/* PSE should drop packets to port 8/9 on WDMA Rx ring full */ -mtk_w32 (eth,0x00000300 ,PSE_PPE0_DROP ); +mtk_w32 (eth,0x00000300 ,PSE_PPE_DROP (0 ));/* PSE Free Queue Flow Control */ mtk_w32 (eth,0x01fa01f4 ,PSE_FQFC_CFG2 );
drivers/net/ethernet/mediatek/mtk_eth_soc.h +9 -1
@@ -149,7 +149,15 @@#define PSE_FQFC_CFG1 0x100#define PSE_FQFC_CFG2 0x104#define PSE_DROP_CFG 0x108 -#define PSE_PPE0_DROP 0x110 +#define PSE_PPE_DROP (x) (0x110 + ((x) * 0x4)) + +/* PSE Last FreeQ Page Request Control */ +#define PSE_DUMY_REQ 0x10C +/* PSE_DUMY_REQ is not a typo but actually called like that also in +* MediaTek's datasheet +*/ +#define PSE_DUMMY_WORK_GDM (x) BIT(16 + (x)) +#define DUMMY_PAGE_THR 0x1/* PSE Input Queue Reservation Register*/ #define PSE_IQ_REV (x) (0x140 + (((x) - 1) << 2))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 58/204 fix a couple of races in MNT_TREE_BENEATH handling by do_move_mount()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 0d039eac6e5950f9d1ecc9e410c2fd1feaeab3b6 ]
Normally do_lock_mount(path, _) is locking a mountpoint pinned by *path and at the time when matching unlock_mount() unlocks that location it is still pinned by the same thing.
Unfortunately, for 'beneath' case it's no longer that simple - the object being locked is not the one *path points to. It's the mountpoint of path->mnt. The thing is, without sufficient locking ->mnt_parent may change under us and none of the locks are held at that point. The rules are
* mount_lock stabilizes m->mnt_parent for any mount m.
* namespace_sem stabilizes m->mnt_parent, provided that
m is mounted.
* if either of the above holds and refcount of m is positive,
we are guaranteed the same for refcount of m->mnt_parent.
namespace_sem nests inside inode_lock(), so do_lock_mount() has to take inode_lock() before grabbing namespace_sem. It does recheck that path->mnt is still mounted in the same place after getting namespace_sem, and it does take care to pin the dentry. It is needed, since otherwise we might end up with racing mount --move (or umount) happening while we were getting locks; in that case dentry would no longer be a mountpoint and could've been evicted on memory pressure along with its inode - not something you want when grabbing lock on that inode.
However, pinning a dentry is not enough - the matching mount is also pinned only by the fact that path->mnt is mounted on top it and at that point we are not holding any locks whatsoever, so the same kind of races could end up with all references to that mount gone just as we are about to enter inode_lock(). If that happens, we are left with filesystem being shut down while we are holding a dentry reference on it; results are not pretty.
What we need to do is grab both dentry and mount at the same time; that makes inode_lock() safe *and* avoids the problem with fs getting shut down under us. After taking namespace_sem we verify that path->mnt is still mounted (which stabilizes its ->mnt_parent) and check that it's still mounted at the same place. From that point on to the matching namespace_unlock() we are guaranteed that mount/dentry pair we'd grabbed are also pinned by being the mountpoint of path->mnt, so we can quietly drop both the dentry reference (as the current code does) and mnt one - it's OK to do under namespace_sem, since we are not dropping the final refs.
That solves the problem on do_lock_mount() side; unlock_mount() also has one, since dentry is guaranteed to stay pinned only until the namespace_unlock(). That's easy to fix - just have inode_unlock() done earlier, while it's still pinned by mp->m_dentry.
--- fs/namespace.c | 69 ++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 33 deletions(-)
fs/namespace.c +36 -33
@@ -2439,56 +2439,62 @@ static struct mountpoint *do_lock_mount(struct path *path, bool beneath)struct vfsmount *mnt = path->mnt;struct dentry *dentry;struct mountpoint *mp =ERR_PTR (-ENOENT ); +struct path under = {};for (;;) { -struct mount *m; +struct mount *m =real_mount (mnt);if (beneath) { - m =real_mount (mnt); +path_put (&under);read_seqlock_excl (&mount_lock); - dentry =dget (m->mnt_mountpoint); + under.mnt =mntget (&m->mnt_parent->mnt); + under.dentry =dget (m->mnt_mountpoint);read_sequnlock_excl (&mount_lock); + dentry = under.dentry; }else { dentry = path->dentry; }inode_lock (dentry->d_inode); -if (unlikely (cant_mount (dentry))) { -inode_unlock (dentry->d_inode); - goto out; - } -namespace_lock (); -if (beneath && (!is_mounted (mnt) || m->mnt_mountpoint != dentry)) { +if (unlikely (cant_mount (dentry) || !is_mounted (mnt))) +break ;// not to be mounted on + +if (beneath &&unlikely (m->mnt_mountpoint != dentry || + &m->mnt_parent->mnt != under.mnt)) {namespace_unlock ();inode_unlock (dentry->d_inode); - goto out; +continue ;// got moved } mnt =lookup_mnt (path); -if (likely (!mnt)) +if (unlikely (mnt)) { +namespace_unlock (); +inode_unlock (dentry->d_inode); +path_put (path); + path->mnt = mnt; + path->dentry =dget (mnt->mnt_root); +continue ;// got overmounted + } + mp =get_mountpoint (dentry); +if (IS_ERR (mp))break ; - -namespace_unlock (); -inode_unlock (dentry->d_inode); -if (beneath) -dput (dentry); -path_put (path); - path->mnt = mnt; - path->dentry =dget (mnt->mnt_root); - } - - mp =get_mountpoint (dentry); -if (IS_ERR (mp)) { -namespace_unlock (); -inode_unlock (dentry->d_inode); +if (beneath) { +/* +* @under duplicates the references that will stay +* at least until namespace_unlock(), so the path_put() +* below is safe (and OK to do under namespace_lock - +* we are not dropping the final references here). +*/ +path_put (&under); + } +return mp; } - -out: +namespace_unlock (); +inode_unlock (dentry->d_inode);if (beneath) -dput (dentry); - +path_put (&under);return mp; }
@@ -2499,14 +2505,11 @@ static inline struct mountpoint *lock_mount(struct path *path)static void unlock_mount (struct mountpoint *where) { -struct dentry *dentry = where->m_dentry; - +inode_unlock (where->m_dentry->d_inode);read_seqlock_excl (&mount_lock);put_mountpoint (where);read_sequnlock_excl (&mount_lock); -namespace_unlock (); -inode_unlock (dentry->d_inode); }static int graft_tree (struct mount *mnt,struct mount *p,struct mountpoint *mp)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 59/204 net_sched: hfsc: Fix a UAF vulnerability in class handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 3df275ef0a6ae181e8428a6589ef5d5231e58b5c ]
This patch fixes a Use-After-Free vulnerability in the HFSC qdisc class handling. The issue occurs due to a time-of-check/time-of-use condition in hfsc_change_class() when working with certain child qdiscs like netem or codel.
The vulnerability works as follows:
1. hfsc_change_class() checks if a class has packets (q.qlen != 0)
2. It then calls qdisc_peek_len(), which for certain qdiscs (e.g., codel, netem) might drop packets and empty the queue
3. The code continues assuming the queue is still non-empty, adding the class to vttree
4. This breaks HFSC scheduler assumptions that only non-empty classes are in vttree
5. Later, when the class is destroyed, this can lead to a Use-After-Free
The fix adds a second queue length check after qdisc_peek_len() to verify the queue wasn't emptied.
--- net/sched/sch_hfsc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/sched/sch_hfsc.c +7 -2
@@ -958,6 +958,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,if (cl !=NULL ) {int old_flags; +int len =0 ;if (parentid) { if (cl->cl_parent &&
@@ -988,9 +989,13 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,if (usc !=NULL )hfsc_change_usc (cl, usc, cur_time); +if (cl->qdisc->q.qlen !=0 ) + len =qdisc_peek_len (cl->qdisc); +/* Check queue length again since some qdisc implementations +* (e.g., netem/codel) might empty the queue during the peek +* operation. +*/ if (cl->qdisc->q.qlen !=0 ) { -int len =qdisc_peek_len (cl->qdisc); -if (cl->cl_flags &HFSC_RSC ) {if (old_flags &HFSC_RSC )update_ed (cl, len);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 60/204 net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 6ccbda44e2cc3d26fd22af54c650d6d5d801addf ]
Similarly to the previous patch, we need to safe guard hfsc_dequeue() too. But for this one, we don't have a reliable reproducer.
--- net/sched/sch_hfsc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/sched/sch_hfsc.c +10 -4
@@ -1638,10 +1638,16 @@ hfsc_dequeue(struct Qdisc *sch)if (cl->qdisc->q.qlen !=0 ) {/* update ed */ next_len =qdisc_peek_len (cl->qdisc); -if (realtime) -update_ed (cl, next_len); -else -update_d (cl, next_len); +/* Check queue length again since some qdisc implementations +* (e.g., netem/codel) might empty the queue during the peek +* operation. +*/ +if (cl->qdisc->q.qlen !=0 ) { +if (realtime) +update_ed (cl, next_len); +else +update_d (cl, next_len); + } }else {/* the class becomes passive */ eltree_remove (cl);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 34/204 of: resolver: Fix device node refcount leakage in of_resolve_phandles()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit a46a0805635d07de50c2ac71588345323c13b2f9 ]
In of_resolve_phandles(), refcount of device node @local_fixups will be increased if the for_each_child_of_node() exits early, but nowhere to decrease the refcount, so cause refcount leakage for the node.
Fix by using __free() on @local_fixups.
--- drivers/of/resolver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/of/resolver.c +2 -1
@@ -262,8 +262,9 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,*/ int of_resolve_phandles (struct device_node *overlay) { -struct device_node *child, *local_fixups, *refnode; +struct device_node *child, *refnode;struct device_node *overlay_fixups; + struct device_node __free(device_node) *local_fixups = NULL;struct property *prop;const char *refpath;phandle phandle, phandle_delta;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 61/204 net: dsa: mt7530: sync driver-specific behavior of MT7531 variants
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Golle <[email protected]>
[ Upstream commit 497041d763016c2e8314d2f6a329a9b77c3797ca ]
MT7531 standalone and MMIO variants found in MT7988 and EN7581 share most basic properties. Despite that, assisted_learning_on_cpu_port and mtu_enforcement_ingress were only applied for MT7531 but not for MT7988 or EN7581, causing the expected issues on MMIO devices.
Apply both settings equally also for MT7988 and EN7581 by moving both assignments form mt7531_setup() to mt7531_setup_common().
This fixes unwanted flooding of packets due to unknown unicast during DA lookup, as well as issues with heterogenous MTU settings.
--- drivers/net/dsa/mt7530.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/dsa/mt7530.c +3 -3
@@ -2596,6 +2596,9 @@ mt7531_setup_common(struct dsa_switch *ds)struct mt7530_priv *priv = ds->priv;int ret, i; + ds->assisted_learning_on_cpu_port = true; + ds->mtu_enforcement_ingress = true; +mt753x_trap_frames (priv);/* Enable and reset MIB counters */
@@ -2735,9 +2738,6 @@ mt7531_setup(struct dsa_switch *ds)mt7531_setup_common (ds); - ds->assisted_learning_on_cpu_port = true; - ds->mtu_enforcement_ingress = true; -return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 62/204 pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit 2567daad69cd1107fc0ec29b1615f110d7cf7385 ]
If the FW doesn't support the PDS_CORE_CMD_FW_CONTROL command the driver might at the least print garbage and at the worst crash when the user runs the "devlink dev info" devlink command.
This happens because the stack variable fw_list is not 0 initialized which results in fw_list.num_fw_slots being a garbage value from the stack. Then the driver tries to access fw_list.fw_names[i] with i >= ARRAY_SIZE and runs off the end of the array.
Fix this by initializing the fw_list and by not failing completely if the devcmd fails because other useful information is printed via devlink dev info even if the devcmd fails.
--- drivers/net/ethernet/amd/pds_core/devlink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/amd/pds_core/devlink.c +1 -3
@@ -101,7 +101,7 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, .fw_control.opcode = PDS_CORE_CMD_FW_CONTROL, .fw_control.oper = PDS_CORE_FW_GET_LIST, }; -struct pds_core_fw_list_info fw_list; +struct pds_core_fw_list_info fw_list = {};struct pdsc *pdsc =devlink_priv (dl);union pds_core_dev_comp comp;char buf[32 ];
@@ -114,8 +114,6 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req,if (!err)memcpy_fromio (&fw_list, pdsc->cmd_regs->data,sizeof (fw_list));mutex_unlock (&pdsc->devcmd_lock); -if (err && err != -EIO ) -return err; listlen =min (fw_list.num_fw_slots,ARRAY_SIZE (fw_list.fw_names));for (i =0 ; i < listlen; i++) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 35/204 PCI: Fix reference leak in pci_register_host_bridge()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Ke <[email protected]>
[ Upstream commit 804443c1f27883926de94c849d91f5b7d7d696e9 ]
If device_register() fails, call put_device() to give up the reference to avoid a memory leak, per the comment at device_register().
Found by code review.
[bhelgaas: squash Dan Carpenter's double free fix from
https://lore.kernel.org/r/[email protected]]
--- drivers/pci/probe.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pci/probe.c +7 -2
@@ -885,6 +885,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)resource_size_t offset, next_offset;LIST_HEAD (resources);struct resource *res, *next_res; +bool bus_registered = false;char addr[64 ], *fmt;const char *name;int err;
@@ -948,6 +949,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) name =dev_name (&bus->dev); err =device_register (&bus->dev); + bus_registered = true;if (err) goto unregister;
@@ -1031,12 +1033,15 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) unregister:put_device (&bridge->dev);device_del (&bridge->dev); - free: #ifdef CONFIG_PCI_DOMAINS_GENERICpci_bus_release_domain_nr (bus ,parent );#endif -kfree (bus); +if (bus_registered) +put_device (&bus->dev); +else +kfree (bus); +return err; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 36/204 s390/virtio_ccw: fix virtual vs physical address confusion
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Halil Pasic <[email protected]>
[ Upstream commit d5cc41686990fa522ce573e5c6c7a619f10c3fd1 ]
Fix virtual vs physical address confusion and use new dma types and helper functions to allow for type checking. This does not fix a bug since virtual and physical address spaces are currently the same.
Stable-dep-of: 2ccd42b959aa ("s390/virtio_ccw: Don't allocate/assign airqs for non-existing queues")
--- drivers/s390/virtio/virtio_ccw.c | 78 ++++++++++++++++---------------- 1 file changed, 39 insertions(+), 39 deletions(-)
drivers/s390/virtio/virtio_ccw.c +39 -39
@@ -85,19 +85,19 @@ static inline unsigned long *indicators2(struct virtio_ccw_device *vcdev) }struct vq_info_block_legacy { -__u64 queue; +dma64_t queue;__u32 align;__u16 index;__u16 num; } __packed;struct vq_info_block { -__u64 desc; +dma64_t desc;__u32 res0;__u16 index;__u16 num; -__u64 avail; -__u64 used; +dma64_t avail; +dma64_t used; } __packed;struct virtio_feature_desc {
@@ -106,8 +106,8 @@ struct virtio_feature_desc { } __packed;struct virtio_thinint_area { -unsigned long summary_indicator; -unsigned long indicator; +dma64_t summary_indicator; +dma64_t indicator;u64 bit_nr;u8 isc; } __packed;
@@ -260,12 +260,12 @@ static struct airq_info *new_airq_info(int index)return info; } -static unsigned long get_airq_indicator (struct virtqueue *vqs[],int nvqs, -u64 *first,void **airq_info) +static unsigned long *get_airq_indicator (struct virtqueue *vqs[],int nvqs, +u64 *first,void **airq_info) {int i, j;struct airq_info *info; -unsigned long indicator_addr =0 ; +unsigned long *indicator_addr =NULL ;unsigned long bit, flags;for (i =0 ; i <MAX_AIRQ_AREAS && !indicator_addr; i++) {
@@ -275,7 +275,7 @@ static unsigned long get_airq_indicator(struct virtqueue *vqs[], int nvqs, info = airq_areas[i];mutex_unlock (&airq_areas_lock);if (!info) -return 0 ; +return NULL ;write_lock_irqsave (&info->lock, flags); bit =airq_iv_alloc (info->aiv, nvqs);if (bit ==-1UL ) {
@@ -285,7 +285,7 @@ static unsigned long get_airq_indicator(struct virtqueue *vqs[], int nvqs, } *first = bit; *airq_info = info; - indicator_addr = (unsigned long )info->aiv->vector; + indicator_addr = info->aiv->vector;for (j =0 ; j < nvqs; j++) {airq_iv_set_ptr (info->aiv, bit + j, (unsigned long )vqs[j]);
@@ -358,11 +358,11 @@ static void virtio_ccw_drop_indicator(struct virtio_ccw_device *vcdev,if (!thinint_area)return ; thinint_area->summary_indicator = - (unsigned long )get_summary_indicator (airq_info); +virt_to_dma64 (get_summary_indicator (airq_info)); thinint_area->isc =VIRTIO_AIRQ_ISC ; ccw->cmd_code =CCW_CMD_SET_IND_ADAPTER ; ccw->count =sizeof (*thinint_area); - ccw->cda = (__u32 )virt_to_phys (thinint_area); + ccw->cda =virt_to_dma32 (thinint_area); }else {/* payload is the address of the indicators */ indicatorp = ccw_device_dma_zalloc(vcdev->cdev,
@@ -372,7 +372,7 @@ static void virtio_ccw_drop_indicator(struct virtio_ccw_device *vcdev, *indicatorp =0 ; ccw->cmd_code =CCW_CMD_SET_IND ; ccw->count =sizeof (indicators (vcdev)); - ccw->cda = (__u32 )virt_to_phys (indicatorp); + ccw->cda =virt_to_dma32 (indicatorp); }/* Deregister indicators from host. */ *indicators (vcdev) =0 ;
@@ -426,7 +426,7 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, ccw->cmd_code =CCW_CMD_READ_VQ_CONF ; ccw->flags =0 ; ccw->count =sizeof (struct vq_config_block ); - ccw->cda = (__u32 )virt_to_phys (&vcdev->dma_area->config_block); + ccw->cda =virt_to_dma32 (&vcdev->dma_area->config_block); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_READ_VQ_CONF );if (ret)return ret;
@@ -463,7 +463,7 @@ static void virtio_ccw_del_vq(struct virtqueue *vq, struct ccw1 *ccw) } ccw->cmd_code =CCW_CMD_SET_VQ ; ccw->flags =0 ; - ccw->cda = (__u32 )virt_to_phys (info->info_block); + ccw->cda =virt_to_dma32 (info->info_block); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_SET_VQ | index);/*
@@ -556,22 +556,22 @@ static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev,/* Register it with the host. */ queue =virtqueue_get_desc_addr (vq);if (vcdev->revision ==0 ) { - info->info_block->l.queue = queue; + info->info_block->l.queue =u64_to_dma64 (queue); info->info_block->l.align =KVM_VIRTIO_CCW_RING_ALIGN ; info->info_block->l.index = i; info->info_block->l.num = info->num; ccw->count =sizeof (info->info_block->l); }else { - info->info_block->s.desc = queue; + info->info_block->s.desc =u64_to_dma64 (queue); info->info_block->s.index = i; info->info_block->s.num = info->num; - info->info_block->s.avail = (__u64 )virtqueue_get_avail_addr (vq); - info->info_block->s.used = (__u64 )virtqueue_get_used_addr (vq); + info->info_block->s.avail =u64_to_dma64 (virtqueue_get_avail_addr (vq)); + info->info_block->s.used =u64_to_dma64 (virtqueue_get_used_addr (vq)); ccw->count =sizeof (info->info_block->s); } ccw->cmd_code =CCW_CMD_SET_VQ ; ccw->flags =0 ; - ccw->cda = (__u32 )virt_to_phys (info->info_block); + ccw->cda =virt_to_dma32 (info->info_block); err =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_SET_VQ | i);if (err) {dev_warn (&vcdev->cdev->dev,"SET_VQ failed\n" );
@@ -605,7 +605,7 @@ static int virtio_ccw_register_adapter_ind(struct virtio_ccw_device *vcdev, {int ret;struct virtio_thinint_area *thinint_area =NULL ; -unsigned long indicator_addr; +unsigned long *indicator_addr;struct airq_info *info; thinint_area = ccw_device_dma_zalloc(vcdev->cdev,
@@ -622,15 +622,15 @@ static int virtio_ccw_register_adapter_ind(struct virtio_ccw_device *vcdev, ret = -ENOSPC ; goto out; } - thinint_area->indicator =virt_to_phys ((void *)indicator_addr); + thinint_area->indicator =virt_to_dma64 (indicator_addr); info = vcdev->airq_info; thinint_area->summary_indicator = -virt_to_phys (get_summary_indicator (info)); +virt_to_dma64 (get_summary_indicator (info)); thinint_area->isc =VIRTIO_AIRQ_ISC ; ccw->cmd_code =CCW_CMD_SET_IND_ADAPTER ; ccw->flags =CCW_FLAG_SLI ; ccw->count =sizeof (*thinint_area); - ccw->cda = (__u32 )virt_to_phys (thinint_area); + ccw->cda =virt_to_dma32 (thinint_area); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_SET_IND_ADAPTER );if (ret) {if (ret == -EOPNOTSUPP ) {
@@ -658,7 +658,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, struct irq_affinity *desc) {struct virtio_ccw_device *vcdev =to_vc_device (vdev); -unsigned long *indicatorp =NULL ; +dma64_t *indicatorp =NULL ;int ret, i, queue_idx =0 ;struct ccw1 *ccw;
@@ -690,7 +690,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, sizeof(indicators(vcdev)));if (!indicatorp) goto out; - *indicatorp = (unsigned long )indicators (vcdev); + *indicatorp =virt_to_dma64 (indicators (vcdev));if (vcdev->is_thinint) { ret =virtio_ccw_register_adapter_ind (vcdev, vqs, nvqs, ccw);if (ret)
@@ -703,18 +703,18 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, ccw->cmd_code =CCW_CMD_SET_IND ; ccw->flags =0 ; ccw->count =sizeof (indicators (vcdev)); - ccw->cda = (__u32 )virt_to_phys (indicatorp); + ccw->cda =virt_to_dma32 (indicatorp); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_SET_IND );if (ret) goto out; }/* Register indicators2 with host for config changes */ - *indicatorp = (unsigned long )indicators2 (vcdev); + *indicatorp =virt_to_dma64 (indicators2 (vcdev)); *indicators2 (vcdev) =0 ; ccw->cmd_code =CCW_CMD_SET_CONF_IND ; ccw->flags =0 ; ccw->count =sizeof (indicators2 (vcdev)); - ccw->cda = (__u32 )virt_to_phys (indicatorp); + ccw->cda =virt_to_dma32 (indicatorp); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_SET_CONF_IND );if (ret) goto out;
@@ -776,7 +776,7 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev) ccw->cmd_code =CCW_CMD_READ_FEAT ; ccw->flags =0 ; ccw->count =sizeof (*features); - ccw->cda = (__u32 )virt_to_phys (features); + ccw->cda =virt_to_dma32 (features); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_READ_FEAT );if (ret) { rc =0 ;
@@ -793,7 +793,7 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev) ccw->cmd_code =CCW_CMD_READ_FEAT ; ccw->flags =0 ; ccw->count =sizeof (*features); - ccw->cda = (__u32 )virt_to_phys (features); + ccw->cda =virt_to_dma32 (features); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_READ_FEAT );if (ret ==0 ) rc |= (u64 )le32_to_cpu (features->features) <<32 ;
@@ -846,7 +846,7 @@ static int virtio_ccw_finalize_features(struct virtio_device *vdev) ccw->cmd_code =CCW_CMD_WRITE_FEAT ; ccw->flags =0 ; ccw->count =sizeof (*features); - ccw->cda = (__u32 )virt_to_phys (features); + ccw->cda =virt_to_dma32 (features); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_WRITE_FEAT );if (ret) goto out_free;
@@ -860,7 +860,7 @@ static int virtio_ccw_finalize_features(struct virtio_device *vdev) ccw->cmd_code =CCW_CMD_WRITE_FEAT ; ccw->flags =0 ; ccw->count =sizeof (*features); - ccw->cda = (__u32 )virt_to_phys (features); + ccw->cda =virt_to_dma32 (features); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_WRITE_FEAT ); out_free:
@@ -892,7 +892,7 @@ static void virtio_ccw_get_config(struct virtio_device *vdev, ccw->cmd_code =CCW_CMD_READ_CONF ; ccw->flags =0 ; ccw->count = offset + len; - ccw->cda = (__u32 )virt_to_phys (config_area); + ccw->cda =virt_to_dma32 (config_area); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_READ_CONFIG );if (ret) goto out_free;
@@ -939,7 +939,7 @@ static void virtio_ccw_set_config(struct virtio_device *vdev, ccw->cmd_code =CCW_CMD_WRITE_CONF ; ccw->flags =0 ; ccw->count = offset + len; - ccw->cda = (__u32 )virt_to_phys (config_area); + ccw->cda =virt_to_dma32 (config_area);ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_WRITE_CONFIG ); out_free:
@@ -963,7 +963,7 @@ static u8 virtio_ccw_get_status(struct virtio_device *vdev) ccw->cmd_code =CCW_CMD_READ_STATUS ; ccw->flags =0 ; ccw->count =sizeof (vcdev->dma_area->status); - ccw->cda = (__u32 )virt_to_phys (&vcdev->dma_area->status); + ccw->cda =virt_to_dma32 (&vcdev->dma_area->status);ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_READ_STATUS );/* * If the channel program failed (should only happen if the device
@@ -992,11 +992,11 @@ static void virtio_ccw_set_status(struct virtio_device *vdev, u8 status) ccw->cmd_code =CCW_CMD_WRITE_STATUS ; ccw->flags =0 ; ccw->count =sizeof (status); - ccw->cda = (__u32 )virt_to_phys (&vcdev->dma_area->status);/* We use ssch for setting the status which is a serializing * instruction that guarantees the memory writes have * completed before ssch. */ + ccw->cda =virt_to_dma32 (&vcdev->dma_area->status); ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_WRITE_STATUS );/* Write failed? We assume status is unchanged. */ if (ret)
@@ -1291,7 +1291,7 @@ static int virtio_ccw_set_transport_rev(struct virtio_ccw_device *vcdev) ccw->cmd_code =CCW_CMD_SET_VIRTIO_REV ; ccw->flags =0 ; ccw->count =sizeof (*rev); - ccw->cda = (__u32 )virt_to_phys (rev); + ccw->cda =virt_to_dma32 (rev); vcdev->revision =VIRTIO_CCW_REV_MAX ; do {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 37/204 s390/virtio_ccw: Dont allocate/assign airqs for non-existing queues
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit 2ccd42b959aaf490333dbd3b9b102eaf295c036a ]
If we finds a vq without a name in our input array in virtio_ccw_find_vqs(), we treat it as "non-existing" and set the vq pointer to NULL; we will not call virtio_ccw_setup_vq() to allocate/setup a vq.
Consequently, we create only a queue if it actually exists (name != NULL) and assign an incremental queue index to each such existing queue.
However, in virtio_ccw_register_adapter_ind()->get_airq_indicator() we will not ignore these "non-existing queues", but instead assign an airq indicator to them.
Besides never releasing them in virtio_ccw_drop_indicators() (because there is no virtqueue), the bigger issue seems to be that there will be a disagreement between the device and the Linux guest about the airq indicator to be used for notifying a queue, because the indicator bit for adapter I/O interrupt is derived from the queue index.
The virtio spec states under "Setting Up Two-Stage Queue Indicators":
... indicator contains the guest address of an area wherein the indicators for the devices are contained, starting at bit_nr, one bit per virtqueue of the device.
And further in "Notification via Adapter I/O Interrupts":
For notifying the driver of virtqueue buffers, the device sets the bit in the guest-provided indicator area at the corresponding offset.
For example, QEMU uses in virtio_ccw_notify() the queue index (passed as "vector") to select the relevant indicator bit. If a queue does not exist, it does not have a corresponding indicator bit assigned, because it effectively doesn't have a queue index.
Using a virtio-balloon-ccw device under QEMU with free-page-hinting disabled ("free-page-hint=off") but free-page-reporting enabled ("free-page-reporting=on") will result in free page reporting not working as expected: in the virtio_balloon driver, we'll be stuck forever in virtballoon_free_page_report()->wait_event(), because the waitqueue will not be woken up as the notification from the device is
lost: it would use the wrong indicator bit.
Free page reporting stops working and we get splats (when configured to detect hung wqs) like:
INFO: task kworker/1:3:463 blocked for more than 61 seconds.
Not tainted 6.14.0 #4
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:kworker/1:3 [...]
Workqueue: events page_reporting_process
Call Trace:
[<000002f404e6dfb2>] __schedule+0x402/0x1640
[<000002f404e6f22e>] schedule+0x3e/0xe0
[<000002f3846a88fa>] virtballoon_free_page_report+0xaa/0x110 [virtio_balloon]
[<000002f40435c8a4>] page_reporting_process+0x2e4/0x740
[<000002f403fd3ee2>] process_one_work+0x1c2/0x400
[<000002f403fd4b96>] worker_thread+0x296/0x420
[<000002f403fe10b4>] kthread+0x124/0x290
[<000002f403f4e0dc>] __ret_from_fork+0x3c/0x60
[<000002f404e77272>] ret_from_fork+0xa/0x38There was recently a discussion [1] whether the "holes" should be treated differently again, effectively assigning also non-existing queues a queue index: that should also fix the issue, but requires other workarounds to not break existing setups.
Let's fix it without affecting existing setups for now by properly ignoring the non-existing queues, so the indicator bits will match the queue indexes.
[1] https://lore.kernel.org/all/[email protected]/
--- drivers/s390/virtio/virtio_ccw.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/s390/virtio/virtio_ccw.c +12 -4
@@ -263,11 +263,17 @@ static struct airq_info *new_airq_info(int index)static unsigned long *get_airq_indicator (struct virtqueue *vqs[],int nvqs,u64 *first,void **airq_info) { -int i, j; +int i, j, queue_idx, highest_queue_idx =-1 ;struct airq_info *info;unsigned long *indicator_addr =NULL ;unsigned long bit, flags; +/* Array entries without an actual queue pointer must be ignored. */ +for (i =0 ; i < nvqs; i++) { +if (vqs[i]) + highest_queue_idx++; + } +for (i =0 ; i <MAX_AIRQ_AREAS && !indicator_addr; i++) {mutex_lock (&airq_areas_lock);if (!airq_areas[i])
@@ -277,7 +283,7 @@ static unsigned long *get_airq_indicator(struct virtqueue *vqs[], int nvqs,if (!info)return NULL ;write_lock_irqsave (&info->lock, flags); - bit =airq_iv_alloc (info->aiv, nvqs); + bit =airq_iv_alloc (info->aiv, highest_queue_idx +1 );if (bit ==-1UL ) {/* Not enough vacancies. */ write_unlock_irqrestore (&info->lock, flags);
@@ -286,8 +292,10 @@ static unsigned long *get_airq_indicator(struct virtqueue *vqs[], int nvqs, *first = bit; *airq_info = info; indicator_addr = info->aiv->vector; -for (j =0 ; j < nvqs; j++) { -airq_iv_set_ptr (info->aiv, bit + j, +for (j =0 , queue_idx =0 ; j < nvqs; j++) { +if (!vqs[j]) +continue ; +airq_iv_set_ptr (info->aiv, bit + queue_idx++, (unsigned long )vqs[j]); }write_unlock_irqrestore (&info->lock, flags);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 38/204 scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 ]
The driver leaks the device reference taken with of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get().
--- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
@@ -121,7 +121,7 @@ static int ufs_qcom_ice_init(struct ufs_qcom_host *host)struct device *dev = hba->dev;struct qcom_ice *ice; - ice =of_qcom_ice_get (dev); + ice =devm_of_qcom_ice_get (dev);if (ice ==ERR_PTR (-EOPNOTSUPP )) {dev_warn (dev,"Disabling inline encryption support\n" ); ice =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 39/204 s390/sclp: Allow user-space to provide PCI reports for optical modules
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Schnelle <[email protected]>
[ Upstream commit e9ab04490667249633fb397be17db46a8fa6d130 ]
The new SCLP action qualifier 3 is used by user-space code to provide optical module monitoring data to the platform.
Stable-dep-of: aa9f168d55dc ("s390/pci: Support mmap() of PCI resources except for ISM devices")
--- drivers/s390/char/sclp_pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/s390/char/sclp_pci.c +2 -0
@@ -27,6 +27,7 @@#define SCLP_ERRNOTIFY_AQ_RESET 0#define SCLP_ERRNOTIFY_AQ_REPAIR 1#define SCLP_ERRNOTIFY_AQ_INFO_LOG 2 +#define SCLP_ERRNOTIFY_AQ_OPTICS_DATA 3static DEFINE_MUTEX (sclp_pci_mutex);static struct sclp_register sclp_pci_event = {
@@ -116,6 +117,7 @@ static int sclp_pci_check_report(struct zpci_report_error_header *report)case SCLP_ERRNOTIFY_AQ_RESET :case SCLP_ERRNOTIFY_AQ_REPAIR :case SCLP_ERRNOTIFY_AQ_INFO_LOG : +case SCLP_ERRNOTIFY_AQ_OPTICS_DATA :break ;default :return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 40/204 s390/pci: Report PCI error recovery results via SCLP
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Schnelle <[email protected]>
[ Upstream commit 4ec6054e7321dc24ebccaa08b3af0d590f5666e6 ]
Add a mechanism with which the status of PCI error recovery runs is reported to the platform. Together with the status supply additional information that may aid in problem determination.
Stable-dep-of: aa9f168d55dc ("s390/pci: Support mmap() of PCI resources except for ISM devices")
--- arch/s390/include/asm/sclp.h | 33 +++++++++++ arch/s390/pci/Makefile | 2 +- arch/s390/pci/pci_event.c | 21 +++++-- arch/s390/pci/pci_report.c | 111 +++++++++++++++++++++++++++++++++++ arch/s390/pci/pci_report.h | 16 +++++ drivers/s390/char/sclp.h | 14 ----- drivers/s390/char/sclp_pci.c | 19 ------ 7 files changed, 178 insertions(+), 38 deletions(-) create mode 100644 arch/s390/pci/pci_report.c create mode 100644 arch/s390/pci/pci_report.h
arch/s390/include/asm/sclp.h +33 -0
@@ -16,6 +16,11 @@/* 24 + 16 * SCLP_MAX_CORES */ #define EXT_SCCB_READ_CPU (3 * PAGE_SIZE) +#define SCLP_ERRNOTIFY_AQ_RESET 0 +#define SCLP_ERRNOTIFY_AQ_REPAIR 1 +#define SCLP_ERRNOTIFY_AQ_INFO_LOG 2 +#define SCLP_ERRNOTIFY_AQ_OPTICS_DATA 3 +#ifndef __ASSEMBLY__#include <linux/uio.h> #include <asm/chpid.h>
@@ -109,6 +114,34 @@ struct sclp_info { };extern struct sclp_info sclp; +struct sccb_header { +u16 length; +u8 function_code; +u8 control_mask[3 ]; +u16 response_code; +} __packed; + +struct evbuf_header { +u16 length; +u8 type; +u8 flags; +u16 _reserved; +} __packed; + +struct err_notify_evbuf { +struct evbuf_header header; +u8 action; +u8 atype; +u32 fh; +u32 fid; +u8 data[]; +} __packed; + +struct err_notify_sccb { +struct sccb_header header; +struct err_notify_evbuf evbuf; +} __packed; +struct zpci_report_error_header {u8 version;/* Interface version byte */ u8 action;/* Action qualifier byte
arch/s390/pci/Makefile +1 -1
@@ -5,5 +5,5 @@ obj-$(CONFIG_PCI) += pci.o pci_irq.o pci_dma.o pci_clp.o pci_sysfs.o \ pci_event.o pci_debug.o pci_insn.o pci_mmio.o \ - pci_bus.o pci_kvm_hook.o + pci_bus.o pci_kvm_hook.o pci_report.o obj-$(CONFIG_PCI_IOV) += pci_iov.o
arch/s390/pci/pci_event.c +17 -4
@@ -16,6 +16,7 @@#include <asm/sclp.h> #include "pci_bus.h" +#include "pci_report.h" /* Content Code Description for PCI Function Error */ struct zpci_ccdf_err {
@@ -162,6 +163,8 @@ static pci_ers_result_t zpci_event_do_reset(struct pci_dev *pdev,static pci_ers_result_t zpci_event_attempt_error_recovery (struct pci_dev *pdev) {pci_ers_result_t ers_res =PCI_ERS_RESULT_DISCONNECT ; +struct zpci_dev *zdev =to_zpci (pdev); +char *status_str ="success" ;struct pci_driver *driver;/*
@@ -179,29 +182,37 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev)if (is_passed_through (to_zpci (pdev))) {pr_info ("%s: Cannot be recovered in the host because it is a pass-through device\n" ,pci_name (pdev)); + status_str ="failed (pass-through)" ; goto out_unlock; } driver =to_pci_driver (pdev->dev.driver);if (!is_driver_supported (driver)) { -if (!driver) +if (!driver) {pr_info ("%s: Cannot be recovered because no driver is bound to the device\n" ,pci_name (pdev)); -else + status_str ="failed (no driver)" ; + }else {pr_info ("%s: The %s driver bound to the device does not support error recovery\n" ,pci_name (pdev), driver->name); + status_str ="failed (no driver support)" ; + } goto out_unlock; } ers_res =zpci_event_notify_error_detected (pdev, driver); -if (ers_result_indicates_abort (ers_res)) +if (ers_result_indicates_abort (ers_res)) { + status_str ="failed (abort on detection)" ; goto out_unlock; + }if (ers_res ==PCI_ERS_RESULT_CAN_RECOVER ) { ers_res =zpci_event_do_error_state_clear (pdev, driver); -if (ers_result_indicates_abort (ers_res)) +if (ers_result_indicates_abort (ers_res)) { + status_str ="failed (abort on MMIO enable)" ; goto out_unlock; + } }if (ers_res ==PCI_ERS_RESULT_NEED_RESET )
@@ -210,6 +221,7 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev)if (ers_res !=PCI_ERS_RESULT_RECOVERED ) {pr_err ("%s: Automatic recovery failed; operator intervention is required\n" ,pci_name (pdev)); + status_str ="failed (driver can't recover)" ; goto out_unlock; }
@@ -218,6 +230,7 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev) driver->err_handler->resume (pdev); out_unlock:pci_dev_unlock (pdev); +zpci_report_status (zdev,"recovery" , status_str);return ers_res; }
arch/s390/pci/pci_report.c new file +111 -0
111 lines not on this page · raw message
arch/s390/pci/pci_report.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright IBM Corp. 2024 +* +* Author(s): +* Niklas Schnelle <[email protected]> +* +*/ +#ifndef __S390_PCI_REPORT_H +#define __S390_PCI_REPORT_H + +struct zpci_dev ; + +int zpci_report_status (struct zpci_dev *zdev,const char *operation,const char *status); + +#endif /* __S390_PCI_REPORT_H */
drivers/s390/char/sclp.h +0 -14
@@ -84,13 +84,6 @@ typedef unsigned int sclp_cmdw_t;typedef u64 sccb_mask_t ; -struct sccb_header { -u16 length; -u8 function_code; -u8 control_mask[3 ]; -u16 response_code; -} __attribute__((packed)); -struct init_sccb {struct sccb_header header;u16 _reserved;
@@ -237,13 +230,6 @@ struct gds_vector {u16 gds_id; } __attribute__((packed)); -struct evbuf_header { -u16 length; -u8 type; -u8 flags; -u16 _reserved; -} __attribute__((packed)); -struct sclp_req {struct list_head list;/* list_head for request queueing. */ sclp_cmdw_t command;/* sclp command to execute */
drivers/s390/char/sclp_pci.c +0 -19
@@ -24,30 +24,11 @@#define SCLP_ATYPE_PCI 2 -#define SCLP_ERRNOTIFY_AQ_RESET 0 -#define SCLP_ERRNOTIFY_AQ_REPAIR 1 -#define SCLP_ERRNOTIFY_AQ_INFO_LOG 2 -#define SCLP_ERRNOTIFY_AQ_OPTICS_DATA 3 -static DEFINE_MUTEX (sclp_pci_mutex);static struct sclp_register sclp_pci_event = { .send_mask =EVTYP_ERRNOTIFY_MASK , }; -struct err_notify_evbuf { -struct evbuf_header header; -u8 action; -u8 atype; -u32 fh; -u32 fid; -u8 data[]; -} __packed; - -struct err_notify_sccb { -struct sccb_header header; -struct err_notify_evbuf evbuf; -} __packed; -struct pci_cfg_sccb {struct sccb_header header;u8 atype;/* adapter type */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 31/204 clk: renesas: r9a07g04[34]: Fix typo for sel_shdi variable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 46fb5dd9ca289953fa791b2bb060dac7f8002ae0 ]
Fix typo for sel_shdi variable.
Stable-dep-of: 7f22a298d926 ("clk: renesas: r9a07g043: Fix HP clock source for RZ/Five")
--- drivers/clk/renesas/r9a07g043-cpg.c | 6 +++--- drivers/clk/renesas/r9a07g044-cpg.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/clk/renesas/r9a07g043-cpg.c +3 -3
@@ -87,7 +87,7 @@ static const struct clk_div_table dtable_1_32[] = {/* Mux clock tables */ static const char *const sel_pll3_3[] = {".pll3_533" ,".pll3_400" };static const char *const sel_pll6_2[] = {".pll6_250" ,".pll5_250" }; -static const char *const sel_shdi[] = {".clk_533" ,".clk_400" ,".clk_266" }; +static const char *const sel_sdhi[] = {".clk_533" ,".clk_400" ,".clk_266" };static const u32 mtable_sdhi[] = {1 ,2 ,3 };
@@ -136,9 +136,9 @@ static const struct cpg_core_clk r9a07g043_core_clks[] __initconst = {DEF_MUX ("HP" ,R9A07G043_CLK_HP ,SEL_PLL6_2 , sel_pll6_2),DEF_FIXED ("SPI0" ,R9A07G043_CLK_SPI0 ,CLK_DIV_PLL3_C ,1 ,2 ),DEF_FIXED ("SPI1" ,R9A07G043_CLK_SPI1 ,CLK_DIV_PLL3_C ,1 ,4 ), -DEF_SD_MUX ("SD0" ,R9A07G043_CLK_SD0 ,SEL_SDHI0 ,SEL_SDHI0_STS , sel_shdi, +DEF_SD_MUX ("SD0" ,R9A07G043_CLK_SD0 ,SEL_SDHI0 ,SEL_SDHI0_STS , sel_sdhi, mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier), -DEF_SD_MUX ("SD1" ,R9A07G043_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI1_STS , sel_shdi, +DEF_SD_MUX ("SD1" ,R9A07G043_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI1_STS , sel_sdhi, mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier),DEF_FIXED ("SD0_DIV4" ,CLK_SD0_DIV4 ,R9A07G043_CLK_SD0 ,1 ,4 ), DEF_FIXED("SD1_DIV4", CLK_SD1_DIV4, R9A07G043_CLK_SD1, 1, 4),
drivers/clk/renesas/r9a07g044-cpg.c +3 -3
@@ -106,7 +106,7 @@ static const struct clk_div_table dtable_16_128[] = {static const char *const sel_pll3_3[] = {".pll3_533" ,".pll3_400" };static const char *const sel_pll5_4[] = {".pll5_foutpostdiv" ,".pll5_fout1ph0" };static const char *const sel_pll6_2[] = {".pll6_250" ,".pll5_250" }; -static const char *const sel_shdi[] = {".clk_533" ,".clk_400" ,".clk_266" }; +static const char *const sel_sdhi[] = {".clk_533" ,".clk_400" ,".clk_266" };static const char *const sel_gpu2[] = {".pll6" ,".pll3_div2_2" };static const u32 mtable_sdhi[] = {1 ,2 ,3 };
@@ -176,9 +176,9 @@ static const struct {DEF_MUX ("HP" ,R9A07G044_CLK_HP ,SEL_PLL6_2 , sel_pll6_2),DEF_FIXED ("SPI0" ,R9A07G044_CLK_SPI0 ,CLK_DIV_PLL3_C ,1 ,2 ),DEF_FIXED ("SPI1" ,R9A07G044_CLK_SPI1 ,CLK_DIV_PLL3_C ,1 ,4 ), -DEF_SD_MUX ("SD0" ,R9A07G044_CLK_SD0 ,SEL_SDHI0 ,SEL_SDHI0_STS , sel_shdi, +DEF_SD_MUX ("SD0" ,R9A07G044_CLK_SD0 ,SEL_SDHI0 ,SEL_SDHI0_STS , sel_sdhi, mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier), -DEF_SD_MUX ("SD1" ,R9A07G044_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI1_STS , sel_shdi, +DEF_SD_MUX ("SD1" ,R9A07G044_CLK_SD1 ,SEL_SDHI1 ,SEL_SDHI1_STS , sel_sdhi, mtable_sdhi,0 , rzg2l_cpg_sd_clk_mux_notifier),DEF_FIXED ("SD0_DIV4" ,CLK_SD0_DIV4 ,R9A07G044_CLK_SD0 ,1 ,4 ), DEF_FIXED("SD1_DIV4", CLK_SD1_DIV4, R9A07G044_CLK_SD1, 1, 4),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 64/204 pds_core: make wait_context part of q_info
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shannon Nelson <[email protected]>
[ Upstream commit 3f77c3dfffc7063428b100c4945ca2a7a8680380 ]
Make the wait_context a full part of the q_info struct rather than a stack variable that goes away after pdsc_adminq_post() is done so that the context is still available after the wait loop has given up.
There was a case where a slow development firmware caused the adminq request to time out, but then later the FW finally finished the request and sent the interrupt. The handler tried to complete_all() the completion context that had been created on the stack in pdsc_adminq_post() but no longer existed. This caused bad pointer usage, kernel crashes, and much wailing and gnashing of teeth.
--- drivers/net/ethernet/amd/pds_core/adminq.c | 36 +++++++++------------- drivers/net/ethernet/amd/pds_core/core.c | 4 ++- drivers/net/ethernet/amd/pds_core/core.h | 2 +- 3 files changed, 18 insertions(+), 24 deletions(-)
drivers/net/ethernet/amd/pds_core/adminq.c +14 -22
@@ -5,11 +5,6 @@#include "core.h" -struct pdsc_wait_context { -struct pdsc_qcq *qcq; -struct completion wait_completion; -}; -static int pdsc_process_notifyq (struct pdsc_qcq *qcq) {union pds_core_notifyq_comp *comp;
@@ -110,10 +105,10 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq) q_info = &q->info[q->tail_idx]; q->tail_idx = (q->tail_idx +1 ) & (q->num_descs -1 ); -/* Copy out the completion data */ -memcpy (q_info->dest, comp,sizeof (*comp)); - -complete_all (&q_info->wc->wait_completion); +if (!completion_done (&q_info->completion)) { +memcpy (q_info->dest, comp,sizeof (*comp)); +complete (&q_info->completion); + }if (cq->tail_idx == cq->num_descs -1 ) cq->done_color = !cq->done_color;
@@ -166,8 +161,7 @@ irqreturn_t pdsc_adminq_isr(int irq, void *data)static int __pdsc_adminq_post (struct pdsc *pdsc,struct pdsc_qcq *qcq,union pds_core_adminq_cmd *cmd, -union pds_core_adminq_comp *comp, -struct pdsc_wait_context *wc) +union pds_core_adminq_comp *comp) {struct pdsc_queue *q = &qcq->q;struct pdsc_q_info *q_info;
@@ -209,9 +203,9 @@ static int __pdsc_adminq_post(struct pdsc *pdsc,/* Post the request */ index = q->head_idx; q_info = &q->info[index]; - q_info->wc = wc; q_info->dest = comp;memcpy (q_info->desc, cmd,sizeof (*cmd)); +reinit_completion (&q_info->completion);dev_dbg (pdsc->dev,"head_idx %d tail_idx %d\n" , q->head_idx, q->tail_idx);
@@ -235,16 +229,13 @@ int pdsc_adminq_post(struct pdsc *pdsc, union pds_core_adminq_comp *comp, bool fast_poll) { -struct pdsc_wait_context wc = { - .wait_completion = -COMPLETION_INITIALIZER_ONSTACK (wc.wait_completion), - };unsigned long poll_interval =1 ;unsigned long poll_jiffies;unsigned long time_limit;unsigned long time_start;unsigned long time_done;unsigned long remaining; +struct completion *wc;int err =0 ;int index;
@@ -254,20 +245,19 @@ int pdsc_adminq_post(struct pdsc *pdsc,return -ENXIO ; } - wc.qcq = &pdsc->adminqcq; - index =__pdsc_adminq_post (pdsc, &pdsc->adminqcq, cmd, comp, &wc); + index =__pdsc_adminq_post (pdsc, &pdsc->adminqcq, cmd, comp);if (index <0 ) { err = index; goto err_out; } + wc = &pdsc->adminqcq.q.info[index].completion; time_start = jiffies; time_limit = time_start +HZ * pdsc->devcmd_timeout; do { /* Timeslice the actual wait to catch IO errors etc early */ poll_jiffies = msecs_to_jiffies(poll_interval); - remaining = wait_for_completion_timeout(&wc.wait_completion, - poll_jiffies); + remaining = wait_for_completion_timeout(wc, poll_jiffies); if (remaining) break;
@@ -296,9 +286,11 @@ int pdsc_adminq_post(struct pdsc *pdsc,dev_dbg (pdsc->dev,"%s: elapsed %d msecs\n" , __func__,jiffies_to_msecs (time_done - time_start)); -/* Check the results */ -if (time_after_eq (time_done, time_limit)) +/* Check the results and clear an un-completed timeout */ +if (time_after_eq (time_done, time_limit) && !completion_done (wc)) { err = -ETIMEDOUT ; +complete (wc); + }dev_dbg (pdsc->dev,"read admin queue completion idx %d:\n" , index); dynamic_hex_dump("comp ", DUMP_PREFIX_OFFSET, 16, 1,
drivers/net/ethernet/amd/pds_core/core.c +3 -1
@@ -169,8 +169,10 @@ static void pdsc_q_map(struct pdsc_queue *q, void *base, dma_addr_t base_pa) q->base = base; q->base_pa = base_pa; -for (i =0 , cur = q->info; i < q->num_descs; i++, cur++) +for (i =0 , cur = q->info; i < q->num_descs; i++, cur++) { cur->desc = base + (i * q->desc_size); +init_completion (&cur->completion); + } }static void pdsc_cq_map (struct pdsc_cq *cq,void *base,dma_addr_t base_pa)
drivers/net/ethernet/amd/pds_core/core.h +1 -1
@@ -96,7 +96,7 @@ struct pdsc_q_info {unsigned int bytes;unsigned int nbufs;struct pdsc_buf_info bufs[PDS_CORE_MAX_FRAGS ]; -struct pdsc_wait_context *wc; +struct completion completion;void *dest; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 73/204 crypto: atmel-sha204a - Set hwrng quality to lowest possible
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
commit 8006aff15516a170640239c5a8e6696c0ba18d8e upstream.
According to the review by Bill Cox [1], the Atmel SHA204A random number generator produces random numbers with very low entropy.
Set the lowest possible entropy for this chip just to be safe.
[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html
--- drivers/crypto/atmel-sha204a.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/crypto/atmel-sha204a.c +6 -0
@@ -107,6 +107,12 @@ static int atmel_sha204a_probe(struct i2 i2c_priv->hwrng.name =dev_name (&client->dev); i2c_priv->hwrng.read = atmel_sha204a_rng_read; +/* +* According to review by Bill Cox [1], this HWRNG has very low entropy. +* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html +*/ + i2c_priv->hwrng.quality =1 ; + ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng);if (ret)dev_warn (&client->dev,"failed to register RNG (%d)\n" , ret);
Greg Kroah-Hartman
maintainerPATCH 74/204 xen-netfront: handle NULL returned by xdp_convert_buff_to_frame()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Nepomnyashih <[email protected]>
commit cc3628dcd851ddd8d418bf0c897024b4621ddc92 upstream.
The function xdp_convert_buff_to_frame() may return NULL if it fails to correctly convert the XDP buffer into an XDP frame due to memory constraints, internal errors, or invalid data. Failing to check for NULL may lead to a NULL pointer dereference if the result is used later in processing, potentially causing crashes, data corruption, or undefined behavior.
On XDP redirect failure, the associated page must be released explicitly if it was previously retained via get_page(). Failing to do so may result in a memory leak, as the pages reference count is not decremented.
--- drivers/net/xen-netfront.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/xen-netfront.c +12 -5
@@ -985,20 +985,27 @@ static u32 xennet_run_xdp(struct netfron act =bpf_prog_run_xdp (prog, xdp);switch (act) {case XDP_TX : -get_page (pdata); xdpf =xdp_convert_buff_to_frame (xdp); +if (unlikely (!xdpf)) { +trace_xdp_exception (queue->info->netdev, prog, act); +break ; + } +get_page (pdata); err =xennet_xdp_xmit (queue->info->netdev,1 , &xdpf,0 ); -if (unlikely (!err)) +if (unlikely (err <=0 )) { +if (err <0 ) +trace_xdp_exception (queue->info->netdev, prog, act);xdp_return_frame_rx_napi (xdpf); -else if (unlikely (err <0 )) -trace_xdp_exception (queue->info->netdev, prog, act); + }break ;case XDP_REDIRECT :get_page (pdata); err =xdp_do_redirect (queue->info->netdev, xdp, prog); *need_xdp_flush = true; -if (unlikely (err)) +if (unlikely (err)) {trace_xdp_exception (queue->info->netdev, prog, act); +xdp_return_buff (xdp); + }break ;case XDP_PASS :case XDP_DROP :
Greg Kroah-Hartman
maintainerPATCH 75/204 net: selftests: initialize TCP header and skb payload with zero
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
commit 9e8d1013b0c38910cbc9e60de74dbe883878469d upstream.
Zero-initialize TCP header via memset() to avoid garbage values that may affect checksum or behavior during test transmission.
Also zero-fill allocated payload and padding regions using memset() after skb_put(), ensuring deterministic content for all outgoing test packets.
--- net/core/selftests.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
net/core/selftests.c +13 -5
@@ -100,10 +100,10 @@ static struct sk_buff *net_test_get_skb( ehdr->h_proto =htons (ETH_P_IP );if (attr->tcp) { +memset (thdr,0 ,sizeof (*thdr)); thdr->source =htons (attr->sport); thdr->dest =htons (attr->dport); thdr->doff =sizeof (struct tcphdr ) /4 ; - thdr->check =0 ; }else { uhdr->source =htons (attr->sport); uhdr->dest =htons (attr->dport);
@@ -144,10 +144,18 @@ static struct sk_buff *net_test_get_skb( attr->id = net_test_next_id; shdr->id = net_test_next_id++; -if (attr->size) -skb_put (skb, attr->size); -if (attr->max_size && attr->max_size > skb->len) -skb_put (skb, attr->max_size - skb->len); +if (attr->size) { +void *payload =skb_put (skb, attr->size); + +memset (payload,0 , attr->size); + } + +if (attr->max_size && attr->max_size > skb->len) { +size_t pad_len = attr->max_size - skb->len; +void *pad =skb_put (skb, pad_len); + +memset (pad,0 , pad_len); + } skb->csum =0 ; skb->ip_summed =CHECKSUM_PARTIAL ;
Greg Kroah-Hartman
maintainerPATCH 76/204 net: phy: microchip: force IRQ polling mode for lan88xx
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fiona Klute <[email protected]>
commit 30a41ed32d3088cd0d682a13d7f30b23baed7e93 upstream.
With lan88xx based devices the lan78xx driver can get stuck in an interrupt loop while bringing the device up, flooding the kernel log with messages like the following:
lan78xx 2-3:1.0 enp1s0u3: kevent 4 may have been dropped
Removing interrupt support from the lan88xx PHY driver forces the driver to use polling instead, which avoids the problem.
The issue has been observed with Raspberry Pi devices at least since 4.14 (see [1], bug report for their downstream kernel), as well as with Nvidia devices [2] in 2020, where disabling interrupts was the vendor-suggested workaround (together with the claim that phylib changes in 4.9 made the interrupt handling in lan78xx incompatible).
Iperf reports well over 900Mbits/sec per direction with client in --dualtest mode, so there does not seem to be a significant impact on throughput (lan88xx device connected via switch to the peer).
[1] https://github.com/raspberrypi/linux/issues/2447
[2] https://forums.developer.nvidia.com/t/jetson-xavier-and-lan7800-problem/142134/11
--- drivers/net/phy/microchip.c | 46 ++------------------------------------------ 1 file changed, 3 insertions(+), 43 deletions(-)
drivers/net/phy/microchip.c +3 -43
@@ -31,47 +31,6 @@ static int lan88xx_write_page(struct phyreturn __phy_write (phydev,LAN88XX_EXT_PAGE_ACCESS , page); } -static int lan88xx_phy_config_intr (struct phy_device *phydev) -{ -int rc; - -if (phydev->interrupts ==PHY_INTERRUPT_ENABLED ) { -/* unmask all source and clear them before enable */ - rc =phy_write (phydev,LAN88XX_INT_MASK ,0x7FFF ); - rc =phy_read (phydev,LAN88XX_INT_STS ); - rc =phy_write (phydev,LAN88XX_INT_MASK , -LAN88XX_INT_MASK_MDINTPIN_EN_ | -LAN88XX_INT_MASK_LINK_CHANGE_ ); - }else { - rc =phy_write (phydev,LAN88XX_INT_MASK ,0 ); -if (rc) -return rc; - -/* Ack interrupts after they have been disabled */ - rc =phy_read (phydev,LAN88XX_INT_STS ); - } - -return rc <0 ? rc :0 ; -} - -static irqreturn_t lan88xx_handle_interrupt (struct phy_device *phydev) -{ -int irq_status; - - irq_status =phy_read (phydev,LAN88XX_INT_STS ); -if (irq_status <0 ) { -phy_error (phydev); -return IRQ_NONE ; - } - -if (!(irq_status &LAN88XX_INT_STS_LINK_CHANGE_ )) -return IRQ_NONE ; - -phy_trigger_machine (phydev); - -return IRQ_HANDLED ; -} -static int lan88xx_suspend (struct phy_device *phydev) {struct lan88xx_priv *priv = phydev->priv;
@@ -392,8 +351,9 @@ static struct phy_driver microchip_phy_d .config_aneg = lan88xx_config_aneg, .link_change_notify = lan88xx_link_change_notify, - .config_intr = lan88xx_phy_config_intr, - .handle_interrupt = lan88xx_handle_interrupt, +/* Interrupt handling is broken, do not define related +* functions to force polling. +*/ .suspend = lan88xx_suspend, .resume = genphy_resume,
Greg Kroah-Hartman
maintainerPATCH 77/204 drm/amd/display: Fix gpu reset in multidisplay config
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Li <[email protected]>
commit 7eb287beeb60be1e4437be2b4e4e9f0da89aab97 upstream.
[Why]
The indexing of stream_status in dm_gpureset_commit_state() is incorrect. That leads to asserts in multi-display configuration after gpu reset.
[How]
Adjust the indexing logic to align stream_status with surface_updates.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -3
@@ -2789,16 +2789,16 @@ static void dm_gpureset_commit_state(strfor (k =0 ; k < dc_state->stream_count; k++) { bundle->stream_update.stream = dc_state->streams[k]; -for (m =0 ; m < dc_state->stream_status->plane_count; m++) { +for (m =0 ; m < dc_state->stream_status[k].plane_count; m++) { bundle->surface_updates[m].surface = - dc_state->stream_status->plane_states[m]; + dc_state->stream_status[k].plane_states[m]; bundle->surface_updates[m].surface->force_full_update = true; }update_planes_and_stream_adapter (dm->dc,UPDATE_TYPE_FULL , - dc_state->stream_status->plane_count, + dc_state->stream_status[k].plane_count, dc_state->streams[k], &bundle->stream_update, bundle->surface_updates);
Greg Kroah-Hartman
maintainerPATCH 78/204 drm/amd/display: Force full update in gpu reset
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Li <[email protected]>
commit 67fe574651c73fe5cc176e35f28f2ec1ba498d14 upstream.
[Why]
While system undergoing gpu reset always do full update to sync the dc state before and after reset.
[How]
Return true in should_reset_plane() if gpu reset detected
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -9590,6 +9590,9 @@ static bool should_reset_plane(struct drif (adev->ip_versions[DCE_HWIP ][0 ] <IP_VERSION (3 ,2 ,0 ) && state->allow_modeset)return true; +if (amdgpu_in_reset (adev) && state->allow_modeset) +return true; +/* Exit early if we know that we're adding or removing the plane. */ if (old_plane_state->crtc != new_plane_state->crtc)return true;
Greg Kroah-Hartman
maintainerPATCH 79/204 irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
commit 3318dc299b072a0511d6dfd8367f3304fb6d9827 upstream.
With ACPI in place, gicv2m_get_fwnode() is registered with the pci subsystem as pci_msi_get_fwnode_cb(), which may get invoked at runtime during a PCI host bridge probe. But, the call back is wrongly marked as __init, causing it to be freed, while being registered with the PCI subsystem and could trigger:
Unable to handle kernel paging request at virtual address ffff8000816c0400 gicv2m_get_fwnode+0x0/0x58 (P) pci_set_bus_msi_domain+0x74/0x88 pci_register_host_bridge+0x194/0x548
This is easily reproducible on a Juno board with ACPI boot.
Retain the function for later use.
--- drivers/irqchip/irq-gic-v2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v2m.c +1 -1
@@ -454,7 +454,7 @@ static int __init gicv2m_of_init(struct#ifdef CONFIG_ACPI static int acpi_num_msi; -static __init struct fwnode_handle *gicv2m_get_fwnode (struct device *dev) +static struct fwnode_handle *gicv2m_get_fwnode (struct device *dev) {struct v2m_data *data;
Greg Kroah-Hartman
maintainerPATCH 80/204 LoongArch: Return NULL from huge_pte_offset() for invalid PMD
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Wang <[email protected]>
commit bd51834d1cf65a2c801295d230c220aeebf87a73 upstream.
LoongArch's huge_pte_offset() currently returns a pointer to a PMD slot even if the underlying entry points to invalid_pte_table (indicating no mapping). Callers like smaps_hugetlb_range() fetch this invalid entry value (the address of invalid_pte_table) via this pointer.
The generic is_swap_pte() check then incorrectly identifies this address as a swap entry on LoongArch, because it satisfies the "!pte_present() && !pte_none()" conditions. This misinterpretation, combined with a coincidental match by is_migration_entry() on the address bits, leads to kernel crashes in pfn_swap_entry_to_page().
Fix this at the architecture level by modifying huge_pte_offset() to check the PMD entry's content using pmd_none() before returning. If the entry is invalid (i.e., it points to invalid_pte_table), return NULL instead of the pointer to the slot.
--- arch/loongarch/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/loongarch/mm/hugetlbpage.c +1 -1
@@ -47,7 +47,7 @@ pte_t *huge_pte_offset(struct mm_struct pmd =pmd_offset (pud, addr); } } -return (pte_t *) pmd; +return pmd_none (pmdp_get (pmd)) ?NULL : (pte_t *) pmd; }int pmd_huge (pmd_t pmd)
Greg Kroah-Hartman
maintainerPATCH 81/204 LoongArch: Remove a bogus reference to ZONE_DMA
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Tesarik <[email protected]>
commit c37325cbd91abe3bfab280b3b09947155abe8e07 upstream.
Remove dead code. LoongArch does not have a DMA memory zone (24bit DMA). The architecture does not even define MAX_DMA_PFN.
--- arch/loongarch/mm/init.c | 3 --- 1 file changed, 3 deletions(-)
arch/loongarch/mm/init.c +0 -3
@@ -64,9 +64,6 @@ void __init paging_init(void) {unsigned long max_zone_pfns[MAX_NR_ZONES ]; -#ifdef CONFIG_ZONE_DMA - max_zone_pfns[ZONE_DMA ] =MAX_DMA_PFN ; -#endif #ifdef CONFIG_ZONE_DMA32 max_zone_pfns[ZONE_DMA32 ] =MAX_DMA32_PFN ;#endif
Greg Kroah-Hartman
maintainerPATCH 82/204 io_uring: fix sync handling of io_fallback_tw()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit edd43f4d6f50ec3de55a0c9e9df6348d1da51965 upstream.
A previous commit added a 'sync' parameter to io_fallback_tw(), which if true, means the caller wants to wait on the fallback thread handling it. But the logic is somewhat messed up, ensure that ctxs are swapped and flushed appropriately.
--- io_uring/io_uring.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
io_uring/io_uring.c +7 -6
@@ -1247,21 +1247,22 @@ static __cold void io_fallback_tw(structwhile (node) { req = container_of(node, struct io_kiocb, io_task_work.node); node = node->next; -if (sync && last_ctx != req->ctx) { +if (last_ctx != req->ctx) {if (last_ctx) { -flush_delayed_work (&last_ctx->fallback_work); +if (sync) +flush_delayed_work (&last_ctx->fallback_work);percpu_ref_put (&last_ctx->refs); } last_ctx = req->ctx;percpu_ref_get (&last_ctx->refs); } -if (llist_add (&req->io_task_work.node, - &req->ctx->fallback_llist)) -schedule_delayed_work (&req->ctx->fallback_work,1 ); +if (llist_add (&req->io_task_work.node, &last_ctx->fallback_llist)) +schedule_delayed_work (&last_ctx->fallback_work,1 ); }if (last_ctx) { -flush_delayed_work (&last_ctx->fallback_work); +if (sync) +flush_delayed_work (&last_ctx->fallback_work);percpu_ref_put (&last_ctx->refs); } }
Greg Kroah-Hartman
maintainerPATCH 65/204 iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 07172206a26dcf3f0bf7c3ecaadd4242b008ea54 ]
Return -EINVAL instead of success if amd_ir_set_vcpu_affinity() is invoked without use_vapic; lying to KVM about whether or not the IRTE was configured to post IRQs is all kinds of bad.
Message-ID: <[email protected]>
--- drivers/iommu/amd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd/iommu.c +1 -1
@@ -3619,7 +3619,7 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)* we should not modify the IRTE */ if (!dev_data || !dev_data->use_vapic) -return 0 ; +return -EINVAL ; ir_data->cfg =irqd_cfg (data); pi_data->ir_data = ir_data;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 83/204 KVM: SVM: Allocate IR data using atomic allocation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit 7537deda36521fa8fff9133b39c46e31893606f2 upstream.
Allocate SVM's interrupt remapping metadata using GFP_ATOMIC as svm_ir_list_add() is called with IRQs are disabled and irqfs.lock held when kvm_irq_routing_update() reacts to GSI routing changes.
Message-ID: <[email protected]>
--- arch/x86/kvm/svm/avic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/avic.c +1 -1
@@ -820,7 +820,7 @@ static int svm_ir_list_add(struct vcpu_s* Allocating new amd_iommu_pi_data, which will get * add to the per-vcpu ir_list. */ - ir =kzalloc (sizeof (struct amd_svm_iommu_ir ),GFP_KERNEL_ACCOUNT ); + ir =kzalloc (sizeof (struct amd_svm_iommu_ir ),GFP_ATOMIC | __GFP_ACCOUNT);if (!ir) { ret = -ENOMEM ; goto out;
Greg Kroah-Hartman
maintainerPATCH 84/204 cxl/core/regs.c: Skip Memory Space Enable check for RCD and RCH Ports
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Smita Koralahalli <[email protected]>
commit 078d3ee7c162cd66d76171579c02d7890bd77daf upstream.
According to CXL r3.2 section 8.2.1.2, the PCI_COMMAND register fields, including Memory Space Enable bit, have no effect on the behavior of an RCD Upstream Port. Retaining this check may incorrectly cause cxl_pci_probe() to fail on a valid RCD upstream Port.
While the specification is explicit only for RCD Upstream Ports, this check is solely for accessing the RCRB, which is always mapped through memory space. Therefore, its safe to remove the check entirely. In practice, firmware reliably enables the Memory Space Enable bit for RCH Downstream Ports and no failures have been observed.
Removing the check simplifies the code and avoids unnecessary special-casing, while relying on BIOS/firmware to configure devices correctly. Moreover, any failures due to inaccessible RCRB regions will still be caught either in __rcrb_to_component() or while parsing the component register block.
The following failure was observed in dmesg when the check was present:
cxl_pci 0000:7f:00.0: No component registers (-6)
--- drivers/cxl/core/regs.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/cxl/core/regs.c +0 -4
@@ -478,7 +478,6 @@ resource_size_t __rcrb_to_component(struresource_size_t rcrb = ri->base;void __iomem *addr;u32 bar0, bar1; -u16 cmd;u32 id;if (which ==CXL_RCRB_UPSTREAM )
@@ -500,7 +499,6 @@ resource_size_t __rcrb_to_component(stru } id =readl (addr +PCI_VENDOR_ID ); - cmd =readw (addr +PCI_COMMAND ); bar0 =readl (addr +PCI_BASE_ADDRESS_0 ); bar1 =readl (addr +PCI_BASE_ADDRESS_1 );iounmap (addr);
@@ -515,8 +513,6 @@ resource_size_t __rcrb_to_component(strudev_err (dev,"Failed to access Downstream Port RCRB\n" );return CXL_RESOURCE_NONE ; } -if (!(cmd &PCI_COMMAND_MEMORY )) -return CXL_RESOURCE_NONE ;/* The RCRB is a Memory Window, and the MEM_TYPE_1M bit is obsolete */ if (bar0 & (PCI_BASE_ADDRESS_MEM_TYPE_1M |PCI_BASE_ADDRESS_SPACE_IO ))return CXL_RESOURCE_NONE ;
Greg Kroah-Hartman
maintainerPATCH 85/204 mcb: fix a double free bug in chameleon_parse_gdd()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
commit 7c7f1bfdb2249f854a736d9b79778c7e5a29a150 upstream.
In chameleon_parse_gdd(), if mcb_device_register() fails, 'mdev' would be released in mcb_device_register() via put_device(). Thus, goto 'err' label and free 'mdev' again causes a double free. Just return if mcb_device_register() fails.
--- drivers/mcb/mcb-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mcb/mcb-parse.c +1 -1
@@ -101,7 +101,7 @@ static int chameleon_parse_gdd(struct mc ret =mcb_device_register (bus, mdev);if (ret <0 ) - goto err; +return ret;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 86/204 ata: libata-scsi: Improve CDL control
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 17e897a456752ec9c2d7afb3d9baf268b442451b upstream.
With ATA devices supporting the CDL feature, using CDL requires that the feature be enabled with a SET FEATURES command. This command is issued as the translated command for the MODE SELECT command issued by scsi_cdl_enable() when the user enables CDL through the device cdl_enable sysfs attribute.
Currently, ata_mselect_control_ata_feature() always translates a MODE SELECT command for the ATA features subpage of the control mode page to a SET FEATURES command to enable or disable CDL based on the cdl_ctrl field. However, there is no need to issue the SET FEATURES command if:
1) The MODE SELECT command requests disabling CDL and CDL is already disabled.
2) The MODE SELECT command requests enabling CDL and CDL is already enabled.
Fix ata_mselect_control_ata_feature() to issue the SET FEATURES command only when necessary. Since enabling CDL also implies a reset of the CDL statistics log page, avoiding useless CDL enable operations also avoids clearing the CDL statistics log.
Also add debug messages to clearly signal when CDL is being enabled or disabled using a SET FEATURES command.
--- drivers/ata/libata-scsi.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/ata/libata-scsi.c +12 -2
@@ -3787,17 +3787,27 @@ static unsigned int ata_mselect_control_/* Check cdl_ctrl */ switch (buf[0 ] &0x03 ) {case 0 : -/* Disable CDL */ +/* Disable CDL if it is enabled */ +if (!(dev->flags &ATA_DFLAG_CDL_ENABLED )) +return 0 ; +ata_dev_dbg (dev,"Disabling CDL\n" ); cdl_action =0 ; dev->flags &= ~ATA_DFLAG_CDL_ENABLED ;break ;case 0x02 : -/* Enable CDL T2A/T2B: NCQ priority must be disabled */ +/* +* Enable CDL if not already enabled. Since this is mutually +* exclusive with NCQ priority, allow this only if NCQ priority +* is disabled. +*/ +if (dev->flags &ATA_DFLAG_CDL_ENABLED ) +return 0 ;if (dev->flags &ATA_DFLAG_NCQ_PRIO_ENABLED ) {ata_dev_err (dev,"NCQ priority must be disabled to enable CDL\n" );return -EINVAL ; } +ata_dev_dbg (dev,"Enabling CDL\n" ); cdl_action =1 ; dev->flags |=ATA_DFLAG_CDL_ENABLED ;break ;
Greg Kroah-Hartman
maintainerPATCH 87/204 ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit db91586b1e8f36122a9e5b8fbced11741488dd22 upstream.
The function ata_mselect_control_ata_feature() has a return type defined as unsigned int but this function may return negative error codes, which are correctly propagated up the call chain as integers.
Fix ata_mselect_control_ata_feature() to have the correct int return type.
While at it, also fix a typo in this function description comment.
--- drivers/ata/libata-scsi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/ata/libata-scsi.c +3 -4
@@ -3764,12 +3764,11 @@ static int ata_mselect_control_spg0(stru }/* -* Translate MODE SELECT control mode page, sub-pages f2h (ATA feature mode +* Translate MODE SELECT control mode page, sub-page f2h (ATA feature mode * page) into a SET FEATURES command. */ -static unsigned int ata_mselect_control_ata_feature (struct ata_queued_cmd *qc, -const u8 *buf,int len, -u16 *fp) +static int ata_mselect_control_ata_feature (struct ata_queued_cmd *qc, +const u8 *buf,int len,u16 *fp) {struct ata_device *dev = qc->dev;struct ata_taskfile *tf = &qc->tf;
Greg Kroah-Hartman
maintainerPATCH 88/204 ata: libata-scsi: Fix ata_msense_control_ata_feature()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 88474ad734fb2000805c63e01cc53ea930adf2c7 upstream.
For the ATA features subpage of the control mode page, the T10 SAT-6 specifications state that:
For a MODE SENSE command, the SATL shall return the CDL_CTRL field value that was last set by an application client.
However, the function ata_msense_control_ata_feature() always sets the CDL_CTRL field to the 0x02 value to indicate support for the CDL T2A and T2B pages. This is thus incorrect and the value 0x02 must be reported only after the user enables the CDL feature, which is indicated with the ATA_DFLAG_CDL_ENABLED device flag. When this flag is not set, the CDL_CTRL field of the ATA feature subpage of the control mode page must report a value of 0x00.
Fix ata_msense_control_ata_feature() to report the correct values for the CDL_CTRL field, according to the enable/disable state of the device CDL feature.
--- drivers/ata/libata-scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ata/libata-scsi.c +2 -2
@@ -2354,8 +2354,8 @@ static unsigned int ata_msense_control_a*/ put_unaligned_be16 (ATA_FEATURE_SUB_MPAGE_LEN -4 , &buf[2 ]); -if (dev->flags &ATA_DFLAG_CDL ) - buf[4 ] =0x02 ;/* Support T2A and T2B pages */ +if (dev->flags &ATA_DFLAG_CDL_ENABLED ) + buf[4 ] =0x02 ;/* T2A and T2B pages enabled */ else buf[4 ] =0 ;
Greg Kroah-Hartman
maintainerPATCH 89/204 USB: storage: quirk for ADATA Portable HDD CH94
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 9ab75eee1a056f896b87d139044dd103adc532b9 upstream.
Version 1.60 specifically needs this quirk.
Version 2.00 is known good.
--- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_uas.h +7 -0
@@ -83,6 +83,13 @@ UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x99 USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_REPORT_LUNS), +/* Reported-by: Oliver Neukum <[email protected]> */ +UNUSUAL_DEV (0x125f ,0xa94a ,0x0160 ,0x0160 , +"ADATA" , +"Portable HDD CH94" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_NO_ATA_1X ), +/* Reported-by: Benjamin Tissoires <[email protected]> */ UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999, "Initio Corporation",
Greg Kroah-Hartman
maintainerPATCH 90/204 scsi: Improve CDL control
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 14a3cc755825ef7b34c986aa2786ea815023e9c5 upstream.
With ATA devices supporting the CDL feature, using CDL requires that the feature be enabled with a SET FEATURES command. This command is issued as the translated command for the MODE SELECT command issued by scsi_cdl_enable() when the user enables CDL through the device cdl_enable sysfs attribute.
However, the implementation of scsi_cdl_enable() always issues a MODE SELECT command for ATA devices when the enable argument is true, even if CDL is already enabled on the device. While this does not cause any issue with using CDL descriptors with read/write commands (the CDL feature will be enabled on the drive), issuing the MODE SELECT command even when the device CDL feature is already enabled will cause a reset of the ATA device CDL statistics log page (as defined in ACS, any CDL enable action must reset the device statistics).
Avoid this needless actions (and the implied statistics log page reset) by modifying scsi_cdl_enable() to issue the MODE SELECT command to enable CDL if and only if CDL is not reported as already enabled on the device.
And while at it, simplify the initialization of the is_ata boolean variable and move the declaration of the scsi mode data and sense header variables to within the scope of ATA device handling.
--- drivers/scsi/scsi.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
drivers/scsi/scsi.c +24 -12
@@ -693,26 +693,23 @@ void scsi_cdl_check(struct scsi_device **/ int scsi_cdl_enable (struct scsi_device *sdev,bool enable) { -struct scsi_mode_data data; -struct scsi_sense_hdr sshdr; -struct scsi_vpd *vpd; -bool is_ata = false;char buf[64 ]; +bool is_ata;int ret;if (!sdev->cdl_supported)return -EOPNOTSUPP ;rcu_read_lock (); - vpd =rcu_dereference (sdev->vpd_pg89); -if (vpd) - is_ata = true; + is_ata =rcu_dereference (sdev->vpd_pg89);rcu_read_unlock ();/* * For ATA devices, CDL needs to be enabled with a SET FEATURES command. */ if (is_ata) { +struct scsi_mode_data data; +struct scsi_sense_hdr sshdr;char *buf_data;int len;
@@ -721,16 +718,30 @@ int scsi_cdl_enable(struct scsi_device *if (ret)return -EINVAL ; -/* Enable CDL using the ATA feature page */ +/* Enable or disable CDL using the ATA feature page */ len =min_t (size_t,sizeof (buf), data.length - data.header_length - data.block_descriptor_length); buf_data = buf + data.header_length + data.block_descriptor_length; -if (enable) - buf_data[4 ] =0x02 ; -else - buf_data[4 ] =0 ; + +/* +* If we want to enable CDL and CDL is already enabled on the +* device, do nothing. This avoids needlessly resetting the CDL +* statistics on the device as that is implied by the CDL enable +* action. Similar to this, there is no need to do anything if +* we want to disable CDL and CDL is already disabled. +*/ +if (enable) { +if ((buf_data[4 ] &0x03 ) ==0x02 ) + goto out; + buf_data[4 ] &= ~0x03 ; + buf_data[4 ] |=0x02 ; + }else { +if ((buf_data[4 ] &0x03 ) ==0x00 ) + goto out; + buf_data[4 ] &= ~0x03 ; + } ret =scsi_mode_select (sdev,1 ,0 , buf_data, len,5 *HZ ,3 , &data, &sshdr);
@@ -742,6 +753,7 @@ int scsi_cdl_enable(struct scsi_device * } } +out: sdev->cdl_enable = enable;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 91/204 mei: me: add panther lake H DID
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Usyskin <[email protected]>
commit 86ce5c0a1dec02e21b4c864b2bc0cc5880a2c13c upstream.
Add Panther Lake H device id.
--- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + 2 files changed, 2 insertions(+)
drivers/misc/mei/hw-me-regs.h +1 -0
@@ -117,6 +117,7 @@#define MEI_DEV_ID_LNL_M 0xA870/* Lunar Lake Point M */ +#define MEI_DEV_ID_PTL_H 0xE370/* Panther Lake H */ #define MEI_DEV_ID_PTL_P 0xE470/* Panther Lake P */ /*
drivers/misc/mei/pci-me.c +1 -0
@@ -124,6 +124,7 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_LNL_M, MEI_ME_PCH15_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_PTL_H, MEI_ME_PCH15_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_PTL_P, MEI_ME_PCH15_CFG)},/* required last entry */
Greg Kroah-Hartman
maintainerPATCH 92/204 KVM: x86: Explicitly treat routing entry type changes as changes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit bcda70c56f3e718465cab2aad260cf34183ce1ce upstream.
Explicitly treat type differences as GSI routing changes, as comparing MSI data between two entries could get a false negative, e.g. if userspace changed the type but left the type-specific data as-is.
Message-ID: <[email protected]>
--- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +2 -1
@@ -13297,7 +13297,8 @@ int kvm_arch_update_irqfd_routing(structbool kvm_arch_irqfd_route_changed (struct kvm_kernel_irq_routing_entry *old,struct kvm_kernel_irq_routing_entry *new) { -if (new->type !=KVM_IRQ_ROUTING_MSI ) +if (old->type !=KVM_IRQ_ROUTING_MSI || + new->type !=KVM_IRQ_ROUTING_MSI )return true;return !!memcmp (&old->msi, &new->msi,sizeof (new->msi));
Greg Kroah-Hartman
maintainerPATCH 66/204 riscv: uprobes: Add missing fence.i after building the XOL buffer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Björn Töpel <[email protected]>
[ Upstream commit 7d1d19a11cfbfd8bae1d89cc010b2cc397cd0c48 ]
The XOL (execute out-of-line) buffer is used to single-step the replaced instruction(s) for uprobes. The RISC-V port was missing a proper fence.i (i$ flushing) after constructing the XOL buffer, which can result in incorrect execution of stale/broken instructions.
This was found running the BPF selftests "test_progs:uprobe_autoattach, attach_probe" on the Spacemit K1/X60, where the uprobes tests randomly blew up.
--- arch/riscv/kernel/probes/uprobes.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
arch/riscv/kernel/probes/uprobes.c +2 -8
@@ -167,6 +167,7 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,/* Initialize the slot */ void *kaddr =kmap_atomic (page);void *dst = kaddr + (vaddr & ~PAGE_MASK ); +unsigned long start = (unsigned long )dst;memcpy (dst, src, len);
@@ -176,13 +177,6 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, *(uprobe_opcode_t *)dst = __BUG_INSN_32; } +flush_icache_range (start, start + len);kunmap_atomic (kaddr); - -/* -* We probably need flush_icache_user_page() but it needs vma. -* This should work on most of architectures by default. If -* architecture needs to do something different it can define -* its own version of the function. -*/ -flush_dcache_page (page); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 93/204 KVM: x86: Reset IRTE to host control if *new* route isnt postable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit 9bcac97dc42d2f4da8229d18feb0fe2b1ce523a2 upstream.
Restore an IRTE back to host control (remapped or posted MSI mode) if the *new* GSI route prevents posting the IRQ directly to a vCPU, regardless of the GSI routing type. Updating the IRTE if and only if the new GSI is an MSI results in KVM leaving an IRTE posting to a vCPU.
The dangling IRTE can result in interrupts being incorrectly delivered to the guest, and in the worst case scenario can result in use-after-free, e.g. if the VM is torn down, but the underlying host IRQ isn't freed.
Message-ID: <[email protected]>
--- arch/x86/kvm/svm/avic.c | 58 +++++++++++++++++++++-------------------- arch/x86/kvm/vmx/posted_intr.c | 28 +++++++------------ 2 files changed, 41 insertions(+), 45 deletions(-)
arch/x86/kvm/svm/avic.c +31 -27
@@ -896,6 +896,7 @@ int avic_pi_update_irte(struct kvm *kvm, {struct kvm_kernel_irq_routing_entry *e;struct kvm_irq_routing_table *irq_rt; +bool enable_remapped_mode = true;int idx, ret =0 ; if (!kvm_arch_has_assigned_device(kvm) ||
@@ -933,6 +934,8 @@ int avic_pi_update_irte(struct kvm *kvm, kvm_vcpu_apicv_active(&svm->vcpu)) {struct amd_iommu_pi_data pi; + enable_remapped_mode = false; +/* Try to enable guest_mode in IRTE */ pi.base =__sme_set (page_to_phys (svm->avic_backing_page) &AVIC_HPA_MASK );
@@ -951,33 +954,6 @@ int avic_pi_update_irte(struct kvm *kvm,*/ if (!ret && pi.is_guest_mode)svm_ir_list_add (svm, &pi); - }else { -/* Use legacy mode in IRTE */ -struct amd_iommu_pi_data pi; - -/** -* Here, pi is used to: -* - Tell IOMMU to use legacy mode for this interrupt. -* - Retrieve ga_tag of prior interrupt remapping data. -*/ - pi.prev_ga_tag =0 ; - pi.is_guest_mode = false; - ret =irq_set_vcpu_affinity (host_irq, &pi); - -/** -* Check if the posted interrupt was previously -* setup with the guest_mode by checking if the ga_tag -* was cached. If so, we need to clean up the per-vcpu -* ir_list. -*/ -if (!ret && pi.prev_ga_tag) { -int id =AVIC_GATAG_TO_VCPUID (pi.prev_ga_tag); -struct kvm_vcpu *vcpu; - - vcpu =kvm_get_vcpu_by_id (kvm, id); -if (vcpu) -svm_ir_list_del (to_svm (vcpu), &pi); - } }if (!ret && svm) {
@@ -993,6 +969,34 @@ int avic_pi_update_irte(struct kvm *kvm, } ret =0 ; +if (enable_remapped_mode) { +/* Use legacy mode in IRTE */ +struct amd_iommu_pi_data pi; + +/** +* Here, pi is used to: +* - Tell IOMMU to use legacy mode for this interrupt. +* - Retrieve ga_tag of prior interrupt remapping data. +*/ + pi.prev_ga_tag =0 ; + pi.is_guest_mode = false; + ret =irq_set_vcpu_affinity (host_irq, &pi); + +/** +* Check if the posted interrupt was previously +* setup with the guest_mode by checking if the ga_tag +* was cached. If so, we need to clean up the per-vcpu +* ir_list. +*/ +if (!ret && pi.prev_ga_tag) { +int id =AVIC_GATAG_TO_VCPUID (pi.prev_ga_tag); +struct kvm_vcpu *vcpu; + + vcpu =kvm_get_vcpu_by_id (kvm, id); +if (vcpu) +svm_ir_list_del (to_svm (vcpu), &pi); + } + } out:srcu_read_unlock (&kvm->irq_srcu, idx);return ret;
arch/x86/kvm/vmx/posted_intr.c +10 -18
@@ -274,6 +274,7 @@ int vmx_pi_update_irte(struct kvm *kvm, {struct kvm_kernel_irq_routing_entry *e;struct kvm_irq_routing_table *irq_rt; +bool enable_remapped_mode = true;struct kvm_lapic_irq irq;struct kvm_vcpu *vcpu;struct vcpu_data vcpu_info;
@@ -312,21 +313,8 @@ int vmx_pi_update_irte(struct kvm *kvm,kvm_set_msi_irq (kvm, e, &irq);if (!kvm_intr_is_single_vcpu (kvm, &irq, &vcpu) || - !kvm_irq_is_postable (&irq)) { -/* -* Make sure the IRTE is in remapped mode if -* we don't handle it in posted mode. -*/ - ret =irq_set_vcpu_affinity (host_irq,NULL ); -if (ret <0 ) { -printk (KERN_INFO -"failed to back to remapped mode, irq: %u\n" , - host_irq); - goto out; - } - + !kvm_irq_is_postable (&irq))continue ; - } vcpu_info.pi_desc_addr =__pa (vcpu_to_pi_desc (vcpu)); vcpu_info.vector = irq.vector;
@@ -334,11 +322,12 @@ int vmx_pi_update_irte(struct kvm *kvm,trace_kvm_pi_irte_update (host_irq, vcpu->vcpu_id, e->gsi, vcpu_info.vector, vcpu_info.pi_desc_addr, set); -if (set) - ret =irq_set_vcpu_affinity (host_irq, &vcpu_info); -else - ret =irq_set_vcpu_affinity (host_irq,NULL ); +if (!set) +continue ; + enable_remapped_mode = false; + + ret =irq_set_vcpu_affinity (host_irq, &vcpu_info);if (ret <0 ) {printk (KERN_INFO "%s: failed to update PI IRTE\n" , __func__);
@@ -346,6 +335,9 @@ int vmx_pi_update_irte(struct kvm *kvm, } } +if (enable_remapped_mode) + ret =irq_set_vcpu_affinity (host_irq,NULL ); + ret =0 ; out:srcu_read_unlock (&kvm->irq_srcu, idx);
Greg Kroah-Hartman
maintainerPATCH 94/204 char: misc: register chrdev region with all possible minors
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit c876be906ce7e518d9ef9926478669c151999e69 upstream.
register_chrdev will only register the first 256 minors of a major chrdev. That means that dynamically allocated misc devices with minor above 255 will fail to open with -ENXIO.
This was found by kernel test robot when testing a different change that makes all dynamically allocated minors be above 255. This has, however, been separately tested by creating 256 serio_raw devices with the help of userio driver.
Ever since allowing misc devices with minors above 128, this has been possible.
Fix it by registering all minor numbers from 0 to MINORMASK + 1 for MISC_MAJOR.
--- drivers/char/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/misc.c +1 -1
@@ -315,7 +315,7 @@ static int __init misc_init(void) goto fail_remove; err = -EIO ; -if (register_chrdev (MISC_MAJOR ,"misc" , &misc_fops)) +if (__register_chrdev (MISC_MAJOR ,0 ,MINORMASK +1 ,"misc" , &misc_fops)) goto fail_printk;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 67/204 splice: remove duplicate noinline from pipe_clear_nowait
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: T.J. Mercier <[email protected]>
[ Upstream commit e6f141b332ddd9007756751b6afd24f799488fd8 ]
pipe_clear_nowait has two noinline macros, but we only need one.
I checked the whole tree, and this is the only occurrence:
$ grep -r "noinline .* noinline" fs/splice.c:static noinline void noinline pipe_clear_nowait(struct file *file) $
--- fs/splice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/splice.c +1 -1
@@ -45,7 +45,7 @@* here if set to avoid blocking other users of this pipe if splice is * being done on it. */ -static noinline void noinline pipe_clear_nowait(struct file *file) +static noinline void pipe_clear_nowait(struct file *file) {fmode_t fmode =READ_ONCE (file->f_mode);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 68/204 perf/x86: Fix non-sampling (counting) events on certain x86 platforms
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luo Gengkun <[email protected]>
[ Upstream commit 1a97fea9db9e9b9c4839d4232dde9f505ff5b4cc ]
Perf doesn't work at perf stat for hardware events on certain x86 platforms:
$perf stat -- sleep 1
Performance counter stats for 'sleep 1':
16.44 msec task-clock # 0.016 CPUs utilized
2 context-switches # 121.691 /sec
0 cpu-migrations # 0.000 /sec
54 page-faults # 3.286 K/sec <not supported> cycles
<not supported> instructions
<not supported> branches
<not supported> branch-misses
The reason is that the check in x86_pmu_hw_config() for sampling events is unexpectedly applied to counting events as well.
It should only impact x86 platforms with limit_period used for non-PEBS events. For Intel platforms, it should only impact some older platforms, e.g., HSW, BDW and NHM.
--- arch/x86/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/core.c +1 -1
@@ -623,7 +623,7 @@ int x86_pmu_hw_config(struct perf_event *event)if (event->attr.type == event->pmu->type) event->hw.config |= event->attr.config &X86_RAW_EVENT_MASK ; -if (!event->attr.freq && x86_pmu.limit_period) { +if (is_sampling_event (event) && !event->attr.freq && x86_pmu.limit_period) {s64 left = event->attr.sample_period; x86_pmu.limit_period (event, &left);if (left > event->attr.sample_period)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 69/204 LoongArch: Select ARCH_USE_MEMTEST
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuli Wang <[email protected]>
[ Upstream commit fb8e9f59d6f292c3d9fea6c155c22ea5fc3053ab ]
As of commit dce44566192e ("mm/memtest: add ARCH_USE_MEMTEST"), architectures must select ARCH_USE_MEMTESET to enable CONFIG_MEMTEST.
Commit 628c3bb40e9a ("LoongArch: Add boot and setup routines") added support for early_memtest but did not select ARCH_USE_MEMTESET.
--- arch/loongarch/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/loongarch/Kconfig +1 -0
@@ -59,6 +59,7 @@ config LOONGARCH select ARCH_SUPPORTS_NUMA_BALANCING select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF + select ARCH_USE_MEMTEST select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 70/204 LoongArch: Make regs_irqs_disabled() more clear
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
[ Upstream commit bb0511d59db9b3e40c8d51f0d151ccd0fd44071d ]
In the current code, the definition of regs_irqs_disabled() is actually "!(regs->csr_prmd & CSR_CRMD_IE)" because arch_irqs_disabled_flags() is defined as "!(flags & CSR_CRMD_IE)", it looks a little strange.
Define regs_irqs_disabled() as !(regs->csr_prmd & CSR_PRMD_PIE) directly to make it more clear, no functional change.
While at it, the return value of regs_irqs_disabled() is true or false, so change its type to reflect that and also make it always inline.
--- arch/loongarch/include/asm/ptrace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/loongarch/include/asm/ptrace.h +2 -2
@@ -33,9 +33,9 @@ struct pt_regs {unsigned long __last[]; }__aligned(8) ; -static inline int regs_irqs_disabled (struct pt_regs *regs) +static __always_inline bool regs_irqs_disabled(struct pt_regs *regs) { -return arch_irqs_disabled_flags (regs->csr_prmd); +return !(regs->csr_prmd &CSR_PRMD_PIE ); }static inline unsigned long kernel_stack_pointer (struct pt_regs *regs)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 71/204 LoongArch: Make do_xyz() exception handlers more robust
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
[ Upstream commit cc73cc6bcdb5f959670e3ff9abdc62461452ddff ]
Currently, interrupts need to be disabled before single-step mode is set, it requires that CSR_PRMD_PIE be cleared in save_local_irqflag() which is called by setup_singlestep(), this is reasonable.
But in the first kprobe breakpoint exception, if the irq is enabled at the beginning of do_bp(), it will not be disabled at the end of do_bp() due to the CSR_PRMD_PIE has been cleared in save_local_irqflag(). So for this case, it may corrupt exception context when restoring the exception after do_bp() in handle_bp(), this is not reasonable.
In order to restore exception safely in handle_bp(), it needs to ensure the irq is disabled at the end of do_bp(), so just add a local variable to record the original interrupt status in the parent context, then use it as the check condition to enable and disable irq in do_bp().
While at it, do the similar thing for other do_xyz() exception handlers to make them more robust.
--- arch/loongarch/kernel/traps.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
arch/loongarch/kernel/traps.c +12 -8
@@ -527,9 +527,10 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)die_if_kernel ("Kernel ale access" , regs);force_sig_fault (SIGBUS ,BUS_ADRALN , (void __user *)regs->csr_badvaddr);#else +bool pie =regs_irqs_disabled (regs);unsigned int *pc; -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable ();perf_sw_event (PERF_COUNT_SW_ALIGNMENT_FAULTS ,1 , regs, regs->csr_badvaddr);
@@ -556,7 +557,7 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)die_if_kernel ("Kernel ale access" , regs);force_sig_fault (SIGBUS ,BUS_ADRALN , (void __user *)regs->csr_badvaddr); out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();#endif irqentry_exit (regs, state);
@@ -588,12 +589,13 @@ static void bug_handler(struct pt_regs *regs) asmlinkage void noinstr do_bce(struct pt_regs *regs) {bool user =user_mode (regs); +bool pie =regs_irqs_disabled (regs);unsigned long era =exception_era (regs);u64 badv =0 , lower =0 , upper =ULONG_MAX ;union loongarch_instruction insn;irqentry_state_t state =irqentry_enter (regs); -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable (); current->thread.trap_nr =read_csr_excode ();
@@ -659,7 +661,7 @@ asmlinkage void noinstr do_bce(struct pt_regs *regs)force_sig_bnderr ((void __user *)badv, (void __user *)lower, (void __user *)upper); out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();irqentry_exit (regs, state);
@@ -677,11 +679,12 @@ asmlinkage void noinstr do_bce(struct pt_regs *regs) asmlinkage void noinstr do_bp(struct pt_regs *regs) {bool user =user_mode (regs); +bool pie =regs_irqs_disabled (regs);unsigned int opcode, bcode;unsigned long era =exception_era (regs);irqentry_state_t state =irqentry_enter (regs); -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable ();if (__get_inst (&opcode, (u32 *)era, user))
@@ -747,7 +750,7 @@ asmlinkage void noinstr do_bp(struct pt_regs *regs) } out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();irqentry_exit (regs, state);
@@ -982,6 +985,7 @@ static void init_restore_lbt(void) asmlinkage void noinstr do_lbt(struct pt_regs *regs) { +bool pie =regs_irqs_disabled (regs);irqentry_state_t state =irqentry_enter (regs);/*
@@ -991,7 +995,7 @@ asmlinkage void noinstr do_lbt(struct pt_regs *regs)* (including the user using 'MOVGR2GCSR' to turn on TM, which * will not trigger the BTE), we need to check PRMD first. */ -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable ();if (!cpu_has_lbt) {
@@ -1005,7 +1009,7 @@ asmlinkage void noinstr do_lbt(struct pt_regs *regs)preempt_enable (); out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();irqentry_exit (regs, state);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 72/204 virtio_console: fix missing byte order handling for cols and rows
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Halil Pasic <[email protected]>
commit fbd3039a64b01b769040677c4fc68badeca8e3b2 upstream.
As per virtio spec the fields cols and rows are specified as little endian. Although there is no legacy interface requirement that would state that cols and rows need to be handled as native endian when legacy interface is used, unlike for the fields of the adjacent struct virtio_console_control, I decided to err on the side of caution based on some non-conclusive virtio spec repo archaeology and opt for using virtio16_to_cpu() much like for virtio_console_control.event. Strictly by the letter of the spec virtio_le_to_cpu() would have been sufficient. But when the legacy interface is not used, it boils down to the same.
And when using the legacy interface, the device formatting these as little endian when the guest is big endian would surprise me more than it using guest native byte order (which would make it compatible with the current implementation). Nevertheless somebody trying to implement the spec following it to the letter could end up forcing little endian byte order when the legacy interface is in use. So IMHO this ultimately needs a judgement call by the maintainers.
Message-Id: <[email protected]>
--- drivers/char/virtio_console.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/char/virtio_console.c +4 -3
@@ -1612,8 +1612,8 @@ static void handle_control_message(strucbreak ;case VIRTIO_CONSOLE_RESIZE : {struct { -__u16 rows; -__u16 cols; +__virtio16 rows; +__virtio16 cols; } size;if (!is_console_port (port))
@@ -1621,7 +1621,8 @@ static void handle_control_message(strucmemcpy (&size, buf->buf + buf->offset +sizeof (*cpkt),sizeof (size)); -set_console_size (port, size.rows, size.cols); +set_console_size (port,virtio16_to_cpu (vdev, size.rows), +virtio16_to_cpu (vdev, size.cols)); port->cons.hvc->irq_requested =1 ;resize_console (port);
Greg Kroah-Hartman
maintainerPATCH 63/204 pds_core: Remove unnecessary check in pds_client_adminq_cmd()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit f9559d818205a4a0b9cd87181ef46e101ea11157 ]
When the pds_core driver was first created there were some race conditions around using the adminq, especially for client drivers. To reduce the possibility of a race condition there's a check against pf->state in pds_client_adminq_cmd(). This is problematic for a couple of reasons:
1. The PDSC_S_INITING_DRIVER bit is set during probe, but not cleared until after everything in probe is complete, which includes creating the auxiliary devices. For pds_fwctl this means it can't make any adminq commands until after pds_core's probe is complete even though the adminq is fully up by the time pds_fwctl's auxiliary device is created.
2. The race conditions around using the adminq have been fixed and this path is already protected against client drivers calling pds_client_adminq_cmd() if the adminq isn't ready, i.e. see pdsc_adminq_post() -> pdsc_adminq_inc_if_up().
Fix this by removing the pf->state check in pds_client_adminq_cmd() because invalid accesses to pds_core's adminq is already handled by pdsc_adminq_post()->pdsc_adminq_inc_if_up().
--- drivers/net/ethernet/amd/pds_core/auxbus.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/amd/pds_core/auxbus.c +0 -3
@@ -107,9 +107,6 @@ int pds_client_adminq_cmd(struct pds_auxiliary_dev *padev,dev_dbg (pf->dev,"%s: %s opcode %d\n" , __func__,dev_name (&padev->aux_dev.dev), req->opcode); -if (pf->state) -return -ENXIO ; -/* Wrap the client's request */ cmd.client_request.opcode =PDS_AQ_CMD_CLIENT_CMD ; cmd.client_request.client_id =cpu_to_le16 (padev->client_id);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 96/204 misc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rengarajan S <[email protected]>
commit e9d7748a7468581859d2b85b378135f9688a0aff upstream.
Under irq_ack, pci1xxxx_assign_bit reads the current interrupt status, modifies and writes the entire value back. Since, the IRQ status bit gets cleared on writing back, the better approach is to directly write the bitmask to the register in order to preserve the value.
--- drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c +1 -1
@@ -165,7 +165,7 @@ static void pci1xxxx_gpio_irq_ack(structunsigned long flags;spin_lock_irqsave (&priv->lock, flags); -pci1xxx_assign_bit (priv->reg_base,INTR_STAT_OFFSET (gpio), (gpio %32 ), true); +writel (BIT (gpio %32 ), priv->reg_base +INTR_STAT_OFFSET (gpio));spin_unlock_irqrestore (&priv->lock, flags); }
Greg Kroah-Hartman
maintainerPATCH 105/204 usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 8cab0e9a3f3e8d700179e0d6141643d54a267fd5 upstream.
Upon encountering errors during the HSIC pinctrl handling section the regulator should be disabled.
Use devm_add_action_or_reset() to let the regulator-disabling routine be handled by device resource management stack.
Found by Linux Verification Center (linuxtesting.org).
--- drivers/usb/chipidea/ci_hdrc_imx.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +17 -8
@@ -328,6 +328,13 @@ static int ci_hdrc_imx_notify_event(strureturn ret; } +static void ci_hdrc_imx_disable_regulator (void *arg) +{ +struct ci_hdrc_imx_data *data = arg; + +regulator_disable (data->hsic_pad_regulator); +} +static int ci_hdrc_imx_probe (struct platform_device *pdev) {struct ci_hdrc_imx_data *data;
@@ -386,6 +393,13 @@ static int ci_hdrc_imx_probe(struct plat "Failed to enable HSIC pad regulator\n"); goto err_put; } + ret =devm_add_action_or_reset (dev, + ci_hdrc_imx_disable_regulator, data); +if (ret) { +dev_err (dev, +"Failed to add regulator devm action\n" ); + goto err_put; + } } }
@@ -424,11 +438,11 @@ static int ci_hdrc_imx_probe(struct plat ret =imx_get_clks (dev);if (ret) - goto disable_hsic_regulator; + goto qos_remove_request; ret =imx_prepare_enable_clks (dev);if (ret) - goto disable_hsic_regulator; + goto qos_remove_request; data->phy =devm_usb_get_phy_by_phandle (dev,"fsl,usbphy" ,0 );if (IS_ERR (data->phy)) {
@@ -512,10 +526,7 @@ disable_device:ci_hdrc_remove_device (data->ci_pdev); err_clk:imx_disable_unprepare_clks (dev); -disable_hsic_regulator: -if (data->hsic_pad_regulator) -/* don't overwrite original ret (cf. EPROBE_DEFER) */ -regulator_disable (data->hsic_pad_regulator); +qos_remove_request:if (pdata.flags &CI_HDRC_PMQOS )cpu_latency_qos_remove_request (&data->pm_qos_req); data->ci_pdev =NULL ;
@@ -542,8 +553,6 @@ static void ci_hdrc_imx_remove(struct plimx_disable_unprepare_clks (&pdev->dev);if (data->plat_data->flags &CI_HDRC_PMQOS )cpu_latency_qos_remove_request (&data->pm_qos_req); -if (data->hsic_pad_regulator) -regulator_disable (data->hsic_pad_regulator); }if (data->usbmisc_data)put_device (data->usbmisc_data->dev);
Greg Kroah-Hartman
maintainerPATCH 106/204 usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 8c531e0a8c2d82509ad97c6d3a1e6217c7ed136d upstream.
usb_phy_init() may return an error code if e.g. its implementation fails to prepare/enable some clocks. And properly rollback on probe error path by calling the counterpart usb_phy_shutdown().
Found by Linux Verification Center (linuxtesting.org).
--- drivers/usb/chipidea/ci_hdrc_imx.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +10 -3
@@ -472,7 +472,11 @@ static int ci_hdrc_imx_probe(struct plat of_usb_get_phy_mode(np) == USBPHY_INTERFACE_MODE_ULPI) { pdata.flags |=CI_HDRC_OVERRIDE_PHY_CONTROL ; data->override_phy_control = true; -usb_phy_init (pdata.usb_phy); + ret =usb_phy_init (pdata.usb_phy); +if (ret) { +dev_err (dev,"Failed to init phy\n" ); + goto err_clk; + } }if (pdata.flags &CI_HDRC_SUPPORTS_RUNTIME_PM )
@@ -481,7 +485,7 @@ static int ci_hdrc_imx_probe(struct plat ret =imx_usbmisc_init (data->usbmisc_data);if (ret) {dev_err (dev,"usbmisc init failed, ret=%d\n" , ret); - goto err_clk; + goto phy_shutdown; } data->ci_pdev = ci_hdrc_add_device(dev,
@@ -490,7 +494,7 @@ static int ci_hdrc_imx_probe(struct platif (IS_ERR (data->ci_pdev)) { ret =PTR_ERR (data->ci_pdev);dev_err_probe (dev, ret,"ci_hdrc_add_device failed\n" ); - goto err_clk; + goto phy_shutdown; }if (data->usbmisc_data) {
@@ -524,6 +528,9 @@ static int ci_hdrc_imx_probe(struct plat disable_device:ci_hdrc_remove_device (data->ci_pdev); +phy_shutdown: +if (data->override_phy_control) +usb_phy_shutdown (data->phy); err_clk:imx_disable_unprepare_clks (dev); qos_remove_request:
Greg Kroah-Hartman
maintainerPATCH 107/204 USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02)
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
commit bcb60d438547355b8f9ad48645909139b64d3482 upstream.
The OHCI controller (rev 0x02) under LS7A PCI host has a hardware flaw. MMIO register with offset 0x60/0x64 is treated as legacy PS2-compatible keyboard/mouse interface, which confuse the OHCI controller. Since OHCI only use a 4KB BAR resource indeed, the LS7A OHCI controller's 32KB BAR is wrapped around (the second 4KB BAR space is the same as the first 4KB internally). So we can add an 4KB offset (0x1000) to the OHCI registers (from the PCI BAR resource) as a quirk.
--- drivers/usb/host/ohci-pci.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/usb/host/ohci-pci.c +23 -0
@@ -165,6 +165,25 @@ static int ohci_quirk_amd700(struct usb_return 0 ; } +static int ohci_quirk_loongson (struct usb_hcd *hcd) +{ +struct pci_dev *pdev =to_pci_dev (hcd->self.controller); + +/* +* Loongson's LS7A OHCI controller (rev 0x02) has a +* flaw. MMIO register with offset 0x60/64 is treated +* as legacy PS2-compatible keyboard/mouse interface. +* Since OHCI only use 4KB BAR resource, LS7A OHCI's +* 32KB BAR is wrapped around (the 2nd 4KB BAR space +* is the same as the 1st 4KB internally). So add 4KB +* offset (0x1000) to the OHCI registers as a quirk. +*/ +if (pdev->revision ==0x2 ) + hcd->regs +=SZ_4K ;/* SZ_4K = 0x1000 */ + +return 0 ; +} +static int ohci_quirk_qemu (struct usb_hcd *hcd) {struct ohci_hcd *ohci =hcd_to_ohci (hcd);
@@ -225,6 +244,10 @@ static const struct pci_device_id ohci_p .driver_data = (unsigned long)ohci_quirk_amd700, }, { + PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, 0x7a24), + .driver_data = (unsigned long)ohci_quirk_loongson, + }, + { .vendor = PCI_VENDOR_ID_APPLE, .device = 0x003f, .subvendor = PCI_SUBVENDOR_ID_REDHAT_QUMRANET,
Greg Kroah-Hartman
maintainerPATCH 108/204 usb: dwc3: gadget: check that event count does not exceed event buffer length
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frode Isaksen <[email protected]>
commit 63ccd26cd1f6600421795f6ca3e625076be06c9f upstream.
The event count is read from register DWC3_GEVNTCOUNT. There is a check for the count being zero, but not for exceeding the event buffer length.
Check that event count does not exceed event buffer length, avoiding an out-of-bounds access when memcpy'ing the event. Crash log:
Unable to handle kernel paging request at virtual address ffffffc0129be000 pc : __memcpy+0x114/0x180 lr : dwc3_check_event_buf+0xec/0x348 x3 : 0000000000000030 x2 : 000000000000dfc4 x1 : ffffffc0129be000 x0 : ffffff87aad60080 Call trace: __memcpy+0x114/0x180 dwc3_interrupt+0x24/0x34
--- drivers/usb/dwc3/gadget.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/dwc3/gadget.c +6 -0
@@ -4570,6 +4570,12 @@ static irqreturn_t dwc3_check_event_buf(if (!count)return IRQ_NONE ; +if (count > evt->length) { +dev_err_ratelimited (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , + count, evt->length); +return IRQ_NONE ; + } + evt->count = count; evt->flags |=DWC3_EVENT_PENDING ;
Greg Kroah-Hartman
maintainerPATCH 109/204 usb: dwc3: xilinx: Prevent spike in reset signal
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Looijmans <[email protected]>
commit 38d6e60b6f3a99f8f13bee22eab616136c2c0675 upstream.
The "reset" GPIO controls the RESET signal to an external, usually ULPI PHY, chip. The original code path acquires the signal in LOW state, and then immediately asserts it HIGH again, if the reset signal defaulted to asserted, there'd be a short "spike" before the reset.
Here is what happens depending on the pre-existing state of the reset signal:
Reset (previously asserted): ~~~|_|~~~~|_______ Reset (previously deasserted): _____|~~~~|_______
^ ^ ^
A B C
At point A, the low going transition is because the reset line is requested using GPIOD_OUT_LOW. If the line is successfully requested, the first thing we do is set it high _without_ any delay. This is point B. So, a glitch occurs between A and B.
Requesting the line using GPIOD_OUT_HIGH eliminates the A and B transitions. Instead we get:
Reset (previously asserted) : ~~~~~~~~~~|______
Reset (previously deasserted): ____|~~~~~|______
^ ^
A CWhere A and C are the points described above in the code. Point B has been eliminated.
The issue was found during code inspection.
Also remove the cryptic "toggle ulpi .." comment.
--- drivers/usb/dwc3/dwc3-xilinx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/usb/dwc3/dwc3-xilinx.c +1 -3
@@ -207,15 +207,13 @@ static int dwc3_xlnx_init_zynqmp(struct skip_usb3_phy:/* ulpi reset via gpio-modepin or gpio-framework driver */ - reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_LOW ); + reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_HIGH );if (IS_ERR (reset_gpio)) {return dev_err_probe (dev,PTR_ERR (reset_gpio),"Failed to request reset GPIO\n" ); }if (reset_gpio) { -/* Toggle ulpi to reset the phy. */ -gpiod_set_value_cansleep (reset_gpio,1 );usleep_range (5000 ,10000 );gpiod_set_value_cansleep (reset_gpio,0 );usleep_range (5000 ,10000 );
Greg Kroah-Hartman
maintainerPATCH 110/204 usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miao Li <[email protected]>
commit 2932b6b547ec36ad2ed60fbf2117c0e46bb7d40a upstream.
Silicon Motion Flash Drive connects to Huawei hisi platforms and performs a system reboot test for two thousand circles, it will randomly work incorrectly on boot, set DELAY_INIT quirk can workaround this issue.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -383,6 +383,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x0904, 0x6103), .driver_info = USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL }, + /* Silicon Motion Flash Drive */ + { USB_DEVICE(0x090c, 0x1000), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Sound Devices USBPre2 */ { USB_DEVICE(0x0926, 0x0202), .driver_info = USB_QUIRK_ENDPOINT_IGNORE },
Greg Kroah-Hartman
maintainerPATCH 111/204 usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miao Li <[email protected]>
commit 37ffdbd695c02189dbf23d6e7d2385e0299587ca upstream.
The SanDisk 3.2Gen1 Flash Drive, which VID:PID is in 0781:55a3, just like Silicon Motion Flash Drive:
https://lore.kernel.org/r/[email protected]
also needs the DELAY_INIT quirk, or it will randomly work incorrectly (e.g.: lsusb and can't list this device info) when connecting Huawei hisi platforms and doing thousand of reboot test circles.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -369,6 +369,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x0781, 0x5583), .driver_info = USB_QUIRK_NO_LPM }, { USB_DEVICE(0x0781, 0x5591), .driver_info = USB_QUIRK_NO_LPM }, + /* SanDisk Corp. SanDisk 3.2Gen1 */ + { USB_DEVICE(0x0781, 0x55a3), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Realforce 87U Keyboard */ { USB_DEVICE(0x0853, 0x011b), .driver_info = USB_QUIRK_NO_LPM },
Greg Kroah-Hartman
maintainerPATCH 112/204 USB: VLI disk crashes if LPM is used
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit e00b39a4f3552c730f1e24c8d62c4a8c6aad4e5d upstream.
This device needs the NO_LPM quirk.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -542,6 +542,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x2040, 0x7200), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, + /* VLI disk */ + { USB_DEVICE(0x2109, 0x0711), .driver_info = USB_QUIRK_NO_LPM }, + /* Raydium Touchscreen */ { USB_DEVICE(0x2386, 0x3114), .driver_info = USB_QUIRK_NO_LPM },
Greg Kroah-Hartman
maintainerPATCH 113/204 USB: wdm: handle IO errors in wdm_wwan_port_start
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 9697f5efcf5fdea65b8390b5eb81bebe746ceedc upstream.
In case submitting the URB fails we must undo
what we've done so far.
--- drivers/usb/class/cdc-wdm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +10 -1
@@ -829,6 +829,7 @@ static struct usb_class_driver wdm_classstatic int wdm_wwan_port_start (struct wwan_port *port) {struct wdm_device *desc =wwan_port_get_drvdata (port); +int rv;/* The interface is both exposed via the WWAN framework and as a * legacy usbmisc chardev. If chardev is already open, just fail
@@ -848,7 +849,15 @@ static int wdm_wwan_port_start(struct wwwwan_port_txon (port);/* Start getting events */ -return usb_submit_urb (desc->validity,GFP_KERNEL ); + rv =usb_submit_urb (desc->validity,GFP_KERNEL ); +if (rv <0 ) { +wwan_port_txoff (port); + desc->manage_power (desc->intf,0 ); +/* this must be last lest we race with chardev open */ +clear_bit (WDM_WWAN_IN_USE , &desc->flags); + } + +return rv; }static void wdm_wwan_port_stop (struct wwan_port *port)
Greg Kroah-Hartman
maintainerPATCH 114/204 USB: wdm: close race between wdm_open and wdm_wwan_port_stop
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit c1846ed4eb527bdfe6b3b7dd2c78e2af4bf98f4f upstream.
Clearing WDM_WWAN_IN_USE must be the last action or we can open a chardev whose URBs are still poisoned
--- drivers/usb/class/cdc-wdm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/class/cdc-wdm.c +4 -2
@@ -726,7 +726,7 @@ static int wdm_open(struct inode *inode, rv = -EBUSY ; goto out; } - +smp_rmb ();/* ordered against wdm_wwan_port_stop() */ rv =usb_autopm_get_interface (desc->intf);if (rv <0 ) {dev_err (&desc->intf->dev,"Error autopm - %d\n" , rv);
@@ -868,8 +868,10 @@ static void wdm_wwan_port_stop(struct wwpoison_urbs (desc); desc->manage_power (desc->intf,0 );clear_bit (WDM_READ , &desc->flags); -clear_bit (WDM_WWAN_IN_USE , &desc->flags);unpoison_urbs (desc); +smp_wmb ();/* ordered against wdm_open() */ +/* this must be last lest we open a poisoned device */ +clear_bit (WDM_WWAN_IN_USE , &desc->flags); }static void wdm_wwan_port_tx_complete (struct urb *urb)
Greg Kroah-Hartman
maintainerPATCH 97/204 serial: msm: Configure correct working mode before starting earlycon
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephan Gerhold <[email protected]>
commit 7094832b5ac861b0bd7ed8866c93cb15ef619996 upstream.
The MSM UART DM controller supports different working modes, e.g. DMA or the "single-character mode", where all reads/writes operate on a single character rather than 4 chars (32-bit) at once. When using earlycon, __msm_console_write() always writes 4 characters at a time, but we don't know which mode the bootloader was using and we don't set the mode either.
This causes garbled output if the bootloader was using the single-character mode, because only every 4th character appears in the serial console, e.g.
"[ 00oni pi 000xf0[ 00i s 5rm9(l)l s 1 1 SPMTA 7:C 5[ 00A ade k d[
00ano:ameoi .Q1B[ 00ac _idaM00080oo'"
If the bootloader was using the DMA ("DM") mode, output would likely fail entirely. Later, when the full serial driver probes, the port is re-initialized and output works as expected.
Fix this also for earlycon by clearing the DMEN register and reset+re-enable the transmitter to apply the change. This ensures the transmitter is in the expected state before writing any output.
--- drivers/tty/serial/msm_serial.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/msm_serial.c +6 -0
@@ -1741,6 +1741,12 @@ msm_serial_early_console_setup_dm(structif (!device->port.membase)return -ENODEV ; +/* Disable DM / single-character modes */ +msm_write (&device->port,0 ,UARTDM_DMEN ); +msm_write (&device->port,MSM_UART_CR_CMD_RESET_RX ,MSM_UART_CR ); +msm_write (&device->port,MSM_UART_CR_CMD_RESET_TX ,MSM_UART_CR ); +msm_write (&device->port,MSM_UART_CR_TX_ENABLE ,MSM_UART_CR ); + device->con->write = msm_serial_early_write_dm;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 115/204 USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 1fdc4dca350c0b8ada0b8ebf212504e1ad55e511 upstream.
wdm_wwan_port_tx_complete is called from a completion handler with irqs disabled and possible in IRQ context usb_autopm_put_interface can take a mutex. Hence usb_autopm_put_interface_async must be used.
--- drivers/usb/class/cdc-wdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +1 -1
@@ -879,7 +879,7 @@ static void wdm_wwan_port_tx_complete(ststruct sk_buff *skb = urb->context;struct wdm_device *desc =skb_shinfo (skb)->destructor_arg; -usb_autopm_put_interface (desc->intf); +usb_autopm_put_interface_async (desc->intf);wwan_port_txon (desc->wwanp);kfree_skb (skb); }
Greg Kroah-Hartman
maintainerPATCH 116/204 USB: wdm: add annotation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 73e9cc1ffd3650b12c4eb059dfdafd56e725ceda upstream.
This is not understandable without a comment on endianness
--- drivers/usb/class/cdc-wdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +1 -1
@@ -909,7 +909,7 @@ static int wdm_wwan_port_tx(struct wwan_ req->bRequestType = (USB_DIR_OUT |USB_TYPE_CLASS |USB_RECIP_INTERFACE ); req->bRequest =USB_CDC_SEND_ENCAPSULATED_COMMAND ; req->wValue =0 ; - req->wIndex = desc->inum; + req->wIndex = desc->inum;/* already converted */ req->wLength =cpu_to_le16 (skb->len);skb_shinfo (skb)->destructor_arg = desc;
Greg Kroah-Hartman
maintainerPATCH 117/204 pinctrl: renesas: rza2: Fix potential NULL pointer dereference
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit f752ee5b5b86b5f88a5687c9eb0ef9b39859b908 ]
chip.label in rza2_gpio_register() could be NULL. Add the missing check.
--- drivers/pinctrl/renesas/pinctrl-rza2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pinctrl/renesas/pinctrl-rza2.c +3 -0
@@ -243,6 +243,9 @@ static int rza2_gpio_register(struct rza2_pinctrl_priv *priv)int ret; chip.label =devm_kasprintf (priv->dev,GFP_KERNEL ,"%pOFn" , np); +if (!chip.label) +return -ENOMEM ; + chip.parent = priv->dev; chip.ngpio = priv->npins;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 118/204 MIPS: cm: Detect CM quirks from device tree
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gregory CLEMENT <[email protected]>
[ Upstream commit e27fbe16af5cfc40639de4ced67d1a866a1953e9 ]
Some information that should be retrieved at runtime for the Coherence Manager can be either absent or wrong. This patch allows checking if some of this information is available from the device tree and updates the internal variable accordingly.
For now, only the compatible string associated with the broken HCI is being retrieved.
--- arch/mips/include/asm/mips-cm.h | 22 ++++++++++++++++++++++ arch/mips/kernel/mips-cm.c | 14 ++++++++++++++ 2 files changed, 36 insertions(+)
arch/mips/include/asm/mips-cm.h +22 -0
@@ -47,6 +47,16 @@ extern phys_addr_t __mips_cm_phys_base(void);*/ extern int mips_cm_is64; +/* +* mips_cm_is_l2_hci_broken - determine if HCI is broken +* +* Some CM reports show that Hardware Cache Initialization is +* complete, but in reality it's not the case. They also incorrectly +* indicate that Hardware Cache Initialization is supported. This +* flags allows warning about this broken feature. +*/ +extern bool mips_cm_is_l2_hci_broken; +/** * mips_cm_error_report - Report CM cache errors */
@@ -85,6 +95,18 @@ static inline bool mips_cm_present(void)#endif } +/** +* mips_cm_update_property - update property from the device tree +* +* Retrieve the properties from the device tree if a CM node exist and +* update the internal variable based on this. +*/ +#ifdef CONFIG_MIPS_CM +extern void mips_cm_update_property (void ); +#else +static void mips_cm_update_property (void ) {} +#endif +/** * mips_cm_has_l2sync - determine whether an L2-only sync region is present *
arch/mips/kernel/mips-cm.c +14 -0
@@ -5,6 +5,7 @@*/ #include <linux/errno.h> +#include <linux/of.h> #include <linux/percpu.h> #include <linux/spinlock.h>
@@ -14,6 +15,7 @@void __iomem *mips_gcr_base;void __iomem *mips_cm_l2sync_base;int mips_cm_is64; +bool mips_cm_is_l2_hci_broken;static char *cm2_tr[8 ] = {"mem" ,"gcr" ,"gic" ,"mmio" ,
@@ -243,6 +245,18 @@ static void mips_cm_probe_l2sync(void) mips_cm_l2sync_base =ioremap (addr,MIPS_CM_L2SYNC_SIZE ); } +void mips_cm_update_property (void ) +{ +struct device_node *cm_node; + + cm_node =of_find_compatible_node (of_root,NULL ,"mobileye,eyeq6-cm" ); +if (!cm_node) +return ; +pr_info ("HCI (Hardware Cache Init for the L2 cache) in GCR_L2_RAM_CONFIG from the CM3 is broken" ); + mips_cm_is_l2_hci_broken = true; +of_node_put (cm_node); +} +int mips_cm_probe (void ) {phys_addr_t addr;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 119/204 crypto: ccp - Add support for PCI device 0x1134
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Devaraj Rangasamy <[email protected]>
[ Upstream commit 6cb345939b8cc4be79909875276aa9dc87d16757 ]
PCI device 0x1134 shares same register features as PCI device 0x17E0. Hence reuse same data for the new PCI device ID 0x1134.
--- drivers/crypto/ccp/sp-pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/ccp/sp-pci.c +1 -0
@@ -577,6 +577,7 @@ static const struct pci_device_id sp_pci_table[] = { { PCI_VDEVICE(AMD, 0x14CA), (kernel_ulong_t)&dev_vdata[5] }, { PCI_VDEVICE(AMD, 0x15C7), (kernel_ulong_t)&dev_vdata[6] }, { PCI_VDEVICE(AMD, 0x1649), (kernel_ulong_t)&dev_vdata[6] }, + { PCI_VDEVICE(AMD, 0x1134), (kernel_ulong_t)&dev_vdata[7] }, { PCI_VDEVICE(AMD, 0x17E0), (kernel_ulong_t)&dev_vdata[7] }, { PCI_VDEVICE(AMD, 0x156E), (kernel_ulong_t)&dev_vdata[8] }, /* Last entry must be zero */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 120/204 crypto: null - Use spin lock instead of mutex
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
[ Upstream commit dcc47a028c24e793ce6d6efebfef1a1e92f80297 ]
As the null algorithm may be freed in softirq context through af_alg, use spin locks instead of mutexes to protect the default null algorithm.
--- crypto/crypto_null.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-)
crypto/crypto_null.c +26 -13
@@ -17,10 +17,10 @@#include <crypto/internal/skcipher.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/mm.h> +#include <linux/spinlock.h> #include <linux/string.h> -static DEFINE_MUTEX (crypto_default_null_skcipher_lock); +static DEFINE_SPINLOCK (crypto_default_null_skcipher_lock);static struct crypto_sync_skcipher *crypto_default_null_skcipher;static int crypto_default_null_skcipher_refcnt;
@@ -152,23 +152,32 @@ MODULE_ALIAS_CRYPTO("cipher_null");struct crypto_sync_skcipher *crypto_get_default_null_skcipher (void ) { +struct crypto_sync_skcipher *ntfm =NULL ;struct crypto_sync_skcipher *tfm; -mutex_lock (&crypto_default_null_skcipher_lock); +spin_lock_bh (&crypto_default_null_skcipher_lock); tfm = crypto_default_null_skcipher;if (!tfm) { - tfm =crypto_alloc_sync_skcipher ("ecb(cipher_null)" ,0 ,0 ); -if (IS_ERR (tfm)) - goto unlock; - - crypto_default_null_skcipher = tfm; +spin_unlock_bh (&crypto_default_null_skcipher_lock); + + ntfm =crypto_alloc_sync_skcipher ("ecb(cipher_null)" ,0 ,0 ); +if (IS_ERR (ntfm)) +return ntfm; + +spin_lock_bh (&crypto_default_null_skcipher_lock); + tfm = crypto_default_null_skcipher; +if (!tfm) { + tfm = ntfm; + ntfm =NULL ; + crypto_default_null_skcipher = tfm; + } } crypto_default_null_skcipher_refcnt++; +spin_unlock_bh (&crypto_default_null_skcipher_lock); -unlock: -mutex_unlock (&crypto_default_null_skcipher_lock); +crypto_free_sync_skcipher (ntfm);return tfm; }
@@ -176,12 +185,16 @@ EXPORT_SYMBOL_GPL(crypto_get_default_null_skcipher);void crypto_put_default_null_skcipher (void ) { -mutex_lock (&crypto_default_null_skcipher_lock); +struct crypto_sync_skcipher *tfm =NULL ; + +spin_lock_bh (&crypto_default_null_skcipher_lock);if (!--crypto_default_null_skcipher_refcnt) { -crypto_free_sync_skcipher (crypto_default_null_skcipher); + tfm = crypto_default_null_skcipher; crypto_default_null_skcipher =NULL ; } -mutex_unlock (&crypto_default_null_skcipher_lock); +spin_unlock_bh (&crypto_default_null_skcipher_lock); + +crypto_free_sync_skcipher (tfm); }EXPORT_SYMBOL_GPL (crypto_put_default_null_skcipher);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 121/204 bpf: Fix deadlock between rcu_tasks_trace and event_mutex.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Starovoitov <[email protected]>
[ Upstream commit 4580f4e0ebdf8dc8d506ae926b88510395a0c1d1 ]
Fix the following deadlock:
CPU A_free_event()
perf_kprobe_destroy()
mutex_lock(&event_mutex)
perf_trace_event_unreg()
synchronize_rcu_tasks_trace()
There are several paths where _free_event() grabs event_mutex and calls sync_rcu_tasks_trace. Above is one such case.
CPU Bbpf_prog_test_run_syscall()
rcu_read_lock_trace()
bpf_prog_run_pin_on_cpu()
bpf_prog_load()
bpf_tracing_func_proto()
trace_set_clr_event()
mutex_lock(&event_mutex)Delegate trace_set_clr_event() to workqueue to avoid such lock dependency.
--- kernel/trace/bpf_trace.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/trace/bpf_trace.c +4 -3
@@ -400,7 +400,7 @@ static const struct bpf_func_proto bpf_trace_printk_proto = { .arg2_type = ARG_CONST_SIZE, }; -static void __set_printk_clr_event (void ) +static void __set_printk_clr_event (struct work_struct *work) {/* * This program might be calling bpf_trace_printk,
@@ -413,10 +413,11 @@ static void __set_printk_clr_event(void)if (trace_set_clr_event ("bpf_trace" ,"bpf_trace_printk" ,1 ))pr_warn_ratelimited ("could not enable bpf_trace_printk events" ); } +static DECLARE_WORK(set_printk_work, __set_printk_clr_event);const struct bpf_func_proto *bpf_get_trace_printk_proto (void ) { -__set_printk_clr_event (); +schedule_work (&set_printk_work);return &bpf_trace_printk_proto; }
@@ -459,7 +460,7 @@ static const struct bpf_func_proto bpf_trace_vprintk_proto = {const struct bpf_func_proto *bpf_get_trace_vprintk_proto (void ) { -__set_printk_clr_event (); +schedule_work (&set_printk_work);return &bpf_trace_vprintk_proto; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 122/204 clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Stuebner <[email protected]>
[ Upstream commit b20150d499b3ee5c2d632fbc5ac94f98dd33accf ]
of_clk_get_hw_from_clkspec() checks all available clock-providers by comparing their of nodes to the one from the clkspec. If no matching clock provider is found, the function returns -EPROBE_DEFER to cause a re-check at a later date. If a matching clock provider is found, an authoritative answer can be retrieved from it whether the clock exists or not.
This does not take into account that the clock-provider may never appear, because it's node is disabled. This can happen when a clock is optional, provided by a separate block which never gets enabled.
One example of this happening is the rk3588's VOP, which has optional additional display clocks coming from PLLs inside the hdmiphy blocks. These can be used for better rates, but the system will also work without them.
The problem around that is described in the followups to[1]. As we already know the of node of the presumed clock provider, add a check via of_device_is_available() whether this is a "valid" device node. This prevents eternal defer loops.
--- drivers/clk/clk.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clk/clk.c +4 -0
@@ -5216,6 +5216,10 @@ of_clk_get_hw_from_clkspec(struct of_phandle_args *clkspec)if (!clkspec)return ERR_PTR (-EINVAL ); +/* Check if node in clkspec is in disabled/fail state */ +if (!of_device_is_available (clkspec->np)) +return ERR_PTR (-ENOENT ); +mutex_lock (&of_clk_mutex);list_for_each_entry (provider, &of_clk_providers, link) {if (provider->node == clkspec->np) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 123/204 parisc: PDT: Fix missing prototype warning
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu-Chun Lin <[email protected]>
[ Upstream commit b899981750dcb958ceffa4462d903963ee494aa2 ]
As reported by the kernel test robot, the following error occurs:
arch/parisc/kernel/pdt.c:65:6: warning: no previous prototype for 'arch_report_meminfo' [-Wmissing-prototypes]
65 | void arch_report_meminfo(struct seq_file *m)
| ^~~~~~~~~~~~~~~~~~~
arch_report_meminfo() is declared in include/linux/proc_fs.h and only defined when CONFIG_PROC_FS is enabled. Wrap its definition in #ifdef CONFIG_PROC_FS to fix the -Wmissing-prototypes warning.
--- arch/parisc/kernel/pdt.c | 2 ++ 1 file changed, 2 insertions(+)
arch/parisc/kernel/pdt.c +2 -0
@@ -63,6 +63,7 @@ static unsigned long pdt_entry[MAX_PDT_ENTRIES] __page_aligned_bss;#define PDT_ADDR_PERM_ERR (pdt_type != PDT_PDC ? 2UL : 0UL)#define PDT_ADDR_SINGLE_ERR 1UL +#ifdef CONFIG_PROC_FS /* report PDT entries via /proc/meminfo */ void arch_report_meminfo (struct seq_file *m) {
@@ -74,6 +75,7 @@ void arch_report_meminfo(struct seq_file *m)seq_printf (m,"PDT_cur_entries: %7lu\n" , pdt_status.pdt_entries); } +#endif static int get_info_pat_new (void ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 124/204 s390/sclp: Add check for get_zeroed_page()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
[ Upstream commit 3db42c75a921854a99db0a2775814fef97415bac ]
Add check for the return value of get_zeroed_page() in sclp_console_init() to prevent null pointer dereference. Furthermore, to solve the memory leak caused by the loop allocation, add a free helper to do the free job.
--- drivers/s390/char/sclp_con.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/s390/char/sclp_con.c +17 -0
@@ -263,6 +263,19 @@ static struct console sclp_console = .index = 0 /* ttyS0 */ }; +/* +* Release allocated pages. +*/ +static void __init __sclp_console_free_pages (void ) +{ +struct list_head *page, *p; + +list_for_each_safe (page, p, &sclp_con_pages) { +list_del (page); +free_page ((unsigned long )page); + } +} +/* * called by console_init() in drivers/char/tty_io.c at boot-time. */
@@ -282,6 +295,10 @@ sclp_console_init(void)/* Allocate pages for output buffering */ for (i =0 ; i < sclp_console_pages; i++) { page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA ); +if (!page) { +__sclp_console_free_pages (); +return -ENOMEM ; + }list_add_tail (page, &sclp_con_pages); } sclp_conbuf =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 98/204 serial: sifive: lock port in startup()/shutdown() callbacks
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryo Takakura <[email protected]>
commit e1ca3ff28ab1e2c1e70713ef3fa7943c725742c3 upstream.
startup()/shutdown() callbacks access SIFIVE_SERIAL_IE_OFFS. The register is also accessed from write() callback.
If console were printing and startup()/shutdown() callback gets called, its access to the register could be overwritten.
Add port->lock to startup()/shutdown() callbacks to make sure their access to SIFIVE_SERIAL_IE_OFFS is synchronized against write() callback.
Rule: add
--- drivers/tty/serial/sifive.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/sifive.c +6 -0
@@ -562,8 +562,11 @@ static void sifive_serial_break_ctl(strustatic int sifive_serial_startup (struct uart_port *port) {struct sifive_serial_port *ssp =port_to_sifive_serial_port (port); +unsigned long flags; +uart_port_lock_irqsave (&ssp->port, &flags);__ssp_enable_rxwm (ssp); +uart_port_unlock_irqrestore (&ssp->port, flags);return 0 ; }
@@ -571,9 +574,12 @@ static int sifive_serial_startup(structstatic void sifive_serial_shutdown (struct uart_port *port) {struct sifive_serial_port *ssp =port_to_sifive_serial_port (port); +unsigned long flags; +uart_port_lock_irqsave (&ssp->port, &flags);__ssp_disable_rxwm (ssp);__ssp_disable_txwm (ssp); +uart_port_unlock_irqrestore (&ssp->port, flags); }/**
Greg Kroah-Hartman
maintainerPATCH 125/204 s390/tty: Fix a potential memory leak bug
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
[ Upstream commit ad9bb8f049717d64c5e62b2a44954be9f681c65b ]
The check for get_zeroed_page() leads to a direct return and overlooked the memory leak caused by loop allocation. Add a free helper to free spaces allocated by get_zeroed_page().
--- drivers/s390/char/sclp_tty.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/s390/char/sclp_tty.c +12 -0
@@ -490,6 +490,17 @@ static const struct tty_operations sclp_ops = { .flush_buffer = sclp_tty_flush_buffer, }; +/* Release allocated pages. */ +static void __init __sclp_tty_free_pages (void ) +{ +struct list_head *page, *p; + +list_for_each_safe (page, p, &sclp_tty_pages) { +list_del (page); +free_page ((unsigned long )page); + } +} +static int __init sclp_tty_init (void ) {
@@ -516,6 +527,7 @@ sclp_tty_init(void)for (i =0 ; i <MAX_KMEM_PAGES ; i++) { page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (page ==NULL ) { +__sclp_tty_free_pages ();tty_driver_kref_put (driver);return -ENOMEM ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 126/204 bpf: bpftool: Setting error code in do_loader()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sewon Nam <[email protected]>
[ Upstream commit 02a4694107b4c830d4bd6d194e98b3ac0bc86f29 ]
We are missing setting error code in do_loader() when bpf_object__open_file() fails. This means the command's exit status code will be successful, even though the operation failed. So make sure to return the correct error code. To maintain consistency with other locations where bpf_object__open_file() is called, return -1.
[0] Closes: https://github.com/libbpf/bpftool/issues/156
--- tools/bpf/bpftool/prog.c | 1 + 1 file changed, 1 insertion(+)
tools/bpf/bpftool/prog.c +1 -0
@@ -1924,6 +1924,7 @@ static int do_loader(int argc, char **argv) obj =bpf_object__open_file (file, &open_opts);if (!obj) { + err =-1 ;p_err ("failed to open object file" ); goto err_close_obj; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 99/204 USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ehrenreich <[email protected]>
commit b399078f882b6e5d32da18b6c696cc84b12f90d5 upstream.
Abacus Electrics makes optical probes for interacting with smart meters over an optical interface.
At least one version uses an FT232B chip (as detected by ftdi_sio) with a custom USB PID, which needs to be added to the list to make the device work in a plug-and-play fashion.
--- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 5 +++++ 2 files changed, 7 insertions(+)
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -1093,6 +1093,8 @@ static const struct usb_device_id id_tab { USB_DEVICE_INTERFACE_NUMBER(ALTERA_VID, ALTERA_UB3_602E_PID, 1) }, { USB_DEVICE_INTERFACE_NUMBER(ALTERA_VID, ALTERA_UB3_602E_PID, 2) }, { USB_DEVICE_INTERFACE_NUMBER(ALTERA_VID, ALTERA_UB3_602E_PID, 3) }, +/* Abacus Electrics */ + { USB_DEVICE(FTDI_VID, ABACUS_OPTICAL_PROBE_PID) }, { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +5 -0
@@ -443,6 +443,11 @@#define LINX_FUTURE_2_PID 0xF44C/* Linx future device */ /* +* Abacus Electrics +*/ +#define ABACUS_OPTICAL_PROBE_PID 0xf458/* ABACUS ELECTRICS Optical Probe */ + +/* * Oceanic product ids */ #define FTDI_OCEANIC_PID 0xF460/* Oceanic dive instrument */
Greg Kroah-Hartman
maintainerPATCH 100/204 USB: serial: option: add Sierra Wireless EM9291
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Xue <[email protected]>
commit 968e1cbb1f6293c3add9607f80b5ce3d29f57583 upstream.
Add Sierra Wireless EM9291.
Interface 0: MBIM control
1: MBIM data
3: AT port
4: Diagnostic port
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1199 ProdID=90e3 Rev=00.06 S: Manufacturer=Sierra Wireless, Incorporated S: Product=Sierra Wireless EM9291 S: SerialNumber=xxxxxxxxxxxxxxxx C: #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=8e(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=(none) E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=(none) E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/option.c +3 -0
@@ -611,6 +611,7 @@ static void option_instat_callback(struc/* Sierra Wireless products */ #define SIERRA_VENDOR_ID 0x1199#define SIERRA_PRODUCT_EM9191 0x90d3 +#define SIERRA_PRODUCT_EM9291 0x90e3/* UNISOC (Spreadtrum) products */ #define UNISOC_VENDOR_ID 0x1782
@@ -2432,6 +2433,8 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) }, { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9291, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9291, 0xff, 0xff, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, LUAT_PRODUCT_AIR720U, 0xff, 0, 0) }, { USB_DEVICE_INTERFACE_CLASS(0x1bbb, 0x0530, 0xff), /* TCL IK512 MBIM */
Greg Kroah-Hartman
maintainerPATCH 101/204 USB: serial: simple: add OWON HDS200 series oscilloscope support
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Craig Hesling <[email protected]>
commit 4cc01410e1c1dd075df10f750775c81d1cb6672b upstream.
Add serial support for OWON HDS200 series oscilloscopes and likely many other pieces of OWON test equipment.
OWON HDS200 series devices host two USB endpoints, designed to facilitate bidirectional SCPI. SCPI is a predominately ASCII text protocol for test/measurement equipment. Having a serial/tty interface for these devices lowers the barrier to entry for anyone trying to write programs to communicate with them.
The following shows the USB descriptor for the OWON HDS272S running firmware V5.7.1:
Bus 001 Device 068: ID 5345:1234 Owon PDS6062T Oscilloscope Negotiated speed: Full Speed (12Mbps)
Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 0 [unknown] bDeviceSubClass 0 [unknown] bDeviceProtocol 0 bMaxPacketSize0 64 idVendor 0x5345 Owon idProduct 0x1234 PDS6062T Oscilloscope bcdDevice 1.00 iManufacturer 1 oscilloscope iProduct 2 oscilloscope iSerial 3 oscilloscope bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 0x0029
bNumInterfaces 1
bConfigurationValue 1
iConfiguration 0
bmAttributes 0x80
(Bus Powered)
MaxPower 100mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 5 Physical Interface Device
bInterfaceSubClass 0 [unknown]
bInterfaceProtocol 0
iInterface 0
** UNRECOGNIZED: 09 21 11 01 00 01 22 5f 00 Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 32
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 32
Device Status: 0x0000
(Bus Powered)
OWON appears to be using the same USB Vendor and Product ID for many of their oscilloscopes. Looking at the discussion about the USB vendor/product ID, in the link bellow, suggests that this VID/PID is shared with VDS, SDS, PDS, and now the HDS series oscilloscopes. Available documentation for these devices seems to indicate that all use a similar SCPI protocol, some with RS232 options. It is likely that this same simple serial setup would work correctly for them all.
--- drivers/usb/serial/usb-serial-simple.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/serial/usb-serial-simple.c +7 -0
@@ -101,6 +101,11 @@ DEVICE(nokia, NOKIA_IDS); { USB_DEVICE(0x09d7, 0x0100) } /* NovAtel FlexPack GPS */DEVICE_N (novatel_gps,NOVATEL_IDS ,3 ); +/* OWON electronic test and measurement equipment driver */ +#define OWON_IDS () \ + { USB_DEVICE(0x5345, 0x1234) }/* HDS200 oscilloscopes and others */ +DEVICE (owon,OWON_IDS ); +/* Siemens USB/MPI adapter */ #define SIEMENS_IDS () \ { USB_DEVICE(0x908, 0x0004) }
@@ -135,6 +140,7 @@ static struct usb_serial_driver * const &motorola_tetra_device, &nokia_device, &novatel_gps_device, + &owon_device, &siemens_mpi_device, &suunto_device, &vivopay_device,
@@ -154,6 +160,7 @@ static const struct usb_device_id id_tabMOTOROLA_TETRA_IDS (),NOKIA_IDS (),NOVATEL_IDS (), +OWON_IDS (),SIEMENS_IDS (),SUUNTO_IDS (), VIVOPAY_IDS(),
Greg Kroah-Hartman
maintainerPATCH 102/204 usb: xhci: Fix invalid pointer dereference in Etron workaround
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
commit 1ea050da5562af9b930d17cbbe9632d30f5df43a upstream.
This check is performed before prepare_transfer() and prepare_ring(), so enqueue can already point at the final link TRB of a segment. And indeed it will, some 0.4% of times this code is called.
Then enqueue + 1 is an invalid pointer. It will crash the kernel right away or load some junk which may look like a link TRB and cause the real link TRB to be replaced with a NOOP. This wouldn't end well.
Use a functionally equivalent test which doesn't dereference the pointer and always gives correct result.
Something has crashed my machine twice in recent days while playing with an Etron HC, and a control transfer stress test ran for confirmation has just crashed it again. The same test passes with this patch applied.
--- drivers/usb/host/xhci-ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-ring.c +1 -1
@@ -3876,7 +3876,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd ** enqueue a No Op TRB, this can prevent the Setup and Data Stage * TRB to be breaked by the Link TRB. */ -if (trb_is_link (ep_ring->enqueue +1 )) { +if (last_trb_on_seg (ep_ring->enq_seg, ep_ring->enqueue +1 )) { field =TRB_TYPE (TRB_TR_NOOP ) | ep_ring->cycle_state;queue_trb (xhci, ep_ring, false,0 ,0 ,TRB_INTR_TARGET (0 ), field);
Greg Kroah-Hartman
maintainerPATCH 103/204 usb: cdns3: Fix deadlock when using NCM gadget
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ralph Siemsen <[email protected]>
commit a1059896f2bfdcebcdc7153c3be2307ea319501f upstream.
The cdns3 driver has the same NCM deadlock as fixed in cdnsp by commit 58f2fcb3a845 ("usb: cdnsp: Fix deadlock issue during using NCM gadget").
Under PREEMPT_RT the deadlock can be readily triggered by heavy network traffic, for example using "iperf --bidir" over NCM ethernet link.
The deadlock occurs because the threaded interrupt handler gets preempted by a softirq, but both are protected by the same spinlock. Prevent deadlock by disabling softirq during threaded irq handler.
--- drivers/usb/cdns3/cdns3-gadget.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/cdns3/cdns3-gadget.c +2 -0
@@ -1962,6 +1962,7 @@ static irqreturn_t cdns3_device_thread_iunsigned int bit;unsigned long reg; +local_bh_disable ();spin_lock_irqsave (&priv_dev->lock, flags); reg =readl (&priv_dev->regs->usb_ists);
@@ -2003,6 +2004,7 @@ static irqreturn_t cdns3_device_thread_i irqend:writel (~0 , &priv_dev->regs->ep_ien);spin_unlock_irqrestore (&priv_dev->lock, flags); +local_bh_enable ();return ret; }
Greg Kroah-Hartman
maintainerPATCH 104/204 usb: chipidea: ci_hdrc_imx: fix usbmisc handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 4e28f79e3dffa52d327b46d1a78dac16efb5810b upstream.
usbmisc is an optional device property so it is totally valid for the corresponding data->usbmisc_data to have a NULL value.
Check that before dereferencing the pointer.
Found by Linux Verification Center (linuxtesting.org) with Svace static analysis tool.
--- drivers/usb/chipidea/ci_hdrc_imx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +4 -2
@@ -520,7 +520,8 @@ disable_hsic_regulator:cpu_latency_qos_remove_request (&data->pm_qos_req); data->ci_pdev =NULL ; err_put: -put_device (data->usbmisc_data->dev); +if (data->usbmisc_data) +put_device (data->usbmisc_data->dev);return ret; }
@@ -544,7 +545,8 @@ static void ci_hdrc_imx_remove(struct plif (data->hsic_pad_regulator)regulator_disable (data->hsic_pad_regulator); } -put_device (data->usbmisc_data->dev); +if (data->usbmisc_data) +put_device (data->usbmisc_data->dev); }static void ci_hdrc_imx_shutdown (struct platform_device *pdev)
Greg Kroah-Hartman
maintainerPATCH 95/204 misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rengarajan S <[email protected]>
commit 18eb77c75ed01439f96ae5c0f33461eb5134b907 upstream.
Resolve kernel panic while accessing IRQ handler associated with the generated IRQ. This is done by acquiring the spinlock and storing the current interrupt state before handling the interrupt request using generic_handle_irq.
A previous fix patch was submitted where 'generic_handle_irq' was replaced with 'handle_nested_irq'. However, this change also causes the kernel panic where after determining which GPIO triggered the interrupt and attempting to call handle_nested_irq with the mapped IRQ number, leads to a failure in locating the registered handler.
--- drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c +5 -1
@@ -37,6 +37,7 @@struct pci1xxxx_gpio {struct auxiliary_device *aux_dev;void __iomem *reg_base; +raw_spinlock_t wa_lock;struct gpio_chip gpio;spinlock_t lock;int irq_base;
@@ -254,6 +255,7 @@ static irqreturn_t pci1xxxx_gpio_irq_hanstruct pci1xxxx_gpio *priv = dev_id;struct gpio_chip *gc = &priv->gpio;unsigned long int_status =0 ; +unsigned long wa_flags;unsigned long flags;u8 pincount;int bit;
@@ -277,7 +279,9 @@ static irqreturn_t pci1xxxx_gpio_irq_hanwritel (BIT (bit), priv->reg_base +INTR_STATUS_OFFSET (gpiobank));spin_unlock_irqrestore (&priv->lock, flags); irq =irq_find_mapping (gc->irq.domain, (bit + (gpiobank *32 ))); -handle_nested_irq (irq); +raw_spin_lock_irqsave (&priv->wa_lock, wa_flags); +generic_handle_irq (irq); +raw_spin_unlock_irqrestore (&priv->wa_lock, wa_flags); } }spin_lock_irqsave (&priv->lock, flags);
Greg Kroah-Hartman
maintainerPATCH 128/204 bpf: Reject attaching fexit/fmod_ret to __noreturn functions
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yafang Shao <[email protected]>
[ Upstream commit cfe816d469dce9c0864062cf65dd7b3c42adc6f8 ]
If we attach fexit/fmod_ret to __noreturn functions, it will cause an issue that the bpf trampoline image will be left over even if the bpf link has been destroyed. Take attaching do_exit() with fexit for example. The fexit works as follows,
bpf_trampoline
+ __bpf_tramp_enter
+ percpu_ref_get(&tr->pcref);
+ call do_exit()
+ __bpf_tramp_exit
+ percpu_ref_put(&tr->pcref);
Since do_exit() never returns, the refcnt of the trampoline image is never decremented, preventing it from being freed. That can be verified with as follows,
$ bpftool link show <<<< nothing output $ grep "bpf_trampoline_[0-9]" /proc/kallsyms ffffffffc04cb000 t bpf_trampoline_6442526459 [bpf] <<<< leftover
In this patch, all functions annotated with __noreturn are rejected, except for the following cases:
- Functions that result in a system reboot, such as panic, machine_real_restart and rust_begin_unwind
- Functions that are never executed by tasks, such as rest_init and cpu_startup_entry
- Functions implemented in assembly, such as rewind_stack_and_make_dead and xen_cpu_bringup_again, lack an associated BTF ID.
With this change, attaching fexit probes to functions like do_exit() will be rejected.
$ ./fexit libbpf: prog 'fexit': BPF program load failed: -EINVAL libbpf: prog 'fexit': -- BEGIN PROG LOAD LOG -- Attaching fexit/fmod_ret to __noreturn functions is rejected.
--- kernel/bpf/verifier.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
kernel/bpf/verifier.c +32 -0
@@ -20106,6 +20106,33 @@ BTF_ID(func, __rcu_read_unlock)#endif BTF_SET_END(btf_id_deny) +/* fexit and fmod_ret can't be used to attach to __noreturn functions. + * Currently, we must manually list all __noreturn functions here. Once a more + * robust solution is implemented, this workaround can be removed. + */ +BTF_SET_START(noreturn_deny) +#ifdef CONFIG_IA32_EMULATION +BTF_ID(func, __ia32_sys_exit) +BTF_ID(func, __ia32_sys_exit_group) +#endif +#ifdef CONFIG_KUNIT +BTF_ID(func, __kunit_abort) +BTF_ID(func, kunit_try_catch_throw) +#endif +#ifdef CONFIG_MODULES +BTF_ID(func, __module_put_and_kthread_exit) +#endif +#ifdef CONFIG_X86_64 +BTF_ID(func, __x64_sys_exit) +BTF_ID(func, __x64_sys_exit_group) +#endif +BTF_ID(func, do_exit) +BTF_ID(func, do_group_exit) +BTF_ID(func, kthread_complete_and_exit) +BTF_ID(func, kthread_exit) +BTF_ID(func, make_task_dead) +BTF_SET_END(noreturn_deny) + static bool can_be_sleepable(struct bpf_prog *prog) { if (prog->type == BPF_PROG_TYPE_TRACING) {
@@ -20194,6 +20221,11 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) }else if (prog->type ==BPF_PROG_TYPE_TRACING &&btf_id_set_contains (&btf_id_deny, btf_id)) {return -EINVAL ; + }else if ((prog->expected_attach_type ==BPF_TRACE_FEXIT || + prog->expected_attach_type ==BPF_MODIFY_RETURN ) && +btf_id_set_contains (&noreturn_deny, btf_id)) { +verbose (env,"Attaching fexit/fmod_ret to __noreturn functions is rejected.\n" ); +return -EINVAL ; } key =bpf_trampoline_compute_key (tgt_prog, prog->aux->attach_btf, btf_id);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 137/204 usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
[ Upstream commit 28a76fcc4c85dd39633fb96edb643c91820133e3 ]
Nothing prevents a broken HC from claiming that an endpoint is Running and repeatedly rejecting Stop Endpoint with Context State Error.
Avoid infinite retries and give back cancelled TDs.
No such cases known so far, but HCs have bugs.
--- drivers/usb/host/xhci-ring.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-ring.c +7 -4
@@ -1214,16 +1214,19 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id,* Stopped state, but it will soon change to Running. * * Assume this bug on unexpected Stop Endpoint failures. -* Keep retrying until the EP starts and stops again, on -* chips where this is known to help. Wait for 100ms. +* Keep retrying until the EP starts and stops again. */ -if (time_is_before_jiffies (ep->stop_time +msecs_to_jiffies (100 ))) -break ; fallthrough;case EP_STATE_RUNNING :/* Race, HW handled stop ep cmd before ep was running */ xhci_dbg (xhci,"Stop ep completion ctx error, ctx_state %d\n" ,GET_EP_CTX_STATE (ep_ctx)); +/* +* Don't retry forever if we guessed wrong or a defective HC never starts +* the EP or says 'Running' but fails the command. We must give back TDs. +*/ +if (time_is_before_jiffies (ep->stop_time +msecs_to_jiffies (100 ))) +break ; command =xhci_alloc_command (xhci, false,GFP_ATOMIC );if (!command) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 138/204 usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 8c75f3e6a433d92084ad4e78b029ae680865420f ]
The variable d->name, returned by devm_kasprintf(), could be NULL. A pointer check is added to prevent potential NULL pointer dereference. This is similar to the fix in commit 3027e7b15b02
("ice: Fix some null pointer dereference issues in ice_ptp.c").
This issue is found by our static analysis tool
--- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/gadget/udc/aspeed-vhub/dev.c +3 -0
@@ -548,6 +548,9 @@ int ast_vhub_init_dev(struct ast_vhub *vhub, unsigned int idx) d->vhub = vhub; d->index = idx; d->name =devm_kasprintf (parent,GFP_KERNEL ,"port%d" , idx+1 ); +if (!d->name) +return -ENOMEM ; + d->regs = vhub->regs +0x100 +0x10 * idx;ast_vhub_init_ep0 (vhub, &d->ep0, d);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 139/204 usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Théo Lebrun <[email protected]>
[ Upstream commit 64eb182d5f7a5ec30227bce4f6922ff663432f44 ]
Compatible "marvell,armada3700-xhci" match data uses the struct xhci_plat_priv::init_quirk() function pointer to add XHCI_RESET_ON_RESUME as quirk on XHCI.
Instead, use the struct xhci_plat_priv::quirks field.
--- drivers/usb/host/xhci-mvebu.c | 10 ---------- drivers/usb/host/xhci-mvebu.h | 6 ------ drivers/usb/host/xhci-plat.c | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-)
drivers/usb/host/xhci-mvebu.c +0 -10
@@ -73,13 +73,3 @@ int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd)return 0 ; } - -int xhci_mvebu_a3700_init_quirk (struct usb_hcd *hcd) -{ -struct xhci_hcd *xhci =hcd_to_xhci (hcd); - -/* Without reset on resume, the HC won't work at all */ - xhci->quirks |=XHCI_RESET_ON_RESUME ; - -return 0 ; -}
drivers/usb/host/xhci-mvebu.h +0 -6
@@ -12,16 +12,10 @@ struct usb_hcd;#if IS_ENABLED (CONFIG_USB_XHCI_MVEBU )int xhci_mvebu_mbus_init_quirk (struct usb_hcd *hcd); -int xhci_mvebu_a3700_init_quirk (struct usb_hcd *hcd);#else static inline int xhci_mvebu_mbus_init_quirk (struct usb_hcd *hcd) {return 0 ; } - -static inline int xhci_mvebu_a3700_init_quirk (struct usb_hcd *hcd) -{ -return 0 ; -}#endif #endif /* __LINUX_XHCI_MVEBU_H */
drivers/usb/host/xhci-plat.c +1 -1
@@ -106,7 +106,7 @@ static const struct xhci_plat_priv xhci_plat_marvell_armada = { };static const struct xhci_plat_priv xhci_plat_marvell_armada3700 = { - .init_quirk = xhci_mvebu_a3700_init_quirk, + .quirks =XHCI_RESET_ON_RESUME , };static const struct xhci_plat_priv xhci_plat_brcm = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 140/204 thunderbolt: Scan retimers after device router has been enumerated
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mika Westerberg <[email protected]>
[ Upstream commit 75749d2c1d8cef439f8b69fa1f4f36d0fc3193e6 ]
Thomas reported connection issues on AMD system with Pluggable UD-4VPD dock. After some experiments it looks like the device has some sort of internal timeout that triggers reconnect. This is completely against the USB4 spec, as there is no requirement for the host to enumerate the device right away or even at all.
In Linux case the delay is caused by scanning of retimers on the link so we can work this around by doing the scanning after the device router has been enumerated.
--- drivers/thunderbolt/tb.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/thunderbolt/tb.c +14 -2
@@ -1370,11 +1370,15 @@ static void tb_scan_port(struct tb_port *port) goto out_rpm_put; } -tb_retimer_scan (port, true); - sw =tb_switch_alloc (port->sw->tb, &port->sw->dev,tb_downstream_route (port));if (IS_ERR (sw)) { +/* +* Make the downstream retimers available even if there +* is no router connected. +*/ +tb_retimer_scan (port, true); +/* * If there is an error accessing the connected switch * it may be connected to another domain. Also we allow
@@ -1424,6 +1428,14 @@ static void tb_scan_port(struct tb_port *port) upstream_port =tb_upstream_port (sw);tb_configure_link (port, upstream_port, sw); +/* +* Scan for downstream retimers. We only scan them after the +* router has been enumerated to avoid issues with certain +* Pluggable devices that expect the host to enumerate them +* within certain timeout. +*/ +tb_retimer_scan (port, true); +/* * CL0s and CL1 are enabled and supported together. * Silently ignore CLx enabling in case CLx is not supported.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 141/204 objtool: Silence more KCOV warnings
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 6b023c7842048c4bbeede802f3cf36b96c7a8b25 ]
In the past there were issues with KCOV triggering unreachable instruction warnings, which is why unreachable warnings are now disabled with CONFIG_KCOV.
Now some new KCOV warnings are showing up with GCC 14:
vmlinux.o: warning: objtool: cpuset_write_resmask() falls through to next function cpuset_update_active_cpus.cold() drivers/usb/core/driver.o: error: objtool: usb_deregister() falls through to next function usb_match_device() sound/soc/codecs/snd-soc-wcd934x.o: warning: objtool: .text.wcd934x_slim_irq_handler: unexpected end of section
All are caused by GCC KCOV not finishing an optimization, leaving behind a never-taken conditional branch to a basic block which falls through to the next function (or end of section).
At a high level this is similar to the unreachable warnings mentioned above, in that KCOV isn't fully removing dead code. Treat it the same way by adding these to the list of warnings to ignore with CONFIG_KCOV.
--- tools/objtool/check.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/objtool/check.c +6 -0
@@ -3569,6 +3569,9 @@ static int validate_branch(struct objtool_file *file, struct symbol *func, !strncmp(func->name, "__pfx_", 6))return 0 ; +if (file->ignore_unreachables) +return 0 ; +WARN ("%s() falls through to next function %s()" , func->name,insn_func (insn)->name);return 1 ;
@@ -3788,6 +3791,9 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,if (!next_insn) {if (state.cfi.cfa.base ==CFI_UNDEFINED )return 0 ; +if (file->ignore_unreachables) +return 0 ; +WARN ("%s: unexpected end of section" , sec->name);return 1 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 142/204 objtool, panic: Disable SMAP in __stack_chk_fail()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 72c774aa9d1e16bfd247096935e7dae194d84929 ]
__stack_chk_fail() can be called from uaccess-enabled code. Make sure uaccess gets disabled before calling panic().
Fixes the following warning:
kernel/trace/trace_branch.o: error: objtool: ftrace_likely_update+0x1ea: call to __stack_chk_fail() with UACCESS enabled
--- kernel/panic.c | 6 ++++++ tools/objtool/check.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-)
kernel/panic.c +6 -0
@@ -763,9 +763,15 @@ device_initcall(register_warn_debugfs);*/ __visible noinstr void __stack_chk_fail(void) { +unsigned long flags; +instrumentation_begin (); + flags =user_access_save (); +panic ("stack-protector: Kernel stack is corrupted in: %pB" ,__builtin_return_address (0 )); + +user_access_restore (flags);instrumentation_end (); }EXPORT_SYMBOL (__stack_chk_fail);
tools/objtool/check.c +4 -1
@@ -1225,12 +1225,15 @@ static const char *uaccess_safe_builtin[] = {"__ubsan_handle_load_invalid_value" ,/* STACKLEAK */ "stackleak_track_stack" , +/* TRACE_BRANCH_PROFILING */ +"ftrace_likely_update" , +/* STACKPROTECTOR */ +"__stack_chk_fail" ,/* misc */ "csum_partial_copy_generic" ,"copy_mc_fragile" ,"copy_mc_fragile_handle_tail" ,"copy_mc_enhanced_fast_string" , -"ftrace_likely_update" ,/* CONFIG_TRACE_BRANCH_PROFILING */ "rep_stos_alternative" ,"rep_movs_alternative" , "__copy_user_nocache",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 143/204 objtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 060aed9c0093b341480770457093449771cf1496 ]
If 'port_id' is negative, the shift counts in wcd934x_slim_irq_handler() also become negative, resulting in undefined behavior due to shift out of bounds.
If I'm reading the code correctly, that appears to be not possible, but with KCOV enabled, Clang's range analysis isn't always able to determine that and generates undefined behavior.
As a result the code generation isn't optimal, and undefined behavior should be avoided regardless. Improve code generation and remove the undefined behavior by converting the signed variables to unsigned.
Fixes the following warning with UBSAN:
sound/soc/codecs/snd-soc-wcd934x.o: warning: objtool: .text.wcd934x_slim_irq_handler: unexpected end of section
--- sound/soc/codecs/wcd934x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wcd934x.c +1 -1
@@ -2281,7 +2281,7 @@ static irqreturn_t wcd934x_slim_irq_handler(int irq, void *data) {struct wcd934x_codec *wcd = data;unsigned long status =0 ; -int i, j, port_id; +unsigned int i, j, port_id;unsigned int val, int_val =0 ;irqreturn_t ret =IRQ_NONE ;bool tx;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 144/204 objtool, regulator: rk808: Remove potential undefined behavior in rk806_set_mode_dcdc()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 29c578c848402a34e8c8e115bf66cb6008b77062 ]
If 'ctr_bit' is negative, the shift counts become negative, causing a shift of bounds and undefined behavior.
Presumably that's not possible in normal operation, but the code generation isn't optimal. And undefined behavior should be avoided regardless.
Improve code generation and remove the undefined behavior by converting the signed variables to unsigned.
Fixes the following warning with an UBSAN kernel:
vmlinux.o: warning: objtool: rk806_set_mode_dcdc() falls through to next function rk806_get_mode_dcdc() vmlinux.o: warning: objtool: .text.rk806_set_mode_dcdc: unexpected end of section
--- drivers/regulator/rk808-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/rk808-regulator.c +2 -2
@@ -267,8 +267,8 @@ static const unsigned int rk817_buck1_4_ramp_table[] = {static int rk806_set_mode_dcdc (struct regulator_dev *rdev,unsigned int mode) { -int rid =rdev_get_id (rdev); -int ctr_bit, reg; +unsigned int rid =rdev_get_id (rdev); +unsigned int ctr_bit, reg; reg =RK806_POWER_FPWM_EN0 + rid /8 ; ctr_bit = rid %8 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 145/204 objtool, lkdtm: Obfuscate the do_nothing() pointer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 05026ea01e95ffdeb0e5ac8fb7fb1b551e3a8726 ]
If execute_location()'s memcpy of do_nothing() gets inlined and unrolled by the compiler, it copies one word at a time:
mov 0x0(%rip),%rax R_X86_64_PC32 .text+0x1374
mov %rax,0x38(%rbx)
mov 0x0(%rip),%rax R_X86_64_PC32 .text+0x136c
mov %rax,0x30(%rbx)
...Those .text references point to the middle of the function, causing objtool to complain about their lack of ENDBR.
Prevent that by resolving the function pointer at runtime rather than build time. This fixes the following warning:
drivers/misc/lkdtm/lkdtm.o: warning: objtool: execute_location+0x23: relocation to !ENDBR: .text+0x1378
--- drivers/misc/lkdtm/perms.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/misc/lkdtm/perms.c +11 -3
@@ -28,6 +28,13 @@ static const unsigned long rodata = 0xAA55AA55;/* This is marked __ro_after_init, so it should ultimately be .rodata. */ static unsigned long ro_after_init__ro_after_init =0x55AA5500 ; +/* +* This is a pointer to do_nothing() which is initialized at runtime rather +* than build time to avoid objtool IBT validation warnings caused by an +* inlined unrolled memcpy() in execute_location(). +*/ +static void __ro_after_init *do_nothing_ptr; +/* * This just returns to the caller. It is designed to be copied into * non-executable memory regions.
@@ -65,13 +72,12 @@ static noinline __nocfi void execute_location(void *dst, bool write) {void (*func)(void );func_desc_t fdesc; -void *do_nothing_text =dereference_function_descriptor (do_nothing); -pr_info ("attempting ok execution at %px\n" , do_nothing_text); +pr_info ("attempting ok execution at %px\n" , do_nothing_ptr);do_nothing ();if (write ==CODE_WRITE ) { -memcpy (dst, do_nothing_text,EXEC_SIZE ); +memcpy (dst, do_nothing_ptr,EXEC_SIZE );flush_icache_range ((unsigned long )dst, (unsigned long )dst +EXEC_SIZE ); }
@@ -267,6 +273,8 @@ static void lkdtm_ACCESS_NULL(void)void __init lkdtm_perms_init (void ) { + do_nothing_ptr =dereference_function_descriptor (do_nothing); +/* Make sure we can write to __ro_after_init values during __init */ ro_after_init |=0xAA ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 146/204 qibfs: fix _another_ leak
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit bdb43af4fdb39f844ede401bdb1258f67a580a27 ]
failure to allocate inode => leaked dentry...
this one had been there since the initial merge; to be fair, if we are that far OOM, the odds of failing at that particular allocation are low...
--- drivers/infiniband/hw/qib/qib_fs.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/qib/qib_fs.c +1 -0
@@ -55,6 +55,7 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode =new_inode (dir->i_sb);if (!inode) { +dput (dentry); error = -EPERM ; goto bail; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 129/204 mailbox: pcc: Fix the possible race in updation of chan_in_use flag
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huisong Li <[email protected]>
[ Upstream commit 9779d45c749340ab461d595c1a4a664cb28f3007 ]
The function mbox_chan_received_data() calls the Rx callback of the mailbox client driver. The callback might set chan_in_use flag from pcc_send_data(). This flag's status determines whether the PCC channel is in use.
However, there is a potential race condition where chan_in_use is updated incorrectly due to concurrency between the interrupt handler (pcc_mbox_irq()) and the command sender(pcc_send_data()).
The 'chan_in_use' flag of a channel is set to true after sending a command. And the flag of the new command may be cleared erroneous by the interrupt handler afer mbox_chan_received_data() returns,
As a result, the interrupt being level triggered can't be cleared in pcc_mbox_irq() and it will be disabled after the number of handled times exceeds the specified value. The error log is as follows:
| kunpeng_hccs HISI04B2:00: PCC command executed timeout! | kunpeng_hccs HISI04B2:00: get port link status info failed, ret = -110 | irq 13: nobody cared (try booting with the "irqpoll" option) | Call trace: | dump_backtrace+0x0/0x210 | show_stack+0x1c/0x2c | dump_stack+0xec/0x130 | __report_bad_irq+0x50/0x190 | note_interrupt+0x1e4/0x260 | handle_irq_event+0x144/0x17c | handle_fasteoi_irq+0xd0/0x240 | __handle_domain_irq+0x80/0xf0 | gic_handle_irq+0x74/0x2d0 | el1_irq+0xbc/0x140 | mnt_clone_write+0x0/0x70 | file_update_time+0xcc/0x160 | fault_dirty_shared_page+0xe8/0x150 | do_shared_fault+0x80/0x1d0 | do_fault+0x118/0x1a4 | handle_pte_fault+0x154/0x230 | __handle_mm_fault+0x1ac/0x390 | handle_mm_fault+0xf0/0x250 | do_page_fault+0x184/0x454 | do_translation_fault+0xac/0xd4 | do_mem_abort+0x44/0xb4 | el0_da+0x40/0x74 | el0_sync_handler+0x60/0xb4 | el0_sync+0x168/0x180 | handlers: | pcc_mbox_irq | Disabling IRQ #13
To solve this issue, pcc_mbox_irq() must clear 'chan_in_use' flag before the call to mbox_chan_received_data().
(sudeep.holla: Minor updates to the subject, commit message and comment)
--- drivers/mailbox/pcc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/mailbox/pcc.c +7 -1
@@ -333,10 +333,16 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p)if (pcc_chan_reg_read_modify_write (&pchan->plat_irq_ack))return IRQ_NONE ; +/* +* Clear this flag after updating interrupt ack register and just +* before mbox_chan_received_data() which might call pcc_send_data() +* where the flag is set again to start new transfer. This is +* required to avoid any possible race in updatation of this flag. +*/ + pchan->chan_in_use = false;mbox_chan_received_data (chan,NULL );check_and_ack (pchan, chan); - pchan->chan_in_use = false;return IRQ_HANDLED ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 147/204 ntb: reduce stack usage in idt_scan_mws
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit aff12700b8dd7422bfe2277696e192af4df9de8f ]
idt_scan_mws() puts a large fixed-size array on the stack and copies it into a smaller dynamically allocated array at the end. On 32-bit targets, the fixed size can easily exceed the warning limit for possible stack overflow:
drivers/ntb/hw/idt/ntb_hw_idt.c:1041:27: error: stack frame size (1032) exceeds limit (1024) in 'idt_scan_mws' [-Werror,-Wframe-larger-than]
Change it to instead just always use dynamic allocation for the array from the start. It's too big for the stack, but not actually all that much for a permanent allocation.
--- drivers/ntb/hw/idt/ntb_hw_idt.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/ntb/hw/idt/ntb_hw_idt.c +7 -11
@@ -1041,7 +1041,7 @@ static inline char *idt_get_mw_name(enum idt_mw_type mw_type)static struct idt_mw_cfg *idt_scan_mws (struct idt_ntb_dev *ndev,int port,unsigned char *mw_cnt) { -struct idt_mw_cfg mws[IDT_MAX_NR_MWS ], *ret_mws; +struct idt_mw_cfg *mws;const struct idt_ntb_bar *bars;enum idt_mw_type mw_type;unsigned char widx, bidx, en_cnt;
@@ -1049,6 +1049,11 @@ static struct idt_mw_cfg *idt_scan_mws(struct idt_ntb_dev *ndev, int port,int aprt_size;u32 data; + mws =devm_kcalloc (&ndev->ntb.pdev->dev,IDT_MAX_NR_MWS , +sizeof (*mws),GFP_KERNEL ); +if (!mws) +return ERR_PTR (-ENOMEM ); +/* Retrieve the array of the BARs registers */ bars = portdata_tbl[port].bars;
@@ -1103,16 +1108,7 @@ static struct idt_mw_cfg *idt_scan_mws(struct idt_ntb_dev *ndev, int port, } } -/* Allocate memory for memory window descriptors */ - ret_mws =devm_kcalloc (&ndev->ntb.pdev->dev, *mw_cnt,sizeof (*ret_mws), -GFP_KERNEL ); -if (!ret_mws) -return ERR_PTR (-ENOMEM ); - -/* Copy the info of detected memory windows */ -memcpy (ret_mws, mws, (*mw_cnt)*sizeof (*ret_mws)); - -return ret_mws; +return mws; }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 148/204 ntb_hw_amd: Add NTB PCI ID for new gen CPU
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Basavaraj Natikar <[email protected]>
[ Upstream commit bf8a7ce7e4c7267a6f5f2b2023cfc459b330b25e ]
Add NTB support for new generation of processor.
--- drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + 1 file changed, 1 insertion(+)
drivers/ntb/hw/amd/ntb_hw_amd.c +1 -0
@@ -1318,6 +1318,7 @@ static const struct pci_device_id amd_ntb_pci_tbl[] = { { PCI_VDEVICE(AMD, 0x148b), (kernel_ulong_t)&dev_data[1] }, { PCI_VDEVICE(AMD, 0x14c0), (kernel_ulong_t)&dev_data[1] }, { PCI_VDEVICE(AMD, 0x14c3), (kernel_ulong_t)&dev_data[1] }, + { PCI_VDEVICE(AMD, 0x155a), (kernel_ulong_t)&dev_data[1] }, { PCI_VDEVICE(HYGON, 0x145b), (kernel_ulong_t)&dev_data[0] }, { 0, } };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 149/204 9p/net: fix improper handling of bogus negative read/write replies
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Martinet <[email protected]>
[ Upstream commit d0259a856afca31d699b706ed5e2adf11086c73b ]
In p9_client_write() and p9_client_read_once(), if the server incorrectly replies with success but a negative write/read count then we would consider written (negative) <= rsize (positive) because both variables were signed.
Make variables unsigned to avoid this problem.
The reproducer linked below now fails with the following error instead of a null pointer deref:
9pnet: bogus RWRITE count (4294967295 > 3)
Message-ID: <[email protected]>
--- net/9p/client.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
net/9p/client.c +16 -14
@@ -1547,7 +1547,8 @@ p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to,struct p9_client *clnt = fid->clnt;struct p9_req_t *req;int count =iov_iter_count (to); -int rsize, received, non_zc =0 ; +u32 rsize, received; +bool non_zc = false;char *dataptr; *err =0 ;
@@ -1570,7 +1571,7 @@ p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to,0 ,11 ,"dqd" , fid->fid, offset, rsize); }else { - non_zc =1 ; + non_zc = true; req =p9_client_rpc (clnt,P9_TREAD ,"dqd" , fid->fid, offset, rsize); }
@@ -1591,11 +1592,11 @@ p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to,return 0 ; }if (rsize < received) { -pr_err ("bogus RREAD count (%d > %d)\n" , received, rsize); +pr_err ("bogus RREAD count (%u > %u)\n" , received, rsize); received = rsize; } -p9_debug (P9_DEBUG_9P ,"<<< RREAD count %d\n" , received); +p9_debug (P9_DEBUG_9P ,"<<< RREAD count %u\n" , received);if (non_zc) {int n =copy_to_iter (dataptr, received, to);
@@ -1622,9 +1623,9 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err) *err =0 ;while (iov_iter_count (from)) { -int count =iov_iter_count (from); -int rsize = fid->iounit; -int written; +size_t count =iov_iter_count (from); +u32 rsize = fid->iounit; +u32 written;if (!rsize || rsize > clnt->msize -P9_IOHDRSZ ) rsize = clnt->msize -P9_IOHDRSZ ;
@@ -1632,7 +1633,7 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err)if (count < rsize) rsize = count; -p9_debug (P9_DEBUG_9P ,">>> TWRITE fid %d offset %llu count %d (/%d)\n" , +p9_debug (P9_DEBUG_9P ,">>> TWRITE fid %d offset %llu count %u (/%zu)\n" , fid->fid, offset, rsize, count);/* Don't bother zerocopy for small IO (< 1024) */
@@ -1658,11 +1659,11 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err)break ; }if (rsize < written) { -pr_err ("bogus RWRITE count (%d > %d)\n" , written, rsize); +pr_err ("bogus RWRITE count (%u > %u)\n" , written, rsize); written = rsize; } -p9_debug (P9_DEBUG_9P ,"<<< RWRITE count %d\n" , written); +p9_debug (P9_DEBUG_9P ,"<<< RWRITE count %u\n" , written);p9_req_put (clnt, req);iov_iter_revert (from, count - written -iov_iter_count (from));
@@ -2049,7 +2050,8 @@ EXPORT_SYMBOL_GPL(p9_client_xattrcreate);int p9_client_readdir (struct p9_fid *fid,char *data,u32 count,u64 offset) { -int err, rsize, non_zc =0 ; +int err, non_zc =0 ; +u32 rsize;struct p9_client *clnt;struct p9_req_t *req;char *dataptr;
@@ -2058,7 +2060,7 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset)iov_iter_kvec (&to,ITER_DEST , &kv,1 , count); -p9_debug (P9_DEBUG_9P ,">>> TREADDIR fid %d offset %llu count %d\n" , +p9_debug (P9_DEBUG_9P ,">>> TREADDIR fid %d offset %llu count %u\n" , fid->fid, offset, count); clnt = fid->clnt;
@@ -2093,11 +2095,11 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset) goto free_and_error; }if (rsize < count) { -pr_err ("bogus RREADDIR count (%d > %d)\n" , count, rsize); +pr_err ("bogus RREADDIR count (%u > %u)\n" , count, rsize); count = rsize; } -p9_debug (P9_DEBUG_9P ,"<<< RREADDIR count %d\n" , count); +p9_debug (P9_DEBUG_9P ,"<<< RREADDIR count %u\n" , count);if (non_zc)memmove (data, dataptr, count);
Signature · 1 line
2.39.5