From patchwork Tue Jul 17 13:49:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ram Pai X-Patchwork-Id: 10529517 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 16C81600F4 for ; Tue, 17 Jul 2018 13:51:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F13AA29203 for ; Tue, 17 Jul 2018 13:50:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5C4829221; Tue, 17 Jul 2018 13:50:59 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A87329203 for ; Tue, 17 Jul 2018 13:50:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EF226B0272; Tue, 17 Jul 2018 09:50:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 376006B0273; Tue, 17 Jul 2018 09:50:32 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2191E6B0274; Tue, 17 Jul 2018 09:50:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f199.google.com (mail-qt0-f199.google.com [209.85.216.199]) by kanga.kvack.org (Postfix) with ESMTP id E19836B0272 for ; Tue, 17 Jul 2018 09:50:31 -0400 (EDT) Received: by mail-qt0-f199.google.com with SMTP id d1-v6so730275qth.21 for ; Tue, 17 Jul 2018 06:50:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:sender:from:to:cc:subject:date :message-id:in-reply-to:references; bh=UuKQUeU+B6YsYpQdii4eXZCR5h1tqCh6cf1hN11oxuw=; b=irVUujqDLv3S22lDf5uM/oBoTG3vsSOKToRQ2GXfFuZlZZHa8mGxxV1SErE/5vSwq0 Zf335t2SFHeDhcihvH5q9+WnTYQjggvnvdGZKF7WJrz1DuTweURwMOWVK2Vy4UOejY0w DcFuOIiEGNqOx9vwBj3GLJxHICYCTJZr6AbhuR5Q9Is24PCBz4FetE7NwSKH3dXz73vB bUd8qvM6lrnljuHG8Z4GUUdc72pLJPBuz9unAyfi5o+jPoX/7lBzLTMMiTYwTGESD90P kucW/wHaucpLY94t3mm1x8JWWlDiBTkPCPvx3TSis7ZCAm5KtFqVk8yJikB6M1pIKay1 64xw== X-Gm-Message-State: AOUpUlEh94PSJ5XQSolQAlJSZ3JBY1MKrU4K84BvrJODNwe881K1A9Nk OIJSF5n+cYC7OK2Khk45vK89xU8ISwEgnJQi0gOl7qZCL2sEVRqzNmkhLKXRdU5UI84PNSwM0wd ySa0FpZnBznObup/rhwFVA69CktqNtRFTTbRoIBmKOzRsDUU8UsQPKp+1lP3D4G57Vq1dP7IWKO 1nI3GgxUzO5EmbKhr58kvhulyCvz7NGkDQ8/BnMZWLICfcNr2/T3ExpdIaopJgBb8UBO6MfWkWm CAAsSo/XI6gUhfNU30hDP8xmh9HDiTzX61CCNN6e4nplPE4ggBd/MUkbWcD3Qoo0KEyZqfQ4xHt 4eaiWiSFjKXVf+4tpr8ZStFAXYOnHQSj4nJxsLdHEFequwiVsaAN4WH3XiMbu4CId0iT6Uabxg= = X-Received: by 2002:aed:3e29:: with SMTP id l38-v6mr1629388qtf.186.1531835431699; Tue, 17 Jul 2018 06:50:31 -0700 (PDT) X-Received: by 2002:aed:3e29:: with SMTP id l38-v6mr1629317qtf.186.1531835430838; Tue, 17 Jul 2018 06:50:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531835430; cv=none; d=google.com; s=arc-20160816; b=ulOfemM6UcsSKbwZ8lJsPuZW2f3X/ekH5CNq/GxJxJLen0eFBa0u+KGbkhUBX93xA3 qLFpXxWYyTxM7tMFH2rRpw/E1udu+0c6uEiJWv8i4XWuB192V+J6kAd4uNbzBVYyn+gU TLYnncLU+RI3SnhS/45qpHdQ0BFbfHSEBLRP0RHUuOKnIbYaU6rWgD65F5e2JKBSsys0 nzdnsunCZ9SdXJN6BU/dA8cYpxykNUGqhe8RW4sZvJyODQnW400gtqfUy59N7raSvfIj dw2N+znSQkf1PDq5+wxWAIkmaZAJhGRtIaGQY16s7GpkKciZLwEWqCJ4Yy7NtyCDHYJ5 FHfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature:arc-authentication-results; bh=UuKQUeU+B6YsYpQdii4eXZCR5h1tqCh6cf1hN11oxuw=; b=wxNNULLwd02ZboZ8bZO/W9+st4Arp+Y6svfc9IDnMeaVFpOKtO2B4jfheNWyUb49nW 9cgWDPfATTLeUyq+QdosO8v2lqitW0H+AOr8Vzrec029rimvR9uT2OtTXIa+0p1+YVF6 NGUj4AY/zSLNj8GK9iv/OJKHm4k+bd/e3ruYG6DzkoDupp2glwyR9C6B4m2SErajk9um SkNSmDYwTix9DnCqkCzVGH2dWeZGvywBr1uQcPWVqPEZosGhJ4PWEx5Pb04pK1FA5KHU QNwC+ML7vKMu6oiwqO700i8v7TdAnvmv4zJaEmruTYnwLJ8d0dDX7EnMqINxmwcoqECF Fy8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=aGwhrlYP; spf=pass (google.com: domain of ram.n.pai@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ram.n.pai@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m84-v6sor454509qke.63.2018.07.17.06.50.30 for (Google Transport Security); Tue, 17 Jul 2018 06:50:30 -0700 (PDT) Received-SPF: pass (google.com: domain of ram.n.pai@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=aGwhrlYP; spf=pass (google.com: domain of ram.n.pai@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ram.n.pai@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UuKQUeU+B6YsYpQdii4eXZCR5h1tqCh6cf1hN11oxuw=; b=aGwhrlYPHHdySm+l+tfNf0uZWpCfKsuYe35aHjUxXODrN2mLqn5ZcJTGW4vIXTaEzr r3nuM1dR3UMIjTeIoFAv7FsSq6Adpbs0nQydETKKJDkwSdRRCd4ZDXVrZGBcG1AQjpmu tPMbmhCfHdNhDKbXs/8JS8wwqgYPj4D76rx9VaNNNOGrS1VQL/ix5+TQnL0eWbJkCMjd RROcZ35yJD/yjPYGTMYkE8OapfY5gwSrQy6Y/d39qwO5ZbUKOdE+3zK1fPVe9dc3NhkT kYfVMzqdIg+MyNp6xOzu0ruKxJJDRjKnqF8GJnnSj3fKvraijBGLuItdSCAokpc07qGI ecfg== X-Google-Smtp-Source: AAOMgpf6kwUTlmVeMe5NvZahx7T5ZN7y5+9w+NIFcojvcV9qfhwUu605xAvBNSRV+KAZe+CP8jWPog== X-Received: by 2002:a37:8c02:: with SMTP id o2-v6mr1435839qkd.322.1531835430491; Tue, 17 Jul 2018 06:50:30 -0700 (PDT) Received: from localhost.localdomain (50-39-100-161.bvtn.or.frontiernet.net. [50.39.100.161]) by smtp.gmail.com with ESMTPSA id s83-v6sm640937qki.20.2018.07.17.06.50.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 06:50:29 -0700 (PDT) From: Ram Pai To: shuahkh@osg.samsung.com, linux-kselftest@vger.kernel.org Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, x86@kernel.org, linux-arch@vger.kernel.org, mingo@redhat.com, dave.hansen@intel.com, mhocko@kernel.org, bauerman@linux.vnet.ibm.com, linuxram@us.ibm.com, fweimer@redhat.com, msuchanek@suse.de, aneesh.kumar@linux.vnet.ibm.com Subject: [PATCH v14 13/22] selftests/vm: generic cleanup Date: Tue, 17 Jul 2018 06:49:16 -0700 Message-Id: <1531835365-32387-14-git-send-email-linuxram@us.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1531835365-32387-1-git-send-email-linuxram@us.ibm.com> References: <1531835365-32387-1-git-send-email-linuxram@us.ibm.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP cleanup the code to satisfy coding styles. cc: Dave Hansen cc: Florian Weimer Signed-off-by: Ram Pai --- tools/testing/selftests/vm/protection_keys.c | 64 +++++++++++++++++-------- 1 files changed, 43 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c index f50cce8..304f74f 100644 --- a/tools/testing/selftests/vm/protection_keys.c +++ b/tools/testing/selftests/vm/protection_keys.c @@ -4,7 +4,7 @@ * * There are examples in here of: * * how to set protection keys on memory - * * how to set/clear bits in pkey registers (the rights register) + * * how to set/clear bits in Protection Key registers (the rights register) * * how to handle SEGV_PKUERR signals and extract pkey-relevant * information from the siginfo * @@ -13,13 +13,18 @@ * prefault pages in at malloc, or not * protect MPX bounds tables with protection keys? * make sure VMA splitting/merging is working correctly - * OOMs can destroy mm->mmap (see exit_mmap()), so make sure it is immune to pkeys - * look for pkey "leaks" where it is still set on a VMA but "freed" back to the kernel - * do a plain mprotect() to a mprotect_pkey() area and make sure the pkey sticks + * OOMs can destroy mm->mmap (see exit_mmap()), + * so make sure it is immune to pkeys + * look for pkey "leaks" where it is still set on a VMA + * but "freed" back to the kernel + * do a plain mprotect() to a mprotect_pkey() area and make + * sure the pkey sticks * * Compile like this: - * gcc -o protection_keys -O2 -g -std=gnu99 -pthread -Wall protection_keys.c -lrt -ldl -lm - * gcc -m32 -o protection_keys_32 -O2 -g -std=gnu99 -pthread -Wall protection_keys.c -lrt -ldl -lm + * gcc -o protection_keys -O2 -g -std=gnu99 + * -pthread -Wall protection_keys.c -lrt -ldl -lm + * gcc -m32 -o protection_keys_32 -O2 -g -std=gnu99 + * -pthread -Wall protection_keys.c -lrt -ldl -lm */ #define _GNU_SOURCE #include @@ -263,10 +268,12 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext) __read_pkey_reg()); dprintf1("pkey from siginfo: %jx\n", siginfo_pkey); *(u64 *)pkey_reg_ptr = 0x00000000; - dprintf1("WARNING: set PRKU=0 to allow faulting instruction to continue\n"); + dprintf1("WARNING: set PKEY_REG=0 to allow faulting instruction " + "to continue\n"); pkey_faults++; dprintf1("<<<<==================================================\n"); dprint_in_signal = 0; + return; } int wait_all_children(void) @@ -384,7 +391,7 @@ void pkey_disable_set(int pkey, int flags) { unsigned long syscall_flags = 0; int ret; - int pkey_rights; + u32 pkey_rights; pkey_reg_t orig_pkey_reg = read_pkey_reg(); dprintf1("START->%s(%d, 0x%x)\n", __func__, @@ -487,9 +494,10 @@ int sys_mprotect_pkey(void *ptr, size_t size, unsigned long orig_prot, return sret; } -int sys_pkey_alloc(unsigned long flags, unsigned long init_val) +int sys_pkey_alloc(unsigned long flags, u64 init_val) { int ret = syscall(SYS_pkey_alloc, flags, init_val); + dprintf1("%s(flags=%lx, init_val=%lx) syscall ret: %d errno: %d\n", __func__, flags, init_val, ret, errno); return ret; @@ -513,7 +521,7 @@ void pkey_set_shadow(u32 key, u64 init_val) int alloc_pkey(void) { int ret; - unsigned long init_val = 0x0; + u64 init_val = 0x0; dprintf1("%s()::%d, pkey_reg: "PKEY_REG_FMT" shadow: "PKEY_REG_FMT"\n", __func__, __LINE__, __read_pkey_reg(), shadow_pkey_reg); @@ -669,7 +677,9 @@ void record_pkey_malloc(void *ptr, long size, int prot) /* every record is full */ size_t old_nr_records = nr_pkey_malloc_records; size_t new_nr_records = (nr_pkey_malloc_records * 2 + 1); - size_t new_size = new_nr_records * sizeof(struct pkey_malloc_record); + size_t new_size = new_nr_records * + sizeof(struct pkey_malloc_record); + dprintf2("new_nr_records: %zd\n", new_nr_records); dprintf2("new_size: %zd\n", new_size); pkey_malloc_records = realloc(pkey_malloc_records, new_size); @@ -695,9 +705,11 @@ void free_pkey_malloc(void *ptr) { long i; int ret; + dprintf3("%s(%p)\n", __func__, ptr); for (i = 0; i < nr_pkey_malloc_records; i++) { struct pkey_malloc_record *rec = &pkey_malloc_records[i]; + dprintf4("looking for ptr %p at record[%ld/%p]: {%p, %ld}\n", ptr, i, rec, rec->ptr, rec->size); if ((ptr < rec->ptr) || @@ -778,11 +790,13 @@ void setup_hugetlbfs(void) char buf[] = "123"; if (geteuid() != 0) { - fprintf(stderr, "WARNING: not run as root, can not do hugetlb test\n"); + fprintf(stderr, + "WARNING: not run as root, can not do hugetlb test\n"); return; } - cat_into_file(__stringify(GET_NR_HUGE_PAGES), "/proc/sys/vm/nr_hugepages"); + cat_into_file(__stringify(GET_NR_HUGE_PAGES), + "/proc/sys/vm/nr_hugepages"); /* * Now go make sure that we got the pages and that they @@ -803,7 +817,8 @@ void setup_hugetlbfs(void) } if (atoi(buf) != GET_NR_HUGE_PAGES) { - fprintf(stderr, "could not confirm 2M pages, got: '%s' expected %d\n", + fprintf(stderr, "could not confirm 2M pages, got:" + " '%s' expected %d\n", buf, GET_NR_HUGE_PAGES); return; } @@ -945,6 +960,7 @@ void __save_test_fd(int fd) int get_test_read_fd(void) { int test_fd = open("/etc/passwd", O_RDONLY); + __save_test_fd(test_fd); return test_fd; } @@ -986,7 +1002,8 @@ void test_read_of_access_disabled_region(int *ptr, u16 pkey) { int ptr_contents; - dprintf1("disabling access to PKEY[%02d], doing read @ %p\n", pkey, ptr); + dprintf1("disabling access to PKEY[%02d], doing read @ %p\n", + pkey, ptr); read_pkey_reg(); pkey_access_deny(pkey); ptr_contents = read_ptr(ptr); @@ -1108,13 +1125,14 @@ void test_pkey_syscalls_bad_args(int *ptr, u16 pkey) /* Assumes that all pkeys other than 'pkey' are unallocated */ void test_pkey_alloc_exhaust(int *ptr, u16 pkey) { - int err; + int err = 0; int allocated_pkeys[NR_PKEYS] = {0}; int nr_allocated_pkeys = 0; int i; for (i = 0; i < NR_PKEYS*2; i++) { int new_pkey; + dprintf1("%s() alloc loop: %d\n", __func__, i); new_pkey = alloc_pkey(); dprintf4("%s()::%d, err: %d pkey_reg: 0x"PKEY_REG_FMT @@ -1122,9 +1140,11 @@ void test_pkey_alloc_exhaust(int *ptr, u16 pkey) __func__, __LINE__, err, __read_pkey_reg(), shadow_pkey_reg); read_pkey_reg(); /* for shadow checking */ - dprintf2("%s() errno: %d ENOSPC: %d\n", __func__, errno, ENOSPC); + dprintf2("%s() errno: %d ENOSPC: %d\n", + __func__, errno, ENOSPC); if ((new_pkey == -1) && (errno == ENOSPC)) { - dprintf2("%s() failed to allocate pkey after %d tries\n", + dprintf2("%s() failed to allocate pkey " + "after %d tries\n", __func__, nr_allocated_pkeys); break; } @@ -1416,7 +1436,8 @@ void run_tests_once(void) tracing_off(); close_test_fds(); - printf("test %2d PASSED (iteration %d)\n", test_nr, iteration_nr); + printf("test %2d PASSED (iteration %d)\n", + test_nr, iteration_nr); dprintf1("======================\n\n"); } iteration_nr++; @@ -1428,7 +1449,7 @@ int main(void) setup_handlers(); - printf("has pku: %d\n", cpu_has_pku()); + printf("has pkey: %d\n", cpu_has_pku()); if (!cpu_has_pku()) { int size = PAGE_SIZE; @@ -1436,7 +1457,8 @@ int main(void) printf("running PKEY tests for unsupported CPU/OS\n"); - ptr = mmap(NULL, size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); + ptr = mmap(NULL, size, PROT_NONE, + MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); assert(ptr != (void *)-1); test_mprotect_pkey_on_unsupported_cpu(ptr, 1); exit(0);