6.14.5-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 265/311 timekeeping: Add a lockdep override in tick_freeze()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 92e250c624ea37fde64bfd624fd2556f0d846f18 ]
tick_freeze() acquires a raw spinlock (tick_freeze_lock). Later in the callchain (timekeeping_suspend() -> mc146818_avoid_UIP()) the RTC driver acquires a spinlock which becomes a sleeping lock on PREEMPT_RT. Lockdep complains about this lock nesting.
Add a lockdep override for this special case and a comment explaining why it is okay.
--- kernel/time/tick-common.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
kernel/time/tick-common.c +22 -0
@@ -509,6 +509,7 @@ void tick_resume(void)#ifdef CONFIG_SUSPEND static DEFINE_RAW_SPINLOCK (tick_freeze_lock); +static DEFINE_WAIT_OVERRIDE_MAP(tick_freeze_map, LD_WAIT_SLEEP);static unsigned int tick_freeze_depth;/**
@@ -528,9 +529,22 @@ void tick_freeze(void)if (tick_freeze_depth ==num_online_cpus ()) {trace_suspend_resume (TPS ("timekeeping_freeze" ),smp_processor_id (), true); +/* +* All other CPUs have their interrupts disabled and are +* suspended to idle. Other tasks have been frozen so there +* is no scheduling happening. This means that there is no +* concurrency in the system at this point. Therefore it is +* okay to acquire a sleeping lock on PREEMPT_RT, such as a +* spinlock, because the lock cannot be held by other CPUs +* or threads and acquiring it cannot block. +* +* Inform lockdep about the situation. +*/ +lock_map_acquire_try (&tick_freeze_map); system_state =SYSTEM_SUSPEND ;sched_clock_suspend ();timekeeping_suspend (); +lock_map_release (&tick_freeze_map); }else {tick_suspend_local (); }
@@ -552,8 +566,16 @@ void tick_unfreeze(void)raw_spin_lock (&tick_freeze_lock);if (tick_freeze_depth ==num_online_cpus ()) { +/* +* Similar to tick_freeze(). On resumption the first CPU may +* acquire uncontended sleeping locks while other CPUs block on +* tick_freeze_lock. +*/ +lock_map_acquire_try (&tick_freeze_map);timekeeping_resume ();sched_clock_resume (); +lock_map_release (&tick_freeze_map); + system_state =SYSTEM_RUNNING ;trace_suspend_resume (TPS ("timekeeping_freeze" ),smp_processor_id (), false);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 266/311 cifs: Fix querying of WSL CHR and BLK reparse points over SMB1
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit ef86ab131d9127dfbfa8f06e12441d05fdfb090b ]
When reparse point in SMB1 query_path_info() callback was detected then query also for EA $LXDEV. In this EA are stored device major and minor numbers used by WSL CHR and BLK reparse points. Without major and minor numbers, stat() syscall does not work for char and block devices.
Similar code is already in SMB2+ query_path_info() callback function.
--- fs/smb/client/smb1ops.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
fs/smb/client/smb1ops.c +36 -0
@@ -573,6 +573,42 @@ static int cifs_query_path_info(const unsigned int xid, data->reparse_point =le32_to_cpu (fi.Attributes) &ATTR_REPARSE ; } +#ifdef CONFIG_CIFS_XATTR +/* +* For WSL CHR and BLK reparse points it is required to fetch +* EA $LXDEV which contains major and minor device numbers. +*/ +if (!rc && data->reparse_point) { +struct smb2_file_full_ea_info *ea; + + ea = (struct smb2_file_full_ea_info *)data->wsl.eas; + rc =CIFSSMBQAllEAs (xid, tcon, full_path,SMB2_WSL_XATTR_DEV , + &ea->ea_data[SMB2_WSL_XATTR_NAME_LEN +1 ], +SMB2_WSL_XATTR_DEV_SIZE , cifs_sb); +if (rc ==SMB2_WSL_XATTR_DEV_SIZE ) { + ea->next_entry_offset =cpu_to_le32 (0 ); + ea->flags =0 ; + ea->ea_name_length =SMB2_WSL_XATTR_NAME_LEN ; + ea->ea_value_length =cpu_to_le16 (SMB2_WSL_XATTR_DEV_SIZE ); +memcpy (&ea->ea_data[0 ],SMB2_WSL_XATTR_DEV ,SMB2_WSL_XATTR_NAME_LEN +1 ); + data->wsl.eas_len =sizeof (*ea) +SMB2_WSL_XATTR_NAME_LEN +1 + +SMB2_WSL_XATTR_DEV_SIZE ; + rc =0 ; + }else if (rc >=0 ) { +/* It is an error if EA $LXDEV has wrong size. */ + rc = -EINVAL ; + }else { +/* +* In all other cases ignore error if fetching +* of EA $LXDEV failed. It is needed only for +* WSL CHR and BLK reparse points and wsl_to_fattr() +* handle the case when EA is missing. +*/ + rc =0 ; + } + } +#endif +return rc; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 267/311 iommu: Clear iommu-dma ops on cleanup
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin Murphy <[email protected]>
[ Upstream commit 280e5a30100578106a4305ce0118e0aa9b866f12 ]
If iommu_device_register() encounters an error, it can end up tearing down already-configured groups and default domains, however this currently still leaves devices hooked up to iommu-dma (and even historically the behaviour in this area was at best inconsistent across architectures/drivers...) Although in the case that an IOMMU is present whose driver has failed to probe, users cannot necessarily expect DMA to work anyway, it's still arguable that we should do our best to put things back as if the IOMMU driver was never there at all, and certainly the potential for crashing in iommu-dma itself is undesirable. Make sure we clean up the dev->dma_iommu flag along with everything else.
--- drivers/iommu/iommu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/iommu.c +3 -0
@@ -508,6 +508,9 @@ static void iommu_deinit_device(struct device *dev) dev->iommu_group =NULL ;module_put (ops->owner);dev_iommu_free (dev); +#ifdef CONFIG_IOMMU_DMA + dev->dma_iommu = false; +#endif }DEFINE_MUTEX (iommu_probe_device_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 268/311 ext4: make block validity check resistent to sb bh corruption
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ojaswin Mujoo <[email protected]>
[ Upstream commit ccad447a3d331a239477c281533bacb585b54a98 ]
Block validity checks need to be skipped in case they are called for journal blocks since they are part of system's protected zone.
Currently, this is done by checking inode->ino against sbi->s_es->s_journal_inum, which is a direct read from the ext4 sb buffer head. If someone modifies this underneath us then the s_journal_inum field might get corrupted. To prevent against this, change the check to directly compare the inode with journal->j_inode.
**Slight change in behavior**: During journal init path, check_block_validity etc might be called for journal inode when sbi->s_journal is not set yet. In this case we now proceed with ext4_inode_block_valid() instead of returning early. Since systems zones have not been set yet, it is okay to proceed so we can perform basic checks on the blocks.
--- fs/ext4/block_validity.c | 5 ++--- fs/ext4/inode.c | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-)
fs/ext4/block_validity.c +2 -3
@@ -351,10 +351,9 @@ int ext4_check_blockref(const char *function, unsigned int line, {__le32 *bref = p;unsigned int blk; +journal_t *journal =EXT4_SB (inode->i_sb)->s_journal; -if (ext4_has_feature_journal (inode->i_sb) && - (inode->i_ino == -le32_to_cpu (EXT4_SB (inode->i_sb)->s_es->s_journal_inum))) +if (journal && inode == journal->j_inode)return 0 ;while (bref < p+max) {
fs/ext4/inode.c +4 -3
@@ -383,10 +383,11 @@ static int __check_block_validity(struct inode *inode, const char *func,unsigned int line, struct ext4_map_blocks *map) { - if (ext4_has_feature_journal(inode->i_sb) && - (inode->i_ino == - le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_journal_inum))) + journal_t *journal = EXT4_SB(inode->i_sb)->s_journal; + +if (journal && inode == journal->j_inode)return 0 ; +if (!ext4_inode_block_valid (inode, map->m_pblk, map->m_len)) {ext4_error_inode (inode, func, line, map->m_pblk, "lblock %lu mapped to illegal pblock %llu "
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 269/311 scsi: hisi_sas: Fix I/O errors caused by hardware port ID changes
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingui Yang <[email protected]>
[ Upstream commit daff37f00c7506ca322ccfce95d342022f06ec58 ]
The hw port ID of phy may change when inserting disks in batches, causing the port ID in hisi_sas_port and itct to be inconsistent with the hardware, resulting in I/O errors. The solution is to set the device state to gone to intercept I/O sent to the device, and then execute linkreset to discard and find the disk to re-update its information.
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/scsi/hisi_sas/hisi_sas_main.c +20 -0
@@ -935,8 +935,28 @@ static void hisi_sas_phyup_work_common(struct work_struct *work,container_of (work,typeof (*phy), works[event]);struct hisi_hba *hisi_hba = phy->hisi_hba;struct asd_sas_phy *sas_phy = &phy->sas_phy; +struct asd_sas_port *sas_port = sas_phy->port; +struct hisi_sas_port *port = phy->port; +struct device *dev = hisi_hba->dev; +struct domain_device *port_dev;int phy_no = sas_phy->id; +if (!test_bit (HISI_SAS_RESETTING_BIT , &hisi_hba->flags) && + sas_port && port && (port->id != phy->port_id)) { +dev_info (dev,"phy%d's hw port id changed from %d to %llu\n" , + phy_no, port->id, phy->port_id); + port_dev = sas_port->port_dev; +if (port_dev && !dev_is_expander (port_dev->dev_type)) { +/* +* Set the device state to gone to block +* sending IO to the device. +*/ +set_bit (SAS_DEV_GONE , &port_dev->state); +hisi_sas_notify_phy_event (phy,HISI_PHYE_LINK_RESET ); +return ; + } + } + phy->wait_phyup_cnt =0 ;if (phy->identify.target_port_protocols ==SAS_PROTOCOL_SSP ) hisi_hba->hw->sl_notify_ssp (hisi_hba, phy_no);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 270/311 scsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit 3d101165e72316775947d71321d97194f03dfef3 ]
Ensure clocks are enabled before configuring unipro. Additionally move the pre_link() hook before the exynos_ufs_phy_init() calls. This means the register write sequence more closely resembles the ordering of the downstream driver.
--- drivers/ufs/host/ufs-exynos.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/ufs/host/ufs-exynos.c +5 -5
@@ -1060,9 +1060,14 @@ static int exynos_ufs_pre_link(struct ufs_hba *hba)exynos_ufs_config_intr (ufs,DFES_DEF_L4_ERRS ,UNIPRO_L4 );exynos_ufs_set_unipro_pclk_div (ufs); +exynos_ufs_setup_clocks (hba, true,PRE_CHANGE ); +/* unipro */ exynos_ufs_config_unipro (ufs); +if (ufs->drv_data->pre_link) + ufs->drv_data->pre_link (ufs); +/* m-phy */ exynos_ufs_phy_init (ufs);if (!(ufs->opts &EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR )) {
@@ -1070,11 +1075,6 @@ static int exynos_ufs_pre_link(struct ufs_hba *hba)exynos_ufs_config_phy_cap_attr (ufs); } -exynos_ufs_setup_clocks (hba, true,PRE_CHANGE ); - -if (ufs->drv_data->pre_link) - ufs->drv_data->pre_link (ufs); -return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 271/311 scsi: ufs: exynos: Enable PRDT pre-fetching with UFSHCD_CAP_CRYPTO
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit deac9ad496ec17e1ec06848964ecc635bdaca703 ]
PRDT_PREFETCH_ENABLE[31] bit should be set when desctype field of fmpsecurity0 register is type2 (double file encryption) or type3 (support for file and disk encryption). Setting this bit enables PRDT pre-fetching on both TXPRDT and RXPRDT.
--- drivers/ufs/host/ufs-exynos.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/ufs/host/ufs-exynos.c +7 -2
@@ -34,7 +34,7 @@* Exynos's Vendor specific registers for UFSHCI */ #define HCI_TXPRDT_ENTRY_SIZE 0x00 -#define PRDT_PREFECT_EN BIT(31) +#define PRDT_PREFETCH_EN BIT(31)#define HCI_RXPRDT_ENTRY_SIZE 0x04#define HCI_1US_TO_CNT_VAL 0x0C#define CNT_VAL_1US_MASK 0x3FF
@@ -1098,12 +1098,17 @@ static int exynos_ufs_post_link(struct ufs_hba *hba)struct exynos_ufs *ufs =ufshcd_get_variant (hba);struct phy *generic_phy = ufs->phy;struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr; +u32 val =ilog2 (DATA_UNIT_SIZE );exynos_ufs_establish_connt (ufs);exynos_ufs_fit_aggr_timeout (ufs);hci_writel (ufs,0xa ,HCI_DATA_REORDER ); -hci_writel (ufs,ilog2 (DATA_UNIT_SIZE ),HCI_TXPRDT_ENTRY_SIZE ); + +if (hba->caps &UFSHCD_CAP_CRYPTO ) + val |=PRDT_PREFETCH_EN ; +hci_writel (ufs, val,HCI_TXPRDT_ENTRY_SIZE ); +hci_writel (ufs,ilog2 (DATA_UNIT_SIZE ),HCI_RXPRDT_ENTRY_SIZE );hci_writel (ufs, (1 << hba->nutrs) -1 ,HCI_UTRL_NEXUS_TYPE );hci_writel (ufs, (1 << hba->nutmrs) -1 ,HCI_UTMRL_NEXUS_TYPE );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 272/311 scsi: ufs: exynos: Move phy calls to .exit() callback
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit 67e4085015c33bf2fb552af1f171c58b81ef0616 ]
ufshcd_pltfrm_remove() calls ufshcd_remove(hba) which in turn calls ufshcd_hba_exit().
By moving the phy_power_off() and phy_exit() calls to the newly created .exit callback they get called by ufshcd_variant_hba_exit() before ufshcd_hba_exit() turns off the regulators. This is also similar flow to the ufs-qcom driver.
--- drivers/ufs/host/ufs-exynos.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/ufs/host/ufs-exynos.c +9 -6
@@ -1522,6 +1522,14 @@ static int exynos_ufs_init(struct ufs_hba *hba)return ret; } +static void exynos_ufs_exit (struct ufs_hba *hba) +{ +struct exynos_ufs *ufs =ufshcd_get_variant (hba); + +phy_power_off (ufs->phy); +phy_exit (ufs->phy); +} +static int exynos_ufs_host_reset (struct ufs_hba *hba) {struct exynos_ufs *ufs =ufshcd_get_variant (hba);
@@ -1977,6 +1985,7 @@ static int gs101_ufs_pre_pwr_change(struct exynos_ufs *ufs,static const struct ufs_hba_variant_ops ufs_hba_exynos_ops = { .name ="exynos_ufs" , .init = exynos_ufs_init, + .exit = exynos_ufs_exit, .hce_enable_notify = exynos_ufs_hce_enable_notify, .link_startup_notify = exynos_ufs_link_startup_notify, .pwr_change_notify = exynos_ufs_pwr_change_notify,
@@ -2015,13 +2024,7 @@ static int exynos_ufs_probe(struct platform_device *pdev)static void exynos_ufs_remove (struct platform_device *pdev) { -struct ufs_hba *hba =platform_get_drvdata (pdev); -struct exynos_ufs *ufs =ufshcd_get_variant (hba); -ufshcd_pltfrm_remove (pdev); - -phy_power_off (ufs->phy); -phy_exit (ufs->phy); }static struct exynos_ufs_uic_attr exynos7_uic_attr = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 273/311 scsi: ufs: exynos: gs101: Put UFS device in reset on .suspend()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit cd4c0025069f16fc666c6ffc56c49c9b1154841f ]
GPIO_OUT[0] is connected to the reset pin of embedded UFS device. Before powering off the phy assert the reset signal.
This is added as a gs101 specific suspend hook so as not to have any unintended consequences for other SoCs supported by this driver.
--- drivers/ufs/host/ufs-exynos.c | 10 ++++++++++ drivers/ufs/host/ufs-exynos.h | 1 + 2 files changed, 11 insertions(+)
drivers/ufs/host/ufs-exynos.c +10 -0
@@ -1700,6 +1700,12 @@ static void exynos_ufs_hibern8_notify(struct ufs_hba *hba, } } +static int gs101_ufs_suspend (struct exynos_ufs *ufs) +{ +hci_writel (ufs,0 <<0 ,HCI_GPIO_OUT ); +return 0 ; +} +static int exynos_ufs_suspend (struct ufs_hba *hba,enum ufs_pm_op pm_op,enum ufs_notify_change_status status) {
@@ -1708,6 +1714,9 @@ static int exynos_ufs_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,if (status ==PRE_CHANGE )return 0 ; +if (ufs->drv_data->suspend) + ufs->drv_data->suspend (ufs); +if (!ufshcd_is_link_active (hba))phy_power_off (ufs->phy);
@@ -2170,6 +2179,7 @@ static const struct exynos_ufs_drv_data gs101_ufs_drvs = { .pre_link = gs101_ufs_pre_link, .post_link = gs101_ufs_post_link, .pre_pwr_change = gs101_ufs_pre_pwr_change, + .suspend = gs101_ufs_suspend, };static const struct of_device_id exynos_ufs_of_match[] = {
drivers/ufs/host/ufs-exynos.h +1 -0
@@ -192,6 +192,7 @@ struct exynos_ufs_drv_data { struct ufs_pa_layer_attr *pwr);int (*pre_hce_enable)(struct exynos_ufs *ufs);int (*post_hce_enable)(struct exynos_ufs *ufs); +int (*suspend)(struct exynos_ufs *ufs); };struct ufs_phy_time_cfg {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 274/311 scsi: pm80xx: Set phy_attached to zero when device is gone
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Igor Pylypiv <[email protected]>
[ Upstream commit f7b705c238d1483f0a766e2b20010f176e5c0fb7 ]
When a fatal error occurs, a phy down event may not be received to set phy->phy_attached to zero.
--- drivers/scsi/pm8001/pm8001_sas.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/pm8001/pm8001_sas.c +1 -0
@@ -766,6 +766,7 @@ static void pm8001_dev_gone_notify(struct domain_device *dev)spin_lock_irqsave (&pm8001_ha->lock, flags); }PM8001_CHIP_DISP ->dereg_dev_req (pm8001_ha, device_id); + pm8001_ha->phy[pm8001_dev->attached_phy].phy_attached =0 ;pm8001_free_dev (pm8001_dev); }else {pm8001_dbg (pm8001_ha,DISC ,"Found dev has gone.\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 275/311 ASoC: fsl_asrc_dma: get codec or cpu dai from backend
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengjiu Wang <[email protected]>
[ Upstream commit ef5c23ae9ab380fa756f257411024a9b4518d1b9 ]
With audio graph card, original cpu dai is changed to codec device in backend, so if cpu dai is dummy device in backend, get the codec dai device, which is the real hardware device connected.
The specific case is ASRC->SAI->AMIX->CODEC.
--- sound/soc/fsl/fsl_asrc_dma.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
sound/soc/fsl/fsl_asrc_dma.c +14 -1
@@ -156,11 +156,24 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,for_each_dpcm_be (rtd, stream, dpcm) {struct snd_soc_pcm_runtime *be = dpcm->be;struct snd_pcm_substream *substream_be; -struct snd_soc_dai *dai =snd_soc_rtd_to_cpu (be,0 ); +struct snd_soc_dai *dai_cpu =snd_soc_rtd_to_cpu (be,0 ); +struct snd_soc_dai *dai_codec =snd_soc_rtd_to_codec (be,0 ); +struct snd_soc_dai *dai;if (dpcm->fe != rtd)continue ; +/* +* With audio graph card, original cpu dai is changed to codec +* device in backend, so if cpu dai is dummy device in backend, +* get the codec dai device, which is the real hardware device +* connected. +*/ +if (!snd_soc_dai_is_dummy (dai_cpu)) + dai = dai_cpu; +else + dai = dai_codec; + substream_be =snd_soc_dpcm_get_substream (be, stream); dma_params_be =snd_soc_dai_get_dma_data (dai, substream_be); dev_be = dai->dev;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 276/311 ASoC: codecs: Add of_match_table for aw888081 driver
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weidong Wang <[email protected]>
[ Upstream commit 6bbb2b1286f437b45ccf4828a537429153cd1096 ]
Add of_match_table for aw88081 driver to make matching between dts and driver more flexible
--- sound/soc/codecs/aw88081.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/soc/codecs/aw88081.c +10 -0
@@ -1295,9 +1295,19 @@ static int aw88081_i2c_probe(struct i2c_client *i2c) aw88081_dai, ARRAY_SIZE(aw88081_dai)); } +#if defined(CONFIG_OF ) +static const struct of_device_id aw88081_of_match[] = { + { .compatible ="awinic,aw88081" }, + { .compatible ="awinic,aw88083" }, + { } +}; +MODULE_DEVICE_TABLE (of, aw88081_of_match); +#endif +static struct i2c_driver aw88081_i2c_driver = { .driver = { .name =AW88081_I2C_NAME , + .of_match_table =of_match_ptr (aw88081_of_match), }, .probe = aw88081_i2c_probe, .id_table = aw88081_i2c_id,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 277/311 x86/i8253: Call clockevent_i8253_disable() with interrupts disabled
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fernando Fernandez Mancera <[email protected]>
[ Upstream commit 3940f5349b476197fb079c5aa19c9a988de64efb ]
There's a lockdep false positive warning related to i8253_lock:
WARNING: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected
...
systemd-sleep/3324 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:
ffffffffb2c23398 (i8253_lock){+.+.}-{2:2}, at: pcspkr_event+0x3f/0xe0 [pcspkr]
...
... which became HARDIRQ-irq-unsafe at:
...
lock_acquire+0xd0/0x2f0
_raw_spin_lock+0x30/0x40
clockevent_i8253_disable+0x1c/0x60
pit_timer_init+0x25/0x50
hpet_time_init+0x46/0x50
x86_late_time_init+0x1b/0x40
start_kernel+0x962/0xa00
x86_64_start_reservations+0x24/0x30
x86_64_start_kernel+0xed/0xf0
common_startup_64+0x13e/0x141
...Lockdep complains due pit_timer_init() using the lock in an IRQ-unsafe fashion, but it's a false positive, because there is no deadlock possible at that point due to init ordering: at the point where pit_timer_init() is called there is no other possible usage of i8253_lock because the system is still in the very early boot stage with no interrupts.
But in any case, pit_timer_init() should disable interrupts before calling clockevent_i8253_disable() out of general principle, and to keep lockdep working even in this scenario.
Use scoped_guard() for that, as suggested by Thomas Gleixner.
[ mingo: Cleaned up the changelog. ]
--- arch/x86/kernel/i8253.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/i8253.c +2 -1
@@ -46,7 +46,8 @@ bool __init pit_timer_init(void)* VMMs otherwise steal CPU time just to pointlessly waggle * the (masked) IRQ. */ -clockevent_i8253_disable (); +scoped_guard (irq) +clockevent_i8253_disable ();return false; }clockevent_i8253_init (true);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 278/311 platform/x86: x86-android-tablets: Add "9v" to Vexia EDU ATLA 10 tablet symbols
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 3343b086c7035222c24956780ea4423655cad6d2 ]
The Vexia EDU ATLA 10 tablet comes in 2 different versions with significantly different mainboards. The only outward difference is that the charging barrel on one is marked 5V and the other is marked 9V.
Both need to be handled by the x86-android-tablets code. Add 9v to the symbols for the existing support for the 9V Vexia EDU ATLA 10 tablet symbols to prepare for adding support for the 5V version.
All this patch does is s/vexia_edu_atla10_info/vexia_edu_atla10_9v_info/.
--- .../platform/x86/x86-android-tablets/dmi.c | 2 +- .../platform/x86/x86-android-tablets/other.c | 64 +++++++++---------- .../x86-android-tablets/x86-android-tablets.h | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-)
drivers/platform/x86/x86-android-tablets/dmi.c +1 -1
@@ -187,7 +187,7 @@ const struct dmi_system_id x86_android_tablet_ids[] __initconst = {/* Above strings are too generic, also match on BIOS date */ DMI_MATCH(DMI_BIOS_DATE, "08/25/2014"), }, - .driver_data = (void *)&vexia_edu_atla10_info, + .driver_data = (void *)&vexia_edu_atla10_9v_info, }, {/* Whitelabel (sold as various brands) TM800A550L */
drivers/platform/x86/x86-android-tablets/other.c +32 -32
154 lines not on this page · raw message
drivers/platform/x86/x86-android-tablets/x86-android-tablets.h +1 -1
@@ -127,7 +127,7 @@ extern const struct x86_dev_info nextbook_ares8_info;extern const struct x86_dev_info nextbook_ares8a_info;extern const struct x86_dev_info peaq_c1010_info;extern const struct x86_dev_info whitelabel_tm800a550l_info; -extern const struct x86_dev_info vexia_edu_atla10_info; +extern const struct x86_dev_info vexia_edu_atla10_9v_info;extern const struct x86_dev_info xiaomi_mipad2_info;extern const struct dmi_system_id x86_android_tablet_ids[];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 279/311 platform/x86: x86-android-tablets: Add Vexia Edu Atla 10 tablet 5V data
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 59df54c67be3e587e4217bddd793350fbe8f5feb ]
The Vexia EDU ATLA 10 tablet comes in 2 different versions with significantly different mainboards. The only outward difference is that the charging barrel on one is marked 5V and the other is marked 9V.
Both are x86 ACPI tablets which ships with Android x86 as factory OS. with a DSDT which contains a bunch of I2C devices which are not actually there, causing various resource conflicts. Enumeration of these is skipped through the acpi_quirk_skip_i2c_client_enumeration().
Extend the existing support for the 9V version by adding support for manually instantiating the I2C devices which are actually present on the 5V version by adding the necessary device info to
the x86-android-tablets module.
--- .../platform/x86/x86-android-tablets/dmi.c | 12 ++++ .../platform/x86/x86-android-tablets/other.c | 60 +++++++++++++++++++ .../x86-android-tablets/x86-android-tablets.h | 1 + 3 files changed, 73 insertions(+)
drivers/platform/x86/x86-android-tablets/dmi.c +12 -0
@@ -179,6 +179,18 @@ const struct dmi_system_id x86_android_tablet_ids[] __initconst = { }, .driver_data = (void *)&peaq_c1010_info, }, + { +/* Vexia Edu Atla 10 tablet 5V version */ + .matches = { +/* Having all 3 of these not set is somewhat unique */ +DMI_MATCH (DMI_SYS_VENDOR ,"To be filled by O.E.M." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"To be filled by O.E.M." ), +DMI_MATCH (DMI_BOARD_NAME ,"To be filled by O.E.M." ), +/* Above strings are too generic, also match on BIOS date */ + DMI_MATCH(DMI_BIOS_DATE, "05/14/2015"), + }, + .driver_data = (void *)&vexia_edu_atla10_5v_info, + }, {/* Vexia Edu Atla 10 tablet 9V version */ .matches = {
drivers/platform/x86/x86-android-tablets/other.c +60 -0
66 lines not on this page · raw message
drivers/platform/x86/x86-android-tablets/x86-android-tablets.h +1 -0
@@ -127,6 +127,7 @@ extern const struct x86_dev_info nextbook_ares8_info;extern const struct x86_dev_info nextbook_ares8a_info;extern const struct x86_dev_info peaq_c1010_info;extern const struct x86_dev_info whitelabel_tm800a550l_info; +extern const struct x86_dev_info vexia_edu_atla10_5v_info;extern const struct x86_dev_info vexia_edu_atla10_9v_info;extern const struct x86_dev_info xiaomi_mipad2_info;extern const struct dmi_system_id x86_android_tablet_ids[];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 280/311 netfs: Only create /proc/fs/netfs with CONFIG_PROC_FS
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Song Liu <[email protected]>
[ Upstream commit 40cb48eba3b4b79e110c1a35d33a48cac54507a2 ]
When testing a special config:
CONFIG_NETFS_SUPPORTS=yCONFIG_PROC_FS=n
The system crashes with something like:
[ 3.766197] ------------[ cut here ]------------ [ 3.766484] kernel BUG at mm/mempool.c:560! [ 3.766789] Oops: invalid opcode: 0000 [#1] SMP NOPTI [ 3.767123] CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Tainted: G W [ 3.767777] Tainted: [W]=WARN [ 3.767968] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), [ 3.768523] RIP: 0010:mempool_alloc_slab.cold+0x17/0x19 [ 3.768847] Code: 50 fe ff 58 5b 5d 41 5c 41 5d 41 5e 41 5f e9 93 95 13 00 [ 3.769977] RSP: 0018:ffffc90000013998 EFLAGS: 00010286 [ 3.770315] RAX: 000000000000002f RBX: ffff888100ba8640 RCX: 0000000000000000 [ 3.770749] RDX: 0000000000000000 RSI: 0000000000000003 RDI: 00000000ffffffff [ 3.771217] RBP: 0000000000092880 R08: 0000000000000000 R09: ffffc90000013828 [ 3.771664] R10: 0000000000000001 R11: 00000000ffffffea R12: 0000000000092cc0 [ 3.772117] R13: 0000000000000400 R14: ffff8881004b1620 R15: ffffea0004ef7e40 [ 3.772554] FS: 0000000000000000(0000) GS:ffff8881b5f3c000(0000) knlGS:0000000000000000 [ 3.773061] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3.773443] CR2: ffffffff830901b4 CR3: 0000000004296001 CR4: 0000000000770ef0 [ 3.773884] PKRU: 55555554 [ 3.774058] Call Trace: [ 3.774232] <TASK> [ 3.774371] mempool_alloc_noprof+0x6a/0x190 [ 3.774649] ? _printk+0x57/0x80 [ 3.774862] netfs_alloc_request+0x85/0x2ce [ 3.775147] netfs_readahead+0x28/0x170 [ 3.775395] read_pages+0x6c/0x350 [ 3.775623] ? srso_alias_return_thunk+0x5/0xfbef5 [ 3.775928] page_cache_ra_unbounded+0x1bd/0x2a0 [ 3.776247] filemap_get_pages+0x139/0x970 [ 3.776510] ? srso_alias_return_thunk+0x5/0xfbef5 [ 3.776820] filemap_read+0xf9/0x580 [ 3.777054] ? srso_alias_return_thunk+0x5/0xfbef5 [ 3.777368] ? srso_alias_return_thunk+0x5/0xfbef5 [ 3.777674] ? find_held_lock+0x32/0x90 [ 3.777929] ? netfs_start_io_read+0x19/0x70 [ 3.778221] ? netfs_start_io_read+0x19/0x70 [ 3.778489] ? srso_alias_return_thunk+0x5/0xfbef5 [ 3.778800] ? lock_acquired+0x1e6/0x450 [ 3.779054] ? srso_alias_return_thunk+0x5/0xfbef5 [ 3.779379] netfs_buffered_read_iter+0x57/0x80 [ 3.779670] __kernel_read+0x158/0x2c0 [ 3.779927] bprm_execve+0x300/0x7a0 [ 3.780185] kernel_execve+0x10c/0x140 [ 3.780423] ? __pfx_kernel_init+0x10/0x10 [ 3.780690] kernel_init+0xd5/0x150 [ 3.780910] ret_from_fork+0x2d/0x50 [ 3.781156] ? __pfx_kernel_init+0x10/0x10 [ 3.781414] ret_from_fork_asm+0x1a/0x30 [ 3.781677] </TASK> [ 3.781823] Modules linked in: [ 3.782065] ---[ end trace 0000000000000000 ]---
This is caused by the following error path in netfs_init():
if (!proc_mkdir("fs/netfs", NULL))
goto error_proc;Fix this by adding ifdef in netfs_main(), so that /proc/fs/netfs is only created with CONFIG_PROC_FS.
--- fs/netfs/main.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/netfs/main.c +4 -0
@@ -127,11 +127,13 @@ static int __init netfs_init(void)if (mempool_init_slab_pool (&netfs_subrequest_pool,100 , netfs_subrequest_slab) <0 ) goto error_subreqpool; +#ifdef CONFIG_PROC_FS if (!proc_mkdir ("fs/netfs" ,NULL )) goto error_proc;if (!proc_create_seq ("fs/netfs/requests" ,S_IFREG |0444 ,NULL , &netfs_requests_seq_ops)) goto error_procfile; +#endif #ifdef CONFIG_FSCACHE_STATS if (!proc_create_single ("fs/netfs/stats" ,S_IFREG |0444 ,NULL , netfs_stats_show))
@@ -144,9 +146,11 @@ static int __init netfs_init(void)return 0 ; error_fscache: +#ifdef CONFIG_PROC_FS error_procfile:remove_proc_subtree ("fs/netfs" ,NULL ); error_proc: +#endif mempool_exit (&netfs_subrequest_pool); error_subreqpool:kmem_cache_destroy (netfs_subrequest_slab);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 281/311 iomap: skip unnecessary ifs_block_is_uptodate check
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gou Hao <[email protected]>
[ Upstream commit 8e3c15ee0d292c413c66fe10201d1b035a0bea72 ]
In iomap_adjust_read_range, i is either the first !uptodate block, or it is past last for the second loop looking for trailing uptodate blocks. Assuming there's no overflow (there's no combination of huge folios and tiny blksize) then yeah, there is no point in retesting that the same block pointed to by i is uptodate since we hold the folio lock so nobody else could have set it uptodate.
--- fs/iomap/buffered-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/iomap/buffered-io.c +1 -1
@@ -263,7 +263,7 @@ static void iomap_adjust_read_range(struct inode *inode, struct folio *folio, }/* truncate len if we find any trailing uptodate block(s) */ -for ( ; i <= last; i++) { +while (++i <= last) {if (ifs_block_is_uptodate (ifs, i)) { plen -= (last - i +1 ) * block_size; last = i -1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 282/311 riscv: Provide all alternative macros all the time
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Jones <[email protected]>
[ Upstream commit fb53a9aa5f5b8bf302f3260a7f1f5a24345ce62a ]
We need to provide all six forms of the alternative macros (ALTERNATIVE, ALTERNATIVE_2, _ALTERNATIVE_CFG, _ALTERNATIVE_CFG_2, __ALTERNATIVE_CFG, __ALTERNATIVE_CFG_2) for all four cases derived from the two ifdefs (RISCV_ALTERNATIVE, __ASSEMBLY__) in order to ensure all configs can compile. Define this missing ones and ensure all are defined to consume all parameters passed.
--- arch/riscv/include/asm/alternative-macros.h | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
arch/riscv/include/asm/alternative-macros.h +7 -12
@@ -115,24 +115,19 @@ \old_c .endm -#define _ALTERNATIVE_CFG (old_c, ...) \ - ALTERNATIVE_CFG old_c - -#define _ALTERNATIVE_CFG_2 (old_c, ...) \ - ALTERNATIVE_CFG old_c +#define __ALTERNATIVE_CFG (old_c, ...) ALTERNATIVE_CFG old_c +#define __ALTERNATIVE_CFG_2 (old_c, ...) ALTERNATIVE_CFG old_c#else /* !__ASSEMBLY__ */ -#define __ALTERNATIVE_CFG (old_c) \ - old_c "\n" +#define __ALTERNATIVE_CFG (old_c, ...) old_c "\n" +#define __ALTERNATIVE_CFG_2 (old_c, ...) old_c "\n" -#define _ALTERNATIVE_CFG (old_c, ...) \ - __ALTERNATIVE_CFG(old_c) +#endif /* __ASSEMBLY__ */ -#define _ALTERNATIVE_CFG_2 (old_c, ...) \ - __ALTERNATIVE_CFG(old_c) +#define _ALTERNATIVE_CFG (old_c, ...) __ALTERNATIVE_CFG(old_c) +#define _ALTERNATIVE_CFG_2 (old_c, ...) __ALTERNATIVE_CFG_2(old_c) -#endif /* __ASSEMBLY__ */ #endif /* CONFIG_RISCV_ALTERNATIVE */ /*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 283/311 ksmbd: fix WARNING "do not call blocking ops when !TASK_RUNNING"
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 1df0d4c616138784e033ad337961b6e1a6bcd999 ]
wait_event_timeout() will set the state of the current
task to TASK_UNINTERRUPTIBLE, before doing the condition check. This means that ksmbd_durable_scavenger_alive() will try to acquire the mutex while already in a sleeping state. The scheduler warns us by giving the following warning:
do not call blocking ops when !TASK_RUNNING; state=2 set at
[<0000000061515a6f>] prepare_to_wait_event+0x9f/0x6c0 WARNING: CPU: 2 PID: 4147 at kernel/sched/core.c:10099 __might_sleep+0x12f/0x160
mutex lock is not needed in ksmbd_durable_scavenger_alive().
--- fs/smb/server/vfs_cache.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
fs/smb/server/vfs_cache.c +1 -7
@@ -713,12 +713,8 @@ static bool tree_conn_fd_check(struct ksmbd_tree_connect *tcon,static bool ksmbd_durable_scavenger_alive (void ) { -mutex_lock (&durable_scavenger_lock); -if (!durable_scavenger_running) { -mutex_unlock (&durable_scavenger_lock); +if (!durable_scavenger_running)return false; - } -mutex_unlock (&durable_scavenger_lock);if (kthread_should_stop ())return false;
@@ -799,9 +795,7 @@ static int ksmbd_durable_scavenger(void *dummy)break ; } -mutex_lock (&durable_scavenger_lock); durable_scavenger_running = false; -mutex_unlock (&durable_scavenger_lock);module_put (THIS_MODULE );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 284/311 spi: tegra210-quad: use WARN_ON_ONCE instead of WARN_ON for timeouts
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit 41c721fc093938745d116c3a21326a0ee03bb491 ]
Some machines with tegra_qspi_combined_seq_xfer hardware issues generate excessive kernel warnings, severely polluting the logs:
dmesg | grep -i "WARNING:.*tegra_qspi_transfer_one_message" | wc -l 94451
This patch replaces WARN_ON with WARN_ON_ONCE for timeout conditions to reduce log spam. The subsequent error message still prints on each occurrence, providing sufficient information about the failure, while the stack trace is only needed once for debugging purposes.
--- drivers/spi/spi-tegra210-quad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-tegra210-quad.c +1 -1
@@ -1117,7 +1117,7 @@ static int tegra_qspi_combined_seq_xfer(struct tegra_qspi *tqspi, (&tqspi->xfer_completion,QSPI_DMA_TIMEOUT ); -if (WARN_ON (ret ==0 )) { +if (WARN_ON_ONCE (ret ==0 )) {dev_err (tqspi->dev,"QSPI Transfer failed with timeout: %d\n" , ret); if (tqspi->is_curr_dma_xfer &&
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 285/311 spi: tegra210-quad: add rate limiting and simplify timeout error message
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit 21f4314e66ed8d40b2ee24185d1a06a07a512eb1 ]
On malfunctioning hardware, timeout error messages can appear thousands of times, creating unnecessary system pressure and log bloat. This patch makes two improvements:
1. Replace dev_err() with dev_err_ratelimited() to prevent log flooding when hardware errors persist
2. Remove the redundant timeout value parameter from the error message, as 'ret' is always zero in this error path
These changes reduce logging overhead while maintaining necessary error reporting for debugging purposes.
--- drivers/spi/spi-tegra210-quad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-tegra210-quad.c +2 -2
@@ -1118,8 +1118,8 @@ static int tegra_qspi_combined_seq_xfer(struct tegra_qspi *tqspi, QSPI_DMA_TIMEOUT);if (WARN_ON_ONCE (ret ==0 )) { -dev_err (tqspi->dev,"QSPI Transfer failed with timeout: %d\n" , - ret); +dev_err_ratelimited (tqspi->dev, +"QSPI Transfer failed with timeout\n" );if (tqspi->is_curr_dma_xfer && (tqspi->cur_direction &DATA_DIR_TX )) dmaengine_terminate_all
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 286/311 ubsan: Fix panic from test_ubsan_out_of_bounds
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mostafa Saleh <[email protected]>
[ Upstream commit 9b044614be12d78d3a93767708b8d02fb7dfa9b0 ]
Running lib_ubsan.ko on arm64 (without CONFIG_UBSAN_TRAP) panics the kernel:
[ 31.616546] Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: test_ubsan_out_of_bounds+0x158/0x158 [test_ubsan] [ 31.646817] CPU: 3 UID: 0 PID: 179 Comm: insmod Not tainted 6.15.0-rc2 #1 PREEMPT [ 31.648153] Hardware name: linux,dummy-virt (DT) [ 31.648970] Call trace: [ 31.649345] show_stack+0x18/0x24 (C) [ 31.650960] dump_stack_lvl+0x40/0x84 [ 31.651559] dump_stack+0x18/0x24 [ 31.652264] panic+0x138/0x3b4 [ 31.652812] __ktime_get_real_seconds+0x0/0x10 [ 31.653540] test_ubsan_load_invalid_value+0x0/0xa8 [test_ubsan] [ 31.654388] init_module+0x24/0xff4 [test_ubsan] [ 31.655077] do_one_initcall+0xd4/0x280 [ 31.655680] do_init_module+0x58/0x2b4
That happens because the test corrupts other data in the stack:
400: d5384108 mrs x8, sp_el0 404: f9426d08 ldr x8, [x8, #1240] 408: f85f83a9 ldur x9, [x29, #-8] 40c: eb09011f cmp x8, x9 410: 54000301 b.ne 470 <test_ubsan_out_of_bounds+0x154> // b.any
As there is no guarantee the compiler will order the local variables as declared in the module:
volatile char above[4] = { }; /* Protect surrounding memory. */ volatile int arr[4];
volatile char below[4] = { }; /* Protect surrounding memory. */
There is another problem where the out-of-bound index is 5 which is larger than the extra surrounding memory for protection.
So, use a struct to enforce the ordering, and fix the index to be 4. Also, remove some of the volatiles and rely on OPTIMIZER_HIDE_VAR()
--- lib/test_ubsan.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
lib/test_ubsan.c +11 -7
@@ -68,18 +68,22 @@ static void test_ubsan_shift_out_of_bounds(void)static void test_ubsan_out_of_bounds (void ) { -volatile int i =4 , j =5 , k =-1 ; -volatile char above[4 ] = { };/* Protect surrounding memory. */ -volatile int arr[4 ]; -volatile char below[4 ] = { };/* Protect surrounding memory. */ +int i =4 , j =4 , k =-1 ; +volatile struct { +char above[4 ];/* Protect surrounding memory. */ +int arr[4 ]; +char below[4 ];/* Protect surrounding memory. */ + } data; - above[0 ] = below[0 ]; +OPTIMIZER_HIDE_VAR (i); +OPTIMIZER_HIDE_VAR (j); +OPTIMIZER_HIDE_VAR (k);UBSAN_TEST (CONFIG_UBSAN_BOUNDS ,"above" ); - arr[j] = i; + data.arr[j] = i;UBSAN_TEST (CONFIG_UBSAN_BOUNDS ,"below" ); - arr[k] = i; + data.arr[k] = i; }enum ubsan_test_enum {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 287/311 nvmet: pci-epf: cleanup link state management
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
[ Upstream commit ad91308d3bdeb9d90ef4a400f379ce461f0fb6a7 ]
Since the link_up boolean field of struct nvmet_pci_epf_ctrl is always set to true when nvmet_pci_epf_start_ctrl() is called, assign true to this field in nvmet_pci_epf_start_ctrl(). Conversely, since this field is set to false when nvmet_pci_epf_stop_ctrl() is called, set this field to false directly inside that function.
While at it, also add information messages to notify the user of the PCI link state changes to help troubleshoot any link stability issues without needing to enable debug messages.
--- drivers/nvme/target/pci-epf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/nvme/target/pci-epf.c +8 -6
@@ -2109,11 +2109,18 @@ static int nvmet_pci_epf_create_ctrl(struct nvmet_pci_epf *nvme_epf,static void nvmet_pci_epf_start_ctrl (struct nvmet_pci_epf_ctrl *ctrl) { + +dev_info (ctrl->dev,"PCI link up\n" ); + ctrl->link_up = true; +schedule_delayed_work (&ctrl->poll_cc,NVMET_PCI_EPF_CC_POLL_INTERVAL ); }static void nvmet_pci_epf_stop_ctrl (struct nvmet_pci_epf_ctrl *ctrl) { +dev_info (ctrl->dev,"PCI link down\n" ); + ctrl->link_up = false; +cancel_delayed_work_sync (&ctrl->poll_cc);nvmet_pci_epf_disable_ctrl (ctrl, false);
@@ -2340,10 +2347,8 @@ static int nvmet_pci_epf_epc_init(struct pci_epf *epf)if (ret) goto out_clear_bar; -if (!epc_features->linkup_notifier) { - ctrl->link_up = true; +if (!epc_features->linkup_notifier)nvmet_pci_epf_start_ctrl (&nvme_epf->ctrl); - }return 0 ;
@@ -2359,7 +2364,6 @@ static void nvmet_pci_epf_epc_deinit(struct pci_epf *epf)struct nvmet_pci_epf *nvme_epf =epf_get_drvdata (epf);struct nvmet_pci_epf_ctrl *ctrl = &nvme_epf->ctrl; - ctrl->link_up = false;nvmet_pci_epf_destroy_ctrl (ctrl);nvmet_pci_epf_deinit_dma (nvme_epf);
@@ -2371,7 +2375,6 @@ static int nvmet_pci_epf_link_up(struct pci_epf *epf)struct nvmet_pci_epf *nvme_epf =epf_get_drvdata (epf);struct nvmet_pci_epf_ctrl *ctrl = &nvme_epf->ctrl; - ctrl->link_up = true;nvmet_pci_epf_start_ctrl (ctrl);return 0 ;
@@ -2382,7 +2385,6 @@ static int nvmet_pci_epf_link_down(struct pci_epf *epf)struct nvmet_pci_epf *nvme_epf =epf_get_drvdata (epf);struct nvmet_pci_epf_ctrl *ctrl = &nvme_epf->ctrl; - ctrl->link_up = false;nvmet_pci_epf_stop_ctrl (ctrl);return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 288/311 x86/cpu: Add CPU model number for Bartlett Lake CPUs with Raptor Cove cores
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pi Xiange <[email protected]>
[ Upstream commit d466304c4322ad391797437cd84cca7ce1660de0 ]
Bartlett Lake has a P-core only product with Raptor Cove.
[ mingo: Switch around the define as pointed out by Christian Ludloff:
Ratpr Cove is the core, Bartlett Lake is the product.
--- arch/x86/include/asm/intel-family.h | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/include/asm/intel-family.h +2 -0
@@ -115,6 +115,8 @@#define INTEL_GRANITERAPIDS_X IFM(6, 0xAD)#define INTEL_GRANITERAPIDS_D IFM(6, 0xAE) +#define INTEL_BARTLETTLAKE IFM(6, 0xD7)/* Raptor Cove */ +/* "Hybrid" Processors (P-Core/E-Core) */ #define INTEL_LAKEFIELD IFM(6, 0x8A)/* Sunny Cove / Tremont */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 289/311 md/raid1: Add check for missing source disk in process_checks()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Meir Elisha <[email protected]>
[ Upstream commit b7c178d9e57c8fd4238ff77263b877f6f16182ba ]
During recovery/check operations, the process_checks function loops through available disks to find a 'primary' source with successfully read data.
If no suitable source disk is found after checking all possibilities, the 'primary' index will reach conf->raid_disks * 2. Add an explicit check for this condition after the loop. If no source disk was found, print an error message and return early to prevent further processing without a valid primary source.
--- drivers/md/raid1.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/md/raid1.c +16 -10
@@ -2199,14 +2199,9 @@ static int fix_sync_read_error(struct r1bio *r1_bio)if (!rdev_set_badblocks (rdev, sect, s,0 )) abort =1 ; } -if (abort) { - conf->recovery_disabled = - mddev->recovery_disabled; -set_bit (MD_RECOVERY_INTR , &mddev->recovery); -md_done_sync (mddev, r1_bio->sectors,0 ); -put_buf (r1_bio); +if (abort)return 0 ; - } +/* Try next page */ sectors -= s; sect += s;
@@ -2345,10 +2340,21 @@ static void sync_request_write(struct mddev *mddev, struct r1bio *r1_bio)int disks = conf->raid_disks *2 ;struct bio *wbio; -if (!test_bit (R1BIO_Uptodate, &r1_bio->state)) -/* ouch - failed to read all of that. */ -if (!fix_sync_read_error (r1_bio)) +if (!test_bit (R1BIO_Uptodate, &r1_bio->state)) { +/* +* ouch - failed to read all of that. +* No need to fix read error for check/repair +* because all member disks are read. +*/ +if (test_bit (MD_RECOVERY_REQUESTED , &mddev->recovery) || + !fix_sync_read_error (r1_bio)) { + conf->recovery_disabled = mddev->recovery_disabled; +set_bit (MD_RECOVERY_INTR , &mddev->recovery); +md_done_sync (mddev, r1_bio->sectors,0 ); +put_buf (r1_bio);return ; + } + }if (test_bit (MD_RECOVERY_REQUESTED , &mddev->recovery))process_checks (r1_bio);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 290/311 drm/amdgpu: use a dummy owner for sysfs triggered cleaner shaders v4
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian König <[email protected]>
[ Upstream commit 447fab30955cf7dba7dd563f42b67c02284860c8 ]
Otherwise triggering sysfs multiple times without other submissions in between only runs the shader once.
v2: add some comment
v3: re-add missing cast
v4: squash in semicolon fix
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +11 -3
@@ -1411,9 +1411,11 @@ static int amdgpu_gfx_run_cleaner_shader_job(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;struct drm_gpu_scheduler *sched = &ring->sched;struct drm_sched_entity entity; +static atomic_t counter;struct dma_fence *f;struct amdgpu_job *job;struct amdgpu_ib *ib; +void *owner;int i, r;/* Initialize the scheduler entity */
@@ -1424,9 +1426,15 @@ static int amdgpu_gfx_run_cleaner_shader_job(struct amdgpu_ring *ring) goto err; } - r =amdgpu_job_alloc_with_ib (ring->adev, &entity,NULL , -64 ,0 , - &job); +/* +* Use some unique dummy value as the owner to make sure we execute +* the cleaner shader on each submission. The value just need to change +* for each submission and is otherwise meaningless. +*/ + owner = (void *)(unsigned long )atomic_inc_return (&counter); + + r =amdgpu_job_alloc_with_ib (ring->adev, &entity, owner, +64 ,0 , &job);if (r) goto err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 291/311 drm/amd: Forbid suspending into non-default suspend states
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 1657793def101dac7c9d3b2250391f6a3dd934ba ]
On systems that default to 'deep' some userspace software likes to try to suspend in 'deep' first. If there is a failure for any reason (such as -ENOMEM) the failure is ignored and then it will try to use 's2idle' as a fallback. This fails, but more importantly it leads to graphical problems.
Forbid this behavior and only allow suspending in the last state supported by the system.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1118,6 +1118,7 @@ struct amdgpu_device {bool in_s3;bool in_s4;bool in_s0ix; +suspend_state_t last_suspend_state;enum pp_mp1_state mp1_state;struct amdgpu_doorbell_index doorbell_index;
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +13 -1
@@ -2515,8 +2515,20 @@ static int amdgpu_pmops_suspend(struct device *dev) adev->in_s0ix = true; else if (amdgpu_acpi_is_s3_active(adev)) adev->in_s3 = true; -if (!adev->in_s0ix && !adev->in_s3) +if (!adev->in_s0ix && !adev->in_s3) { +/* don't allow going deep first time followed by s2idle the next time */ +if (adev->last_suspend_state !=PM_SUSPEND_ON && + adev->last_suspend_state != pm_suspend_target_state) { +drm_err_once (drm_dev,"Unsupported suspend state %d\n" , + pm_suspend_target_state); +return -EINVAL ; + }return 0 ; + } + +/* cache the state last used for suspend */ + adev->last_suspend_state = pm_suspend_target_state; +return amdgpu_device_suspend (drm_dev, true); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 292/311 drm/amdgpu: Use the right function for hdp flush
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit c235a7132258ac30bd43d228222986022d21f5de ]
There are a few prechecks made before HDP flush like a flush is not required on APU bare metal. Using hdp callback directly bypasses those checks. Use amdgpu_device_flush_hdp which takes care of prechecks.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +4 -4
@@ -6044,7 +6044,7 @@ static int gfx_v10_0_cp_gfx_load_pfp_microcode(struct amdgpu_device *adev) }if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); tmp =RREG32_SOC15 (GC ,0 , mmCP_PFP_IC_BASE_CNTL); tmp =REG_SET_FIELD (tmp,CP_PFP_IC_BASE_CNTL ,VMID ,0 );
@@ -6122,7 +6122,7 @@ static int gfx_v10_0_cp_gfx_load_ce_microcode(struct amdgpu_device *adev) }if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); tmp =RREG32_SOC15 (GC ,0 , mmCP_CE_IC_BASE_CNTL); tmp =REG_SET_FIELD (tmp,CP_CE_IC_BASE_CNTL ,VMID ,0 );
@@ -6199,7 +6199,7 @@ static int gfx_v10_0_cp_gfx_load_me_microcode(struct amdgpu_device *adev) }if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); tmp =RREG32_SOC15 (GC ,0 , mmCP_ME_IC_BASE_CNTL); tmp =REG_SET_FIELD (tmp,CP_ME_IC_BASE_CNTL ,VMID ,0 );
@@ -6574,7 +6574,7 @@ static int gfx_v10_0_cp_compute_load_microcode(struct amdgpu_device *adev) }if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); tmp =RREG32_SOC15 (GC ,0 , mmCP_CPC_IC_BASE_CNTL); tmp =REG_SET_FIELD (tmp,CP_CPC_IC_BASE_CNTL ,CACHE_POLICY ,0 );
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +6 -6
@@ -2391,7 +2391,7 @@ static int gfx_v11_0_config_me_cache(struct amdgpu_device *adev, uint64_t addr) }if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); tmp =RREG32_SOC15 (GC ,0 , regCP_ME_IC_BASE_CNTL); tmp =REG_SET_FIELD (tmp,CP_ME_IC_BASE_CNTL ,VMID ,0 );
@@ -2435,7 +2435,7 @@ static int gfx_v11_0_config_pfp_cache(struct amdgpu_device *adev, uint64_t addr) }if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); tmp =RREG32_SOC15 (GC ,0 , regCP_PFP_IC_BASE_CNTL); tmp =REG_SET_FIELD (tmp,CP_PFP_IC_BASE_CNTL ,VMID ,0 );
@@ -2480,7 +2480,7 @@ static int gfx_v11_0_config_mec_cache(struct amdgpu_device *adev, uint64_t addr) }if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); tmp =RREG32_SOC15 (GC ,0 , regCP_CPC_IC_BASE_CNTL); tmp =REG_SET_FIELD (tmp,CP_CPC_IC_BASE_CNTL ,CACHE_POLICY ,0 );
@@ -3115,7 +3115,7 @@ static int gfx_v11_0_cp_gfx_load_pfp_microcode_rs64(struct amdgpu_device *adev)amdgpu_bo_unreserve (adev->gfx.pfp.pfp_fw_data_obj);if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );WREG32_SOC15 (GC ,0 , regCP_PFP_IC_BASE_LO,lower_32_bits (adev->gfx.pfp.pfp_fw_gpu_addr));
@@ -3333,7 +3333,7 @@ static int gfx_v11_0_cp_gfx_load_me_microcode_rs64(struct amdgpu_device *adev)amdgpu_bo_unreserve (adev->gfx.me.me_fw_data_obj);if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );WREG32_SOC15 (GC ,0 , regCP_ME_IC_BASE_LO,lower_32_bits (adev->gfx.me.me_fw_gpu_addr));
@@ -4549,7 +4549,7 @@ static int gfx_v11_0_gfxhub_enable(struct amdgpu_device *adev)if (r)return r; - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); value = (amdgpu_vm_fault_stop ==AMDGPU_VM_FAULT_STOP_ALWAYS ) ? false : true;
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +3 -3
@@ -2306,7 +2306,7 @@ static int gfx_v12_0_cp_gfx_load_pfp_microcode_rs64(struct amdgpu_device *adev)amdgpu_bo_unreserve (adev->gfx.pfp.pfp_fw_data_obj);if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );WREG32_SOC15 (GC ,0 , regCP_PFP_IC_BASE_LO,lower_32_bits (adev->gfx.pfp.pfp_fw_gpu_addr));
@@ -2450,7 +2450,7 @@ static int gfx_v12_0_cp_gfx_load_me_microcode_rs64(struct amdgpu_device *adev)amdgpu_bo_unreserve (adev->gfx.me.me_fw_data_obj);if (amdgpu_emu_mode ==1 ) - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );WREG32_SOC15 (GC ,0 , regCP_ME_IC_BASE_LO,lower_32_bits (adev->gfx.me.me_fw_gpu_addr));
@@ -3469,7 +3469,7 @@ static int gfx_v12_0_gfxhub_enable(struct amdgpu_device *adev)if (r)return r; - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); value = (amdgpu_vm_fault_stop ==AMDGPU_VM_FAULT_STOP_ALWAYS ) ? false : true;
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +2 -2
@@ -268,7 +268,7 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, ack = hub->vm_inv_eng0_ack + hub->eng_distance * eng;/* flush hdp cache */ - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );/* This is necessary for SRIOV as well as for GFXOFF to function * properly under bare metal
@@ -969,7 +969,7 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev) adev->hdp.funcs->init_registers (adev);/* Flush HDP after it is initialized */ - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); value = (amdgpu_vm_fault_stop ==AMDGPU_VM_FAULT_STOP_ALWAYS ) ? false : true;
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +2 -2
@@ -229,7 +229,7 @@ static void gmc_v11_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, ack = hub->vm_inv_eng0_ack + hub->eng_distance * eng;/* flush hdp cache */ - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );/* This is necessary for SRIOV as well as for GFXOFF to function * properly under bare metal
@@ -896,7 +896,7 @@ static int gmc_v11_0_gart_enable(struct amdgpu_device *adev)return r;/* Flush HDP after it is initialized */ - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); value = (amdgpu_vm_fault_stop ==AMDGPU_VM_FAULT_STOP_ALWAYS ) ? false : true;
drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c +2 -2
@@ -297,7 +297,7 @@ static void gmc_v12_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,return ;/* flush hdp cache */ - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );/* This is necessary for SRIOV as well as for GFXOFF to function * properly under bare metal
@@ -881,7 +881,7 @@ static int gmc_v12_0_gart_enable(struct amdgpu_device *adev)return r;/* Flush HDP after it is initialized */ - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL ); value = (amdgpu_vm_fault_stop ==AMDGPU_VM_FAULT_STOP_ALWAYS ) ? false : true;
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -1
@@ -2434,7 +2434,7 @@ static int gmc_v9_0_hw_init(struct amdgpu_ip_block *ip_block) adev->hdp.funcs->init_registers (adev);/* After HDP is initialized, flush HDP.*/ - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );if (amdgpu_vm_fault_stop ==AMDGPU_VM_FAULT_STOP_ALWAYS ) value = false;
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +1 -1
@@ -532,7 +532,7 @@ static int psp_v11_0_memory_training(struct psp_context *psp, uint32_t ops) }memcpy_toio (adev->mman.aper_base_kaddr, buf, sz); - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );vfree (buf);drm_dev_exit (idx); }else {
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +1 -1
@@ -610,7 +610,7 @@ static int psp_v13_0_memory_training(struct psp_context *psp, uint32_t ops) }memcpy_toio (adev->mman.aper_base_kaddr, buf, sz); - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );vfree (buf);drm_dev_exit (idx); }else {
drivers/gpu/drm/amd/amdgpu/psp_v14_0.c +1 -1
@@ -488,7 +488,7 @@ static int psp_v14_0_memory_training(struct psp_context *psp, uint32_t ops) }memcpy_toio (adev->mman.aper_base_kaddr, buf, sz); - adev->hdp.funcs->flush_hdp (adev,NULL ); +amdgpu_device_flush_hdp (adev,NULL );vfree (buf);drm_dev_exit (idx); }else {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 293/311 ublk: add ublk_force_abort_dev()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 00b3b0d7cb454d614117c93f33351cdcd20b5b93 ]
Add ublk_force_abort_dev() for handling ublk_nosrv_dev_should_queue_io() in ublk_stop_dev(). Then queue quiesce and unquiesce can be paired in single function.
Meantime not change device state to QUIESCED any more, since the disk is going to be removed soon.
--- drivers/block/ublk_drv.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
drivers/block/ublk_drv.c +8 -13
@@ -1707,22 +1707,20 @@ static void __ublk_quiesce_dev(struct ublk_device *ub) ub->dev_info.state =UBLK_S_DEV_QUIESCED ; } -static void ublk_unquiesce_dev (struct ublk_device *ub) +static void ublk_force_abort_dev (struct ublk_device *ub) {int i; -pr_devel ("%s: unquiesce ub: dev_id %d state %s\n" , +pr_devel ("%s: force abort ub: dev_id %d state %s\n" , __func__, ub->dev_info.dev_id, ub->dev_info.state ==UBLK_S_DEV_LIVE ?"LIVE" :"QUIESCED" ); -/* quiesce_work has run. We let requeued rqs be aborted -* before running fallback_wq. "force_abort" must be seen -* after request queue is unqiuesced. Then del_gendisk() -* can move on. -*/ +blk_mq_quiesce_queue (ub->ub_disk->queue); +if (ub->dev_info.state ==UBLK_S_DEV_LIVE ) +ublk_wait_tagset_rqs_idle (ub); +for (i =0 ; i < ub->dev_info.nr_hw_queues; i++)ublk_get_queue (ub, i)->force_abort = true; -blk_mq_unquiesce_queue (ub->ub_disk->queue);/* We may have requeued some rqs in ublk_quiesce_queue() */ blk_mq_kick_requeue_list (ub->ub_disk->queue);
@@ -1750,11 +1748,8 @@ static void ublk_stop_dev(struct ublk_device *ub)mutex_lock (&ub->mutex);if (ub->dev_info.state ==UBLK_S_DEV_DEAD ) goto unlock; -if (ublk_nosrv_dev_should_queue_io (ub)) { -if (ub->dev_info.state ==UBLK_S_DEV_LIVE ) -__ublk_quiesce_dev (ub); -ublk_unquiesce_dev (ub); - } +if (ublk_nosrv_dev_should_queue_io (ub)) +ublk_force_abort_dev (ub);del_gendisk (ub->ub_disk); disk =ublk_detach_disk (ub);put_disk (disk);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 294/311 ublk: rely on ->canceling for dealing with ublk_nosrv_dev_should_queue_io
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 7e26cb69c5e62152a6f05a2ae23605a983a8ef31 ]
Now ublk deals with ublk_nosrv_dev_should_queue_io() by keeping request queue as quiesced. This way is fragile because queue quiesce crosses syscalls or process contexts.
Switch to rely on ubq->canceling for dealing with ublk_nosrv_dev_should_queue_io(), because it has been used for this purpose during io_uring context exiting, and it can be reused before recovering too. In ublk_queue_rq(), the request will be added to requeue list without kicking off requeue in case of ubq->canceling, and finally requests added in requeue list will be dispatched from either ublk_stop_dev() or ublk_ctrl_end_recovery().
Meantime we have to move reset of ubq->canceling from ublk_ctrl_start_recovery() to ublk_ctrl_end_recovery(), when IO handling can be recovered completely.
Then blk_mq_quiesce_queue() and blk_mq_unquiesce_queue() are always used in same context.
--- drivers/block/ublk_drv.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/block/ublk_drv.c +17 -14
@@ -1698,13 +1698,19 @@ static void ublk_wait_tagset_rqs_idle(struct ublk_device *ub)static void __ublk_quiesce_dev (struct ublk_device *ub) { +int i; +pr_devel ("%s: quiesce ub: dev_id %d state %s\n" , __func__, ub->dev_info.dev_id, ub->dev_info.state ==UBLK_S_DEV_LIVE ?"LIVE" :"QUIESCED" );blk_mq_quiesce_queue (ub->ub_disk->queue); +/* mark every queue as canceling */ +for (i =0 ; i < ub->dev_info.nr_hw_queues; i++) +ublk_get_queue (ub, i)->canceling = true;ublk_wait_tagset_rqs_idle (ub); ub->dev_info.state =UBLK_S_DEV_QUIESCED ; +blk_mq_unquiesce_queue (ub->ub_disk->queue); }static void ublk_force_abort_dev (struct ublk_device *ub)
@@ -2846,7 +2852,6 @@ static void ublk_queue_reinit(struct ublk_device *ub, struct ublk_queue *ubq)/* We have to reset it to NULL, otherwise ub won't accept new FETCH_REQ */ ubq->ubq_daemon =NULL ; ubq->timeout = false; - ubq->canceling = false;for (i =0 ; i < ubq->q_depth; i++) {struct ublk_io *io = &ubq->ios[i];
@@ -2935,20 +2940,18 @@ static int ublk_ctrl_end_recovery(struct ublk_device *ub,pr_devel ("%s: new ublksrv_pid %d, dev id %d\n" , __func__, ublksrv_pid, header->dev_id); -if (ublk_nosrv_dev_should_queue_io (ub)) { - ub->dev_info.state =UBLK_S_DEV_LIVE ; -blk_mq_unquiesce_queue (ub->ub_disk->queue); -pr_devel ("%s: queue unquiesced, dev id %d.\n" , - __func__, header->dev_id); -blk_mq_kick_requeue_list (ub->ub_disk->queue); - }else { -blk_mq_quiesce_queue (ub->ub_disk->queue); - ub->dev_info.state =UBLK_S_DEV_LIVE ; -for (i =0 ; i < ub->dev_info.nr_hw_queues; i++) { -ublk_get_queue (ub, i)->fail_io = false; - } -blk_mq_unquiesce_queue (ub->ub_disk->queue); +blk_mq_quiesce_queue (ub->ub_disk->queue); + ub->dev_info.state =UBLK_S_DEV_LIVE ; +for (i =0 ; i < ub->dev_info.nr_hw_queues; i++) { +struct ublk_queue *ubq =ublk_get_queue (ub, i); + + ubq->canceling = false; + ubq->fail_io = false; } +blk_mq_unquiesce_queue (ub->ub_disk->queue); +pr_devel ("%s: queue unquiesced, dev id %d.\n" , + __func__, header->dev_id); +blk_mq_kick_requeue_list (ub->ub_disk->queue); ret =0 ; out_unlock:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 295/311 spi: spi-imx: Add check for spi_imx_setupxfer()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tamura Dai <[email protected]>
[ Upstream commit 951a04ab3a2db4029debfa48d380ef834b93207e ]
Add check for the return value of spi_imx_setupxfer(). spi_imx->rx and spi_imx->tx function pointer can be NULL when spi_imx_setupxfer() return error, and make NULL pointer dereference.
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 Call trace: 0x0 spi_imx_pio_transfer+0x50/0xd8 spi_imx_transfer_one+0x18c/0x858 spi_transfer_one_message+0x43c/0x790 __spi_pump_transfer_message+0x238/0x5d4 __spi_sync+0x2b0/0x454 spi_write_then_read+0x11c/0x200
--- drivers/spi/spi-imx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/spi/spi-imx.c +4 -1
@@ -1695,9 +1695,12 @@ static int spi_imx_transfer_one(struct spi_controller *controller,struct spi_device *spi, struct spi_transfer *transfer) { + int ret;struct spi_imx_data *spi_imx =spi_controller_get_devdata (spi->controller); -spi_imx_setupxfer (spi, transfer); + ret =spi_imx_setupxfer (spi, transfer); +if (ret <0 ) +return ret; transfer->effective_speed_hz = spi_imx->spi_bus_clk;/* flush rxfifo before transfer */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 296/311 Revert "drivers: core: synchronize really_probe() and dev_uevent()"
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
commit dc1771f718548f7d4b93991b174c6e7b5e1ba410 upstream.
This reverts commit c0a40097f0bc81deafc15f9195d1fb54595cd6d0.
Probing a device can take arbitrary long time. In the field we observed that, for example, probing a bad micro-SD cards in an external USB card reader (or maybe cards were good but cables were flaky) sometimes takes longer than 2 minutes due to multiple retries at various levels of the stack. We can not block uevent_show() method for that long because udev is reading that attribute very often and that blocks udev and interferes with booting of the system.
The change that introduced locking was concerned with dev_uevent() racing with unbinding the driver. However we can handle it without locking (which will be done in subsequent patch).
There was also claim that synchronization with probe() is needed to properly load USB drivers, however this is a red herring: the change adding the lock was introduced in May of last year and USB loading and probing worked properly for many years before that.
Revert the harmful locking.
--- drivers/base/core.c | 3 --- 1 file changed, 3 deletions(-)
drivers/base/core.c +0 -3
@@ -2726,11 +2726,8 @@ static ssize_t uevent_show(struct deviceif (!env)return -ENOMEM ; -/* Synchronize with really_probe() */ -device_lock (dev);/* let the kset specific function add its keys */ retval = kset->uevent_ops->uevent (&dev->kobj, env); -device_unlock (dev);if (retval) goto out;
Greg Kroah-Hartman
maintainerPATCH 297/311 driver core: introduce device_set_driver() helper
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
commit 04d3e5461c1f5cf8eec964ab64948ebed826e95e upstream.
In preparation to closing a race when reading driver pointer in dev_uevent() code, instead of setting device->driver pointer directly introduce device_set_driver() helper.
--- drivers/base/base.h | 6 ++++++ drivers/base/core.c | 2 +- drivers/base/dd.c | 7 +++---- 3 files changed, 10 insertions(+), 5 deletions(-)
drivers/base/base.h +6 -0
@@ -180,6 +180,12 @@ int driver_add_groups(const struct devicvoid driver_remove_groups (const struct device_driver *drv,const struct attribute_group **groups);void device_driver_detach (struct device *dev); +static inline void device_set_driver (struct device *dev,const struct device_driver *drv) +{ +// FIXME - this cast should not be needed "soon" + dev->driver = (struct device_driver *)drv; +} +int devres_release_all (struct device *dev);void device_block_probing (void );void device_unblock_probing (void );
drivers/base/core.c +1 -1
@@ -3697,7 +3697,7 @@ done:device_pm_remove (dev);dpm_sysfs_remove (dev); DPMError: - dev->driver =NULL ; +device_set_driver (dev,NULL );bus_remove_device (dev); BusError:device_remove_attrs (dev);
drivers/base/dd.c +3 -4
@@ -550,7 +550,7 @@ static void device_unbind_cleanup(structarch_teardown_dma_ops (dev);kfree (dev->dma_range_map); dev->dma_range_map =NULL ; - dev->driver =NULL ; +device_set_driver (dev,NULL );dev_set_drvdata (dev,NULL );if (dev->pm_domain && dev->pm_domain->dismiss) dev->pm_domain->dismiss (dev);
@@ -629,8 +629,7 @@ static int really_probe(struct device *d } re_probe: -// FIXME - this cast should not be needed "soon" - dev->driver = (struct device_driver *)drv; +device_set_driver (dev, drv);/* If using pinctrl, bind pins now before probing */ ret =pinctrl_bind_pins (dev);
@@ -1014,7 +1013,7 @@ static int __device_attach(struct deviceif (ret ==0 ) ret =1 ;else { - dev->driver =NULL ; +device_set_driver (dev,NULL ); ret =0 ; } }else {
Greg Kroah-Hartman
maintainerPATCH 298/311 driver core: fix potential NULL pointer dereference in dev_uevent()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
commit 18daa52418e7e4629ed1703b64777294209d2622 upstream.
If userspace reads "uevent" device attribute at the same time as another threads unbinds the device from its driver, change to dev->driver from a valid pointer to NULL may result in crash. Fix this by using READ_ONCE() when fetching the pointer, and take bus' drivers klist lock to make sure driver instance will not disappear while we access it.
Use WRITE_ONCE() when setting the driver pointer to ensure there is no tearing.
--- drivers/base/base.h | 13 ++++++++++++- drivers/base/bus.c | 2 +- drivers/base/core.c | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 44 insertions(+), 4 deletions(-)
drivers/base/base.h +12 -1
@@ -73,6 +73,7 @@ static inline void subsys_put(struct subkset_put (&sp->subsys); } +struct subsys_private *bus_to_subsys (const struct bus_type *bus);struct subsys_private *class_to_subsys (const struct class *class);struct driver_private {
@@ -182,8 +183,18 @@ void device_driver_detach(struct devicestatic inline void device_set_driver (struct device *dev,const struct device_driver *drv) { +/* +* Majority (all?) read accesses to dev->driver happens either +* while holding device lock or in bus/driver code that is only +* invoked when the device is bound to a driver and there is no +* concern of the pointer being changed while it is being read. +* However when reading device's uevent file we read driver pointer +* without taking device lock (so we do not block there for +* arbitrary amount of time). We use WRITE_ONCE() here to prevent +* tearing so that READ_ONCE() can safely be used in uevent code. +*/ // FIXME - this cast should not be needed "soon" - dev->driver = (struct device_driver *)drv; +WRITE_ONCE (dev->driver, (struct device_driver *)drv); }int devres_release_all (struct device *dev);
drivers/base/bus.c +1 -1
@@ -57,7 +57,7 @@ static int __must_check bus_rescan_devic* NULL. A call to subsys_put() must be done when finished with the pointer in * order for it to be properly freed. */ -static struct subsys_private *bus_to_subsys (const struct bus_type *bus) +struct subsys_private *bus_to_subsys (const struct bus_type *bus) {struct subsys_private *sp =NULL ;struct kobject *kobj;
drivers/base/core.c +31 -2
@@ -2624,6 +2624,35 @@ static const char *dev_uevent_name(constreturn NULL ; } +/* +* Try filling "DRIVER=<name>" uevent variable for a device. Because this +* function may race with binding and unbinding the device from a driver, +* we need to be careful. Binding is generally safe, at worst we miss the +* fact that the device is already bound to a driver (but the driver +* information that is delivered through uevents is best-effort, it may +* become obsolete as soon as it is generated anyways). Unbinding is more +* risky as driver pointer is transitioning to NULL, so READ_ONCE() should +* be used to make sure we are dealing with the same pointer, and to +* ensure that driver structure is not going to disappear from under us +* we take bus' drivers klist lock. The assumption that only registered +* driver can be bound to a device, and to unregister a driver bus code +* will take the same lock. +*/ +static void dev_driver_uevent (const struct device *dev,struct kobj_uevent_env *env) +{ +struct subsys_private *sp =bus_to_subsys (dev->bus); + +if (sp) { + scoped_guard(spinlock, &sp->klist_drivers.k_lock) { +struct device_driver *drv =READ_ONCE (dev->driver); +if (drv) +add_uevent_var (env,"DRIVER=%s" , drv->name); + } + +subsys_put (sp); + } +} +static int dev_uevent (const struct kobject *kobj,struct kobj_uevent_env *env) {const struct device *dev =kobj_to_dev (kobj);
@@ -2655,8 +2684,8 @@ static int dev_uevent(const struct kobjeif (dev->type && dev->type->name)add_uevent_var (env,"DEVTYPE=%s" , dev->type->name); -if (dev->driver) -add_uevent_var (env,"DRIVER=%s" , dev->driver->name); +/* Add "DRIVER=%s" variable if the device is bound to a driver */ +dev_driver_uevent (dev, env);/* Add common DT information about the device */ of_device_uevent (dev, env);
Greg Kroah-Hartman
maintainerPATCH 299/311 vmxnet3: Fix malformed packet sizing in vmxnet3_process_xdp
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
commit 4c2227656d9003f4d77afc76f34dd81b95e4c2c4 upstream.
vmxnet3 driver's XDP handling is buggy for packet sizes using ring0 (that is, packet sizes between 128 - 3k bytes).
We noticed MTU-related connectivity issues with Cilium's service load- balancing in case of vmxnet3 as NIC underneath. A simple curl to a HTTP backend service where the XDP LB was doing IPIP encap led to overly large packet sizes but only for *some* of the packets (e.g. HTTP GET request) while others (e.g. the prior TCP 3WHS) looked completely fine on the wire.
In fact, the pcap recording on the backend node actually revealed that the node with the XDP LB was leaking uninitialized kernel data onto the wire for the affected packets, for example, while the packets should have been 152 bytes their actual size was 1482 bytes, so the remainder after 152 bytes was padded with whatever other data was in that page at the time (e.g. we saw user/payload data from prior processed packets).
We only noticed this through an MTU issue, e.g. when the XDP LB node and the backend node both had the same MTU (e.g. 1500) then the curl request got dropped on the backend node's NIC given the packet was too large even though the IPIP-encapped packet normally would never even come close to the MTU limit. Lowering the MTU on the XDP LB (e.g. 1480) allowed to let the curl request succeed (which also indicates that the kernel ignored the padding, and thus the issue wasn't very user-visible).
Commit e127ce7699c1 ("vmxnet3: Fix missing reserved tailroom") was too eager to also switch xdp_prepare_buff() from rcd->len to rbi->len. It really needs to stick to rcd->len which is the actual packet length from the descriptor. The latter we also feed into vmxnet3_process_xdp_small(), by the way, and it indicates the correct length needed to initialize the xdp->{data,data_end} parts. For e127ce7699c1 ("vmxnet3: Fix missing reserved tailroom") the relevant part was adapting xdp_init_buff() to address the warning given the xdp_data_hard_end() depends on xdp->frame_sz. With that fixed, traffic on the wire looks good again.
--- drivers/net/vmxnet3/vmxnet3_xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/vmxnet3/vmxnet3_xdp.c +1 -1
@@ -397,7 +397,7 @@ vmxnet3_process_xdp(struct vmxnet3_adaptxdp_init_buff (&xdp,PAGE_SIZE , &rq->xdp_rxq);xdp_prepare_buff (&xdp,page_address (page), rq->page_pool->p.offset, - rbi->len, false); + rcd->len, false);xdp_buff_clear_frags_flag (&xdp); xdp_prog =rcu_dereference (rq->adapter->xdp_bpf_prog);
Greg Kroah-Hartman
maintainerPATCH 300/311 comedi: jr3_pci: Fix synchronous deletion of timer
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 44d9b3f584c59a606b521e7274e658d5b866c699 upstream.
When jr3_pci_detach() is called during device removal, it calls timer_delete_sync() to stop the timer, but the timer expiry function always reschedules the timer, so the synchronization is ineffective.
Call timer_shutdown_sync() instead. It does not matter that the timer expiry function pointer is cleared, because the device is being removed.
--- drivers/comedi/drivers/jr3_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/comedi/drivers/jr3_pci.c +1 -1
@@ -758,7 +758,7 @@ static void jr3_pci_detach(struct comedistruct jr3_pci_dev_private *devpriv = dev->private;if (devpriv) -del_timer_sync (&devpriv->timer); +timer_shutdown_sync (&devpriv->timer);comedi_pci_detach (dev); }
Greg Kroah-Hartman
maintainerPATCH 301/311 crypto: lib/Kconfig - Hide arch options from user
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
commit 17ec3e71ba797cdb62164fea9532c81b60f47167 upstream.
The ARCH_MAY_HAVE patch missed arm64, mips and s390. But it may also lead to arch options being enabled but ineffective because of modular/built-in conflicts.
As the primary user of all these options wireguard is selecting the arch options anyway, make the same selections at the lib/crypto option level and hide the arch options from the user.
Instead of selecting them centrally from lib/crypto, simply set the default of each arch option as suggested by Eric Biggers.
Change the Crypto API generic algorithms to select the top-level lib/crypto options instead of the generic one as otherwise there is no way to enable the arch options (Eric Biggers). Introduce a set of INTERNAL options to work around dependency cycles on the CONFIG_CRYPTO symbol.
--- arch/arm/crypto/Kconfig | 16 ++++++++++------ arch/arm64/crypto/Kconfig | 6 ++++-- arch/mips/crypto/Kconfig | 7 +++++-- arch/powerpc/crypto/Kconfig | 11 +++++++---- arch/riscv/crypto/Kconfig | 1 - arch/s390/crypto/Kconfig | 3 ++- arch/x86/crypto/Kconfig | 17 +++++++++++------ crypto/Kconfig | 6 +++--- lib/crypto/Kconfig | 41 +++++++++++++++++++++-------------------- 9 files changed, 63 insertions(+), 45 deletions(-)
arch/arm/crypto/Kconfig +10 -6
@@ -3,10 +3,12 @@ menu "Accelerated Cryptographic Algorithms for CPU (arm)" config CRYPTO_CURVE25519_NEON - tristate "Public key crypto: Curve25519 (NEON)" + tristate depends on KERNEL_MODE_NEON + select CRYPTO_KPP select CRYPTO_LIB_CURVE25519_GENERIC - select CRYPTO_ARCH_MAY_HAVE_LIB_CURVE25519 + select CRYPTO_ARCH_HAVE_LIB_CURVE25519 + default CRYPTO_LIB_CURVE25519_INTERNAL help Curve25519 algorithm
@@ -45,9 +47,10 @@ config CRYPTO_NHPOLY1305_NEON - NEON (Advanced SIMD) extensions config CRYPTO_POLY1305_ARM - tristate "Hash functions: Poly1305 (NEON)" + tristate select CRYPTO_HASH - select CRYPTO_ARCH_MAY_HAVE_LIB_POLY1305 + select CRYPTO_ARCH_HAVE_LIB_POLY1305 + default CRYPTO_LIB_POLY1305_INTERNAL help Poly1305 authenticator algorithm (RFC7539)
@@ -212,9 +215,10 @@ config CRYPTO_AES_ARM_CE - ARMv8 Crypto Extensions config CRYPTO_CHACHA20_NEON - tristate "Ciphers: ChaCha20, XChaCha20, XChaCha12 (NEON)" + tristate select CRYPTO_SKCIPHER - select CRYPTO_ARCH_MAY_HAVE_LIB_CHACHA + select CRYPTO_ARCH_HAVE_LIB_CHACHA + default CRYPTO_LIB_CHACHA_INTERNAL help Length-preserving ciphers: ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms
arch/arm64/crypto/Kconfig +4 -2
@@ -26,10 +26,11 @@ config CRYPTO_NHPOLY1305_NEON - NEON (Advanced SIMD) extensions config CRYPTO_POLY1305_NEON - tristate "Hash functions: Poly1305 (NEON)" + tristate depends on KERNEL_MODE_NEON select CRYPTO_HASH select CRYPTO_ARCH_HAVE_LIB_POLY1305 + default CRYPTO_LIB_POLY1305_INTERNAL help Poly1305 authenticator algorithm (RFC7539)
@@ -186,11 +187,12 @@ config CRYPTO_AES_ARM64_NEON_BLK - NEON (Advanced SIMD) extensions config CRYPTO_CHACHA20_NEON - tristate "Ciphers: ChaCha (NEON)" + tristate depends on KERNEL_MODE_NEON select CRYPTO_SKCIPHER select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA + default CRYPTO_LIB_CHACHA_INTERNAL help Length-preserving ciphers: ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms
arch/mips/crypto/Kconfig +5 -2
@@ -3,9 +3,11 @@ menu "Accelerated Cryptographic Algorithms for CPU (mips)" config CRYPTO_POLY1305_MIPS - tristate "Hash functions: Poly1305" + tristate depends on MIPS + select CRYPTO_HASH select CRYPTO_ARCH_HAVE_LIB_POLY1305 + default CRYPTO_LIB_POLY1305_INTERNAL help Poly1305 authenticator algorithm (RFC7539)
@@ -52,10 +54,11 @@ config CRYPTO_SHA512_OCTEON Architecture: mips OCTEON using crypto instructions, when available config CRYPTO_CHACHA_MIPS - tristate "Ciphers: ChaCha20, XChaCha20, XChaCha12 (MIPS32r2)" + tristate depends on CPU_MIPS32_R2 select CRYPTO_SKCIPHER select CRYPTO_ARCH_HAVE_LIB_CHACHA + default CRYPTO_LIB_CHACHA_INTERNAL help Length-preserving ciphers: ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms
arch/powerpc/crypto/Kconfig +7 -4
@@ -3,10 +3,12 @@ menu "Accelerated Cryptographic Algorithms for CPU (powerpc)" config CRYPTO_CURVE25519_PPC64 - tristate "Public key crypto: Curve25519 (PowerPC64)" + tristate depends on PPC64 && CPU_LITTLE_ENDIAN + select CRYPTO_KPP select CRYPTO_LIB_CURVE25519_GENERIC - select CRYPTO_ARCH_MAY_HAVE_LIB_CURVE25519 + select CRYPTO_ARCH_HAVE_LIB_CURVE25519 + default CRYPTO_LIB_CURVE25519_INTERNAL help Curve25519 algorithm
@@ -91,11 +93,12 @@ config CRYPTO_AES_GCM_P10 later CPU. This module supports stitched acceleration for AES/GCM. config CRYPTO_CHACHA20_P10 - tristate "Ciphers: ChaCha20, XChacha20, XChacha12 (P10 or later)" + tristate depends on PPC64 && CPU_LITTLE_ENDIAN && VSX select CRYPTO_SKCIPHER select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_MAY_HAVE_LIB_CHACHA + select CRYPTO_ARCH_HAVE_LIB_CHACHA + default CRYPTO_LIB_CHACHA_INTERNAL help Length-preserving ciphers: ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms
arch/riscv/crypto/Kconfig +0 -1
@@ -22,7 +22,6 @@ config CRYPTO_CHACHA_RISCV64 tristate "Ciphers: ChaCha" depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO select CRYPTO_SKCIPHER - select CRYPTO_LIB_CHACHA_GENERIC help Length-preserving ciphers: ChaCha20 stream cipher algorithm
arch/s390/crypto/Kconfig +2 -1
@@ -108,11 +108,12 @@ config CRYPTO_DES_S390 As of z196 the CTR mode is hardware accelerated. config CRYPTO_CHACHA_S390 - tristate "Ciphers: ChaCha20" + tristate depends on S390 select CRYPTO_SKCIPHER select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA + default CRYPTO_LIB_CHACHA_INTERNAL help Length-preserving cipher: ChaCha20 stream cipher (RFC 7539)
arch/x86/crypto/Kconfig +11 -6
@@ -3,10 +3,12 @@ menu "Accelerated Cryptographic Algorithms for CPU (x86)" config CRYPTO_CURVE25519_X86 - tristate "Public key crypto: Curve25519 (ADX)" + tristate depends on X86 && 64BIT + select CRYPTO_KPP select CRYPTO_LIB_CURVE25519_GENERIC - select CRYPTO_ARCH_MAY_HAVE_LIB_CURVE25519 + select CRYPTO_ARCH_HAVE_LIB_CURVE25519 + default CRYPTO_LIB_CURVE25519_INTERNAL help Curve25519 algorithm
@@ -348,11 +350,12 @@ config CRYPTO_ARIA_GFNI_AVX512_X86_64 Processes 64 blocks in parallel. config CRYPTO_CHACHA20_X86_64 - tristate "Ciphers: ChaCha20, XChaCha20, XChaCha12 (SSSE3/AVX2/AVX-512VL)" + tristate depends on X86 && 64BIT select CRYPTO_SKCIPHER select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_MAY_HAVE_LIB_CHACHA + select CRYPTO_ARCH_HAVE_LIB_CHACHA + default CRYPTO_LIB_CHACHA_INTERNAL help Length-preserving ciphers: ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms
@@ -417,10 +420,12 @@ config CRYPTO_POLYVAL_CLMUL_NI - CLMUL-NI (carry-less multiplication new instructions) config CRYPTO_POLY1305_X86_64 - tristate "Hash functions: Poly1305 (SSE2/AVX2)" + tristate depends on X86 && 64BIT + select CRYPTO_HASH select CRYPTO_LIB_POLY1305_GENERIC - select CRYPTO_ARCH_MAY_HAVE_LIB_POLY1305 + select CRYPTO_ARCH_HAVE_LIB_POLY1305 + default CRYPTO_LIB_POLY1305_INTERNAL help Poly1305 authenticator algorithm (RFC7539)
crypto/Kconfig +3 -3
@@ -317,7 +317,7 @@ config CRYPTO_ECRDSA config CRYPTO_CURVE25519 tristate "Curve25519" select CRYPTO_KPP - select CRYPTO_LIB_CURVE25519_GENERIC + select CRYPTO_LIB_CURVE25519_INTERNAL help Curve25519 elliptic curve (RFC7748)
@@ -615,7 +615,7 @@ config CRYPTO_ARC4 config CRYPTO_CHACHA20 tristate "ChaCha" - select CRYPTO_LIB_CHACHA_GENERIC + select CRYPTO_LIB_CHACHA_INTERNAL select CRYPTO_SKCIPHER help The ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms
@@ -936,7 +936,7 @@ config CRYPTO_POLYVAL config CRYPTO_POLY1305 tristate "Poly1305" select CRYPTO_HASH - select CRYPTO_LIB_POLY1305_GENERIC + select CRYPTO_LIB_POLY1305_INTERNAL help Poly1305 authenticator algorithm (RFC7539)
lib/crypto/Kconfig +21 -20
93 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 302/311 media: i2c: imx214: Fix uninitialized variable in imx214_set_ctrl()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 38985a25682c66d1a7599b0e95ceeb9c7ba89f84 upstream.
You can't pass uninitialized "ret" variables to cci_write(). It has to start as zero.
--- drivers/media/i2c/imx214.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/imx214.c +1 -1
@@ -840,7 +840,7 @@ static int imx214_s_stream(struct v4l2_s {struct imx214 *imx214 =to_imx214 (subdev);struct v4l2_subdev_state *state; -int ret; +int ret =0 ;if (enable) { ret =pm_runtime_resume_and_get (imx214->dev);
Greg Kroah-Hartman
maintainerPATCH 303/311 MIPS: cm: Fix warning if MIPS_CM is disabled
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Bogendoerfer <[email protected]>
commit b73c3ccdca95c237750c981054997c71d33e09d7 upstream.
Commit e27fbe16af5c ("MIPS: cm: Detect CM quirks from device tree") introduced
arch/mips/include/asm/mips-cm.h:119:13: error: ‘mips_cm_update_property’
defined but not used [-Werror=unused-function]
Fix this by making empty function implementation inline
--- arch/mips/include/asm/mips-cm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/asm/mips-cm.h +1 -1
@@ -116,7 +116,7 @@ static inline bool mips_cm_present(void)#ifdef CONFIG_MIPS_CM extern void mips_cm_update_property (void );#else -static void mips_cm_update_property (void ) {} +static inline void mips_cm_update_property (void ) {}#endif /**
Greg Kroah-Hartman
maintainerPATCH 304/311 net: phy: dp83822: fix transmit amplitude if CONFIG_OF_MDIO not defined
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dimitri Fedrau <[email protected]>
commit 8fa649fd7d3009769c7289d0c31c319b72bc42c4 upstream.
When CONFIG_OF_MDIO is not defined the index for selecting the transmit amplitude voltage for 100BASE-TX is set to 0, but it should be -1, if there is no need to modify the transmit amplitude voltage. Move initialization of the index from dp83822_of_init to dp8382x_probe.
--- drivers/net/phy/dp83822.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/dp83822.c +1 -1
@@ -833,7 +833,6 @@ static int dp83822_of_init(struct phy_de dp83822->set_gpio2_clk_out = true; } - dp83822->tx_amplitude_100base_tx_index =-1 ; ret =phy_get_tx_amplitude_gain (phydev, dev, ETHTOOL_LINK_MODE_100baseT_Full_BIT, &val);
@@ -931,6 +930,7 @@ static int dp8382x_probe(struct phy_deviif (!dp83822)return -ENOMEM ; + dp83822->tx_amplitude_100base_tx_index =-1 ; phydev->priv = dp83822;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 305/311 rust: kbuild: skip `--remap-path-prefix` for `rustdoc`
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miguel Ojeda <[email protected]>
commit 2c8725c1dca3de043670b38592b1b43105322496 upstream.
rustdoc only recognizes --remap-path-prefix starting with Rust 1.81.0, which is later than on minimum, so we cannot pass it unconditionally. Otherwise, we get:
error: Unrecognized option: 'remap-path-prefix'
Note that rustc (the compiler) does recognize the flag since a long time ago (1.26.0).
Moreover, rustdoc since Rust 1.82.0 ICEs in out-of-tree builds when using --remap-path-prefix. The issue has been reduced and reported upstream [1].
Thus workaround both issues by simply skipping the flag when generating the docs -- it is not critical there anyway.
The ICE does not reproduce under --test, but we still need to skip the flag as well for RUSTDOC TK since it is not recognized.
--- rust/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
rust/Makefile +6 -2
@@ -57,10 +57,14 @@ endif core-cfgs = \ --cfg no_fp_fmt_parse +# `rustc` recognizes `--remap-path-prefix` since 1.26.0, but `rustdoc` only +# since Rust 1.81.0. Moreover, `rustdoc` ICEs on out-of-tree builds since Rust +# 1.82.0 (https://github.com/rust-lang/rust/issues/138520). Thus workaround both +# issues skipping the flag. The former also applies to `RUSTDOC TK`. quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $< cmd_rustdoc = \ OBJTREE=$(abspath $(objtree)) \ - $(RUSTDOC) $(filter-out $(skip_flags),$(if $(rustdoc_host),$(rust_common_flags),$(rust_flags))) \ + $(RUSTDOC) $(filter-out $(skip_flags) --remap-path-prefix=%,$(if $(rustdoc_host),$(rust_common_flags),$(rust_flags))) \ $(rustc_target_flags) -L$(objtree)/$(obj) \ -Zunstable-options --generate-link-to-definition \ --output $(rustdoc_output) \
@@ -171,7 +175,7 @@ quiet_cmd_rustdoc_test_kernel = RUSTDOC rm -rf $(objtree)/$(obj)/test/doctests/kernel; \ mkdir -p $(objtree)/$(obj)/test/doctests/kernel; \ OBJTREE=$(abspath $(objtree)) \ - $(RUSTDOC) --test $(rust_flags) \ + $(RUSTDOC) --test $(filter-out --remap-path-prefix=%,$(rust_flags)) \ -L$(objtree)/$(obj) --extern ffi --extern kernel \ --extern build_error --extern macros \ --extern bindings --extern uapi \
Greg Kroah-Hartman
maintainerPATCH 306/311 ublk: dont fail request for recovery & reissue in case of ubq->canceling
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit 18461f2a02be04f8bbbe3b37fecfc702e3fa5bc2 upstream.
ubq->canceling is set with request queue quiesced when io_uring context is exiting. USER_RECOVERY or !RECOVERY_FAIL_IO requires request to be re-queued and re-dispatch after device is recovered.
However commit d796cea7b9f3 ("ublk: implement ->queue_rqs()") still may fail any request in case of ubq->canceling, this way breaks USER_RECOVERY or !RECOVERY_FAIL_IO.
Fix it by calling __ublk_abort_rq() in case of ubq->canceling.
--- drivers/block/ublk_drv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/block/ublk_drv.c +5 -4
@@ -1336,7 +1336,8 @@ static enum blk_eh_timer_return ublk_timreturn BLK_EH_RESET_TIMER ; } -static blk_status_t ublk_prep_req (struct ublk_queue *ubq,struct request *rq) +static blk_status_t ublk_prep_req (struct ublk_queue *ubq,struct request *rq, +bool check_cancel) {blk_status_t res;
@@ -1355,7 +1356,7 @@ static blk_status_t ublk_prep_req(structif (ublk_nosrv_should_queue_io (ubq) &&unlikely (ubq->force_abort))return BLK_STS_IOERR ; -if (unlikely (ubq->canceling)) +if (check_cancel &&unlikely (ubq->canceling))return BLK_STS_IOERR ;/* fill iod to slot in io cmd buffer */
@@ -1374,7 +1375,7 @@ static blk_status_t ublk_queue_rq(structstruct request *rq = bd->rq;blk_status_t res; - res =ublk_prep_req (ubq, rq); + res =ublk_prep_req (ubq, rq, false);if (res !=BLK_STS_OK )return res;
@@ -1406,7 +1407,7 @@ static void ublk_queue_rqs(struct rq_lisublk_queue_cmd_list (ubq, &submit_list); ubq = this_q; -if (ublk_prep_req (ubq, req) ==BLK_STS_OK ) +if (ublk_prep_req (ubq, req, true) ==BLK_STS_OK )rq_list_add_tail (&submit_list, req);else rq_list_add_tail (&requeue_list, req);
Greg Kroah-Hartman
maintainerPATCH 307/311 nvme: fixup scan failure for non-ANA multipath controllers
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <[email protected]>
commit 26d7fb4fd4ca1180e2fa96587dea544563b4962a upstream.
Commit 62baf70c3274 caused the ANA log page to be re-read, even on controllers that do not support ANA. While this should generally harmless, some controllers hang on the unsupported log page and never finish probing.
--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -4297,7 +4297,7 @@ static void nvme_scan_work(struct work_sif (test_bit (NVME_AER_NOTICE_NS_CHANGED , &ctrl->events))nvme_queue_scan (ctrl);#ifdef CONFIG_NVME_MULTIPATH - else + else if (ctrl->ana_log_buf) /* Re-read the ANA log page to not miss updates */ queue_work(nvme_wq, &ctrl->ana_work);#endif
Greg Kroah-Hartman
maintainerPATCH 308/311 usb: xhci: Fix Short Packet handling rework ignoring errors
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
commit 9e3a28793d2fde7a709e814d2504652eaba6ae98 upstream.
A Short Packet event before the last TRB of a TD is followed by another event on the final TRB on spec-compliant HCs, which is most of them.
A 'last_td_was_short' flag was added to know if a TD has just completed as Short Packet and another event is to come. The flag was cleared after seeing the event (unless no TDs are pending, but that's a separate bug) or seeing a new TD complete as something other than Short Packet.
A rework replaced the flag with an 'old_trb_comp_code' variable. When an event doesn't match the pending TD and the previous event was Short Packet, the new event is silently ignored.
To preserve old behavior, 'old_trb_comp_code' should be cleared at this point, but instead it is being set to current comp code, which is often Short Packet again. This can cause more events to be silently ignored, even though they are no longer connected with the old TD that completed short and indicate a serious problem with the driver or the xHC.
Common device classes like UAC in async mode, UVC, serial or the UAS status pipe complete as Short Packet routinely and could be affected.
Clear 'old_trb_comp_code' to zero, which is an invalid completion code and the same value the variable starts with. This restores original behavior on Short Packet and also works for illegal Etron events, which the code has been extended to cover too.
--- drivers/usb/host/xhci-ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-ring.c +1 -1
@@ -2926,7 +2926,7 @@ static int handle_tx_event(struct xhci_hif (xhci_spurious_success_tx_event (xhci, ep_ring)) {xhci_dbg (xhci,"Spurious event dma %pad, comp_code %u after %u\n" , &ep_trb_dma, trb_comp_code, ep_ring->old_trb_comp_code); - ep_ring->old_trb_comp_code = trb_comp_code; + ep_ring->old_trb_comp_code =0 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 309/311 objtool: Ignore end-of-section jumps for KCOV/GCOV
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
commit 0d7597749f5a3ac67851d3836635d084df15fb66 upstream.
When KCOV or GCOV is enabled, dead code can be left behind, in which case objtool silences unreachable and undefined behavior (fallthrough) warnings.
Fallthrough warnings, and their variant "end of section" warnings, were silenced with the following commit:
6b023c784204 ("objtool: Silence more KCOV warnings")
Another variant of a fallthrough warning is a jump to the end of a function. If that function happens to be at the end of a section, the jump destination doesn't actually exist.
Normally that would be a fatal objtool error, but for KCOV/GCOV it's just another undefined behavior fallthrough. Silence it like the others.
Fixes the following warning:
drivers/iommu/dma-iommu.o: warning: objtool: iommu_dma_sw_msi+0x92: can't find jump dest instruction at .text+0x54d5
--- tools/objtool/check.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
tools/objtool/check.c +16 -6
@@ -1482,6 +1482,8 @@ static int add_jump_destinations(structunsigned long dest_off;for_each_insn (file, insn) { +struct symbol *func =insn_func (insn); +if (insn->jump_dest) {/* * handle_group_alt() may have previously set
@@ -1505,7 +1507,7 @@ static int add_jump_destinations(struct }else if (reloc->sym->return_thunk) {add_return_call (file, insn, true);continue ; - }else if (insn_func (insn)) { + }else if (func) {/* * External sibling call or internal sibling call with * STT_FUNC reloc.
@@ -1538,6 +1540,15 @@ static int add_jump_destinations(structcontinue ; } +/* +* GCOV/KCOV dead code can jump to the end of the +* function/section. +*/ +if (file->ignore_unreachables && func && + dest_sec == insn->sec && + dest_off == func->offset + func->len) +continue ; +WARN_INSN (insn,"can't find jump dest instruction at %s+0x%lx" , dest_sec->name, dest_off);return -1 ;
@@ -1562,8 +1573,7 @@ static int add_jump_destinations(struct/* * Cross-function jump. */ -if (insn_func (insn) &&insn_func (jump_dest) && -insn_func (insn) !=insn_func (jump_dest)) { +if (func &&insn_func (jump_dest) && func !=insn_func (jump_dest)) {/* * For GCC 8+, create parent/child links for any cold
@@ -1580,10 +1590,10 @@ static int add_jump_destinations(struct* case where the parent function's only reference to a * subfunction is through a jump table. */ -if (!strstr (insn_func (insn)->name,".cold" ) && +if (!strstr (func->name,".cold" ) &&strstr (insn_func (jump_dest)->name,".cold" )) { -insn_func (insn)->cfunc =insn_func (jump_dest); -insn_func (jump_dest)->pfunc =insn_func (insn); + func->cfunc =insn_func (jump_dest); +insn_func (jump_dest)->pfunc = func; } }
Greg Kroah-Hartman
maintainerPATCH 310/311 objtool: Silence more KCOV warnings, part 2
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
commit 55c78035a1a8dfb05f1472018ce2a651701adb7d upstream.
Similar to GCOV, KCOV can leave behind dead code and undefined behavior. Warnings related to those should be ignored.
The previous commit:
6b023c784204 ("objtool: Silence more KCOV warnings")
... only did so for CONFIG_CGOV_KERNEL. Also do it for CONFIG_KCOV, but for real this time.
Fixes the following warning:
vmlinux.o: warning: objtool: synaptics_report_mt_data: unexpected end of section .text.synaptics_report_mt_data
--- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.lib +1 -1
@@ -275,7 +275,7 @@ objtool-args-$(CONFIG_MITIGATION_SLS) objtool-args-$(CONFIG_STACK_VALIDATION) += --stackval objtool-args-$(CONFIG_HAVE_STATIC_CALL_INLINE) += --static-call objtool-args-$(CONFIG_HAVE_UACCESS_VALIDATION) += --uaccess -objtool-args-$(CONFIG_GCOV_KERNEL) += --no-unreachable +objtool-args-$(or $(CONFIG_GCOV_KERNEL),$(CONFIG_KCOV)) += --no-unreachable objtool-args-$(CONFIG_PREFIX_SYMBOLS) += --prefix=$(CONFIG_FUNCTION_PADDING_BYTES) objtool-args = $(objtool-args-y) \
Greg Kroah-Hartman
maintainerPATCH 311/311 crypto: Kconfig - Select LIB generic option
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
commit 98330b9a61506de7df0d1725122111909c157864 upstream.
Select the generic LIB options if the Crypto API algorithm is enabled. Otherwise this may lead to a build failure as the Crypto API algorithm always uses the generic implementation.
--- crypto/Kconfig | 3 +++ 1 file changed, 3 insertions(+)
crypto/Kconfig +3 -0
@@ -317,6 +317,7 @@ config CRYPTO_ECRDSA config CRYPTO_CURVE25519 tristate "Curve25519" select CRYPTO_KPP + select CRYPTO_LIB_CURVE25519_GENERIC select CRYPTO_LIB_CURVE25519_INTERNAL help Curve25519 elliptic curve (RFC7748)
@@ -615,6 +616,7 @@ config CRYPTO_ARC4 config CRYPTO_CHACHA20 tristate "ChaCha" + select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_LIB_CHACHA_INTERNAL select CRYPTO_SKCIPHER help
@@ -936,6 +938,7 @@ config CRYPTO_POLYVAL config CRYPTO_POLY1305 tristate "Poly1305" select CRYPTO_HASH + select CRYPTO_LIB_POLY1305_GENERIC select CRYPTO_LIB_POLY1305_INTERNAL help Poly1305 authenticator algorithm (RFC7539)
Hi Greg
no regressions here on x86_64 (RKL, Intel 11th Gen. CPU)
Thanks
The kernel, bpf tool and perf tool builds fine for v6.14.5-rc1 on x86 and arm64 Azure VM. Kernel binary size for x86 build:
text data bss dec hex filename
31679632 14224334 6311936 52215902 31cc05e vmlinux
Kernel binary size for arm64 build:
text data bss dec hex filename
36856310 15166805 1048656 53071771 329cf9b vmlinux
Thanks,
Hardik
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 6.14.5 release. There are 311 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-6.14.y
6.12 and 6.6 pass our testing, too:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.12.y
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.6.y
I'm still retrying 5.4 and 5.15.
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Hi Greg
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.5 release. There are 311 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
6.14.5-rc1 tested.
Build successfully completed.
Boot successfully completed.
No dmesg regressions.
Video output normal.
Sound output normal.
Lenovo ThinkPad X1 Carbon Gen10(Intel i7-1260P(x86_64) arch linux)
[ 0.000000] Linux version 6.14.5-rc1rv-g25b40e24731f
(takeshi@ThinkPadX1Gen10J0764) (gcc (GCC) 14.2.1 20250207, GNU ld (GNU Binutils) 2.44) #1 SMP PREEMPT_DYNAMIC Wed Apr 30 10:38:19 JST 2025
Thanks
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.5 release. There are 311 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.
test_progs, test_progs-no_alu32, test_progs-cpuv4, test_maps, test_verifier in BPF selftests all passes (with 82303a059aab cherry-picked from bpf tree to deal with sockmap_ktls failure, it will be sent to stable once it made its way to Linus' tree).
...
Am 29.04.2025 um 18:37 schrieb Greg Kroah-Hartman:
Quoted 4 lines
This is the start of the stable review cycle for the 6.14.5 release. There are 311 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.
Builds, boots and works on my 2-socket Ivy Bridge Xeon E5-2697 v2 server. No dmesg oddities or regressions found.
Beste Grüße,
Peter Schneider
Signature · 8 lines
Climb the mountain not to plant your flag, but to embrace the challenge, enjoy the air and behold the view. Climb it so you can see the world, not so the world can see you. -- David McCullough Jr. OpenPGP: 0xA3828BD796CCE11A8CADE8866E3A92C92C3FF244 Download: https://www.peters-netzplatz.de/download/pschneider1968_pub.asc https://keys.mailvelope.com/pks/lookup?op=get&[email protected] https://keys.mailvelope.com/pks/lookup?op=get&[email protected]
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.5 release. There are 311 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.14:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
116 tests: 116 pass, 0 failLinux version: 6.14.5-rc1-g25b40e24731f
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra186-p3509-0000+p3636-0001, tegra194-p2972-0000,
tegra194-p3509-0000+p3668-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.5 release. There are 311 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 8 lines · On Tue, 29 Apr 2025 18:37:17 +0200 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 6.14.5 release. There are 311 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
Boot-tested under QEMU for Rust x86_64, arm64 and riscv64; built-tested for loongarch64:
Thanks!
Cheers,
Miguel
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.5 release. There are 311 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Regressions on s390 build regressions with defconfig with gcc-13/8 and clang-20/clang-nightly on the stable-rc 6.14.5-rc1.
* s390, build
- clang-20-allmodconfig
- clang-20-defconfig
- clang-nightly-defconfig
- clang-nightly-lkftconfig-hardening
- clang-nightly-lkftconfig-lto-full
- clang-nightly-lkftconfig-lto-thing
- gcc-13-allmodconfig
- gcc-13-defconfig
- gcc-13-lkftconfig-hardening
- gcc-8-defconfig-fe40093d
- gcc-8-lkftconfig-hardening
- korg-clang-20-lkftconfig-hardening
- korg-clang-20-lkftconfig-lto-full
- korg-clang-20-lkftconfig-lto-thing
Regression Analysis:
- New regression? Yes
- Reproducibility? Yes
Build regression: s390 pci_fixup.c 'struct pci_dev' has no member named 'non_mappable_bars'
## Build s390arch/s390/pci/pci_fixup.c: In function 'zpci_ism_bar_no_mmap':arch/s390/pci/pci_fixup.c:19:13: error: 'struct pci_dev' has no member named 'non_mappable_bars'
19 | pdev->non_mappable_bars = 1;
| ^~
## Build s390
* Build log: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.3-550-g25b40e24731f/testrun/28260682/suite/build/test/gcc-13-defconfig/log
* Build history:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.3-550-g25b40e24731f/testrun/28260682/suite/build/test/gcc-13-defconfig/history/
* Build details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.3-550-g25b40e24731f/testrun/28260682/suite/build/test/gcc-13-defconfig/details/
* Build link: https://storage.tuxsuite.com/public/linaro/lkft/builds/2wPcixbnyrWJFLHOcPITycGUE5C/
* Kernel config:
https://storage.tuxsuite.com/public/linaro/lkft/builds/2wPcixbnyrWJFLHOcPITycGUE5C/config
* Toolchain: gcc-13 and clang-20
NOTE:
### Clang-nightly build warnings
* arm64, build
- clang-nightly-allyesconfig
* x86, i386, build
- clang-nightly-defconfig
- clang-nightly-lkftconfig-kselftest
## Build warningsinclude/linux/fs.h:3911:15: warning: default initialization of an object of type 'union (unnamed union at include/linux/fs.h:3911:6)' with const member leaves the object uninitialized and is incompatible with C++ [-Wdefault-const-init-unsafe]
3911 | if (unlikely(get_user(c, path)))
| ^
Links:
- https://storage.tuxsuite.com/public/linaro/lkft/builds/2wPciVppbD5RzfHEvVZtbFTHapf/
- https://storage.tuxsuite.com/public/linaro/lkft/builds/2wPchxeZeZBSVjD4AtsK7UIen0t/
## Build
* kernel: 6.14.5-rc1
* git: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git commit: 25b40e24731f2dbaad24bd56b2b25e6714783538
* git describe: v6.14.3-550-g25b40e24731f
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.3-550-g25b40e24731f
## Test Regressions (compared to v6.14.3-242-g86c135e93323)
* s390, build
- clang-20-allmodconfig
- clang-20-defconfig
- clang-nightly-defconfig
- clang-nightly-lkftconfig-hardening
- clang-nightly-lkftconfig-lto-full
- clang-nightly-lkftconfig-lto-thing
- gcc-13-allmodconfig
- gcc-13-defconfig
- gcc-13-lkftconfig-hardening
- gcc-8-defconfig-fe40093d
- gcc-8-lkftconfig-hardening
- korg-clang-20-lkftconfig-hardening
- korg-clang-20-lkftconfig-lto-full
- korg-clang-20-lkftconfig-lto-thing
## Metric Regressions (compared to v6.14.3-242-g86c135e93323)
## Test Fixes (compared to v6.14.3-242-g86c135e93323)
## Metric Fixes (compared to v6.14.3-242-g86c135e93323)
## Test result summary
total: 129647, pass: 105960, fail: 5381, skip: 17905, xfail: 401
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 139 total, 137 passed, 2 failed
* arm64: 56 total, 55 passed, 1 failed
* i386: 18 total, 16 passed, 2 failed
* mips: 34 total, 33 passed, 1 failed
* parisc: 4 total, 4 passed, 0 failed
* powerpc: 40 total, 40 passed, 0 failed
* riscv: 25 total, 22 passed, 3 failed
* s390: 22 total, 8 passed, 14 failed
* sh: 5 total, 5 passed, 0 failed
* sparc: 4 total, 3 passed, 1 failed
* x86_64: 49 total, 42 passed, 7 failed
## Test suites summary
* boot
* commands
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-efivarfs
* kselftest-exec
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-kcmp
* kselftest-kvm
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-mincore
* kselftest-mqueue
* kselftest-net
* kselftest-net-mptcp
* kselftest-openat2
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-rust
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-tc-testing
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user_events
* kselftest-vDSO
* kselftest-x86
* kunit
* kvm-unit-tests
* lava
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-build-clang
* log-parser-build-gcc
* log-parser-test
* ltp-ca[
* ltp-capability
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-hugetlb
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* perf
* rcutorture
* rt-tests-cyclicdeadline
* rt-tests-pi-stress
* rt-tests-pmqtest
* rt-tests-rt-migrate-test
* rt-tests-signaltest
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.5 release. There are 311 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.5 release. There are 311 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.
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.5 release. There are 311 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
Tested on a ThinkPad E14 Gen 3 with a AMD Ryzen 5 5500U CPU and on the Steam Deck (LCD variant) aswell as a Framework Desktop.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.5 release. There are 311 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian