From patchwork Mon Jun 18 08:14:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10470153 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 DDBB76032A for ; Mon, 18 Jun 2018 08:38:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFF5F26E3C for ; Mon, 18 Jun 2018 08:38:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C487F28449; Mon, 18 Jun 2018 08:38:33 +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 4565E26E3C for ; Mon, 18 Jun 2018 08:38:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B0616B0276; Mon, 18 Jun 2018 04:38:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 25CC86B0277; Mon, 18 Jun 2018 04:38:31 -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 0D66D6B0278; Mon, 18 Jun 2018 04:38:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f71.google.com (mail-pl0-f71.google.com [209.85.160.71]) by kanga.kvack.org (Postfix) with ESMTP id BDAB26B0276 for ; Mon, 18 Jun 2018 04:38:30 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id x2-v6so9799654plv.0 for ; Mon, 18 Jun 2018 01:38:30 -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=K95E2fxgYbcCFhtZyWGistikAnZXpLmQBdpksIYQvmY=; b=qn1pyXJpTKCFsoTM8pfidd4nlJxyAPEP1zFx/YL9a0JYvs8HNZEE5q+Flr4nSHPvV6 0NQCk1BPD8QcX6GE1to0mAFAxF4S98letoUTonlP5N4he+pqc2ucMhbAdiHLji+Ij2Cf V4BBaz2XIt3n8wTrLAAB0Vr2H+YSgo4R41H3VMGANoaKI4qHxkAdkR5BKVRj9l156K3D smLsDZ9DnVLREtavy1MsGChBDzZ+mjl7koOGPXGv23MCXZKw1EvtwQl1CKaGriU4pd/E pxsQ1em+LI3zYt2tTjREdo1JESNGG4a6YaZtjShgBeB0jBgOyhJgwVVpv8rft6rbfwKv JlVQ== 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: APt69E0IJRdSnze/DVsnSA/WqeEN0A2nUnASMZ/u2USvdXnYANmzrr1L oaieLHJ3bnxd+NNuF4bfNbO7L3Plcd7vBbLa6uFO6RS/M4T++c9gPWoIgSt0ayQaVHRx+I7Cdrt 8yKnn2icNjT6/aO/8f0AH++uydeunr3TAG7X9imCg9HWDF6VqCF8bASTSr4BvYKU7MA== X-Received: by 2002:a17:902:b946:: with SMTP id h6-v6mr12679634pls.1.1529311110461; Mon, 18 Jun 2018 01:38:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKoF1yszUTyqMrxMS5ZBTIkQtpAYCcSHw43KNDs1tdTFuD6PAsnGlU92y5JmuYixwnlgOyQ X-Received: by 2002:a17:902:b946:: with SMTP id h6-v6mr12679587pls.1.1529311109664; Mon, 18 Jun 2018 01:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529311109; cv=none; d=google.com; s=arc-20160816; b=n1AJQ4i3l4NU6dqHiQQhOgXX7GqKNBKlX2dfYOqWLT2Gc9JDgZapXlv/UF6DKEcW2b DOFFKhd9Mm/eiTUdfrsKJHuwQ1Sl1gqgNlslbR4lE/Q7uJtSkinO2s+Vi7crcdgg/8CK qWbU6gyQpwaETcUrVHC2ZyckWILAfdZv7cS7cJPeO7Q2HIIA6HqDrn1DoveSKb1+KCfv ay+IS6SqhJo5oNPpcHNTi8t6FTV46YIcnryckAJUNiVZbh7jVizqyKfsjCYi3W6HPUaG AMFMV6I/jCDmnYzMgxtjv0fk5pBaPgJUjVpS5HXRC5lkzpnh5L5DbSTQMO3FBJNwW3d0 CE4w== 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=K95E2fxgYbcCFhtZyWGistikAnZXpLmQBdpksIYQvmY=; b=BEJPFrJck11IfDRB/UrBghybroOjT2BSsIWC6pbk5BFA7DsvXCBBphyjzrp0cS3Zto THzDCxtdVaweR3q6RyRFhWCIpueFFF9gZtOJxQ+yksVAdM49sn0I/RSNAx0uiGRXbiUU BySt8/zAwgfUbfXWQnP/TN1ui1imgIuEpP6ycpX/9ydew2EqndYh3X8K+OkRfAWp5wgW DwKiiV0/D9V8qwhG0IleAM0FC7SkJEt1vWFiPxWAFswdkSOKRrUIGZgNLBCzQvi3o0Y7 YCygYOMY4kMGRtm1WV9ke/Sgos4fk8uL06h6dscVqlYLUv6L/kgJUeHSa//6cNMRSZ3k VS9A== 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 184-v6si11564088pgd.343.2018.06.18.01.38.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 01:38:29 -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 D28C5CB9; Mon, 18 Jun 2018 08:38:28 +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.14 155/189] x86/pkeys/selftests: Give better unexpected fault error messages Date: Mon, 18 Jun 2018 10:14:11 +0200 Message-Id: <20180618081215.462194707@linuxfoundation.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618081209.254234434@linuxfoundation.org> References: <20180618081209.254234434@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.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Hansen [ Upstream commit 55556b0b2016806b2e16a20b62d143383983a34a ] do_not_expect_pk_fault() is a helper that we call when we do not expect a PK fault to have occurred. But, it is a function, which means that it obscures the line numbers from pkey_assert(). It also gives no details. Replace it with an implementation that gives nice line numbers and also lets callers pass in a more descriptive message about what happened that caused the unexpected fault. 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/20180509171338.55D13B64@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 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -954,10 +954,11 @@ void expected_pk_fault(int pkey) last_si_pkey = -1; } -void do_not_expect_pk_fault(void) -{ - pkey_assert(last_pkru_faults == pkru_faults); -} +#define do_not_expect_pk_fault(msg) do { \ + if (last_pkru_faults != pkru_faults) \ + dprintf0("unexpected PK fault: %s\n", msg); \ + pkey_assert(last_pkru_faults == pkru_faults); \ +} while (0) int test_fds[10] = { -1 }; int nr_test_fds; @@ -1243,7 +1244,7 @@ void test_ptrace_of_child(int *ptr, u16 pkey_assert(ret != -1); /* Now access from the current task, and expect NO exception: */ peek_result = read_ptr(plain_ptr); - do_not_expect_pk_fault(); + do_not_expect_pk_fault("read plain pointer after ptrace"); ret = ptrace(PTRACE_DETACH, child_pid, ignored, 0); pkey_assert(ret != -1); @@ -1287,7 +1288,7 @@ void test_executing_on_unreadable_memory */ madvise(p1, PAGE_SIZE, MADV_DONTNEED); lots_o_noops_around_write(&scratch); - do_not_expect_pk_fault(); + do_not_expect_pk_fault("executing on PROT_EXEC memory"); ptr_contents = read_ptr(p1); dprintf2("ptr (%p) contents@%d: %x\n", p1, __LINE__, ptr_contents); expected_pk_fault(pkey);