From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, LKML <linux-kernel@vger.kernel.org>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Daniel Vetter" <daniel.vetter@intel.com>, "Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>, "Hans de Goede" <hdegoede@redhat.com>, "Noralf Trønnes" <noralf@tronnes.org>, "Yisheng Xie" <ysxie@foxmail.com>, "Konstantin Khorenko" <khorenko@virtuozzo.com>, "Prarit Bhargava" <prarit@redhat.com>, "Kees Cook" <keescook@chromium.org> Subject: [PATCH 09/33] fbcon: Remove fbcon_has_exited Date: Mon, 20 May 2019 10:21:52 +0200 [thread overview] Message-ID: <20190520082216.26273-10-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20190520082216.26273-1-daniel.vetter@ffwll.ch> This is unused code since commit 6104c37094e729f3d4ce65797002112735d49cd1 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Tue Aug 1 17:32:07 2017 +0200 fbcon: Make fbcon a built-time depency for fbdev when fbcon was made a compile-time static dependency of fbdev. We can't exit fbcon anymore without exiting fbdev first, which only works if all fbdev drivers have unloaded already. Hence this is all dead code. v2: I missed that fbcon_exit is also called from con_deinit stuff, and there fbcon_has_exited prevents double-cleanup. But we can fix that by properly resetting con2fb_map[] to all -1, which is used everywhere else to indicate "no fb_info allocate to this console". With that change the double-cleanup (which resulted in a module refcount underflow, among other things) is prevented. Aside: con2fb_map is a signed char, so don't register more than 128 fb_info or hilarity will ensue. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Hans de Goede <hdegoede@redhat.com> Cc: "Noralf Trønnes" <noralf@tronnes.org> Cc: Yisheng Xie <ysxie@foxmail.com> Cc: Konstantin Khorenko <khorenko@virtuozzo.com> Cc: Prarit Bhargava <prarit@redhat.com> Cc: Kees Cook <keescook@chromium.org> --- drivers/video/fbdev/core/fbcon.c | 33 +------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 2b2082615ca1..a1be589b692f 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -112,7 +112,6 @@ static int softback_lines; static int first_fb_vc; static int last_fb_vc = MAX_NR_CONSOLES - 1; static int fbcon_is_default = 1; -static int fbcon_has_exited; static int primary_device = -1; static int fbcon_has_console_bind; @@ -1050,7 +1049,6 @@ static const char *fbcon_startup(void) info->var.bits_per_pixel); fbcon_add_cursor_timer(info); - fbcon_has_exited = 0; return display_desc; } @@ -3336,14 +3334,6 @@ static int fbcon_event_notify(struct notifier_block *self, struct fb_blit_caps *caps; int idx, ret = 0; - /* - * ignore all events except driver registration and deregistration - * if fbcon is not active - */ - if (fbcon_has_exited && !(action == FB_EVENT_FB_REGISTERED || - action == FB_EVENT_FB_UNREGISTERED)) - goto done; - switch(action) { case FB_EVENT_SUSPEND: fbcon_suspended(info); @@ -3396,7 +3386,6 @@ static int fbcon_event_notify(struct notifier_block *self, fbcon_remap_all(idx); break; } -done: return ret; } @@ -3443,9 +3432,6 @@ static ssize_t store_rotate(struct device *device, int rotate, idx; char **last = NULL; - if (fbcon_has_exited) - return count; - console_lock(); idx = con2fb_map[fg_console]; @@ -3468,9 +3454,6 @@ static ssize_t store_rotate_all(struct device *device, int rotate, idx; char **last = NULL; - if (fbcon_has_exited) - return count; - console_lock(); idx = con2fb_map[fg_console]; @@ -3491,9 +3474,6 @@ static ssize_t show_rotate(struct device *device, struct fb_info *info; int rotate = 0, idx; - if (fbcon_has_exited) - return 0; - console_lock(); idx = con2fb_map[fg_console]; @@ -3514,9 +3494,6 @@ static ssize_t show_cursor_blink(struct device *device, struct fbcon_ops *ops; int idx, blink = -1; - if (fbcon_has_exited) - return 0; - console_lock(); idx = con2fb_map[fg_console]; @@ -3543,9 +3520,6 @@ static ssize_t store_cursor_blink(struct device *device, int blink, idx; char **last = NULL; - if (fbcon_has_exited) - return count; - console_lock(); idx = con2fb_map[fg_console]; @@ -3668,9 +3642,6 @@ static void fbcon_exit(void) struct fb_info *info; int i, j, mapped; - if (fbcon_has_exited) - return; - #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER if (deferred_takeover) { dummycon_unregister_output_notifier(&fbcon_output_nb); @@ -3695,7 +3666,7 @@ static void fbcon_exit(void) for (j = first_fb_vc; j <= last_fb_vc; j++) { if (con2fb_map[j] == i) { mapped = 1; - break; + con2fb_map[j] = -1; } } @@ -3718,8 +3689,6 @@ static void fbcon_exit(void) info->queue.func = NULL; } } - - fbcon_has_exited = 1; } void __init fb_console_init(void) -- 2.20.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: "Prarit Bhargava" <prarit@redhat.com>, "Kees Cook" <keescook@chromium.org>, "Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, LKML <linux-kernel@vger.kernel.org>, "Yisheng Xie" <ysxie@foxmail.com>, "Noralf Trønnes" <noralf@tronnes.org>, "Daniel Vetter" <daniel.vetter@intel.com>, "Konstantin Khorenko" <khorenko@virtuozzo.com> Subject: [PATCH 09/33] fbcon: Remove fbcon_has_exited Date: Mon, 20 May 2019 10:21:52 +0200 [thread overview] Message-ID: <20190520082216.26273-10-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20190520082216.26273-1-daniel.vetter@ffwll.ch> This is unused code since commit 6104c37094e729f3d4ce65797002112735d49cd1 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Tue Aug 1 17:32:07 2017 +0200 fbcon: Make fbcon a built-time depency for fbdev when fbcon was made a compile-time static dependency of fbdev. We can't exit fbcon anymore without exiting fbdev first, which only works if all fbdev drivers have unloaded already. Hence this is all dead code. v2: I missed that fbcon_exit is also called from con_deinit stuff, and there fbcon_has_exited prevents double-cleanup. But we can fix that by properly resetting con2fb_map[] to all -1, which is used everywhere else to indicate "no fb_info allocate to this console". With that change the double-cleanup (which resulted in a module refcount underflow, among other things) is prevented. Aside: con2fb_map is a signed char, so don't register more than 128 fb_info or hilarity will ensue. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Hans de Goede <hdegoede@redhat.com> Cc: "Noralf Trønnes" <noralf@tronnes.org> Cc: Yisheng Xie <ysxie@foxmail.com> Cc: Konstantin Khorenko <khorenko@virtuozzo.com> Cc: Prarit Bhargava <prarit@redhat.com> Cc: Kees Cook <keescook@chromium.org> --- drivers/video/fbdev/core/fbcon.c | 33 +------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 2b2082615ca1..a1be589b692f 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -112,7 +112,6 @@ static int softback_lines; static int first_fb_vc; static int last_fb_vc = MAX_NR_CONSOLES - 1; static int fbcon_is_default = 1; -static int fbcon_has_exited; static int primary_device = -1; static int fbcon_has_console_bind; @@ -1050,7 +1049,6 @@ static const char *fbcon_startup(void) info->var.bits_per_pixel); fbcon_add_cursor_timer(info); - fbcon_has_exited = 0; return display_desc; } @@ -3336,14 +3334,6 @@ static int fbcon_event_notify(struct notifier_block *self, struct fb_blit_caps *caps; int idx, ret = 0; - /* - * ignore all events except driver registration and deregistration - * if fbcon is not active - */ - if (fbcon_has_exited && !(action == FB_EVENT_FB_REGISTERED || - action == FB_EVENT_FB_UNREGISTERED)) - goto done; - switch(action) { case FB_EVENT_SUSPEND: fbcon_suspended(info); @@ -3396,7 +3386,6 @@ static int fbcon_event_notify(struct notifier_block *self, fbcon_remap_all(idx); break; } -done: return ret; } @@ -3443,9 +3432,6 @@ static ssize_t store_rotate(struct device *device, int rotate, idx; char **last = NULL; - if (fbcon_has_exited) - return count; - console_lock(); idx = con2fb_map[fg_console]; @@ -3468,9 +3454,6 @@ static ssize_t store_rotate_all(struct device *device, int rotate, idx; char **last = NULL; - if (fbcon_has_exited) - return count; - console_lock(); idx = con2fb_map[fg_console]; @@ -3491,9 +3474,6 @@ static ssize_t show_rotate(struct device *device, struct fb_info *info; int rotate = 0, idx; - if (fbcon_has_exited) - return 0; - console_lock(); idx = con2fb_map[fg_console]; @@ -3514,9 +3494,6 @@ static ssize_t show_cursor_blink(struct device *device, struct fbcon_ops *ops; int idx, blink = -1; - if (fbcon_has_exited) - return 0; - console_lock(); idx = con2fb_map[fg_console]; @@ -3543,9 +3520,6 @@ static ssize_t store_cursor_blink(struct device *device, int blink, idx; char **last = NULL; - if (fbcon_has_exited) - return count; - console_lock(); idx = con2fb_map[fg_console]; @@ -3668,9 +3642,6 @@ static void fbcon_exit(void) struct fb_info *info; int i, j, mapped; - if (fbcon_has_exited) - return; - #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER if (deferred_takeover) { dummycon_unregister_output_notifier(&fbcon_output_nb); @@ -3695,7 +3666,7 @@ static void fbcon_exit(void) for (j = first_fb_vc; j <= last_fb_vc; j++) { if (con2fb_map[j] == i) { mapped = 1; - break; + con2fb_map[j] = -1; } } @@ -3718,8 +3689,6 @@ static void fbcon_exit(void) info->queue.func = NULL; } } - - fbcon_has_exited = 1; } void __init fb_console_init(void) -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-05-20 8:24 UTC|newest] Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-20 8:21 [PATCH 00/33] fbcon notifier begone! Daniel Vetter 2019-05-20 8:21 ` [PATCH 01/33] dummycon: Sprinkle locking checks Daniel Vetter 2019-05-20 8:21 ` [PATCH 02/33] fbdev: locking check for fb_set_suspend Daniel Vetter 2019-05-20 8:21 ` [PATCH 03/33] vt: might_sleep() annotation for do_blank_screen Daniel Vetter 2019-05-20 8:21 ` [PATCH 04/33] vt: More locking checks Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:21 ` [PATCH 05/33] fbdev/sa1100fb: Remove dead code Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:21 ` [PATCH 06/33] fbdev/cyber2000: Remove struct display Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:21 ` [PATCH 07/33] fbdev/aty128fb: Remove dead code Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:21 ` [PATCH 08/33] fbcon: s/struct display/struct fbcon_display/ Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter [this message] 2019-05-20 8:21 ` [PATCH 09/33] fbcon: Remove fbcon_has_exited Daniel Vetter 2019-05-21 14:23 ` [PATCH] " Daniel Vetter 2019-05-22 10:04 ` Bartlomiej Zolnierkiewicz 2019-05-22 10:04 ` Bartlomiej Zolnierkiewicz 2019-05-22 10:38 ` Daniel Vetter 2019-05-20 8:21 ` [PATCH 10/33] fbcon: call fbcon_fb_(un)registered directly Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:33 ` Thomas Zimmermann 2019-05-20 8:33 ` Thomas Zimmermann 2019-05-20 8:37 ` Thomas Zimmermann 2019-05-20 8:37 ` Thomas Zimmermann 2019-05-21 15:09 ` Daniel Vetter 2019-05-21 15:09 ` Daniel Vetter 2019-05-20 17:08 ` Sam Ravnborg 2019-05-20 17:08 ` Sam Ravnborg 2019-05-20 17:08 ` Sam Ravnborg 2019-05-20 17:25 ` Daniel Vetter 2019-05-20 17:25 ` Daniel Vetter 2019-05-20 8:21 ` [PATCH 11/33] fbdev/sh_mobile: remove sh_mobile_lcdc_display_notify Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 9:04 ` Geert Uytterhoeven 2019-05-20 8:21 ` [PATCH 12/33] fbdev/omap: sysfs files can't disappear before the device is gone Daniel Vetter 2019-05-20 8:21 ` [PATCH 13/33] fbdev: " Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:21 ` [PATCH 14/33] staging/olpc: lock_fb_info can't fail Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:21 ` [PATCH 15/33] fbdev/atyfb: " Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:21 ` [PATCH 16/33] fbdev: lock_fb_info cannot fail Daniel Vetter 2019-05-20 8:21 ` Daniel Vetter 2019-05-20 8:22 ` [PATCH 17/33] fbcon: call fbcon_fb_bind directly Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-20 8:22 ` [PATCH 18/33] fbdev: make unregister/unlink functions not fail Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-20 19:08 ` [Intel-gfx] " kbuild test robot 2019-05-20 19:08 ` kbuild test robot 2019-05-20 19:08 ` kbuild test robot 2019-05-20 19:25 ` kbuild test robot 2019-05-20 19:25 ` kbuild test robot 2019-05-20 19:25 ` [Intel-gfx] " kbuild test robot 2019-05-20 21:45 ` kbuild test robot 2019-05-20 21:45 ` kbuild test robot 2019-05-20 21:45 ` kbuild test robot 2019-05-20 8:22 ` [PATCH 19/33] fbdev: unify unlink_framebufer paths Daniel Vetter 2019-05-21 10:52 ` Maarten Lankhorst 2019-05-20 8:22 ` [PATCH 20/33] fbdev/sh_mob: Remove fb notifier callback Daniel Vetter 2019-05-20 9:05 ` Geert Uytterhoeven 2019-05-20 9:19 ` Daniel Vetter 2019-05-20 8:22 ` [PATCH 21/33] fbdev: directly call fbcon_suspended/resumed Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-20 19:24 ` kbuild test robot 2019-05-20 19:24 ` kbuild test robot 2019-05-20 19:24 ` kbuild test robot 2019-05-20 8:22 ` [PATCH 22/33] fbcon: Call fbcon_mode_deleted/new_modelist directly Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-20 8:22 ` [PATCH 23/33] fbdev: Call fbcon_get_requirement directly Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-20 8:22 ` [PATCH 24/33] Revert "backlight/fbcon: Add FB_EVENT_CONBLANK" Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-20 8:22 ` [PATCH 25/33] fbcon: directly call fbcon_fb_blanked Daniel Vetter 2019-05-20 8:22 ` [PATCH 26/33] fbmem: pull fbcon_fb_blanked out of fb_blank Daniel Vetter 2019-05-20 8:22 ` [PATCH 27/33] fbdev: remove FBINFO_MISC_USEREVENT around fb_blank Daniel Vetter 2019-05-20 17:20 ` Sam Ravnborg 2019-05-20 17:20 ` Sam Ravnborg 2019-05-20 17:29 ` Daniel Vetter 2019-05-20 17:29 ` Daniel Vetter 2019-05-20 17:53 ` Sam Ravnborg 2019-05-20 8:22 ` [PATCH 28/33] fb: Flatten control flow in fb_set_var Daniel Vetter 2019-05-20 8:22 ` [PATCH 29/33] fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-21 10:56 ` Maarten Lankhorst 2019-05-21 10:56 ` Maarten Lankhorst 2019-05-21 12:42 ` Daniel Vetter 2019-05-21 12:42 ` Daniel Vetter 2019-05-21 12:42 ` Daniel Vetter 2019-05-20 8:22 ` [PATCH 30/33] vgaswitcheroo: call fbcon_remap_all directly Daniel Vetter 2019-05-20 8:22 ` Daniel Vetter 2019-05-20 8:37 ` Lukas Wunner 2019-05-20 8:37 ` Lukas Wunner 2019-05-20 8:22 ` [PATCH 31/33] fbcon: Call con2fb_map functions directly Daniel Vetter 2019-05-20 19:28 ` [Intel-gfx] " kbuild test robot 2019-05-20 19:28 ` kbuild test robot 2019-05-20 19:34 ` [Intel-gfx] " kbuild test robot 2019-05-20 19:34 ` kbuild test robot 2019-05-20 8:22 ` [PATCH 32/33] fbcon: Document what I learned about fbcon locking Daniel Vetter 2019-05-21 11:13 ` Maarten Lankhorst 2019-05-20 8:22 ` [PATCH 33/33] staging/olpc_dcon: Add drm conversion to TODO Daniel Vetter 2019-05-20 8:30 ` ✗ Fi.CI.CHECKPATCH: warning for fbcon notifier begone! Patchwork 2019-05-20 8:41 ` ✗ Fi.CI.BAT: failure " Patchwork 2019-05-20 8:44 ` ✗ Fi.CI.SPARSE: warning " Patchwork 2019-05-21 17:08 ` ✗ Fi.CI.CHECKPATCH: warning for fbcon notifier begone! (rev2) Patchwork 2019-05-21 17:22 ` ✗ Fi.CI.SPARSE: " Patchwork 2019-05-21 17:29 ` ✗ Fi.CI.BAT: failure " Patchwork 2019-05-22 8:15 ` ✓ Fi.CI.BAT: success " Patchwork 2019-05-22 18:43 ` ✓ Fi.CI.IGT: " Patchwork 2019-05-24 8:53 [PATCH 00/33] fbcon notifier begone! Daniel Vetter 2019-05-24 8:53 ` [PATCH 09/33] fbcon: Remove fbcon_has_exited Daniel Vetter 2019-05-25 15:38 ` Sam Ravnborg 2019-05-25 15:38 ` Sam Ravnborg 2019-05-27 6:10 ` Daniel Vetter 2019-05-27 6:10 ` Daniel Vetter 2019-05-27 6:51 ` Sam Ravnborg 2019-05-27 6:51 ` Sam Ravnborg 2019-05-28 9:02 [PATCH 00/33] fbcon notifier begone v3! Daniel Vetter 2019-05-28 9:02 ` [PATCH 09/33] fbcon: Remove fbcon_has_exited Daniel Vetter 2019-05-28 9:02 ` Daniel Vetter 2019-05-28 9:02 ` 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=20190520082216.26273-10-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=b.zolnierkie@samsung.com \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=hdegoede@redhat.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=keescook@chromium.org \ --cc=khorenko@virtuozzo.com \ --cc=linux-kernel@vger.kernel.org \ --cc=noralf@tronnes.org \ --cc=prarit@redhat.com \ --cc=ysxie@foxmail.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.