From patchwork Sat Oct 17 12:31:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1383647 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=QpeFZXKc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CD2Tz3RwFz9sT6 for ; Sat, 17 Oct 2020 23:32:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 96C77821A4; Sat, 17 Oct 2020 14:32:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="QpeFZXKc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 406EF822D2; Sat, 17 Oct 2020 14:32:30 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DC89D81BD2 for ; Sat, 17 Oct 2020 14:32:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1602937940; bh=1UXV2HI9b7zXhIK9w6p86I47qi7eiJtsW8oPoia79Nw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=QpeFZXKcKbiMcOku/+tF1Ql8Y+exFjC1WGbikaPL5EOBcmAegIr868YrVxozAv4I/ +AB+Wz0RI0GmKnZ3ofIa8j+9x57AELYejNvF88GdoK8kYrkLLLYxdkXxg0r0wafzeu sKvUNW0FEhHHS+uOkdnCSYz5OrX75Lh/fctdBDdE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MStCe-1ksPmc0oF4-00UG9p; Sat, 17 Oct 2020 14:32:20 +0200 From: Heinrich Schuchardt To: Simon Glass Cc: Bin Meng , Peng Fan , Baruch Siach , Masahiro Yamada , Andy Shevchenko , Wolfgang Wallner , Sean Anderson , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH v2 1/3] log: move processing_msg to global data Date: Sat, 17 Oct 2020 14:31:57 +0200 Message-Id: <20201017123159.172357-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201017123159.172357-1-xypron.glpk@gmx.de> References: <20201017123159.172357-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:XAg3NyCnSPo0uDDjO2/zHMCyrsh5k2PrssKhjO06NQeElDP+tRf YL/zPEMcsvKkG7NbMfhQGAdHufsRFqUSbgw71P/xdGF1PMSVzGlslUl8uLYCqrJjaaszMjf zhmLcVaSImvLhTd/jcqB7mk8eEASUy9dZjuryXdiMSWfGOiQW8RcNBV6QQhnnbHf9ntBitf oFTpSUbp9nd8ElSApJtiQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:yBsG89PbxY8=:BthQn1GnKvC/6G15HZib75 sumlV9iyhs2294CvmwDxsg/xrGjOSQYtQ+KVbN6lsKaMJ9hPLu6uZbKM0Wok/QDXA99wu0iCA 1opvjIIP8VeC16Se+oWv2gHuXTBi8FEHHJaNJaGup5iJ7c9nTb94oIxa9zlKD6gbLP2ap4Nj8 5vr/RoWUhsYZ/kSjDZsWVA8LLOr5VpiODA5tanHjQB0LG2hd2IGuYS2c6w0lQwgX5Q9dzcQ0Q jNKrXORgGQ5FYrtQW8piC2I6oG13AUqP7kPXLOBwZ0C0cPMP89mTUagvT0mPpvRS+pXrsPjRg SXs3xwG86dXx4bzo7OsYAjPghP1zVJPGCYpw3V2PuXUxzA/UbZXrNfS54g3vmXbwVzz2q46UZ MIvap1gc9/pYGo5sOrTfzix3Oa+I0XZcXtjTIPwzqvh9eLxMz/JovAIpf5jjG8Rrfono+FBS4 udsUzVLANI5hPmXZRT2b5xQl1chZIrk9vShrzFyG1bHlV5NwkrLLHhumVON0HIQqo4NCLnG/A 3TO9kMrJ9UkGg68bRNHqvQc/lRyF8PB2yMcNg93abgYVdITianmhkOPyxXQbZy3zuh9pzkBDg Z58cCY4xQG8ZnjTlmTgBX3t4LT4VHp2+PiiocQZeuKOB+ClI4FF/N+NGeaDe/PeJWPbUMDyU8 A54I3INu6pdDT2WZJdxvvgS/eXTECllloMzTlN/KiTJcMX3dIxGjpn6CtLkJxXJ771KB/6A0Y 2/TRAD88XS9pQkH8ZHKtk0SRwJhkaFz+yD80gVVm+ZE1v8ace8Nl0u5UAu+21uMMmEiuwCpRs yZXp9q8H21stLW0hkoWaF/e6J91V3eiF6iSj02Zco4iiLJCRDg0JL4cOosqtTuM7aDr/2liGT hZZoj74lrU88RrWbIgiw== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Replace the static variable processing_msg by a field in the global data. Make the field bool at it can only be true or false. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- v2: new patch --- common/log.c | 7 +++---- include/asm-generic/global_data.h | 8 ++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) -- 2.28.0 diff --git a/common/log.c b/common/log.c index 1b10f6f180..f95f09c1b6 100644 --- a/common/log.c +++ b/common/log.c @@ -194,24 +194,23 @@ static bool log_passes_filters(struct log_device *ldev, struct log_rec *rec) static int log_dispatch(struct log_rec *rec) { struct log_device *ldev; - static int processing_msg; /* * When a log driver writes messages (e.g. via the network stack) this * may result in further generated messages. We cannot process them here * as this might result in infinite recursion. */ - if (processing_msg) + if (gd->processing_msg) return 0; /* Emit message */ - processing_msg = 1; + gd->processing_msg = true; list_for_each_entry(ldev, &gd->log_head, sibling_node) { if ((ldev->flags & LOGDF_ENABLE) && log_passes_filters(ldev, rec)) ldev->drv->emit(ldev, rec); } - processing_msg = 0; + gd->processing_msg = false; return 0; } diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index ebb740d34f..db83f59ceb 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -363,6 +363,14 @@ struct global_data { * &enum log_fmt defines the bits of the bit mask. */ int log_fmt; + + /** + * @processing_msg: a log message is being processed + * + * This flag is used to suppress the creation of additional messages + * while another message is being processed. + */ + bool processing_msg; #endif #if CONFIG_IS_ENABLED(BLOBLIST) /**