From kvm-owner@vger.kernel.org Sun Sep 25 04:12:32 2011 Return-path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on stodi.digitalkingdom.org X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,KB_DATE_CONTAINS_TAB,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD,TAB_IN_FROM,T_DKIM_INVALID,T_TO_NO_BRKTS_FREEMAIL autolearn=no version=3.3.2 Envelope-to: rlpowell@digitalkingdom.org Delivery-date: Sun, 25 Sep 2011 04:12:33 -0700 Received: from vger.kernel.org ([209.132.180.67]:59962) by stodi.digitalkingdom.org with esmtp (Exim 4.76) (envelope-from ) id 1R7mdH-0001ru-By for rlpowell@digitalkingdom.org; Sun, 25 Sep 2011 04:12:32 -0700 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752090Ab1IYLMS (ORCPT ); Sun, 25 Sep 2011 07:12:18 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:60991 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751967Ab1IYLMQ (ORCPT ); Sun, 25 Sep 2011 07:12:16 -0400 Received: by eya28 with SMTP id 28so3010123eya.19 for ; Sun, 25 Sep 2011 04:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=HG/FSKKWZJsJYClpzAzun5xtNF6FWh5q+Mqouu+55+8=; b=x/w76Mxw3LeqBvgad9gsOzrA1YuJVJoy/JFpjYhFuF7SRrfCvRA2bJ2w114FwzhS/U mB7IT5AnNPLkK3QaEZEcVCGP4InGelCHIlp3D4A5tAsFVKGGNai6s2vz+YR7wqK43M1q 1BBk+jd+wNb+azy6IAX653KJQrIGNzHCYOEpE= Received: by 10.213.113.132 with SMTP id a4mr538666ebq.29.1316949134861; Sun, 25 Sep 2011 04:12:14 -0700 (PDT) Received: from localhost.localdomain (bzq-79-180-204-136.red.bezeqint.net. [79.180.204.136]) by mx.google.com with ESMTPS id f16sm10624762eec.8.2011.09.25.04.12.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 25 Sep 2011 04:12:14 -0700 (PDT) From: Sasha Levin To: penberg@cs.helsinki.fi Cc: kvm@vger.kernel.org, mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, Sasha Levin Subject: [PATCH v2] kvm tools: Support multiple net devices Date: Sun, 25 Sep 2011 14:11:25 +0300 Message-Id: <1316949085-22598-1-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.6.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam_score: 0.9 X-Spam_score_int: 9 X-Spam_bar: / Status: RO Content-Length: 16652 This patch adds support for multiple network devices. The command line syntax changes to the following: --network/-n [mode=[tap/user/none]] [guest_ip=[guest ip]] [host_ip= [host_ip]] [guest_mac=[guest_mac]] [script=[script]] Each of the parameters is optional, and the config defaults to a TAP based networking with a sequential MAC. Signed-off-by: Sasha Levin --- tools/kvm/builtin-run.c | 146 ++++++++++++++++++++++++++++++++------------ tools/kvm/virtio/net.c | 155 +++++++++++++++++++++++++--------------------- 2 files changed, 191 insertions(+), 110 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index 28dc95a..070b1b6 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -87,9 +87,12 @@ static bool sdl; static bool balloon; static bool using_rootfs; static bool custom_rootfs; +static bool no_net; extern bool ioport_debug; extern int active_console; extern int debug_iodelay; +struct virtio_net_parameters *net_params; +int num_net_devices; bool do_debug_print = false; @@ -182,6 +185,89 @@ static int tty_parser(const struct option *opt, const char *arg, int unset) return 0; } +static inline void str_to_mac(const char *str, char *mac) +{ + sscanf(str, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", + mac, mac+1, mac+2, mac+3, mac+4, mac+5); +} +static int set_net_param(struct virtio_net_parameters *p, const char *param, + const char *val) +{ + if (strcmp(param, "guest_mac") == 0) { + str_to_mac(val, p->guest_mac); + } else if (strcmp(param, "mode") == 0) { + if (!strncmp(val, "user", 4)) { + int i; + + for (i = 0; i < num_net_devices; i++) + if (net_params[i].mode == NET_MODE_USER) + die("Only one usermode network device allowed at a time"); + p->mode = NET_MODE_USER; + } else if (!strncmp(val, "tap", 3)) { + p->mode = NET_MODE_TAP; + } else if (!strncmp(val, "none", 4)) { + no_net = 1; + return -1; + } else + die("Unkown network mode %s, please use user, tap or none", network); + } else if (strcmp(param, "script") == 0) { + p->script = val; + } else if (strcmp(param, "guest_ip") == 0) { + p->guest_ip = val; + } else if (strcmp(param, "host_ip") == 0) { + p->host_ip = val; + } + + return 0; +} + +static int netdev_parser(const struct option *opt, const char *arg, int unset) +{ + struct virtio_net_parameters p; + char *buf, *cmd = NULL, *cur = NULL; + bool on_cmd = true; + + if (arg) { + buf = strdup(arg); + if (buf == NULL) + die("Failed allocating new net buffer"); + cur = strtok(buf, ",="); + } + + p = (struct virtio_net_parameters) { + .guest_ip = DEFAULT_GUEST_ADDR, + .host_ip = DEFAULT_HOST_ADDR, + .script = DEFAULT_SCRIPT, + .mode = NET_MODE_TAP, + }; + + str_to_mac(DEFAULT_GUEST_MAC, p.guest_mac); + p.guest_mac[5] += num_net_devices; + + while (cur) { + if (on_cmd) { + cmd = cur; + } else { + if (set_net_param(&p, cmd, cur) < 0) + goto done; + } + on_cmd = !on_cmd; + + cur = strtok(NULL, ",="); + }; + + num_net_devices++; + + net_params = realloc(net_params, num_net_devices * sizeof(*net_params)); + if (net_params == NULL) + die("Failed adding new network device"); + + net_params[num_net_devices - 1] = p; + +done: + return 0; +} + static int shmem_parser(const struct option *opt, const char *arg, int unset) { const u64 default_size = SHMEM_DEFAULT_SIZE; @@ -339,18 +425,9 @@ static const struct option options[] = { "Kernel command line arguments"), OPT_GROUP("Networking options:"), - OPT_STRING('n', "network", &network, "user, tap, none", - "Network to use"), - OPT_STRING('\0', "host-ip", &host_ip, "a.b.c.d", - "Assign this address to the host side networking"), - OPT_STRING('\0', "guest-ip", &guest_ip, "a.b.c.d", - "Assign this address to the guest side networking"), - OPT_STRING('\0', "host-mac", &host_mac, "aa:bb:cc:dd:ee:ff", - "Assign this address to the host side NIC"), - OPT_STRING('\0', "guest-mac", &guest_mac, "aa:bb:cc:dd:ee:ff", - "Assign this address to the guest side NIC"), - OPT_STRING('\0', "tapscript", &script, "Script path", - "Assign a script to process created tap device"), + OPT_CALLBACK_DEFAULT('n', "network", NULL, "network params", + "Create a new guest NIC", + netdev_parser, NULL), OPT_GROUP("BIOS options:"), OPT_INTEGER('\0', "vidmode", &vidmode, @@ -615,7 +692,6 @@ void kvm_run_help(void) int kvm_cmd_run(int argc, const char **argv, const char *prefix) { - struct virtio_net_parameters net_params; static char real_cmdline[2048], default_name[20]; struct framebuffer *fb = NULL; unsigned int nr_online_cpus; @@ -823,32 +899,24 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) virtio_9p__init(kvm); - if (strncmp(network, "none", 4)) { - net_params.guest_ip = guest_ip; - net_params.host_ip = host_ip; - net_params.kvm = kvm; - net_params.script = script; - sscanf(guest_mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", - net_params.guest_mac, - net_params.guest_mac+1, - net_params.guest_mac+2, - net_params.guest_mac+3, - net_params.guest_mac+4, - net_params.guest_mac+5); - sscanf(host_mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", - net_params.host_mac, - net_params.host_mac+1, - net_params.host_mac+2, - net_params.host_mac+3, - net_params.host_mac+4, - net_params.host_mac+5); - - if (!strncmp(network, "user", 4)) - net_params.mode = NET_MODE_USER; - else if (!strncmp(network, "tap", 3)) - net_params.mode = NET_MODE_TAP; - else - die("Unkown network mode %s, please use -network user, tap, none", network); + for (i = 0; i < num_net_devices; i++) { + net_params[i].kvm = kvm; + virtio_net__init(&net_params[i]); + } + + if (num_net_devices == 0 && no_net == 0) { + struct virtio_net_parameters net_params; + + net_params = (struct virtio_net_parameters) { + .guest_ip = guest_ip, + .host_ip = host_ip, + .kvm = kvm, + .script = script, + .mode = NET_MODE_USER, + }; + str_to_mac(guest_mac, net_params.guest_mac); + str_to_mac(host_mac, net_params.host_mac); + virtio_net__init(&net_params); } diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c index 4700483..1e33891 100644 --- a/tools/kvm/virtio/net.c +++ b/tools/kvm/virtio/net.c @@ -43,6 +43,7 @@ struct net_dev_operations { struct net_dev { pthread_mutex_t mutex; struct virtio_pci vpci; + struct list_head list; struct virt_queue vqs[VIRTIO_NET_NUM_QUEUES]; struct virtio_net_config config; @@ -64,48 +65,41 @@ struct net_dev { struct uip_info info; struct net_dev_operations *ops; + struct kvm *kvm; }; -static struct net_dev ndev = { - .mutex = PTHREAD_MUTEX_INITIALIZER, - - .config = { - .status = VIRTIO_NET_S_LINK_UP, - }, - .info = { - .buf_nr = 20, - } -}; +static LIST_HEAD(ndevs); static void *virtio_net_rx_thread(void *p) { struct iovec iov[VIRTIO_NET_QUEUE_SIZE]; struct virt_queue *vq; struct kvm *kvm; + struct net_dev *ndev = p; u16 out, in; u16 head; int len; - kvm = p; - vq = &ndev.vqs[VIRTIO_NET_RX_QUEUE]; + kvm = ndev->kvm; + vq = &ndev->vqs[VIRTIO_NET_RX_QUEUE]; while (1) { - mutex_lock(&ndev.io_rx_lock); + mutex_lock(&ndev->io_rx_lock); if (!virt_queue__available(vq)) - pthread_cond_wait(&ndev.io_rx_cond, &ndev.io_rx_lock); - mutex_unlock(&ndev.io_rx_lock); + pthread_cond_wait(&ndev->io_rx_cond, &ndev->io_rx_lock); + mutex_unlock(&ndev->io_rx_lock); while (virt_queue__available(vq)) { head = virt_queue__get_iov(vq, iov, &out, &in, kvm); - len = ndev.ops->rx(iov, in, &ndev); + len = ndev->ops->rx(iov, in, ndev); virt_queue__set_used_elem(vq, head, len); /* We should interrupt guest right now, otherwise latency is huge. */ - virtio_pci__signal_vq(kvm, &ndev.vpci, VIRTIO_NET_RX_QUEUE); + virtio_pci__signal_vq(kvm, &ndev->vpci, VIRTIO_NET_RX_QUEUE); } } @@ -120,29 +114,30 @@ static void *virtio_net_tx_thread(void *p) struct iovec iov[VIRTIO_NET_QUEUE_SIZE]; struct virt_queue *vq; struct kvm *kvm; + struct net_dev *ndev = p; u16 out, in; u16 head; int len; - kvm = p; - vq = &ndev.vqs[VIRTIO_NET_TX_QUEUE]; + kvm = ndev->kvm; + vq = &ndev->vqs[VIRTIO_NET_TX_QUEUE]; while (1) { - mutex_lock(&ndev.io_tx_lock); + mutex_lock(&ndev->io_tx_lock); if (!virt_queue__available(vq)) - pthread_cond_wait(&ndev.io_tx_cond, &ndev.io_tx_lock); - mutex_unlock(&ndev.io_tx_lock); + pthread_cond_wait(&ndev->io_tx_cond, &ndev->io_tx_lock); + mutex_unlock(&ndev->io_tx_lock); while (virt_queue__available(vq)) { head = virt_queue__get_iov(vq, iov, &out, &in, kvm); - len = ndev.ops->tx(iov, out, &ndev); + len = ndev->ops->tx(iov, out, ndev); virt_queue__set_used_elem(vq, head, len); } - virtio_pci__signal_vq(kvm, &ndev.vpci, VIRTIO_NET_TX_QUEUE); + virtio_pci__signal_vq(kvm, &ndev->vpci, VIRTIO_NET_TX_QUEUE); } pthread_exit(NULL); @@ -151,58 +146,58 @@ static void *virtio_net_tx_thread(void *p) } -static void virtio_net_handle_callback(struct kvm *kvm, u16 queue_index) +static void virtio_net_handle_callback(struct kvm *kvm, struct net_dev *ndev, int queue) { - switch (queue_index) { + switch (queue) { case VIRTIO_NET_TX_QUEUE: - mutex_lock(&ndev.io_tx_lock); - pthread_cond_signal(&ndev.io_tx_cond); - mutex_unlock(&ndev.io_tx_lock); + mutex_lock(&ndev->io_tx_lock); + pthread_cond_signal(&ndev->io_tx_cond); + mutex_unlock(&ndev->io_tx_lock); break; case VIRTIO_NET_RX_QUEUE: - mutex_lock(&ndev.io_rx_lock); - pthread_cond_signal(&ndev.io_rx_cond); - mutex_unlock(&ndev.io_rx_lock); + mutex_lock(&ndev->io_rx_lock); + pthread_cond_signal(&ndev->io_rx_cond); + mutex_unlock(&ndev->io_rx_lock); break; default: - pr_warning("Unknown queue index %u", queue_index); + pr_warning("Unknown queue index %u", queue); } } -static bool virtio_net__tap_init(const struct virtio_net_parameters *params) +static bool virtio_net__tap_init(const struct virtio_net_parameters *params, + struct net_dev *ndev) { int sock = socket(AF_INET, SOCK_STREAM, 0); int pid, status, offload, hdr_len; struct sockaddr_in sin = {0}; struct ifreq ifr; - ndev.tap_fd = open("/dev/net/tun", O_RDWR); - if (ndev.tap_fd < 0) { + ndev->tap_fd = open("/dev/net/tun", O_RDWR); + if (ndev->tap_fd < 0) { pr_warning("Unable to open /dev/net/tun"); goto fail; } memset(&ifr, 0, sizeof(ifr)); ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_VNET_HDR; - if (ioctl(ndev.tap_fd, TUNSETIFF, &ifr) < 0) { + if (ioctl(ndev->tap_fd, TUNSETIFF, &ifr) < 0) { pr_warning("Config tap device error. Are you root?"); goto fail; } - strncpy(ndev.tap_name, ifr.ifr_name, sizeof(ndev.tap_name)); + strncpy(ndev->tap_name, ifr.ifr_name, sizeof(ndev->tap_name)); - if (ioctl(ndev.tap_fd, TUNSETNOCSUM, 1) < 0) { + if (ioctl(ndev->tap_fd, TUNSETNOCSUM, 1) < 0) { pr_warning("Config tap device TUNSETNOCSUM error"); goto fail; } hdr_len = sizeof(struct virtio_net_hdr); - if (ioctl(ndev.tap_fd, TUNSETVNETHDRSZ, &hdr_len) < 0) { + if (ioctl(ndev->tap_fd, TUNSETVNETHDRSZ, &hdr_len) < 0) pr_warning("Config tap device TUNSETVNETHDRSZ error"); - } offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 | TUN_F_UFO; - if (ioctl(ndev.tap_fd, TUNSETOFFLOAD, offload) < 0) { + if (ioctl(ndev->tap_fd, TUNSETOFFLOAD, offload) < 0) { pr_warning("Config tap device TUNSETOFFLOAD error"); goto fail; } @@ -210,7 +205,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) if (strcmp(params->script, "none")) { pid = fork(); if (pid == 0) { - execl(params->script, params->script, ndev.tap_name, NULL); + execl(params->script, params->script, ndev->tap_name, NULL); _exit(1); } else { waitpid(pid, &status, 0); @@ -221,7 +216,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) } } else { memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, ndev.tap_name, sizeof(ndev.tap_name)); + strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name)); sin.sin_addr.s_addr = inet_addr(params->host_ip); memcpy(&(ifr.ifr_addr), &sin, sizeof(ifr.ifr_addr)); ifr.ifr_addr.sa_family = AF_INET; @@ -232,7 +227,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) } memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, ndev.tap_name, sizeof(ndev.tap_name)); + strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name)); ioctl(sock, SIOCGIFFLAGS, &ifr); ifr.ifr_flags |= IFF_UP | IFF_RUNNING; if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) @@ -245,22 +240,22 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) fail: if (sock >= 0) close(sock); - if (ndev.tap_fd >= 0) - close(ndev.tap_fd); + if (ndev->tap_fd >= 0) + close(ndev->tap_fd); return 0; } -static void virtio_net__io_thread_init(struct kvm *kvm) +static void virtio_net__io_thread_init(struct kvm *kvm, struct net_dev *ndev) { - pthread_mutex_init(&ndev.io_rx_lock, NULL); - pthread_cond_init(&ndev.io_tx_cond, NULL); + pthread_mutex_init(&ndev->io_rx_lock, NULL); + pthread_cond_init(&ndev->io_tx_cond, NULL); - pthread_mutex_init(&ndev.io_rx_lock, NULL); - pthread_cond_init(&ndev.io_tx_cond, NULL); + pthread_mutex_init(&ndev->io_rx_lock, NULL); + pthread_cond_init(&ndev->io_tx_cond, NULL); - pthread_create(&ndev.io_rx_thread, NULL, virtio_net_rx_thread, (void *)kvm); - pthread_create(&ndev.io_tx_thread, NULL, virtio_net_tx_thread, (void *)kvm); + pthread_create(&ndev->io_rx_thread, NULL, virtio_net_rx_thread, ndev); + pthread_create(&ndev->io_tx_thread, NULL, virtio_net_tx_thread, ndev); } static inline int tap_ops_tx(struct iovec *iov, u16 out, struct net_dev *ndev) @@ -345,7 +340,9 @@ static int init_vq(struct kvm *kvm, void *dev, u32 vq, u32 pfn) static int notify_vq(struct kvm *kvm, void *dev, u32 vq) { - virtio_net_handle_callback(kvm, vq); + struct net_dev *ndev = dev; + + virtio_net_handle_callback(kvm, ndev, vq); return 0; } @@ -365,27 +362,43 @@ static int get_size_vq(struct kvm *kvm, void *dev, u32 vq) void virtio_net__init(const struct virtio_net_parameters *params) { int i; + struct net_dev *ndev; + + if (!params) + return; + + ndev = calloc(1, sizeof(struct net_dev)); + if (ndev == NULL) + die("Failed allocating ndev"); + + list_add_tail(&ndev->list, &ndevs); + + ndev->kvm = params->kvm; + + mutex_init(&ndev->mutex); + ndev->config.status = VIRTIO_NET_S_LINK_UP; for (i = 0 ; i < 6 ; i++) { - ndev.config.mac[i] = params->guest_mac[i]; - ndev.info.guest_mac.addr[i] = params->guest_mac[i]; - ndev.info.host_mac.addr[i] = params->host_mac[i]; + ndev->config.mac[i] = params->guest_mac[i]; + ndev->info.guest_mac.addr[i] = params->guest_mac[i]; + ndev->info.host_mac.addr[i] = params->host_mac[i]; } - ndev.mode = params->mode; - if (ndev.mode == NET_MODE_TAP) { - virtio_net__tap_init(params); - ndev.ops = &tap_ops; + ndev->mode = params->mode; + if (ndev->mode == NET_MODE_TAP) { + virtio_net__tap_init(params, ndev); + ndev->ops = &tap_ops; } else { - ndev.info.host_ip = ntohl(inet_addr(params->host_ip)); - ndev.info.guest_ip = ntohl(inet_addr(params->guest_ip)); - ndev.info.guest_netmask = ntohl(inet_addr("255.255.255.0")); - uip_init(&ndev.info); - ndev.ops = &uip_ops; + ndev->info.host_ip = ntohl(inet_addr(params->host_ip)); + ndev->info.guest_ip = ntohl(inet_addr(params->guest_ip)); + ndev->info.guest_netmask = ntohl(inet_addr("255.255.255.0")); + ndev->info.buf_nr = 20, + uip_init(&ndev->info); + ndev->ops = &uip_ops; } - virtio_pci__init(kvm, &ndev.vpci, &ndev, PCI_DEVICE_ID_VIRTIO_NET, VIRTIO_ID_NET); - ndev.vpci.ops = (struct virtio_pci_ops) { + virtio_pci__init(kvm, &ndev->vpci, ndev, PCI_DEVICE_ID_VIRTIO_NET, VIRTIO_ID_NET); + ndev->vpci.ops = (struct virtio_pci_ops) { .set_config = set_config, .get_config = get_config, .get_host_features = get_host_features, @@ -396,9 +409,9 @@ void virtio_net__init(const struct virtio_net_parameters *params) .get_size_vq = get_size_vq, }; - virtio_net__io_thread_init(params->kvm); + virtio_net__io_thread_init(params->kvm, ndev); - ndev.compat_id = compat__add_message("virtio-net device was not detected", + ndev->compat_id = compat__add_message("virtio-net device was not detected", "While you have requested a virtio-net device, " "the guest kernel didn't seem to detect it.\n" "Please make sure that the kernel was compiled " -- 1.7.6.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From kvm-owner@vger.kernel.org Sun Sep 25 23:10:39 2011 Return-path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on stodi.digitalkingdom.org X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=DKIM_SIGNED, KB_DATE_CONTAINS_TAB,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,TAB_IN_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Envelope-to: rlpowell@digitalkingdom.org Delivery-date: Sun, 25 Sep 2011 23:10:40 -0700 Received: from vger.kernel.org ([209.132.180.67]:36524) by stodi.digitalkingdom.org with esmtp (Exim 4.76) (envelope-from ) id 1R84Ok-0007uZ-IW for rlpowell@digitalkingdom.org; Sun, 25 Sep 2011 23:10:39 -0700 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751124Ab1IZGKg convert rfc822-to-quoted-printable (ORCPT ); Mon, 26 Sep 2011 02:10:36 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:58173 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750931Ab1IZGKg convert rfc822-to-8bit (ORCPT ); Mon, 26 Sep 2011 02:10:36 -0400 Received: by ywb5 with SMTP id 5so4030681ywb.19 for ; Sun, 25 Sep 2011 23:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=SlEV4r//dfu89ByLg9SJkA+R1vD22b2GQ+5JQr3reD0=; b=S91A1EnpgJN207YswnU3mQQGZbcUga5omATNPIxqnb8E2h3STsUcmaVHgKEFHRVnLb qO0DYFpxCOK3T6dqVvOkYFXObHv80pVAt2oFpyGq/tg0AaKQXTBD3bU43iW4GnotwDYY vVu6Oj1mHj5nyzVbYgziYdTrLCC1doATBQgYo= MIME-Version: 1.0 Received: by 10.231.61.149 with SMTP id t21mr8030639ibh.46.1317017435499; Sun, 25 Sep 2011 23:10:35 -0700 (PDT) Received: by 10.231.171.9 with HTTP; Sun, 25 Sep 2011 23:10:35 -0700 (PDT) In-Reply-To: <1316949085-22598-1-git-send-email-levinsasha928@gmail.com> References: <1316949085-22598-1-git-send-email-levinsasha928@gmail.com> Date: Mon, 26 Sep 2011 09:10:35 +0300 X-Google-Sender-Auth: Kdk3YoOa_LMTgbSwwik3WXqnegQ Message-ID: From: Pekka Enberg To: Sasha Levin Cc: kvm@vger.kernel.org, mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam_score: 0.9 X-Spam_score_int: 9 X-Spam_bar: / Subject: [kvm] Re: [PATCH v2] kvm tools: Support multiple net devices Status: RO Content-Length: 751 On Sun, Sep 25, 2011 at 2:11 PM, Sasha Levin = wrote: > This patch adds support for multiple network devices. The command lin= e syntax > changes to the following: > > =A0 =A0 =A0 =A0--network/-n [mode=3D[tap/user/none]] [guest_ip=3D[gue= st ip]] [host_ip=3D > [host_ip]] [guest_mac=3D[guest_mac]] [script=3D[script]] > > Each of the parameters is optional, and the config defaults to a TAP = based > networking with a sequential MAC. > > Signed-off-by: Sasha Levin Seems reasonable. Asias, is v2 OK to merge? -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From kvm-owner@vger.kernel.org Mon Sep 26 04:58:51 2011 Return-path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on stodi.digitalkingdom.org X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,KB_DATE_CONTAINS_TAB,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD,TAB_IN_FROM,T_DKIM_INVALID autolearn=no version=3.3.2 Envelope-to: rlpowell@digitalkingdom.org Delivery-date: Mon, 26 Sep 2011 04:58:51 -0700 Received: from vger.kernel.org ([209.132.180.67]:38503) by stodi.digitalkingdom.org with esmtp (Exim 4.76) (envelope-from ) id 1R89pd-0002G9-SU for rlpowell@digitalkingdom.org; Mon, 26 Sep 2011 04:58:51 -0700 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673Ab1IZL6k (ORCPT ); Mon, 26 Sep 2011 07:58:40 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:61798 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752460Ab1IZL6i (ORCPT ); Mon, 26 Sep 2011 07:58:38 -0400 Received: by ywb5 with SMTP id 5so4195065ywb.19 for ; Mon, 26 Sep 2011 04:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; bh=XpO+UppYb0HxwJ5NaoLg0nn30oTaFfatrL4rtAWMMWA=; b=qJSQjcs7oQsuUJjBXWEHos/cGxWELw1KNKM5ik+qkRbXjaubkLVkUaUSw+AhqlH/hV tmHYggo6BqFrmpp6X9QhNUCpF5KOqut3G6xbZh4h6HcpQSbQBr+VjVEJjAmE80Y5gdhJ z5zXRdXCQ1u3+8HufFVnpVzmk7O9ICav8KZjI= Received: by 10.68.19.6 with SMTP id a6mr29575500pbe.46.1317038316094; Mon, 26 Sep 2011 04:58:36 -0700 (PDT) Received: from [172.16.254.100] ([219.224.169.130]) by mx.google.com with ESMTPS id ji3sm72692380pbc.2.2011.09.26.04.58.31 (version=SSLv3 cipher=OTHER); Mon, 26 Sep 2011 04:58:34 -0700 (PDT) Message-ID: <4E8068C7.7080009@gmail.com> Date: Mon, 26 Sep 2011 19:57:59 +0800 From: Asias He User-Agent: Mozilla/5.0 (X11; Linux i686; rv:6.0.2) Gecko/20110902 Thunderbird/6.0.2 MIME-Version: 1.0 To: Sasha Levin CC: penberg@cs.helsinki.fi, kvm@vger.kernel.org, mingo@elte.hu, gorcunov@gmail.com References: <1316949085-22598-1-git-send-email-levinsasha928@gmail.com> In-Reply-To: <1316949085-22598-1-git-send-email-levinsasha928@gmail.com> X-Enigmail-Version: 1.3.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam_score: 0.9 X-Spam_score_int: 9 X-Spam_bar: / Subject: [kvm] Re: [PATCH v2] kvm tools: Support multiple net devices Status: RO Content-Length: 23405 On 09/25/2011 07:11 PM, Sasha Levin wrote: > This patch adds support for multiple network devices. The command line syntax > changes to the following: > > --network/-n [mode=[tap/user/none]] [guest_ip=[guest ip]] [host_ip= > [host_ip]] [guest_mac=[guest_mac]] [script=[script]] This syntax is actually, no? --network/-n mode=tap,guest_ip=x.x.x.x not --network/-n mode=tag guest_ip=x.x.x.x This works for me: $ sudo ./kvm run -d sid.img -p root=/dev/vda1 -k bzImage \ -n mode=tap,host_ip=192.168.100.1 -n mode=tap,host_ip=192.168.200.1 This does not work for me: $ sudo ./kvm run -d sid.img -p root=/dev/vda1 -k bzImage \ -n mode=tap host_ip=192.168.100.1 -n mode=tap host_ip=192.168.200.1 > > Each of the parameters is optional, and the config defaults to a TAP based > networking with a sequential MAC. > > Signed-off-by: Sasha Levin > --- > tools/kvm/builtin-run.c | 146 ++++++++++++++++++++++++++++++++------------ > tools/kvm/virtio/net.c | 155 +++++++++++++++++++++++++--------------------- > 2 files changed, 191 insertions(+), 110 deletions(-) > > diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c > index 28dc95a..070b1b6 100644 > --- a/tools/kvm/builtin-run.c > +++ b/tools/kvm/builtin-run.c > @@ -87,9 +87,12 @@ static bool sdl; > static bool balloon; > static bool using_rootfs; > static bool custom_rootfs; > +static bool no_net; > extern bool ioport_debug; > extern int active_console; > extern int debug_iodelay; > +struct virtio_net_parameters *net_params; > +int num_net_devices; > > bool do_debug_print = false; > > @@ -182,6 +185,89 @@ static int tty_parser(const struct option *opt, const char *arg, int unset) > return 0; > } > > +static inline void str_to_mac(const char *str, char *mac) > +{ > + sscanf(str, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", > + mac, mac+1, mac+2, mac+3, mac+4, mac+5); > +} > +static int set_net_param(struct virtio_net_parameters *p, const char *param, > + const char *val) > +{ > + if (strcmp(param, "guest_mac") == 0) { > + str_to_mac(val, p->guest_mac); > + } else if (strcmp(param, "mode") == 0) { > + if (!strncmp(val, "user", 4)) { > + int i; > + > + for (i = 0; i < num_net_devices; i++) > + if (net_params[i].mode == NET_MODE_USER) > + die("Only one usermode network device allowed at a time"); > + p->mode = NET_MODE_USER; > + } else if (!strncmp(val, "tap", 3)) { > + p->mode = NET_MODE_TAP; > + } else if (!strncmp(val, "none", 4)) { > + no_net = 1; > + return -1; > + } else > + die("Unkown network mode %s, please use user, tap or none", network); > + } else if (strcmp(param, "script") == 0) { > + p->script = val; > + } else if (strcmp(param, "guest_ip") == 0) { > + p->guest_ip = val; > + } else if (strcmp(param, "host_ip") == 0) { > + p->host_ip = val; > + } > + > + return 0; > +} > + > +static int netdev_parser(const struct option *opt, const char *arg, int unset) > +{ > + struct virtio_net_parameters p; > + char *buf, *cmd = NULL, *cur = NULL; > + bool on_cmd = true; > + > + if (arg) { > + buf = strdup(arg); > + if (buf == NULL) > + die("Failed allocating new net buffer"); > + cur = strtok(buf, ",="); > + } > + > + p = (struct virtio_net_parameters) { > + .guest_ip = DEFAULT_GUEST_ADDR, > + .host_ip = DEFAULT_HOST_ADDR, > + .script = DEFAULT_SCRIPT, > + .mode = NET_MODE_TAP, > + }; > + > + str_to_mac(DEFAULT_GUEST_MAC, p.guest_mac); > + p.guest_mac[5] += num_net_devices; > + > + while (cur) { > + if (on_cmd) { > + cmd = cur; > + } else { > + if (set_net_param(&p, cmd, cur) < 0) > + goto done; > + } > + on_cmd = !on_cmd; > + > + cur = strtok(NULL, ",="); > + }; > + > + num_net_devices++; > + > + net_params = realloc(net_params, num_net_devices * sizeof(*net_params)); > + if (net_params == NULL) > + die("Failed adding new network device"); > + > + net_params[num_net_devices - 1] = p; > + > +done: > + return 0; > +} > + > static int shmem_parser(const struct option *opt, const char *arg, int unset) > { > const u64 default_size = SHMEM_DEFAULT_SIZE; > @@ -339,18 +425,9 @@ static const struct option options[] = { > "Kernel command line arguments"), > > OPT_GROUP("Networking options:"), > - OPT_STRING('n', "network", &network, "user, tap, none", > - "Network to use"), > - OPT_STRING('\0', "host-ip", &host_ip, "a.b.c.d", > - "Assign this address to the host side networking"), > - OPT_STRING('\0', "guest-ip", &guest_ip, "a.b.c.d", > - "Assign this address to the guest side networking"), > - OPT_STRING('\0', "host-mac", &host_mac, "aa:bb:cc:dd:ee:ff", > - "Assign this address to the host side NIC"), > - OPT_STRING('\0', "guest-mac", &guest_mac, "aa:bb:cc:dd:ee:ff", > - "Assign this address to the guest side NIC"), > - OPT_STRING('\0', "tapscript", &script, "Script path", > - "Assign a script to process created tap device"), > + OPT_CALLBACK_DEFAULT('n', "network", NULL, "network params", > + "Create a new guest NIC", > + netdev_parser, NULL), > > OPT_GROUP("BIOS options:"), > OPT_INTEGER('\0', "vidmode", &vidmode, > @@ -615,7 +692,6 @@ void kvm_run_help(void) > > int kvm_cmd_run(int argc, const char **argv, const char *prefix) > { > - struct virtio_net_parameters net_params; > static char real_cmdline[2048], default_name[20]; > struct framebuffer *fb = NULL; > unsigned int nr_online_cpus; > @@ -823,32 +899,24 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) > > virtio_9p__init(kvm); > > - if (strncmp(network, "none", 4)) { > - net_params.guest_ip = guest_ip; > - net_params.host_ip = host_ip; > - net_params.kvm = kvm; > - net_params.script = script; > - sscanf(guest_mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", > - net_params.guest_mac, > - net_params.guest_mac+1, > - net_params.guest_mac+2, > - net_params.guest_mac+3, > - net_params.guest_mac+4, > - net_params.guest_mac+5); > - sscanf(host_mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", > - net_params.host_mac, > - net_params.host_mac+1, > - net_params.host_mac+2, > - net_params.host_mac+3, > - net_params.host_mac+4, > - net_params.host_mac+5); > - > - if (!strncmp(network, "user", 4)) > - net_params.mode = NET_MODE_USER; > - else if (!strncmp(network, "tap", 3)) > - net_params.mode = NET_MODE_TAP; > - else > - die("Unkown network mode %s, please use -network user, tap, none", network); > + for (i = 0; i < num_net_devices; i++) { > + net_params[i].kvm = kvm; > + virtio_net__init(&net_params[i]); > + } > + > + if (num_net_devices == 0 && no_net == 0) { > + struct virtio_net_parameters net_params; > + > + net_params = (struct virtio_net_parameters) { > + .guest_ip = guest_ip, > + .host_ip = host_ip, > + .kvm = kvm, > + .script = script, > + .mode = NET_MODE_USER, > + }; > + str_to_mac(guest_mac, net_params.guest_mac); > + str_to_mac(host_mac, net_params.host_mac); > + > virtio_net__init(&net_params); > } > > diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c > index 4700483..1e33891 100644 > --- a/tools/kvm/virtio/net.c > +++ b/tools/kvm/virtio/net.c > @@ -43,6 +43,7 @@ struct net_dev_operations { > struct net_dev { > pthread_mutex_t mutex; > struct virtio_pci vpci; > + struct list_head list; > > struct virt_queue vqs[VIRTIO_NET_NUM_QUEUES]; > struct virtio_net_config config; > @@ -64,48 +65,41 @@ struct net_dev { > > struct uip_info info; > struct net_dev_operations *ops; > + struct kvm *kvm; > }; > > -static struct net_dev ndev = { > - .mutex = PTHREAD_MUTEX_INITIALIZER, > - > - .config = { > - .status = VIRTIO_NET_S_LINK_UP, > - }, > - .info = { > - .buf_nr = 20, > - } > -}; > +static LIST_HEAD(ndevs); > > static void *virtio_net_rx_thread(void *p) > { > struct iovec iov[VIRTIO_NET_QUEUE_SIZE]; > struct virt_queue *vq; > struct kvm *kvm; > + struct net_dev *ndev = p; > u16 out, in; > u16 head; > int len; > > - kvm = p; > - vq = &ndev.vqs[VIRTIO_NET_RX_QUEUE]; > + kvm = ndev->kvm; > + vq = &ndev->vqs[VIRTIO_NET_RX_QUEUE]; > > while (1) { > > - mutex_lock(&ndev.io_rx_lock); > + mutex_lock(&ndev->io_rx_lock); > if (!virt_queue__available(vq)) > - pthread_cond_wait(&ndev.io_rx_cond, &ndev.io_rx_lock); > - mutex_unlock(&ndev.io_rx_lock); > + pthread_cond_wait(&ndev->io_rx_cond, &ndev->io_rx_lock); > + mutex_unlock(&ndev->io_rx_lock); > > while (virt_queue__available(vq)) { > > head = virt_queue__get_iov(vq, iov, &out, &in, kvm); > > - len = ndev.ops->rx(iov, in, &ndev); > + len = ndev->ops->rx(iov, in, ndev); > > virt_queue__set_used_elem(vq, head, len); > > /* We should interrupt guest right now, otherwise latency is huge. */ > - virtio_pci__signal_vq(kvm, &ndev.vpci, VIRTIO_NET_RX_QUEUE); > + virtio_pci__signal_vq(kvm, &ndev->vpci, VIRTIO_NET_RX_QUEUE); > } > > } > @@ -120,29 +114,30 @@ static void *virtio_net_tx_thread(void *p) > struct iovec iov[VIRTIO_NET_QUEUE_SIZE]; > struct virt_queue *vq; > struct kvm *kvm; > + struct net_dev *ndev = p; > u16 out, in; > u16 head; > int len; > > - kvm = p; > - vq = &ndev.vqs[VIRTIO_NET_TX_QUEUE]; > + kvm = ndev->kvm; > + vq = &ndev->vqs[VIRTIO_NET_TX_QUEUE]; > > while (1) { > - mutex_lock(&ndev.io_tx_lock); > + mutex_lock(&ndev->io_tx_lock); > if (!virt_queue__available(vq)) > - pthread_cond_wait(&ndev.io_tx_cond, &ndev.io_tx_lock); > - mutex_unlock(&ndev.io_tx_lock); > + pthread_cond_wait(&ndev->io_tx_cond, &ndev->io_tx_lock); > + mutex_unlock(&ndev->io_tx_lock); > > while (virt_queue__available(vq)) { > > head = virt_queue__get_iov(vq, iov, &out, &in, kvm); > > - len = ndev.ops->tx(iov, out, &ndev); > + len = ndev->ops->tx(iov, out, ndev); > > virt_queue__set_used_elem(vq, head, len); > } > > - virtio_pci__signal_vq(kvm, &ndev.vpci, VIRTIO_NET_TX_QUEUE); > + virtio_pci__signal_vq(kvm, &ndev->vpci, VIRTIO_NET_TX_QUEUE); > } > > pthread_exit(NULL); > @@ -151,58 +146,58 @@ static void *virtio_net_tx_thread(void *p) > > } > > -static void virtio_net_handle_callback(struct kvm *kvm, u16 queue_index) > +static void virtio_net_handle_callback(struct kvm *kvm, struct net_dev *ndev, int queue) > { > - switch (queue_index) { > + switch (queue) { > case VIRTIO_NET_TX_QUEUE: > - mutex_lock(&ndev.io_tx_lock); > - pthread_cond_signal(&ndev.io_tx_cond); > - mutex_unlock(&ndev.io_tx_lock); > + mutex_lock(&ndev->io_tx_lock); > + pthread_cond_signal(&ndev->io_tx_cond); > + mutex_unlock(&ndev->io_tx_lock); > break; > case VIRTIO_NET_RX_QUEUE: > - mutex_lock(&ndev.io_rx_lock); > - pthread_cond_signal(&ndev.io_rx_cond); > - mutex_unlock(&ndev.io_rx_lock); > + mutex_lock(&ndev->io_rx_lock); > + pthread_cond_signal(&ndev->io_rx_cond); > + mutex_unlock(&ndev->io_rx_lock); > break; > default: > - pr_warning("Unknown queue index %u", queue_index); > + pr_warning("Unknown queue index %u", queue); > } > } > > -static bool virtio_net__tap_init(const struct virtio_net_parameters *params) > +static bool virtio_net__tap_init(const struct virtio_net_parameters *params, > + struct net_dev *ndev) > { > int sock = socket(AF_INET, SOCK_STREAM, 0); > int pid, status, offload, hdr_len; > struct sockaddr_in sin = {0}; > struct ifreq ifr; > > - ndev.tap_fd = open("/dev/net/tun", O_RDWR); > - if (ndev.tap_fd < 0) { > + ndev->tap_fd = open("/dev/net/tun", O_RDWR); > + if (ndev->tap_fd < 0) { > pr_warning("Unable to open /dev/net/tun"); > goto fail; > } > > memset(&ifr, 0, sizeof(ifr)); > ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_VNET_HDR; > - if (ioctl(ndev.tap_fd, TUNSETIFF, &ifr) < 0) { > + if (ioctl(ndev->tap_fd, TUNSETIFF, &ifr) < 0) { > pr_warning("Config tap device error. Are you root?"); > goto fail; > } > > - strncpy(ndev.tap_name, ifr.ifr_name, sizeof(ndev.tap_name)); > + strncpy(ndev->tap_name, ifr.ifr_name, sizeof(ndev->tap_name)); > > - if (ioctl(ndev.tap_fd, TUNSETNOCSUM, 1) < 0) { > + if (ioctl(ndev->tap_fd, TUNSETNOCSUM, 1) < 0) { > pr_warning("Config tap device TUNSETNOCSUM error"); > goto fail; > } > > hdr_len = sizeof(struct virtio_net_hdr); > - if (ioctl(ndev.tap_fd, TUNSETVNETHDRSZ, &hdr_len) < 0) { > + if (ioctl(ndev->tap_fd, TUNSETVNETHDRSZ, &hdr_len) < 0) > pr_warning("Config tap device TUNSETVNETHDRSZ error"); > - } > > offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 | TUN_F_UFO; > - if (ioctl(ndev.tap_fd, TUNSETOFFLOAD, offload) < 0) { > + if (ioctl(ndev->tap_fd, TUNSETOFFLOAD, offload) < 0) { > pr_warning("Config tap device TUNSETOFFLOAD error"); > goto fail; > } > @@ -210,7 +205,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) > if (strcmp(params->script, "none")) { > pid = fork(); > if (pid == 0) { > - execl(params->script, params->script, ndev.tap_name, NULL); > + execl(params->script, params->script, ndev->tap_name, NULL); > _exit(1); > } else { > waitpid(pid, &status, 0); > @@ -221,7 +216,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) > } > } else { > memset(&ifr, 0, sizeof(ifr)); > - strncpy(ifr.ifr_name, ndev.tap_name, sizeof(ndev.tap_name)); > + strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name)); > sin.sin_addr.s_addr = inet_addr(params->host_ip); > memcpy(&(ifr.ifr_addr), &sin, sizeof(ifr.ifr_addr)); > ifr.ifr_addr.sa_family = AF_INET; > @@ -232,7 +227,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) > } > > memset(&ifr, 0, sizeof(ifr)); > - strncpy(ifr.ifr_name, ndev.tap_name, sizeof(ndev.tap_name)); > + strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name)); > ioctl(sock, SIOCGIFFLAGS, &ifr); > ifr.ifr_flags |= IFF_UP | IFF_RUNNING; > if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) > @@ -245,22 +240,22 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) > fail: > if (sock >= 0) > close(sock); > - if (ndev.tap_fd >= 0) > - close(ndev.tap_fd); > + if (ndev->tap_fd >= 0) > + close(ndev->tap_fd); > > return 0; > } > > -static void virtio_net__io_thread_init(struct kvm *kvm) > +static void virtio_net__io_thread_init(struct kvm *kvm, struct net_dev *ndev) > { > - pthread_mutex_init(&ndev.io_rx_lock, NULL); > - pthread_cond_init(&ndev.io_tx_cond, NULL); > + pthread_mutex_init(&ndev->io_rx_lock, NULL); > + pthread_cond_init(&ndev->io_tx_cond, NULL); > > - pthread_mutex_init(&ndev.io_rx_lock, NULL); > - pthread_cond_init(&ndev.io_tx_cond, NULL); > + pthread_mutex_init(&ndev->io_rx_lock, NULL); > + pthread_cond_init(&ndev->io_tx_cond, NULL); > > - pthread_create(&ndev.io_rx_thread, NULL, virtio_net_rx_thread, (void *)kvm); > - pthread_create(&ndev.io_tx_thread, NULL, virtio_net_tx_thread, (void *)kvm); > + pthread_create(&ndev->io_rx_thread, NULL, virtio_net_rx_thread, ndev); > + pthread_create(&ndev->io_tx_thread, NULL, virtio_net_tx_thread, ndev); > } > > static inline int tap_ops_tx(struct iovec *iov, u16 out, struct net_dev *ndev) > @@ -345,7 +340,9 @@ static int init_vq(struct kvm *kvm, void *dev, u32 vq, u32 pfn) > > static int notify_vq(struct kvm *kvm, void *dev, u32 vq) > { > - virtio_net_handle_callback(kvm, vq); > + struct net_dev *ndev = dev; > + > + virtio_net_handle_callback(kvm, ndev, vq); > > return 0; > } > @@ -365,27 +362,43 @@ static int get_size_vq(struct kvm *kvm, void *dev, u32 vq) > void virtio_net__init(const struct virtio_net_parameters *params) > { > int i; > + struct net_dev *ndev; > + > + if (!params) > + return; > + > + ndev = calloc(1, sizeof(struct net_dev)); > + if (ndev == NULL) > + die("Failed allocating ndev"); > + > + list_add_tail(&ndev->list, &ndevs); > + > + ndev->kvm = params->kvm; > + > + mutex_init(&ndev->mutex); > + ndev->config.status = VIRTIO_NET_S_LINK_UP; > > for (i = 0 ; i < 6 ; i++) { > - ndev.config.mac[i] = params->guest_mac[i]; > - ndev.info.guest_mac.addr[i] = params->guest_mac[i]; > - ndev.info.host_mac.addr[i] = params->host_mac[i]; > + ndev->config.mac[i] = params->guest_mac[i]; > + ndev->info.guest_mac.addr[i] = params->guest_mac[i]; > + ndev->info.host_mac.addr[i] = params->host_mac[i]; > } > > - ndev.mode = params->mode; > - if (ndev.mode == NET_MODE_TAP) { > - virtio_net__tap_init(params); we need to check if virtio_net__tap_init is successful. if it fails, for example lack of permission, we should exit and give up this net device. Otherwise, we will have this: $ ./kvm run -n mode=tap [ 1.490781] registered taskstats version 1 [ 1.492781] BUG: unable to handle kernel NULL pointer dereference at 0000001c [ 1.493781] IP: [] virtnet_poll+0x16e/0x408 [ 1.493781] *pde = 00000000 [ 1.493781] Oops: 0000 [#1] PREEMPT SMP [ 1.493781] Modules linked in: [ 1.493781] [ 1.493781] Pid: 1, comm: swapper Tainted: G W 3.1.0-rc3+ #77 [ 1.493781] EIP: 0060:[] EFLAGS: 00010286 CPU: 1 [ 1.493781] EIP is at virtnet_poll+0x16e/0x408 [ 1.493781] EAX: 00001000 EBX: db4bb0c0 ECX: db7cd778 EDX: 00001000 [ 1.493781] ESI: 00000000 EDI: db7cd6c0 EBP: db487fa8 ESP: db487f64 [ 1.493781] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 [ 1.493781] Process swapper (pid: 1, ti=db486000 task=db450000 task.ti=db458000) [ 1.493781] Stack: [ 1.493781] db487f98 19dfb000 db5e1400 00000080 c1b0df60 db6ff000 00000000 00000010 [ 1.493781] 00000080 dbcebfe0 db5e1414 db5e1000 ffffffff fffec005 db5e1414 db906dc0 [ 1.493781] c1a39a0c db487fd4 c15e4869 fffb71f7 db906dc8 00000080 0000012c 00000000 [ 1.493781] Call Trace: [ 1.493781] [] net_rx_action+0x8e/0x177 [ 1.493781] [] __do_softirq+0xa7/0x158 [ 1.493781] [] ? __tasklet_hi_schedule_first+0x2b/0x2b [ 1.493781] [ 1.493781] [] ? _local_bh_enable_ip.isra.9+0x65/0x86 [ 1.493781] [] ? local_bh_enable_ip+0x8/0xa [ 1.493781] [] ? _raw_spin_unlock_bh+0x18/0x1a [ 1.493781] [] ? dev_set_rx_mode+0x22/0x26 [ 1.493781] [] ? __dev_open+0x96/0xa6 [ 1.493781] [] ? __dev_change_flags+0x97/0x10e [ 1.493781] [] ? dev_change_flags+0x13/0x3f [ 1.493781] [] ? ip_auto_config+0x160/0xcf8 [ 1.493781] [] ? extract_entropy+0x45/0x71 [ 1.493781] [] ? get_parent_ip+0xb/0x31 [ 1.493781] [] ? sub_preempt_count+0x7c/0x89 [ 1.493781] [] ? _raw_spin_unlock+0x1c/0x27 [ 1.493781] [] ? tcp_set_default_congestion_control+0x8c/0x95 [ 1.493781] [] ? do_one_initcall+0x71/0x114 [ 1.493781] [] ? root_nfs_parse_addr+0x91/0x91 [ 1.493781] [] ? kernel_init+0xab/0x11d [ 1.493781] [] ? start_kernel+0x301/0x301 [ 1.493781] [] ? kernel_thread_helper+0x6/0xd [ 1.493781] Code: 89 d8 e8 23 94 0e 00 8b 4d dc 89 c7 f3 a4 8b 55 dc 8b 4d d8 29 55 f0 8b 75 e0 01 d1 eb 13 8d 45 f0 89 f2 50 89 d8 e8 ae f2 ff ff <8b> 76 1c 31 c9 58 83 7d f0 00 75 e7 85 f6 89 75 e0 0f 84 6e 02 [ 1.493781] EIP: [] virtnet_poll+0x16e/0x408 SS:ESP 0068:db487f64 [ 1.493781] CR2: 000000000000001c [ 1.549772] ---[ end trace 4eaa2a86a8e2da27 ]--- [ 1.550772] Kernel panic - not syncing: Fatal exception in interrupt [ 1.551772] Pid: 1, comm: swapper Tainted: G D W 3.1.0-rc3+ #77 [ 1.553771] Call Trace: [ 1.553771] [] panic+0x58/0x156 [ 1.554771] [] oops_end+0x8c/0x9b [ 1.555771] [] no_context+0x116/0x120 [ 1.555771] [] __bad_area_nosemaphore+0xf0/0xf8 [ 1.557771] [] bad_area_nosemaphore+0xd/0x10 [ 1.558771] [] do_page_fault+0x174/0x2fa [ 1.559770] [] ? sched_clock_local+0x10/0x14b [ 1.560770] [] ? __netdev_alloc_skb+0x17/0x34 [ 1.561770] [] ? __kmalloc_track_caller+0xb7/0xc7 [ 1.563770] [] ? __netdev_alloc_skb+0x17/0x34 [ 1.564770] [] ? spurious_fault+0xa8/0xa8 [ 1.565770] [] error_code+0x5a/0x60 [ 1.566769] [] ? spurious_fault+0xa8/0xa8 [ 1.567769] [] ? virtnet_poll+0x16e/0x408 [ 1.567769] [] net_rx_action+0x8e/0x177 [ 1.568769] [] __do_softirq+0xa7/0x158 [ 1.569769] [] ? __tasklet_hi_schedule_first+0x2b/0x2b [ 1.569769] [] ? _local_bh_enable_ip.isra.9+0x65/0x86 [ 1.570769] [] ? local_bh_enable_ip+0x8/0xa [ 1.571769] [] ? _raw_spin_unlock_bh+0x18/0x1a [ 1.571769] [] ? dev_set_rx_mode+0x22/0x26 [ 1.572768] [] ? __dev_open+0x96/0xa6 [ 1.573768] [] ? __dev_change_flags+0x97/0x10e [ 1.573768] [] ? dev_change_flags+0x13/0x3f [ 1.574768] [] ? ip_auto_config+0x160/0xcf8 [ 1.574768] [] ? extract_entropy+0x45/0x71 [ 1.575768] [] ? get_parent_ip+0xb/0x31 [ 1.576768] [] ? sub_preempt_count+0x7c/0x89 [ 1.576768] [] ? _raw_spin_unlock+0x1c/0x27 [ 1.577768] [] ? tcp_set_default_congestion_control+0x8c/0x95 [ 1.578768] [] ? do_one_initcall+0x71/0x114 [ 1.578768] [] ? root_nfs_parse_addr+0x91/0x91 [ 1.579767] [] ? kernel_init+0xab/0x11d [ 1.580767] [] ? start_kernel+0x301/0x301 [ 1.581767] [] ? kernel_thread_helper+0x6/0xd [ 1.582767] Rebooting in 1 seconds.. # KVM session ended normally. > - ndev.ops = &tap_ops; > + ndev->mode = params->mode; > + if (ndev->mode == NET_MODE_TAP) { > + virtio_net__tap_init(params, ndev); > + ndev->ops = &tap_ops; > } else { > - ndev.info.host_ip = ntohl(inet_addr(params->host_ip)); > - ndev.info.guest_ip = ntohl(inet_addr(params->guest_ip)); > - ndev.info.guest_netmask = ntohl(inet_addr("255.255.255.0")); > - uip_init(&ndev.info); > - ndev.ops = &uip_ops; > + ndev->info.host_ip = ntohl(inet_addr(params->host_ip)); > + ndev->info.guest_ip = ntohl(inet_addr(params->guest_ip)); > + ndev->info.guest_netmask = ntohl(inet_addr("255.255.255.0")); > + ndev->info.buf_nr = 20, > + uip_init(&ndev->info); > + ndev->ops = &uip_ops; > } > > - virtio_pci__init(kvm, &ndev.vpci, &ndev, PCI_DEVICE_ID_VIRTIO_NET, VIRTIO_ID_NET); > - ndev.vpci.ops = (struct virtio_pci_ops) { > + virtio_pci__init(kvm, &ndev->vpci, ndev, PCI_DEVICE_ID_VIRTIO_NET, VIRTIO_ID_NET); > + ndev->vpci.ops = (struct virtio_pci_ops) { > .set_config = set_config, > .get_config = get_config, > .get_host_features = get_host_features, > @@ -396,9 +409,9 @@ void virtio_net__init(const struct virtio_net_parameters *params) > .get_size_vq = get_size_vq, > }; > > - virtio_net__io_thread_init(params->kvm); > + virtio_net__io_thread_init(params->kvm, ndev); > > - ndev.compat_id = compat__add_message("virtio-net device was not detected", > + ndev->compat_id = compat__add_message("virtio-net device was not detected", > "While you have requested a virtio-net device, " > "the guest kernel didn't seem to detect it.\n" > "Please make sure that the kernel was compiled " -- Asias He -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From kvm-owner@vger.kernel.org Mon Sep 26 05:00:35 2011 Return-path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on stodi.digitalkingdom.org X-Spam-Flag: YES X-Spam-Level: ******** X-Spam-Status: Yes, score=8.4 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,KB_DATE_CONTAINS_TAB,RP_MATCHES_RCVD, SINGLE_HEADER_2K,TAB_IN_FROM,T_DKIM_INVALID autolearn=no version=3.3.2 X-Spam-Report: * 2.5 SINGLE_HEADER_2K A single header contains 2K-3K characters * 3.8 KB_DATE_CONTAINS_TAB KB_DATE_CONTAINS_TAB * 2.5 TAB_IN_FROM From starts with a tab * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider * (levinsasha928[at]gmail.com) * 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is * CUSTOM_MED * -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid Envelope-to: rlpowell@digitalkingdom.org Delivery-date: Mon, 26 Sep 2011 05:00:36 -0700 Received: from vger.kernel.org ([209.132.180.67]:40371) by stodi.digitalkingdom.org with esmtp (Exim 4.76) (envelope-from ) id 1R89rL-0002I1-No for rlpowell@digitalkingdom.org; Mon, 26 Sep 2011 05:00:35 -0700 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753186Ab1IZMA3 (ORCPT ); Mon, 26 Sep 2011 08:00:29 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:41093 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752736Ab1IZMA3 (ORCPT ); Mon, 26 Sep 2011 08:00:29 -0400 Received: by yxl31 with SMTP id 31so4186557yxl.19 for ; Mon, 26 Sep 2011 05:00:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; bh=GrgCX0fyQDknBvtoDJxDqqq5CM+YSAF5YUjhAIUzFPU=; b=tXplXsKf1Ih4J8POFCKBkxp6yeGSldjjaKYaAAFGmhcEAcOZZ7LNXNblap481D8lZ9 oTrHTsvUWqu3c+8/G/qWkalBDlcY5O+bqUXMLfr3WwewtkDZtS0v7DQG+9olTGB0GoWy 6vyTQ1HHQr7a4eG9ZCdurkwVzJjLlMZJYIG9Q= Received: by 10.14.19.68 with SMTP id m44mr2109206eem.234.1317038428392; Mon, 26 Sep 2011 05:00:28 -0700 (PDT) Received: from [192.168.1.150] (bzq-79-180-204-136.red.bezeqint.net. [79.180.204.136]) by mx.google.com with ESMTPS id x45sm59542643eeh.11.2011.09.26.05.00.26 (version=SSLv3 cipher=OTHER); Mon, 26 Sep 2011 05:00:27 -0700 (PDT) From: Sasha Levin To: Asias He Cc: penberg@cs.helsinki.fi, kvm@vger.kernel.org, mingo@elte.hu, gorcunov@gmail.com In-Reply-To: <4E8068C7.7080009@gmail.com> References: <1316949085-22598-1-git-send-email-levinsasha928@gmail.com> <4E8068C7.7080009@gmail.com> Content-Type: text/plain; charset="us-ascii" Date: Mon, 26 Sep 2011 14:59:39 +0300 Message-ID: <1317038379.4465.2.camel@lappy> Mime-Version: 1.0 X-Mailer: Evolution 2.32.3 Content-Transfer-Encoding: 7bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam_score: 0.9 X-Spam_score_int: 9 X-Spam_bar: / Subject: [kvm] Re: [PATCH v2] kvm tools: Support multiple net devices X-Spam-Prev-Subject: [kvm] Re: [PATCH v2] kvm tools: Support multiple net devices Status: RO Content-Length: 1040 On Mon, 2011-09-26 at 19:57 +0800, Asias He wrote: > On 09/25/2011 07:11 PM, Sasha Levin wrote: > > This patch adds support for multiple network devices. The command > line syntax > > changes to the following: > > > > --network/-n [mode=[tap/user/none]] [guest_ip=[guest ip]] > [host_ip= > > [host_ip]] [guest_mac=[guest_mac]] [script=[script]] > > This syntax is actually, no? > > --network/-n mode=tap,guest_ip=x.x.x.x > > not > > --network/-n mode=tag guest_ip=x.x.x.x > > > This works for me: > $ sudo ./kvm run -d sid.img -p root=/dev/vda1 -k bzImage \ > -n mode=tap,host_ip=192.168.100.1 -n mode=tap,host_ip=192.168.200.1 > > This does not work for me: > $ sudo ./kvm run -d sid.img -p root=/dev/vda1 -k bzImage \ > -n mode=tap host_ip=192.168.100.1 -n mode=tap host_ip=192.168.200.1 Yes, with ',' ofcourse :) -- Sasha. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html