Skip to content

Commit 3e4f8b7

Browse files
Vlad Yasevichdavem330
authored andcommitted
macvtap: Perform GSO on forwarding path.
When macvtap forwards skb to its tap, it needs to check if GSO needs to be performed. This is sometimes necessary when the HW device performed GRO, but the guest reading from the tap does not support it (ex: Windows 7). Signed-off-by: Vlad Yasevich <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2be5c76 commit 3e4f8b7

File tree

1 file changed

+31
-1
lines changed

1 file changed

+31
-1
lines changed

drivers/net/macvtap.c

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,14 +276,44 @@ static void macvtap_del_queues(struct net_device *dev)
276276
*/
277277
static int macvtap_forward(struct net_device *dev, struct sk_buff *skb)
278278
{
279+
struct macvlan_dev *vlan = netdev_priv(dev);
279280
struct macvtap_queue *q = macvtap_get_queue(dev, skb);
281+
netdev_features_t features;
280282
if (!q)
281283
goto drop;
282284

283285
if (skb_queue_len(&q->sk.sk_receive_queue) >= dev->tx_queue_len)
284286
goto drop;
285287

286-
skb_queue_tail(&q->sk.sk_receive_queue, skb);
288+
skb->dev = dev;
289+
/* Apply the forward feature mask so that we perform segmentation
290+
* according to users wishes.
291+
*/
292+
features = netif_skb_features(skb) & vlan->tap_features;
293+
if (netif_needs_gso(skb, features)) {
294+
struct sk_buff *segs = __skb_gso_segment(skb, features, false);
295+
296+
if (IS_ERR(segs))
297+
goto drop;
298+
299+
if (!segs) {
300+
skb_queue_tail(&q->sk.sk_receive_queue, skb);
301+
goto wake_up;
302+
}
303+
304+
kfree_skb(skb);
305+
while (segs) {
306+
struct sk_buff *nskb = segs->next;
307+
308+
segs->next = NULL;
309+
skb_queue_tail(&q->sk.sk_receive_queue, segs);
310+
segs = nskb;
311+
}
312+
} else {
313+
skb_queue_tail(&q->sk.sk_receive_queue, skb);
314+
}
315+
316+
wake_up:
287317
wake_up_interruptible_poll(sk_sleep(&q->sk), POLLIN | POLLRDNORM | POLLRDBAND);
288318
return NET_RX_SUCCESS;
289319

0 commit comments

Comments
 (0)