Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: build failure after merge of the vhost tree
@ 2017-03-30  4:25 Stephen Rothwell
  2017-04-03  6:21 ` Stephen Rothwell
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2017-03-30  4:25 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List

Hi Michael,

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

drivers/remoteproc/remoteproc_virtio.c: In function 'rproc_virtio_find_vqs':
drivers/remoteproc/remoteproc_virtio.c:148:9: error: 'ctx' undeclared (first use in this function)
         ctx ? ctx[i] : false);
         ^

Caused by commit

  a965e977a103 ("virtio: add context flag to find vqs")

I have used the vhost tree from next-20170329 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2017-03-30  4:25 linux-next: build failure after merge of the vhost tree Stephen Rothwell
@ 2017-04-03  6:21 ` Stephen Rothwell
  0 siblings, 0 replies; 29+ messages in thread
From: Stephen Rothwell @ 2017-04-03  6:21 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List

Hi Michael,

On Thu, 30 Mar 2017 15:25:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the vhost tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/remoteproc/remoteproc_virtio.c: In function 'rproc_virtio_find_vqs':
> drivers/remoteproc/remoteproc_virtio.c:148:9: error: 'ctx' undeclared (first use in this function)
>          ctx ? ctx[i] : false);
>          ^
> 
> Caused by commit
> 
>   a965e977a103 ("virtio: add context flag to find vqs")
> 
> I have used the vhost tree from next-20170329 for today.

I am still getting this.
-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2020-08-04  7:04   ` Guennadi Liakhovetski
@ 2020-08-04  9:15     ` Michael S. Tsirkin
  0 siblings, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2020-08-04  9:15 UTC (permalink / raw)
  To: Guennadi Liakhovetski
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Stephen Rothwell

On Tue, Aug 04, 2020 at 09:04:40AM +0200, Guennadi Liakhovetski wrote:
> Michael, looks like something went wrong with your merge? My patch 
> https://lore.kernel.org/r/20200722150927.15587-3-guennadi.liakhovetski@linux.intel.com 
> has the header, your merged commit 
> https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git/commit/?h=vhost&id=bba6f4f52c31af1ce4ebcc063afa08eb063b3d2c
> doesn't have it?
> 
> Thanks
> Guennadi

My bad: patch was based on a hash I did not have in my tree
so git am failed, I use patch and forgot git add.

> On Tue, Aug 04, 2020 at 07:47:58AM +0200, Guennadi Liakhovetski wrote:
> > Hi Stephen,
> > 
> > On Tue, Aug 04, 2020 at 03:11:17PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > After merging the vhost tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > > 
> > > drivers/rpmsg/virtio_rpmsg_bus.c:28:10: fatal error: linux/virtio_rpmsg.h: No such file or directory
> > >    28 | #include <linux/virtio_rpmsg.h>
> > >       |          ^~~~~~~~~~~~~~~~~~~~~~
> > > 
> > > Caused by commit
> > > 
> > >   bba6f4f52c31 ("rpmsg: move common structures and defines to headers")
> > > 
> > > I have used the vhost tree from next-20200803 for today.
> > 
> > Yes, I've seen that, that's a clang build for MIPS... I'll have a look.
> > 
> > Thanks
> > Guennadi
> > 
> > > -- 
> > > Cheers,
> > > Stephen Rothwell


^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2020-08-04  5:47 ` Guennadi Liakhovetski
@ 2020-08-04  7:04   ` Guennadi Liakhovetski
  2020-08-04  9:15     ` Michael S. Tsirkin
  0 siblings, 1 reply; 29+ messages in thread
From: Guennadi Liakhovetski @ 2020-08-04  7:04 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Stephen Rothwell

Michael, looks like something went wrong with your merge? My patch 
https://lore.kernel.org/r/20200722150927.15587-3-guennadi.liakhovetski@linux.intel.com 
has the header, your merged commit 
https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git/commit/?h=vhost&id=bba6f4f52c31af1ce4ebcc063afa08eb063b3d2c
doesn't have it?

Thanks
Guennadi

On Tue, Aug 04, 2020 at 07:47:58AM +0200, Guennadi Liakhovetski wrote:
> Hi Stephen,
> 
> On Tue, Aug 04, 2020 at 03:11:17PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the vhost tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/rpmsg/virtio_rpmsg_bus.c:28:10: fatal error: linux/virtio_rpmsg.h: No such file or directory
> >    28 | #include <linux/virtio_rpmsg.h>
> >       |          ^~~~~~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   bba6f4f52c31 ("rpmsg: move common structures and defines to headers")
> > 
> > I have used the vhost tree from next-20200803 for today.
> 
> Yes, I've seen that, that's a clang build for MIPS... I'll have a look.
> 
> Thanks
> Guennadi
> 
> > -- 
> > Cheers,
> > Stephen Rothwell

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2020-08-04  5:11 Stephen Rothwell
@ 2020-08-04  5:47 ` Guennadi Liakhovetski
  2020-08-04  7:04   ` Guennadi Liakhovetski
  0 siblings, 1 reply; 29+ messages in thread
From: Guennadi Liakhovetski @ 2020-08-04  5:47 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Michael S. Tsirkin, Linux Next Mailing List, Linux Kernel Mailing List

Hi Stephen,

On Tue, Aug 04, 2020 at 03:11:17PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vhost tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/rpmsg/virtio_rpmsg_bus.c:28:10: fatal error: linux/virtio_rpmsg.h: No such file or directory
>    28 | #include <linux/virtio_rpmsg.h>
>       |          ^~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   bba6f4f52c31 ("rpmsg: move common structures and defines to headers")
> 
> I have used the vhost tree from next-20200803 for today.

Yes, I've seen that, that's a clang build for MIPS... I'll have a look.

Thanks
Guennadi

> -- 
> Cheers,
> Stephen Rothwell



^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2020-08-04  5:11 Stephen Rothwell
  2020-08-04  5:47 ` Guennadi Liakhovetski
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2020-08-04  5:11 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Guennadi Liakhovetski


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

Hi all,

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

drivers/rpmsg/virtio_rpmsg_bus.c:28:10: fatal error: linux/virtio_rpmsg.h: No such file or directory
   28 | #include <linux/virtio_rpmsg.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  bba6f4f52c31 ("rpmsg: move common structures and defines to headers")

I have used the vhost tree from next-20200803 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2020-07-30  7:52 Stephen Rothwell
  0 siblings, 0 replies; 29+ messages in thread
From: Stephen Rothwell @ 2020-07-30  7:52 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: Linux Next Mailing List, Linux Kernel Mailing List


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

Hi all,

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

drivers/virtio/virtio_vdpa.c: In function 'virtio_vdpa_get':
drivers/virtio/virtio_vdpa.c:60:32: warning: unused variable 'ops' [-Wunused-variable]
   60 |  const struct vdpa_config_ops *ops = vdpa->config;
      |                                ^~~
drivers/virtio/virtio_vdpa.c: In function 'virtio_vdpa_finalize_features':
drivers/virtio/virtio_vdpa.c:301:9: error: void value not ignored as it ought to be
  301 |  return vdpa_set_features(vdpa, vdev->features);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/virtio/virtio_vdpa.c:296:32: warning: unused variable 'ops' [-Wunused-variable]
  296 |  const struct vdpa_config_ops *ops = vdpa->config;
      |                                ^~~
drivers/virtio/virtio_vdpa.c:302:1: warning: control reaches end of non-void function [-Wreturn-type]
  302 | }
      | ^
drivers/vhost/vdpa.c: In function 'vhost_vdpa_get_config':
drivers/vhost/vdpa.c:198:32: warning: unused variable 'ops' [-Wunused-variable]
  198 |  const struct vdpa_config_ops *ops = vdpa->config;
      |                                ^~~
drivers/vhost/vdpa.c: In function 'vhost_vdpa_set_features':
drivers/vhost/vdpa.c:284:6: error: void value not ignored as it ought to be
  284 |  if (vdpa_set_features(vdpa, features))
      |      ^~~~~~~~~~~~~~~~~

Caused by commit

  d4ff0377f05b ("virtio_vdpa: legacy features handling")

I added the following (hack) patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 30 Jul 2020 17:39:11 +1000
Subject: [PATCH] virtio_vdpa: fix legacy features handling

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/vhost/vdpa.c         | 4 +---
 drivers/virtio/virtio_vdpa.c | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
index be9b3ed01a93..f7ef5f3ef0e3 100644
--- a/drivers/vhost/vdpa.c
+++ b/drivers/vhost/vdpa.c
@@ -195,7 +195,6 @@ static long vhost_vdpa_get_config(struct vhost_vdpa *v,
 				  struct vhost_vdpa_config __user *c)
 {
 	struct vdpa_device *vdpa = v->vdpa;
-	const struct vdpa_config_ops *ops = vdpa->config;
 	struct vhost_vdpa_config config;
 	unsigned long size = offsetof(struct vhost_vdpa_config, buf);
 	u8 *buf;
@@ -281,8 +280,7 @@ static long vhost_vdpa_set_features(struct vhost_vdpa *v, u64 __user *featurep)
 	if (features & ~vhost_vdpa_features[v->virtio_id])
 		return -EINVAL;
 
-	if (vdpa_set_features(vdpa, features))
-		return -EINVAL;
+	vdpa_set_features(vdpa, features);
 
 	return 0;
 }
diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c
index d0ae58d35392..73c5d49ff0df 100644
--- a/drivers/virtio/virtio_vdpa.c
+++ b/drivers/virtio/virtio_vdpa.c
@@ -57,7 +57,6 @@ static void virtio_vdpa_get(struct virtio_device *vdev, unsigned offset,
 			    void *buf, unsigned len)
 {
 	struct vdpa_device *vdpa = vd_get_vdpa(vdev);
-	const struct vdpa_config_ops *ops = vdpa->config;
 
 	vdpa_get_config(vdpa, offset, buf, len);
 }
@@ -293,12 +292,12 @@ static u64 virtio_vdpa_get_features(struct virtio_device *vdev)
 static int virtio_vdpa_finalize_features(struct virtio_device *vdev)
 {
 	struct vdpa_device *vdpa = vd_get_vdpa(vdev);
-	const struct vdpa_config_ops *ops = vdpa->config;
 
 	/* Give virtio_ring a chance to accept features. */
 	vring_transport_features(vdev);
 
-	return vdpa_set_features(vdpa, vdev->features);
+	vdpa_set_features(vdpa, vdev->features);
+	return 0;
 }
 
 static const char *virtio_vdpa_bus_name(struct virtio_device *vdev)
-- 
2.27.0

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2020-07-28  8:11 Stephen Rothwell
@ 2020-07-29 14:08 ` Michael S. Tsirkin
  0 siblings, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2020-07-29 14:08 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Linux Next Mailing List, Linux Kernel Mailing List

On Tue, Jul 28, 2020 at 06:11:32PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vhost tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/virtio/virtio_vdpa.c:17:
> include/linux/vdpa.h:43:21: error: expected ':', ',', ';', '}' or '__attribute__' before '.' token
>    43 |  bool features_valid.
>       |                     ^
> 
> Caused by commit
> 
>   fee8fe6bd8cc ("vdpa: make sure set_features in invoked for legacy")
> 
> I have used the vhost tree from next-20200727 for today.

Sorry by bad, pushed to a wrong tag.


> -- 
> Cheers,
> Stephen Rothwell



^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2020-07-28  8:11 Stephen Rothwell
  2020-07-29 14:08 ` Michael S. Tsirkin
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2020-07-28  8:11 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: Linux Next Mailing List, Linux Kernel Mailing List


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

Hi all,

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

In file included from drivers/virtio/virtio_vdpa.c:17:
include/linux/vdpa.h:43:21: error: expected ':', ',', ';', '}' or '__attribute__' before '.' token
   43 |  bool features_valid.
      |                     ^

Caused by commit

  fee8fe6bd8cc ("vdpa: make sure set_features in invoked for legacy")

I have used the vhost tree from next-20200727 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2020-05-07  5:36 Stephen Rothwell
  0 siblings, 0 replies; 29+ messages in thread
From: Stephen Rothwell @ 2020-05-07  5:36 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: Linux Next Mailing List, Linux Kernel Mailing List


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

Hi all,

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

drivers/net/virtio_net.c: In function 'try_fill_recv':
drivers/net/virtio_net.c:1250:3: error: too few arguments to function 'u64_stats_update_end_irqrestore'
 1250 |   u64_stats_update_end_irqrestore(&rq->stats.syncp);
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/net/snmp.h:47,
                 from include/net/netns/mib.h:5,
                 from include/net/net_namespace.h:17,
                 from include/linux/netdevice.h:38,
                 from drivers/net/virtio_net.c:7:
include/linux/u64_stats_sync.h:149:1: note: declared here
  149 | u64_stats_update_end_irqrestore(struct u64_stats_sync *syncp,
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  fa74db4261e1 ("virtio_net: fix lockdep warning on 32 bit")

I have used the version of the vhost tree from next-20200505.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2020-04-07 18:58 ` Nathan Chancellor
@ 2020-04-09 21:15   ` Michael S. Tsirkin
  0 siblings, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2020-04-09 21:15 UTC (permalink / raw)
  To: Nathan Chancellor
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Gerd Hoffmann, clang-built-linux

On Tue, Apr 07, 2020 at 11:58:15AM -0700, Nathan Chancellor wrote:
> On Tue, Apr 07, 2020 at 01:05:42PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the vhost tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/gpu/drm/virtio/virtgpu_kms.c: In function 'virtio_gpu_init':
> > drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: error: 'VIRTIO_RING_F_INDIRECT_DESC' undeclared (first use in this function)
> >   153 |  if (virtio_has_feature(vgdev->vdev, VIRTIO_RING_F_INDIRECT_DESC)) {
> >       |                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: note: each undeclared identifier is reported only once for each function it appears in
> > 
> > Caused by commit
> > 
> >   898952f9597e ("virtio: stop using legacy struct vring in kernel")
> > 
> > interacting with commit
> > 
> >   5edbb5608256 ("drm/virtio: fix ring free check")
> > 
> > from Linus' tree (post v5.6).
> > 
> > I have added the following merge fix patch for today.
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 7 Apr 2020 12:58:26 +1000
> > Subject: [PATCH] drm/virtio: fix up for include file changes
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/gpu/drm/virtio/virtgpu_kms.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
> > index 023a030ca7b9..f4ea4cef5e23 100644
> > --- a/drivers/gpu/drm/virtio/virtgpu_kms.c
> > +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
> > @@ -25,6 +25,7 @@
> >  
> >  #include <linux/virtio.h>
> >  #include <linux/virtio_config.h>
> > +#include <linux/virtio_ring.h>
> >  
> >  #include <drm/drm_file.h>
> >  
> > -- 
> > 2.25.0
> > 
> > I do have to wonder why all this code has been added to the vhost tree
> > during the second week of the merge window (especially when I see it
> > rebased 4 times in one day :-().  Is it really intended for v5.7?

I pushed to next branch by mistake as I was publishing a tree for others to test, sorry.
But yes the final version (which should be ok now hopefully) is intended
for 5.7.

> > -- 
> > Cheers,
> > Stephen Rothwell
> 
> Linaro's CI also reports an issue with this patch with the remoteproc
> drivers that were freshly merged in Linus' tree for 5.7-rc1 (seen with a
> simple arm allyesconfig build):
> 
> drivers/rpmsg/mtk_rpmsg.c:68:2: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
> drivers/rpmsg/mtk_rpmsg.c:93:9: error: implicit declaration of function 'kzalloc' [-Werror,-Wimplicit-function-declaration]
> drivers/rpmsg/mtk_rpmsg.c:170:2: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
> drivers/rpmsg/mtk_rpmsg.c:204:9: error: implicit declaration of function 'kzalloc' [-Werror,-Wimplicit-function-declaration]
> drivers/rpmsg/mtk_rpmsg.c:223:3: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
> drivers/rpmsg/mtk_rpmsg.c:259:9: error: implicit declaration of function 'kzalloc' [-Werror,-Wimplicit-function-declaration]
> drivers/rpmsg/mtk_rpmsg.c:376:3: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
> drivers/rpmsg/mtk_rpmsg.c:387:15: error: implicit declaration of function 'kzalloc' [-Werror,-Wimplicit-function-declaration]
> drivers/rpmsg/mtk_rpmsg.c:409:2: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
> drivers/remoteproc/stm32_rproc.c:152:14: error: implicit declaration of function 'kcalloc' [-Werror,-Wimplicit-function-declaration]
> drivers/remoteproc/stm32_rproc.c:179:2: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]

Yes, this a virtio header change in -next exposes a bug: these are using slab.h
but not including it. I posted fixes and also pushed them on my branch now.

> It seems like this series shouldn't be in -next until after 5.7-rc1 (or
> rebased on Linus' tree if it is intended for the merge window).
> 
> Cheers,
> Nathan

Exposing this kind of issue is what next is for, right?

-- 
MST


^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2020-04-07  3:05 Stephen Rothwell
  2020-04-07 10:01 ` Michael S. Tsirkin
@ 2020-04-07 18:58 ` Nathan Chancellor
  2020-04-09 21:15   ` Michael S. Tsirkin
  1 sibling, 1 reply; 29+ messages in thread
From: Nathan Chancellor @ 2020-04-07 18:58 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Michael S. Tsirkin, Linux Next Mailing List,
	Linux Kernel Mailing List, Gerd Hoffmann, clang-built-linux

On Tue, Apr 07, 2020 at 01:05:42PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vhost tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/virtio/virtgpu_kms.c: In function 'virtio_gpu_init':
> drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: error: 'VIRTIO_RING_F_INDIRECT_DESC' undeclared (first use in this function)
>   153 |  if (virtio_has_feature(vgdev->vdev, VIRTIO_RING_F_INDIRECT_DESC)) {
>       |                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit
> 
>   898952f9597e ("virtio: stop using legacy struct vring in kernel")
> 
> interacting with commit
> 
>   5edbb5608256 ("drm/virtio: fix ring free check")
> 
> from Linus' tree (post v5.6).
> 
> I have added the following merge fix patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 7 Apr 2020 12:58:26 +1000
> Subject: [PATCH] drm/virtio: fix up for include file changes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/virtio/virtgpu_kms.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
> index 023a030ca7b9..f4ea4cef5e23 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_kms.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
> @@ -25,6 +25,7 @@
>  
>  #include <linux/virtio.h>
>  #include <linux/virtio_config.h>
> +#include <linux/virtio_ring.h>
>  
>  #include <drm/drm_file.h>
>  
> -- 
> 2.25.0
> 
> I do have to wonder why all this code has been added to the vhost tree
> during the second week of the merge window (especially when I see it
> rebased 4 times in one day :-().  Is it really intended for v5.7?
> -- 
> Cheers,
> Stephen Rothwell

Linaro's CI also reports an issue with this patch with the remoteproc
drivers that were freshly merged in Linus' tree for 5.7-rc1 (seen with a
simple arm allyesconfig build):

drivers/rpmsg/mtk_rpmsg.c:68:2: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
drivers/rpmsg/mtk_rpmsg.c:93:9: error: implicit declaration of function 'kzalloc' [-Werror,-Wimplicit-function-declaration]
drivers/rpmsg/mtk_rpmsg.c:170:2: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
drivers/rpmsg/mtk_rpmsg.c:204:9: error: implicit declaration of function 'kzalloc' [-Werror,-Wimplicit-function-declaration]
drivers/rpmsg/mtk_rpmsg.c:223:3: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
drivers/rpmsg/mtk_rpmsg.c:259:9: error: implicit declaration of function 'kzalloc' [-Werror,-Wimplicit-function-declaration]
drivers/rpmsg/mtk_rpmsg.c:376:3: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
drivers/rpmsg/mtk_rpmsg.c:387:15: error: implicit declaration of function 'kzalloc' [-Werror,-Wimplicit-function-declaration]
drivers/rpmsg/mtk_rpmsg.c:409:2: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]
drivers/remoteproc/stm32_rproc.c:152:14: error: implicit declaration of function 'kcalloc' [-Werror,-Wimplicit-function-declaration]
drivers/remoteproc/stm32_rproc.c:179:2: error: implicit declaration of function 'kfree' [-Werror,-Wimplicit-function-declaration]

It seems like this series shouldn't be in -next until after 5.7-rc1 (or
rebased on Linus' tree if it is intended for the merge window).

Cheers,
Nathan

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2020-04-07  3:05 Stephen Rothwell
@ 2020-04-07 10:01 ` Michael S. Tsirkin
  2020-04-07 18:58 ` Nathan Chancellor
  1 sibling, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2020-04-07 10:01 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Gerd Hoffmann

On Tue, Apr 07, 2020 at 01:05:42PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vhost tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/virtio/virtgpu_kms.c: In function 'virtio_gpu_init':
> drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: error: 'VIRTIO_RING_F_INDIRECT_DESC' undeclared (first use in this function)
>   153 |  if (virtio_has_feature(vgdev->vdev, VIRTIO_RING_F_INDIRECT_DESC)) {
>       |                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit
> 
>   898952f9597e ("virtio: stop using legacy struct vring in kernel")
> 
> interacting with commit
> 
>   5edbb5608256 ("drm/virtio: fix ring free check")
> 
> from Linus' tree (post v5.6).
> 
> I have added the following merge fix patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 7 Apr 2020 12:58:26 +1000
> Subject: [PATCH] drm/virtio: fix up for include file changes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

That's the right fix - anyone using VIRTIO_RING_F_INDIRECT_DESC
must include virtio_ring.h, not assume some other header
pulls it in.

Given Gerd's patch is in Linus' tree I'll put this one in mine to
make things easy.

Thanks!

> ---
>  drivers/gpu/drm/virtio/virtgpu_kms.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
> index 023a030ca7b9..f4ea4cef5e23 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_kms.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
> @@ -25,6 +25,7 @@
>  
>  #include <linux/virtio.h>
>  #include <linux/virtio_config.h>
> +#include <linux/virtio_ring.h>
>  
>  #include <drm/drm_file.h>
>  
> -- 
> 2.25.0
> 
> I do have to wonder why all this code has been added to the vhost tree
> during the second week of the merge window (especially when I see it
> rebased 4 times in one day :-().  Is it really intended for v5.7?
> -- 
> Cheers,
> Stephen Rothwell



^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2020-04-07  3:05 Stephen Rothwell
  2020-04-07 10:01 ` Michael S. Tsirkin
  2020-04-07 18:58 ` Nathan Chancellor
  0 siblings, 2 replies; 29+ messages in thread
From: Stephen Rothwell @ 2020-04-07  3:05 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Gerd Hoffmann


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

Hi all,

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

drivers/gpu/drm/virtio/virtgpu_kms.c: In function 'virtio_gpu_init':
drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: error: 'VIRTIO_RING_F_INDIRECT_DESC' undeclared (first use in this function)
  153 |  if (virtio_has_feature(vgdev->vdev, VIRTIO_RING_F_INDIRECT_DESC)) {
      |                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  898952f9597e ("virtio: stop using legacy struct vring in kernel")

interacting with commit

  5edbb5608256 ("drm/virtio: fix ring free check")

from Linus' tree (post v5.6).

I have added the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 7 Apr 2020 12:58:26 +1000
Subject: [PATCH] drm/virtio: fix up for include file changes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/virtio/virtgpu_kms.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
index 023a030ca7b9..f4ea4cef5e23 100644
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -25,6 +25,7 @@
 
 #include <linux/virtio.h>
 #include <linux/virtio_config.h>
+#include <linux/virtio_ring.h>
 
 #include <drm/drm_file.h>
 
-- 
2.25.0

I do have to wonder why all this code has been added to the vhost tree
during the second week of the merge window (especially when I see it
rebased 4 times in one day :-().  Is it really intended for v5.7?
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2019-12-04  3:24 Stephen Rothwell
  2019-12-07 23:45 ` Stephen Rothwell
@ 2019-12-09 15:24 ` Michael S. Tsirkin
  1 sibling, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2019-12-09 15:24 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Linux Next Mailing List, Linux Kernel Mailing List

On Wed, Dec 04, 2019 at 02:24:04PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vhost tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: error: initialization of 'void (*)(struct net_device *, unsigned int)' from incompatible pointer type 'void (*)(struct net_device *)' [-Werror=incompatible-pointer-types]
>  2889 |  .ndo_tx_timeout  = atlx_tx_timeout,
>       |                     ^~~~~~~~~~~~~~~
> drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: note: (near initialization for 'atl1_netdev_ops.ndo_tx_timeout')
> 
> Caused by commit
> 
>   29fd1db09264 ("netdev: pass the stuck queue to the timeout handler")
> 
> I applied the following patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 4 Dec 2019 14:13:18 +1100
> Subject: [PATCH] netdev: another fix for "netdev: pass the stuck queue to the
>  timeout handler"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/ethernet/atheros/atlx/atlx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
> index 505a22c703f7..0941d07d0833 100644
> --- a/drivers/net/ethernet/atheros/atlx/atlx.c
> +++ b/drivers/net/ethernet/atheros/atlx/atlx.c
> @@ -183,7 +183,7 @@ static void atlx_clear_phy_int(struct atlx_adapter *adapter)
>   * atlx_tx_timeout - Respond to a Tx Hang
>   * @netdev: network interface device structure
>   */
> -static void atlx_tx_timeout(struct net_device *netdev)
> +static void atlx_tx_timeout(struct net_device *netdev, unsigned int txqueue)
>  {
>  	struct atlx_adapter *adapter = netdev_priv(netdev);
>  	/* Do the reset outside of interrupt context */
> -- 
> 2.24.0
> 
> Then I got another build failure:
> 
> drivers/net/ethernet/natsemi/ns83820.c: In function 'ns83820_tx_watch':
> drivers/net/ethernet/natsemi/ns83820.c:1606:3: error: too few arguments to function 'ns83820_tx_timeout'
>  1606 |   ns83820_tx_timeout(ndev);
>       |   ^~~~~~~~~~~~~~~~~~
> drivers/net/ethernet/natsemi/ns83820.c:1552:13: note: declared here
>  1552 | static void ns83820_tx_timeout(struct net_device *ndev, unsigned int txqueue)
>       |             ^~~~~~~~~~~~~~~~~~
> 
> At this point, I just used the vhost tree from next-20191203 ...
> -- 
> Cheers,
> Stephen Rothwell


fixed up now, thanks!

-- 
MST


^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2019-12-04  3:24 Stephen Rothwell
@ 2019-12-07 23:45 ` Stephen Rothwell
  2019-12-09 15:24 ` Michael S. Tsirkin
  1 sibling, 0 replies; 29+ messages in thread
From: Stephen Rothwell @ 2019-12-07 23:45 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: Linux Next Mailing List, Linux Kernel Mailing List


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

Hi Michael,

On Wed, 4 Dec 2019 14:24:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> After merging the vhost tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: error: initialization of 'void (*)(struct net_device *, unsigned int)' from incompatible pointer type 'void (*)(struct net_device *)' [-Werror=incompatible-pointer-types]
>  2889 |  .ndo_tx_timeout  = atlx_tx_timeout,
>       |                     ^~~~~~~~~~~~~~~
> drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: note: (near initialization for 'atl1_netdev_ops.ndo_tx_timeout')
> 
> Caused by commit
> 
>   29fd1db09264 ("netdev: pass the stuck queue to the timeout handler")
> 
> I applied the following patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 4 Dec 2019 14:13:18 +1100
> Subject: [PATCH] netdev: another fix for "netdev: pass the stuck queue to the
>  timeout handler"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/ethernet/atheros/atlx/atlx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
> index 505a22c703f7..0941d07d0833 100644
> --- a/drivers/net/ethernet/atheros/atlx/atlx.c
> +++ b/drivers/net/ethernet/atheros/atlx/atlx.c
> @@ -183,7 +183,7 @@ static void atlx_clear_phy_int(struct atlx_adapter *adapter)
>   * atlx_tx_timeout - Respond to a Tx Hang
>   * @netdev: network interface device structure
>   */
> -static void atlx_tx_timeout(struct net_device *netdev)
> +static void atlx_tx_timeout(struct net_device *netdev, unsigned int txqueue)
>  {
>  	struct atlx_adapter *adapter = netdev_priv(netdev);
>  	/* Do the reset outside of interrupt context */
> -- 
> 2.24.0
> 
> Then I got another build failure:
> 
> drivers/net/ethernet/natsemi/ns83820.c: In function 'ns83820_tx_watch':
> drivers/net/ethernet/natsemi/ns83820.c:1606:3: error: too few arguments to function 'ns83820_tx_timeout'
>  1606 |   ns83820_tx_timeout(ndev);
>       |   ^~~~~~~~~~~~~~~~~~
> drivers/net/ethernet/natsemi/ns83820.c:1552:13: note: declared here
>  1552 | static void ns83820_tx_timeout(struct net_device *ndev, unsigned int txqueue)
>       |             ^~~~~~~~~~~~~~~~~~
> 
> At this point, I just used the vhost tree from next-20191203 ...

I am still getting these build failures ...
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2019-12-04  3:24 Stephen Rothwell
  2019-12-07 23:45 ` Stephen Rothwell
  2019-12-09 15:24 ` Michael S. Tsirkin
  0 siblings, 2 replies; 29+ messages in thread
From: Stephen Rothwell @ 2019-12-04  3:24 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: Linux Next Mailing List, Linux Kernel Mailing List


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

Hi all,

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

drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: error: initialization of 'void (*)(struct net_device *, unsigned int)' from incompatible pointer type 'void (*)(struct net_device *)' [-Werror=incompatible-pointer-types]
 2889 |  .ndo_tx_timeout  = atlx_tx_timeout,
      |                     ^~~~~~~~~~~~~~~
drivers/net/ethernet/atheros/atlx/atl1.c:2889:21: note: (near initialization for 'atl1_netdev_ops.ndo_tx_timeout')

Caused by commit

  29fd1db09264 ("netdev: pass the stuck queue to the timeout handler")

I applied the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Dec 2019 14:13:18 +1100
Subject: [PATCH] netdev: another fix for "netdev: pass the stuck queue to the
 timeout handler"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/atheros/atlx/atlx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
index 505a22c703f7..0941d07d0833 100644
--- a/drivers/net/ethernet/atheros/atlx/atlx.c
+++ b/drivers/net/ethernet/atheros/atlx/atlx.c
@@ -183,7 +183,7 @@ static void atlx_clear_phy_int(struct atlx_adapter *adapter)
  * atlx_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
  */
-static void atlx_tx_timeout(struct net_device *netdev)
+static void atlx_tx_timeout(struct net_device *netdev, unsigned int txqueue)
 {
 	struct atlx_adapter *adapter = netdev_priv(netdev);
 	/* Do the reset outside of interrupt context */
-- 
2.24.0

Then I got another build failure:

drivers/net/ethernet/natsemi/ns83820.c: In function 'ns83820_tx_watch':
drivers/net/ethernet/natsemi/ns83820.c:1606:3: error: too few arguments to function 'ns83820_tx_timeout'
 1606 |   ns83820_tx_timeout(ndev);
      |   ^~~~~~~~~~~~~~~~~~
drivers/net/ethernet/natsemi/ns83820.c:1552:13: note: declared here
 1552 | static void ns83820_tx_timeout(struct net_device *ndev, unsigned int txqueue)
      |             ^~~~~~~~~~~~~~~~~~

At this point, I just used the vhost tree from next-20191203 ...
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2018-02-07  2:57   ` Michael S. Tsirkin
@ 2018-02-07  4:30     ` Stephen Rothwell
  0 siblings, 0 replies; 29+ messages in thread
From: Stephen Rothwell @ 2018-02-07  4:30 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Wei Wang, Liang Li

Hi Michael,

On Wed, 7 Feb 2018 04:57:42 +0200 "Michael S. Tsirkin" <mst@redhat.com> wrote:
>
> On Wed, Feb 07, 2018 at 01:54:41PM +1100, Stephen Rothwell wrote:
> > 
> > On Wed, 7 Feb 2018 13:04:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >
> > > I have used the vhost tree from next-20180206 for today.  
> 
> That's
> commit d25cc43c6775bff6b8e3dad97c747954b805e421
>     vhost: don't hold onto file pointer for VHOST_SET_LOG_FD
> 
> Right?

Correct.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2018-02-07  2:54 ` Stephen Rothwell
@ 2018-02-07  2:57   ` Michael S. Tsirkin
  2018-02-07  4:30     ` Stephen Rothwell
  0 siblings, 1 reply; 29+ messages in thread
From: Michael S. Tsirkin @ 2018-02-07  2:57 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Wei Wang, Liang Li

On Wed, Feb 07, 2018 at 01:54:41PM +1100, Stephen Rothwell wrote:
> Hi Michael,
> 
> On Wed, 7 Feb 2018 13:04:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the vhost tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> 
> ERROR: "page_poisoning_enabled" [drivers/virtio/virtio_balloon.ko] undefined!
> 
> > Caused by commit
> > 
> >   96bcd04462b9 ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT")
> > 
> > I have used the vhost tree from next-20180206 for today.

That's
commit d25cc43c6775bff6b8e3dad97c747954b805e421
    vhost: don't hold onto file pointer for VHOST_SET_LOG_FD

Right?
Sounds good, and I reverted by tree to the same hash.

> -- 
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2018-02-07  2:04 Stephen Rothwell
  2018-02-07  2:52 ` Michael S. Tsirkin
@ 2018-02-07  2:54 ` Stephen Rothwell
  2018-02-07  2:57   ` Michael S. Tsirkin
  1 sibling, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2018-02-07  2:54 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Wei Wang, Liang Li

Hi Michael,

On Wed, 7 Feb 2018 13:04:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the vhost tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

ERROR: "page_poisoning_enabled" [drivers/virtio/virtio_balloon.ko] undefined!

> Caused by commit
> 
>   96bcd04462b9 ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT")
> 
> I have used the vhost tree from next-20180206 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2018-02-07  2:04 Stephen Rothwell
@ 2018-02-07  2:52 ` Michael S. Tsirkin
  2018-02-07  2:54 ` Stephen Rothwell
  1 sibling, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2018-02-07  2:52 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Wei Wang, Liang Li

On Wed, Feb 07, 2018 at 01:04:23PM +1100, Stephen Rothwell wrote:
> Hi Michael,
> 
> After merging the vhost tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> 
> Caused by commit
> 
>   96bcd04462b9 ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT")
> 
> I have used the vhost tree from next-20180206 for today.
> 
> -- 
> Cheers,
> Stephen Rothwell

Thanks, I'll revert to that too.

-- 
MST

^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2018-02-07  2:04 Stephen Rothwell
  2018-02-07  2:52 ` Michael S. Tsirkin
  2018-02-07  2:54 ` Stephen Rothwell
  0 siblings, 2 replies; 29+ messages in thread
From: Stephen Rothwell @ 2018-02-07  2:04 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Wei Wang, Liang Li

Hi Michael,

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


Caused by commit

  96bcd04462b9 ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT")

I have used the vhost tree from next-20180206 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2014-06-10  4:12 Stephen Rothwell
@ 2014-06-10  9:38 ` Michael S. Tsirkin
  0 siblings, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2014-06-10  9:38 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Nicholas Bellinger, linux-next, linux-kernel

On Tue, Jun 10, 2014 at 02:12:17PM +1000, Stephen Rothwell wrote:
> Hi Michael,
> 
> After merging the vhost tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/vhost/scsi.c: In function 'vhost_scsi_handle_vq':
> drivers/vhost/scsi.c:1043:14: error: 'struct vhost_dev' has no member named 'acked_features'
>    if (vs->dev.acked_features & VIRTIO_SCSI_F_T10_PI) {
>               ^
> 
> Commit 95e7c4341b8e ("vhost/scsi: Enable T10 PI IOV -> SGL memory
> mapping") from the target-updates tree interacting with commit
> 10350a292160 ("vhost: move acked_features to VQs") from the vhost tree.
> 
> I applied the following patch which seems right, but may not be.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 10 Jun 2014 14:08:21 +1000
> Subject: [PATCH] vhost/scsi: fixup for acked_features move
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

This is exactly the correct resolution of this conflict.
ACK

> ---
>  drivers/vhost/scsi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
> index 78ff1f64d759..6d7dd85365fe 100644
> --- a/drivers/vhost/scsi.c
> +++ b/drivers/vhost/scsi.c
> @@ -1040,7 +1040,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)
>  			break;
>  		}
>  
> -		if (vs->dev.acked_features & VIRTIO_SCSI_F_T10_PI) {
> +		if (vhost_has_feature(vq, VIRTIO_SCSI_F_T10_PI)) {
>  			req = &v_req_pi;
>  			lunp = &v_req_pi.lun[0];
>  			target = &v_req_pi.lun[1];
> -- 
> 2.0.0
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2014-06-10  4:12 Stephen Rothwell
  2014-06-10  9:38 ` Michael S. Tsirkin
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2014-06-10  4:12 UTC (permalink / raw)
  To: Michael S. Tsirkin, Nicholas Bellinger; +Cc: linux-next, linux-kernel


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

Hi Michael,

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

drivers/vhost/scsi.c: In function 'vhost_scsi_handle_vq':
drivers/vhost/scsi.c:1043:14: error: 'struct vhost_dev' has no member named 'acked_features'
   if (vs->dev.acked_features & VIRTIO_SCSI_F_T10_PI) {
              ^

Commit 95e7c4341b8e ("vhost/scsi: Enable T10 PI IOV -> SGL memory
mapping") from the target-updates tree interacting with commit
10350a292160 ("vhost: move acked_features to VQs") from the vhost tree.

I applied the following patch which seems right, but may not be.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Jun 2014 14:08:21 +1000
Subject: [PATCH] vhost/scsi: fixup for acked_features move

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/vhost/scsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 78ff1f64d759..6d7dd85365fe 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1040,7 +1040,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)
 			break;
 		}
 
-		if (vs->dev.acked_features & VIRTIO_SCSI_F_T10_PI) {
+		if (vhost_has_feature(vq, VIRTIO_SCSI_F_T10_PI)) {
 			req = &v_req_pi;
 			lunp = &v_req_pi.lun[0];
 			target = &v_req_pi.lun[1];
-- 
2.0.0

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2014-06-03  8:38 Stephen Rothwell
@ 2014-06-09 13:19 ` Michael S. Tsirkin
  0 siblings, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2014-06-09 13:19 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

On Tue, Jun 03, 2014 at 06:38:38PM +1000, Stephen Rothwell wrote:
> Hi Michael,
> 
> After merging the vhost tree, today's linux-next build (powerpc allyesconfig)
> failed like this:

Yes pushed a wrong tree, sorry about that.
I fixed it up now, sorry about the noise.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2014-06-03  8:38 Stephen Rothwell
  2014-06-09 13:19 ` Michael S. Tsirkin
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2014-06-03  8:38 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: linux-next, linux-kernel


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

Hi Michael,

After merging the vhost tree, today's linux-next build (powerpc allyesconfig)
failed like this:

In file included from arch/powerpc/include/asm/epapr_hcalls.h:53:0,
                 from arch/powerpc/include/uapi/asm/kvm_para.h:81,
                 from arch/powerpc/include/asm/kvm_para.h:22,
                 from drivers/cpuidle/cpuidle-kvm.c:18:
arch/powerpc/include/asm/kvm_para.h: In function 'kvm_arch_para_features':
arch/powerpc/include/asm/kvm_para.h:58:40: error: 'KVM_HC_FEATURES' undeclared (first use in this function)
  if(epapr_hypercall0_1(KVM_HCALL_TOKEN(KVM_HC_FEATURES), &r))
                                        ^
arch/powerpc/include/uapi/asm/epapr_hcalls.h:74:51: note: in definition of macro '_EV_HCALL_TOKEN'
 #define _EV_HCALL_TOKEN(id, num) (((id) << 16) | (num))
                                                   ^
arch/powerpc/include/asm/kvm_para.h:58:24: note: in expansion of macro 'KVM_HCALL_TOKEN'
  if(epapr_hypercall0_1(KVM_HCALL_TOKEN(KVM_HC_FEATURES), &r))
                        ^
arch/powerpc/include/asm/kvm_para.h:58:40: note: each undeclared identifier is reported only once for each function it appears in
  if(epapr_hypercall0_1(KVM_HCALL_TOKEN(KVM_HC_FEATURES), &r))
                                        ^
arch/powerpc/include/uapi/asm/epapr_hcalls.h:74:51: note: in definition of macro '_EV_HCALL_TOKEN'
 #define _EV_HCALL_TOKEN(id, num) (((id) << 16) | (num))
                                                   ^
arch/powerpc/include/asm/kvm_para.h:58:24: note: in expansion of macro 'KVM_HCALL_TOKEN'
  if(epapr_hypercall0_1(KVM_HCALL_TOKEN(KVM_HC_FEATURES), &r))
                        ^
drivers/cpuidle/cpuidle-kvm.c: In function 'kvm_enter_idle':
drivers/cpuidle/cpuidle-kvm.c:66:2: error: implicit declaration of function 'arch_safe_halt' [-Werror=implicit-function-declaration]
  safe_halt();
  ^

Caused by commit 89bfc4cdb438 ("cpuidle: kvm cpuidle").

Given that the commit message for this commit includes "Very much a
demo for now, downstream only." it should *not* be in linux-next.  It
should especially not have turned up at this point (just before the
merge window).  I also wonder about some of the other commits in that
tree :-(

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2013-05-22  4:37 Stephen Rothwell
  2013-05-22  5:07 ` Michael S. Tsirkin
@ 2013-05-22  9:03 ` Michael S. Tsirkin
  1 sibling, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2013-05-22  9:03 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

On Wed, May 22, 2013 at 02:37:04PM +1000, Stephen Rothwell wrote:
> Hi Michael,
> 
> After merging the vhost tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from arch/powerpc/include/asm/uaccess.h:12:0,
>                  from arch/powerpc/lib/checksum_wrappers_64.c:24:
> include/asm-generic/uaccess.h: In function 'might_fault':
> include/asm-generic/uaccess.h:36:2: error: implicit declaration of function 'segment_eq' [-Werror=implicit-function-declaration]
>   if (_might_fault())
>   ^
> include/asm-generic/uaccess.h:36:2: error: implicit declaration of function 'get_fs' [-Werror=implicit-function-declaration]
> include/asm-generic/uaccess.h:29:47: error: 'KERNEL_DS' undeclared (first use in this function)
>  #define _might_fault() (!segment_eq(get_fs(), KERNEL_DS) && !in_atomic())
>                                                ^
> include/asm-generic/uaccess.h:36:6: note: in expansion of macro '_might_fault'
>   if (_might_fault())
>       ^
> 
> and many, many more.
> 
> Caused by commit d198a8acf543 ("kernel: might_fault does not imply
> might_sleep").
> 
> I have used the version of the vhost tree from next-20130521 for today.

Aha I see what happened. I fixed it and made sure the
changes build and work, but didn't commit and pushed from
a dirty tree.

> 
> It was unexpected that such patches would turn up in the "vhost" tree ...
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

vhost wants to use these changes but these patches are still
work in progress. Since the changes are all over the
tree I thought looking at how they interact with
everyone's work at an early stage is a good idea.

Of course breaking builds for everyone is not acceptable,
I'm very sorry about that.
I'll make double sure by tree is clean before push next time,
will also look at whether git push can check this automatically.

-- 
MST

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: linux-next: build failure after merge of the vhost tree
  2013-05-22  4:37 Stephen Rothwell
@ 2013-05-22  5:07 ` Michael S. Tsirkin
  2013-05-22  9:03 ` Michael S. Tsirkin
  1 sibling, 0 replies; 29+ messages in thread
From: Michael S. Tsirkin @ 2013-05-22  5:07 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

On Wed, May 22, 2013 at 02:37:04PM +1000, Stephen Rothwell wrote:
> Hi Michael,
> 
> After merging the vhost tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from arch/powerpc/include/asm/uaccess.h:12:0,
>                  from arch/powerpc/lib/checksum_wrappers_64.c:24:
> include/asm-generic/uaccess.h: In function 'might_fault':
> include/asm-generic/uaccess.h:36:2: error: implicit declaration of function 'segment_eq' [-Werror=implicit-function-declaration]
>   if (_might_fault())
>   ^
> include/asm-generic/uaccess.h:36:2: error: implicit declaration of function 'get_fs' [-Werror=implicit-function-declaration]
> include/asm-generic/uaccess.h:29:47: error: 'KERNEL_DS' undeclared (first use in this function)
>  #define _might_fault() (!segment_eq(get_fs(), KERNEL_DS) && !in_atomic())
>                                                ^
> include/asm-generic/uaccess.h:36:6: note: in expansion of macro '_might_fault'
>   if (_might_fault())
>       ^
> 
> and many, many more.
> 
> Caused by commit d198a8acf543 ("kernel: might_fault does not imply
> might_sleep").
> 
> I have used the version of the vhost tree from next-20130521 for today.
> 
> It was unexpected that such patches would turn up in the "vhost" tree ...
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au


Looks like I pushed a wrong commit. Sorry, will fix this up ASAP.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* linux-next: build failure after merge of the vhost tree
@ 2013-05-22  4:37 Stephen Rothwell
  2013-05-22  5:07 ` Michael S. Tsirkin
  2013-05-22  9:03 ` Michael S. Tsirkin
  0 siblings, 2 replies; 29+ messages in thread
From: Stephen Rothwell @ 2013-05-22  4:37 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: linux-next, linux-kernel


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

Hi Michael,

After merging the vhost tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from arch/powerpc/include/asm/uaccess.h:12:0,
                 from arch/powerpc/lib/checksum_wrappers_64.c:24:
include/asm-generic/uaccess.h: In function 'might_fault':
include/asm-generic/uaccess.h:36:2: error: implicit declaration of function 'segment_eq' [-Werror=implicit-function-declaration]
  if (_might_fault())
  ^
include/asm-generic/uaccess.h:36:2: error: implicit declaration of function 'get_fs' [-Werror=implicit-function-declaration]
include/asm-generic/uaccess.h:29:47: error: 'KERNEL_DS' undeclared (first use in this function)
 #define _might_fault() (!segment_eq(get_fs(), KERNEL_DS) && !in_atomic())
                                               ^
include/asm-generic/uaccess.h:36:6: note: in expansion of macro '_might_fault'
  if (_might_fault())
      ^

and many, many more.

Caused by commit d198a8acf543 ("kernel: might_fault does not imply
might_sleep").

I have used the version of the vhost tree from next-20130521 for today.

It was unexpected that such patches would turn up in the "vhost" tree ...

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread

end of thread, back to index

Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-30  4:25 linux-next: build failure after merge of the vhost tree Stephen Rothwell
2017-04-03  6:21 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-08-04  5:11 Stephen Rothwell
2020-08-04  5:47 ` Guennadi Liakhovetski
2020-08-04  7:04   ` Guennadi Liakhovetski
2020-08-04  9:15     ` Michael S. Tsirkin
2020-07-30  7:52 Stephen Rothwell
2020-07-28  8:11 Stephen Rothwell
2020-07-29 14:08 ` Michael S. Tsirkin
2020-05-07  5:36 Stephen Rothwell
2020-04-07  3:05 Stephen Rothwell
2020-04-07 10:01 ` Michael S. Tsirkin
2020-04-07 18:58 ` Nathan Chancellor
2020-04-09 21:15   ` Michael S. Tsirkin
2019-12-04  3:24 Stephen Rothwell
2019-12-07 23:45 ` Stephen Rothwell
2019-12-09 15:24 ` Michael S. Tsirkin
2018-02-07  2:04 Stephen Rothwell
2018-02-07  2:52 ` Michael S. Tsirkin
2018-02-07  2:54 ` Stephen Rothwell
2018-02-07  2:57   ` Michael S. Tsirkin
2018-02-07  4:30     ` Stephen Rothwell
2014-06-10  4:12 Stephen Rothwell
2014-06-10  9:38 ` Michael S. Tsirkin
2014-06-03  8:38 Stephen Rothwell
2014-06-09 13:19 ` Michael S. Tsirkin
2013-05-22  4:37 Stephen Rothwell
2013-05-22  5:07 ` Michael S. Tsirkin
2013-05-22  9:03 ` Michael S. Tsirkin

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git