<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Michel Dänzer <michel@daenzer.net> Sent: Tuesday, March 5, 2019 6:20 AM To: amd-gfx@lists.freedesktop.org Subject: [PATCH] drm/amdkfd: Add curly braces around idr_for_each_entry_continue loop <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">From: Michel Dänzer <michel.daenzer@amd.com> The compiler pointed out that one if block unintentionally wasn't part of the loop: In file included from ./include/linux/kernfs.h:14, from ./include/linux/sysfs.h:16, from ./include/linux/kobject.h:20, from ./include/linux/device.h:16, from ./include/linux/node.h:18, from ./include/linux/memory.h:19, from drivers/gpu/drm//amd/amdgpu/../amdkfd/kfd_events.c:30: drivers/gpu/drm//amd/amdgpu/../amdkfd/kfd_events.c: In function ‘kfd_signal_reset_event’: ./include/linux/idr.h:212:2: warning: this ‘for’ clause does not guard... [-Wmisleading-indentation] for ((entry) = idr_get_next((idr), &(id)); \ ^~~ drivers/gpu/drm//amd/amdgpu/../amdkfd/kfd_events.c:1038:3: note: in expansion of macro ‘idr_for_each_entry_continue’ idr_for_each_entry_continue(&p->event_idr, ev, id) ^~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm//amd/amdgpu/../amdkfd/kfd_events.c:1043:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘for’ if (ev->type == KFD_EVENT_TYPE_MEMORY && ^~ Fixes: "drm/amdkfd: add RAS ECC event support" Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> --- This is one reason why I think it's better to always use curly braces around multiple lines, even if it happens to be a single statement. drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c index 97c984684973..6e1d41c5bf86 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c @@ -1035,7 +1035,7 @@ void kfd_signal_reset_event(struct kfd_dev *dev) hash_for_each_rcu(kfd_processes_table, temp, p, kfd_processes) { mutex_lock(&p->event_mutex); id = KFD_FIRST_NONSIGNAL_EVENT_ID; - idr_for_each_entry_continue(&p->event_idr, ev, id) + idr_for_each_entry_continue(&p->event_idr, ev, id) { if (ev->type == KFD_EVENT_TYPE_HW_EXCEPTION) { ev->hw_exception_data = hw_exception_data; set_event(ev); @@ -1045,6 +1045,7 @@ void kfd_signal_reset_event(struct kfd_dev *dev) ev->memory_exception_data = memory_exception_data; set_event(ev); } + } mutex_unlock(&p->event_mutex); } srcu_read_unlock(&kfd_processes_srcu, idx); -- 2.20.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org <a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a></div> </div> </body> </html>