From patchwork Mon Jun 18 08:13:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 10469859 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 82D8E6032A for ; Mon, 18 Jun 2018 08:27:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 731DC28861 for ; Mon, 18 Jun 2018 08:27:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6778A288B8; Mon, 18 Jun 2018 08:27:58 +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 D6E6328861 for ; Mon, 18 Jun 2018 08:27:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 092086B0003; Mon, 18 Jun 2018 04:27:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 040CF6B000D; Mon, 18 Jun 2018 04:27:56 -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 E24866B0010; Mon, 18 Jun 2018 04:27:56 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f70.google.com (mail-pg0-f70.google.com [74.125.83.70]) by kanga.kvack.org (Postfix) with ESMTP id 9B3A06B000D for ; Mon, 18 Jun 2018 04:27:56 -0400 (EDT) Received: by mail-pg0-f70.google.com with SMTP id e1-v6so4955714pgp.20 for ; Mon, 18 Jun 2018 01:27:56 -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=2U4xKfCpQol+vppBA97y4qlvzwnSmWA3KKyWVe4Rhyc=; b=aDwUSAC6hLf5Z1WE/Jv6EjZf+ZEEjZLnEjGMlioo+a2ngQ8V86IM98bi/7fVNy2BSf c6xVQ8f+oDnVG0q3n0kU7jhFGaU9xYPxwtMsuStfbm1yfXrNpRNAj0Nm2Xqpx4SaBUNj Bq2aAjBqCLuYB/eu/dwUzJgEO0X2qbWinggghim+Q2hb98PZZ1wZODk2HDQZMfyNVLEK Jc46BXvFLaFJiKtVKfoGXtexqgYv8qhGeA6SE5G06pQwwQaHZxP0ikFGlqCXk1jarmXX OXaC9rthaxABZ6e0mG0tpQWFZ5NAF5PltIt5cVgMPGzsgyN1AbGMjwjLf87MugANbOQJ /PHQ== 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: APt69E3SukD1hvWGNqnI7bchACSvHUP4yQfo5/oIF790PDGK9LO4p8Ld y7PzQ0deup5aVvJYL+Gsvag5kGebw4z4JZThUZWF6QMuhTwMxzxRofA+TKB9tMQ8FmV3v111/S7 W74B7RiDiCY5C3wYfJZhV7nWVO9KKAg3LG4rgBCwr12Wnza5/kxiI/O43Ep7yj+MctQ== X-Received: by 2002:a17:902:d90f:: with SMTP id c15-v6mr12844645plz.65.1529310476324; Mon, 18 Jun 2018 01:27:56 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL1L/TbTJa52pkWXctkWaKrZqAM30z2qK/FatjZIDetHFkumA70F+vw7ggSBlUgJScWVgd6 X-Received: by 2002:a17:902:d90f:: with SMTP id c15-v6mr12844598plz.65.1529310475566; Mon, 18 Jun 2018 01:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529310475; cv=none; d=google.com; s=arc-20160816; b=P/9PhjX4gFO2uTIdGPxsUtN6xH2+t+P1JPIc9o7rh4rgm33kec1uh8wvtFyGHTKYRQ ICef9Hgf5dl9aBdj9CMj61U80tCHfKzf8prMthOUFu7uR2UvTEZiIsQsg5cJ5FdjiL5n b87jhN4S8dKyWzWAMG8CaKMJLjRMaMhfjcb/jWPrAxo34bt/JwT3KPsAJol0whA8+M8T R+Vwh4ChVoTbVg/AzypX8eYj74perV7YwWUL5zirxpDVoGHs9DjsVCRu74hO1ApGP9X2 ERv0mEp551nd62a0JwLvEa6/y9iNeZY8xT6NkEWHX70JIbaKKUyRtPC6HdRi+NOQp8xP 2/rg== 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=2U4xKfCpQol+vppBA97y4qlvzwnSmWA3KKyWVe4Rhyc=; b=xjFCsshkMFYRyFOMOqPd53ysai2tSd7DL84hgD7bN53KgiMruxgjJyIvOqMm0mcr3P Hpm/p+rtZPFPMeihWZv3socnibCL+Dyw7JHaN8MPnGZ9SlDpszaG1SgFP4eoUWaz3HWj aBcFkM27Z4Vq2UQgVx07dJPQpRSC2QtjmAMhbMrWNxbCEMwM+SA4uE7i4twLzBu7HFHj xQaB2S6A8tDB/Us/kEnER/MNB1tjrAuW/7d2mTd8T0H33AsxZgX0xJnvYYvxB5AS++Fl fsxILBVVNZo+p8YXX6a/oHYKYM2HGSiPLKoGbIWrV5hq4NDPreQgGtcEpppzx0Kul4yZ m5HA== 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 67-v6si11673315pge.373.2018.06.18.01.27.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 01:27:55 -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 94074BAD; Mon, 18 Jun 2018 08:27:54 +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 242/279] x86/pkeys/selftests: Factor out "instruction page" Date: Mon, 18 Jun 2018 10:13:47 +0200 Message-Id: <20180618080618.793993947@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 3fcd2b2d928904cbf30b01e2c5e4f1dd2f9ab262 ] We currently have an execute-only test, but it is for the explicit mprotect_pkey() interface. We will soon add a test for the implicit mprotect(PROT_EXEC) enterface. We need this code in both tests. 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/20180509171347.C64AB733@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 | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -1253,12 +1253,9 @@ void test_ptrace_of_child(int *ptr, u16 free(plain_ptr_unaligned); } -void test_executing_on_unreadable_memory(int *ptr, u16 pkey) +void *get_pointer_to_instructions(void) { void *p1; - int scratch; - int ptr_contents; - int ret; p1 = ALIGN_PTR_UP(&lots_o_noops_around_write, PAGE_SIZE); dprintf3("&lots_o_noops: %p\n", &lots_o_noops_around_write); @@ -1268,7 +1265,23 @@ void test_executing_on_unreadable_memory /* Point 'p1' at the *second* page of the function: */ p1 += PAGE_SIZE; + /* + * Try to ensure we fault this in on next touch to ensure + * we get an instruction fault as opposed to a data one + */ madvise(p1, PAGE_SIZE, MADV_DONTNEED); + + return p1; +} + +void test_executing_on_unreadable_memory(int *ptr, u16 pkey) +{ + void *p1; + int scratch; + int ptr_contents; + int ret; + + p1 = get_pointer_to_instructions(); lots_o_noops_around_write(&scratch); ptr_contents = read_ptr(p1); dprintf2("ptr (%p) contents@%d: %x\n", p1, __LINE__, ptr_contents);