6.1.84-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 1/272 x86/cpu: Support AMD Automatic IBRS
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kim Phillips <[email protected]>
commit e7862eda309ecfccc36bb5558d937ed3ace07f3f upstream.
The AMD Zen4 core supports a new feature called Automatic IBRS.
It is a "set-and-forget" feature that means that, like Intel's Enhanced IBRS, h/w manages its IBRS mitigation resources automatically across CPL transitions.
The feature is advertised by CPUID_Fn80000021_EAX bit 8 and is enabled by setting MSR C000_0080 (EFER) bit 21.
Enable Automatic IBRS by default if the CPU feature is present. It typically provides greater performance over the incumbent generic retpolines mitigation.
Reuse the SPECTRE_V2_EIBRS spectre_v2_mitigation enum. AMD Automatic IBRS and Intel Enhanced IBRS have similar enablement. Add NO_EIBRS_PBRSB to cpu_vuln_whitelist, since AMD Automatic IBRS isn't affected by PBRSB-eIBRS.
The kernel command line option spectre_v2=eibrs is used to select AMD Automatic IBRS, if available.
--- Documentation/admin-guide/hw-vuln/spectre.rst | 6 +++--- Documentation/admin-guide/kernel-parameters.txt | 6 +++--- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/bugs.c | 20 ++++++++++++-------- arch/x86/kernel/cpu/common.c | 19 +++++++++++-------- 6 files changed, 32 insertions(+), 22 deletions(-)
Documentation/admin-guide/hw-vuln/spectre.rst +3 -3
@@ -621,9 +621,9 @@ kernel command line. retpoline,generic Retpolines retpoline,lfence LFENCE; indirect branch retpoline,amd alias for retpoline,lfence - eibrs enhanced IBRS - eibrs,retpoline enhanced IBRS + Retpolines - eibrs,lfence enhanced IBRS + LFENCE + eibrs Enhanced/Auto IBRS + eibrs,retpoline Enhanced/Auto IBRS + Retpolines + eibrs,lfence Enhanced/Auto IBRS + LFENCE ibrs use IBRS to protect kernel Not specifying this option is equivalent to
Documentation/admin-guide/kernel-parameters.txt +3 -3
@@ -5765,9 +5765,9 @@ retpoline,generic - Retpolines retpoline,lfence - LFENCE; indirect branch retpoline,amd - alias for retpoline,lfence - eibrs - enhanced IBRS - eibrs,retpoline - enhanced IBRS + Retpolines - eibrs,lfence - enhanced IBRS + LFENCE + eibrs - Enhanced/Auto IBRS + eibrs,retpoline - Enhanced/Auto IBRS + Retpolines + eibrs,lfence - Enhanced/Auto IBRS + LFENCE ibrs - use IBRS to protect kernel Not specifying this option is equivalent to
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -427,6 +427,7 @@#define X86_FEATURE_V_TSC_AUX (19*32+ 9)/* "" Virtual TSC_AUX */ #define X86_FEATURE_SME_COHERENT (19*32+10)/* "" AMD hardware-enforced cache coherency */ +#define X86_FEATURE_AUTOIBRS (20*32+ 8)/* "" Automatic IBRS */ #define X86_FEATURE_SBPB (20*32+27)/* "" Selective Branch Prediction Barrier */ #define X86_FEATURE_IBPB_BRTYPE (20*32+28)/* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */ #define X86_FEATURE_SRSO_NO (20*32+29)/* "" CPU is not affected by SRSO */
arch/x86/include/asm/msr-index.h +2 -0
@@ -30,6 +30,7 @@#define _EFER_SVME 12/* Enable virtualization */ #define _EFER_LMSLE 13/* Long Mode Segment Limit Enable */ #define _EFER_FFXSR 14/* Enable Fast FXSAVE/FXRSTOR */ +#define _EFER_AUTOIBRS 21/* Enable Automatic IBRS */ #define EFER_SCE (1<<_EFER_SCE)#define EFER_LME (1<<_EFER_LME)
@@ -38,6 +39,7 @@#define EFER_SVME (1<<_EFER_SVME)#define EFER_LMSLE (1<<_EFER_LMSLE)#define EFER_FFXSR (1<<_EFER_FFXSR) +#define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS)/* Intel MSRs. Some also available on other CPUs */
arch/x86/kernel/cpu/bugs.c +12 -8
@@ -1396,9 +1396,9 @@ static const char * const spectre_v2_str [SPECTRE_V2_NONE] = "Vulnerable", [SPECTRE_V2_RETPOLINE] = "Mitigation: Retpolines", [SPECTRE_V2_LFENCE] = "Mitigation: LFENCE", - [SPECTRE_V2_EIBRS] = "Mitigation: Enhanced IBRS", - [SPECTRE_V2_EIBRS_LFENCE] = "Mitigation: Enhanced IBRS + LFENCE", - [SPECTRE_V2_EIBRS_RETPOLINE] = "Mitigation: Enhanced IBRS + Retpolines", + [SPECTRE_V2_EIBRS] = "Mitigation: Enhanced / Automatic IBRS", + [SPECTRE_V2_EIBRS_LFENCE] = "Mitigation: Enhanced / Automatic IBRS + LFENCE", + [SPECTRE_V2_EIBRS_RETPOLINE] = "Mitigation: Enhanced / Automatic IBRS + Retpolines", [SPECTRE_V2_IBRS] = "Mitigation: IBRS", };
@@ -1467,7 +1467,7 @@ static enum spectre_v2_mitigation_cmd __ cmd == SPECTRE_V2_CMD_EIBRS_LFENCE || cmd == SPECTRE_V2_CMD_EIBRS_RETPOLINE) && !boot_cpu_has(X86_FEATURE_IBRS_ENHANCED)) { -pr_err ("%s selected but CPU doesn't have eIBRS. Switching to AUTO select\n" , +pr_err ("%s selected but CPU doesn't have Enhanced or Automatic IBRS. Switching to AUTO select\n" , mitigation_options[i].option);return SPECTRE_V2_CMD_AUTO ; }
@@ -1652,8 +1652,12 @@ static void __init spectre_v2_select_mitpr_err (SPECTRE_V2_EIBRS_EBPF_MSG );if (spectre_v2_in_ibrs_mode (mode)) { - x86_spec_ctrl_base |=SPEC_CTRL_IBRS ; -update_spec_ctrl (x86_spec_ctrl_base); +if (boot_cpu_has (X86_FEATURE_AUTOIBRS )) { +msr_set_bit (MSR_EFER , _EFER_AUTOIBRS); + }else { + x86_spec_ctrl_base |=SPEC_CTRL_IBRS ; +update_spec_ctrl (x86_spec_ctrl_base); + } }switch (mode) {
@@ -1737,8 +1741,8 @@ static void __init spectre_v2_select_mit/* * Retpoline protects the kernel, but doesn't protect firmware. IBRS * and Enhanced IBRS protect firmware too, so enable IBRS around -* firmware calls only when IBRS / Enhanced IBRS aren't otherwise -* enabled. +* firmware calls only when IBRS / Enhanced / Automatic IBRS aren't +* otherwise enabled. * * Use "mode" to check Enhanced IBRS instead of boot_cpu_has(), because * the user might select retpoline on the kernel command line and if
arch/x86/kernel/cpu/common.c +11 -8
@@ -1212,8 +1212,8 @@ static const __initconst struct x86_cpu_VULNWL_AMD (0x12 ,NO_MELTDOWN |NO_SSB |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO ),/* FAMILY_ANY must be last, otherwise 0x0f - 0x12 matches won't work */ -VULNWL_AMD (X86_FAMILY_ANY ,NO_MELTDOWN |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO ), -VULNWL_HYGON (X86_FAMILY_ANY ,NO_MELTDOWN |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO ), +VULNWL_AMD (X86_FAMILY_ANY ,NO_MELTDOWN |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO |NO_EIBRS_PBRSB ), +VULNWL_HYGON (X86_FAMILY_ANY ,NO_MELTDOWN |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO |NO_EIBRS_PBRSB ),/* Zhaoxin Family 7 */ VULNWL(CENTAUR, 7, X86_MODEL_ANY, NO_SPECTRE_V2 | NO_SWAPGS | NO_MMIO),
@@ -1362,8 +1362,16 @@ static void __init cpu_set_bug_bits(stru !cpu_has(c, X86_FEATURE_AMD_SSB_NO))setup_force_cpu_bug (X86_BUG_SPEC_STORE_BYPASS ); -if (ia32_cap &ARCH_CAP_IBRS_ALL ) +/* +* AMD's AutoIBRS is equivalent to Intel's eIBRS - use the Intel feature +* flag and protect from vendor-specific bugs via the whitelist. +*/ +if ((ia32_cap &ARCH_CAP_IBRS_ALL ) ||cpu_has (c,X86_FEATURE_AUTOIBRS )) {setup_force_cpu_cap (X86_FEATURE_IBRS_ENHANCED ); +if (!cpu_matches (cpu_vuln_whitelist,NO_EIBRS_PBRSB ) && + !(ia32_cap &ARCH_CAP_PBRSB_NO )) +setup_force_cpu_bug (X86_BUG_EIBRS_PBRSB ); + }if (!cpu_matches (cpu_vuln_whitelist,NO_MDS ) && !(ia32_cap &ARCH_CAP_MDS_NO )) {
@@ -1425,11 +1433,6 @@ static void __init cpu_set_bug_bits(strusetup_force_cpu_bug (X86_BUG_RETBLEED ); } -if (cpu_has (c,X86_FEATURE_IBRS_ENHANCED ) && - !cpu_matches (cpu_vuln_whitelist,NO_EIBRS_PBRSB ) && - !(ia32_cap &ARCH_CAP_PBRSB_NO )) -setup_force_cpu_bug (X86_BUG_EIBRS_PBRSB ); -if (cpu_matches (cpu_vuln_blacklist,SMT_RSB ))setup_force_cpu_bug (X86_BUG_SMT_RSB );
Greg Kroah-Hartman
maintainerPATCH 10/272 media: staging: ipu3-imgu: Set fields before media_entity_pads_init()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hidenori Kobayashi <[email protected]>
[ Upstream commit 87318b7092670d4086bfec115a0280a60c51c2dd ]
The imgu driver fails to probe with the following message because it does not set the pad's flags before calling media_entity_pads_init().
[ 14.596315] ipu3-imgu 0000:00:05.0: failed initialize subdev media entity (-22) [ 14.596322] ipu3-imgu 0000:00:05.0: failed to register subdev0 ret (-22) [ 14.596327] ipu3-imgu 0000:00:05.0: failed to register pipes (-22) [ 14.596331] ipu3-imgu 0000:00:05.0: failed to create V4L2 devices (-22)
Fix the initialization order so that the driver probe succeeds. The ops initialization is also moved together for readability.
--- drivers/staging/media/ipu3/ipu3-v4l2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/media/ipu3/ipu3-v4l2.c +8 -8
@@ -1069,6 +1069,11 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];/* Initialize subdev media entity */ + imgu_sd->subdev.entity.ops = &imgu_media_ops; +for (i =0 ; i <IMGU_NODE_NUM ; i++) { + imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? +MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; + } r =media_entity_pads_init (&imgu_sd->subdev.entity,IMGU_NODE_NUM , imgu_sd->subdev_pads);if (r) {
@@ -1076,11 +1081,6 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu, "failed initialize subdev media entity (%d)\n", r);return r; } - imgu_sd->subdev.entity.ops = &imgu_media_ops; -for (i =0 ; i <IMGU_NODE_NUM ; i++) { - imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? -MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; - }/* Initialize subdev */ v4l2_subdev_init (&imgu_sd->subdev, &imgu_subdev_ops);
@@ -1177,15 +1177,15 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe, }/* Initialize media entities */ + node->vdev_pad.flags = node->output ? +MEDIA_PAD_FL_SOURCE :MEDIA_PAD_FL_SINK ; + vdev->entity.ops =NULL ; r =media_entity_pads_init (&vdev->entity,1 , &node->vdev_pad);if (r) {dev_err (dev,"failed initialize media entity (%d)\n" , r);mutex_destroy (&node->lock);return r; } - node->vdev_pad.flags = node->output ? -MEDIA_PAD_FL_SOURCE :MEDIA_PAD_FL_SINK ; - vdev->entity.ops =NULL ;/* Initialize vbq */ vbq->type = node->vdev_fmt.type;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 11/272 arm64: dts: qcom: sc7280: Add additional MSI interrupts
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krishna chaitanya chundru <[email protected]>
[ Upstream commit b8ba66b40da3230a8675cb5dd5c2dea5bce24d62 ]
Current MSI's mapping doesn't have all the vectors. This platform supports 8 vectors each vector supports 32 MSI's, so total MSI's supported is 256.
Add all the MSI groups supported for this PCIe instance in this platform.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +10 -2
@@ -2028,8 +2028,16 @@ pcie1: pci@1c08000 { ranges = <0x01000000 0x0 0x00000000 0x0 0x40200000 0x0 0x100000>, <0x02000000 0x0 0x40300000 0x0 0x40300000 0x0 0x1fd00000>; - interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "msi"; + interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "msi0", "msi1", "msi2", "msi3", + "msi4", "msi5", "msi6", "msi7"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>; interrupt-map = <0 0 0 1 &intc 0 0 0 434 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 12/272 remoteproc: virtio: Fix wdg cannot recovery remote processor
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joakim Zhang <[email protected]>
[ Upstream commit b327c72753d6a78de37aed6c35756f2ef62897ee ]
Recovery remote processor failed when wdg irq received:
[ 0.842574] remoteproc remoteproc0: crash detected in cix-dsp-rproc: type watchdog [ 0.842750] remoteproc remoteproc0: handling crash #1 in cix-dsp-rproc [ 0.842824] remoteproc remoteproc0: recovering cix-dsp-rproc [ 0.843342] remoteproc remoteproc0: stopped remote processor cix-dsp-rproc [ 0.847901] rproc-virtio rproc-virtio.0.auto: Failed to associate buffer [ 0.847979] remoteproc remoteproc0: failed to probe subdevices for cix-dsp-rproc: -16
The reason is that dma coherent mem would not be released when recovering the remote processor, due to rproc_virtio_remove() would not be called, where the mem released. It will fail when it try to allocate and associate buffer again.
Releasing reserved memory from rproc_virtio_dev_release(), instead of rproc_virtio_remove().
--- drivers/remoteproc/remoteproc_virtio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/remoteproc/remoteproc_virtio.c +3 -3
@@ -351,6 +351,9 @@ static void rproc_virtio_dev_release(struct device *dev)kfree (vdev); +of_reserved_mem_device_release (&rvdev->pdev->dev); +dma_release_coherent_memory (&rvdev->pdev->dev); +put_device (&rvdev->pdev->dev); }
@@ -584,9 +587,6 @@ static int rproc_virtio_remove(struct platform_device *pdev)rproc_remove_subdev (rproc, &rvdev->subdev);rproc_remove_rvdev (rvdev); -of_reserved_mem_device_release (&pdev->dev); -dma_release_coherent_memory (&pdev->dev); -put_device (&rproc->dev);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 13/272 clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amit Pundir <[email protected]>
[ Upstream commit 1d9054e3a4fd36e2949e616f7360bdb81bcc1921 ]
With the addition of RPMh power domain to the GCC node in device tree, we noticed a significant delay in getting the UFS driver probed on AOSP which futher led to mount failures because Android do not support rootwait. So adding a soft dependency on RPMh power domain which informs modprobe to load rpmhpd module before gcc-sdm845.
--- drivers/clk/qcom/gcc-sdm845.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sdm845.c +1 -0
@@ -4038,3 +4038,4 @@ module_exit(gcc_sdm845_exit);MODULE_DESCRIPTION ("QTI GCC SDM845 Driver" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:gcc-sdm845" ); +MODULE_SOFTDEP ("pre: rpmhpd" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 14/272 smack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roberto Sassu <[email protected]>
[ Upstream commit 9c82169208dde516510aaba6bbd8b13976690c5d ]
Since the SMACK64TRANSMUTE xattr makes sense only for directories, enforce this restriction in smack_inode_setxattr().
--- security/smack/smack_lsm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
security/smack/smack_lsm.c +2 -1
@@ -1309,7 +1309,8 @@ static int smack_inode_setxattr(struct user_namespace *mnt_userns, check_star =1 ; }else if (strcmp (name,XATTR_NAME_SMACKTRANSMUTE ) ==0 ) { check_priv =1 ; -if (size !=TRANS_TRUE_SIZE || +if (!S_ISDIR (d_backing_inode (dentry)->i_mode) || + size !=TRANS_TRUE_SIZE ||strncmp (value,TRANS_TRUE ,TRANS_TRUE_SIZE ) !=0 ) rc = -EINVAL ; }else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 15/272 smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roberto Sassu <[email protected]>
[ Upstream commit ac02f007d64eb2769d0bde742aac4d7a5fc6e8a5 ]
If the SMACK64TRANSMUTE xattr is provided, and the inode is a directory, update the in-memory inode flags by setting SMK_INODE_TRANSMUTE.
--- security/smack/smack_lsm.c | 9 +++++++++ 1 file changed, 9 insertions(+)
security/smack/smack_lsm.c +9 -0
@@ -2783,6 +2783,15 @@ static int smack_inode_setsecurity(struct inode *inode, const char *name,if (value ==NULL || size >SMK_LONGLABEL || size ==0 )return -EINVAL ; +if (strcmp (name,XATTR_SMACK_TRANSMUTE ) ==0 ) { +if (!S_ISDIR (inode->i_mode) || size !=TRANS_TRUE_SIZE || +strncmp (value,TRANS_TRUE ,TRANS_TRUE_SIZE ) !=0 ) +return -EINVAL ; + + nsp->smk_flags |=SMK_INODE_TRANSMUTE ; +return 0 ; + } + skp =smk_import_entry (value, size);if (IS_ERR (skp))return PTR_ERR (skp);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 16/272 arm: dts: marvell: Fix maxium->maxim typo in brownstone dts
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Duje Mihanović <[email protected]>
[ Upstream commit 831e0cd4f9ee15a4f02ae10b67e7fdc10eb2b4fc ]
Fix an obvious spelling error in the PMIC compatible in the MMP2 Brownstone DTS file.
[krzysztof: Just 10 years to take a patch, not bad! Rephrased commit
msg]
--- arch/arm/boot/dts/mmp2-brownstone.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mmp2-brownstone.dts +1 -1
@@ -28,7 +28,7 @@ &uart3 { &twsi1 { status = "okay"; pmic: max8925@3c { - compatible = "maxium,max8925"; + compatible = "maxim,max8925"; reg = <0x3c>; interrupts = <1>; interrupt-parent = <&intcmux4>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 17/272 drm/vmwgfx: Fix possible null pointer derefence with invalid contexts
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zack Rusin <[email protected]>
[ Upstream commit 517621b7060096e48e42f545fa6646fc00252eac ]
vmw_context_cotable can return either an error or a null pointer and its usage sometimes went unchecked. Subsequent code would then try to access either a null pointer or an error value.
The invalid dereferences were only possible with malformed userspace apps which never properly initialized the rendering contexts.
Check the results of vmw_context_cotable to fix the invalid derefs.
Thanks:
ziming zhang(@ezrak1e) from Ant Group Light-Year Security Lab who was the first person to discover it.
Niels De Graef who reported it and helped to track down the poc.
--- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +11 -3
@@ -447,7 +447,7 @@ static int vmw_resource_context_res_add(struct vmw_private *dev_priv, vmw_res_type(ctx) == vmw_res_dx_context) {for (i =0 ; i < cotable_max; ++i) { res =vmw_context_cotable (ctx, i); -if (IS_ERR (res)) +if (IS_ERR_OR_NULL (res))continue ; ret = vmw_execbuf_res_val_add(sw_context, res,
@@ -1259,6 +1259,8 @@ static int vmw_cmd_dx_define_query(struct vmw_private *dev_priv,return -EINVAL ; cotable_res =vmw_context_cotable (ctx_node->ctx,SVGA_COTABLE_DXQUERY ); +if (IS_ERR_OR_NULL (cotable_res)) +return cotable_res ?PTR_ERR (cotable_res) : -EINVAL ; ret =vmw_cotable_notify (cotable_res, cmd->body.queryId);return ret;
@@ -2477,6 +2479,8 @@ static int vmw_cmd_dx_view_define(struct vmw_private *dev_priv,return ret; res =vmw_context_cotable (ctx_node->ctx, vmw_view_cotables[view_type]); +if (IS_ERR_OR_NULL (res)) +return res ?PTR_ERR (res) : -EINVAL ; ret =vmw_cotable_notify (res, cmd->defined_id);if (unlikely (ret !=0 ))return ret;
@@ -2562,8 +2566,8 @@ static int vmw_cmd_dx_so_define(struct vmw_private *dev_priv, so_type =vmw_so_cmd_to_type (header->id); res =vmw_context_cotable (ctx_node->ctx, vmw_so_cotables[so_type]); -if (IS_ERR (res)) -return PTR_ERR (res); +if (IS_ERR_OR_NULL (res)) +return res ?PTR_ERR (res) : -EINVAL ; cmd =container_of (header,typeof (*cmd), header); ret =vmw_cotable_notify (res, cmd->defined_id);
@@ -2682,6 +2686,8 @@ static int vmw_cmd_dx_define_shader(struct vmw_private *dev_priv,return -EINVAL ; res =vmw_context_cotable (ctx_node->ctx,SVGA_COTABLE_DXSHADER ); +if (IS_ERR_OR_NULL (res)) +return res ?PTR_ERR (res) : -EINVAL ; ret =vmw_cotable_notify (res, cmd->body.shaderId);if (ret)return ret;
@@ -3003,6 +3009,8 @@ static int vmw_cmd_dx_define_streamoutput(struct vmw_private *dev_priv, } res =vmw_context_cotable (ctx_node->ctx,SVGA_COTABLE_STREAMOUTPUT ); +if (IS_ERR_OR_NULL (res)) +return res ?PTR_ERR (res) : -EINVAL ; ret =vmw_cotable_notify (res, cmd->body.soid);if (ret)return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 18/272 serial: max310x: fix NULL pointer dereference in I2C instantiation
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugo Villeneuve <[email protected]>
[ Upstream commit 0d27056c24efd3d63a03f3edfbcfc4827086b110 ]
When trying to instantiate a max14830 device from userspace:
echo max14830 0x60 > /sys/bus/i2c/devices/i2c-2/new_device
we get the following error:
Unable to handle kernel NULL pointer dereference at virtual address...
...
Call trace:
max310x_i2c_probe+0x48/0x170 [max310x]
i2c_device_probe+0x150/0x2a0
...Add check for validity of devtype to prevent the error, and abort probe with a meaningful error message.
--- drivers/tty/serial/max310x.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/tty/serial/max310x.c +5 -2
@@ -1633,13 +1633,16 @@ static unsigned short max310x_i2c_slave_addr(unsigned short addr,static int max310x_i2c_probe (struct i2c_client *client) { -const struct max310x_devtype *devtype = -device_get_match_data (&client->dev); +const struct max310x_devtype *devtype;struct i2c_client *port_client;struct regmap *regmaps[4 ];unsigned int i;u8 port_addr; + devtype =device_get_match_data (&client->dev); +if (!devtype) +return dev_err_probe (&client->dev, -ENODEV ,"Failed to match device\n" ); +if (client->addr < devtype->slave_addr.min || client->addr > devtype->slave_addr.max) return dev_err_probe(&client->dev, -EINVAL,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 2/272 x86/bugs: Use sysfs_emit()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov <[email protected]>
commit 1d30800c0c0ae1d086ffad2bdf0ba4403370f132 upstream.
Those mitigations are very talkative; use the printing helper which pays attention to the buffer size.
--- arch/x86/kernel/cpu/bugs.c | 105 ++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 53 deletions(-)
arch/x86/kernel/cpu/bugs.c +52 -53
@@ -2572,74 +2572,74 @@ static const char * const l1tf_vmx_statestatic ssize_t l1tf_show_state (char *buf) {if (l1tf_vmx_mitigation ==VMENTER_L1D_FLUSH_AUTO ) -return sprintf (buf,"%s\n" ,L1TF_DEFAULT_MSG ); +return sysfs_emit (buf,"%s\n" ,L1TF_DEFAULT_MSG );if (l1tf_vmx_mitigation ==VMENTER_L1D_FLUSH_EPT_DISABLED || (l1tf_vmx_mitigation ==VMENTER_L1D_FLUSH_NEVER &&sched_smt_active ())) { -return sprintf (buf,"%s; VMX: %s\n" ,L1TF_DEFAULT_MSG , - l1tf_vmx_states[l1tf_vmx_mitigation]); +return sysfs_emit (buf,"%s; VMX: %s\n" ,L1TF_DEFAULT_MSG , + l1tf_vmx_states[l1tf_vmx_mitigation]); } -return sprintf (buf,"%s; VMX: %s, SMT %s\n" ,L1TF_DEFAULT_MSG , - l1tf_vmx_states[l1tf_vmx_mitigation], -sched_smt_active () ?"vulnerable" :"disabled" ); +return sysfs_emit (buf,"%s; VMX: %s, SMT %s\n" ,L1TF_DEFAULT_MSG , + l1tf_vmx_states[l1tf_vmx_mitigation], +sched_smt_active () ?"vulnerable" :"disabled" ); }static ssize_t itlb_multihit_show_state (char *buf) {if (!boot_cpu_has (X86_FEATURE_MSR_IA32_FEAT_CTL ) || !boot_cpu_has (X86_FEATURE_VMX )) -return sprintf (buf,"KVM: Mitigation: VMX unsupported\n" ); +return sysfs_emit (buf,"KVM: Mitigation: VMX unsupported\n" );else if (!(cr4_read_shadow () &X86_CR4_VMXE )) -return sprintf (buf,"KVM: Mitigation: VMX disabled\n" ); +return sysfs_emit (buf,"KVM: Mitigation: VMX disabled\n" );else if (itlb_multihit_kvm_mitigation) -return sprintf (buf,"KVM: Mitigation: Split huge pages\n" ); +return sysfs_emit (buf,"KVM: Mitigation: Split huge pages\n" );else -return sprintf (buf,"KVM: Vulnerable\n" ); +return sysfs_emit (buf,"KVM: Vulnerable\n" ); }#else static ssize_t l1tf_show_state (char *buf) { -return sprintf (buf,"%s\n" ,L1TF_DEFAULT_MSG ); +return sysfs_emit (buf,"%s\n" ,L1TF_DEFAULT_MSG ); }static ssize_t itlb_multihit_show_state (char *buf) { -return sprintf (buf,"Processor vulnerable\n" ); +return sysfs_emit (buf,"Processor vulnerable\n" ); }#endif static ssize_t mds_show_state (char *buf) {if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) { -return sprintf (buf,"%s; SMT Host state unknown\n" , - mds_strings[mds_mitigation]); +return sysfs_emit (buf,"%s; SMT Host state unknown\n" , + mds_strings[mds_mitigation]); }if (boot_cpu_has (X86_BUG_MSBDS_ONLY )) { -return sprintf (buf,"%s; SMT %s\n" , mds_strings[mds_mitigation], - (mds_mitigation ==MDS_MITIGATION_OFF ?"vulnerable" : -sched_smt_active () ?"mitigated" :"disabled" )); +return sysfs_emit (buf,"%s; SMT %s\n" , mds_strings[mds_mitigation], + (mds_mitigation ==MDS_MITIGATION_OFF ?"vulnerable" : +sched_smt_active () ?"mitigated" :"disabled" )); } -return sprintf (buf,"%s; SMT %s\n" , mds_strings[mds_mitigation], -sched_smt_active () ?"vulnerable" :"disabled" ); +return sysfs_emit (buf,"%s; SMT %s\n" , mds_strings[mds_mitigation], +sched_smt_active () ?"vulnerable" :"disabled" ); }static ssize_t tsx_async_abort_show_state (char *buf) {if ((taa_mitigation ==TAA_MITIGATION_TSX_DISABLED ) || (taa_mitigation ==TAA_MITIGATION_OFF )) -return sprintf (buf,"%s\n" , taa_strings[taa_mitigation]); +return sysfs_emit (buf,"%s\n" , taa_strings[taa_mitigation]);if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) { -return sprintf (buf,"%s; SMT Host state unknown\n" , - taa_strings[taa_mitigation]); +return sysfs_emit (buf,"%s; SMT Host state unknown\n" , + taa_strings[taa_mitigation]); } -return sprintf (buf,"%s; SMT %s\n" , taa_strings[taa_mitigation], -sched_smt_active () ?"vulnerable" :"disabled" ); +return sysfs_emit (buf,"%s; SMT %s\n" , taa_strings[taa_mitigation], +sched_smt_active () ?"vulnerable" :"disabled" ); }static ssize_t mmio_stale_data_show_state (char *buf)
@@ -2712,47 +2712,46 @@ static char *pbrsb_eibrs_state(void)static ssize_t spectre_v2_show_state (char *buf) {if (spectre_v2_enabled ==SPECTRE_V2_LFENCE ) -return sprintf (buf,"Vulnerable: LFENCE\n" ); +return sysfs_emit (buf,"Vulnerable: LFENCE\n" );if (spectre_v2_enabled ==SPECTRE_V2_EIBRS &&unprivileged_ebpf_enabled ()) -return sprintf (buf,"Vulnerable: eIBRS with unprivileged eBPF\n" ); +return sysfs_emit (buf,"Vulnerable: eIBRS with unprivileged eBPF\n" );if (sched_smt_active () &&unprivileged_ebpf_enabled () && spectre_v2_enabled ==SPECTRE_V2_EIBRS_LFENCE ) -return sprintf (buf,"Vulnerable: eIBRS+LFENCE with unprivileged eBPF and SMT\n" ); +return sysfs_emit (buf,"Vulnerable: eIBRS+LFENCE with unprivileged eBPF and SMT\n" ); -return sprintf (buf,"%s%s%s%s%s%s%s\n" , - spectre_v2_strings[spectre_v2_enabled], -ibpb_state (), -boot_cpu_has (X86_FEATURE_USE_IBRS_FW ) ?", IBRS_FW" :"" , -stibp_state (), -boot_cpu_has (X86_FEATURE_RSB_CTXSW ) ?", RSB filling" :"" , -pbrsb_eibrs_state (), -spectre_v2_module_string ()); +return sysfs_emit (buf,"%s%s%s%s%s%s%s\n" , + spectre_v2_strings[spectre_v2_enabled], +ibpb_state (), +boot_cpu_has (X86_FEATURE_USE_IBRS_FW ) ?", IBRS_FW" :"" , +stibp_state (), +boot_cpu_has (X86_FEATURE_RSB_CTXSW ) ?", RSB filling" :"" , +pbrsb_eibrs_state (), +spectre_v2_module_string ()); }static ssize_t srbds_show_state (char *buf) { -return sprintf (buf,"%s\n" , srbds_strings[srbds_mitigation]); +return sysfs_emit (buf,"%s\n" , srbds_strings[srbds_mitigation]); }static ssize_t retbleed_show_state (char *buf) {if (retbleed_mitigation ==RETBLEED_MITIGATION_UNRET || retbleed_mitigation ==RETBLEED_MITIGATION_IBPB ) { -if (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD && - boot_cpu_data.x86_vendor !=X86_VENDOR_HYGON ) -return sprintf (buf,"Vulnerable: untrained return thunk / IBPB on non-AMD based uarch\n" ); - -return sprintf (buf,"%s; SMT %s\n" , - retbleed_strings[retbleed_mitigation], - !sched_smt_active () ?"disabled" : - spectre_v2_user_stibp ==SPECTRE_V2_USER_STRICT || - spectre_v2_user_stibp ==SPECTRE_V2_USER_STRICT_PREFERRED ? -"enabled with STIBP protection" :"vulnerable" ); +if (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD && + boot_cpu_data.x86_vendor !=X86_VENDOR_HYGON ) +return sysfs_emit (buf,"Vulnerable: untrained return thunk / IBPB on non-AMD based uarch\n" ); + +return sysfs_emit (buf,"%s; SMT %s\n" , retbleed_strings[retbleed_mitigation], + !sched_smt_active () ?"disabled" : + spectre_v2_user_stibp ==SPECTRE_V2_USER_STRICT || + spectre_v2_user_stibp ==SPECTRE_V2_USER_STRICT_PREFERRED ? +"enabled with STIBP protection" :"vulnerable" ); } -return sprintf (buf,"%s\n" , retbleed_strings[retbleed_mitigation]); +return sysfs_emit (buf,"%s\n" , retbleed_strings[retbleed_mitigation]); }static ssize_t gds_show_state (char *buf)
@@ -2774,26 +2773,26 @@ static ssize_t cpu_show_common(struct de char *buf, unsigned int bug) {if (!boot_cpu_has_bug (bug)) -return sprintf (buf,"Not affected\n" ); +return sysfs_emit (buf,"Not affected\n" );switch (bug) {case X86_BUG_CPU_MELTDOWN :if (boot_cpu_has (X86_FEATURE_PTI )) -return sprintf (buf,"Mitigation: PTI\n" ); +return sysfs_emit (buf,"Mitigation: PTI\n" );if (hypervisor_is_type (X86_HYPER_XEN_PV )) -return sprintf (buf,"Unknown (XEN PV detected, hypervisor mitigation required)\n" ); +return sysfs_emit (buf,"Unknown (XEN PV detected, hypervisor mitigation required)\n" );break ;case X86_BUG_SPECTRE_V1 : -return sprintf (buf,"%s\n" , spectre_v1_strings[spectre_v1_mitigation]); +return sysfs_emit (buf,"%s\n" , spectre_v1_strings[spectre_v1_mitigation]);case X86_BUG_SPECTRE_V2 :return spectre_v2_show_state (buf);case X86_BUG_SPEC_STORE_BYPASS : -return sprintf (buf,"%s\n" , ssb_strings[ssb_mode]); +return sysfs_emit (buf,"%s\n" , ssb_strings[ssb_mode]);case X86_BUG_L1TF :if (boot_cpu_has (X86_FEATURE_L1TF_PTEINV ))
@@ -2832,7 +2831,7 @@ static ssize_t cpu_show_common(struct debreak ; } -return sprintf (buf,"Vulnerable\n" ); +return sysfs_emit (buf,"Vulnerable\n" ); }ssize_t cpu_show_meltdown (struct device *dev,struct device_attribute *attr,char *buf)
Greg Kroah-Hartman
maintainerPATCH 3/272 KVM: x86: Update KVM-only leaf handling to allow for 100% KVM-only leafs
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit 047c7229906152fb85c23dc18fd25a00cd7cb4de upstream.
Rename kvm_cpu_cap_init_scattered() to kvm_cpu_cap_init_kvm_defined() in anticipation of adding KVM-only CPUID leafs that aren't recognized by the kernel and thus not scattered, i.e. for leafs that are 100% KVM-defined.
Adjust/add comments to kvm_only_cpuid_leafs and KVM_X86_FEATURE to document how to create new kvm_only_cpuid_leafs entries for scattered features as well as features that are entirely unknown to the kernel.
No functional change intended.
Message-Id: <[email protected]>
--- arch/x86/kvm/cpuid.c | 8 ++++---- arch/x86/kvm/reverse_cpuid.h | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-)
arch/x86/kvm/cpuid.c +4 -4
@@ -535,9 +535,9 @@ static __always_inline void __kvm_cpu_ca }static __always_inline -void kvm_cpu_cap_init_scattered(enum kvm_only_cpuid_leafs leaf, u32 mask) +void kvm_cpu_cap_init_kvm_defined(enum kvm_only_cpuid_leafs leaf, u32 mask) { -/* Use kvm_cpu_cap_mask for non-scattered leafs. */ +/* Use kvm_cpu_cap_mask for leafs that aren't KVM-only. */ BUILD_BUG_ON (leaf <NCAPINTS ); kvm_cpu_caps[leaf] = mask;
@@ -547,7 +547,7 @@ void kvm_cpu_cap_init_scattered(enum kvm static __always_inline void kvm_cpu_cap_mask(enum cpuid_leafs leaf, u32 mask) { -/* Use kvm_cpu_cap_init_scattered for scattered leafs. */ +/* Use kvm_cpu_cap_init_kvm_defined for KVM-only leafs. */ BUILD_BUG_ON (leaf >=NCAPINTS ); kvm_cpu_caps[leaf] &= mask;
@@ -656,7 +656,7 @@ void kvm_set_cpu_caps(void)F (XSAVEOPT ) |F (XSAVEC ) |F (XGETBV1 ) |F (XSAVES ) | f_xfd ); -kvm_cpu_cap_init_scattered (CPUID_12_EAX , +kvm_cpu_cap_init_kvm_defined (CPUID_12_EAX ,SF (SGX1 ) |SF (SGX2 ) );
arch/x86/kvm/reverse_cpuid.h +15 -3
@@ -7,9 +7,9 @@#include <asm/cpufeatures.h> /* -* Hardware-defined CPUID leafs that are scattered in the kernel, but need to -* be directly used by KVM. Note, these word values conflict with the kernel's -* "bug" caps, but KVM doesn't use those. +* Hardware-defined CPUID leafs that are either scattered by the kernel or are +* unknown to the kernel, but need to be directly used by KVM. Note, these +* word values conflict with the kernel's "bug" caps, but KVM doesn't use those. */ enum kvm_only_cpuid_leafs {CPUID_12_EAX =NCAPINTS ,
@@ -18,6 +18,18 @@ enum kvm_only_cpuid_leafs { NKVMCAPINTS = NR_KVM_CPU_CAPS - NCAPINTS, }; +/* +* Define a KVM-only feature flag. +* +* For features that are scattered by cpufeatures.h, __feature_translate() also +* needs to be updated to translate the kernel-defined feature into the +* KVM-defined feature. +* +* For features that are 100% KVM-only, i.e. not defined by cpufeatures.h, +* forego the intermediate KVM_X86_FEATURE and directly define X86_FEATURE_* so +* that X86_FEATURE_* can be used in KVM. No __feature_translate() handling is +* needed in this case. +*/ #define KVM_X86_FEATURE (w, f) ((w)*32 + (f))/* Intel-defined SGX sub-features, CPUID level 0x12 (EAX). */
Greg Kroah-Hartman
maintainerPATCH 4/272 KVM: x86: Advertise CPUID.(EAX=7,ECX=2):EDX[5:0] to userspace
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jim Mattson <[email protected]>
commit eefe5e6682099445f77f2d97d4c525f9ac9d9b07 upstream.
The low five bits {INTEL_PSFD, IPRED_CTRL, RRSBA_CTRL, DDPD_U, BHI_CTRL} advertise the availability of specific bits in IA32_SPEC_CTRL. Since KVM dynamically determines the legal IA32_SPEC_CTRL bits for the underlying hardware, the hard work has already been done. Just let userspace know that a guest can use these IA32_SPEC_CTRL bits.
The sixth bit (MCDT_NO) states that the processor does not exhibit MXCSR Configuration Dependent Timing (MCDT) behavior. This is an inherent property of the physical processor that is inherited by the virtual CPU. Pass that information on to userspace.
--- arch/x86/kvm/cpuid.c | 21 ++++++++++++++++++--- arch/x86/kvm/reverse_cpuid.h | 12 ++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-)
arch/x86/kvm/cpuid.c +18 -3
@@ -652,6 +652,11 @@ void kvm_set_cpu_caps(void)F (AVX_VNNI ) |F (AVX512_BF16 ) ); +kvm_cpu_cap_init_kvm_defined (CPUID_7_2_EDX , +F (INTEL_PSFD ) |F (IPRED_CTRL ) |F (RRSBA_CTRL ) |F (DDPD_U ) | +F (BHI_CTRL ) |F (MCDT_NO ) + ); +kvm_cpu_cap_mask (CPUID_D_1_EAX ,F (XSAVEOPT ) |F (XSAVEC ) |F (XGETBV1 ) |F (XSAVES ) | f_xfd );
@@ -902,13 +907,13 @@ static inline int __do_cpuid_func(structbreak ;/* function 7 has additional index. */ case 7 : - entry->eax =min (entry->eax,1u ); + max_idx = entry->eax =min (entry->eax,2u );cpuid_entry_override (entry,CPUID_7_0_EBX );cpuid_entry_override (entry,CPUID_7_ECX );cpuid_entry_override (entry,CPUID_7_EDX ); -/* KVM only supports 0x7.0 and 0x7.1, capped above via min(). */ -if (entry->eax ==1 ) { +/* KVM only supports up to 0x7.2, capped above via min(). */ +if (max_idx >=1 ) { entry =do_host_cpuid (array, function,1 );if (!entry) goto out;
@@ -918,6 +923,16 @@ static inline int __do_cpuid_func(struct entry->ecx =0 ; entry->edx =0 ; } +if (max_idx >=2 ) { + entry =do_host_cpuid (array, function,2 ); +if (!entry) + goto out; + +cpuid_entry_override (entry,CPUID_7_2_EDX ); + entry->ecx =0 ; + entry->ebx =0 ; + entry->eax =0 ; + }break ;case 0xa : {/* Architectural Performance Monitoring */ union cpuid10_eax eax;
arch/x86/kvm/reverse_cpuid.h +12 -0
@@ -13,6 +13,7 @@*/ enum kvm_only_cpuid_leafs {CPUID_12_EAX =NCAPINTS , +CPUID_7_2_EDX ,NR_KVM_CPU_CAPS ,NKVMCAPINTS =NR_KVM_CPU_CAPS -NCAPINTS ,
@@ -36,6 +37,14 @@ enum kvm_only_cpuid_leafs {#define KVM_X86_FEATURE_SGX1 KVM_X86_FEATURE(CPUID_12_EAX, 0)#define KVM_X86_FEATURE_SGX2 KVM_X86_FEATURE(CPUID_12_EAX, 1) +/* Intel-defined sub-features, CPUID level 0x00000007:2 (EDX) */ +#define X86_FEATURE_INTEL_PSFD KVM_X86_FEATURE(CPUID_7_2_EDX, 0) +#define X86_FEATURE_IPRED_CTRL KVM_X86_FEATURE(CPUID_7_2_EDX, 1) +#define KVM_X86_FEATURE_RRSBA_CTRL KVM_X86_FEATURE(CPUID_7_2_EDX, 2) +#define X86_FEATURE_DDPD_U KVM_X86_FEATURE(CPUID_7_2_EDX, 3) +#define X86_FEATURE_BHI_CTRL KVM_X86_FEATURE(CPUID_7_2_EDX, 4) +#define X86_FEATURE_MCDT_NO KVM_X86_FEATURE(CPUID_7_2_EDX, 5) +struct cpuid_reg {u32 function;u32 index;
@@ -61,6 +70,7 @@ static const struct cpuid_reg reverse_cp [CPUID_12_EAX] = {0x00000012, 0, CPUID_EAX}, [CPUID_8000_001F_EAX] = {0x8000001f, 0, CPUID_EAX}, [CPUID_8000_0021_EAX] = {0x80000021, 0, CPUID_EAX}, + [CPUID_7_2_EDX] = { 7, 2, CPUID_EDX}, };/*
@@ -91,6 +101,8 @@ static __always_inline u32 __feature_trareturn KVM_X86_FEATURE_SGX1 ; else if (x86_feature == X86_FEATURE_SGX2) return KVM_X86_FEATURE_SGX2; + else if (x86_feature == X86_FEATURE_RRSBA_CTRL) + return KVM_X86_FEATURE_RRSBA_CTRL;return x86_feature; }
Greg Kroah-Hartman
maintainerPATCH 5/272 KVM: x86: Use a switch statement and macros in __feature_translate()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jim Mattson <[email protected]>
commit 80c883db87d9ffe2d685e91ba07a087b1c246c78 upstream.
Use a switch statement with macro-generated case statements to handle translating feature flags in order to reduce the probability of runtime errors due to copy+paste goofs, to make compile-time errors easier to debug, and to make the code more readable.
E.g. the compiler won't directly generate an error for duplicate if statements
if (x86_feature == X86_FEATURE_SGX1) return KVM_X86_FEATURE_SGX1; else if (x86_feature == X86_FEATURE_SGX2) return KVM_X86_FEATURE_SGX1;
and so instead reverse_cpuid_check() will fail due to the untranslated entry pointing at a Linux-defined leaf, which provides practically no hint as to what is broken
arch/x86/kvm/reverse_cpuid.h:108:2: error: call to __compiletime_assert_450 declared with 'error' attribute:
BUILD_BUG_ON failed: x86_leaf == CPUID_LNX_4
BUILD_BUG_ON(x86_leaf == CPUID_LNX_4);
^whereas duplicate case statements very explicitly point at the offending code:
arch/x86/kvm/reverse_cpuid.h:125:2: error: duplicate case value '361'
KVM_X86_TRANSLATE_FEATURE(SGX2);
^
arch/x86/kvm/reverse_cpuid.h:124:2: error: duplicate case value '360'
KVM_X86_TRANSLATE_FEATURE(SGX1);
^And without macros, the opposite type of copy+paste goof doesn't generate any error at compile-time, e.g. this yields no complaints:
case X86_FEATURE_SGX1:
return KVM_X86_FEATURE_SGX1;
case X86_FEATURE_SGX2:
return KVM_X86_FEATURE_SGX1;Note, __feature_translate() is forcibly inlined and the feature is known at compile-time, so the code generation between an if-elif sequence and a switch statement should be identical.
--- arch/x86/kvm/reverse_cpuid.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
arch/x86/kvm/reverse_cpuid.h +9 -7
@@ -97,14 +97,16 @@ static __always_inline void reverse_cpui*/ static __always_inline u32 __feature_translate(int x86_feature) { -if (x86_feature ==X86_FEATURE_SGX1 ) -return KVM_X86_FEATURE_SGX1 ; -else if (x86_feature ==X86_FEATURE_SGX2 ) -return KVM_X86_FEATURE_SGX2 ; -else if (x86_feature ==X86_FEATURE_RRSBA_CTRL ) -return KVM_X86_FEATURE_RRSBA_CTRL ; +#define KVM_X86_TRANSLATE_FEATURE (f) \ + case X86_FEATURE_##f: return KVM_X86_FEATURE_##f -return x86_feature; +switch (x86_feature) { +KVM_X86_TRANSLATE_FEATURE (SGX1 ); +KVM_X86_TRANSLATE_FEATURE (SGX2 ); +KVM_X86_TRANSLATE_FEATURE (RRSBA_CTRL ); +default : +return x86_feature; + } } static __always_inline u32 __feature_leaf(int x86_feature)
Greg Kroah-Hartman
maintainerPATCH 6/272 timers: Update kernel-doc for various functions
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 14f043f1340bf30bc60af127bff39f55889fef26 ]
The kernel-doc of timer related functions is partially uncomprehensible word salad. Rewrite it to make it useful.
Stable-dep-of: 0f7352557a35 ("wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach")
--- kernel/time/timer.c | 148 +++++++++++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 58 deletions(-)
kernel/time/timer.c +90 -58
@@ -1121,14 +1121,16 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option }/** -* mod_timer_pending - modify a pending timer's timeout -* @timer: the pending timer to be modified -* @expires: new timeout in jiffies +* mod_timer_pending - Modify a pending timer's timeout +* @timer: The pending timer to be modified +* @expires: New absolute timeout in jiffies * -* mod_timer_pending() is the same for pending timers as mod_timer(), -* but will not re-activate and modify already deleted timers. +* mod_timer_pending() is the same for pending timers as mod_timer(), but +* will not activate inactive timers. * -* It is useful for unserialized use of timers. +* Return: +* * %0 - The timer was inactive and not modified +* * %1 - The timer was active and requeued to expire at @expires */ int mod_timer_pending (struct timer_list *timer,unsigned long expires) {
@@ -1137,24 +1139,27 @@ int mod_timer_pending(struct timer_list *timer, unsigned long expires)EXPORT_SYMBOL (mod_timer_pending);/** -* mod_timer - modify a timer's timeout -* @timer: the timer to be modified -* @expires: new timeout in jiffies -* -* mod_timer() is a more efficient way to update the expire field of an -* active timer (if the timer is inactive it will be activated) +* mod_timer - Modify a timer's timeout +* @timer: The timer to be modified +* @expires: New absolute timeout in jiffies * * mod_timer(timer, expires) is equivalent to: * * del_timer(timer); timer->expires = expires; add_timer(timer); * +* mod_timer() is more efficient than the above open coded sequence. In +* case that the timer is inactive, the del_timer() part is a NOP. The +* timer is in any case activated with the new expiry time @expires. +* * Note that if there are multiple unserialized concurrent users of the * same timer, then mod_timer() is the only safe way to modify the timeout, * since add_timer() cannot modify an already running timer. * -* The function returns whether it has modified a pending timer or not. -* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an -* active timer returns 1.) +* Return: +* * %0 - The timer was inactive and started +* * %1 - The timer was active and requeued to expire at @expires or +* the timer was active and not modified because @expires did +* not change the effective expiry time */ int mod_timer (struct timer_list *timer,unsigned long expires) {
@@ -1165,11 +1170,18 @@ EXPORT_SYMBOL(mod_timer);/** * timer_reduce - Modify a timer's timeout if it would reduce the timeout * @timer: The timer to be modified -* @expires: New timeout in jiffies +* @expires: New absolute timeout in jiffies * * timer_reduce() is very similar to mod_timer(), except that it will only -* modify a running timer if that would reduce the expiration time (it will -* start a timer that isn't running). +* modify an enqueued timer if that would reduce the expiration time. If +* @timer is not enqueued it starts the timer. +* +* Return: +* * %0 - The timer was inactive and started +* * %1 - The timer was active and requeued to expire at @expires or +* the timer was active and not modified because @expires +* did not change the effective expiry time such that the +* timer would expire earlier than already scheduled */ int timer_reduce (struct timer_list *timer,unsigned long expires) {
@@ -1178,18 +1190,21 @@ int timer_reduce(struct timer_list *timer, unsigned long expires)EXPORT_SYMBOL (timer_reduce);/** -* add_timer - start a timer -* @timer: the timer to be added +* add_timer - Start a timer +* @timer: The timer to be started * -* The kernel will do a ->function(@timer) callback from the -* timer interrupt at the ->expires point in the future. The -* current time is 'jiffies'. +* Start @timer to expire at @timer->expires in the future. @timer->expires +* is the absolute expiry time measured in 'jiffies'. When the timer expires +* timer->function(timer) will be invoked from soft interrupt context. * -* The timer's ->expires, ->function fields must be set prior calling this -* function. +* The @timer->expires and @timer->function fields must be set prior +* to calling this function. +* +* If @timer->expires is already in the past @timer will be queued to +* expire at the next timer tick. * -* Timers with an ->expires field in the past will be executed in the next -* timer tick. +* This can only operate on an inactive timer. Attempts to invoke this on +* an active timer are rejected with a warning. */ void add_timer (struct timer_list *timer) {
@@ -1199,11 +1214,13 @@ void add_timer(struct timer_list *timer)EXPORT_SYMBOL (add_timer);/** -* add_timer_on - start a timer on a particular CPU -* @timer: the timer to be added -* @cpu: the CPU to start it on +* add_timer_on - Start a timer on a particular CPU +* @timer: The timer to be started +* @cpu: The CPU to start it on +* +* Same as add_timer() except that it starts the timer on the given CPU. * -* This is not very scalable on SMP. Double adds are not possible. +* See add_timer() for further details. */ void add_timer_on (struct timer_list *timer,int cpu) {
@@ -1238,15 +1255,18 @@ void add_timer_on(struct timer_list *timer, int cpu)EXPORT_SYMBOL_GPL (add_timer_on);/** -* del_timer - deactivate a timer. -* @timer: the timer to be deactivated -* -* del_timer() deactivates a timer - this works on both active and inactive -* timers. -* -* The function returns whether it has deactivated a pending timer or not. -* (ie. del_timer() of an inactive timer returns 0, del_timer() of an -* active timer returns 1.) +* del_timer - Deactivate a timer. +* @timer: The timer to be deactivated +* +* The function only deactivates a pending timer, but contrary to +* del_timer_sync() it does not take into account whether the timer's +* callback function is concurrently executed on a different CPU or not. +* It neither prevents rearming of the timer. If @timer can be rearmed +* concurrently then the return value of this function is meaningless. +* +* Return: +* * %0 - The timer was not pending +* * %1 - The timer was pending and deactivated */ int del_timer (struct timer_list *timer) {
@@ -1268,10 +1288,19 @@ EXPORT_SYMBOL(del_timer);/** * try_to_del_timer_sync - Try to deactivate a timer -* @timer: timer to delete +* @timer: Timer to deactivate +* +* This function tries to deactivate a timer. On success the timer is not +* queued and the timer callback function is not running on any CPU. * -* This function tries to deactivate a timer. Upon successful (ret >= 0) -* exit the timer is not queued and the handler is not running on any CPU. +* This function does not guarantee that the timer cannot be rearmed right +* after dropping the base lock. That needs to be prevented by the calling +* code if necessary. +* +* Return: +* * %0 - The timer was not pending +* * %1 - The timer was pending and deactivated +* * %-1 - The timer callback function is running on a different CPU */ int try_to_del_timer_sync (struct timer_list *timer) {
@@ -1367,23 +1396,19 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }#if defined(CONFIG_SMP ) || defined(CONFIG_PREEMPT_RT )/** -* del_timer_sync - deactivate a timer and wait for the handler to finish. -* @timer: the timer to be deactivated -* -* This function only differs from del_timer() on SMP: besides deactivating -* the timer it also makes sure the handler has finished executing on other -* CPUs. +* del_timer_sync - Deactivate a timer and wait for the handler to finish. +* @timer: The timer to be deactivated * * Synchronization rules: Callers must prevent restarting of the timer, * otherwise this function is meaningless. It must not be called from * interrupt contexts unless the timer is an irqsafe one. The caller must -* not hold locks which would prevent completion of the timer's -* handler. The timer's handler must not call add_timer_on(). Upon exit the -* timer is not queued and the handler is not running on any CPU. +* not hold locks which would prevent completion of the timer's callback +* function. The timer's handler must not call add_timer_on(). Upon exit +* the timer is not queued and the handler is not running on any CPU. * -* Note: For !irqsafe timers, you must not hold locks that are held in -* interrupt context while calling this function. Even if the lock has -* nothing to do with the timer in question. Here's why:: +* For !irqsafe timers, the caller must not hold locks that are held in +* interrupt context. Even if the lock has nothing to do with the timer in +* question. Here's why:: * * CPU0 CPU1 * ---- ----
@@ -1397,10 +1422,17 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }* while (base->running_timer == mytimer); * * Now del_timer_sync() will never return and never release somelock. -* The interrupt on the other CPU is waiting to grab somelock but -* it has interrupted the softirq that CPU0 is waiting to finish. +* The interrupt on the other CPU is waiting to grab somelock but it has +* interrupted the softirq that CPU0 is waiting to finish. +* +* This function cannot guarantee that the timer is not rearmed again by +* some concurrent or preempting code, right after it dropped the base +* lock. If there is the possibility of a concurrent rearm then the return +* value of the function is meaningless. * -* The function returns whether it has deactivated a pending timer or not. +* Return: +* * %0 - The timer was not pending +* * %1 - The timer was pending and deactivated */ int del_timer_sync (struct timer_list *timer) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 7/272 timers: Use del_timer_sync() even on UP
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 168f6b6ffbeec0b9333f3582e4cf637300858db5 ]
del_timer_sync() is assumed to be pointless on uniprocessor systems and can be mapped to del_timer() because in theory del_timer() can never be invoked while the timer callback function is executed.
This is not entirely true because del_timer() can be invoked from interrupt context and therefore hit in the middle of a running timer callback.
Contrary to that del_timer_sync() is not allowed to be invoked from interrupt context unless the affected timer is marked with TIMER_IRQSAFE. del_timer_sync() has proper checks in place to detect such a situation.
Give up on the UP optimization and make del_timer_sync() unconditionally available.
Stable-dep-of: 0f7352557a35 ("wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach")
--- include/linux/timer.h | 7 +------ kernel/time/timer.c | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-)
include/linux/timer.h +1 -6
@@ -183,12 +183,7 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);extern void add_timer (struct timer_list *timer);extern int try_to_del_timer_sync (struct timer_list *timer); - -#if defined(CONFIG_SMP ) || defined(CONFIG_PREEMPT_RT ) -extern int del_timer_sync (struct timer_list *timer); -#else -# define del_timer_sync (t) del_timer(t) -#endif +extern int del_timer_sync (struct timer_list *timer);#define del_singleshot_timer_sync (t) del_timer_sync(t)
kernel/time/timer.c +0 -2
@@ -1394,7 +1394,6 @@ static inline void timer_sync_wait_running(struct timer_base *base) { }static inline void del_timer_wait_running (struct timer_list *timer) { }#endif -#if defined(CONFIG_SMP ) || defined(CONFIG_PREEMPT_RT )/** * del_timer_sync - Deactivate a timer and wait for the handler to finish. * @timer: The timer to be deactivated
@@ -1475,7 +1474,6 @@ int del_timer_sync(struct timer_list *timer)return ret; }EXPORT_SYMBOL (del_timer_sync); -#endif static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 8/272 timers: Rename del_timer_sync() to timer_delete_sync()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 9b13df3fb64ee95e2397585404e442afee2c7d4f ]
The timer related functions do not have a strict timer_ prefixed namespace which is really annoying.
Rename del_timer_sync() to timer_delete_sync() and provide del_timer_sync() as a wrapper. Document that del_timer_sync() is not for new code.
Stable-dep-of: 0f7352557a35 ("wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach")
--- include/linux/timer.h | 15 ++++++++++++++- kernel/time/timer.c | 18 +++++++++--------- 2 files changed, 23 insertions(+), 10 deletions(-)
include/linux/timer.h +14 -1
@@ -183,7 +183,20 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);extern void add_timer (struct timer_list *timer);extern int try_to_del_timer_sync (struct timer_list *timer); -extern int del_timer_sync (struct timer_list *timer); +extern int timer_delete_sync (struct timer_list *timer); + +/** +* del_timer_sync - Delete a pending timer and wait for a running callback +* @timer: The timer to be deleted +* +* See timer_delete_sync() for detailed explanation. +* +* Do not use in new code. Use timer_delete_sync() instead. +*/ +static inline int del_timer_sync (struct timer_list *timer) +{ +return timer_delete_sync (timer); +}#define del_singleshot_timer_sync (t) del_timer_sync(t)
kernel/time/timer.c +9 -9
@@ -1083,7 +1083,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option/* * We are trying to schedule the timer on the new base. * However we can't change timer's base while it is running, -* otherwise del_timer_sync() can't detect that the timer's +* otherwise timer_delete_sync() can't detect that the timer's * handler yet has not finished. This also guarantees that the * timer is serialized wrt itself. */
@@ -1259,7 +1259,7 @@ EXPORT_SYMBOL_GPL(add_timer_on);* @timer: The timer to be deactivated * * The function only deactivates a pending timer, but contrary to -* del_timer_sync() it does not take into account whether the timer's +* timer_delete_sync() it does not take into account whether the timer's * callback function is concurrently executed on a different CPU or not. * It neither prevents rearming of the timer. If @timer can be rearmed * concurrently then the return value of this function is meaningless.
@@ -1395,7 +1395,7 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }#endif /** -* del_timer_sync - Deactivate a timer and wait for the handler to finish. +* timer_delete_sync - Deactivate a timer and wait for the handler to finish. * @timer: The timer to be deactivated * * Synchronization rules: Callers must prevent restarting of the timer,
@@ -1417,10 +1417,10 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }* spin_lock_irq(somelock); * <IRQ> * spin_lock(somelock); -* del_timer_sync(mytimer); +* timer_delete_sync(mytimer); * while (base->running_timer == mytimer); * -* Now del_timer_sync() will never return and never release somelock. +* Now timer_delete_sync() will never return and never release somelock. * The interrupt on the other CPU is waiting to grab somelock but it has * interrupted the softirq that CPU0 is waiting to finish. *
@@ -1433,7 +1433,7 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }* * %0 - The timer was not pending * * %1 - The timer was pending and deactivated */ -int del_timer_sync (struct timer_list *timer) +int timer_delete_sync (struct timer_list *timer) {int ret;
@@ -1473,7 +1473,7 @@ int del_timer_sync(struct timer_list *timer)return ret; } -EXPORT_SYMBOL (del_timer_sync); +EXPORT_SYMBOL (timer_delete_sync); static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *),
@@ -1495,8 +1495,8 @@ static void call_timer_fn(struct timer_list *timer,#endif /* * Couple the lock chain with the lock chain at -* del_timer_sync() by acquiring the lock_map around the fn() -* call here and in del_timer_sync(). +* timer_delete_sync() by acquiring the lock_map around the fn() +* call here and in timer_delete_sync(). */ lock_map_acquire (&lockdep_map);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 9/272 wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Wang <[email protected]>
[ Upstream commit 0f7352557a35ab7888bc7831411ec8a3cbe20d78 ]
This is the candidate patch of CVE-2023-47233 :
https://nvd.nist.gov/vuln/detail/CVE-2023-47233
In brcm80211 driver,it starts with the following invoking chain to start init a timeout worker:
->brcmf_usb_probe
->brcmf_usb_probe_cb
->brcmf_attach
->brcmf_bus_started
->brcmf_cfg80211_attach
->wl_init_priv
->brcmf_init_escan
->INIT_WORK(&cfg->escan_timeout_work,
brcmf_cfg80211_escan_timeout_worker);If we disconnect the USB by hotplug, it will call brcmf_usb_disconnect to make cleanup. The invoking chain is :
brcmf_usb_disconnect
->brcmf_usb_disconnect_cb
->brcmf_detach
->brcmf_cfg80211_detach
->kfree(cfg);While the timeout woker may still be running. This will cause a use-after-free bug on cfg in brcmf_cfg80211_escan_timeout_worker.
Fix it by deleting the timer and canceling the worker in brcmf_cfg80211_detach.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +2 -2
@@ -791,8 +791,7 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg, scan_request = cfg->scan_request; cfg->scan_request =NULL ; -if (timer_pending (&cfg->escan_timeout)) -del_timer_sync (&cfg->escan_timeout); +timer_delete_sync (&cfg->escan_timeout);if (fw_abort) {/* Do a scan abort to stop the driver's scan engine */
@@ -7805,6 +7804,7 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)brcmf_btcoex_detach (cfg);wiphy_unregister (cfg->wiphy);wl_deinit_priv (cfg); +cancel_work_sync (&cfg->escan_timeout_work);brcmf_free_wiphy (cfg->wiphy);kfree (cfg); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainercover 6.1.84-rc1 review
This is the start of the stable review cycle for the 6.1.84 release. There are 272 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 03 Apr 2024 15:24:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.84-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.1.84-rc1
Natanael Copa <[email protected]>
tools/resolve_btfids: fix build with musl libc
Alan Stern <[email protected]>
USB: core: Fix deadlock in usb_deauthorize_interface()
Kevin Loughlin <[email protected]>
x86/sev: Skip ROM range scans and validation for SEV-SNP guests
Xingui Yang <[email protected]>
scsi: libsas: Fix disk not being scanned in after being removed
Xingui Yang <[email protected]>
scsi: libsas: Add a helper sas_get_sas_addr_and_dev_type()
Muhammad Usama Anjum <[email protected]>
scsi: lpfc: Correct size for wqe for memset()
Muhammad Usama Anjum <[email protected]>
scsi: lpfc: Correct size for cmdwqe/rspwqe for memset()
Sabrina Dubroca <[email protected]>
tls: fix use-after-free on failed backlog decryption
Kim Phillips <[email protected]>
x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled
Quinn Tran <[email protected]>
scsi: qla2xxx: Delay I/O Abort on PCI error
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Change debug message during driver unload
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Fix double free of fcport
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix command flush on cable pull
Quinn Tran <[email protected]>
scsi: qla2xxx: NVME|FCP prefer flag not being honored
Bikash Hazarika <[email protected]>
scsi: qla2xxx: Update manufacturer detail
Quinn Tran <[email protected]>
scsi: qla2xxx: Split FCE|EFT trace control
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix N2N stuck connection
Quinn Tran <[email protected]>
scsi: qla2xxx: Prevent command send on chip reset
Christian A. Ehrhardt <[email protected]>
usb: typec: ucsi: Clear UCSI_CCI_RESET_COMPLETE before reset
Christian A. Ehrhardt <[email protected]>
usb: typec: ucsi_acpi: Refactor and fix DELL quirk
Christian A. Ehrhardt <[email protected]>
usb: typec: ucsi: Ack unsupported commands
Christian A. Ehrhardt <[email protected]>
usb: typec: ucsi: Check for notifications after init
Christian A. Ehrhardt <[email protected]>
usb: typec: ucsi: Clear EVENT_PENDING under PPM lock
Kyle Tso <[email protected]>
usb: typec: Return size of buffer if pd_set operation succeeds
yuan linyu <[email protected]>
usb: udc: remove warning when queue disabled ep
Minas Harutyunyan <[email protected]>
usb: dwc2: gadget: LPM flow fix
Minas Harutyunyan <[email protected]>
usb: dwc2: gadget: Fix exiting from clock gating
Minas Harutyunyan <[email protected]>
usb: dwc2: host: Fix ISOC flow in DDMA mode
Minas Harutyunyan <[email protected]>
usb: dwc2: host: Fix hibernation flow
Minas Harutyunyan <[email protected]>
usb: dwc2: host: Fix remote wakeup from hibernation
Damien Le Moal <[email protected]>
scsi: sd: Fix TCG OPAL unlock on system resume
Alan Stern <[email protected]>
USB: core: Fix deadlock in port "disable" sysfs attribute
Alan Stern <[email protected]>
USB: core: Add hub_get() and hub_put() routines
Dan Carpenter <[email protected]>
staging: vc04_services: fix information leak in create_component()
Arnd Bergmann <[email protected]>
staging: vc04_services: changen strncpy() to strscpy_pad()
Guilherme G. Piccoli <[email protected]>
scsi: core: Fix unremoved procfs host directory regression
Duoming Zhou <[email protected]>
ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
Roger Quadros <[email protected]>
usb: dwc3-am62: fix module unload/reload behavior
Ladislav Michl <[email protected]>
usb: dwc3-am62: Rename private data
Weitao Wang <[email protected]>
USB: UAS: return ENODEV when submit urbs fail with device not attached
Oliver Neukum <[email protected]>
usb: cdc-wdm: close race between read and workqueue
Alexander Stein <[email protected]>
Revert "usb: phy: generic: Get the vbus supply"
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_sync: Fix not checking error on hci_cmd_sync_cancel_sync
Chris Wilson <[email protected]>
drm/i915/gt: Reset queue_priority_hint on parking
Ville Syrjälä <[email protected]>
drm/i915/bios: Tolerate devdata==NULL in intel_bios_encoder_supports_dp_dual_mode()
Eric Huang <[email protected]>
drm/amdkfd: fix TLB flush after unmap for GFX9.4.2
Jocelyn Falempe <[email protected]>
drm/vmwgfx: Create debugfs ttm_resource_manager entry only if needed
Claus Hansen Ries <[email protected]>
net: ll_temac: platform_get_resource replaced by wrong function
Duoming Zhou <[email protected]>
nouveau/dmem: handle kcalloc() allocation failure
Ye Zhang <[email protected]>
thermal: devfreq_cooling: Fix perf state when calculate dfc res_util
Damien Le Moal <[email protected]>
block: Do not force full zone append completion in req_bio_endio()
Mikko Rapeli <[email protected]>
mmc: core: Avoid negative index with array access
Mikko Rapeli <[email protected]>
mmc: core: Initialize mmc_blk_ioc_data
Romain Naour <[email protected]>
mmc: sdhci-omap: re-tuning is needed after a pm transition to support emmc HS200 mode
Nathan Chancellor <[email protected]>
hexagon: vmlinux.lds.S: handle attributes section
Max Filippov <[email protected]>
exec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack()
Johannes Berg <[email protected]>
wifi: iwlwifi: fw: don't always use FW dump trig
Felix Fietkau <[email protected]>
wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes
Johannes Thumshirn <[email protected]>
btrfs: zoned: use zone aware sb location for scrub
Johannes Thumshirn <[email protected]>
btrfs: zoned: don't skip block groups with 100% zone unusable
Ard Biesheuvel <[email protected]>
efi/libstub: Cast away type warning in use of max()
Ard Biesheuvel <[email protected]>
x86/efistub: Add missing boot_params for mixed mode compat entry
John Sperbeck <[email protected]>
init: open /initrd.image with O_LARGEFILE
Zi Yan <[email protected]>
mm/migrate: set swap entry values of THP tail pages properly.
Ard Biesheuvel <[email protected]>
x86/sev: Fix position dependent variable references in startup code
Borislav Petkov (AMD) <[email protected]>
x86/Kconfig: Remove CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
Borislav Petkov (AMD) <[email protected]>
x86/coco: Get rid of accessor functions
Borislav Petkov (AMD) <[email protected]>
x86/coco: Export cc_vendor
Alex Williamson <[email protected]>
vfio/fsl-mc: Block calling interrupt handler without trigger
Alex Williamson <[email protected]>
vfio/platform: Create persistent IRQ handlers
Alex Williamson <[email protected]>
vfio/pci: Create persistent INTx handler
Alex Williamson <[email protected]>
vfio: Introduce interface to flush virqfd inject workqueue
Alex Williamson <[email protected]>
vfio/pci: Disable auto-enable of exclusive INTx IRQ
Geliang Tang <[email protected]>
selftests: mptcp: diag: return KSFT_FAIL not test_cnt
Chengming Zhou <[email protected]>
blk-mq: release scheduler resource when request completes
Tony Battersby <[email protected]>
block: Fix page refcounts for unaligned buffers in __bio_release_pages()
Rickard x Andersson <[email protected]>
tty: serial: imx: Fix broken RS485
Zoltan HERPAI <[email protected]>
pwm: img: fix pwm clock lookup
Oleksandr Tymoshenko <[email protected]>
efi: fix panic in kdump kernel
Adamos Ttofari <[email protected]>
x86/fpu: Keep xfd_state in sync with MSR_IA32_XFD
KONDO KAZUMA(近藤 和真) <[email protected]>
efi/libstub: fix efi_random_alloc() to allocate memory at alloc_min or higher address
Masami Hiramatsu (Google) <[email protected]>
kprobes/x86: Use copy_from_kernel_nofault() to read from unsafe address
Biju Das <[email protected]>
irqchip/renesas-rzg2l: Prevent spurious interrupts when setting trigger type
Biju Das <[email protected]>
irqchip/renesas-rzg2l: Rename rzg2l_irq_eoi()
Biju Das <[email protected]>
irqchip/renesas-rzg2l: Rename rzg2l_tint_eoi()
Claudiu Beznea <[email protected]>
irqchip/renesas-rzg2l: Add macro to retrieve TITSR register offset based on register's index
Biju Das <[email protected]>
irqchip/renesas-rzg2l: Flush posted write in irq_eoi()
Claudiu Beznea <[email protected]>
irqchip/renesas-rzg2l: Implement restriction when writing ISCR register
John Ogness <[email protected]>
printk: Update @console_may_schedule in console_trylock_spinning()
Nicolin Chen <[email protected]>
iommu/dma: Force swiotlb_max_mapping_size on an untrusted device
Will Deacon <[email protected]>
swiotlb: Fix alignment checks when both allocation and DMA masks are present
David Laight <[email protected]>
minmax: add umin(a, b) and umax(a, b)
André Rösti <[email protected]>
entry: Respect changes to system call number by trace_sys_enter()
Martin Blumenstingl <[email protected]>
clocksource/drivers/arm_global_timer: Fix maximum prescaler value
Charan Teja Kalla <[email protected]>
iommu: Avoid races around default domain allocations
Jiawei Wang <[email protected]>
ASoC: amd: yc: Revert "Fix non-functional mic on Lenovo 21J2"
Jakub Kicinski <[email protected]>
net: tls: handle backlogging of crypto requests
Ard Biesheuvel <[email protected]>
x86/efistub: Call mixed mode boot services on the firmware's stack
Alex Deucher <[email protected]>
drm/amd/display: handle range offsets in VRR ranges
Heiner Kallweit <[email protected]>
i2c: i801: Avoid potential double call to gpiod_remove_lookup_table
Cosmin Tanislav <[email protected]>
iio: accel: adxl367: fix I2C FIFO data register
Cosmin Tanislav <[email protected]>
iio: accel: adxl367: fix DEVID read after reset
Vlastimil Babka <[email protected]>
mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
Sumit Garg <[email protected]>
tee: optee: Fix kernel panic caused by incorrect error handling
Andy Chi <[email protected]>
ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook
Kailang Yang <[email protected]>
ALSA: hda/realtek - Add Headset Mic supported Acer NB platform
Bart Van Assche <[email protected]>
fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
Nicolas Pitre <[email protected]>
vt: fix unicode buffer corruption when deleting characters
Alexander Usyskin <[email protected]>
mei: me: add arrow lake point H DID
Alexander Usyskin <[email protected]>
mei: me: add arrow lake point S DID
Hans de Goede <[email protected]>
misc: lis3lv02d_i2c: Fix regulators getting en-/dis-abled twice on suspend/resume
Peter Collingbourne <[email protected]>
serial: 8250_dw: Do not reclock if already at correct rate
Sherry Sun <[email protected]>
tty: serial: fsl_lpuart: avoid idle preamble pending if CTS is enabled
Mathias Nyman <[email protected]>
usb: port: Don't try to peer unused USB ports based on location
Krishna Kurapati <[email protected]>
usb: gadget: ncm: Fix handling of zero block length packets
Alan Stern <[email protected]>
USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform
Nirmoy Das <[email protected]>
drm/i915: Check before removing mm notifier
Ma Jun <[email protected]>
drm/amdgpu/pm: Fix the error of pwm1_enable setting
Steven Rostedt (Google) <[email protected]>
tracing: Use .flush() call to wake up readers
Sean Christopherson <[email protected]>
KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region()
Sean Christopherson <[email protected]>
KVM: x86: Mark target gfn of emulated atomic instruction as dirty
Kees Cook <[email protected]>
init/Kconfig: lower GCC version check for -Warray-bounds
Nathan Chancellor <[email protected]>
xfrm: Avoid clang fortify warning in copy_to_user_tmpl()
Michael Kelley <[email protected]>
Drivers: hv: vmbus: Calculate ring buffer size for more efficient use of memory
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject constant set with timeout
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: disallow anonymous set with timeout flag
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
Jakub Kicinski <[email protected]>
tls: fix race between tx work scheduling and socket close
Hans de Goede <[email protected]>
platform/x86: p2sb: On Goldmont only cache P2SB and SPI devfn BAR
Greg Kroah-Hartman <[email protected]>
cpufreq: brcmstb-avs-cpufreq: fix up "add check for cpufreq_cpu_get's return value"
Anton Altaparmakov <[email protected]>
x86/pm: Work around false positive kmemleak report in msr_build_context()
Mikulas Patocka <[email protected]>
dm snapshot: fix lockup in dm_exception_table_exit
Leo Ma <[email protected]>
drm/amd/display: Fix noise issue on HDMI AV mute
Rodrigo Siqueira <[email protected]>
drm/amd/display: Return the correct HDCP error code
Philip Yang <[email protected]>
drm/amdgpu: amdgpu_ttm_gart_bind set gtt bound flag
Conrad Kostecki <[email protected]>
ahci: asm1064: asm1166: don't limit reported ports
Andrey Jr. Melnikov <[email protected]>
ahci: asm1064: correct count of reported ports
Jason A. Donenfeld <[email protected]>
wireguard: netlink: access device through ctx instead of peer
Jason A. Donenfeld <[email protected]>
wireguard: netlink: check for dangling peer via is_dead instead of empty list
Huacai Chen <[email protected]>
LoongArch: Define the __io_aw() hook as mmiowb()
Huacai Chen <[email protected]>
LoongArch: Change __my_cpu_offset definition to avoid mis-optimization
Steven Rostedt (Google) <[email protected]>
net: hns3: tracing: fix hclgevf trace event strings
Steven Rostedt (Google) <[email protected]>
NFSD: Fix nfsd_clid_class use of __string_len() macro
Borislav Petkov (AMD) <[email protected]>
x86/CPU/AMD: Update the Zenbleed microcode revisions
Marek Szyprowski <[email protected]>
cpufreq: dt: always allocate zeroed cpumask
Eugene Korenevsky <[email protected]>
cifs: open_cached_dir(): add FILE_READ_EA to desired access
Ryusuke Konishi <[email protected]>
nilfs2: prevent kernel bug at submit_bh_wbc()
Ryusuke Konishi <[email protected]>
nilfs2: fix failure to detect DAT corruption in btree and direct mappings
Sunmin Jeong <[email protected]>
f2fs: truncate page cache before clearing flags when aborting atomic write
Sunmin Jeong <[email protected]>
f2fs: mark inode dirty for FI_ATOMIC_COMMITTED flag
Bart Van Assche <[email protected]>
Revert "block/mq-deadline: use correct way to throttling write requests"
Qiang Zhang <[email protected]>
memtest: use {READ,WRITE}_ONCE in memory scanning
Jani Nikula <[email protected]>
drm/vc4: hdmi: do not return negative values from .get_modes()
Jani Nikula <[email protected]>
drm/imx/ipuv3: do not return negative values from .get_modes()
Jani Nikula <[email protected]>
drm/exynos: do not return negative values from .get_modes()
Jani Nikula <[email protected]>
drm/panel: do not return negative error codes from drm_panel_get_modes()
Jani Nikula <[email protected]>
drm/probe-helper: warn about negative .get_modes()
Harald Freudenberger <[email protected]>
s390/zcrypt: fix reference counting on zcrypt card objects
Sean Anderson <[email protected]>
soc: fsl: qbman: Use raw spinlock for cgr_lock
Sean Anderson <[email protected]>
soc: fsl: qbman: Always disable interrupts when taking cgr_lock
Steven Rostedt (Google) <[email protected]>
ring-buffer: Use wait_event_interruptible() in ring_buffer_wait()
Steven Rostedt (Google) <[email protected]>
ring-buffer: Fix full_waiters_pending in poll
Steven Rostedt (Google) <[email protected]>
ring-buffer: Fix resetting of shortest_full
Steven Rostedt (Google) <[email protected]>
ring-buffer: Do not set shortest_full when full target is hit
Steven Rostedt (Google) <[email protected]>
ring-buffer: Fix waking up ring buffer readers
Marios Makassikis <[email protected]>
ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info
Alex Williamson <[email protected]>
vfio/platform: Disable virqfds on cleanup
Alex Williamson <[email protected]>
vfio/pci: Lock external INTx masking ops
Reinette Chatre <[email protected]>
vfio/pci: Remove negative check on unsigned vector
Reinette Chatre <[email protected]>
vfio/pci: Consolidate irq cleanup on MSI/MSI-X disable
Jason Gunthorpe <[email protected]>
vfio: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
Michael Kelley <[email protected]>
PCI: hv: Fix ring buffer size calculation
Niklas Cassel <[email protected]>
PCI: dwc: endpoint: Fix advertised resizable BAR size
Manivannan Sadhasivam <[email protected]>
PCI: qcom: Enable BDF to SID translation properly
Manivannan Sadhasivam <[email protected]>
PCI: qcom: Rename qcom_pcie_config_sid_sm8250() to reflect IP version
Nathan Chancellor <[email protected]>
kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
Josef Bacik <[email protected]>
nfs: fix UAF in direct writes
Sam Ravnborg <[email protected]>
sparc32: Fix parport build with sparc32
Rob Herring <[email protected]>
sparc: Explicitly include correct DT includes
Jens Axboe <[email protected]>
io_uring/net: correctly handle multishot recvmsg retry setup
Stanislaw Gruszka <[email protected]>
PCI/AER: Block runtime suspend when handling errors
Samuel Thibault <[email protected]>
speakup: Fix 8bit characters from direct synth
Wayne Chang <[email protected]>
usb: gadget: tegra-xudc: Fix USB3 PHY retrieval logic
Wayne Chang <[email protected]>
phy: tegra: xusb: Add API to retrieve the port number of phy
Christophe JAILLET <[email protected]>
slimbus: core: Remove usage of the deprecated ida_simple_xx() API
Jerome Brunet <[email protected]>
nvmem: meson-efuse: fix function pointer type mismatch
Maximilian Heyne <[email protected]>
ext4: fix corruption during on-line resize
Josua Mayer <[email protected]>
hwmon: (amc6821) add of_match table
Mickaël Salaün <[email protected]>
landlock: Warn once if a Landlock action is requested while disabled
Christian Gmeiner <[email protected]>
drm/etnaviv: Restore some id values
Dominique Martinet <[email protected]>
mmc: core: Fix switch on gp3 partition
Ryan Roberts <[email protected]>
mm: swap: fix race between free_swap_and_cache() and swapoff()
Huang Ying <[email protected]>
swap: comments get_swap_device() with usage rule
Fedor Pchelkin <[email protected]>
mac802154: fix llsec key resources release in mac802154_llsec_key_del
Nathan Chancellor <[email protected]>
powerpc: xor_vmx: Add '-mhard-float' to CFLAGS
Yu Kuai <[email protected]>
dm-raid: fix lockdep waring in "pers->hot_add_disk"
Jarred White <[email protected]>
ACPI: CPPC: Use access_width over bit_width for system memory accesses
Paul Menzel <[email protected]>
PCI/DPC: Quirk PIO log size for Intel Raptor Lake Root Ports
Rafael J. Wysocki <[email protected]>
PCI/PM: Drain runtime-idle callbacks before driver removal
Filipe Manana <[email protected]>
btrfs: fix off-by-one chunk length calculation at contains_pending_extent()
Qu Wenruo <[email protected]>
btrfs: qgroup: always free reserved space for extent records
Peter Collingbourne <[email protected]>
serial: Lock console when calling into driver before registration
Jameson Thies <[email protected]>
usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros
Miklos Szeredi <[email protected]>
fuse: don't unhash root
Miklos Szeredi <[email protected]>
fuse: fix root lookup with nonzero generation
Wolfram Sang <[email protected]>
mmc: tmio: avoid concurrent runs of mmc_request_done()
Qingliang Li <[email protected]>
PM: sleep: wakeirq: fix wake irq warning in system suspend
Toru Katagiri <[email protected]>
USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
David Woodhouse <[email protected]>
KVM: x86/xen: inject vCPU upcall vector when local APIC is enabled
Aurélien Jacobs <[email protected]>
USB: serial: option: add MeiG Smart SLM320 product
Christian Häggström <[email protected]>
USB: serial: cp210x: add ID for MGP Instruments PDS100
Cameron Williams <[email protected]>
USB: serial: add device ID for VeriFone adapter
Daniel Vogelbacher <[email protected]>
USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
Michael Ellerman <[email protected]>
powerpc/fsl: Fix mfpmr build errors with newer binutils
Prashanth K <[email protected]>
usb: xhci: Add error handling in xhci_map_urb_for_dma
Gabor Juhos <[email protected]>
clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays
Gabor Juhos <[email protected]>
clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays
Gabor Juhos <[email protected]>
clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays
Gabor Juhos <[email protected]>
clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays
Maulik Shah <[email protected]>
PM: suspend: Set mem_sleep_current during kernel command line setup
Shivnandan Kumar <[email protected]>
cpufreq: Limit resolving a frequency to policy min/max
Gui-Dong Han <[email protected]>
md/raid5: fix atomicity violation in raid5_cache_count
Guenter Roeck <[email protected]>
parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
Guenter Roeck <[email protected]>
parisc: Fix csum_ipv6_magic on 64-bit systems
Guenter Roeck <[email protected]>
parisc: Fix csum_ipv6_magic on 32-bit systems
Guenter Roeck <[email protected]>
parisc: Fix ip_fast_csum
John David Anglin <[email protected]>
parisc: Avoid clobbering the C/B bits in the PSW with tophys and tovirt macros
Guenter Roeck <[email protected]>
parisc/unaligned: Rewrite 64-bit inline assembly of emulate_ldd()
Arseniy Krasnov <[email protected]>
mtd: rawnand: meson: fix scrambling mode value in command macro
Zhang Yi <[email protected]>
ubi: correct the calculation of fastmap size
Richard Weinberger <[email protected]>
ubi: Check for too small LEB size in VTBL code
Matthew Wilcox (Oracle) <[email protected]>
ubifs: Set page uptodate in the correct place
Jan Kara <[email protected]>
fat: fix uninitialized field in nostale filehandles
Matthew Wilcox (Oracle) <[email protected]>
bounds: support non-power-of-two CONFIG_NR_CPUS
Arnd Bergmann <[email protected]>
kasan/test: avoid gcc warning for intentional overflow
Damien Le Moal <[email protected]>
block: Clear zone limits for a non-zoned stacked queue
Baokun Li <[email protected]>
ext4: correct best extent lstart adjustment logic
SeongJae Park <[email protected]>
selftests/mqueue: Set timeout to 180 seconds
Damian Muszynski <[email protected]>
crypto: qat - resolve race condition during AER recovery
Svyatoslav Pankratov <[email protected]>
crypto: qat - fix double free during reset
Randy Dunlap <[email protected]>
sparc: vDSO: fix return value of __setup handler
Randy Dunlap <[email protected]>
sparc64: NMI watchdog: fix return value of __setup handler
Michael Ellerman <[email protected]>
powerpc/smp: Increase nr_cpu_ids to include the boot CPU
Michael Ellerman <[email protected]>
powerpc/smp: Adjust nr_cpu_ids to cover all threads of a core
Tor Vic <[email protected]>
cpufreq: amd-pstate: Fix min_perf assignment in amd_pstate_adjust_perf()
Sean Christopherson <[email protected]>
KVM: Always flush async #PF workqueue when vCPU is being destroyed
Laurent Pinchart <[email protected]>
media: mc: Expand MUST_CONNECT flag to always require an enabled link
Laurent Pinchart <[email protected]>
media: mc: Rename pad variable to clarify intent
Laurent Pinchart <[email protected]>
media: mc: Add num_links flag to media_pad
Laurent Pinchart <[email protected]>
media: mc: Fix flags handling when creating pad links
Laurent Pinchart <[email protected]>
media: mc: Add local pad to pipeline regardless of the link state
Gui-Dong Han <[email protected]>
media: xc4000: Fix atomicity violation in xc4000_get_frequency
Philipp Stanner <[email protected]>
pci_iounmap(): Fix MMIO mapping leak
Hugo Villeneuve <[email protected]>
serial: max310x: fix NULL pointer dereference in I2C instantiation
Zack Rusin <[email protected]>
drm/vmwgfx: Fix possible null pointer derefence with invalid contexts
Duje Mihanović <[email protected]>
arm: dts: marvell: Fix maxium->maxim typo in brownstone dts
Roberto Sassu <[email protected]>
smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity()
Roberto Sassu <[email protected]>
smack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr()
Amit Pundir <[email protected]>
clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd
Joakim Zhang <[email protected]>
remoteproc: virtio: Fix wdg cannot recovery remote processor
Krishna chaitanya chundru <[email protected]>
arm64: dts: qcom: sc7280: Add additional MSI interrupts
Hidenori Kobayashi <[email protected]>
media: staging: ipu3-imgu: Set fields before media_entity_pads_init()
Zheng Wang <[email protected]>
wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach
Thomas Gleixner <[email protected]>
timers: Rename del_timer_sync() to timer_delete_sync()
Thomas Gleixner <[email protected]>
timers: Use del_timer_sync() even on UP
Thomas Gleixner <[email protected]>
timers: Update kernel-doc for various functions
Jim Mattson <[email protected]>
KVM: x86: Use a switch statement and macros in __feature_translate()
Jim Mattson <[email protected]>
KVM: x86: Advertise CPUID.(EAX=7,ECX=2):EDX[5:0] to userspace
Sean Christopherson <[email protected]>
KVM: x86: Update KVM-only leaf handling to allow for 100% KVM-only leafs
Borislav Petkov <[email protected]>
x86/bugs: Use sysfs_emit()
Kim Phillips <[email protected]>
x86/cpu: Support AMD Automatic IBRS
-------------
Diffstat:
Documentation/admin-guide/hw-vuln/spectre.rst | 17 +- Documentation/admin-guide/kernel-parameters.txt | 10 +- .../userspace-api/media/mediactl/media-types.rst | 11 +- Documentation/x86/amd-memory-encryption.rst | 16 +- Makefile | 4 +- arch/arm/boot/dts/mmp2-brownstone.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280.dtsi | 12 +- arch/hexagon/kernel/vmlinux.lds.S | 1 + arch/loongarch/include/asm/io.h | 2 + arch/loongarch/include/asm/percpu.h | 7 +- arch/parisc/include/asm/assembly.h | 18 +- arch/parisc/include/asm/checksum.h | 10 +- arch/parisc/kernel/unaligned.c | 27 +-- arch/powerpc/include/asm/reg_fsl_emb.h | 11 +- arch/powerpc/kernel/prom.c | 12 + arch/powerpc/lib/Makefile | 2 +- arch/sparc/crypto/crop_devid.c | 2 +- arch/sparc/include/asm/floppy_32.h | 2 +- arch/sparc/include/asm/floppy_64.h | 2 +- arch/sparc/include/asm/parport.h | 258 +-------------------- arch/sparc/include/asm/parport_64.h | 256 ++++++++++++++++++++ arch/sparc/kernel/apc.c | 2 +- arch/sparc/kernel/auxio_32.c | 1 - arch/sparc/kernel/auxio_64.c | 3 +- arch/sparc/kernel/central.c | 2 +- arch/sparc/kernel/chmc.c | 3 +- arch/sparc/kernel/ioport.c | 2 +- arch/sparc/kernel/leon_kernel.c | 2 - arch/sparc/kernel/leon_pci.c | 3 +- arch/sparc/kernel/leon_pci_grpci1.c | 3 +- arch/sparc/kernel/leon_pci_grpci2.c | 4 +- arch/sparc/kernel/nmi.c | 2 +- arch/sparc/kernel/of_device_32.c | 2 +- arch/sparc/kernel/of_device_64.c | 4 +- arch/sparc/kernel/of_device_common.c | 4 +- arch/sparc/kernel/pci.c | 3 +- arch/sparc/kernel/pci_common.c | 3 +- arch/sparc/kernel/pci_fire.c | 3 +- arch/sparc/kernel/pci_impl.h | 1 - arch/sparc/kernel/pci_msi.c | 2 + arch/sparc/kernel/pci_psycho.c | 4 +- arch/sparc/kernel/pci_sun4v.c | 3 +- arch/sparc/kernel/pmc.c | 2 +- arch/sparc/kernel/power.c | 3 +- arch/sparc/kernel/prom_irqtrans.c | 1 + arch/sparc/kernel/psycho_common.c | 1 + arch/sparc/kernel/sbus.c | 3 +- arch/sparc/kernel/time_32.c | 1 - arch/sparc/mm/io-unit.c | 3 +- arch/sparc/mm/iommu.c | 5 +- arch/sparc/vdso/vma.c | 7 +- arch/x86/Kconfig | 13 -- arch/x86/boot/compressed/efi_mixed.S | 29 ++- arch/x86/coco/core.c | 20 +- arch/x86/coco/tdx/tdx.c | 2 +- arch/x86/include/asm/asm.h | 14 ++ arch/x86/include/asm/coco.h | 10 +- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/mem_encrypt.h | 15 +- arch/x86/include/asm/msr-index.h | 2 + arch/x86/include/asm/sev.h | 4 +- arch/x86/include/asm/suspend_32.h | 10 +- arch/x86/include/asm/x86_init.h | 3 +- arch/x86/kernel/cpu/amd.c | 10 +- arch/x86/kernel/cpu/bugs.c | 138 +++++------ arch/x86/kernel/cpu/common.c | 19 +- arch/x86/kernel/cpu/mshyperv.c | 2 +- arch/x86/kernel/eisa.c | 3 +- arch/x86/kernel/fpu/xstate.c | 5 +- arch/x86/kernel/fpu/xstate.h | 14 +- arch/x86/kernel/kprobes/core.c | 11 +- arch/x86/kernel/probe_roms.c | 10 - arch/x86/kernel/setup.c | 3 +- arch/x86/kernel/sev-shared.c | 12 +- arch/x86/kernel/sev.c | 31 ++- arch/x86/kernel/x86_init.c | 2 + arch/x86/kvm/cpuid.c | 29 ++- arch/x86/kvm/lapic.c | 5 +- arch/x86/kvm/reverse_cpuid.h | 42 +++- arch/x86/kvm/svm/sev.c | 18 +- arch/x86/kvm/x86.c | 10 + arch/x86/kvm/xen.c | 2 +- arch/x86/kvm/xen.h | 18 ++ arch/x86/mm/mem_encrypt_amd.c | 18 ++ arch/x86/mm/mem_encrypt_identity.c | 38 ++- block/bio.c | 11 +- block/blk-mq.c | 33 ++- block/blk-settings.c | 4 + block/mq-deadline.c | 3 +- drivers/accessibility/speakup/synth.c | 4 +- drivers/acpi/cppc_acpi.c | 31 ++- drivers/ata/ahci.c | 5 - drivers/ata/libata-eh.c | 5 +- drivers/ata/libata-scsi.c | 9 + drivers/base/power/wakeirq.c | 4 +- drivers/clk/qcom/gcc-ipq6018.c | 2 + drivers/clk/qcom/gcc-ipq8074.c | 2 + drivers/clk/qcom/gcc-sdm845.c | 1 + drivers/clk/qcom/mmcc-apq8084.c | 2 + drivers/clk/qcom/mmcc-msm8974.c | 2 + drivers/clocksource/arm_global_timer.c | 2 +- drivers/cpufreq/amd-pstate.c | 2 +- drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 +- drivers/cpufreq/cpufreq-dt.c | 2 +- drivers/crypto/qat/qat_common/adf_aer.c | 23 +- drivers/firmware/efi/efi.c | 2 + drivers/firmware/efi/libstub/randomalloc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 19 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 12 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 3 + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 12 +- drivers/gpu/drm/drm_panel.c | 17 +- drivers/gpu/drm/drm_probe_helper.c | 7 + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 9 + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- drivers/gpu/drm/i915/display/intel_bios.c | 3 + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 3 - .../gpu/drm/i915/gt/intel_execlists_submission.c | 3 + drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 12 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 15 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 14 +- drivers/hwmon/amc6821.c | 11 + drivers/i2c/busses/i2c-i801.c | 4 +- drivers/iio/accel/adxl367.c | 8 +- drivers/iio/accel/adxl367_i2c.c | 2 +- drivers/iommu/dma-iommu.c | 9 + drivers/iommu/iommu.c | 3 + drivers/irqchip/irq-renesas-rzg2l.c | 93 +++++--- drivers/md/dm-raid.c | 2 + drivers/md/dm-snap.c | 4 +- drivers/md/raid5.c | 14 +- drivers/media/mc/mc-entity.c | 93 ++++++-- drivers/media/tuners/xc4000.c | 4 +- drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 21 +- drivers/misc/mei/hw-me-regs.h | 2 + drivers/misc/mei/pci-me.c | 2 + drivers/mmc/core/block.c | 14 +- drivers/mmc/host/sdhci-omap.c | 3 + drivers/mmc/host/tmio_mmc_core.c | 2 + drivers/mtd/nand/raw/meson_nand.c | 2 +- drivers/mtd/ubi/fastmap.c | 7 +- drivers/mtd/ubi/vtbl.c | 6 + .../ethernet/hisilicon/hns3/hns3pf/hclge_trace.h | 8 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h | 8 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/wireguard/netlink.c | 10 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 15 +- drivers/nvmem/meson-efuse.c | 25 +- drivers/pci/controller/dwc/pcie-designware-ep.c | 7 +- drivers/pci/controller/dwc/pcie-qcom.c | 153 ++++++------ drivers/pci/controller/pci-hyperv.c | 3 +- drivers/pci/pci-driver.c | 7 + drivers/pci/pcie/err.c | 20 ++ drivers/pci/quirks.c | 2 + drivers/phy/tegra/xusb.c | 13 ++ drivers/platform/x86/p2sb.c | 23 +- drivers/pwm/pwm-img.c | 4 +- drivers/remoteproc/remoteproc_virtio.c | 6 +- drivers/s390/crypto/zcrypt_api.c | 2 + drivers/scsi/hosts.c | 7 +- drivers/scsi/libsas/sas_expander.c | 51 ++-- drivers/scsi/lpfc/lpfc_bsg.c | 4 +- drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 14 +- drivers/scsi/qla2xxx/qla_def.h | 2 +- drivers/scsi/qla2xxx/qla_gbl.h | 2 +- drivers/scsi/qla2xxx/qla_init.c | 128 +++++----- drivers/scsi/qla2xxx/qla_iocb.c | 68 ++++-- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 2 +- drivers/scsi/qla2xxx/qla_target.c | 10 + drivers/scsi/scsi_scan.c | 34 +++ drivers/scsi/sd.c | 25 +- drivers/slimbus/core.c | 4 +- drivers/soc/fsl/qbman/qman.c | 25 +- drivers/staging/media/ipu3/ipu3-v4l2.c | 16 +- .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 5 +- drivers/tee/optee/device.c | 3 +- drivers/thermal/devfreq_cooling.c | 2 +- drivers/tty/serial/8250/8250_dw.c | 6 +- drivers/tty/serial/8250/8250_port.c | 6 - drivers/tty/serial/fsl_lpuart.c | 7 +- drivers/tty/serial/imx.c | 22 +- drivers/tty/serial/max310x.c | 7 +- drivers/tty/serial/serial_core.c | 12 + drivers/tty/vt/vt.c | 2 +- drivers/usb/class/cdc-wdm.c | 6 +- drivers/usb/core/hub.c | 23 +- drivers/usb/core/hub.h | 2 + drivers/usb/core/port.c | 43 +++- drivers/usb/core/sysfs.c | 16 +- drivers/usb/dwc2/core.h | 14 ++ drivers/usb/dwc2/core_intr.c | 72 ++++-- drivers/usb/dwc2/gadget.c | 10 + drivers/usb/dwc2/hcd.c | 49 +++- drivers/usb/dwc2/hcd_ddma.c | 17 +- drivers/usb/dwc2/hw.h | 2 +- drivers/usb/dwc2/platform.c | 2 +- drivers/usb/dwc3/dwc3-am62.c | 90 ++++--- drivers/usb/gadget/function/f_ncm.c | 2 +- drivers/usb/gadget/udc/core.c | 4 +- drivers/usb/gadget/udc/tegra-xudc.c | 39 ++-- drivers/usb/host/xhci.c | 2 + drivers/usb/phy/phy-generic.c | 7 - drivers/usb/serial/cp210x.c | 4 + drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 6 + drivers/usb/serial/option.c | 6 + drivers/usb/storage/isd200.c | 23 +- drivers/usb/storage/uas.c | 28 ++- drivers/usb/typec/class.c | 7 +- drivers/usb/typec/ucsi/ucsi.c | 56 ++++- drivers/usb/typec/ucsi/ucsi.h | 4 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 71 +++--- drivers/vfio/container.c | 2 +- drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 7 +- drivers/vfio/pci/vfio_pci_config.c | 6 +- drivers/vfio/pci/vfio_pci_core.c | 7 +- drivers/vfio/pci/vfio_pci_igd.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 218 ++++++++++------- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- drivers/vfio/platform/vfio_platform_irq.c | 106 ++++++--- drivers/vfio/virqfd.c | 23 +- fs/aio.c | 8 +- fs/btrfs/block-group.c | 3 +- fs/btrfs/qgroup.c | 10 +- fs/btrfs/scrub.c | 12 +- fs/btrfs/volumes.c | 2 +- fs/exec.c | 1 + fs/ext4/mballoc.c | 17 +- fs/ext4/resize.c | 3 +- fs/f2fs/f2fs.h | 1 + fs/f2fs/segment.c | 4 +- fs/fat/nfs.c | 6 + fs/fuse/dir.c | 4 + fs/fuse/fuse_i.h | 1 - fs/fuse/inode.c | 7 +- fs/nfs/direct.c | 11 +- fs/nfs/write.c | 2 +- fs/nfsd/trace.h | 2 +- fs/nilfs2/btree.c | 9 +- fs/nilfs2/direct.c | 9 +- fs/nilfs2/inode.c | 2 +- fs/smb/client/cached_dir.c | 3 +- fs/smb/server/smb2pdu.c | 10 +- fs/ubifs/file.c | 13 +- include/drm/drm_modeset_helper_vtables.h | 3 +- include/linux/cpufreq.h | 15 +- include/linux/gfp.h | 9 + include/linux/hyperv.h | 22 +- include/linux/libata.h | 1 + include/linux/minmax.h | 17 ++ include/linux/nfs_fs.h | 1 + include/linux/phy/tegra/xusb.h | 1 + include/linux/ring_buffer.h | 1 + include/linux/timer.h | 18 +- include/linux/vfio.h | 2 + include/media/media-entity.h | 2 + include/net/cfg802154.h | 1 + include/scsi/scsi_driver.h | 1 + include/scsi/scsi_host.h | 1 + init/Kconfig | 6 +- init/initramfs.c | 2 +- io_uring/net.c | 3 +- kernel/bounds.c | 2 +- kernel/dma/swiotlb.c | 11 +- kernel/entry/common.c | 8 +- kernel/power/suspend.c | 1 + kernel/printk/printk.c | 27 ++- kernel/time/timer.c | 160 +++++++------ kernel/trace/ring_buffer.c | 233 +++++++++++-------- kernel/trace/trace.c | 21 +- lib/pci_iomap.c | 2 +- mm/compaction.c | 7 +- mm/kasan/kasan_test.c | 3 +- mm/memtest.c | 4 +- mm/migrate.c | 6 +- mm/page_alloc.c | 10 +- mm/swapfile.c | 25 +- mm/vmscan.c | 5 +- net/bluetooth/hci_core.c | 6 +- net/bluetooth/hci_sync.c | 5 +- net/mac80211/cfg.c | 5 +- net/mac802154/llsec.c | 18 +- net/netfilter/nf_tables_api.c | 7 + net/tls/tls_sw.c | 60 +++-- net/xfrm/xfrm_user.c | 3 + scripts/Makefile.extrawarn | 2 + security/landlock/syscalls.c | 18 +- security/smack/smack_lsm.c | 12 +- sound/pci/hda/patch_realtek.c | 13 +- sound/sh/aica.c | 17 +- sound/soc/amd/yc/acp6x-mach.c | 7 - tools/include/linux/btf_ids.h | 2 + tools/testing/selftests/mqueue/setting | 1 + tools/testing/selftests/net/mptcp/diag.sh | 6 +- virt/kvm/async_pf.c | 31 ++- 305 files changed, 3011 insertions(+), 1673 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 20/272 media: xc4000: Fix atomicity violation in xc4000_get_frequency
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
[ Upstream commit 36d503ad547d1c75758a6fcdbec2806f1b6aeb41 ]
In xc4000_get_frequency():
*freq = priv->freq_hz + priv->freq_offset;
The code accesses priv->freq_hz and priv->freq_offset without holding any lock.
In xc4000_set_params():
// Code that updates priv->freq_hz and priv->freq_offset ...
xc4000_get_frequency() and xc4000_set_params() may execute concurrently, risking inconsistent reads of priv->freq_hz and priv->freq_offset. Since these related data may update during reading, it can result in incorrect frequency calculation, leading to atomicity violations.
This possible bug is found by an experimental static analysis tool developed by our team, BassCheck[1]. This tool analyzes the locking APIs to extract function pairs that can be concurrently executed, and then analyzes the instructions in the paired functions to identify possible concurrency bugs including data races and atomicity violations. The above possible bug is reported when our tool analyzes the source code of Linux 6.2.
To address this issue, it is proposed to add a mutex lock pair in xc4000_get_frequency() to ensure atomicity. With this patch applied, our tool no longer reports the possible bug, with the kernel configuration allyesconfig for x86_64. Due to the lack of associated hardware, we cannot test the patch in runtime testing, and just verify it according to the code logic.
[1] https://sites.google.com/view/basscheck/
--- drivers/media/tuners/xc4000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/tuners/xc4000.c +2 -2
@@ -1515,10 +1515,10 @@ static int xc4000_get_frequency(struct dvb_frontend *fe, u32 *freq) {struct xc4000_priv *priv = fe->tuner_priv; +mutex_lock (&priv->lock); *freq = priv->freq_hz + priv->freq_offset;if (debug) { -mutex_lock (&priv->lock);if ((priv->cur_fw.type & (BASE |FM |DTV6 |DTV7 |DTV78 |DTV8 )) ==BASE ) {u16 snr =0 ;
@@ -1529,8 +1529,8 @@ static int xc4000_get_frequency(struct dvb_frontend *fe, u32 *freq)return 0 ; } } -mutex_unlock (&priv->lock); } +mutex_unlock (&priv->lock);dprintk (1 ,"%s()\n" , __func__);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 29/272 powerpc/smp: Increase nr_cpu_ids to include the boot CPU
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit 777f81f0a9c780a6443bcf2c7785f0cc2e87c1ef ]
If nr_cpu_ids is too low to include the boot CPU adjust nr_cpu_ids upward. Otherwise the kernel will BUG when trying to allocate a paca for the boot CPU and fail to boot.
--- arch/powerpc/kernel/prom.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/powerpc/kernel/prom.c +6 -0
@@ -375,6 +375,12 @@ static int __init early_init_dt_scan_cpus(unsigned long node, nr_cpu_ids); } +if (boot_cpuid >= nr_cpu_ids) { +set_nr_cpu_ids (min (CONFIG_NR_CPUS ,ALIGN (boot_cpuid +1 , nthreads))); +pr_warn ("Boot CPU %d >= nr_cpu_ids, adjusted nr_cpu_ids to %d\n" , + boot_cpuid, nr_cpu_ids); + } +/* * PAPR defines "logical" PVR values for cpus that * meet various levels of the architecture:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 30/272 sparc64: NMI watchdog: fix return value of __setup handler
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 3ed7c61e49d65dacb96db798c0ab6fcd55a1f20f ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from setup_nmi_watchdog().
--- arch/sparc/kernel/nmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sparc/kernel/nmi.c +1 -1
@@ -274,7 +274,7 @@ static int __init setup_nmi_watchdog(char *str)if (!strncmp (str,"panic" ,5 )) panic_on_timeout =1 ; -return 0 ; +return 1 ; }__setup ("nmi_watchdog=" , setup_nmi_watchdog);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 31/272 sparc: vDSO: fix return value of __setup handler
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 5378f00c935bebb846b1fdb0e79cb76c137c56b5 ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from vdso_setup().
--- arch/sparc/vdso/vma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/sparc/vdso/vma.c +3 -4
@@ -449,9 +449,8 @@ static __init int vdso_setup(char *s)unsigned long val; err =kstrtoul (s,10 , &val); -if (err) -return err; - vdso_enabled = val; -return 0 ; +if (!err) + vdso_enabled = val; +return 1 ; }__setup ("vdso=" , vdso_setup);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 32/272 crypto: qat - fix double free during reset
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Svyatoslav Pankratov <[email protected]>
[ Upstream commit 01aed663e6c421aeafc9c330bda630976b50a764 ]
There is no need to free the reset_data structure if the recovery is unsuccessful and the reset is synchronous. The function adf_dev_aer_schedule_reset() handles the cleanup properly. Only asynchronous resets require such structure to be freed inside the reset worker.
Stable-dep-of: 7d42e097607c ("crypto: qat - resolve race condition during AER recovery")
--- drivers/crypto/qat/qat_common/adf_aer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/qat/qat_common/adf_aer.c +2 -1
@@ -95,7 +95,8 @@ static void adf_device_reset_worker(struct work_struct *work)if (adf_dev_init (accel_dev) ||adf_dev_start (accel_dev)) {/* The device hanged and we can't restart it so stop here */ dev_err (&GET_DEV (accel_dev),"Restart device failed\n" ); -kfree (reset_data); +if (reset_data->mode ==ADF_DEV_RESET_ASYNC ) +kfree (reset_data);WARN (1 ,"QAT: device restart failed. Device is unusable\n" );return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 33/272 crypto: qat - resolve race condition during AER recovery
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damian Muszynski <[email protected]>
[ Upstream commit 7d42e097607c4d246d99225bf2b195b6167a210c ]
During the PCI AER system's error recovery process, the kernel driver may encounter a race condition with freeing the reset_data structure's memory. If the device restart will take more than 10 seconds the function scheduling that restart will exit due to a timeout, and the reset_data structure will be freed. However, this data structure is used for completion notification after the restart is completed, which leads to a UAF bug.
This results in a KFENCE bug notice.
BUG: KFENCE: use-after-free read in adf_device_reset_worker+0x38/0xa0 [intel_qat] Use-after-free read at 0x00000000bc56fddf (in kfence-#142): adf_device_reset_worker+0x38/0xa0 [intel_qat] process_one_work+0x173/0x340
To resolve this race condition, the memory associated to the container of the work_struct is freed on the worker if the timeout expired, otherwise on the function that schedules the worker.
The timeout detection can be done by checking if the caller is still waiting for completion or not by using completion_done() function.
--- drivers/crypto/qat/qat_common/adf_aer.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/crypto/qat/qat_common/adf_aer.c +16 -6
@@ -95,7 +95,8 @@ static void adf_device_reset_worker(struct work_struct *work)if (adf_dev_init (accel_dev) ||adf_dev_start (accel_dev)) {/* The device hanged and we can't restart it so stop here */ dev_err (&GET_DEV (accel_dev),"Restart device failed\n" ); -if (reset_data->mode ==ADF_DEV_RESET_ASYNC ) +if (reset_data->mode ==ADF_DEV_RESET_ASYNC || +completion_done (&reset_data->compl))kfree (reset_data);WARN (1 ,"QAT: device restart failed. Device is unusable\n" );return ;
@@ -103,11 +104,19 @@ static void adf_device_reset_worker(struct work_struct *work)adf_dev_restarted_notify (accel_dev);clear_bit (ADF_STATUS_RESTARTING , &accel_dev->status); -/* The dev is back alive. Notify the caller if in sync mode */ -if (reset_data->mode ==ADF_DEV_RESET_SYNC ) -complete (&reset_data->compl); -else +/* +* The dev is back alive. Notify the caller if in sync mode +* +* If device restart will take a more time than expected, +* the schedule_reset() function can timeout and exit. This can be +* detected by calling the completion_done() function. In this case +* the reset_data structure needs to be freed here. +*/ +if (reset_data->mode ==ADF_DEV_RESET_ASYNC || +completion_done (&reset_data->compl))kfree (reset_data); +else +complete (&reset_data->compl); } static int adf_dev_aer_schedule_reset(struct adf_accel_dev *accel_dev,
@@ -140,8 +149,9 @@ static int adf_dev_aer_schedule_reset(struct adf_accel_dev *accel_dev,dev_err (&GET_DEV (accel_dev),"Reset device timeout expired\n" ); ret = -EFAULT ; + }else { +kfree (reset_data); } -kfree (reset_data);return ret; }return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 34/272 selftests/mqueue: Set timeout to 180 seconds
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: SeongJae Park <[email protected]>
[ Upstream commit 85506aca2eb4ea41223c91c5fe25125953c19b13 ]
While mq_perf_tests runs with the default kselftest timeout limit, which is 45 seconds, the test takes about 60 seconds to complete on i3.metal AWS instances. Hence, the test always times out. Increase the timeout to 180 seconds.
--- tools/testing/selftests/mqueue/setting | 1 + 1 file changed, 1 insertion(+) create mode 100644 tools/testing/selftests/mqueue/setting
tools/testing/selftests/mqueue/setting new file +1 -0
@@ -0,0 +1 @@ +timeout=180
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 35/272 ext4: correct best extent lstart adjustment logic
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 4fbf8bc733d14bceb16dda46a3f5e19c6a9621c5 ]
When yangerkun review commit 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()"), it was found that the best extent did not completely cover the original request after adjusting the best extent lstart in ext4_mb_new_inode_pa() as follows:
original request: 2/10(8)
normalized request: 0/64(64)
best extent: 0/9(9)
When we check if best ex can be kept at start of goal, ac_o_ex.fe_logical is 2 less than the adjusted best extent logical end 9, so we think the adjustment is done. But obviously 0/9(9) doesn't cover 2/10(8), so we should determine here if the original request logical end is less than or equal to the adjusted best extent logical end.
In addition, add a comment stating when adjusted best_ex will not cover the original request, and remove the duplicate assertion because adjusting lstart makes no change to b_ex.fe_len.
--- fs/ext4/mballoc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
fs/ext4/mballoc.c +11 -6
@@ -4684,10 +4684,16 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) .fe_len = ac->ac_g_ex.fe_len, };loff_t orig_goal_end =extent_logical_end (sbi, &ex); +loff_t o_ex_end =extent_logical_end (sbi, &ac->ac_o_ex); -/* we can't allocate as much as normalizer wants. -* so, found space must get proper lstart -* to cover original request */ +/* +* We can't allocate as much as normalizer wants, so we try +* to get proper lstart to cover the original request, except +* when the goal doesn't cover the original request as below: +* +* orig_ex:2045/2055(10), isize:8417280 -> normalized:0/2048 +* best_ex:0/200(200) -> adjusted: 1848/2048(200) +*/ BUG_ON (ac->ac_g_ex.fe_logical > ac->ac_o_ex.fe_logical);BUG_ON (ac->ac_g_ex.fe_len < ac->ac_o_ex.fe_len);
@@ -4699,7 +4705,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)* 1. Check if best ex can be kept at end of goal and still * cover original start * 2. Else, check if best ex can be kept at start of goal and -* still cover original start +* still cover original end * 3. Else, keep the best ex at start of original request. */ ex.fe_len = ac->ac_b_ex.fe_len;
@@ -4709,7 +4715,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) goto adjust_bex; ex.fe_logical = ac->ac_g_ex.fe_logical; -if (ac->ac_o_ex.fe_logical <extent_logical_end (sbi, &ex)) +if (o_ex_end <=extent_logical_end (sbi, &ex)) goto adjust_bex; ex.fe_logical = ac->ac_o_ex.fe_logical;
@@ -4717,7 +4723,6 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) ac->ac_b_ex.fe_logical = ex.fe_logical;BUG_ON (ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); -BUG_ON (ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len);BUG_ON (extent_logical_end (sbi, &ex) > orig_goal_end); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 36/272 block: Clear zone limits for a non-zoned stacked queue
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
[ Upstream commit c8f6f88d25929ad2f290b428efcae3b526f3eab0 ]
Device mapper may create a non-zoned mapped device out of a zoned device (e.g., the dm-zoned target). In such case, some queue limit such as the max_zone_append_sectors and zone_write_granularity endup being non zero values for a block device that is not zoned. Avoid this by clearing these limits in blk_stack_limits() when the stacked zoned limit is false.
--- block/blk-settings.c | 4 ++++ 1 file changed, 4 insertions(+)
block/blk-settings.c +4 -0
@@ -680,6 +680,10 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, t->zone_write_granularity =max (t->zone_write_granularity, b->zone_write_granularity); t->zoned =max (t->zoned, b->zoned); +if (!t->zoned) { + t->zone_write_granularity =0 ; + t->max_zone_append_sectors =0 ; + }return ret; }EXPORT_SYMBOL (blk_stack_limits);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 37/272 kasan/test: avoid gcc warning for intentional overflow
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit e10aea105e9ed14b62a11844fec6aaa87c6935a3 ]
The out-of-bounds test allocates an object that is three bytes too short in order to validate the bounds checking. Starting with gcc-14, this causes a compile-time warning as gcc has grown smart enough to understand the sizeof() logic:
mm/kasan/kasan_test.c: In function 'kmalloc_oob_16':mm/kasan/kasan_test.c:443:14: error: allocation of insufficient size '13' for type 'struct <anonymous>' with size '16' [-Werror=alloc-size]
443 | ptr1 = kmalloc(sizeof(*ptr1) - 3, GFP_KERNEL);
| ^
Hide the actual computation behind a RELOC_HIDE() that ensures the compiler misses the intentional bug.
--- mm/kasan/kasan_test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/kasan/kasan_test.c +2 -1
@@ -415,7 +415,8 @@ static void kmalloc_oob_16(struct kunit *test)/* This test is specifically crafted for the generic mode. */ KASAN_TEST_NEEDS_CONFIG_ON (test,CONFIG_KASAN_GENERIC ); - ptr1 =kmalloc (sizeof (*ptr1) -3 ,GFP_KERNEL ); +/* RELOC_HIDE to prevent gcc from warning about short alloc */ + ptr1 =RELOC_HIDE (kmalloc (sizeof (*ptr1) -3 ,GFP_KERNEL ),0 );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr1); ptr2 =kmalloc (sizeof (*ptr2),GFP_KERNEL );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 38/272 bounds: support non-power-of-two CONFIG_NR_CPUS
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit f2d5dcb48f7ba9e3ff249d58fc1fa963d374e66a ]
ilog2() rounds down, so for example when PowerPC 85xx sets CONFIG_NR_CPUS to 24, we will only allocate 4 bits to store the number of CPUs instead of
5. Use bits_per() instead, which rounds up. Found by code inspection. The effect of this would probably be a misaccounting when doing NUMA balancing, so to a user, it would only be a performance penalty. The effects may be more wide-spread; it's hard to tell.
--- kernel/bounds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bounds.c +1 -1
@@ -19,7 +19,7 @@ int main(void)DEFINE (NR_PAGEFLAGS , __NR_PAGEFLAGS);DEFINE (MAX_NR_ZONES , __MAX_NR_ZONES);#ifdef CONFIG_SMP -DEFINE (NR_CPUS_BITS ,ilog2 (CONFIG_NR_CPUS )); +DEFINE (NR_CPUS_BITS ,bits_per (CONFIG_NR_CPUS ));#endif DEFINE (SPINLOCK_SIZE ,sizeof (spinlock_t));#ifdef CONFIG_LRU_GEN
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 21/272 media: mc: Add local pad to pipeline regardless of the link state
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit 78f0daa026d4c5e192d31801d1be6caf88250220 ]
When building pipelines by following links, the media_pipeline_explore_next_link() function only traverses enabled links. The remote pad of a disabled link is not added to the pipeline, and neither is the local pad. While the former is correct as disabled links should not be followed, not adding the local pad breaks processing of the MEDIA_PAD_FL_MUST_CONNECT flag.
The MEDIA_PAD_FL_MUST_CONNECT flag is checked in the __media_pipeline_start() function that iterates over all pads after populating the pipeline. If the pad is not present, the check gets skipped, rendering it useless.
Fix this by adding the local pad of all links regardless of their state, only skipping the remote pad for disabled links.
--- drivers/media/mc/mc-entity.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/media/mc/mc-entity.c +9 -9
@@ -594,13 +594,6 @@ static int media_pipeline_explore_next_link(struct media_pipeline *pipe, link->source->entity->name, link->source->index, link->sink->entity->name, link->sink->index); -/* Skip links that are not enabled. */ -if (!(link->flags &MEDIA_LNK_FL_ENABLED )) { -dev_dbg (walk->mdev->dev, -"media pipeline: skipping link (disabled)\n" ); -return 0 ; - } -/* Get the local pad and remote pad. */ if (link->source->entity == pad->entity) { local = link->source;
@@ -622,13 +615,20 @@ static int media_pipeline_explore_next_link(struct media_pipeline *pipe, }/* -* Add the local and remote pads of the link to the pipeline and push -* them to the stack, if they're not already present. +* Add the local pad of the link to the pipeline and push it to the +* stack, if not already present. */ ret =media_pipeline_add_pad (pipe, walk, local);if (ret)return ret; +/* Similarly, add the remote pad, but only if the link is enabled. */ +if (!(link->flags &MEDIA_LNK_FL_ENABLED )) { +dev_dbg (walk->mdev->dev, +"media pipeline: skipping link (disabled)\n" ); +return 0 ; + } + ret =media_pipeline_add_pad (pipe, walk, remote);if (ret)return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 39/272 fat: fix uninitialized field in nostale filehandles
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit fde2497d2bc3a063d8af88b258dbadc86bd7b57c ]
When fat_encode_fh_nostale() encodes file handle without a parent it stores only first 10 bytes of the file handle. However the length of the file handle must be a multiple of 4 so the file handle is actually 12 bytes long and the last two bytes remain uninitialized. This is not great at we potentially leak uninitialized information with the handle to userspace. Properly initialize the full handle length.
--- fs/fat/nfs.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/fat/nfs.c +6 -0
@@ -130,6 +130,12 @@ fat_encode_fh_nostale(struct inode *inode, __u32 *fh, int *lenp, fid->parent_i_gen = parent->i_generation; type =FILEID_FAT_WITH_PARENT ; *lenp =FAT_FID_SIZE_WITH_PARENT ; + }else { +/* +* We need to initialize this field because the fh is actually +* 12 bytes long +*/ + fid->parent_i_pos_hi =0 ; }return type;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 40/272 ubifs: Set page uptodate in the correct place
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit 723012cab779eee8228376754e22c6594229bf8f ]
Page cache reads are lockless, so setting the freshly allocated page uptodate before we've overwritten it with the data it's supposed to have in it will allow a simultaneous reader to see old data. Move the call to SetPageUptodate into ubifs_write_end(), which is after we copied the new data into the page.
--- fs/ubifs/file.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
fs/ubifs/file.c +4 -9
@@ -261,9 +261,6 @@ static int write_begin_slow(struct address_space *mapping,return err; } } - -SetPageUptodate (page); -ClearPageError (page); }if (PagePrivate (page))
@@ -462,9 +459,6 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,return err; } } - -SetPageUptodate (page); -ClearPageError (page); } err =allocate_budget (c, page, ui, appending);
@@ -474,10 +468,8 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,* If we skipped reading the page because we were going to * write all of it, then it is not up to date. */ -if (skipped_read) { +if (skipped_read)ClearPageChecked (page); -ClearPageUptodate (page); - }/* * Budgeting failed which means it would have to force * write-back but didn't, because we set the @fast flag in the
@@ -568,6 +560,9 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping, goto out; } +if (len ==PAGE_SIZE ) +SetPageUptodate (page); +if (!PagePrivate (page)) {attach_page_private (page, (void *)1 );atomic_long_inc (&c->dirty_pg_cnt);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 41/272 ubi: Check for too small LEB size in VTBL code
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Weinberger <[email protected]>
[ Upstream commit 68a24aba7c593eafa8fd00f2f76407b9b32b47a9 ]
If the LEB size is smaller than a volume table record we cannot have volumes.
In this case abort attaching.
--- drivers/mtd/ubi/vtbl.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mtd/ubi/vtbl.c +6 -0
@@ -791,6 +791,12 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *ai)* The number of supported volumes is limited by the eraseblock size * and by the UBI_MAX_VOLUMES constant. */ + +if (ubi->leb_size <UBI_VTBL_RECORD_SIZE ) { +ubi_err (ubi,"LEB size too small for a volume record" ); +return -EINVAL ; + } + ubi->vtbl_slots = ubi->leb_size /UBI_VTBL_RECORD_SIZE ;if (ubi->vtbl_slots >UBI_MAX_VOLUMES ) ubi->vtbl_slots =UBI_MAX_VOLUMES ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 42/272 ubi: correct the calculation of fastmap size
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit 7f174ae4f39e8475adcc09d26c5a43394689ad6c ]
Now that the calculation of fastmap size in ubi_calc_fm_size() is incorrect since it miss each user volume's ubi_fm_eba structure and the Internal UBI volume info. Let's correct the calculation.
--- drivers/mtd/ubi/fastmap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mtd/ubi/fastmap.c +4 -3
@@ -85,9 +85,10 @@ size_t ubi_calc_fm_size(struct ubi_device *ubi)sizeof (struct ubi_fm_scan_pool ) +sizeof (struct ubi_fm_scan_pool ) + (ubi->peb_count *sizeof (struct ubi_fm_ec )) + - (sizeof (struct ubi_fm_eba ) + - (ubi->peb_count *sizeof (__be32))) + -sizeof (struct ubi_fm_volhdr ) *UBI_MAX_VOLUMES ; + ((sizeof (struct ubi_fm_eba ) + +sizeof (struct ubi_fm_volhdr )) * + (UBI_MAX_VOLUMES +UBI_INT_VOL_COUNT )) + + (ubi->peb_count *sizeof (__be32));return roundup (size, ubi->leb_size); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 43/272 mtd: rawnand: meson: fix scrambling mode value in command macro
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arseniy Krasnov <[email protected]>
[ Upstream commit ef6f463599e16924cdd02ce5056ab52879dc008c ]
Scrambling mode is enabled by value (1 << 19). NFC_CMD_SCRAMBLER_ENABLE is already (1 << 19), so there is no need to shift it again in CMDRWGEN macro.
--- drivers/mtd/nand/raw/meson_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/meson_nand.c +1 -1
@@ -63,7 +63,7 @@#define CMDRWGEN (cmd_dir, ran, bch, short_mode, page_size, pages) \ ( \ (cmd_dir) | \ - ((ran) << 19) | \ + (ran) | \ ((bch) << 14) | \ ((short_mode) << 13) | \ (((page_size) & 0x7f) << 6) | \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 44/272 parisc/unaligned: Rewrite 64-bit inline assembly of emulate_ldd()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit e5db6a74571a8baf87a116ea39aab946283362ff ]
Convert to use real temp variables instead of clobbering processor registers. This aligns the 64-bit inline assembly code with the 32-bit assembly code which was rewritten with commit 427c1073a2a1 ("parisc/unaligned: Rewrite 32-bit inline assembly of emulate_ldd()").
While at it, fix comment in 32-bit rewrite code. Temporary variables are now used for both 32-bit and 64-bit code, so move their declarations to the function header.
No functional change intended.
--- arch/parisc/kernel/unaligned.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
arch/parisc/kernel/unaligned.c +12 -15
@@ -167,6 +167,7 @@ static int emulate_ldw(struct pt_regs *regs, int toreg, int flop)static int emulate_ldd (struct pt_regs *regs,int toreg,int flop) {unsigned long saddr = regs->ior; +unsigned long shift, temp1;__u64 val =0 ;ASM_EXCEPTIONTABLE_VAR (ret);
@@ -178,25 +179,22 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)#ifdef CONFIG_64BIT __asm__ __volatile__ ( -" depd,z %3,60,3,%%r19\n" /* r19=(ofs&7)*8 */ -" mtsp %4, %%sr1\n" -" depd %%r0,63,3,%3\n" -"1: ldd 0(%%sr1,%3),%0\n" -"2: ldd 8(%%sr1,%3),%%r20\n" -" subi 64,%%r19,%%r19\n" -" mtsar %%r19\n" -" shrpd %0,%%r20,%%sar,%0\n" +" depd,z %2,60,3,%3\n" /* shift=(ofs&7)*8 */ +" mtsp %5, %%sr1\n" +" depd %%r0,63,3,%2\n" +"1: ldd 0(%%sr1,%2),%0\n" +"2: ldd 8(%%sr1,%2),%4\n" +" subi 64,%3,%3\n" +" mtsar %3\n" +" shrpd %0,%4,%%sar,%0\n" "3: \n" ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b, "%1") ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b, "%1") - : "=r" (val), "+r" (ret) - : "0" (val), "r" (saddr), "r" (regs->isr) - : "r19", "r20" ); + : "+r" (val), "+r" (ret), "+r" (saddr), "=&r" (shift), "=&r" (temp1) + : "r" (regs->isr) );#else - { -unsigned long shift, temp1; __asm__ __volatile__ ( -" zdep %2,29,2,%3\n" /* r19=(ofs&3)*8 */ +" zdep %2,29,2,%3\n" /* shift=(ofs&3)*8 */ " mtsp %5, %%sr1\n" " dep %%r0,31,2,%2\n" "1: ldw 0(%%sr1,%2),%0\n"
@@ -212,7 +210,6 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop) ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 4b, "%1") : "+r" (val), "+r" (ret), "+r" (saddr), "=&r" (shift), "=&r" (temp1) : "r" (regs->isr) ); - }#endif DPRINTF ("val = 0x%llx\n" , val);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 45/272 parisc: Avoid clobbering the C/B bits in the PSW with tophys and tovirt macros
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: John David Anglin <[email protected]>
[ Upstream commit 4603fbaa76b5e703b38ac8cc718102834eb6e330 ]
Use add,l to avoid clobbering the C/B bits in the PSW.
--- arch/parisc/include/asm/assembly.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
arch/parisc/include/asm/assembly.h +10 -8
@@ -97,26 +97,28 @@* version takes two arguments: a src and destination register. * However, the source and destination registers can not be * the same register. +* +* We use add,l to avoid clobbering the C/B bits in the PSW. */ .macro tophys grvirt, grphys - ldil L%(__PAGE_OFFSET), \grphys - sub \grvirt, \grphys, \grphys + ldil L%(-__PAGE_OFFSET), \grphys + addl \grvirt, \grphys, \grphys .endm - + .macro tovirt grphys, grvirt ldil L%(__PAGE_OFFSET), \grvirt - add \grphys, \grvirt, \grvirt + addl \grphys, \grvirt, \grvirt .endm .macro tophys_r1 gr - ldil L%(__PAGE_OFFSET), %r1 - sub \gr, %r1, \gr + ldil L%(-__PAGE_OFFSET), %r1 + addl \gr, %r1, \gr .endm - + .macro tovirt_r1 gr ldil L%(__PAGE_OFFSET), %r1 - add \gr, %r1, \gr + addl \gr, %r1, \gr .endm .macro delay value
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 46/272 parisc: Fix ip_fast_csum
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit a2abae8f0b638c31bb9799d9dd847306e0d005bd ]
IP checksum unit tests report the following error when run on hppa/hppa64.
# test_ip_fast_csum: ASSERTION FAILED at lib/checksum_kunit.c:463
Expected ( u64)csum_result == ( u64)expected, but
( u64)csum_result == 33754 (0x83da)
( u64)expected == 10946 (0x2ac2)
not ok 4 test_ip_fast_csum0x83da is the expected result if the IP header length is 20 bytes. 0x2ac2 is the expected result if the IP header length is 24 bytes. The test fails with an IP header length of 24 bytes. It appears that ip_fast_csum() always returns the checksum for a 20-byte header, no matter how long the header actually is.
Code analysis shows a suspicious assembler sequence in ip_fast_csum().
" addc %0, %3, %0\n" "1: ldws,ma 4(%1), %3\n" " addib,< 0, %2, 1b\n" <---
While my understanding of HPPA assembler is limited, it does not seem to make much sense to subtract 0 from a register and to expect the result to ever be negative. Subtracting 1 from the length parameter makes more sense. On top of that, the operation should be repeated if and only if the result is still > 0, so change the suspicious instruction to
" addib,> -1, %2, 1b\n"
The IP checksum unit test passes after this change.
--- arch/parisc/include/asm/checksum.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/parisc/include/asm/checksum.h +1 -1
@@ -40,7 +40,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)" addc %0, %5, %0\n" " addc %0, %3, %0\n" "1: ldws,ma 4(%1), %3\n" -" addib,< 0, %2, 1b\n" +" addib,> -1, %2, 1b\n" " addc %0, %3, %0\n" "\n" " extru %0, 31, 16, %4\n"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 47/272 parisc: Fix csum_ipv6_magic on 32-bit systems
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 4408ba75e4ba80c91fde7e10bccccf388f5c09be ]
Calculating the IPv6 checksum on 32-bit systems missed overflows when adding the proto+len fields into the checksum. This results in the following unit test failure.
# test_csum_ipv6_magic: ASSERTION FAILED at lib/checksum_kunit.c:506
Expected ( u64)csum_result == ( u64)expected, but
( u64)csum_result == 46722 (0xb682)
( u64)expected == 46721 (0xb681)
not ok 5 test_csum_ipv6_magicThis is probably rarely seen in the real world because proto+len are usually small values which will rarely result in overflows when calculating the checksum. However, the unit test code uses large values for the length field, causing the test to fail.
Fix the problem by adding the missing carry into the final checksum.
--- arch/parisc/include/asm/checksum.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/parisc/include/asm/checksum.h +2 -1
@@ -163,7 +163,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr," ldw,ma 4(%2), %7\n" /* 4th daddr */ " addc %6, %0, %0\n" " addc %7, %0, %0\n" -" addc %3, %0, %0\n" /* fold in proto+len, catch carry */ +" addc %3, %0, %0\n" /* fold in proto+len */ +" addc 0, %0, %0\n" /* add carry */ #endif : "=r" (sum), "=r" (saddr), "=r" (daddr), "=r" (len),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 48/272 parisc: Fix csum_ipv6_magic on 64-bit systems
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 4b75b12d70506e31fc02356bbca60f8d5ca012d0 ]
hppa 64-bit systems calculates the IPv6 checksum using 64-bit add operations. The last add folds protocol and length fields into the 64-bit result. While unlikely, this operation can overflow. The overflow can be triggered with a code sequence such as the following.
/* try to trigger massive overflows */ memset(tmp_buf, 0xff, sizeof(struct in6_addr)); csum_result = csum_ipv6_magic((struct in6_addr *)tmp_buf, (struct in6_addr *)tmp_buf, 0xffff, 0xff, 0xffffffff);
Fix the problem by adding any overflows from the final add operation into the calculated checksum. Fortunately, we can do this without additional cost by replacing the add operation used to fold the checksum into 32 bit with "add,dc" to add in the missing carry.
--- arch/parisc/include/asm/checksum.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/parisc/include/asm/checksum.h +2 -2
@@ -137,8 +137,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr," add,dc %3, %0, %0\n" /* fold in proto+len | carry bit */ " extrd,u %0, 31, 32, %4\n" /* copy upper half down */ " depdi 0, 31, 32, %0\n" /* clear upper half */ -" add %4, %0, %0\n" /* fold into 32-bits */ -" addc 0, %0, %0\n" /* add carry */ +" add,dc %4, %0, %0\n" /* fold into 32-bits, plus carry */ +" addc 0, %0, %0\n" /* add final carry */ #else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 22/272 media: mc: Fix flags handling when creating pad links
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit 422f7af75d03d50895938d38bc9cb8be759c440f ]
The media_create_pad_link() function doesn't correctly clear reject link type flags, nor does it set the DATA_LINK flag. It only works because the MEDIA_LNK_FL_DATA_LINK flag's value is 0.
Fix it by returning an error if any link type flag is set. This doesn't introduce any regression, as nobody calls the media_create_pad_link() function with link type flags (easily checked by grepping for the flag in the source code, there are very few hits).
Set the MEDIA_LNK_FL_DATA_LINK explicitly, which is a no-op that the compiler will optimize out, but is still useful to make the code more explicit and easier to understand.
--- drivers/media/mc/mc-entity.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/media/mc/mc-entity.c +6 -1
@@ -1017,6 +1017,11 @@ media_create_pad_link(struct media_entity *source, u16 source_pad,struct media_link *link;struct media_link *backlink; +if (flags &MEDIA_LNK_FL_LINK_TYPE ) +return -EINVAL ; + + flags |=MEDIA_LNK_FL_DATA_LINK ; +if (WARN_ON (!source || !sink) ||WARN_ON (source_pad >= source->num_pads) ||WARN_ON (sink_pad >= sink->num_pads))
@@ -1032,7 +1037,7 @@ media_create_pad_link(struct media_entity *source, u16 source_pad, link->source = &source->pads[source_pad]; link->sink = &sink->pads[sink_pad]; - link->flags = flags & ~MEDIA_LNK_FL_INTERFACE_LINK ; + link->flags = flags;/* Initialize graph object embedded at the new link */ media_gobj_create(source->graph_obj.mdev, MEDIA_GRAPH_LINK,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 49/272 parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 0568b6f0d863643db2edcc7be31165740c89fa82 ]
IPv6 checksum tests with unaligned addresses on 64-bit builds result in unexpected failures.
Expected expected == csum_result, but
expected == 46591 (0xb5ff)
csum_result == 46381 (0xb52d)with alignment offset 1
Oddly enough, the problem disappeared after adding test code into the beginning of csum_ipv6_magic().
As it turns out, the 'sum' parameter of csum_ipv6_magic() is declared as __wsum, which is a 32-bit variable. However, it is treated as 64-bit variable in the 64-bit assembler code. Tests showed that the upper 32 bit of the register used to pass the variable are _not_ cleared when entering the function. This can result in checksum calculation errors.
Clearing the upper 32 bit of 'sum' as first operation in the assembler code fixes the problem.
--- arch/parisc/include/asm/checksum.h | 1 + 1 file changed, 1 insertion(+)
arch/parisc/include/asm/checksum.h +1 -0
@@ -126,6 +126,7 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,** Try to keep 4 registers with "live" values ahead of the ALU. */ +" depdi 0, 31, 32, %0\n" /* clear upper half of incoming checksum */ " ldd,ma 8(%1), %4\n" /* get 1st saddr word */ " ldd,ma 8(%2), %5\n" /* get 1st daddr word */ " add %4, %0, %0\n"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 50/272 md/raid5: fix atomicity violation in raid5_cache_count
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
[ Upstream commit dfd2bf436709b2bccb78c2dda550dde93700efa7 ]
In raid5_cache_count():
if (conf->max_nr_stripes < conf->min_nr_stripes)
return 0;
return conf->max_nr_stripes - conf->min_nr_stripes;The current check is ineffective, as the values could change immediately after being checked.
In raid5_set_cache_size():
...
conf->min_nr_stripes = size;
...
while (size > conf->max_nr_stripes)
conf->min_nr_stripes = conf->max_nr_stripes;
...Due to intermediate value updates in raid5_set_cache_size(), concurrent execution of raid5_cache_count() and raid5_set_cache_size() may lead to inconsistent reads of conf->max_nr_stripes and conf->min_nr_stripes. The current checks are ineffective as values could change immediately after being checked, raising the risk of conf->min_nr_stripes exceeding conf->max_nr_stripes and potentially causing an integer overflow.
This possible bug is found by an experimental static analysis tool developed by our team. This tool analyzes the locking APIs to extract function pairs that can be concurrently executed, and then analyzes the instructions in the paired functions to identify possible concurrency bugs including data races and atomicity violations. The above possible bug is reported when our tool analyzes the source code of Linux 6.2.
To resolve this issue, it is suggested to introduce local variables 'min_stripes' and 'max_stripes' in raid5_cache_count() to ensure the values remain stable throughout the check. Adding locks in raid5_cache_count() fails to resolve atomicity violations, as raid5_set_cache_size() may hold intermediate values of conf->min_nr_stripes while unlocked. With this patch applied, our tool no longer reports the bug, with the kernel configuration allyesconfig for x86_64. Due to the lack of associated hardware, we cannot test the patch in runtime testing, and just verify it according to the code logic.
--- drivers/md/raid5.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/md/raid5.c +8 -6
@@ -2420,7 +2420,7 @@ static int grow_one_stripe(struct r5conf *conf, gfp_t gfp)atomic_inc (&conf->active_stripes);raid5_release_stripe (sh); - conf->max_nr_stripes++; +WRITE_ONCE (conf->max_nr_stripes, conf->max_nr_stripes +1 );return 1 ; }
@@ -2717,7 +2717,7 @@ static int drop_one_stripe(struct r5conf *conf)shrink_buffers (sh);free_stripe (conf->slab_cache, sh);atomic_dec (&conf->active_stripes); - conf->max_nr_stripes--; +WRITE_ONCE (conf->max_nr_stripes, conf->max_nr_stripes -1 );return 1 ; }
@@ -6891,7 +6891,7 @@ raid5_set_cache_size(struct mddev *mddev, int size)if (size <=16 || size >32768 )return -EINVAL ; - conf->min_nr_stripes = size; +WRITE_ONCE (conf->min_nr_stripes, size);mutex_lock (&conf->cache_size_mutex);while (size < conf->max_nr_stripes &&drop_one_stripe (conf))
@@ -6903,7 +6903,7 @@ raid5_set_cache_size(struct mddev *mddev, int size)mutex_lock (&conf->cache_size_mutex);while (size > conf->max_nr_stripes)if (!grow_one_stripe (conf,GFP_KERNEL )) { - conf->min_nr_stripes = conf->max_nr_stripes; +WRITE_ONCE (conf->min_nr_stripes, conf->max_nr_stripes); result = -ENOMEM ;break ; }
@@ -7468,11 +7468,13 @@ static unsigned long raid5_cache_count(struct shrinker *shrink, struct shrink_control *sc) { struct r5conf *conf = container_of(shrink, struct r5conf, shrinker); +int max_stripes =READ_ONCE (conf->max_nr_stripes); +int min_stripes =READ_ONCE (conf->min_nr_stripes); -if (conf->max_nr_stripes < conf->min_nr_stripes) +if (max_stripes < min_stripes)/* unlikely, but not impossible */ return 0 ; -return conf->max_nr_stripes - conf->min_nr_stripes; +return max_stripes - min_stripes; }static struct r5conf *setup_conf (struct mddev *mddev)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 23/272 media: mc: Add num_links flag to media_pad
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit baeddf94aa61879b118f2faa37ed126d772670cc ]
Maintain a counter of the links connected to a pad in the media_pad structure. This helps checking if a pad is connected to anything, which will be used in the pipeline building code.
--- drivers/media/mc/mc-entity.c | 6 ++++++ include/media/media-entity.h | 2 ++ 2 files changed, 8 insertions(+)
drivers/media/mc/mc-entity.c +6 -0
@@ -957,6 +957,9 @@ static void __media_entity_remove_link(struct media_entity *entity,/* Remove the reverse links for a data link. */ if ((link->flags &MEDIA_LNK_FL_LINK_TYPE ) ==MEDIA_LNK_FL_DATA_LINK ) { + link->source->num_links--; + link->sink->num_links--; +if (link->source->entity == entity) remote = link->sink->entity;else
@@ -1068,6 +1071,9 @@ media_create_pad_link(struct media_entity *source, u16 source_pad, sink->num_links++; source->num_links++; + link->source->num_links++; + link->sink->num_links++; +return 0 ; }EXPORT_SYMBOL_GPL (media_create_pad_link);
include/media/media-entity.h +2 -0
@@ -205,6 +205,7 @@ enum media_pad_signal_type {* @graph_obj: Embedded structure containing the media object common data * @entity: Entity this pad belongs to * @index: Pad index in the entity pads array, numbered from 0 to n +* @num_links: Number of links connected to this pad * @sig_type: Type of the signal inside a media pad * @flags: Pad flags, as defined in * :ref:`include/uapi/linux/media.h <media_header>`
@@ -216,6 +217,7 @@ struct media_pad {struct media_gobj graph_obj;/* must be first field in struct */ struct media_entity *entity;u16 index; +u16 num_links;enum media_pad_signal_type sig_type;unsigned long flags;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 24/272 media: mc: Rename pad variable to clarify intent
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit 9ec9109cf9f611e3ec9ed0355afcc7aae5e73176 ]
The pad local variable in the media_pipeline_explore_next_link() function is used to store the pad through which the entity has been reached. Rename it to origin to reflect that and make the code easier to read. This will be even more important in subsequent commits when expanding the function with additional logic.
--- drivers/media/mc/mc-entity.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/media/mc/mc-entity.c +6 -5
@@ -579,13 +579,13 @@ static int media_pipeline_explore_next_link(struct media_pipeline *pipe, struct media_pipeline_walk *walk) {struct media_pipeline_walk_entry *entry =media_pipeline_walk_top (walk); -struct media_pad *pad; +struct media_pad *origin;struct media_link *link;struct media_pad *local;struct media_pad *remote;int ret; - pad = entry->pad; + origin = entry->pad; link =list_entry (entry->links,typeof (*link), list);media_pipeline_walk_pop (walk);
@@ -595,7 +595,7 @@ static int media_pipeline_explore_next_link(struct media_pipeline *pipe, link->sink->entity->name, link->sink->index);/* Get the local pad and remote pad. */ -if (link->source->entity == pad->entity) { +if (link->source->entity == origin->entity) { local = link->source; remote = link->sink; }else {
@@ -607,8 +607,9 @@ static int media_pipeline_explore_next_link(struct media_pipeline *pipe,* Skip links that originate from a different pad than the incoming pad * that is not connected internally in the entity to the incoming pad. */ -if (pad != local && - !media_entity_has_pad_interdep (pad->entity, pad->index, local->index)) { +if (origin != local && + !media_entity_has_pad_interdep (origin->entity, origin->index, + local->index)) {dev_dbg (walk->mdev->dev,"media pipeline: skipping link (no route)\n" );return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 25/272 media: mc: Expand MUST_CONNECT flag to always require an enabled link
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit b3decc5ce7d778224d266423b542326ad469cb5f ]
The MEDIA_PAD_FL_MUST_CONNECT flag indicates that the pad requires an enabled link to stream, but only if it has any link at all. This makes little sense, as if a pad is part of a pipeline, there are very few use cases for an active link to be mandatory only if links exist at all. A review of in-tree drivers confirms they all need an enabled link for pads marked with the MEDIA_PAD_FL_MUST_CONNECT flag.
Expand the scope of the flag by rejecting pads that have no links at all. This requires modifying the pipeline build code to add those pads to the pipeline.
--- .../media/mediactl/media-types.rst | 11 ++-- drivers/media/mc/mc-entity.c | 53 +++++++++++++++---- 2 files changed, 48 insertions(+), 16 deletions(-)
Documentation/userspace-api/media/mediactl/media-types.rst +5 -6
@@ -375,12 +375,11 @@ Types and flags used to represent the media graph elements are origins of links. * - ``MEDIA_PAD_FL_MUST_CONNECT`` - - If this flag is set and the pad is linked to any other pad, then - at least one of those links must be enabled for the entity to be - able to stream. There could be temporary reasons (e.g. device - configuration dependent) for the pad to need enabled links even - when this flag isn't set; the absence of the flag doesn't imply - there is none. + - If this flag is set, then for this pad to be able to stream, it must + be connected by at least one enabled link. There could be temporary + reasons (e.g. device configuration dependent) for the pad to need + enabled links even when this flag isn't set; the absence of the flag + doesn't imply there is none. One and only one of ``MEDIA_PAD_FL_SINK`` and ``MEDIA_PAD_FL_SOURCE``
drivers/media/mc/mc-entity.c +43 -10
122 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 26/272 KVM: Always flush async #PF workqueue when vCPU is being destroyed
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 3d75b8aa5c29058a512db29da7cbee8052724157 ]
Always flush the per-vCPU async #PF workqueue when a vCPU is clearing its completion queue, e.g. when a VM and all its vCPUs is being destroyed. KVM must ensure that none of its workqueue callbacks is running when the last reference to the KVM _module_ is put. Gifting a reference to the associated VM prevents the workqueue callback from dereferencing freed vCPU/VM memory, but does not prevent the KVM module from being unloaded before the callback completes.
Drop the misguided VM refcount gifting, as calling kvm_put_kvm() from async_pf_execute() if kvm_put_kvm() flushes the async #PF workqueue will result in deadlock. async_pf_execute() can't return until kvm_put_kvm() finishes, and kvm_put_kvm() can't return until async_pf_execute() finishes:
WARNING: CPU: 8 PID: 251 at virt/kvm/kvm_main.c:1435 kvm_put_kvm+0x2d/0x320 [kvm]
Modules linked in: vhost_net vhost vhost_iotlb tap kvm_intel kvm irqbypass
CPU: 8 PID: 251 Comm: kworker/8:1 Tainted: G W 6.6.0-rc1-e7af8d17224a-x86/gmem-vm #119
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015
Workqueue: events async_pf_execute [kvm]
RIP: 0010:kvm_put_kvm+0x2d/0x320 [kvm]
Call Trace:
<TASK>
async_pf_execute+0x198/0x260 [kvm]
process_one_work+0x145/0x2d0
worker_thread+0x27e/0x3a0
kthread+0xba/0xe0
ret_from_fork+0x2d/0x50
ret_from_fork_asm+0x11/0x20
</TASK>
---[ end trace 0000000000000000 ]---
INFO: task kworker/8:1:251 blocked for more than 120 seconds.
Tainted: G W 6.6.0-rc1-e7af8d17224a-x86/gmem-vm #119
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:kworker/8:1 state:D stack:0 pid:251 ppid:2 flags:0x00004000
Workqueue: events async_pf_execute [kvm]
Call Trace:
<TASK>
__schedule+0x33f/0xa40
schedule+0x53/0xc0
schedule_timeout+0x12a/0x140
__wait_for_common+0x8d/0x1d0
__flush_work.isra.0+0x19f/0x2c0
kvm_clear_async_pf_completion_queue+0x129/0x190 [kvm]
kvm_arch_destroy_vm+0x78/0x1b0 [kvm]
kvm_put_kvm+0x1c1/0x320 [kvm]
async_pf_execute+0x198/0x260 [kvm]
process_one_work+0x145/0x2d0
worker_thread+0x27e/0x3a0
kthread+0xba/0xe0
ret_from_fork+0x2d/0x50
ret_from_fork_asm+0x11/0x20
</TASK>If kvm_clear_async_pf_completion_queue() actually flushes the workqueue, then there's no need to gift async_pf_execute() a reference because all invocations of async_pf_execute() will be forced to complete before the vCPU and its VM are destroyed/freed. And that in turn fixes the module unloading bug as __fput() won't do module_put() on the last vCPU reference until the vCPU has been freed, e.g. if closing the vCPU file also puts the last reference to the KVM module.
Note that kvm_check_async_pf_completion() may also take the work item off the completion queue and so also needs to flush the work queue, as the work will not be seen by kvm_clear_async_pf_completion_queue(). Waiting on the workqueue could theoretically delay a vCPU due to waiting for the work to complete, but that's a very, very small chance, and likely a very small delay. kvm_arch_async_page_present_queued() unconditionally makes a new request, i.e. will effectively delay entering the guest, so the remaining work is really just:
trace_kvm_async_pf_completed(addr, cr2_or_gpa);
__kvm_vcpu_wake_up(vcpu);
mmput(mm);and mmput() can't drop the last reference to the page tables if the vCPU is still alive, i.e. the vCPU won't get stuck tearing down page tables.
Add a helper to do the flushing, specifically to deal with "wakeup all" work items, as they aren't actually work items, i.e. are never placed in a workqueue. Trying to flush a bogus workqueue entry rightly makes __flush_work() complain (kudos to whoever added that sanity check).
Note, commit 5f6de5cbebee ("KVM: Prevent module exit until all VMs are freed") *tried* to fix the module refcounting issue by having VMs grab a reference to the module, but that only made the bug slightly harder to hit as it gave async_pf_execute() a bit more time to complete before the KVM module could be unloaded.
--- virt/kvm/async_pf.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
virt/kvm/async_pf.c +26 -5
@@ -88,7 +88,27 @@ static void async_pf_execute(struct work_struct *work)__kvm_vcpu_wake_up (vcpu);mmput (mm); -kvm_put_kvm (vcpu->kvm); +} + +static void kvm_flush_and_free_async_pf_work (struct kvm_async_pf *work) +{ +/* +* The async #PF is "done", but KVM must wait for the work item itself, +* i.e. async_pf_execute(), to run to completion. If KVM is a module, +* KVM must ensure *no* code owned by the KVM (the module) can be run +* after the last call to module_put(). Note, flushing the work item +* is always required when the item is taken off the completion queue. +* E.g. even if the vCPU handles the item in the "normal" path, the VM +* could be terminated before async_pf_execute() completes. +* +* Wake all events skip the queue and go straight done, i.e. don't +* need to be flushed (but sanity check that the work wasn't queued). +*/ +if (work->wakeup_all) +WARN_ON_ONCE (work->work.func); +else +flush_work (&work->work); +kmem_cache_free (async_pf_cache, work); }void kvm_clear_async_pf_completion_queue (struct kvm_vcpu *vcpu)
@@ -115,7 +135,6 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)#else if (cancel_work_sync (&work->work)) {mmput (work->mm); -kvm_put_kvm (vcpu->kvm);/* == work->vcpu->kvm */ kmem_cache_free (async_pf_cache, work); }#endif
@@ -127,7 +146,10 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)list_first_entry (&vcpu->async_pf.done,typeof (*work), link);list_del (&work->link); -kmem_cache_free (async_pf_cache, work); + +spin_unlock (&vcpu->async_pf.lock); +kvm_flush_and_free_async_pf_work (work); +spin_lock (&vcpu->async_pf.lock); }spin_unlock (&vcpu->async_pf.lock);
@@ -152,7 +174,7 @@ void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu)list_del (&work->queue); vcpu->async_pf.queued--; -kmem_cache_free (async_pf_cache, work); +kvm_flush_and_free_async_pf_work (work); } }
@@ -187,7 +209,6 @@ bool kvm_setup_async_pf(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, work->arch = *arch; work->mm = current->mm;mmget (work->mm); -kvm_get_kvm (work->vcpu->kvm);INIT_WORK (&work->work, async_pf_execute);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 27/272 cpufreq: amd-pstate: Fix min_perf assignment in amd_pstate_adjust_perf()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tor Vic <[email protected]>
[ Upstream commit b26ffbf800ae3c8d01bdf90d9cd8a37e1606ff06 ]
In the function amd_pstate_adjust_perf(), the 'min_perf' variable is set to 'highest_perf' instead of 'lowest_perf'.
--- drivers/cpufreq/amd-pstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/amd-pstate.c +1 -1
@@ -320,7 +320,7 @@ static void amd_pstate_adjust_perf(unsigned int cpu,if (target_perf < capacity) des_perf =DIV_ROUND_UP (cap_perf * target_perf, capacity); - min_perf =READ_ONCE (cpudata->highest_perf); + min_perf =READ_ONCE (cpudata->lowest_perf);if (_min_perf < capacity) min_perf =DIV_ROUND_UP (cap_perf * _min_perf, capacity);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 28/272 powerpc/smp: Adjust nr_cpu_ids to cover all threads of a core
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit 5580e96dad5a439d561d9648ffcbccb739c2a120 ]
If nr_cpu_ids is too low to include at least all the threads of a single core adjust nr_cpu_ids upwards. This avoids triggering odd bugs in code that assumes all threads of a core are available.
--- arch/powerpc/kernel/prom.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/powerpc/kernel/prom.c +6 -0
@@ -369,6 +369,12 @@ static int __init early_init_dt_scan_cpus(unsigned long node,if (IS_ENABLED (CONFIG_PPC64 )) boot_cpu_hwid =be32_to_cpu (intserv[found_thread]); +if (nr_cpu_ids % nthreads !=0 ) { +set_nr_cpu_ids (ALIGN (nr_cpu_ids, nthreads)); +pr_warn ("nr_cpu_ids was not a multiple of threads_per_core, adjusted to %d\n" , + nr_cpu_ids); + } +/* * PAPR defines "logical" PVR values for cpus that * meet various levels of the architecture:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 19/272 pci_iounmap(): Fix MMIO mapping leak
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Stanner <[email protected]>
[ Upstream commit 7626913652cc786c238e2dd7d8740b17d41b2637 ]
The #ifdef ARCH_HAS_GENERIC_IOPORT_MAP accidentally also guards iounmap(), which means MMIO mappings are leaked.
Move the guard so we call iounmap() for MMIO mappings.
--- lib/pci_iomap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/pci_iomap.c +1 -1
@@ -170,8 +170,8 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *p)if (addr >= start && addr < start +IO_SPACE_LIMIT )return ; -iounmap (p);#endif +iounmap (p); }EXPORT_SYMBOL (pci_iounmap);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 52/272 PM: suspend: Set mem_sleep_current during kernel command line setup
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maulik Shah <[email protected]>
[ Upstream commit 9bc4ffd32ef8943f5c5a42c9637cfd04771d021b ]
psci_init_system_suspend() invokes suspend_set_ops() very early during bootup even before kernel command line for mem_sleep_default is setup. This leads to kernel command line mem_sleep_default=s2idle not working as mem_sleep_current gets changed to deep via suspend_set_ops() and never changes back to s2idle.
Set mem_sleep_current along with mem_sleep_default during kernel command line setup as default suspend mode.
--- kernel/power/suspend.c | 1 + 1 file changed, 1 insertion(+)
kernel/power/suspend.c +1 -0
@@ -192,6 +192,7 @@ static int __init mem_sleep_default_setup(char *str)if (mem_sleep_labels[state] && !strcmp (str, mem_sleep_labels[state])) { mem_sleep_default = state; + mem_sleep_current = state;break ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 61/272 USB: serial: cp210x: add ID for MGP Instruments PDS100
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Häggström <[email protected]>
[ Upstream commit a0d9d868491a362d421521499d98308c8e3a0398 ]
The radiation meter has the text MGP Instruments PDS-100G or PDS-100GN produced by Mirion Technologies. Tested by forcing the driver association with
echo 10c4 863c > /sys/bus/usb-serial/drivers/cp210x/new_id
and then setting the serial port in 115200 8N1 mode. The device announces ID_USB_VENDOR_ENC=Silicon\x20Labs and ID_USB_MODEL_ENC=PDS100
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -144,6 +144,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */ { USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */ { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ + { USB_DEVICE(0x10C4, 0x863C) }, /* MGP Instruments PDS100 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ { USB_DEVICE(0x10C4, 0x87ED) }, /* IMST USB-Stick for Smart Meter */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 62/272 USB: serial: option: add MeiG Smart SLM320 product
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aurélien Jacobs <[email protected]>
[ Upstream commit 46809c51565b83881aede6cdf3b0d25254966a41 ]
Update the USB serial option driver to support MeiG Smart SLM320.
ID 2dee:4d41 UNISOC UNISOC-8910
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 9 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
P: Vendor=2dee ProdID=4d41 Rev=00.00
S: Manufacturer=UNISOC
S: Product=UNISOC-8910
C: #Ifs= 8 Cfg#= 1 Atr=e0 MxPwr=400mA
I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 7 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=08(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
Tested successfully a PPP LTE connection using If#= 0. Not sure of the purpose of every other serial interfaces.
--- drivers/usb/serial/option.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/serial/option.c +6 -0
@@ -613,6 +613,11 @@ static void option_instat_callback(struct urb *urb);/* Luat Air72*U series based on UNISOC UIS8910 uses UNISOC's vendor ID */ #define LUAT_PRODUCT_AIR720U 0x4e00 +/* MeiG Smart Technology products */ +#define MEIGSMART_VENDOR_ID 0x2dee +/* MeiG Smart SLM320 based on UNISOC UIS8910 */ +#define MEIGSMART_PRODUCT_SLM320 0x4d41 +/* Device flags */ /* Highest interface number which can be used with NCTRL() and RSVD() */
@@ -2282,6 +2287,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, LUAT_PRODUCT_AIR720U, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(MEIGSMART_VENDOR_ID, MEIGSMART_PRODUCT_SLM320, 0xff, 0, 0) }, { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, option_ids);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 63/272 KVM: x86/xen: inject vCPU upcall vector when local APIC is enabled
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Woodhouse <[email protected]>
[ Upstream commit 8e62bf2bfa46367e14d0ffdcde5aada08759497c ]
Linux guests since commit b1c3497e604d ("x86/xen: Add support for HVMOP_set_evtchn_upcall_vector") in v6.0 onwards will use the per-vCPU upcall vector when it's advertised in the Xen CPUID leaves.
This upcall is injected through the guest's local APIC as an MSI, unlike the older system vector which was merely injected by the hypervisor any time the CPU was able to receive an interrupt and the upcall_pending flags is set in its vcpu_info.
Effectively, that makes the per-CPU upcall edge triggered instead of level triggered, which results in the upcall being lost if the MSI is delivered when the local APIC is *disabled*.
Xen checks the vcpu_info->evtchn_upcall_pending flag when the local APIC for a vCPU is software enabled (in fact, on any write to the SPIV register which doesn't disable the APIC). Do the same in KVM since KVM doesn't provide a way for userspace to intervene and trap accesses to the SPIV register of a local APIC emulated by KVM.
--- arch/x86/kvm/lapic.c | 5 ++++- arch/x86/kvm/xen.c | 2 +- arch/x86/kvm/xen.h | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-)
arch/x86/kvm/lapic.c +4 -1
@@ -40,6 +40,7 @@#include "ioapic.h" #include "trace.h" #include "x86.h" +#include "xen.h" #include "cpuid.h" #include "hyperv.h"
@@ -338,8 +339,10 @@ static inline void apic_set_spiv(struct kvm_lapic *apic, u32 val) }/* Check if there are APF page ready requests pending */ -if (enabled) +if (enabled) {kvm_make_request (KVM_REQ_APF_READY , apic->vcpu); +kvm_xen_sw_enable_lapic (apic->vcpu); + } }static inline void kvm_apic_set_xapic_id (struct kvm_lapic *apic,u8 id)
arch/x86/kvm/xen.c +1 -1
@@ -314,7 +314,7 @@ void kvm_xen_update_runstate_guest(struct kvm_vcpu *v, int state)mark_page_dirty_in_slot (v->kvm, gpc->memslot, gpc->gpa >>PAGE_SHIFT ); } -static void kvm_xen_inject_vcpu_vector (struct kvm_vcpu *v) +void kvm_xen_inject_vcpu_vector (struct kvm_vcpu *v) {struct kvm_lapic_irq irq = { };int r;
arch/x86/kvm/xen.h +18 -0
@@ -16,6 +16,7 @@ extern struct static_key_false_deferred kvm_xen_enabled;int __kvm_xen_has_interrupt (struct kvm_vcpu *vcpu);void kvm_xen_inject_pending_events (struct kvm_vcpu *vcpu); +void kvm_xen_inject_vcpu_vector (struct kvm_vcpu *vcpu);int kvm_xen_vcpu_set_attr (struct kvm_vcpu *vcpu,struct kvm_xen_vcpu_attr *data);int kvm_xen_vcpu_get_attr (struct kvm_vcpu *vcpu,struct kvm_xen_vcpu_attr *data);int kvm_xen_hvm_set_attr (struct kvm *kvm,struct kvm_xen_hvm_attr *data);
@@ -33,6 +34,19 @@ int kvm_xen_setup_evtchn(struct kvm *kvm,struct kvm_kernel_irq_routing_entry *e, const struct kvm_irq_routing_entry *ue); +static inline void kvm_xen_sw_enable_lapic (struct kvm_vcpu *vcpu) +{ +/* +* The local APIC is being enabled. If the per-vCPU upcall vector is +* set and the vCPU's evtchn_upcall_pending flag is set, inject the +* interrupt. +*/ +if (static_branch_unlikely (&kvm_xen_enabled.key) && + vcpu->arch.xen.vcpu_info_cache.active && + vcpu->arch.xen.upcall_vector &&__kvm_xen_has_interrupt (vcpu)) +kvm_xen_inject_vcpu_vector (vcpu); +} +static inline bool kvm_xen_msr_enabled (struct kvm *kvm) { return static_branch_unlikely(&kvm_xen_enabled.key) &&
@@ -98,6 +112,10 @@ static inline void kvm_xen_destroy_vcpu(struct kvm_vcpu *vcpu) { } +static inline void kvm_xen_sw_enable_lapic (struct kvm_vcpu *vcpu) +{ +} +static inline bool kvm_xen_msr_enabled (struct kvm *kvm) {return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 64/272 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toru Katagiri <[email protected]>
[ Upstream commit b1a8da9ff1395c4879b4bd41e55733d944f3d613 ]
TDK NC0110013M and MM0110113M have custom USB IDs for CP210x, so we need to add them to the driver.
--- drivers/usb/serial/cp210x.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/cp210x.c +2 -0
@@ -56,6 +56,8 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */ { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ + { USB_DEVICE(0x04BF, 0x1301) }, /* TDK Corporation NC0110013M - Network Controller */ + { USB_DEVICE(0x04BF, 0x1303) }, /* TDK Corporation MM0110113M - i3 Micro Module */ { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ { USB_DEVICE(0x0846, 0x1100) }, /* NetGear Managed Switch M4100 series, M5300 series, M7100 series */ { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 65/272 PM: sleep: wakeirq: fix wake irq warning in system suspend
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qingliang Li <[email protected]>
[ Upstream commit e7a7681c859643f3f2476b2a28a494877fd89442 ]
When driver uses pm_runtime_force_suspend() as the system suspend callback function and registers the wake irq with reverse enable ordering, the wake irq will be re-enabled when entering system suspend, triggering an 'Unbalanced enable for IRQ xxx' warning. In this scenario, the call sequence during system suspend is as follows:
suspend_devices_and_enter()
-> dpm_suspend_start()
-> dpm_run_callback()
-> pm_runtime_force_suspend()
-> dev_pm_enable_wake_irq_check()
-> dev_pm_enable_wake_irq_complete()
-> suspend_enter()
-> dpm_suspend_noirq()
-> device_wakeup_arm_wake_irqs()
-> dev_pm_arm_wake_irq()To fix this issue, complete the setting of WAKE_IRQ_DEDICATED_ENABLED flag in dev_pm_enable_wake_irq_complete() to avoid redundant irq enablement.
--- drivers/base/power/wakeirq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/base/power/wakeirq.c +3 -1
@@ -362,8 +362,10 @@ void dev_pm_enable_wake_irq_complete(struct device *dev)return ;if (wirq->status &WAKE_IRQ_DEDICATED_MANAGED && - wirq->status &WAKE_IRQ_DEDICATED_REVERSE ) + wirq->status &WAKE_IRQ_DEDICATED_REVERSE ) {enable_irq (wirq->irq); + wirq->status |=WAKE_IRQ_DEDICATED_ENABLED ; + } }/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 66/272 mmc: tmio: avoid concurrent runs of mmc_request_done()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit e8d1b41e69d72c62865bebe8f441163ec00b3d44 ]
With the to-be-fixed commit, the reset_work handler cleared 'host->mrq' outside of the spinlock protected critical section. That leaves a small race window during execution of 'tmio_mmc_reset()' where the done_work handler could grab a pointer to the now invalid 'host->mrq'. Both would use it to call mmc_request_done() causing problems (see link below).
However, 'host->mrq' cannot simply be cleared earlier inside the critical section. That would allow new mrqs to come in asynchronously while the actual reset of the controller still needs to be done. So, like 'tmio_mmc_set_ios()', an ERR_PTR is used to prevent new mrqs from coming in but still avoiding concurrency between work handlers.
--- drivers/mmc/host/tmio_mmc_core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/host/tmio_mmc_core.c +2 -0
@@ -259,6 +259,8 @@ static void tmio_mmc_reset_work(struct work_struct *work)else mrq->cmd->error = -ETIMEDOUT ; +/* No new calls yet, but disallow concurrent tmio_mmc_done_work() */ + host->mrq =ERR_PTR (-EBUSY ); host->cmd =NULL ; host->data =NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 67/272 fuse: fix root lookup with nonzero generation
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
[ Upstream commit 68ca1b49e430f6534d0774a94147a823e3b8b26e ]
The root inode has a fixed nodeid and generation (1, 0).
Prior to the commit 15db16837a35 ("fuse: fix illegal access to inode with reused nodeid") generation number on lookup was ignored. After this commit lookup with the wrong generation number resulted in the inode being unhashed. This is correct for non-root inodes, but replacing the root inode is wrong and results in weird behavior.
Fix by reverting to the old behavior if ignoring the generation for the root inode, but issuing a warning in dmesg.
--- fs/fuse/dir.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/fuse/dir.c +4 -0
@@ -399,6 +399,10 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name goto out_put_forget;if (fuse_invalid_attr (&outarg->attr)) goto out_put_forget; +if (outarg->nodeid ==FUSE_ROOT_ID && outarg->generation !=0 ) { +pr_warn_once ("root generation should be zero\n" ); + outarg->generation =0 ; + } *inode = fuse_iget(sb, outarg->nodeid, outarg->generation, &outarg->attr, entry_attr_timeout(outarg),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 68/272 fuse: dont unhash root
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
[ Upstream commit b1fe686a765e6c0d71811d825b5a1585a202b777 ]
The root inode is assumed to be always hashed. Do not unhash the root inode even if it is marked BAD.
--- fs/fuse/fuse_i.h | 1 - fs/fuse/inode.c | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
fs/fuse/fuse_i.h +0 -1
@@ -923,7 +923,6 @@ static inline bool fuse_stale_inode(const struct inode *inode, int generation,static inline void fuse_make_bad (struct inode *inode) { -remove_inode_hash (inode);set_bit (FUSE_I_BAD , &get_fuse_inode (inode)->state); }
fs/fuse/inode.c +5 -2
@@ -445,8 +445,11 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid, }else if (fuse_stale_inode (inode, generation, attr)) {/* nodeid was reused, any I/O on the old inode should fail */ fuse_make_bad (inode); -iput (inode); - goto retry; +if (inode !=d_inode (sb->s_root)) { +remove_inode_hash (inode); +iput (inode); + goto retry; + } } fi =get_fuse_inode (inode);spin_lock (&fi->lock);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 69/272 usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jameson Thies <[email protected]>
[ Upstream commit 4d0a5a9915793377c0fe1a8d78de6bcd92cea963 ]
Clean up UCSI_CABLE_PROP macros by fixing a bitmask shifting error for plug type and updating the modal support macro for consistent naming.
--- drivers/usb/typec/ucsi/ucsi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/typec/ucsi/ucsi.h +2 -2
@@ -220,12 +220,12 @@ struct ucsi_cable_property {#define UCSI_CABLE_PROP_FLAG_VBUS_IN_CABLE BIT(0)#define UCSI_CABLE_PROP_FLAG_ACTIVE_CABLE BIT(1)#define UCSI_CABLE_PROP_FLAG_DIRECTIONALITY BIT(2) -#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE (_f_) ((_f_) & GENMASK(3, 0)) +#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE (_f_) (((_f_) & GENMASK(4, 3)) >> 3)#define UCSI_CABLE_PROPERTY_PLUG_TYPE_A 0#define UCSI_CABLE_PROPERTY_PLUG_TYPE_B 1#define UCSI_CABLE_PROPERTY_PLUG_TYPE_C 2#define UCSI_CABLE_PROPERTY_PLUG_OTHER 3 -#define UCSI_CABLE_PROP_MODE_SUPPORT BIT(5) +#define UCSI_CABLE_PROP_FLAG_MODE_SUPPORT BIT(5)u8 latency; } __packed;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 70/272 serial: Lock console when calling into driver before registration
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Collingbourne <[email protected]>
[ Upstream commit 801410b26a0e8b8a16f7915b2b55c9528b69ca87 ]
During the handoff from earlycon to the real console driver, we have two separate drivers operating on the same device concurrently. In the case of the 8250 driver these concurrent accesses cause problems due to the driver's use of banked registers, controlled by LCR.DLAB. It is possible for the setup(), config_port(), pm() and set_mctrl() callbacks to set DLAB, which can cause the earlycon code that intends to access TX to instead access DLL, leading to missed output and corruption on the serial line due to unintended modifications to the baud rate.
In particular, for setup() we have:
univ8250_console_setup()
-> serial8250_console_setup()
-> uart_set_options()
-> serial8250_set_termios()
-> serial8250_do_set_termios()
-> serial8250_do_set_divisor()
For config_port() we have:
serial8250_config_port()
-> autoconfig()
For pm() we have:
serial8250_pm()
-> serial8250_do_pm()
-> serial8250_set_sleep()
For set_mctrl() we have (for some devices):
serial8250_set_mctrl()
-> omap8250_set_mctrl()
-> __omap8250_set_mctrl()
To avoid such problems, let's make it so that the console is locked during pre-registration calls to these callbacks, which will prevent the earlycon driver from running concurrently.
Remove the partial solution to this problem in the 8250 driver that locked the console only during autoconfig_irq(), as this would result in a deadlock with the new approach. The console continues to be locked during autoconfig_irq() because it can only be called through uart_configure_port().
Although this patch introduces more locking than strictly necessary (and in particular it also locks during the call to rs485_config() which is not affected by this issue as far as I can tell), it follows the principle that it is the responsibility of the generic console code to manage the earlycon handoff by ensuring that earlycon and real console driver code cannot run concurrently, and not the individual drivers.
--- drivers/tty/serial/8250/8250_port.c | 6 ------ drivers/tty/serial/serial_core.c | 12 ++++++++++++ kernel/printk/printk.c | 21 ++++++++++++++++++--- 3 files changed, 30 insertions(+), 9 deletions(-)
drivers/tty/serial/8250/8250_port.c +0 -6
@@ -1377,9 +1377,6 @@ static void autoconfig_irq(struct uart_8250_port *up)inb_p (ICP ); } -if (uart_console (port)) -console_lock (); -/* forget possible initially masked and pending IRQ */ probe_irq_off (probe_irq_on ()); save_mcr =serial8250_in_MCR (up);
@@ -1410,9 +1407,6 @@ static void autoconfig_irq(struct uart_8250_port *up)if (port->flags &UPF_FOURPORT )outb_p (save_ICP,ICP ); -if (uart_console (port)) -console_unlock (); - port->irq = (irq >0 ) ? irq :0 ; }
drivers/tty/serial/serial_core.c +12 -0
@@ -2561,7 +2561,12 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state, port->type =PORT_UNKNOWN ; flags |=UART_CONFIG_TYPE ; } +/* Synchronize with possible boot console. */ +if (uart_console (port)) +console_lock (); port->ops->config_port (port, flags); +if (uart_console (port)) +console_unlock (); }if (port->type !=PORT_UNKNOWN ) {
@@ -2569,6 +2574,10 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,uart_report_port (drv, port); +/* Synchronize with possible boot console. */ +if (uart_console (port)) +console_lock (); +/* Power up port for set_mctrl() */ uart_change_pm (state,UART_PM_STATE_ON );
@@ -2585,6 +2594,9 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,uart_rs485_config (port); +if (uart_console (port)) +console_unlock (); +/* * If this driver supports console, and it hasn't been * successfully registered yet, try to re-register it.
kernel/printk/printk.c +18 -3
@@ -3045,6 +3045,21 @@ static int __init keep_bootcon_setup(char *str)early_param ("keep_bootcon" , keep_bootcon_setup); +static int console_call_setup (struct console *newcon,char *options) +{ +int err; + +if (!newcon->setup) +return 0 ; + +/* Synchronize with possible boot console. */ +console_lock (); + err = newcon->setup (newcon, options); +console_unlock (); + +return err; +} +/* * This is called by register_console() to try to match * the newly registered console with any of the ones selected
@@ -3080,8 +3095,8 @@ static int try_enable_preferred_console(struct console *newcon,if (_braille_register_console (newcon, c))return 0 ; -if (newcon->setup && - (err = newcon->setup (newcon, c->options)) !=0 ) + err =console_call_setup (newcon, c->options); +if (err)return err; } newcon->flags |=CON_ENABLED ;
@@ -3107,7 +3122,7 @@ static void try_enable_default_console(struct console *newcon)if (newcon->index <0 ) newcon->index =0 ; -if (newcon->setup && newcon->setup (newcon,NULL ) !=0 ) +if (console_call_setup (newcon,NULL ) !=0 )return ; newcon->flags |=CON_ENABLED ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 53/272 clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit cdbc6e2d8108bc47895e5a901cfcaf799b00ca8d ]
The frequency table arrays are supposed to be terminated with an empty element. Add such entry to the end of the arrays where it is missing in order to avoid possible out-of-bound access when the table is traversed by functions like qcom_find_freq() or qcom_find_freq_floor().
Only compile tested.
--- drivers/clk/qcom/gcc-ipq6018.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/gcc-ipq6018.c +2 -0
@@ -1557,6 +1557,7 @@ static struct clk_regmap_div nss_ubi0_div_clk_src = {static const struct freq_tbl ftbl_pcie_aux_clk_src[] = {F (24000000 ,P_XO ,1 ,0 ,0 ), + { } };static const struct clk_parent_data gcc_xo_gpll0_core_pi_sleep_clk[] = {
@@ -1737,6 +1738,7 @@ static const struct freq_tbl ftbl_sdcc_ice_core_clk_src[] = {F (160000000 ,P_GPLL0 ,5 ,0 ,0 ),F (216000000 ,P_GPLL6 ,5 ,0 ,0 ), F(308570000, P_GPLL6, 3.5, 0, 0), + { } }; static const struct clk_parent_data gcc_xo_gpll0_gpll6_gpll0_div2[] = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 71/272 btrfs: qgroup: always free reserved space for extent records
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit d139ded8b9cdb897bb9539eb33311daf9a177fd2 ]
[BUG]
If qgroup is marked inconsistent (e.g. caused by operations needing full subtree rescan, like creating a snapshot and assign to a higher level qgroup), btrfs would immediately start leaking its data reserved space.
The following script can easily reproduce it:
mkfs.btrfs -O quota -f $dev
mount $dev $mnt
btrfs subvolume create $mnt/subv1
btrfs qgroup create 1/0 $mnt
# This snapshot creation would mark qgroup inconsistent,
# as the ownership involves different higher level qgroup, thus # we have to rescan both source and snapshot, which can be very # time consuming, thus here btrfs just choose to mark qgroup # inconsistent, and let users to determine when to do the rescan. btrfs subv snapshot -i 1/0 $mnt/subv1 $mnt/snap1
# Now this write would lead to qgroup rsv leak.
xfs_io -f -c "pwrite 0 64k" $mnt/file1
# And at unmount time, btrfs would report 64K DATA rsv space leaked. umount $mnt
And we would have the following dmesg output for the unmount:
BTRFS info (device dm-1): last unmount of filesystem 14a3d84e-f47b-4f72-b053-a8a36eef74d3 BTRFS warning (device dm-1): qgroup 0/5 has unreleased space, type 0 rsv 65536
[CAUSE]
Since commit e15e9f43c7ca ("btrfs: introduce BTRFS_QGROUP_RUNTIME_FLAG_NO_ACCOUNTING to skip qgroup accounting"), we introduce a mode for btrfs qgroup to skip the timing consuming backref walk, if the qgroup is already inconsistent.
But this skip also covered the data reserved freeing, thus the qgroup reserved space for each newly created data extent would not be freed, thus cause the leakage.
[FIX]
Make the data extent reserved space freeing mandatory.
The qgroup reserved space handling is way cheaper compared to the backref walking part, and we always have the super sensitive leak detector, thus it's definitely worth to always free the qgroup reserved data space.
--- fs/btrfs/qgroup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/btrfs/qgroup.c +5 -5
@@ -2800,11 +2800,6 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans) goto cleanup; } -/* Free the reserved data space */ -btrfs_qgroup_free_refroot (fs_info, - record->data_rsv_refroot, - record->data_rsv, -BTRFS_QGROUP_RSV_DATA );/* * Use BTRFS_SEQ_LAST as time_seq to do special search, * which doesn't lock tree or delayed_refs and search
@@ -2826,6 +2821,11 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans) record->old_roots =NULL ; new_roots =NULL ; } +/* Free the reserved data space */ +btrfs_qgroup_free_refroot (fs_info, + record->data_rsv_refroot, + record->data_rsv, +BTRFS_QGROUP_RSV_DATA ); cleanup:ulist_free (record->old_roots);ulist_free (new_roots);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 72/272 btrfs: fix off-by-one chunk length calculation at contains_pending_extent()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit ae6bd7f9b46a29af52ebfac25d395757e2031d0d ]
At contains_pending_extent() the value of the end offset of a chunk we found in the device's allocation state io tree is inclusive, so when we calculate the length we pass to the in_range() macro, we must sum 1 to the expression "physical_end - physical_offset".
In practice the wrong calculation should be harmless as chunks sizes are never 1 byte and we should never have 1 byte ranges of unallocated space. Nevertheless fix the wrong calculation.
--- fs/btrfs/volumes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/volumes.c +1 -1
@@ -1444,7 +1444,7 @@ static bool contains_pending_extent(struct btrfs_device *device, u64 *start,if (in_range (physical_start, *start, len) ||in_range (*start, physical_start, - physical_end - physical_start)) { + physical_end +1 - physical_start)) { *start = physical_end +1 ;return true; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 73/272 PCI/PM: Drain runtime-idle callbacks before driver removal
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 9d5286d4e7f68beab450deddbb6a32edd5ecf4bf ]
A race condition between the .runtime_idle() callback and the .remove() callback in the rtsx_pcr PCI driver leads to a kernel crash due to an unhandled page fault [1].
The problem is that rtsx_pci_runtime_idle() is not expected to be running after pm_runtime_get_sync() has been called, but the latter doesn't really guarantee that. It only guarantees that the suspend and resume callbacks will not be running when it returns.
However, if a .runtime_idle() callback is already running when pm_runtime_get_sync() is called, the latter will notice that the runtime PM status of the device is RPM_ACTIVE and it will return right away without waiting for the former to complete. In fact, it cannot wait for .runtime_idle() to complete because it may be called from that callback (it arguably does not make much sense to do that, but it is not strictly prohibited).
Thus in general, whoever is providing a .runtime_idle() callback needs to protect it from running in parallel with whatever code runs after pm_runtime_get_sync(). [Note that .runtime_idle() will not start after pm_runtime_get_sync() has returned, but it may continue running then if it has started earlier.]
One way to address that race condition is to call pm_runtime_barrier() after pm_runtime_get_sync() (not before it, because a nonzero value of the runtime PM usage counter is necessary to prevent runtime PM callbacks from being invoked) to wait for the .runtime_idle() callback to complete should it be running at that point. A suitable place for doing that is in pci_device_remove() which calls pm_runtime_get_sync() before removing the driver, so it may as well call pm_runtime_barrier() subsequently, which will prevent the race in question from occurring, not just in the rtsx_pcr driver, but in any PCI drivers providing .runtime_idle() callbacks.
--- drivers/pci/pci-driver.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/pci/pci-driver.c +7 -0
@@ -473,6 +473,13 @@ static void pci_device_remove(struct device *dev)if (drv->remove) {pm_runtime_get_sync (dev); +/* +* If the driver provides a .runtime_idle() callback and it has +* started to run already, it may continue to run in parallel +* with the code below, so wait until all of the runtime PM +* activity has completed. +*/ +pm_runtime_barrier (dev); drv->remove (pci_dev);pm_runtime_put_noidle (dev); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 74/272 PCI/DPC: Quirk PIO log size for Intel Raptor Lake Root Ports
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Menzel <[email protected]>
[ Upstream commit 627c6db20703b5d18d928464f411d0d4ec327508 ]
Commit 5459c0b70467 ("PCI/DPC: Quirk PIO log size for certain Intel Root Ports") and commit 3b8803494a06 ("PCI/DPC: Quirk PIO log size for Intel Ice Lake Root Ports") add quirks for Ice, Tiger and Alder Lake Root Ports. System firmware for Raptor Lake still has the bug, so Linux logs the warning below on several Raptor Lake systems like Dell Precision 3581 with Intel Raptor Lake processor (0W18NX) system firmware/BIOS version 1.10.1.
pci 0000:00:07.0: [8086:a76e] type 01 class 0x060400 pci 0000:00:07.0: DPC: RP PIO log size 0 is invalid pci 0000:00:07.1: [8086:a73f] type 01 class 0x060400 pci 0000:00:07.1: DPC: RP PIO log size 0 is invalid
Apply the quirk for Raptor Lake Root Ports as well.
This also enables the DPC driver to dump the RP PIO Log registers when DPC is triggered.
--- drivers/pci/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/quirks.c +2 -0
@@ -6078,6 +6078,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2b, dpc_log_size);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x9a2d , dpc_log_size);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x9a2f , dpc_log_size);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x9a31 , dpc_log_size); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0xa73f , dpc_log_size); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0xa76e , dpc_log_size);#endif /*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 75/272 ACPI: CPPC: Use access_width over bit_width for system memory accesses
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jarred White <[email protected]>
[ Upstream commit 2f4a4d63a193be6fd530d180bb13c3592052904c ]
To align with ACPI 6.3+, since bit_width can be any 8-bit value, it cannot be depended on to be always on a clean 8b boundary. This was uncovered on the Cobalt 100 platform.
SError Interrupt on CPU26, code 0xbe000011 -- SError
CPU: 26 PID: 1510 Comm: systemd-udevd Not tainted 5.15.2.1-13 #1 Hardware name: MICROSOFT CORPORATION, BIOS MICROSOFT CORPORATION pstate: 62400009 (nZCv daif +PAN -UAO +TCO -DIT -SSBS BTYPE=--) pc : cppc_get_perf_caps+0xec/0x410 lr : cppc_get_perf_caps+0xe8/0x410 sp : ffff8000155ab730 x29: ffff8000155ab730 x28: ffff0080139d0038 x27: ffff0080139d0078 x26: 0000000000000000 x25: ffff0080139d0058 x24: 00000000ffffffff x23: ffff0080139d0298 x22: ffff0080139d0278 x21: 0000000000000000 x20: ffff00802b251910 x19: ffff0080139d0000 x18: ffffffffffffffff x17: 0000000000000000 x16: ffffdc7e111bad04 x15: ffff00802b251008 x14: ffffffffffffffff x13: ffff013f1fd63300 x12: 0000000000000006 x11: ffffdc7e128f4420 x10: 0000000000000000 x9 : ffffdc7e111badec x8 : ffff00802b251980 x7 : 0000000000000000 x6 : ffff0080139d0028 x5 : 0000000000000000 x4 : ffff0080139d0018 x3 : 00000000ffffffff x2 : 0000000000000008 x1 : ffff8000155ab7a0 x0 : 0000000000000000 Kernel panic - not syncing: Asynchronous SError Interrupt CPU: 26 PID: 1510 Comm: systemd-udevd Not tainted 5.15.2.1-13 #1 Hardware name: MICROSOFT CORPORATION, BIOS MICROSOFT CORPORATION Call trace: dump_backtrace+0x0/0x1e0 show_stack+0x24/0x30 dump_stack_lvl+0x8c/0xb8 dump_stack+0x18/0x34 panic+0x16c/0x384 add_taint+0x0/0xc0 arm64_serror_panic+0x7c/0x90 arm64_is_fatal_ras_serror+0x34/0xa4 do_serror+0x50/0x6c el1h_64_error_handler+0x40/0x74 el1h_64_error+0x7c/0x80 cppc_get_perf_caps+0xec/0x410 cppc_cpufreq_cpu_init+0x74/0x400 [cppc_cpufreq] cpufreq_online+0x2dc/0xa30 cpufreq_add_dev+0xc0/0xd4 subsys_interface_register+0x134/0x14c cpufreq_register_driver+0x1b0/0x354 cppc_cpufreq_init+0x1a8/0x1000 [cppc_cpufreq] do_one_initcall+0x50/0x250 do_init_module+0x60/0x27c load_module+0x2300/0x2570 __do_sys_finit_module+0xa8/0x114 __arm64_sys_finit_module+0x2c/0x3c invoke_syscall+0x78/0x100 el0_svc_common.constprop.0+0x180/0x1a0 do_el0_svc+0x84/0xa0 el0_svc+0x2c/0xc0 el0t_64_sync_handler+0xa4/0x12c el0t_64_sync+0x1a4/0x1a8
Instead, use access_width to determine the size and use the offset and width to shift and mask the bits to read/write out. Make sure to add a check for system memory since pcc redefines the access_width to subspace id.
If access_width is not set, then fall back to using bit_width.
--- drivers/acpi/cppc_acpi.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
drivers/acpi/cppc_acpi.c +26 -5
@@ -163,6 +163,13 @@ show_cppc_data(cppc_get_perf_caps, cppc_perf_caps, nominal_freq);show_cppc_data (cppc_get_perf_ctrs, cppc_perf_fb_ctrs, reference_perf);show_cppc_data (cppc_get_perf_ctrs, cppc_perf_fb_ctrs, wraparound_time); +/* Check for valid access_width, otherwise, fallback to using bit_width */ +#define GET_BIT_WIDTH (reg) ((reg)->access_width ? (8 << ((reg)->access_width - 1)) : (reg)->bit_width) + +/* Shift and apply the mask for CPC reads/writes */ +#define MASK_VAL (reg, val) ((val) >> ((reg)->bit_offset & \ + GENMASK(((reg)->bit_width), 0))) +static ssize_t show_feedback_ctrs (struct kobject *kobj,struct kobj_attribute *attr,char *buf) {
@@ -776,6 +783,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) }else if (gas_t->space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) {if (gas_t->address) {void __iomem *addr; +size_t access_width;if (!osc_cpc_flexible_adr_space_confirmed) {pr_debug ("Flexible address space capability not supported\n" );
@@ -783,7 +791,8 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) goto out_free; } - addr =ioremap (gas_t->address, gas_t->bit_width/8 ); + access_width =GET_BIT_WIDTH (gas_t) /8 ; + addr =ioremap (gas_t->address, access_width);if (!addr) goto out_free; cpc_ptr->cpc_regs[i-2 ].sys_mem_vaddr = addr;
@@ -979,6 +988,7 @@ int __weak cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val)static int cpc_read (int cpu,struct cpc_register_resource *reg_res,u64 *val) {void __iomem *vaddr =NULL ; +int size;int pcc_ss_id =per_cpu (cpu_pcc_subspace_idx, cpu);struct cpc_reg *reg = ®_res->cpc_entry.reg;
@@ -990,7 +1000,7 @@ static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val) *val =0 ;if (reg->space_id ==ACPI_ADR_SPACE_SYSTEM_IO ) { -u32 width =8 << (reg->access_width -1 ); +u32 width =GET_BIT_WIDTH (reg);u32 val_u32;acpi_status status;
@@ -1014,7 +1024,9 @@ static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val)return acpi_os_read_memory ((acpi_physical_address )reg->address, val, reg->bit_width); -switch (reg->bit_width) { + size =GET_BIT_WIDTH (reg); + +switch (size) {case 8 : *val =readb_relaxed (vaddr);break ;
@@ -1033,18 +1045,22 @@ static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val)return -EFAULT ; } +if (reg->space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) + *val =MASK_VAL (reg, *val); +return 0 ; }static int cpc_write (int cpu,struct cpc_register_resource *reg_res,u64 val) {int ret_val =0 ; +int size;void __iomem *vaddr =NULL ;int pcc_ss_id =per_cpu (cpu_pcc_subspace_idx, cpu);struct cpc_reg *reg = ®_res->cpc_entry.reg;if (reg->space_id ==ACPI_ADR_SPACE_SYSTEM_IO ) { -u32 width =8 << (reg->access_width -1 ); +u32 width =GET_BIT_WIDTH (reg);acpi_status status; status = acpi_os_write_port((acpi_io_address)reg->address,
@@ -1066,7 +1082,12 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val)return acpi_os_write_memory ((acpi_physical_address )reg->address, val, reg->bit_width); -switch (reg->bit_width) { + size =GET_BIT_WIDTH (reg); + +if (reg->space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) + val =MASK_VAL (reg, val); + +switch (size) {case 8 :writeb_relaxed (val, vaddr);break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 76/272 dm-raid: fix lockdep waring in "pers->hot_add_disk"
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit 95009ae904b1e9dca8db6f649f2d7c18a6e42c75 ]
The lockdep assert is added by commit a448af25becf ("md/raid10: remove rcu protection to access rdev from conf") in print_conf(). And I didn't notice that dm-raid is calling "pers->hot_add_disk" without holding 'reconfig_mutex'.
"pers->hot_add_disk" read and write many fields that is protected by 'reconfig_mutex', and raid_resume() already grab the lock in other contex. Hence fix this problem by protecting "pers->host_add_disk" with the lock.
--- drivers/md/dm-raid.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/md/dm-raid.c +2 -0
@@ -4046,7 +4046,9 @@ static void raid_resume(struct dm_target *ti)* Take this opportunity to check whether any failed * devices are reachable again. */ +mddev_lock_nointr (mddev);attempt_restore_of_faulty_devices (rs); +mddev_unlock (mddev); }if (test_and_clear_bit (RT_FLAG_RS_SUSPENDED , &rs->runtime_flags)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 77/272 powerpc: xor_vmx: Add -mhard-float to CFLAGS
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
[ Upstream commit 35f20786c481d5ced9283ff42de5c69b65e5ed13 ]
arch/powerpc/lib/xor_vmx.o is built with '-msoft-float' (from the main powerpc Makefile) and '-maltivec' (from its CFLAGS), which causes an error when building with clang after a recent change in main:
error: option '-msoft-float' cannot be specified with '-maltivec' make[6]: *** [scripts/Makefile.build:243: arch/powerpc/lib/xor_vmx.o] Error 1
Explicitly add '-mhard-float' before '-maltivec' in xor_vmx.o's CFLAGS to override the previous inclusion of '-msoft-float' (as the last option wins), which matches how other areas of the kernel use '-maltivec', such as AMDGPU.
--- arch/powerpc/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/lib/Makefile +1 -1
@@ -72,7 +72,7 @@ obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o obj-$(CONFIG_FTR_FIXUP_SELFTEST) += feature-fixups-test.o obj-$(CONFIG_ALTIVEC) += xor_vmx.o xor_vmx_glue.o -CFLAGS_xor_vmx.o += -maltivec $(call cc-option,-mabi=altivec) +CFLAGS_xor_vmx.o += -mhard-float -maltivec $(call cc-option,-mabi=altivec) # Enable <altivec.h> CFLAGS_xor_vmx.o += -isystem $(shell $(CC) -print-file-name=include)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 78/272 mac802154: fix llsec key resources release in mac802154_llsec_key_del
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit e8a1e58345cf40b7b272e08ac7b32328b2543e40 ]
mac802154_llsec_key_del() can free resources of a key directly without following the RCU rules for waiting before the end of a grace period. This may lead to use-after-free in case llsec_lookup_key() is traversing the list of keys in parallel with a key deletion:
refcount_t: addition on 0; use-after-free.
WARNING: CPU: 4 PID: 16000 at lib/refcount.c:25 refcount_warn_saturate+0x162/0x2a0 Modules linked in: CPU: 4 PID: 16000 Comm: wpan-ping Not tainted 6.7.0 #19 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 RIP: 0010:refcount_warn_saturate+0x162/0x2a0 Call Trace: <TASK> llsec_lookup_key.isra.0+0x890/0x9e0 mac802154_llsec_encrypt+0x30c/0x9c0 ieee802154_subif_start_xmit+0x24/0x1e0 dev_hard_start_xmit+0x13e/0x690 sch_direct_xmit+0x2ae/0xbc0 __dev_queue_xmit+0x11dd/0x3c20 dgram_sendmsg+0x90b/0xd60 __sys_sendto+0x466/0x4c0 __x64_sys_sendto+0xe0/0x1c0 do_syscall_64+0x45/0xf0 entry_SYSCALL_64_after_hwframe+0x6e/0x76
Also, ieee802154_llsec_key_entry structures are not freed by mac802154_llsec_key_del():
unreferenced object 0xffff8880613b6980 (size 64):
comm "iwpan", pid 2176, jiffies 4294761134 (age 60.475s) hex dump (first 32 bytes):
78 0d 8f 18 80 88 ff ff 22 01 00 00 00 00 ad de x.......".......
00 00 00 00 00 00 00 00 03 00 cd ab 00 00 00 00 ................
backtrace:
[<ffffffff81dcfa62>] __kmem_cache_alloc_node+0x1e2/0x2d0
[<ffffffff81c43865>] kmalloc_trace+0x25/0xc0
[<ffffffff88968b09>] mac802154_llsec_key_add+0xac9/0xcf0
[<ffffffff8896e41a>] ieee802154_add_llsec_key+0x5a/0x80
[<ffffffff8892adc6>] nl802154_add_llsec_key+0x426/0x5b0
[<ffffffff86ff293e>] genl_family_rcv_msg_doit+0x1fe/0x2f0
[<ffffffff86ff46d1>] genl_rcv_msg+0x531/0x7d0
[<ffffffff86fee7a9>] netlink_rcv_skb+0x169/0x440
[<ffffffff86ff1d88>] genl_rcv+0x28/0x40
[<ffffffff86fec15c>] netlink_unicast+0x53c/0x820
[<ffffffff86fecd8b>] netlink_sendmsg+0x93b/0xe60
[<ffffffff86b91b35>] ____sys_sendmsg+0xac5/0xca0
[<ffffffff86b9c3dd>] ___sys_sendmsg+0x11d/0x1c0
[<ffffffff86b9c65a>] __sys_sendmsg+0xfa/0x1d0
[<ffffffff88eadbf5>] do_syscall_64+0x45/0xf0
[<ffffffff890000ea>] entry_SYSCALL_64_after_hwframe+0x6e/0x76Handle the proper resource release in the RCU callback function mac802154_llsec_key_del_rcu().
Note that if llsec_lookup_key() finds a key, it gets a refcount via llsec_key_get() and locally copies key id from key_entry (which is a list element). So it's safe to call llsec_key_put() and free the list entry after the RCU grace period elapses.
Found by Linux Verification Center (linuxtesting.org).
Message-ID: <[email protected]>
--- include/net/cfg802154.h | 1 + net/mac802154/llsec.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)
include/net/cfg802154.h +1 -0
@@ -267,6 +267,7 @@ struct ieee802154_llsec_key {struct ieee802154_llsec_key_entry {struct list_head list; +struct rcu_head rcu;struct ieee802154_llsec_key_id id;struct ieee802154_llsec_key *key;
net/mac802154/llsec.c +13 -5
@@ -265,19 +265,27 @@ int mac802154_llsec_key_add(struct mac802154_llsec *sec,return -ENOMEM ; } +static void mac802154_llsec_key_del_rcu (struct rcu_head *rcu) +{ +struct ieee802154_llsec_key_entry *pos; +struct mac802154_llsec_key *mkey; + + pos = container_of(rcu, struct ieee802154_llsec_key_entry, rcu); + mkey = container_of(pos->key, struct mac802154_llsec_key, key); + +llsec_key_put (mkey); +kfree_sensitive (pos); +} +int mac802154_llsec_key_del (struct mac802154_llsec *sec,const struct ieee802154_llsec_key_id *key) {struct ieee802154_llsec_key_entry *pos;list_for_each_entry (pos, &sec->table.keys, list) { -struct mac802154_llsec_key *mkey; - - mkey = container_of(pos->key, struct mac802154_llsec_key, key); -if (llsec_key_id_equal (&pos->id, key)) {list_del_rcu (&pos->list); -llsec_key_put (mkey); +call_rcu (&pos->rcu, mac802154_llsec_key_del_rcu);return 0 ; } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 79/272 swap: comments get_swap_device() with usage rule
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huang Ying <[email protected]>
[ Upstream commit a95722a047724ef75567381976a36f0e44230bd9 ]
The general rule to use a swap entry is as follows.
When we get a swap entry, if there aren't some other ways to prevent swapoff, such as the folio in swap cache is locked, page table lock is held, etc., the swap entry may become invalid because of swapoff. Then, we need to enclose all swap related functions with get_swap_device() and put_swap_device(), unless the swap functions call get/put_swap_device() by themselves.
Add the rule as comments of get_swap_device().
Stable-dep-of: 82b1c07a0af6 ("mm: swap: fix race between free_swap_and_cache() and swapoff()")
--- mm/swapfile.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
mm/swapfile.c +9 -3
@@ -1222,6 +1222,13 @@ static unsigned char __swap_entry_free_locked(struct swap_info_struct *p, }/* +* When we get a swap entry, if there aren't some other ways to +* prevent swapoff, such as the folio in swap cache is locked, page +* table lock is held, etc., the swap entry may become invalid because +* of swapoff. Then, we need to enclose all swap related functions +* with get_swap_device() and put_swap_device(), unless the swap +* functions call get/put_swap_device() by themselves. +* * Check whether swap entry is valid in the swap device. If so, * return pointer to swap_info_struct, and keep the swap entry valid * via preventing the swap device from being swapoff, until
@@ -1230,9 +1237,8 @@ static unsigned char __swap_entry_free_locked(struct swap_info_struct *p,* Notice that swapoff or swapoff+swapon can still happen before the * percpu_ref_tryget_live() in get_swap_device() or after the * percpu_ref_put() in put_swap_device() if there isn't any other way -* to prevent swapoff, such as page lock, page table lock, etc. The -* caller must be prepared for that. For example, the following -* situation is possible. +* to prevent swapoff. The caller must be prepared for that. For +* example, the following situation is possible. * * CPU1 CPU2 * do_swap_page()
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 80/272 mm: swap: fix race between free_swap_and_cache() and swapoff()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Roberts <[email protected]>
[ Upstream commit 82b1c07a0af603e3c47b906c8e991dc96f01688e ]
There was previously a theoretical window where swapoff() could run and teardown a swap_info_struct while a call to free_swap_and_cache() was running in another thread. This could cause, amongst other bad possibilities, swap_page_trans_huge_swapped() (called by free_swap_and_cache()) to access the freed memory for swap_map.
This is a theoretical problem and I haven't been able to provoke it from a test case. But there has been agreement based on code review that this is possible (see link below).
Fix it by using get_swap_device()/put_swap_device(), which will stall swapoff(). There was an extra check in _swap_info_get() to confirm that the swap entry was not free. This isn't present in get_swap_device() because it doesn't make sense in general due to the race between getting the reference and swapoff. So I've added an equivalent check directly in free_swap_and_cache().
Details of how to provoke one possible issue (thanks to David Hildenbrand for deriving this):
--8<-----
__swap_entry_free() might be the last user and result in "count == SWAP_HAS_CACHE".
swapoff->try_to_unuse() will stop as soon as soon as si->inuse_pages==0.
So the question is: could someone reclaim the folio and turn si->inuse_pages==0, before we completed swap_page_trans_huge_swapped().
Imagine the following: 2 MiB folio in the swapcache. Only 2 subpages are still references by swap entries.
Process 1 still references subpage 0 via swap entry. Process 2 still references subpage 1 via swap entry.
Process 1 quits. Calls free_swap_and_cache().
-> count == SWAP_HAS_CACHE
[then, preempted in the hypervisor etc.]
Process 2 quits. Calls free_swap_and_cache().
-> count == SWAP_HAS_CACHE
Process 2 goes ahead, passes swap_page_trans_huge_swapped(), and calls __try_to_reclaim_swap().
__try_to_reclaim_swap()->folio_free_swap()->delete_from_swap_cache()-> put_swap_folio()->free_swap_slot()->swapcache_free_entries()-> swap_entry_free()->swap_range_free()->
...WRITE_ONCE(si->inuse_pages, si->inuse_pages - nr_entries);
What stops swapoff to succeed after process 2 reclaimed the swap cache but before process1 finished its call to swap_page_trans_huge_swapped()?
--8<-----
--- mm/swapfile.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
mm/swapfile.c +12 -1
@@ -1229,6 +1229,11 @@ static unsigned char __swap_entry_free_locked(struct swap_info_struct *p,* with get_swap_device() and put_swap_device(), unless the swap * functions call get/put_swap_device() by themselves. * +* Note that when only holding the PTL, swapoff might succeed immediately +* after freeing a swap entry. Therefore, immediately after +* __swap_entry_free(), the swap info might become stale and should not +* be touched without a prior get_swap_device(). +* * Check whether swap entry is valid in the swap device. If so, * return pointer to swap_info_struct, and keep the swap entry valid * via preventing the swap device from being swapoff, until
@@ -1630,13 +1635,19 @@ int free_swap_and_cache(swp_entry_t entry)if (non_swap_entry (entry))return 1 ; - p =_swap_info_get (entry); + p =get_swap_device (entry);if (p) { +if (WARN_ON (data_race (!p->swap_map[swp_offset (entry)]))) { +put_swap_device (p); +return 0 ; + } + count =__swap_entry_free (p, entry);if (count ==SWAP_HAS_CACHE && !swap_page_trans_huge_swapped (p, entry))__try_to_reclaim_swap (p,swp_offset (entry),TTRS_UNMAPPED |TTRS_FULL ); +put_swap_device (p); }return p !=NULL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 54/272 clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit 1040ef5ed95d6fd2628bad387d78a61633e09429 ]
The frequency table arrays are supposed to be terminated with an empty element. Add such entry to the end of the arrays where it is missing in order to avoid possible out-of-bound access when the table is traversed by functions like qcom_find_freq() or qcom_find_freq_floor().
Only compile tested.
--- drivers/clk/qcom/gcc-ipq8074.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/gcc-ipq8074.c +2 -0
@@ -973,6 +973,7 @@ static struct clk_rcg2 pcie0_axi_clk_src = {static const struct freq_tbl ftbl_pcie_aux_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ), + { } };static struct clk_rcg2 pcie0_aux_clk_src = {
@@ -1078,6 +1079,7 @@ static const struct freq_tbl ftbl_sdcc_ice_core_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ),F (160000000 ,P_GPLL0 ,5 ,0 ,0 ), F(308570000, P_GPLL6, 3.5, 0, 0), + { } }; static struct clk_rcg2 sdcc1_ice_core_clk_src = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 81/272 mmc: core: Fix switch on gp3 partition
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Martinet <[email protected]>
[ Upstream commit 4af59a8df5ea930038cd3355e822f5eedf4accc1 ]
Commit e7794c14fd73 ("mmc: rpmb: fixes pause retune on all RPMB partitions.") added a mask check for 'part_type', but the mask used was wrong leading to the code intended for rpmb also being executed for GP3.
On some MMCs (but not all) this would make gp3 partition inaccessible:
armadillo:~# head -c 1 < /dev/mmcblk2gp3 head: standard input: I/O error armadillo:~# dmesg -c [ 422.976583] mmc2: running CQE recovery [ 423.058182] mmc2: running CQE recovery [ 423.137607] mmc2: running CQE recovery [ 423.137802] blk_update_request: I/O error, dev mmcblk2gp3, sector 0 op 0x0:(READ) flags 0x80700 phys_seg 4 prio class 0 [ 423.237125] mmc2: running CQE recovery [ 423.318206] mmc2: running CQE recovery [ 423.397680] mmc2: running CQE recovery [ 423.397837] blk_update_request: I/O error, dev mmcblk2gp3, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 0 [ 423.408287] Buffer I/O error on dev mmcblk2gp3, logical block 0, async page read
the part_type values of interest here are defined as follow:
main 0
boot0 1
boot1 2
rpmb 3 gp0 4 gp1 5 gp2 6 gp3 7
so mask with EXT_CSD_PART_CONFIG_ACC_MASK (7) to correctly identify rpmb
--- drivers/mmc/core/block.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/mmc/core/block.c +6 -4
@@ -889,10 +889,11 @@ static const struct block_device_operations mmc_bdops = {static int mmc_blk_part_switch_pre (struct mmc_card *card,unsigned int part_type) { -const unsigned int mask =EXT_CSD_PART_CONFIG_ACC_RPMB ; +const unsigned int mask =EXT_CSD_PART_CONFIG_ACC_MASK ; +const unsigned int rpmb =EXT_CSD_PART_CONFIG_ACC_RPMB ;int ret =0 ; -if ((part_type & mask) == mask) { +if ((part_type & mask) == rpmb) {if (card->ext_csd.cmdq_en) { ret =mmc_cmdq_disable (card);if (ret)
@@ -907,10 +908,11 @@ static int mmc_blk_part_switch_pre(struct mmc_card *card,static int mmc_blk_part_switch_post (struct mmc_card *card,unsigned int part_type) { -const unsigned int mask =EXT_CSD_PART_CONFIG_ACC_RPMB ; +const unsigned int mask =EXT_CSD_PART_CONFIG_ACC_MASK ; +const unsigned int rpmb =EXT_CSD_PART_CONFIG_ACC_RPMB ;int ret =0 ; -if ((part_type & mask) == mask) { +if ((part_type & mask) == rpmb) {mmc_retune_unpause (card->host);if (card->reenable_cmdq && !card->ext_csd.cmdq_en) ret =mmc_cmdq_enable (card);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 82/272 drm/etnaviv: Restore some id values
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Gmeiner <[email protected]>
[ Upstream commit b735ee173f84d5d0d0733c53946a83c12d770d05 ]
The hwdb selection logic as a feature that allows it to mark some fields as 'don't care'. If we match with such a field we memcpy(..) the current etnaviv_chip_identity into ident.
This step can overwrite some id values read from the GPU with the 'don't care' value.
Fix this issue by restoring the affected values after the memcpy(..).
As this is crucial for user space to know when this feature works as expected increment the minor version too.
--- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_drv.c +1 -1
@@ -488,7 +488,7 @@ static const struct drm_driver etnaviv_drm_driver = { .desc = "etnaviv DRM", .date = "20151214", .major = 1, - .minor = 3, + .minor = 4, };/*
drivers/gpu/drm/etnaviv/etnaviv_hwdb.c +9 -0
@@ -135,6 +135,9 @@ static const struct etnaviv_chip_identity etnaviv_chip_identities[] = {bool etnaviv_fill_identity_from_hwdb (struct etnaviv_gpu *gpu) {struct etnaviv_chip_identity *ident = &gpu->identity; +const u32 product_id = ident->product_id; +const u32 customer_id = ident->customer_id; +const u32 eco_id = ident->eco_id;int i;for (i =0 ; i <ARRAY_SIZE (etnaviv_chip_identities); i++) {
@@ -148,6 +151,12 @@ bool etnaviv_fill_identity_from_hwdb(struct etnaviv_gpu *gpu) etnaviv_chip_identities[i].eco_id == ~0U)) {memcpy (ident, &etnaviv_chip_identities[i],sizeof (*ident)); + +/* Restore some id values as ~0U aka 'don't care' might been used. */ + ident->product_id = product_id; + ident->customer_id = customer_id; + ident->eco_id = eco_id; +return true; } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 55/272 clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit a903cfd38d8dee7e754fb89fd1bebed99e28003d ]
The frequency table arrays are supposed to be terminated with an empty element. Add such entry to the end of the arrays where it is missing in order to avoid possible out-of-bound access when the table is traversed by functions like qcom_find_freq() or qcom_find_freq_floor().
Only compile tested.
--- drivers/clk/qcom/mmcc-apq8084.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/mmcc-apq8084.c +2 -0
@@ -334,6 +334,7 @@ static struct freq_tbl ftbl_mmss_axi_clk[] = {F (333430000 ,P_MMPLL1 ,3.5 ,0 ,0 ),F (400000000 ,P_MMPLL0 ,2 ,0 ,0 ), F(466800000, P_MMPLL1, 2.5, 0, 0), + { } }; static struct clk_rcg2 mmss_axi_clk_src = {
@@ -358,6 +359,7 @@ static struct freq_tbl ftbl_ocmemnoc_clk[] = {F (150000000 ,P_GPLL0 ,4 ,0 ,0 ),F (228570000 ,P_MMPLL0 ,3.5 ,0 ,0 ), F(320000000, P_MMPLL0, 2.5, 0, 0), + { } }; static struct clk_rcg2 ocmemnoc_clk_src = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 56/272 clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit e2c02a85bf53ae86d79b5fccf0a75ac0b78e0c96 ]
The frequency table arrays are supposed to be terminated with an empty element. Add such entry to the end of the arrays where it is missing in order to avoid possible out-of-bound access when the table is traversed by functions like qcom_find_freq() or qcom_find_freq_floor().
Only compile tested.
--- drivers/clk/qcom/mmcc-msm8974.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/mmcc-msm8974.c +2 -0
@@ -279,6 +279,7 @@ static struct freq_tbl ftbl_mmss_axi_clk[] = {F (291750000 ,P_MMPLL1 ,4 ,0 ,0 ),F (400000000 ,P_MMPLL0 ,2 ,0 ,0 ), F(466800000, P_MMPLL1, 2.5, 0, 0), + { } }; static struct clk_rcg2 mmss_axi_clk_src = {
@@ -303,6 +304,7 @@ static struct freq_tbl ftbl_ocmemnoc_clk[] = {F (150000000 ,P_GPLL0 ,4 ,0 ,0 ),F (291750000 ,P_MMPLL1 ,4 ,0 ,0 ), F(400000000, P_MMPLL0, 2, 0, 0), + { } }; static struct clk_rcg2 ocmemnoc_clk_src = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 57/272 usb: xhci: Add error handling in xhci_map_urb_for_dma
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prashanth K <[email protected]>
[ Upstream commit be95cc6d71dfd0cba66e3621c65413321b398052 ]
Currently xhci_map_urb_for_dma() creates a temporary buffer and copies the SG list to the new linear buffer. But if the kzalloc_node() fails, then the following sg_pcopy_to_buffer() can lead to crash since it tries to memcpy to NULL pointer.
So return -ENOMEM if kzalloc returns null pointer.
--- drivers/usb/host/xhci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/host/xhci.c +2 -0
@@ -1334,6 +1334,8 @@ static int xhci_map_temp_buffer(struct usb_hcd *hcd, struct urb *urb) temp =kzalloc_node (buf_len,GFP_ATOMIC ,dev_to_node (hcd->self.sysdev)); +if (!temp) +return -ENOMEM ;if (usb_urb_dir_out (urb)) sg_pcopy_to_buffer(urb->sg, urb->num_sgs,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 58/272 powerpc/fsl: Fix mfpmr build errors with newer binutils
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit 5f491356b7149564ab22323ccce79c8d595bfd0c ]
Binutils 2.38 complains about the use of mfpmr when building ppc6xx_defconfig:
CC arch/powerpc/kernel/pmc.o
{standard input}: Assembler messages:
{standard input}:45: Error: unrecognized opcode: mfpmr' {standard input}:56: Error: unrecognized opcode: mtpmr'
This is because by default the kernel is built with -mcpu=powerpc, and the mt/mfpmr instructions are not defined.
It can be avoided by enabling CONFIG_E300C3_CPU, but just adding that to the defconfig will leave open the possibility of randconfig failures.
So add machine directives around the mt/mfpmr instructions to tell binutils how to assemble them.
--- arch/powerpc/include/asm/reg_fsl_emb.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/reg_fsl_emb.h +9 -2
@@ -12,9 +12,16 @@#ifndef __ASSEMBLY__/* Performance Monitor Registers */ #define mfpmr (rn) ({unsigned int rval; \ - asm volatile("mfpmr %0," __stringify(rn) \ + asm volatile(".machine push; " \ + ".machine e300; " \ + "mfpmr %0," __stringify(rn) ";" \ + ".machine pop; " \ : "=r" (rval)); rval;}) -#define mtpmr (rn, v) asm volatile("mtpmr " __stringify(rn) ",%0" : : "r" (v)) +#define mtpmr (rn, v) asm volatile(".machine push; " \ + ".machine e300; " \ + "mtpmr " __stringify(rn) ",%0; " \ + ".machine pop; " \ + : : "r" (v))#endif /* __ASSEMBLY__ */ /* Freescale Book E Performance Monitor APU Registers */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 59/272 USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vogelbacher <[email protected]>
[ Upstream commit 3fb7bc4f3a98c48981318b87cf553c5f115fd5ca ]
The GMC IR-USB adapter cable utilizes a FTDI FT232R chip.
Add VID/PID for this adapter so it can be used as serial device via ftdi_sio.
--- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ 2 files changed, 8 insertions(+)
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -1077,6 +1077,8 @@ static const struct usb_device_id id_table_combined[] = { .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, +/* GMC devices */ + { USB_DEVICE(GMC_VID, GMC_Z216C_PID) }, { }/* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -1606,3 +1606,9 @@#define UBLOX_VID 0x1546#define UBLOX_C099F9P_ZED_PID 0x0502#define UBLOX_C099F9P_ODIN_PID 0x0503 + +/* +* GMC devices +*/ +#define GMC_VID 0x1cd7 +#define GMC_Z216C_PID 0x0217/* GMC Z216C Adapter IR-USB */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 60/272 USB: serial: add device ID for VeriFone adapter
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
[ Upstream commit cda704809797a8a86284f9df3eef5e62ec8a3175 ]
Add device ID for a (probably fake) CP2102 UART device.
lsusb -v output:
Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 1.10
bDeviceClass 0 [unknown] bDeviceSubClass 0 [unknown] bDeviceProtocol 0 bMaxPacketSize0 64 idVendor 0x11ca VeriFone Inc idProduct 0x0212 Verifone USB to Printer bcdDevice 1.00 iManufacturer 1 Silicon Labs iProduct 2 Verifone USB to Printer iSerial 3 0001 bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 0x0020
bNumInterfaces 1
bConfigurationValue 1
iConfiguration 0
bmAttributes 0x80
(Bus Powered)
MaxPower 100mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 0 [unknown]
bInterfaceProtocol 0
iInterface 2 Verifone USB to Printer
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Device Status: 0x0000
(Bus Powered)
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -177,6 +177,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0xF004) }, /* Elan Digital Systems USBcount50 */ { USB_DEVICE(0x10C5, 0xEA61) }, /* Silicon Labs MobiData GPRS USB Modem */ { USB_DEVICE(0x10CE, 0xEA6A) }, /* Silicon Labs MobiData GPRS USB Modem 100EU */ + { USB_DEVICE(0x11CA, 0x0212) }, /* Verifone USB to Printer (UART, CP2102) */ { USB_DEVICE(0x12B8, 0xEC60) }, /* Link G4 ECU */ { USB_DEVICE(0x12B8, 0xEC62) }, /* Link G4+ ECU */ { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 51/272 cpufreq: Limit resolving a frequency to policy min/max
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shivnandan Kumar <[email protected]>
[ Upstream commit d394abcb12bb1a6f309c1221fdb8e73594ecf1b4 ]
Resolving a frequency to an efficient one should not transgress policy->max (which can be set for thermal reason) and policy->min.
Currently, there is possibility where scaling_cur_freq can exceed scaling_max_freq when scaling_max_freq is an inefficient frequency.
Add a check to ensure that resolving a frequency will respect policy->min/max.
--- include/linux/cpufreq.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
include/linux/cpufreq.h +14 -1
@@ -1023,6 +1023,18 @@ static inline int cpufreq_table_find_index_c(struct cpufreq_policy *policy, efficiencies); } +static inline bool cpufreq_is_in_limits (struct cpufreq_policy *policy,int idx) +{ +unsigned int freq; + +if (idx <0 ) +return false; + + freq = policy->freq_table[idx].frequency; + +return freq ==clamp_val (freq, policy->min, policy->max); +} +static inline int cpufreq_frequency_table_target (struct cpufreq_policy *policy,unsigned int target_freq,unsigned int relation)
@@ -1056,7 +1068,8 @@ static inline int cpufreq_frequency_table_target(struct cpufreq_policy *policy,return 0 ; } -if (idx <0 && efficiencies) { +/* Limit frequency index to honor policy->min/max */ +if (!cpufreq_is_in_limits (policy, idx) && efficiencies) { efficiencies = false; goto retry; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 84/272 hwmon: (amc6821) add of_match table
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josua Mayer <[email protected]>
[ Upstream commit 3f003fda98a7a8d5f399057d92e6ed56b468657c ]
Add of_match table for "ti,amc6821" compatible string.
This fixes automatic driver loading by userspace when using device-tree, and if built as a module like major linux distributions do.
While devices probe just fine with i2c_device_id table, userspace can't match the "ti,amc6821" compatible string from dt with the plain "amc6821" device id. As a result, the kernel module can not be loaded.
--- drivers/hwmon/amc6821.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/hwmon/amc6821.c +11 -0
@@ -934,10 +934,21 @@ static const struct i2c_device_id amc6821_id[] = {MODULE_DEVICE_TABLE (i2c, amc6821_id); +static const struct of_device_id __maybe_unused amc6821_of_match[] = { + { + .compatible ="ti,amc6821" , + .data = (void *)amc6821, + }, + { } +}; + +MODULE_DEVICE_TABLE (of, amc6821_of_match); +static struct i2c_driver amc6821_driver = { .class =I2C_CLASS_HWMON , .driver = { .name ="amc6821" , + .of_match_table =of_match_ptr (amc6821_of_match), }, .probe_new = amc6821_probe, .id_table = amc6821_id,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 93/272 sparc: Explicitly include correct DT includes
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring <[email protected]>
[ Upstream commit 263291fa44ff0909b5b7c43ff40babc1c43362f2 ]
The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it was merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes.
Stable-dep-of: 91d3ff922c34 ("sparc32: Fix parport build with sparc32")
--- arch/sparc/crypto/crop_devid.c | 2 +- arch/sparc/include/asm/floppy_32.h | 2 +- arch/sparc/include/asm/floppy_64.h | 2 +- arch/sparc/include/asm/parport.h | 3 ++- arch/sparc/kernel/apc.c | 2 +- arch/sparc/kernel/auxio_32.c | 1 - arch/sparc/kernel/auxio_64.c | 3 ++- arch/sparc/kernel/central.c | 2 +- arch/sparc/kernel/chmc.c | 3 ++- arch/sparc/kernel/ioport.c | 2 +- arch/sparc/kernel/leon_kernel.c | 2 -- arch/sparc/kernel/leon_pci.c | 3 ++- arch/sparc/kernel/leon_pci_grpci1.c | 3 ++- arch/sparc/kernel/leon_pci_grpci2.c | 4 +++- arch/sparc/kernel/of_device_32.c | 2 +- arch/sparc/kernel/of_device_64.c | 4 ++-- arch/sparc/kernel/of_device_common.c | 4 ++-- arch/sparc/kernel/pci.c | 3 ++- arch/sparc/kernel/pci_common.c | 3 ++- arch/sparc/kernel/pci_fire.c | 3 ++- arch/sparc/kernel/pci_impl.h | 1 - arch/sparc/kernel/pci_msi.c | 2 ++ arch/sparc/kernel/pci_psycho.c | 4 +++- arch/sparc/kernel/pci_sun4v.c | 3 ++- arch/sparc/kernel/pmc.c | 2 +- arch/sparc/kernel/power.c | 3 ++- arch/sparc/kernel/prom_irqtrans.c | 1 + arch/sparc/kernel/psycho_common.c | 1 + arch/sparc/kernel/sbus.c | 3 ++- arch/sparc/kernel/time_32.c | 1 - arch/sparc/mm/io-unit.c | 3 ++- arch/sparc/mm/iommu.c | 5 +++-- 32 files changed, 49 insertions(+), 33 deletions(-)
arch/sparc/crypto/crop_devid.c +1 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 +#include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of_device.h> /* This is a dummy device table linked into all of the crypto * opcode drivers. It serves to trigger the module autoloading
arch/sparc/include/asm/floppy_32.h +1 -1
@@ -8,7 +8,7 @@#define __ASM_SPARC_FLOPPY_H#include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/pgtable.h> #include <asm/idprom.h>
arch/sparc/include/asm/floppy_64.h +1 -1
@@ -11,7 +11,7 @@#define __ASM_SPARC64_FLOPPY_H#include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/dma-mapping.h> #include <asm/auxio.h>
arch/sparc/include/asm/parport.h +2 -1
@@ -7,7 +7,8 @@#ifndef _ASM_SPARC64_PARPORT_H#define _ASM_SPARC64_PARPORT_H 1 -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <asm/ebus_dma.h> #include <asm/ns87303.h>
arch/sparc/kernel/apc.c +1 -1
@@ -13,7 +13,7 @@#include <linux/miscdevice.h> #include <linux/pm.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/platform_device.h> #include <linux/module.h> #include <asm/io.h>
arch/sparc/kernel/auxio_32.c +0 -1
@@ -8,7 +8,6 @@#include <linux/init.h> #include <linux/spinlock.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/export.h> #include <asm/oplib.h>
arch/sparc/kernel/auxio_64.c +2 -1
@@ -10,7 +10,8 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/ioport.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <asm/prom.h> #include <asm/io.h>
arch/sparc/kernel/central.c +1 -1
@@ -10,7 +10,7 @@#include <linux/export.h> #include <linux/string.h> #include <linux/init.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <asm/fhc.h>
arch/sparc/kernel/chmc.c +2 -1
@@ -15,7 +15,8 @@#include <linux/errno.h> #include <linux/init.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/spitfire.h> #include <asm/chmctrl.h> #include <asm/cpudata.h>
arch/sparc/kernel/ioport.c +1 -1
@@ -39,7 +39,7 @@#include <linux/seq_file.h> #include <linux/scatterlist.h> #include <linux/dma-map-ops.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <asm/io.h> #include <asm/vaddrs.h>
arch/sparc/kernel/leon_kernel.c +0 -2
@@ -8,9 +8,7 @@#include <linux/errno.h> #include <linux/mutex.h> #include <linux/of.h> -#include <linux/of_platform.h> #include <linux/interrupt.h> -#include <linux/of_device.h> #include <linux/clocksource.h> #include <linux/clockchips.h>
arch/sparc/kernel/leon_pci.c +2 -1
@@ -7,7 +7,8 @@* Code is partially derived from pcic.c */ -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/kernel.h> #include <linux/pci.h> #include <linux/export.h>
arch/sparc/kernel/leon_pci_grpci1.c +2 -1
@@ -13,10 +13,11 @@* Contributors: Daniel Hellstrom <[email protected]> */ -#include <linux/of_device.h> #include <linux/export.h> #include <linux/kernel.h> +#include <linux/of.h> #include <linux/of_irq.h> +#include <linux/platform_device.h> #include <linux/delay.h> #include <linux/pci.h>
arch/sparc/kernel/leon_pci_grpci2.c +3 -1
@@ -6,12 +6,14 @@* */ -#include <linux/of_device.h> #include <linux/kernel.h> #include <linux/pci.h> #include <linux/slab.h> #include <linux/delay.h> #include <linux/export.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <asm/io.h> #include <asm/leon.h> #include <asm/vaddrs.h>
arch/sparc/kernel/of_device_32.c +1 -1
@@ -7,8 +7,8 @@#include <linux/slab.h> #include <linux/errno.h> #include <linux/irq.h> -#include <linux/of_device.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <asm/leon.h> #include <asm/leon_amba.h>
arch/sparc/kernel/of_device_64.c +2 -2
@@ -1,7 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/string.h> #include <linux/kernel.h> -#include <linux/of.h> #include <linux/dma-mapping.h> #include <linux/init.h> #include <linux/export.h>
@@ -9,8 +8,9 @@#include <linux/slab.h> #include <linux/errno.h> #include <linux/irq.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/spitfire.h> #include "of_device_common.h"
arch/sparc/kernel/of_device_common.c +2 -2
@@ -1,15 +1,15 @@// SPDX-License-Identifier: GPL-2.0-only #include <linux/string.h> #include <linux/kernel.h> -#include <linux/of.h> #include <linux/export.h> #include <linux/mod_devicetable.h> #include <linux/errno.h> #include <linux/irq.h> +#include <linux/of.h> #include <linux/of_platform.h> #include <linux/of_address.h> -#include <linux/of_device.h> #include <linux/of_irq.h> +#include <linux/platform_device.h> #include "of_device_common.h"
arch/sparc/kernel/pci.c +2 -1
@@ -20,8 +20,9 @@#include <linux/irq.h> #include <linux/init.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/pgtable.h> +#include <linux/platform_device.h> #include <linux/uaccess.h> #include <asm/irq.h>
arch/sparc/kernel/pci_common.c +2 -1
@@ -8,7 +8,8 @@#include <linux/slab.h> #include <linux/pci.h> #include <linux/device.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <asm/prom.h> #include <asm/oplib.h>
arch/sparc/kernel/pci_fire.c +2 -1
@@ -10,7 +10,8 @@#include <linux/msi.h> #include <linux/export.h> #include <linux/irq.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/numa.h> #include <asm/prom.h>
arch/sparc/kernel/pci_impl.h +0 -1
@@ -11,7 +11,6 @@#include <linux/spinlock.h> #include <linux/pci.h> #include <linux/msi.h> -#include <linux/of_device.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/iommu.h>
arch/sparc/kernel/pci_msi.c +2 -0
@@ -5,6 +5,8 @@*/ #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/irq.h>
arch/sparc/kernel/pci_psycho.c +3 -1
@@ -13,7 +13,9 @@#include <linux/export.h> #include <linux/slab.h> #include <linux/interrupt.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/iommu.h> #include <asm/irq.h>
arch/sparc/kernel/pci_sun4v.c +2 -1
@@ -15,7 +15,8 @@#include <linux/msi.h> #include <linux/export.h> #include <linux/log2.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/dma-map-ops.h> #include <asm/iommu-common.h>
arch/sparc/kernel/pmc.c +1 -1
@@ -11,7 +11,7 @@#include <linux/init.h> #include <linux/pm.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/platform_device.h> #include <linux/module.h> #include <asm/io.h>
arch/sparc/kernel/power.c +2 -1
@@ -9,7 +9,8 @@#include <linux/init.h> #include <linux/interrupt.h> #include <linux/reboot.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <asm/prom.h> #include <asm/io.h>
arch/sparc/kernel/prom_irqtrans.c +1 -0
@@ -4,6 +4,7 @@#include <linux/init.h> #include <linux/of.h> #include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/oplib.h> #include <asm/prom.h>
arch/sparc/kernel/psycho_common.c +1 -0
@@ -6,6 +6,7 @@#include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/numa.h> +#include <linux/platform_device.h> #include <asm/upa.h>
arch/sparc/kernel/sbus.c +2 -1
@@ -14,7 +14,8 @@#include <linux/init.h> #include <linux/interrupt.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/numa.h> #include <asm/page.h>
arch/sparc/kernel/time_32.c +0 -1
@@ -33,7 +33,6 @@#include <linux/ioport.h> #include <linux/profile.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <asm/mc146818rtc.h>
arch/sparc/mm/io-unit.c +2 -1
@@ -13,7 +13,8 @@#include <linux/bitops.h> #include <linux/dma-map-ops.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/io.h> #include <asm/io-unit.h>
arch/sparc/mm/iommu.c +3 -2
@@ -7,14 +7,15 @@* Copyright (C) 1996 Eddie C. Dost ([email protected]) * Copyright (C) 1997,1998 Jakub Jelinek ([email protected]) */ - +#include <linux/kernel.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/slab.h> #include <linux/dma-map-ops.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <asm/io.h> #include <asm/mxcc.h>
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 94/272 sparc32: Fix parport build with sparc32
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sam Ravnborg <[email protected]>
[ Upstream commit 91d3ff922c346d6d8cb8de5ff8d504fe0ca9e17e ]
include/asm/parport.h is sparc64 specific.
Rename it to parport_64.h and use the generic version for sparc32.
This fixed all{mod,yes}config build errors like:
parport_pc.c:(.text):undefined-reference-to-ebus_dma_enable parport_pc.c:(.text):undefined-reference-to-ebus_dma_irq_enable parport_pc.c:(.text):undefined-reference-to-ebus_dma_register
The errors occur as the sparc32 build references sparc64 symbols.
--- arch/sparc/include/asm/parport.h | 259 +--------------------------- arch/sparc/include/asm/parport_64.h | 256 +++++++++++++++++++++++++++ 2 files changed, 263 insertions(+), 252 deletions(-) create mode 100644 arch/sparc/include/asm/parport_64.h
arch/sparc/include/asm/parport.h +7 -252
@@ -1,256 +1,11 @@/* SPDX-License-Identifier: GPL-2.0 */ -/* parport.h: sparc64 specific parport initialization and dma. -* -* Copyright (C) 1999 Eddie C. Dost ([email protected]) -*/ +#ifndef ___ASM_SPARC_PARPORT_H +#define ___ASM_SPARC_PARPORT_H -#ifndef _ASM_SPARC64_PARPORT_H -#define _ASM_SPARC64_PARPORT_H 1 - -#include <linux/of.h> -#include <linux/platform_device.h> - -#include <asm/ebus_dma.h> -#include <asm/ns87303.h> -#include <asm/prom.h> - -#define PARPORT_PC_MAX_PORTS PARPORT_MAX - -/* -* While sparc64 doesn't have an ISA DMA API, we provide something that looks -* close enough to make parport_pc happy -*/ -#define HAS_DMA - -#ifdef CONFIG_PARPORT_PC_FIFO -static DEFINE_SPINLOCK (dma_spin_lock); - -#define claim_dma_lock () \ -({ unsigned long flags; \ - spin_lock_irqsave(&dma_spin_lock, flags); \ - flags; \ -}) - -#define release_dma_lock (__flags) \ - spin_unlock_irqrestore(&dma_spin_lock, __flags); +#if defined(__sparc__) && defined(__arch64__) +#include <asm/parport_64.h> +#else +#include <asm-generic/parport.h> +#endif #endif -static struct sparc_ebus_info { -struct ebus_dma_info info; -unsigned int addr; -unsigned int count; -int lock; - -struct parport *port; -} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS ]; - -static DECLARE_BITMAP(dma_slot_map, PARPORT_PC_MAX_PORTS); - -static inline int request_dma (unsigned int dmanr,const char *device_id) -{ -if (dmanr >=PARPORT_PC_MAX_PORTS ) -return -EINVAL ; -if (xchg (&sparc_ebus_dmas[dmanr].lock,1 ) !=0 ) -return -EBUSY ; -return 0 ; -} - -static inline void free_dma (unsigned int dmanr) -{ -if (dmanr >=PARPORT_PC_MAX_PORTS ) { -printk (KERN_WARNING "Trying to free DMA%d\n" , dmanr); -return ; - } -if (xchg (&sparc_ebus_dmas[dmanr].lock,0 ) ==0 ) { -printk (KERN_WARNING "Trying to free free DMA%d\n" , dmanr); -return ; - } -} - -static inline void enable_dma (unsigned int dmanr) -{ -ebus_dma_enable (&sparc_ebus_dmas[dmanr].info,1 ); - -if (ebus_dma_request (&sparc_ebus_dmas[dmanr].info, - sparc_ebus_dmas[dmanr].addr, - sparc_ebus_dmas[dmanr].count)) -BUG (); -} - -static inline void disable_dma (unsigned int dmanr) -{ -ebus_dma_enable (&sparc_ebus_dmas[dmanr].info,0 ); -} - -static inline void clear_dma_ff (unsigned int dmanr) -{ -/* nothing */ -} - -static inline void set_dma_mode (unsigned int dmanr,char mode) -{ -ebus_dma_prepare (&sparc_ebus_dmas[dmanr].info, (mode !=DMA_MODE_WRITE )); -} - -static inline void set_dma_addr (unsigned int dmanr,unsigned int addr) -{ - sparc_ebus_dmas[dmanr].addr = addr; -} - -static inline void set_dma_count (unsigned int dmanr,unsigned int count) -{ - sparc_ebus_dmas[dmanr].count = count; -} - -static inline unsigned int get_dma_residue (unsigned int dmanr) -{ -return ebus_dma_residue (&sparc_ebus_dmas[dmanr].info); -} - -static int ecpp_probe (struct platform_device *op) -{ -unsigned long base = op->resource[0 ].start; -unsigned long config = op->resource[1 ].start; -unsigned long d_base = op->resource[2 ].start; -unsigned long d_len; -struct device_node *parent; -struct parport *p; -int slot, err; - - parent = op->dev.of_node->parent; -if (of_node_name_eq (parent,"dma" )) { - p =parport_pc_probe_port (base, base +0x400 , - op->archdata.irqs[0 ],PARPORT_DMA_NOFIFO , - op->dev.parent->parent,0 ); -if (!p) -return -ENOMEM ; -dev_set_drvdata (&op->dev, p); -return 0 ; - } - -for (slot =0 ; slot <PARPORT_PC_MAX_PORTS ; slot++) { -if (!test_and_set_bit (slot, dma_slot_map)) -break ; - } - err = -ENODEV ; -if (slot >=PARPORT_PC_MAX_PORTS ) - goto out_err; - -spin_lock_init (&sparc_ebus_dmas[slot].info.lock); - - d_len = (op->resource[2 ].end - d_base) +1UL ; - sparc_ebus_dmas[slot].info.regs = -of_ioremap (&op->resource[2 ],0 , d_len,"ECPP DMA" ); - -if (!sparc_ebus_dmas[slot].info.regs) - goto out_clear_map; - - sparc_ebus_dmas[slot].info.flags =0 ; - sparc_ebus_dmas[slot].info.callback =NULL ; - sparc_ebus_dmas[slot].info.client_cookie =NULL ; - sparc_ebus_dmas[slot].info.irq =0xdeadbeef ; -strcpy (sparc_ebus_dmas[slot].info.name,"parport" ); -if (ebus_dma_register (&sparc_ebus_dmas[slot].info)) - goto out_unmap_regs; - -ebus_dma_irq_enable (&sparc_ebus_dmas[slot].info,1 ); - -/* Configure IRQ to Push Pull, Level Low */ -/* Enable ECP, set bit 2 of the CTR first */ -outb (0x04 , base +0x02 ); -ns87303_modify (config,PCR , -PCR_EPP_ENABLE | -PCR_IRQ_ODRAIN , -PCR_ECP_ENABLE | -PCR_ECP_CLK_ENA | -PCR_IRQ_POLAR ); - -/* CTR bit 5 controls direction of port */ -ns87303_modify (config,PTR , -0 ,PTR_LPT_REG_DIR ); - - p =parport_pc_probe_port (base, base +0x400 , - op->archdata.irqs[0 ], - slot, - op->dev.parent, -0 ); - err = -ENOMEM ; -if (!p) - goto out_disable_irq; - -dev_set_drvdata (&op->dev, p); - -return 0 ; - -out_disable_irq: -ebus_dma_irq_enable (&sparc_ebus_dmas[slot].info,0 ); -ebus_dma_unregister (&sparc_ebus_dmas[slot].info); - -out_unmap_regs: -of_iounmap (&op->resource[2 ], sparc_ebus_dmas[slot].info.regs, d_len); - -out_clear_map: -clear_bit (slot, dma_slot_map); - -out_err: -return err; -} - -static int ecpp_remove (struct platform_device *op) -{ -struct parport *p =dev_get_drvdata (&op->dev); -int slot = p->dma; - -parport_pc_unregister_port (p); - -if (slot !=PARPORT_DMA_NOFIFO ) { -unsigned long d_base = op->resource[2 ].start; -unsigned long d_len; - - d_len = (op->resource[2 ].end - d_base) +1UL ; - -ebus_dma_irq_enable (&sparc_ebus_dmas[slot].info,0 ); -ebus_dma_unregister (&sparc_ebus_dmas[slot].info); -of_iounmap (&op->resource[2 ], - sparc_ebus_dmas[slot].info.regs, - d_len); -clear_bit (slot, dma_slot_map); - } - -return 0 ; -} - -static const struct of_device_id ecpp_match[] = { - { - .name ="ecpp" , - }, - { - .name ="parallel" , - .compatible ="ecpp" , - }, - { - .name ="parallel" , - .compatible ="ns87317-ecpp" , - }, - { - .name ="parallel" , - .compatible ="pnpALI,1533,3" , - }, - {}, -}; - -static struct platform_driver ecpp_driver = { - .driver = { - .name ="ecpp" , - .of_match_table = ecpp_match, - }, - .probe = ecpp_probe, - .remove = ecpp_remove, -}; - -static int parport_pc_find_nonpci_ports (int autoirq,int autodma) -{ -return platform_driver_register (&ecpp_driver); -} - -#endif /* !(_ASM_SPARC64_PARPORT_H */
arch/sparc/include/asm/parport_64.h new file +256 -0
256 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 95/272 nfs: fix UAF in direct writes
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
[ Upstream commit 17f46b803d4f23c66cacce81db35fef3adb8f2af ]
In production we have been hitting the following warning consistently
------------[ cut here ]------------ refcount_t: underflow; use-after-free. WARNING: CPU: 17 PID: 1800359 at lib/refcount.c:28 refcount_warn_saturate+0x9c/0xe0 Workqueue: nfsiod nfs_direct_write_schedule_work [nfs] RIP: 0010:refcount_warn_saturate+0x9c/0xe0 PKRU: 55555554 Call Trace: <TASK> ? __warn+0x9f/0x130 ? refcount_warn_saturate+0x9c/0xe0 ? report_bug+0xcc/0x150 ? handle_bug+0x3d/0x70 ? exc_invalid_op+0x16/0x40 ? asm_exc_invalid_op+0x16/0x20 ? refcount_warn_saturate+0x9c/0xe0 nfs_direct_write_schedule_work+0x237/0x250 [nfs] process_one_work+0x12f/0x4a0 worker_thread+0x14e/0x3b0 ? ZSTD_getCParams_internal+0x220/0x220 kthread+0xdc/0x120 ? __btf_name_valid+0xa0/0xa0 ret_from_fork+0x1f/0x30
This is because we're completing the nfs_direct_request twice in a row.
The source of this is when we have our commit requests to submit, we process them and send them off, and then in the completion path for the commit requests we have
if (nfs_commit_end(cinfo.mds))
nfs_direct_write_complete(dreq);
However since we're submitting asynchronous requests we sometimes have one that completes before we submit the next one, so we end up calling complete on the nfs_direct_request twice.
The only other place we use nfs_generic_commit_list() is in __nfs_commit_inode, which wraps this call in a
nfs_commit_begin();nfs_commit_end();
Which is a common pattern for this style of completion handling, one that is also repeated in the direct code with get_dreq()/put_dreq() calls around where we process events as well as in the completion paths.
Fix this by using the same pattern for the commit requests.
Before with my 200 node rocksdb stress running this warning would pop every 10ish minutes. With my patch the stress test has been running for several hours without popping.
--- fs/nfs/direct.c | 11 +++++++++-- fs/nfs/write.c | 2 +- include/linux/nfs_fs.h | 1 + 3 files changed, 11 insertions(+), 3 deletions(-)
fs/nfs/direct.c +9 -2
@@ -647,10 +647,17 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)LIST_HEAD (mds_list);nfs_init_cinfo_from_dreq (&cinfo, dreq); +nfs_commit_begin (cinfo.mds);nfs_scan_commit (dreq->inode, &mds_list, &cinfo); res =nfs_generic_commit_list (dreq->inode, &mds_list,0 , &cinfo); -if (res <0 )/* res == -ENOMEM */ -nfs_direct_write_reschedule (dreq); +if (res <0 ) {/* res == -ENOMEM */ +spin_lock (&dreq->lock); +if (dreq->flags ==0 ) + dreq->flags =NFS_ODIRECT_RESCHED_WRITES ; +spin_unlock (&dreq->lock); + } +if (nfs_commit_end (cinfo.mds)) +nfs_direct_write_complete (dreq); }static void nfs_direct_write_clear_reqs (struct nfs_direct_req *dreq)
fs/nfs/write.c +1 -1
@@ -1656,7 +1656,7 @@ static int wait_on_commit(struct nfs_mds_commit_info *cinfo) !atomic_read(&cinfo->rpcs_out)); } -static void nfs_commit_begin (struct nfs_mds_commit_info *cinfo) +void nfs_commit_begin (struct nfs_mds_commit_info *cinfo) {atomic_inc (&cinfo->rpcs_out); }
include/linux/nfs_fs.h +1 -0
@@ -582,6 +582,7 @@ int nfs_wb_folio_cancel(struct inode *inode, struct folio *folio);extern int nfs_commit_inode (struct inode *,int );extern struct nfs_commit_data *nfs_commitdata_alloc (void );extern void nfs_commit_free (struct nfs_commit_data *data); +void nfs_commit_begin (struct nfs_mds_commit_info *cinfo);bool nfs_commit_end (struct nfs_mds_commit_info *cinfo);static inline bool nfs_have_writebacks (const struct inode *inode)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 96/272 kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
[ Upstream commit 75b5ab134bb5f657ef7979a59106dce0657e8d87 ]
Clang enables -Wenum-enum-conversion and -Wenum-compare-conditional under -Wenum-conversion. A recent change in Clang strengthened these warnings and they appear frequently in common builds, primarily due to several instances in common headers but there are quite a few drivers that have individual instances as well.
include/linux/vmstat.h:508:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
508 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
509 | item];
| ~~~~ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c:955:24: warning: conditional expression between different enumeration types ('enum iwl_mac_beacon_flags' and 'enum iwl_mac_beacon_flags_v1') [-Wenum-compare-conditional]
955 | flags |= is_new_rate ? IWL_MAC_BEACON_CCK
| ^ ~~~~~~~~~~~~~~~~~~
956 | : IWL_MAC_BEACON_CCK_V1;
| ~~~~~~~~~~~~~~~~~~~~~
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c:1120:21: warning: conditional expression between different enumeration types ('enum iwl_mac_beacon_flags' and 'enum iwl_mac_beacon_flags_v1') [-Wenum-compare-conditional]
1120 | 0) > 10 ?
| ^
1121 | IWL_MAC_BEACON_FILS :
| ~~~~~~~~~~~~~~~~~~~
1122 | IWL_MAC_BEACON_FILS_V1;
| ~~~~~~~~~~~~~~~~~~~~~~Doing arithmetic between or returning two different types of enums could be a bug, so each of the instance of the warning needs to be evaluated. Unfortunately, as mentioned above, there are many instances of this warning in many different configurations, which can break the build when CONFIG_WERROR is enabled.
To avoid introducing new instances of the warnings while cleaning up the disruption for the majority of users, disable these warnings for the default build while leaving them on for W=1 builds.
--- scripts/Makefile.extrawarn | 2 ++ 1 file changed, 2 insertions(+)
scripts/Makefile.extrawarn +2 -0
@@ -65,6 +65,8 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast) KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access) KBUILD_CFLAGS += $(call cc-disable-warning, cast-function-type-strict) +KBUILD_CFLAGS += -Wno-enum-compare-conditional +KBUILD_CFLAGS += -Wno-enum-enum-conversion endif endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 97/272 PCI: qcom: Rename qcom_pcie_config_sid_sm8250() to reflect IP version
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 1f70939871b260b52e9d1941f1cad740b7295c2c ]
qcom_pcie_config_sid_sm8250() function no longer applies only to SM8250. So let's rename it to reflect the actual IP version and also move its definition to keep it sorted as per IP revisions.
Stable-dep-of: bf79e33cdd89 ("PCI: qcom: Enable BDF to SID translation properly")
--- drivers/pci/controller/dwc/pcie-qcom.c | 143 ++++++++++++------------- 1 file changed, 71 insertions(+), 72 deletions(-)
drivers/pci/controller/dwc/pcie-qcom.c +71 -72
@@ -1312,6 +1312,76 @@ static void qcom_pcie_deinit_2_7_0(struct qcom_pcie *pcie)regulator_bulk_disable (ARRAY_SIZE (res->supplies), res->supplies); } +static int qcom_pcie_config_sid_1_9_0 (struct qcom_pcie *pcie) +{ +/* iommu map structure */ +struct { +u32 bdf; +u32 phandle; +u32 smmu_sid; +u32 smmu_sid_len; + } *map; +void __iomem *bdf_to_sid_base = pcie->parf +PARF_BDF_TO_SID_TABLE_N ; +struct device *dev = pcie->pci->dev; +u8 qcom_pcie_crc8_table[CRC8_TABLE_SIZE ]; +int i, nr_map, size =0 ; +u32 smmu_sid_base; + +of_get_property (dev->of_node,"iommu-map" , &size); +if (!size) +return 0 ; + + map =kzalloc (size,GFP_KERNEL ); +if (!map) +return -ENOMEM ; + +of_property_read_u32_array (dev->of_node,"iommu-map" , (u32 *)map, + size /sizeof (u32)); + + nr_map = size / (sizeof (*map)); + +crc8_populate_msb (qcom_pcie_crc8_table,QCOM_PCIE_CRC8_POLYNOMIAL ); + +/* Registers need to be zero out first */ +memset_io (bdf_to_sid_base,0 ,CRC8_TABLE_SIZE *sizeof (u32)); + +/* Extract the SMMU SID base from the first entry of iommu-map */ + smmu_sid_base = map[0 ].smmu_sid; + +/* Look for an available entry to hold the mapping */ +for (i =0 ; i < nr_map; i++) { +__be16 bdf_be =cpu_to_be16 (map[i].bdf); +u32 val; +u8 hash; + + hash =crc8 (qcom_pcie_crc8_table, (u8 *)&bdf_be,sizeof (bdf_be),0 ); + + val =readl (bdf_to_sid_base + hash *sizeof (u32)); + +/* If the register is already populated, look for next available entry */ +while (val) { +u8 current_hash = hash++; +u8 next_mask =0xff ; + +/* If NEXT field is NULL then update it with next hash */ +if (!(val & next_mask)) { + val |= (u32 )hash; +writel (val, bdf_to_sid_base + current_hash *sizeof (u32)); + } + + val =readl (bdf_to_sid_base + hash *sizeof (u32)); + } + +/* BDF [31:16] | SID [15:8] | NEXT [7:0] */ + val = map[i].bdf <<16 | (map[i].smmu_sid - smmu_sid_base) <<8 |0 ; +writel (val, bdf_to_sid_base + hash *sizeof (u32)); + } + +kfree (map); + +return 0 ; +} +static int qcom_pcie_get_resources_2_9_0 (struct qcom_pcie *pcie) {struct qcom_pcie_resources_2_9_0 *res = &pcie->res.v2_9_0;
@@ -1429,77 +1499,6 @@ static int qcom_pcie_link_up(struct dw_pcie *pci)return !!(val &PCI_EXP_LNKSTA_DLLLA ); } -static int qcom_pcie_config_sid_sm8250 (struct qcom_pcie *pcie) -{ -/* iommu map structure */ -struct { -u32 bdf; -u32 phandle; -u32 smmu_sid; -u32 smmu_sid_len; - } *map; -void __iomem *bdf_to_sid_base = pcie->parf +PARF_BDF_TO_SID_TABLE_N ; -struct device *dev = pcie->pci->dev; -u8 qcom_pcie_crc8_table[CRC8_TABLE_SIZE ]; -int i, nr_map, size =0 ; -u32 smmu_sid_base; - -of_get_property (dev->of_node,"iommu-map" , &size); -if (!size) -return 0 ; - - map =kzalloc (size,GFP_KERNEL ); -if (!map) -return -ENOMEM ; - -of_property_read_u32_array (dev->of_node, -"iommu-map" , (u32 *)map, size /sizeof (u32)); - - nr_map = size / (sizeof (*map)); - -crc8_populate_msb (qcom_pcie_crc8_table,QCOM_PCIE_CRC8_POLYNOMIAL ); - -/* Registers need to be zero out first */ -memset_io (bdf_to_sid_base,0 ,CRC8_TABLE_SIZE *sizeof (u32)); - -/* Extract the SMMU SID base from the first entry of iommu-map */ - smmu_sid_base = map[0 ].smmu_sid; - -/* Look for an available entry to hold the mapping */ -for (i =0 ; i < nr_map; i++) { -__be16 bdf_be =cpu_to_be16 (map[i].bdf); -u32 val; -u8 hash; - - hash =crc8 (qcom_pcie_crc8_table, (u8 *)&bdf_be,sizeof (bdf_be), -0 ); - - val =readl (bdf_to_sid_base + hash *sizeof (u32)); - -/* If the register is already populated, look for next available entry */ -while (val) { -u8 current_hash = hash++; -u8 next_mask =0xff ; - -/* If NEXT field is NULL then update it with next hash */ -if (!(val & next_mask)) { - val |= (u32 )hash; -writel (val, bdf_to_sid_base + current_hash *sizeof (u32)); - } - - val =readl (bdf_to_sid_base + hash *sizeof (u32)); - } - -/* BDF [31:16] | SID [15:8] | NEXT [7:0] */ - val = map[i].bdf <<16 | (map[i].smmu_sid - smmu_sid_base) <<8 |0 ; -writel (val, bdf_to_sid_base + hash *sizeof (u32)); - } - -kfree (map); - -return 0 ; -} -static int qcom_pcie_host_init (struct dw_pcie_rp *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);
@@ -1616,7 +1615,7 @@ static const struct qcom_pcie_ops ops_1_9_0 = { .init = qcom_pcie_init_2_7_0, .deinit = qcom_pcie_deinit_2_7_0, .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, - .config_sid = qcom_pcie_config_sid_sm8250, + .config_sid = qcom_pcie_config_sid_1_9_0, };/* Qcom IP rev.: 2.9.0 Synopsys IP rev.: 5.00a */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 98/272 PCI: qcom: Enable BDF to SID translation properly
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit bf79e33cdd89db498e00a6131e937259de5f2705 ]
Qcom SoCs making use of ARM SMMU require BDF to SID translation table in the driver to properly map the SID for the PCIe devices based on their BDF identifier. This is currently achieved with the help of qcom_pcie_config_sid_1_9_0() function for SoCs supporting the 1_9_0 config.
But With newer Qcom SoCs starting from SM8450, BDF to SID translation is set to bypass mode by default in hardware. Due to this, the translation table that is set in the qcom_pcie_config_sid_1_9_0() is essentially unused and the default SID is used for all endpoints in SoCs starting from SM8450.
This is a security concern and also warrants swapping the DeviceID in DT while using the GIC ITS to handle MSIs from endpoints. The swapping is currently done like below in DT when using GIC ITS:
/*
* MSIs for BDF (1:0.0) only works with Device ID 0x5980.
* Hence, the IDs are swapped.
*/
msi-map = <0x0 &gic_its 0x5981 0x1>,
<0x100 &gic_its 0x5980 0x1>;Here, swapping of the DeviceIDs ensure that the endpoint with BDF (1:0.0) gets the DeviceID 0x5980 which is associated with the default SID as per the iommu mapping in DT. So MSIs were delivered with IDs swapped so far. But this also means the Root Port (0:0.0) won't receive any MSIs (for PME, AER etc...)
So let's fix these issues by clearing the BDF to SID bypass mode for all SoCs making use of the 1_9_0 config. This allows the PCIe devices to use the correct SID, thus avoiding the DeviceID swapping hack in DT and also achieving the isolation between devices.
--- drivers/pci/controller/dwc/pcie-qcom.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pci/controller/dwc/pcie-qcom.c +10 -0
@@ -50,6 +50,7 @@#define PARF_SLV_ADDR_SPACE_SIZE 0x358#define PARF_DEVICE_TYPE 0x1000#define PARF_BDF_TO_SID_TABLE_N 0x2000 +#define PARF_BDF_TO_SID_CFG 0x2c00/* ELBI registers */ #define ELBI_SYS_CTRL 0x04
@@ -102,6 +103,9 @@/* PARF_DEVICE_TYPE register fields */ #define DEVICE_TYPE_RC 0x4 +/* PARF_BDF_TO_SID_CFG fields */ +#define BDF_TO_SID_BYPASS BIT(0) +/* ELBI_SYS_CTRL register fields */ #define ELBI_SYS_CTRL_LT_ENABLE BIT(0)
@@ -1326,11 +1330,17 @@ static int qcom_pcie_config_sid_1_9_0(struct qcom_pcie *pcie)u8 qcom_pcie_crc8_table[CRC8_TABLE_SIZE ];int i, nr_map, size =0 ;u32 smmu_sid_base; +u32 val;of_get_property (dev->of_node,"iommu-map" , &size);if (!size)return 0 ; +/* Enable BDF to SID translation by disabling bypass mode (default) */ + val =readl (pcie->parf +PARF_BDF_TO_SID_CFG ); + val &= ~BDF_TO_SID_BYPASS ; +writel (val, pcie->parf +PARF_BDF_TO_SID_CFG ); + map =kzalloc (size,GFP_KERNEL );if (!map)return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 99/272 PCI: dwc: endpoint: Fix advertised resizable BAR size
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit 72e34b8593e08a0ee759b7a038e0b178418ea6f8 ]
The commit message in commit fc9a77040b04 ("PCI: designware-ep: Configure Resizable BAR cap to advertise the smallest size") claims that it modifies the Resizable BAR capability to only advertise support for 1 MB size BARs.
However, the commit writes all zeroes to PCI_REBAR_CAP (the register which contains the possible BAR sizes that a BAR be resized to).
According to the spec, it is illegal to not have a bit set in PCI_REBAR_CAP, and 1 MB is the smallest size allowed.
Set bit 4 in PCI_REBAR_CAP, so that we actually advertise support for a 1 MB BAR size.
Before:
Capabilities: [2e8 v1] Physical Resizable BAR
BAR 0: current size: 1MB
BAR 1: current size: 1MB
BAR 2: current size: 1MB
BAR 3: current size: 1MB
BAR 4: current size: 1MB
BAR 5: current size: 1MB
After:
Capabilities: [2e8 v1] Physical Resizable BAR
BAR 0: current size: 1MB, supported: 1MB BAR 1: current size: 1MB, supported: 1MB BAR 2: current size: 1MB, supported: 1MB BAR 3: current size: 1MB, supported: 1MB BAR 4: current size: 1MB, supported: 1MB BAR 5: current size: 1MB, supported: 1MB
--- drivers/pci/controller/dwc/pcie-designware-ep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +6 -1
@@ -669,8 +669,13 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep) nbars = (reg &PCI_REBAR_CTRL_NBAR_MASK ) >>PCI_REBAR_CTRL_NBAR_SHIFT ; +/* +* PCIe r6.0, sec 7.8.6.2 require us to support at least one +* size in the range from 1 MB to 512 GB. Advertise support +* for 1 MB BAR size only. +*/ for (i =0 ; i < nbars; i++, offset +=PCI_REBAR_CTRL ) -dw_pcie_writel_dbi (pci, offset +PCI_REBAR_CAP ,0x0 ); +dw_pcie_writel_dbi (pci, offset +PCI_REBAR_CAP ,BIT (4 )); }dw_pcie_setup (pci);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 100/272 PCI: hv: Fix ring buffer size calculation
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Kelley <[email protected]>
[ Upstream commit b5ff74c1ef50fe08e384026875fec660fadfaedd ]
For a physical PCI device that is passed through to a Hyper-V guest VM, current code specifies the VMBus ring buffer size as 4 pages. But this is an inappropriate dependency, since the amount of ring buffer space needed is unrelated to PAGE_SIZE. For example, on x86 the ring buffer size ends up as 16 Kbytes, while on ARM64 with 64 Kbyte pages, the ring size bloats to 256 Kbytes. The ring buffer for PCI pass-thru devices is used for only a few messages during device setup and removal, so any space above a few Kbytes is wasted.
Fix this by declaring the ring buffer size to be a fixed 16 Kbytes. Furthermore, use the VMBUS_RING_SIZE() macro so that the ring buffer header is properly accounted for, and so the size is rounded up to a page boundary, using the page size for which the kernel is built. While w/64 Kbyte pages this results in a 64 Kbyte ring buffer header plus a 64 Kbyte ring buffer, that's the smallest possible with that page size. It's still 128 Kbytes better than the current code.
--- drivers/pci/controller/pci-hyperv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-hyperv.c +2 -1
@@ -49,6 +49,7 @@#include <linux/refcount.h> #include <linux/irqdomain.h> #include <linux/acpi.h> +#include <linux/sizes.h> #include <asm/mshyperv.h> /*
@@ -465,7 +466,7 @@ struct pci_eject_response {u32 status; } __packed; -static int pci_ring_size = (4 *PAGE_SIZE ); +static int pci_ring_size =VMBUS_RING_SIZE (SZ_16K );/* * Driver specific state.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 101/272 vfio: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit 0886196ca8810c5b1f5097b71c4bc0df40b10208 ]
Use GFP_KERNEL_ACCOUNT for userspace persistent allocations.
The GFP_KERNEL_ACCOUNT option lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accounting, and as such it is controlled by the cgroup mechanism.
The way to find the relevant allocations was for example to look at the close_device function and trace back all the kfrees to their allocations.
Stable-dep-of: fe9a7082684e ("vfio/pci: Disable auto-enable of exclusive INTx IRQ")
--- drivers/vfio/container.c | 2 +- drivers/vfio/pci/vfio_pci_config.c | 6 +++--- drivers/vfio/pci/vfio_pci_core.c | 7 ++++--- drivers/vfio/pci/vfio_pci_igd.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 10 ++++++---- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- drivers/vfio/virqfd.c | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-)
drivers/vfio/container.c +1 -1
@@ -366,7 +366,7 @@ static int vfio_fops_open(struct inode *inode, struct file *filep) {struct vfio_container *container; - container =kzalloc (sizeof (*container),GFP_KERNEL ); + container =kzalloc (sizeof (*container),GFP_KERNEL_ACCOUNT );if (!container)return -ENOMEM ;
drivers/vfio/pci/vfio_pci_config.c +3 -3
@@ -1244,7 +1244,7 @@ static int vfio_msi_cap_len(struct vfio_pci_core_device *vdev, u8 pos)if (vdev->msi_perm)return len; - vdev->msi_perm =kmalloc (sizeof (struct perm_bits ),GFP_KERNEL ); + vdev->msi_perm =kmalloc (sizeof (struct perm_bits ),GFP_KERNEL_ACCOUNT );if (!vdev->msi_perm)return -ENOMEM ;
@@ -1731,11 +1731,11 @@ int vfio_config_init(struct vfio_pci_core_device *vdev)* no requirements on the length of a capability, so the gap between * capabilities needs byte granularity. */ - map =kmalloc (pdev->cfg_size,GFP_KERNEL ); + map =kmalloc (pdev->cfg_size,GFP_KERNEL_ACCOUNT );if (!map)return -ENOMEM ; - vconfig =kmalloc (pdev->cfg_size,GFP_KERNEL ); + vconfig =kmalloc (pdev->cfg_size,GFP_KERNEL_ACCOUNT );if (!vconfig) {kfree (map);return -ENOMEM ;
drivers/vfio/pci/vfio_pci_core.c +4 -3
@@ -141,7 +141,8 @@ static void vfio_pci_probe_mmaps(struct vfio_pci_core_device *vdev)* of the exclusive page in case that hot-add * device's bar is assigned into it. */ - dummy_res =kzalloc (sizeof (*dummy_res),GFP_KERNEL ); + dummy_res = +kzalloc (sizeof (*dummy_res),GFP_KERNEL_ACCOUNT );if (dummy_res ==NULL ) goto no_mmap;
@@ -856,7 +857,7 @@ int vfio_pci_core_register_dev_region(struct vfio_pci_core_device *vdev, region =krealloc (vdev->region, (vdev->num_regions +1 ) *sizeof (*region), -GFP_KERNEL ); +GFP_KERNEL_ACCOUNT );if (!region)return -ENOMEM ;
@@ -1637,7 +1638,7 @@ static int __vfio_pci_add_vma(struct vfio_pci_core_device *vdev, {struct vfio_pci_mmap_vma *mmap_vma; - mmap_vma =kmalloc (sizeof (*mmap_vma),GFP_KERNEL ); + mmap_vma =kmalloc (sizeof (*mmap_vma),GFP_KERNEL_ACCOUNT );if (!mmap_vma)return -ENOMEM ;
drivers/vfio/pci/vfio_pci_igd.c +1 -1
@@ -180,7 +180,7 @@ static int vfio_pci_igd_opregion_init(struct vfio_pci_core_device *vdev)if (!addr || !(~addr))return -ENODEV ; - opregionvbt =kzalloc (sizeof (*opregionvbt),GFP_KERNEL ); + opregionvbt =kzalloc (sizeof (*opregionvbt),GFP_KERNEL_ACCOUNT );if (!opregionvbt)return -ENOMEM ;
drivers/vfio/pci/vfio_pci_intrs.c +6 -4
@@ -177,7 +177,7 @@ static int vfio_intx_enable(struct vfio_pci_core_device *vdev)if (!vdev->pdev->irq)return -ENODEV ; - vdev->ctx =kzalloc (sizeof (struct vfio_pci_irq_ctx ),GFP_KERNEL ); + vdev->ctx =kzalloc (sizeof (struct vfio_pci_irq_ctx ),GFP_KERNEL_ACCOUNT );if (!vdev->ctx)return -ENOMEM ;
@@ -216,7 +216,7 @@ static int vfio_intx_set_signal(struct vfio_pci_core_device *vdev, int fd)if (fd <0 )/* Disable only */ return 0 ; - vdev->ctx[0 ].name =kasprintf (GFP_KERNEL ,"vfio-intx(%s)" , + vdev->ctx[0 ].name =kasprintf (GFP_KERNEL_ACCOUNT ,"vfio-intx(%s)" ,pci_name (pdev));if (!vdev->ctx[0 ].name)return -ENOMEM ;
@@ -284,7 +284,8 @@ static int vfio_msi_enable(struct vfio_pci_core_device *vdev, int nvec, bool msiif (!is_irq_none (vdev))return -EINVAL ; - vdev->ctx =kcalloc (nvec,sizeof (struct vfio_pci_irq_ctx ),GFP_KERNEL ); + vdev->ctx =kcalloc (nvec,sizeof (struct vfio_pci_irq_ctx ), +GFP_KERNEL_ACCOUNT );if (!vdev->ctx)return -ENOMEM ;
@@ -343,7 +344,8 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_core_device *vdev,if (fd <0 )return 0 ; - vdev->ctx[vector].name =kasprintf (GFP_KERNEL ,"vfio-msi%s[%d](%s)" , + vdev->ctx[vector].name =kasprintf (GFP_KERNEL_ACCOUNT , +"vfio-msi%s[%d](%s)" , msix ?"x" :"" , vector,pci_name (pdev));if (!vdev->ctx[vector].name)
drivers/vfio/pci/vfio_pci_rdwr.c +1 -1
@@ -470,7 +470,7 @@ int vfio_pci_ioeventfd(struct vfio_pci_core_device *vdev, loff_t offset, goto out_unlock; } - ioeventfd =kzalloc (sizeof (*ioeventfd),GFP_KERNEL ); + ioeventfd =kzalloc (sizeof (*ioeventfd),GFP_KERNEL_ACCOUNT );if (!ioeventfd) { ret = -ENOMEM ; goto out_unlock;
drivers/vfio/virqfd.c +1 -1
@@ -115,7 +115,7 @@ int vfio_virqfd_enable(void *opaque,int ret =0 ;__poll_t events; - virqfd =kzalloc (sizeof (*virqfd),GFP_KERNEL ); + virqfd =kzalloc (sizeof (*virqfd),GFP_KERNEL_ACCOUNT );if (!virqfd)return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 102/272 vfio/pci: Consolidate irq cleanup on MSI/MSI-X disable
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Reinette Chatre <[email protected]>
[ Upstream commit a65f35cfd504e5135540939cffd4323083190b36 ]
vfio_msi_disable() releases all previously allocated state associated with each interrupt before disabling MSI/MSI-X.
vfio_msi_disable() iterates twice over the interrupt state:
first directly with a for loop to do virqfd cleanup, followed by another for loop within vfio_msi_set_block() that removes the interrupt handler and its associated state using vfio_msi_set_vector_signal().
Simplify interrupt cleanup by iterating over allocated interrupts once.
Stable-dep-of: fe9a7082684e ("vfio/pci: Disable auto-enable of exclusive INTx IRQ")
--- drivers/vfio/pci/vfio_pci_intrs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/vfio/pci/vfio_pci_intrs.c +1 -2
@@ -426,10 +426,9 @@ static void vfio_msi_disable(struct vfio_pci_core_device *vdev, bool msix)for (i =0 ; i < vdev->num_ctx; i++) {vfio_virqfd_disable (&vdev->ctx[i].unmask);vfio_virqfd_disable (&vdev->ctx[i].mask); +vfio_msi_set_vector_signal (vdev, i,-1 , msix); } -vfio_msi_set_block (vdev,0 , vdev->num_ctx,NULL , msix); - cmd =vfio_pci_memory_lock_and_enable (vdev);pci_free_irq_vectors (pdev);vfio_pci_memory_unlock_and_restore (vdev, cmd);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 85/272 ext4: fix corruption during on-line resize
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maximilian Heyne <[email protected]>
[ Upstream commit a6b3bfe176e8a5b05ec4447404e412c2a3fc92cc ]
We observed a corruption during on-line resize of a file system that is larger than 16 TiB with 4k block size. With having more then 2^32 blocks resize_inode is turned off by default by mke2fs. The issue can be reproduced on a smaller file system for convenience by explicitly turning off resize_inode. An on-line resize across an 8 GiB boundary (the size of a meta block group in this setup) then leads to a corruption:
dev=/dev/<some_dev> # should be >= 16 GiB mkdir -p /corruption /sbin/mke2fs -t ext4 -b 4096 -O ^resize_inode $dev $((2 * 2**21 - 2**15)) mount -t ext4 $dev /corruption dd if=/dev/zero bs=4096 of=/corruption/test count=$((2*2**21 - 4*2**15)) sha1sum /corruption/test # 79d2658b39dcfd77274e435b0934028adafaab11 /corruption/test /sbin/resize2fs $dev $((2*2**21)) # drop page cache to force reload the block from disk echo 1 > /proc/sys/vm/drop_caches
sha1sum /corruption/test
# 3c2abc63cbf1a94c9e6977e0fbd72cd832c4d5c3 /corruption/test
2^21 = 2^15*2^6 equals 8 GiB whereof 2^15 is the number of blocks per block group and 2^6 are the number of block groups that make a meta block group.
The last checksum might be different depending on how the file is laid out across the physical blocks. The actual corruption occurs at physical block 63*2^15 = 2064384 which would be the location of the backup of the meta block group's block descriptor. During the on-line resize the file system will be converted to meta_bg starting at s_first_meta_bg which is 2 in the example - meaning all block groups after 16 GiB. However, in ext4_flex_group_add we might add block groups that are not part of the first meta block group yet. In the reproducer we achieved this by substracting the size of a whole block group from the point where the meta block group would start. This must be considered when updating the backup block group descriptors to follow the non-meta_bg layout. The fix is to add a test whether the group to add is already part of the meta block group or not.
--- fs/ext4/resize.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/resize.c +2 -1
@@ -1606,7 +1606,8 @@ static int ext4_flex_group_add(struct super_block *sb,int gdb_num = group /EXT4_DESC_PER_BLOCK (sb);int gdb_num_end = ((group + flex_gd->count -1 ) /EXT4_DESC_PER_BLOCK (sb)); -int meta_bg =ext4_has_feature_meta_bg (sb); +int meta_bg =ext4_has_feature_meta_bg (sb) && + gdb_num >=le32_to_cpu (es->s_first_meta_bg);sector_t padding_blocks = meta_bg ?0 : sbi->s_sbh->b_blocknr -ext4_group_first_block_no (sb,0 );sector_t old_gdb =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 103/272 vfio/pci: Remove negative check on unsigned vector
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Reinette Chatre <[email protected]>
[ Upstream commit 6578ed85c7d63693669bfede01e0237d0e24211a ]
User space provides the vector as an unsigned int that is checked early for validity (vfio_set_irqs_validate_and_prepare()).
A later negative check of the provided vector is not necessary.
Remove the negative check and ensure the type used for the vector is consistent as an unsigned int.
Stable-dep-of: fe9a7082684e ("vfio/pci: Disable auto-enable of exclusive INTx IRQ")
--- drivers/vfio/pci/vfio_pci_intrs.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/vfio/pci/vfio_pci_intrs.c +8 -7
@@ -317,14 +317,14 @@ static int vfio_msi_enable(struct vfio_pci_core_device *vdev, int nvec, bool msi }static int vfio_msi_set_vector_signal (struct vfio_pci_core_device *vdev, -int vector,int fd,bool msix) +unsigned int vector,int fd,bool msix) {struct pci_dev *pdev = vdev->pdev;struct eventfd_ctx *trigger;int irq, ret;u16 cmd; -if (vector <0 || vector >= vdev->num_ctx) +if (vector >= vdev->num_ctx)return -EINVAL ; irq =pci_irq_vector (pdev, vector);
@@ -399,7 +399,8 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_core_device *vdev,static int vfio_msi_set_block (struct vfio_pci_core_device *vdev,unsigned start,unsigned count,int32_t *fds,bool msix) { -int i, j, ret =0 ; +unsigned int i, j; +int ret =0 ;if (start >= vdev->num_ctx || start + count > vdev->num_ctx)return -EINVAL ;
@@ -410,8 +411,8 @@ static int vfio_msi_set_block(struct vfio_pci_core_device *vdev, unsigned start, }if (ret) { -for (--j; j >= (int )start; j--) -vfio_msi_set_vector_signal (vdev, j,-1 , msix); +for (i = start; i < j; i++) +vfio_msi_set_vector_signal (vdev, i,-1 , msix); }return ret;
@@ -420,7 +421,7 @@ static int vfio_msi_set_block(struct vfio_pci_core_device *vdev, unsigned start,static void vfio_msi_disable (struct vfio_pci_core_device *vdev,bool msix) {struct pci_dev *pdev = vdev->pdev; -int i; +unsigned int i;u16 cmd;for (i =0 ; i < vdev->num_ctx; i++) {
@@ -542,7 +543,7 @@ static int vfio_pci_set_msi_trigger(struct vfio_pci_core_device *vdev, unsigned index, unsigned start, unsigned count, uint32_t flags, void *data) { - int i; + unsigned int i;bool msix = (index ==VFIO_PCI_MSIX_IRQ_INDEX ) ? true : false;if (irq_is (vdev, index) && !count && (flags &VFIO_IRQ_SET_DATA_NONE )) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 104/272 vfio/pci: Lock external INTx masking ops
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit 810cd4bb53456d0503cc4e7934e063835152c1b7 ]
Mask operations through config space changes to DisINTx may race INTx configuration changes via ioctl. Create wrappers that add locking for paths outside of the core interrupt code.
In particular, irq_type is updated holding igate, therefore testing is_intx() requires holding igate. For example clearing DisINTx from config space can otherwise race changes of the interrupt configuration.
This aligns interfaces which may trigger the INTx eventfd into two camps, one side serialized by igate and the other only enabled while INTx is configured. A subsequent patch introduces synchronization for the latter flows.
--- drivers/vfio/pci/vfio_pci_intrs.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
drivers/vfio/pci/vfio_pci_intrs.c +28 -6
@@ -60,12 +60,14 @@ static void vfio_send_intx_eventfd(void }/* Returns true if the INTx vfio_pci_irq_ctx.masked value is changed. */ -bool vfio_pci_intx_mask (struct vfio_pci_core_device *vdev) +static bool __vfio_pci_intx_mask (struct vfio_pci_core_device *vdev) {struct pci_dev *pdev = vdev->pdev;unsigned long flags;bool masked_changed = false; +lockdep_assert_held (&vdev->igate); +spin_lock_irqsave (&vdev->irqlock, flags);/*
@@ -95,6 +97,17 @@ bool vfio_pci_intx_mask(struct vfio_pci_return masked_changed; } +bool vfio_pci_intx_mask (struct vfio_pci_core_device *vdev) +{ +bool mask_changed; + +mutex_lock (&vdev->igate); + mask_changed =__vfio_pci_intx_mask (vdev); +mutex_unlock (&vdev->igate); + +return mask_changed; +} +/* * If this is triggered by an eventfd, we can't call eventfd_signal * or else we'll deadlock on the eventfd wait queue. Return >0 when
@@ -137,12 +150,21 @@ static int vfio_pci_intx_unmask_handler(return ret; } -void vfio_pci_intx_unmask (struct vfio_pci_core_device *vdev) +static void __vfio_pci_intx_unmask (struct vfio_pci_core_device *vdev) { +lockdep_assert_held (&vdev->igate); +if (vfio_pci_intx_unmask_handler (vdev,NULL ) >0 )vfio_send_intx_eventfd (vdev,NULL ); } +void vfio_pci_intx_unmask (struct vfio_pci_core_device *vdev) +{ +mutex_lock (&vdev->igate); +__vfio_pci_intx_unmask (vdev); +mutex_unlock (&vdev->igate); +} +static irqreturn_t vfio_intx_handler (int irq,void *dev_id) {struct vfio_pci_core_device *vdev = dev_id;
@@ -457,11 +479,11 @@ static int vfio_pci_set_intx_unmask(strureturn -EINVAL ;if (flags &VFIO_IRQ_SET_DATA_NONE ) { -vfio_pci_intx_unmask (vdev); +__vfio_pci_intx_unmask (vdev); }else if (flags &VFIO_IRQ_SET_DATA_BOOL ) {uint8_t unmask = *(uint8_t *)data;if (unmask) -vfio_pci_intx_unmask (vdev); +__vfio_pci_intx_unmask (vdev); }else if (flags &VFIO_IRQ_SET_DATA_EVENTFD ) {int32_t fd = *(int32_t *)data;if (fd >=0 )
@@ -484,11 +506,11 @@ static int vfio_pci_set_intx_mask(structreturn -EINVAL ;if (flags &VFIO_IRQ_SET_DATA_NONE ) { -vfio_pci_intx_mask (vdev); +__vfio_pci_intx_mask (vdev); }else if (flags &VFIO_IRQ_SET_DATA_BOOL ) {uint8_t mask = *(uint8_t *)data;if (mask) -vfio_pci_intx_mask (vdev); +__vfio_pci_intx_mask (vdev); }else if (flags &VFIO_IRQ_SET_DATA_EVENTFD ) {return -ENOTTY ;/* XXX implement me */ }
Greg Kroah-Hartman
maintainerPATCH 105/272 vfio/platform: Disable virqfds on cleanup
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit fcdc0d3d40bc26c105acf8467f7d9018970944ae ]
irqfds for mask and unmask that are not specifically disabled by the user are leaked. Remove any irqfds during cleanup
--- drivers/vfio/platform/vfio_platform_irq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/vfio/platform/vfio_platform_irq.c +4 -1
@@ -321,8 +321,11 @@ void vfio_platform_irq_cleanup(struct vfio_platform_device *vdev) {int i; -for (i =0 ; i < vdev->num_irqs; i++) +for (i =0 ; i < vdev->num_irqs; i++) { +vfio_virqfd_disable (&vdev->irqs[i].mask); +vfio_virqfd_disable (&vdev->irqs[i].unmask);vfio_set_trigger (vdev, i,-1 ,NULL ); + } vdev->num_irqs =0 ;kfree (vdev->irqs);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 106/272 ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marios Makassikis <[email protected]>
[ Upstream commit 34cd86b6632718b7df3999d96f51e63de41c5e4f ]
Use vfs_getattr() to retrieve stat information, rather than make assumptions about how a filesystem fills inode structs.
--- fs/smb/server/smb2pdu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/smb/server/smb2pdu.c +8 -2
@@ -5757,15 +5757,21 @@ static int set_file_allocation_info(struct ksmbd_work *work,loff_t alloc_blks;struct inode *inode; +struct kstat stat;int rc;if (!(fp->daccess &FILE_WRITE_DATA_LE ))return -EACCES ; + rc =vfs_getattr (&fp->filp->f_path, &stat,STATX_BASIC_STATS , +AT_STATX_SYNC_AS_STAT ); +if (rc) +return rc; + alloc_blks = (le64_to_cpu (file_alloc_info->AllocationSize) +511 ) >>9 ; inode =file_inode (fp->filp); -if (alloc_blks > inode->i_blocks) { +if (alloc_blks > stat.blocks) {smb_break_all_levII_oplock (work, fp,1 ); rc =vfs_fallocate (fp->filp,FALLOC_FL_KEEP_SIZE ,0 , alloc_blks *512 );
@@ -5773,7 +5779,7 @@ static int set_file_allocation_info(struct ksmbd_work *work,pr_err ("vfs_fallocate is failed : %d\n" , rc);return rc; } - }else if (alloc_blks < inode->i_blocks) { + }else if (alloc_blks < stat.blocks) {loff_t size;/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 107/272 ring-buffer: Fix waking up ring buffer readers
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit b3594573681b53316ec0365332681a30463edfd6 ]
A task can wait on a ring buffer for when it fills up to a specific watermark. The writer will check the minimum watermark that waiters are waiting for and if the ring buffer is past that, it will wake up all the waiters.
The waiters are in a wait loop, and will first check if a signal is pending and then check if the ring buffer is at the desired level where it should break out of the loop.
If a file that uses a ring buffer closes, and there's threads waiting on the ring buffer, it needs to wake up those threads. To do this, a "wait_index" was used.
Before entering the wait loop, the waiter will read the wait_index. On wakeup, it will check if the wait_index is different than when it entered the loop, and will exit the loop if it is. The waker will only need to update the wait_index before waking up the waiters.
This had a couple of bugs. One trivial one and one broken by design.
The trivial bug was that the waiter checked the wait_index after the schedule() call. It had to be checked between the prepare_to_wait() and the schedule() which it was not.
The main bug is that the first check to set the default wait_index will always be outside the prepare_to_wait() and the schedule(). That's because the ring_buffer_wait() doesn't have enough context to know if it should break out of the loop.
The loop itself is not needed, because all the callers to the ring_buffer_wait() also has their own loop, as the callers have a better sense of what the context is to decide whether to break out of the loop or not.
Just have the ring_buffer_wait() block once, and if it gets woken up, exit the function and let the callers decide what to do next.
Stable-dep-of: 761d9473e27f ("ring-buffer: Do not set shortest_full when full target is hit")
--- kernel/trace/ring_buffer.c | 139 ++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 71 deletions(-)
kernel/trace/ring_buffer.c +68 -71
@@ -414,7 +414,6 @@ struct rb_irq_work {struct irq_work work;wait_queue_head_t waiters;wait_queue_head_t full_waiters; -long wait_index;bool waiters_pending;bool full_waiters_pending;bool wakeup_full;
@@ -949,14 +948,40 @@ void ring_buffer_wake_waiters(struct trace_buffer *buffer, int cpu) rbwork = &cpu_buffer->irq_work; } - rbwork->wait_index++; -/* make sure the waiters see the new index */ -smp_wmb (); -/* This can be called in any context */ irq_work_queue (&rbwork->work); } +static bool rb_watermark_hit (struct trace_buffer *buffer,int cpu,int full) +{ +struct ring_buffer_per_cpu *cpu_buffer; +bool ret = false; + +/* Reads of all CPUs always waits for any data */ +if (cpu ==RING_BUFFER_ALL_CPUS ) +return !ring_buffer_empty (buffer); + + cpu_buffer = buffer->buffers[cpu]; + +if (!ring_buffer_empty_cpu (buffer, cpu)) { +unsigned long flags; +bool pagebusy; + +if (!full) +return true; + +raw_spin_lock_irqsave (&cpu_buffer->reader_lock, flags); + pagebusy = cpu_buffer->reader_page == cpu_buffer->commit_page; + ret = !pagebusy &&full_hit (buffer, cpu, full); + +if (!cpu_buffer->shortest_full || + cpu_buffer->shortest_full > full) + cpu_buffer->shortest_full = full; +raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); + } +return ret; +} +/** * ring_buffer_wait - wait for input to the ring buffer * @buffer: buffer to wait on
@@ -972,7 +997,6 @@ int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full)struct ring_buffer_per_cpu *cpu_buffer;DEFINE_WAIT (wait);struct rb_irq_work *work; -long wait_index;int ret =0 ;/*
@@ -991,81 +1015,54 @@ int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full) work = &cpu_buffer->irq_work; } - wait_index =READ_ONCE (work->wait_index); - -while (true) { -if (full) -prepare_to_wait (&work->full_waiters, &wait,TASK_INTERRUPTIBLE ); -else -prepare_to_wait (&work->waiters, &wait,TASK_INTERRUPTIBLE ); - -/* -* The events can happen in critical sections where -* checking a work queue can cause deadlocks. -* After adding a task to the queue, this flag is set -* only to notify events to try to wake up the queue -* using irq_work. -* -* We don't clear it even if the buffer is no longer -* empty. The flag only causes the next event to run -* irq_work to do the work queue wake up. The worse -* that can happen if we race with !trace_empty() is that -* an event will cause an irq_work to try to wake up -* an empty queue. -* -* There's no reason to protect this flag either, as -* the work queue and irq_work logic will do the necessary -* synchronization for the wake ups. The only thing -* that is necessary is that the wake up happens after -* a task has been queued. It's OK for spurious wake ups. -*/ -if (full) - work->full_waiters_pending = true; -else - work->waiters_pending = true; - -if (signal_pending (current)) { - ret = -EINTR ; -break ; - } - -if (cpu ==RING_BUFFER_ALL_CPUS && !ring_buffer_empty (buffer)) -break ; - -if (cpu !=RING_BUFFER_ALL_CPUS && - !ring_buffer_empty_cpu (buffer, cpu)) { -unsigned long flags; -bool pagebusy; -bool done; - -if (!full) -break ; - -raw_spin_lock_irqsave (&cpu_buffer->reader_lock, flags); - pagebusy = cpu_buffer->reader_page == cpu_buffer->commit_page; - done = !pagebusy &&full_hit (buffer, cpu, full); +if (full) +prepare_to_wait (&work->full_waiters, &wait,TASK_INTERRUPTIBLE ); +else +prepare_to_wait (&work->waiters, &wait,TASK_INTERRUPTIBLE ); -if (!cpu_buffer->shortest_full || - cpu_buffer->shortest_full > full) - cpu_buffer->shortest_full = full; -raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); -if (done) -break ; - } +/* +* The events can happen in critical sections where +* checking a work queue can cause deadlocks. +* After adding a task to the queue, this flag is set +* only to notify events to try to wake up the queue +* using irq_work. +* +* We don't clear it even if the buffer is no longer +* empty. The flag only causes the next event to run +* irq_work to do the work queue wake up. The worse +* that can happen if we race with !trace_empty() is that +* an event will cause an irq_work to try to wake up +* an empty queue. +* +* There's no reason to protect this flag either, as +* the work queue and irq_work logic will do the necessary +* synchronization for the wake ups. The only thing +* that is necessary is that the wake up happens after +* a task has been queued. It's OK for spurious wake ups. +*/ +if (full) + work->full_waiters_pending = true; +else + work->waiters_pending = true; -schedule (); +if (rb_watermark_hit (buffer, cpu, full)) + goto out; -/* Make sure to see the new wait index */ -smp_rmb (); -if (wait_index != work->wait_index) -break ; +if (signal_pending (current)) { + ret = -EINTR ; + goto out; } +schedule (); + out:if (full)finish_wait (&work->full_waiters, &wait);else finish_wait (&work->waiters, &wait); +if (!ret && !rb_watermark_hit (buffer, cpu, full) &&signal_pending (current)) + ret = -EINTR ; +return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 108/272 ring-buffer: Do not set shortest_full when full target is hit
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 761d9473e27f0c8782895013a3e7b52a37c8bcfc ]
The rb_watermark_hit() checks if the amount of data in the ring buffer is above the percentage level passed in by the "full" variable. If it is, it returns true.
But it also sets the "shortest_full" field of the cpu_buffer that informs writers that it needs to call the irq_work if the amount of data on the ring buffer is above the requested amount.
The rb_watermark_hit() always sets the shortest_full even if the amount in the ring buffer is what it wants. As it is not going to wait, because it has what it wants, there's no reason to set shortest_full.
--- kernel/trace/ring_buffer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/trace/ring_buffer.c +4 -3
@@ -974,9 +974,10 @@ static bool rb_watermark_hit(struct trace_buffer *buffer, int cpu, int full) pagebusy = cpu_buffer->reader_page == cpu_buffer->commit_page; ret = !pagebusy &&full_hit (buffer, cpu, full); -if (!cpu_buffer->shortest_full || - cpu_buffer->shortest_full > full) - cpu_buffer->shortest_full = full; +if (!ret && (!cpu_buffer->shortest_full || + cpu_buffer->shortest_full > full)) { + cpu_buffer->shortest_full = full; + }raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); }return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 109/272 ring-buffer: Fix resetting of shortest_full
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 68282dd930ea38b068ce2c109d12405f40df3f93 ]
The "shortest_full" variable is used to keep track of the waiter that is waiting for the smallest amount on the ring buffer before being woken up. When a tasks waits on the ring buffer, it passes in a "full" value that is a percentage. 0 means wake up on any data. 1-100 means wake up from 1% to 100% full buffer.
As all waiters are on the same wait queue, the wake up happens for the waiter with the smallest percentage.
The problem is that the smallest_full on the cpu_buffer that stores the smallest amount doesn't get reset when all the waiters are woken up. It does get reset when the ring buffer is reset (echo > /sys/kernel/tracing/trace).
This means that tasks may be woken up more often then when they want to be. Instead, have the shortest_full field get reset just before waking up all the tasks. If the tasks wait again, they will update the shortest_full before sleeping.
Also add locking around setting of shortest_full in the poll logic, and change "work" to "rbwork" to match the variable name for rb_irq_work structures that are used in other places.
Stable-dep-of: 8145f1c35fa6 ("ring-buffer: Fix full_waiters_pending in poll")
--- kernel/trace/ring_buffer.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
kernel/trace/ring_buffer.c +23 -7
@@ -907,8 +907,19 @@ static void rb_wake_up_waiters(struct irq_work *work)wake_up_all (&rbwork->waiters);if (rbwork->full_waiters_pending || rbwork->wakeup_full) { +/* Only cpu_buffer sets the above flags */ +struct ring_buffer_per_cpu *cpu_buffer = + container_of(rbwork, struct ring_buffer_per_cpu, irq_work); + +/* Called from interrupt context */ +raw_spin_lock (&cpu_buffer->reader_lock); rbwork->wakeup_full = false; rbwork->full_waiters_pending = false; + +/* Waking up all waiters, they will reset the shortest full */ + cpu_buffer->shortest_full =0 ; +raw_spin_unlock (&cpu_buffer->reader_lock); +wake_up_all (&rbwork->full_waiters); } }
@@ -1086,28 +1097,33 @@ __poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu, struct file *filp, poll_table *poll_table, int full) { struct ring_buffer_per_cpu *cpu_buffer; -struct rb_irq_work *work; +struct rb_irq_work *rbwork;if (cpu ==RING_BUFFER_ALL_CPUS ) { - work = &buffer->irq_work; + rbwork = &buffer->irq_work; full =0 ; }else {if (!cpumask_test_cpu (cpu, buffer->cpumask))return EPOLLERR ; cpu_buffer = buffer->buffers[cpu]; - work = &cpu_buffer->irq_work; + rbwork = &cpu_buffer->irq_work; }if (full) { -poll_wait (filp, &work->full_waiters, poll_table); - work->full_waiters_pending = true; +unsigned long flags; + +poll_wait (filp, &rbwork->full_waiters, poll_table); + +raw_spin_lock_irqsave (&cpu_buffer->reader_lock, flags); + rbwork->full_waiters_pending = true;if (!cpu_buffer->shortest_full || cpu_buffer->shortest_full > full) cpu_buffer->shortest_full = full; +raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); }else { -poll_wait (filp, &work->waiters, poll_table); - work->waiters_pending = true; +poll_wait (filp, &rbwork->waiters, poll_table); + rbwork->waiters_pending = true; }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 110/272 ring-buffer: Fix full_waiters_pending in poll
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 8145f1c35fa648da662078efab299c4467b85ad5 ]
If a reader of the ring buffer is doing a poll, and waiting for the ring buffer to hit a specific watermark, there could be a case where it gets into an infinite ping-pong loop.
The poll code has:
rbwork->full_waiters_pending = true;
if (!cpu_buffer->shortest_full ||
cpu_buffer->shortest_full > full)
cpu_buffer->shortest_full = full;The writer will see full_waiters_pending and check if the ring buffer is filled over the percentage of the shortest_full value. If it is, it calls an irq_work to wake up all the waiters.
But the code could get into a circular loop:
CPU 0 CPU 1
----- -----
[ Poll ]
[ shortest_full = 0 ]
rbwork->full_waiters_pending = true;
if (rbwork->full_waiters_pending &&
[ buffer percent ] > shortest_full) {
rbwork->wakeup_full = true;
[ queue_irqwork ]cpu_buffer->shortest_full = full;
[ IRQ work ]
if (rbwork->wakeup_full) {
cpu_buffer->shortest_full = 0;
wakeup poll waiters;
[woken]
if ([ buffer percent ] > full)
break;
rbwork->full_waiters_pending = true;
if (rbwork->full_waiters_pending &&
[ buffer percent ] > shortest_full) {
rbwork->wakeup_full = true;
[ queue_irqwork ]cpu_buffer->shortest_full = full;
[ IRQ work ]
if (rbwork->wakeup_full) {
cpu_buffer->shortest_full = 0;
wakeup poll waiters;[woken]
[ Wash, rinse, repeat! ]
In the poll, the shortest_full needs to be set before the full_pending_waiters, as once that is set, the writer will compare the current shortest_full (which is incorrect) to decide to call the irq_work, which will reset the shortest_full (expecting the readers to update it).
Also move the setting of full_waiters_pending after the check if the ring buffer has the required percentage filled. There's no reason to tell the writer to wake up waiters if there are no waiters.
--- kernel/trace/ring_buffer.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
kernel/trace/ring_buffer.c +20 -7
@@ -1116,16 +1116,32 @@ __poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu,poll_wait (filp, &rbwork->full_waiters, poll_table);raw_spin_lock_irqsave (&cpu_buffer->reader_lock, flags); - rbwork->full_waiters_pending = true;if (!cpu_buffer->shortest_full || cpu_buffer->shortest_full > full) cpu_buffer->shortest_full = full;raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); - }else { -poll_wait (filp, &rbwork->waiters, poll_table); - rbwork->waiters_pending = true; +if (full_hit (buffer, cpu, full)) +return EPOLLIN |EPOLLRDNORM ; +/* +* Only allow full_waiters_pending update to be seen after +* the shortest_full is set. If the writer sees the +* full_waiters_pending flag set, it will compare the +* amount in the ring buffer to shortest_full. If the amount +* in the ring buffer is greater than the shortest_full +* percent, it will call the irq_work handler to wake up +* this list. The irq_handler will reset shortest_full +* back to zero. That's done under the reader_lock, but +* the below smp_mb() makes sure that the update to +* full_waiters_pending doesn't leak up into the above. +*/ +smp_mb (); + rbwork->full_waiters_pending = true; +return 0 ; } +poll_wait (filp, &rbwork->waiters, poll_table); + rbwork->waiters_pending = true; +/* * There's a tight race between setting the waiters_pending and * checking if the ring buffer is empty. Once the waiters_pending bit
@@ -1141,9 +1157,6 @@ __poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu,*/ smp_mb (); -if (full) -return full_hit (buffer, cpu, full) ?EPOLLIN |EPOLLRDNORM :0 ; -if ((cpu ==RING_BUFFER_ALL_CPUS && !ring_buffer_empty (buffer)) || (cpu !=RING_BUFFER_ALL_CPUS && !ring_buffer_empty_cpu (buffer, cpu)))return EPOLLIN |EPOLLRDNORM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 111/272 ring-buffer: Use wait_event_interruptible() in ring_buffer_wait()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 7af9ded0c2caac0a95f33df5cb04706b0f502588 ]
Convert ring_buffer_wait() over to wait_event_interruptible(). The default condition is to execute the wait loop inside __wait_event() just once.
This does not change the ring_buffer_wait() prototype yet, but restructures the code so that it can take a "cond" and "data" parameter and will call wait_event_interruptible() with a helper function as the condition.
The helper function (rb_wait_cond) takes the cond function and data parameters. It will first check if the buffer hit the watermark defined by the "full" parameter and then call the passed in condition parameter. If either are true, it returns true.
If rb_wait_cond() does not return true, it will set the appropriate "waiters_pending" flag and returns false.
--- include/linux/ring_buffer.h | 1 + kernel/trace/ring_buffer.c | 116 +++++++++++++++++++++--------------- 2 files changed, 69 insertions(+), 48 deletions(-)
include/linux/ring_buffer.h +1 -0
@@ -98,6 +98,7 @@ __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *k__ring_buffer_alloc ((size), (flags), &__key); \ }) +typedef bool (*ring_buffer_cond_fn )(void *data);int ring_buffer_wait (struct trace_buffer *buffer,int cpu,int full);__poll_t ring_buffer_poll_wait (struct trace_buffer *buffer,int cpu,struct file *filp,poll_table *poll_table,int full);
kernel/trace/ring_buffer.c +68 -48
138 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 112/272 soc: fsl: qbman: Always disable interrupts when taking cgr_lock
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit 584c2a9184a33a40fceee838f856de3cffa19be3 ]
smp_call_function_single disables IRQs when executing the callback. To prevent deadlocks, we must disable IRQs when taking cgr_lock elsewhere. This is already done by qman_update_cgr and qman_delete_cgr; fix the other lockers.
--- drivers/soc/fsl/qbman/qman.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/soc/fsl/qbman/qman.c +5 -5
@@ -1456,11 +1456,11 @@ static void qm_congestion_task(struct work_struct *work)union qm_mc_result *mcr;struct qman_cgr *cgr; -spin_lock (&p->cgr_lock); +spin_lock_irq (&p->cgr_lock);qm_mc_start (&p->p);qm_mc_commit (&p->p,QM_MCC_VERB_QUERYCONGESTION );if (!qm_mc_result_timeout (&p->p, &mcr)) { -spin_unlock (&p->cgr_lock); +spin_unlock_irq (&p->cgr_lock);dev_crit (p->config->dev,"QUERYCONGESTION timeout\n" );qman_p_irqsource_add (p,QM_PIRQ_CSCI );return ;
@@ -1476,7 +1476,7 @@ static void qm_congestion_task(struct work_struct *work)list_for_each_entry (cgr, &p->cgr_cbs, node)if (cgr->cb &&qman_cgrs_get (&c, cgr->cgrid)) cgr->cb (p, cgr,qman_cgrs_get (&rr, cgr->cgrid)); -spin_unlock (&p->cgr_lock); +spin_unlock_irq (&p->cgr_lock);qman_p_irqsource_add (p,QM_PIRQ_CSCI ); }
@@ -2440,7 +2440,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,preempt_enable (); cgr->chan = p->config->channel; -spin_lock (&p->cgr_lock); +spin_lock_irq (&p->cgr_lock);if (opts) {struct qm_mcc_initcgr local_opts = *opts;
@@ -2477,7 +2477,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, qman_cgrs_get(&p->cgrs[1], cgr->cgrid)) cgr->cb(p, cgr, 1); out: -spin_unlock (&p->cgr_lock); +spin_unlock_irq (&p->cgr_lock);put_affine_portal ();return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 86/272 nvmem: meson-efuse: fix function pointer type mismatch
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit cbd38332c140829ab752ba4e727f98be5c257f18 ]
clang-16 warns about casting functions to incompatible types, as is done here to call clk_disable_unprepare:
drivers/nvmem/meson-efuse.c:78:12: error: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
78 | (void(*)(void *))clk_disable_unprepare,
The pattern of getting, enabling and setting a disable callback for a clock can be replaced with devm_clk_get_enabled(), which also fixes this warning.
--- drivers/nvmem/meson-efuse.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)
drivers/nvmem/meson-efuse.c +3 -22
@@ -47,7 +47,6 @@ static int meson_efuse_probe(struct platform_device *pdev)struct nvmem_config *econfig;struct clk *clk;unsigned int size; -int ret; sm_np =of_parse_phandle (pdev->dev.of_node,"secure-monitor" ,0 );if (!sm_np) {
@@ -60,27 +59,9 @@ static int meson_efuse_probe(struct platform_device *pdev)if (!fw)return -EPROBE_DEFER ; - clk =devm_clk_get (dev,NULL ); -if (IS_ERR (clk)) { - ret =PTR_ERR (clk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get efuse gate" ); -return ret; - } - - ret =clk_prepare_enable (clk); -if (ret) { -dev_err (dev,"failed to enable gate" ); -return ret; - } - - ret =devm_add_action_or_reset (dev, - (void (*)(void *))clk_disable_unprepare, - clk); -if (ret) { -dev_err (dev,"failed to add disable callback" ); -return ret; - } + clk =devm_clk_get_enabled (dev,NULL ); +if (IS_ERR (clk)) +return dev_err_probe (dev,PTR_ERR (clk),"failed to get efuse gate" );if (meson_sm_call (fw,SM_EFUSE_USER_MAX , &size,0 ,0 ,0 ,0 ,0 ) <0 ) {dev_err (dev,"failed to get max user" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 113/272 soc: fsl: qbman: Use raw spinlock for cgr_lock
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit fbec4e7fed89b579f2483041fabf9650fb0dd6bc ]
smp_call_function always runs its callback in hard IRQ context, even on PREEMPT_RT, where spinlocks can sleep. So we need to use a raw spinlock for cgr_lock to ensure we aren't waiting on a sleeping task.
Although this bug has existed for a while, it was not apparent until commit ef2a8d5478b9 ("net: dpaa: Adjust queue depth on rate change") which invokes smp_call_function_single via qman_update_cgr_safe every time a link goes up or down.
--- drivers/soc/fsl/qbman/qman.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/soc/fsl/qbman/qman.c +14 -11
@@ -991,7 +991,7 @@ struct qman_portal {/* linked-list of CSCN handlers. */ struct list_head cgr_cbs;/* list lock */ -spinlock_t cgr_lock; +raw_spinlock_t cgr_lock;struct work_struct congestion_work;struct work_struct mr_work;char irqname[MAX_IRQNAME ];
@@ -1281,7 +1281,7 @@ static int qman_create_portal(struct qman_portal *portal,/* if the given mask is NULL, assume all CGRs can be seen */ qman_cgrs_fill (&portal->cgrs[0 ]);INIT_LIST_HEAD (&portal->cgr_cbs); -spin_lock_init (&portal->cgr_lock); +raw_spin_lock_init (&portal->cgr_lock);INIT_WORK (&portal->congestion_work, qm_congestion_task);INIT_WORK (&portal->mr_work, qm_mr_process_task); portal->bits =0 ;
@@ -1456,11 +1456,14 @@ static void qm_congestion_task(struct work_struct *work)union qm_mc_result *mcr;struct qman_cgr *cgr; -spin_lock_irq (&p->cgr_lock); +/* +* FIXME: QM_MCR_TIMEOUT is 10ms, which is too long for a raw spinlock! +*/ +raw_spin_lock_irq (&p->cgr_lock);qm_mc_start (&p->p);qm_mc_commit (&p->p,QM_MCC_VERB_QUERYCONGESTION );if (!qm_mc_result_timeout (&p->p, &mcr)) { -spin_unlock_irq (&p->cgr_lock); +raw_spin_unlock_irq (&p->cgr_lock);dev_crit (p->config->dev,"QUERYCONGESTION timeout\n" );qman_p_irqsource_add (p,QM_PIRQ_CSCI );return ;
@@ -1476,7 +1479,7 @@ static void qm_congestion_task(struct work_struct *work)list_for_each_entry (cgr, &p->cgr_cbs, node)if (cgr->cb &&qman_cgrs_get (&c, cgr->cgrid)) cgr->cb (p, cgr,qman_cgrs_get (&rr, cgr->cgrid)); -spin_unlock_irq (&p->cgr_lock); +raw_spin_unlock_irq (&p->cgr_lock);qman_p_irqsource_add (p,QM_PIRQ_CSCI ); }
@@ -2440,7 +2443,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,preempt_enable (); cgr->chan = p->config->channel; -spin_lock_irq (&p->cgr_lock); +raw_spin_lock_irq (&p->cgr_lock);if (opts) {struct qm_mcc_initcgr local_opts = *opts;
@@ -2477,7 +2480,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, qman_cgrs_get(&p->cgrs[1], cgr->cgrid)) cgr->cb(p, cgr, 1); out: -spin_unlock_irq (&p->cgr_lock); +raw_spin_unlock_irq (&p->cgr_lock);put_affine_portal ();return ret; }
@@ -2512,7 +2515,7 @@ int qman_delete_cgr(struct qman_cgr *cgr)return -EINVAL ;memset (&local_opts,0 ,sizeof (struct qm_mcc_initcgr )); -spin_lock_irqsave (&p->cgr_lock, irqflags); +raw_spin_lock_irqsave (&p->cgr_lock, irqflags);list_del (&cgr->node);/* * If there are no other CGR objects for this CGRID in the list,
@@ -2537,7 +2540,7 @@ int qman_delete_cgr(struct qman_cgr *cgr)/* add back to the list */ list_add (&cgr->node, &p->cgr_cbs); release_lock: -spin_unlock_irqrestore (&p->cgr_lock, irqflags); +raw_spin_unlock_irqrestore (&p->cgr_lock, irqflags);put_affine_portal ();return ret; }
@@ -2577,9 +2580,9 @@ static int qman_update_cgr(struct qman_cgr *cgr, struct qm_mcc_initcgr *opts)if (!p)return -EINVAL ; -spin_lock_irqsave (&p->cgr_lock, irqflags); +raw_spin_lock_irqsave (&p->cgr_lock, irqflags); ret =qm_modify_cgr (cgr,0 , opts); -spin_unlock_irqrestore (&p->cgr_lock, irqflags); +raw_spin_unlock_irqrestore (&p->cgr_lock, irqflags);put_affine_portal ();return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 87/272 slimbus: core: Remove usage of the deprecated ida_simple_xx() API
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 89ffa4cccec54467446f141a79b9e36893079fb8 ]
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove().
Note that the upper limit of ida_simple_get() is exclusive, but the one of ida_alloc_range() is inclusive. So change this change allows one more device. Previously address 0xFE was never used.
--- drivers/slimbus/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/slimbus/core.c +2 -2
@@ -436,8 +436,8 @@ static int slim_device_alloc_laddr(struct slim_device *sbdev,if (ret <0 ) goto err; }else if (report_present) { - ret =ida_simple_get (&ctrl->laddr_ida, -0 ,SLIM_LA_MANAGER -1 ,GFP_KERNEL ); + ret =ida_alloc_max (&ctrl->laddr_ida, +SLIM_LA_MANAGER -1 ,GFP_KERNEL );if (ret <0 ) goto err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 88/272 phy: tegra: xusb: Add API to retrieve the port number of phy
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wayne Chang <[email protected]>
[ Upstream commit d843f031d9e90462253015bc0bd9e3852d206bf2 ]
This patch introduces a new API, tegra_xusb_padctl_get_port_number, to the Tegra XUSB Pad Controller driver. This API is used to identify the USB port that is associated with a given PHY.
The function takes a PHY pointer for either a USB2 PHY or USB3 PHY as input and returns the corresponding port number. If the PHY pointer is invalid, it returns -ENODEV.
--- drivers/phy/tegra/xusb.c | 13 +++++++++++++ include/linux/phy/tegra/xusb.h | 1 + 2 files changed, 14 insertions(+)
drivers/phy/tegra/xusb.c +13 -0
@@ -1518,6 +1518,19 @@ int tegra_xusb_padctl_get_usb3_companion(struct tegra_xusb_padctl *padctl, }EXPORT_SYMBOL_GPL (tegra_xusb_padctl_get_usb3_companion); +int tegra_xusb_padctl_get_port_number (struct phy *phy) +{ +struct tegra_xusb_lane *lane; + +if (!phy) +return -ENODEV ; + + lane =phy_get_drvdata (phy); + +return lane->index; +} +EXPORT_SYMBOL_GPL (tegra_xusb_padctl_get_port_number); +MODULE_AUTHOR ("Thierry Reding <[email protected]>" );MODULE_DESCRIPTION ("Tegra XUSB Pad Controller driver" );MODULE_LICENSE ("GPL v2" );
include/linux/phy/tegra/xusb.h +1 -0
@@ -26,6 +26,7 @@ void tegra_phy_xusb_utmi_pad_power_down(struct phy *phy);int tegra_phy_xusb_utmi_port_reset (struct phy *phy);int tegra_xusb_padctl_get_usb3_companion (struct tegra_xusb_padctl *padctl,unsigned int port); +int tegra_xusb_padctl_get_port_number (struct phy *phy);int tegra_xusb_padctl_enable_phy_sleepwalk (struct tegra_xusb_padctl *padctl,struct phy *phy,enum usb_device_speed speed);int tegra_xusb_padctl_disable_phy_sleepwalk (struct tegra_xusb_padctl *padctl,struct phy *phy);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 89/272 usb: gadget: tegra-xudc: Fix USB3 PHY retrieval logic
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wayne Chang <[email protected]>
[ Upstream commit 84fa943d93c31ee978355e6c6c69592dae3c9f59 ]
This commit resolves an issue in the tegra-xudc USB gadget driver that incorrectly fetched USB3 PHY instances. The problem stemmed from the assumption of a one-to-one correspondence between USB2 and USB3 PHY names and their association with physical USB ports in the device tree.
Previously, the driver associated USB3 PHY names directly with the USB3 instance number, leading to mismatches when mapping the physical USB ports. For instance, if using USB3-1 PHY, the driver expect the corresponding PHY name as 'usb3-1'. However, the physical USB ports in the device tree were designated as USB2-0 and USB3-0 as we only have one device controller, causing a misalignment.
This commit rectifies the issue by adjusting the PHY naming logic. Now, the driver correctly correlates the USB2 and USB3 PHY instances, allowing the USB2-0 and USB3-1 PHYs to form a physical USB port pair while accurately reflecting their configuration in the device tree by naming them USB2-0 and USB3-0, respectively.
The change ensures that the PHY and PHY names align appropriately, resolving the mismatch between physical USB ports and their associated names in the device tree.
--- drivers/usb/gadget/udc/tegra-xudc.c | 39 ++++++++++++++++++----------- 1 file changed, 25 insertions(+), 14 deletions(-)
drivers/usb/gadget/udc/tegra-xudc.c +25 -14
@@ -3486,8 +3486,8 @@ static void tegra_xudc_device_params_init(struct tegra_xudc *xudc)static int tegra_xudc_phy_get (struct tegra_xudc *xudc) { -int err =0 , usb3; -unsigned int i; +int err =0 , usb3_companion_port; +unsigned int i, j; xudc->utmi_phy =devm_kcalloc (xudc->dev, xudc->soc->num_phys,sizeof (*xudc->utmi_phy),GFP_KERNEL );
@@ -3515,7 +3515,7 @@ static int tegra_xudc_phy_get(struct tegra_xudc *xudc)if (IS_ERR (xudc->utmi_phy[i])) { err =PTR_ERR (xudc->utmi_phy[i]);dev_err_probe (xudc->dev, err, -"failed to get usb2-%d PHY\n" , i); +"failed to get PHY for phy-name usb2-%d\n" , i); goto clean_up; }else if (xudc->utmi_phy[i]) {/* Get usb-phy, if utmi phy is available */
@@ -3534,19 +3534,30 @@ static int tegra_xudc_phy_get(struct tegra_xudc *xudc) }/* Get USB3 phy */ - usb3 =tegra_xusb_padctl_get_usb3_companion (xudc->padctl, i); -if (usb3 <0 ) + usb3_companion_port =tegra_xusb_padctl_get_usb3_companion (xudc->padctl, i); +if (usb3_companion_port <0 )continue ; -snprintf (phy_name,sizeof (phy_name),"usb3-%d" , usb3); - xudc->usb3_phy[i] =devm_phy_optional_get (xudc->dev, phy_name); -if (IS_ERR (xudc->usb3_phy[i])) { - err =PTR_ERR (xudc->usb3_phy[i]); -dev_err_probe (xudc->dev, err, -"failed to get usb3-%d PHY\n" , usb3); - goto clean_up; - }else if (xudc->usb3_phy[i]) -dev_dbg (xudc->dev,"usb3-%d PHY registered" , usb3); +for (j =0 ; j < xudc->soc->num_phys; j++) { +snprintf (phy_name,sizeof (phy_name),"usb3-%d" , j); + xudc->usb3_phy[i] =devm_phy_optional_get (xudc->dev, phy_name); +if (IS_ERR (xudc->usb3_phy[i])) { + err =PTR_ERR (xudc->usb3_phy[i]); +dev_err_probe (xudc->dev, err, +"failed to get PHY for phy-name usb3-%d\n" , j); + goto clean_up; + }else if (xudc->usb3_phy[i]) { +int usb2_port = +tegra_xusb_padctl_get_port_number (xudc->utmi_phy[i]); +int usb3_port = +tegra_xusb_padctl_get_port_number (xudc->usb3_phy[i]); +if (usb3_port == usb3_companion_port) { +dev_dbg (xudc->dev,"USB2 port %d is paired with USB3 port %d for device mode port %d\n" , + usb2_port, usb3_port, i); +break ; + } + } + } }return err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 90/272 speakup: Fix 8bit characters from direct synth
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Thibault <[email protected]>
[ Upstream commit b6c8dafc9d86eb77e502bb018ec4105e8d2fbf78 ]
When userland echoes 8bit characters to /dev/synth with e.g.
echo -e '\xe9' > /dev/synth
synth_write would get characters beyond 0x7f, and thus negative when char is signed. When given to synth_buffer_add which takes a u16, this would sign-extend and produce a U+ffxy character rather than U+xy. Users thus get garbled text instead of accents in their output.
Let's fix this by making sure that we read unsigned characters.
--- drivers/accessibility/speakup/synth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/accessibility/speakup/synth.c +3 -1
@@ -208,8 +208,10 @@ void spk_do_flush(void)wake_up_process (speakup_task); } -void synth_write (const char *buf,size_t count) +void synth_write (const char *_buf,size_t count) { +const unsigned char *buf = (const unsigned char *) _buf; +while (count--)synth_buffer_add (*buf++);synth_start ();
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 91/272 PCI/AER: Block runtime suspend when handling errors
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
[ Upstream commit 002bf2fbc00e5c4b95fb167287e2ae7d1973281e ]
PM runtime can be done simultaneously with AER error handling. Avoid that by using pm_runtime_get_sync() before and pm_runtime_put() after reset in pcie_do_recovery() for all recovering devices.
pm_runtime_get_sync() will increase dev->power.usage_count counter to prevent any possible future request to runtime suspend a device. It will also resume a device, if it was previously in D3hot state.
I tested with igc device by doing simultaneous aer_inject and rpm suspend/resume via /sys/bus/pci/devices/PCI_ID/power/control and can reproduce:
igc 0000:02:00.0: not ready 65535ms after bus reset; giving up pcieport 0000:00:1c.2: AER: Root Port link has been reset (-25) pcieport 0000:00:1c.2: AER: subordinate device reset failed
pcieport 0000:00:1c.2: AER: device recovery failed
igc 0000:02:00.0: Unable to change power state from D3hot to D0, device inaccessible
The problem disappears when this patch is applied.
--- drivers/pci/pcie/err.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/pci/pcie/err.c +20 -0
@@ -13,6 +13,7 @@#define dev_fmt (fmt) "AER: " fmt#include <linux/pci.h> +#include <linux/pm_runtime.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h>
@@ -85,6 +86,18 @@ static int report_error_detected(struct pci_dev *dev,return 0 ; } +static int pci_pm_runtime_get_sync (struct pci_dev *pdev,void *data) +{ +pm_runtime_get_sync (&pdev->dev); +return 0 ; +} + +static int pci_pm_runtime_put (struct pci_dev *pdev,void *data) +{ +pm_runtime_put (&pdev->dev); +return 0 ; +} +static int report_frozen_detected (struct pci_dev *dev,void *data) {return report_error_detected (dev, pci_channel_io_frozen, data);
@@ -207,6 +220,8 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,else bridge =pci_upstream_bridge (dev); +pci_walk_bridge (bridge, pci_pm_runtime_get_sync,NULL ); +pci_dbg (bridge,"broadcast error_detected message\n" );if (state == pci_channel_io_frozen) {pci_walk_bridge (bridge, report_frozen_detected, &status);
@@ -251,10 +266,15 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,pcie_clear_device_status (dev);pci_aer_clear_nonfatal_status (dev); } + +pci_walk_bridge (bridge, pci_pm_runtime_put,NULL ); +pci_info (bridge,"device recovery successful\n" );return status; failed: +pci_walk_bridge (bridge, pci_pm_runtime_put,NULL ); +pci_uevent_ers (bridge,PCI_ERS_RESULT_DISCONNECT );/* TODO: Should kernel panic here? */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 92/272 io_uring/net: correctly handle multishot recvmsg retry setup
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit deaef31bc1ec7966698a427da8c161930830e1cf ]
If we loop for multishot receive on the initial attempt, and then abort later on to wait for more, we miss a case where we should be copying the io_async_msghdr from the stack to stable storage. This leads to the next retry potentially failing, if the application had the msghdr on the stack.
--- io_uring/net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
io_uring/net.c +2 -1
@@ -876,7 +876,8 @@ int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags)kfree (kmsg->free_iov);io_netmsg_recycle (req, issue_flags); req->flags &= ~REQ_F_NEED_CLEANUP ; - } + }else if (ret == -EAGAIN ) +return io_setup_async_msg (req, kmsg, issue_flags);return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 83/272 landlock: Warn once if a Landlock action is requested while disabled
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mickaël Salaün <[email protected]>
[ Upstream commit 782191c74875cc33b50263e21d76080b1411884d ]
Because sandboxing can be used as an opportunistic security measure, user space may not log unsupported features. Let the system administrator know if an application tries to use Landlock but failed because it isn't enabled at boot time. This may be caused by boot loader configurations with outdated "lsm" kernel's command-line parameter.
--- security/landlock/syscalls.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
security/landlock/syscalls.c +15 -3
@@ -32,6 +32,18 @@#include "ruleset.h" #include "setup.h" +static bool is_initialized (void ) +{ +if (likely (landlock_initialized)) +return true; + +pr_warn_once ( +"Disabled but requested by user space. " +"You should enable Landlock at boot time: " +"https://docs.kernel.org/userspace-api/landlock.html#boot-time-configuration\n" ); +return false; +} +/** * copy_min_struct_from_user - Safe future-proof argument copying *
@@ -165,7 +177,7 @@ SYSCALL_DEFINE3(landlock_create_ruleset,/* Build-time checks. */ build_check_abi (); -if (!landlock_initialized) +if (!is_initialized ())return -EOPNOTSUPP ;if (flags) {
@@ -311,7 +323,7 @@ SYSCALL_DEFINE4(landlock_add_rule, const int, ruleset_fd,struct landlock_ruleset *ruleset;int res, err; -if (!landlock_initialized) +if (!is_initialized ())return -EOPNOTSUPP ;/* No flag for now. */
@@ -402,7 +414,7 @@ SYSCALL_DEFINE2(landlock_restrict_self, const int, ruleset_fd, const __u32,struct landlock_cred_security *new_llcred;int err; -if (!landlock_initialized) +if (!is_initialized ())return -EOPNOTSUPP ;/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 115/272 drm/probe-helper: warn about negative .get_modes()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit 7af03e688792293ba33149fb8df619a8dff90e80 ]
The .get_modes() callback is supposed to return the number of modes, never a negative error code. If a negative value is returned, it'll just be interpreted as a negative count, and added to previous calculations.
Document the rules, but handle the negative values gracefully with an error message.
--- drivers/gpu/drm/drm_probe_helper.c | 7 +++++++ include/drm/drm_modeset_helper_vtables.h | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_probe_helper.c +7 -0
@@ -362,6 +362,13 @@ static int drm_helper_probe_get_modes(struct drm_connector *connector) count = connector_funcs->get_modes (connector); +/* The .get_modes() callback should not return negative values. */ +if (count <0 ) { +drm_err (connector->dev,".get_modes() returned %pe\n" , +ERR_PTR (count)); + count =0 ; + } +/* * Fallback for when DDC probe failed in drm_get_edid() and thus skipped * override/firmware EDID.
include/drm/drm_modeset_helper_vtables.h +2 -1
@@ -896,7 +896,8 @@ struct drm_connector_helper_funcs {* * RETURNS: * -* The number of modes added by calling drm_mode_probed_add(). +* The number of modes added by calling drm_mode_probed_add(). Return 0 +* on failures (no modes) instead of negative error codes. */ int (*get_modes)(struct drm_connector *connector);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 124/272 nilfs2: fix failure to detect DAT corruption in btree and direct mappings
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit f2f26b4a84a0ef41791bd2d70861c8eac748f4ba ]
Patch series "nilfs2: fix kernel bug at submit_bh_wbc()".
This resolves a kernel BUG reported by syzbot. Since there are two flaws involved, I've made each one a separate patch.
The first patch alone resolves the syzbot-reported bug, but I think both fixes should be sent to stable, so I've tagged them as such.
This patch (of 2):
Syzbot has reported a kernel bug in submit_bh_wbc() when writing file data to a nilfs2 file system whose metadata is corrupted.
There are two flaws involved in this issue.
The first flaw is that when nilfs_get_block() locates a data block using btree or direct mapping, if the disk address translation routine nilfs_dat_translate() fails with internal code -ENOENT due to DAT metadata corruption, it can be passed back to nilfs_get_block(). This causes nilfs_get_block() to misidentify an existing block as non-existent, causing both data block lookup and insertion to fail inconsistently.
The second flaw is that nilfs_get_block() returns a successful status in this inconsistent state. This causes the caller __block_write_begin_int() or others to request a read even though the buffer is not mapped, resulting in a BUG_ON check for the BH_Mapped flag in submit_bh_wbc() failing.
This fixes the first issue by changing the return value to code -EINVAL when a conversion using DAT fails with code -ENOENT, avoiding the conflicting condition that leads to the kernel bug described above. Here, code -EINVAL indicates that metadata corruption was detected during the block lookup, which will be properly handled as a file system error and converted to -EIO when passing through the nilfs2 bmap layer.
--- fs/nilfs2/btree.c | 9 +++++++-- fs/nilfs2/direct.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-)
fs/nilfs2/btree.c +7 -2
@@ -724,7 +724,7 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree, dat =nilfs_bmap_get_dat (btree); ret =nilfs_dat_translate (dat, ptr, &blocknr);if (ret <0 ) - goto out; + goto dat_error; ptr = blocknr; } cnt =1 ;
@@ -743,7 +743,7 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree,if (dat) { ret =nilfs_dat_translate (dat, ptr2, &blocknr);if (ret <0 ) - goto out; + goto dat_error; ptr2 = blocknr; }if (ptr2 != ptr + cnt || ++cnt == maxblocks)
@@ -781,6 +781,11 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree, out:nilfs_btree_free_path (path);return ret; + + dat_error: +if (ret == -ENOENT ) + ret = -EINVAL ;/* Notify bmap layer of metadata corruption */ + goto out; } static void nilfs_btree_promote_key(struct nilfs_bmap *btree,
fs/nilfs2/direct.c +7 -2
@@ -66,7 +66,7 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct, dat =nilfs_bmap_get_dat (direct); ret =nilfs_dat_translate (dat, ptr, &blocknr);if (ret <0 ) -return ret; + goto dat_error; ptr = blocknr; }
@@ -79,7 +79,7 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct,if (dat) { ret =nilfs_dat_translate (dat, ptr2, &blocknr);if (ret <0 ) -return ret; + goto dat_error; ptr2 = blocknr; }if (ptr2 != ptr + cnt)
@@ -87,6 +87,11 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct, } *ptrp = ptr;return cnt; + + dat_error: +if (ret == -ENOENT ) + ret = -EINVAL ;/* Notify bmap layer of metadata corruption */ +return ret; } static __u64
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 125/272 nilfs2: prevent kernel bug at submit_bh_wbc()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit 269cdf353b5bdd15f1a079671b0f889113865f20 ]
Fix a bug where nilfs_get_block() returns a successful status when searching and inserting the specified block both fail inconsistently. If this inconsistent behavior is not due to a previously fixed bug, then an unexpected race is occurring, so return a temporary error -EAGAIN instead.
This prevents callers such as __block_write_begin_int() from requesting a read into a buffer that is not mapped, which would cause the BUG_ON check for the BH_Mapped flag in submit_bh_wbc() to fail.
--- fs/nilfs2/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nilfs2/inode.c +1 -1
@@ -112,7 +112,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,"%s (ino=%lu): a race condition while inserting a data block at offset=%llu" , __func__, inode->i_ino, (unsigned long long)blkoff); - err =0 ; + err = -EAGAIN ; }nilfs_transaction_abort (inode->i_sb); goto out;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 126/272 cifs: open_cached_dir(): add FILE_READ_EA to desired access
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eugene Korenevsky <[email protected]>
[ Upstream commit f1b8224b4e6ed59e7e6f5c548673c67410098d8d ]
Since smb2_query_eas() reads EA and uses cached directory, open_cached_dir() should request FILE_READ_EA access.
Otherwise listxattr() and getxattr() will fail with EACCES (0xc0000022 STATUS_ACCESS_DENIED SMB status).
--- fs/smb/client/cached_dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/smb/client/cached_dir.c +2 -1
@@ -218,7 +218,8 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, .tcon = tcon, .path = path, .create_options = cifs_create_options(cifs_sb, CREATE_NOT_FILE), - .desired_access = FILE_READ_DATA | FILE_READ_ATTRIBUTES, + .desired_access = FILE_READ_DATA | FILE_READ_ATTRIBUTES | + FILE_READ_EA, .disposition = FILE_OPEN, .fid = pfid, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 127/272 cpufreq: dt: always allocate zeroed cpumask
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit d2399501c2c081eac703ca9597ceb83c7875a537 ]
Commit 0499a78369ad ("ARM64: Dynamically allocate cpumasks and increase supported CPUs to 512") changed the handling of cpumasks on ARM 64bit, what resulted in the strange issues and warnings during cpufreq-dt initialization on some big.LITTLE platforms.
This was caused by mixing OPPs between big and LITTLE cores, because OPP-sharing information between big and LITTLE cores is computed on cpumask, which in turn was not zeroed on allocation. Fix this by switching to zalloc_cpumask_var() call.
--- drivers/cpufreq/cpufreq-dt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cpufreq-dt.c +1 -1
@@ -208,7 +208,7 @@ static int dt_cpufreq_early_init(struct device *dev, int cpu)if (!priv)return -ENOMEM ; -if (!alloc_cpumask_var (&priv->cpus,GFP_KERNEL )) +if (!zalloc_cpumask_var (&priv->cpus,GFP_KERNEL ))return -ENOMEM ;cpumask_set_cpu (cpu, priv->cpus);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 128/272 x86/CPU/AMD: Update the Zenbleed microcode revisions
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov (AMD) <[email protected]>
[ Upstream commit 5c84b051bd4e777cf37aaff983277e58c99618d5 ]
Update them to the correct revision numbers.
--- arch/x86/kernel/cpu/amd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/amd.c +5 -5
@@ -997,11 +997,11 @@ static bool cpu_has_zenbleed_microcode(void)u32 good_rev =0 ;switch (boot_cpu_data.x86_model) { - case 0x30 ... 0x3f: good_rev = 0x0830107a; break; - case 0x60 ... 0x67: good_rev = 0x0860010b; break; - case 0x68 ... 0x6f: good_rev = 0x08608105; break; - case 0x70 ... 0x7f: good_rev = 0x08701032; break; - case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; + case 0x30 ... 0x3f: good_rev = 0x0830107b; break; + case 0x60 ... 0x67: good_rev = 0x0860010c; break; + case 0x68 ... 0x6f: good_rev = 0x08608107; break; + case 0x70 ... 0x7f: good_rev = 0x08701033; break; + case 0xa0 ... 0xaf: good_rev = 0x08a00009; break;default :return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 129/272 NFSD: Fix nfsd_clid_class use of __string_len() macro
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 9388a2aa453321bcf1ad2603959debea9e6ab6d4 ]
I'm working on restructuring the __string* macros so that it doesn't need to recalculate the string twice. That is, it will save it off when processing __string() and the __assign_str() will not need to do the work again as it currently does.
Currently __string_len(item, src, len) doesn't actually use "src", but my changes will require src to be correct as that is where the __assign_str() will get its value from.
The event class nfsd_clid_class has:
__string_len(name, name, clp->cl_name.len)
But the second "name" does not exist and causes my changes to fail to build. That second parameter should be: clp->cl_name.data.
--- fs/nfsd/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/trace.h +1 -1
@@ -842,7 +842,7 @@ DECLARE_EVENT_CLASS(nfsd_clid_class, __array(unsigned char, addr, sizeof(struct sockaddr_in6)) __field(unsigned long, flavor) __array(unsigned char, verifier, NFS4_VERIFIER_SIZE) - __string_len(name, name, clp->cl_name.len) + __string_len(name, clp->cl_name.data, clp->cl_name.len) ),TP_fast_assign ( __entry->cl_boot = clp->cl_clientid.cl_boot;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 130/272 net: hns3: tracing: fix hclgevf trace event strings
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 3f9952e8d80cca2da3b47ecd5ad9ec16cfd1a649 ]
The __string() and __assign_str() helper macros of the TRACE_EVENT() macro are going through some optimizations where only the source string of __string() will be used and the __assign_str() source will be ignored and later removed.
To make sure that there's no issues, a new check is added between the __string() src argument and the __assign_str() src argument that does a strcmp() to make sure they are the same string.
The hclgevf trace events have:
__assign_str(devname, &hdev->nic.kinfo.netdev->name);
Which triggers the warning:
hclgevf_trace.h:34:39: error: passing argument 1 of ‘strcmp’ from incompatible pointer type [-Werror=incompatible-pointer-types]
34 | __assign_str(devname, &hdev->nic.kinfo.netdev->name);
[..]arch/x86/include/asm/string_64.h:75:24: note: expected ‘const char *’ but argument is of type ‘char (*)[16]’
75 | int strcmp(const char *cs, const char *ct);
| ~~~~~~~~~~~~^~Because __assign_str() now has:
WARN_ON_ONCE(__builtin_constant_p(src) ? \ strcmp((src), __data_offsets.dst##_ptr_) : \ (src) != __data_offsets.dst##_ptr_); \
The problem is the '&' on hdev->nic.kinfo.netdev->name. That's because that name is:
char name[IFNAMSIZ]
Where passing an address '&' of a char array is not compatible with strcmp().
The '&' is not necessary, remove it.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h | 8 ++++---- .../net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h +4 -4
@@ -24,7 +24,7 @@ TRACE_EVENT(hclge_pf_mbx_get, __field(u8, code) __field(u8, subcode) __string(pciname, pci_name(hdev->pdev)) - __string(devname, &hdev->vport[0].nic.kinfo.netdev->name) + __string(devname, hdev->vport[0].nic.kinfo.netdev->name)__array (u32, mbx_data,PF_GET_MBX_LEN ) ),
@@ -33,7 +33,7 @@ TRACE_EVENT(hclge_pf_mbx_get, __entry->code = req->msg.code; __entry->subcode = req->msg.subcode;__assign_str (pciname,pci_name (hdev->pdev)); -__assign_str (devname, &hdev->vport[0 ].nic.kinfo.netdev->name); +__assign_str (devname, hdev->vport[0 ].nic.kinfo.netdev->name);memcpy (__entry->mbx_data, req,sizeof (struct hclge_mbx_vf_to_pf_cmd )); ),
@@ -56,7 +56,7 @@ TRACE_EVENT(hclge_pf_mbx_send, __field(u8, vfid) __field(u16, code) __string(pciname, pci_name(hdev->pdev)) - __string(devname, &hdev->vport[0].nic.kinfo.netdev->name) + __string(devname, hdev->vport[0].nic.kinfo.netdev->name)__array (u32, mbx_data,PF_SEND_MBX_LEN ) ),
@@ -64,7 +64,7 @@ TRACE_EVENT(hclge_pf_mbx_send, __entry->vfid = req->dest_vfid; __entry->code =le16_to_cpu (req->msg.code);__assign_str (pciname,pci_name (hdev->pdev)); -__assign_str (devname, &hdev->vport[0 ].nic.kinfo.netdev->name); +__assign_str (devname, hdev->vport[0 ].nic.kinfo.netdev->name);memcpy (__entry->mbx_data, req,sizeof (struct hclge_mbx_pf_to_vf_cmd )); ),
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h +4 -4
@@ -23,7 +23,7 @@ TRACE_EVENT(hclge_vf_mbx_get, __field(u8, vfid) __field(u16, code) __string(pciname, pci_name(hdev->pdev)) - __string(devname, &hdev->nic.kinfo.netdev->name) + __string(devname, hdev->nic.kinfo.netdev->name)__array (u32, mbx_data,VF_GET_MBX_LEN ) ),
@@ -31,7 +31,7 @@ TRACE_EVENT(hclge_vf_mbx_get, __entry->vfid = req->dest_vfid; __entry->code =le16_to_cpu (req->msg.code);__assign_str (pciname,pci_name (hdev->pdev)); -__assign_str (devname, &hdev->nic.kinfo.netdev->name); +__assign_str (devname, hdev->nic.kinfo.netdev->name);memcpy (__entry->mbx_data, req,sizeof (struct hclge_mbx_pf_to_vf_cmd )); ),
@@ -55,7 +55,7 @@ TRACE_EVENT(hclge_vf_mbx_send, __field(u8, code) __field(u8, subcode) __string(pciname, pci_name(hdev->pdev)) - __string(devname, &hdev->nic.kinfo.netdev->name) + __string(devname, hdev->nic.kinfo.netdev->name)__array (u32, mbx_data,VF_SEND_MBX_LEN ) ),
@@ -64,7 +64,7 @@ TRACE_EVENT(hclge_vf_mbx_send, __entry->code = req->msg.code; __entry->subcode = req->msg.subcode;__assign_str (pciname,pci_name (hdev->pdev)); -__assign_str (devname, &hdev->nic.kinfo.netdev->name); +__assign_str (devname, hdev->nic.kinfo.netdev->name);memcpy (__entry->mbx_data, req,sizeof (struct hclge_mbx_vf_to_pf_cmd )); ),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 131/272 LoongArch: Change __my_cpu_offset definition to avoid mis-optimization
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit c87e12e0e8c1241410e758e181ca6bf23efa5b5b ]
Quoted 1 line
From GCC commit
3f13154553f8546a("df-scan: remove ad-hoc handling of
global regs in asms"), global registers will no longer be forced to add to the def-use chain. Then current_thread_info(), current_stack_pointer and __my_cpu_offset may be lifted out of the loop because they are no longer treated as "volatile variables".
This optimization is still correct for the current_thread_info() and current_stack_pointer usages because they are associated to a thread. However it is wrong for __my_cpu_offset because it is associated to a CPU rather than a thread: if the thread migrates to a different CPU in the loop, __my_cpu_offset should be changed.
Change __my_cpu_offset definition to treat it as a "volatile variable", in order to avoid such a mis-optimization.
--- arch/loongarch/include/asm/percpu.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/loongarch/include/asm/percpu.h +6 -1
@@ -25,7 +25,12 @@ static inline void set_my_cpu_offset(unsigned long off) __my_cpu_offset = off;csr_write64 (off,PERCPU_BASE_KS ); } -#define __my_cpu_offset __my_cpu_offset + +#define __my_cpu_offset \ +({ \ + __asm__ __volatile__("":"+r"(__my_cpu_offset)); \ + __my_cpu_offset; \ +})#define PERCPU_OP (op, asm_op, c_op) \ static __always_inline unsigned long __percpu_##op(void *ptr, \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 132/272 LoongArch: Define the __io_aw() hook as mmiowb()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit 9c68ece8b2a5c5ff9b2fcaea923dd73efeb174cd ]
Commit fb24ea52f78e0d595852e ("drivers: Remove explicit invocations of mmiowb()") remove all mmiowb() in drivers, but it says:
"NOTE: mmiowb() has only ever guaranteed ordering in conjunction with spin_unlock(). However, pairing each mmiowb() removal in this patch with the corresponding call to spin_unlock() is not at all trivial, so there is a small chance that this change may regress any drivers incorrectly relying on mmiowb() to order MMIO writes between CPUs using lock-free synchronisation."
The mmio in radeon_ring_commit() is protected by a mutex rather than a spinlock, but in the mutex fastpath it behaves similar to spinlock. We can add mmiowb() calls in the radeon driver but the maintainer says he doesn't like such a workaround, and radeon is not the only example of mutex protected mmio.
So we should extend the mmiowb tracking system from spinlock to mutex, and maybe other locking primitives. This is not easy and error prone, so we solve it in the architectural code, by simply defining the __io_aw() hook as mmiowb(). And we no longer need to override queued_spin_unlock() so use the generic definition.
Without this, we get such an error when run 'glxgears' on weak ordering architectures such as LoongArch:
radeon 0000:04:00.0: ring 0 stalled for more than 10324msec
radeon 0000:04:00.0: ring 3 stalled for more than 10240msec
radeon 0000:04:00.0: GPU lockup (current fence id 0x000000000001f412 last fence id 0x000000000001f414 on ring 3) radeon 0000:04:00.0: GPU lockup (current fence id 0x000000000000f940 last fence id 0x000000000000f941 on ring 0) radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
radeon 0000:04:00.0: scheduling IB failed (-35).
[drm:radeon_gem_va_ioctl [radeon]] *ERROR* Couldn't update BO_VA (-35)
--- arch/loongarch/include/asm/io.h | 2 ++ 1 file changed, 2 insertions(+)
arch/loongarch/include/asm/io.h +2 -0
@@ -72,6 +72,8 @@ extern void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t#define memcpy_fromio (a, c, l) __memcpy_fromio((a), (c), (l))#define memcpy_toio (c, a, l) __memcpy_toio((c), (a), (l)) +#define __io_aw () mmiowb() +#include <asm-generic/io.h> #define ARCH_HAS_VALID_PHYS_ADDR_RANGE
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 133/272 wireguard: netlink: check for dangling peer via is_dead instead of empty list
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason A. Donenfeld <[email protected]>
[ Upstream commit 55b6c738673871c9b0edae05d0c97995c1ff08c4 ]
If all peers are removed via wg_peer_remove_all(), rather than setting peer_list to empty, the peer is added to a temporary list with a head on the stack of wg_peer_remove_all(). If a netlink dump is resumed and the cursored peer is one that has been removed via wg_peer_remove_all(), it will iterate from that peer and then attempt to dump freed peers.
Fix this by instead checking peer->is_dead, which was explictly created for this purpose. Also move up the device_update_lock lockdep assertion, since reading is_dead relies on that.
It can be reproduced by a small script like:
echo "Setting config..."
ip link add dev wg0 type wireguard
wg setconf wg0 /big-config
(
while true; do
echo "Showing config..."
wg showconf wg0 > /dev/null
done
) &
sleep 4
wg setconf wg0 <(printf "[Peer]\nPublicKey=$(wg genkey)\n")
Resulting in:
BUG: KASAN: slab-use-after-free in __lock_acquire+0x182a/0x1b20
Read of size 8 at addr ffff88811956ec70 by task wg/59
CPU: 2 PID: 59 Comm: wg Not tainted 6.8.0-rc2-debug+ #5
Call Trace:
<TASK>
dump_stack_lvl+0x47/0x70
print_address_description.constprop.0+0x2c/0x380
print_report+0xab/0x250
kasan_report+0xba/0xf0
__lock_acquire+0x182a/0x1b20
lock_acquire+0x191/0x4b0
down_read+0x80/0x440
get_peer+0x140/0xcb0
wg_get_device_dump+0x471/0x1130--- drivers/net/wireguard/netlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireguard/netlink.c +3 -3
@@ -255,17 +255,17 @@ static int wg_get_device_dump(struct sk_buff *skb, struct netlink_callback *cb)if (!peers_nest) goto out; ret =0 ; -/* If the last cursor was removed via list_del_init in peer_remove, then +lockdep_assert_held (&wg->device_update_lock); +/* If the last cursor was removed in peer_remove or peer_remove_all, then * we just treat this the same as there being no more peers left. The * reason is that seq_nr should indicate to userspace that this isn't a * coherent dump anyway, so they'll try again. */ if (list_empty (&wg->peer_list) || - (ctx->next_peer &&list_empty (&ctx->next_peer->peer_list))) { + (ctx->next_peer && ctx->next_peer->is_dead)) {nla_nest_cancel (skb, peers_nest); goto out; } -lockdep_assert_held (&wg->device_update_lock); peer =list_prepare_entry (ctx->next_peer, &wg->peer_list, peer_list);list_for_each_entry_continue (peer, &wg->peer_list, peer_list) {if (get_peer (peer, skb, ctx)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 116/272 drm/panel: do not return negative error codes from drm_panel_get_modes()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit fc4e97726530241d96dd7db72eb65979217422c9 ]
None of the callers of drm_panel_get_modes() expect it to return negative error codes. Either they propagate the return value in their struct drm_connector_helper_funcs .get_modes() hook (which is also not supposed to return negative codes), or add it to other counts leading to bogus values.
On the other hand, many of the struct drm_panel_funcs .get_modes() hooks do return negative error codes, so handle them gracefully instead of propagating further.
Return 0 for no modes, whatever the reason.
--- drivers/gpu/drm/drm_panel.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_panel.c +11 -6
@@ -207,19 +207,24 @@ EXPORT_SYMBOL(drm_panel_disable);* The modes probed from the panel are automatically added to the connector * that the panel is attached to. * -* Return: The number of modes available from the panel on success or a -* negative error code on failure. +* Return: The number of modes available from the panel on success, or 0 on +* failure (no modes). */ int drm_panel_get_modes (struct drm_panel *panel,struct drm_connector *connector) {if (!panel) -return -EINVAL ; +return 0 ; -if (panel->funcs && panel->funcs->get_modes) -return panel->funcs->get_modes (panel, connector); +if (panel->funcs && panel->funcs->get_modes) { +int num; -return -EOPNOTSUPP ; + num = panel->funcs->get_modes (panel, connector); +if (num >0 ) +return num; + } + +return 0 ; }EXPORT_SYMBOL (drm_panel_get_modes);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 134/272 wireguard: netlink: access device through ctx instead of peer
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason A. Donenfeld <[email protected]>
[ Upstream commit 71cbd32e3db82ea4a74e3ef9aeeaa6971969c86f ]
The previous commit fixed a bug that led to a NULL peer->device being dereferenced. It's actually easier and faster performance-wise to instead get the device from ctx->wg. This semantically makes more sense too, since ctx->wg->peer_allowedips.seq is compared with ctx->allowedips_seq, basing them both in ctx. This also acts as a defence in depth provision against freed peers.
--- drivers/net/wireguard/netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireguard/netlink.c +2 -2
@@ -164,8 +164,8 @@ get_peer(struct wg_peer *peer, struct sk_buff *skb, struct dump_ctx *ctx)if (!allowedips_node) goto no_allowedips;if (!ctx->allowedips_seq) - ctx->allowedips_seq = peer->device->peer_allowedips.seq; -else if (ctx->allowedips_seq != peer->device->peer_allowedips.seq) + ctx->allowedips_seq = ctx->wg->peer_allowedips.seq; +else if (ctx->allowedips_seq != ctx->wg->peer_allowedips.seq) goto no_allowedips; allowedips_nest =nla_nest_start (skb,WGPEER_A_ALLOWEDIPS );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 135/272 ahci: asm1064: correct count of reported ports
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Jr. Melnikov <[email protected]>
[ Upstream commit 9815e39617541ef52d0dfac4be274ad378c6dc09 ]
The ASM1064 SATA host controller always reports wrongly, that it has 24 ports. But in reality, it only has four ports.
before:
ahci 0000:04:00.0: SSS flag set, parallel bus scan disabled
ahci 0000:04:00.0: AHCI 0001.0301 32 slots 24 ports 6 Gbps 0xffff0f impl SATA mode ahci 0000:04:00.0: flags: 64bit ncq sntf stag pm led only pio sxs deso sadm sds apst
after:
ahci 0000:04:00.0: ASM1064 has only four ports
ahci 0000:04:00.0: forcing port_map 0xffff0f -> 0xf
ahci 0000:04:00.0: SSS flag set, parallel bus scan disabled
ahci 0000:04:00.0: AHCI 0001.0301 32 slots 24 ports 6 Gbps 0xf impl SATA mode ahci 0000:04:00.0: flags: 64bit ncq sntf stag pm led only pio sxs deso sadm sds apst
Stable-dep-of: 6cd8adc3e189 ("ahci: asm1064: asm1166: don't limit reported ports")
--- drivers/ata/ahci.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/ata/ahci.c +11 -3
@@ -671,9 +671,17 @@ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets");static void ahci_pci_save_initial_config (struct pci_dev *pdev,struct ahci_host_priv *hpriv) { -if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA && pdev->device ==0x1166 ) { -dev_info (&pdev->dev,"ASM1166 has only six ports\n" ); - hpriv->saved_port_map =0x3f ; +if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA ) { +switch (pdev->device) { +case 0x1166 : +dev_info (&pdev->dev,"ASM1166 has only six ports\n" ); + hpriv->saved_port_map =0x3f ; +break ; +case 0x1064 : +dev_info (&pdev->dev,"ASM1064 has only four ports\n" ); + hpriv->saved_port_map =0xf ; +break ; + } }if (pdev->vendor ==PCI_VENDOR_ID_JMICRON && pdev->device ==0x2361 ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 136/272 ahci: asm1064: asm1166: dont limit reported ports
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Conrad Kostecki <[email protected]>
[ Upstream commit 6cd8adc3e18960f6e59d797285ed34ef473cc896 ]
Previously, patches have been added to limit the reported count of SATA ports for asm1064 and asm1166 SATA controllers, as those controllers do report more ports than physically having.
While it is allowed to report more ports than physically having in CAP.NP, it is not allowed to report more ports than physically having in the PI (Ports Implemented) register, which is what these HBAs do. (This is a AHCI spec violation.)
Unfortunately, it seems that the PMP implementation in these ASMedia HBAs is also violating the AHCI and SATA-IO PMP specification.
What these HBAs do is that they do not report that they support PMP (CAP.SPM (Supports Port Multiplier) is not set).
Instead, they have decided to add extra "virtual" ports in the PI register that is used if a port multiplier is connected to any of the physical ports of the HBA.
Enumerating the devices behind the PMP as specified in the AHCI and SATA-IO specifications, by using PMP READ and PMP WRITE commands to the physical ports of the HBA is not possible, you have to use the "virtual" ports.
This is of course bad, because this gives us no way to detect the device and vendor ID of the PMP actually connected to the HBA, which means that we can not apply the proper PMP quirks for the PMP that is connected to the HBA.
Limiting the port map will thus stop these controllers from working with SATA Port Multipliers.
This patch reverts both patches for asm1064 and asm1166, so old behavior is restored and SATA PMP will work again, but it will also reintroduce the (minutes long) extra boot time for the ASMedia controllers that do not have a PMP connected (either on the PCIe card itself, or an external PMP).
However, a longer boot time for some, is the lesser evil compared to some other users not being able to detect their drives at all.
--- drivers/ata/ahci.c | 13 ------------- 1 file changed, 13 deletions(-)
drivers/ata/ahci.c +0 -13
@@ -671,19 +671,6 @@ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets");static void ahci_pci_save_initial_config (struct pci_dev *pdev,struct ahci_host_priv *hpriv) { -if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA ) { -switch (pdev->device) { -case 0x1166 : -dev_info (&pdev->dev,"ASM1166 has only six ports\n" ); - hpriv->saved_port_map =0x3f ; -break ; -case 0x1064 : -dev_info (&pdev->dev,"ASM1064 has only four ports\n" ); - hpriv->saved_port_map =0xf ; -break ; - } - } -if (pdev->vendor ==PCI_VENDOR_ID_JMICRON && pdev->device ==0x2361 ) {dev_info (&pdev->dev,"JMB361 has only one port\n" ); hpriv->saved_port_map =1 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 137/272 drm/amdgpu: amdgpu_ttm_gart_bind set gtt bound flag
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philip Yang <[email protected]>
[ Upstream commit 6c6064cbe58b43533e3451ad6a8ba9736c109ac3 ]
Otherwise after the GTT bo is released, the GTT and gart space is freed but amdgpu_ttm_backend_unbind will not clear the gart page table entry and leave valid mapping entry pointing to the stale system page. Then if GPU access the gart address mistakely, it will read undefined value instead page fault, harder to debug and reproduce the real issue.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -0
@@ -838,6 +838,7 @@ static void amdgpu_ttm_gart_bind(struct amdgpu_device *adev,amdgpu_gart_bind (adev, gtt->offset, ttm->num_pages, gtt->ttm.dma_address, flags); } + gtt->bound = true; }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 138/272 drm/amd/display: Return the correct HDCP error code
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rodrigo Siqueira <[email protected]>
[ Upstream commit e64b3f55e458ce7e2087a0051f47edabf74545e7 ]
[WHY & HOW]
If the display is null when creating an HDCP session, return a proper error code.
--- drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c +3 -0
@@ -513,6 +513,9 @@ enum mod_hdcp_status mod_hdcp_hdcp2_create_session(struct mod_hdcp *hdcp) hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.context.mem_context.shared_buf;memset (hdcp_cmd,0 ,sizeof (struct ta_hdcp_shared_memory )); +if (!display) +return MOD_HDCP_STATUS_DISPLAY_NOT_FOUND ; + hdcp_cmd->in_msg.hdcp2_create_session_v2.display_handle = display->index;if (hdcp->connection.link.adjust.hdcp2.force_type ==MOD_HDCP_FORCE_TYPE_0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 139/272 drm/amd/display: Fix noise issue on HDMI AV mute
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Ma <[email protected]>
[ Upstream commit 69e3be6893a7e668660b05a966bead82bbddb01d ]
[Why]
When mode switching is triggered there is momentary noise visible on some HDMI TV or displays.
[How]
Wait for 2 frames to make sure we have enough time to send out AV mute and sink receives a full frame.
--- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +11 -1
@@ -651,10 +651,20 @@ void dcn30_set_avmute(struct pipe_ctx *pipe_ctx, bool enable)if (pipe_ctx ==NULL )return ; -if (dc_is_hdmi_signal (pipe_ctx->stream->signal) && pipe_ctx->stream_res.stream_enc !=NULL ) +if (dc_is_hdmi_signal (pipe_ctx->stream->signal) && pipe_ctx->stream_res.stream_enc !=NULL ) { pipe_ctx->stream_res.stream_enc->funcs->set_avmute ( pipe_ctx->stream_res.stream_enc, enable); + +/* Wait for two frame to make sure AV mute is sent out */ +if (enable) { + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VACTIVE ); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VBLANK ); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VACTIVE ); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VBLANK ); + pipe_ctx->stream_res.tg->funcs->wait_for_state (pipe_ctx->stream_res.tg,CRTC_STATE_VACTIVE ); + } + } }void dcn30_update_info_frame (struct pipe_ctx *pipe_ctx)
Signature · 1 line
2.43.0