From: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: Thomas Zimmermann <tzimmermann@suse.de>,
linux-fbdev@vger.kernel.org, Miko Larsson <mikoxyzzz@gmail.com>,
Helge Deller <deller@gmx.de>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Patrik Jakobsson <pjakobsson@suse.de>
Subject: Re: [PATCH] fbdev: Fix incorrect page mapping clearance at fb_deferred_io_release()
Date: Wed, 8 Mar 2023 10:08:24 +0100 [thread overview]
Message-ID: <CAMeQTsYSgXm=Sku99USE+Up+uuJHUFdE8zPj7_B=BUi5SH=6KQ@mail.gmail.com> (raw)
In-Reply-To: <20230308063628.15233-1-tiwai@suse.de>
On Wed, Mar 8, 2023 at 7:36 AM Takashi Iwai <tiwai@suse.de> wrote:
>
> The recent fix for the deferred I/O by the commit
> 3efc61d95259 ("fbdev: Fix invalid page access after closing deferred I/O devices")
> caused a regression when the same fb device is opened/closed while
> it's being used. It resulted in a frozen screen even if something
> is redrawn there after the close. The breakage is because the patch
> was made under a wrong assumption of a single open; in the current
> code, fb_deferred_io_release() cleans up the page mapping of the
> pageref list and it calls cancel_delayed_work_sync() unconditionally,
> where both are no correct behavior for multiple opens.
>
> This patch adds a refcount for the opens of the device, and applies
> the cleanup only when all files get closed.
>
> Fixes: 3efc61d95259 ("fbdev: Fix invalid page access after closing deferred I/O devices")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> drivers/video/fbdev/core/fb_defio.c | 16 +++++++++++++---
> include/linux/fb.h | 1 +
> 2 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
> index aa5f059d0222..9dcec9e020b6 100644
> --- a/drivers/video/fbdev/core/fb_defio.c
> +++ b/drivers/video/fbdev/core/fb_defio.c
> @@ -305,17 +305,19 @@ void fb_deferred_io_open(struct fb_info *info,
> struct inode *inode,
> struct file *file)
> {
> + struct fb_deferred_io *fbdefio = info->fbdefio;
> +
> file->f_mapping->a_ops = &fb_deferred_io_aops;
> + fbdefio->opens++;
> }
> EXPORT_SYMBOL_GPL(fb_deferred_io_open);
>
> -void fb_deferred_io_release(struct fb_info *info)
> +static void fb_deferred_io_release_internal(struct fb_info *info)
Maybe a better name would be fb_deferred_io_lastclose() to be more in
line with DRM?
> {
> struct fb_deferred_io *fbdefio = info->fbdefio;
> struct page *page;
> int i;
>
> - BUG_ON(!fbdefio);
Should the BUG_ON be put back into fb_deferred_io_release()?
> cancel_delayed_work_sync(&info->deferred_work);
>
> /* clear out the mapping that we setup */
> @@ -324,13 +326,21 @@ void fb_deferred_io_release(struct fb_info *info)
> page->mapping = NULL;
> }
> }
> +
> +void fb_deferred_io_release(struct fb_info *info)
> +{
> + struct fb_deferred_io *fbdefio = info->fbdefio;
> +
> + if (!--fbdefio->opens)
> + fb_deferred_io_release_internal(info);
I think this can race so we need locking.
> +}
> EXPORT_SYMBOL_GPL(fb_deferred_io_release);
>
> void fb_deferred_io_cleanup(struct fb_info *info)
> {
> struct fb_deferred_io *fbdefio = info->fbdefio;
>
> - fb_deferred_io_release(info);
> + fb_deferred_io_release_internal(info);
>
> kvfree(info->pagerefs);
> mutex_destroy(&fbdefio->lock);
> diff --git a/include/linux/fb.h b/include/linux/fb.h
> index d8d20514ea05..29674a29d1c4 100644
> --- a/include/linux/fb.h
> +++ b/include/linux/fb.h
> @@ -212,6 +212,7 @@ struct fb_deferred_io {
> /* delay between mkwrite and deferred handler */
> unsigned long delay;
> bool sort_pagereflist; /* sort pagelist by offset */
> + int opens; /* number of opened files */
I would prefer the name num_opens (or open_count as in DRM) instead of
opens since it can be interpreted as a verb.
Also, don't we need it to be atomic_t?
> struct mutex lock; /* mutex that protects the pageref list */
> struct list_head pagereflist; /* list of pagerefs for touched pages */
> /* callback */
> --
> 2.35.3
>
next prev parent reply other threads:[~2023-03-08 9:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 6:36 [PATCH] fbdev: Fix incorrect page mapping clearance at fb_deferred_io_release() Takashi Iwai
2023-03-08 9:08 ` Patrik Jakobsson [this message]
2023-03-08 9:14 ` Takashi Iwai
2023-03-08 9:34 ` Patrik Jakobsson
2023-03-08 10:54 ` kernel test robot
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='CAMeQTsYSgXm=Sku99USE+Up+uuJHUFdE8zPj7_B=BUi5SH=6KQ@mail.gmail.com' \
--to=patrik.r.jakobsson@gmail.com \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikoxyzzz@gmail.com \
--cc=pjakobsson@suse.de \
--cc=tiwai@suse.de \
--cc=tzimmermann@suse.de \
/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).