iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i915: convert i915_gpu_error to use a folio_batch

Browse Source 
Remove one of the last remaining users of pagevec.

Link: https://lkml.kernel.org/r/20230621164557.3510324-9-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2023-06-21 17:45:52 +01:00 committed by Andrew Morton
parent ce06442812
commit f8a101ff09
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/gpu/drm/i915/i915_gpu_error.c
View File

@ -187,64 +187,64 @@ i915_error_printer(struct drm_i915_error_state_buf *e)
}
/* single threaded page allocator with a reserved stash for emergencies */
static void pool_fini(struct pagevec *pv)
static void pool_fini(struct folio_batch *fbatch)
{
pagevec_release(pv);
folio_batch_release(fbatch);
}
static int pool_refill(struct pagevec *pv, gfp_t gfp)
static int pool_refill(struct folio_batch *fbatch, gfp_t gfp)
{
while (pagevec_space(pv)) {
struct page *p;
while (folio_batch_space(fbatch)) {
struct folio *folio;
p = alloc_page(gfp);
if (!p)
folio = folio_alloc(gfp, 0);
if (!folio)
return -ENOMEM;
pagevec_add(pv, p);
folio_batch_add(fbatch, folio);
}
return 0;
}
static int pool_init(struct pagevec *pv, gfp_t gfp)
static int pool_init(struct folio_batch *fbatch, gfp_t gfp)
{
int err;
pagevec_init(pv);
folio_batch_init(fbatch);
err = pool_refill(pv, gfp);
err = pool_refill(fbatch, gfp);
if (err)
pool_fini(pv);
pool_fini(fbatch);
return err;
}
static void *pool_alloc(struct pagevec *pv, gfp_t gfp)
static void *pool_alloc(struct folio_batch *fbatch, gfp_t gfp)
{
struct page *p;
struct folio *folio;
p = alloc_page(gfp);
if (!p && pagevec_count(pv))
p = pv->pages[--pv->nr];
folio = folio_alloc(gfp, 0);
if (!folio && folio_batch_count(fbatch))
folio = fbatch->folios[--fbatch->nr];
return p ? page_address(p) : NULL;
return folio ? folio_address(folio) : NULL;
}
static void pool_free(struct pagevec *pv, void *addr)
static void pool_free(struct folio_batch *fbatch, void *addr)
{
struct page *p = virt_to_page(addr);
struct folio *folio = virt_to_folio(addr);
if (pagevec_space(pv))
pagevec_add(pv, p);
if (folio_batch_space(fbatch))
folio_batch_add(fbatch, folio);
else
__free_page(p);
folio_put(folio);
}
#ifdef CONFIG_DRM_I915_COMPRESS_ERROR
struct i915_vma_compress {
struct pagevec pool;
struct folio_batch pool;
struct z_stream_s zstream;
void *tmp;
};
@ -381,7 +381,7 @@ static void err_compression_marker(struct drm_i915_error_state_buf *m)
#else
struct i915_vma_compress {
struct pagevec pool;
struct folio_batch pool;
};
static bool compress_init(struct i915_vma_compress *c)