From patchwork Wed Jul 5 14:54:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 116207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1942251vqx; Wed, 5 Jul 2023 08:19:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlF56w8E0nygqxGrgtPHoE5YiuX0k7jDPxsUPMKLEowRhSLndunCbwqgedkWav/pCJEcNoEy X-Received: by 2002:a17:90a:1996:b0:263:e813:ae9a with SMTP id 22-20020a17090a199600b00263e813ae9amr4137942pji.12.1688570384521; Wed, 05 Jul 2023 08:19:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688570384; cv=none; d=google.com; s=arc-20160816; b=PudzLdGwm3jKFUgPMC2ojWXFmiAlWhhMgaSn1sbhC76msiV0yhhfjDLI1MLmf1mYiC Lh97pPjrVz1tEW1tUOaOt3hakA1RKFINwYGi8D84dzi3gdIbfLPB+xEJ5CZ7MaG+1RGs gNxAPmutF1QbUXTkdx8Mupsvtz0EZAUWzuxX+zd8xRkm963PFDA7wu234uPmA1OFRhVM 2o1FoHrLV/RLTyx6B/pJ9H/F4JMwpm4/UKuOvVLoi+yZYR/anp6nQsHjBEJve6d0OCYG ZX8zWSZOyjBy8RjzG08wHE3MUYVV3k1oYpOlzqolYui8gpD4e+r/UWhoKf3jZ07C4EDa bhHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Ktiz5JnGjct41q/JncoKfLTAzr51zniMpUOq72kwQDk=; fh=a+KQptYqQCoNYvGuX6JstSJhiP1tL8YdkbG+0kJ3Its=; b=nwujdyyezn1D+yJy1W68Gng0PB2vYm33bA5b14swJMRHF2u/J4qtAtIkGlRgkJJHVb n/D1KnFGmEWhm03lt4LuOh8vwT8RcbjSP0X69KraicIc2Kysc4a7gEV+iVerW/TSlaZ8 JXwKKSN7YseCOCZ8BvNy6dASipngJ6e8SUu/yl7HFruNp8xcJDFXUpWO14JdDjlOgT4F hiFb/5fZ92TzMJ30fhD14smDrAYOtXAeaN0XhSazSuL+v591aDcUb0bVGU1De3I+4fJ7 rCkUxJVWxEJOWqnPVvkzEZGpOT6ENH8NNR/l8C/tdoM7k7/SGVB+z/J57wY6A+uFXrt2 Yaww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u23-20020a17090ae01700b0025e61a6f105si1810224pjy.115.2023.07.05.08.19.31; Wed, 05 Jul 2023 08:19:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232470AbjGEOyl (ORCPT + 99 others); Wed, 5 Jul 2023 10:54:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232303AbjGEOyi (ORCPT ); Wed, 5 Jul 2023 10:54:38 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE52C1985 for ; Wed, 5 Jul 2023 07:54:16 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5979:7b6f:39a:b9cb]) by baptiste.telenet-ops.be with bizsmtp id HSuC2A00Z45Xpxs01SuCGm; Wed, 05 Jul 2023 16:54:13 +0200 Received: from rox.of.borg ([192.168.97.57] helo=rox) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qH3tR-000ccO-2b; Wed, 05 Jul 2023 16:54:12 +0200 Received: from geert by rox with local (Exim 4.95) (envelope-from ) id 1qH3tU-00Aw3y-K5; Wed, 05 Jul 2023 16:54:12 +0200 From: Geert Uytterhoeven To: Andrew Morton , Dan Carpenter Cc: linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] lib: dhry: Fix sleeping allocations inside non-preemptable section Date: Wed, 5 Jul 2023 16:54:04 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770594379457592886?= X-GMAIL-MSGID: =?utf-8?q?1770594379457592886?= 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. Fixes: 13684e966d46283e ("lib: dhry: fix unstable smp_processor_id(_) usage") Reported-by: Dan Carpenter Closes: https://lore.kernel.org/r/0469eb3a-02eb-4b41-b189-de20b931fa56@moroto.mountain Signed-off-by: Geert Uytterhoeven --- Alternatively, memory (de)allocation could be spin off into their own functions, and called outside the non-preemptable section. But that would be more intrusive. --- lib/dhry_1.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/dhry_1.c b/lib/dhry_1.c index 83247106824cc7f4..08edbbb19f573ff7 100644 --- a/lib/dhry_1.c +++ b/lib/dhry_1.c @@ -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;