From: Hans de Goede <hdegoede@redhat.com>
To: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Petr Mladek <pmladek@suse.com>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
linux-fbdev@vger.kernel.org, Steven Rostedt <rostedt@goodmis.org>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 2/3] fbcon: Call WARN_CONSOLE_UNLOCKED() where applicable
Date: Tue, 26 Jun 2018 18:36:11 +0000 [thread overview]
Message-ID: <20180626183612.321-3-hdegoede@redhat.com> (raw)
In-Reply-To: <20180626183612.321-1-hdegoede@redhat.com>
Replace comments about places where the console lock should be held with
calls to WARN_CONSOLE_UNLOCKED() to assert that it is actually held.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v3:
-New patch in v3 of this patchset
Changes in v4:
-Keep the comments about which fbcon functions need locks in place
---
drivers/video/fbdev/core/fbcon.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index c910e74d46ff..cd8d52a967aa 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -828,6 +828,8 @@ static int set_con2fb_map(int unit, int newidx, int user)
struct fb_info *oldinfo = NULL;
int found, err = 0;
+ WARN_CONSOLE_UNLOCKED();
+
if (oldidx = newidx)
return 0;
@@ -3044,6 +3046,8 @@ static int fbcon_fb_unbind(int idx)
{
int i, new_idx = -1, ret = 0;
+ WARN_CONSOLE_UNLOCKED();
+
if (!fbcon_has_console_bind)
return 0;
@@ -3094,6 +3098,8 @@ static int fbcon_fb_unregistered(struct fb_info *info)
{
int i, idx;
+ WARN_CONSOLE_UNLOCKED();
+
idx = info->node;
for (i = first_fb_vc; i <= last_fb_vc; i++) {
if (con2fb_map[i] = idx)
@@ -3131,6 +3137,9 @@ static int fbcon_fb_unregistered(struct fb_info *info)
static void fbcon_remap_all(int idx)
{
int i;
+
+ WARN_CONSOLE_UNLOCKED();
+
for (i = first_fb_vc; i <= last_fb_vc; i++)
set_con2fb_map(i, idx, 0);
@@ -3177,6 +3186,8 @@ static int fbcon_fb_registered(struct fb_info *info)
{
int ret = 0, i, idx;
+ WARN_CONSOLE_UNLOCKED();
+
idx = info->node;
fbcon_select_primary(info);
--
2.17.1
next prev parent reply other threads:[~2018-06-26 18:36 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-26 18:36 [PATCH v4 0/3] console/fbcon: Add support for deferred console takeover Hans de Goede
2018-06-26 18:36 ` [PATCH v3 1/3] printk: Export is_console_locked Hans de Goede
2018-06-26 18:38 ` Hans de Goede
2018-06-27 1:07 ` Sergey Senozhatsky
2018-06-27 13:31 ` Petr Mladek
2018-06-26 18:36 ` Hans de Goede [this message]
2018-06-27 1:09 ` [PATCH v3 2/3] fbcon: Call WARN_CONSOLE_UNLOCKED() where applicable Sergey Senozhatsky
2018-06-26 18:36 ` [PATCH v3 3/3] console/fbcon: Add support for deferred console takeover Hans de Goede
2018-06-28 7:55 ` Daniel Vetter
2018-06-28 8:20 ` Hans de Goede
2018-06-28 8:37 ` Daniel Vetter
2018-06-28 8:58 ` Hans de Goede
2018-06-26 19:14 ` [PATCH v4 0/3] " Steven Rostedt
2018-06-27 9:15 ` Daniel Vetter
2018-06-27 9:47 ` Bartlomiej Zolnierkiewicz
2018-06-27 11:13 ` Hans de Goede
2018-06-27 14:15 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2018-06-26 13:55 [PATCH v3 " Hans de Goede
2018-06-26 13:55 ` [PATCH v3 2/3] fbcon: Call WARN_CONSOLE_UNLOCKED() where applicable Hans de Goede
2018-06-26 14:00 ` Daniel Vetter
2018-06-26 14:47 ` Steven Rostedt
2018-06-26 18:29 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180626183612.321-3-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=b.zolnierkie@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).