2019-02-16 07:20:20

by Kieran Bingham

[permalink] [raw]
Subject: Re: [PATCH] scripts/gdb: fix linux constants

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/[email protected]/

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 <[email protected]>

> Signed-off-by: Dan Robertson <[email protected]>
> ---
> 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


2019-02-16 07:24:03

by Dan Robertson

[permalink] [raw]
Subject: Re: [PATCH] scripts/gdb: fix linux constants

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


Attachments:
(No filename) (370.00 B)
signature.asc (849.00 B)
Digital signature
Download all attachments

2019-02-18 13:46:55

by Dan Robertson

[permalink] [raw]
Subject: [PATCH 1/1] scripts/gdb: fix linux constants

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 <[email protected]>
---
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


2019-02-18 13:47:22

by Dan Robertson

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

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