From patchwork Tue Jul 17 13:49:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ram Pai X-Patchwork-Id: 10529467 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 748686020A for ; Tue, 17 Jul 2018 13:50:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BCBC29203 for ; Tue, 17 Jul 2018 13:50:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F3C429225; Tue, 17 Jul 2018 13:50:23 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, 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 ED69429203 for ; Tue, 17 Jul 2018 13:50:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731661AbeGQOXI (ORCPT ); Tue, 17 Jul 2018 10:23:08 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:38351 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731698AbeGQOXI (ORCPT ); Tue, 17 Jul 2018 10:23:08 -0400 Received: by mail-qk0-f196.google.com with SMTP id y4-v6so515939qka.5; Tue, 17 Jul 2018 06:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=QUvfCvj00EhTJy+BDSl2Z8dPnm5wv5ZkdNEiB7LZ4Ew=; b=f+pRtPz3I8fWxrYbKh5WDmgtKO9qaNtEqTNG/GMNwRciYfzZDTiXQrFiv3rXMKbqbK uqHX+o1GGl6pB1EmgWQ5UyFVydi//zsioTxCj3Lsjb7hcN3pVuKIAR0ShdvGWi7blDtH xKtHXun120znEdSQELl2aqCHviW+bmfUbDjE33/M3UGrPdRrmS/rXaiYlSTCjzdr4bRt 8M/MLJpbTBogf+bnkaO0wMW1qF24N81el8C17Y38TsRWtLIRIpEFY6s+/Raen63LQ7y7 U4pK0419nF8jdlnjDEYPmNthrG9kx3IgFcwDRC4wCBP2roPPn7oqTW+BEaKlMNUNHP/r wLzQ== 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:cc:subject:date:message-id :in-reply-to:references; bh=QUvfCvj00EhTJy+BDSl2Z8dPnm5wv5ZkdNEiB7LZ4Ew=; b=lUdx6UlKoQM6+Y7K1tfC6TjqTwAl3rksXwtrXhfSQVVSCPLncV301UuPAHVG8a3pql FxIZMkQYvBnA38nXz/Pb5jZAW3OiD+AfMeArjBaBzrz0Mxc38p1jHF1pXUiTXGkNivGz nyTXIgRw8f7WDizj1dp5l0TVuQUR4haJCsopFMAKzoapwt/+kY9wLj669icVOOO5qwfW 6QVCqa/hlVf988ZeQM6xSQ1cyZ7jldGMAu7VG3kmMOyi0P7AEmTg0G2aTUa41VluikPL 56Yldu3rBM2opuPV7NwSGMeDA1dZ0H1Jkk7Ez3PPAwSuid+75YHwK3QJORM6bAfamS5H dcrg== X-Gm-Message-State: AOUpUlFM9w5P04n1IZLopVqqjw85sY34h/IsQaIvzHo7w3LHlEXQ7hU2 uIIXR26rt+Tp2AoWovXY5Ns= X-Google-Smtp-Source: AAOMgpe1OIse3iAWGRyiT6bxIgRuIul6umjSG1s7aCXu8uQQ2JvOv9u/WS+/dZDrr/kd7oIN8XB8WA== X-Received: by 2002:a37:9702:: with SMTP id z2-v6mr1461232qkd.183.1531835421741; Tue, 17 Jul 2018 06:50:21 -0700 (PDT) Received: from localhost.localdomain (50-39-100-161.bvtn.or.frontiernet.net. [50.39.100.161]) by smtp.gmail.com with ESMTPSA id s83-v6sm640937qki.20.2018.07.17.06.50.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 06:50:21 -0700 (PDT) From: Ram Pai To: shuahkh@osg.samsung.com, linux-kselftest@vger.kernel.org Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, x86@kernel.org, linux-arch@vger.kernel.org, mingo@redhat.com, dave.hansen@intel.com, mhocko@kernel.org, bauerman@linux.vnet.ibm.com, linuxram@us.ibm.com, fweimer@redhat.com, msuchanek@suse.de, aneesh.kumar@linux.vnet.ibm.com Subject: [PATCH v14 09/22] selftests/vm: fixed bugs in pkey_disable_clear() Date: Tue, 17 Jul 2018 06:49:12 -0700 Message-Id: <1531835365-32387-10-git-send-email-linuxram@us.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1531835365-32387-1-git-send-email-linuxram@us.ibm.com> References: <1531835365-32387-1-git-send-email-linuxram@us.ibm.com> Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP instead of clearing the bits, pkey_disable_clear() was setting the bits. Fixed it. Also fixed a wrong assertion in that function. When bits are cleared, the resulting bit value will be less than the original. This hasn't been a problem so far because this code isn't currently used. cc: Dave Hansen cc: Florian Weimer Signed-off-by: Ram Pai Acked-by: Dave Hansen --- tools/testing/selftests/vm/protection_keys.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c index 2dd94c3..8fa4f74 100644 --- a/tools/testing/selftests/vm/protection_keys.c +++ b/tools/testing/selftests/vm/protection_keys.c @@ -433,7 +433,7 @@ void pkey_disable_clear(int pkey, int flags) pkey, pkey, pkey_rights); pkey_assert(pkey_rights >= 0); - pkey_rights |= flags; + pkey_rights &= ~flags; ret = hw_pkey_set(pkey, pkey_rights, 0); shadow_pkey_reg &= clear_pkey_flags(pkey, flags); @@ -446,7 +446,7 @@ void pkey_disable_clear(int pkey, int flags) dprintf1("%s(%d) pkey_reg: 0x"PKEY_REG_FMT"\n", __func__, pkey, read_pkey_reg()); if (flags) - assert(read_pkey_reg() > orig_pkey_reg); + assert(read_pkey_reg() <= orig_pkey_reg); } void pkey_write_allow(int pkey)