Message ID | 20231011092728.105904-6-xuanzhuo@linux.alibaba.com (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | virtio-net: support AF_XDP zero copy | expand |
Hi Xuan,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linus/master]
[also build test WARNING on v6.6-rc5 next-20231011]
[cannot apply to mst-vhost/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Xuan-Zhuo/virtio_ring-virtqueue_set_dma_premapped-support-disable/20231011-180709
base: linus/master
patch link: https://lore.kernel.org/r/20231011092728.105904-6-xuanzhuo%40linux.alibaba.com
patch subject: [PATCH vhost 05/22] virtio_net: independent directory
config: sparc-allyesconfig (https://download.01.org/0day-ci/archive/20231012/202310120705.aR0WPj7m-lkp@intel.com/config)
compiler: sparc64-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231012/202310120705.aR0WPj7m-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202310120705.aR0WPj7m-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/net/virtio/main.c: In function 'virtnet_find_vqs':
>> drivers/net/virtio/main.c:4091:48: warning: '%d' directive writing between 1 and 11 bytes into a region of size 10 [-Wformat-overflow=]
4091 | sprintf(vi->rq[i].name, "input.%d", i);
| ^~
drivers/net/virtio/main.c:4091:41: note: directive argument in the range [-2147483641, 65534]
4091 | sprintf(vi->rq[i].name, "input.%d", i);
| ^~~~~~~~~~
drivers/net/virtio/main.c:4091:17: note: 'sprintf' output between 8 and 18 bytes into a destination of size 16
4091 | sprintf(vi->rq[i].name, "input.%d", i);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/virtio/main.c:4092:49: warning: '%d' directive writing between 1 and 11 bytes into a region of size 9 [-Wformat-overflow=]
4092 | sprintf(vi->sq[i].name, "output.%d", i);
| ^~
drivers/net/virtio/main.c:4092:41: note: directive argument in the range [-2147483641, 65534]
4092 | sprintf(vi->sq[i].name, "output.%d", i);
| ^~~~~~~~~~~
drivers/net/virtio/main.c:4092:17: note: 'sprintf' output between 9 and 19 bytes into a destination of size 16
4092 | sprintf(vi->sq[i].name, "output.%d", i);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +4091 drivers/net/virtio/main.c
d85b758f72b05a drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-09 4046
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4047 static int virtnet_find_vqs(struct virtnet_info *vi)
3f9c10b0d478a3 drivers/net/virtio_net.c Amit Shah 2011-12-22 4048 {
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4049 vq_callback_t **callbacks;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4050 struct virtqueue **vqs;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4051 int ret = -ENOMEM;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4052 int i, total_vqs;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4053 const char **names;
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4054 bool *ctx;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4055
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4056 /* We expect 1 RX virtqueue followed by 1 TX virtqueue, followed by
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4057 * possible N-1 RX/TX queue pairs used in multiqueue mode, followed by
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4058 * possible control vq.
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4059 */
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4060 total_vqs = vi->max_queue_pairs * 2 +
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4061 virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4062
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4063 /* Allocate space for find_vqs parameters */
6396bb221514d2 drivers/net/virtio_net.c Kees Cook 2018-06-12 4064 vqs = kcalloc(total_vqs, sizeof(*vqs), GFP_KERNEL);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4065 if (!vqs)
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4066 goto err_vq;
6da2ec56059c3c drivers/net/virtio_net.c Kees Cook 2018-06-12 4067 callbacks = kmalloc_array(total_vqs, sizeof(*callbacks), GFP_KERNEL);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4068 if (!callbacks)
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4069 goto err_callback;
6da2ec56059c3c drivers/net/virtio_net.c Kees Cook 2018-06-12 4070 names = kmalloc_array(total_vqs, sizeof(*names), GFP_KERNEL);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4071 if (!names)
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4072 goto err_names;
192f68cf35f5ee drivers/net/virtio_net.c Jason Wang 2017-07-19 4073 if (!vi->big_packets || vi->mergeable_rx_bufs) {
6396bb221514d2 drivers/net/virtio_net.c Kees Cook 2018-06-12 4074 ctx = kcalloc(total_vqs, sizeof(*ctx), GFP_KERNEL);
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4075 if (!ctx)
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4076 goto err_ctx;
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4077 } else {
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4078 ctx = NULL;
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4079 }
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4080
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4081 /* Parameters for control virtqueue, if any */
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4082 if (vi->has_cvq) {
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4083 callbacks[total_vqs - 1] = NULL;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4084 names[total_vqs - 1] = "control";
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4085 }
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4086
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4087 /* Allocate/initialize parameters for send/receive virtqueues */
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4088 for (i = 0; i < vi->max_queue_pairs; i++) {
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4089 callbacks[rxq2vq(i)] = skb_recv_done;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4090 callbacks[txq2vq(i)] = skb_xmit_done;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 @4091 sprintf(vi->rq[i].name, "input.%d", i);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4092 sprintf(vi->sq[i].name, "output.%d", i);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4093 names[rxq2vq(i)] = vi->rq[i].name;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4094 names[txq2vq(i)] = vi->sq[i].name;
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4095 if (ctx)
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4096 ctx[rxq2vq(i)] = true;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4097 }
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4098
2e9ca760c289e1 drivers/net/virtio_net.c Michael S. Tsirkin 2022-08-16 4099 ret = virtio_find_vqs_ctx(vi->vdev, total_vqs, vqs, callbacks,
2e9ca760c289e1 drivers/net/virtio_net.c Michael S. Tsirkin 2022-08-16 4100 names, ctx, NULL);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4101 if (ret)
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4102 goto err_find;
3f9c10b0d478a3 drivers/net/virtio_net.c Amit Shah 2011-12-22 4103
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4104 if (vi->has_cvq) {
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4105 vi->cvq = vqs[total_vqs - 1];
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4106 if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
f646968f8f7c62 drivers/net/virtio_net.c Patrick McHardy 2013-04-19 4107 vi->dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4108 }
3f9c10b0d478a3 drivers/net/virtio_net.c Amit Shah 2011-12-22 4109
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4110 for (i = 0; i < vi->max_queue_pairs; i++) {
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4111 vi->rq[i].vq = vqs[rxq2vq(i)];
d85b758f72b05a drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-09 4112 vi->rq[i].min_buf_len = mergeable_min_buf_len(vi, vi->rq[i].vq);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4113 vi->sq[i].vq = vqs[txq2vq(i)];
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4114 }
3f9c10b0d478a3 drivers/net/virtio_net.c Amit Shah 2011-12-22 4115
2fa3c8a8b23041 drivers/net/virtio_net.c Tonghao Zhang 2018-05-31 4116 /* run here: ret == 0. */
3f9c10b0d478a3 drivers/net/virtio_net.c Amit Shah 2011-12-22 4117
3f9c10b0d478a3 drivers/net/virtio_net.c Amit Shah 2011-12-22 4118
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4119 err_find:
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4120 kfree(ctx);
d45b897b11eaf9 drivers/net/virtio_net.c Michael S. Tsirkin 2017-03-06 4121 err_ctx:
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4122 kfree(names);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4123 err_names:
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4124 kfree(callbacks);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4125 err_callback:
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4126 kfree(vqs);
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4127 err_vq:
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4128 return ret;
3f9c10b0d478a3 drivers/net/virtio_net.c Amit Shah 2011-12-22 4129 }
986a4f4d452dec drivers/net/virtio_net.c Jason Wang 2012-12-07 4130
diff --git a/MAINTAINERS b/MAINTAINERS index 9c186c214c54..e4fbcbc100e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22768,7 +22768,7 @@ F: Documentation/devicetree/bindings/virtio/ F: Documentation/driver-api/virtio/ F: drivers/block/virtio_blk.c F: drivers/crypto/virtio/ -F: drivers/net/virtio_net.c +F: drivers/net/virtio/ F: drivers/vdpa/ F: drivers/virtio/ F: include/linux/vdpa.h diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 44eeb5d61ba9..54ee6fa4f4a6 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -430,13 +430,7 @@ config VETH When one end receives the packet it appears on its pair and vice versa. -config VIRTIO_NET - tristate "Virtio network driver" - depends on VIRTIO - select NET_FAILOVER - help - This is the virtual network driver for virtio. It can be used with - QEMU based VMMs (like KVM or Xen). Say Y or M. +source "drivers/net/virtio/Kconfig" config NLMON tristate "Virtual netlink monitoring device" diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e26f98f897c5..47537dd0f120 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -31,7 +31,7 @@ obj-$(CONFIG_NET_TEAM) += team/ obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_TAP) += tap.o obj-$(CONFIG_VETH) += veth.o -obj-$(CONFIG_VIRTIO_NET) += virtio_net.o +obj-$(CONFIG_VIRTIO_NET) += virtio/ obj-$(CONFIG_VXLAN) += vxlan/ obj-$(CONFIG_GENEVE) += geneve.o obj-$(CONFIG_BAREUDP) += bareudp.o diff --git a/drivers/net/virtio/Kconfig b/drivers/net/virtio/Kconfig new file mode 100644 index 000000000000..d8ccb3ac49df --- /dev/null +++ b/drivers/net/virtio/Kconfig @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# virtio-net device configuration +# +config VIRTIO_NET + tristate "Virtio network driver" + depends on VIRTIO + select NET_FAILOVER + help + This is the virtual network driver for virtio. It can be used with + QEMU based VMMs (like KVM or Xen). + + Say Y or M. diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile new file mode 100644 index 000000000000..15ed7c97fd4f --- /dev/null +++ b/drivers/net/virtio/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the virtio network device drivers. +# + +obj-$(CONFIG_VIRTIO_NET) += virtio_net.o + +virtio_net-y := main.o diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio/main.c similarity index 100% rename from drivers/net/virtio_net.c rename to drivers/net/virtio/main.c
Create a separate directory for virtio-net. AF_XDP support will be added later, then a separate xsk.c file will be added, so we should create a directory for virtio-net. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> --- MAINTAINERS | 2 +- drivers/net/Kconfig | 8 +------- drivers/net/Makefile | 2 +- drivers/net/virtio/Kconfig | 13 +++++++++++++ drivers/net/virtio/Makefile | 8 ++++++++ drivers/net/{virtio_net.c => virtio/main.c} | 0 6 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 drivers/net/virtio/Kconfig create mode 100644 drivers/net/virtio/Makefile rename drivers/net/{virtio_net.c => virtio/main.c} (100%)