5.10.51-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 168/215 mmc: core: clear flags before allowing to retune
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
commit 77347eda64ed5c9383961d1de9165f9d0b7d8df6 upstream.
It might be that something goes wrong during tuning so the MMC core will immediately trigger a retune. In our case it was:
- we sent a tuning block
- there was an error so we need to send an abort cmd to the eMMC
- the abort cmd had a CRC error
- retune was set by the MMC core
This lead to a vicious circle causing a performance regression of 75%. So, clear retuning flags before we enable retuning to start with a known cleared state.
Reported-by Yoshihiro Shimoda <[email protected]>
--- drivers/mmc/core/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/core/core.c +5 -2
@@ -936,11 +936,14 @@ int mmc_execute_tuning(struct mmc_card * err = host->ops->execute_tuning (host, opcode); -if (err) +if (err) {pr_err ("%s: tuning execution failed: %d\n" ,mmc_hostname (host), err); -else + }else { + host->retune_now =0 ; + host->need_retune =0 ;mmc_retune_enable (host); + }return err; }
Greg Kroah-Hartman
maintainerPATCH 169/215 mmc: core: Allow UHS-I voltage switch for SDSC cards if supported
In reply to Greg Kroah-HartmanFrom: Christian Löhle <[email protected]>
commit 09247e110b2efce3a104e57e887c373e0a57a412 upstream.
While initializing an UHS-I SD card, the mmc core first tries to switch to 1.8V I/O voltage, before it continues to change the settings for the bus speed mode.
However, the current behaviour in the mmc core is inconsistent and doesn't conform to the SD spec. More precisely, an SD card that supports UHS-I must set both the SD_OCR_CCS bit and the SD_OCR_S18R bit in the OCR register response. When switching to 1.8V I/O the mmc core correctly checks both of the bits, but only the SD_OCR_S18R bit when changing the settings for bus speed mode.
Rather than actually fixing the code to confirm to the SD spec, let's deliberately deviate from it by requiring only the SD_OCR_S18R bit for both parts. This enables us to support UHS-I for SDSC cards (outside spec), which is actually being supported by some existing SDSC cards. Moreover, this fixes the inconsistent behaviour.
--- drivers/mmc/core/sd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/mmc/core/sd.c +6 -4
@@ -847,11 +847,13 @@ try_again:return err;/* -* In case CCS and S18A in the response is set, start Signal Voltage -* Switch procedure. SPI mode doesn't support CMD11. +* In case the S18A bit is set in the response, let's start the signal +* voltage switch procedure. SPI mode doesn't support CMD11. +* Note that, according to the spec, the S18A bit is not valid unless +* the CCS bit is set as well. We deliberately deviate from the spec in +* regards to this, which allows UHS-I to be supported for SDSC cards. */ -if (!mmc_host_is_spi (host) && rocr && - ((*rocr &0x41000000 ) ==0x41000000 )) { +if (!mmc_host_is_spi (host) && rocr && (*rocr &0x01000000 )) { err =mmc_set_uhs_voltage (host, pocr);if (err == -EAGAIN ) { retries--;
Greg Kroah-Hartman
maintainerPATCH 170/215 ata: ahci_sunxi: Disable DIPM
In reply to Greg Kroah-HartmanFrom: Timo Sigurdsson <[email protected]>
commit f6bca4d91b2ea052e917cca3f9d866b5cc1d500a upstream.
DIPM is unsupported or broken on sunxi. Trying to enable the power management policy med_power_with_dipm on an Allwinner A20 SoC based board leads to immediate I/O errors and the attached SATA disk disappears from the /dev filesystem. A reset (power cycle) is required to make the SATA controller or disk work again. The A10 and A20 SoC data sheets and manuals don't mention DIPM at all [1], so it's fair to assume that it's simply not supported. But even if it was, it should be considered broken and best be disabled in the ahci_sunxi driver.
[1] https://github.com/allwinner-zh/documents/tree/master/
--- drivers/ata/ahci_sunxi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/ahci_sunxi.c +1 -1
@@ -200,7 +200,7 @@ static void ahci_sunxi_start_engine(stru }static const struct ata_port_info ahci_sunxi_port_info = { - .flags =AHCI_FLAG_COMMON |ATA_FLAG_NCQ , + .flags =AHCI_FLAG_COMMON |ATA_FLAG_NCQ |ATA_FLAG_NO_DIPM , .pio_mask =ATA_PIO4 , .udma_mask =ATA_UDMA6 , .port_ops = &ahci_platform_ops,
Greg Kroah-Hartman
maintainerPATCH 171/215 arm64: tlb: fix the TTL value of tlb_get_level
In reply to Greg Kroah-HartmanFrom: Zhenyu Ye <[email protected]>
commit 52218fcd61cb42bde0d301db4acb3ffdf3463cc7 upstream.
The TTL field indicates the level of page table walk holding the *leaf* entry for the address being invalidated. But currently, the TTL field may be set to an incorrent value in the following stack:
pte_free_tlb
__pte_free_tlb
tlb_remove_table
tlb_table_invalidate
tlb_flush_mmu_tlbonly
tlb_flushIn this case, we just want to flush a PTE page, but the tlb->cleared_pmds is set and we get tlb_level = 2 in the tlb_get_level() function. This may cause some unexpected problems.
This patch set the TTL field to 0 if tlb->freed_tables is set. The tlb->freed_tables indicates page table pages are freed, not the leaf entry.
--- arch/arm64/include/asm/tlb.h | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/include/asm/tlb.h +4 -0
@@ -28,6 +28,10 @@ static void tlb_flush(struct mmu_gather*/ static inline int tlb_get_level (struct mmu_gather *tlb) { +/* The TTL field is only valid for the leaf entry. */ +if (tlb->freed_tables) +return 0 ; +if (tlb->cleared_ptes && !(tlb->cleared_pmds || tlb->cleared_puds || tlb->cleared_p4ds))
Greg Kroah-Hartman
maintainerPATCH 172/215 cpu/hotplug: Cure the cpusets trainwreck
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit b22afcdf04c96ca58327784e280e10288cfd3303 upstream.
Alexey and Joshua tried to solve a cpusets related hotplug problem which is user space visible and results in unexpected behaviour for some time after a CPU has been plugged in and the corresponding uevent was delivered.
cpusets delegate the hotplug work (rebuilding cpumasks etc.) to a workqueue. This is done because the cpusets code has already a lock nesting of cgroups_mutex -> cpu_hotplug_lock. A synchronous callback or waiting for the work to finish with cpu_hotplug_lock held can and will deadlock because that results in the reverse lock order.
As a consequence the uevent can be delivered before cpusets have consistent state which means that a user space invocation of sched_setaffinity() to move a task to the plugged CPU fails up to the point where the scheduled work has been processed.
The same is true for CPU unplug, but that does not create user observable failure (yet).
It's still inconsistent to claim that an operation is finished before it actually is and that's the real issue at hand. uevents just make it reliably observable.
Obviously the problem should be fixed in cpusets/cgroups, but untangling that is pretty much impossible because according to the changelog of the commit which introduced this 8 years ago:
3a5a6d0c2b03("cpuset: don't nest cgroup_mutex inside get_online_cpus()")
the lock order cgroups_mutex -> cpu_hotplug_lock is a design decision and the whole code is built around that.
So bite the bullet and invoke the relevant cpuset function, which waits for the work to finish, in _cpu_up/down() after dropping cpu_hotplug_lock and only when tasks are not frozen by suspend/hibernate because that would obviously wait forever.
Waiting there with cpu_add_remove_lock, which is protecting the present and possible CPU maps, held is not a problem at all because neither work queues nor cpusets/cgroups have any lockchains related to that lock.
Waiting in the hotplug machinery is not problematic either because there are already state callbacks which wait for hardware queues to drain. It makes the operations slightly slower, but hotplug is slow anyway.
This ensures that state is consistent before returning from a hotplug up/down operation. It's still inconsistent during the operation, but that's a different story.
Add a large comment which explains why this is done and why this is not a dump ground for the hack of the day to work around half thought out locking schemes. Document also the implications vs. hotplug operations and serialization or the lack of it.
Thanks to Alexy and Joshua for analyzing why this temporary sched_setaffinity() failure happened.
--- kernel/cpu.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
kernel/cpu.c +49 -0
@@ -32,6 +32,7 @@#include <linux/relay.h> #include <linux/slab.h> #include <linux/percpu-rwsem.h> +#include <linux/cpuset.h> #include <trace/events/power.h> #define CREATE_TRACE_POINTS
@@ -814,6 +815,52 @@ void __init cpuhp_threads_init(void)kthread_unpark (this_cpu_read (cpuhp_state.thread)); } +/* +* +* Serialize hotplug trainwrecks outside of the cpu_hotplug_lock +* protected region. +* +* The operation is still serialized against concurrent CPU hotplug via +* cpu_add_remove_lock, i.e. CPU map protection. But it is _not_ +* serialized against other hotplug related activity like adding or +* removing of state callbacks and state instances, which invoke either the +* startup or the teardown callback of the affected state. +* +* This is required for subsystems which are unfixable vs. CPU hotplug and +* evade lock inversion problems by scheduling work which has to be +* completed _before_ cpu_up()/_cpu_down() returns. +* +* Don't even think about adding anything to this for any new code or even +* drivers. It's only purpose is to keep existing lock order trainwrecks +* working. +* +* For cpu_down() there might be valid reasons to finish cleanups which are +* not required to be done under cpu_hotplug_lock, but that's a different +* story and would be not invoked via this. +*/ +static void cpu_up_down_serialize_trainwrecks (bool tasks_frozen) +{ +/* +* cpusets delegate hotplug operations to a worker to "solve" the +* lock order problems. Wait for the worker, but only if tasks are +* _not_ frozen (suspend, hibernate) as that would wait forever. +* +* The wait is required because otherwise the hotplug operation +* returns with inconsistent state, which could even be observed in +* user space when a new CPU is brought up. The CPU plug uevent +* would be delivered and user space reacting on it would fail to +* move tasks to the newly plugged CPU up to the point where the +* work has finished because up to that point the newly plugged CPU +* is not assignable in cpusets/cgroups. On unplug that's not +* necessarily a visible issue, but it is still inconsistent state, +* which is the real problem which needs to be "fixed". This can't +* prevent the transient state between scheduling the work and +* returning from waiting for it. +*/ +if (!tasks_frozen) +cpuset_wait_for_hotplug (); +} +#ifdef CONFIG_HOTPLUG_CPU #ifndef arch_clear_mm_cpumask_cpu#define arch_clear_mm_cpumask_cpu (cpu, mm) cpumask_clear_cpu(cpu, mm_cpumask(mm))
@@ -1051,6 +1098,7 @@ out:*/ lockup_detector_cleanup ();arch_smt_update (); +cpu_up_down_serialize_trainwrecks (tasks_frozen);return ret; }
@@ -1247,6 +1295,7 @@ static int _cpu_up(unsigned int cpu, int out:cpus_write_unlock ();arch_smt_update (); +cpu_up_down_serialize_trainwrecks (tasks_frozen);return ret; }
Greg Kroah-Hartman
maintainerPATCH 173/215 clocksource/arm_arch_timer: Improve Allwinner A64 timer workaround
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
commit 8b33dfe0ba1c84c1aab2456590b38195837f1e6e upstream.
Bad counter reads are experienced sometimes when bit 10 or greater rolls over. Originally, testing showed that at least 10 lower bits would be set to the same value during these bad reads. However, some users still reported time skips.
Wider testing revealed that on some chips, occasionally only the lowest 9 bits would read as the anomalous value. During these reads (which still happen only when bit 10), bit 9 would read as the correct value.
Reduce the mask by one bit to cover these cases as well.
--- drivers/clocksource/arm_arch_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/arm_arch_timer.c +1 -1
@@ -352,7 +352,7 @@ static u64 notrace arm64_858921_read_cntdo { \ _val =read_sysreg (reg); \ _retries--; \ - }while (((_val +1 ) &GENMASK (9 ,0 )) <=1 && _retries); \ + }while (((_val +1 ) &GENMASK (8 ,0 )) <=1 && _retries); \ \WARN_ON_ONCE (!_retries); \ _val; \
Greg Kroah-Hartman
maintainerPATCH 174/215 fpga: stratix10-soc: Add missing fpga_mgr_free() call
In reply to Greg Kroah-HartmanFrom: Russ Weight <[email protected]>
commit d9ec9daa20eb8de1efe6abae78c9835ec8ed86f9 upstream.
The stratix10-soc driver uses fpga_mgr_create() function and is therefore responsible to call fpga_mgr_free() to release the class driver resources. Add a missing call to fpga_mgr_free in the s10_remove() function.
--- drivers/fpga/stratix10-soc.c | 1 + 1 file changed, 1 insertion(+)
drivers/fpga/stratix10-soc.c +1 -0
@@ -454,6 +454,7 @@ static int s10_remove(struct platform_destruct s10_priv *priv = mgr->priv;fpga_mgr_unregister (mgr); +fpga_mgr_free (mgr);stratix10_svc_free_channel (priv->chan);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 175/215 ASoC: tegra: Set driver_name=tegra for all machine drivers
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit f6eb84fa596abf28959fc7e0b626f925eb1196c7 upstream.
The driver_name="tegra" is now required by the newer ALSA UCMs, otherwise Tegra UCMs don't match by the path/name.
All Tegra machine drivers are specifying the card's name, but it has no effect if model name is specified in the device-tree since it overrides the card's name. We need to set the driver_name to "tegra" in order to get a usable lookup path for the updated ALSA UCMs. The new UCM lookup path has a form of driver_name/card_name.
The old lookup paths that are based on driver module name continue to work as before. Note that UCM matching never worked for Tegra ASoC drivers if they were compiled as built-in, this is fixed by supporting the new naming scheme.
--- sound/soc/tegra/tegra_alc5632.c | 1 + sound/soc/tegra/tegra_max98090.c | 1 + sound/soc/tegra/tegra_rt5640.c | 1 + sound/soc/tegra/tegra_rt5677.c | 1 + sound/soc/tegra/tegra_sgtl5000.c | 1 + sound/soc/tegra/tegra_wm8753.c | 1 + sound/soc/tegra/tegra_wm8903.c | 1 + sound/soc/tegra/tegra_wm9712.c | 1 + sound/soc/tegra/trimslice.c | 1 + 9 files changed, 9 insertions(+)
sound/soc/tegra/tegra_alc5632.c +1 -0
@@ -139,6 +139,7 @@ static struct snd_soc_dai_link tegra_alcstatic struct snd_soc_card snd_soc_tegra_alc5632 = { .name ="tegra-alc5632" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_alc5632_dai, .num_links =1 ,
sound/soc/tegra/tegra_max98090.c +1 -0
@@ -182,6 +182,7 @@ static struct snd_soc_dai_link tegra_maxstatic struct snd_soc_card snd_soc_tegra_max98090 = { .name ="tegra-max98090" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_max98090_dai, .num_links =1 ,
sound/soc/tegra/tegra_rt5640.c +1 -0
@@ -132,6 +132,7 @@ static struct snd_soc_dai_link tegra_rt5static struct snd_soc_card snd_soc_tegra_rt5640 = { .name ="tegra-rt5640" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_rt5640_dai, .num_links =1 ,
sound/soc/tegra/tegra_rt5677.c +1 -0
@@ -175,6 +175,7 @@ static struct snd_soc_dai_link tegra_rt5static struct snd_soc_card snd_soc_tegra_rt5677 = { .name ="tegra-rt5677" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_rt5677_dai, .num_links =1 ,
sound/soc/tegra/tegra_sgtl5000.c +1 -0
@@ -97,6 +97,7 @@ static struct snd_soc_dai_link tegra_sgtstatic struct snd_soc_card snd_soc_tegra_sgtl5000 = { .name ="tegra-sgtl5000" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_sgtl5000_dai, .num_links =1 ,
sound/soc/tegra/tegra_wm8753.c +1 -0
@@ -101,6 +101,7 @@ static struct snd_soc_dai_link tegra_wm8static struct snd_soc_card snd_soc_tegra_wm8753 = { .name ="tegra-wm8753" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_wm8753_dai, .num_links =1 ,
sound/soc/tegra/tegra_wm8903.c +1 -0
@@ -235,6 +235,7 @@ static struct snd_soc_dai_link tegra_wm8static struct snd_soc_card snd_soc_tegra_wm8903 = { .name ="tegra-wm8903" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_wm8903_dai, .num_links =1 ,
sound/soc/tegra/tegra_wm9712.c +1 -0
@@ -54,6 +54,7 @@ static struct snd_soc_dai_link tegra_wm9static struct snd_soc_card snd_soc_tegra_wm9712 = { .name ="tegra-wm9712" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &tegra_wm9712_dai, .num_links =1 ,
sound/soc/tegra/trimslice.c +1 -0
@@ -94,6 +94,7 @@ static struct snd_soc_dai_link trimslicestatic struct snd_soc_card snd_soc_trimslice = { .name ="tegra-trimslice" , + .driver_name ="tegra" , .owner =THIS_MODULE , .dai_link = &trimslice_tlv320aic23_dai, .num_links =1 ,
Greg Kroah-Hartman
maintainerPATCH 176/215 i40e: fix PTP on 5Gb links
In reply to Greg Kroah-HartmanFrom: Jesse Brandeburg <[email protected]>
commit 26b0ce8dd3dd704393dbace4dc416adfeffe531f upstream.
As reported by Alex Sergeev, the i40e driver is incrementing the PTP clock at 40Gb speeds when linked at 5Gb. Fix this bug by making sure that the right multiplier is selected when linked at 5Gb.
--- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_ptp.c +6 -2
@@ -11,13 +11,14 @@* operate with the nanosecond field directly without fear of overflow. * * Much like the 82599, the update period is dependent upon the link speed: -* At 40Gb link or no link, the period is 1.6ns. -* At 10Gb link, the period is multiplied by 2. (3.2ns) +* At 40Gb, 25Gb, or no link, the period is 1.6ns. +* At 10Gb or 5Gb link, the period is multiplied by 2. (3.2ns) * At 1Gb link, the period is multiplied by 20. (32ns) * 1588 functionality is not supported at 100Mbps. */ #define I40E_PTP_40GB_INCVAL 0x0199999999ULL#define I40E_PTP_10GB_INCVAL_MULT 2 +#define I40E_PTP_5GB_INCVAL_MULT 2#define I40E_PTP_1GB_INCVAL_MULT 20#define I40E_PRTTSYN_CTL1_TSYNTYPE_V1 BIT(I40E_PRTTSYN_CTL1_TSYNTYPE_SHIFT)
@@ -465,6 +466,9 @@ void i40e_ptp_set_increment(struct i40e_case I40E_LINK_SPEED_10GB : mult =I40E_PTP_10GB_INCVAL_MULT ;break ; +case I40E_LINK_SPEED_5GB : + mult =I40E_PTP_5GB_INCVAL_MULT ; +break ;case I40E_LINK_SPEED_1GB : mult =I40E_PTP_1GB_INCVAL_MULT ;break ;
Greg Kroah-Hartman
maintainerPATCH 177/215 qemu_fw_cfg: Make fw_cfg_rev_attr a proper kobj_attribute
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit fca41af18e10318e4de090db47d9fa7169e1bf2f upstream.
fw_cfg_showrev() is called by an indirect call in kobj_attr_show(), which violates clang's CFI checking because fw_cfg_showrev()'s second parameter is 'struct attribute', whereas the ->show() member of 'struct kobj_structure' expects the second parameter to be of type 'struct kobj_attribute'.
$ cat /sys/firmware/qemu_fw_cfg/rev 3
$ dmesg | grep "CFI failure" [ 26.016832] CFI failure (target: fw_cfg_showrev+0x0/0x8):
Fix this by converting fw_cfg_rev_attr to 'struct kobj_attribute' where this would have been caught automatically by the incompatible pointer types compiler warning. Update fw_cfg_showrev() accordingly.
--- drivers/firmware/qemu_fw_cfg.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/firmware/qemu_fw_cfg.c +3 -5
@@ -299,15 +299,13 @@ static int fw_cfg_do_platform_probe(strureturn 0 ; } -static ssize_t fw_cfg_showrev (struct kobject *k,struct attribute *a,char *buf) +static ssize_t fw_cfg_showrev (struct kobject *k,struct kobj_attribute *a, +char *buf) {return sprintf (buf,"%u\n" , fw_cfg_rev); } -static const struct { -struct attribute attr; -ssize_t (*show)(struct kobject *k,struct attribute *a,char *buf); -} fw_cfg_rev_attr = { +static const struct kobj_attribute fw_cfg_rev_attr = { .attr = { .name ="rev" , .mode =S_IRUSR }, .show = fw_cfg_showrev, };
Greg Kroah-Hartman
maintainerPATCH 178/215 ipmi/watchdog: Stop watchdog timer when the current action is none
In reply to Greg Kroah-HartmanFrom: Petr Pavlu <[email protected]>
commit 2253042d86f57d90a621ac2513a7a7a13afcf809 upstream.
When an IPMI watchdog timer is being stopped in ipmi_close() or ipmi_ioctl(WDIOS_DISABLECARD), the current watchdog action is updated to WDOG_TIMEOUT_NONE and _ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB) is called to install this action. The latter function ends up invoking __ipmi_set_timeout() which makes the actual 'Set Watchdog Timer' IPMI request.
For IPMI 1.0, this operation results in fully stopping the watchdog timer. For IPMI >= 1.5, function __ipmi_set_timeout() always specifies the "don't stop" flag in the prepared 'Set Watchdog Timer' IPMI request. This causes that the watchdog timer has its action correctly updated to 'none' but the timer continues to run. A problem is that IPMI firmware can then still log an expiration event when the configured timeout is reached, which is unexpected because the watchdog timer was requested to be stopped.
The patch fixes this problem by not setting the "don't stop" flag in __ipmi_set_timeout() when the current action is WDOG_TIMEOUT_NONE which results in stopping the watchdog timer. This makes the behaviour for IPMI >= 1.5 consistent with IPMI 1.0. It also matches the logic in __ipmi_heartbeat() which does not allow to reset the watchdog if the current action is WDOG_TIMEOUT_NONE as that would start the timer.
Message-Id: <[email protected]>
--- drivers/char/ipmi/ipmi_watchdog.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/char/ipmi/ipmi_watchdog.c +12 -10
@@ -371,16 +371,18 @@ static int __ipmi_set_timeout(struct ipm data[0 ] =0 ;WDOG_SET_TIMER_USE (data[0 ],WDOG_TIMER_USE_SMS_OS ); -if ((ipmi_version_major >1 ) - || ((ipmi_version_major ==1 ) && (ipmi_version_minor >=5 ))) { -/* This is an IPMI 1.5-only feature. */ - data[0 ] |=WDOG_DONT_STOP_ON_SET ; - }else if (ipmi_watchdog_state !=WDOG_TIMEOUT_NONE ) { -/* -* In ipmi 1.0, setting the timer stops the watchdog, we -* need to start it back up again. -*/ - hbnow =1 ; +if (ipmi_watchdog_state !=WDOG_TIMEOUT_NONE ) { +if ((ipmi_version_major >1 ) || + ((ipmi_version_major ==1 ) && (ipmi_version_minor >=5 ))) { +/* This is an IPMI 1.5-only feature. */ + data[0 ] |=WDOG_DONT_STOP_ON_SET ; + }else { +/* +* In ipmi 1.0, setting the timer stops the watchdog, we +* need to start it back up again. +*/ + hbnow =1 ; + } } data[1 ] =0 ;
Greg Kroah-Hartman
maintainerPATCH 179/215 xfrm: policy: Read seqcount outside of rcu-read side in xfrm_policy_lookup_bytype
In reply to Greg Kroah-HartmanFrom: Varad Gautam <[email protected]>
commit d7b0408934c749f546b01f2b33d07421a49b6f3e upstream.
xfrm_policy_lookup_bytype loops on seqcount mutex xfrm_policy_hash_generation within an RCU read side critical section. Although ill advised, this is fine if the loop is bounded.
xfrm_policy_hash_generation wraps mutex hash_resize_mutex, which is used to serialize writers (xfrm_hash_resize, xfrm_hash_rebuild). This is fine too.
On PREEMPT_RT=y, the read_seqcount_begin call within xfrm_policy_lookup_bytype emits a mutex lock/unlock for hash_resize_mutex. Mutex locking is fine, since RCU read side critical sections are allowed to sleep with PREEMPT_RT.
xfrm_hash_resize can, however, block on synchronize_rcu while holding hash_resize_mutex.
This leads to the following situation on PREEMPT_RT, where the writer is blocked on RCU grace period expiry, while the reader is blocked on a lock held by the writer:
Thead 1 (xfrm_hash_resize) Thread 2 (xfrm_policy_lookup_bytype)
rcu_read_lock(); mutex_lock(&hash_resize_mutex); read_seqcount_begin(&xfrm_policy_hash_generation); mutex_lock(&hash_resize_mutex); // block
xfrm_bydst_resize();synchronize_rcu(); // block
<RCU stalls in xfrm_policy_lookup_bytype>
Move the read_seqcount_begin call outside of the RCU read side critical section, and do an rcu_read_unlock/retry if we got stale data within the critical section.
On non-PREEMPT_RT, this shortens the time spent within RCU read side critical section in case the seqcount needs a retry, and avoids unbounded looping.
--- net/xfrm/xfrm_policy.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
net/xfrm/xfrm_policy.c +14 -7
@@ -2092,12 +2092,15 @@ static struct xfrm_policy *xfrm_policy_lif (unlikely (!daddr || !saddr))return NULL ; -rcu_read_lock (); retry: -do { - sequence =read_seqcount_begin (&xfrm_policy_hash_generation); - chain =policy_hash_direct (net, daddr, saddr, family, dir); - }while (read_seqcount_retry (&xfrm_policy_hash_generation, sequence)); + sequence =read_seqcount_begin (&xfrm_policy_hash_generation); +rcu_read_lock (); + + chain =policy_hash_direct (net, daddr, saddr, family, dir); +if (read_seqcount_retry (&xfrm_policy_hash_generation, sequence)) { +rcu_read_unlock (); + goto retry; + } ret =NULL ;hlist_for_each_entry_rcu (pol, chain, bydst) {
@@ -2128,11 +2131,15 @@ static struct xfrm_policy *xfrm_policy_l } skip_inexact: -if (read_seqcount_retry (&xfrm_policy_hash_generation, sequence)) +if (read_seqcount_retry (&xfrm_policy_hash_generation, sequence)) { +rcu_read_unlock (); goto retry; + } -if (ret && !xfrm_pol_hold_rcu (ret)) +if (ret && !xfrm_pol_hold_rcu (ret)) { +rcu_read_unlock (); goto retry; + } fail:rcu_read_unlock ();
Greg Kroah-Hartman
maintainerPATCH 180/215 thermal/drivers/int340x/processor_thermal: Fix tcc setting
In reply to Greg Kroah-HartmanFrom: Srinivas Pandruvada <[email protected]>
commit fe6a6de6692e7f7159c1ff42b07ecd737df712b4 upstream.
The following fixes are done for tcc sysfs interface:
- TCC is 6 bits only from bit 29-24
- TCC of 0 is valid
- When BIT(31) is set, this register is read only
- Check for invalid tcc value
- Error for negative values
--- drivers/thermal/intel/int340x_thermal/processor_thermal_device.c | 20 ++++++---- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +12 -8
@@ -156,24 +156,27 @@ static ssize_t tcc_offset_degree_celsiusif (err)return err; - val = (val >>24 ) &0xff ; + val = (val >>24 ) &0x3f ;return sprintf (buf,"%d\n" , (int )val); } -static int tcc_offset_update (int tcc) +static int tcc_offset_update (unsigned int tcc) {u64 val;int err; -if (!tcc) +if (tcc >63 )return -EINVAL ; err =rdmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , &val);if (err)return err; - val &= ~GENMASK_ULL (31 ,24 ); - val |= (tcc &0xff ) <<24 ; +if (val &BIT (31 )) +return -EPERM ; + + val &= ~GENMASK_ULL (29 ,24 ); + val |= (tcc &0x3f ) <<24 ; err =wrmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , val);if (err)
@@ -182,14 +185,15 @@ static int tcc_offset_update(int tcc)return 0 ; } -static int tcc_offset_save; +static unsigned int tcc_offset_save;static ssize_t tcc_offset_degree_celsius_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { +unsigned int tcc;u64 val; -int tcc, err; +int err; err =rdmsrl_safe (MSR_PLATFORM_INFO , &val);if (err)
@@ -198,7 +202,7 @@ static ssize_t tcc_offset_degree_celsiusif (!(val &BIT (30 )))return -EACCES ; -if (kstrtoint (buf,0 , &tcc)) +if (kstrtouint (buf,0 , &tcc))return -EINVAL ; err =tcc_offset_update (tcc);
Greg Kroah-Hartman
maintainerPATCH 181/215 ubifs: Fix races between xattr_{set|get} and listxattr operations
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
commit f4e3634a3b642225a530c292fdb1e8a4007507f5 upstream.
UBIFS may occur some problems with concurrent xattr_{set|get} and listxattr operations, such as assertion failure, memory corruption, stale xattr value[1].
Fix it by importing a new rw-lock in @ubifs_inode to serilize write operations on xattr, concurrent read operations are still effective, just like ext4.
[1] https://lore.kernel.org/linux-mtd/[email protected]
--- fs/ubifs/super.c | 1 + fs/ubifs/ubifs.h | 2 ++ fs/ubifs/xattr.c | 44 +++++++++++++++++++++++++++++++++----------- 3 files changed, 36 insertions(+), 11 deletions(-)
fs/ubifs/super.c +1 -0
@@ -275,6 +275,7 @@ static struct inode *ubifs_alloc_inode(smemset ((void *)ui +sizeof (struct inode ),0 ,sizeof (struct ubifs_inode ) -sizeof (struct inode ));mutex_init (&ui->ui_mutex); +init_rwsem (&ui->xattr_sem);spin_lock_init (&ui->ui_lock);return &ui->vfs_inode; };
fs/ubifs/ubifs.h +2 -0
@@ -356,6 +356,7 @@ struct ubifs_gced_idx_leb {* @ui_mutex: serializes inode write-back with the rest of VFS operations, * serializes "clean <-> dirty" state changes, serializes bulk-read, * protects @dirty, @bulk_read, @ui_size, and @xattr_size +* @xattr_sem: serilizes write operations (remove|set|create) on xattr * @ui_lock: protects @synced_i_size * @synced_i_size: synchronized size of inode, i.e. the value of inode size * currently stored on the flash; used only for regular file
@@ -409,6 +410,7 @@ struct ubifs_inode { unsigned int bulk_read:1; unsigned int compr_type:2;struct mutex ui_mutex; +struct rw_semaphore xattr_sem;spinlock_t ui_lock;loff_t synced_i_size;loff_t ui_size;
fs/ubifs/xattr.c +33 -11
146 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 182/215 power: supply: ab8500: Fix an old bug
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
commit f1c74a6c07e76fcb31a4bcc1f437c4361a2674ce upstream.
Trying to get the AB8500 charging driver working I ran into a bit of bitrot: we haven't used the driver for a while so errors in refactorings won't be noticed.
This one is pretty self evident: use argument to the macro or we end up with a random pointer to something else.
--- include/linux/mfd/abx500/ux500_chargalg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mfd/abx500/ux500_chargalg.h +1 -1
@@ -15,7 +15,7 @@* - POWER_SUPPLY_TYPE_USB, * because only them store as drv_data pointer to struct ux500_charger. */ -#define psy_to_ux500_charger (x) power_supply_get_drvdata(psy) +#define psy_to_ux500_charger (x) power_supply_get_drvdata(x)/* Forward declaration */ struct ux500_charger ;
Greg Kroah-Hartman
maintainerPATCH 183/215 mfd: syscon: Free the allocated name field of struct regmap_config
In reply to Greg Kroah-HartmanFrom: Limeng <[email protected]>
commit 56a1188159cb2b87fbcb5a7a7afb38a4dd9db0c1 upstream.
The commit 529a1101212a("mfd: syscon: Don't free allocated name for regmap_config") doesn't free the allocated name field of struct regmap_config, but introduce a memory leak. There is another commit 94cc89eb8fa5("regmap: debugfs: Fix handling of name string for debugfs init delays") fixing this debugfs init issue from root cause. With this fixing, the name field in struct regmap_debugfs_node is removed. When initialize debugfs for syscon driver, the name field of struct regmap_config is not used anymore. So, the allocated name field of struct regmap_config is need to be freed directly after regmap initialization to avoid memory leak.
--- drivers/mfd/syscon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/syscon.c +1 -1
@@ -108,6 +108,7 @@ static struct syscon *of_syscon_register syscon_config.max_register =resource_size (&res) - reg_io_width; regmap =regmap_init_mmio (NULL , base, &syscon_config); +kfree (syscon_config.name);if (IS_ERR (regmap)) {pr_err ("regmap init failed\n" ); ret =PTR_ERR (regmap);
@@ -144,7 +145,6 @@ err_clk:regmap_exit (regmap); err_regmap:iounmap (base); -kfree (syscon_config.name); err_map:kfree (syscon);return ERR_PTR (ret);
Greg Kroah-Hartman
maintainerPATCH 184/215 nvmem: core: add a missing of_node_put
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit 63879e2964bceee2aa5bbe8b99ea58bba28bb64f upstream.
'for_each_child_of_node' performs an of_node_get on each iteration, so a return from the middle of the loop requires an of_node_put.
--- drivers/nvmem/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/nvmem/core.c +6 -3
@@ -549,15 +549,17 @@ static int nvmem_add_cells_from_of(struccontinue ;if (len <2 *sizeof (u32)) {dev_err (dev,"nvmem: invalid reg on %pOF\n" , child); +of_node_put (child);return -EINVAL ; } cell =kzalloc (sizeof (*cell),GFP_KERNEL ); -if (!cell) +if (!cell) { +of_node_put (child);return -ENOMEM ; + } cell->nvmem = nvmem; - cell->np =of_node_get (child); cell->offset =be32_to_cpup (addr++); cell->bytes =be32_to_cpup (addr); cell->name =kasprintf (GFP_KERNEL ,"%pOFn" , child);
@@ -578,11 +580,12 @@ static int nvmem_add_cells_from_of(struc cell->name, nvmem->stride);/* Cells already added will be freed later. */ kfree_const (cell->name); -of_node_put (cell->np);kfree (cell); +of_node_put (child);return -EINVAL ; } + cell->np =of_node_get (child);nvmem_cell_add (cell); }
Greg Kroah-Hartman
maintainerPATCH 185/215 lkdtm/bugs: XFAIL UNALIGNED_LOAD_STORE_WRITE
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
commit a15676ac8f24a9ac5fd881cf17be4be13fa0910a upstream.
When built under CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS, this test is expected to fail (i.e. not trip an exception).
--- drivers/misc/lkdtm/bugs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/misc/lkdtm/bugs.c +3 -0
@@ -144,6 +144,9 @@ void lkdtm_UNALIGNED_LOAD_STORE_WRITE(voif (*p ==0 ) val =0x87654321 ; *p = val; + +if (IS_ENABLED (CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS )) +pr_err ("XFAIL: arch has CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS\n" ); }void lkdtm_SOFTLOCKUP (void )
Greg Kroah-Hartman
maintainerPATCH 186/215 selftests/lkdtm: Fix expected text for CR4 pinning
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
commit c2eb472bbe25b3f360990f23b293b3fbadfa4bc0 upstream.
The error text for CR4 pinning changed. Update the test to match.
--- tools/testing/selftests/lkdtm/tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/lkdtm/tests.txt +1 -1
@@ -11,7 +11,7 @@ CORRUPT_LIST_ADD list_add corruption CORRUPT_LIST_DEL list_del corruption STACK_GUARD_PAGE_LEADING STACK_GUARD_PAGE_TRAILING -UNSET_SMEP CR4 bits went missing +UNSET_SMEP pinned CR4 bits changed: DOUBLE_FAULT CORRUPT_PAC UNALIGNED_LOAD_STORE_WRITE
Greg Kroah-Hartman
maintainerPATCH 187/215 extcon: intel-mrfld: Sync hardware and software state on init
In reply to Greg Kroah-HartmanFrom: Ferry Toth <[email protected]>
commit ecb5bdff901139850fb3ca3ae2d0cccac045bc52 upstream.
extcon driver for Basin Cove PMIC shadows the switch status used for dwc3 DRD to detect a change in the switch position. This change initializes the status at probe time.
--- drivers/extcon/extcon-intel-mrfld.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/extcon/extcon-intel-mrfld.c +9 -0
@@ -197,6 +197,7 @@ static int mrfld_extcon_probe(struct plastruct intel_soc_pmic *pmic =dev_get_drvdata (dev->parent);struct regmap *regmap = pmic->regmap;struct mrfld_extcon_data *data; +unsigned int status;unsigned int id;int irq, ret;
@@ -244,6 +245,14 @@ static int mrfld_extcon_probe(struct pla/* Get initial state */ mrfld_extcon_role_detect (data); +/* +* Cached status value is used for cable detection, see comments +* in mrfld_extcon_cable_detect(), we need to sync cached value +* with a real state of the hardware. +*/ +regmap_read (regmap,BCOVE_SCHGRIRQ1 , &status); + data->status = status; +mrfld_extcon_clear (data,BCOVE_MIRQLVL1 ,BCOVE_LVL1_CHGR );mrfld_extcon_clear (data,BCOVE_MCHGRIRQ1 ,BCOVE_CHGRIRQ_ALL );
Greg Kroah-Hartman
maintainerPATCH 188/215 seq_buf: Fix overflow in seq_buf_putmem_hex()
In reply to Greg Kroah-HartmanFrom: Yun Zhou <[email protected]>
commit d3b16034a24a112bb83aeb669ac5b9b01f744bb7 upstream.
There's two variables being increased in that loop (i and j), and i follows the raw data, and j follows what is being written into the buffer. We should compare 'i' to MAX_MEMHEX_BYTES or compare 'j' to HEX_CHARS. Otherwise, if 'j' goes bigger than HEX_CHARS, it will overflow the destination buffer.
--- lib/seq_buf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/seq_buf.c +3 -1
@@ -229,8 +229,10 @@ int seq_buf_putmem_hex(struct seq_buf *sWARN_ON (s->size ==0 ); +BUILD_BUG_ON (MAX_MEMHEX_BYTES *2 >=HEX_CHARS ); +while (len) { - start_len =min (len,HEX_CHARS -1 ); + start_len =min (len,MAX_MEMHEX_BYTES );#ifdef __BIG_ENDIANfor (i =0 , j =0 ; i < start_len; i++) {#else
Greg Kroah-Hartman
maintainerPATCH 189/215 rq-qos: fix missed wake-ups in rq_qos_throttle try two
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 11c7aa0ddea8611007768d3e6b58d45dc60a19e1 upstream.
Commit 545fbd0775ba ("rq-qos: fix missed wake-ups in rq_qos_throttle") tried to fix a problem that a process could be sleeping in rq_qos_wait() without anyone to wake it up. However the fix is not complete and the following can still happen:
CPU1 (waiter1) CPU2 (waiter2) CPU3 (waker)rq_qos_wait() rq_qos_wait()
acquire_inflight_cb() -> fails
acquire_inflight_cb() -> fails completes IOs, inflight decreased prepare_to_wait_exclusive() prepare_to_wait_exclusive() has_sleeper = !wq_has_single_sleeper() -> true as there are two sleepers has_sleeper = !wq_has_single_sleeper() -> true
io_schedule() io_schedule()
Deadlock as now there's nobody to wakeup the two waiters. The logic automatically blocking when there are already sleepers is really subtle and the only way to make it work reliably is that we check whether there are some waiters in the queue when adding ourselves there. That way, we are guaranteed that at least the first process to enter the wait queue will recheck the waiting condition before going to sleep and thus guarantee forward progress.
--- block/blk-rq-qos.c | 4 ++-- include/linux/wait.h | 2 +- kernel/sched/wait.c | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-)
block/blk-rq-qos.c +2 -2
@@ -266,8 +266,8 @@ void rq_qos_wait(struct rq_wait *rqw, voif (!has_sleeper &&acquire_inflight_cb (rqw, private_data))return ; -prepare_to_wait_exclusive (&rqw->wait, &data.wq,TASK_UNINTERRUPTIBLE ); - has_sleeper = !wq_has_single_sleeper (&rqw->wait); + has_sleeper = !prepare_to_wait_exclusive (&rqw->wait, &data.wq, +TASK_UNINTERRUPTIBLE ); do { /* The memory barrier in set_task_state saves us here. */ if (data.got_token)
include/linux/wait.h +1 -1
@@ -1126,7 +1126,7 @@ do { \* Waitqueues which are removed from the waitqueue_head at wakeup time */ void prepare_to_wait (struct wait_queue_head *wq_head,struct wait_queue_entry *wq_entry,int state); -void prepare_to_wait_exclusive (struct wait_queue_head *wq_head,struct wait_queue_entry *wq_entry,int state); +bool prepare_to_wait_exclusive (struct wait_queue_head *wq_head,struct wait_queue_entry *wq_entry,int state);long prepare_to_wait_event (struct wait_queue_head *wq_head,struct wait_queue_entry *wq_entry,int state);void finish_wait (struct wait_queue_head *wq_head,struct wait_queue_entry *wq_entry);long wait_woken (struct wait_queue_entry *wq_entry,unsigned mode,long timeout);
kernel/sched/wait.c +7 -2
@@ -249,17 +249,22 @@ prepare_to_wait(struct wait_queue_head * }EXPORT_SYMBOL (prepare_to_wait); -void +/* Returns true if we are the first waiter in the queue, false otherwise. */ +bool prepare_to_wait_exclusive (struct wait_queue_head *wq_head,struct wait_queue_entry *wq_entry,int state) {unsigned long flags; +bool was_empty = false; wq_entry->flags |=WQ_FLAG_EXCLUSIVE ;spin_lock_irqsave (&wq_head->lock, flags); -if (list_empty (&wq_entry->entry)) +if (list_empty (&wq_entry->entry)) { + was_empty =list_empty (&wq_head->head);__add_wait_queue_entry_tail (wq_head, wq_entry); + }set_current_state (state);spin_unlock_irqrestore (&wq_head->lock, flags); +return was_empty; }EXPORT_SYMBOL (prepare_to_wait_exclusive);
Greg Kroah-Hartman
maintainerPATCH 190/215 tracing: Simplify & fix saved_tgids logic
In reply to Greg Kroah-HartmanFrom: Paul Burton <[email protected]>
commit b81b3e959adb107cd5b36c7dc5ba1364bbd31eb2 upstream.
The tgid_map array records a mapping from pid to tgid, where the index of an entry within the array is the pid & the value stored at that index is the tgid.
The saved_tgids_next() function iterates over pointers into the tgid_map array & dereferences the pointers which results in the tgid, but then it passes that dereferenced value to trace_find_tgid() which treats it as a pid & does a further lookup within the tgid_map array. It seems likely that the intent here was to skip over entries in tgid_map for which the recorded tgid is zero, but instead we end up skipping over entries for which the thread group leader hasn't yet had its own tgid recorded in tgid_map.
A minimal fix would be to remove the call to trace_find_tgid, turning:
if (trace_find_tgid(*ptr))
into:
if (*ptr)
..but it seems like this logic can be much simpler if we simply let seq_read() iterate over the whole tgid_map array & filter out empty entries by returning SEQ_SKIP from saved_tgids_show(). Here we take that approach, removing the incorrect logic here entirely.
--- kernel/trace/trace.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-)
kernel/trace/trace.c +13 -25
@@ -5284,37 +5284,20 @@ static const struct file_operations tracstatic void *saved_tgids_next (struct seq_file *m,void *v,loff_t *pos) { -int *ptr = v; +int pid = ++(*pos); -if (*pos || m->count) - ptr++; - - (*pos)++; - -for (; ptr <= &tgid_map[PID_MAX_DEFAULT ]; ptr++) { -if (trace_find_tgid (*ptr)) -return ptr; - } +if (pid >PID_MAX_DEFAULT ) +return NULL ; -return NULL ; +return &tgid_map[pid]; }static void *saved_tgids_start (struct seq_file *m,loff_t *pos) { -void *v; -loff_t l =0 ; - -if (!tgid_map) +if (!tgid_map || *pos >PID_MAX_DEFAULT )return NULL ; - v = &tgid_map[0 ]; -while (l <= *pos) { - v =saved_tgids_next (m, v, &l); -if (!v) -return NULL ; - } - -return v; +return &tgid_map[*pos]; }static void saved_tgids_stop (struct seq_file *m,void *v)
@@ -5323,9 +5306,14 @@ static void saved_tgids_stop(struct seq_static int saved_tgids_show (struct seq_file *m,void *v) { -int pid = (int *)v - tgid_map; +int *entry = (int *)v; +int pid = entry - tgid_map; +int tgid = *entry; + +if (tgid ==0 ) +return SEQ_SKIP ; -seq_printf (m,"%d %d\n" , pid,trace_find_tgid (pid)); +seq_printf (m,"%d %d\n" , pid, tgid);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 191/215 tracing: Resize tgid_map to pid_max, not PID_MAX_DEFAULT
In reply to Greg Kroah-HartmanFrom: Paul Burton <[email protected]>
commit 4030a6e6a6a4a42ff8c18414c9e0c93e24cc70b8 upstream.
Currently tgid_map is sized at PID_MAX_DEFAULT entries, which means that on systems where pid_max is configured higher than PID_MAX_DEFAULT the ftrace record-tgid option doesn't work so well. Any tasks with PIDs higher than PID_MAX_DEFAULT are simply not recorded in tgid_map, and don't show up in the saved_tgids file.
In particular since systemd v243 & above configure pid_max to its highest possible 1<<22 value by default on 64 bit systems this renders the record-tgids option of little use.
Increase the size of tgid_map to the configured pid_max instead, allowing it to cover the full range of PIDs up to the maximum value of PID_MAX_LIMIT if the system is configured that way.
On 64 bit systems with pid_max == PID_MAX_LIMIT this will increase the size of tgid_map from 256KiB to 16MiB. Whilst this 64x increase in memory overhead sounds significant 64 bit systems are presumably best placed to accommodate it, and since tgid_map is only allocated when the record-tgid option is actually used presumably the user would rather it spends sufficient memory to actually record the tgids they expect.
The size of tgid_map could also increase for CONFIG_BASE_SMALL=y configurations, but these seem unlikely to be systems upon which people are both configuring a large pid_max and running ftrace with record-tgid anyway.
Of note is that we only allocate tgid_map once, the first time that the record-tgid option is enabled. Therefore its size is only set once, to the value of pid_max at the time the record-tgid option is first enabled. If a user increases pid_max after that point, the saved_tgids file will not contain entries for any tasks with pids beyond the earlier value of pid_max.
--- kernel/trace/trace.c | 63 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 16 deletions(-)
kernel/trace/trace.c +47 -16
@@ -2181,8 +2181,15 @@ void tracing_reset_all_online_cpus(void) } } +/* +* The tgid_map array maps from pid to tgid; i.e. the value stored at index i +* is the tgid last observed corresponding to pid=i. +*/ static int *tgid_map; +/* The maximum valid index into tgid_map. */ +static size_t tgid_map_max; +#define SAVED_CMDLINES_DEFAULT 128#define NO_CMDLINE_MAP UINT_MAXstatic arch_spinlock_t trace_cmdline_lock = __ARCH_SPIN_LOCK_UNLOCKED;
@@ -2455,24 +2462,41 @@ void trace_find_cmdline(int pid, char copreempt_enable (); } +static int *trace_find_tgid_ptr (int pid) +{ +/* +* Pairs with the smp_store_release in set_tracer_flag() to ensure that +* if we observe a non-NULL tgid_map then we also observe the correct +* tgid_map_max. +*/ +int *map =smp_load_acquire (&tgid_map); + +if (unlikely (!map || pid > tgid_map_max)) +return NULL ; + +return &map[pid]; +} +int trace_find_tgid (int pid) { -if (unlikely (!tgid_map || !pid || pid >PID_MAX_DEFAULT )) -return 0 ; +int *ptr =trace_find_tgid_ptr (pid); -return tgid_map[pid]; +return ptr ? *ptr :0 ; }static int trace_save_tgid (struct task_struct *tsk) { +int *ptr; +/* treat recording of idle task as a success */ if (!tsk->pid)return 1 ; -if (unlikely (!tgid_map || tsk->pid >PID_MAX_DEFAULT )) + ptr =trace_find_tgid_ptr (tsk->pid); +if (!ptr)return 0 ; - tgid_map[tsk->pid] = tsk->tgid; + *ptr = tsk->tgid;return 1 ; }
@@ -4847,6 +4871,8 @@ int trace_keep_overwrite(struct tracer *int set_tracer_flag (struct trace_array *tr,unsigned int mask,int enabled) { +int *map; +if ((mask ==TRACE_ITER_RECORD_TGID ) || (mask ==TRACE_ITER_RECORD_CMD ))lockdep_assert_held (&event_mutex);
@@ -4869,10 +4895,19 @@ int set_tracer_flag(struct trace_array *trace_event_enable_cmd_record (enabled);if (mask ==TRACE_ITER_RECORD_TGID ) { -if (!tgid_map) - tgid_map =kvcalloc (PID_MAX_DEFAULT +1 , -sizeof (*tgid_map), -GFP_KERNEL ); +if (!tgid_map) { + tgid_map_max = pid_max; + map =kvcalloc (tgid_map_max +1 ,sizeof (*tgid_map), +GFP_KERNEL ); + +/* +* Pairs with smp_load_acquire() in +* trace_find_tgid_ptr() to ensure that if it observes +* the tgid_map we just allocated then it also observes +* the corresponding tgid_map_max value. +*/ +smp_store_release (&tgid_map, map); + }if (!tgid_map) { tr->trace_flags &= ~TRACE_ITER_RECORD_TGID ;return -ENOMEM ;
@@ -5286,18 +5321,14 @@ static void *saved_tgids_next(struct seq {int pid = ++(*pos); -if (pid >PID_MAX_DEFAULT ) -return NULL ; - -return &tgid_map[pid]; +return trace_find_tgid_ptr (pid); }static void *saved_tgids_start (struct seq_file *m,loff_t *pos) { -if (!tgid_map || *pos >PID_MAX_DEFAULT ) -return NULL ; +int pid = *pos; -return &tgid_map[*pos]; +return trace_find_tgid_ptr (pid); }static void saved_tgids_stop (struct seq_file *m,void *v)
Greg Kroah-Hartman
maintainerPATCH 192/215 ipack/carriers/tpci200: Fix a double free in tpci200_pci_probe
In reply to Greg Kroah-HartmanFrom: Lv Yunlong <[email protected]>
commit 9272e5d0028d45a3b45b58c9255e6e0df53f7ad9 upstream.
In the out_err_bus_register error branch of tpci200_pci_probe, tpci200->info->cfg_regs is freed by tpci200_uninstall()-> tpci200_unregister()->pci_iounmap(..,tpci200->info->cfg_regs) in the first time.
But later, iounmap() is called to free tpci200->info->cfg_regs again.
My patch sets tpci200->info->cfg_regs to NULL after tpci200_uninstall() to avoid the double free.
--- drivers/ipack/carriers/tpci200.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ipack/carriers/tpci200.c +4 -1
@@ -596,8 +596,11 @@ static int tpci200_pci_probe(struct pci_ out_err_bus_register:tpci200_uninstall (tpci200); +/* tpci200->info->cfg_regs is unmapped in tpci200_uninstall */ + tpci200->info->cfg_regs =NULL ; out_err_install: -iounmap (tpci200->info->cfg_regs); +if (tpci200->info->cfg_regs) +iounmap (tpci200->info->cfg_regs); out_err_ioremap:pci_release_region (pdev,TPCI200_CFG_MEM_BAR ); out_err_pci_request:
Greg Kroah-Hartman
maintainerPATCH 193/215 coresight: Propagate symlink failure
In reply to Greg Kroah-HartmanFrom: Jeremy Linton <[email protected]>
commit 51dd19a7e9f8fbbb7cd92b8a357091911eae7f78 upstream.
If the symlink is unable to be created, the driver goes ahead and continues device creation. Instead lets propagate the failure, and fail the probe.
--- drivers/hwtracing/coresight/coresight-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-core.c +1 -1
@@ -1347,7 +1347,7 @@ static int coresight_fixup_device_conns( } } -return 0 ; +return ret; }static int coresight_remove_match (struct device *dev,void *data)
Greg Kroah-Hartman
maintainerPATCH 194/215 coresight: tmc-etf: Fix global-out-of-bounds in tmc_update_etf_buffer()
In reply to Greg Kroah-HartmanFrom: Sai Prakash Ranjan <[email protected]>
commit 5fae8a946ac2df879caf3f79a193d4766d00239b upstream.
commit 6f755e85c332 ("coresight: Add helper for inserting synchronization packets") removed trailing '\0' from barrier_pkt array and updated the call sites like etb_update_buffer() to have proper checks for barrier_pkt size before read but missed updating tmc_update_etf_buffer() which still reads barrier_pkt past the array size resulting in KASAN out-of-bounds bug. Fix this by adding a check for barrier_pkt size before accessing like it is done in etb_update_buffer().
BUG: KASAN: global-out-of-bounds in tmc_update_etf_buffer+0x4b8/0x698
Read of size 4 at addr ffffffd05b7d1030 by task perf/2629
Call trace:
dump_backtrace+0x0/0x27c
show_stack+0x20/0x2c
dump_stack+0x11c/0x188
print_address_description+0x3c/0x4a4
__kasan_report+0x140/0x164
kasan_report+0x10/0x18
__asan_report_load4_noabort+0x1c/0x24
tmc_update_etf_buffer+0x4b8/0x698
etm_event_stop+0x248/0x2d8
etm_event_del+0x20/0x2c
event_sched_out+0x214/0x6f0
group_sched_out+0xd0/0x270
ctx_sched_out+0x2ec/0x518
__perf_event_task_sched_out+0x4fc/0xe6c
__schedule+0x1094/0x16a0
preempt_schedule_irq+0x88/0x170
arm64_preempt_schedule_irq+0xf0/0x18c
el1_irq+0xe8/0x180
perf_event_exec+0x4d8/0x56c
setup_new_exec+0x204/0x400
load_elf_binary+0x72c/0x18c0
search_binary_handler+0x13c/0x420
load_script+0x500/0x6c4
search_binary_handler+0x13c/0x420
exec_binprm+0x118/0x654
__do_execve_file+0x77c/0xba4
__arm64_compat_sys_execve+0x98/0xac
el0_svc_common+0x1f8/0x5e0
el0_svc_compat_handler+0x84/0xb0
el0_svc_compat+0x10/0x50
The buggy address belongs to the variable:
barrier_pkt+0x10/0x40
Memory state around the buggy address:
ffffffd05b7d0f00: fa fa fa fa 04 fa fa fa fa fa fa fa 00 00 00 00
ffffffd05b7d0f80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>ffffffd05b7d1000: 00 00 00 00 00 00 fa fa fa fa fa fa 00 00 00 03
^
ffffffd05b7d1080: fa fa fa fa 00 02 fa fa fa fa fa fa 03 fa fa fa
ffffffd05b7d1100: fa fa fa fa 00 00 00 00 05 fa fa fa fa fa fa fa
==================================================================--- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-tmc-etf.c +1 -1
@@ -528,7 +528,7 @@ static unsigned long tmc_update_etf_buff buf_ptr = buf->data_pages[cur] + offset; *buf_ptr =readl_relaxed (drvdata->base +TMC_RRD ); -if (lost && *barrier) { +if (lost && i <CORESIGHT_BARRIER_PKT_SIZE ) { *buf_ptr = *barrier; barrier++; }
Greg Kroah-Hartman
maintainerPATCH 195/215 dm zoned: check zone capacity
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
commit bab68499428ed934f0493ac74197ed6f36204260 upstream.
The dm-zoned target cannot support zoned block devices with zones that have a capacity smaller than the zone size (e.g. NVMe zoned namespaces) due to the current chunk zone mapping implementation as it is assumed that zones and chunks have the same size with all blocks usable. If a zoned drive is found to have zones with a capacity different from the zone size, fail the target initialization.
--- drivers/md/dm-zoned-metadata.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/md/dm-zoned-metadata.c +7 -0
@@ -1390,6 +1390,13 @@ static int dmz_init_zone(struct blk_zonereturn -ENXIO ; } +/* +* Devices that have zones with a capacity smaller than the zone size +* (e.g. NVMe zoned namespaces) are not supported. +*/ +if (blkz->capacity != blkz->len) +return -ENXIO ; +switch (blkz->type) {case BLK_ZONE_TYPE_CONVENTIONAL :set_bit (DMZ_RND , &zone->flags);
Greg Kroah-Hartman
maintainerPATCH 196/215 dm writecache: flush origin device when writing and cache is full
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit ee55b92a7391bf871939330f662651b54be51b73 upstream.
Commit d53f1fafec9d086f1c5166436abefdaef30e0363 ("dm writecache: do direct write if the cache is full") changed dm-writecache, so that it writes directly to the origin device if the cache is full. Unfortunately, it doesn't forward flush requests to the origin device, so that there is a bug where flushes are being ignored.
Fix this by adding missing flush forwarding.
For PMEM mode, we fix this bug by disabling direct writes to the origin device, because it performs better.
--- drivers/md/dm-writecache.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/md/dm-writecache.c +6 -2
@@ -1297,8 +1297,12 @@ static int writecache_map(struct dm_targwritecache_flush (wc);if (writecache_has_error (wc)) goto unlock_error; +if (unlikely (wc->cleaner)) + goto unlock_remap_origin; goto unlock_submit; }else { +if (dm_bio_get_target_bio_nr (bio)) + goto unlock_remap_origin;writecache_offload_bio (wc, bio); goto unlock_return; }
@@ -1377,7 +1381,7 @@ read_next_block: } e =writecache_pop_from_freelist (wc, (sector_t)-1 );if (unlikely (!e)) { -if (!found_entry) { +if (!WC_MODE_PMEM (wc) && !found_entry) { direct_write: e =writecache_find_entry (wc, bio->bi_iter.bi_sector,WFE_RETURN_FOLLOWING );if (e) {
@@ -2483,7 +2487,7 @@ overflow: goto bad; } - ti->num_flush_bios =1 ; + ti->num_flush_bios =WC_MODE_PMEM (wc) ?1 :2 ; ti->flush_supported = true; ti->num_discard_bios =1 ;
Greg Kroah-Hartman
maintainerPATCH 197/215 dm btree remove: assign new_root only when removal succeeds
In reply to Greg Kroah-HartmanFrom: Hou Tao <[email protected]>
commit b6e58b5466b2959f83034bead2e2e1395cca8aeb upstream.
remove_raw() in dm_btree_remove() may fail due to IO read error (e.g. read the content of origin block fails during shadowing), and the value of shadow_spine::root is uninitialized, but the uninitialized value is still assign to new_root in the end of dm_btree_remove().
For dm-thin, the value of pmd->details_root or pmd->root will become an uninitialized value, so if trying to read details_info tree again out-of-bound memory may occur as showed below:
general protection fault, probably for non-canonical address 0x3fdcb14c8d7520 CPU: 4 PID: 515 Comm: dmsetup Not tainted 5.13.0-rc6 Hardware name: QEMU Standard PC RIP: 0010:metadata_ll_load_ie+0x14/0x30 Call Trace: sm_metadata_count_is_more_than_one+0xb9/0xe0 dm_tm_shadow_block+0x52/0x1c0 shadow_step+0x59/0xf0 remove_raw+0xb2/0x170 dm_btree_remove+0xf4/0x1c0 dm_pool_delete_thin_device+0xc3/0x140 pool_message+0x218/0x2b0 target_message+0x251/0x290 ctl_ioctl+0x1c4/0x4d0 dm_ctl_ioctl+0xe/0x20 __x64_sys_ioctl+0x7b/0xb0 do_syscall_64+0x40/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xae
Fixing it by only assign new_root when removal succeeds
--- drivers/md/persistent-data/dm-btree-remove.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/persistent-data/dm-btree-remove.c +2 -1
@@ -549,7 +549,8 @@ int dm_btree_remove(struct dm_btree_infodelete_at (n, index); } - *new_root =shadow_root (&spine); +if (!r) + *new_root =shadow_root (&spine);exit_shadow_spine (&spine);return r;
Greg Kroah-Hartman
maintainerPATCH 198/215 PCI: Leave Apple Thunderbolt controllers on for s2idle or standby
In reply to Greg Kroah-HartmanFrom: Konstantin Kharlamov <[email protected]>
commit 4694ae373dc2114f9a82f6ae15737e65af0c6dea upstream.
On Macbook 2013, resuming from suspend-to-idle or standby resulted in the external monitor no longer being detected, a stacktrace, and errors like this in dmesg:
pcieport 0000:06:00.0: can't change power state from D3hot to D0 (config space inaccessible)
The reason is that we know how to turn power to the Thunderbolt controller *off* via the SXIO/SXFP/SXLF methods, but we don't know how to turn power back on. We have to rely on firmware to turn the power back on.
When going to the "suspend-to-idle" or "standby" system sleep states, firmware is not involved either on the suspend side or the resume side, so we can't use SXIO/SXFP/SXLF to turn the power off.
Skip SXIO/SXFP/SXLF when firmware isn't involved in suspend, e.g., when we're going to the "suspend-to-idle" or "standby" system sleep states.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212767
--- drivers/pci/quirks.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/pci/quirks.c +11 -0
@@ -27,6 +27,7 @@#include <linux/nvme.h> #include <linux/platform_data/x86/apple.h> #include <linux/pm_runtime.h> +#include <linux/suspend.h> #include <linux/switchtec.h> #include <asm/dma.h> /* isa_dma_bridge_buggy */ #include "pci.h"
@@ -3667,6 +3668,16 @@ static void quirk_apple_poweroff_thunderreturn ;if (pci_pcie_type (dev) !=PCI_EXP_TYPE_UPSTREAM )return ; + +/* +* SXIO/SXFP/SXLF turns off power to the Thunderbolt controller. +* We don't know how to turn it back on again, but firmware does, +* so we can only use SXIO/SXFP/SXLF if we're suspending via +* firmware. +*/ +if (!pm_suspend_via_firmware ()) +return ; + bridge =ACPI_HANDLE (&dev->dev);if (!bridge)return ;
Greg Kroah-Hartman
maintainerPATCH 199/215 PCI: aardvark: Fix checking for PIO Non-posted Request
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 8ceeac307a79f68c0d0c72d6e48b82fa424204ec upstream.
PIO_NON_POSTED_REQ for PIO_STAT register is incorrectly defined. Bit 10 in register PIO_STAT indicates the response is to a non-posted request.
--- drivers/pci/controller/pci-aardvark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pci-aardvark.c +1 -1
@@ -56,7 +56,7 @@#define PIO_COMPLETION_STATUS_UR 1#define PIO_COMPLETION_STATUS_CRS 2#define PIO_COMPLETION_STATUS_CA 4 -#define PIO_NON_POSTED_REQ BIT(0) +#define PIO_NON_POSTED_REQ BIT(10)#define PIO_ADDR_LS (PIO_BASE_ADDR + 0x8)#define PIO_ADDR_MS (PIO_BASE_ADDR + 0xc)#define PIO_WR_DATA (PIO_BASE_ADDR + 0x10)
Greg Kroah-Hartman
maintainerPATCH 200/215 PCI: aardvark: Implement workaround for the readback value of VEND_ID
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 7f71a409fe3d9358da07c77f15bb5b7960f12253 upstream.
Marvell Armada 3700 Functional Errata, Guidelines, and Restrictions document describes in erratum 4.1 PCIe value of vendor ID (Ref #: 243):
The readback value of VEND_ID (RD0070000h [15:0]) is 1B4Bh, while it should read 11ABh.
The firmware can write the correct value, 11ABh, through VEND_ID (RD0076044h [15:0]).
Implement this workaround in aardvark driver for both PCI vendor id and PCI subsystem vendor id.
This change affects and fixes PCI vendor id of emulated PCIe root bridge. After this change emulated PCIe root bridge has correct vendor id.
--- drivers/pci/controller/pci-aardvark.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/pci/controller/pci-aardvark.c +11 -0
@@ -124,6 +124,7 @@#define LTSSM_MASK 0x3f#define LTSSM_L0 0x10#define RC_BAR_CONFIG 0x300 +#define VENDOR_ID_REG (LMI_BASE_ADDR + 0x44)/* PCIe core controller registers */ #define CTRL_CORE_BASE_ADDR 0x18000
@@ -385,6 +386,16 @@ static void advk_pcie_setup_hw(struct ad reg |= (IS_RC_MSK <<IS_RC_SHIFT );advk_writel (pcie, reg,PCIE_CORE_CTRL0_REG ); +/* +* Replace incorrect PCI vendor id value 0x1b4b by correct value 0x11ab. +* VENDOR_ID_REG contains vendor id in low 16 bits and subsystem vendor +* id in high 16 bits. Updating this register changes readback value of +* read-only vendor id bits in PCIE_CORE_DEV_ID_REG register. Workaround +* for erratum 4.1: "The value of device and vendor ID is incorrect". +*/ + reg = (PCI_VENDOR_ID_MARVELL <<16 ) |PCI_VENDOR_ID_MARVELL ; +advk_writel (pcie, reg,VENDOR_ID_REG ); +/* Set Advanced Error Capabilities and Control PF0 register */ reg =PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX | PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN |
Greg Kroah-Hartman
maintainerPATCH 201/215 media: subdev: disallow ioctl for saa6588/davinci
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit 0a7790be182d32b9b332a37cb4206e24fe94b728 upstream.
The saa6588_ioctl() function expects to get called from other kernel functions with a 'saa6588_command' pointer, but I found nothing stops it from getting called from user space instead, which seems rather dangerous.
The same thing happens in the davinci vpbe driver with its VENC_GET_FLD command.
As a quick fix, add a separate .command() callback pointer for this driver and change the two callers over to that. This change can easily get backported to stable kernels if necessary, but since there are only two drivers, we may want to eventually replace this with a set of more specialized callbacks in the long run.
--- drivers/media/i2c/saa6588.c | 4 ++-- drivers/media/pci/bt8xx/bttv-driver.c | 6 +++--- drivers/media/pci/saa7134/saa7134-video.c | 6 +++--- drivers/media/platform/davinci/vpbe_display.c | 2 +- drivers/media/platform/davinci/vpbe_venc.c | 6 ++---- include/media/v4l2-subdev.h | 4 ++++ 6 files changed, 15 insertions(+), 13 deletions(-)
drivers/media/i2c/saa6588.c +2 -2
@@ -380,7 +380,7 @@ static void saa6588_configure(struct saa/* ---------------------------------------------------------------------- */ -static long saa6588_ioctl (struct v4l2_subdev *sd,unsigned int cmd,void *arg) +static long saa6588_command (struct v4l2_subdev *sd,unsigned int cmd,void *arg) {struct saa6588 *s =to_saa6588 (sd);struct saa6588_command *a = arg;
@@ -433,7 +433,7 @@ static int saa6588_s_tuner(struct v4l2_s/* ----------------------------------------------------------------------- */ static const struct v4l2_subdev_core_ops saa6588_core_ops = { - .ioctl = saa6588_ioctl, + .command = saa6588_command, };static const struct v4l2_subdev_tuner_ops saa6588_tuner_ops = {
drivers/media/pci/bt8xx/bttv-driver.c +3 -3
@@ -3187,7 +3187,7 @@ static int radio_release(struct file *fi btv->radio_user--; -bttv_call_all (btv, core, ioctl,SAA6588_CMD_CLOSE , &cmd); +bttv_call_all (btv, core, command,SAA6588_CMD_CLOSE , &cmd);if (btv->radio_user ==0 ) btv->has_radio_tuner =0 ;
@@ -3268,7 +3268,7 @@ static ssize_t radio_read(struct file *f cmd.result = -ENODEV ;radio_enable (btv); -bttv_call_all (btv, core, ioctl,SAA6588_CMD_READ , &cmd); +bttv_call_all (btv, core, command,SAA6588_CMD_READ , &cmd);return cmd.result; }
@@ -3289,7 +3289,7 @@ static __poll_t radio_poll(struct file * cmd.instance = file; cmd.event_list = wait; cmd.poll_mask = res; -bttv_call_all (btv, core, ioctl,SAA6588_CMD_POLL , &cmd); +bttv_call_all (btv, core, command,SAA6588_CMD_POLL , &cmd);return cmd.poll_mask; }
drivers/media/pci/saa7134/saa7134-video.c +3 -3
@@ -1178,7 +1178,7 @@ static int video_release(struct file *fisaa_call_all (dev, tuner, standby);if (vdev->vfl_type ==VFL_TYPE_RADIO ) -saa_call_all (dev, core, ioctl,SAA6588_CMD_CLOSE , &cmd); +saa_call_all (dev, core, command,SAA6588_CMD_CLOSE , &cmd);mutex_unlock (&dev->lock);return 0 ;
@@ -1197,7 +1197,7 @@ static ssize_t radio_read(struct file *f cmd.result = -ENODEV ;mutex_lock (&dev->lock); -saa_call_all (dev, core, ioctl,SAA6588_CMD_READ , &cmd); +saa_call_all (dev, core, command,SAA6588_CMD_READ , &cmd);mutex_unlock (&dev->lock);return cmd.result;
@@ -1213,7 +1213,7 @@ static __poll_t radio_poll(struct file * cmd.event_list = wait; cmd.poll_mask =0 ;mutex_lock (&dev->lock); -saa_call_all (dev, core, ioctl,SAA6588_CMD_POLL , &cmd); +saa_call_all (dev, core, command,SAA6588_CMD_POLL , &cmd);mutex_unlock (&dev->lock);return rc | cmd.poll_mask;
drivers/media/platform/davinci/vpbe_display.c +1 -1
@@ -47,7 +47,7 @@ static int venc_is_second_field(struct v ret =v4l2_subdev_call (vpbe_dev->venc, core, - ioctl, + command,VENC_GET_FLD , &val);if (ret <0 ) {
drivers/media/platform/davinci/vpbe_venc.c +2 -4
@@ -521,9 +521,7 @@ static int venc_s_routing(struct v4l2_sureturn ret; } -static long venc_ioctl (struct v4l2_subdev *sd, -unsigned int cmd, -void *arg) +static long venc_command (struct v4l2_subdev *sd,unsigned int cmd,void *arg) {u32 val;
@@ -542,7 +540,7 @@ static long venc_ioctl(struct v4l2_subde }static const struct v4l2_subdev_core_ops venc_core_ops = { - .ioctl = venc_ioctl, + .command = venc_command, };static const struct v4l2_subdev_video_ops venc_video_ops = {
include/media/v4l2-subdev.h +4 -0
@@ -162,6 +162,9 @@ struct v4l2_subdev_io_pin_config {* @s_gpio: set GPIO pins. Very simple right now, might need to be extended with * a direction argument if needed. * +* @command: called by in-kernel drivers in order to call functions internal +* to subdev drivers driver that have a separate callback. +* * @ioctl: called at the end of ioctl() syscall handler at the V4L2 core. * used to provide support for private ioctls used on the driver. *
@@ -193,6 +196,7 @@ struct v4l2_subdev_core_ops {int (*load_fw)(struct v4l2_subdev *sd);int (*reset)(struct v4l2_subdev *sd,u32 val);int (*s_gpio)(struct v4l2_subdev *sd,u32 val); +long (*command)(struct v4l2_subdev *sd,unsigned int cmd,void *arg);long (*ioctl)(struct v4l2_subdev *sd,unsigned int cmd,void *arg);#ifdef CONFIG_COMPAT long (*compat_ioctl32)(struct v4l2_subdev *sd, unsigned int cmd,
Greg Kroah-Hartman
maintainerPATCH 202/215 media: dtv5100: fix control-request directions
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 8c8b9a9be2afa8bd6a72ad1130532baab9fab89d upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Fix the control requests which erroneously used usb_rcvctrlpipe().
--- drivers/media/usb/dvb-usb/dtv5100.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/usb/dvb-usb/dtv5100.c +5 -2
@@ -26,6 +26,7 @@ static int dtv5100_i2c_msg(struct dvb_us u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen) { struct dtv5100_state *st = d->priv; +unsigned int pipe;u8 request;u8 type;u16 value;
@@ -34,6 +35,7 @@ static int dtv5100_i2c_msg(struct dvb_usswitch (wlen) {case 1 :/* write { reg }, read { value } */ + pipe =usb_rcvctrlpipe (d->udev,0 ); request = (addr ==DTV5100_DEMOD_ADDR ?DTV5100_DEMOD_READ :DTV5100_TUNER_READ ); type =USB_TYPE_VENDOR |USB_DIR_IN ;
@@ -41,6 +43,7 @@ static int dtv5100_i2c_msg(struct dvb_usbreak ;case 2 :/* write { reg, value } */ + pipe =usb_sndctrlpipe (d->udev,0 ); request = (addr ==DTV5100_DEMOD_ADDR ?DTV5100_DEMOD_WRITE :DTV5100_TUNER_WRITE ); type =USB_TYPE_VENDOR |USB_DIR_OUT ;
@@ -54,7 +57,7 @@ static int dtv5100_i2c_msg(struct dvb_usmemcpy (st->data, rbuf, rlen);msleep (1 );/* avoid I2C errors */ -return usb_control_msg (d->udev,usb_rcvctrlpipe (d->udev,0 ), request, +return usb_control_msg (d->udev, pipe, request, type, value, index, st->data, rlen,DTV5100_USB_TIMEOUT ); }
@@ -141,7 +144,7 @@ static int dtv5100_probe(struct usb_inte/* initialize non qt1010/zl10353 part? */ for (i =0 ; dtv5100_init[i].request; i++) { - ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), + ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), dtv5100_init[i].request, USB_TYPE_VENDOR | USB_DIR_OUT, dtv5100_init[i].value,
Greg Kroah-Hartman
maintainerPATCH 203/215 media: zr364xx: fix memory leak in zr364xx_start_readpipe
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit 0a045eac8d0427b64577a24d74bb8347c905ac65 upstream.
syzbot reported memory leak in zr364xx driver.
The problem was in non-freed urb in case ofusb_submit_urb() fail.
backtrace:
[<ffffffff82baedf6>] kmalloc include/linux/slab.h:561 [inline] [<ffffffff82baedf6>] usb_alloc_urb+0x66/0xe0 drivers/usb/core/urb.c:74 [<ffffffff82f7cce8>] zr364xx_start_readpipe+0x78/0x130 drivers/media/usb/zr364xx/zr364xx.c:1022 [<ffffffff84251dfc>] zr364xx_board_init drivers/media/usb/zr364xx/zr364xx.c:1383 [inline] [<ffffffff84251dfc>] zr364xx_probe+0x6a3/0x851 drivers/media/usb/zr364xx/zr364xx.c:1516 [<ffffffff82bb6507>] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 [<ffffffff826018a9>] really_probe+0x159/0x500 drivers/base/dd.c:576
--- drivers/media/usb/zr364xx/zr364xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/usb/zr364xx/zr364xx.c +1 -0
@@ -1034,6 +1034,7 @@ static int zr364xx_start_readpipe(structDBG ("submitting URB %p\n" , pipe_info->stream_urb); retval =usb_submit_urb (pipe_info->stream_urb,GFP_KERNEL );if (retval) { +usb_free_urb (pipe_info->stream_urb); printk(KERN_ERR KBUILD_MODNAME ": start read pipe failed\n");return retval; }
Greg Kroah-Hartman
maintainerPATCH 204/215 media: gspca/sq905: fix control-request direction
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 53ae298fde7adcc4b1432bce2dbdf8dac54dfa72 upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Fix the USB_REQ_SYNCH_FRAME request which erroneously used usb_sndctrlpipe().
--- drivers/media/usb/gspca/sq905.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/gspca/sq905.c +1 -1
@@ -116,7 +116,7 @@ static int sq905_command(struct gspca_de } ret = usb_control_msg(gspca_dev->dev, - usb_sndctrlpipe(gspca_dev->dev, 0), + usb_rcvctrlpipe(gspca_dev->dev, 0), USB_REQ_SYNCH_FRAME, /* request */ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, SQ905_PING, 0, gspca_dev->usb_buf, 1,
Greg Kroah-Hartman
maintainerPATCH 205/215 media: gspca/sunplus: fix zero-length control requests
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit b4bb4d425b7b02424afea2dfdcd77b3b4794175e upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using usb_sndctrlpipe(). Failing to do so will now trigger a warning.
Fix the single zero-length control request which was using the read-register helper, and update the helper so that zero-length reads fail with an error message instead.
--- drivers/media/usb/gspca/sunplus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/usb/gspca/sunplus.c +6 -2
@@ -242,6 +242,10 @@ static void reg_r(struct gspca_dev *gspcgspca_err (gspca_dev,"reg_r: buffer overflow\n" );return ; } +if (len ==0 ) { +gspca_err (gspca_dev,"reg_r: zero-length read\n" ); +return ; + }if (gspca_dev->usb_err <0 )return ; ret = usb_control_msg(gspca_dev->dev,
@@ -250,7 +254,7 @@ static void reg_r(struct gspca_dev *gspcUSB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,/* value */ index, - len ? gspca_dev->usb_buf :NULL , len, + gspca_dev->usb_buf, len, 500);if (ret <0 ) {pr_err ("reg_r err %d\n" , ret);
@@ -727,7 +731,7 @@ static int sd_start(struct gspca_dev *gscase MegaImageVI:reg_w_riv (gspca_dev,0xf0 ,0 ,0 );spca504B_WaitCmdStatus (gspca_dev); -reg_r (gspca_dev,0xf0 ,4 ,0 ); +reg_w_riv (gspca_dev,0xf0 ,4 ,0 );spca504B_WaitCmdStatus (gspca_dev);break ;default :
Greg Kroah-Hartman
maintainerPATCH 206/215 media: rtl28xxu: fix zero-length control request
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 25d5ce3a606a1eb23a9265d615a92a876ff9cb5f upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using usb_sndctrlpipe(). Failing to do so will now trigger a warning.
Fix the zero-length i2c-read request used for type detection by attempting to read a single byte instead.
--- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb-v2/rtl28xxu.c +2 -1
@@ -612,8 +612,9 @@ static int rtl28xxu_read_config(struct dstatic int rtl28xxu_identify_state (struct dvb_usb_device *d,const char **name) {struct rtl28xxu_dev *dev =d_to_priv (d); +u8 buf[1 ];int ret; -struct rtl28xxu_req req_demod_i2c = {0x0020 ,CMD_I2C_DA_RD ,0 ,NULL }; +struct rtl28xxu_req req_demod_i2c = {0x0020 ,CMD_I2C_DA_RD ,1 , buf};dev_dbg (&d->intf->dev,"\n" );
Greg Kroah-Hartman
maintainerPATCH 207/215 media: uvcvideo: Fix pixel format change for Elgato Cam Link 4K
In reply to Greg Kroah-HartmanFrom: Benjamin Drung <[email protected]>
commit 4c6e0976295add7f0ed94d276c04a3d6f1ea8f83 upstream.
The Elgato Cam Link 4K HDMI video capture card reports to support three different pixel formats, where the first format depends on the connected HDMI device.
``` $ v4l2-ctl -d /dev/video0 --list-formats-ext ioctl: VIDIOC_ENUM_FMT Type: Video Capture [0]: 'NV12' (Y/CbCr 4:2:0) Size: Discrete 3840x2160 Interval: Discrete 0.033s (29.970 fps) [1]: 'NV12' (Y/CbCr 4:2:0) Size: Discrete 3840x2160 Interval: Discrete 0.033s (29.970 fps) [2]: 'YU12' (Planar YUV 4:2:0) Size: Discrete 3840x2160 Interval: Discrete 0.033s (29.970 fps) ```
Changing the pixel format to anything besides the first pixel format does not work:
``` $ v4l2-ctl -d /dev/video0 --try-fmt-video pixelformat=YU12 Format Video Capture: Width/Height : 3840/2160 Pixel Format : 'NV12' (Y/CbCr 4:2:0) Field : None Bytes per Line : 3840 Size Image : 12441600 Colorspace : sRGB Transfer Function : Rec. 709 YCbCr/HSV Encoding: Rec. 709 Quantization : Default (maps to Limited Range) Flags : ```
User space applications like VLC might show an error message on the terminal in that case:
``` libv4l2: error set_fmt gave us a different result than try_fmt! ```
Depending on the error handling of the user space applications, they might display a distorted video, because they use the wrong pixel format for decoding the stream.
The Elgato Cam Link 4K responds to the USB video probe VS_PROBE_CONTROL/VS_COMMIT_CONTROL with a malformed data structure: The second byte contains bFormatIndex (instead of being the second byte of bmHint). The first byte is always zero. The third byte is always 1.
The firmware bug was reported to Elgato on 2020-12-01 and it was forwarded by the support team to the developers as feature request. There is no firmware update available since then. The latest firmware for Elgato Cam Link 4K as of 2021-03-23 has MCU 20.02.19 and FPGA 67.
Therefore correct the malformed data structure for this device. The change was successfully tested with VLC, OBS, and Chromium using different pixel formats (YUYV, NV12, YU12), resolutions (3840x2160, 1920x1080), and frame rates (29.970 and 59.940 fps).
--- drivers/media/usb/uvc/uvc_video.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/media/usb/uvc/uvc_video.c +27 -0
@@ -124,10 +124,37 @@ int uvc_query_ctrl(struct uvc_device *destatic void uvc_fixup_video_ctrl (struct uvc_streaming *stream,struct uvc_streaming_control *ctrl) { +static const struct usb_device_id elgato_cam_link_4k = { +USB_DEVICE (0x0fd9 ,0x0066 ) + };struct uvc_format *format =NULL ;struct uvc_frame *frame =NULL ;unsigned int i; +/* +* The response of the Elgato Cam Link 4K is incorrect: The second byte +* contains bFormatIndex (instead of being the second byte of bmHint). +* The first byte is always zero. The third byte is always 1. +* +* The UVC 1.5 class specification defines the first five bits in the +* bmHint bitfield. The remaining bits are reserved and should be zero. +* Therefore a valid bmHint will be less than 32. +* +* Latest Elgato Cam Link 4K firmware as of 2021-03-23 needs this fix. +* MCU: 20.02.19, FPGA: 67 +*/ +if (usb_match_one_id (stream->dev->intf, &elgato_cam_link_4k) && + ctrl->bmHint >255 ) { +u8 corrected_format_index = ctrl->bmHint >>8 ; + +/* uvc_dbg(stream->dev, VIDEO, +"Correct USB video probe response from {bmHint: 0x%04x, bFormatIndex: %u} to {bmHint: 0x%04x, bFormatIndex: %u}\n", +ctrl->bmHint, ctrl->bFormatIndex, +1, corrected_format_index); */ + ctrl->bmHint =1 ; + ctrl->bFormatIndex = corrected_format_index; + } +for (i =0 ; i < stream->nformats; ++i) {if (stream->format[i].index == ctrl->bFormatIndex) { format = &stream->format[i];
Greg Kroah-Hartman
maintainerPATCH 208/215 io_uring: fix clear IORING_SETUP_R_DISABLED in wrong function
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
In commit 3ebba796fa25 ("io_uring: ensure that SQPOLL thread is started for exit"), the IORING_SETUP_R_DISABLED is cleared in io_sq_offload_start(), but when backport it to stable-5.10, IORING_SETUP_R_DISABLED is cleared in __io_req_task_submit(), move clearing IORING_SETUP_R_DISABLED to io_sq_offload_start() to fix this.
--- fs/io_uring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/io_uring.c +1 -1
@@ -2087,7 +2087,6 @@ static void __io_req_task_submit(struct__io_req_task_cancel (req, -EFAULT );mutex_unlock (&ctx->uring_lock); - ctx->flags &= ~IORING_SETUP_R_DISABLED ;if (ctx->flags &IORING_SETUP_SQPOLL )io_sq_thread_drop_mm (); }
@@ -7992,6 +7991,7 @@ static void io_sq_offload_start(struct i {struct io_sq_data *sqd = ctx->sq_data; + ctx->flags &= ~IORING_SETUP_R_DISABLED ;if ((ctx->flags &IORING_SETUP_SQPOLL ) && sqd->thread)wake_up_process (sqd->thread); }
Greg Kroah-Hartman
maintainerPATCH 209/215 dm writecache: write at least 4k when committing
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 867de40c4c23e6d7f89f9ce4272a5d1b1484c122 upstream.
SSDs perform badly with sub-4k writes (because they perfrorm read-modify-write internally), so make sure writecache writes at least 4k when committing.
--- drivers/md/dm-writecache.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/md/dm-writecache.c +5 -1
@@ -532,7 +532,11 @@ static void ssd_commit_superblock(struct region.bdev = wc->ssd_dev->bdev; region.sector =0 ; - region.count = wc->block_size >>SECTOR_SHIFT ; + region.count =max (4096U , wc->block_size) >>SECTOR_SHIFT ; + +if (unlikely (region.sector + region.count > wc->metadata_sectors)) + region.count = wc->metadata_sectors - region.sector; + region.sector += wc->start_sector; req.bi_op =REQ_OP_WRITE ;
Greg Kroah-Hartman
maintainerPATCH 210/215 pinctrl: mcp23s08: Fix missing unlock on error in mcp23s08_irq()
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
commit 884af72c90016cfccd5717439c86b48702cbf184 upstream.
Add the missing unlock before return from function mcp23s08_irq() in the error handling case.
v1-->v2:
remove the "return IRQ_HANDLED" line
--- drivers/pinctrl/pinctrl-mcp23s08.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-mcp23s08.c +1 -1
@@ -353,7 +353,7 @@ static irqreturn_t mcp23s08_irq(int irq,if (intf ==0 ) {/* There is no interrupt pending */ -return IRQ_HANDLED ; + goto unlock; }if (mcp_read (mcp,MCP_INTCAP , &intcap))
Greg Kroah-Hartman
maintainerPATCH 211/215 drm/ast: Remove reference to struct drm_device.pdev
In reply to Greg Kroah-HartmanFrom: Thomas Zimmermann <[email protected]>
commit 0ecb51824e838372e01330752503ddf9c0430ef7 upstream.
Using struct drm_device.pdev is deprecated. Upcast with to_pci_dev() from struct drm_device.dev to get the PCI device structure.
v9:
* fix remaining pdev references
--- drivers/gpu/drm/ast/ast_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/ast/ast_main.c +2 -3
@@ -406,7 +406,6 @@ struct ast_private *ast_device_create(streturn ast; dev = &ast->base; - dev->pdev = pdev;pci_set_drvdata (pdev, dev); ast->regs =pcim_iomap (pdev,1 ,0 );
@@ -448,8 +447,8 @@ struct ast_private *ast_device_create(st/* map reserved buffer */ ast->dp501_fw_buf =NULL ; -if (dev->vram_mm->vram_size <pci_resource_len (dev->pdev,0 )) { - ast->dp501_fw_buf =pci_iomap_range (dev->pdev,0 , dev->vram_mm->vram_size,0 ); +if (dev->vram_mm->vram_size <pci_resource_len (pdev,0 )) { + ast->dp501_fw_buf =pci_iomap_range (pdev,0 , dev->vram_mm->vram_size,0 );if (!ast->dp501_fw_buf)drm_info (dev,"failed to map reserved buffer!\n" ); }
Greg Kroah-Hartman
maintainerPATCH 212/215 jfs: fix GPF in diFree
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit 9d574f985fe33efd6911f4d752de6f485a1ea732 upstream.
Avoid passing inode with
JFS_SBI(inode->i_sb)->ipimap == NULL to
diFree()[1]. GFP will appear:
struct inode *ipimap = JFS_SBI(ip->i_sb)->ipimap; struct inomap *imap = JFS_IP(ipimap)->i_imap;
JFS_IP() will return invalid pointer when ipimap == NULL
Call Trace: diFree+0x13d/0x2dc0 fs/jfs/jfs_imap.c:853 [1] jfs_evict_inode+0x2c9/0x370 fs/jfs/inode.c:154 evict+0x2ed/0x750 fs/inode.c:578 iput_final fs/inode.c:1654 [inline] iput.part.0+0x3fe/0x820 fs/inode.c:1680 iput+0x58/0x70 fs/inode.c:1670
--- fs/jfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/jfs/inode.c +2 -1
@@ -151,7 +151,8 @@ void jfs_evict_inode(struct inode *inodeif (test_cflag (COMMIT_Freewmap, inode))jfs_free_zero_link (inode); -diFree (inode); +if (JFS_SBI (inode->i_sb)->ipimap) +diFree (inode);/* * Free the inode from the quota allocation.
Greg Kroah-Hartman
maintainerPATCH 213/215 smackfs: restrict bytes count in smk_set_cipso()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit 49ec114a6e62d8d320037ce71c1aaf9650b3cafd upstream.
Oops, I failed to update subject line.
Quoted 1 line
From
07571157c91b98ce1a4aa70967531e64b78e8346Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <[email protected]>
Date: Mon, 12 Apr 2021 22:25:06 +0900
Subject: [PATCH 5.10 213/215] smackfs: restrict bytes count in smk_set_cipso()
Commit 7ef4c19d245f3dc2 ("smackfs: restrict bytes count in smackfs write functions") missed that count > SMK_CIPSOMAX check applies to only format == SMK_FIXED24_FMT case.
--- security/smack/smackfs.c | 2 ++ 1 file changed, 2 insertions(+)
security/smack/smackfs.c +2 -0
@@ -855,6 +855,8 @@ static ssize_t smk_set_cipso(struct fileif (format ==SMK_FIXED24_FMT && (count <SMK_CIPSOMIN || count >SMK_CIPSOMAX ))return -EINVAL ; +if (count >PAGE_SIZE ) +return -EINVAL ; data =memdup_user_nul (buf, count);if (IS_ERR (data))
Greg Kroah-Hartman
maintainerPATCH 214/215 ext4: fix memory leak in ext4_fill_super
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit 618f003199c6188e01472b03cdbba227f1dc5f24 upstream.
static int kthread(void *_create) will return -ENOMEM or -EINTR in case of internal failure or kthread_stop() call happens before threadfn call.
To prevent fancy error checking and make code more straightforward we moved all cleanup code out of kmmpd threadfn.
Also, dropped struct mmpd_data at all. Now struct super_block is a threadfn data and struct buffer_head embedded into struct ext4_sb_info.
--- fs/ext4/ext4.h | 4 ++++ fs/ext4/mmp.c | 28 +++++++++++++--------------- fs/ext4/super.c | 10 ++++------ 3 files changed, 21 insertions(+), 21 deletions(-)
fs/ext4/ext4.h +4 -0
@@ -1480,6 +1480,7 @@ struct ext4_sb_info {struct kobject s_kobj;struct completion s_kobj_unregister;struct super_block *s_sb; +struct buffer_head *s_mmp_bh;/* Journaling */ struct journal_s *s_journal;
@@ -3624,6 +3625,9 @@ extern struct ext4_io_end_vec *ext4_last/* mmp.c */ extern int ext4_multi_mount_protect (struct super_block *,ext4_fsblk_t ); +/* mmp.c */ +extern void ext4_stop_mmpd (struct ext4_sb_info *sbi); +/* verity.c */ extern const struct fsverity_operations ext4_verityops;
fs/ext4/mmp.c +13 -15
@@ -127,9 +127,9 @@ void __dump_mmp_msg(struct super_block **/ static int kmmpd (void *data) { -struct super_block *sb = ((struct mmpd_data *) data)->sb; -struct buffer_head *bh = ((struct mmpd_data *) data)->bh; +struct super_block *sb = (struct super_block *) data;struct ext4_super_block *es =EXT4_SB (sb)->s_es; +struct buffer_head *bh =EXT4_SB (sb)->s_mmp_bh;struct mmp_struct *mmp;ext4_fsblk_t mmp_block;u32 seq =0 ;
@@ -245,12 +245,18 @@ static int kmmpd(void *data) retval =write_mmp_block (sb, bh); exit_thread: -EXT4_SB (sb)->s_mmp_tsk =NULL ; -kfree (data); -brelse (bh);return retval; } +void ext4_stop_mmpd (struct ext4_sb_info *sbi) +{ +if (sbi->s_mmp_tsk) { +kthread_stop (sbi->s_mmp_tsk); +brelse (sbi->s_mmp_bh); + sbi->s_mmp_tsk =NULL ; + } +} +/* * Get a random new sequence number but make sure it is not greater than * EXT4_MMP_SEQ_MAX.
@@ -275,7 +281,6 @@ int ext4_multi_mount_protect(struct supestruct ext4_super_block *es =EXT4_SB (sb)->s_es;struct buffer_head *bh =NULL ;struct mmp_struct *mmp =NULL ; -struct mmpd_data *mmpd_data;u32 seq;unsigned int mmp_check_interval =le16_to_cpu (es->s_mmp_update_interval);unsigned int wait_time =0 ;
@@ -364,24 +369,17 @@ skip: goto failed; } - mmpd_data =kmalloc (sizeof (*mmpd_data),GFP_KERNEL ); -if (!mmpd_data) { -ext4_warning (sb,"not enough memory for mmpd_data" ); - goto failed; - } - mmpd_data->sb = sb; - mmpd_data->bh = bh; +EXT4_SB (sb)->s_mmp_bh = bh;/* * Start a kernel thread to update the MMP block periodically. */ -EXT4_SB (sb)->s_mmp_tsk =kthread_run (kmmpd, mmpd_data,"kmmpd-%.*s" , +EXT4_SB (sb)->s_mmp_tsk =kthread_run (kmmpd, sb,"kmmpd-%.*s" , (int )sizeof (mmp->mmp_bdevname),bdevname (bh->b_bdev, mmp->mmp_bdevname));if (IS_ERR (EXT4_SB (sb)->s_mmp_tsk)) {EXT4_SB (sb)->s_mmp_tsk =NULL ; -kfree (mmpd_data);ext4_warning (sb,"Unable to create kmmpd thread for %s." , sb->s_id); goto failed;
fs/ext4/super.c +4 -6
@@ -1260,8 +1260,8 @@ static void ext4_put_super(struct super_ext4_xattr_destroy_cache (sbi->s_ea_block_cache); sbi->s_ea_block_cache =NULL ; -if (sbi->s_mmp_tsk) -kthread_stop (sbi->s_mmp_tsk); +ext4_stop_mmpd (sbi); +brelse (sbi->s_sbh); sb->s_fs_info =NULL ;/*
@@ -5173,8 +5173,7 @@ failed_mount3a:ext4_es_unregister_shrinker (sbi); failed_mount3:del_timer_sync (&sbi->s_err_report); -if (sbi->s_mmp_tsk) -kthread_stop (sbi->s_mmp_tsk); +ext4_stop_mmpd (sbi); failed_mount2:rcu_read_lock (); group_desc =rcu_dereference (sbi->s_group_desc);
@@ -5927,8 +5926,7 @@ static int ext4_remount(struct super_blo*/ ext4_mark_recovery_complete (sb, es); } -if (sbi->s_mmp_tsk) -kthread_stop (sbi->s_mmp_tsk); +ext4_stop_mmpd (sbi); }else {/* Make sure we can mount this feature set readwrite */ if (ext4_has_feature_readonly(sb) ||
Greg Kroah-Hartman
maintainerPATCH 215/215 f2fs: fix to avoid racing on fsync_entry_slab by multi filesystem instances
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
commit cad83c968c2ebe97905f900326988ed37146c347 upstream.
As syzbot reported, there is an use-after-free issue during f2fs recovery:
Use-after-free write at 0xffff88823bc16040 (in kfence-#10):
kmem_cache_destroy+0x1f/0x120 mm/slab_common.c:486 f2fs_recover_fsync_data+0x75b0/0x8380 fs/f2fs/recovery.c:869 f2fs_fill_super+0x9393/0xa420 fs/f2fs/super.c:3945 mount_bdev+0x26c/0x3a0 fs/super.c:1367 legacy_get_tree+0xea/0x180 fs/fs_context.c:592 vfs_get_tree+0x86/0x270 fs/super.c:1497 do_new_mount fs/namespace.c:2905 [inline] path_mount+0x196f/0x2be0 fs/namespace.c:3235 do_mount fs/namespace.c:3248 [inline] __do_sys_mount fs/namespace.c:3456 [inline] __se_sys_mount+0x2f9/0x3b0 fs/namespace.c:3433 do_syscall_64+0x3f/0xb0 arch/x86/entry/common.c:47 entry_SYSCALL_64_after_hwframe+0x44/0xae
The root cause is multi f2fs filesystem instances can race on accessing global fsync_entry_slab pointer, result in use-after-free issue of slab cache, fixes to init/destroy this slab cache only once during module init/destroy procedure to avoid this issue.
--- fs/f2fs/f2fs.h | 2 ++ fs/f2fs/recovery.c | 23 ++++++++++++++--------- fs/f2fs/super.c | 8 +++++++- 3 files changed, 23 insertions(+), 10 deletions(-)
fs/f2fs/f2fs.h +2 -0
@@ -3462,6 +3462,8 @@ void f2fs_destroy_garbage_collection_cac*/ int f2fs_recover_fsync_data (struct f2fs_sb_info *sbi,bool check_only);bool f2fs_space_for_roll_forward (struct f2fs_sb_info *sbi); +int __init f2fs_create_recovery_cache (void ); +void f2fs_destroy_recovery_cache (void );/* * debug.c
fs/f2fs/recovery.c +14 -9
@@ -777,13 +777,6 @@ int f2fs_recover_fsync_data(struct f2fs_ quota_enabled =f2fs_enable_quota_files (sbi, s_flags &SB_RDONLY );#endif - fsync_entry_slab =f2fs_kmem_cache_create ("f2fs_fsync_inode_entry" , -sizeof (struct fsync_inode_entry )); -if (!fsync_entry_slab) { - err = -ENOMEM ; - goto out; - } -INIT_LIST_HEAD (&inode_list);INIT_LIST_HEAD (&tmp_inode_list);INIT_LIST_HEAD (&dir_list);
@@ -856,8 +849,6 @@ skip: } } -kmem_cache_destroy (fsync_entry_slab); -out:#ifdef CONFIG_QUOTA /* Turn quotas off */ if (quota_enabled)
@@ -867,3 +858,17 @@ out:return ret ? ret: err; } + +int __init f2fs_create_recovery_cache (void ) +{ + fsync_entry_slab =f2fs_kmem_cache_create ("f2fs_fsync_inode_entry" , +sizeof (struct fsync_inode_entry )); +if (!fsync_entry_slab) +return -ENOMEM ; +return 0 ; +} + +void f2fs_destroy_recovery_cache (void ) +{ +kmem_cache_destroy (fsync_entry_slab); +}
fs/f2fs/super.c +7 -1
@@ -4027,9 +4027,12 @@ static int __init init_f2fs_fs(void) err =f2fs_create_checkpoint_caches ();if (err) goto free_segment_manager_caches; - err =f2fs_create_extent_cache (); + err =f2fs_create_recovery_cache ();if (err) goto free_checkpoint_caches; + err =f2fs_create_extent_cache (); +if (err) + goto free_recovery_cache; err =f2fs_create_garbage_collection_cache ();if (err) goto free_extent_cache;
@@ -4078,6 +4081,8 @@ free_garbage_collection_cache:f2fs_destroy_garbage_collection_cache (); free_extent_cache:f2fs_destroy_extent_cache (); +free_recovery_cache: +f2fs_destroy_recovery_cache (); free_checkpoint_caches:f2fs_destroy_checkpoint_caches (); free_segment_manager_caches:
@@ -4103,6 +4108,7 @@ static void __exit exit_f2fs_fs(void)f2fs_exit_sysfs ();f2fs_destroy_garbage_collection_cache ();f2fs_destroy_extent_cache (); +f2fs_destroy_recovery_cache ();f2fs_destroy_checkpoint_caches ();f2fs_destroy_segment_manager_caches ();f2fs_destroy_node_manager_caches ();
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.51 release. There are 215 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 Sat, 17 Jul 2021 18:21:07 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.51-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB, using 32-bit and 64-bit ARM kernels:
Signature · 1 line
Florian
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 5.10.51 release. There are 215 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.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.51 release. There are 215 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 Sat, 17 Jul 2021 18:21:07 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.51-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.10:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
75 tests: 75 pass, 0 failLinux version: 5.10.51-rc1-g36558b9a3bb7
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.51 release. There are 215 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 Sat, 17 Jul 2021 18:21:07 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.51-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.10.51-rc1
* git: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git branch: linux-5.10.y
* git commit: 36558b9a3bb700ca62ec3ac2f06e6fbec57a35d2
* git describe: v5.10.50-216-g36558b9a3bb7
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.10.y/build/v5.10.50-216-g36558b9a3bb7
## No regressions (compared to v5.10.49-594-g3e2628c73ba0)
## No fixes (compared to v5.10.49-594-g3e2628c73ba0)
## Test result summary
total: 79086, pass: 65714, fail: 1691, skip: 10507, xfail: 1174,
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 193 total, 193 passed, 0 failed
* arm64: 27 total, 27 passed, 0 failed
* dragonboard-410c: 1 total, 1 passed, 0 failed
* hi6220-hikey: 1 total, 1 passed, 0 failed
* i386: 26 total, 26 passed, 0 failed
* juno-r2: 1 total, 1 passed, 0 failed
* mips: 45 total, 45 passed, 0 failed
* parisc: 9 total, 9 passed, 0 failed
* powerpc: 27 total, 27 passed, 0 failed
* riscv: 21 total, 21 passed, 0 failed
* s390: 18 total, 18 passed, 0 failed
* sh: 18 total, 18 passed, 0 failed
* sparc: 9 total, 9 passed, 0 failed
* x15: 1 total, 1 passed, 0 failed
* x86: 1 total, 1 passed, 0 failed
* x86_64: 27 total, 27 passed, 0 failed
## Test suites summary
* fwts
* install-android-platform-tools-r2600
* kselftest-
* kselftest-android
* kselftest-bpf
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-lkdtm
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-vsyscall-mode-native-
* kselftest-vsyscall-mode-none-
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* network-basic-tests
* packetdrill
* perf
* rcutorture
* ssuite
* v4l2-compliance
--
Linaro LKFT
https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.51 release. There are 215 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 Sat, 17 Jul 2021 18:21:07 +0000. Anything received after that time might be too late.
Building ia64:defconfig ... failed
--------------
Error log:
<stdin>:1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] mm/page_alloc.c:6270:20: error: conflicting types for 'memmap_init'; have 'void(void)'
6270 | void __init __weak memmap_init(void)
| ^~~~~~~~~~~
In file included from include/linux/pgtable.h:6,
from include/linux/mm.h:33,
from mm/page_alloc.c:19:
arch/ia64/include/asm/pgtable.h:523:17: note: previous declaration of 'memmap_init' with type 'void(long unsigned int, int, long unsigned int, long unsigned int)'
523 | extern void memmap_init (unsigned long size, int nid, unsigned long zone,
| ^~~~~~~~~~~I'll send a complete summary later, after builds are complete.
Guenter
Greg Kroah-Hartman
maintainerQuoted 17 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.51 release. There are 215 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 Sat, 17 Jul 2021 18:21:07 +0000. Anything received after that time might be too late.
Building ia64:defconfig ... failed
--------------
Error log:
<stdin>:1511:2: warning: #warning syscall clone3 not implemented [-Wcpp]mm/page_alloc.c:6270:20: error: conflicting types for 'memmap_init'; have 'void(void)'
6270 | void__init__weakmemmap_init(void)
Quoted 7 lines
| ^~~~~~~~~~~
In file included from include/linux/pgtable.h:6,
from include/linux/mm.h:33,
from mm/page_alloc.c:19:
arch/ia64/include/asm/pgtable.h:523:17: note: previous declaration of 'memmap_init' with type 'void(long unsigned int, int, long unsigned int, long unsigned int)'
523 | extern void memmap_init (unsigned long size, int nid, unsigned long zone,
| ^~~~~~~~~~~Found the offending commit, now dropped.
Will push out -rc2 for all trees now, what a mess...
thanks,
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.51 release. There are 215 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 Sat, 17 Jul 2021 18:21:07 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.51-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Tested on arm64 and x86 for 5.10.51-rc1,
Kernel repo:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Branch: linux-5.10.y
Version: 5.10.51-rc1
Commit: 36558b9a3bb700ca62ec3ac2f06e6fbec57a35d2
Compiler: gcc version 7.3.0 (GCC)
arm64:
--------------------------------------------------------------------
Testcase Result Summary:
total: 8906
passed: 8906
failed: 0
timeout: 0
--------------------------------------------------------------------
x86:
--------------------------------------------------------------------
Testcase Result Summary:
total: 8906
passed: 8906
failed: 0
timeout: 0
--------------------------------------------------------------------