From patchwork Mon Jun 18 08:13:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10469875 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 0A71F6032A for ; Mon, 18 Jun 2018 08:28:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF24128861 for ; Mon, 18 Jun 2018 08:28:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3AB5288B8; Mon, 18 Jun 2018 08:28:11 +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.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham 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 5AB9728861 for ; Mon, 18 Jun 2018 08:28:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63AD76B0266; Mon, 18 Jun 2018 04:28:09 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5C10D6B0269; Mon, 18 Jun 2018 04:28:09 -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 466B36B026A; Mon, 18 Jun 2018 04:28:09 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id DAD286B0266 for ; Mon, 18 Jun 2018 04:28:08 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id 31-v6so9783333plf.19 for ; Mon, 18 Jun 2018 01:28:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:user-agent :mime-version; bh=tbYy+VTHk+ENPogtc523NHjkyE41WM7SM4nhxsyPwrc=; b=Qwy5tx0uvoox5Wqzj1vVqbEG2krHki1zeuQTWAmxgLQ1SD/cteiXLhTYD5GK8dsuj2 fVFkfHRe8SWcjn95rdRzE8bGwO4LtA/Kg9nxkmgsaAdrZVYjQxQoM8V56pezOAN/CQWO APlIRJap2sfi7gpD0Vok4GMkRwSGDKkSduBZEO92AWbDXyppf5tfRqCShToThoii5EOK bUcwfFNTNho08dgZyfY1251BiBF5/oB78vnqjUJinrU90N2YPwMfkL5H1PMgSY4CE2Ai sYLC//xew1TrwXdlZAXfCiVFXnXa72Gpb0LDfv5kI/UiayJbJ3j4agAwfUbcW2EIb+D7 BkAg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-Gm-Message-State: APt69E3aSR3o0Gm9VjjuGaxRAwAk7IbcjdcP1XwKikjqsTjfoYWbO4/i MUxjwnfLwjtOwOKW1CvbYke4tBmPLtwRhwZspZvT/kntFymet/nSTZaRl9jcTUvrq0O8Zam/cVA 7zdjIQhevRHgaIkZ/0RSwVDvNijE9J74tZqu2DkXDMv2CMT+W2xZdU9cleXUO6rSiug== X-Received: by 2002:a17:902:d20c:: with SMTP id t12-v6mr13150788ply.63.1529310488577; Mon, 18 Jun 2018 01:28:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKfEka5m+NacR1RLV/uc+rpdWzU9xNl1fYvtdSuGqcoNfb51XAyBbTawRtJ9nSmi/4YEvxM X-Received: by 2002:a17:902:d20c:: with SMTP id t12-v6mr13150744ply.63.1529310487859; Mon, 18 Jun 2018 01:28:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529310487; cv=none; d=google.com; s=arc-20160816; b=qN2nQ+DsDhi7xvcjtdB+Aa7QxmnfjI4vZHhWgqMl8Vkr5rEM8fo1TJih49t61/Qr72 sR4pc2rQttRZiJfObCicULHs5o2XuEKAR0uf30JLXY0iXUmLLbFs52S+iSG+zUE/LpxJ HMLGaFPb4rSl72VuFJD6M7pNFPvzP7YuExERz7/XEMNyKVlG4nHJhI+dcD/ZNpci5lHC TzmTwRMRCnLtmX1LfZxKHnk2xCCoVRuqt3fn0csgSgCPTpYeUspslQsqZBt32d6RrDs9 KypWZHzJeq4jbtDHSGGdq7VxBjP/KZgdHs0XFSpleH501fWIX43bPOaWNJn3CxopyHXW Fp7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=tbYy+VTHk+ENPogtc523NHjkyE41WM7SM4nhxsyPwrc=; b=zfn1FZax4CvJwtLR1qb4r/1+dIhzTwSTFhN5jZ6dwdPBpXPWVsf/PmnTfhyMZ7/S11 2KrRWNBV1PNSYTyaiTgseHq08RD7jHio3oeHxEsy3nTVsgzzzMJ3en56nODAChj8L+DS yMtyWsM5tGvJG2qfKx9FI7zU/4L4HlSFk7a5PNFiwCAwKtop4h7oZp7SXlwR5I0av6K6 jk06Ns8A0aSG0L25hDulU2feQV/H8uzjH6D30/4pBvWkWezwg0tbexBfOkhzcUlMcmVA XGq3Jh/S1krnRuMehbT+bRMDG1I6qQp6Yh5Pc/+8MH3c/IDBFp9m66pFVn6KVRNzU8XD 72Iw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id u191-v6si11623866pgd.667.2018.06.18.01.28.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 01:28:07 -0700 (PDT) Received-SPF: pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) client-ip=140.211.169.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 142F9CE1; Mon, 18 Jun 2018 08:28:07 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Hansen , Andrew Morton , Dave Hansen , Linus Torvalds , Michael Ellermen , Peter Zijlstra , Ram Pai , Shuah Khan , Thomas Gleixner , linux-mm@kvack.org, Ingo Molnar , Sasha Levin Subject: [PATCH 4.16 246/279] x86/pkeys/selftests: Save off prot for allocations Date: Mon, 18 Jun 2018 10:13:51 +0200 Message-Id: <20180618080618.947257586@linuxfoundation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618080608.851973560@linuxfoundation.org> References: <20180618080608.851973560@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 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 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Hansen [ Upstream commit acb25d761d6f2f64e785ccefc71e54f244f1eda4 ] This makes it possible to to tell what 'prot' a given allocation is supposed to have. That way, if we want to change just the pkey, we know what 'prot' to pass to mprotect_pkey(). Also, keep a record of the most recent allocation so the tests can easily find it. Signed-off-by: Dave Hansen Cc: Andrew Morton Cc: Dave Hansen Cc: Linus Torvalds Cc: Michael Ellermen Cc: Peter Zijlstra Cc: Ram Pai Cc: Shuah Khan Cc: Thomas Gleixner Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20180509171354.AA23E228@viggo.jf.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/x86/protection_keys.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -677,10 +677,12 @@ int mprotect_pkey(void *ptr, size_t size struct pkey_malloc_record { void *ptr; long size; + int prot; }; struct pkey_malloc_record *pkey_malloc_records; +struct pkey_malloc_record *pkey_last_malloc_record; long nr_pkey_malloc_records; -void record_pkey_malloc(void *ptr, long size) +void record_pkey_malloc(void *ptr, long size, int prot) { long i; struct pkey_malloc_record *rec = NULL; @@ -712,6 +714,8 @@ void record_pkey_malloc(void *ptr, long (int)(rec - pkey_malloc_records), rec, ptr, size); rec->ptr = ptr; rec->size = size; + rec->prot = prot; + pkey_last_malloc_record = rec; nr_pkey_malloc_records++; } @@ -756,7 +760,7 @@ void *malloc_pkey_with_mprotect(long siz pkey_assert(ptr != (void *)-1); ret = mprotect_pkey((void *)ptr, PAGE_SIZE, prot, pkey); pkey_assert(!ret); - record_pkey_malloc(ptr, size); + record_pkey_malloc(ptr, size, prot); rdpkru(); dprintf1("%s() for pkey %d @ %p\n", __func__, pkey, ptr); @@ -777,7 +781,7 @@ void *malloc_pkey_anon_huge(long size, i size = ALIGN_UP(size, HPAGE_SIZE * 2); ptr = mmap(NULL, size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); pkey_assert(ptr != (void *)-1); - record_pkey_malloc(ptr, size); + record_pkey_malloc(ptr, size, prot); mprotect_pkey(ptr, size, prot, pkey); dprintf1("unaligned ptr: %p\n", ptr); @@ -850,7 +854,7 @@ void *malloc_pkey_hugetlb(long size, int pkey_assert(ptr != (void *)-1); mprotect_pkey(ptr, size, prot, pkey); - record_pkey_malloc(ptr, size); + record_pkey_malloc(ptr, size, prot); dprintf1("mmap()'d hugetlbfs for pkey %d @ %p\n", pkey, ptr); return ptr; @@ -872,7 +876,7 @@ void *malloc_pkey_mmap_dax(long size, in mprotect_pkey(ptr, size, prot, pkey); - record_pkey_malloc(ptr, size); + record_pkey_malloc(ptr, size, prot); dprintf1("mmap()'d for pkey %d @ %p\n", pkey, ptr); close(fd);