From patchwork Mon Jun 18 08:14:09 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: 10470093 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 C9DF56032A for ; Mon, 18 Jun 2018 08:36:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAD992842E for ; Mon, 18 Jun 2018 08:36:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF41F28705; Mon, 18 Jun 2018 08:36:37 +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 323662842E for ; Mon, 18 Jun 2018 08:36:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E96936B000D; Mon, 18 Jun 2018 04:36:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E45636B026F; Mon, 18 Jun 2018 04:36:35 -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 CBF506B0270; Mon, 18 Jun 2018 04:36:35 -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 875DF6B000D for ; Mon, 18 Jun 2018 04:36:35 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id bf1-v6so9797655plb.2 for ; Mon, 18 Jun 2018 01:36:35 -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=/6eahoKfEPkW6mCZ8KPeakGofiwPRU0NuCQMxjEgq8g=; b=Ge2CQZSK8ALVx0WfGVabDDNNq6SPkLjusIywggdopgiJvylF8KZVAzsjrslZLzc1C0 e+rFp0xebu2p3wWs6kOT1OSgQAh75o4LvYN5iDB0Rb+k/X7epiv7x4I0fVv+02yxIMGS YPKxYS+M+7GFiUBZc56inalyCdVpfwlRQTJ8UsYMfH96OJ/QWRMvptkyURrk2F/iilC9 S3Xq5FbSXS9VPdEyGWQZVR44VgwaNTixWeFAMfaU2RqH2ypaA9g1vkUSyYhztdKYhHXW l55CyPF1QESWe4ZEMNxXuFuY7YwK+/yA2+DzgzqlpQxKB+Vi7ms3UDiH4ZNSEviOdLVv PxRQ== 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: APt69E3y3Cl3THvVBpJD2UbkZPPOBjuHzgBWeyqLMwQDZtcDjEiIB9Oh QGn69grtscYlmojS6DNk2fOse+lxXE0UXe3O24OR7frVf/b4ZHqCy4sDu5E0iuPvvsCAtHl8EOk SUd6anU3lW+puOakxukFUdlfsPyukSoc5FdPojYpQE8UsHCQv0qWGOVWWtA7fw8SPMg== X-Received: by 2002:a65:644f:: with SMTP id s15-v6mr10265009pgv.228.1529310995212; Mon, 18 Jun 2018 01:36:35 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLeQDYgpFzv0lk0BwYL/dt7EFyDUywCWR+pX/Xae71WeIx5x6tkF011xpgUghCOG6lXdkNg X-Received: by 2002:a65:644f:: with SMTP id s15-v6mr10264983pgv.228.1529310994477; Mon, 18 Jun 2018 01:36:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529310994; cv=none; d=google.com; s=arc-20160816; b=qN77OmcH+b7skCeiU2AkgShA3q1V1DU3wsEySIlx3/DCJLBpXEqkJP8Ydhs/HhR0R8 gCOn0iFUXU5jeS6AASx13msNr+nu/5wXke8QpL+6B2+fV0ScqsDyxJZ2q/uaI4HadJUq pZrRsEVhdl2RoerjaRoux8FXp+tQ/JR9TkIzYR5RlLlHDKWQ3+X/oX3uqjBPaf11thqY njeYIg5JP9oYypuUdjxtlf0BeMpo5ksDR2vmIAKVOUlVy0r8Re+nc/3w0r5dasjtRSqj gyUwf2+pxUC9lmSS79XbZHkIM9ekTH8Nx3gsusikg51Be3qhwcpLKjnwe9XZcW8hmLQE Ah8w== 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=/6eahoKfEPkW6mCZ8KPeakGofiwPRU0NuCQMxjEgq8g=; b=X9oqvbVfD6DqMB8YVOYgYPwOyTc8hixUKx7JKFQuL923Waz3gZu1pXtBzYatCPWHzz LA75AlRMgFem0SxF+20Z/+Mk8Q8oEZXEhCCyb8exWAh02QxGYysBTcSw/HByFynPsgiR Z9qNEoeFjXXDbEuJ6giiJj8IUtBuV2dk6QteoqC8qyVkat5UmeM+kO1a2BiLHnqkYWcL j2j9XHTigsu7TpLZcXl/l3VCXhkA8MINL9njnFRok1J/T0tXMpa0Dn8efsVL4vnov/dj E5a5g/jP1Qjp+NC4VP9dHk4cG+U3MVcLp1LqTZx5bKCR776YafsbhTUhRnUw0t6605s9 4/Yg== 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 32-v6si14899583plc.252.2018.06.18.01.36.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 01:36:34 -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 8BD15CB9; Mon, 18 Jun 2018 08:36:33 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Hansen , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , akpm@linux-foundation.org, dave.hansen@intel.com, linux-mm@kvack.org, linuxram@us.ibm.com, mpe@ellerman.id.au, shakeelb@google.com, shuah@kernel.org, Ingo Molnar , Sasha Levin Subject: [PATCH 4.14 153/189] x86/mpx/selftests: Adjust the self-test to fresh distros that export the MPX ABI Date: Mon, 18 Jun 2018 10:14:09 +0200 Message-Id: <20180618081215.375936556@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: Ingo Molnar [ Upstream commit 73bb4d6cd192b8629c5125aaada9892d9fc986b6 ] Fix this warning: mpx-mini-test.c:422:0: warning: "SEGV_BNDERR" redefined Cc: Dave Hansen Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: akpm@linux-foundation.org Cc: dave.hansen@intel.com Cc: linux-mm@kvack.org Cc: linuxram@us.ibm.com Cc: mpe@ellerman.id.au Cc: shakeelb@google.com Cc: shuah@kernel.org Link: http://lkml.kernel.org/r/20180514085908.GA12798@gmail.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/x86/mpx-mini-test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/tools/testing/selftests/x86/mpx-mini-test.c +++ b/tools/testing/selftests/x86/mpx-mini-test.c @@ -368,6 +368,11 @@ static int expected_bnd_index = -1; uint64_t shadow_plb[NR_MPX_BOUNDS_REGISTERS][2]; /* shadow MPX bound registers */ unsigned long shadow_map[NR_MPX_BOUNDS_REGISTERS]; +/* Failed address bound checks: */ +#ifndef SEGV_BNDERR +# define SEGV_BNDERR 3 +#endif + /* * The kernel is supposed to provide some information about the bounds * exception in the siginfo. It should match what we have in the bounds @@ -419,8 +424,6 @@ void handler(int signum, siginfo_t *si, br_count++; dprintf1("#BR 0x%jx (total seen: %d)\n", status, br_count); -#define SEGV_BNDERR 3 /* failed address bound checks */ - dprintf2("Saw a #BR! status 0x%jx at %016lx br_reason: %jx\n", status, ip, br_reason); dprintf2("si_signo: %d\n", si->si_signo);