From patchwork Thu Jul 29 13:28:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 12408727 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 ECA06C4338F for ; Thu, 29 Jul 2021 13:33:17 +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 B302960EBC for ; Thu, 29 Jul 2021 13:33:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B302960EBC 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=L559Z/wHKssRk7Vuhl9WqNCgaBG2x3ToSRUWw7AZtw8=; b=3DghoWOdU+0spOEhYbw88xw8cI Wyj+Q/GzAuXfGSI9Z+4G/NYtNrpdsX4MtXIG6kPTvUirKs+62T+NbjunHs8q8m60vN9pZfQhA1xct Jh8v7byC6aQmsEUQwHYDjsIs6RkTBytyUl1Q0Z9z5sfhKpveZmHOa3KwcimcLRDA2czTcwHbBASCp U2+sOtg2FPI4Q0Qma50k4K/KwazTtaUUhvSe9vXB8c05D8SlITsp23xF9mAc/IFfnUiQmZE6CIaNY OZ8ofooFB2ncpfbU3OfEQJFtacHBwn8fLOX6RTwiuE54816i0KjfrtQ1gvXExh7ryvQPFY+PcmpOL UNDHN4pQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m968Y-004Fvn-Ei; Thu, 29 Jul 2021 13:31:47 +0000 Received: from mail-ed1-x549.google.com ([2a00:1450:4864:20::549]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m965c-004Ed3-QL for linux-arm-kernel@lists.infradead.org; Thu, 29 Jul 2021 13:28:46 +0000 Received: by mail-ed1-x549.google.com with SMTP id u25-20020aa7d8990000b02903bb6a903d90so2936490edq.17 for ; Thu, 29 Jul 2021 06:28:40 -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=rFkRNcfpvB1Ju4IVqteFXhSiHej5m8ER5DA8p5t0LAM=; b=adgE5oH5ZzQyJ5my+MCD24NaPHWhLe66wtzcPFxdI/5uGtUKivh3E2sLcxhhUi1oUH kO7wflN08UcEigT8OK5o3G9pnCptziZAF+CPeYXNsUPhGWRx9thRs8VvjUsj0wnVgVd9 FsDGXrEqaK5mNzuNKveKDQw9yNnZPbE3IwF3Nyp5jGLc24vZ6pC16gO1goRrmc6p4QeG 1pl2RVMEOAGPak5/N4DWB4EdeaFsM/1BqnR1Y+4My1F0edR0G+W0cHFgkk/nQylpkCT7 wfl1k5OCIXaC4iXp8zFS7ADwIDEW7L7ZdpJPW5wBQMrYF0zfhDiqkNWELGt0tzVlNpX3 W7MA== 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=rFkRNcfpvB1Ju4IVqteFXhSiHej5m8ER5DA8p5t0LAM=; b=MHpP9TLpHhRoxDsfLQ+K+A8bYE0qVhgqXGqliDYd8lCrDsGRjh2hnMMzoDHXkSIRhO 9AyZVdi+rCMDLdO2BUpprrrGDK4mQlrHtjf5+1WfA5KWzuQngKuJKXBhzaLMszYCZ8FA T2mKOHm3IMfZ3lS5DMOLhsq4DRBzdJ/BE6C4HeNo90qDUGP86eASIebrFONI07yfDLme YmSinIt4t4qdigQSI3iGWrqOkmvb6gllhDzjBN3hBwharkmUKBd83ki6moaXKElnVezd JYmgkUf0CE9NvK4fZs9XJQC0xH/1kOMjE9UQTxRl8IkPmAzCYCj4ycfzbEAWA8QKkXCI nMtw== X-Gm-Message-State: AOAM530Y2QnyZ1Olyr7bIqGRA8TA6JIQobY/CvtmEIdx4e3az/xDRn8l XRfvcAdsmsNDFL5YMFuuhPUkp/36dzhd X-Google-Smtp-Source: ABdhPJycW7HuuY9Gim/mXG1ILhZq0/6nWfqymTtbWe0EQGgl+pPQmTGRPV48lVOvv5Y7iUj6rD/h42ZYLODf X-Received: from luke.lon.corp.google.com ([2a00:79e0:d:210:293a:bc89:7514:5218]) (user=qperret job=sendgmr) by 2002:aa7:dbc3:: with SMTP id v3mr6100538edt.63.1627565318816; Thu, 29 Jul 2021 06:28:38 -0700 (PDT) Date: Thu, 29 Jul 2021 14:28:04 +0100 In-Reply-To: <20210729132818.4091769-1-qperret@google.com> Message-Id: <20210729132818.4091769-8-qperret@google.com> Mime-Version: 1.0 References: <20210729132818.4091769-1-qperret@google.com> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog Subject: [PATCH v3 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, Quentin Perret X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210729_062844_902558_7789F946 X-CRM114-Status: GOOD ( 11.01 ) 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. Signed-off-by: Quentin Perret Reviewed-by: Fuad Tabba --- 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