From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755574AbcJZNmh (ORCPT ); Wed, 26 Oct 2016 09:42:37 -0400 Received: from mx2.suse.de ([195.135.220.15]:59580 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754307AbcJZNmc (ORCPT ); Wed, 26 Oct 2016 09:42:32 -0400 From: Vlastimil Babka To: Andrew Morton , Christian Borntraeger Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Vlastimil Babka , stable@vger.kernel.org, Konrad Rzeszutek Wilk , Boris Ostrovsky , David Vrabel , Juergen Gross , "Kirill A. Shutemov" Subject: [PATCH] mm, frontswap: make sure allocated frontswap map is assigned Date: Wed, 26 Oct 2016 15:42:20 +0200 Message-Id: <20161026134220.2566-1-vbabka@suse.cz> X-Mailer: git-send-email 2.10.1 In-Reply-To: <633c9485-d150-03ac-d0d3-827ad24c514d@de.ibm.com> References: <633c9485-d150-03ac-d0d3-827ad24c514d@de.ibm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Christian Borntraeger reports: with commit 8ea1d2a1985a7ae096e ("mm, frontswap: convert frontswap_enabled to static key") kmemleak complains about a memory leak in swapon unreferenced object 0x3e09ba56000 (size 32112640): comm "swapon", pid 7852, jiffies 4294968787 (age 1490.770s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<00000000003a2504>] __vmalloc_node_range+0x194/0x2d8 [<00000000003a2918>] vzalloc+0x58/0x68 [<00000000003b0af0>] SyS_swapon+0xd60/0x12f8 [<0000000000a3dc2e>] system_call+0xd6/0x270 [] 0xffffffffffffffff Turns out kmemleak is right. We now allocate the frontswap map depending on the kernel config (and no longer on the enablement) swapfile.c: [...] if (IS_ENABLED(CONFIG_FRONTSWAP)) frontswap_map = vzalloc(BITS_TO_LONGS(maxpages) * sizeof(long)); but later on this is passed along --> enable_swap_info(p, prio, swap_map, cluster_info, frontswap_map); and ignored if frontswap is disabled --> frontswap_init(p->type, frontswap_map); static inline void frontswap_init(unsigned type, unsigned long *map) { if (frontswap_enabled()) __frontswap_init(type, map); } Thing is, that frontswap map is never freed. === The leakage is relatively not that bad, because swapon is an infrequent and privileged operation. However, if the first frontswap backend is registered after a swap type has been already enabled, it will WARN_ON in frontswap_register_ops() and frontswap will not be available for the swap type. Fix this by making sure the map is assigned by frontswap_init() as long as CONFIG_FRONTSWAP is enabled. Reported-by: Christian Borntraeger Fixes: 8ea1d2a1985a ("mm, frontswap: convert frontswap_enabled to static key") Cc: stable@vger.kernel.org Cc: Konrad Rzeszutek Wilk Cc: Boris Ostrovsky Cc: David Vrabel Cc: Juergen Gross Cc: "Kirill A. Shutemov" Signed-off-by: Vlastimil Babka --- include/linux/frontswap.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h index c46d2aa16d81..1d18af034554 100644 --- a/include/linux/frontswap.h +++ b/include/linux/frontswap.h @@ -106,8 +106,9 @@ static inline void frontswap_invalidate_area(unsigned type) static inline void frontswap_init(unsigned type, unsigned long *map) { - if (frontswap_enabled()) - __frontswap_init(type, map); +#ifdef CONFIG_FRONTSWAP + __frontswap_init(type, map); +#endif } #endif /* _LINUX_FRONTSWAP_H */ -- 2.10.1