|
@@ -204,52 +204,36 @@ static int vring_get_buf(int queue_index, unsigned int *len)
|
204
|
204
|
return ret;
|
205
|
205
|
}
|
206
|
206
|
|
207
|
|
-static void vring_add_buf(int queue_index, int index, int num_added)
|
|
207
|
+static void vring_add_buf(int queue_index,
|
|
208
|
+ struct vring_list list[],
|
|
209
|
+ unsigned int out, unsigned int in,
|
|
210
|
+ int index, int num_added)
|
208
|
211
|
{
|
209
|
212
|
struct vring *vr = &vring[queue_index];
|
210
|
|
- int i, avail, head;
|
|
213
|
+ int i, avail, head, prev;
|
211
|
214
|
|
212
|
215
|
BUG_ON(queue_index >= QUEUE_NB);
|
|
216
|
+ BUG_ON(out + in == 0);
|
213
|
217
|
|
|
218
|
+ prev = 0;
|
214
|
219
|
head = free_head[queue_index];
|
215
|
|
- i = head;
|
216
|
|
-
|
217
|
|
- if (queue_index == TX_INDEX) {
|
218
|
|
-
|
219
|
|
- BUG_ON(index != 0);
|
220
|
|
-
|
221
|
|
- /* add header into vring */
|
|
220
|
+ for (i = head; out; i = vr->desc[i].next, out--) {
|
222
|
221
|
|
223
|
222
|
vr->desc[i].flags = VRING_DESC_F_NEXT;
|
224
|
|
- vr->desc[i].addr = (u64)virt_to_phys(&tx_virtio_hdr);
|
225
|
|
- vr->desc[i].len = sizeof(struct virtio_net_hdr);
|
226
|
|
- i = vr->desc[i].next;
|
227
|
|
-
|
228
|
|
- /* add frame buffer into vring */
|
229
|
|
-
|
230
|
|
- vr->desc[i].flags = 0;
|
231
|
|
- vr->desc[i].addr = (u64)virt_to_phys(&tx_eth_frame);
|
232
|
|
- vr->desc[i].len = ETH_FRAME_LEN;
|
233
|
|
- i = vr->desc[i].next;
|
234
|
|
-
|
235
|
|
- } else if (queue_index == RX_INDEX) {
|
236
|
|
-
|
237
|
|
- BUG_ON(index >= RX_BUF_NB);
|
238
|
|
-
|
239
|
|
- /* add header into vring */
|
|
223
|
+ vr->desc[i].addr = (u64)virt_to_phys(list->addr);
|
|
224
|
+ vr->desc[i].len = list->length;
|
|
225
|
+ prev = i;
|
|
226
|
+ list++;
|
|
227
|
+ }
|
|
228
|
+ for ( ; in; i = vr->desc[i].next, in--) {
|
240
|
229
|
|
241
|
230
|
vr->desc[i].flags = VRING_DESC_F_NEXT|VRING_DESC_F_WRITE;
|
242
|
|
- vr->desc[i].addr = (u64)virt_to_phys(&rx_hdr[index]);
|
243
|
|
- vr->desc[i].len = sizeof(struct virtio_net_hdr);
|
244
|
|
- i = vr->desc[i].next;
|
245
|
|
-
|
246
|
|
- /* add frame buffer into vring */
|
247
|
|
-
|
248
|
|
- vr->desc[i].flags = VRING_DESC_F_WRITE;
|
249
|
|
- vr->desc[i].addr = (u64)virt_to_phys(&rx_buffer[index]);
|
250
|
|
- vr->desc[i].len = ETH_FRAME_LEN;
|
251
|
|
- i = vr->desc[i].next;
|
|
231
|
+ vr->desc[i].addr = (u64)virt_to_phys(list->addr);
|
|
232
|
+ vr->desc[i].len = list->length;
|
|
233
|
+ prev = i;
|
|
234
|
+ list++;
|
252
|
235
|
}
|
|
236
|
+ vr->desc[prev].flags &= ~VRING_DESC_F_NEXT;
|
253
|
237
|
|
254
|
238
|
free_head[queue_index] = i;
|
255
|
239
|
|
|
@@ -306,6 +290,7 @@ static int virtnet_poll(struct nic *nic, int retrieve)
|
306
|
290
|
unsigned int len;
|
307
|
291
|
u16 token;
|
308
|
292
|
struct virtio_net_hdr *hdr;
|
|
293
|
+ struct vring_list list[2];
|
309
|
294
|
|
310
|
295
|
if (!vring_more_used(RX_INDEX))
|
311
|
296
|
return 0;
|
|
@@ -320,12 +305,17 @@ static int virtnet_poll(struct nic *nic, int retrieve)
|
320
|
305
|
hdr = &rx_hdr[token]; /* FIXME: check flags */
|
321
|
306
|
len -= sizeof(struct virtio_net_hdr);
|
322
|
307
|
|
323
|
|
- nic->packetlen = len;
|
|
308
|
+ nic->packetlen = len;
|
324
|
309
|
memcpy(nic->packet, (char *)rx_buffer[token], nic->packetlen);
|
325
|
310
|
|
326
|
311
|
/* add buffer to desc */
|
327
|
312
|
|
328
|
|
- vring_add_buf(RX_INDEX, token, 0);
|
|
313
|
+ list[0].addr = (char*)&rx_hdr[token];
|
|
314
|
+ list[0].length = sizeof(struct virtio_net_hdr);
|
|
315
|
+ list[1].addr = (char*)&rx_buffer[token];
|
|
316
|
+ list[1].length = ETH_FRAME_LEN;
|
|
317
|
+
|
|
318
|
+ vring_add_buf(RX_INDEX, list, 0, 2, token, 0);
|
329
|
319
|
vring_kick(nic, RX_INDEX, 1);
|
330
|
320
|
|
331
|
321
|
return 1;
|
|
@@ -342,6 +332,8 @@ static int virtnet_poll(struct nic *nic, int retrieve)
|
342
|
332
|
static void virtnet_transmit(struct nic *nic, const char *destaddr,
|
343
|
333
|
unsigned int type, unsigned int len, const char *data)
|
344
|
334
|
{
|
|
335
|
+ struct vring_list list[2];
|
|
336
|
+
|
345
|
337
|
/*
|
346
|
338
|
* from http://www.etherboot.org/wiki/dev/devmanual :
|
347
|
339
|
* "You do not need more than one transmit buffer."
|
|
@@ -365,7 +357,12 @@ static void virtnet_transmit(struct nic *nic, const char *destaddr,
|
365
|
357
|
tx_eth_frame.hdr.type = htons(type);
|
366
|
358
|
memcpy(tx_eth_frame.data, data, len);
|
367
|
359
|
|
368
|
|
- vring_add_buf(TX_INDEX, 0, 0);
|
|
360
|
+ list[0].addr = (char*)&tx_virtio_hdr;
|
|
361
|
+ list[0].length = sizeof(struct virtio_net_hdr);
|
|
362
|
+ list[1].addr = (char*)&tx_eth_frame;
|
|
363
|
+ list[1].length = ETH_FRAME_LEN;
|
|
364
|
+
|
|
365
|
+ vring_add_buf(TX_INDEX, list, 2, 0, 0, 0);
|
369
|
366
|
|
370
|
367
|
vring_kick(nic, TX_INDEX, 1);
|
371
|
368
|
|
|
@@ -405,9 +402,15 @@ static void virtnet_irq(struct nic *nic __unused, irq_action_t action)
|
405
|
402
|
static void provide_buffers(struct nic *nic)
|
406
|
403
|
{
|
407
|
404
|
int i;
|
408
|
|
-
|
409
|
|
- for (i = 0; i < RX_BUF_NB; i++)
|
410
|
|
- vring_add_buf(RX_INDEX, i, i);
|
|
405
|
+ struct vring_list list[2];
|
|
406
|
+
|
|
407
|
+ for (i = 0; i < RX_BUF_NB; i++) {
|
|
408
|
+ list[0].addr = (char*)&rx_hdr[i];
|
|
409
|
+ list[0].length = sizeof(struct virtio_net_hdr);
|
|
410
|
+ list[1].addr = (char*)&rx_buffer[i];
|
|
411
|
+ list[1].length = ETH_FRAME_LEN;
|
|
412
|
+ vring_add_buf(RX_INDEX, list, 0, 2, i, i);
|
|
413
|
+ }
|
411
|
414
|
|
412
|
415
|
/* nofify */
|
413
|
416
|
|