| Message ID | 20220425112751.25985-3-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | fbdev: Decouple deferred I/O from struct page | expand |
Hi Thomas, a little ramblings below. Just my thoughts while trying to understand the code - especially since I looked at it before. Sam On Mon, Apr 25, 2022 at 01:27:50PM +0200, Thomas Zimmermann wrote: > Store the per-page state for fbdev's deferred I/O in struct > fb_deferred_io_pageref. Maintain a list of pagerefs for the pages > that have to be written back to video memory. Update all affected > drivers. > > As with pages before, fbdev acquires a pageref when an mmaped page > of the framebuffer is being written to. It holds the pageref in a > list of all currently written pagerefs until it flushes the written > pages to video memory. Writeback occurs periodically. After writeback > fbdev releases all pagerefs and builds up a new dirty list until the > next writeback occurs. > > Using pagerefs has a number of benefits. > > For pages of the framebuffer, the deferred I/O code used struct > page.lru as an entry into the list of dirty pages. The lru field is > owned by the page cache, which makes deferred I/O incompatible with > some memory pages (e.g., most notably DRM's GEM SHMEM allocator). > struct fb_deferred_io_pageref now provides an entry into a list of > dirty framebuffer pages, freeing lru for use with the page cache. > > Drivers also assumed that struct page.index is the page offset into > the framebuffer. This is not true for DRM buffers, which are located > at various offset within a mapped area. struct fb_deferred_io_pageref > explicitly stores an offset into the framebuffer. struct page.index > is now only the page offset into the mapped area. > > These changes will allow DRM to use fbdev deferred I/O without an > intermediate shadow buffer. > > v2: > * minor fixes in commit message > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> > --- > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c > index 02a4a4fa3da3..db02e17e12b6 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c > @@ -322,12 +322,13 @@ static void vmw_deferred_io(struct fb_info *info, > struct vmw_fb_par *par = info->par; > unsigned long start, end, min, max; > unsigned long flags; > - struct page *page; > + struct fb_deferred_io_pageref *pageref; > int y1, y2; > > min = ULONG_MAX; > max = 0; > - list_for_each_entry(page, pagelist, lru) { > + list_for_each_entry(pageref, pagelist, list) { > + struct page *page = pageref->page; > start = page->index << PAGE_SHIFT; > end = start + PAGE_SIZE - 1; > min = min(min, start); This is the same change in all deferred_io drivers like above. We now traverse pageref->list where pagelist points to the head. It took me a while to understand that pagelist points to a list of fb_deferred_io_pageref and not a list of pages. I had been helped, had this been renamed to s/pagelist/pagereflist/. If you see no point in this then just ignore my comment, I have not stared at kernel code for a while and is thus easy to confuse. > diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c > index 6924d489a289..a03b9c64fc61 100644 > --- a/drivers/video/fbdev/core/fb_defio.c > +++ b/drivers/video/fbdev/core/fb_defio.c > @@ -36,6 +36,60 @@ static struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs > return page; > } > > +static struct fb_deferred_io_pageref *fb_deferred_io_pageref_get(struct fb_info *info, > + unsigned long offset, > + struct page *page) > +{ > + struct fb_deferred_io *fbdefio = info->fbdefio; > + struct list_head *pos = &fbdefio->pagelist; > + unsigned long pgoff = offset >> PAGE_SHIFT; > + struct fb_deferred_io_pageref *pageref, *cur; > + > + if (WARN_ON_ONCE(pgoff >= info->npagerefs)) > + return NULL; /* incorrect allocation size */ > + > + /* 1:1 mapping between pageref and page offset */ > + pageref = &info->pagerefs[pgoff]; > + > + /* > + * This check is to catch the case where a new process could start > + * writing to the same page through a new PTE. This new access > + * can cause a call to .page_mkwrite even if the original process' > + * PTE is marked writable. > + */ > + if (!list_empty(&pageref->list)) > + goto pageref_already_added; > + > + pageref->page = page; > + pageref->offset = pgoff << PAGE_SHIFT; > + > + if (unlikely(fbdefio->sort_pagelist)) { > + /* > + * We loop through the list of pagerefs before adding, in > + * order to keep the pagerefs sorted. This has significant > + * overhead of O(n^2) with n being the number of written > + * pages. If possible, drivers should try to work with > + * unsorted page lists instead. > + */ > + list_for_each_entry(cur, &info->fbdefio->pagelist, list) { > + if (cur > pageref) > + break; > + } > + pos = &cur->list; > + } > + > + list_add_tail(&pageref->list, pos); > + > +pageref_already_added: > + return pageref; > +} > + > +static void fb_deferred_io_pageref_put(struct fb_deferred_io_pageref *pageref, > + struct fb_info *info) > +{ > + list_del_init(&pageref->list); > +} > + > /* this is to find and return the vmalloc-ed fb pages */ > static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf) > { > @@ -59,7 +113,7 @@ static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf) > printk(KERN_ERR "no mapping available\n"); > > BUG_ON(!page->mapping); > - page->index = vmf->pgoff; > + page->index = vmf->pgoff; /* for page_mkclean() */ > > vmf->page = page; > return 0; > @@ -95,7 +149,11 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) > struct page *page = vmf->page; > struct fb_info *info = vmf->vma->vm_private_data; > struct fb_deferred_io *fbdefio = info->fbdefio; > - struct list_head *pos = &fbdefio->pagelist; > + struct fb_deferred_io_pageref *pageref; > + unsigned long offset; > + vm_fault_t ret; > + > + offset = (vmf->address - vmf->vma->vm_start); > > /* this is a callback we get when userspace first tries to > write to the page. we schedule a workqueue. that workqueue > @@ -112,6 +170,12 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) > if (fbdefio->first_io && list_empty(&fbdefio->pagelist)) > fbdefio->first_io(info); > > + pageref = fb_deferred_io_pageref_get(info, offset, page); Compared to the old code we now do all the sorting and stuff without the page locked, which seem like a big change. > + if (WARN_ON_ONCE(!pageref)) { > + ret = VM_FAULT_OOM; > + goto err_mutex_unlock; > + } > + > /* > * We want the page to remain locked from ->page_mkwrite until > * the PTE is marked dirty to avoid page_mkclean() being called > @@ -120,47 +184,17 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) > * Do this by locking the page here and informing the caller > * about it with VM_FAULT_LOCKED. > */ > - lock_page(page); > - > - /* > - * This check is to catch the case where a new process could start > - * writing to the same page through a new PTE. This new access > - * can cause a call to .page_mkwrite even if the original process' > - * PTE is marked writable. > - * > - * TODO: The lru field is owned by the page cache; hence the name. > - * We dequeue in fb_deferred_io_work() after flushing the > - * page's content into video memory. Instead of lru, fbdefio > - * should have it's own field. > - */ > - if (!list_empty(&page->lru)) > - goto page_already_added; > - > - if (unlikely(fbdefio->sort_pagelist)) { > - /* > - * We loop through the pagelist before adding in order to > - * keep the pagelist sorted. This has significant overhead > - * of O(n^2) with n being the number of written pages. If > - * possible, drivers should try to work with unsorted page > - * lists instead. > - */ > - struct page *cur; > - > - list_for_each_entry(cur, &fbdefio->pagelist, lru) { > - if (cur->index > page->index) > - break; > - } > - pos = &cur->lru; > - } > - > - list_add_tail(&page->lru, pos); > + lock_page(pageref->page); > > -page_already_added: > mutex_unlock(&fbdefio->lock); > > /* come back after delay to process the deferred IO */ > schedule_delayed_work(&info->deferred_work, fbdefio->delay); > return VM_FAULT_LOCKED; > + > +err_mutex_unlock: > + mutex_unlock(&fbdefio->lock); > + return ret; > } > > static const struct vm_operations_struct fb_deferred_io_vm_ops = { > @@ -186,15 +220,14 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_mmap); > /* workqueue callback */ > static void fb_deferred_io_work(struct work_struct *work) > { > - struct fb_info *info = container_of(work, struct fb_info, > - deferred_work.work); > - struct list_head *node, *next; > - struct page *cur; > + struct fb_info *info = container_of(work, struct fb_info, deferred_work.work); > + struct fb_deferred_io_pageref *pageref, *next; > struct fb_deferred_io *fbdefio = info->fbdefio; > > /* here we mkclean the pages, then do all deferred IO */ > mutex_lock(&fbdefio->lock); > - list_for_each_entry(cur, &fbdefio->pagelist, lru) { > + list_for_each_entry(pageref, &fbdefio->pagelist, list) { > + struct page *cur = pageref->page; > lock_page(cur); > page_mkclean(cur); > unlock_page(cur); > @@ -204,30 +237,48 @@ static void fb_deferred_io_work(struct work_struct *work) > fbdefio->deferred_io(info, &fbdefio->pagelist); > > /* clear the list */ > - list_for_each_safe(node, next, &fbdefio->pagelist) { > - list_del_init(node); > - } > + list_for_each_entry_safe(pageref, next, &fbdefio->pagelist, list) > + fb_deferred_io_pageref_put(pageref, info); > + > mutex_unlock(&fbdefio->lock); > } > > -void fb_deferred_io_init(struct fb_info *info) > +int fb_deferred_io_init(struct fb_info *info) > { > struct fb_deferred_io *fbdefio = info->fbdefio; > - struct page *page; > - unsigned int i; > + struct fb_deferred_io_pageref *pagerefs; > + unsigned long npagerefs, i; > + int ret; > > BUG_ON(!fbdefio); > + > + if (WARN_ON(!info->fix.smem_len)) > + return -EINVAL; > + > mutex_init(&fbdefio->lock); > INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work); > INIT_LIST_HEAD(&fbdefio->pagelist); > if (fbdefio->delay == 0) /* set a default of 1 s */ > fbdefio->delay = HZ; > > - /* initialize all the page lists one time */ > - for (i = 0; i < info->fix.smem_len; i += PAGE_SIZE) { > - page = fb_deferred_io_page(info, i); > - INIT_LIST_HEAD(&page->lru); > + npagerefs = DIV_ROUND_UP(info->fix.smem_len, PAGE_SIZE); > + > + /* alloc a page ref for each page of the display memory */ > + pagerefs = kvcalloc(npagerefs, sizeof(*pagerefs), GFP_KERNEL); > + if (!pagerefs) { > + ret = -ENOMEM; > + goto err; > } > + for (i = 0; i < npagerefs; ++i) > + INIT_LIST_HEAD(&pagerefs[i].list); > + info->npagerefs = npagerefs; > + info->pagerefs = pagerefs; > + > + return 0; > + > +err: > + mutex_destroy(&fbdefio->lock); > + return ret; > } > EXPORT_SYMBOL_GPL(fb_deferred_io_init); > > @@ -254,6 +305,7 @@ void fb_deferred_io_cleanup(struct fb_info *info) > page->mapping = NULL; > } > > + kvfree(info->pagerefs); > mutex_destroy(&fbdefio->lock); > } > EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup); > diff --git a/include/linux/fb.h b/include/linux/fb.h > index f95da1af9ff6..a332590c0fae 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -201,6 +201,13 @@ struct fb_pixmap { > }; > > #ifdef CONFIG_FB_DEFERRED_IO > +struct fb_deferred_io_pageref { > + struct page *page; > + unsigned long offset; > + /* private */ > + struct list_head list; This is the list of pages - so this could be named pagelist... > +}; > + > struct fb_deferred_io { > /* delay between mkwrite and deferred handler */ > unsigned long delay; > @@ -468,6 +475,8 @@ struct fb_info { > #endif > #ifdef CONFIG_FB_DEFERRED_IO > struct delayed_work deferred_work; > + unsigned long npagerefs; > + struct fb_deferred_io_pageref *pagerefs; > struct fb_deferred_io *fbdefio; > #endif > > @@ -661,7 +670,7 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, > > /* drivers/video/fb_defio.c */ > int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma); > -extern void fb_deferred_io_init(struct fb_info *info); > +extern int fb_deferred_io_init(struct fb_info *info); > extern void fb_deferred_io_open(struct fb_info *info, > struct inode *inode, > struct file *file); > -- > 2.36.0
Hi Am 25.04.22 um 20:17 schrieb Sam Ravnborg: > Hi Thomas, > > a little ramblings below. Just my thoughts while trying to understand > the code - especially since I looked at it before. Thanks for reviewing the patches. > > Sam > > On Mon, Apr 25, 2022 at 01:27:50PM +0200, Thomas Zimmermann wrote: >> Store the per-page state for fbdev's deferred I/O in struct >> fb_deferred_io_pageref. Maintain a list of pagerefs for the pages >> that have to be written back to video memory. Update all affected >> drivers. >> >> As with pages before, fbdev acquires a pageref when an mmaped page >> of the framebuffer is being written to. It holds the pageref in a >> list of all currently written pagerefs until it flushes the written >> pages to video memory. Writeback occurs periodically. After writeback >> fbdev releases all pagerefs and builds up a new dirty list until the >> next writeback occurs. >> >> Using pagerefs has a number of benefits. >> >> For pages of the framebuffer, the deferred I/O code used struct >> page.lru as an entry into the list of dirty pages. The lru field is >> owned by the page cache, which makes deferred I/O incompatible with >> some memory pages (e.g., most notably DRM's GEM SHMEM allocator). >> struct fb_deferred_io_pageref now provides an entry into a list of >> dirty framebuffer pages, freeing lru for use with the page cache. >> >> Drivers also assumed that struct page.index is the page offset into >> the framebuffer. This is not true for DRM buffers, which are located >> at various offset within a mapped area. struct fb_deferred_io_pageref >> explicitly stores an offset into the framebuffer. struct page.index >> is now only the page offset into the mapped area. >> >> These changes will allow DRM to use fbdev deferred I/O without an >> intermediate shadow buffer. >> >> v2: >> * minor fixes in commit message >> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> >> --- > > >> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c >> index 02a4a4fa3da3..db02e17e12b6 100644 >> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c >> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c >> @@ -322,12 +322,13 @@ static void vmw_deferred_io(struct fb_info *info, >> struct vmw_fb_par *par = info->par; >> unsigned long start, end, min, max; >> unsigned long flags; >> - struct page *page; >> + struct fb_deferred_io_pageref *pageref; >> int y1, y2; >> >> min = ULONG_MAX; >> max = 0; >> - list_for_each_entry(page, pagelist, lru) { >> + list_for_each_entry(pageref, pagelist, list) { >> + struct page *page = pageref->page; >> start = page->index << PAGE_SHIFT; >> end = start + PAGE_SIZE - 1; >> min = min(min, start); > > This is the same change in all deferred_io drivers like above. > We now traverse pageref->list where pagelist points to the head. > > It took me a while to understand that pagelist points to a list of > fb_deferred_io_pageref and not a list of pages. > I had been helped, had this been renamed to s/pagelist/pagereflist/. > > If you see no point in this then just ignore my comment, I have not > stared at kernel code for a while and is thus easy to confuse. It's a good point. There's already a lot going on in this patch and I wanted to minimize the fallout. But I'll add an additional patch that fixes the naming. > >> diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c >> index 6924d489a289..a03b9c64fc61 100644 >> --- a/drivers/video/fbdev/core/fb_defio.c >> +++ b/drivers/video/fbdev/core/fb_defio.c >> @@ -36,6 +36,60 @@ static struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs >> return page; >> } >> >> +static struct fb_deferred_io_pageref *fb_deferred_io_pageref_get(struct fb_info *info, >> + unsigned long offset, >> + struct page *page) >> +{ >> + struct fb_deferred_io *fbdefio = info->fbdefio; >> + struct list_head *pos = &fbdefio->pagelist; >> + unsigned long pgoff = offset >> PAGE_SHIFT; >> + struct fb_deferred_io_pageref *pageref, *cur; >> + >> + if (WARN_ON_ONCE(pgoff >= info->npagerefs)) >> + return NULL; /* incorrect allocation size */ >> + >> + /* 1:1 mapping between pageref and page offset */ >> + pageref = &info->pagerefs[pgoff]; >> + >> + /* >> + * This check is to catch the case where a new process could start >> + * writing to the same page through a new PTE. This new access >> + * can cause a call to .page_mkwrite even if the original process' >> + * PTE is marked writable. >> + */ >> + if (!list_empty(&pageref->list)) >> + goto pageref_already_added; >> + >> + pageref->page = page; >> + pageref->offset = pgoff << PAGE_SHIFT; >> + >> + if (unlikely(fbdefio->sort_pagelist)) { >> + /* >> + * We loop through the list of pagerefs before adding, in >> + * order to keep the pagerefs sorted. This has significant >> + * overhead of O(n^2) with n being the number of written >> + * pages. If possible, drivers should try to work with >> + * unsorted page lists instead. >> + */ >> + list_for_each_entry(cur, &info->fbdefio->pagelist, list) { >> + if (cur > pageref) >> + break; >> + } >> + pos = &cur->list; >> + } >> + >> + list_add_tail(&pageref->list, pos); >> + >> +pageref_already_added: >> + return pageref; >> +} >> + >> +static void fb_deferred_io_pageref_put(struct fb_deferred_io_pageref *pageref, >> + struct fb_info *info) >> +{ >> + list_del_init(&pageref->list); >> +} >> + >> /* this is to find and return the vmalloc-ed fb pages */ >> static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf) >> { >> @@ -59,7 +113,7 @@ static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf) >> printk(KERN_ERR "no mapping available\n"); >> >> BUG_ON(!page->mapping); >> - page->index = vmf->pgoff; >> + page->index = vmf->pgoff; /* for page_mkclean() */ >> >> vmf->page = page; >> return 0; >> @@ -95,7 +149,11 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) >> struct page *page = vmf->page; >> struct fb_info *info = vmf->vma->vm_private_data; >> struct fb_deferred_io *fbdefio = info->fbdefio; >> - struct list_head *pos = &fbdefio->pagelist; >> + struct fb_deferred_io_pageref *pageref; >> + unsigned long offset; >> + vm_fault_t ret; >> + >> + offset = (vmf->address - vmf->vma->vm_start); >> >> /* this is a callback we get when userspace first tries to >> write to the page. we schedule a workqueue. that workqueue >> @@ -112,6 +170,12 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) >> if (fbdefio->first_io && list_empty(&fbdefio->pagelist)) >> fbdefio->first_io(info); >> >> + pageref = fb_deferred_io_pageref_get(info, offset, page); > Compared to the old code we now do all the sorting and stuff without > the page locked, which seem like a big change. We never touch any of the page's fields in fb_deferred_io_pageref_get(). It's only used to initialize the pageref's page pointer. The pagerefs are all protected by fbdev-internal locking. Is there a reason why we should further hold the page lock? All sorting is done by the pageref addresses, which implicitly correspond to 'offset'. After looking at the new function again, I'll change it to sort directly by offset. It's clearer in its intend. > > >> + if (WARN_ON_ONCE(!pageref)) { >> + ret = VM_FAULT_OOM; >> + goto err_mutex_unlock; >> + } >> + >> /* >> * We want the page to remain locked from ->page_mkwrite until >> * the PTE is marked dirty to avoid page_mkclean() being called >> @@ -120,47 +184,17 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) >> * Do this by locking the page here and informing the caller >> * about it with VM_FAULT_LOCKED. >> */ >> - lock_page(page); >> - >> - /* >> - * This check is to catch the case where a new process could start >> - * writing to the same page through a new PTE. This new access >> - * can cause a call to .page_mkwrite even if the original process' >> - * PTE is marked writable. >> - * >> - * TODO: The lru field is owned by the page cache; hence the name. >> - * We dequeue in fb_deferred_io_work() after flushing the >> - * page's content into video memory. Instead of lru, fbdefio >> - * should have it's own field. >> - */ >> - if (!list_empty(&page->lru)) >> - goto page_already_added; >> - >> - if (unlikely(fbdefio->sort_pagelist)) { >> - /* >> - * We loop through the pagelist before adding in order to >> - * keep the pagelist sorted. This has significant overhead >> - * of O(n^2) with n being the number of written pages. If >> - * possible, drivers should try to work with unsorted page >> - * lists instead. >> - */ >> - struct page *cur; >> - >> - list_for_each_entry(cur, &fbdefio->pagelist, lru) { >> - if (cur->index > page->index) >> - break; >> - } >> - pos = &cur->lru; >> - } >> - >> - list_add_tail(&page->lru, pos); >> + lock_page(pageref->page); The page lock is taken here. Best regards Thomas >> >> -page_already_added: >> mutex_unlock(&fbdefio->lock); >> >> /* come back after delay to process the deferred IO */ >> schedule_delayed_work(&info->deferred_work, fbdefio->delay); >> return VM_FAULT_LOCKED; >> + >> +err_mutex_unlock: >> + mutex_unlock(&fbdefio->lock); >> + return ret; >> } >> >> static const struct vm_operations_struct fb_deferred_io_vm_ops = { >> @@ -186,15 +220,14 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_mmap); >> /* workqueue callback */ >> static void fb_deferred_io_work(struct work_struct *work) >> { >> - struct fb_info *info = container_of(work, struct fb_info, >> - deferred_work.work); >> - struct list_head *node, *next; >> - struct page *cur; >> + struct fb_info *info = container_of(work, struct fb_info, deferred_work.work); >> + struct fb_deferred_io_pageref *pageref, *next; >> struct fb_deferred_io *fbdefio = info->fbdefio; >> >> /* here we mkclean the pages, then do all deferred IO */ >> mutex_lock(&fbdefio->lock); >> - list_for_each_entry(cur, &fbdefio->pagelist, lru) { >> + list_for_each_entry(pageref, &fbdefio->pagelist, list) { >> + struct page *cur = pageref->page; >> lock_page(cur); >> page_mkclean(cur); >> unlock_page(cur); >> @@ -204,30 +237,48 @@ static void fb_deferred_io_work(struct work_struct *work) >> fbdefio->deferred_io(info, &fbdefio->pagelist); >> >> /* clear the list */ >> - list_for_each_safe(node, next, &fbdefio->pagelist) { >> - list_del_init(node); >> - } >> + list_for_each_entry_safe(pageref, next, &fbdefio->pagelist, list) >> + fb_deferred_io_pageref_put(pageref, info); >> + >> mutex_unlock(&fbdefio->lock); >> } >> >> -void fb_deferred_io_init(struct fb_info *info) >> +int fb_deferred_io_init(struct fb_info *info) >> { >> struct fb_deferred_io *fbdefio = info->fbdefio; >> - struct page *page; >> - unsigned int i; >> + struct fb_deferred_io_pageref *pagerefs; >> + unsigned long npagerefs, i; >> + int ret; >> >> BUG_ON(!fbdefio); >> + >> + if (WARN_ON(!info->fix.smem_len)) >> + return -EINVAL; >> + >> mutex_init(&fbdefio->lock); >> INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work); >> INIT_LIST_HEAD(&fbdefio->pagelist); >> if (fbdefio->delay == 0) /* set a default of 1 s */ >> fbdefio->delay = HZ; >> >> - /* initialize all the page lists one time */ >> - for (i = 0; i < info->fix.smem_len; i += PAGE_SIZE) { >> - page = fb_deferred_io_page(info, i); >> - INIT_LIST_HEAD(&page->lru); >> + npagerefs = DIV_ROUND_UP(info->fix.smem_len, PAGE_SIZE); >> + >> + /* alloc a page ref for each page of the display memory */ >> + pagerefs = kvcalloc(npagerefs, sizeof(*pagerefs), GFP_KERNEL); >> + if (!pagerefs) { >> + ret = -ENOMEM; >> + goto err; >> } >> + for (i = 0; i < npagerefs; ++i) >> + INIT_LIST_HEAD(&pagerefs[i].list); >> + info->npagerefs = npagerefs; >> + info->pagerefs = pagerefs; >> + >> + return 0; >> + >> +err: >> + mutex_destroy(&fbdefio->lock); >> + return ret; >> } >> EXPORT_SYMBOL_GPL(fb_deferred_io_init); >> >> @@ -254,6 +305,7 @@ void fb_deferred_io_cleanup(struct fb_info *info) >> page->mapping = NULL; >> } >> >> + kvfree(info->pagerefs); >> mutex_destroy(&fbdefio->lock); >> } >> EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup); > >> diff --git a/include/linux/fb.h b/include/linux/fb.h >> index f95da1af9ff6..a332590c0fae 100644 >> --- a/include/linux/fb.h >> +++ b/include/linux/fb.h >> @@ -201,6 +201,13 @@ struct fb_pixmap { >> }; >> >> #ifdef CONFIG_FB_DEFERRED_IO >> +struct fb_deferred_io_pageref { >> + struct page *page; >> + unsigned long offset; >> + /* private */ >> + struct list_head list; > This is the list of pages - so this could be named pagelist... > >> +}; >> + >> struct fb_deferred_io { >> /* delay between mkwrite and deferred handler */ >> unsigned long delay; >> @@ -468,6 +475,8 @@ struct fb_info { >> #endif >> #ifdef CONFIG_FB_DEFERRED_IO >> struct delayed_work deferred_work; >> + unsigned long npagerefs; >> + struct fb_deferred_io_pageref *pagerefs; >> struct fb_deferred_io *fbdefio; >> #endif >> >> @@ -661,7 +670,7 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, >> >> /* drivers/video/fb_defio.c */ >> int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma); >> -extern void fb_deferred_io_init(struct fb_info *info); >> +extern int fb_deferred_io_init(struct fb_info *info); >> extern void fb_deferred_io_open(struct fb_info *info, >> struct inode *inode, >> struct file *file); >> -- >> 2.36.0
Hi Thomas, > > > + > > > /* this is to find and return the vmalloc-ed fb pages */ > > > static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf) > > > { > > > @@ -59,7 +113,7 @@ static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf) > > > printk(KERN_ERR "no mapping available\n"); > > > BUG_ON(!page->mapping); > > > - page->index = vmf->pgoff; > > > + page->index = vmf->pgoff; /* for page_mkclean() */ > > > vmf->page = page; > > > return 0; > > > @@ -95,7 +149,11 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) > > > struct page *page = vmf->page; > > > struct fb_info *info = vmf->vma->vm_private_data; > > > struct fb_deferred_io *fbdefio = info->fbdefio; > > > - struct list_head *pos = &fbdefio->pagelist; > > > + struct fb_deferred_io_pageref *pageref; > > > + unsigned long offset; > > > + vm_fault_t ret; > > > + > > > + offset = (vmf->address - vmf->vma->vm_start); > > > /* this is a callback we get when userspace first tries to > > > write to the page. we schedule a workqueue. that workqueue > > > @@ -112,6 +170,12 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) > > > if (fbdefio->first_io && list_empty(&fbdefio->pagelist)) > > > fbdefio->first_io(info); > > > + pageref = fb_deferred_io_pageref_get(info, offset, page); > > Compared to the old code we now do all the sorting and stuff without > > the page locked, which seem like a big change. > > We never touch any of the page's fields in fb_deferred_io_pageref_get(). > It's only used to initialize the pageref's page pointer. The pagerefs are > all protected by fbdev-internal locking. Is there a reason why we should > further hold the page lock? I only commented because it was a change in scope of the lock, I did not see anything wrong in the locking, but then I do not understand locking so that does not say much. > > All sorting is done by the pageref addresses, which implicitly correspond to > 'offset'. After looking at the new function again, I'll change it to sort > directly by offset. It's clearer in its intend. Looks forward for the re-spin. Sam
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index d06ce0e92d66..dd1d72d58b35 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -717,13 +717,13 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist) { unsigned long start, end, min, max; - struct page *page; + struct fb_deferred_io_pageref *pageref; struct drm_rect damage_area; min = ULONG_MAX; max = 0; - list_for_each_entry(page, pagelist, lru) { - start = page->index << PAGE_SHIFT; + list_for_each_entry(pageref, pagelist, list) { + start = pageref->offset; end = start + PAGE_SIZE; min = min(min, start); max = max(max, end); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 02a4a4fa3da3..db02e17e12b6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c @@ -322,12 +322,13 @@ static void vmw_deferred_io(struct fb_info *info, struct vmw_fb_par *par = info->par; unsigned long start, end, min, max; unsigned long flags; - struct page *page; + struct fb_deferred_io_pageref *pageref; int y1, y2; min = ULONG_MAX; max = 0; - list_for_each_entry(page, pagelist, lru) { + list_for_each_entry(pageref, pagelist, list) { + struct page *page = pageref->page; start = page->index << PAGE_SHIFT; end = start + PAGE_SIZE - 1; min = min(min, start); diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index d4e14f7c9d57..e9662822e1ef 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -326,7 +326,7 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist) { struct fbtft_par *par = info->par; unsigned int dirty_lines_start, dirty_lines_end; - struct page *page; + struct fb_deferred_io_pageref *pageref; unsigned long index; unsigned int y_low = 0, y_high = 0; int count = 0; @@ -340,7 +340,8 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist) spin_unlock(&par->dirty_lock); /* Mark display lines as dirty */ - list_for_each_entry(page, pagelist, lru) { + list_for_each_entry(pageref, pagelist, list) { + struct page *page = pageref->page; count++; index = page->index << PAGE_SHIFT; y_low = index / info->fix.line_length; diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c index 528bc0902338..6afc6ef4cb5e 100644 --- a/drivers/video/fbdev/broadsheetfb.c +++ b/drivers/video/fbdev/broadsheetfb.c @@ -934,7 +934,7 @@ static void broadsheetfb_dpy_deferred_io(struct fb_info *info, { u16 y1 = 0, h = 0; int prev_index = -1; - struct page *cur; + struct fb_deferred_io_pageref *pageref; struct fb_deferred_io *fbdefio = info->fbdefio; int h_inc; u16 yres = info->var.yres; @@ -944,7 +944,8 @@ static void broadsheetfb_dpy_deferred_io(struct fb_info *info, h_inc = DIV_ROUND_UP(PAGE_SIZE , xres); /* walk the written page list and swizzle the data */ - list_for_each_entry(cur, &fbdefio->pagelist, lru) { + list_for_each_entry(pageref, &fbdefio->pagelist, list) { + struct page *cur = pageref->page; if (prev_index < 0) { /* just starting so assign first page */ y1 = (cur->index << PAGE_SHIFT) / xres; diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c index 6924d489a289..a03b9c64fc61 100644 --- a/drivers/video/fbdev/core/fb_defio.c +++ b/drivers/video/fbdev/core/fb_defio.c @@ -36,6 +36,60 @@ static struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs return page; } +static struct fb_deferred_io_pageref *fb_deferred_io_pageref_get(struct fb_info *info, + unsigned long offset, + struct page *page) +{ + struct fb_deferred_io *fbdefio = info->fbdefio; + struct list_head *pos = &fbdefio->pagelist; + unsigned long pgoff = offset >> PAGE_SHIFT; + struct fb_deferred_io_pageref *pageref, *cur; + + if (WARN_ON_ONCE(pgoff >= info->npagerefs)) + return NULL; /* incorrect allocation size */ + + /* 1:1 mapping between pageref and page offset */ + pageref = &info->pagerefs[pgoff]; + + /* + * This check is to catch the case where a new process could start + * writing to the same page through a new PTE. This new access + * can cause a call to .page_mkwrite even if the original process' + * PTE is marked writable. + */ + if (!list_empty(&pageref->list)) + goto pageref_already_added; + + pageref->page = page; + pageref->offset = pgoff << PAGE_SHIFT; + + if (unlikely(fbdefio->sort_pagelist)) { + /* + * We loop through the list of pagerefs before adding, in + * order to keep the pagerefs sorted. This has significant + * overhead of O(n^2) with n being the number of written + * pages. If possible, drivers should try to work with + * unsorted page lists instead. + */ + list_for_each_entry(cur, &info->fbdefio->pagelist, list) { + if (cur > pageref) + break; + } + pos = &cur->list; + } + + list_add_tail(&pageref->list, pos); + +pageref_already_added: + return pageref; +} + +static void fb_deferred_io_pageref_put(struct fb_deferred_io_pageref *pageref, + struct fb_info *info) +{ + list_del_init(&pageref->list); +} + /* this is to find and return the vmalloc-ed fb pages */ static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf) { @@ -59,7 +113,7 @@ static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf) printk(KERN_ERR "no mapping available\n"); BUG_ON(!page->mapping); - page->index = vmf->pgoff; + page->index = vmf->pgoff; /* for page_mkclean() */ vmf->page = page; return 0; @@ -95,7 +149,11 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) struct page *page = vmf->page; struct fb_info *info = vmf->vma->vm_private_data; struct fb_deferred_io *fbdefio = info->fbdefio; - struct list_head *pos = &fbdefio->pagelist; + struct fb_deferred_io_pageref *pageref; + unsigned long offset; + vm_fault_t ret; + + offset = (vmf->address - vmf->vma->vm_start); /* this is a callback we get when userspace first tries to write to the page. we schedule a workqueue. that workqueue @@ -112,6 +170,12 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) if (fbdefio->first_io && list_empty(&fbdefio->pagelist)) fbdefio->first_io(info); + pageref = fb_deferred_io_pageref_get(info, offset, page); + if (WARN_ON_ONCE(!pageref)) { + ret = VM_FAULT_OOM; + goto err_mutex_unlock; + } + /* * We want the page to remain locked from ->page_mkwrite until * the PTE is marked dirty to avoid page_mkclean() being called @@ -120,47 +184,17 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf) * Do this by locking the page here and informing the caller * about it with VM_FAULT_LOCKED. */ - lock_page(page); - - /* - * This check is to catch the case where a new process could start - * writing to the same page through a new PTE. This new access - * can cause a call to .page_mkwrite even if the original process' - * PTE is marked writable. - * - * TODO: The lru field is owned by the page cache; hence the name. - * We dequeue in fb_deferred_io_work() after flushing the - * page's content into video memory. Instead of lru, fbdefio - * should have it's own field. - */ - if (!list_empty(&page->lru)) - goto page_already_added; - - if (unlikely(fbdefio->sort_pagelist)) { - /* - * We loop through the pagelist before adding in order to - * keep the pagelist sorted. This has significant overhead - * of O(n^2) with n being the number of written pages. If - * possible, drivers should try to work with unsorted page - * lists instead. - */ - struct page *cur; - - list_for_each_entry(cur, &fbdefio->pagelist, lru) { - if (cur->index > page->index) - break; - } - pos = &cur->lru; - } - - list_add_tail(&page->lru, pos); + lock_page(pageref->page); -page_already_added: mutex_unlock(&fbdefio->lock); /* come back after delay to process the deferred IO */ schedule_delayed_work(&info->deferred_work, fbdefio->delay); return VM_FAULT_LOCKED; + +err_mutex_unlock: + mutex_unlock(&fbdefio->lock); + return ret; } static const struct vm_operations_struct fb_deferred_io_vm_ops = { @@ -186,15 +220,14 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_mmap); /* workqueue callback */ static void fb_deferred_io_work(struct work_struct *work) { - struct fb_info *info = container_of(work, struct fb_info, - deferred_work.work); - struct list_head *node, *next; - struct page *cur; + struct fb_info *info = container_of(work, struct fb_info, deferred_work.work); + struct fb_deferred_io_pageref *pageref, *next; struct fb_deferred_io *fbdefio = info->fbdefio; /* here we mkclean the pages, then do all deferred IO */ mutex_lock(&fbdefio->lock); - list_for_each_entry(cur, &fbdefio->pagelist, lru) { + list_for_each_entry(pageref, &fbdefio->pagelist, list) { + struct page *cur = pageref->page; lock_page(cur); page_mkclean(cur); unlock_page(cur); @@ -204,30 +237,48 @@ static void fb_deferred_io_work(struct work_struct *work) fbdefio->deferred_io(info, &fbdefio->pagelist); /* clear the list */ - list_for_each_safe(node, next, &fbdefio->pagelist) { - list_del_init(node); - } + list_for_each_entry_safe(pageref, next, &fbdefio->pagelist, list) + fb_deferred_io_pageref_put(pageref, info); + mutex_unlock(&fbdefio->lock); } -void fb_deferred_io_init(struct fb_info *info) +int fb_deferred_io_init(struct fb_info *info) { struct fb_deferred_io *fbdefio = info->fbdefio; - struct page *page; - unsigned int i; + struct fb_deferred_io_pageref *pagerefs; + unsigned long npagerefs, i; + int ret; BUG_ON(!fbdefio); + + if (WARN_ON(!info->fix.smem_len)) + return -EINVAL; + mutex_init(&fbdefio->lock); INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work); INIT_LIST_HEAD(&fbdefio->pagelist); if (fbdefio->delay == 0) /* set a default of 1 s */ fbdefio->delay = HZ; - /* initialize all the page lists one time */ - for (i = 0; i < info->fix.smem_len; i += PAGE_SIZE) { - page = fb_deferred_io_page(info, i); - INIT_LIST_HEAD(&page->lru); + npagerefs = DIV_ROUND_UP(info->fix.smem_len, PAGE_SIZE); + + /* alloc a page ref for each page of the display memory */ + pagerefs = kvcalloc(npagerefs, sizeof(*pagerefs), GFP_KERNEL); + if (!pagerefs) { + ret = -ENOMEM; + goto err; } + for (i = 0; i < npagerefs; ++i) + INIT_LIST_HEAD(&pagerefs[i].list); + info->npagerefs = npagerefs; + info->pagerefs = pagerefs; + + return 0; + +err: + mutex_destroy(&fbdefio->lock); + return ret; } EXPORT_SYMBOL_GPL(fb_deferred_io_init); @@ -254,6 +305,7 @@ void fb_deferred_io_cleanup(struct fb_info *info) page->mapping = NULL; } + kvfree(info->pagerefs); mutex_destroy(&fbdefio->lock); } EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup); diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index d7f6abf827b9..51eb57ea68f7 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -424,7 +424,7 @@ static void synthvid_deferred_io(struct fb_info *p, struct list_head *pagelist) { struct hvfb_par *par = p->par; - struct page *page; + struct fb_deferred_io_pageref *pageref; unsigned long start, end; int y1, y2, miny, maxy; @@ -437,7 +437,8 @@ static void synthvid_deferred_io(struct fb_info *p, * in synthvid_update function by clamping the y2 * value to yres. */ - list_for_each_entry(page, pagelist, lru) { + list_for_each_entry(pageref, pagelist, list) { + struct page *page = pageref->page; start = page->index << PAGE_SHIFT; end = start + PAGE_SIZE - 1; y1 = start / p->fix.line_length; diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c index 2541f2fe065b..8352fa3f4cef 100644 --- a/drivers/video/fbdev/metronomefb.c +++ b/drivers/video/fbdev/metronomefb.c @@ -469,12 +469,13 @@ static void metronomefb_dpy_deferred_io(struct fb_info *info, struct list_head *pagelist) { u16 cksum; - struct page *cur; + struct fb_deferred_io_pageref *pageref; struct fb_deferred_io *fbdefio = info->fbdefio; struct metronomefb_par *par = info->par; /* walk the written page list and swizzle the data */ - list_for_each_entry(cur, &fbdefio->pagelist, lru) { + list_for_each_entry(pageref, &fbdefio->pagelist, list) { + struct page *cur = pageref->page; cksum = metronomefb_dpy_update_page(par, (cur->index << PAGE_SHIFT)); par->metromem_img_csum -= par->csum_table[cur->index]; diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c index 1dc5079e4518..7fcc85352033 100644 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c @@ -440,13 +440,15 @@ static int sh_mobile_lcdc_sginit(struct fb_info *info, { struct sh_mobile_lcdc_chan *ch = info->par; unsigned int nr_pages_max = ch->fb_size >> PAGE_SHIFT; - struct page *page; + struct fb_deferred_io_pageref *pageref; int nr_pages = 0; sg_init_table(ch->sglist, nr_pages_max); - list_for_each_entry(page, pagelist, lru) + list_for_each_entry(pageref, pagelist, list) { + struct page *page = pageref->page; sg_set_page(&ch->sglist[nr_pages++], page, PAGE_SIZE, 0); + } return nr_pages; } diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c index 9383f8d0914c..eb108f56ea04 100644 --- a/drivers/video/fbdev/smscufx.c +++ b/drivers/video/fbdev/smscufx.c @@ -958,7 +958,7 @@ static void ufx_ops_fillrect(struct fb_info *info, static void ufx_dpy_deferred_io(struct fb_info *info, struct list_head *pagelist) { - struct page *cur; + struct fb_deferred_io_pageref *pageref; struct fb_deferred_io *fbdefio = info->fbdefio; struct ufx_data *dev = info->par; @@ -969,9 +969,10 @@ static void ufx_dpy_deferred_io(struct fb_info *info, return; /* walk the written page list and render each to device */ - list_for_each_entry(cur, &fbdefio->pagelist, lru) { + list_for_each_entry(pageref, &fbdefio->pagelist, list) { /* create a rectangle of full screen width that encloses the * entire dirty framebuffer page */ + struct page *cur = pageref->page; const int x = 0; const int width = dev->info->var.xres; const int y = (cur->index << PAGE_SHIFT) / (width * 2); diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c index 9e5a33396ef9..8249ed8700d4 100644 --- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -784,7 +784,7 @@ static void dlfb_ops_fillrect(struct fb_info *info, static void dlfb_dpy_deferred_io(struct fb_info *info, struct list_head *pagelist) { - struct page *cur; + struct fb_deferred_io_pageref *pageref; struct fb_deferred_io *fbdefio = info->fbdefio; struct dlfb_data *dlfb = info->par; struct urb *urb; @@ -811,7 +811,8 @@ static void dlfb_dpy_deferred_io(struct fb_info *info, cmd = urb->transfer_buffer; /* walk the written page list and render each to device */ - list_for_each_entry(cur, &fbdefio->pagelist, lru) { + list_for_each_entry(pageref, &fbdefio->pagelist, list) { + struct page *cur = pageref->page; if (dlfb_render_hline(dlfb, &urb, (char *) info->fix.smem_start, &cmd, cur->index << PAGE_SHIFT, diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c index 6c8846eba2fb..608fcde767d3 100644 --- a/drivers/video/fbdev/xen-fbfront.c +++ b/drivers/video/fbdev/xen-fbfront.c @@ -185,13 +185,14 @@ static void xenfb_deferred_io(struct fb_info *fb_info, struct list_head *pagelist) { struct xenfb_info *info = fb_info->par; - struct page *page; + struct fb_deferred_io_pageref *pageref; unsigned long beg, end; int y1, y2, miny, maxy; miny = INT_MAX; maxy = 0; - list_for_each_entry(page, pagelist, lru) { + list_for_each_entry(pageref, pagelist, list) { + struct page *page = pageref->page; beg = page->index << PAGE_SHIFT; end = beg + PAGE_SIZE - 1; y1 = beg / fb_info->fix.line_length; diff --git a/include/linux/fb.h b/include/linux/fb.h index f95da1af9ff6..a332590c0fae 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -201,6 +201,13 @@ struct fb_pixmap { }; #ifdef CONFIG_FB_DEFERRED_IO +struct fb_deferred_io_pageref { + struct page *page; + unsigned long offset; + /* private */ + struct list_head list; +}; + struct fb_deferred_io { /* delay between mkwrite and deferred handler */ unsigned long delay; @@ -468,6 +475,8 @@ struct fb_info { #endif #ifdef CONFIG_FB_DEFERRED_IO struct delayed_work deferred_work; + unsigned long npagerefs; + struct fb_deferred_io_pageref *pagerefs; struct fb_deferred_io *fbdefio; #endif @@ -661,7 +670,7 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, /* drivers/video/fb_defio.c */ int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma); -extern void fb_deferred_io_init(struct fb_info *info); +extern int fb_deferred_io_init(struct fb_info *info); extern void fb_deferred_io_open(struct fb_info *info, struct inode *inode, struct file *file);