Re: [PATCH] drm: Reduce object size of DRM_DEV_ uses
On Fri, Mar 16, 2018 at 01:56:27PM -0700, Joe Perches wrote:
> These macros are similar to the DRM_ with the addition
> of a struct device * to the arguments.
>
> Convert the single drm_dev_printk function into 2 separate functions.
> drm_dev_printk with a KERN_ * for generic use and drm_dev_dbg
> for conditional masked use.
>
> Remove the __func__ argument and use __builtin_return_address(0) to be
> similar to the DRM_ macros uses.
>
> Convert the DRM_DEV_ macros to remove now unnecessary arguments
> and use a consistent style.
>
> These macros are rarely used in the generic gpu/drm code so the code
> size does not change much for a defconfig, but when more drivers are
> enabled, there is ~4k savings.
>
> Many of these macros have no existing use at all.
>
> $ size -t drivers/gpu/drm/built-in.a | tail -1
> 1877530 44651 995 1923176 1d5868 (TOTALS)
>
> $ size -t drivers/gpu/drm/built-in.a | tail -1
> 1877527 44651 995 1923173 1d5865 (TOTALS)
>
> $ size -t drivers/gpu/drm/built-in.a | tail -1
> 17166750 2689238 108352 19964340130a1b4 (TOTALS)
>
> $ size -t drivers/gpu/drm/built-in.a | tail -1
> 1716 2691734 108352 19968974130b3ce (TOTALS)
>
> Signed-off-by: Joe Perches
Thanks for the resend, applied.
-Daniel
> ---
> drivers/gpu/drm/drm_print.c | 37 +-
> include/drm/drm_print.h | 94
> ++---
> 2 files changed, 74 insertions(+), 57 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> index 79abf6d5b4db..b25f98f33f6c 100644
> --- a/drivers/gpu/drm/drm_print.c
> +++ b/drivers/gpu/drm/drm_print.c
> @@ -63,16 +63,34 @@ void drm_printf(struct drm_printer *p, const char *f, ...)
> }
> EXPORT_SYMBOL(drm_printf);
>
> -#define DRM_PRINTK_FMT "[" DRM_NAME ":%s]%s %pV"
> -
> void drm_dev_printk(const struct device *dev, const char *level,
> - unsigned int category, const char *function_name,
> - const char *prefix, const char *format, ...)
> + const char *format, ...)
> +{
> + struct va_format vaf;
> + va_list args;
> +
> + va_start(args, format);
> + vaf.fmt = format;
> + vaf.va = &args;
> +
> + if (dev)
> + dev_printk(level, dev, "[" DRM_NAME ":%ps] %pV",
> +__builtin_return_address(0), &vaf);
> + else
> + printk("%s" "[" DRM_NAME ":%ps] %pV",
> +level, __builtin_return_address(0), &vaf);
> +
> + va_end(args);
> +}
> +EXPORT_SYMBOL(drm_dev_printk);
> +
> +void drm_dev_dbg(const struct device *dev, unsigned int category,
> + const char *format, ...)
> {
> struct va_format vaf;
> va_list args;
>
> - if (category != DRM_UT_NONE && !(drm_debug & category))
> + if (!(drm_debug & category))
> return;
>
> va_start(args, format);
> @@ -80,14 +98,15 @@ void drm_dev_printk(const struct device *dev, const char
> *level,
> vaf.va = &args;
>
> if (dev)
> - dev_printk(level, dev, DRM_PRINTK_FMT, function_name, prefix,
> -&vaf);
> + dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV",
> +__builtin_return_address(0), &vaf);
> else
> - printk("%s" DRM_PRINTK_FMT, level, function_name, prefix, &vaf);
> + printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
> +__builtin_return_address(0), &vaf);
>
> va_end(args);
> }
> -EXPORT_SYMBOL(drm_dev_printk);
> +EXPORT_SYMBOL(drm_dev_dbg);
>
> void drm_dbg(unsigned int category, const char *format, ...)
> {
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 3a40c5a3a5fa..e1a46e9991cc 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -196,10 +196,13 @@ static inline struct drm_printer
> drm_debug_printer(const char *prefix)
> #define DRM_UT_STATE 0x40
> #define DRM_UT_LEASE 0x80
>
> -__printf(6, 7)
> +__printf(3, 4)
> void drm_dev_printk(const struct device *dev, const char *level,
> - unsigned int category, const char *function_name,
> - const char *prefix, const char *format, ...);
> + const char *format, ...);
> +__printf(3, 4)
> +void drm_dev_dbg(const struct device *dev, unsigned int category,
> + const char *format, ...);
> +
> __printf(2, 3)
> void drm_dbg(unsigned int category, const char *format, ...);
> __printf(1, 2)
> @@ -208,10 +211,7 @@ void drm_err(const char *format, ...);
> /* Macros to make printk easier */
>
> #define _DRM_PRINTK(once, level, fmt, ...) \
> - do {\
> - printk##once(KERN_##level "[" DRM_NAME "] " fmt,\
> - ##__VA_ARGS__);\
> - } while (0)
> + pr
[PATCH] drm: Reduce object size of DRM_DEV_ uses
These macros are similar to the DRM_ with the addition
of a struct device * to the arguments.
Convert the single drm_dev_printk function into 2 separate functions.
drm_dev_printk with a KERN_ * for generic use and drm_dev_dbg
for conditional masked use.
Remove the __func__ argument and use __builtin_return_address(0) to be
similar to the DRM_ macros uses.
Convert the DRM_DEV_ macros to remove now unnecessary arguments
and use a consistent style.
These macros are rarely used in the generic gpu/drm code so the code
size does not change much for a defconfig, but when more drivers are
enabled, there is ~4k savings.
Many of these macros have no existing use at all.
$ size -t drivers/gpu/drm/built-in.a | tail -1
1877530 44651 995 1923176 1d5868 (TOTALS)
$ size -t drivers/gpu/drm/built-in.a | tail -1
1877527 44651 995 1923173 1d5865 (TOTALS)
$ size -t drivers/gpu/drm/built-in.a | tail -1
171667502689238 108352 19964340130a1b4 (TOTALS)
$ size -t drivers/gpu/drm/built-in.a | tail -1
17162691734 108352 19968974130b3ce (TOTALS)
Signed-off-by: Joe Perches
---
drivers/gpu/drm/drm_print.c | 37 +-
include/drm/drm_print.h | 94 ++---
2 files changed, 74 insertions(+), 57 deletions(-)
diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 79abf6d5b4db..b25f98f33f6c 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -63,16 +63,34 @@ void drm_printf(struct drm_printer *p, const char *f, ...)
}
EXPORT_SYMBOL(drm_printf);
-#define DRM_PRINTK_FMT "[" DRM_NAME ":%s]%s %pV"
-
void drm_dev_printk(const struct device *dev, const char *level,
- unsigned int category, const char *function_name,
- const char *prefix, const char *format, ...)
+ const char *format, ...)
+{
+ struct va_format vaf;
+ va_list args;
+
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+
+ if (dev)
+ dev_printk(level, dev, "[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
+ else
+ printk("%s" "[" DRM_NAME ":%ps] %pV",
+ level, __builtin_return_address(0), &vaf);
+
+ va_end(args);
+}
+EXPORT_SYMBOL(drm_dev_printk);
+
+void drm_dev_dbg(const struct device *dev, unsigned int category,
+const char *format, ...)
{
struct va_format vaf;
va_list args;
- if (category != DRM_UT_NONE && !(drm_debug & category))
+ if (!(drm_debug & category))
return;
va_start(args, format);
@@ -80,14 +98,15 @@ void drm_dev_printk(const struct device *dev, const char
*level,
vaf.va = &args;
if (dev)
- dev_printk(level, dev, DRM_PRINTK_FMT, function_name, prefix,
- &vaf);
+ dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
else
- printk("%s" DRM_PRINTK_FMT, level, function_name, prefix, &vaf);
+ printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
va_end(args);
}
-EXPORT_SYMBOL(drm_dev_printk);
+EXPORT_SYMBOL(drm_dev_dbg);
void drm_dbg(unsigned int category, const char *format, ...)
{
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 3a40c5a3a5fa..e1a46e9991cc 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -196,10 +196,13 @@ static inline struct drm_printer drm_debug_printer(const
char *prefix)
#define DRM_UT_STATE 0x40
#define DRM_UT_LEASE 0x80
-__printf(6, 7)
+__printf(3, 4)
void drm_dev_printk(const struct device *dev, const char *level,
- unsigned int category, const char *function_name,
- const char *prefix, const char *format, ...);
+ const char *format, ...);
+__printf(3, 4)
+void drm_dev_dbg(const struct device *dev, unsigned int category,
+const char *format, ...);
+
__printf(2, 3)
void drm_dbg(unsigned int category, const char *format, ...);
__printf(1, 2)
@@ -208,10 +211,7 @@ void drm_err(const char *format, ...);
/* Macros to make printk easier */
#define _DRM_PRINTK(once, level, fmt, ...) \
- do {\
- printk##once(KERN_##level "[" DRM_NAME "] " fmt,\
-##__VA_ARGS__);\
- } while (0)
+ printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
#define DRM_INFO(fmt, ...) \
_DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
@@ -234,8 +234,7 @@ void drm_err(const char *format, ...);
* @fmt: printf() like format string.
*/
