| Message ID | 20210610082209.91487-11-xuanzhuo@linux.alibaba.com |
|---|---|
| State | New |
| Headers | show |
| Series | virtio-net: support xdp socket zero copy | expand |
在 2021/6/10 下午4:22, Xuan Zhuo 写道: > Create a separate directory for virtio-net. AF_XDP support will be added > later, and a separate xsk.c file will be added. > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Acked-by: Jason Wang <jasowang@redhat.com> > --- > MAINTAINERS | 2 +- > drivers/net/Kconfig | 8 +------- > drivers/net/Makefile | 2 +- > drivers/net/virtio/Kconfig | 11 +++++++++++ > drivers/net/virtio/Makefile | 6 ++++++ > drivers/net/{ => virtio}/virtio_net.c | 0 > 6 files changed, 20 insertions(+), 9 deletions(-) > create mode 100644 drivers/net/virtio/Kconfig > create mode 100644 drivers/net/virtio/Makefile > rename drivers/net/{ => virtio}/virtio_net.c (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index e69c1991ec3b..2041267f19f1 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -19344,7 +19344,7 @@ S: Maintained > F: Documentation/devicetree/bindings/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 4da68ba8448f..2297fe4183ae 100644 > --- a/drivers/net/Kconfig > +++ b/drivers/net/Kconfig > @@ -392,13 +392,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 7ffd2d03efaf..c4c7419e0398 100644 > --- a/drivers/net/Makefile > +++ b/drivers/net/Makefile > @@ -28,7 +28,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.o > 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..9bc2a2fc6c3e > --- /dev/null > +++ b/drivers/net/virtio/Kconfig > @@ -0,0 +1,11 @@ > +# 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..ccc80f40f33a > --- /dev/null > +++ b/drivers/net/virtio/Makefile > @@ -0,0 +1,6 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# Makefile for the virtio network device drivers. > +# > + > +obj-$(CONFIG_VIRTIO_NET) += virtio_net.o > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio/virtio_net.c > similarity index 100% > rename from drivers/net/virtio_net.c > rename to drivers/net/virtio/virtio_net.c
diff --git a/MAINTAINERS b/MAINTAINERS index e69c1991ec3b..2041267f19f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19344,7 +19344,7 @@ S: Maintained F: Documentation/devicetree/bindings/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 4da68ba8448f..2297fe4183ae 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -392,13 +392,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 7ffd2d03efaf..c4c7419e0398 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -28,7 +28,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.o 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..9bc2a2fc6c3e --- /dev/null +++ b/drivers/net/virtio/Kconfig @@ -0,0 +1,11 @@ +# 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..ccc80f40f33a --- /dev/null +++ b/drivers/net/virtio/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the virtio network device drivers. +# + +obj-$(CONFIG_VIRTIO_NET) += virtio_net.o diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio/virtio_net.c similarity index 100% rename from drivers/net/virtio_net.c rename to drivers/net/virtio/virtio_net.c
Create a separate directory for virtio-net. AF_XDP support will be added later, and a separate xsk.c file will be added. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> --- MAINTAINERS | 2 +- drivers/net/Kconfig | 8 +------- drivers/net/Makefile | 2 +- drivers/net/virtio/Kconfig | 11 +++++++++++ drivers/net/virtio/Makefile | 6 ++++++ drivers/net/{ => virtio}/virtio_net.c | 0 6 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 drivers/net/virtio/Kconfig create mode 100644 drivers/net/virtio/Makefile rename drivers/net/{ => virtio}/virtio_net.c (100%)