linux-next: build failure after merge of the tip tree

linux-next: build failure after merge of the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1891 bytes --]

Hi all,

After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

arch/x86/kernel/fpu/core.c: In function 'fpu_alloc_guest_fpstate':
arch/x86/kernel/fpu/core.c:187:12: error: implicit declaration of function 'vzalloc'; did you mean 'kzalloc'? [-Werror=implicit-function-declaration]
  187 |  fpstate = vzalloc(size);
      |            ^~~~~~~
      |            kzalloc
arch/x86/kernel/fpu/core.c:187:10: error: assignment to 'struct fpstate *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
  187 |  fpstate = vzalloc(size);
      |          ^
arch/x86/kernel/fpu/core.c: In function 'fpu_free_guest_fpstate':
arch/x86/kernel/fpu/core.c:212:2: error: implicit declaration of function 'vfree'; did you mean 'kfree'? [-Werror=implicit-function-declaration]
  212 |  vfree(fps);
      |  ^~~~~
      |  kfree
cc1: all warnings being treated as errors

Caused by commit

  69f6ed1d14c6 ("x86/fpu: Provide infrastructure for KVM FPU cleanup")

I have applied the following patch for today (because it was quicker
than using the tip tree from next-20211022).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 Oct 2021 15:04:13 +1100
Subject: [PATCH] x86/fpu: include vmalloc.h for vzalloc etc

Fixes: 69f6ed1d14c6 ("x86/fpu: Provide infrastructure for KVM FPU cleanup")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/kernel/fpu/core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index 9c475e2efd4d..c55013fc82ab 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -16,6 +16,7 @@
 
 #include <linux/hardirq.h>
 #include <linux/pkeys.h>
+#include <linux/vmalloc.h>
 
 #include "context.h"
 #include "internal.h"
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the tip tree

[Borislav Petkov]

Hi Stephen,

On Mon, Oct 25, 2021 at 03:11:44PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> arch/x86/kernel/fpu/core.c: In function 'fpu_alloc_guest_fpstate':
> arch/x86/kernel/fpu/core.c:187:12: error: implicit declaration of function 'vzalloc'; did you mean 'kzalloc'? [-Werror=implicit-function-declaration]
>   187 |  fpstate = vzalloc(size);
>       |            ^~~~~~~
>       |            kzalloc
> arch/x86/kernel/fpu/core.c:187:10: error: assignment to 'struct fpstate *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
>   187 |  fpstate = vzalloc(size);
>       |          ^
> arch/x86/kernel/fpu/core.c: In function 'fpu_free_guest_fpstate':
> arch/x86/kernel/fpu/core.c:212:2: error: implicit declaration of function 'vfree'; did you mean 'kfree'? [-Werror=implicit-function-declaration]
>   212 |  vfree(fps);
>       |  ^~~~~
>       |  kfree
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   69f6ed1d14c6 ("x86/fpu: Provide infrastructure for KVM FPU cleanup")
> 
> I have applied the following patch for today (because it was quicker
> than using the tip tree from next-20211022).

I cannot reproduce here. It could be uncovered by some stuff you merge
before tip/auto-latest or so.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 25 Oct 2021 15:04:13 +1100
> Subject: [PATCH] x86/fpu: include vmalloc.h for vzalloc etc
> 
> Fixes: 69f6ed1d14c6 ("x86/fpu: Provide infrastructure for KVM FPU cleanup")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/x86/kernel/fpu/core.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
> index 9c475e2efd4d..c55013fc82ab 100644
> --- a/arch/x86/kernel/fpu/core.c
> +++ b/arch/x86/kernel/fpu/core.c
> @@ -16,6 +16,7 @@
>  
>  #include <linux/hardirq.h>
>  #include <linux/pkeys.h>
> +#include <linux/vmalloc.h>
>  
>  #include "context.h"
>  #include "internal.h"
> -- 

I'm thinking I could simply fold in your change into 69f6ed1d14c6 ...

Thx.

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Re: linux-next: build failure after merge of the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]

Hi Borislav,

On Mon, 25 Oct 2021 09:42:12 +0200 Borislav Petkov <bp@suse.de> wrote:
>
> I cannot reproduce here. It could be uncovered by some stuff you merge
> before tip/auto-latest or so.

Yeah, I fugured something like that must have happened.

> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 25 Oct 2021 15:04:13 +1100
> > Subject: [PATCH] x86/fpu: include vmalloc.h for vzalloc etc
> > 
> > Fixes: 69f6ed1d14c6 ("x86/fpu: Provide infrastructure for KVM FPU cleanup")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  arch/x86/kernel/fpu/core.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
> > index 9c475e2efd4d..c55013fc82ab 100644
> > --- a/arch/x86/kernel/fpu/core.c
> > +++ b/arch/x86/kernel/fpu/core.c
> > @@ -16,6 +16,7 @@
> >  
> >  #include <linux/hardirq.h>
> >  #include <linux/pkeys.h>
> > +#include <linux/vmalloc.h>
> >  
> >  #include "context.h"
> >  #include "internal.h"
> > --   
> 
> I'm thinking I could simply fold in your change into 69f6ed1d14c6 ...

That will certainly make it more robust against people cleaning up
include files.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the tip tree

[Borislav Petkov]

On Mon, Oct 25, 2021 at 06:58:36PM +1100, Stephen Rothwell wrote:
> That will certainly make it more robust against people cleaning up
> include files.

Ok, rebased and pushed out. You could try it now.

Thx.

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Re: linux-next: build failure after merge of the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2120 bytes --]

Hi all,

On Mon, 25 Oct 2021 15:11:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> arch/x86/kernel/fpu/core.c: In function 'fpu_alloc_guest_fpstate':
> arch/x86/kernel/fpu/core.c:187:12: error: implicit declaration of function 'vzalloc'; did you mean 'kzalloc'? [-Werror=implicit-function-declaration]
>   187 |  fpstate = vzalloc(size);
>       |            ^~~~~~~
>       |            kzalloc
> arch/x86/kernel/fpu/core.c:187:10: error: assignment to 'struct fpstate *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
>   187 |  fpstate = vzalloc(size);
>       |          ^
> arch/x86/kernel/fpu/core.c: In function 'fpu_free_guest_fpstate':
> arch/x86/kernel/fpu/core.c:212:2: error: implicit declaration of function 'vfree'; did you mean 'kfree'? [-Werror=implicit-function-declaration]
>   212 |  vfree(fps);
>       |  ^~~~~
>       |  kfree
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   69f6ed1d14c6 ("x86/fpu: Provide infrastructure for KVM FPU cleanup")
> 
> I have applied the following patch for today (because it was quicker
> than using the tip tree from next-20211022).
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 25 Oct 2021 15:04:13 +1100
> Subject: [PATCH] x86/fpu: include vmalloc.h for vzalloc etc
> 
> Fixes: 69f6ed1d14c6 ("x86/fpu: Provide infrastructure for KVM FPU cleanup")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/x86/kernel/fpu/core.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
> index 9c475e2efd4d..c55013fc82ab 100644
> --- a/arch/x86/kernel/fpu/core.c
> +++ b/arch/x86/kernel/fpu/core.c
> @@ -16,6 +16,7 @@
>  
>  #include <linux/hardirq.h>
>  #include <linux/pkeys.h>
> +#include <linux/vmalloc.h>
>  
>  #include "context.h"
>  #include "internal.h"
> -- 
> 2.33.0

This build failure has returned today :-(

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the tip tree

[Borislav Petkov]

Hi Stephen,

On Thu, Oct 28, 2021 at 04:10:58PM +1100, Stephen Rothwell wrote:
> This build failure has returned today :-(

Sorry about that.

I had the original patch updated but then it is very possible I
fat-fingered the branch during the patch frenzy in the past days here.

Now I've applied yours because it happening a second time simply
warrants having this as a separate patch.

Thx.

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

[tip: x86/fpu] x86/fpu: Include vmalloc.h for vzalloc()

[tip-bot2 for Stephen Rothwell]

The following commit has been merged into the x86/fpu branch of tip:

Commit-ID:     6ccd63f07775961b3212c098abad05bcda931045
Gitweb:        https://git.kernel.org/tip/6ccd63f07775961b3212c098abad05bcda931045
Author:        Stephen Rothwell <sfr@canb.auug.org.au>
AuthorDate:    Mon, 25 Oct 2021 15:04:13 +11:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Thu, 28 Oct 2021 10:12:54 +02:00

x86/fpu: Include vmalloc.h for vzalloc()

Explicitly include that header to avoid build errors when vzalloc()
becomes "invisible" to the compiler due to header reorganizations.

This is not a problem in the tip tree but occurred when integrating
linux-next.

 [ bp: Commit message. ]

Link: https://lore.kernel.org/r/20211025151144.552c60ca@canb.auug.org.au
Fixes: 69f6ed1d14c6 ("x86/fpu: Provide infrastructure for KVM FPU cleanup")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Borislav Petkov <bp@suse.de>
---
 arch/x86/kernel/fpu/core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index 290836d..8ea306b 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -16,6 +16,7 @@
 
 #include <linux/hardirq.h>
 #include <linux/pkeys.h>
+#include <linux/vmalloc.h>
 
 #include "context.h"
 #include "internal.h"

[tip: x86/fpu] x86/fpu: Include vmalloc.h for vzalloc()

[tip-bot2 for Stephen Rothwell]

The following commit has been merged into the x86/fpu branch of tip:

Commit-ID:     868c250bb4639531ff33b2d879fbef39c1d9ed39
Gitweb:        https://git.kernel.org/tip/868c250bb4639531ff33b2d879fbef39c1d9ed39
Author:        Stephen Rothwell <sfr@canb.auug.org.au>
AuthorDate:    Mon, 25 Oct 2021 15:04:13 +11:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Thu, 28 Oct 2021 14:35:27 +02:00

x86/fpu: Include vmalloc.h for vzalloc()

Explicitly include that header to avoid build errors when vzalloc()
becomes "invisible" to the compiler due to header reorganizations.

This is not a problem in the tip tree but occurred when integrating
linux-next.

 [ bp: Commit message. ]

Link: https://lore.kernel.org/r/20211025151144.552c60ca@canb.auug.org.au
Fixes: 69f6ed1d14c6 ("x86/fpu: Provide infrastructure for KVM FPU cleanup")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Borislav Petkov <bp@suse.de>
---
 arch/x86/kernel/fpu/core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index 290836d..8ea306b 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -16,6 +16,7 @@
 
 #include <linux/hardirq.h>
 #include <linux/pkeys.h>
+#include <linux/vmalloc.h>
 
 #include "context.h"
 #include "internal.h"