* [PATCH next] drm/i915: Fix NULL vs IS_ERR() check in __shmem_writeback()
@ 2025-02-06 8:17 Dan Carpenter
2025-02-06 11:16 ` Andi Shyti
2025-02-07 11:02 ` Andi Shyti
0 siblings, 2 replies; 5+ messages in thread
From: Dan Carpenter @ 2025-02-06 8:17 UTC (permalink / raw)
To: Kirill A. Shutemov
Cc: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin,
David Airlie, Simona Vetter, Andrew Morton, Andi Shyti,
David Hildenbrand, Josef Bacik, Matthew Wilcox (Oracle),
Brian Geffon, intel-gfx, dri-devel, linux-kernel, kernel-janitors
The filemap_lock_folio() function doesn't return NULL, it returns error
pointers.
Fixes: 25dd342f0cc8 ("drm/i915/gem: convert __shmem_writeback() to folios")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
index a784fb44e59c..fb263b421958 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
@@ -319,7 +319,7 @@ void __shmem_writeback(size_t size, struct address_space *mapping)
struct folio *folio;
folio = filemap_lock_folio(mapping, i);
- if (!folio)
+ if (IS_ERR(folio))
continue;
if (!folio_mapped(folio) && folio_clear_dirty_for_io(folio)) {
--
2.47.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH next] drm/i915: Fix NULL vs IS_ERR() check in __shmem_writeback()
2025-02-06 8:17 [PATCH next] drm/i915: Fix NULL vs IS_ERR() check in __shmem_writeback() Dan Carpenter
@ 2025-02-06 11:16 ` Andi Shyti
2025-02-07 11:02 ` Andi Shyti
1 sibling, 0 replies; 5+ messages in thread
From: Andi Shyti @ 2025-02-06 11:16 UTC (permalink / raw)
To: Dan Carpenter
Cc: Kirill A. Shutemov, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Tvrtko Ursulin, David Airlie, Simona Vetter, Andrew Morton,
Andi Shyti, David Hildenbrand, Josef Bacik,
Matthew Wilcox (Oracle), Brian Geffon, intel-gfx, dri-devel,
linux-kernel, kernel-janitors
> The filemap_lock_folio() function doesn't return NULL, it returns error
> pointers.
>
> Fixes: 25dd342f0cc8 ("drm/i915/gem: convert __shmem_writeback() to folios")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
...
> struct folio *folio;
>
> folio = filemap_lock_folio(mapping, i);
> - if (!folio)
> + if (IS_ERR(folio))
ops! Thanks, Dan
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Andi
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH next] drm/i915: Fix NULL vs IS_ERR() check in __shmem_writeback()
2025-02-06 8:17 [PATCH next] drm/i915: Fix NULL vs IS_ERR() check in __shmem_writeback() Dan Carpenter
2025-02-06 11:16 ` Andi Shyti
@ 2025-02-07 11:02 ` Andi Shyti
2025-02-07 11:04 ` Andi Shyti
2025-02-07 11:48 ` Dan Carpenter
1 sibling, 2 replies; 5+ messages in thread
From: Andi Shyti @ 2025-02-07 11:02 UTC (permalink / raw)
To: Dan Carpenter
Cc: Kirill A. Shutemov, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Tvrtko Ursulin, David Airlie, Simona Vetter, Andrew Morton,
Andi Shyti, David Hildenbrand, Josef Bacik,
Matthew Wilcox (Oracle), Brian Geffon, intel-gfx, dri-devel,
linux-kernel, kernel-janitors
Hi Dan,
On Thu, Feb 06, 2025 at 11:17:02AM +0300, Dan Carpenter wrote:
> The filemap_lock_folio() function doesn't return NULL, it returns error
> pointers.
>
> Fixes: 25dd342f0cc8 ("drm/i915/gem: convert __shmem_writeback() to folios")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
> index a784fb44e59c..fb263b421958 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
> @@ -319,7 +319,7 @@ void __shmem_writeback(size_t size, struct address_space *mapping)
> struct folio *folio;
>
> folio = filemap_lock_folio(mapping, i);
> - if (!folio)
> + if (IS_ERR(folio))
I don't see this patch yet in -next yet (and of course not in
drm-tip), which branch is it based on?
Thanks,
Andi
> continue;
>
> if (!folio_mapped(folio) && folio_clear_dirty_for_io(folio)) {
> --
> 2.47.2
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH next] drm/i915: Fix NULL vs IS_ERR() check in __shmem_writeback()
2025-02-07 11:02 ` Andi Shyti
@ 2025-02-07 11:04 ` Andi Shyti
2025-02-07 11:48 ` Dan Carpenter
1 sibling, 0 replies; 5+ messages in thread
From: Andi Shyti @ 2025-02-07 11:04 UTC (permalink / raw)
To: Andi Shyti
Cc: Dan Carpenter, Kirill A. Shutemov, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Tvrtko Ursulin, David Airlie, Simona Vetter,
Andrew Morton, David Hildenbrand, Josef Bacik,
Matthew Wilcox (Oracle), Brian Geffon, intel-gfx, dri-devel,
linux-kernel, kernel-janitors
> > - if (!folio)
> > + if (IS_ERR(folio))
>
> I don't see this patch yet in -next yet (and of course not in
> drm-tip), which branch is it based on?
To be precise, not this patch, but the patch(*) that this is fixing :-)
Andi
(*) "drm/i915/gem: Convert __shmem_writeback() to folios" from
Kirill
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH next] drm/i915: Fix NULL vs IS_ERR() check in __shmem_writeback()
2025-02-07 11:02 ` Andi Shyti
2025-02-07 11:04 ` Andi Shyti
@ 2025-02-07 11:48 ` Dan Carpenter
1 sibling, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2025-02-07 11:48 UTC (permalink / raw)
To: Andi Shyti, Kirill A. Shutemov
Cc: Kirill A. Shutemov, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Tvrtko Ursulin, David Airlie, Simona Vetter, Andrew Morton,
David Hildenbrand, Josef Bacik, Matthew Wilcox (Oracle),
Brian Geffon, intel-gfx, dri-devel, linux-kernel, kernel-janitors
On Fri, Feb 07, 2025 at 12:02:43PM +0100, Andi Shyti wrote:
> Hi Dan,
>
> On Thu, Feb 06, 2025 at 11:17:02AM +0300, Dan Carpenter wrote:
> > The filemap_lock_folio() function doesn't return NULL, it returns error
> > pointers.
> >
> > Fixes: 25dd342f0cc8 ("drm/i915/gem: convert __shmem_writeback() to folios")
> > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> > ---
> > drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
> > index a784fb44e59c..fb263b421958 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
> > @@ -319,7 +319,7 @@ void __shmem_writeback(size_t size, struct address_space *mapping)
> > struct folio *folio;
> >
> > folio = filemap_lock_folio(mapping, i);
> > - if (!folio)
> > + if (IS_ERR(folio))
>
> I don't see this patch yet in -next yet (and of course not in
> drm-tip), which branch is it based on?
>
This was in linux-next but it's not there now. It came via -mm. I
guess it's been dropped and Kirill will fix this in his devel branch
before resending.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-02-07 11:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-06 8:17 [PATCH next] drm/i915: Fix NULL vs IS_ERR() check in __shmem_writeback() Dan Carpenter
2025-02-06 11:16 ` Andi Shyti
2025-02-07 11:02 ` Andi Shyti
2025-02-07 11:04 ` Andi Shyti
2025-02-07 11:48 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox