On 23/04/2025 10:01 am, Jan Beulich wrote: > On 23.04.2025 03:02, Andrew Cooper wrote: >> --- a/xen/arch/x86/alternative.c >> +++ b/xen/arch/x86/alternative.c >> @@ -378,13 +378,6 @@ static int init_or_livepatch _apply_alternatives(struct >> alt_instr *start, >> text_poke(orig, buf, total_len); >> } >> >> - /* >> - * Clobber endbr64 instructions now that altcall has finished optimising >> - * all indirect branches to direct ones. >> - */ >> - if ( force && system_state < SYS_STATE_active ) >> - seal_endbr64(); >> - >> return 0; >> } >> >> @@ -533,6 +526,8 @@ static int __init cf_check nmi_apply_alternatives( >> rc = apply_alt_calls(__alt_call_sites_start, >> __alt_call_sites_end); >> if ( rc ) >> panic("Unable to apply alternative calls: %d\n", rc); >> + >> + seal_endbr64(); >> } > Are you deliberately losing the comment?
Yes, counterbalancing the comment gained in patch 4. > Other than this: > Reviewed-by: Jan Beulich <jbeul...@suse.com> Thanks, ~Andrew