APPLIED: [SRU][jammy/linux-azure-5.19, kinetic/linux-azure, lunar/linux-azure][PATCH] Revert "UBUNTU: SAUCE: TDX: Work around the segfault issue in glibc 2.35 in Ubuntu 22.04."

[Tim Gardner]

On 3/21/23 9:27 AM, Ioanna Alifieraki wrote:
> BugLink: https://bugs.launchpad.net/bugs/2011421
> 
> This reverts commit 5e304319d26d7003e648bd7a68322537dddbdaed.
> 
> Commit 5e304319d26d ("UBUNTU: SAUCE: TDX: Work around the segfault issue
> in glibc 2.35 in Ubuntu 22.04.") was added to work around a bug in
> glibc. Glibc is getting fixed in LP#2011421 and we can drop this.
> 
> Signed-off-by: Ioanna Alifieraki <ioanna-maria.alifieraki at canonical.com>
> ---
>   arch/x86/coco/tdx/tdx.c | 12 ------------
>   1 file changed, 12 deletions(-)
> 
> diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c
> index 3c853e18320e..b7af93ca319e 100644
> --- a/arch/x86/coco/tdx/tdx.c
> +++ b/arch/x86/coco/tdx/tdx.c
> @@ -318,18 +318,6 @@ static int handle_cpuid(struct pt_regs *regs, struct ve_info *ve)
>   		.r13 = regs->cx,
>   	};
>   
> -	/*
> -	 * Work around the segfault issue in glibc 2.35 in Ubuntu 22.04.
> -	 * See https://sourceware.org/bugzilla/show_bug.cgi?id=28784
> -	 * Ubuntu 22.04/22.10/23.04's glibc should pick up this glibc fix:
> -	 * https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=c242fcce06e3102ca663b2f992611d0bda4f2668
> -	 */
> -	if (regs->ax == 2) {
> -		regs->ax = 0xf1ff01;
> -		regs->bx = regs->cx = regs->dx = 0;
> -		return ve_instr_len(ve);
> -	}
> -
>   	/*
>   	 * Only allow VMM to control range reserved for hypervisor
>   	 * communication.
Applied to lunar linux-azure:master-next. Thanks.

-rtg
-- 
-----------
Tim Gardner
Canonical, Inc