From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751834AbaK0QDg (ORCPT ); Thu, 27 Nov 2014 11:03:36 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:60719 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751454AbaK0QBc (ORCPT ); Thu, 27 Nov 2014 11:01:32 -0500 X-AuditID: cbfec7f5-b7fc86d0000066b7-91-54774ad947e0 From: Andrey Ryabinin To: Andrew Morton Cc: Andrey Ryabinin , Dmitry Vyukov , Konstantin Serebryany , Dmitry Chernenkov , Andrey Konovalov , Yuri Gribov , Konstantin Khlebnikov , Sasha Levin , Christoph Lameter , Joonsoo Kim , Dave Hansen , Andi Kleen , "H. Peter Anvin" , x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Pekka Enberg , David Rientjes Subject: [PATCH v8 06/12] mm: slub: share slab_err and object_err functions Date: Thu, 27 Nov 2014 19:00:50 +0300 Message-id: <1417104057-20335-7-git-send-email-a.ryabinin@samsung.com> X-Mailer: git-send-email 2.1.3 In-reply-to: <1417104057-20335-1-git-send-email-a.ryabinin@samsung.com> References: <1404905415-9046-1-git-send-email-a.ryabinin@samsung.com> <1417104057-20335-1-git-send-email-a.ryabinin@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRmVeSWpSXmKPExsVy+t/xa7o3vcpDDDruGVts+/WIzeL33pms FnPWr2GzOHLtO7vF9W9vGC0+vXzAaPH84UN2iwkP29gtpm0Ut1jZ3cxmsf3ZWyaLlZ0PWC0u 75rDZnFvzX9Wi7bP/4DEko1MFouP3Ga2ePdsMrPFjw2PWR2EPebv/MjosXPWXXaPBZtKPRbv ecnksWlVJ5vHpk+T2D263l5h8jgx4zeLx5Mr05k8Pj69xeLRt2UVo8fnTXIeJ1q+sAbwRnHZ pKTmZJalFunbJXBlXD6dUHCAu+LehibmBsaVnF2MnBwSAiYSN47OZ4SwxSQu3FvPBmILCSxl lNi7U6aLkQvI7mOSuNrSyQKSYBPQk/g3aztYkYiArsSq57uYQYqYBdpYJZ4+aARLCAt4S8xZ 9xmsgUVAVeLo0p1ARRwcvAJuEj+v54CYEgJyElvXeYNUcAq4S7Sf/8YIsauJUaKl/RrLBEbe BYwMqxhFU0uTC4qT0nON9IoTc4tL89L1kvNzNzFC4uLrDsalx6wOMQpwMCrx8DLcKgsRYk0s K67MPcQowcGsJMLbZFseIsSbklhZlVqUH19UmpNafIiRiYNTqoGx7Nn52DTDpdZbCgt2OHqv f9lTuXfikjzn377bjs9eL16ueU/cidlmbqDl2j89L+4aurx+umr2nqafVfGWRfsPBh8X+Rci M2OVQv4CiWZz7YtcCpUMVrMPv437vWPOjoWndCw7n/otblX/cTjohZjNudmKR13u8D3ba/hz ctn1KMPdE3+HnGtbosRSnJFoqMVcVJwIANJ4ymtpAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove static and add function declarations to mm/slab.h so they could be used by kernel address sanitizer. Signed-off-by: Andrey Ryabinin --- include/linux/slub_def.h | 5 +++++ mm/slub.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index c75bc1d..144b5cb 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -115,4 +115,9 @@ static inline void *virt_to_obj(struct kmem_cache *s, void *slab_page, void *x) return x - ((x - slab_page) % s->size); } +__printf(3, 4) +void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...); +void object_err(struct kmem_cache *s, struct page *page, + u8 *object, char *reason); + #endif /* _LINUX_SLUB_DEF_H */ diff --git a/mm/slub.c b/mm/slub.c index 95d2142..0c01584 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -629,14 +629,14 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p) dump_stack(); } -static void object_err(struct kmem_cache *s, struct page *page, +void object_err(struct kmem_cache *s, struct page *page, u8 *object, char *reason) { slab_bug(s, "%s", reason); print_trailer(s, page, object); } -static void slab_err(struct kmem_cache *s, struct page *page, +void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...) { va_list args; -- 2.1.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by kanga.kvack.org (Postfix) with ESMTP id 9BA476B0072 for ; Thu, 27 Nov 2014 11:01:36 -0500 (EST) Received: by mail-pd0-f173.google.com with SMTP id ft15so5117195pdb.32 for ; Thu, 27 Nov 2014 08:01:36 -0800 (PST) Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com. [210.118.77.14]) by mx.google.com with ESMTPS id vz6si12332148pab.0.2014.11.27.08.01.31 for (version=TLSv1 cipher=RC4-MD5 bits=128/128); Thu, 27 Nov 2014 08:01:32 -0800 (PST) Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NFP00J55GN2I670@mailout4.w1.samsung.com> for linux-mm@kvack.org; Thu, 27 Nov 2014 16:04:14 +0000 (GMT) From: Andrey Ryabinin Subject: [PATCH v8 06/12] mm: slub: share slab_err and object_err functions Date: Thu, 27 Nov 2014 19:00:50 +0300 Message-id: <1417104057-20335-7-git-send-email-a.ryabinin@samsung.com> In-reply-to: <1417104057-20335-1-git-send-email-a.ryabinin@samsung.com> References: <1404905415-9046-1-git-send-email-a.ryabinin@samsung.com> <1417104057-20335-1-git-send-email-a.ryabinin@samsung.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: Andrey Ryabinin , Dmitry Vyukov , Konstantin Serebryany , Dmitry Chernenkov , Andrey Konovalov , Yuri Gribov , Konstantin Khlebnikov , Sasha Levin , Christoph Lameter , Joonsoo Kim , Dave Hansen , Andi Kleen , "H. Peter Anvin" , x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Pekka Enberg , David Rientjes Remove static and add function declarations to mm/slab.h so they could be used by kernel address sanitizer. Signed-off-by: Andrey Ryabinin --- include/linux/slub_def.h | 5 +++++ mm/slub.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index c75bc1d..144b5cb 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -115,4 +115,9 @@ static inline void *virt_to_obj(struct kmem_cache *s, void *slab_page, void *x) return x - ((x - slab_page) % s->size); } +__printf(3, 4) +void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...); +void object_err(struct kmem_cache *s, struct page *page, + u8 *object, char *reason); + #endif /* _LINUX_SLUB_DEF_H */ diff --git a/mm/slub.c b/mm/slub.c index 95d2142..0c01584 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -629,14 +629,14 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p) dump_stack(); } -static void object_err(struct kmem_cache *s, struct page *page, +void object_err(struct kmem_cache *s, struct page *page, u8 *object, char *reason) { slab_bug(s, "%s", reason); print_trailer(s, page, object); } -static void slab_err(struct kmem_cache *s, struct page *page, +void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...) { va_list args; -- 2.1.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org