modpost: Mark uuid_le type only for MEI
Subsystems (3)
Andy Shevchenko
reviewerPATCH v2 1/2 modpost: Mark uuid_le type only for MEI
The uuid_le type is used only for MEI ABI, do not advertise it for others. Due to above, bury add_uuid() in its only user.
---
v2: no changes
scripts/mod/file2alias.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
scripts/mod/file2alias.c +13 -17
@@ -34,19 +34,22 @@ typedef Elf64_Addr kernel_ulong_t;typedef uint32_t __u32 ;typedef uint16_t __u16 ;typedef unsigned char __u8 ; +typedef struct {__u8 b[16 ]; }guid_t ; -/* backwards compatibility, don't use in new code */ -typedef struct { -__u8 b[16 ]; -}uuid_le ;typedef struct {__u8 b[16 ]; }uuid_t ; +#define UUID_STRING_LEN 36 +/* MEI UUID type, don't use anywhere else */ +typedef struct { +__u8 b[16 ]; +}uuid_le ; +/* Big exception to the "don't include kernel headers into userspace, which * even potentially has different endianness and word sizes, since * we handle those differences explicitly below */
@@ -104,17 +107,6 @@ static inline void add_wildcard(char *str)strcat (str + len,"*" ); } -static inline void add_uuid (char *str,uuid_le uuid) -{ -int len =strlen (str); - -sprintf (str + len,"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" , - uuid.b[3 ], uuid.b[2 ], uuid.b[1 ], uuid.b[0 ], - uuid.b[5 ], uuid.b[4 ], uuid.b[7 ], uuid.b[6 ], - uuid.b[8 ], uuid.b[9 ], uuid.b[10 ], uuid.b[11 ], - uuid.b[12 ], uuid.b[13 ], uuid.b[14 ], uuid.b[15 ]); -} -/** * Check that sizeof(device_id type) are consistent with size of section * in .o file. If in-consistent then userspace and kernel does not agree
@@ -1198,12 +1190,16 @@ static int do_mei_entry(const char *filename, void *symval, char *alias) {DEF_FIELD_ADDR (symval, mei_cl_device_id, name); -DEF_FIELD_ADDR (symval, mei_cl_device_id, uuid); +DEF_FIELD (symval, mei_cl_device_id, uuid);DEF_FIELD (symval, mei_cl_device_id, version);sprintf (alias,MEI_CL_MODULE_PREFIX );sprintf (alias +strlen (alias),"%s:" , (*name)[0 ] ? *name :"*" ); -add_uuid (alias, *uuid); +sprintf (alias +strlen (alias),"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" , + uuid.b[3 ], uuid.b[2 ], uuid.b[1 ], uuid.b[0 ], + uuid.b[5 ], uuid.b[4 ], uuid.b[7 ], uuid.b[6 ], + uuid.b[8 ], uuid.b[9 ], uuid.b[10 ], uuid.b[11 ], + uuid.b[12 ], uuid.b[13 ], uuid.b[14 ], uuid.b[15 ]);ADD (alias,":" , version !=MEI_CL_VERSION_ANY , version);strcat (alias,":*" );
Signature · 1 line
2.28.0
Andy Shevchenko
reviewerPATCH v2 2/2 uuid: Make guid_t completely internal type to the kernel
The guid_t type was defined in UAPI by mistake.
Keep it an internal type and leave uuid_le UAPI
for it's only user, i.e. MEI.
---
v2: converted uuid_le_cmp() to old type
include/linux/uuid.h | 20 ++++++++++++++++---- include/uapi/linux/uuid.h | 14 +++++--------- 2 files changed, 21 insertions(+), 13 deletions(-)
include/linux/uuid.h +16 -4
@@ -8,15 +8,25 @@#ifndef _LINUX_UUID_H_#define _LINUX_UUID_H_ -#include <uapi/linux/uuid.h> #include <linux/string.h> #define UUID_SIZE 16 +typedef struct { +__u8 b[UUID_SIZE ]; +}guid_t ; +typedef struct {__u8 b[UUID_SIZE ]; }uuid_t ; +#define GUID_INIT (a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ +((guid_t) \ +{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \ + (b) & 0xff, ((b) >> 8) & 0xff, \ + (c) & 0xff, ((c) >> 8) & 0xff, \ + (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) +#define UUID_INIT (a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ ((uuid_t) \ {{ ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff, \
@@ -97,10 +107,12 @@ extern const u8 uuid_index[16];int guid_parse (const char *uuid,guid_t *u);int uuid_parse (const char *uuid,uuid_t *u); -/* backwards compatibility, don't use in new code */ -static inline int uuid_le_cmp (const guid_t u1,const guid_t u2) +/* MEI UUID type, don't use anywhere else */ +#include <uapi/linux/uuid.h> + +static inline int uuid_le_cmp (const uuid_le u1,const uuid_le u2) { -return memcmp (&u1, &u2,sizeof (guid_t)); +return memcmp (&u1, &u2,sizeof (uuid_le)); }#endif
include/uapi/linux/uuid.h +5 -9
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* -* UUID/GUID definition +* MEI UUID definition * * Copyright (C) 2010, Intel Corp. * Huang Ying <[email protected]>
@@ -22,21 +22,17 @@typedef struct {__u8 b[16 ]; -}guid_t ; +}uuid_le ; -#define GUID_INIT (a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ -((guid_t) \ +#define UUID_LE (a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ +((uuid_le) \ {{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \ (b) & 0xff, ((b) >> 8) & 0xff, \ (c) & 0xff, ((c) >> 8) & 0xff, \ (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) -/* backwards compatibility, don't use in new code */ -typedef guid_t uuid_le ; -#define UUID_LE (a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ - GUID_INIT(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)#define NULL_UUID_LE \ UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00) + 0x00, 0x00, 0x00, 0x00)#endif /* _UAPI_LINUX_UUID_H_ */
Signature · 1 line
2.28.0
Andy Shevchenko
reviewerRe: [PATCH v2 2/2] uuid: Make guid_t completely internal type to the kernel
Quoted 3 lines · Andy Shevchenko
The
guid_ttype was defined in UAPI by mistake.
Keep it an internal type and leaveuuid_leUAPI
for it's only user, i.e. MEI.
Any comments on this series?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 2/2] uuid: Make guid_t completely internal type to the kernel
In reply to Andy ShevchenkoQuoted 13 lines · Andy Shevchenko
include/uapi/linux/uuid.h +1
-1@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* -* UUID/GUID definition +* MEI UUID definition * * Copyright (C) 2010, Intel Corp. * Huang Ying <[email protected]>
include/uapi/linux/uuid.h line 25
Quoted 5 lines
include/uapi/linux/uuid.h +1
-1@@ -22,21 +22,17 @@typedef struct {__u8 b[16 ]; -}guid_t ; +}uuid_le ;
IMHO we should kill this header entirely and move the definition to <uapi/linux/mei.h> under a new name so that no one picks up the definition by accident.
Andy Shevchenko
reviewerRe: [PATCH v2 2/2] uuid: Make guid_t completely internal type to the kernel
Quoted 15 lines · Christoph Hellwig
Quoted 14 lines · Andy Shevchenko
include/uapi/linux/uuid.h +1
-1@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* -* UUID/GUID definition +* MEI UUID definition * * Copyright (C) 2010, Intel Corp. * Huang Ying <[email protected]> @@ -22,21 +22,17 @@
Quoted 8 lines
include/uapi/linux/uuid.h line 25
Quoted 4 lines
include/uapi/linux/uuid.h +1
-1typedef struct {__u8 b[16 ]; -}guid_t ; +}uuid_le ;IMHO we should kill this header entirely and move the definition to <
uapi/linux/mei.h> under a new name so that no one picks up the definition by accident.
I would like to do that in a separate series. Here I don't change the status quo about using it, but for moving it will require to touch MEI code.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 2/2] uuid: Make guid_t completely internal type to the kernel
Quoted 7 lines · Andy Shevchenko
Quoted 4 lines
IMHO we should kill this header entirely and move the definition to <
uapi/linux/mei.h> under a new name so that no one picks up the definition by accident.I would like to do that in a separate series. Here I don't change the status quo about using it, but for moving it will require to touch MEI code.
Maybe just keep a dummy empty uapi/linux/uuid.h if that is so much of a problem.