2022-09-06 11:21:46

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the mm tree

Hi all,

After merging the mm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/msm_gem_shrinker.c: In function 'can_block':
drivers/gpu/drm/msm/msm_gem_shrinker.c:29:28: error: '__GFP_ATOMIC' undeclared (first use in this function); did you mean 'GFP_ATOMIC'?
29 | if (sc->gfp_mask & __GFP_ATOMIC)
| ^~~~~~~~~~~~
| GFP_ATOMIC

Caused by commit

9178e3dcb121 ("mm: discard __GFP_ATOMIC")

interacting with commit

025d27239a2f ("drm/msm/gem: Evict active GEM objects when necessary")

from the drm-msm tree.

I have reverted the drm-msm tree commit for today.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2022-09-06 12:34:16

by Rob Clark

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the mm tree

It looks like, at least for now, I can replace `sc->gfp_mask &
__GFP_ATOMIC` with `!(sc->gfp_mask & __GFP_DIRECT_RECLAIM)`.. I'm not
sure if there would be any cases where we could otherwise sleep but
__GFP_DIRECT_RECLAIM is not set?

BR,
-R

On Tue, Sep 6, 2022 at 4:03 AM Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> After merging the mm tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/msm/msm_gem_shrinker.c: In function 'can_block':
> drivers/gpu/drm/msm/msm_gem_shrinker.c:29:28: error: '__GFP_ATOMIC' undeclared (first use in this function); did you mean 'GFP_ATOMIC'?
> 29 | if (sc->gfp_mask & __GFP_ATOMIC)
> | ^~~~~~~~~~~~
> | GFP_ATOMIC
>
> Caused by commit
>
> 9178e3dcb121 ("mm: discard __GFP_ATOMIC")
>
> interacting with commit
>
> 025d27239a2f ("drm/msm/gem: Evict active GEM objects when necessary")
>
> from the drm-msm tree.
>
> I have reverted the drm-msm tree commit for today.
>
> --
> Cheers,
> Stephen Rothwell

2022-09-06 22:56:33

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the mm tree

Hi Rob,

On Tue, 6 Sep 2022 05:05:32 -0700 Rob Clark <[email protected]> wrote:
>
> It looks like, at least for now, I can replace `sc->gfp_mask &
> __GFP_ATOMIC` with `!(sc->gfp_mask & __GFP_DIRECT_RECLAIM)`.. I'm not
> sure if there would be any cases where we could otherwise sleep but
> __GFP_DIRECT_RECLAIM is not set?

The commit message for 9178e3dcb121 seems to say that would be correct.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature