From patchwork Thu Jun 14 00:45:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ram Pai X-Patchwork-Id: 10463121 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 C1DEC603EE for ; Thu, 14 Jun 2018 00:48:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B352C28988 for ; Thu, 14 Jun 2018 00:48:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A805128BA8; Thu, 14 Jun 2018 00:48:13 +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 4A2B728988 for ; Thu, 14 Jun 2018 00:48:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE89D6B028E; Wed, 13 Jun 2018 20:47:33 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A46086B028F; Wed, 13 Jun 2018 20:47:33 -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 8BF276B0291; Wed, 13 Jun 2018 20:47:33 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk0-f198.google.com (mail-qk0-f198.google.com [209.85.220.198]) by kanga.kvack.org (Postfix) with ESMTP id 561E56B028E for ; Wed, 13 Jun 2018 20:47:33 -0400 (EDT) Received: by mail-qk0-f198.google.com with SMTP id w203-v6so3537836qkb.16 for ; Wed, 13 Jun 2018 17:47:33 -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=qUUbPlETo6D6vmHu5K+2mwBGEckBptKPXfmzRqNtbBU=; b=E99DS+FiDPbb2ajkkoTiPjFwvRRjdsDm/Xlxch7Rn7xw+aShXiRQDPSEr9I7fmQKv2 68wSnGfD3jIfDCmprbgZNQaUvrQH5poELjQLa6nIv79I12ZVY5Yyp+6xCcdxX3sux1LV ZcV9l+CJlqu0KGJ3Qp1nPD7c9PPE2rhBBUZS6b8qLJ9vPZWewxIN0a2B/i93jtPFUw5k TY/k8oevSeyt5Vw1BNi5gq3IRKnIPsYiQF0czElWbt4xUomOxkIAfjuVPzzGKKsqEUQ/ RTr4uyP310c7E9zhnR1qj6YsnUbLib4t5ZbCp5Qwl88Vm341FM6I9ggqUjAcaN3bkSa1 iLQw== X-Gm-Message-State: APt69E1ZG6rnKRbmSHEbLUCpalQdNo3ue3SozZtJQ5DyMOCtWctYWd6l 8wVqs2+KeaCKiI43oVdDzLPUcigk//45qwijq3rpfrlCCaPZbNUTek12UyfC1bUSyxINyEHTQUs GCdNG+/12vz4g5wJEXTz+RXAQaO5cO7/m68cTo6s7Bdg2bQEWIwvu4B3fYl7W2bbWASmBnC/H69 7nH0hcqrrK7J/VoKCcuOJJiZMNlqnfk13yEq6JUG7kgbY4I9Feka4XJN+15f/OnywPnBJfdnBwg pRKnMT7YqbnlQqHl3V3ffx1lNVM+BJHSX8gX97noZkFrzPwJDznAD07Ora64UVIINZUS+YC4Qop 9Vbzm2uzbJeOrr6ie8ZQjt3fzFZ20cPP1Vc2huW39kNRwAkhzzyoXObhc4Icze/PmrDDdEKPfg= = X-Received: by 2002:ac8:1b62:: with SMTP id p31-v6mr396538qtk.280.1528937253159; Wed, 13 Jun 2018 17:47:33 -0700 (PDT) X-Received: by 2002:ac8:1b62:: with SMTP id p31-v6mr396518qtk.280.1528937252464; Wed, 13 Jun 2018 17:47:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528937252; cv=none; d=google.com; s=arc-20160816; b=oOb308P7fkH+DaQIFfn0ffWUqcjpcua+aqV99OZK1qKeRyhZ18ZkAinWZD7zmPf+0s 8KUoeUn1WkMYpoZIuT0U4Q4R4DRpBSnHoRCHDiBhtIGyxKPxJgSN52r51+2px71cPaMQ SdV36pyuHTzY978bL48F+Mnl6LR2ATWo8vmPHdV3EXJF/CQnY4TwoahpfK/KrvIfvWHt zqjsDqxvyDnodiCUXkXdfy21WiRZfirG2SWD7I21AWz8NY+p0djMoCS+Sa5NSuYBJzl2 OgLhlU+LkYE7xv6OGP6zYJeNfml75w0+eiMd08aV6jgoHsmmiqgJPEgzLgCpWnxb3fbF WZng== 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=qUUbPlETo6D6vmHu5K+2mwBGEckBptKPXfmzRqNtbBU=; b=GYapYrETlCiWNh69H5T1adgUWlp3QzeaREJmscIIUokEUxAq0PsUTTun1OLQvsW13I nPzGnLyGvtleobCvDwgoPnaFk5laa2d7D/jsVABGtApJbvswWsEBRrHa2DfVlaSVdEvD rqbmwj7MYYdplO8nybqK7+d0Eo0hgZprCv/Asi9+ivZsn2SxLOfmTkauepsy4Zxwt14e UqJGoV7yVuYybi7O/XknmHuqctQ3eLv2i3eQN4vlZQQaRnSgUcff7lxpFTwKM0JuUbVc MyhC/RkGU0AoW6vo96mzQbrBVHFqxLKfSYyOO0I9+YuUsCqhpLSqF0KDU5ci2lr0f33D GsGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="O/aw1krj"; 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 c14-v6sor1838806qvn.38.2018.06.13.17.47.32 for (Google Transport Security); Wed, 13 Jun 2018 17:47:32 -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="O/aw1krj"; 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=qUUbPlETo6D6vmHu5K+2mwBGEckBptKPXfmzRqNtbBU=; b=O/aw1krjOmVijT+4SS7tjz4vdX5Z2PtbAeuhtwS6PEg6nzFb0/3z0MFzjhs2x7zVdH 4CH0v5AoZIXIVUIKGdKSQS3Jfo9FnpA/q/lxrWkHFENprvzCD97Iy15VUiNuxutnfL00 +m9/kenISd9RNhqm8oMnQrauWDT/shSUh1hplu1ytuLqamwjn45OPcAvQDI9mw6RU3on /7fB0tsaCoBya6m9/J1xyV32y59RQbMcfm89xnG8C3NdW5U8z88pMBjCApOa7MujqZ4w hkF+qPnP8NYjuC1+J6gm7yYuQ6vbCH4YwJHSR4v3DDJDGdnht6PxKsT7YZsxLZ5bnAH9 Rn+w== X-Google-Smtp-Source: ADUXVKJlBgf41UmASKU6WzEdpRIM1oBbUx3Vcd2vYJtZZCi0AIKrabDrmKD+CbvRLhkQ8TP0SMNjPQ== X-Received: by 2002:a0c:d1f7:: with SMTP id k52-v6mr353572qvh.199.1528937252278; Wed, 13 Jun 2018 17:47:32 -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 u31-v6sm3225898qtc.28.2018.06.13.17.47.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 17:47:31 -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 v13 24/24] selftests/vm: test correct behavior of pkey-0 Date: Wed, 13 Jun 2018 17:45:15 -0700 Message-Id: <1528937115-10132-25-git-send-email-linuxram@us.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1528937115-10132-1-git-send-email-linuxram@us.ibm.com> References: <1528937115-10132-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 Ensure pkey-0 is allocated on start. Ensure pkey-0 can be attached dynamically in various modes, without failures. Ensure pkey-0 can be freed and allocated. Signed-off-by: Ram Pai Acked-by: Dave Hansen --- tools/testing/selftests/vm/protection_keys.c | 66 +++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c index cbd87f8..f37b031 100644 --- a/tools/testing/selftests/vm/protection_keys.c +++ b/tools/testing/selftests/vm/protection_keys.c @@ -1003,6 +1003,67 @@ void close_test_fds(void) return *ptr; } +void test_pkey_alloc_free_attach_pkey0(int *ptr, u16 pkey) +{ + int i, err; + int max_nr_pkey_allocs; + int alloced_pkeys[NR_PKEYS]; + int nr_alloced = 0; + int newpkey; + long size; + + assert(pkey_last_malloc_record); + size = pkey_last_malloc_record->size; + /* + * This is a bit of a hack. But mprotect() requires + * huge-page-aligned sizes when operating on hugetlbfs. + * So, make sure that we use something that's a multiple + * of a huge page when we can. + */ + if (size >= HPAGE_SIZE) + size = HPAGE_SIZE; + + + /* allocate every possible key and make sure key-0 never got allocated */ + max_nr_pkey_allocs = NR_PKEYS; + for (i = 0; i < max_nr_pkey_allocs; i++) { + int new_pkey = alloc_pkey(); + assert(new_pkey != 0); + + if (new_pkey < 0) + break; + alloced_pkeys[nr_alloced++] = new_pkey; + } + /* free all the allocated keys */ + for (i = 0; i < nr_alloced; i++) { + int free_ret; + + if (!alloced_pkeys[i]) + continue; + free_ret = sys_pkey_free(alloced_pkeys[i]); + pkey_assert(!free_ret); + } + + /* attach key-0 in various modes */ + err = sys_mprotect_pkey(ptr, size, PROT_READ, 0); + pkey_assert(!err); + err = sys_mprotect_pkey(ptr, size, PROT_WRITE, 0); + pkey_assert(!err); + err = sys_mprotect_pkey(ptr, size, PROT_EXEC, 0); + pkey_assert(!err); + err = sys_mprotect_pkey(ptr, size, PROT_READ|PROT_WRITE, 0); + pkey_assert(!err); + err = sys_mprotect_pkey(ptr, size, PROT_READ|PROT_WRITE|PROT_EXEC, 0); + pkey_assert(!err); + + /* free key-0 */ + err = sys_pkey_free(0); + pkey_assert(!err); + + newpkey = sys_pkey_alloc(0, 0x0); + assert(newpkey == 0); +} + void test_read_of_write_disabled_region(int *ptr, u16 pkey) { int ptr_contents; @@ -1153,10 +1214,10 @@ void test_kernel_gup_write_to_write_disabled_region(int *ptr, u16 pkey) void test_pkey_syscalls_on_non_allocated_pkey(int *ptr, u16 pkey) { int err; - int i = get_start_key(); + int i; /* Note: 0 is the default pkey, so don't mess with it */ - for (; i < NR_PKEYS; i++) { + for (i=1; i < NR_PKEYS; i++) { if (pkey == i) continue; @@ -1465,6 +1526,7 @@ void test_mprotect_pkey_on_unsupported_cpu(int *ptr, u16 pkey) test_pkey_syscalls_on_non_allocated_pkey, test_pkey_syscalls_bad_args, test_pkey_alloc_exhaust, + test_pkey_alloc_free_attach_pkey0, }; void run_tests_once(void)