The buffer is cleared in the suspend handler but used in
the delayed work for amd_pmf_get_metrics().
Stop clearing it to fix the hang.
Reported-by: Trolli Schmittlauch <[email protected]>
Closes: https://lore.kernel.org/regressions/ed2226ff-257b-4cfd-afd6-bf3be9785474@localhost/
Closes: https://community.frame.work/t/kernel-6-8-rc-system-freezes-after-resuming-from-suspend-reproducers-wanted/45381
Fixes: 2b3a7f06caaf ("platform/x86/amd/pmf: Change return type of amd_pmf_set_dram_addr()")
Signed-off-by: Mario Limonciello <[email protected]>
---
drivers/platform/x86/amd/pmf/core.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index 853158933510..4f734e049f4a 100644
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -299,8 +299,6 @@ static int amd_pmf_suspend_handler(struct device *dev)
if (pdev->smart_pc_enabled)
cancel_delayed_work_sync(&pdev->pb_work);
- kfree(pdev->buf);
-
return 0;
}
--
2.34.1
As the reporter of that issue, I confirm that this fixes suspend and resume for me as well. I've applied the patch on top of 6.8-rc4.
Thanks for getting to the bottom of it so quickly.
On 17.02.24 01:52, Mario Limonciello wrote:
> The buffer is cleared in the suspend handler but used in
> the delayed work for amd_pmf_get_metrics().
>
> Stop clearing it to fix the hang.
>
> Reported-by: Trolli Schmittlauch <[email protected]>
> Closes: https://lore.kernel.org/regressions/ed2226ff-257b-4cfd-afd6-bf3be9785474@localhost/
> Closes: https://community.frame.work/t/kernel-6-8-rc-system-freezes-after-resuming-from-suspend-reproducers-wanted/45381
> Fixes: 2b3a7f06caaf ("platform/x86/amd/pmf: Change return type of amd_pmf_set_dram_addr()")
> Signed-off-by: Mario Limonciello <[email protected]>
> ---
> drivers/platform/x86/amd/pmf/core.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> index 853158933510..4f734e049f4a 100644
> --- a/drivers/platform/x86/amd/pmf/core.c
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -299,8 +299,6 @@ static int amd_pmf_suspend_handler(struct device *dev)
> if (pdev->smart_pc_enabled)
> cancel_delayed_work_sync(&pdev->pb_work);
>
> - kfree(pdev->buf);
> -
> return 0;
> }
>
Hi,
On 2/17/24 01:52, Mario Limonciello wrote:
> The buffer is cleared in the suspend handler but used in
> the delayed work for amd_pmf_get_metrics().
>
> Stop clearing it to fix the hang.
>
> Reported-by: Trolli Schmittlauch <[email protected]>
> Closes: https://lore.kernel.org/regressions/ed2226ff-257b-4cfd-afd6-bf3be9785474@localhost/
> Closes: https://community.frame.work/t/kernel-6-8-rc-system-freezes-after-resuming-from-suspend-reproducers-wanted/45381
> Fixes: 2b3a7f06caaf ("platform/x86/amd/pmf: Change return type of amd_pmf_set_dram_addr()")
> Signed-off-by: Mario Limonciello <[email protected]>
Ugh, I should have caught this during review. I especially asked
for the alloc parameter to amd_pmf_set_dram_addr() to be added
for this. Ah well ...
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <[email protected]>
Regards,
Hans
> ---
> drivers/platform/x86/amd/pmf/core.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> index 853158933510..4f734e049f4a 100644
> --- a/drivers/platform/x86/amd/pmf/core.c
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -299,8 +299,6 @@ static int amd_pmf_suspend_handler(struct device *dev)
> if (pdev->smart_pc_enabled)
> cancel_delayed_work_sync(&pdev->pb_work);
>
> - kfree(pdev->buf);
> -
> return 0;
> }
>
Hi Mario,
This was super quick! Thank you for the help. Seems like lot of action
happened over the weekend :-)
Hi Hans,
On 2/18/2024 15:56, Hans de Goede wrote:
> Hi,
>
> On 2/17/24 01:52, Mario Limonciello wrote:
>> The buffer is cleared in the suspend handler but used in
>> the delayed work for amd_pmf_get_metrics().
>>
>> Stop clearing it to fix the hang.
>>
>> Reported-by: Trolli Schmittlauch <[email protected]>
>> Closes: https://lore.kernel.org/regressions/ed2226ff-257b-4cfd-afd6-bf3be9785474@localhost/
>> Closes: https://community.frame.work/t/kernel-6-8-rc-system-freezes-after-resuming-from-suspend-reproducers-wanted/45381
>> Fixes: 2b3a7f06caaf ("platform/x86/amd/pmf: Change return type of amd_pmf_set_dram_addr()")
>> Signed-off-by: Mario Limonciello <[email protected]>
>
> Ugh, I should have caught this during review. I especially asked
> for the alloc parameter to amd_pmf_set_dram_addr() to be added
> for this. Ah well ...
>
> Thanks, patch looks good to me:
Thank you for the support!
Thanks,
Shyam
>
> Reviewed-by: Hans de Goede <[email protected]>
>
> Regards,
>
> Hans
>
>
>
>> ---
>> drivers/platform/x86/amd/pmf/core.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
>> index 853158933510..4f734e049f4a 100644
>> --- a/drivers/platform/x86/amd/pmf/core.c
>> +++ b/drivers/platform/x86/amd/pmf/core.c
>> @@ -299,8 +299,6 @@ static int amd_pmf_suspend_handler(struct device *dev)
>> if (pdev->smart_pc_enabled)
>> cancel_delayed_work_sync(&pdev->pb_work);
>>
>> - kfree(pdev->buf);
>> -
>> return 0;
>> }
>>
>
Hi,
On 2/17/24 01:52, Mario Limonciello wrote:
> The buffer is cleared in the suspend handler but used in
> the delayed work for amd_pmf_get_metrics().
>
> Stop clearing it to fix the hang.
>
> Reported-by: Trolli Schmittlauch <[email protected]>
> Closes: https://lore.kernel.org/regressions/ed2226ff-257b-4cfd-afd6-bf3be9785474@localhost/
> Closes: https://community.frame.work/t/kernel-6-8-rc-system-freezes-after-resuming-from-suspend-reproducers-wanted/45381
> Fixes: 2b3a7f06caaf ("platform/x86/amd/pmf: Change return type of amd_pmf_set_dram_addr()")
> Signed-off-by: Mario Limonciello <[email protected]>
Thank you for your patch, I've applied this patch to my review-hans
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.
I will include this patch in my next fixes pull-req to Linus
for the current kernel development cycle.
Regards,
Hans
> ---
> drivers/platform/x86/amd/pmf/core.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> index 853158933510..4f734e049f4a 100644
> --- a/drivers/platform/x86/amd/pmf/core.c
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -299,8 +299,6 @@ static int amd_pmf_suspend_handler(struct device *dev)
> if (pdev->smart_pc_enabled)
> cancel_delayed_work_sync(&pdev->pb_work);
>
> - kfree(pdev->buf);
> -
> return 0;
> }
>