From patchwork Mon Aug 9 15:24:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 12426807 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 949F7C4338F for ; Mon, 9 Aug 2021 15:29:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 54B5460F93 for ; Mon, 9 Aug 2021 15:29:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 54B5460F93 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=yJNCtFyJ4jMcEkQKTXEHSiiy3NpYV/XOzE1cuIwTXjQ=; b=J1oiu1R9D+5KUi/9LY0aV30MWw 01VDn7Kq+EYEZVx3AxkwPOwcR/3ObFOV+SjwoWQ+bWik1kiL1a/JUeVoYxvHaFNOSpi4VBgcuT+qn t7+xhMI0UskSQ0GJPX7i+GL065Hmb+HME85W19FfTH9uxeQ/bN7SAjM6fZi42eICAc9hlzBF6Hea1 fJNtXt4lAVLuH5SLfeTHAtTuk589BhCcwqdYTM5MIum9uSPl7eHXyrzhMmCsplfBO+CM8/M48mMVi ikxCqzvPU18+xdqYLn+ksE/vXlWL2eOla/f+YEb7flvFbrJwdqAwC8qoEHuWxEjfEbiblIgvxDVzD gCtwdYLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mD7BT-0018tq-Ak; Mon, 09 Aug 2021 15:27:26 +0000 Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mD79J-0017tY-2Q for linux-arm-kernel@lists.infradead.org; Mon, 09 Aug 2021 15:25:10 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id u6-20020ad448660000b02903500bf28866so4934048qvy.23 for ; Mon, 09 Aug 2021 08:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0U6bEbFLcZw+EVlWCQFxbjscDvzC1GFCLaFxX8mML7w=; b=kOLCXZaTuLa+M/eAksDlmTXxarvjJi/4V0U691zcl9If3pch1JmCrYhjGOY8XVKtJE 6NuTYclkw0GPt0FK2mSGr3hTr4kwtJkTW+ezZALU33xRPk28YsNg05w+3w7O4PtRSL8i wrjld/G5kuClFhvVfczeYTwUpwU7xzbTze9JQU4DBSUbnKUAk+5TmjEX1GPeAbpvo7EB 8VtQ67ClSRfBWW+SLvG80L6+JEtKS6B+eU5WjxhSeBvp0pLR+HNQV+YuuMmfIvZp+APm fiAK3U3VTWGVuBaz5uZbFLU0vd0fRk8vYM5Ajv1XJbbeZUdR+aL0PvPbhBv8YESCUjpZ TKFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0U6bEbFLcZw+EVlWCQFxbjscDvzC1GFCLaFxX8mML7w=; b=Lee3QwHJfiahpWsWwk4sm7YXTnHugPKhhzbyl7ZVrmmw1Er8hs6Z0H0w0LbgHmcOXt xSEtma8eiAFrOcSBtpZNCjg3ZDVl5T6kn/fdsew6sGw5maSsHfy9dq07VBroY4HMHBlt tpGPSsffW42AFOhaA2+RJsLLN5LkxceHcp4GOWJrDA4leSpmGTcgVh+UdXunsvNWPa2N 6grMrriXi3lvb6XECgAYFddkOXYySEhDL0sCRoSGM3m3bWgOa1v/1WnzbF09dPaoZd+W vya2bFOeiyTGvDH053sLPMK1cC6ls4krO3WFlltrJyXnjfewkurxwOilnoAMmdBwf/yt NZig== X-Gm-Message-State: AOAM530xQbZHZniUrGGyZMLj5K2ZOlIzgoqvL7wniPv3yW8n0IM77Oc+ XXa28y6Gv4abji0W3EFdf5S+XuzCgMrg X-Google-Smtp-Source: ABdhPJyLymu2D60zHUrmLqd+Yu9r4hpSVIXHgBvGpH3s/oeTvKgBK0EWZGKeXuUJmU+jyvIS3H1jipiit27T X-Received: from luke.lon.corp.google.com ([2a00:79e0:d:210:b0e8:d460:758b:a0ae]) (user=qperret job=sendgmr) by 2002:a05:6214:62c:: with SMTP id a12mr14308495qvx.49.1628522706714; Mon, 09 Aug 2021 08:25:06 -0700 (PDT) Date: Mon, 9 Aug 2021 16:24:34 +0100 In-Reply-To: <20210809152448.1810400-1-qperret@google.com> Message-Id: <20210809152448.1810400-8-qperret@google.com> Mime-Version: 1.0 References: <20210809152448.1810400-1-qperret@google.com> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog Subject: [PATCH v4 07/21] KVM: arm64: Rename KVM_PTE_LEAF_ATTR_S2_IGNORED From: Quentin Perret To: maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, ardb@kernel.org, qwandor@google.com, tabba@google.com, dbrazdil@google.com, kernel-team@android.com, qperret@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210809_082509_166167_E71A9654 X-CRM114-Status: GOOD ( 11.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ignored bits for both stage-1 and stage-2 page and block descriptors are in [55:58], so rename KVM_PTE_LEAF_ATTR_S2_IGNORED to make it applicable to both. And while at it, since these bits are more commonly known as 'software' bits, rename accordingly. Reviewed-by: Fuad Tabba Signed-off-by: Quentin Perret --- arch/arm64/kvm/hyp/pgtable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 4dff2ad39ee4..59a394d82de3 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -36,6 +36,8 @@ #define KVM_PTE_LEAF_ATTR_HI GENMASK(63, 51) +#define KVM_PTE_LEAF_ATTR_HI_SW GENMASK(58, 55) + #define KVM_PTE_LEAF_ATTR_HI_S1_XN BIT(54) #define KVM_PTE_LEAF_ATTR_HI_S2_XN BIT(54) @@ -44,8 +46,6 @@ KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | \ KVM_PTE_LEAF_ATTR_HI_S2_XN) -#define KVM_PTE_LEAF_ATTR_S2_IGNORED GENMASK(58, 55) - #define KVM_INVALID_PTE_OWNER_MASK GENMASK(63, 56) #define KVM_MAX_OWNER_ID 1