From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 6D56DC433DB for ; Tue, 16 Mar 2021 17:50:59 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 76E6465104 for ; Tue, 16 Mar 2021 17:50:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76E6465104 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=c65B4craYkpOUVQZN5GlLHE583knF9kMNVPI79+gMYk=; b=NcF/zwhbbrUGSEFpfpKHoOIqg dkPZaWfUyq5ovc/XgEP38dhFBU44jXVDsyL1TCLVRtZtKKWcb4oFjbnNi+yA5yKJi5dVRgyOKW5xw 0krz645go07bIPLrkZBdpixf28ViXKkIA1y6V7MbKKPeEFL1NhaplNLKbpb9+GTO6NNlClsC9TX/j aJPzqPqY/hlyuTwsw4tibczy+XXC72hIwORo5DjHRk/FDNLMgxqZXbB88rTZ1qvTEn7CWbKlQUEFH mgWyvyKvKCdb4/yqTdjnYKVA1WOOgZuFjYz7N+MT0zWUgfs3HbGzVO2zrF+pO1xizqKkuVVq2XTB5 QTWPrh5iA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lMDob-001RjI-35; Tue, 16 Mar 2021 17:49:09 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lMDmJ-001R0E-G1 for linux-arm-kernel@lists.infradead.org; Tue, 16 Mar 2021 17:46:50 +0000 Received: by mail-wr1-x436.google.com with SMTP id a18so10908750wrc.13 for ; Tue, 16 Mar 2021 10:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=8CWHxiV0ZKizo+vjFshSgCNglE9MeCQCWx2fDMf8iU8=; b=gYo2kERL9GIyhaZOa6PnViq0BRXBGefSRBZieSYFhlS1lW0yoNCUiliN2Cn6l4BirX BlvvIXzdoXNmkgVaURC+XAcXa0lXCs2NdACd8cPProNkQhZcbPlREIWB6dnrFIdi59j2 ytNxz7q3toFgoz1mpxdX75jcbjJoLrOPdzZaDbYTpqgMRrqOu6AACZ92tZBXis10/464 GGnBnjTFr9UdrTfL8cl0RFjhKCcegioXqStezi2b2K6dg/2HxW1W8yqM4aaV0DV4AvL+ DXyo460cKTkPZQumL0LtSLdIGqDOZLV5FHjZyQlHjCQeXsDDdU2PW1nI+j9hewIITYy4 03qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=8CWHxiV0ZKizo+vjFshSgCNglE9MeCQCWx2fDMf8iU8=; b=C6sb2hqSh25lDo3PCbxx8365GmjhgVl25Hi6cnR+6RC09qWP01dtcQBze0qJkGlRdz C8J8zuxRol6UVd2CFhYLADN48BsWV/y6hS4t4MTnAaGMj7djTjcBzH4LYkX8cnfwC17/ hGrSkqzY+2vrtbkMsiTipwCXiQd/BmRYBeNbxidwmIyjORDJrt/sfET7v6qxM3yi/dYA 8P+740s2+r7am0O3O+f24rSU+p/XxJYReNoBJn7Wc/lINUEIMmu+HcgtELkZJ518A/Ho azEsfGzgSpyU2S0MEWuEgfGqOjL4GWvIrnB6TtOtCTRbP0WqOqCQFIr1HuOCx0ERs9XY jUMQ== X-Gm-Message-State: AOAM530IUNNlkdIH/0MvMMjSlOkt+hMrrtwCP4hQu7YubMNqiF4AZuqz YCrgQ8nwqvvEs/91gBfpo7t1DQ== X-Google-Smtp-Source: ABdhPJy/Yk1N4Dwd5vCd00S1/qPonp2CAvh1R3Oab2RFqzCIWDW/+HMqKnOh2qKqDNLLxfncBWs3yg== X-Received: by 2002:a5d:4d0f:: with SMTP id z15mr216557wrt.192.1615916805635; Tue, 16 Mar 2021 10:46:45 -0700 (PDT) Received: from google.com (230.69.233.35.bc.googleusercontent.com. [35.233.69.230]) by smtp.gmail.com with ESMTPSA id t8sm22607136wrr.10.2021.03.16.10.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 10:46:45 -0700 (PDT) Date: Tue, 16 Mar 2021 17:46:42 +0000 From: Quentin Perret To: Mate Toth-Pal Cc: catalin.marinas@arm.com, will@kernel.org, maz@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, android-kvm@google.com, seanjc@google.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, tabba@google.com, ardb@kernel.org, mark.rutland@arm.com, dbrazdil@google.com Subject: Re: [PATCH v5 33/36] KVM: arm64: Wrap the host with a stage 2 Message-ID: References: <20210315143536.214621-1-qperret@google.com> <20210315143536.214621-34-qperret@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210316_174647_735590_59E2A41C X-CRM114-Status: GOOD ( 21.50 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tuesday 16 Mar 2021 at 16:16:18 (+0100), Mate Toth-Pal wrote: > On 2021-03-16 15:29, Quentin Perret wrote: > > On Tuesday 16 Mar 2021 at 12:53:53 (+0000), Quentin Perret wrote: > > > On Tuesday 16 Mar 2021 at 13:28:42 (+0100), Mate Toth-Pal wrote: > > > > Changing the value of MT_S2_FWB_NORMAL to 7 would change this behavior, and > > > > the resulting memory type would be device. > > > > > > Sounds like the correct fix here -- see below. > > > > Just to clarify this, I meant this should be the configuration for the > > host stage-2. We'll want to keep the existing behaviour for guests I > > believe. > > I Agree. OK, so the below seems to boot on my non-FWB-capable hardware and should fix the issue. Could you by any chance give it a spin? diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h index b93a2a3526ab..b2066bd03ca2 100644 --- a/arch/arm64/include/asm/kvm_pgtable.h +++ b/arch/arm64/include/asm/kvm_pgtable.h @@ -76,10 +76,11 @@ struct kvm_pgtable { /** * enum kvm_pgtable_prot - Page-table permissions and attributes. - * @KVM_PGTABLE_PROT_X: Execute permission. - * @KVM_PGTABLE_PROT_W: Write permission. - * @KVM_PGTABLE_PROT_R: Read permission. - * @KVM_PGTABLE_PROT_DEVICE: Device attributes. + * @KVM_PGTABLE_PROT_X: Execute permission. + * @KVM_PGTABLE_PROT_W: Write permission. + * @KVM_PGTABLE_PROT_R: Read permission. + * @KVM_PGTABLE_PROT_DEVICE: Device attributes. + * @KVM_PGTABLE_PROT_S2_NOFWB: Don't enforce Normal-WB with FWB. */ enum kvm_pgtable_prot { KVM_PGTABLE_PROT_X = BIT(0), @@ -87,6 +88,8 @@ enum kvm_pgtable_prot { KVM_PGTABLE_PROT_R = BIT(2), KVM_PGTABLE_PROT_DEVICE = BIT(3), + + KVM_PGTABLE_PROT_S2_NOFWB = BIT(4), }; #define PAGE_HYP (KVM_PGTABLE_PROT_R | KVM_PGTABLE_PROT_W) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index c759faf7a1ff..e695d2e1839d 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -144,13 +144,16 @@ * Memory types for Stage-2 translation */ #define MT_S2_NORMAL 0xf +#define MT_S2_WEAK MT_S2_NORMAL #define MT_S2_DEVICE_nGnRE 0x1 /* * Memory types for Stage-2 translation when ID_AA64MMFR2_EL1.FWB is 0001 - * Stage-2 enforces Normal-WB and Device-nGnRE + * Stage-2 enforces Normal-WB and Device-nGnRE by default. The 'weak' mode + * honors Stage-1 attributes. */ #define MT_S2_FWB_NORMAL 6 +#define MT_S2_FWB_WEAK 7 #define MT_S2_FWB_DEVICE_nGnRE 1 #ifdef CONFIG_ARM64_4K_PAGES diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index dd03252b9574..1ff72babe565 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -214,6 +214,8 @@ static int host_stage2_idmap(u64 addr) if (is_memory) prot |= KVM_PGTABLE_PROT_X; + else + prot |= KVM_PGTABLE_PROT_S2_NOFWB; hyp_spin_lock(&host_kvm.lock); ret = kvm_pgtable_stage2_find_range(&host_kvm.pgt, addr, prot, &range); diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 3a971df278bd..bd1b8464a537 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -343,6 +343,9 @@ static int hyp_set_prot_attr(enum kvm_pgtable_prot prot, kvm_pte_t *ptep) if (!(prot & KVM_PGTABLE_PROT_R)) return -EINVAL; + if (prot & KVM_PGTABLE_PROT_S2_NOFWB) + return -EINVAL; + if (prot & KVM_PGTABLE_PROT_X) { if (prot & KVM_PGTABLE_PROT_W) return -EINVAL; @@ -510,9 +513,18 @@ u64 kvm_get_vtcr(u64 mmfr0, u64 mmfr1, u32 phys_shift) static int stage2_set_prot_attr(enum kvm_pgtable_prot prot, kvm_pte_t *ptep) { bool device = prot & KVM_PGTABLE_PROT_DEVICE; - kvm_pte_t attr = device ? PAGE_S2_MEMATTR(DEVICE_nGnRE) : - PAGE_S2_MEMATTR(NORMAL); + bool nofwb = prot & KVM_PGTABLE_PROT_S2_NOFWB; u32 sh = KVM_PTE_LEAF_ATTR_LO_S2_SH_IS; + kvm_pte_t attr; + + WARN_ON(nofwb && device); + + if (device) + attr = PAGE_S2_MEMATTR(DEVICE_nGnRE); + else if (nofwb) + attr = PAGE_S2_MEMATTR(WEAK); + else + attr = PAGE_S2_MEMATTR(NORMAL); if (!(prot & KVM_PGTABLE_PROT_X)) attr |= KVM_PTE_LEAF_ATTR_HI_S2_XN; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel