From patchwork Fri Sep 15 21:22:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9953841 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 1BA6F601D3 for ; Fri, 15 Sep 2017 21:22:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A0A429564 for ; Fri, 15 Sep 2017 21:22:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2CD929566; Fri, 15 Sep 2017 21:22:41 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8ACE429564 for ; Fri, 15 Sep 2017 21:22:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751850AbdIOVWi (ORCPT ); Fri, 15 Sep 2017 17:22:38 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:37498 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751704AbdIOVWg (ORCPT ); Fri, 15 Sep 2017 17:22:36 -0400 Received: by mail-wm0-f67.google.com with SMTP id f4so3764574wmh.4 for ; Fri, 15 Sep 2017 14:22:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id; bh=1/sW0wftHDIWX2H13cSbcto2mYKEQyWplQS/5uj+71g=; b=SDdhNzfkk8W2JANzsyLq5bn9SFcHN2ascsua0ogXUCGJZdwdpvpb9G4j/lglgC4slJ vEb1uPy+dEgsTGmQeLXNzkuhiVexnsVWnbVL+Rp2elDpiwmIrZwVb5+RddSDzF5hqyIs 5pDMim1FBe2Yg+2GTkwC1wQPKIi1kgimOPwe1IjqjUz5otN6GZ94Cq09nVANS83Pe8X4 mOOSw5ICsa6LhZbVfCNX7hjwC1iMS9KAx5hkq26yK6CyzsrvcDhptm7v1bosA9dz3MZZ o4Fiiw4u+jRWDWc7YckB46wyfDvJL9zTYwKI5aUUvUZgyDQo/fL4kJbHjXCFj2Ps8Z31 3Scg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=1/sW0wftHDIWX2H13cSbcto2mYKEQyWplQS/5uj+71g=; b=PL8LQJ/35Y+LLYgq5xlakljeUZQDd2KUsS3gUNRGzysQ+5NLkJ+BtWRNNP7e7AIgeQ dbvLNsh+8McSB35xohHoH56kbZhBocnakMg3lFet8m8tWpKovt/lMH0tWZyrkv9Aq30R C2dlCiG0tZYyJ16ECCaY4KA9EYSklEqWt+fZTKd8XaatiHeDu5ZavlWJ0UcttUQPyMwG BFir/r9N/4cgdxcKOg0xT2uAYA+FyFaO0T/I2B4iNQ6TPw++R8v/LP9VSub8AMnwub5D 4XdgC7xzU9V7NGTij5+1cmIyRV+ifY0q7xgYFHTgBJXcTAX7fHJOktIkho07MjP8D8FA SiKg== X-Gm-Message-State: AHPjjUgcR+ofaEQq/mzyvp2TbXa8SZ441BVoC1t9jvPGRrQjHARoZCmj mvkO8+tAEMH8DPzgIuY= X-Google-Smtp-Source: AOwi7QCKGqyccZX6sE1dm+KKPTyoHIWoi4wHn4BCI7vGbQBUwdkkNXUo6BqWyIcjYLrxjNa1P97n0g== X-Received: by 10.28.150.199 with SMTP id y190mr3959529wmd.51.1505510554906; Fri, 15 Sep 2017 14:22:34 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id n48sm1579601wrb.0.2017.09.15.14.22.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 14:22:34 -0700 (PDT) From: Paolo Bonzini To: kvm@vger.kernel.org Subject: [PATCH kvm-unit-tests] x86: fix access.flat on non-SMEP machines Date: Fri, 15 Sep 2017 23:22:32 +0200 Message-Id: <1505510552-22114-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We need to restore PDPE.U=1, similar to what the tests do after printing the "Set SMEP in CR4 - expect #GP: FAIL" message. Signed-off-by: Paolo Bonzini --- x86/access.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x86/access.c b/x86/access.c index a0c19dc..11f561b 100644 --- a/x86/access.c +++ b/x86/access.c @@ -207,7 +207,7 @@ unsigned set_cr4_smep(int smep) if (smep) ptl2[2] &= ~PT_USER_MASK; r = write_cr4_checking(cr4); - if (!smep) + if (r || !smep) ptl2[2] |= PT_USER_MASK; return r; }