From patchwork Tue Jul 17 13:49:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ram Pai X-Patchwork-Id: 10529511 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 2D73D600F4 for ; Tue, 17 Jul 2018 13:50:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 130FD29203 for ; Tue, 17 Jul 2018 13:50:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0769729221; Tue, 17 Jul 2018 13:50:52 +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 9D3D229203 for ; Tue, 17 Jul 2018 13:50:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A55796B026F; Tue, 17 Jul 2018 09:50:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A06986B0270; Tue, 17 Jul 2018 09:50:27 -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 834726B0271; Tue, 17 Jul 2018 09:50:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f197.google.com (mail-qt0-f197.google.com [209.85.216.197]) by kanga.kvack.org (Postfix) with ESMTP id 490116B026F for ; Tue, 17 Jul 2018 09:50:27 -0400 (EDT) Received: by mail-qt0-f197.google.com with SMTP id b8-v6so736568qto.16 for ; Tue, 17 Jul 2018 06:50:27 -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=3Msqigu/NKIbCJKAgSdf6fLoN8lQRyfGKzwl0VZ6Ltg=; b=tpn72jOIv5H73ItDA4nlqy+/KNhSmZFxFdLD69VCDoaLdjOJxE/BQjobmWHWqVVeB5 pVtP+0z1AkREqFVtYK9sU0lRmgnfE1eeuzor0AI2tTHGLiS3WKks2wHlwr/RNA3Ffzye slT6rE3ePLjmu2PSbDz+8m5bJhoLcnwM6bBO3hQfMxPCjaMkXeiqhZ1ZmBpdyWgoo7nd R9/Zj/tF6tqFaXhkpOo9GHORjYQ56VcpFKPjEi3LNDureIZLa3DReRZjSXyRHarljWcv FTxIJ4UZox+6M1v1HQ8Fw9wCh1ryi5pc7XhxTe31oyJX3mT/K3U6PaGRm4n+ASjt/9mz /PTQ== X-Gm-Message-State: AOUpUlFR3XpO2CEsbIE3DyR1BS6/mV5f8O60qUEIv0zIIoHuMKFadQpj gFySu0fDER6/G5wtXDRBg37HoYF85jYJR6b/IUVOKQL8wHKGGq02NfISTEIw/PbcIKhVbLKi2Ps tIYxqHJepqGllvJXbnyUNZqhJYaNt/BS0UAjdpN4yK3VrsKWERneVKWmQA5uUvl20DMzaGmuQo5 a3SH/Tg8Hz4Iwi+JlFKe8WVUk069yTur2dUv1jPo7nyWE14Cv9ICuLqL5QsyEgWUGF6cLeb9etZ nExAQ33NYMwUN1IeetnRq2ZQTU019t5iwjfhAPLv3SSN5BmaqI9d7tmOhCDADxz9cB/N6RWMnG8 Q6GzqtdmFZAkRva+1To9L3wFEWakavOy3VaxfdgzABY8EIAaV22wtjllhAyMDhZN5PQ8V50Hdw= = X-Received: by 2002:a37:5e82:: with SMTP id s124-v6mr1411887qkb.313.1531835427037; Tue, 17 Jul 2018 06:50:27 -0700 (PDT) X-Received: by 2002:a37:5e82:: with SMTP id s124-v6mr1411851qkb.313.1531835426475; Tue, 17 Jul 2018 06:50:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531835426; cv=none; d=google.com; s=arc-20160816; b=VDQTgMjHKjpvPgW/PCX0+KHyt6jQWRmhUkQN/6EDwZaTtLPQVYMmmYCneo6JwKcjlQ Omf//KeWVOmyVYXGKXXtH0H+xvGywYjZP83gjLmNv9G/+Bozh18Vy68ZPI5aJwKUtsGw +PwWkzFptRBgA3HdIXr60gLx2RyI0RTICGHlQLhZvsC6Yoy+YOTIbJtXd1FIdSwURgtC Uk09Ly8KuPfOJn2d/23E59cuCCxQM8ZRiSUhnjW7mNouTkBbrG/+0MhCLfGOj7rLIAIS ZpJcZ32hBWOu69AAISx/77YZT9N96HDxkwakkbMJjiQAaaHY8ol3Tr9nU86ihNorVUTY XTaw== 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=3Msqigu/NKIbCJKAgSdf6fLoN8lQRyfGKzwl0VZ6Ltg=; b=FKczOpThSg/lmBfQ6q+0sTHKw1YbsWoSyz8DsEV6k5Lk3d4q+mjFSUcZOxn0v0Auue n0wFkLdNAFBrX33MGf6G1QmPW1uy7vU6KuS62WUgiHvc1llLY5ebqBxjKmh3EKuYCXbA yh4pLaqpTqaDkBTXaIR6BhI+ITRvU4TM/pJYjwCIwtj9+KqWj8C8K0YvDZXH0MStPYa/ FTkFV9Fd4HyEbeGrlH1uD/XbgFqap/ioYFxyzmiiqRd9SzccH3uen4nRoJoG+j1XvP4Q xLA22AmPEFmWMEZR1v1qhb9hhl8FwGYqlE88/3ZdyoqjBFGdBEr8488Er3OyjoydxJva g3Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="N4t1v/s/"; 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 h37-v6sor489464qtf.123.2018.07.17.06.50.26 for (Google Transport Security); Tue, 17 Jul 2018 06:50:26 -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="N4t1v/s/"; 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=3Msqigu/NKIbCJKAgSdf6fLoN8lQRyfGKzwl0VZ6Ltg=; b=N4t1v/s/4uP2pxBySXS3TmjfNvrjt+Xt2yyLeqYCkSLlC9zeBkDGU9tQX9TR2u/ZcX wK2lVP1dYIGNfQZvQ8D9jVubRE9qiAJIWmwoQDEoN8yd+7VVsrJRK0F6iguZlMok+/s+ mFqzdeBOpiTxzCbgIeTAnPeh3Zmz7NAR5K4h0SE2Zspcyn5Ey36LwvhVt6y20b1afo3f o8bNLnYy7D2T3yavPH12Pi0aTWOFokbIWG2UnjNQCfTJksvN7GpW2ISaO8bZi4sru2st mUqvx6enH2fmR4nOFHO/Wro9k+b7/mXvFPyvV/LrQKjP60FZoC+iKGRzzSreGeQx48Da 8lew== X-Google-Smtp-Source: AAOMgpdyBmQ1nQbo2J76/zxxOub0hGu1KtCqOFL7EfIoxkumPVxJHOylrmd/XQSR1X0p6DwdCSIueA== X-Received: by 2002:aed:3803:: with SMTP id j3-v6mr1603561qte.353.1531835426238; Tue, 17 Jul 2018 06:50:26 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 06:50:25 -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 11/22] selftests/vm: introduce two arch independent abstraction Date: Tue, 17 Jul 2018 06:49:14 -0700 Message-Id: <1531835365-32387-12-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 open_hugepage_file() <- opens the huge page file get_start_key() <-- provides the first non-reserved key. cc: Dave Hansen cc: Florian Weimer Signed-off-by: Ram Pai Signed-off-by: Thiago Jung Bauermann Reviewed-by: Dave Hansen --- tools/testing/selftests/vm/pkey-helpers.h | 10 ++++++++++ tools/testing/selftests/vm/pkey-x86.h | 1 + tools/testing/selftests/vm/protection_keys.c | 6 +++--- 3 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 ada0146..52a1152 100644 --- a/tools/testing/selftests/vm/pkey-helpers.h +++ b/tools/testing/selftests/vm/pkey-helpers.h @@ -179,4 +179,14 @@ static inline void __pkey_write_allow(int pkey, int do_allow_write) #define __stringify_1(x...) #x #define __stringify(x...) __stringify_1(x) +static inline int open_hugepage_file(int flag) +{ + return open(HUGEPAGE_FILE, flag); +} + +static inline int get_start_key(void) +{ + return 1; +} + #endif /* _PKEYS_HELPER_H */ diff --git a/tools/testing/selftests/vm/pkey-x86.h b/tools/testing/selftests/vm/pkey-x86.h index 2b3780d..d5fa299 100644 --- a/tools/testing/selftests/vm/pkey-x86.h +++ b/tools/testing/selftests/vm/pkey-x86.h @@ -48,6 +48,7 @@ #define MB (1<<20) #define pkey_reg_t u32 #define PKEY_REG_FMT "%016x" +#define HUGEPAGE_FILE "/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages" static inline u32 pkey_bit_position(int pkey) { diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c index 2565b4c..2e448e0 100644 --- a/tools/testing/selftests/vm/protection_keys.c +++ b/tools/testing/selftests/vm/protection_keys.c @@ -788,7 +788,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; @@ -1075,10 +1075,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;