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 C875CECAAD5 for ; Fri, 2 Sep 2022 16:11:32 +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=/DtgTWSSZfaEyguO47Klry6fsqe1ELsWTYR3jULZYPY=; b=fbYRk+kS7iL+2h /phKaXo2GHbzoRxlOFQ/XD4KTc9+rqPpcKl/OgNjjMPqn79Np0JgCf7Pvp9a4Eu5LlU0P2k/n8iOs gxyDGvYylXzL+hiS+QkQj834yT4BYobT4/D85HzaCGVpIR4T0HmHkPzsoYrDJBfmSRQT21w+6/afe BSZqpmdQtZO1+DPVeClF4nfmxN4mkxI3VIhwvR4oxIe+A64qWODcepJZLRPQ1ir3CKcyCpsVBzZSY 1berGAhOn16MynT/UnYUwoHW0ciUHZLlBFio4pMN08i4IVKuhn4NqTukYltW7mf5AU6ibFzEO9gvD 6MtbUdfe7WinStE+/mAw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oU9FJ-006mS4-QS; Fri, 02 Sep 2022 16:10:18 +0000 Received: from mail-db8eur05on2063.outbound.protection.outlook.com ([40.107.20.63] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oU9FF-006mQX-UI for linux-arm-kernel@lists.infradead.org; Fri, 02 Sep 2022 16:10:15 +0000 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=MzjknWMQQ1AcitV49bwrg02HbBPn1SExDudHcjoi3+QslIcYIepc+DWtp0Fr0Dl3q/poZJj7e5Bw/Pn/1X1198xflA+l+FHFnzTqbOKXVMNEF0YFC4L1BVkrEVivduBErBBgW3kBa90+CzcHvpVXwYjOkWgyCPevR0GMPtfR2HjkVh0DM1DFlGfY1qq0okIRxJgpBxc4sgASb5p56fs2A35MZGIIbvqk7SZJmcZv8KQMts5OQe/OdLMfRWrP2SHtUI56lD5aRz4fdhJNH55XSt3LuUasRw2J0+cH8OKCsLnXzVHkldRtMO2bPpS9kYE5PbussyriMn3xYL1EhOhFmA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NvU6kEl/xn1Y/x9fRQUevmgRqj8RO7DBv7C1GEwVsDs=; b=nZM1r2OIz5AzshdIg0qBqMXvn/dCvPM6l+lsRiV9IBXJxfnv36v9FawL3xSXyY00hM/o+EIJmigHELdOrxpLJJjx24cC+4NzQHJ+8jsM22sgLrJhhp0tiGCy6W3jy4sz1xxyzdfHDCTZh5lRnRphzka9HwaDQOLLPAVX9okVQK1kKqI4WGfTvagy6Nf+v2yXepP9eQfuhaCDzn1tKz2vTFudYHcOqxpZU/VKg/5FYkF21GnlhY7pDa3yaaMDrQyekWwku1FGJktg5W0ttppSxYAPKEvlhl3dqvQNMzyRTAEUSrjIh96tARIBTWPwjeivlSSgiiXpEpNaFRSRyX9p1Q== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NvU6kEl/xn1Y/x9fRQUevmgRqj8RO7DBv7C1GEwVsDs=; b=iyg5XBrgWAUk171eoShQ2bCqvJGPX6FjNNBvekILNAFb3GBAtZWnH+qpKbRHgPDhHUvMOF8sQIoQgQtoZ6/7s6snGazVuHFoo5PmssHVSQ1dt+G5PFM9B3Qf29i9hbTISBu+I+vHytjcybi4VvcoLANCjMRoNr+cv1MPMCXkC+U= Received: from AM5PR04CA0005.eurprd04.prod.outlook.com (2603:10a6:206:1::18) by DB8PR08MB5387.eurprd08.prod.outlook.com (2603:10a6:10:115::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Fri, 2 Sep 2022 15:54:57 +0000 Received: from AM7EUR03FT022.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:1:cafe::df) by AM5PR04CA0005.outlook.office365.com (2603:10a6:206:1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.15 via Frontend Transport; Fri, 2 Sep 2022 15:54:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM7EUR03FT022.mail.protection.outlook.com (100.127.140.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10 via Frontend Transport; Fri, 2 Sep 2022 15:54:57 +0000 Received: ("Tessian outbound cc6a8ab50b6b:v123"); Fri, 02 Sep 2022 15:54:57 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 6bbc07bf3bf58e30 X-CR-MTA-TID: 64aa7808 Received: from db777bd6e52d.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id EF25F924-37BE-4A0F-8B17-6C260C57850B.1; Fri, 02 Sep 2022 15:54:50 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id db777bd6e52d.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 02 Sep 2022 15:54:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m7jHR4VVlgVyNYOhGaxfoKLqodT1YpA24u/ROg1sQCjbxx4xxlfqPzR47rdX9B8nLlGZ0No1LRzbLzDNBEdLhxmPRKmdcgwD9GqGMJ2G2bSJh5jFli9QA2nMTrx7DfIk3qYE7OuUCPAM/MrYplMUKG8y6nuLkONurrnWGwqCk3Hr2+eLP+jeCzadqysBS/u2Ua+NQAsBFvTPiRfUoUkCAU9NVg9IirgAx9dAHkjhW+0pAs7r1/vYP6c8W7NwYLDxxFXvAdx74tGcqZM593zoevkECRGv/w32Q3WcXGsIgWtkcI4eK0Mh3diq05oiiGe7tw5axlpf8l6nBhd+I6mK7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NvU6kEl/xn1Y/x9fRQUevmgRqj8RO7DBv7C1GEwVsDs=; b=LEcyY10GluTWePvM3ncsd/pqqNuEMlD3BN8S1NxsPU6xUn/rAmzHL662WWzkV7dAKd7aMcoezQi3znKAdq4DLCJ8JywQqBSMEQSZZqZQLeI5NkJtI2j9EIBJHKyT6QVcrJ2ker3SkB8kLVQB2ZWf7aIp/sqT3BDdF+mMgT1vktNN3L5/+18vvxMKvf1jhtxnRkk3PqLR2GAnns44GELl06W8zc2BWtzDGgrHqWvhgxAZDWmbYc8FNCAZAX0WvnZVF0or0BivTGOODpz1Smck6FzbP9IZ5T0lkwhS1CQ9u79LHs+sAnEGSRGyp5mzQAF5+Ji0jKfDZmFsat/csZ1Wzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NvU6kEl/xn1Y/x9fRQUevmgRqj8RO7DBv7C1GEwVsDs=; b=iyg5XBrgWAUk171eoShQ2bCqvJGPX6FjNNBvekILNAFb3GBAtZWnH+qpKbRHgPDhHUvMOF8sQIoQgQtoZ6/7s6snGazVuHFoo5PmssHVSQ1dt+G5PFM9B3Qf29i9hbTISBu+I+vHytjcybi4VvcoLANCjMRoNr+cv1MPMCXkC+U= Received: from DB6P191CA0009.EURP191.PROD.OUTLOOK.COM (2603:10a6:6:28::19) by DB9PR08MB7495.eurprd08.prod.outlook.com (2603:10a6:10:36c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Fri, 2 Sep 2022 15:54:47 +0000 Received: from DBAEUR03FT028.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:28:cafe::62) by DB6P191CA0009.outlook.office365.com (2603:10a6:6:28::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10 via Frontend Transport; Fri, 2 Sep 2022 15:54:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT028.mail.protection.outlook.com (100.127.142.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.10 via Frontend Transport; Fri, 2 Sep 2022 15:54:47 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Fri, 2 Sep 2022 15:54:47 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9 via Frontend Transport; Fri, 2 Sep 2022 15:54:46 +0000 Date: Fri, 2 Sep 2022 16:54:45 +0100 From: Joey Gouly To: Mark Rutland CC: , , , , , , Subject: Re: [PATCH 6/9] arm64: alternatives: have callbacks take a cap Message-ID: <20220902155445.GA10647@e124191.cambridge.arm.com> References: <20220901151403.1735836-1-mark.rutland@arm.com> <20220901151403.1735836-7-mark.rutland@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220901151403.1735836-7-mark.rutland@arm.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 0030a765-8197-418b-cda2-08da8cfb7bfe X-MS-TrafficTypeDiagnostic: DB9PR08MB7495:EE_|AM7EUR03FT022:EE_|DB8PR08MB5387:EE_ x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: S2Pth8L+3P4cFikyqdnuJY4bsnlMGZxa7Phh2KhgrLh8uUu76hpA5eZ0fjtC1tt1scgtLqYuE8+CasNnC/weor84ByWw7nPRc5IgBPNHCmSykI1TWxlFDNo9VIgkQGhzgzZkJNIaZI9g5kciTplq/5HNCoqaPQLkzPyKeRSiD+uJr8g4M/KB16M+Cphc2cj4BNYoEv38IT2CL8vinySqCEx7QW8FzGJQ6GdWPxx7aS+accOPXZ2WdnEsow2xyGWYSZQZLxuSeF774GfQMEM5XFLtsuZvCb5kyuZB4/RzK5ZA5xIw+xOUSOWOcds4unXd3zVVz9T3y3imj2KhK5g7PT7fyWkkCQF7gJB+KZ8yxxiWtSycWVBiCM64l7YMcdi/64o38TNRGNW9hQ3Gz+fsWDAFutpxsN99rBYYwY3OKdeXhbwFRhGTMAhr55eDACpO+2Odv69sD4QQzCHCMNcMd7v+AgClyrcSdPvrqeS8JcE/+Ixu2M1/XUMA4MOOgg69Z9hb0K7FrxpiIOtTqds5xRzTph3HnRfOmYTB9LnfXFzKGeIliqSjJj3cW5QOOoodtezJor6yNy3/zHuK1rk90+U61GAW4KJOXqemNKgJetn1aDEujpBjq5AsxO5c1ym11fLWC1qOia8KiWfvYYkj5i1xI3dh8mSVZO/RRJHTddo+Z1aVKLyrjr32P8IF3ypDCazNZOClSPp1Sf54op0BOR6JXbUW5Y1Um1ejgDSu2N1viVqguES6w2BKcdkTzXrAc5rj8JAJ1xx1ZL5g09EgWxh91FHRTiGG0h76ODaxB5j+xI1A4myO6aP9EEHOBY0U X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230016)(4636009)(376002)(396003)(346002)(39860400002)(136003)(36840700001)(46966006)(40470700004)(2906002)(1076003)(478600001)(186003)(33656002)(5660300002)(8936002)(6862004)(44832011)(26005)(41300700001)(86362001)(356005)(40460700003)(7696005)(82310400005)(81166007)(82740400003)(40480700001)(83380400001)(336012)(426003)(36860700001)(47076005)(55016003)(316002)(70586007)(8676002)(4326008)(54906003)(6636002)(70206006)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB7495 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT022.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: ef00c7b2-2e8e-4dc1-878d-08da8cfb7675 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u+185sn1gQSUGGWc/lHdque4CsX02OW8aR6qfchxkWzAjwSTNM1zcJGDwDD3B8QFrjJ/KG7Nr3Nj6XzYZzaXlNm6HWFJwOjMTS5cEfmyxkeZFFR9hAa+O+oDk64XD0VvA4PTxp1SkRXBCxJtWpFjRwZvnBKDF5cfXNt5q0fA8eHBle4e+HWI11eSmZcrysj/dohMiayQRl72jEWccxVtjH6KQ06YhiH4wLXWGNTyWkrwQnt+xvLlBJCeMgd6FNSFLkMC8GLlm5boLDtAuzrW/KnWdpib7LBLhrnCclcl1VUh6jl4XI/T4PPpu0Q9d0+izCqKE0kEu6hCaRJMkki5lNQE7GrrNwaVRxD8hMCT1Q/78B7DG1Kb8s68hTByZaN4jl1d6mQSQIoUn7bZmt+p3jDBwhjlIfNWujtUYsEm9c5t1Dau0ncrMp5N+54H/kKA0W18NFtr6ljokdDrjw4tXDTm3l2T1y4eExhUJR4fMHwwmbKoLVn7t+Yr8pEvt2hG+yhIODdvqmsMMGmzkyi/gJZYvM7ukOdvtfB7whkgaCl6hIsQiWYzC+ZH5bukABPG3+X5WI3pg5e4FoEy/WjNliBp4JkpNxdnrQubIo8gQBgMU5qJgbUw2PPEB1dPTrAPaPzslCVuA4PsDyal4fVm9DUSqscQyM/TIApzXj6CJyR9aJ8ydDwvSz1yjIULDtMYQzC4olnbf3raOisaRuEnvwTcPHiX7rpj6E6YjJr3hNfufv4hyoiqo8qRi+hMCyILK2xlEbqSVzY1Bx8MCFyTlw== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230016)(4636009)(39860400002)(346002)(136003)(396003)(376002)(40470700004)(46966006)(36840700001)(7696005)(426003)(26005)(47076005)(336012)(186003)(1076003)(44832011)(8936002)(5660300002)(6862004)(40480700001)(33656002)(41300700001)(86362001)(478600001)(36860700001)(83380400001)(81166007)(6636002)(54906003)(82310400005)(2906002)(316002)(82740400003)(55016003)(4326008)(8676002)(70206006)(70586007)(40460700003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 15:54:57.0697 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0030a765-8197-418b-cda2-08da8cfb7bfe X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM7EUR03FT022.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB5387 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220902_091014_126446_D86B4969 X-CRM114-Status: GOOD ( 27.14 ) 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 Hi Mark, On Thu, Sep 01, 2022 at 04:14:00PM +0100, Mark Rutland wrote: > Today, callback alternatives are special-cased within > __apply_alternatives(), and are applied alongside patching for system > capabilities as ARM64_NCAPS is not part of the boot_capabilities feature > mask. > > This special-casing is less than ideal. Giving special meaning to > ARM64_NCAPS for this requires some structures and loops to use > ARM64_NCAPS + 1 (AKA ARM64_NPATCHABLE), while others use ARM64_NCAPS. > It's also not immediately clear callback alternatives are only applied > when applying alternatives for system-wide features. > > To make this a bit clearer, changes the way that callback alternatives > are identified to remove the special-casing of ARM64_NCAPS, and to allow > callback alternatives to be associated with a cpucap as with all other > alternatives. > > New cpucaps, ARM64_ALWAYS_BOOT and ARM64_ALWAYS_SYSTEM are added which > are always detected alongside boot cpu capabilities and system > capabilities respectively. All existing callback alternatives are made > to use ARM64_ALWAYS_SYSTEM, and so will be patched at the same point > during the boot flow as before. > > Subsequent patches will make more use of these new cpucaps. > > There should be no functional change as a result of this patch. > > Signed-off-by: Mark Rutland > Cc: Ard Biesheuvel > Cc: Catalin Marinas > Cc: James Morse > Cc: Joey Gouly > Cc: Marc Zyngier > Cc: Will Deacon > --- > arch/arm64/include/asm/alternative-macros.h | 18 ++++++++----- > arch/arm64/include/asm/assembler.h | 10 ++++---- > arch/arm64/include/asm/cpufeature.h | 4 +-- > arch/arm64/include/asm/kvm_mmu.h | 5 ++-- > arch/arm64/kernel/alternative.c | 28 ++++++++++++--------- > arch/arm64/kernel/cpufeature.c | 19 ++++++++++++-- > arch/arm64/kernel/entry.S | 8 +++--- > arch/arm64/kvm/hyp/hyp-entry.S | 4 +-- > arch/arm64/tools/cpucaps | 2 ++ > 9 files changed, 62 insertions(+), 36 deletions(-) > [..] > diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c > index 2e18c9c0f612b..da706c9f9a9a5 100644 > --- a/arch/arm64/kernel/alternative.c > +++ b/arch/arm64/kernel/alternative.c > @@ -21,6 +21,11 @@ > #define ALT_ORIG_PTR(a) __ALT_PTR(a, orig_offset) > #define ALT_REPL_PTR(a) __ALT_PTR(a, alt_offset) > > +#define ALT_CAP(a) ((a)->cpufeature & ~ARM64_CB_BIT) > +#define ALT_HAS_CB(a) ((a)->cpufeature & ARM64_CB_BIT) > + > +#define ALT_NR_INST(a) ((a)->orig_len / AARCH64_INSN_SIZE) You introduced this macro, but don't use it. > + > /* Volatile, as we may be patching the guts of READ_ONCE() */ > static volatile int all_alternatives_applied; > > @@ -143,16 +148,15 @@ static void __nocfi __apply_alternatives(const struct alt_region *region, > > for (alt = region->begin; alt < region->end; alt++) { > int nr_inst; > + int cap = ALT_CAP(alt); > > - if (!test_bit(alt->cpufeature, feature_mask)) > + if (!test_bit(cap, feature_mask)) > continue; > > - /* Use ARM64_CB_PATCH as an unconditional patch */ > - if (alt->cpufeature < ARM64_CB_PATCH && > - !cpus_have_cap(alt->cpufeature)) > + if (!cpus_have_cap(cap)) > continue; > > - if (alt->cpufeature == ARM64_CB_PATCH) > + if (ALT_HAS_CB(alt)) > BUG_ON(alt->alt_len != 0); > else > BUG_ON(alt->alt_len != alt->orig_len); > @@ -161,10 +165,10 @@ static void __nocfi __apply_alternatives(const struct alt_region *region, > updptr = is_module ? origptr : lm_alias(origptr); > nr_inst = alt->orig_len / AARCH64_INSN_SIZE; > > - if (alt->cpufeature < ARM64_CB_PATCH) > - alt_cb = patch_alternative; > - else > + if (ALT_HAS_CB(alt)) > alt_cb = ALT_REPL_PTR(alt); > + else > + alt_cb = patch_alternative; > > alt_cb(alt, origptr, updptr, nr_inst); > > @@ -208,10 +212,10 @@ static int __apply_alternatives_multi_stop(void *unused) > cpu_relax(); > isb(); > } else { > - DECLARE_BITMAP(remaining_capabilities, ARM64_NPATCHABLE); > + DECLARE_BITMAP(remaining_capabilities, ARM64_NCAPS); > > bitmap_complement(remaining_capabilities, boot_capabilities, > - ARM64_NPATCHABLE); > + ARM64_NCAPS); > > BUG_ON(all_alternatives_applied); > __apply_alternatives(&kernel_alternatives, false, > @@ -254,9 +258,9 @@ void apply_alternatives_module(void *start, size_t length) > .begin = start, > .end = start + length, > }; > - DECLARE_BITMAP(all_capabilities, ARM64_NPATCHABLE); > + DECLARE_BITMAP(all_capabilities, ARM64_NCAPS); > > - bitmap_fill(all_capabilities, ARM64_NPATCHABLE); > + bitmap_fill(all_capabilities, ARM64_NCAPS); > > __apply_alternatives(®ion, true, &all_capabilities[0]); > } Thanks, Joey _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel