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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3E366E80A97 for ; Wed, 27 Sep 2023 07:02:59 +0000 (UTC) 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: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=3gNiEpPr+kk8UrcdU5phHQ0fvT63Xna9ue7SoNQXmcU=; b=xbG2k9QaHpv79P nhTmI/coB8qBZItAgfUacYKjmT+Cn9ZjvzflJFZ/YTrYUlYyci1pWfem9v6p2zATa73ccQEarCy4F x6LFUG9x3KGXUHMnAugoHPkershl0/6eplgW3MbN4B1invEr2xPbHXzytCZ3nSPlaMXz/f1/6FcSf SJo/HtW2afZwH6Fq777ZmLXFrJbSnfJ3ZMLPue2rvRJeVKcDu8WMQtXzgKi4gdyXm4hUgnGxhbFfA Csg4Uou3JmXUx6YWNq+LF8hE7Rfrho48SThkWBnlbg9HGwADRx5ts7IjVa9DY1Nu0DBlO8sTigBKQ dQcDa1EQ5acILTT1YV5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qlOZ7-0008qI-1i; Wed, 27 Sep 2023 07:02:33 +0000 Received: from out-208.mta1.migadu.com ([2001:41d0:203:375::d0]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qlOZ4-0008py-1m for linux-arm-kernel@lists.infradead.org; Wed, 27 Sep 2023 07:02:32 +0000 Date: Wed, 27 Sep 2023 07:02:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1695798147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=J/NkQrf917Vyjx9AgyGMqg2PAn7EJlOnWPmYiD9+8lA=; b=ppk3TYKD1+mhj6CzxF/W8NuWWgXi+sB3PxbrSBG99yK6K7/Xlp0O43QlfxMLZSrTd1pBqb 5h4QvDNXZiphttmTdJqsenCSCd+g/VMunl1yJ4mNRBmnC0xKgYcF1Zuu93C9pUb/Rjv4U3 ys/53utsncsY1k7VIZLIt4EUzRnGFvU= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: Ryan Roberts Cc: Catalin Marinas , Will Deacon , Marc Zyngier , Suzuki K Poulose , James Morse , Zenghui Yu , Ard Biesheuvel , Anshuman Khandual , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Subject: Re: [PATCH v3 06/13] KVM: arm64: Use LPA2 page-tables for stage2 if HW supports it Message-ID: References: <20230918065740.3670662-1-ryan.roberts@arm.com> <20230918065740.3670662-7-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230918065740.3670662-7-ryan.roberts@arm.com> X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230927_000231_423790_311A6464 X-CRM114-Status: GOOD ( 12.41 ) 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 Mon, Sep 18, 2023 at 07:57:33AM +0100, Ryan Roberts wrote: [...] > static inline u64 kvm_pte_to_phys(kvm_pte_t pte) > { > - u64 pa = pte & KVM_PTE_ADDR_MASK; > - > - if (PAGE_SHIFT == 16) > - pa |= FIELD_GET(KVM_PTE_ADDR_51_48, pte) << 48; > + u64 pa; > + > + if (system_supports_lpa2()) { > + pa = pte & KVM_PTE_ADDR_MASK_LPA2; > + pa |= FIELD_GET(KVM_PTE_ADDR_51_50_LPA2, pte) << 50; > + } else { > + pa = pte & KVM_PTE_ADDR_MASK; > + if (PAGE_SHIFT == 16) > + pa |= FIELD_GET(KVM_PTE_ADDR_51_48, pte) << 48; > + } > > return pa; > } > > static inline kvm_pte_t kvm_phys_to_pte(u64 pa) > { > - kvm_pte_t pte = pa & KVM_PTE_ADDR_MASK; > - > - if (PAGE_SHIFT == 16) { > - pa &= GENMASK(51, 48); > - pte |= FIELD_PREP(KVM_PTE_ADDR_51_48, pa >> 48); > + kvm_pte_t pte; > + > + if (system_supports_lpa2()) { > + pte = pa & KVM_PTE_ADDR_MASK_LPA2; > + pa &= GENMASK(51, 50); > + pte |= FIELD_PREP(KVM_PTE_ADDR_51_50_LPA2, pa >> 50); > + } else { > + pte = pa & KVM_PTE_ADDR_MASK; > + if (PAGE_SHIFT == 16) { > + pa &= GENMASK(51, 48); > + pte |= FIELD_PREP(KVM_PTE_ADDR_51_48, pa >> 48); > + } > } These accessors are common between stage-1 and stage-2 walks... Aren't bits [9:8] of the descriptor still being used to encode shareability for hyp stage-1 at this point? You may as well squash the subsequent patch (LPA2 format for S1) into this one such that the change is atomic. -- Thanks, Oliver _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel