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 A8E1AC433F5 for ; Wed, 19 Jan 2022 09:47:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353174AbiASJrT (ORCPT ); Wed, 19 Jan 2022 04:47:19 -0500 Received: from szxga01-in.huawei.com ([45.249.212.187]:35852 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346503AbiASJrL (ORCPT ); Wed, 19 Jan 2022 04:47:11 -0500 Received: from dggeme755-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Jf14J6LXzzccZF; Wed, 19 Jan 2022 17:46:24 +0800 (CST) Received: from [10.67.110.136] (10.67.110.136) by dggeme755-chm.china.huawei.com (10.3.19.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.21; Wed, 19 Jan 2022 17:47:09 +0800 Subject: Re: [PATCH] arm64: entry: Save some nops when CONFIG_ARM64_PSEUDO_NMI is not set To: Mark Rutland CC: , , , , , , , References: <20220107085536.214501-1-heying24@huawei.com> <20220112032410.29231-1-heying24@huawei.com> <20220119093525.GB42546@C02TD0UTHF1T.local> From: He Ying Message-ID: <784a864e-e7e5-4ce5-ec78-850b523c23b0@huawei.com> Date: Wed, 19 Jan 2022 17:47:09 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20220119093525.GB42546@C02TD0UTHF1T.local> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.110.136] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggeme755-chm.china.huawei.com (10.3.19.101) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2022/1/19 17:35, Mark Rutland 写道: > 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. OK. Thanks for your comment. > >> 锟斤拷 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 865DDC433FE for ; Wed, 19 Jan 2022 09:48:28 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:CC:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zZIF2iPqOI+LyPC46keeIN2QJN+QBMpI3cSAnnJAzYI=; b=Aw/y8eQkcz8Gz9UBYCQSLglonL USIc4P+9xYfwyWS4l7Sn61jJBH5cMAZrgvrRATP+7wCsvgIHfft74kapsijgrZHIbbsJ/pFuMm5i7 Id9u4twKMQ8CGv9NmioquJO4UZZu4nV87ZhKPVOqhWUwJ7MamH/wSmJTlmqhnnO1aKC+CPCwSp6FX CTv7ZWc1ENj1QFtefFrUUH77HFxgDsU7Hdo2XwvzUXAX+S578LAxFIVGQgKIVQ9f9WmG6lum2/x0Q BJ15r8yarPdfRKSu54V3si2B6szQYTeJYANWBAzJ/qZ/hBs2Iynjcd7pFg16TOGLb7QbMSe3MhCCi j8o8sjRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nA7Yk-004hmo-I5; Wed, 19 Jan 2022 09:47:18 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nA7Yg-004hlB-1Y for linux-arm-kernel@lists.infradead.org; Wed, 19 Jan 2022 09:47:15 +0000 Received: from dggeme755-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Jf14J6LXzzccZF; Wed, 19 Jan 2022 17:46:24 +0800 (CST) Received: from [10.67.110.136] (10.67.110.136) by dggeme755-chm.china.huawei.com (10.3.19.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.21; Wed, 19 Jan 2022 17:47:09 +0800 Subject: Re: [PATCH] arm64: entry: Save some nops when CONFIG_ARM64_PSEUDO_NMI is not set To: Mark Rutland CC: , , , , , , , References: <20220107085536.214501-1-heying24@huawei.com> <20220112032410.29231-1-heying24@huawei.com> <20220119093525.GB42546@C02TD0UTHF1T.local> From: He Ying Message-ID: <784a864e-e7e5-4ce5-ec78-850b523c23b0@huawei.com> Date: Wed, 19 Jan 2022 17:47:09 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20220119093525.GB42546@C02TD0UTHF1T.local> X-Originating-IP: [10.67.110.136] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggeme755-chm.china.huawei.com (10.3.19.101) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220119_014714_281566_12590EC7 X-CRM114-Status: GOOD ( 13.96 ) 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-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org CuWcqCAyMDIyLzEvMTkgMTc6MzUsIE1hcmsgUnV0bGFuZCDlhpnpgZM6Cj4gT24gV2VkLCBKYW4g MTksIDIwMjIgYXQgMDI6NDA6NThQTSArMDgwMCwgSGUgWWluZyB3cm90ZToKPj4gSGkgYWxsLAo+ Pgo+PiBQaW5nLiBBbnkgY29tbWVudHM/Cj4gVGhlIHBhdGNoIGxvb2tzIGZpbmUsIGJ1dCBhcyBp dCdzIHRoZSBtaWRkbGUgb2YgdGhlIG1lcmdlIHdpbmRvdyBwZW9wbGUKPiBhcmUgYnVzeSBhbmQg dW5saWtlbHkgdG8gbG9vayBhdCB0aGlzIGZvciB0aGUgbmV4dCBmZXcgZGF5cy4KPgo+IEdlbmVy YWxseSBpdCdzIGEgZ29vZCBpZGVhIHRvIHdhaXQgdW50aWwgcmMxIG9yIHJjMiwgcmViYXNlIGF0 b3AgdGhhdCwKPiBhbmQgcG9zdCB0aGUgdXBkYXRlZCBwYXRjaC4gU3R1ZmYgbGlrZSB0aGlzIHVz dWFsbHkgZ2V0cyBxdWV1ZWQgYXJvdW5kCj4gcmMzL3JjNCB0aW1lLgpPSy4gVGhhbmtzIGZvciB5 b3VyIGNvbW1lbnQuCj4KPj4g6ZSf5pak5ou3IDIwMjIvMS8xMiAxMToyNCwgSGUgWWluZyDlhpnp lJ/mlqTmi7c6Cj4+PiBBcm02NCBwc2V1ZG8tTk1JIGZlYXR1cmUgY29kZSBicmluZ3Mgc29tZSBh ZGRpdGlvbmFsIG5vcHMKPj4+IHdoZW4gQ09ORklHX0FSTTY0X1BTRVVET19OTUkgaXMgbm90IHNl dCwgd2hpY2ggaXMgbm90Cj4+PiBuZWNlc3NhcnkuIFNvIGFkZCBuZWNlc3NhcnkgaWZkZWZmZXJ5 IHRvIGF2b2lkIGl0Lgo+Pj4KPj4+IFNpZ25lZC1vZmYtYnk6IEhlIFlpbmcgPGhleWluZzI0QGh1 YXdlaS5jb20+Cj4gRldJVzoKPgo+IEFja2VkLWJ5OiBNYXJrIFJ1dGxhbmQgPG1hcmsucnV0bGFu ZEBhcm0uY29tPgo+Cj4gTWFyay4KPgo+Pj4gLS0tCj4+PiAgICBhcmNoL2FybTY0L2tlcm5lbC9l bnRyeS5TIHwgNCArKysrCj4+PiAgICAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspCj4+ Pgo+Pj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva2VybmVsL2VudHJ5LlMgYi9hcmNoL2FybTY0 L2tlcm5lbC9lbnRyeS5TCj4+PiBpbmRleCAyZjY5YWU0Mzk0MWQuLmZmYzMyZDNkOTA5YSAxMDA2 NDQKPj4+IC0tLSBhL2FyY2gvYXJtNjQva2VybmVsL2VudHJ5LlMKPj4+ICsrKyBiL2FyY2gvYXJt NjQva2VybmVsL2VudHJ5LlMKPj4+IEBAIC0zMDAsNiArMzAwLDcgQEAgYWx0ZXJuYXRpdmVfZWxz ZV9ub3BfZW5kaWYKPj4+ICAgIAlzdHIJdzIxLCBbc3AsICNTX1NZU0NBTExOT10KPj4+ICAgIAku ZW5kaWYKPj4+ICsjaWZkZWYgQ09ORklHX0FSTTY0X1BTRVVET19OTUkKPj4+ICAgIAkvKiBTYXZl IHBtciAqLwo+Pj4gICAgYWx0ZXJuYXRpdmVfaWYgQVJNNjRfSEFTX0lSUV9QUklPX01BU0tJTkcK Pj4+ICAgIAltcnNfcwl4MjAsIFNZU19JQ0NfUE1SX0VMMQo+Pj4gQEAgLTMwNyw2ICszMDgsNyBA QCBhbHRlcm5hdGl2ZV9pZiBBUk02NF9IQVNfSVJRX1BSSU9fTUFTS0lORwo+Pj4gICAgCW1vdgl4 MjAsICNHSUNfUFJJT19JUlFPTiB8IEdJQ19QUklPX1BTUl9JX1NFVAo+Pj4gICAgCW1zcl9zCVNZ U19JQ0NfUE1SX0VMMSwgeDIwCj4+PiAgICBhbHRlcm5hdGl2ZV9lbHNlX25vcF9lbmRpZgo+Pj4g KyNlbmRpZgo+Pj4gICAgCS8qIFJlLWVuYWJsZSB0YWcgY2hlY2tpbmcgKFRDTyBzZXQgb24gZXhj ZXB0aW9uIGVudHJ5KSAqLwo+Pj4gICAgI2lmZGVmIENPTkZJR19BUk02NF9NVEUKPj4+IEBAIC0z MzAsNiArMzMyLDcgQEAgYWx0ZXJuYXRpdmVfZWxzZV9ub3BfZW5kaWYKPj4+ICAgIAlkaXNhYmxl X2RhaWYKPj4+ICAgIAkuZW5kaWYKPj4+ICsjaWZkZWYgQ09ORklHX0FSTTY0X1BTRVVET19OTUkK Pj4+ICAgIAkvKiBSZXN0b3JlIHBtciAqLwo+Pj4gICAgYWx0ZXJuYXRpdmVfaWYgQVJNNjRfSEFT X0lSUV9QUklPX01BU0tJTkcKPj4+ICAgIAlsZHIJeDIwLCBbc3AsICNTX1BNUl9TQVZFXQo+Pj4g QEAgLTMzOSw2ICszNDIsNyBAQCBhbHRlcm5hdGl2ZV9pZiBBUk02NF9IQVNfSVJRX1BSSU9fTUFT S0lORwo+Pj4gICAgCWRzYglzeQkJCQkvLyBFbnN1cmUgcHJpb3JpdHkgY2hhbmdlIGlzIHNlZW4g YnkgcmVkaXN0cmlidXRvcgo+Pj4gICAgLkxfX3NraXBfcG1yX3N5bmNcQDoKPj4+ICAgIGFsdGVy bmF0aXZlX2Vsc2Vfbm9wX2VuZGlmCj4+PiArI2VuZGlmCj4+PiAgICAJbGRwCXgyMSwgeDIyLCBb c3AsICNTX1BDXQkJLy8gbG9hZCBFTFIsIFNQU1IKPiAuCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdAps aW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVh ZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==