[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [RFC] xen/arm64: livepatch: enable attaching callbacks
- To: Ryo Takakura <takakura@xxxxxxxxxxxxx>, "roger.pau@xxxxxxxxxx" <roger.pau@xxxxxxxxxx>
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Tue, 30 Jun 2026 11:57:23 +0100
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=pcx6O+eU8Bi70trAYZMjUNqUPauYGfeDKJjvcHE9xcU=; b=rouZwBKdsH6ejBd2RZxeeuVr8+mmL8Ns0L7WWid24/LxJ2G67DJEga1fzCuPy1oBKt3WQUtt36mLHaRvX+8fyXZi4aZ5KBcV/sDNr0WRotGz2H4FXU6pL0kxemVyjbmHFSfNKqZb+Cnh9Io+zg1UPfUXHvlzlVkemBM8njXCnuJbNAQX652KT30TF0cu6PFNvQ7VF8GGzjgrgWEOaPWiuGMJwcVP2f7VmO/QOn/v6qTpkiW07WfOHbdGNjic0OAHb2/K/TRU0FycP12f3y/4UfcGnV8MlWT+GWe3Djh3ZA3dOJh1Rie4iEI3b+Bk2kdJSiErmhmn/VQcXPiFFjSfew==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pC2T2XGrvc01SdUN4fdwSgmpfi0v1xJrMK2aVL1uxRQd77VwvYF225wc9GgP1TzUJqk8+x1V08272Ot/XwcnTMI20gMt23JyErAU6gsDrGDDx0vPsiqF0WZThME281QF2qykPdorev8+9haPVy5ysKJ0a7FeiK7yzdW6V76bnYYWHYaSeBBzhWLtixegVB8XTdkgS3RDRwuFnhCXfc5o4UG4qxATw565hEjGYO1VyCY01m/s5IJgAleZhbDTng1jxHfvNQPgHyDhpw3nfw0TjWMpBfwv4vgb8mI+3KDHf+5njVHqHbLvm7J5AZT6xRa+GFa5q+3oIfVqwfjyjVsefA==
- Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=citrix.com header.i="@citrix.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck"
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Autocrypt: addr=andrew.cooper3@xxxxxxxxxx; keydata= xsFNBFLhNn8BEADVhE+Hb8i0GV6mihnnr/uiQQdPF8kUoFzCOPXkf7jQ5sLYeJa0cQi6Penp VtiFYznTairnVsN5J+ujSTIb+OlMSJUWV4opS7WVNnxHbFTPYZVQ3erv7NKc2iVizCRZ2Kxn srM1oPXWRic8BIAdYOKOloF2300SL/bIpeD+x7h3w9B/qez7nOin5NzkxgFoaUeIal12pXSR Q354FKFoy6Vh96gc4VRqte3jw8mPuJQpfws+Pb+swvSf/i1q1+1I4jsRQQh2m6OTADHIqg2E ofTYAEh7R5HfPx0EXoEDMdRjOeKn8+vvkAwhviWXTHlG3R1QkbE5M/oywnZ83udJmi+lxjJ5 YhQ5IzomvJ16H0Bq+TLyVLO/VRksp1VR9HxCzItLNCS8PdpYYz5TC204ViycobYU65WMpzWe LFAGn8jSS25XIpqv0Y9k87dLbctKKA14Ifw2kq5OIVu2FuX+3i446JOa2vpCI9GcjCzi3oHV e00bzYiHMIl0FICrNJU0Kjho8pdo0m2uxkn6SYEpogAy9pnatUlO+erL4LqFUO7GXSdBRbw5 gNt25XTLdSFuZtMxkY3tq8MFss5QnjhehCVPEpE6y9ZjI4XB8ad1G4oBHVGK5LMsvg22PfMJ ISWFSHoF/B5+lHkCKWkFxZ0gZn33ju5n6/FOdEx4B8cMJt+cWwARAQABzSlBbmRyZXcgQ29v cGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPsLBegQTAQgAJAIbAwULCQgHAwUVCgkI CwUWAgMBAAIeAQIXgAUCWKD95wIZAQAKCRBlw/kGpdefoHbdD/9AIoR3k6fKl+RFiFpyAhvO 59ttDFI7nIAnlYngev2XUR3acFElJATHSDO0ju+hqWqAb8kVijXLops0gOfqt3VPZq9cuHlh IMDquatGLzAadfFx2eQYIYT+FYuMoPZy/aTUazmJIDVxP7L383grjIkn+7tAv+qeDfE+txL4 SAm1UHNvmdfgL2/lcmL3xRh7sub3nJilM93RWX1Pe5LBSDXO45uzCGEdst6uSlzYR/MEr+5Z JQQ32JV64zwvf/aKaagSQSQMYNX9JFgfZ3TKWC1KJQbX5ssoX/5hNLqxMcZV3TN7kU8I3kjK mPec9+1nECOjjJSO/h4P0sBZyIUGfguwzhEeGf4sMCuSEM4xjCnwiBwftR17sr0spYcOpqET ZGcAmyYcNjy6CYadNCnfR40vhhWuCfNCBzWnUW0lFoo12wb0YnzoOLjvfD6OL3JjIUJNOmJy RCsJ5IA/Iz33RhSVRmROu+TztwuThClw63g7+hoyewv7BemKyuU6FTVhjjW+XUWmS/FzknSi dAG+insr0746cTPpSkGl3KAXeWDGJzve7/SBBfyznWCMGaf8E2P1oOdIZRxHgWj0zNr1+ooF /PzgLPiCI4OMUttTlEKChgbUTQ+5o0P080JojqfXwbPAyumbaYcQNiH1/xYbJdOFSiBv9rpt TQTBLzDKXok86M7BTQRS4TZ/ARAAkgqudHsp+hd82UVkvgnlqZjzz2vyrYfz7bkPtXaGb9H4 Rfo7mQsEQavEBdWWjbga6eMnDqtu+FC+qeTGYebToxEyp2lKDSoAsvt8w82tIlP/EbmRbDVn 7bhjBlfRcFjVYw8uVDPptT0TV47vpoCVkTwcyb6OltJrvg/QzV9f07DJswuda1JH3/qvYu0p vjPnYvCq4NsqY2XSdAJ02HrdYPFtNyPEntu1n1KK+gJrstjtw7KsZ4ygXYrsm/oCBiVW/OgU g/XIlGErkrxe4vQvJyVwg6YH653YTX5hLLUEL1NS4TCo47RP+wi6y+TnuAL36UtK/uFyEuPy wwrDVcC4cIFhYSfsO0BumEI65yu7a8aHbGfq2lW251UcoU48Z27ZUUZd2Dr6O/n8poQHbaTd 6bJJSjzGGHZVbRP9UQ3lkmkmc0+XCHmj5WhwNNYjgbbmML7y0fsJT5RgvefAIFfHBg7fTY/i kBEimoUsTEQz+N4hbKwo1hULfVxDJStE4sbPhjbsPCrlXf6W9CxSyQ0qmZ2bXsLQYRj2xqd1 bpA+1o1j2N4/au1R/uSiUFjewJdT/LX1EklKDcQwpk06Af/N7VZtSfEJeRV04unbsKVXWZAk uAJyDDKN99ziC0Wz5kcPyVD1HNf8bgaqGDzrv3TfYjwqayRFcMf7xJaL9xXedMcAEQEAAcLB XwQYAQgACQUCUuE2fwIbDAAKCRBlw/kGpdefoG4XEACD1Qf/er8EA7g23HMxYWd3FXHThrVQ HgiGdk5Yh632vjOm9L4sd/GCEACVQKjsu98e8o3ysitFlznEns5EAAXEbITrgKWXDDUWGYxd pnjj2u+GkVdsOAGk0kxczX6s+VRBhpbBI2PWnOsRJgU2n10PZ3mZD4Xu9kU2IXYmuW+e5KCA vTArRUdCrAtIa1k01sPipPPw6dfxx2e5asy21YOytzxuWFfJTGnVxZZSCyLUO83sh6OZhJkk b9rxL9wPmpN/t2IPaEKoAc0FTQZS36wAMOXkBh24PQ9gaLJvfPKpNzGD8XWR5HHF0NLIJhgg 4ZlEXQ2fVp3XrtocHqhu4UZR4koCijgB8sB7Tb0GCpwK+C4UePdFLfhKyRdSXuvY3AHJd4CP 4JzW0Bzq/WXY3XMOzUTYApGQpnUpdOmuQSfpV9MQO+/jo7r6yPbxT7CwRS5dcQPzUiuHLK9i nvjREdh84qycnx0/6dDroYhp0DFv4udxuAvt1h4wGwTPRQZerSm4xaYegEFusyhbZrI0U9tJ B8WrhBLXDiYlyJT6zOV2yZFuW47VrLsjYnHwn27hmxTC/7tvG3euCklmkn9Sl9IAKFu29RSo d5bD8kMSCYsTqtTfT6W4A3qHGvIDta3ptLYpIAOD2sY3GYq2nf3Bbzx81wZK14JdDDHUX2Rs 6+ahAA==
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>, "ross.lagerwall@xxxxxxxxxx" <ross.lagerwall@xxxxxxxxxx>, "sstabellini@xxxxxxxxxx" <sstabellini@xxxxxxxxxx>, "julien@xxxxxxx" <julien@xxxxxxx>, "bertrand.marquis@xxxxxxx" <bertrand.marquis@xxxxxxx>, "michal.orzel@xxxxxxx" <michal.orzel@xxxxxxx>, "Volodymyr_Babchuk@xxxxxxxx" <Volodymyr_Babchuk@xxxxxxxx>, "anthony.perard@xxxxxxxxxx" <anthony.perard@xxxxxxxxxx>, "jbeulich@xxxxxxxx" <jbeulich@xxxxxxxx>, Hirokazu Takahashi <taka@xxxxxxxxxxxxx>, Koichiro Den <den@xxxxxxxxxxxxx>
- Delivery-date: Tue, 30 Jun 2026 10:57:38 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On 30/06/2026 11:43 am, Ryo Takakura wrote:
>>> diff --git a/xen/arch/arm/arm64/livepatch.c b/xen/arch/arm/arm64/livepatch.c
>>> index e135bd5bf9..b7c9aba94e 100644
>>> --- a/xen/arch/arm/arm64/livepatch.c
>>> +++ b/xen/arch/arm/arm64/livepatch.c
>>> @@ -34,12 +57,87 @@ void arch_livepatch_apply(const struct livepatch_func
>>> *func,
>>> /* Save old ones. */
>>> memcpy(state->insn_buffer, func->old_addr, len);
>>>
>>> - if ( func->new_addr )
>>> + if ( !func->new_addr )
>>> + {
>>> + insn = aarch64_insn_gen_nop();
>>> + }
>>> + else if ( func->trampoline_buf )
>>> + {
>>> + int rc;
>>> + uint32_t *trampoline = func->trampoline_buf;
>>> + uint32_t *tp = trampoline;
>>> + void *orig_cont_addr = (void *)func->old_addr + len;
>>> + unsigned int trampoline_code_size = len + 12 *
>>> ARCH_PATCH_INSN_SIZE;
>>> + unsigned long trampoline_start = (unsigned long)trampoline &
>>> PAGE_MASK;
>>> + unsigned long trampoline_end =
>>> + PAGE_ALIGN((unsigned long)trampoline + trampoline_code_size);
>>> +
>>> + /*
>>> + * Make the payload text area writeable while generating
>>> + * the trampoline instructions.
>>> + */
>>> + rc = modify_xen_mappings(trampoline_start, trampoline_end,
>>> + PAGE_HYPERVISOR);
>>> + if ( rc )
>>> + {
>>> + printk(XENLOG_ERR LIVEPATCH
>>> + "Failed to make trampoline writable: %d\n", rc);
>>> + return;
>>> + }
>> This ought not to be necessary.
>>
>> The trampoline is executable code, so should have space reserved for it
>> in .text of the livepatch.
>>
>> Then, you can identify it simply by references in a new section, without
>> having to have a pointer with a sentinel value (void *)1 in (which MISRA
>> will have a fit at).
> I like this idea as well! I'll try this together with the earlier
> suggestion using __attribute__((no_caller_saved_registers)).
If you reserve space in the function preamble, and use
__attribute__((no_caller_saved_registers)), then you don't need
trampolines at all.
The preamble just needs to turn into `call newfunc` when the callback
function is attached, and then it's regular return will do the right thing.
~Andrew
|