All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: linux-fbdev@vger.kernel.org,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Qing Wang <wangqing@vivo.com>,
	Daniel Vetter <daniel.vetter@intel.com>,
	Sam Ravnborg <sam@ravnborg.org>, Helge Deller <deller@gmx.de>
Subject: [PATCH v2 05/19] fbdev/sysfs: Fix locking
Date: Tue,  8 Feb 2022 22:08:10 +0100	[thread overview]
Message-ID: <20220208210824.2238981-6-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20220208210824.2238981-1-daniel.vetter@ffwll.ch>

fb_set_var requires we hold the fb_info lock. Or at least this now
matches what the ioctl does ...

Note that ps3fb and sh_mobile_lcdcfb are busted in different ways here,
but I will not fix them up.

Also in practice this isn't a big deal, because really variable fbdev
state is actually protected by console_lock (because fbcon just
doesn't bother with lock_fb_info() at all), and lock_fb_info
protecting anything is really just a neat lie. But that's a much
bigger fish to fry.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Qing Wang <wangqing@vivo.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
---
 drivers/video/fbdev/core/fbsysfs.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/video/fbdev/core/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c
index 26892940c213..8c1ee9ecec3d 100644
--- a/drivers/video/fbdev/core/fbsysfs.c
+++ b/drivers/video/fbdev/core/fbsysfs.c
@@ -91,9 +91,11 @@ static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var)
 
 	var->activate |= FB_ACTIVATE_FORCE;
 	console_lock();
+	lock_fb_info(fb_info);
 	err = fb_set_var(fb_info, var);
 	if (!err)
 		fbcon_update_vcs(fb_info, var->activate & FB_ACTIVATE_ALL);
+	unlock_fb_info(fb_info);
 	console_unlock();
 	if (err)
 		return err;
-- 
2.34.1


WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: linux-fbdev@vger.kernel.org,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Qing Wang <wangqing@vivo.com>,
	Daniel Vetter <daniel.vetter@intel.com>,
	Sam Ravnborg <sam@ravnborg.org>, Helge Deller <deller@gmx.de>
Subject: [Intel-gfx] [PATCH v2 05/19] fbdev/sysfs: Fix locking
Date: Tue,  8 Feb 2022 22:08:10 +0100	[thread overview]
Message-ID: <20220208210824.2238981-6-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20220208210824.2238981-1-daniel.vetter@ffwll.ch>

fb_set_var requires we hold the fb_info lock. Or at least this now
matches what the ioctl does ...

Note that ps3fb and sh_mobile_lcdcfb are busted in different ways here,
but I will not fix them up.

Also in practice this isn't a big deal, because really variable fbdev
state is actually protected by console_lock (because fbcon just
doesn't bother with lock_fb_info() at all), and lock_fb_info
protecting anything is really just a neat lie. But that's a much
bigger fish to fry.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Qing Wang <wangqing@vivo.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
---
 drivers/video/fbdev/core/fbsysfs.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/video/fbdev/core/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c
index 26892940c213..8c1ee9ecec3d 100644
--- a/drivers/video/fbdev/core/fbsysfs.c
+++ b/drivers/video/fbdev/core/fbsysfs.c
@@ -91,9 +91,11 @@ static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var)
 
 	var->activate |= FB_ACTIVATE_FORCE;
 	console_lock();
+	lock_fb_info(fb_info);
 	err = fb_set_var(fb_info, var);
 	if (!err)
 		fbcon_update_vcs(fb_info, var->activate & FB_ACTIVATE_ALL);
+	unlock_fb_info(fb_info);
 	console_unlock();
 	if (err)
 		return err;
-- 
2.34.1


WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	linux-fbdev@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Sam Ravnborg <sam@ravnborg.org>,
	Daniel Vetter <daniel.vetter@intel.com>,
	Helge Deller <deller@gmx.de>, Daniel Vetter <daniel@ffwll.ch>,
	Qing Wang <wangqing@vivo.com>
Subject: [PATCH v2 05/19] fbdev/sysfs: Fix locking
Date: Tue,  8 Feb 2022 22:08:10 +0100	[thread overview]
Message-ID: <20220208210824.2238981-6-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20220208210824.2238981-1-daniel.vetter@ffwll.ch>

fb_set_var requires we hold the fb_info lock. Or at least this now
matches what the ioctl does ...

Note that ps3fb and sh_mobile_lcdcfb are busted in different ways here,
but I will not fix them up.

Also in practice this isn't a big deal, because really variable fbdev
state is actually protected by console_lock (because fbcon just
doesn't bother with lock_fb_info() at all), and lock_fb_info
protecting anything is really just a neat lie. But that's a much
bigger fish to fry.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Qing Wang <wangqing@vivo.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
---
 drivers/video/fbdev/core/fbsysfs.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/video/fbdev/core/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c
index 26892940c213..8c1ee9ecec3d 100644
--- a/drivers/video/fbdev/core/fbsysfs.c
+++ b/drivers/video/fbdev/core/fbsysfs.c
@@ -91,9 +91,11 @@ static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var)
 
 	var->activate |= FB_ACTIVATE_FORCE;
 	console_lock();
+	lock_fb_info(fb_info);
 	err = fb_set_var(fb_info, var);
 	if (!err)
 		fbcon_update_vcs(fb_info, var->activate & FB_ACTIVATE_ALL);
+	unlock_fb_info(fb_info);
 	console_unlock();
 	if (err)
 		return err;
-- 
2.34.1


  parent reply	other threads:[~2022-02-08 21:08 UTC|newest]

Thread overview: 145+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-08 21:08 [PATCH v2 00/19] fbcon patches, take two Daniel Vetter
2022-02-08 21:08 ` Daniel Vetter
2022-02-08 21:08 ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 01/19] fbcon: delete a few unneeded forward decl Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-10 11:17   ` Thomas Zimmermann
2022-02-10 11:17     ` [Intel-gfx] " Thomas Zimmermann
2022-02-10 11:17     ` Thomas Zimmermann
2022-02-08 21:08 ` [PATCH v2 02/19] fbcon: Move fbcon_bmove(_rec) functions Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 23:06   ` Javier Martinez Canillas
2022-02-08 23:06     ` [Intel-gfx] " Javier Martinez Canillas
2022-02-08 23:06     ` Javier Martinez Canillas
2022-02-10 11:17   ` Thomas Zimmermann
2022-02-10 11:17     ` [Intel-gfx] " Thomas Zimmermann
2022-02-10 11:17     ` Thomas Zimmermann
2022-02-08 21:08 ` [PATCH v2 03/19] fbcon: Introduce wrapper for console->fb_info lookup Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-10 11:18   ` Thomas Zimmermann
2022-02-10 11:18     ` [Intel-gfx] " Thomas Zimmermann
2022-02-10 11:18     ` Thomas Zimmermann
2022-02-08 21:08 ` [PATCH v2 04/19] fbcon: delete delayed loading code Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-10 11:20   ` Thomas Zimmermann
2022-02-10 11:20     ` [Intel-gfx] " Thomas Zimmermann
2022-02-10 11:20     ` Thomas Zimmermann
2022-02-08 21:08 ` Daniel Vetter [this message]
2022-02-08 21:08   ` [PATCH v2 05/19] fbdev/sysfs: Fix locking Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-10 11:22   ` Thomas Zimmermann
2022-02-10 11:22     ` [Intel-gfx] " Thomas Zimmermann
2022-02-08 21:08 ` [PATCH v2 06/19] fbcon: Use delayed work for cursor Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 23:59   ` Javier Martinez Canillas
2022-02-08 23:59     ` [Intel-gfx] " Javier Martinez Canillas
2022-02-08 23:59     ` Javier Martinez Canillas
2022-02-10 11:37   ` Thomas Zimmermann
2022-02-10 11:37     ` [Intel-gfx] " Thomas Zimmermann
2022-02-10 11:37     ` Thomas Zimmermann
2022-02-10 11:43   ` Tetsuo Handa
2022-02-10 11:43     ` [Intel-gfx] " Tetsuo Handa
2022-02-10 11:43     ` Tetsuo Handa
2022-04-05 20:54     ` Daniel Vetter
2022-04-05 20:54       ` Daniel Vetter
2022-04-05 20:54       ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 07/19] fbcon: Replace FBCON_FLAGS_INIT with a boolean Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 08/19] fb: Delete fb_info->queue Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-10 11:38   ` Thomas Zimmermann
2022-02-10 11:38     ` [Intel-gfx] " Thomas Zimmermann
2022-02-08 21:08 ` [PATCH v2 09/19] fbcon: Extract fbcon_open/release helpers Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-10 11:46   ` Thomas Zimmermann
2022-02-10 11:46     ` [Intel-gfx] " Thomas Zimmermann
2022-02-10 11:46     ` Thomas Zimmermann
2022-04-05  8:45     ` Daniel Vetter
2022-04-05  8:45       ` Daniel Vetter
2022-04-05  8:45       ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 10/19] fbcon: Ditch error handling for con2fb_release_oldinfo Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-10 14:14   ` Thomas Zimmermann
2022-02-10 14:14     ` [Intel-gfx] " Thomas Zimmermann
2022-02-10 14:14     ` Thomas Zimmermann
2022-02-08 21:08 ` [PATCH v2 11/19] fbcon: move more common code into fb_open() Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-10 14:16   ` Thomas Zimmermann
2022-02-10 14:16     ` [Intel-gfx] " Thomas Zimmermann
2022-02-10 14:16     ` Thomas Zimmermann
2022-02-08 21:08 ` [PATCH v2 12/19] fbcon: use lock_fb_info in fbcon_open/release Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 13/19] fbcon: Consistently protect deferred_takeover with console_lock() Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 14/19] fbcon: Move console_lock for register/unlink/unregister Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 15/19] fbcon: Move more code into fbcon_release Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 16/19] fbcon: untangle fbcon_exit Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 17/19] fbcon: Maintain a private array of fb_info Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08 ` [PATCH v2 18/19] Revert "fbdev: Prevent probing generic drivers if a FB is already registered" Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-09  0:19   ` Javier Martinez Canillas
2022-02-09  0:19     ` [Intel-gfx] " Javier Martinez Canillas
2022-02-09  0:19     ` Javier Martinez Canillas
2022-04-05  8:36     ` Daniel Vetter
2022-04-05  8:36       ` Daniel Vetter
2022-04-05  8:36       ` [Intel-gfx] " Daniel Vetter
2022-04-05  8:40       ` Daniel Vetter
2022-04-05  8:40         ` [Intel-gfx] " Daniel Vetter
2022-04-05  9:19         ` Javier Martinez Canillas
2022-04-05  9:19           ` [Intel-gfx] " Javier Martinez Canillas
2022-04-05  9:24           ` Daniel Vetter
2022-04-05  9:24             ` Daniel Vetter
2022-04-05  9:24             ` [Intel-gfx] " Daniel Vetter
2022-04-05  9:52             ` Javier Martinez Canillas
2022-04-05  9:52               ` Javier Martinez Canillas
2022-04-05  9:52               ` [Intel-gfx] " Javier Martinez Canillas
2022-04-05 10:34               ` Daniel Vetter
2022-04-05 10:34                 ` Daniel Vetter
2022-04-05 10:34                 ` [Intel-gfx] " Daniel Vetter
2022-04-05 13:24                 ` Geert Uytterhoeven
2022-04-05 13:24                   ` Geert Uytterhoeven
2022-04-05 13:24                   ` [Intel-gfx] " Geert Uytterhoeven
2022-04-05 13:33                   ` Greg KH
2022-04-05 13:33                     ` Greg KH
2022-04-05 13:33                     ` [Intel-gfx] " Greg KH
2022-04-05 16:12                     ` Daniel Vetter
2022-04-05 16:12                       ` Daniel Vetter
2022-04-05 16:12                       ` [Intel-gfx] " Daniel Vetter
2022-04-05 16:44                       ` Greg KH
2022-04-05 16:44                         ` [Intel-gfx] " Greg KH
2022-04-05 17:29                         ` Daniel Vetter
2022-04-05 17:29                           ` Daniel Vetter
2022-04-05 17:29                           ` [Intel-gfx] " Daniel Vetter
2022-04-07 17:26                           ` Greg KH
2022-04-07 17:26                             ` Greg KH
2022-04-07 17:26                             ` [Intel-gfx] " Greg KH
2022-04-05 13:25                 ` Javier Martinez Canillas
2022-04-05 13:25                   ` Javier Martinez Canillas
2022-04-05 13:25                   ` Javier Martinez Canillas
2022-02-08 21:08 ` [PATCH v2 19/19] fbdev: Make registered_fb[] private to fbmem.c Daniel Vetter
2022-02-08 21:08   ` [Intel-gfx] " Daniel Vetter
2022-02-08 21:08   ` Daniel Vetter
2022-02-08 23:15 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for fbcon patches, take two Patchwork
2022-02-08 23:18 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-02-08 23:50 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork

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=20220208210824.2238981-6-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=deller@gmx.de \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sam@ravnborg.org \
    --cc=wangqing@vivo.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.