From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755309AbbDNU5S (ORCPT ); Tue, 14 Apr 2015 16:57:18 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:45514 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754824AbbDNU4q (ORCPT ); Tue, 14 Apr 2015 16:56:46 -0400 From: Sasha Levin To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, kirill@shutemov.name, linux-mm@kvack.org Subject: [RFC 07/11] mm: debug: VM_BUG() Date: Tue, 14 Apr 2015 16:56:29 -0400 Message-Id: <1429044993-1677-8-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1429044993-1677-1-git-send-email-sasha.levin@oracle.com> References: <1429044993-1677-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VM_BUG() complements VM_BUG_ON() just like with WARN() and WARN_ON(). This lets us format custom strings to output when a VM_BUG() is hit. Signed-off-by: Sasha Levin --- include/linux/mmdebug.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index 8b3f5a0..42f41e3 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h @@ -12,7 +12,14 @@ char *format_page(struct page *page, char *buf, char *end); #ifdef CONFIG_DEBUG_VM char *format_vma(const struct vm_area_struct *vma, char *buf, char *end); char *format_mm(const struct mm_struct *mm, char *buf, char *end); -#define VM_BUG_ON(cond) BUG_ON(cond) +#define VM_BUG(cond, fmt...) \ + do { \ + if (unlikely(cond)) { \ + pr_emerg(fmt); \ + BUG(); \ + } \ + } while (0) +#define VM_BUG_ON(cond) VM_BUG(cond, "%s\n", __stringify(cond)) #define VM_BUG_ON_PAGE(cond, page) \ do { \ if (unlikely(cond)) { \ @@ -46,6 +53,7 @@ static char *format_mm(const struct mm_struct *mm, char *buf, char *end) { return buf; } +#define VM_BUG(cond, fmt...) BUILD_BUG_ON_INVALID(cond) #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) -- 1.7.10.4