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

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

[Stephen Rothwell]

[-- 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 --]

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

[Michael S. Tsirkin]

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

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

[Mark Brown]

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

Hi all,

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

/tmp/next/build/drivers/vhost/net.c: In function 'handle_tx_copy':
/tmp/next/build/drivers/vhost/net.c:855:1: error: expected 'while' before 'static'
  855 | static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock)
      | ^~~~~~
/tmp/next/build/drivers/vhost/net.c:964:13: error: invalid storage class for function 'handle_tx'
  964 | static void handle_tx(struct vhost_net *net)
      |             ^~~~~~~~~
/tmp/next/build/drivers/vhost/net.c: In function 'handle_tx':
/tmp/next/build/drivers/vhost/net.c:982:17: error: implicit declaration of function 'handle_tx_zerocopy'; did you mean 'handle_tx_copy'? [-Wimplicit-function-declaration]
  982 |                 handle_tx_zerocopy(net, sock);
      |                 ^~~~~~~~~~~~~~~~~~
      |                 handle_tx_copy
/tmp/next/build/drivers/vhost/net.c: In function 'handle_tx_copy':
/tmp/next/build/drivers/vhost/net.c:990:12: error: invalid storage class for function 'peek_head_len'
  990 | static int peek_head_len(struct vhost_net_virtqueue *rvq, struct sock *sk)
      |            ^~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1011:12: error: invalid storage class for function 'vhost_net_rx_peek_head_len'
 1011 | static int vhost_net_rx_peek_head_len(struct vhost_net *net, struct sock *sk,
      |            ^~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1043:12: error: invalid storage class for function 'get_rx_bufs'
 1043 | static int get_rx_bufs(struct vhost_net_virtqueue *nvq,
      |            ^~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1126:13: error: invalid storage class for function 'handle_rx'
 1126 | static void handle_rx(struct vhost_net *net)
      |             ^~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1281:13: error: invalid storage class for function 'handle_tx_kick'
 1281 | static void handle_tx_kick(struct vhost_work *work)
      |             ^~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1290:13: error: invalid storage class for function 'handle_rx_kick'
 1290 | static void handle_rx_kick(struct vhost_work *work)
      |             ^~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1299:13: error: invalid storage class for function 'handle_tx_net'
 1299 | static void handle_tx_net(struct vhost_work *work)
      |             ^~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1306:13: error: invalid storage class for function 'handle_rx_net'
 1306 | static void handle_rx_net(struct vhost_work *work)
      |             ^~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1313:12: error: invalid storage class for function 'vhost_net_open'
 1313 | static int vhost_net_open(struct inode *inode, struct file *f)
      |            ^~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1381:23: error: invalid storage class for function 'vhost_net_stop_vq'
 1381 | static struct socket *vhost_net_stop_vq(struct vhost_net *n,
      |                       ^~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1398:13: error: invalid storage class for function 'vhost_net_stop'
 1398 | static void vhost_net_stop(struct vhost_net *n, struct socket **tx_sock,
      |             ^~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1405:13: error: invalid storage class for function 'vhost_net_flush'
 1405 | static void vhost_net_flush(struct vhost_net *n)
      |             ^~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1421:12: error: invalid storage class for function 'vhost_net_release'
 1421 | static int vhost_net_release(struct inode *inode, struct file *f)
      |            ^~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1449:23: error: invalid storage class for function 'get_raw_socket'
 1449 | static struct socket *get_raw_socket(int fd)
      |                       ^~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1473:25: error: invalid storage class for function 'get_tap_ptr_ring'
 1473 | static struct ptr_ring *get_tap_ptr_ring(struct file *file)
      |                         ^~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1487:23: error: invalid storage class for function 'get_tap_socket'
 1487 | static struct socket *get_tap_socket(int fd)
      |                       ^~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1503:23: error: invalid storage class for function 'get_socket'
 1503 | static struct socket *get_socket(int fd)
      |                       ^~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1519:13: error: invalid storage class for function 'vhost_net_set_backend'
 1519 | static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
      |             ^~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1620:13: error: invalid storage class for function 'vhost_net_reset_owner'
 1620 | static long vhost_net_reset_owner(struct vhost_net *n)
      |             ^~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1650:12: error: invalid storage class for function 'vhost_net_set_features'
 1650 | static int vhost_net_set_features(struct vhost_net *n, const u64 *features)
      |            ^~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1701:13: error: invalid storage class for function 'vhost_net_set_owner'
 1701 | static long vhost_net_set_owner(struct vhost_net *n)
      |             ^~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1722:13: error: invalid storage class for function 'vhost_net_ioctl'
 1722 | static long vhost_net_ioctl(struct file *f, unsigned int ioctl,
      |             ^~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1821:16: error: invalid storage class for function 'vhost_net_chr_read_iter'
 1821 | static ssize_t vhost_net_chr_read_iter(struct kiocb *iocb, struct iov_iter *to)
      |                ^~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1831:16: error: invalid storage class for function 'vhost_net_chr_write_iter'
 1831 | static ssize_t vhost_net_chr_write_iter(struct kiocb *iocb,
      |                ^~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1841:17: error: invalid storage class for function 'vhost_net_chr_poll'
 1841 | static __poll_t vhost_net_chr_poll(struct file *file, poll_table *wait)
      |                 ^~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1851:27: error: initializer element is not constant
 1851 |         .release        = vhost_net_release,
      |                           ^~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1851:27: note: (near initialization for 'vhost_net_fops.release')
/tmp/next/build/drivers/vhost/net.c:1852:27: error: initializer element is not constant
 1852 |         .read_iter      = vhost_net_chr_read_iter,
      |                           ^~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1852:27: note: (near initialization for 'vhost_net_fops.read_iter')
/tmp/next/build/drivers/vhost/net.c:1853:27: error: initializer element is not constant
 1853 |         .write_iter     = vhost_net_chr_write_iter,
      |                           ^~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1853:27: note: (near initialization for 'vhost_net_fops.write_iter')
/tmp/next/build/drivers/vhost/net.c:1854:27: error: initializer element is not constant
 1854 |         .poll           = vhost_net_chr_poll,
      |                           ^~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1854:27: note: (near initialization for 'vhost_net_fops.poll')
/tmp/next/build/drivers/vhost/net.c:1855:27: error: initializer element is not constant
 1855 |         .unlocked_ioctl = vhost_net_ioctl,
      |                           ^~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1855:27: note: (near initialization for 'vhost_net_fops.unlocked_ioctl')
/tmp/next/build/drivers/vhost/net.c:1857:27: error: initializer element is not constant
 1857 |         .open           = vhost_net_open,
      |                           ^~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1857:27: note: (near initialization for 'vhost_net_fops.open')
/tmp/next/build/drivers/vhost/net.c:1867:19: error: invalid storage class for function 'vhost_net_init'
 1867 | static int __init vhost_net_init(void)
      |                   ^~~~~~~~~~~~~~
In file included from /tmp/next/build/include/linux/device/driver.h:21,
                 from /tmp/next/build/include/linux/device.h:32,
                 from /tmp/next/build/include/linux/virtio.h:9,
                 from /tmp/next/build/include/linux/virtio_config.h:7,
                 from /tmp/next/build/include/uapi/linux/vhost_types.h:16,
                 from /tmp/next/build/include/uapi/linux/vhost.h:14,
                 from /tmp/next/build/drivers/vhost/net.c:10:
/tmp/next/build/include/linux/module.h:132:49: error: invalid storage class for function '__inittest'
  132 |         static inline initcall_t __maybe_unused __inittest(void)                \
      |                                                 ^~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1873:1: note: in expansion of macro 'module_init'
 1873 | module_init(vhost_net_init);
      | ^~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1873:1: error: 'alias' attribute ignored [-Werror=attributes]
/tmp/next/build/drivers/vhost/net.c:1875:20: error: invalid storage class for function 'vhost_net_exit'
 1875 | static void __exit vhost_net_exit(void)
      |                    ^~~~~~~~~~~~~~
/tmp/next/build/include/linux/module.h:140:49: error: invalid storage class for function '__exittest'
  140 |         static inline exitcall_t __maybe_unused __exittest(void)                \
      |                                                 ^~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1879:1: note: in expansion of macro 'module_exit'
 1879 | module_exit(vhost_net_exit);
      | ^~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:1879:1: error: 'alias' attribute ignored [-Werror=attributes]
/tmp/next/build/drivers/vhost/net.c:1886:1: error: expected declaration or statement at end of input
 1886 | MODULE_ALIAS("devname:vhost-net");
      | ^~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c: At top level:
/tmp/next/build/drivers/vhost/net.c:620:13: error: 'vhost_exceeds_maxpend' defined but not used [-Werror=unused-function]
  620 | static bool vhost_exceeds_maxpend(struct vhost_net *net)
      |             ^~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:340:13: error: 'vhost_net_tx_select_zcopy' defined but not used [-Werror=unused-function]
  340 | static bool vhost_net_tx_select_zcopy(struct vhost_net *net)
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/vhost/net.c:326:13: error: 'vhost_net_tx_packet' defined but not used [-Werror=unused-function]
  326 | static void vhost_net_tx_packet(struct vhost_net *net)
      |             ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[5]: *** [/tmp/next/build/scripts/Makefile.build:287: drivers/vhost/net.o] Error 1
make[4]: *** [/tmp/next/build/scripts/Makefile.build:556: drivers/vhost] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [/tmp/next/build/scripts/Makefile.build:556: drivers] Error 2
make[2]: *** [/tmp/next/build/Makefile:2010: .] Error 2
make[1]: *** [/tmp/next/build/Makefile:248: __sub-make] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Command exited with non-zero status 2
16291.57user 1243.39system 1:51.12elapsed 15780%CPU (0avgtext+0avgdata 1397196maxresident)k
0inputs+0outputs (4572major+208444472minor)pagefaults 0swaps

Caused by commit

   41bafbdcd27bf ("vhost-net: flush batched before enabling notifications")

I have used the tree from 20250915 instead.

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

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

[Stephen Rothwell]

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

Hi all,

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

drivers/vdpa/pds/vdpa_dev.c: In function 'pds_vdpa_dev_add':
drivers/vdpa/pds/vdpa_dev.c:647:24: error: 'struct vdpa_device' has no member named 'dma_dev'; did you mean 'mdev'?
  647 |         pdsv->vdpa_dev.dma_dev = dma_dev;
      |                        ^~~~~~~
      |                        mdev

Caused by commit

  ca3cc7f8da0a ("vdpa: rename dma_dev to map_token")

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

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

In file included from /home/sfr/next/next/arch/x86/events/amd/ibs.c:12:
/home/sfr/next/next/include/linux/pci.h: In function 'pci_set_disconnect_work':
/home/sfr/next/next/include/linux/pci.h:2738:14: error: implicit declaration of function 'pci_device_is_present'; did you mean 'pci_dev_present'? [-Wimplicit-function-declaration]
 2738 |         if (!pci_device_is_present(pdev))
      |              ^~~~~~~~~~~~~~~~~~~~~
      |              pci_dev_present

Caused by commit

  b7468115b604 ("pci: report surprise removal event")

I have reverted that commit and the 4 following ones (just in case).

-- 
Cheers,
Stephen Rothwell

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

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

[Michael S. Tsirkin]

On Wed, Jul 09, 2025 at 10:19:05PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vhost tree, today's linux-next build (x86_64
> allnoconfig) failed like this:
> 
> In file included from /home/sfr/next/next/arch/x86/events/amd/ibs.c:12:
> /home/sfr/next/next/include/linux/pci.h: In function 'pci_set_disconnect_work':
> /home/sfr/next/next/include/linux/pci.h:2738:14: error: implicit declaration of function 'pci_device_is_present'; did you mean 'pci_dev_present'? [-Wimplicit-function-declaration]
>  2738 |         if (!pci_device_is_present(pdev))
>       |              ^~~~~~~~~~~~~~~~~~~~~
>       |              pci_dev_present
> 
> Caused by commit
> 
>   b7468115b604 ("pci: report surprise removal event")
> 
> I have reverted that commit and the 4 following ones (just in case).
> 
> -- 
> Cheers,
> Stephen Rothwell



Weird:
$ git grep pci_device_is_present include/linux/pci.h 
include/linux/pci.h:bool pci_device_is_present(struct pci_dev *pdev);
include/linux/pci.h:    if (!pci_device_is_present(pdev))

and of course I did build it ... which commit should I test?

-- 
MST

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

[Randy Dunlap]

On 7/9/25 1:00 PM, Michael S. Tsirkin wrote:
> On Wed, Jul 09, 2025 at 10:19:05PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the vhost tree, today's linux-next build (x86_64
>> allnoconfig) failed like this:
>>
>> In file included from /home/sfr/next/next/arch/x86/events/amd/ibs.c:12:
>> /home/sfr/next/next/include/linux/pci.h: In function 'pci_set_disconnect_work':
>> /home/sfr/next/next/include/linux/pci.h:2738:14: error: implicit declaration of function 'pci_device_is_present'; did you mean 'pci_dev_present'? [-Wimplicit-function-declaration]
>>  2738 |         if (!pci_device_is_present(pdev))
>>       |              ^~~~~~~~~~~~~~~~~~~~~
>>       |              pci_dev_present
>>
>> Caused by commit
>>
>>   b7468115b604 ("pci: report surprise removal event")
>>
>> I have reverted that commit and the 4 following ones (just in case).
>>
>> -- 
>> Cheers,
>> Stephen Rothwell
> 
> 
> 
> Weird:
> $ git grep pci_device_is_present include/linux/pci.h 
> include/linux/pci.h:bool pci_device_is_present(struct pci_dev *pdev);
> include/linux/pci.h:    if (!pci_device_is_present(pdev))
> 

in x86_64 allnoconfig, CONFIG_PCI is not enabled.

The function is only defined when CONFIG_PCI is enabled.


> and of course I did build it ... which commit should I test?
> 

The one that Stephen listed above?

-- 
~Randy

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

[Michael S. Tsirkin]

On Wed, Jul 09, 2025 at 01:51:53PM -0700, Randy Dunlap wrote:
> 
> 
> On 7/9/25 1:00 PM, Michael S. Tsirkin wrote:
> > On Wed, Jul 09, 2025 at 10:19:05PM +1000, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> After merging the vhost tree, today's linux-next build (x86_64
> >> allnoconfig) failed like this:
> >>
> >> In file included from /home/sfr/next/next/arch/x86/events/amd/ibs.c:12:
> >> /home/sfr/next/next/include/linux/pci.h: In function 'pci_set_disconnect_work':
> >> /home/sfr/next/next/include/linux/pci.h:2738:14: error: implicit declaration of function 'pci_device_is_present'; did you mean 'pci_dev_present'? [-Wimplicit-function-declaration]
> >>  2738 |         if (!pci_device_is_present(pdev))
> >>       |              ^~~~~~~~~~~~~~~~~~~~~
> >>       |              pci_dev_present
> >>
> >> Caused by commit
> >>
> >>   b7468115b604 ("pci: report surprise removal event")
> >>
> >> I have reverted that commit and the 4 following ones (just in case).
> >>
> >> -- 
> >> Cheers,
> >> Stephen Rothwell
> > 
> > 
> > 
> > Weird:
> > $ git grep pci_device_is_present include/linux/pci.h 
> > include/linux/pci.h:bool pci_device_is_present(struct pci_dev *pdev);
> > include/linux/pci.h:    if (!pci_device_is_present(pdev))
> > 
> 
> in x86_64 allnoconfig, CONFIG_PCI is not enabled.
> 
> The function is only defined when CONFIG_PCI is enabled.
> 
> 
> > and of course I did build it ... which commit should I test?
> > 
> 
> The one that Stephen listed above?
> 
> -- 
> ~Randy

Fixed now, thanks!

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

[Michael S. Tsirkin]

On Wed, Jul 09, 2025 at 10:19:05PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vhost tree, today's linux-next build (x86_64
> allnoconfig) failed like this:
> 
> In file included from /home/sfr/next/next/arch/x86/events/amd/ibs.c:12:
> /home/sfr/next/next/include/linux/pci.h: In function 'pci_set_disconnect_work':
> /home/sfr/next/next/include/linux/pci.h:2738:14: error: implicit declaration of function 'pci_device_is_present'; did you mean 'pci_dev_present'? [-Wimplicit-function-declaration]
>  2738 |         if (!pci_device_is_present(pdev))
>       |              ^~~~~~~~~~~~~~~~~~~~~
>       |              pci_dev_present
> 
> Caused by commit
> 
>   b7468115b604 ("pci: report surprise removal event")
> 
> I have reverted that commit and the 4 following ones (just in case).
> 
> -- 
> Cheers,
> Stephen Rothwell

got it, the issue is !CONFIG_PCI. Fixing up. Thanks!

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

[Stephen Rothwell]

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

Hi all,

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

drivers/virtio/virtio_pci_modern.c: In function 'vp_modern_create_avq':
drivers/virtio/virtio_pci_modern.c:755:34: warning: passing argument 5 of 'vp_dev->setup_vq' makes integer from pointer without a cast [-Wint-conversion]
  755 |                               avq->name, NULL, VIRTIO_MSI_NO_VECTOR);
      |                               ~~~^~~~~~
      |                                  |
      |                                  char *
drivers/virtio/virtio_pci_modern.c:755:34: note: expected 'u16' {aka 'short unsigned int'} but argument is of type 'char *'
drivers/virtio/virtio_pci_modern.c:754:14: error: too many arguments to function 'vp_dev->setup_vq'
  754 |         vq = vp_dev->setup_vq(vp_dev, &vp_dev->admin_vq.info, avq->vq_index, NULL,
      |              ^~~~~~

Caused by commit

  4cceb2591a87 ("virtio: find_vqs: pass struct instead of multi parameters")

I have used the vhost tree from next-20240228 for 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 vhost tree

[Xuan Zhuo]

On Thu, 29 Feb 2024 14:55:31 +1100, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the vhost tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/virtio/virtio_pci_modern.c: In function 'vp_modern_create_avq':
> drivers/virtio/virtio_pci_modern.c:755:34: warning: passing argument 5 of 'vp_dev->setup_vq' makes integer from pointer without a cast [-Wint-conversion]
>   755 |                               avq->name, NULL, VIRTIO_MSI_NO_VECTOR);
>       |                               ~~~^~~~~~
>       |                                  |
>       |                                  char *
> drivers/virtio/virtio_pci_modern.c:755:34: note: expected 'u16' {aka 'short unsigned int'} but argument is of type 'char *'
> drivers/virtio/virtio_pci_modern.c:754:14: error: too many arguments to function 'vp_dev->setup_vq'
>   754 |         vq = vp_dev->setup_vq(vp_dev, &vp_dev->admin_vq.info, avq->vq_index, NULL,
>       |              ^~~~~~
>
> Caused by commit
>
>   4cceb2591a87 ("virtio: find_vqs: pass struct instead of multi parameters")
>
> I have used the vhost tree from next-20240228 for today.

I will post new version for powerpc soon.

Thanks.


>
> --
> Cheers,
> Stephen Rothwell
>

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

[Xuan Zhuo]

On Thu, 29 Feb 2024 12:01:44 +0800, Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote:
> On Thu, 29 Feb 2024 14:55:31 +1100, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > After merging the vhost tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > drivers/virtio/virtio_pci_modern.c: In function 'vp_modern_create_avq':
> > drivers/virtio/virtio_pci_modern.c:755:34: warning: passing argument 5 of 'vp_dev->setup_vq' makes integer from pointer without a cast [-Wint-conversion]
> >   755 |                               avq->name, NULL, VIRTIO_MSI_NO_VECTOR);
> >       |                               ~~~^~~~~~
> >       |                                  |
> >       |                                  char *
> > drivers/virtio/virtio_pci_modern.c:755:34: note: expected 'u16' {aka 'short unsigned int'} but argument is of type 'char *'
> > drivers/virtio/virtio_pci_modern.c:754:14: error: too many arguments to function 'vp_dev->setup_vq'
> >   754 |         vq = vp_dev->setup_vq(vp_dev, &vp_dev->admin_vq.info, avq->vq_index, NULL,
> >       |              ^~~~~~
> >
> > Caused by commit
> >
> >   4cceb2591a87 ("virtio: find_vqs: pass struct instead of multi parameters")
> >
> > I have used the vhost tree from next-20240228 for today.
>
> I will post new version for powerpc soon.


This is not a bug on the powerpc. This is due to a conflict with the admin
queue commit. Because my patch set contains files for many other platforms. So I
have to check each file manually. Maybe when I do rebase I missed
checking the code again and my automated script didn't work because some files
can not compile on x86.

But the good news is that this patch set contains the ability to add new virtio
features without impacting files on other platforms.

The new version is sent.

	http://lore.kernel.org/all/20240229072044.77388-1-xuanzhuo@linux.alibaba.com

Thanks.


>
> Thanks.
>
>
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
>

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 747 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_find_vqs':
drivers/virtio/virtio_vdpa.c:291:61: error: 'sizes' undeclared (first use in this function)
  291 |                                                   names[i], sizes ? sizes[i] : 0,
      |                                                             ^~~~~
drivers/virtio/virtio_vdpa.c:291:61: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  71545b3c933a ("virtio: Revert "virtio: find_vqs() add arg sizes"")

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

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

drivers/virtio/virtio_ring.c: In function 'virtqueue_add':
drivers/virtio/virtio_ring.c:1783:16: error: 'vq' undeclared (first use in this function); did you mean '_vq'?
 1783 |         return vq->packed_ring ? virtqueue_add_packed(_vq, sgs, total_sg,
      |                ^~
      |                _vq
drivers/virtio/virtio_ring.c:1783:16: note: each undeclared identifier is reported only once for each function it appears in
drivers/virtio/virtio_ring.c:1787:1: error: control reaches end of non-void function [-Werror=return-type]
 1787 | }
      | ^

Caused by commit

  a50f09346a34 ("virtio_ring: remove unused variable in virtqueue_add()")

I am sorry, but I expect better review and build testing than this :-(

I have used the vhost tree from next-20220531 for 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 vhost tree

[Michael S. Tsirkin]

On Wed, Jun 01, 2022 at 11:42:40AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vhost tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/virtio/virtio_ring.c: In function 'virtqueue_add':
> drivers/virtio/virtio_ring.c:1783:16: error: 'vq' undeclared (first use in this function); did you mean '_vq'?
>  1783 |         return vq->packed_ring ? virtqueue_add_packed(_vq, sgs, total_sg,
>       |                ^~
>       |                _vq
> drivers/virtio/virtio_ring.c:1783:16: note: each undeclared identifier is reported only once for each function it appears in
> drivers/virtio/virtio_ring.c:1787:1: error: control reaches end of non-void function [-Werror=return-type]
>  1787 | }
>       | ^
> 
> Caused by commit
> 
>   a50f09346a34 ("virtio_ring: remove unused variable in virtqueue_add()")
> 
> I am sorry, but I expect better review and build testing than this :-(
> 
> I have used the vhost tree from next-20220531 for today.

Indeed, pushed a wrong tree :( 
I hope I pushed the correct one now, pls let me know whether this is now fixed.
Thanks!

-- 
MST

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

[Stephen Rothwell]

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

Hi Michael,

On Wed, 1 Jun 2022 17:57:12 -0400 "Michael S. Tsirkin" <mst@redhat.com> wrote:
>
> Indeed, pushed a wrong tree :( 
> I hope I pushed the correct one now, pls let me know whether this is now fixed.

Looks good here, thanks.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

net/vmw_vsock/virtio_transport.c:734:3: error: 'struct virtio_driver' has no member named 'suppress_used_validation'
  734 |  .suppress_used_validation = true,
      |   ^~~~~~~~~~~~~~~~~~~~~~~~
net/vmw_vsock/virtio_transport.c:734:30: error: initialization of 'const unsigned int *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
  734 |  .suppress_used_validation = true,
      |                              ^~~~
net/vmw_vsock/virtio_transport.c:734:30: note: (near initialization for 'virtio_vsock_driver.feature_table_legacy')

Caused by commit

  f124034faa91 ("Revert "virtio_ring: validate used buffer length"")

interacting with commit

  f7a36b03a732 ("vsock/virtio: suppress used length validation")

from the net tree.

I have reverted commit f7a36b03a732 for today.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

drivers/vdpa/vdpa_user/vduse_dev.c: In function 'vduse_vdpa_kick_vq':
drivers/vdpa/vdpa_user/vduse_dev.c:489:6: error: implicit declaration of function 'eventfd_signal_count'; did you mean 'eventfd_signal_allowed'? [-Werror=implicit-function-declaration]
  489 |  if (eventfd_signal_count()) {
      |      ^~~~~~~~~~~~~~~~~~~~
      |      eventfd_signal_allowed

Caused by commit

  b66219796563 ("vduse: Introduce VDUSE - vDPA Device in Userspace")

interacting with commit

  b542e383d8c0 ("eventfd: Make signal recursion protection a task bit")

from Linus' tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Sep 2021 12:43:32 +1000
Subject: [PATCH] fix up for "eventfd: Make signal recursion protection a task bit"

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

diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index 59a93e5b967a..5c25ff6483ad 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -486,7 +486,7 @@ static void vduse_vdpa_kick_vq(struct vdpa_device *vdpa, u16 idx)
 	struct vduse_dev *dev = vdpa_to_vduse(vdpa);
 	struct vduse_virtqueue *vq = &dev->vqs[idx];
 
-	if (eventfd_signal_count()) {
+	if (eventfd_signal_allowed()) {
 		schedule_work(&vq->kick);
 		return;
 	}
-- 
2.32.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 vhost tree

[Yongji Xie]

On Mon, Sep 6, 2021 at 10:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the vhost tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/vdpa/vdpa_user/vduse_dev.c: In function 'vduse_vdpa_kick_vq':
> drivers/vdpa/vdpa_user/vduse_dev.c:489:6: error: implicit declaration of function 'eventfd_signal_count'; did you mean 'eventfd_signal_allowed'? [-Werror=implicit-function-declaration]
>   489 |  if (eventfd_signal_count()) {
>       |      ^~~~~~~~~~~~~~~~~~~~
>       |      eventfd_signal_allowed
>
> Caused by commit
>
>   b66219796563 ("vduse: Introduce VDUSE - vDPA Device in Userspace")
>
> interacting with commit
>
>   b542e383d8c0 ("eventfd: Make signal recursion protection a task bit")
>
> from Linus' tree.
>
> I have applied the following merge fix patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 6 Sep 2021 12:43:32 +1000
> Subject: [PATCH] fix up for "eventfd: Make signal recursion protection a task bit"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/vdpa/vdpa_user/vduse_dev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
> index 59a93e5b967a..5c25ff6483ad 100644
> --- a/drivers/vdpa/vdpa_user/vduse_dev.c
> +++ b/drivers/vdpa/vdpa_user/vduse_dev.c
> @@ -486,7 +486,7 @@ static void vduse_vdpa_kick_vq(struct vdpa_device *vdpa, u16 idx)
>         struct vduse_dev *dev = vdpa_to_vduse(vdpa);
>         struct vduse_virtqueue *vq = &dev->vqs[idx];
>
> -       if (eventfd_signal_count()) {
> +       if (eventfd_signal_allowed()) {
>                 schedule_work(&vq->kick);
>                 return;
>         }
> --

LGTM! Thank you for the fix!

Thanks,
Yongji

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

[Stephen Rothwell]

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

Hi all,

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

drivers/block/virtio_blk.c:986:14: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
  986 |  .probe    = virtblk_probe,
      |              ^~~~~~~~~~~~~
drivers/block/virtio_blk.c:986:14: note: (near initialization for 'virtio_blk.probe')
drivers/char/virtio_console.c:2213:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
 2213 |  .probe = virtcons_probe,
      |           ^~~~~~~~~~~~~~
drivers/char/virtio_console.c:2213:11: note: (near initialization for 'virtio_console.probe')
drivers/char/virtio_console.c:2228:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
 2228 |  .probe = virtcons_probe,
      |           ^~~~~~~~~~~~~~
drivers/char/virtio_console.c:2228:11: note: (near initialization for 'virtio_rproc_serial.probe')
drivers/scsi/virtio_scsi.c:983:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
  983 |  .probe = virtscsi_probe,
      |           ^~~~~~~~~~~~~~
drivers/scsi/virtio_scsi.c:983:11: note: (near initialization for 'virtio_scsi_driver.probe')
drivers/net/virtio_net.c: At top level:
drivers/net/virtio_net.c:3387:14: error: initialization of 'void * (*)(struct virtio_device *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
 3387 |  .validate = virtnet_validate,
      |              ^~~~~~~~~~~~~~~~
drivers/net/virtio_net.c:3387:14: note: (near initialization for 'virtio_net_driver.validate')
drivers/net/virtio_net.c:3388:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
 3388 |  .probe = virtnet_probe,
      |           ^~~~~~~~~~~~~
drivers/net/virtio_net.c:3388:11: note: (near initialization for 'virtio_net_driver.probe')

Caused by commit

  e397242b72e2 ("virtio: allow passing config data from validate callback")

I have used the vhost tree from next-20210707 for 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 vhost tree

[Michael S. Tsirkin]

On Thu, Jul 08, 2021 at 11:08:54AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vhost tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/block/virtio_blk.c:986:14: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
>   986 |  .probe    = virtblk_probe,
>       |              ^~~~~~~~~~~~~
> drivers/block/virtio_blk.c:986:14: note: (near initialization for 'virtio_blk.probe')
> drivers/char/virtio_console.c:2213:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
>  2213 |  .probe = virtcons_probe,
>       |           ^~~~~~~~~~~~~~
> drivers/char/virtio_console.c:2213:11: note: (near initialization for 'virtio_console.probe')
> drivers/char/virtio_console.c:2228:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
>  2228 |  .probe = virtcons_probe,
>       |           ^~~~~~~~~~~~~~
> drivers/char/virtio_console.c:2228:11: note: (near initialization for 'virtio_rproc_serial.probe')
> drivers/scsi/virtio_scsi.c:983:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
>   983 |  .probe = virtscsi_probe,
>       |           ^~~~~~~~~~~~~~
> drivers/scsi/virtio_scsi.c:983:11: note: (near initialization for 'virtio_scsi_driver.probe')
> drivers/net/virtio_net.c: At top level:
> drivers/net/virtio_net.c:3387:14: error: initialization of 'void * (*)(struct virtio_device *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
>  3387 |  .validate = virtnet_validate,
>       |              ^~~~~~~~~~~~~~~~
> drivers/net/virtio_net.c:3387:14: note: (near initialization for 'virtio_net_driver.validate')
> drivers/net/virtio_net.c:3388:11: error: initialization of 'int (*)(struct virtio_device *, void *)' from incompatible pointer type 'int (*)(struct virtio_device *)' [-Werror=incompatible-pointer-types]
>  3388 |  .probe = virtnet_probe,
>       |           ^~~~~~~~~~~~~
> drivers/net/virtio_net.c:3388:11: note: (near initialization for 'virtio_net_driver.probe')
> 
> Caused by commit
> 
>   e397242b72e2 ("virtio: allow passing config data from validate callback")
> 
> I have used the vhost tree from next-20210707 for today.


My bad - pushed a wrong head by mistake. thanks!

> -- 
> Cheers,
> Stephen Rothwell

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

[Stephen Rothwell]

[-- 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 --]

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

[Guennadi Liakhovetski]

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

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

[Guennadi Liakhovetski]

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

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

[Michael S. Tsirkin]

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

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

[Stephen Rothwell]

[-- 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 --]

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

[Stephen Rothwell]

[-- 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 --]

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

[Stephen Rothwell]

[-- 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 --]

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

[Michael S. Tsirkin]

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

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

[Nathan Chancellor]

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

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

[Michael S. Tsirkin]

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

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

[Stephen Rothwell]

[-- 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 --]

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

[Stephen Rothwell]

[-- 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 --]

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

[Michael S. Tsirkin]

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

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

[Stephen Rothwell]

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

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

[Michael S. Tsirkin]

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

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

[Stephen Rothwell]

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

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

[Michael S. Tsirkin]

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

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

[Stephen Rothwell]

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

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

[Stephen Rothwell]

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

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

[Stephen Rothwell]

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

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

[Stephen Rothwell]

[-- 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 --]

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

[Michael S. Tsirkin]

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

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

[Stephen Rothwell]

[-- 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 --]

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

[Michael S. Tsirkin]

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.

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

[Stephen Rothwell]

[-- 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 --]

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

[Michael S. Tsirkin]

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.

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

[Michael S. Tsirkin]

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