drm/i915: Tune down init error message due to failure injection
Subsystems (5)
PATCH 1/1 drm/i915: Tune down init error message due to failure injection
Atm, in case failure injection forces an error a subsequent error messages will make automated tests (CI) report this event as a breakage, even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure for consistency.
--- drivers/gpu/drm/i915/i915_dma.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +11 -3
@@ -66,6 +66,14 @@ bool __i915_inject_load_failure(const char *func, int line)return false; } +#define i915_load_error (fmt, ...) do { \ + if (i915.inject_load_failure && \ + i915_load_fail_count == i915.inject_load_failure) \ + DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__); \ + else \ + DRM_ERROR(fmt, ##__VA_ARGS__); \ +} while(0) +static int i915_getparam (struct drm_device *dev,void *data,struct drm_file *file_priv) {
@@ -1332,10 +1340,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) } ret =i915_load_modeset_init (dev); -if (ret <0 ) { -DRM_ERROR ("failed to init modeset\n" ); +if (ret <0 ) goto out_cleanup_vblank; - }i915_driver_register (dev_priv);
@@ -1357,6 +1363,8 @@ out_runtime_pm_put: out_free_priv:kfree (dev_priv); +i915_load_error ("device initialization failed (%d)\n" , ret); +return ret; }
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 46 lines · Imre Deak
Atm, in case failure injection forces an error a subsequent error messages will make automated tests (CI) report this event as a breakage, even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure for consistency.
CC Chris Wilson <[email protected]>Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_dma.c +9
-3@@ -66,6 +66,14 @@ bool __i915_inject_load_failure(const char *func, int line)return false; } +#define i915_load_error (fmt, ...) do { \ + if (i915.inject_load_failure && \ + i915_load_fail_count == i915.inject_load_failure) \ + DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__); \ + else \ + DRM_ERROR(fmt, ##__VA_ARGS__); \ +} while(0) +static int i915_getparam (struct drm_device *dev,void *data,struct drm_file *file_priv) {@@ -1332,10 +1340,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) } ret =i915_load_modeset_init (dev); -if (ret <0 ) { -DRM_ERROR ("failed to init modeset\n" ); +if (ret <0 ) goto out_cleanup_vblank; - }i915_driver_register (dev_priv);
drivers/gpu/drm/i915/i915_dma.c out_runtime_pm_put: · line 1366
Quoted 4 lines
drivers/gpu/drm/i915/i915_dma.c +1
-0@@ -1357,6 +1363,8 @@ out_runtime_pm_put: out_free_priv:kfree (dev_priv); +i915_load_error ("device initialization failed (%d)\n" , ret);
Please put a representative sample output into the changelog.
I think we should include a request to file bug with full drm.debug=0xf. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915: Tune down init error message due to failure injection
In reply to Imre DeakAtm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure for consistency.
v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)
--- drivers/gpu/drm/i915/i915_dma.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +11 -3
@@ -66,6 +66,14 @@ bool __i915_inject_load_failure(const char *func, int line)return false; } +#define i915_load_error (fmt, ...) do { \ + if (i915.inject_load_failure && \ + i915_load_fail_count == i915.inject_load_failure) \ + DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__); \ + else \ + DRM_ERROR(fmt, ##__VA_ARGS__); \ +} while(0) +static int i915_getparam (struct drm_device *dev,void *data,struct drm_file *file_priv) {
@@ -1332,10 +1340,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) } ret =i915_load_modeset_init (dev); -if (ret <0 ) { -DRM_ERROR ("failed to init modeset\n" ); +if (ret <0 ) goto out_cleanup_vblank; - }i915_driver_register (dev_priv);
@@ -1357,6 +1363,8 @@ out_runtime_pm_put: out_free_priv:kfree (dev_priv); +i915_load_error ("Device initialization failed (%d), please file a bug at https://bugs.freedesktop.org providing the dmesg log by booting with drm.debug=0xf\n" , ret); +return ret; }
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Imre Deak
Atm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
Quoted 6 lines
While at it print the error message for any init failure for consistency.
v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)
And the new one! Helps when cross-referencing a message in dmesg.
Quoted 39 lines
CC Chris Wilson <[email protected]>Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_dma.c +9
-3@@ -66,6 +66,14 @@ bool __i915_inject_load_failure(const char *func, int line)return false; } +#define i915_load_error (fmt, ...) do { \ + if (i915.inject_load_failure && \ + i915_load_fail_count == i915.inject_load_failure) \ + DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__); \ + else \ + DRM_ERROR(fmt, ##__VA_ARGS__); \ +} while(0) +static int i915_getparam (struct drm_device *dev,void *data,struct drm_file *file_priv) {@@ -1332,10 +1340,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) } ret =i915_load_modeset_init (dev); -if (ret <0 ) { -DRM_ERROR ("failed to init modeset\n" ); +if (ret <0 ) goto out_cleanup_vblank; - }i915_driver_register (dev_priv);
drivers/gpu/drm/i915/i915_dma.c out_runtime_pm_put: · line 1366
Quoted 4 lines
drivers/gpu/drm/i915/i915_dma.c +1
-0@@ -1357,6 +1363,8 @@ out_runtime_pm_put: out_free_priv:kfree (dev_priv); +i915_load_error ("Device initialization failed (%d), please file a bug at https://bugs.freedesktop.org providing the dmesg log by booting with drm.debug=0xf\n" , ret);
80cols rules still apply to messages :)
"Device initialization failed (%d). "
"Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi " "against DRI/DRM/Intel providing the dmesg log by booting " "with drm.debug=0xf\n",
I would personally make i915_load_error() a proper function and add the "Please..." output there at a lower logging level than ERROR. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 72 lines · Chris Wilson
Quoted 6 lines · Imre Deak
Atm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
Quoted 6 lines
While at it print the error message for any init failure for consistency.
v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)And the new one! Helps when cross-referencing a message in dmesg.
Quoted 52 lines
CC Chris Wilson <[email protected]>Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/i915_dma.c | 14 +++++++++++---1 file changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_dma.c +0
-0@@ -66,6 +66,14 @@ bool __i915_inject_load_failure(const char *func, int line) return false; }+#define i915_load_error(fmt, ...) do { \drivers/gpu/drm/i915/i915_dma.c +1
-0+ if (i915.inject_load_failure &&\drivers/gpu/drm/i915/i915_dma.c +1
-0+ i915_load_fail_count == i915.inject_load_failure)\drivers/gpu/drm/i915/i915_dma.c +1
-0+ DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__);\drivers/gpu/drm/i915/i915_dma.c +1
-0+ else\drivers/gpu/drm/i915/i915_dma.c +1
-0+ DRM_ERROR(fmt, ##__VA_ARGS__);\drivers/gpu/drm/i915/i915_dma.c +2
-0+}while (0 ) +static int
i915_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv){drivers/gpu/drm/i915/i915_dma.c +0
-0@@ -1332,10 +1340,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) }
ret =i915_load_modeset_init(dev);drivers/gpu/drm/i915/i915_dma.c +1
-2-if (ret <0 ) { -DRM_ERROR ("failed to init modeset\n" ); +if (ret <0 )goto
out_cleanup_vblank;drivers/gpu/drm/i915/i915_dma.c +0
-1- }
i915_driver_register(dev_priv);drivers/gpu/drm/i915/i915_dma.c +0
-0@@ -1357,6 +1363,8 @@ out_runtime_pm_put:out_free_priv:
kfree(dev_priv);drivers/gpu/drm/i915/i915_dma.c +1
-0+ i915_load_error("Device initialization failed (%d), pleaseQuoted 2 lines
file a bug at https://bugs.freedesktop.org providing the dmesg log by booting with drm.debug=0xf\n", ret);
80cols rules still apply to messages :)
Quoted 4 lines
"Device initialization failed (%d). "
"Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi " "against DRI/DRM/Intel providing the dmesg log by booting " "with drm.debug=0xf\n",
I thought for strings emitted to dmesg it's discouraged, since you can't easily grep then. But I can make the link more precise.
Quoted 2 lines
I would personally make
i915_load_error()a proper function and add the "Please..." output there at a lower logging level than ERROR.
Using a function is not straightforward since there is no vprintf like interface for DRM_ERROR. But I can move that part of the message to macro.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Imre Deak
Quoted 6 lines · Chris Wilson
80cols rules still apply to messages :)
"Device initialization failed (%d). "
"Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi " "against DRI/DRM/Intel providing the dmesg log by booting " "with drm.debug=0xf\n",I thought for strings emitted to dmesg it's discouraged, since you can't easily grep then. But I can make the link more precise.
Hmm, we haven't abided by that. I don't mind really :)
Quoted 6 lines
Quoted 2 lines
I would personally make
i915_load_error()a proper function and add the "Please..." output there at a lower logging level than ERROR.Using a function is not straightforward since there is no vprintf like interface for
DRM_ERROR. But I can move that part of the message to macro.
In that case, I'm happy enough with ditching the DRM_ERROR here and go with dev_err(). Another nail in the DRM_ERROR coffin. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Chris Wilson
Quoted 9 lines · Imre Deak
Quoted 7 lines · Chris Wilson
80cols rules still apply to messages :)
"Device initialization failed (%d). "
"Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi
"
"against DRI/DRM/Intel providing the dmesg log by booting " "with drm.debug=0xf\n",
Quoted 4 lines
Quoted 2 lines
I thought for strings emitted to dmesg it's discouraged, since you can't easily grep then. But I can make the link more precise.
Hmm, we haven't abided by that. I don't mind really :)
Ok, will follow this rule then.
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
I would personally make
i915_load_error()a proper function and add
the "Please..." output there at a lower logging level than ERROR.
Quoted 8 lines
Quoted 4 lines
Using a function is not straightforward since there is no vprintf like
interface forDRM_ERROR. But I can move that part of the message to macro.In that case, I'm happy enough with ditching the
DRM_ERRORhere and go
withdev_err(). Another nail in theDRM_ERRORcoffin.
Hm, there doesn't seem to be vprintf like dev_err either. And dev_dbg depends on CONFIG_DEBUG while DRM_DEBUG doesn't.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 27 lines · Imre Deak
Quoted 10 lines · Chris Wilson
Quoted 9 lines · Imre Deak
Quoted 7 lines · Chris Wilson
80cols rules still apply to messages :)
"Device initialization failed (%d). "
"Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi
"
"against DRI/DRM/Intel providing the dmesg log by booting " "with drm.debug=0xf\n",Quoted 4 lines
Quoted 2 lines
I thought for strings emitted to dmesg it's discouraged, since you can't easily grep then. But I can make the link more precise.
Hmm, we haven't abided by that. I don't mind really :)
Ok, will follow this rule then.
Quoted 9 lines
Quoted 8 lines
Quoted 3 lines
I would personally make
i915_load_error()a proper function and add
the "Please..." output there at a lower logging level than ERROR.Using a function is not straightforward since there is no vprintf like
interface forDRM_ERROR. But I can move that part of the message to macro.
Quoted 6 lines
Quoted 3 lines
In that case, I'm happy enough with ditching the
DRM_ERRORhere and go
withdev_err(). Another nail in theDRM_ERRORcoffin.Hm, there doesn't seem to be vprintf like
dev_erreither. Anddev_dbgdepends onCONFIG_DEBUGwhileDRM_DEBUGdoesn't.
It uses dev_printk_emit(KERN_ERR, dev, fmt, va_list) underneath.
Does that help?
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 39 lines · Chris Wilson
Quoted 38 lines · Imre Deak
Quoted 11 lines · Chris Wilson
Quoted 10 lines · Imre Deak
Quoted 8 lines · Chris Wilson
80cols rules still apply to messages :)
"Device initialization failed (%d). "
"Please file a bug at https://bugs.freedesktop.org/enter_bug.
cgi
"
"against DRI/DRM/Intel providing the dmesg log by booting " "with drm.debug=0xf\n",Quoted 5 lines
Quoted 3 lines
I thought for strings emitted to dmesg it's discouraged, since you
can't easily grep then. But I can make the link more precise.Hmm, we haven't abided by that. I don't mind really :)
Ok, will follow this rule then.
Quoted 17 lines
Quoted 6 lines
Quoted 5 lines
I would personally make
i915_load_error()a proper function and
add
the "Please..." output there at a lower logging level than ERROR.Quoted 6 lines
Using a function is not straightforward since there is no vprintf
like
interface forDRM_ERROR. But I can move that part of the message to
macro.In that case, I'm happy enough with ditching the
DRM_ERRORhere and
go
withdev_err(). Another nail in theDRM_ERRORcoffin.
Quoted 7 lines
Quoted 3 lines
Hm, there doesn't seem to be vprintf like
dev_erreither. Anddev_dbg
depends onCONFIG_DEBUGwhileDRM_DEBUGdoesn't.It uses
dev_printk_emit(KERN_ERR, dev, fmt, va_list)underneath.Does that help?
It uses
__dev_printk(kern_level, dev, &vaf);
which is not exported. This one in turn translates to
dev_printk_emit(KERN_ERR[0] - '0', dev, "%s %s: %pV", dev_driver_string(dev), dev_name(dev), vaf);
which we probably don't want to hard-code here.
Quoted 2 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 50 lines · Imre Deak
Quoted 39 lines · Chris Wilson
Quoted 38 lines · Imre Deak
Quoted 11 lines · Chris Wilson
Quoted 10 lines · Imre Deak
Quoted 8 lines · Chris Wilson
80cols rules still apply to messages :)
"Device initialization failed (%d). "
"Please file a bug at https://bugs.freedesktop.org/enter_bug.
cgi
"
"against DRI/DRM/Intel providing the dmesg log by booting " "with drm.debug=0xf\n",Quoted 5 lines
Quoted 3 lines
I thought for strings emitted to dmesg it's discouraged, since you
can't easily grep then. But I can make the link more precise.Hmm, we haven't abided by that. I don't mind really :)
Ok, will follow this rule then.
Quoted 17 lines
Quoted 6 lines
Quoted 5 lines
I would personally make
i915_load_error()a proper function and
add
the "Please..." output there at a lower logging level than ERROR.Quoted 6 lines
Using a function is not straightforward since there is no vprintf
like
interface forDRM_ERROR. But I can move that part of the message to
macro.In that case, I'm happy enough with ditching the
DRM_ERRORhere and
go
withdev_err(). Another nail in theDRM_ERRORcoffin.Quoted 7 lines
Quoted 3 lines
Hm, there doesn't seem to be vprintf like
dev_erreither. Anddev_dbg
depends onCONFIG_DEBUGwhileDRM_DEBUGdoesn't.It uses
dev_printk_emit(KERN_ERR, dev, fmt, va_list)underneath.Does that help?
It uses
Quoted 8 lines
__dev_printk(kern_level, dev, &vaf);which is not exported. This one in turn translates to
dev_printk_emit(KERN_ERR[0] - '0', dev, "%s %s: %pV", dev_driver_string(dev), dev_name(dev), vaf);which we probably don't want to hard-code here.
dev_vprintk_emit() is exported. I am not sure why dev_vprintk() would not be...
I agree it is a nuisance. So just food for thought. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 65 lines · Chris Wilson
Quoted 64 lines · Imre Deak
Quoted 46 lines · Chris Wilson
Quoted 45 lines · Imre Deak
Quoted 13 lines · Chris Wilson
Quoted 12 lines · Imre Deak
Quoted 10 lines · Chris Wilson
80cols rules still apply to messages :)
"Device initialization failed (%d). "
"Please file a bug at https://bugs.freedesktop.org/enter_
bug.
cgi
"
"against DRI/DRM/Intel providing the dmesg log by booting "
"with drm.debug=0xf\n",Quoted 7 lines
Quoted 5 lines
I thought for strings emitted to dmesg it's discouraged, since
you
can't easily grep then. But I can make the link more precise.Hmm, we haven't abided by that. I don't mind really :)
Ok, will follow this rule then.
Quoted 20 lines
Quoted 8 lines
Quoted 7 lines
I would personally make
i915_load_error()a proper function
and
add
the "Please..." output there at a lower logging level than
ERROR.Quoted 6 lines
Using a function is not straightforward since there is no vprintf
like
interface forDRM_ERROR. But I can move that part of the message to
macro.In that case, I'm happy enough with ditching the
DRM_ERRORhere
and
go
withdev_err(). Another nail in theDRM_ERRORcoffin.Quoted 7 lines
Quoted 3 lines
Hm, there doesn't seem to be vprintf like
dev_erreither. Anddev_dbg
depends onCONFIG_DEBUGwhileDRM_DEBUGdoesn't.It uses
dev_printk_emit(KERN_ERR, dev, fmt, va_list)underneath.Does that help?
It uses
__dev_printk(kern_level, dev, &vaf);which is not exported. This one in turn translates to
dev_printk_emit(KERN_ERR[0] - '0', dev, "%s %s: %pV", dev_driver_string(dev), dev_name(dev), vaf);
Quoted 6 lines
Quoted 1 line
which we probably don't want to hard-code here.
dev_vprintk_emit()is exported. I am not sure whydev_vprintk()would not be...I agree it is a nuisance. So just food for thought.
Well, I can follow-up on an export patch for that, but getting that merged may take a while, so could we go with the current version until that?
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · Imre Deak
Well, I can follow-up on an export patch for that, but getting that merged may take a while, so could we go with the current version until that?
What's the current version? ;)
For my tastes, I really want the "please file a bug" to be separate, and I think KERN_NOTICE. I would also like this to be the preferred DRM_ERROR reporting mechanism i.e. anytime we emit an ERROR we should be encouraging the user to file a bug, and do so in a user friendly fashion. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Chris Wilson
Quoted 4 lines · Imre Deak
Well, I can follow-up on an export patch for that, but getting that merged may take a while, so could we go with the current version until
that?What's the current version? ;)
v3. Actually you were right, there is a reason why no dev_vprintk exists. It's because dev_printk provides that with %pV. So learned something new today and it wasn't a nuisance.. I'll use that then and a function instead of the macro.
Quoted 2 lines
For my tastes, I really want the "please file a bug" to be separate, and I think
KERN_NOTICE.
Ok, I used KERN_INFO but will change that to KERN_NOTICE.
Quoted 5 lines
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR we should be
encouraging the user to file a bug, and do so in a user friendly fashion.
Ok, but only in i915 I assume. Should we also convert then all DRM_ERROR to dev_err - with an *ERROR* prefix - or still use DRM_ERROR?
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Imre Deak
Quoted 5 lines · Chris Wilson
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR we should be
encouraging the user to file a bug, and do so in a user friendly fashion.Ok, but only in i915 I assume. Should we also convert then all
DRM_ERRORtodev_err- with an *ERROR* prefix - or still useDRM_ERROR?
Within i915. I am thinking along the lines that no DRM_ERROR should exist that doesn't acknowlege that it is a user facing error message (i.e. written in plain English and is informative, and includes a bug reporting reference). So i915_report_error() or somesuch. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Chris Wilson
Quoted 8 lines · Imre Deak
Quoted 6 lines · Chris Wilson
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR we should
be
encouraging the user to file a bug, and do so in a user friendly fashion.
Quoted 8 lines
Quoted 3 lines
Ok, but only in i915 I assume. Should we also convert then all
DRM_ERRORtodev_err- with an *ERROR* prefix - or still useDRM_ERROR?Within i915. I am thinking along the lines that no
DRM_ERRORshould exist that doesn't acknowlege that it is a user facing error message (i.e. written in plain English and is informative, and includes a bug reporting reference). Soi915_report_error()or somesuch.
Ok, will give it a go.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerQuoted 12 lines · Imre Deak
Quoted 11 lines · Chris Wilson
Quoted 9 lines · Imre Deak
Quoted 7 lines · Chris Wilson
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR we should
be
encouraging the user to file a bug, and do so in a user friendly fashion.
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
Ok, but only in i915 I assume. Should we also convert then all
DRM_ERRORtodev_err- with an *ERROR* prefix - or still useDRM_ERROR?Within i915. I am thinking along the lines that no
DRM_ERRORshould exist that doesn't acknowlege that it is a user facing error message (i.e. written in plain English and is informative, and includes a bug reporting reference). Soi915_report_error()or somesuch.Ok, will give it a go.
Daniel didn't want i915 debugging/erroring mechanisms to deviate from core DRM. So I guess this would follow in the same category.
I'm all in for structuring a coherent debugging/error message logic and functions for it and then everyone can follow the suit.
Regards, Joonas
Quoted 6 lines
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 8 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 25 lines · Joonas Lahtinen
Quoted 24 lines · Imre Deak
Quoted 23 lines · Chris Wilson
Quoted 11 lines · Imre Deak
Quoted 9 lines · Chris Wilson
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR we
should
be
encouraging the user to file a bug, and do so in a user friendly
fashion.Quoted 3 lines
Ok, but only in i915 I assume. Should we also convert then all
DRM_ERRORtodev_err- with an *ERROR* prefix - or still useDRM_ERROR?Within i915. I am thinking along the lines that no
DRM_ERRORshould
exist that doesn't acknowlege that it is a user facing error message
(i.e. written in plain English and is informative, and includes a bug
reporting reference). Soi915_report_error()or somesuch.
Quoted 8 lines
Quoted 1 line
Ok, will give it a go.
Daniel didn't want i915 debugging/erroring mechanisms to deviate from core DRM. So I guess this would follow in the same category.
I'm all in for structuring a coherent debugging/error message logic and
functions for it and then everyone can follow the suit.
The dev_err/dbg method has obvious advantages, like dynamic debug or showing the device instance, so I think that's something we want in any case. I don't see a problem with first rolling it out in i915 then proposing it for more generic use.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 31 lines · Imre Deak
Quoted 30 lines · Joonas Lahtinen
Quoted 17 lines · Imre Deak
Quoted 16 lines · Chris Wilson
Quoted 14 lines · Imre Deak
Quoted 9 lines · Chris Wilson
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR we
should
be
encouraging the user to file a bug, and do so in a user friendly
fashion.Ok, but only in i915 I assume. Should we also convert then all
DRM_ERRORtodev_err- with an *ERROR* prefix - or still useDRM_ERROR?Quoted 8 lines
Quoted 7 lines
Within i915. I am thinking along the lines that no
DRM_ERRORshould
exist that doesn't acknowlege that it is a user facing error message
(i.e. written in plain English and is informative, and includes a bug
reporting reference). Soi915_report_error()or somesuch.Ok, will give it a go.
Daniel didn't want i915 debugging/erroring mechanisms to deviate from core DRM. So I guess this would follow in the same category.
Quoted 8 lines
Quoted 3 lines
I'm all in for structuring a coherent debugging/error message logic and
functions for it and then everyone can follow the suit.The dev_err/dbg method has obvious advantages, like dynamic debug or showing the device instance, so I think that's something we want in any case. I don't see a problem with first rolling it out in i915 then proposing it for more generic use.
Well that's just silly me trying to apply some pressure into making something that's compatible with DRM_*. Or well, porting those macros over to whatever the newfangled fancy thing is. Including keeping drm.debug alive with some hacks (we can write our own store functions, which could enable the right stuff with dynamic debugging, if we export a few funcs) so that the gazillion of howtos out there don't all break. -Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 49 lines · Daniel Vetter
Quoted 41 lines · Imre Deak
Quoted 31 lines · Joonas Lahtinen
Quoted 28 lines · Imre Deak
Quoted 19 lines · Chris Wilson
Quoted 12 lines · Imre Deak
Quoted 10 lines · Chris Wilson
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR
we
should
be
encouraging the user to file a bug, and do so in a user friendly
fashion.Quoted 5 lines
Ok, but only in i915 I assume. Should we also convert then all
DRM_ERRORtodev_err- with an *ERROR* prefix - or still useDRM_ERROR?Quoted 8 lines
Within i915. I am thinking along the lines that no
DRM_ERRORshould
exist that doesn't acknowlege that it is a user facing error message
(i.e. written in plain English and is informative, and includes a
bug
reporting reference). Soi915_report_error()or somesuch.Quoted 1 line
Ok, will give it a go.
Quoted 8 lines
Daniel didn't want i915 debugging/erroring mechanisms to deviate from
core DRM. So I guess this would follow in the same category.I'm all in for structuring a coherent debugging/error message logic
and
functions for it and then everyone can follow the suit.Quoted 6 lines
The dev_err/dbg method has obvious advantages, like dynamic debug or
showing the device instance, so I think that's something we want in any
case. I don't see a problem with first rolling it out in i915 then proposing it for more generic use.
Quoted 10 lines
Well that's just silly me trying to apply some pressure into making something that's compatible with DRM_*. Or well, porting those macros over
to whatever the newfangled fancy thing is. Including keeping drm.debug
alive with some hacks (we can write our own store functions, which could
enable the right stuff with dynamic debugging, if we export a few funcs)
so that the gazillion of howtos out there don't all break.
Yea, currently we'd output debug messages even in case of drm.debug==0. I sent a patch that makes __i915_printk() behave the same as DRM_DEBUG_DRIVER for debug messages. I think on top of that a more fancy dynamic debug based filtering can be implemented later as you suggest.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerQuoted 64 lines · Imre Deak
Quoted 53 lines · Daniel Vetter
Quoted 45 lines · Imre Deak
Quoted 35 lines · Joonas Lahtinen
Quoted 32 lines · Imre Deak
Quoted 22 lines · Chris Wilson
Quoted 14 lines · Imre Deak
Quoted 11 lines · Chris Wilson
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR
we
should
be
encouraging the user to file a bug, and do so in a user friendly
fashion.Quoted 5 lines
Ok, but only in i915 I assume. Should we also convert then all
DRM_ERRORtodev_err- with an *ERROR* prefix - or still useDRM_ERROR?Quoted 8 lines
Within i915. I am thinking along the lines that no
DRM_ERRORshould
exist that doesn't acknowlege that it is a user facing error message
(i.e. written in plain English and is informative, and includes a
bug
reporting reference). Soi915_report_error()or somesuch.Quoted 1 line
Ok, will give it a go.
Quoted 8 lines
Daniel didn't want i915 debugging/erroring mechanisms to deviate from
core DRM. So I guess this would follow in the same category.I'm all in for structuring a coherent debugging/error message logic
and
functions for it and then everyone can follow the suit.Quoted 6 lines
The dev_err/dbg method has obvious advantages, like dynamic debug or
showing the device instance, so I think that's something we want in any
case. I don't see a problem with first rolling it out in i915 then proposing it for more generic use.Quoted 10 lines
Well that's just silly me trying to apply some pressure into making something that's compatible with DRM_*. Or well, porting those macros over
to whatever the newfangled fancy thing is. Including keeping drm.debug
alive with some hacks (we can write our own store functions, which could
enable the right stuff with dynamic debugging, if we export a few funcs)
so that the gazillion of howtos out there don't all break.
Quoted 6 lines
Yea, currently we'd output debug messages even in case of drm.debug==0. I sent a patch that makes
__i915_printk()behave the same asDRM_DEBUG_DRIVERfor debug messages. I think on top of that a more fancy dynamic debug based filtering can be implemented later as you suggest.
Yeah, when dynamic debugging is disabled drm.debug==0 would produce all the debug, that's the biggest problem I hit. Over-verbosity.
I have the drm.debug working in dynamic debugging cases already (I exposed one interface from kernel and tadah).
Problem is only, if we want to have drm.debug doing its filtering thing for the old and new code in transitino phase when dynamic debugging is disabled. Then we'll have to go little bit further and do a few #undefs (but we currently have those, too), because dynamic debugging also makes itself add the line numbers and file names to allow filtering by those.
I copy-pasted my changes at the end so you get a rough idea.
Regards, Joonas
Quoted 1 line
--Imre
Signature · 5 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation ------------------------------8<-----------------------------------
drivers/gpu/drm/drm_drv.c +0 -0
@@ -32,6 +32,7 @@
#include <linux/moduleparam.h>
#include <linux/mount.h>
#include <linux/slab.h>
+#include <linux/dynamic_debug.h>
#include <drm/drmP.h>
#include <drm/drm_core.h>
#include "drm_legacy.h"
@@ -43,8 +44,11 @@ EXPORT_SYMBOL(drm_debug); MODULE_AUTHOR(CORE_AUTHOR);
MODULE_DESCRIPTION(CORE_DESC);
MODULE_LICENSE("GPL and additional rights");
+
+#ifdef CONFIG_DYNAMIC_DEBUG
MODULE_PARM_DESC(debug, "Enable debug output"); module_param_named(debug, drm_debug, int, 0600);
+#endif
static DEFINE_SPINLOCK(drm_minor_lock);
static struct idr drm_minors_idr;
@@ -61,28 +65,13 @@ void drm_err(const char *format, ...)
vaf.fmt = format;
vaf.va = &args;
- printk(KERN_ERR "[" DRM_NAME ":%ps] *ERROR* %pV",
+ printk(KERN_ERR DRM_NAME ": [%ps] *ERROR* %pV",
__builtin_return_address(0), &vaf);
va_end(args);
}
EXPORT_SYMBOL(drm_err);
-void drm_ut_debug_printk(const char *function_name, const char *format, ...) -{
- struct va_format vaf;
- va_list args;
-
- va_start(args, format);
- vaf.fmt = format;
- vaf.va = &args;
-
- printk(KERN_DEBUG "[" DRM_NAME ":%s] %pV", function_name, &vaf);
-
- va_end(args);
-}
-EXPORT_SYMBOL(drm_ut_debug_printk);
-
struct drm_master *drm_master_create(struct drm_minor *minor)
{
struct drm_master *master;
@@ -879,10 +868,21 @@ static const struct file_operations drm_stub_fops = { .llseek = noop_llseek,
};
+static void drm_debug_init(void)
+{
+ struct ddebug_query query = { };
+ unsigned int flags = _DPRINTK_FLAGS_PRINT | _DPRINTK_FLAGS_INCL_FUNCNAME;
+ unsigned int mask = ~_DPRINTK_FLAGS_PRINT;
+
+ query.format = DRM_NAME ": " DRM_PREFIX_CORE ": ";
+ ddebug_change(&query, drm_debug & DRM_UT_CORE ? flags : 0, mask);
+}
+
static int __init drm_core_init(void)
{
int ret = -ENOMEM;
+ drm_debug_init();
drm_global_init();
drm_connector_ida_init();
idr_init(&drm_minors_idr);
include/drm/drmP.h +0 -0
@@ -130,9 +130,13 @@ struct dma_buf_attachment;
#define DRM_UT_ATOMIC 0x10
#define DRM_UT_VBL 0x20
-extern __printf(2, 3)
-void drm_ut_debug_printk(const char *function_name,
- const char *format, ...);
+#define DRM_PREFIX_CORE "core"
+#define DRM_PREFIX_DRIVER "driver"
+#define DRM_PREFIX_KMS "kms"
+#define DRM_PREFIX_PRIME "prime"
+#define DRM_PREFIX_ATOMIC "atomic"
+#define DRM_PREFIX_VBL "vblank"
+
extern __printf(1, 2)
void drm_err(const char *format, ...);
@@ -184,48 +188,34 @@ void drm_err(const char *format, ...); })
#define DRM_INFO(fmt, ...) \
- printk(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
+ printk(KERN_INFO DRM_NAME ": " fmt, ##__VA_ARGS__)
#define DRM_INFO_ONCE(fmt, ...) \
- printk_once(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
+ printk_once(KERN_INFO DRM_NAME ": " fmt, ##__VA_ARGS__)
/**
* Debug output.
*
* \param fmt printf() like format string.
- * \param arg arguments
+ * \param args arguments
*/
-#define DRM_DEBUG(fmt, args...) \
- do { \
- if (unlikely(drm_debug & DRM_UT_CORE)) \
- drm_ut_debug_printk(__func__, fmt, ##args); \
- } while (0)
-
-#define DRM_DEBUG_DRIVER(fmt, args...) \
- do { \
- if (unlikely(drm_debug & DRM_UT_DRIVER)) \
- drm_ut_debug_printk(__func__, fmt, ##args); \
- } while (0)
-#define DRM_DEBUG_KMS(fmt, args...) \
- do { \
- if (unlikely(drm_debug & DRM_UT_KMS)) \
- drm_ut_debug_printk(__func__, fmt, ##args); \
- } while (0)
-#define DRM_DEBUG_PRIME(fmt, args...) \
- do { \
- if (unlikely(drm_debug & DRM_UT_PRIME)) \
- drm_ut_debug_printk(__func__, fmt, ##args); \
- } while (0)
-#define DRM_DEBUG_ATOMIC(fmt, args...) \
- do { \
- if (unlikely(drm_debug & DRM_UT_ATOMIC)) \
- drm_ut_debug_printk(__func__, fmt, ##args); \
- } while (0)
-#define DRM_DEBUG_VBL(fmt, args...) \
- do { \
- if (unlikely(drm_debug & DRM_UT_VBL)) \
- drm_ut_debug_printk(__func__, fmt, ##args); \
- } while (0)
+#define DRM_DEBUG(fmt, args...) \
+ pr_debug(DRM_NAME ": " DRM_PREFIX_CORE ": " fmt, ##args)
+
+#define DRM_DEBUG_DRIVER(fmt, args...) \
+ pr_debug(DRM_NAME ": " DRM_PREFIX_DRIVER ": " fmt, ##args)
+
+#define DRM_DEBUG_KMS(fmt, args...) \
+ pr_debug(DRM_NAME ": " DRM_PREFIX_KMS ": " fmt, ##args)
+
+#define DRM_DEBUG_PRIME(fmt, args...) \
+ pr_debug(DRM_NAME ": " DRM_PREFIX_PRIME ": " fmt, ##args)
+
+#define DRM_DEBUG_ATOMIC(fmt, args...) \
+ pr_debug(DRM_NAME ": " DRM_PREFIX_ATOMIC ": " fmt, ##args)
+
+#define DRM_DEBUG_VBL(fmt, args...) \
+ pr_debug(DRM_NAME ": " DRM_PREFIX_VBL ": " fmt, ##args)
/*@}*/
include/linux/dynamic_debug.h +0 -0
@@ -1,6 +1,14 @@
#ifndef _DYNAMIC_DEBUG_H
#define _DYNAMIC_DEBUG_H
+struct ddebug_query {
+ const char *filename;
+ const char *module;
+ const char *function;
+ const char *format;
+ unsigned int first_lineno, last_lineno;
+};
+
/*
* An instance of this structure is created in a special
* ELF section at every dynamic debug callsite. At runtime,
@@ -40,6 +48,8 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n, const char *modname);
#if defined(CONFIG_DYNAMIC_DEBUG)
+extern int ddebug_change(const struct ddebug_query *query,
+ unsigned int flags, unsigned int mask);
extern int ddebug_remove_module(const char *mod_name);
extern __printf(2, 3)
void __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...);
@@ -111,6 +121,12 @@ do { \
#include <linux/string.h>
#include <linux/errno.h>
+static inline int ddebug_change(const struct ddebug_query *query,
+ unsigned int flags, unsigned int mask)
+{
+ return 0;
+}
+
static inline int ddebug_remove_module(const char *mod)
{
return 0;
lib/dynamic_debug.c +0 -0
@@ -47,14 +47,6 @@ struct ddebug_table {
struct _ddebug *ddebugs;
};
-struct ddebug_query {
- const char *filename;
- const char *module;
- const char *function;
- const char *format;
- unsigned int first_lineno, last_lineno;
-};
-
struct ddebug_iter {
struct ddebug_table *table;
unsigned int idx;
@@ -135,8 +127,8 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg)
* callsites, normally the same as number of changes. If verbose,
* logs the changes. Takes ddebug_lock.
*/
-static int ddebug_change(const struct ddebug_query *query,
- unsigned int flags, unsigned int mask)
+int ddebug_change(const struct ddebug_query *query,
+ unsigned int flags, unsigned int mask)
{
int i;
struct ddebug_table *dt;
@@ -203,6 +195,7 @@ static int ddebug_change(const struct ddebug_query *query,
return nfound;
}
+EXPORT_SYMBOL(ddebug_change);
/*
* Split the buffer `buf' into space-separated words.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 78 lines · Joonas Lahtinen
Quoted 64 lines · Imre Deak
Quoted 53 lines · Daniel Vetter
Quoted 45 lines · Imre Deak
Quoted 35 lines · Joonas Lahtinen
Quoted 32 lines · Imre Deak
Quoted 22 lines · Chris Wilson
Quoted 14 lines · Imre Deak
Quoted 11 lines · Chris Wilson
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR
we
should
be
encouraging the user to file a bug, and do so in a user friendly
fashion.Quoted 5 lines
Ok, but only in i915 I assume. Should we also convert then all
DRM_ERRORtodev_err- with an *ERROR* prefix - or still useDRM_ERROR?Quoted 8 lines
Within i915. I am thinking along the lines that no
DRM_ERRORshould
exist that doesn't acknowlege that it is a user facing error message
(i.e. written in plain English and is informative, and includes a
bug
reporting reference). Soi915_report_error()or somesuch.Quoted 1 line
Ok, will give it a go.
Quoted 8 lines
Daniel didn't want i915 debugging/erroring mechanisms to deviate from
core DRM. So I guess this would follow in the same category.I'm all in for structuring a coherent debugging/error message logic
and
functions for it and then everyone can follow the suit.Quoted 6 lines
The dev_err/dbg method has obvious advantages, like dynamic debug or
showing the device instance, so I think that's something we want in any
case. I don't see a problem with first rolling it out in i915 then proposing it for more generic use.Quoted 10 lines
Well that's just silly me trying to apply some pressure into making something that's compatible with DRM_*. Or well, porting those macros over
to whatever the newfangled fancy thing is. Including keeping drm.debug
alive with some hacks (we can write our own store functions, which could
enable the right stuff with dynamic debugging, if we export a few funcs)
so that the gazillion of howtos out there don't all break.Quoted 6 lines
Yea, currently we'd output debug messages even in case of drm.debug==0. I sent a patch that makes
__i915_printk()behave the same asDRM_DEBUG_DRIVERfor debug messages. I think on top of that a more fancy dynamic debug based filtering can be implemented later as you suggest.Yeah, when dynamic debugging is disabled drm.debug==0 would produce all the debug, that's the biggest problem I hit. Over-verbosity.
I have the drm.debug working in dynamic debugging cases already (I exposed one interface from kernel and tadah).
Quoted 8 lines
Problem is only, if we want to have drm.debug doing its filtering thing for the old and new code in transitino phase when dynamic debugging is disabled. Then we'll have to go little bit further and do a few #undefs (but we currently have those, too), because dynamic debugging also makes itself add the line numbers and file names to allow filtering by those.
I copy-pasted my changes at the end so you get a rough idea.
Just very quick pass over it, 2 comments below.
-Danil
Quoted 68 lines
Regards, Joonas
Quoted 1 line
--Imre
Signature · 5 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation ------------------------------8<-----------------------------------drivers/gpu/drm/drm_drv.c +4
-0@@ -32,6 +32,7 @@ #include <linux/moduleparam.h> #include <linux/mount.h> #include <linux/slab.h> +#include <linux/dynamic_debug.h> #include <drm/drmP.h> #include <drm/drm_core.h> #include "drm_legacy.h"@@ -43,8 +44,11 @@ EXPORT_SYMBOL(drm_debug); MODULE_AUTHOR(CORE_AUTHOR); MODULE_DESCRIPTION(CORE_DESC); MODULE_LICENSE("GPL and additional rights"); + +#ifdef CONFIG_DYNAMIC_DEBUG MODULE_PARM_DESC(debug, "Enable debug output"); module_param_named(debug, drm_debug, int, 0600); +#endif
staticDEFINE_SPINLOCK(drm_minor_lock);
static struct idrdrm_minors_idr;drivers/gpu/drm/drm_drv.c +0
-0@@ -61,28 +65,13 @@ void drm_err(const char *format, ...) vaf.fmt = format; vaf.va = &args;drivers/gpu/drm/drm_drv.c +1
-1- printk(KERN_ERR "[" DRM_NAME ":%ps] *ERROR* %pV", + printk(KERN_ERR DRM_NAME ": [%ps] *ERROR* %pV",__builtin_return_address(0), &vaf);
va_end(args);
}
EXPORT_SYMBOL(drm_err);drivers/gpu/drm/drm_drv.c +0
-15-void drm_ut_debug_printk (const char *function_name,const char *format, ...) -{ -struct va_format vaf; -va_list args; - -va_start (args, format); - vaf.fmt = format; - vaf.va = &args; - -printk (KERN_DEBUG "[" DRM_NAME ":%s] %pV" , function_name, &vaf); - -va_end (args); -} -EXPORT_SYMBOL (drm_ut_debug_printk); -struct
drm_master*drm_master_create(structdrm_minor*minor) {
structdrm_master*master;drivers/gpu/drm/drm_drv.c +0
-0@@ -879,10 +868,21 @@ static const struct file_operations drm_stub_fops = { .llseek = noop_llseek, };
drivers/gpu/drm/drm_drv.c
Quoted 9 lines
drivers/gpu/drm/drm_drv.c +9
-0+static void drm_debug_init (void ) +{ +struct ddebug_query query = { }; +unsigned int flags = _DPRINTK_FLAGS_PRINT | _DPRINTK_FLAGS_INCL_FUNCNAME; +unsigned int mask = ~_DPRINTK_FLAGS_PRINT; + + query.format =DRM_NAME ": " DRM_PREFIX_CORE ": " ; +ddebug_change (&query, drm_debug &DRM_UT_CORE ? flags :0 , mask); +}
Shouldn't we put this into the store function for the module paramater, so that changing at runtime still works? Personally I adjust drm.debug a lot in a bunch of scripts I have lying around, I guess others do the same.
Quoted 86 lines
+
static int__initdrm_core_init(void)
{
int ret =-ENOMEM;drivers/gpu/drm/drm_drv.c +1
-0+drm_debug_init ();
drm_global_init();
drm_connector_ida_init();
idr_init(&drm_minors_idr);include/drm/drmP.h +0
-0@@ -130,9 +130,13 @@ struct dma_buf_attachment; #define DRM_UT_ATOMIC 0x10 #define DRM_UT_VBL 0x20include/drm/drmP.h +7
-3-extern __printf(2, 3) -void drm_ut_debug_printk(const char *function_name, - const char *format, ...); +#define DRM_PREFIX_CORE "core" +#define DRM_PREFIX_DRIVER "driver" +#define DRM_PREFIX_KMS "kms" +#define DRM_PREFIX_PRIME "prime" +#define DRM_PREFIX_ATOMIC "atomic" +#define DRM_PREFIX_VBL "vblank" +extern
__printf(1, 2)
voiddrm_err(const char *format, ...);include/drm/drmP.h +0
-0@@ -184,48 +188,34 @@ void drm_err(const char *format, ...); })
#defineDRM_INFO(fmt, ...)\include/drm/drmP.h +1
-1- printk(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) + printk(KERN_INFO DRM_NAME ": " fmt, ##__VA_ARGS__)
#defineDRM_INFO_ONCE(fmt, ...)\include/drm/drmP.h +1
-1- printk_once(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) + printk_once(KERN_INFO DRM_NAME ": " fmt, ##__VA_ARGS__)
/**
* Debug output.
*
* \param fmtprintf()like format string.
- * \param arg arguments
+ * \param args arguments
*/include/drm/drmP.h +7
-31-#define DRM_DEBUG(fmt, args...) \ - do { \ - if (unlikely(drm_debug & DRM_UT_CORE)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ - } while (0) - -#define DRM_DEBUG_DRIVER(fmt, args...) \ - do { \ - if (unlikely(drm_debug & DRM_UT_DRIVER)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ - } while (0) -#define DRM_DEBUG_KMS(fmt, args...) \ - do { \ - if (unlikely(drm_debug & DRM_UT_KMS)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ - } while (0) -#define DRM_DEBUG_PRIME(fmt, args...) \ - do { \ - if (unlikely(drm_debug & DRM_UT_PRIME)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ - } while (0) -#define DRM_DEBUG_ATOMIC(fmt, args...) \ - do { \ - if (unlikely(drm_debug & DRM_UT_ATOMIC)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ - } while (0) -#define DRM_DEBUG_VBL(fmt, args...) \ - do { \ - if (unlikely(drm_debug & DRM_UT_VBL)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ - } while (0) +#define DRM_DEBUG(fmt, args...) \ + pr_debug(DRM_NAME ": " DRM_PREFIX_CORE ": " fmt, ##args) + +#define DRM_DEBUG_DRIVER(fmt, args...) \ + pr_debug(DRM_NAME ": " DRM_PREFIX_DRIVER ": " fmt, ##args) + +#define DRM_DEBUG_KMS(fmt, args...) \
include/drm/drmP.h
Quoted 10 lines
include/drm/drmP.h +10
-0+ pr_debug(DRM_NAME ": " DRM_PREFIX_KMS ": " fmt, ##args) + +#define DRM_DEBUG_PRIME(fmt, args...) \ + pr_debug(DRM_NAME ": " DRM_PREFIX_PRIME ": " fmt, ##args) + +#define DRM_DEBUG_ATOMIC(fmt, args...) \ + pr_debug(DRM_NAME ": " DRM_PREFIX_ATOMIC ": " fmt, ##args) + +#define DRM_DEBUG_VBL(fmt, args...) \ + pr_debug(DRM_NAME ": " DRM_PREFIX_VBL ": " fmt, ##args)
Yeah, I think we need to have an
#ifndef CONFIG_DYNAMIC_DEBUG
/* old debug macros using drm.debug filtering */
#else
/* new ddebug based macros */
#endif
to address the issues you've raised.
Quoted 82 lines
/*@}*/include/linux/dynamic_debug.h +0
-0@@ -1,6 +1,14 @@ #ifndef _DYNAMIC_DEBUG_H #define _DYNAMIC_DEBUG_Hinclude/linux/dynamic_debug.h +8
-0+struct ddebug_query { +const char *filename; +const char *module; +const char *function; +const char *format; +unsigned int first_lineno, last_lineno; +}; +/*
* An instance of this structure is created in a special
* ELF section at every dynamic debug callsite. At runtime,include/linux/dynamic_debug.h +0
-0@@ -40,6 +48,8 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n, const char *modname);
#ifdefined(CONFIG_DYNAMIC_DEBUG)include/linux/dynamic_debug.h +2
-0+extern int ddebug_change (const struct ddebug_query *query, + unsigned int flags, unsigned int mask);extern int
ddebug_remove_module(const char *mod_name);
extern__printf(2, 3)
void__dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...);include/linux/dynamic_debug.h +0
-0@@ -111,6 +121,12 @@ do { \ #include <linux/string.h> #include <linux/errno.h>include/linux/dynamic_debug.h +6
-0+static inline int ddebug_change (const struct ddebug_query *query, +unsigned int flags,unsigned int mask) +{ +return 0 ; +} +static inline int
ddebug_remove_module(const char *mod){
return 0;lib/dynamic_debug.c +0
-0@@ -47,14 +47,6 @@ struct ddebug_table { struct _ddebug *ddebugs; };lib/dynamic_debug.c +0
-8-struct ddebug_query { -const char *filename; -const char *module; -const char *function; -const char *format; -unsigned int first_lineno, last_lineno; -}; -struct
ddebug_iter{
structddebug_table*table;
unsigned int idx;lib/dynamic_debug.c +2
-2@@ -135,8 +127,8 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg)* callsites, normally the same as number of changes. If verbose, * logs the changes. Takes ddebug_lock. */ -static int ddebug_change (const struct ddebug_query *query, -unsigned int flags,unsigned int mask) +int ddebug_change (const struct ddebug_query *query, + unsigned int flags, unsigned int mask) { int i; struct ddebug_table *dt;@@ -203,6 +195,7 @@ static int ddebug_change(const struct ddebug_query *query,
return nfound;
}
+EXPORT_SYMBOL(ddebug_change);
/*
* Split the buffer `buf' into space-separated words.
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Joonas Lahtinen
Quoted 15 lines · Imre Deak
Quoted 14 lines · Chris Wilson
Quoted 12 lines · Imre Deak
Quoted 7 lines · Chris Wilson
I would also like this to be the preferred
DRM_ERRORreporting mechanism i.e. anytime we emit an ERROR we should
be
encouraging the user to file a bug, and do so in a user friendly fashion.Ok, but only in i915 I assume. Should we also convert then all
DRM_ERRORtodev_err- with an *ERROR* prefix - or still useDRM_ERROR?
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
Within i915. I am thinking along the lines that no
DRM_ERRORshould exist that doesn't acknowlege that it is a user facing error message (i.e. written in plain English and is informative, and includes a bug reporting reference). Soi915_report_error()or somesuch.Ok, will give it a go.
Daniel didn't want i915 debugging/erroring mechanisms to deviate from core DRM. So I guess this would follow in the same category.
Too late really. We have key messages for i915 failures now being generted by other subsystems using pr_err/dev_err, which for some strange reason are using the core reporting mechanims not DRM's. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915: Tune down init error message due to failure injection
In reply to Imre DeakAtm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure and change it to "*ERROR* Device initialization failed (errno)" for consistency.
v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)
v3:
- Include the new error message too in the commit log, make the fdo link more precise and print part of the message with info log level (Chris)
--- drivers/gpu/drm/i915/i915_dma.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +16 -3
@@ -66,6 +66,19 @@ bool __i915_inject_load_failure(const char *func, int line)return false; } +#define BUGS_FDO_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI" +#define i915_load_error (fmt, ...) do { \ + if (i915.inject_load_failure && \ + i915_load_fail_count == i915.inject_load_failure) { \ + DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__); \ + } else { \ + DRM_ERROR(fmt, ##__VA_ARGS__); \ + DRM_INFO("Please file a bug at " BUGS_FDO_URL " " \ + "against DRM/Intel providing the dmesg log " \ + "by booting with drm.debug=0xf\n"); \ + } \ +} while(0) +static int i915_getparam (struct drm_device *dev,void *data,struct drm_file *file_priv) {
@@ -1332,10 +1345,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) } ret =i915_load_modeset_init (dev); -if (ret <0 ) { -DRM_ERROR ("failed to init modeset\n" ); +if (ret <0 ) goto out_cleanup_vblank; - }i915_driver_register (dev_priv);
@@ -1357,6 +1368,8 @@ out_runtime_pm_put: out_free_priv:kfree (dev_priv); +i915_load_error ("Device initialization failed (%d)\n" , ret); +return ret; }
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/1 drm/i915: Tune down init error message due to failure injection
Atm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure and change it to
"""
*ERROR* Device initialization failed (errno)
Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi?product=DRI
against DRM/Intel providing the dmesg log by booting with drm.debug=0xf """
and export a helper printing error messages using this same format. A follow-up patch will convert all uses of DRM_ERROR reporting a user facing problem to use this new helper instead.
v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)
v3:
- Include the new error message too in the commit log, make the fdo link more precise and print part of the message with info log level (Chris)
v4: (Chris)
- Use dev_printk instead of DRM_ERROR/INFO and use NOTICE instead of NOTE loglevel
- Export a helper for printing user facing error messages
--- drivers/gpu/drm/i915/i915_dma.c | 56 +++++++++++++++++++++++++++++++++++++---- drivers/gpu/drm/i915/i915_drv.h | 6 +++++ 2 files changed, 57 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +51 -5
@@ -66,6 +66,52 @@ bool __i915_inject_load_failure(const char *func, int line)return false; } +#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI" +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \ + "providing the dmesg log by booting with drm.debug=0xf" + +void +__i915_printk (struct drm_i915_private *dev_priv,const char *level, +const char *fmt, ...) +{ +struct device *dev = dev_priv->dev->dev; +bool is_error = level[1 ] <=KERN_ERR [1 ]; +struct va_format vaf; +va_list args; + +va_start (args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + +dev_printk (level, dev,"%s%pV" , is_error ?"*ERROR* " :"" , &vaf); +if (is_error) +dev_printk (KERN_NOTICE , dev,"%s" ,FDO_BUG_MSG ); + +va_end (args); +} + +static void __printf(2, 3) +i915_load_error(struct drm_i915_private *dev_priv, const char *fmt, ...) +{ + struct va_format vaf; +va_list args; +bool forced_error; + + forced_error = i915.inject_load_failure && + i915_load_fail_count == i915.inject_load_failure; + + va_start(args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + + __i915_printk(dev_priv, forced_error ? KERN_DEBUG : KERN_ERR, "%pV", + &vaf); + +va_end (args); +} + static int i915_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv) {
@@ -972,8 +1018,6 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,if (i915_inject_load_failure ())return -ENODEV ; - dev_priv->dev = dev; -/* Setup the write-once "constant" device info */ device_info = (struct intel_device_info *)&dev_priv->info;memcpy (device_info, info,sizeof (dev_priv->info));
@@ -1303,6 +1347,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)return -ENOMEM ; dev->dev_private = dev_priv; +/* Must be set before calling __i915_printk */ + dev_priv->dev = dev; ret =i915_driver_init_early (dev_priv, dev, (struct intel_device_info *)flags);
@@ -1332,10 +1378,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) } ret =i915_load_modeset_init (dev); -if (ret <0 ) { -DRM_ERROR ("failed to init modeset\n" ); +if (ret <0 ) goto out_cleanup_vblank; - }i915_driver_register (dev_priv);
@@ -1357,6 +1401,8 @@ out_runtime_pm_put: out_free_priv:kfree (dev_priv); +i915_load_error (dev_priv,"Device initialization failed (%d)\n" , ret); +return ret; }
drivers/gpu/drm/i915/i915_drv.h +6 -0
@@ -2696,6 +2696,12 @@ extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);extern int i915_resume_switcheroo (struct drm_device *dev);/* i915_dma.c */ +void __printf(3, 4) +__i915_printk(struct drm_i915_private *dev_priv, const char *level, + const char *fmt, ...); +#define i915_report_error(dev_priv, fmt, ...) \ + __i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__) + extern int i915_driver_load(struct drm_device *, unsigned long flags); extern int i915_driver_unload(struct drm_device *); extern int i915_driver_open(struct drm_device *dev, struct drm_file *file);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 1/1 drm/i915: Tune down init error message due to failure injection
Atm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure and change it to
"""
Device initialization failed (errno)
Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi?product=DRI
against DRM/Intel providing the dmesg log by booting with drm.debug=0xf """
and export a helper printing error messages using this same format. A follow-up patch will convert all uses of DRM_ERROR reporting a user facing problem to use this new helper instead.
v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)
v3:
- Include the new error message too in the commit log, make the fdo link more precise and print part of the message with info log level (Chris)
v4: (Chris)
- Use dev_printk instead of DRM_ERROR/INFO and use NOTICE instead of INFO loglevel
- Export a helper for printing user facing error messages v5:
- Keep the DRM_ERROR message prefix used by piglit-igt/CI to filter relevant dmesg lines
- Use dev_notice(), instead of dev_printk(KERN_NOTICE,...)
--- drivers/gpu/drm/i915/i915_dma.c | 48 ++++++++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++ 2 files changed, 50 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +43 -5
@@ -66,6 +66,44 @@ bool __i915_inject_load_failure(const char *func, int line)return false; } +#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI" +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \ + "providing the dmesg log by booting with drm.debug=0xf" + +void +__i915_printk (struct drm_i915_private *dev_priv,const char *level, +const char *fmt, ...) +{ +struct device *dev = dev_priv->dev->dev; +bool is_error = level[1 ] <=KERN_ERR [1 ]; +struct va_format vaf; +va_list args; + +va_start (args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + +dev_printk (level, dev,"[" DRM_NAME ":%ps] %pV" , +__builtin_return_address (0 ), &vaf); + +if (is_error) +dev_notice (dev,"%s" ,FDO_BUG_MSG ); + +va_end (args); +} + +static bool i915_error_injected (struct drm_i915_private *dev_priv) +{ +return i915.inject_load_failure && + i915_load_fail_count == i915.inject_load_failure; +} + +#define i915_load_error (dev_priv, fmt, ...) \ + __i915_printk(dev_priv, \ + i915_error_injected(dev_priv) ? KERN_DEBUG : KERN_ERR, \ + fmt, ##__VA_ARGS__) +static int i915_getparam (struct drm_device *dev,void *data,struct drm_file *file_priv) {
@@ -972,8 +1010,6 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,if (i915_inject_load_failure ())return -ENODEV ; - dev_priv->dev = dev; -/* Setup the write-once "constant" device info */ device_info = (struct intel_device_info *)&dev_priv->info;memcpy (device_info, info,sizeof (dev_priv->info));
@@ -1303,6 +1339,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)return -ENOMEM ; dev->dev_private = dev_priv; +/* Must be set before calling __i915_printk */ + dev_priv->dev = dev; ret =i915_driver_init_early (dev_priv, dev, (struct intel_device_info *)flags);
@@ -1332,10 +1370,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) } ret =i915_load_modeset_init (dev); -if (ret <0 ) { -DRM_ERROR ("failed to init modeset\n" ); +if (ret <0 ) goto out_cleanup_vblank; - }i915_driver_register (dev_priv);
@@ -1357,6 +1393,8 @@ out_runtime_pm_put: out_free_priv:kfree (dev_priv); +i915_load_error (dev_priv,"Device initialization failed (%d)\n" , ret); +return ret; }
drivers/gpu/drm/i915/i915_drv.h +7 -0
@@ -2696,6 +2696,13 @@ extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);extern int i915_resume_switcheroo (struct drm_device *dev);/* i915_dma.c */ +void __printf(3, 4) +__i915_printk(struct drm_i915_private *dev_priv, const char *level, + const char *fmt, ...); + +#define i915_report_error(dev_priv, fmt, ...) \ + __i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__) + extern int i915_driver_load(struct drm_device *, unsigned long flags); extern int i915_driver_unload(struct drm_device *); extern int i915_driver_open(struct drm_device *dev, struct drm_file *file);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 45 lines · Imre Deak
Atm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure and change it to
"""
Device initialization failed (errno)
Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi?product=DRI
against DRM/Intel providing the dmesg log by booting with drm.debug=0xf """
and export a helper printing error messages using this same format. A follow-up patch will convert all uses ofDRM_ERRORreporting a user facing problem to use this new helper instead.v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)
v3:
- Include the new error message too in the commit log, make the fdo link more precise and print part of the message with info log level (Chris)
v4: (Chris)
- Usedev_printkinstead of DRM_ERROR/INFO and use NOTICE instead of INFO loglevel
- Export a helper for printing user facing error messages v5:
- Keep theDRM_ERRORmessage prefix used by piglit-igt/CI to filter relevant dmesg lines
- Usedev_notice(), instead ofdev_printk(KERN_NOTICE,...)CC Chris Wilson <[email protected]>Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 48 ++++++++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++ 2 files changed, 50 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_dma.c +0
-0@@ -66,6 +66,44 @@ bool __i915_inject_load_failure(const char *func, int line)return false;
drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 76
Quoted 10 lines
drivers/gpu/drm/i915/i915_dma.c +8
-0} +#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI" +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \ + "providing the dmesg log by booting with drm.debug=0xf" + +void +__i915_printk (struct drm_i915_private *dev_priv,const char *level, +const char *fmt, ...) +{
static int shown_bug_once;
drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 88
Quoted 12 lines
drivers/gpu/drm/i915/i915_dma.c +12
-0+struct device *dev = dev_priv->dev->dev; +bool is_error = level[1 ] <=KERN_ERR [1 ]; +struct va_format vaf; +va_list args; + +va_start (args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + +dev_printk (level, dev,"[" DRM_NAME ":%ps] %pV" , +__builtin_return_address (0 ), &vaf);
Also on my wishlist is to
#undef DRM_NAME
#define DRM_NAME "drm/i915"
in i915_drv.h
Don't tell me that would break CI!
drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 90
Quoted 1 line
drivers/gpu/drm/i915/i915_dma.c +1
-0+if (is_error)
if (is_error && !shown_bug_once) {
drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 91
Quoted 1 line
drivers/gpu/drm/i915/i915_dma.c +1
-0+dev_notice (dev,"%s" ,FDO_BUG_MSG );
shown_bug_once = 1;
}
With just showing the bug once,
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 77 lines · Chris Wilson
Quoted 47 lines · Imre Deak
Atm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure and change it to
"""
Device initialization failed (errno)
Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi?product=DRI
against DRM/Intel providing the dmesg log by booting with drm.debug=0xf """
and export a helper printing error messages using this same format. A follow-up patch will convert all uses ofDRM_ERRORreporting a user facing problem to use this new helper instead.v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)
v3:
- Include the new error message too in the commit log, make the fdo link more precise and print part of the message with info log level (Chris)
v4: (Chris)
- Usedev_printkinstead of DRM_ERROR/INFO and use NOTICE instead of INFO loglevel
- Export a helper for printing user facing error messages v5:
- Keep theDRM_ERRORmessage prefix used by piglit-igt/CI to filter relevant dmesg lines
- Usedev_notice(), instead ofdev_printk(KERN_NOTICE,...)CC Chris Wilson <[email protected]>Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/i915_dma.c | 48 ++++++++++++++++++++++++++++++++++++-----drivers/gpu/drm/i915/i915_drv.h| 7 ++++++2 files changed, 50 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_dma.c +0
-0@@ -66,6 +66,44 @@ bool __i915_inject_load_failure(const char *func, int line) return false; }drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 76
Quoted 8 lines
drivers/gpu/drm/i915/i915_dma.c +8
-0+#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI" +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \ + "providing the dmesg log by booting with drm.debug=0xf" + +void +__i915_printk (struct drm_i915_private *dev_priv,const char *level, + const char *fmt, ...) +{static int
shown_bug_once;drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 88
Quoted 12 lines
drivers/gpu/drm/i915/i915_dma.c +12
-0+struct device *dev = dev_priv->dev->dev; +bool is_error = level[1 ] <=KERN_ERR [1 ]; +struct va_format vaf; +va_list args; + +va_start (args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + +dev_printk (level, dev,"[" DRM_NAME ":%ps] %pV" , + __builtin_return_address(0), &vaf);Also on my wishlist is to
#undefDRM_NAME
#defineDRM_NAME"drm/i915"
ini915_drv.h
Quoted 1 line
Don't tell me that would break CI!
The current regex it uses on all messages with a loglevel <= KERN_NOTICE:
(\[drm:|drm_|intel_|i915_)
Probably could be changed to 'i915 0000:00:02.0:' if we converted all user facing DRM_ERRORs to use the new helper. Btw, according to your plan the rest non-user facing DRM_ERRORs would be printed with debug log level I assume, so isn't it a problem that they won't be treated as test failures by CI?
Quoted 6 lines
drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 90
Quoted 1 line
drivers/gpu/drm/i915/i915_dma.c +1
-0+if (is_error)if (
is_error&& !shown_bug_once) {drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 91
Quoted 1 line
drivers/gpu/drm/i915/i915_dma.c +1
-0+dev_notice (dev,"%s" ,FDO_BUG_MSG );
shown_bug_once= 1;
}
Ok, will respin it.
--Imre
Quoted 5 lines
With just showing the bug once,
Reviwed-by Chris Wilson <[email protected]>-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 84 lines · Imre Deak
Quoted 77 lines · Chris Wilson
Quoted 47 lines · Imre Deak
Atm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure and change it to
"""
Device initialization failed (errno)
Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi?product=DRI
against DRM/Intel providing the dmesg log by booting with drm.debug=0xf """
and export a helper printing error messages using this same format. A follow-up patch will convert all uses ofDRM_ERRORreporting a user facing problem to use this new helper instead.v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)
v3:
- Include the new error message too in the commit log, make the fdo link more precise and print part of the message with info log level (Chris)
v4: (Chris)
- Usedev_printkinstead of DRM_ERROR/INFO and use NOTICE instead of INFO loglevel
- Export a helper for printing user facing error messages v5:
- Keep theDRM_ERRORmessage prefix used by piglit-igt/CI to filter relevant dmesg lines
- Usedev_notice(), instead ofdev_printk(KERN_NOTICE,...)CC Chris Wilson <[email protected]>Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/i915_dma.c | 48 ++++++++++++++++++++++++++++++++++++-----drivers/gpu/drm/i915/i915_drv.h| 7 ++++++2 files changed, 50 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_dma.c +0
-0@@ -66,6 +66,44 @@ bool __i915_inject_load_failure(const char *func, int line) return false; }drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 76
Quoted 8 lines
drivers/gpu/drm/i915/i915_dma.c +8
-0+#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI" +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \ + "providing the dmesg log by booting with drm.debug=0xf" + +void +__i915_printk (struct drm_i915_private *dev_priv,const char *level, + const char *fmt, ...) +{static int
shown_bug_once;drivers/gpu/drm/i915/i915_dma.c bool __i915_inject_load_failure(const char *func, int line) · line 88
Quoted 12 lines
drivers/gpu/drm/i915/i915_dma.c +12
-0+struct device *dev = dev_priv->dev->dev; +bool is_error = level[1 ] <=KERN_ERR [1 ]; +struct va_format vaf; +va_list args; + +va_start (args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + +dev_printk (level, dev,"[" DRM_NAME ":%ps] %pV" , + __builtin_return_address(0), &vaf);Also on my wishlist is to
#undefDRM_NAME
#defineDRM_NAME"drm/i915"
ini915_drv.hQuoted 1 line
Don't tell me that would break CI!
The current regex it uses on all messages with a loglevel <=
KERN_NOTICE:
(\[drm:|drm_|intel_|i915_)
Quoted 5 lines
Probably could be changed to 'i915 0000:00:02.0:' if we converted all user facing
DRM_ERRORsto use the new helper. Btw, according to your plan the rest non-user facingDRM_ERRORswould be printed with debug log level I assume, so isn't it a problem that they won't be treated as test failures by CI?
If a DRM_ERROR didn't result in a user visible error then it wasn't much of an error and CI is only complaining because we didn't keep dmesg clean - i.e. the only bug there would be using DRM_ERROR as a debugging aide, so yes I'm okay with that. (And if the DRM_ERROR did result in a user visible error and the only reason CI was complaining was because of the dmesg spam, then our testing is snafu.)
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 1/1 drm/i915: Tune down init error message due to failure injection
In reply to Imre DeakAtm, in case failure injection forces an error the subsequent "*ERROR* failed to init modeset" error message will make automated tests (CI) report this event as a breakage even though the event is expected. To fix this print the error message with debug log level in this case.
While at it print the error message for any init failure and change it to
"""
Device initialization failed (errno)
Please file a bug at https://bugs.freedesktop.org/enter_bug.cgi?product=DRI
against DRM/Intel providing the dmesg log by booting with drm.debug=0xf """
and export a helper printing error messages using this same format. A follow-up patch will convert all uses of DRM_ERROR reporting a user facing problem to use this new helper instead.
v2:
- Include the problematic error message in the commit log, add a request to file an fdo bug to the message (Chris)
v3:
- Include the new error message too in the commit log, make the fdo link more precise and print part of the message with info log level (Chris)
v4: (Chris)
- Use dev_printk instead of DRM_ERROR/INFO and use NOTICE instead of INFO loglevel
- Export a helper for printing user facing error messages v5:
- Keep the DRM_ERROR message prefix used by piglit-igt/CI to filter relevant dmesg lines
- Use dev_notice(), instead of dev_printk(KERN_NOTICE,...) v6:
- Print the fdo bug link only once (Chris)
--- drivers/gpu/drm/i915/i915_dma.c | 51 +++++++++++++++++++++++++++++++++++++---- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++ 2 files changed, 53 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +46 -5
@@ -66,6 +66,47 @@ bool __i915_inject_load_failure(const char *func, int line)return false; } +#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI" +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \ + "providing the dmesg log by booting with drm.debug=0xf" + +void +__i915_printk (struct drm_i915_private *dev_priv,const char *level, +const char *fmt, ...) +{ +static bool shown_bug_once; +struct device *dev = dev_priv->dev->dev; +bool is_error = level[1 ] <=KERN_ERR [1 ]; +struct va_format vaf; +va_list args; + +va_start (args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + +dev_printk (level, dev,"[" DRM_NAME ":%ps] %pV" , +__builtin_return_address (0 ), &vaf); + +if (is_error && !shown_bug_once) { +dev_notice (dev,"%s" ,FDO_BUG_MSG ); + shown_bug_once = true; + } + +va_end (args); +} + +static bool i915_error_injected (struct drm_i915_private *dev_priv) +{ +return i915.inject_load_failure && + i915_load_fail_count == i915.inject_load_failure; +} + +#define i915_load_error (dev_priv, fmt, ...) \ + __i915_printk(dev_priv, \ + i915_error_injected(dev_priv) ? KERN_DEBUG : KERN_ERR, \ + fmt, ##__VA_ARGS__) +static int i915_getparam (struct drm_device *dev,void *data,struct drm_file *file_priv) {
@@ -972,8 +1013,6 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,if (i915_inject_load_failure ())return -ENODEV ; - dev_priv->dev = dev; -/* Setup the write-once "constant" device info */ device_info = (struct intel_device_info *)&dev_priv->info;memcpy (device_info, info,sizeof (dev_priv->info));
@@ -1303,6 +1342,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)return -ENOMEM ; dev->dev_private = dev_priv; +/* Must be set before calling __i915_printk */ + dev_priv->dev = dev; ret =i915_driver_init_early (dev_priv, dev, (struct intel_device_info *)flags);
@@ -1332,10 +1373,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) } ret =i915_load_modeset_init (dev); -if (ret <0 ) { -DRM_ERROR ("failed to init modeset\n" ); +if (ret <0 ) goto out_cleanup_vblank; - }i915_driver_register (dev_priv);
@@ -1357,6 +1396,8 @@ out_runtime_pm_put: out_free_priv:kfree (dev_priv); +i915_load_error (dev_priv,"Device initialization failed (%d)\n" , ret); +return ret; }
drivers/gpu/drm/i915/i915_drv.h +7 -0
@@ -2696,6 +2696,13 @@ extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);extern int i915_resume_switcheroo (struct drm_device *dev);/* i915_dma.c */ +void __printf(3, 4) +__i915_printk(struct drm_i915_private *dev_priv, const char *level, + const char *fmt, ...); + +#define i915_report_error(dev_priv, fmt, ...) \ + __i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__) + extern int i915_driver_load(struct drm_device *, unsigned long flags); extern int i915_driver_unload(struct drm_device *); extern int i915_driver_open(struct drm_device *dev, struct drm_file *file);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Tune down init error message due to failure injection (rev6)
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: drm/i915: Tune down init error message due to failure injection (rev6)
URL : https://patchwork.freedesktop.org/series/4577/
State : failure
== Summary ==
Series 4577v6 drm/i915: Tune down init error message due to failure injection
http://patchwork.freedesktop.org/api/1.0/series/4577/revisions/6/mbox/
Test drv_module_reload_basic:
dmesg-warn -> PASS (bsw-nuc-2)
dmesg-warn -> PASS (skl-i5k-2)
dmesg-warn -> PASS (skl-nuci5)
dmesg-warn -> PASS (hsw-gt2)
dmesg-warn -> PASS (bdw-ultra)
dmesg-warn -> PASS (skl-i7k-2)
dmesg-warn -> PASS (ivb-t430s)
dmesg-warn -> PASS (snb-dellxps)
dmesg-warn -> PASS (hsw-brixbox)
dmesg-warn -> PASS (bdw-nuci7)
dmesg-warn -> PASS (ilk-hp8440p)
Test gem_mmap_gtt:
Subgroup basic-write-gtt-no-prefault:
dmesg-warn -> PASS (bsw-nuc-2)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (bsw-nuc-2)
pass -> DMESG-WARN (hsw-gt2)
dmesg-warn -> PASS (hsw-brixbox)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
pass -> DMESG-WARN (bsw-nuc-2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (bsw-nuc-2)
Subgroup basic-rte:
dmesg-warn -> PASS (bsw-nuc-2)
pass -> DMESG-WARN (snb-dellxps)bdw-nuci7 total:194 pass:182 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:194 pass:173 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:194 pass:154 dwarn:2 dfail:0 fail:1 skip:37 byt-nuc total:194 pass:155 dwarn:4 dfail:0 fail:0 skip:35 hsw-brixbox total:194 pass:171 dwarn:1 dfail:0 fail:0 skip:22 hsw-gt2 total:194 pass:176 dwarn:1 dfail:0 fail:0 skip:17 ilk-hp8440p total:194 pass:131 dwarn:0 dfail:0 fail:0 skip:63 ivb-t430s total:194 pass:169 dwarn:0 dfail:0 fail:0 skip:25 skl-i5k-2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 skl-i7k-2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 skl-nuci5 total:194 pass:183 dwarn:0 dfail:0 fail:0 skip:11 snb-dellxps total:194 pass:158 dwarn:2 dfail:0 fail:0 skip:34
Results at /archive/results/CI_IGT_test/Patchwork_1642/
851d270da650c16883e87bdaad7ca8b37ccbdea3 drm-intel-nightly: 2016y-03m-18d-11h-13m-55s UTC integration manifest e8243dad16bc7ad17f08c3cacf270e3d6e551825 drm/i915: Tune down init error message due to failure injection
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915: Tune down init error message due to failure injection (rev6)
Quoted 24 lines · Patchwork
== Series Details ==
Series: drm/i915: Tune down init error message due to failure injection (rev6)
URL : https://patchwork.freedesktop.org/series/4577/
State : failure== Summary ==
Series 4577v6 drm/i915: Tune down init error message due to failure injection
http://patchwork.freedesktop.org/api/1.0/series/4577/revisions/6/mbox
/Test
drv_module_reload_basic:
dmesg-warn -> PASS (bsw-nuc-2) dmesg-warn -> PASS (skl-i5k-2) dmesg-warn -> PASS (skl-nuci5) dmesg-warn -> PASS (hsw-gt2) dmesg-warn -> PASS (bdw-ultra) dmesg-warn -> PASS (skl-i7k-2) dmesg-warn -> PASS (ivb-t430s) dmesg-warn -> PASS (snb-dellxps) dmesg-warn -> PASS (hsw-brixbox)
Quoted 8 lines
dmesg-warn -> PASS (bdw-nuci7) dmesg-warn -> PASS (ilk-hp8440p) Test
gem_mmap_gtt:
Subgroup basic-write-gtt-no-prefault:
dmesg-warn -> PASS (bsw-nuc-2) Testkms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (bsw-nuc-2)
1 frame long inter-flip ts jitter with seq-step=1:
https://bugs.freedesktop.org/show_bug.cgi?id=94294
Quoted 1 line
pass -> DMESG-WARN (hsw-gt2)
Device suspended during WM programming:
https://bugs.freedesktop.org/show_bug.cgi?id=94349
Quoted 4 lines
dmesg-warn -> PASS (hsw-brixbox) Test
kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
pass -> DMESG-WARN (bsw-nuc-2)
CPU hotplug lockdep WARN during GGTT programming:
https://bugs.freedesktop.org/show_bug.cgi?id=94350
Quoted 3 lines
Test
pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (bsw-nuc-2)
Unclaimed reg access prior to suspending:
https://bugs.freedesktop.org/show_bug.cgi?id=94164
Quoted 3 lines
Subgroup basic-rte:
dmesg-warn -> PASS (bsw-nuc-2) pass -> DMESG-WARN (snb-dellxps)
Device suspended during WM programming:
https://bugs.freedesktop.org/show_bug.cgi?id=94349
Quoted 35 lines
bdw-
nuci7 total:194 pass:182 dwarn:0 dfail:0 fail:0 skip:1 2
bdw-
ultra total:194 pass:173 dwarn:0 dfail:0 fail:0 skip:2 1
bsw-nuc-
2 total:194 pass:154 dwarn:2 dfail:0 fail:1 skip:37 byt-
nuc total:194 pass:155 dwarn:4 dfail:0 fail:0 skip:3 5
hsw-
brixbox total:194 pass:171 dwarn:1 dfail:0 fail:0 skip:2 2
hsw-
gt2 total:194 pass:176 dwarn:1 dfail:0 fail:0 skip:1 7
ilk-
hp8440p total:194 pass:131 dwarn:0 dfail:0 fail:0 skip:6 3
ivb-
t430s total:194 pass:169 dwarn:0 dfail:0 fail:0 skip:2 5
skl-i5k-
2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 skl-i7k-
2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 skl-
nuci5 total:194 pass:183 dwarn:0 dfail:0 fail:0 skip:1 1
snb-
dellxps total:194 pass:158 dwarn:2 dfail:0 fail:0 skip:3 4
Quoted 7 lines
Results at /archive/results/CI_IGT_test/Patchwork_1642/
851d270da650c16883e87bdaad7ca8b37ccbdea3drm-intel-nightly: 2016y- 03m-18d-11h-13m-55s UTC integration manifeste8243dad16bc7ad17f08c3cacf270e3d6e551825drm/i915: Tune down init error message due to failure injection
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915: Tune down init error message due to failure injection (rev6)
Quoted 51 lines · Imre Deak
Quoted 25 lines · Patchwork
== Series Details ==
Series: drm/i915: Tune down init error message due to failure injection (rev6)
URL : https://patchwork.freedesktop.org/series/4577/
State : failure== Summary ==
Series 4577v6 drm/i915: Tune down init error message due to failure injection
http://patchwork.freedesktop.org/api/1.0/series/4577/revisions/6/mb
ox
/Test
drv_module_reload_basic:
dmesg-warn -> PASS (bsw-nuc-2) dmesg-warn -> PASS (skl-i5k-2) dmesg-warn -> PASS (skl-nuci5) dmesg-warn -> PASS (hsw-gt2) dmesg-warn -> PASS (bdw-ultra) dmesg-warn -> PASS (skl-i7k-2) dmesg-warn -> PASS (ivb-t430s) dmesg-warn -> PASS (snb-dellxps) dmesg-warn -> PASS (hsw-brixbox)Quoted 8 lines
dmesg-warn -> PASS (bdw-nuci7) dmesg-warn -> PASS (ilk-hp8440p) Test
gem_mmap_gtt:
Subgroup basic-write-gtt-no-prefault:
dmesg-warn -> PASS (bsw-nuc-2) Testkms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (bsw-nuc-2)1 frame long inter-flip ts jitter with seq-step=1:
https://bugs.freedesktop.org/show_bug.cgi?id=94294Quoted 1 line
pass -> DMESG-WARN (hsw-gt2)
Device suspended during WM programming:
https://bugs.freedesktop.org/show_bug.cgi?id=94349Quoted 4 lines
dmesg-warn -> PASS (hsw-brixbox) Test
kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
pass -> DMESG-WARN (bsw-nuc-2)CPU hotplug lockdep WARN during GGTT programming:
https://bugs.freedesktop.org/show_bug.cgi?id=94350Quoted 3 lines
Test
pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (bsw-nuc-2)
Quoted 8 lines
Unclaimed reg access prior to suspending:
https://bugs.freedesktop.org/show_bug.cgi?id=94164Quoted 3 lines
Subgroup basic-rte:
dmesg-warn -> PASS (bsw-nuc-2) pass -> DMESG-WARN (snb-dellxps)Device suspended during WM programming:
https://bugs.freedesktop.org/show_bug.cgi?id=94349
I pushed the patch to -dinq, thanks for the review.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx