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: 10529497 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 90F516020A for ; Tue, 17 Jul 2018 13:50:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7733028D8A for ; Tue, 17 Jul 2018 13:50:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6ABD329203; Tue, 17 Jul 2018 13:50:43 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID 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 03B8E29087 for ; Tue, 17 Jul 2018 13:50:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B0786B026C; Tue, 17 Jul 2018 09:50:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4106E6B026D; Tue, 17 Jul 2018 09:50:23 -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 1A2836B026E; Tue, 17 Jul 2018 09:50:23 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f199.google.com (mail-qt0-f199.google.com [209.85.216.199]) by kanga.kvack.org (Postfix) with ESMTP id D9BD46B026C for ; Tue, 17 Jul 2018 09:50:22 -0400 (EDT) Received: by mail-qt0-f199.google.com with SMTP id d18-v6so741055qtj.20 for ; Tue, 17 Jul 2018 06:50:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:sender:from:to:cc:subject:date :message-id:in-reply-to:references; bh=QUvfCvj00EhTJy+BDSl2Z8dPnm5wv5ZkdNEiB7LZ4Ew=; b=ETFIJa+Qr4cncYUOgBXpxoCLo4vWi1bI8swmAu04CFxY6H7uvig+WA/LI554kaEexz 6c8CamZPVzoabFNjnxRLnaN6V3l2OREIi8b7nqrw2sSSNuL1miCxwZNnYD9O7brSGmgk 2T1Bve8+inHEIVTgQPzweRZebdlcdu8FEzj9tUp/K7up9YCQ7GMMcU/RHoN/E8PynyIq pyCnbPMqXAvEy/Of+H/pzEJJVD5f1PsFrD0E1ssv6UK3dWMQWEyqWXi5u8Tv/wEvovNM E1JpKMC2rp1zkINpJLfjMtJIjFu/iT+Uu338tFNs5rGPtJ9rimmayun71PnMzZ1MtHyc nAJQ== X-Gm-Message-State: AOUpUlET0uf13HvjENjq7Pcu5hC97DvsPMHa/VM4BHikQo0gGQlZnLTu ToulqgNmu3dl6P7Ki5ox0at5skKH5NLgDnji+NP/LWiJoB7jsbvo96za9cmwdUT8ro7cKz1ezV9 VFog22DUcDMw+yhWUT+RUwHOj0WikHnBT44jiBCyl7HeJl2xqpF1WU/pydFyhozAl2aLq1rIU67 q3YOESvl9VGuxtYjrT4jKzeVJf+DjNhg1gsCDgJSC5tlIXXM0F80EpHP3NWFt+cVqvGMgJjRrhe JVOHAXg9ItsQj0PHqiddzi6pDQWSNVyjuhoVX0bQEsXSa9JlebfQxmlSaG1iQTqUjzEYkSH4EMB 3LKg1Wz0qgXkJadORA1v2pWCQkfXaynaV6ldq1Uh3zBGE+O+lP5f3PWnnzeYFmdcmwHDATpZCQ= = X-Received: by 2002:a37:3a45:: with SMTP id h66-v6mr1517563qka.118.1531835422685; Tue, 17 Jul 2018 06:50:22 -0700 (PDT) X-Received: by 2002:a37:3a45:: with SMTP id h66-v6mr1517524qka.118.1531835422089; Tue, 17 Jul 2018 06:50:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531835422; cv=none; d=google.com; s=arc-20160816; b=NkBNkY7R9+/76rsKkZwMv6xBTJVPlGKHrZO8r8A+Xw5TXnLc6a/UU3dM/8coWEjlBG hAl6oO1SE9Wq+Xnm30NxcYHHtji4S1ST3SREdKbMiof4Fi7SITdgBXs6p7UpG4yZzUC8 Xl9wFsTypkbTWKEPQiSsc28dRtgQbgdDFlEInbQcLL8O9lSN/og9NrtNwORBvMkRYrGz MJbd0siY8Jbms7BDDkScRTGOIU1AL/hqZTISt9K1G5bIVW7n3N+5T5sPBQKUY60lHA4O yXFpJBA3U9QMIc4764ydSIL0RQckKKHkLu5+2NaIo83hGNxW8aPN7qBDt3ARZ5uhDQq/ 63Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature:arc-authentication-results; bh=QUvfCvj00EhTJy+BDSl2Z8dPnm5wv5ZkdNEiB7LZ4Ew=; b=Z4M7SsjLVq9fCpmnzhUIsM4j5RewnyEmiiXf3n/xq3eKUgJiSOaGz0e+dklfxzQ1ef o4h+W/KCk6pIbbqV2rskoG/qBIgVAklp+8VS6QDrbi2Rz05dg/AuFVbuHawGNYJvkgT4 uwfw4a0vn2wIBQBOWzHfnv96opI9g95q+Pje29tV+Ul1I1aXam+lFU4gUtBeGLlkxp2g 5nD+XzbEny9jee7dyvJg9Prr1j5cRw1FLCC+csmq8HCOrf6NPbEhHUycfBszcI0Ah1W4 frL8akqp5Q2BPVOENvQrL+uBLRjokco6ilBw809NNHjuQvljJ5oaoDIjj4VOUf4TsvM8 SICA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=f+pRtPz3; spf=pass (google.com: domain of ram.n.pai@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ram.n.pai@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l5-v6sor452715qkb.2.2018.07.17.06.50.21 for (Google Transport Security); Tue, 17 Jul 2018 06:50:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ram.n.pai@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=f+pRtPz3; spf=pass (google.com: domain of ram.n.pai@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ram.n.pai@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com 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-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> 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 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)