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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FC55C433F5 for ; Wed, 19 Jan 2022 09:35:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352594AbiASJfc (ORCPT ); Wed, 19 Jan 2022 04:35:32 -0500 Received: from foss.arm.com ([217.140.110.172]:51594 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348111AbiASJf3 (ORCPT ); Wed, 19 Jan 2022 04:35:29 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8A0906D; Wed, 19 Jan 2022 01:35:29 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.38.123]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C0C943F766; Wed, 19 Jan 2022 01:35:27 -0800 (PST) Date: Wed, 19 Jan 2022 09:35:25 +0000 From: Mark Rutland To: He Ying Cc: catalin.marinas@arm.com, will@kernel.org, marcan@marcan.st, maz@kernel.org, joey.gouly@arm.com, pcc@google.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64: entry: Save some nops when CONFIG_ARM64_PSEUDO_NMI is not set Message-ID: <20220119093525.GB42546@C02TD0UTHF1T.local> References: <20220107085536.214501-1-heying24@huawei.com> <20220112032410.29231-1-heying24@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 19, 2022 at 02:40:58PM +0800, He Ying wrote: > Hi all, > > Ping. Any comments? The patch looks fine, but as it's the middle of the merge window people are busy and unlikely to look at this for the next few days. Generally it's a good idea to wait until rc1 or rc2, rebase atop that, and post the updated patch. Stuff like this usually gets queued around rc3/rc4 time. > 锟斤拷 2022/1/12 11:24, He Ying 写锟斤拷: > > Arm64 pseudo-NMI feature code brings some additional nops > > when CONFIG_ARM64_PSEUDO_NMI is not set, which is not > > necessary. So add necessary ifdeffery to avoid it. > > > > Signed-off-by: He Ying FWIW: Acked-by: Mark Rutland Mark. > > --- > > arch/arm64/kernel/entry.S | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > > index 2f69ae43941d..ffc32d3d909a 100644 > > --- a/arch/arm64/kernel/entry.S > > +++ b/arch/arm64/kernel/entry.S > > @@ -300,6 +300,7 @@ alternative_else_nop_endif > > str w21, [sp, #S_SYSCALLNO] > > .endif > > +#ifdef CONFIG_ARM64_PSEUDO_NMI > > /* Save pmr */ > > alternative_if ARM64_HAS_IRQ_PRIO_MASKING > > mrs_s x20, SYS_ICC_PMR_EL1 > > @@ -307,6 +308,7 @@ alternative_if ARM64_HAS_IRQ_PRIO_MASKING > > mov x20, #GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET > > msr_s SYS_ICC_PMR_EL1, x20 > > alternative_else_nop_endif > > +#endif > > /* Re-enable tag checking (TCO set on exception entry) */ > > #ifdef CONFIG_ARM64_MTE > > @@ -330,6 +332,7 @@ alternative_else_nop_endif > > disable_daif > > .endif > > +#ifdef CONFIG_ARM64_PSEUDO_NMI > > /* Restore pmr */ > > alternative_if ARM64_HAS_IRQ_PRIO_MASKING > > ldr x20, [sp, #S_PMR_SAVE] > > @@ -339,6 +342,7 @@ alternative_if ARM64_HAS_IRQ_PRIO_MASKING > > dsb sy // Ensure priority change is seen by redistributor > > .L__skip_pmr_sync\@: > > alternative_else_nop_endif > > +#endif > > ldp x21, x22, [sp, #S_PC] // load ELR, SPSR 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 D006BC433EF for ; Wed, 19 Jan 2022 09:37:09 +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=ejo7EFjLpzFGBLNPpwoL11YxEjZavJ625bBB3NoJc0c=; b=v98Y//guHwzIe9 cmdN/RG+JavwMpe7zCgp2hCxlbZ6ck/pvpBRoCGSlHe3dpeQoAXHQ1yumGJZoVYxU8p3qlvOiRNuF SbF2euc/QYukAskF/vfMymGwVMNf6Z8CiHJS9D7pPXZIJbt2ByR6BXDxPws342yJk/6pQAWw/xzRw Hhb0xiM5NYYdQqg3KruCsGKi7+qpmKWg2Av1hT4nXqiicvBNjNdSKk2ZMHmZJ3z4mXk73QkPKu7f8 idvTHBXKlZVkr5d6PGji2ySQ9EVkeEEuxaIFgjRNGbyl3+73Qk6+Zshajr7Cw2VF+SGzQuKWabXEI 3MVIh9n6u9GF/ktxJg7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nA7NW-004cdo-F9; Wed, 19 Jan 2022 09:35:42 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nA7NK-004cVP-AB for linux-arm-kernel@lists.infradead.org; Wed, 19 Jan 2022 09:35:32 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8A0906D; Wed, 19 Jan 2022 01:35:29 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.38.123]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C0C943F766; Wed, 19 Jan 2022 01:35:27 -0800 (PST) Date: Wed, 19 Jan 2022 09:35:25 +0000 From: Mark Rutland To: He Ying Cc: catalin.marinas@arm.com, will@kernel.org, marcan@marcan.st, maz@kernel.org, joey.gouly@arm.com, pcc@google.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64: entry: Save some nops when CONFIG_ARM64_PSEUDO_NMI is not set Message-ID: <20220119093525.GB42546@C02TD0UTHF1T.local> References: <20220107085536.214501-1-heying24@huawei.com> <20220112032410.29231-1-heying24@huawei.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-20220119_013530_441583_71A78712 X-CRM114-Status: GOOD ( 18.91 ) 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="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gV2VkLCBKYW4gMTksIDIwMjIgYXQgMDI6NDA6NThQTSArMDgwMCwgSGUgWWluZyB3cm90ZToK PiBIaSBhbGwsCj4gCj4gUGluZy4gQW55IGNvbW1lbnRzPwoKVGhlIHBhdGNoIGxvb2tzIGZpbmUs IGJ1dCBhcyBpdCdzIHRoZSBtaWRkbGUgb2YgdGhlIG1lcmdlIHdpbmRvdyBwZW9wbGUKYXJlIGJ1 c3kgYW5kIHVubGlrZWx5IHRvIGxvb2sgYXQgdGhpcyBmb3IgdGhlIG5leHQgZmV3IGRheXMuCgpH ZW5lcmFsbHkgaXQncyBhIGdvb2QgaWRlYSB0byB3YWl0IHVudGlsIHJjMSBvciByYzIsIHJlYmFz ZSBhdG9wIHRoYXQsCmFuZCBwb3N0IHRoZSB1cGRhdGVkIHBhdGNoLiBTdHVmZiBsaWtlIHRoaXMg dXN1YWxseSBnZXRzIHF1ZXVlZCBhcm91bmQKcmMzL3JjNCB0aW1lLgoKPiDplJ/mlqTmi7cgMjAy Mi8xLzEyIDExOjI0LCBIZSBZaW5nIOWGmemUn+aWpOaLtzoKPiA+IEFybTY0IHBzZXVkby1OTUkg ZmVhdHVyZSBjb2RlIGJyaW5ncyBzb21lIGFkZGl0aW9uYWwgbm9wcwo+ID4gd2hlbiBDT05GSUdf QVJNNjRfUFNFVURPX05NSSBpcyBub3Qgc2V0LCB3aGljaCBpcyBub3QKPiA+IG5lY2Vzc2FyeS4g U28gYWRkIG5lY2Vzc2FyeSBpZmRlZmZlcnkgdG8gYXZvaWQgaXQuCj4gPiAKPiA+IFNpZ25lZC1v ZmYtYnk6IEhlIFlpbmcgPGhleWluZzI0QGh1YXdlaS5jb20+CgpGV0lXOgoKQWNrZWQtYnk6IE1h cmsgUnV0bGFuZCA8bWFyay5ydXRsYW5kQGFybS5jb20+CgpNYXJrLgoKPiA+IC0tLQo+ID4gICBh cmNoL2FybTY0L2tlcm5lbC9lbnRyeS5TIHwgNCArKysrCj4gPiAgIDEgZmlsZSBjaGFuZ2VkLCA0 IGluc2VydGlvbnMoKykKPiA+IAo+ID4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva2VybmVsL2Vu dHJ5LlMgYi9hcmNoL2FybTY0L2tlcm5lbC9lbnRyeS5TCj4gPiBpbmRleCAyZjY5YWU0Mzk0MWQu LmZmYzMyZDNkOTA5YSAxMDA2NDQKPiA+IC0tLSBhL2FyY2gvYXJtNjQva2VybmVsL2VudHJ5LlMK PiA+ICsrKyBiL2FyY2gvYXJtNjQva2VybmVsL2VudHJ5LlMKPiA+IEBAIC0zMDAsNiArMzAwLDcg QEAgYWx0ZXJuYXRpdmVfZWxzZV9ub3BfZW5kaWYKPiA+ICAgCXN0cgl3MjEsIFtzcCwgI1NfU1lT Q0FMTE5PXQo+ID4gICAJLmVuZGlmCj4gPiArI2lmZGVmIENPTkZJR19BUk02NF9QU0VVRE9fTk1J Cj4gPiAgIAkvKiBTYXZlIHBtciAqLwo+ID4gICBhbHRlcm5hdGl2ZV9pZiBBUk02NF9IQVNfSVJR X1BSSU9fTUFTS0lORwo+ID4gICAJbXJzX3MJeDIwLCBTWVNfSUNDX1BNUl9FTDEKPiA+IEBAIC0z MDcsNiArMzA4LDcgQEAgYWx0ZXJuYXRpdmVfaWYgQVJNNjRfSEFTX0lSUV9QUklPX01BU0tJTkcK PiA+ICAgCW1vdgl4MjAsICNHSUNfUFJJT19JUlFPTiB8IEdJQ19QUklPX1BTUl9JX1NFVAo+ID4g ICAJbXNyX3MJU1lTX0lDQ19QTVJfRUwxLCB4MjAKPiA+ICAgYWx0ZXJuYXRpdmVfZWxzZV9ub3Bf ZW5kaWYKPiA+ICsjZW5kaWYKPiA+ICAgCS8qIFJlLWVuYWJsZSB0YWcgY2hlY2tpbmcgKFRDTyBz ZXQgb24gZXhjZXB0aW9uIGVudHJ5KSAqLwo+ID4gICAjaWZkZWYgQ09ORklHX0FSTTY0X01URQo+ ID4gQEAgLTMzMCw2ICszMzIsNyBAQCBhbHRlcm5hdGl2ZV9lbHNlX25vcF9lbmRpZgo+ID4gICAJ ZGlzYWJsZV9kYWlmCj4gPiAgIAkuZW5kaWYKPiA+ICsjaWZkZWYgQ09ORklHX0FSTTY0X1BTRVVE T19OTUkKPiA+ICAgCS8qIFJlc3RvcmUgcG1yICovCj4gPiAgIGFsdGVybmF0aXZlX2lmIEFSTTY0 X0hBU19JUlFfUFJJT19NQVNLSU5HCj4gPiAgIAlsZHIJeDIwLCBbc3AsICNTX1BNUl9TQVZFXQo+ ID4gQEAgLTMzOSw2ICszNDIsNyBAQCBhbHRlcm5hdGl2ZV9pZiBBUk02NF9IQVNfSVJRX1BSSU9f TUFTS0lORwo+ID4gICAJZHNiCXN5CQkJCS8vIEVuc3VyZSBwcmlvcml0eSBjaGFuZ2UgaXMgc2Vl biBieSByZWRpc3RyaWJ1dG9yCj4gPiAgIC5MX19za2lwX3Btcl9zeW5jXEA6Cj4gPiAgIGFsdGVy bmF0aXZlX2Vsc2Vfbm9wX2VuZGlmCj4gPiArI2VuZGlmCj4gPiAgIAlsZHAJeDIxLCB4MjIsIFtz cCwgI1NfUENdCQkvLyBsb2FkIEVMUiwgU1BTUgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgt YXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3Jn L21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=