From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226GdJHc+M7jXz183maMNxGiQbxKskSOZ4VlK+qAl8wC1ZoGrJRbQfVe0T597ZCNH4sAOGfk ARC-Seal: i=1; a=rsa-sha256; t=1516647464; cv=none; d=google.com; s=arc-20160816; b=XBhrVK/1cwxi/EpJPRdP9kBcCZOIkFdLYzY26VM8Rz94t/TBaO/bWTNb1KOTdhXp5O aT3efpK3RyDw/fDt35MDIWSCiAbp44xuwNZTXqgw/M3cehSTq77yPo2/2ejxdTBvJTN8 gI6+f6BQQ0w0J+cghvgZFqrKSUdbblFW5W9L8Dt1b/W7xMpwGfSeogntKoIicGlfext3 EYNH0az+VMVz9Yc8wqN6NcNbXUDlhBpFZUU67X+8y6aLCF2subzUq6MmWKNvtkCITBgX w1lWrg2D/ao5tvKqqAXUg6icodZZxHbvYckb4CClvZoLvzW9jJHjK5mJQduFL9DcwGKf FykQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=vCwG56NPVSrEXd6ypUvywbtkzjwwPkniCA2gkYzP4fE=; b=nIV07ypLHTm+xBfP3CebsnGRaaAzH9LT5umuo4FqwfZWWcJLpz079IqycaHzGI5XmS akNzNkA1oVRRUIFK2VmmCDTlX8Kt812BcZDt+9GHNkIutpgKnybIXbmuJQel0NV/JpvE MEUDDHKQgMmt/FBdZlU6zVop9nyHx6JsBtmtZ+556CNYEUQHA3nTFuRS/vouUejsPOvK VyqftyyjTWrBzga4w02BOC9PjRkNhnb01R7r5hl4sUI+ReCqoODUEWPs7SxxhSWRJzxy oaJgOFjFNW2IDE4nfDsTbI39+KISaYeEcgmz5ee8TirOKcuEwLpZxjrZCWeJw8HNb98A nnDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WGfn2XEE; spf=pass (google.com: best guess record for domain of linux-kselftest-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kselftest-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WGfn2XEE; spf=pass (google.com: best guess record for domain of linux-kselftest-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kselftest-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751375AbeAVSxV (ORCPT ); Mon, 22 Jan 2018 13:53:21 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:38762 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751149AbeAVSxR (ORCPT ); Mon, 22 Jan 2018 13:53:17 -0500 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, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, akpm@linux-foundation.org, dave.hansen@intel.com, benh@kernel.crashing.org, paulus@samba.org, khandual@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com, bsingharora@gmail.com, hbabu@us.ibm.com, mhocko@kernel.org, bauerman@linux.vnet.ibm.com, ebiederm@xmission.com, linuxram@us.ibm.com, arnd@arndb.de Subject: [PATCH v10 10/24] selftests/vm: introduce two arch independent abstraction Date: Mon, 22 Jan 2018 10:52:03 -0800 Message-Id: <1516647137-11174-11-git-send-email-linuxram@us.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1516647137-11174-1-git-send-email-linuxram@us.ibm.com> References: <1516647137-11174-1-git-send-email-linuxram@us.ibm.com> Sender: linux-kselftest-owner@vger.kernel.org X-Mailing-List: linux-kselftest@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590320131852224420?= X-GMAIL-MSGID: =?utf-8?q?1590320131852224420?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: open_hugepage_file() <- opens the huge page file get_start_key() <-- provides the first non-reserved key. Signed-off-by: Ram Pai --- tools/testing/selftests/vm/pkey-helpers.h | 11 +++++++++++ tools/testing/selftests/vm/protection_keys.c | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/vm/pkey-helpers.h b/tools/testing/selftests/vm/pkey-helpers.h index 7c979ad..c8f5739 100644 --- a/tools/testing/selftests/vm/pkey-helpers.h +++ b/tools/testing/selftests/vm/pkey-helpers.h @@ -304,3 +304,14 @@ static inline void __page_o_noops(void) } \ } while (0) #define raw_assert(cond) assert(cond) + +static inline int open_hugepage_file(int flag) +{ + return open("/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages", + O_RDONLY); +} + +static inline int get_start_key(void) +{ + return 1; +} diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c index 2e4b636..254b66d 100644 --- a/tools/testing/selftests/vm/protection_keys.c +++ b/tools/testing/selftests/vm/protection_keys.c @@ -809,7 +809,7 @@ void setup_hugetlbfs(void) * Now go make sure that we got the pages and that they * are 2M pages. Someone might have made 1G the default. */ - fd = open("/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages", O_RDONLY); + fd = open_hugepage_file(O_RDONLY); if (fd < 0) { perror("opening sysfs 2M hugetlb config"); return; @@ -1087,10 +1087,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; + int i = get_start_key(); /* Note: 0 is the default pkey, so don't mess with it */ - for (i = 1; i < NR_PKEYS; i++) { + for (; i < NR_PKEYS; i++) { if (pkey == i) continue; -- 1.7.1