Commit 8ba388c0 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Andrew Morton
Browse files

lib: dhry: fix sleeping allocations inside non-preemptable section 

The Smatch static checker reports the following warnings:

    lib/dhry_run.c:38 dhry_benchmark() warn: sleeping in atomic context
    lib/dhry_run.c:43 dhry_benchmark() warn: sleeping in atomic context

Indeed, dhry() does sleeping allocations inside the non-preemptable
section delimited by get_cpu()/put_cpu().

Fix this by using atomic allocations instead.
Add error handling, as atomic these allocations may fail.

Link: https://lkml.kernel.org/r/bac6d517818a7cd8efe217c1ad649fffab9cc371.1688568764.git.geert+renesas@glider.be


Fixes: 13684e96 ("lib: dhry: fix unstable smp_processor_id(_) usage")
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/0469eb3a-02eb-4b41-b189-de20b931fa56@moroto.mountain


Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent fdb54d96

lib/dhry_1.c

+9 −2
Original line number Diff line number Diff line
@@ -139,8 +139,15 @@ int dhry(int n) 


	/* Initializations */



	Next_Ptr_Glob = (Rec_Pointer)kzalloc(sizeof(Rec_Type), GFP_KERNEL);

	Ptr_Glob = (Rec_Pointer)kzalloc(sizeof(Rec_Type), GFP_KERNEL);

	Next_Ptr_Glob = (Rec_Pointer)kzalloc(sizeof(Rec_Type), GFP_ATOMIC);

	if (!Next_Ptr_Glob)

		return -ENOMEM;



	Ptr_Glob = (Rec_Pointer)kzalloc(sizeof(Rec_Type), GFP_ATOMIC);

	if (!Ptr_Glob) {

		kfree(Next_Ptr_Glob);

		return -ENOMEM;

	}



	Ptr_Glob->Ptr_Comp = Next_Ptr_Glob;

	Ptr_Glob->Discr = Ident_1;