| blob | 6a26eb39d21fd9def3bdc7539e5cbb4aecd63385 |
1 From 8a59df2477f869eb4b3f582c36cb0e08018fbcff Mon Sep 17 00:00:00 2001
2 From: Dan McDonald <danmcd@omniti.com>
3 Date: Wed, 22 Apr 2015 16:15:39 -0400
4 Subject: [PATCH] Revert "HVM-798 qemu could know about vnd"
6 This reverts commit 31a39c6ea8dfc9021436264d83dc07a4d799ff61.
7 ---
8 build.sh | 2 +-
9 net/vnic.c | 246 ++++++++++++++++++++++---------------------------------------
10 2 files changed, 88 insertions(+), 160 deletions(-)
12 Updated to 20190827
14 diff -ruN illumos-kvm-cmd-41e7c3e192eb39bb5ced7667fdc12ad2b33e646d.orig/build.sh illumos-kvm-cmd-41e7c3e192eb39bb5ced7667fdc12ad2b33e646d.patched/build.sh
15 --- illumos-kvm-cmd-41e7c3e192eb39bb5ced7667fdc12ad2b33e646d.orig/build.sh 2020-03-19 21:53:41.308240253 +0000
16 +++ illumos-kvm-cmd-41e7c3e192eb39bb5ced7667fdc12ad2b33e646d.patched/build.sh 2020-03-19 21:55:18.480389342 +0000
17 @@ -48,7 +48,7 @@
18 XCFLAGS="$XCFLAGS -fno-builtin -I${PNGINC} -isystem ${DESTDIR}/usr/include -msave-args"
19 XLDFLAGS="-nodefaultlibs -L${PNGLIB} -L${DESTDIR}/usr/lib/amd64 -L${DESTDIR}/lib/amd64"
20 XLDFLAGS="${XLDFLAGS} -Wl,-zfatal-warnings -Wl,-zassert-deflib"
21 -XLDFLAGS="${XLDFLAGS} -lz -lm -lc -lvnd"
22 +XLDFLAGS="${XLDFLAGS} -lz -lm -lc"
23 ./configure \
24 --cc=$CC \
25 --extra-cflags="${XCFLAGS}" \
26 diff -ruN illumos-kvm-cmd-41e7c3e192eb39bb5ced7667fdc12ad2b33e646d.orig/net/vnic.c illumos-kvm-cmd-41e7c3e192eb39bb5ced7667fdc12ad2b33e646d.patched/net/vnic.c
27 --- illumos-kvm-cmd-41e7c3e192eb39bb5ced7667fdc12ad2b33e646d.orig/net/vnic.c 2020-03-19 21:53:41.379418566 +0000
28 +++ illumos-kvm-cmd-41e7c3e192eb39bb5ced7667fdc12ad2b33e646d.patched/net/vnic.c 2020-03-19 22:30:09.207208336 +0000
29 @@ -1,6 +1,6 @@
30 /*
31 * QEMU System Emulator
32 - * illumos VNIC/vnd support
33 + * Solaris VNIC support
34 *
35 * Copyright 2016 Joyent, Inc.
36 *
37 @@ -33,15 +33,12 @@
38 #include <unistd.h>
40 #include <netpacket/packet.h>
41 -#include <assert.h>
42 #include <net/if_dl.h>
43 #include <sys/ethernet.h>
44 +#include <sys/dlpi.h>
45 #include <sys/types.h>
46 #include <sys/stat.h>
47 #include <fcntl.h>
48 -#include <libvnd.h>
49 -#include <sys/vnd.h>
50 -#include <sys/frameio.h>
52 #include "net/vnic.h"
53 #include "net/vnic-dhcp.h"
54 @@ -65,10 +62,8 @@
55 uint8_t vns_buf[VNIC_BUFSIZE];
56 uint8_t vns_txbuf[VNIC_BUFSIZE];
57 uint_t vns_sap;
58 - vnd_handle_t *vns_hdl;
59 + dlpi_handle_t vns_hdl;
60 VNICDHCPState vns_ds;
61 - frameio_t *vns_rfio;
62 - frameio_t *vns_wfio;
63 } VNICState;
65 static void vnic_update_fd_handler(VNICState *);
66 @@ -95,37 +90,44 @@
67 vnic_write_poll(vsp, 1);
68 }
70 -/*
71 - * Because this is a single packet API, just read(2). If QEMU's net backend were
72 - * better we could send more packets at once.
73 - */
74 static int
75 vnic_read_packet(VNICState *vsp, uint8_t *buf, int len)
76 {
77 - int ret;
78 + struct strbuf sbuf;
79 + int flags, ret;
80 +
81 + flags = 0;
82 + sbuf.maxlen = len;
83 + sbuf.buf = (char *)buf;
85 do {
86 - ret = read(vsp->vns_fd, buf, len);
87 + ret = getmsg(vsp->vns_fd, NULL, &sbuf, &flags);
88 } while (ret == -1 && errno == EINTR);
90 if (ret == -1 && errno == EAGAIN) {
91 - vnic_read_poll(vsp, 1);
92 + vnic_write_poll(vsp, 1);
93 return (0);
94 }
96 - return (ret);
97 + if (ret == -1) {
98 + return (-1);
99 + }
100 +
101 + return (sbuf.len);
102 }
104 -/*
105 - * For a single packet, just use write(2).
106 - */
107 static int
108 vnic_write_packet(VNICState *vsp, const uint8_t *buf, int len)
109 {
110 - int ret;
111 + struct strbuf sbuf;
112 + int flags, ret;
113 +
114 + flags = 0;
115 + sbuf.len = len;
116 + sbuf.buf = (char *)buf;
118 do {
119 - ret = write(vsp->vns_fd, buf, len);
120 + ret = putmsg(vsp->vns_fd, NULL, &sbuf, flags);
121 } while (ret == -1 && errno == EINTR);
123 if (ret == -1 && errno == EAGAIN) {
124 @@ -133,7 +135,10 @@
125 return (0);
126 }
128 - return (ret);
129 + if (ret == -1)
130 + return (-1);
131 +
132 + return (len);
133 }
135 static int
136 @@ -187,6 +192,10 @@
137 uint16_t ethtype;
138 VNICState *vsp = DO_UPCAST(VNICState, vns_nc, ncp);
140 +#if VNIC_DHCP_DEBUG
141 + debug_eth_frame(buf, size);
142 +#endif
143 +
144 if (vsp->vns_ds.vnds_enabled && get_ethertype(buf, size, ðtype)) {
145 VNICDHCPState *vdsp = &vsp->vns_ds;
146 int ret;
147 @@ -220,117 +229,6 @@
148 return (vnic_write_packet(vsp, buf, size));
149 }
151 -static ssize_t
152 -vnic_receive_iov(VLANClientState *ncp, const struct iovec *iov,
153 - int iovcnt)
154 -{
155 - int ret, i;
156 - uint16_t ethtype;
157 - size_t total, altsize;
158 - VNICState *vsp = DO_UPCAST(VNICState, vns_nc, ncp);
159 -
160 - for (total = 0, i = 0; i < iovcnt; i++) {
161 - total += (iov + i)->iov_len;
162 - }
163 -
164 - if (vsp->vns_ds.vnds_enabled && get_ethertypev(iov, iovcnt, ðtype)) {
165 - /*
166 - * Basically drop the packet because we can't send a
167 - * reply at this time. It's unfortunate, but we don't
168 - * really have the proper infrastructure to do something
169 - * else with this at this time.
170 - */
171 - if (!vnic_can_send(vsp))
172 - return (total);
173 -
174 - VNICDHCPState *vdsp = &vsp->vns_ds;
175 -
176 - switch (ethtype) {
177 - case ETH_P_ARP:
178 - if (!is_arp_requestv(iov, iovcnt, vdsp))
179 - goto send;
180 - ret = create_arp_responsev(iov, iovcnt, vdsp);
181 - break;
182 - case ETH_P_IP:
183 - if (!is_dhcp_requestv(iov, iovcnt))
184 - goto send;
185 - ret = create_dhcp_responsev(iov, iovcnt, vdsp);
186 - break;
187 - default:
188 - goto send;
189 - }
190 -
191 - /* This failed, drop it and continue */
192 - if (ret == 0)
193 - return (total);
194 -
195 - ret = qemu_send_packet_async(&vsp->vns_nc,
196 - vdsp->vnds_buf, ret, vnic_send_completed);
197 - /*
198 - * qemu has told us that it can't receive any more data
199 - * at this time for the guest (host->guest traffic) so
200 - * turn off our read poll until we get that the send has
201 - * completed.
202 - */
203 - if (ret == 0)
204 - vnic_read_poll(vsp, 0);
205 - return (total);
206 - }
207 -
208 -send:
209 - /*
210 - * Copy the iovcs to our write frameio. Be on the lookout for someone
211 - * giving us more vectors than we support in frameio. In that case,
212 - * let's go ahead and just simply concat the rest.
213 - */
214 - for (i = 0; i < MIN(iovcnt, FRAMEIO_NVECS_MAX - 1); i++, iov++) {
215 - vsp->vns_wfio->fio_vecs[i].fv_buf = iov->iov_base;
216 - vsp->vns_wfio->fio_vecs[i].fv_buflen = iov->iov_len;
217 - }
218 -
219 - altsize = 0;
220 - for (i = MIN(iovcnt, FRAMEIO_NVECS_MAX - 1); i != iovcnt; i++, iov++) {
221 - /*
222 - * The packet is too large. We're goin to silently drop it...
223 - */
224 - if (altsize + iov->iov_len > VNIC_BUFSIZE)
225 - return (total);
226 -
227 - bcopy(iov->iov_base, vsp->vns_txbuf + altsize, iov->iov_len);
228 - altsize += iov->iov_len;
229 - }
230 - if (altsize != 0) {
231 - vsp->vns_wfio->fio_vecs[FRAMEIO_NVECS_MAX-1].fv_buf =
232 - vsp->vns_txbuf;
233 - vsp->vns_wfio->fio_vecs[FRAMEIO_NVECS_MAX-1].fv_buflen =
234 - altsize;
235 - }
236 -
237 - vsp->vns_wfio->fio_nvecs = MIN(iovcnt, FRAMEIO_NVECS_MAX);
238 - vsp->vns_wfio->fio_nvpf = MIN(iovcnt, FRAMEIO_NVECS_MAX);
239 - do {
240 - ret = vnd_frameio_write(vsp->vns_hdl, vsp->vns_wfio);
241 - } while (ret == -1 && errno == EINTR);
242 -
243 - if (ret == -1 && errno == EAGAIN) {
244 - vnic_write_poll(vsp, 1);
245 - return (0);
246 - } else if (ret == -1) {
247 - abort();
248 - }
249 -
250 - total = 0;
251 - for (i = 0; i < vsp->vns_wfio->fio_nvecs; i++) {
252 - if (vsp->vns_wfio->fio_vecs[i].fv_actlen == 0 &&
253 - vsp->vns_wfio->fio_vecs[i].fv_buflen == 0)
254 - break;
255 -
256 - total += vsp->vns_wfio->fio_vecs[i].fv_actlen;
257 - }
258 -
259 - return (total);
260 -}
261 -
262 static void
263 vnic_cleanup(VLANClientState *ncp)
264 {
265 @@ -340,7 +238,7 @@
267 qemu_purge_queued_packets(ncp);
269 - vnd_close(vsp->vns_hdl);
270 + dlpi_close(vsp->vns_hdl);
271 }
273 static void
274 @@ -357,41 +255,42 @@
275 .type = NET_CLIENT_TYPE_VNIC,
276 .size = sizeof (VNICState),
277 .receive = vnic_receive,
278 - .receive_iov = vnic_receive_iov,
279 .poll = vnic_poll,
280 .cleanup = vnic_cleanup
281 };
283 -/*
284 - * Set up all the known values for our frame I/O devices.
285 - */
286 +#ifdef CONFIG_SUNOS_VNIC_KVM
287 static int
288 -vnic_frameio_init(VNICState *vsp)
289 +net_init_kvm(int vfd)
290 {
291 - vsp->vns_rfio = qemu_mallocz(sizeof (frameio_t) +
292 - sizeof (framevec_t) * FRAMEIO_NVECS_MAX);
293 - if (vsp->vns_rfio == NULL)
294 - return (1);
295 - vsp->vns_wfio = qemu_mallocz(sizeof (frameio_t) +
296 - sizeof (framevec_t) * FRAMEIO_NVECS_MAX);
297 - if (vsp->vns_wfio == NULL)
298 - return (1);
299 - vsp->vns_rfio->fio_version = FRAMEIO_CURRENT_VERSION;
300 - vsp->vns_rfio->fio_nvpf = 1;
301 - vsp->vns_wfio->fio_version = FRAMEIO_CURRENT_VERSION;
302 - vsp->vns_wfio->fio_nvpf = 1;
303 + int kfd;
304 +
305 + if ((kfd = open("/dev/kvm", O_RDWR)) < 0) {
306 + error_report("can't open /dev/kvm for vnic: %s\n",
307 + strerror(errno));
308 + return (-1);
309 + }
310 +
311 + /* XXX We shouldn't be embedding the KVM_NET_QUEUE fd */
312 + if (ioctl(kfd, 0x2000ae21, vfd) < 0) {
313 + error_report("can't ioctl: %s\n", strerror(errno));
314 + return (-1);
315 + }
316 +
317 + (void) close(kfd);
318 +
319 return (0);
320 }
321 +#endif
323 int
324 net_init_vnic(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan)
325 {
326 - int fd, len, vnderr, syserr;
327 + int fd, len;
328 const char *ifname, *mac;
329 uchar_t *macaddr;
330 VLANClientState *ncp;
331 VNICState *vsp;
332 - vnd_prop_buf_t vib;
334 if ((ifname = qemu_opt_get(opts, "ifname")) == NULL) {
335 error_report("missing ifname required for vnic\n");
336 @@ -411,36 +310,48 @@
337 ncp = qemu_new_net_client(&net_vnic_info, vlan, NULL, "vnic", name);
338 vsp = DO_UPCAST(VNICState, vns_nc, ncp);
340 + if (dlpi_open(ifname, &vsp->vns_hdl, DLPI_RAW) != DLPI_SUCCESS) {
341 + error_report("vnic: failed to open interface %s", ifname);
342 + return (-1);
343 + }
345 - vsp->vns_hdl = vnd_open(NULL, ifname, &vnderr, &syserr);
346 - if (vsp->vns_hdl == NULL) {
347 - const char *err = vnderr != VND_E_SYS ?
348 - vnd_strerror(vnderr) : vnd_strsyserror(syserr);
349 - error_report("vnic: failed to open interface %s - %s\n",
350 - ifname, err);
351 + if (dlpi_bind(vsp->vns_hdl, DLPI_ANY_SAP, &vsp->vns_sap) != DLPI_SUCCESS) {
352 + error_report("vnic: failed to bind interface %s", ifname);
353 return (-1);
354 }
356 - vib.vpb_size = 1024 * 1024 * 4; /* 4 MB */
357 - if (vnd_prop_set(vsp->vns_hdl, VND_PROP_RXBUF, &vib,
358 - sizeof (vib)) != 0) {
359 - const char *err = vnderr != VND_E_SYS ?
360 - vnd_strerror(vnderr) : vnd_strsyserror(syserr);
361 - error_report("failed to change rx buf size: %s\n", err);
362 + /*
363 + * We only set the mac address of the vnic if the user passed in the
364 + * option on the command line.
365 + */
366 + if (mac != NULL) {
367 + if (dlpi_set_physaddr(vsp->vns_hdl, DL_CURR_PHYS_ADDR, macaddr,
368 + ETHERADDRL) != DLPI_SUCCESS) {
369 + error_report("vnic: failed to set mac address\n");
370 + return (-1);
371 + }
372 + }
373 +
374 + /*
375 + * We are enabling support for two different kinds of promiscuous modes.
376 + * The first is getting us the basics of the unicast traffic that we
377 + * care about. The latter is going to ensure that we also get other
378 + * types of physical traffic such as multicast and broadcast.
379 + */
380 + if (dlpi_promiscon(vsp->vns_hdl, DL_PROMISC_SAP) != DLPI_SUCCESS) {
381 + error_report("vnic: failed to be promiscous with interface %s",
382 + ifname);
383 return (-1);
384 }
386 - vib.vpb_size = 1024 * 1024 * 4; /* 4 MB */
387 - if (vnd_prop_set(vsp->vns_hdl, VND_PROP_TXBUF, &vib,
388 - sizeof (vib)) != 0) {
389 - const char *err = vnderr != VND_E_SYS ?
390 - vnd_strerror(vnderr) : vnd_strsyserror(syserr);
391 - error_report("failed to change tx buf size: %s\n", err);
392 + if (dlpi_promiscon(vsp->vns_hdl, DL_PROMISC_PHYS) != DLPI_SUCCESS) {
393 + error_report("vnic: failed to be promiscous with interface %s",
394 + ifname);
395 return (-1);
396 }
398 + fd = dlpi_fd(vsp->vns_hdl);
400 - fd = vnd_pollfd(vsp->vns_hdl);
401 if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) {
402 error_report("vnic: failed to set fd on interface %s to "
403 "non-blocking: %s\n", ifname, strerror(errno));
404 @@ -455,11 +366,9 @@
405 if (vnic_dhcp_init(&vsp->vns_ds, opts) == 0)
406 return (-1);
408 - if (vnic_frameio_init(vsp) != 0) {
409 - error_report("vnic: failed initialize frameio: %s\n",
410 - strerror(errno));
411 - return (-1);
412 - }
413 +#ifdef CONFIG_SUNOS_VNIC_KVM
414 + net_init_kvm(fd);
415 +#endif
417 /* We have to manually intialize the polling for read */
418 vnic_read_poll(vsp, 1);