From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933136AbcCJXz6 (ORCPT ); Thu, 10 Mar 2016 18:55:58 -0500 Received: from mga09.intel.com ([134.134.136.24]:36649 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933065AbcCJXzy (ORCPT ); Thu, 10 Mar 2016 18:55:54 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,317,1455004800"; d="scan'208";a="63912464" From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-mm@kvack.org, linux-nvdimm@ml01.01.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, willy@linux.intel.com Subject: [PATCH v5 01/14] mmdebug: Always evaluate the arguments to VM_BUG_ON_* Date: Thu, 10 Mar 2016 18:55:18 -0500 Message-Id: <1457654131-4562-2-git-send-email-matthew.r.wilcox@intel.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457654131-4562-1-git-send-email-matthew.r.wilcox@intel.com> References: <1457654131-4562-1-git-send-email-matthew.r.wilcox@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I recently got the order of arguments to VM_BUG_ON_VMA the wrong way around, which was only noticable when compiling with CONFIG_DEBUG_VM. Prevent the next mistake of this kind by making the macros evaluate both their arguments at compile time (this has no effect on the built kernel). Signed-off-by: Matthew Wilcox --- include/linux/mmdebug.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index de7be78..abfc316 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h @@ -41,9 +41,24 @@ void dump_mm(const struct mm_struct *mm); #define VM_WARN_ONCE(cond, format...) WARN_ONCE(cond, format) #else #define VM_BUG_ON(cond) BUILD_BUG_ON_INVALID(cond) -#define VM_BUG_ON_PAGE(cond, page) VM_BUG_ON(cond) -#define VM_BUG_ON_VMA(cond, vma) VM_BUG_ON(cond) -#define VM_BUG_ON_MM(cond, mm) VM_BUG_ON(cond) +#define VM_BUG_ON_PAGE(cond, page) \ + do { \ + if (0) dump_page(page, ""); \ + VM_BUG_ON(cond); \ + } while (0) + +#define VM_BUG_ON_VMA(cond, vma) \ + do { \ + if (0) dump_vma(vma); \ + VM_BUG_ON(cond); \ + } while (0) + +#define VM_BUG_ON_MM(cond, mm) \ + do { \ + if (0) dump_mm(mm); \ + VM_BUG_ON(cond); \ + } while (0) + #define VM_WARN_ON(cond) BUILD_BUG_ON_INVALID(cond) #define VM_WARN_ON_ONCE(cond) BUILD_BUG_ON_INVALID(cond) #define VM_WARN_ONCE(cond, format...) BUILD_BUG_ON_INVALID(cond) -- 2.7.0