net/virtio-user: fix multiqueue support with vhost kernel
PATCH 1/1 net/virtio-user: fix multiqueue support with vhost kernel
The multiqueue support in virtio-user with vhost kernel backend is broken when tap name isn't specified by users explicitly, because the tap name returned by ioctl(TUNSETIFF) isn't saved properly, and multiple tap interfaces will be created in this case. Fix this by saving the dynamically allocated tap name first before reusing the ifr structure. Besides, also make it possible to support the format string in tap name (e.g. foo%d) specified by users explicitly.
--- drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/virtio/virtio_user/vhost_kernel_tap.c +10 -2
@@ -62,6 +62,7 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq, const char *mac, uint64_t features) {unsigned int tap_features; +char *tap_name =NULL ;int sndbuf =INT_MAX ;struct ifreq ifr;int tapfd;
@@ -112,6 +113,12 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq, goto error; } + tap_name =strdup (ifr.ifr_name); +if (!tap_name) { +PMD_DRV_LOG (ERR ,"strdup ifname failed: %s" ,strerror (errno)); + goto error; + } +fcntl (tapfd,F_SETFL ,O_NONBLOCK );if (ioctl (tapfd,TUNSETVNETHDRSZ , &hdr_size) <0 ) {
@@ -134,11 +141,12 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq, goto error; } -if (!(*p_ifname)) - *p_ifname =strdup (ifr.ifr_name); +free (*p_ifname); + *p_ifname = tap_name;return tapfd; error: +free (tap_name);close (tapfd);return -1 ; }
Signature · 1 line
2.17.1
Quoted 9 lines · Tiwei Bie
The multiqueue support in virtio-user with vhost kernel backend is broken when tap name isn't specified by users explicitly, because the tap name returned by ioctl(TUNSETIFF) isn't saved properly, and multiple tap interfaces will be created in this case. Fix this by saving the dynamically allocated tap name first before reusing the ifr structure. Besides, also make it possible to support the format string in tap name (e.g. foo%d) specified by users explicitly.
Quoted 9 lines
Fixes 791b43e08842 ("net/virtio-user: specify MAC of the tap")Reported-by Stephen Hemminger <[email protected]>Signed-off-by Tiwei Bie <[email protected]>--- drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
Quoted 9 lines · On Tue, 12 Mar 2019 15:13:07 +0800 Tiwei Bie <[email protected]> wrote:
The multiqueue support in virtio-user with vhost kernel backend is broken when tap name isn't specified by users explicitly, because the tap name returned by ioctl(TUNSETIFF) isn't saved properly, and multiple tap interfaces will be created in this case. Fix this by saving the dynamically allocated tap name first before reusing the ifr structure. Besides, also make it possible to support the format string in tap name (e.g. foo%d) specified by users explicitly.
Quoted 5 lines
Fixes 791b43e08842 ("net/virtio-user: specify MAC of the tap")Reported-by Stephen Hemminger <[email protected]>Signed-off-by Tiwei Bie <[email protected]>
Does this have any impact on primary/secondary support?
Quoted 15 lines · Stephen Hemminger
Quoted 12 lines · On Tue, 12 Mar 2019 15:13:07 +0800 Tiwei Bie <[email protected]> wrote:
The multiqueue support in virtio-user with vhost kernel backend is broken when tap name isn't specified by users explicitly, because the tap name returned by ioctl(TUNSETIFF) isn't saved properly, and multiple tap interfaces will be created in this case. Fix this by saving the dynamically allocated tap name first before reusing the ifr structure. Besides, also make it possible to support the format string in tap name (e.g. foo%d) specified by users explicitly.
Fixes 791b43e08842 ("net/virtio-user: specify MAC of the tap")
Quoted 6 lines
Quoted 2 lines
Reported-by Stephen Hemminger <[email protected]>Signed-off-by Tiwei Bie <[email protected]>Reviewed-by Stephen Hemminger <[email protected]>Does this have any impact on primary/secondary support?
No. But I think there are some other issues with virtio-user on primary/secondary support currently. I plan to send some fixes for it later.
Thanks,
Tiwei
Maxime Coquelin
AppliedQuoted 9 lines · Tiwei Bie
The multiqueue support in virtio-user with vhost kernel backend is broken when tap name isn't specified by users explicitly, because the tap name returned by ioctl(TUNSETIFF) isn't saved properly, and multiple tap interfaces will be created in this case. Fix this by saving the dynamically allocated tap name first before reusing the ifr structure. Besides, also make it possible to support the format string in tap name (e.g. foo%d) specified by users explicitly.
Quoted 9 lines
Fixes 791b43e08842 ("net/virtio-user: specify MAC of the tap")Reported-by Stephen Hemminger <[email protected]>Signed-off-by Tiwei Bie <[email protected]>--- drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
Applied to dpdk-next-virtio/master branch.
Thanks,
Maxime