Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4013775ybg; Tue, 29 Oct 2019 00:27:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyHhGB+xZIBgt1cJlxYYmi7iSE2bdvI3qaeG3yKeSB1lNwAiAgjxXi0TrlceYjC81FfHSX5 X-Received: by 2002:a17:906:300a:: with SMTP id 10mr1837768ejz.104.1572334032473; Tue, 29 Oct 2019 00:27:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572334032; cv=none; d=google.com; s=arc-20160816; b=ycPTjR+aKZrLYCes1Nmx0XJtf+L3GBXpKRktOsH62uSlJSXEzpibyhQz6GhYi84YwH w1YKz2C9M/P7UdPGzfnGFeWjE0ot0Ob1f8pdKaAgz65rN686vZ8AjpB32Z7Ya6MQgUOX dT4oOXY5r8fftdKE03kCT8/X4zG0MJvd44gSBBPyitVaBSPr5Ilo/qtKaBMUtVnKHInQ OPaKHCBfXiLdpPeXj5ol/BOP8RC+2SMGAKWoAJWQduQYoP/YxWIRliggLXF1Cwd4OSXz FpBfeMpfz8Hy+N0P3LuRcbL3gybDtdbO/pMVZkT6s1dNlkTK55SHkpTS4IgTinKbAA+T Dagg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=E6G/cbdwI55VRIDPH2MzPtSSwLNnlVDKj+xUqyB9XvU=; b=F1POxZ9KgHlFm3u8Lc4hEMmMwnjZBkVUSRksM/VWqtb4Ca0b5KjTEEt5vGF1BRk54h H3NLICm+tzKhi/3Pr0EJBU4tQiTdsJ/yqlOkbBnpV2I1xsZurfsmXEwS1pI8XZCrQGnQ Z1jUhlHr/NiCH1lOnp9Y9WKVKBwHrnCIVHuaxulBYnMOGEbJKGMVSADsowURy0qiA7yn HV/tiaTJPZAhiuRVNLWkwAbEjwos/MEErABgywH9FjPRM3917Aj3UoBbXoUjiOxUFVRI iaeWfiByuOxdXYQoFOX9ggowOEBJb6BYhjqwGWL7Uyrp1t6HZyfyOO55SiosxzoOWoEm VhQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@axtens.net header.s=google header.b=q37hvvFE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s2si7597014ejj.327.2019.10.29.00.26.48; Tue, 29 Oct 2019 00:27:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@axtens.net header.s=google header.b=q37hvvFE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731606AbfJ2EVa (ORCPT + 99 others); Tue, 29 Oct 2019 00:21:30 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:46439 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731591AbfJ2EV3 (ORCPT ); Tue, 29 Oct 2019 00:21:29 -0400 Received: by mail-pg1-f194.google.com with SMTP id f19so8565205pgn.13 for ; Mon, 28 Oct 2019 21:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E6G/cbdwI55VRIDPH2MzPtSSwLNnlVDKj+xUqyB9XvU=; b=q37hvvFEaBAuDhdw8f9RGZPAKbEe6zMTpH1vieG+zpL2j/QDs8RghoIx9JE+q4QWze TAruY1QMB+c1d5affF47SiBVcB02uLSf31ZZ6pl18sMLuLqjyMUqrZhipq3ZGdu16JlP nJAdQq+06ElZPTzvTwKeK7V2Y0q4KaKOeZi5s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E6G/cbdwI55VRIDPH2MzPtSSwLNnlVDKj+xUqyB9XvU=; b=mVDj97l6GQkvqnqfzm27WuYG8zksnQRj51hq+RnsjbSfgegSGh9Vf7Iyv4bqTtAutO jGMJ5Tg6JrlnKVb9iS/oVcDxY/LF0f8oAayASDz/JGobuqSJsN82FxG11ydg1BrrsitN tEnTRAaBPOXSTTvJ2zQjR/Ik5Kn8GzUp62HX+IVY3bGKH2EBtvWoqLXpvBK1Xpl7XzYG XsjubDBVYwajQX7sT6aG5plp309TR7wxPOF9FihscFS1usWsmB544Q14EDRjqZQHFxAs eHQSPkXEK01IuELfTagCe15TV+lHpFpRjzmdggPsWrCkpV6hG2L/wHv1FJdhF2zyEo6Y mF0Q== X-Gm-Message-State: APjAAAV+XjEn6bUYesrfnt3iJMlkuUaOfC9ruxAPH3iTMTmFZxOFLPz4 RyMz9ZHAPG32BqtGYujV3jgHog== X-Received: by 2002:a63:e60b:: with SMTP id g11mr23118732pgh.119.1572322888371; Mon, 28 Oct 2019 21:21:28 -0700 (PDT) Received: from localhost ([2001:44b8:802:1120:783a:2bb9:f7cb:7c3c]) by smtp.gmail.com with ESMTPSA id z4sm957607pjt.20.2019.10.28.21.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 21:21:27 -0700 (PDT) From: Daniel Axtens To: kasan-dev@googlegroups.com, linux-mm@kvack.org, x86@kernel.org, aryabinin@virtuozzo.com, glider@google.com, luto@kernel.org, linux-kernel@vger.kernel.org, mark.rutland@arm.com, dvyukov@google.com, christophe.leroy@c-s.fr Cc: linuxppc-dev@lists.ozlabs.org, gor@linux.ibm.com, Daniel Axtens Subject: [PATCH v10 5/5] kasan debug: track pages allocated for vmalloc shadow Date: Tue, 29 Oct 2019 15:20:59 +1100 Message-Id: <20191029042059.28541-6-dja@axtens.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191029042059.28541-1-dja@axtens.net> References: <20191029042059.28541-1-dja@axtens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide the current number of vmalloc shadow pages in /sys/kernel/debug/kasan/vmalloc_shadow_pages. Signed-off-by: Daniel Axtens --- v10: rebase on linux-next/master. v8: rename kasan_vmalloc/shadow_pages -> kasan/vmalloc_shadow_pages On v4 (no dynamic freeing), I saw the following approximate figures on my test VM: - fresh boot: 720 - after test_vmalloc: ~14000 With v5 (lazy dynamic freeing): - boot: ~490-500 - running modprobe test_vmalloc pushes the figures up to sometimes as high as ~14000, but they drop down to ~560 after the test ends. I'm not sure where the extra sixty pages are from, but running the test repeately doesn't cause the number to keep growing, so I don't think we're leaking. - with vmap_stack, spawning tasks pushes the figure up to ~4200, then some clearing kicks in and drops it down to previous levels again. --- mm/kasan/common.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 6e7bc5d3fa83..a4b5c64da16f 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -750,6 +751,8 @@ core_initcall(kasan_memhotplug_init); #endif #ifdef CONFIG_KASAN_VMALLOC +static u64 vmalloc_shadow_pages; + static int kasan_populate_vmalloc_pte(pte_t *ptep, unsigned long addr, void *unused) { @@ -770,6 +773,7 @@ static int kasan_populate_vmalloc_pte(pte_t *ptep, unsigned long addr, if (likely(pte_none(*ptep))) { set_pte_at(&init_mm, addr, ptep, pte); page = 0; + vmalloc_shadow_pages++; } spin_unlock(&init_mm.page_table_lock); if (page) @@ -858,6 +862,7 @@ static int kasan_depopulate_vmalloc_pte(pte_t *ptep, unsigned long addr, if (likely(!pte_none(*ptep))) { pte_clear(&init_mm, addr, ptep); free_page(page); + vmalloc_shadow_pages--; } spin_unlock(&init_mm.page_table_lock); @@ -974,4 +979,22 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end, (unsigned long)shadow_end); } } + +static __init int kasan_init_debugfs(void) +{ + struct dentry *root; + + root = debugfs_create_dir("kasan", NULL); + if (IS_ERR(root)) { + if (PTR_ERR(root) == -ENODEV) + return 0; + return PTR_ERR(root); + } + + debugfs_create_u64("vmalloc_shadow_pages", 0444, root, + &vmalloc_shadow_pages); + + return 0; +} +late_initcall(kasan_init_debugfs); #endif -- 2.20.1