From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::342; helo=mail-wm1-x342.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9436D2194D387 for ; Wed, 23 Jan 2019 07:46:26 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id b11so2473280wmj.1 for ; Wed, 23 Jan 2019 07:46:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=PDb2JQ7YSMfLGW7wIaIoX1pBeRzWRa/8T4j8KtDbP3s=; b=gdjgAHWAZGBFTOlC2aG4pIf8uOvicJQfK68S7hPhCHcGopluBS2pRbSQEqcRWghGYn MoucOONVf9e48LY/TPsFeh+v1Mow4ekdf+hHZBhSbcFsEAj0kByBItpm6ezu6QTCVR99 HnPVEyylfTJkBvP02ugEg5/M6npIhIICLBpfY= 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:user-agent; bh=PDb2JQ7YSMfLGW7wIaIoX1pBeRzWRa/8T4j8KtDbP3s=; b=hXIqMN4pOZSfzXzqxz5MR123I3rblRvV2aODPWsTzm5gNzu/RfLr6C1Z0lKp4vJPKK A3hRESmVTiy4Bl9A3uzslEm3Bw2NHzhBveMcqi/KQ/jb56T90Jfw+2THWApG6tt8zS9F 6D9fd0QIyh8thpaq1BpQsR/6W3ZW0EjlFW8GyGFdKK8Afp9XWVyuJbv3iWxCqMD1sCLw jUeQ03GxxyK/txpsaeneesijtX7SqdAO1NP2kkiKnQC8y+j9N90U/yJHNbw6EtvColFY vFftEkSfzLTJ99x5cTyej9j05A+GzPwffG/5sAUIqJkqLkObRiyLueyr6m9rmbNvXIgX 1E8w== X-Gm-Message-State: AJcUukewpR6lIsQKXC/fhSQFImV3DMuYjI/2DIkCZEk99n9mKBBASOBh ZVKddxZsHUZNUTDZwICYwsmV4A== X-Google-Smtp-Source: ALg8bN6eLXsCZz6voY9BKPvSiKWyHoMO7+/0hwWdV6gLz/x+8h5TSVDdqFk49HMjvuhLsFTOK7jqmA== X-Received: by 2002:a1c:b687:: with SMTP id g129mr3151776wmf.59.1548258384560; Wed, 23 Jan 2019 07:46:24 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id k128sm75675831wmd.37.2019.01.23.07.46.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Jan 2019 07:46:23 -0800 (PST) Date: Wed, 23 Jan 2019 15:46:22 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: edk2-devel@lists.01.org Message-ID: <20190123154622.pibw6mi5gh6ywb26@bivouac.eciton.net> References: <20190107071504.2431-1-ard.biesheuvel@linaro.org> <20190107071504.2431-3-ard.biesheuvel@linaro.org> MIME-Version: 1.0 In-Reply-To: <20190107071504.2431-3-ard.biesheuvel@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH 2/5] ArmPkg/ArmMmuLib AARCH64: get rid of needless TLB invalidation X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jan 2019 15:46:27 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Jan 07, 2019 at 08:15:01AM +0100, Ard Biesheuvel wrote: > Currently, we always invalidate the TLBs entirely after making > any modification to the page tables. Now that we have introduced > strict memory permissions in quite a number of places, such > modifications occur much more often, and it is better for performance > to flush only those TLB entries that are actually affected by > the changes. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel > --- > ArmPkg/Include/Library/ArmMmuLib.h | 3 ++- > ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S | 6 +++--- > ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c | 16 +++++++--------- > ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S | 14 ++++++++------ > 4 files changed, 20 insertions(+), 19 deletions(-) > > diff --git a/ArmPkg/Include/Library/ArmMmuLib.h b/ArmPkg/Include/Library/ArmMmuLib.h > index fb7fd006417c..d2725810f1c6 100644 > --- a/ArmPkg/Include/Library/ArmMmuLib.h > +++ b/ArmPkg/Include/Library/ArmMmuLib.h > @@ -59,7 +59,8 @@ VOID > EFIAPI > ArmReplaceLiveTranslationEntry ( > IN UINT64 *Entry, > - IN UINT64 Value > + IN UINT64 Value, > + IN UINT64 Address > ); > > EFI_STATUS > diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S > index b7173e00b039..175fb58206b6 100644 > --- a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S > +++ b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S > @@ -124,15 +124,15 @@ ASM_FUNC(ArmSetMAIR) > // IN VOID *MVA // X1 > // ); > ASM_FUNC(ArmUpdateTranslationTableEntry) > - dc civac, x0 // Clean and invalidate data line > - dsb sy > + dsb nshst > + lsr x1, x1, #12 > EL1_OR_EL2_OR_EL3(x0) > 1: tlbi vaae1, x1 // TLB Invalidate VA , EL1 > b 4f > 2: tlbi vae2, x1 // TLB Invalidate VA , EL2 > b 4f > 3: tlbi vae3, x1 // TLB Invalidate VA , EL3 > -4: dsb sy > +4: dsb nsh > isb > ret > > diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c > index d66df3e17a02..e1fabfcbea14 100644 > --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c > +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c > @@ -129,13 +129,14 @@ STATIC > VOID > ReplaceLiveEntry ( > IN UINT64 *Entry, > - IN UINT64 Value > + IN UINT64 Value, > + IN UINT64 Address > ) > { > if (!ArmMmuEnabled ()) { > *Entry = Value; > } else { > - ArmReplaceLiveTranslationEntry (Entry, Value); > + ArmReplaceLiveTranslationEntry (Entry, Value, Address); > } > } > > @@ -296,7 +297,8 @@ GetBlockEntryListFromAddress ( > > // Fill the BlockEntry with the new TranslationTable > ReplaceLiveEntry (BlockEntry, > - ((UINTN)TranslationTable & TT_ADDRESS_MASK_DESCRIPTION_TABLE) | TableAttributes | TT_TYPE_TABLE_ENTRY); > + (UINTN)TranslationTable | TableAttributes | TT_TYPE_TABLE_ENTRY, > + RegionStart); OK, this whole patch took a few times around the loop before I think I caught on what was happening. I think I'm down to the only things confusing me being: - The name "Address" to refer to something that is always the start address of a 4KB-aligned translation region. Is this because the function will be usable in other contexts in later patches? - Why drop the & TT_ADDRESS_MASK_DESCRIPTION_TABLE bit here? Was it just always pointless and you decided to drop it while you were at it? / Leif > } > } else { > if (IndexLevel != PageLevel) { > @@ -375,6 +377,8 @@ UpdateRegionMapping ( > *BlockEntry &= BlockEntryMask; > *BlockEntry |= (RegionStart & TT_ADDRESS_MASK_BLOCK_ENTRY) | Attributes | Type; > > + ArmUpdateTranslationTableEntry (BlockEntry, (VOID *)RegionStart); > + > // Go to the next BlockEntry > RegionStart += BlockEntrySize; > RegionLength -= BlockEntrySize; > @@ -487,9 +491,6 @@ ArmSetMemoryAttributes ( > return Status; > } > > - // Invalidate all TLB entries so changes are synced > - ArmInvalidateTlb (); > - > return EFI_SUCCESS; > } > > @@ -512,9 +513,6 @@ SetMemoryRegionAttribute ( > return Status; > } > > - // Invalidate all TLB entries so changes are synced > - ArmInvalidateTlb (); > - > return EFI_SUCCESS; > } > > diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S > index 90192df24f55..d40c19b2e3e5 100644 > --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S > +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S > @@ -32,11 +32,12 @@ > dmb sy > dc ivac, x0 > > - // flush the TLBs > + // flush translations for the target address from the TLBs > + lsr x2, x2, #12 > .if \el == 1 > - tlbi vmalle1 > + tlbi vaae1, x2 > .else > - tlbi alle\el > + tlbi vae\el, x2 > .endif > dsb sy > > @@ -48,12 +49,13 @@ > //VOID > //ArmReplaceLiveTranslationEntry ( > // IN UINT64 *Entry, > -// IN UINT64 Value > +// IN UINT64 Value, > +// IN UINT64 Address > // ) > ASM_FUNC(ArmReplaceLiveTranslationEntry) > > // disable interrupts > - mrs x2, daif > + mrs x4, daif > msr daifset, #0xf > isb > > @@ -69,7 +71,7 @@ ASM_FUNC(ArmReplaceLiveTranslationEntry) > b 4f > 3:__replace_entry 3 > > -4:msr daif, x2 > +4:msr daif, x4 > ret > > ASM_GLOBAL ASM_PFX(ArmReplaceLiveTranslationEntrySize) > -- > 2.20.1 >