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

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

[Stephen Rothwell]

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

Hi all,

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

drivers/char/tpm/xen-tpmfront.c: In function 'setup_ring':
drivers/char/tpm/xen-tpmfront.c:203:7: warning: passing argument 2 of 'xenbus_grant_ring' makes pointer from integer without a cast
  rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr));
       ^
In file included from drivers/char/tpm/xen-tpmfront.c:17:0:
include/xen/xenbus.h:206:5: note: expected 'void *' but argument is of type 'long unsigned int'
 int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
     ^
drivers/char/tpm/xen-tpmfront.c:203:7: error: too few arguments to function 'xenbus_grant_ring'
  rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr));
       ^
In file included from drivers/char/tpm/xen-tpmfront.c:17:0:
include/xen/xenbus.h:206:5: note: declared here
 int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
     ^

Caused by commit 1b1586eeeb8c ("xenbus_client: Extend interface to
support multi-page ring").

I have used the xen-tip tree from next-20150410 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

[Bob Liu]

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

Hi Stephen,

On 04/13/2015 04:09 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the xen-tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/char/tpm/xen-tpmfront.c: In function 'setup_ring':
> drivers/char/tpm/xen-tpmfront.c:203:7: warning: passing argument 2 of 'xenbus_grant_ring' makes pointer from integer without a cast
>    rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr));
>         ^
> In file included from drivers/char/tpm/xen-tpmfront.c:17:0:
> include/xen/xenbus.h:206:5: note: expected 'void *' but argument is of type 'long unsigned int'
>   int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
>       ^
> drivers/char/tpm/xen-tpmfront.c:203:7: error: too few arguments to function 'xenbus_grant_ring'
>    rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr));
>         ^
> In file included from drivers/char/tpm/xen-tpmfront.c:17:0:
> include/xen/xenbus.h:206:5: note: declared here
>   int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
>       ^
>
> Caused by commit 1b1586eeeb8c ("xenbus_client: Extend interface to
> support multi-page ring").
>
> I have used the xen-tip tree from next-20150410 for today.
>

Sorry for this issue, I missed the xentpm-front.c file in that patch.
(Original patch from Wei Liu already included the right modification 
which didn't exist in Paul's.)

Attached patch should fix this build failure.

-- 
Regards,
-Bob

[-- Attachment #2: 0001-xen-tpmfront-fix-build-error.patch --]
[-- Type: text/x-patch, Size: 1331 bytes --]

>From 973eacee793595b9790957186ffd27f192f5dd4f Mon Sep 17 00:00:00 2001
From: Bob Liu <bob.liu@oracle.com>
Date: Mon, 13 Apr 2015 16:29:10 +0800
Subject: [PATCH] xen-tpmfront: fix build failure

Fix build failure caused by commit 1b1586eeeb8c ("xenbus_client: Extend
interface to support multi-page ring"), xen-tpmfront was missed in that commit.

Signed-off-by: Bob Liu <bob.liu@oracle.com>
---
 drivers/char/tpm/xen-tpmfront.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index c3b4f5a..3111f27 100644
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -193,6 +193,7 @@ static int setup_ring(struct xenbus_device *dev, struct tpm_private *priv)
 	struct xenbus_transaction xbt;
 	const char *message = NULL;
 	int rv;
+	grant_ref_t gref;
 
 	priv->shr = (void *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
 	if (!priv->shr) {
@@ -200,11 +201,11 @@ static int setup_ring(struct xenbus_device *dev, struct tpm_private *priv)
 		return -ENOMEM;
 	}
 
-	rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr));
+	rv = xenbus_grant_ring(dev, &priv->shr, 1, &gref);
 	if (rv < 0)
 		return rv;
 
-	priv->ring_ref = rv;
+	priv->ring_ref = gref;
 
 	rv = xenbus_alloc_evtchn(dev, &priv->evtchn);
 	if (rv)
-- 
1.7.10.4

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

[Stephen Rothwell]

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

Hi all,

On Mon, 13 Apr 2015 16:36:58 +0800 Bob Liu <bob.liu@oracle.com> wrote:
>
> On 04/13/2015 04:09 PM, Stephen Rothwell wrote:
> >
> > After merging the xen-tip tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > drivers/char/tpm/xen-tpmfront.c: In function 'setup_ring':
> > drivers/char/tpm/xen-tpmfront.c:203:7: warning: passing argument 2 of 'xenbus_grant_ring' makes pointer from integer without a cast
> >    rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr));
> >         ^
> > In file included from drivers/char/tpm/xen-tpmfront.c:17:0:
> > include/xen/xenbus.h:206:5: note: expected 'void *' but argument is of type 'long unsigned int'
> >   int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
> >       ^
> > drivers/char/tpm/xen-tpmfront.c:203:7: error: too few arguments to function 'xenbus_grant_ring'
> >    rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr));
> >         ^
> > In file included from drivers/char/tpm/xen-tpmfront.c:17:0:
> > include/xen/xenbus.h:206:5: note: declared here
> >   int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
> >       ^
> >
> > Caused by commit 1b1586eeeb8c ("xenbus_client: Extend interface to
> > support multi-page ring").
> >
> > I have used the xen-tip tree from next-20150410 for today.
> >
> 
> Sorry for this issue, I missed the xentpm-front.c file in that patch.
> (Original patch from Wei Liu already included the right modification 
> which didn't exist in Paul's.)
> 
> Attached patch should fix this build failure.

I am still getting this failure :-(

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

[David Vrabel]

On 13/04/15 09:36, Bob Liu wrote:
> Hi Stephen,
> 
> On 04/13/2015 04:09 PM, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the xen-tip tree, today's linux-next build (x86_64
>> allmodconfig)
>> failed like this:
>>
>> drivers/char/tpm/xen-tpmfront.c: In function 'setup_ring':
>> drivers/char/tpm/xen-tpmfront.c:203:7: warning: passing argument 2 of
>> 'xenbus_grant_ring' makes pointer from integer without a cast
>>    rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr));
>>         ^
>> In file included from drivers/char/tpm/xen-tpmfront.c:17:0:
>> include/xen/xenbus.h:206:5: note: expected 'void *' but argument is of
>> type 'long unsigned int'
>>   int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
>>       ^
>> drivers/char/tpm/xen-tpmfront.c:203:7: error: too few arguments to
>> function 'xenbus_grant_ring'
>>    rv = xenbus_grant_ring(dev, virt_to_mfn(priv->shr));
>>         ^
>> In file included from drivers/char/tpm/xen-tpmfront.c:17:0:
>> include/xen/xenbus.h:206:5: note: declared here
>>   int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
>>       ^
>>
>> Caused by commit 1b1586eeeb8c ("xenbus_client: Extend interface to
>> support multi-page ring").
>>
>> I have used the xen-tip tree from next-20150410 for today.
>>
> 
> Sorry for this issue, I missed the xentpm-front.c file in that patch.
> (Original patch from Wei Liu already included the right modification
> which didn't exist in Paul's.)
> 
> Attached patch should fix this build failure.

Thanks. I've folded this in.

David

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

[Stephen Rothwell]

Hi all,

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

arch/x86/xen/xen-asm_64.o: In function `xen_trace_page_fault':
(.text+0x174): undefined reference to `trace_page_fault'

Caused by commit

  ad5b8c4ba323 ("xen: get rid of paravirt op adjust_exception_frame")

interacting with commit

  11a7ffb01703 ("x86/traps: Simplify pagefault tracing logic")

from the tip tree.

I am not sure how to fix up this, so I have just applied the following
patch for today.  A better solution would be appreciated.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 31 Aug 2017 15:06:10 +1000
Subject: [PATCH] xen: fix for "x86/traps: Simplify pagefault tracing logic"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/xen/enlighten_pv.c | 2 +-
 arch/x86/xen/xen-asm_64.S   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index b18d9b9f84c2..6ea983a9016d 100644
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -618,7 +618,7 @@ static struct {
 	{ alignment_check, xen_alignment_check, false },
 	{ simd_coprocessor_error, xen_simd_coprocessor_error, false },
 #ifdef CONFIG_TRACING
-	{ trace_page_fault, xen_trace_page_fault, false },
+//	{ trace_page_fault, xen_trace_page_fault, false },
 #endif
 };
 
diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S
index 4ebac091a0e8..1c7a3df3e5a5 100644
--- a/arch/x86/xen/xen-asm_64.S
+++ b/arch/x86/xen/xen-asm_64.S
@@ -52,7 +52,7 @@ xen_pv_trap simd_coprocessor_error
 xen_pv_trap entry_INT80_compat
 #endif
 #ifdef CONFIG_TRACING
-xen_pv_trap trace_page_fault
+/* xen_pv_trap trace_page_fault */
 #endif
 xen_pv_trap hypervisor_callback
 
-- 
2.13.2

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

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

Hi all,

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

drivers/xen/gntdev-dmabuf.c:360:12: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .attach = dmabuf_exp_ops_attach,
            ^~~~~~~~~~~~~~~~~~~~~

Caused by commit

  a240d6e42e28 ("xen/gntdev: Implement dma-buf export functionality")

interacting with commit

  a19741e5e5a9 ("dma_buf: remove device parameter from attach callback v2")

from the drm tree.

I have added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Jul 2018 15:08:21 +1000
Subject: [PATCH] xen/gntdev: fix up for attach callback API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/xen/gntdev-dmabuf.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/xen/gntdev-dmabuf.c b/drivers/xen/gntdev-dmabuf.c
index faaa4d3970ea..744cfe9b0311 100644
--- a/drivers/xen/gntdev-dmabuf.c
+++ b/drivers/xen/gntdev-dmabuf.c
@@ -217,7 +217,6 @@ dmabuf_pages_to_sgt(struct page **pages, unsigned int nr_pages)
 }
 
 static int dmabuf_exp_ops_attach(struct dma_buf *dma_buf,
-				 struct device *target_dev,
 				 struct dma_buf_attachment *attach)
 {
 	struct gntdev_dmabuf_attachment *gntdev_dmabuf_attach;
-- 
2.18.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 xen-tip tree

[Oleksandr Andrushchenko]

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 30 Jul 2018 15:08:21 +1000
> Subject: [PATCH] xen/gntdev: fix up for attach callback API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thank you for your patch,
Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>

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

[Stephen Rothwell]

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

Hi all,

On Mon, 30 Jul 2018 15:12:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the xen-tip tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/xen/gntdev-dmabuf.c:360:12: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .attach = dmabuf_exp_ops_attach,
>             ^~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   a240d6e42e28 ("xen/gntdev: Implement dma-buf export functionality")
> 
> interacting with commit
> 
>   a19741e5e5a9 ("dma_buf: remove device parameter from attach callback v2")
> 
> from the drm tree.
> 
> I have added the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 30 Jul 2018 15:08:21 +1000
> Subject: [PATCH] xen/gntdev: fix up for attach callback API change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/xen/gntdev-dmabuf.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/xen/gntdev-dmabuf.c b/drivers/xen/gntdev-dmabuf.c
> index faaa4d3970ea..744cfe9b0311 100644
> --- a/drivers/xen/gntdev-dmabuf.c
> +++ b/drivers/xen/gntdev-dmabuf.c
> @@ -217,7 +217,6 @@ dmabuf_pages_to_sgt(struct page **pages, unsigned int nr_pages)
>  }
>  
>  static int dmabuf_exp_ops_attach(struct dma_buf *dma_buf,
> -				 struct device *target_dev,
>  				 struct dma_buf_attachment *attach)
>  {
>  	struct gntdev_dmabuf_attachment *gntdev_dmabuf_attach;

This is now a conflict between Linus' tree and the drm tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

drivers/base/power/trace.c: In function 'generate_pm_trace':
drivers/base/power/trace.c:170:10: error: 'return' with a value, in function returning void [-Werror=return-type]
  170 |   return 0;
      |          ^
drivers/base/power/trace.c:163:6: note: declared here
  163 | void generate_pm_trace(const void *tracedata, unsigned int user)
      |      ^~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  38b6c7137e13 ("PM: base: power: don't try to use non-existing RTC for storing data")

I used the xen-tip tree from next-20210914 for today.
-- 
Cheers,
Stephen Rothwell

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