From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Qing Wang <wangqing@vivo.com>, Thomas Zimmermann <tzimmermann@suse.de>, Daniel Vetter <daniel.vetter@intel.com>, Sam Ravnborg <sam@ravnborg.org>, Helge Deller <deller@gmx.de> Subject: [PATCH v3 05/17] fbdev/sysfs: Fix locking Date: Tue, 5 Apr 2022 23:03:23 +0200 [thread overview] Message-ID: <20220405210335.3434130-6-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20220405210335.3434130-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: Thomas Zimmermann <tzimmermann@suse.de> 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: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Qing Wang <wangqing@vivo.com>, Thomas Zimmermann <tzimmermann@suse.de>, Daniel Vetter <daniel.vetter@intel.com>, Sam Ravnborg <sam@ravnborg.org>, Helge Deller <deller@gmx.de> Subject: [Intel-gfx] [PATCH v3 05/17] fbdev/sysfs: Fix locking Date: Tue, 5 Apr 2022 23:03:23 +0200 [thread overview] Message-ID: <20220405210335.3434130-6-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20220405210335.3434130-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: Thomas Zimmermann <tzimmermann@suse.de> 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
next prev parent reply other threads:[~2022-04-05 21:04 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-05 21:03 [PATCH v3 00/17] fbcon cleanups Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] [PATCH v3 01/17] fbcon: delete a few unneeded forward decl Daniel Vetter 2022-04-05 21:03 ` Daniel Vetter 2022-04-05 23:36 ` Fabio Estevam 2022-04-05 23:36 ` [Intel-gfx] " Fabio Estevam 2022-04-05 21:03 ` [PATCH v3 02/17] fbcon: Move fbcon_bmove(_rec) functions Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 03/17] fbcon: Introduce wrapper for console->fb_info lookup Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 04/17] fbcon: delete delayed loading code Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` Daniel Vetter [this message] 2022-04-05 21:03 ` [Intel-gfx] [PATCH v3 05/17] fbdev/sysfs: Fix locking Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 06/17] fbcon: Use delayed work for cursor Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 07/17] fbcon: Replace FBCON_FLAGS_INIT with a boolean Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 08/17] fb: Delete fb_info->queue Daniel Vetter 2022-04-05 21:03 ` Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 09/17] fbcon: Extract fbcon_open/release helpers Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 10/17] fbcon: Ditch error handling for con2fb_release_oldinfo Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 11/17] fbcon: move more common code into fb_open() Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 12/17] fbcon: use lock_fb_info in fbcon_open/release Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 13/17] fbcon: Consistently protect deferred_takeover with console_lock() Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 14/17] fbcon: Move console_lock for register/unlink/unregister Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-11 22:27 ` Nathan Chancellor 2022-04-11 22:27 ` [Intel-gfx] " Nathan Chancellor 2022-04-13 8:13 ` Daniel Vetter 2022-04-13 8:13 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 15/17] fbcon: Move more code into fbcon_release Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 16/17] fbcon: untangle fbcon_exit Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-05 21:03 ` [PATCH v3 17/17] fbcon: Maintain a private array of fb_info Daniel Vetter 2022-04-05 21:03 ` [Intel-gfx] " Daniel Vetter 2022-04-06 1:15 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for fbcon cleanups Patchwork 2022-04-06 1:17 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-04-06 1:21 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork 2022-04-06 1:45 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-04-06 7:09 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2022-04-08 7:51 ` [PATCH v3 00/17] " Daniel Vetter 2022-04-08 7:51 ` [Intel-gfx] " 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=20220405210335.3434130-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=sam@ravnborg.org \ --cc=tzimmermann@suse.de \ --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: linkBe 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.