From patchwork Tue Jan 30 15:14:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Stoppa X-Patchwork-Id: 10191995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A94896020C for ; Tue, 30 Jan 2018 15:18:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99A1A283D1 for ; Tue, 30 Jan 2018 15:18:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E11C28785; Tue, 30 Jan 2018 15:18:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBE32283D1 for ; Tue, 30 Jan 2018 15:18:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752725AbeA3PSc (ORCPT ); Tue, 30 Jan 2018 10:18:32 -0500 Received: from lhrrgout.huawei.com ([194.213.3.17]:23931 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752525AbeA3PSc (ORCPT ); Tue, 30 Jan 2018 10:18:32 -0500 Received: from LHREML714-CAH.china.huawei.com (unknown [172.18.7.107]) by Forcepoint Email with ESMTP id 4F726CDBD01AA; Tue, 30 Jan 2018 15:18:28 +0000 (GMT) Received: from localhost.localdomain (10.122.225.51) by smtpsuk.huawei.com (10.201.108.37) with Microsoft SMTP Server (TLS) id 14.3.361.1; Tue, 30 Jan 2018 15:18:22 +0000 From: Igor Stoppa To: , , , , , CC: , , , , , Igor Stoppa Subject: [PATCH 6/6] Pmalloc: self-test Date: Tue, 30 Jan 2018 17:14:46 +0200 Message-ID: <20180130151446.24698-7-igor.stoppa@huawei.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180130151446.24698-1-igor.stoppa@huawei.com> References: <20180130151446.24698-1-igor.stoppa@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.122.225.51] X-CFilter-Loop: Reflected Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Add basic self-test functionality for pmalloc. Signed-off-by: Igor Stoppa --- lib/genalloc.c | 2 +- mm/Kconfig | 7 ++++++ mm/Makefile | 1 + mm/pmalloc-selftest.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ mm/pmalloc-selftest.h | 30 ++++++++++++++++++++++++ mm/pmalloc.c | 9 ++++--- 6 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 mm/pmalloc-selftest.c create mode 100644 mm/pmalloc-selftest.h diff --git a/lib/genalloc.c b/lib/genalloc.c index 62f69b3..7ba2ec9 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -542,7 +542,7 @@ void gen_pool_flush_chunk(struct gen_pool *pool, memset(chunk->entries, 0, DIV_ROUND_UP(size >> pool->min_alloc_order * BITS_PER_ENTRY, BITS_PER_BYTE)); - atomic_set(&chunk->avail, size); + atomic_long_set(&chunk->avail, size); } diff --git a/mm/Kconfig b/mm/Kconfig index 03ff770..f0c960e 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -765,3 +765,10 @@ config GUP_BENCHMARK performance of get_user_pages_fast(). See tools/testing/selftests/vm/gup_benchmark.c + +config PROTECTABLE_MEMORY_SELFTEST + bool "Run self test for pmalloc memory allocator" + default n + help + Tries to verify that pmalloc works correctly and that the memory + is effectively protected. diff --git a/mm/Makefile b/mm/Makefile index a6a47e1..1e76a9b 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -66,6 +66,7 @@ obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o obj-$(CONFIG_SLOB) += slob.o obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o obj-$(CONFIG_ARCH_HAS_SET_MEMORY) += pmalloc.o +obj-$(CONFIG_PROTECTABLE_MEMORY_SELFTEST) += pmalloc-selftest.o obj-$(CONFIG_KSM) += ksm.o obj-$(CONFIG_PAGE_POISONING) += page_poison.o obj-$(CONFIG_SLAB) += slab.o diff --git a/mm/pmalloc-selftest.c b/mm/pmalloc-selftest.c new file mode 100644 index 0000000..1c025f3 --- /dev/null +++ b/mm/pmalloc-selftest.c @@ -0,0 +1,65 @@ +/* + * pmalloc-selftest.c + * + * (C) Copyright 2018 Huawei Technologies Co. Ltd. + * Author: Igor Stoppa + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; version 2 + * of the License. + */ + +#include +#include + + +#define SIZE_1 (PAGE_SIZE * 3) +#define SIZE_2 1000 + +#define validate_alloc(expected, variable, size) \ + pr_notice("must be " expected ": %s", \ + is_pmalloc_object(variable, size) > 0 ? "ok" : "no") + +#define is_alloc_ok(variable, size) \ + validate_alloc("ok", variable, size) + +#define is_alloc_no(variable, size) \ + validate_alloc("no", variable, size) + +void pmalloc_selftest(void) +{ + struct gen_pool *pool_unprot; + struct gen_pool *pool_prot; + void *var_prot, *var_unprot, *var_vmall; + + pr_notice("pmalloc self-test"); + pool_unprot = pmalloc_create_pool("unprotected", 0); + pool_prot = pmalloc_create_pool("protected", 0); + BUG_ON(!(pool_unprot && pool_prot)); + + var_unprot = pmalloc(pool_unprot, SIZE_1 - 1, GFP_KERNEL); + var_prot = pmalloc(pool_prot, SIZE_1, GFP_KERNEL); + var_vmall = vmalloc(SIZE_2); + is_alloc_ok(var_unprot, 10); + is_alloc_ok(var_unprot, SIZE_1); + is_alloc_ok(var_unprot, PAGE_SIZE); + is_alloc_no(var_unprot, SIZE_1 + 1); + is_alloc_no(var_vmall, 10); + + + pfree(pool_unprot, var_unprot); + vfree(var_vmall); + + pmalloc_protect_pool(pool_prot); + + /* This will intentionally trigger a WARN because the pool being + * destroyed is not protected, which is unusual and should happen + * on error paths only, where probably other warnings are already + * displayed. + */ + pmalloc_destroy_pool(pool_unprot); + + /* This must not cause WARNings */ + pmalloc_destroy_pool(pool_prot); +} diff --git a/mm/pmalloc-selftest.h b/mm/pmalloc-selftest.h new file mode 100644 index 0000000..3673d23 --- /dev/null +++ b/mm/pmalloc-selftest.h @@ -0,0 +1,30 @@ +/* + * pmalloc-selftest.h + * + * (C) Copyright 2018 Huawei Technologies Co. Ltd. + * Author: Igor Stoppa + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; version 2 + * of the License. + */ + + +#ifndef __PMALLOC_SELFTEST_H__ +#define __PMALLOC_SELFTEST_H__ + + +#ifdef CONFIG_PROTECTABLE_MEMORY_SELFTEST + +#include + +void pmalloc_selftest(void); + +#else + +static inline void pmalloc_selftest(void){}; + +#endif + +#endif diff --git a/mm/pmalloc.c b/mm/pmalloc.c index a64ac49..73387d7 100644 --- a/mm/pmalloc.c +++ b/mm/pmalloc.c @@ -25,6 +25,8 @@ #include #include +#include "pmalloc-selftest.h" + /** * pmalloc_data contains the data specific to a pmalloc pool, * in a format compatible with the design of gen_alloc. @@ -152,7 +154,7 @@ static void pmalloc_disconnect(struct pmalloc_data *data, do { \ sysfs_attr_init(&data->attr_##attr_name.attr); \ data->attr_##attr_name.attr.name = #attr_name; \ - data->attr_##attr_name.attr.mode = VERIFY_OCTAL_PERMISSIONS(0444); \ + data->attr_##attr_name.attr.mode = VERIFY_OCTAL_PERMISSIONS(0400); \ data->attr_##attr_name.show = pmalloc_pool_show_##attr_name; \ } while (0) @@ -335,7 +337,7 @@ bool pmalloc_prealloc(struct gen_pool *pool, size_t size) return true; abort: - vfree(chunk); + vfree_atomic(chunk); return false; } @@ -401,7 +403,7 @@ void *pmalloc(struct gen_pool *pool, size_t size, gfp_t gfp) abort: untag_chunk(chunk); free: - vfree(chunk); + vfree_atomic(chunk); return NULL; } @@ -508,6 +510,7 @@ static int __init pmalloc_late_init(void) } } mutex_unlock(&pmalloc_mutex); + pmalloc_selftest(); return 0; } late_initcall(pmalloc_late_init);