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=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 01F53C49EA2 for ; Thu, 17 Jun 2021 09:31:36 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C4AE360FE6 for ; Thu, 17 Jun 2021 09:31:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4AE360FE6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=fujitsu.com 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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jmzgM9eccUbRvJuD+OznBfP7TT4IhE83k4Lw7l9jTz4=; b=XCSkWQ0aSgOMYT 3GviYGomDVQBYRo5QJ0rhEoBPQxkHBBfcGeElOrBh3djPE9chcmEVUELzss8hTu02BaELBw8w2Fcl RwAnEIsF4g0VrwqJ6jSajJFHHeI5SXhLrbJ0devnka2RD/3B44WRW2hFUUZlWe+p3D1+KNn450dYI qq1SUNsd4vkm7MtNw3smODbEfauqUPx0SamqA3d5XxhxNvaIXV7zUIFeMcDanm9H+jzpvL9Vi79Kk 0Y2Qfr912B65YEjITZXkca+mI/E3Lr/SrLd0pyCe/rE044QwyvoOOptCxp0J3JG4hK8zliddhXx7B LtcKNTxYbCBYsQM4VI3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltoLD-009dqS-MG; Thu, 17 Jun 2021 09:29:40 +0000 Received: from esa2.fujitsucc.c3s2.iphmx.com ([68.232.152.246]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltoL9-009doi-0O for linux-arm-kernel@lists.infradead.org; Thu, 17 Jun 2021 09:29:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj1; t=1623922175; x=1655458175; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Ry49ZJBMZf+oRWIUdVQlrOtaScVUL5h5yhnTT232EW4=; b=DgeBeMJyI7c9Hb33nyH0VtSX2JGbSML/xowhjZB4qOojH5NTnpvwrMSA 623OPYHCvsA22NhIQYNbMuFMeFk/GoqX/l8voSm5STw5wFVnwOpUey0iw I9Xru5/pAFQsDtV/5O5Rqbk8uNCPLy8MbvgN3iOUPdhMahnih9Efj5+tu ZRLK2crW9t9z4s2G+gfTzbiAO3UKY6WSGV5lnV9wlmA00lIAbuPA0Gd5N UF1H5A8AR1S/li04XIEkhaNEgmeno/Ci0JqzWDMrK1PW+5OLSg5PToUHt rDvTNB8N1LNlMd6s3sTIu1KfckCyJoUYN3w5+jP3b5fDTjNHwuL6GE5vM A==; IronPort-SDR: iN4SQi6djfdeqtnrJNCjLxrpdjhMS+lPS/m48guLpDSWbIh+OdsYCr02BrR7d6yugGh2jgssEO 2yUeaN0GeyYX25f4nA6Se3Gm2hHdoz1Qy4n7Oqr9AB9mHx0LcxesIx+NjmvYEd/DYr9B1J0Syd q1kMLAL7Jmjz6W05MQVYiaGYxN5dRb1kaU0deTTFKVXnWpHX3pE6vZbzUSqQYDS2Ygl2cSwT7z d4AXMAdwWJCCYNI/MWgb8hS8nZg1D8whFx+0cMlvenXVAJsxPIGoEp2DTgpABgOjzZq/3Skt4p QGs= X-IronPort-AV: E=McAfee;i="6200,9189,10017"; a="41457790" X-IronPort-AV: E=Sophos;i="5.83,280,1616425200"; d="scan'208";a="41457790" Received: from mail-ty1jpn01lp2054.outbound.protection.outlook.com (HELO JPN01-TY1-obe.outbound.protection.outlook.com) ([104.47.93.54]) by ob1.fujitsucc.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2021 18:29:26 +0900 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RNPRaaojzuIcRmmGDZKKoChbB8f3e+1eR8xD9KVIuXxmD3CgMSBQIDDlXkfjpE2nAXFL3T9AhmUpR31A+4FXxrs5MX7jjAUhuNNmYraHm+4SY87EyWw/6EyzO9gkb/d0ManZjeKA1rt/b8jyuqB0Nn5Mixg3sVNXSfpyv6ZKj3vTI02G5KshGJ9kHwhjGpkGqtxZ6GihMVCzAGdlOEzlJggmcDGKT/bW543V7PIdX+T7bNKdSiBfWOEL9DBpTaCN7/hMqCCfNbrqsBTrFu/d2pXeMSg5LYsZbC4URCLrcdoA3Czqx8W0LubKR9BRPHW/AaRbIboyf7zJLW2jYHHOiQ== 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-SenderADCheck; bh=hvIGxUQMaIp16x9JpvdnxQkAEgdbHma4DnvdJqzLkxM=; b=ZzibXZvNFMF2+HoJ/cSU4uLZLnQlAU3ECnKvHmJAI6HVP1ElugxVxWnP73xJSQNASk3LgVTpwsqaVqRlPjl+3KgydImLhC1SHUUXHC0x+jmq7zD39Rs1q4HbCdgW/2LUzfscmijjntuz5H+dIF3K59DzvsjZ7F6L9988l8n6bXUKNgBo46hMQI8Ynu9j/iBWajzm8qPK6ENQ0iE9aHvqwmMQ8KRnHYRhy+Uzq9V9z3uXB+qlkHRcITwqiOPAsRBtFuROyVSHjio6LUQGIMuvATJZ+vKVKVNlnEYa9in8mDo8jIoBxrFlNEe4sX43+da32L1a8qxk2Vz4wPBK1CabDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fujitsu.com; dmarc=pass action=none header.from=fujitsu.com; dkim=pass header.d=fujitsu.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.onmicrosoft.com; s=selector2-fujitsu-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hvIGxUQMaIp16x9JpvdnxQkAEgdbHma4DnvdJqzLkxM=; b=dQiMUiiR0cWCKuuEqFrhDyF/b79fkacLVjiLTqDRL0owrBqe7S3oWqyCC6hvlU2iE9szRp3QHtGiPsUF9hIf1AIt2YOlnUSxEb/ZcTehCwnx/D8IbPIhwLG7zc6BVB3OlSHC9lNKeC1+acRDdT/k/m9ZYicq4AfW3tjD5MbAEcs= Received: from TY2PR01MB5257.jpnprd01.prod.outlook.com (2603:1096:404:11a::10) by TYYPR01MB6652.jpnprd01.prod.outlook.com (2603:1096:400:c9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Thu, 17 Jun 2021 09:29:23 +0000 Received: from TY2PR01MB5257.jpnprd01.prod.outlook.com ([fe80::1d6f:5a3b:9719:a811]) by TY2PR01MB5257.jpnprd01.prod.outlook.com ([fe80::1d6f:5a3b:9719:a811%7]) with mapi id 15.20.4242.021; Thu, 17 Jun 2021 09:29:22 +0000 From: "nobuta.keiya@fujitsu.com" To: Suraj Jitindar Singh CC: "linux-kernel@vger.kernel.org" , "live-patching@vger.kernel.org" , "catalin.marinas@arm.com" , "will@kernel.org" , "mark.rutland@arm.com" , "broonie@kernel.org" , "madvenka@linux.microsoft.com" , "duwe@lst.de" , "sjitindarsingh@gmail.com" , "benh@kernel.crashing.org" , "linux-arm-kernel@lists.infradead.org" Subject: RE: [RFC PATCH 1/1] arm64: implement live patching Thread-Topic: [RFC PATCH 1/1] arm64: implement live patching Thread-Index: AQHXWZ3CD4noxF06h0yjyXLanHsV4asX+OWg Date: Thu, 17 Jun 2021 09:29:22 +0000 Message-ID: References: <20210604235930.603-1-surajjs@amazon.com> In-Reply-To: <20210604235930.603-1-surajjs@amazon.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_Enabled=True; MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_SiteId=a19f121d-81e1-4858-a9d8-736e267fd4c7; MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_SetDate=2021-06-17T09:27:36.881Z; MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_Name=FUJITSU-RESTRICTED; MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_ContentBits=0; MSIP_Label_a7295cc1-d279-42ac-ab4d-3b0f4fece050_Method=Standard; authentication-results: amazon.com; dkim=none (message not signed) header.d=none;amazon.com; dmarc=none action=none header.from=fujitsu.com; x-originating-ip: [210.162.30.53] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 46cb9325-e55c-4894-cddb-08d931726463 x-ms-traffictypediagnostic: TYYPR01MB6652: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: FSJEzN6SGGL2omjSMQ+j71DhfavmqQRtl3pFamIf2rOD6Biuivl3R3pjSzJ0kidlKO7MOzfdo3Sf2zKqfqP+YybkoVYZ7aEiOfqi9G47eUbOwYv6K8E7rSuhhmgPYhOkO5bruMb9Nrm5cyo5CZB3YYfgelGtpoC6/qJZPXGGlxXN04zR8Jvjy7KgBm8w86JVluGkzYy0pgV3hf3vrZZBTgCVIcNahffetCdK6TXzr/lUEp6r6JMtApVFceqJdQ4lBC+dE7e1Nx0++aWwRK7SC9r3O2UE0lj/9xgiiszLPvCYsWgdQeR9U8ChBp6bCia1zmSToNS/XABctle5uwtuQJQTU+BbvEWIW423rn9K2jvobRjQTJx+5w65Qn6vFQfbhiaebXyWWilwpXWxg2TsJddumtsgyCoGqzAaDIH8Jz3mAr9mKfAFEV0XXX2Gp8Xh6a1t0jV7EK05uFzCghMi22eLxE240+FRQSj3xQNIWqZIfqHY9VO7pSmLrLOFWukR7rjzfkK4OAMtKVXoZ7ytie7q0Zdgb39Bql5erb67jV3NeXzeDqgwrUXrkRxukVrUa5PhMU/MUuD3RJ0HComxcTC9x9V31ootCbixdo0a12yz67Dkh6Lrf2Py8t2OSgGL5uyE43C+I3ZJPCTFOHEUSQJimuoiBN4y4cRA8IiV9op7ViwKc0iTC1JP75rmaMZkO3evbndugRv2UjtCnJMjtT6I7G7f4JFDWDlU4UQdxKyU81GxBC55cXXlWQDew+sr x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB5257.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(39860400002)(136003)(396003)(376002)(38100700002)(122000001)(66476007)(66556008)(76116006)(33656002)(66446008)(45080400002)(66946007)(64756008)(54906003)(316002)(8936002)(71200400001)(478600001)(9686003)(86362001)(966005)(91956017)(4326008)(6512007)(85182001)(6486002)(8676002)(5660300002)(2906002)(52536014)(6506007)(6916009)(83380400001)(26005)(7416002)(186003); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?B?dHV4b1VjNm1aWXlmclZCNjh3blNMcjNWSmJIVmNLZnlYWmg4S2Y5QWVT?= =?iso-2022-jp?B?dURuODhGSnU1YTE4MmsvWjV5K1dhSGJOL0hJSUFOZnk3SVo2clArRm5r?= =?iso-2022-jp?B?MEhDajhpc0dlaFhwcVY5enFqR3k2RWhXWEYyY3lLMEJFemVaZmJNZ09X?= =?iso-2022-jp?B?alBIMEh6TmdoUnRBYmdiL2R0ZDlMQjE4bmdKV3RiUGxwN0tJTzVsRSsz?= =?iso-2022-jp?B?QWFXTFVvN3dkb3pjaTVtRmVDeUxzbmhKMGVRVVZUbUw2TDRPSHRvQ3Zz?= =?iso-2022-jp?B?YnVXRHdLYXpNR1VwcDIrOEVkdWt0eHJDcXlTei8vZ0x4WDBhVXNYYlB5?= =?iso-2022-jp?B?S1lHcnVXS1VvUkplZFViTlpuMXM2U1k3YlVpd00ydWRXTHBrcEFzV3Ey?= =?iso-2022-jp?B?dUNpSDZDT3g4ak9zVDVseGlZTU53Z3lteE5kZ1hZRW5mcFdCNENZc0ZU?= =?iso-2022-jp?B?bmlPRDhxSk9NUzJSMlBqOW01NW9XajZKTmU2TVJod2x4TmxGVEZ4Ylc1?= =?iso-2022-jp?B?OVFiNUZNT2F4MC9vTE9WZStSa0tXK1VQM2lMbGZxS0pZeWJmRzJjMkNU?= =?iso-2022-jp?B?a0xBb09DVXl3R1RIREQyejlGWHdmdnZnL3h4eHAzSTZoazMvRDZvNFlY?= =?iso-2022-jp?B?aDJRSkgzZzB1NXFoRUpzdEN0dXJJcXFUOVZnbEN2RDhac1Z6anBJWFQw?= =?iso-2022-jp?B?VEV2Z3grVmIxL2hmM0NYTjdxZE5NUVlxTEFiYTJzcGRZUXNuSTBjWnFB?= =?iso-2022-jp?B?aElBVU44TXFqaG96aVR3Um04VHZ0aS9xcDZJNFlvcXQ2YVZvSHR5Tk9K?= =?iso-2022-jp?B?V3pKaXFpaGNVcGl2TmFacFJFeHhucWVLYlRwK2NlTlhqY3Z6czBjdzlT?= =?iso-2022-jp?B?a1JFb0cvTjRjQ0RNTEtkR2VLOHhWZjlrNjlYaFNZSHhtVXpNcis5YS9P?= =?iso-2022-jp?B?S3pKVk9WcTROOWVwKy9EQXZycWpkZUIrQ3RqRnc0R0VaS3drNXp5TDlO?= =?iso-2022-jp?B?aTEwWHpvVlY3amNVMEsrUEJmRDZoN3B6MXl5ejZuTmJzN0dXemR2SXNk?= =?iso-2022-jp?B?OFYxK2taczFaWTUxTzlRM21HNjBNckZmL2wycHF1WTJmVmo2cGRNYUlk?= =?iso-2022-jp?B?UE1TL0JTQkNZRlFUOVVTbUhybW0xNjNGNnd6QmJSclc5VmdlR053NG1I?= =?iso-2022-jp?B?ek1EUnRCU2pMYnlBOXJqQWNvWXVCWDhTWmJOSnhsMVRJS2JoYXp4cXZ0?= =?iso-2022-jp?B?dEdIcGNZZlJSUlpZZG02NktHU2l5UHJHUHk1Z2hHK2pwR1g4b3FNdzlP?= =?iso-2022-jp?B?YXh2dmVwN3ViRkFDbjJYTFdDWDQxUDY0dHB2d0o2ZU5VeWtFRGJONzBN?= =?iso-2022-jp?B?ME9VdEVtRTZCUVNYRisyUTAxcktUT1FrdFJWd0pLc21kYWZrZm5XRjVX?= =?iso-2022-jp?B?Q21FWUpjekFWUGcvRjdKaXh5ZGF6Y2dYV3pCalNtTUhjTkF4TnBBcXlN?= =?iso-2022-jp?B?ODQxUEJIL1FFUlJVOFlwMS9ZUW10T1Y5TjFhUGp0dVRPNlFnSEtlMWR6?= =?iso-2022-jp?B?cXZGdHU1bDRRRCtOZUd6S09FK21MVXJpbzBwNUE2NnpyaysxYnVYQkdQ?= =?iso-2022-jp?B?MG9JZWN3dzBLSWY3YXJnb080R1dDRE52S3hSU1pwTjRkYmd2dlcwa1Vt?= =?iso-2022-jp?B?RWNOallKMkFaM2N3ZCtyRytRVnNabjNxSnhNL0dGcGlrUXV2d2FHZzhD?= =?iso-2022-jp?B?R2FoTVRsMW9NOEtFMCtiZ0xJc0FLTWNBVXROYlFFYzlrTDJQa21DNTZU?= =?iso-2022-jp?B?TUFvcHh0M21wY1dBU3hEeXNYVzR4K0Rvclp4TXhMRHltdUxsZU5hV3RF?= =?iso-2022-jp?B?RUVTcVdoR3dTMGlFcE9DTEhlQVFvPQ==?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: fujitsu.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB5257.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46cb9325-e55c-4894-cddb-08d931726463 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jun 2021 09:29:22.8831 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a19f121d-81e1-4858-a9d8-736e267fd4c7 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ev8pCJRrKV1Sd+P2jKFOyExC/JkZFKTFG62yVl2UfR6k4lEzisd7iso0fww1KJ/f+obAMbjJz2pAXpqagjwqWvQueyeCvJAomo2u/4eCPVQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYPR01MB6652 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210617_022935_564608_2E0EFA13 X-CRM114-Status: GOOD ( 23.10 ) 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 > It's my understanding that the two pieces of work required to enable live > patching on arm are in flight upstream; > - Reliable stack traces as implemented by Madhavan T. Venkataraman [1] > - Objtool as implemented by Julien Thierry [2] > > This is the remaining part required to enable live patching on arm. > Based on work by Torsten Duwe [3] > > Allocate a task flag used to represent the patch pending state for the > task. Also implement generic functions klp_arch_set_pc() & > klp_get_ftrace_location(). > > In klp_arch_set_pc() it is sufficient to set regs->pc as in > ftrace_common_return() the return address is loaded from the stack. > > ldr x9, [sp, #S_PC] > > ret x9 > > In klp_get_ftrace_location() it is necessary to advance the address by > AARCH64_INSN_SIZE (4) to point to the BL in the callsite as 2 nops were > placed at the start of the function, one to be patched to save the LR and > another to be patched to branch to the ftrace call, and > klp_get_ftrace_location() is expected to return the address of the BL. It > may also be necessary to advance the address by another AARCH64_INSN_SIZE > if CONFIG_ARM64_BTI_KERNEL is enabled due to the instruction placed at the > branch target to satisfy BTI, > > Signed-off-by: Suraj Jitindar Singh > > [1] https://lkml.org/lkml/2021/5/26/1212 > [2] https://lkml.org/lkml/2021/3/3/1135 > [3] https://lkml.org/lkml/2018/10/26/536 > --- AFAIU Madhavan's patch series linked in the above [1] is currently awaiting review by Mark Rutland. It seems that not only this patch series but also the implementation of arch_stack_walk_reliable() at the below link is required to enable livepatch. https://lore.kernel.org/linux-arm-kernel/bf3a5289-8199-b665-0327-ed8240dd7827@linux.microsoft.com/ > arch/arm64/Kconfig | 3 ++ > arch/arm64/include/asm/livepatch.h | 42 ++++++++++++++++++++++++++++ > arch/arm64/include/asm/thread_info.h | 4 ++- > arch/arm64/kernel/signal.c | 4 +++ > 4 files changed, 52 insertions(+), 1 deletion(-) > create mode 100644 arch/arm64/include/asm/livepatch.h > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index b098dabed8c2..c4636990c01d 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -187,6 +187,7 @@ config ARM64 > select HAVE_GCC_PLUGINS > select HAVE_HW_BREAKPOINT if PERF_EVENTS > select HAVE_IRQ_TIME_ACCOUNTING > + select HAVE_LIVEPATCH > select HAVE_NMI > select HAVE_PATA_PLATFORM > select HAVE_PERF_EVENTS > @@ -1946,3 +1947,5 @@ source "arch/arm64/kvm/Kconfig" > if CRYPTO > source "arch/arm64/crypto/Kconfig" > endif > + > +source "kernel/livepatch/Kconfig" I think ` source "kernel/livepatch/Kconfig"` should be placed between `menu "Kernel Features"` and `endmenu`. Thanks Keiya > diff --git a/arch/arm64/include/asm/livepatch.h b/arch/arm64/include/asm/livepatch.h > new file mode 100644 > index 000000000000..72d7cd86f158 > --- /dev/null > +++ b/arch/arm64/include/asm/livepatch.h > @@ -0,0 +1,42 @@ > +/* SPDX-License-Identifier: GPL-2.0 > + * > + * livepatch.h - arm64-specific Kernel Live Patching Core > + */ > +#ifndef _ASM_ARM64_LIVEPATCH_H > +#define _ASM_ARM64_LIVEPATCH_H > + > +#include > + > +static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip) > +{ > + struct pt_regs *regs = ftrace_get_regs(fregs); > + > + regs->pc = ip; > +} > + > +/* > + * klp_get_ftrace_location is expected to return the address of the BL to the > + * relevant ftrace handler in the callsite. The location of this can vary based > + * on several compilation options. > + * CONFIG_DYNAMIC_FTRACE_WITH_REGS > + * - Inserts 2 nops on function entry the second of which is the BL > + * referenced above. (See ftrace_init_nop() for the callsite sequence) > + * (this is required by livepatch and must be selected) > + * CONFIG_ARM64_BTI_KERNEL: > + * - Inserts a hint #0x22 on function entry if the function is called > + * indirectly (to satisfy BTI requirements), which is inserted before > + * the two nops from above. > + */ > +#define klp_get_ftrace_location klp_get_ftrace_location > +static inline unsigned long klp_get_ftrace_location(unsigned long faddr) > +{ > + unsigned long addr = faddr + AARCH64_INSN_SIZE; > + > +#if IS_ENABLED(CONFIG_ARM64_BTI_KERNEL) > + addr = ftrace_location_range(addr, addr + AARCH64_INSN_SIZE); > +#endif > + > + return addr; > +} > + > +#endif /* _ASM_ARM64_LIVEPATCH_H */ > diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h > index 6623c99f0984..cca936d53a40 100644 > --- a/arch/arm64/include/asm/thread_info.h > +++ b/arch/arm64/include/asm/thread_info.h > @@ -67,6 +67,7 @@ int arch_dup_task_struct(struct task_struct *dst, > #define TIF_UPROBE 4 /* uprobe breakpoint or singlestep */ > #define TIF_MTE_ASYNC_FAULT 5 /* MTE Asynchronous Tag Check Fault */ > #define TIF_NOTIFY_SIGNAL 6 /* signal notifications exist */ > +#define TIF_PATCH_PENDING 7 /* pending live patching update */ > #define TIF_SYSCALL_TRACE 8 /* syscall trace active */ > #define TIF_SYSCALL_AUDIT 9 /* syscall auditing */ > #define TIF_SYSCALL_TRACEPOINT 10 /* syscall tracepoint for ftrace */ > @@ -97,11 +98,12 @@ int arch_dup_task_struct(struct task_struct *dst, > #define _TIF_SVE (1 << TIF_SVE) > #define _TIF_MTE_ASYNC_FAULT (1 << TIF_MTE_ASYNC_FAULT) > #define _TIF_NOTIFY_SIGNAL (1 << TIF_NOTIFY_SIGNAL) > +#define _TIF_PATCH_PENDING (1 << TIF_PATCH_PENDING) > > #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ > _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \ > _TIF_UPROBE | _TIF_MTE_ASYNC_FAULT | \ > - _TIF_NOTIFY_SIGNAL) > + _TIF_NOTIFY_SIGNAL | _TIF_PATCH_PENDING) > > #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ > _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \ > diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c > index 6237486ff6bb..d1eedb0589a7 100644 > --- a/arch/arm64/kernel/signal.c > +++ b/arch/arm64/kernel/signal.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -932,6 +933,9 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, > (void __user *)NULL, current); > } > > + if (thread_flags & _TIF_PATCH_PENDING) > + klp_update_patch_state(current); > + > if (thread_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) > do_signal(regs); > > -- > 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel