Attachment 111115 Details for Bug 87552 – BUG_ON(!spin_is_locked(lock)) is taboo on UP

[patch] BUG_ON(!spin_is_locked(lock)) is taboo on UP

0001-nouveau-Do-not-BUG_ON-spin_is_locked-on-UP.patch (text/plain), 2.17 KB, created by Bruno on 2014-12-21 16:36:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bruno

Created: 2014-12-21 16:36:27 UTC

Size: 2.17 KB

patch

obsolete

>From ac807dd408d5e68008bdc7d76308506cd01b6a33 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= <bonbons@linux-vserver.org>
>Date: Sun, 21 Dec 2014 17:24:19 +0100
>Subject: [PATCH 1/3] nouveau: Do not BUG_ON(!spin_is_locked()) on UP
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>On !SMP systemps spinlocks do not exist. Thus checking of they
>are active will always fail.
>
>Use
>  assert_spin_locked(lock);
>instead of
>  BUG_ON(!spin_is_locked(lock));
>to not BUG() on all UP systems.
>
>Signed-off-by: Bruno PrÃ©mont <bonbons@linux-vserver.org>
>---
> drivers/gpu/drm/nouveau/core/core/event.c  | 4 ++--
> drivers/gpu/drm/nouveau/core/core/notify.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/core/core/event.c b/drivers/gpu/drm/nouveau/core/core/event.c
>index ff2b434..760947e 100644
>--- a/drivers/gpu/drm/nouveau/core/core/event.c
>+++ b/drivers/gpu/drm/nouveau/core/core/event.c
>@@ -26,7 +26,7 @@
> void
> nvkm_event_put(struct nvkm_event *event, u32 types, int index)
> {
>-	BUG_ON(!spin_is_locked(&event->refs_lock));
>+	assert_spin_locked(&event->refs_lock);
> 	while (types) {
> 		int type = __ffs(types); types &= ~(1 << type);
> 		if (--event->refs[index * event->types_nr + type] == 0) {
>@@ -39,7 +39,7 @@ nvkm_event_put(struct nvkm_event *event, u32 types, int index)
> void
> nvkm_event_get(struct nvkm_event *event, u32 types, int index)
> {
>-	BUG_ON(!spin_is_locked(&event->refs_lock));
>+	assert_spin_locked(&event->refs_lock);
> 	while (types) {
> 		int type = __ffs(types); types &= ~(1 << type);
> 		if (++event->refs[index * event->types_nr + type] == 1) {
>diff --git a/drivers/gpu/drm/nouveau/core/core/notify.c b/drivers/gpu/drm/nouveau/core/core/notify.c
>index d1bcde5..839a325 100644
>--- a/drivers/gpu/drm/nouveau/core/core/notify.c
>+++ b/drivers/gpu/drm/nouveau/core/core/notify.c
>@@ -98,7 +98,7 @@ nvkm_notify_send(struct nvkm_notify *notify, void *data, u32 size)
> 	struct nvkm_event *event = notify->event;
> 	unsigned long flags;
> 
>-	BUG_ON(!spin_is_locked(&event->list_lock));
>+	assert_spin_locked(&event->list_lock);
> 	BUG_ON(size != notify->size);
> 
> 	spin_lock_irqsave(&event->refs_lock, flags);
>-- 
>1.8.1.5
>

Actions: View | Splinter Review

Attachments on bug 87552: 111115

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.