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>,
Daniel Vetter <daniel.vetter@intel.com>,
Helge Deller <deller@gmx.de>, Daniel Vetter <daniel@ffwll.ch>,
Qing Wang <wangqing@vivo.com>, Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH 07/21] fbdev/sysfs: Fix locking
Date: Mon, 31 Jan 2022 22:05:38 +0100 [thread overview]
Message-ID: <20220131210552.482606-8-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20220131210552.482606-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.
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.33.0
next prev parent reply other threads:[~2022-01-31 21:07 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-31 21:05 [PATCH 00/21] some fbcon patches, mostly locking Daniel Vetter
2022-01-31 21:05 ` [PATCH 01/21] MAINTAINERS: Add entry for fbdev core Daniel Vetter
2022-02-01 10:19 ` Thomas Zimmermann
2022-02-01 10:45 ` Greg Kroah-Hartman
2022-02-01 10:32 ` Helge Deller
2022-02-01 14:01 ` Javier Martinez Canillas
2022-02-01 14:47 ` Jani Nikula
2022-02-01 14:54 ` Geert Uytterhoeven
2022-02-01 20:47 ` Dave Airlie
2022-02-02 11:10 ` Daniel Stone
2022-02-02 11:18 ` Tomi Valkeinen
2022-02-02 11:31 ` Maxime Ripard
2022-02-02 13:48 ` Alex Deucher
2022-02-03 20:25 ` Sam Ravnborg
2022-02-08 14:12 ` Daniel Vetter
2022-01-31 21:05 ` [PATCH 02/21] fbcon: Resurrect fbcon accelerated scrolling code Daniel Vetter
2022-01-31 21:05 ` [PATCH 03/21] fbcon: Restore fbcon scrolling acceleration Daniel Vetter
2022-02-01 10:16 ` Helge Deller
2022-02-01 10:17 ` Helge Deller
2022-02-01 10:36 ` Daniel Vetter
2022-02-01 11:01 ` Helge Deller
2022-02-01 13:45 ` Daniel Vetter
2022-02-01 14:52 ` Helge Deller
2022-02-01 16:30 ` Daniel Vetter
2022-01-31 21:05 ` [PATCH 04/21] fbcon: delete a few unneeded forward decl Daniel Vetter
2022-02-03 20:30 ` Sam Ravnborg
2022-02-04 10:00 ` Geert Uytterhoeven
2022-01-31 21:05 ` [PATCH 05/21] fbcon: Introduce wrapper for console->fb_info lookup Daniel Vetter
2022-02-03 21:25 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 06/21] fbcon: delete delayed loading code Daniel Vetter
2022-02-03 20:45 ` Sam Ravnborg
2022-02-08 13:42 ` Daniel Vetter
2022-02-08 18:09 ` Sam Ravnborg
2022-01-31 21:05 ` Daniel Vetter [this message]
2022-02-03 21:27 ` [PATCH 07/21] fbdev/sysfs: Fix locking Sam Ravnborg
2022-01-31 21:05 ` [PATCH 08/21] fbcon: Use delayed work for cursor Daniel Vetter
2022-01-31 21:05 ` [PATCH 09/21] fbcon: Replace FBCON_FLAGS_INIT with a boolean Daniel Vetter
2022-02-01 10:37 ` Thomas Zimmermann
2022-02-03 13:47 ` Geert Uytterhoeven
2022-02-03 21:30 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 10/21] fb: Delete fb_info->queue Daniel Vetter
2022-02-03 21:31 ` Sam Ravnborg
2022-02-08 13:46 ` Daniel Vetter
2022-02-08 18:22 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 11/21] fbcon: Extract fbcon_open/release helpers Daniel Vetter
2022-02-03 21:15 ` Sam Ravnborg
2022-02-03 21:32 ` Sam Ravnborg
2022-02-08 13:48 ` Daniel Vetter
2022-02-08 18:24 ` Sam Ravnborg
2022-02-08 19:51 ` [Intel-gfx] " Daniel Vetter
2022-01-31 21:05 ` [PATCH 12/21] fbcon: Ditch error handling for con2fb_release_oldinfo Daniel Vetter
2022-02-03 21:16 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 13/21] fbcon: move more common code into fb_open() Daniel Vetter
2022-01-31 23:31 ` [Intel-gfx] " kernel test robot
2022-02-04 19:35 ` Sam Ravnborg
2022-02-08 13:53 ` Daniel Vetter
2022-02-08 18:25 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 14/21] fbcon: use lock_fb_info in fbcon_open/release Daniel Vetter
2022-02-04 19:39 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 15/21] fbcon: Consistently protect deferred_takeover with console_lock() Daniel Vetter
2022-02-04 19:45 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 16/21] fbcon: Move console_lock for register/unlink/unregister Daniel Vetter
2022-02-04 19:54 ` Sam Ravnborg
2022-02-08 13:56 ` Daniel Vetter
2022-01-31 21:05 ` [PATCH 17/21] fbcon: Move more code into fbcon_release Daniel Vetter
2022-02-04 19:55 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 18/21] fbcon: untangle fbcon_exit Daniel Vetter
2022-02-04 20:06 ` Sam Ravnborg
2022-02-08 13:58 ` Daniel Vetter
2022-02-08 18:27 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 19/21] fbcon: Maintain a private array of fb_info Daniel Vetter
2022-02-04 20:15 ` Sam Ravnborg
2022-02-08 14:03 ` Daniel Vetter
2022-02-08 18:55 ` Sam Ravnborg
2022-01-31 21:05 ` [PATCH 20/21] Revert "fbdev: Prevent probing generic drivers if a FB is already registered" Daniel Vetter
2022-01-31 21:05 ` [PATCH 21/21] fbdev: Make registered_fb[] private to fbmem.c Daniel Vetter
2022-02-01 8:13 ` [Intel-gfx] " kernel test robot
2022-02-04 8:30 ` Geert Uytterhoeven
2022-02-08 14:04 ` Daniel Vetter
2022-02-08 20:59 ` Daniel Vetter
2022-02-08 19:00 ` Sam Ravnborg
2022-02-08 20:56 ` Daniel Vetter
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=20220131210552.482606-8-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=daniel@ffwll.ch \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®