2023-06-27 13:12:05

by Brendan Jackman

Subject: [PATCH] scripts/gdb: Fix importing SB_ constants

Commit f15afbd34d8f ("fs: fix undefined behavior in bit shift for
SB_NOUSER") switched these defines over to use BIT which when,
!__ASSEMBLY__, expands to something equivalent to 1UL << x. The UL
suffix isn't valid python.

Luckily we already seem to have a facility in the preprocessed code to
handle cases like this.

Signed-off-by: Brendan Jackman <[email protected]>
---
scripts/gdb/linux/constants.py.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
index 471300ba176c..50a92c4e9984 100644
--- a/scripts/gdb/linux/constants.py.in
+++ b/scripts/gdb/linux/constants.py.in
@@ -48,12 +48,12 @@ if IS_BUILTIN(CONFIG_COMMON_CLK):
LX_GDBPARSED(CLK_GET_RATE_NOCACHE)

/* linux/fs.h */
-LX_VALUE(SB_RDONLY)
-LX_VALUE(SB_SYNCHRONOUS)
-LX_VALUE(SB_MANDLOCK)
-LX_VALUE(SB_DIRSYNC)
-LX_VALUE(SB_NOATIME)
-LX_VALUE(SB_NODIRATIME)
+LX_GDBPARSED(SB_RDONLY)
+LX_GDBPARSED(SB_SYNCHRONOUS)
+LX_GDBPARSED(SB_MANDLOCK)
+LX_GDBPARSED(SB_DIRSYNC)
+LX_GDBPARSED(SB_NOATIME)
+LX_GDBPARSED(SB_NODIRATIME)

/* linux/htimer.h */
LX_GDBPARSED(hrtimer_resolution)
--
2.41.0.162.gfafddb0af9-goog

2023-06-27 13:23:48

by Brendan Jackman

Subject: Re: [PATCH] scripts/gdb: Fix importing SB_ constants

On Tue, 27 Jun 2023 at 14:43, Brendan Jackman <[email protected]> wrote:
>
> Commit f15afbd34d8f ("fs: fix undefined behavior in bit shift for
> SB_NOUSER") switched these defines over to use BIT which when,
> !__ASSEMBLY__, expands to something equivalent to 1UL << x. The UL
> suffix isn't valid python.
>
> Luckily we already seem to have a facility in the preprocessed code to
> handle cases like this.

Oh. After sending I realised my tree was stale! This was already fixed
by Florian in 6a59cb5158bff1.

Please ignore :)