Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200718002003.6e0a2aef@f32-m1.lan>
In-Reply-To: <20200718002003.6e0a2aef@f32-m1.lan>
From:   Dave Airlie <airlied@gmail.com>
Date:   Mon, 20 Jul 2020 09:40:14 +1000
Message-ID: <CAPM=9tzJt5W8YpyBpyr0Xk3OwgA8iEOKe_zOtJSM3FThp38K4w@mail.gmail.com>
Subject: Re: [PATCH] copy_xstate_to_kernel: Fix typo which caused GDB regression
To:     Kevin Buettner <kevinb@redhat.com>,
        Linus Torvalds <torvalds@linux-foundation.org>
Cc:     Al Viro <viro@zeniv.linux.org.uk>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Just adding Linus, as Al is oft distracted.

Dave.
>
> This commit fixes a regression encountered while running the
> gdb.base/corefile.exp test in GDB's test suite.
>
> In my testing, the typo prevented the sw_reserved field of struct
> fxregs_state from being output to the kernel XSAVES area.  Thus the
> correct mask corresponding to XCR0 was not present in the core file
> for GDB to interrogate, resulting in the following behavior:
>
> [kev@f32-1 gdb]$ ./gdb -q testsuite/outputs/gdb.base/corefile/corefile testsuite/outputs/gdb.base/corefile/corefile.core
> Reading symbols from testsuite/outputs/gdb.base/corefile/corefile...
> [New LWP 232880]
>
> warning: Unexpected size of section `.reg-xstate/232880' in core file.
>
> With the typo fixed, the test works again as expected.
>
> Signed-off-by: Kevin Buettner <kevinb@redhat.com>
> ---
>  arch/x86/kernel/fpu/xstate.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
> index 6a54e83d5589..9cf40a7ff7ae 100644
> --- a/arch/x86/kernel/fpu/xstate.c
> +++ b/arch/x86/kernel/fpu/xstate.c
> @@ -1022,7 +1022,7 @@ int copy_xstate_to_kernel(void *kbuf, struct xregs_state *xsave, unsigned int of
>                 copy_part(offsetof(struct fxregs_state, st_space), 128,
>                           &xsave->i387.st_space, &kbuf, &offset_start, &count);
>         if (header.xfeatures & XFEATURE_MASK_SSE)
> -               copy_part(xstate_offsets[XFEATURE_MASK_SSE], 256,
> +               copy_part(xstate_offsets[XFEATURE_SSE], 256,
>                           &xsave->i387.xmm_space, &kbuf, &offset_start, &count);
>         /*
>          * Fill xsave->i387.sw_reserved value for ptrace frame:
> --
> 2.26.2
>
>