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: 945075 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41VMvW4Gb8z9rxs for ; Wed, 18 Jul 2018 00:23:19 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=us.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f+pRtPz3"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41VMvW2WTNzF3J1 for ; Wed, 18 Jul 2018 00:23:19 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=us.ibm.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f+pRtPz3"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400d:c09::244; helo=mail-qk0-x244.google.com; envelope-from=ram.n.pai@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=us.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f+pRtPz3"; dkim-atps=neutral Received: from mail-qk0-x244.google.com (mail-qk0-x244.google.com [IPv6:2607:f8b0:400d:c09::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41VM9W4ggLzF3J3 for ; Tue, 17 Jul 2018 23:50:23 +1000 (AEST) Received: by mail-qk0-x244.google.com with SMTP id 27-v6so519542qkv.0 for ; Tue, 17 Jul 2018 06:50:23 -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=UY5XUdZnSVRwdF6HgXEhJcNyWkw/qReya8a9s98+sMTWKLoLBs59Gi1OcKfRhdy/Po d8FsoBwwV8uZQX+gbjAOzFY/t9wUQGTCG/p/YCxXPA70BMpal1X6ye0v8k9gTWfgOPoG RJcC6fCV/uiDUwpd0chMi5ImUb2KRW5wBmANuEhsQwD83f8zi7dtO6guKnl3CzN6oj43 f2nsbGiQMGhKta50kjf+LOjSrWHVZpMng5ye8+tGzxIdUg5xDAbn0rpSHZx0oS8zZYkl DQP++ioJwYMxIXz4mq/S1/2z3jdUOfcqALXtmW0Qgvxl0Tkmzi2666uCDoCFsU8ufPZM 2oNg== X-Gm-Message-State: AOUpUlHGnQdJ/LdDC1CxryfEfrrjJw7K7ZPCsiRU7NLO8ES3as7R6bp9 y/9E//15Ax1NA9uGLtajp9zcqg== 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 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-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, fweimer@redhat.com, dave.hansen@intel.com, x86@kernel.org, linuxram@us.ibm.com, mhocko@kernel.org, linux-mm@kvack.org, mingo@redhat.com, aneesh.kumar@linux.vnet.ibm.com, bauerman@linux.vnet.ibm.com, msuchanek@suse.de, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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)