From patchwork Fri Dec 18 13:30:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 11982009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E0F1C4361B for ; Fri, 18 Dec 2020 13:31:46 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BDBFB23AC0 for ; Fri, 18 Dec 2020 13:31:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDBFB23AC0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.56504.98954 (Exim 4.92) (envelope-from ) id 1kqFqi-0006zu-58; Fri, 18 Dec 2020 13:31:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 56504.98954; Fri, 18 Dec 2020 13:31:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kqFqi-0006zn-1g; Fri, 18 Dec 2020 13:31:12 +0000 Received: by outflank-mailman (input) for mailman id 56504; Fri, 18 Dec 2020 13:31:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kqFqg-0006zi-Vz for xen-devel@lists.xenproject.org; Fri, 18 Dec 2020 13:31:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kqFqf-00088R-L5; Fri, 18 Dec 2020 13:31:09 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kqFqf-00037b-7v; Fri, 18 Dec 2020 13:31:09 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Message-Id:Date:Subject:Cc:To:From; bh=78IRszokJjcwXWRlJq8XMydnKIcEdWhnJEaC/s7+CP4=; b=ta0capm8ycKAgPRg10EyVyYXOv Eq3yXoDsz5zRDR2pWtdnmZpkhBj5B2wrSZe8T/7LHXp8IlQUyeHykEoY+YgnNGWqEZR4vY8tuaj7b EHVTIh/qq0V9nxVpVYLYxQroVl+ew+/ezFN+501bbZmHhAmBd1ET6Cv0V3/U3kUZ9iCc=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, Rahul.Singh@arm.com, Julien Grall , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Juergen Gross Subject: [PATCH v2] xen: Rework WARN_ON() to return whether a warning was triggered Date: Fri, 18 Dec 2020 13:30:54 +0000 Message-Id: <20201218133054.7744-1-julien@xen.org> X-Mailer: git-send-email 2.17.1 From: Julien Grall So far, our implementation of WARN_ON() cannot be used in the following situation: if ( WARN_ON() ) ... This is because WARN_ON() doesn't return whether a warning has been triggered. Such construciton can be handy if you want to print more information and also dump the stack trace. Therefore, rework the WARN_ON() implementation to return whether a warning was triggered. The idea was borrowed from Linux Signed-off-by: Julien Grall Reviewed-by: Juergen Gross Reviewed-by: Bertrand Marquis Acked-by: Stefano Stabellini Acked-by: Jan Beulich --- Changes in v2: - Rework the commit message - Don't use trailing underscore - Add Bertrand's and Juergen's reviewed-by --- xen/include/xen/lib.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 48429b69b8df..5841bd489c35 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -23,7 +23,13 @@ #include #define BUG_ON(p) do { if (unlikely(p)) BUG(); } while (0) -#define WARN_ON(p) do { if (unlikely(p)) WARN(); } while (0) +#define WARN_ON(p) ({ \ + bool ret_warn_on_ = (p); \ + \ + if ( unlikely(ret_warn_on_) ) \ + WARN(); \ + unlikely(ret_warn_on_); \ +}) /* All clang versions supported by Xen have _Static_assert. */ #if defined(__clang__) || \