2019-07-05 07:21:12

by Stephen Rothwell

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

Hi all,

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

In file included from <command-line>:32:
./usr/include/linux/virtio_pmem.h:19:2: error: unknown type name 'uint64_t'
uint64_t start;
^~~~~~~~
./usr/include/linux/virtio_pmem.h:20:2: error: unknown type name 'uint64_t'
uint64_t size;
^~~~~~~~

Caused by commit

403b7f973855 ("virtio-pmem: Add virtio pmem driver")

I have used the nvdimm tree from next-20190704 for today.

--
Cheers,
Stephen Rothwell


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

2019-07-05 09:35:39

by Pankaj Gupta

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


Hi Stephen,
>
> Hi all,
>
> After merging the nvdimm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from :32:
> ./usr/include/linux/virtio_pmem.h:19:2: error: unknown type name 'uint64_t'
> uint64_t start;
> ^~~~~~~~
> ./usr/include/linux/virtio_pmem.h:20:2: error: unknown type name 'uint64_t'
> uint64_t size;
> ^~~~~~~~
>
> Caused by commit
>
> 403b7f973855 ("virtio-pmem: Add virtio pmem driver")
>
> I have used the nvdimm tree from next-20190704 for today.

Thank you for the report.

Can we apply below patch [1] on top to complete linux-next build for today.
I have tested this locally.

Thanks,
Pankaj

========

[1]

diff --git a/drivers/nvdimm/virtio_pmem.h b/drivers/nvdimm/virtio_pmem.h
index 998efbc7660c..dbc12dfe8067 100644
--- a/drivers/nvdimm/virtio_pmem.h
+++ b/drivers/nvdimm/virtio_pmem.h
@@ -46,8 +46,8 @@ struct virtio_pmem {
spinlock_t pmem_lock;

/* Memory region information */
- uint64_t start;
- uint64_t size;
+ u64 start;
+ u64 size;
};

void virtio_pmem_host_ack(struct virtqueue *vq);
diff --git a/include/uapi/linux/virtio_pmem.h b/include/uapi/linux/virtio_pmem.h
index 379861f114f1..efcd72f2d20d 100644
--- a/include/uapi/linux/virtio_pmem.h
+++ b/include/uapi/linux/virtio_pmem.h
@@ -11,25 +11,24 @@
#define _UAPI_LINUX_VIRTIO_PMEM_H

#include <linux/types.h>
-#include <linux/virtio_types.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_config.h>

struct virtio_pmem_config {
- uint64_t start;
- uint64_t size;
+ __u64 start;
+ __u64 size;
};

#define VIRTIO_PMEM_REQ_TYPE_FLUSH 0

struct virtio_pmem_resp {
/* Host return status corresponding to flush request */
- __virtio32 ret;
+ __u32 ret;
};

struct virtio_pmem_req {
/* command type */
- __virtio32 type;
+ __u32 type;
};

2019-07-05 11:10:34

by Stephen Rothwell

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

Hi Pankaj,

On Fri, 5 Jul 2019 04:45:43 -0400 (EDT) Pankaj Gupta <[email protected]> wrote:
>
> Thank you for the report.

That's what I am here for :-)

> Can we apply below patch [1] on top to complete linux-next build for today.
> I have tested this locally.

Its a bit of a pain to go back and linux-next is done for today (after
13 hours :-)). You really should do a proper fix patch and get it
added to the nvdimm tree.

--
Cheers,
Stephen Rothwell


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

2019-07-05 12:37:07

by Pankaj Gupta

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


>
> Hi Pankaj,
>
> On Fri, 5 Jul 2019 04:45:43 -0400 (EDT) Pankaj Gupta <[email protected]>
> wrote:
> >
> > Thank you for the report.
>
> That's what I am here for :-)

:-)

>
> > Can we apply below patch [1] on top to complete linux-next build for today.
> > I have tested this locally.
>
> Its a bit of a pain to go back and linux-next is done for today (after
> 13 hours :-)). You really should do a proper fix patch and get it
> added to the nvdimm tree.

Sure, Thank you! Stephen.

Best regards,
Pankaj

>
> --
> Cheers,
> Stephen Rothwell
>

2019-07-05 22:34:09

by Dan Williams

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

On Fri, Jul 5, 2019 at 12:20 AM Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> After merging the nvdimm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from <command-line>:32:
> ./usr/include/linux/virtio_pmem.h:19:2: error: unknown type name 'uint64_t'
> uint64_t start;
> ^~~~~~~~
> ./usr/include/linux/virtio_pmem.h:20:2: error: unknown type name 'uint64_t'
> uint64_t size;
> ^~~~~~~~

/me boggles at how this sat in 0day visible tree for a long while
without this report?

>
> Caused by commit
>
> 403b7f973855 ("virtio-pmem: Add virtio pmem driver")
>
> I have used the nvdimm tree from next-20190704 for today.

Thanks Stephen, sorry for the noise.

2019-07-05 23:50:57

by Stephen Rothwell

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

Hi Dan,

On Fri, 5 Jul 2019 15:32:19 -0700 Dan Williams <[email protected]> wrote:
>
> On Fri, Jul 5, 2019 at 12:20 AM Stephen Rothwell <[email protected]> wrote:
> >
> > After merging the nvdimm tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > In file included from <command-line>:32:
> > ./usr/include/linux/virtio_pmem.h:19:2: error: unknown type name 'uint64_t'
> > uint64_t start;
> > ^~~~~~~~
> > ./usr/include/linux/virtio_pmem.h:20:2: error: unknown type name 'uint64_t'
> > uint64_t size;
> > ^~~~~~~~
>
> /me boggles at how this sat in 0day visible tree for a long while
> without this report?

These messages are produced by a new test in the kbuild tree, so you
need both it and the nvdimm tree together to get them. That will
change after the merge window, of course.

--
Cheers,
Stephen Rothwell


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