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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 64303C433E2 for ; Tue, 8 Sep 2020 10:35:23 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 1D5C9206DB for ; Tue, 8 Sep 2020 10:35:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HlMJ2WZn"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="R7v/c6AX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D5C9206DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To:Subject:To:From: Date:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=U474MWrcLIzSbX5lydNUKgEOG5ftSLroeniC/d2M3OY=; b=HlMJ2WZnIPbxzU7bfCuLokhjH zacNFrhKoMOXY9npx5tlk/WnELzr/NhkVSNKkO7UUzJyJPW/+0KsAkml1PBsb+aX4xTX2XMpt4j3q VE2ffpSlXV4sgI3IZOzo89e8dNXHHCcGx7OdTfBqJbBQpx9n9uocuwdRNU0p8UBLTH4mCVjkF/odB pvBxljFA3aNU8rr+RAN32egxA6zIimcUyvs7iqRmoqT9PgZM1Dg3GnmyPwQsU/o47xUWFtVIrcRRx /tiaWf3G7BMF3AOg+8yGM2VeryqkG4yLML2sXE4SmaBi2DzVRn+A5qHbFxjU9dMWbRAbsx8OHK14r 9NN4DgVFA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFawp-0004kB-49; Tue, 08 Sep 2020 10:33:59 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFawU-0004XY-G0 for linux-arm-kernel@lists.infradead.org; Tue, 08 Sep 2020 10:33:51 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EF5CA206DB; Tue, 8 Sep 2020 10:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599561217; bh=PMfT0ScqlJVrW1ovi6ZQx1FR07TKRP2CB/NC9+r+dmM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=R7v/c6AXSfaadD/CO+AbDfegeAM+y9tDoBvYp6KE7TlPmyJdOL4Ta3ObeRRqDiOSH o/MstQiA+hluNVnME3gbT9qtc/mcdW8HfkP/sveuhvBcCIZDJ3Uhhi/EsQ5Rj3mhb2 T9d5TChhLpC/xDEg9swT4W2JS9mSNC+0CPYxWcxc= Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kFawR-00A20e-4o; Tue, 08 Sep 2020 11:33:35 +0100 MIME-Version: 1.0 Date: Tue, 08 Sep 2020 11:33:35 +0100 From: Marc Zyngier To: Will Deacon Subject: Re: [PATCH v4 19/21] KVM: arm64: Remove unused page-table code In-Reply-To: <20200907152344.12978-20-will@kernel.org> References: <20200907152344.12978-1-will@kernel.org> <20200907152344.12978-20-will@kernel.org> User-Agent: Roundcube Webmail/1.4.8 Message-ID: <6674b70b99e82fb8084f801bfca84f37@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: will@kernel.org, kvmarm@lists.cs.columbia.edu, kernel-team@android.com, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200908_063338_705372_5AF68C0E X-CRM114-Status: GOOD ( 16.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Will, On 2020-09-07 16:23, Will Deacon wrote: > Now that KVM is using the generic page-table code to manage the guest > stage-2 page-tables, we can remove a bunch of unused macros, #defines > and static inline functions from the old implementation. > > Cc: Marc Zyngier > Cc: Quentin Perret > Reviewed-by: Gavin Shan > Signed-off-by: Will Deacon > --- > arch/arm64/include/asm/kvm_mmu.h | 171 ------ > arch/arm64/include/asm/pgtable-hwdef.h | 17 - > arch/arm64/include/asm/pgtable-prot.h | 13 - > arch/arm64/include/asm/stage2_pgtable.h | 215 ------- > arch/arm64/kvm/mmu.c | 755 ------------------------ > 5 files changed, 1171 deletions(-) > [...] > diff --git a/arch/arm64/include/asm/pgtable-hwdef.h > b/arch/arm64/include/asm/pgtable-hwdef.h > index 1a989353144e..bb97d464f42b 100644 > --- a/arch/arm64/include/asm/pgtable-hwdef.h > +++ b/arch/arm64/include/asm/pgtable-hwdef.h > @@ -172,23 +172,6 @@ > #define PTE_ATTRINDX(t) (_AT(pteval_t, (t)) << 2) > #define PTE_ATTRINDX_MASK (_AT(pteval_t, 7) << 2) > > -/* > - * 2nd stage PTE definitions > - */ > -#define PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[2:1] */ > -#define PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > -#define PTE_S2_XN (_AT(pteval_t, 2) << 53) /* XN[1:0] */ > -#define PTE_S2_SW_RESVD (_AT(pteval_t, 15) << 55) /* Reserved for SW > */ > - > -#define PMD_S2_RDONLY (_AT(pmdval_t, 1) << 6) /* HAP[2:1] */ > -#define PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > -#define PMD_S2_XN (_AT(pmdval_t, 2) << 53) /* XN[1:0] */ > -#define PMD_S2_SW_RESVD (_AT(pmdval_t, 15) << 55) /* Reserved for SW > */ > - > -#define PUD_S2_RDONLY (_AT(pudval_t, 1) << 6) /* HAP[2:1] */ > -#define PUD_S2_RDWR (_AT(pudval_t, 3) << 6) /* HAP[2:1] */ > -#define PUD_S2_XN (_AT(pudval_t, 2) << 53) /* XN[1:0] */ > - > /* > * Memory Attribute override for Stage-2 (MemAttr[3:0]) > */ This breaks the (still out of tree) NV patches, which use some of these definitions as part of the architectural S2 PTW. I can either keep a KVM-private copy, or revert this hunk. What do you think? M. -- Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel