Re: [PATCH] scripts/gdb: fix linux constants

Re: [PATCH] scripts/gdb: fix linux constants

[Kieran Bingham]

Hi Dan,

Thank you for the patch,

On 15/02/2019 19:17, Dan Robertson wrote:
> The linux constants MS_RDONLY, MS_SYNCHRONOUS, MS_MANDLOCK, MS_DIRSYNC,
> MS_NOATIME, and MS_NODIRATIME were previously defined in linux/fs.h.
> Following e262e32d6bde0f77fb0c95d977482fc872c51996 the constants are
> now defined in uapi/linux/mount.h. The new location of the defined
> constants needs to be included in constants.py template in order for the
> correct constants to be generated.
> 

This commit was pipped to the post by a similar patch [0] from Felipe Balbi

[0]
https://lore.kernel.org/lkml/20190215112938.25574-1-felipe.balbi@linux.intel.com/

Combined together they would form a complete patch, but this one could
do with the Fixes: tag such as

Fixes: e262e32d6bde "vfs: Suppress MS_* flag defs within the kernel
unless explicitly enabled"

With a Fixes: tag:

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> Signed-off-by: Dan Robertson <dan@dlrobertson.com>
> ---
>  scripts/gdb/linux/constants.py.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
> index 7aad82406422..6c164761d986 100644
> --- a/scripts/gdb/linux/constants.py.in
> +++ b/scripts/gdb/linux/constants.py.in
> @@ -12,9 +12,9 @@
>   *
>   */
>  
> -#include <linux/fs.h>

Whereas Felipe's patch does not include this change (which I think it
looks like it should)


How should we proceed with these two competing patches?
Any preference from anyone?

Content wise, I feel like this one is in the lead - just missing the
Fixes: tag, but Felipe's won the race...


--
Kieran

>  #include <linux/mount.h>
>  #include <linux/of_fdt.h>
> +#include <uapi/linux/mount.h>
>  
>  /* We need to stringify expanded macros so that they can be parsed */
>  
> @@ -36,7 +36,7 @@
>  
>  import gdb
>  
> -/* linux/fs.h */
> +/* uapi/linux/mount.h */
>  LX_VALUE(MS_RDONLY)
>  LX_VALUE(MS_SYNCHRONOUS)
>  LX_VALUE(MS_MANDLOCK)
> 


-- 
Regards
--
Kieran

Re: [PATCH] scripts/gdb: fix linux constants

[Dan Robertson]

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

Kieran,

> This commit was pipped to the post by a similar patch [0] from Felipe Balbi

No problem! I probably should watch the LKML closer.

Go with the patch from Felipe, but like you men there is definitely no need
for the `include linux/fs.h` now.

Thanks for the tip on the Fixes tag. As a kernel newbie tips like this are
appreciated.

Cheers,

Dan

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH 0/1] scripts/gdb: fix linux constants

[Dan Robertson]

Add Fixes tag to commit

Dan Robertson (1):
  scripts/gdb: fix linux constants

 scripts/gdb/linux/constants.py.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

[PATCH 1/1] scripts/gdb: fix linux constants

[Dan Robertson]

The linux constants MS_RDONLY, MS_SYNCHRONOUS, MS_MANDLOCK, MS_DIRSYNC,
MS_NOATIME, and MS_NODIRATIME were previously defined in linux/fs.h.
Following e262e32d6bde0f77fb0c95d977482fc872c51996 the constants are
now defined in uapi/linux/mount.h. The new location of the defined
constants needs to be included in constants.py template in order for the
correct constants to be generated.

Fixes: e262e32d6bde ("vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled")
Signed-off-by: Dan Robertson <dan@dlrobertson.com>
---
 scripts/gdb/linux/constants.py.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
index 7aad82406422..6c164761d986 100644
--- a/scripts/gdb/linux/constants.py.in
+++ b/scripts/gdb/linux/constants.py.in
@@ -12,9 +12,9 @@
  *
  */
 
-#include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/of_fdt.h>
+#include <uapi/linux/mount.h>
 
 /* We need to stringify expanded macros so that they can be parsed */
 
@@ -36,7 +36,7 @@
 
 import gdb
 
-/* linux/fs.h */
+/* uapi/linux/mount.h */
 LX_VALUE(MS_RDONLY)
 LX_VALUE(MS_SYNCHRONOUS)
 LX_VALUE(MS_MANDLOCK)
-- 
2.20.1