sk_mark_napi_id() is used to record for a flow napi id of incoming packets for busypoll sake. We should do this only on established flows, not on listeners. This was 'working' by virtue of the socket cloning, but doing this on SYN packets in unecessary cache line dirtying. Even if we move sk_napi_id in the same cache line than sk_lock, we are working to make SYN processing lockless, so it is desirable to set sk_napi_id only for established flows.
Unified · Split
| @@ -1429,6 +1429,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) · 1428 unmodified lines | ||
| 1429 | 1429 | struct dst_entry *dst = sk->sk_rx_dst; |
| 1430 | 1430 | |
| 1431 | 1431 | sock_rps_save_rxhash(sk, skb); |
| 1432 | + sk_mark_napi_id(sk, skb); | |
| 1432 | 1433 | if (dst) { |
| 1433 | 1434 | if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif || |
| 1434 | 1435 | dst->ops->check(dst, 0) == NULL) { |
| @@ -1450,6 +1451,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) · 15 unmodified lines | ||
| 1450 | 1451 | |
| 1451 | 1452 | if (nsk != sk) { |
| 1452 | 1453 | sock_rps_save_rxhash(nsk, skb); |
| 1454 | + sk_mark_napi_id(sk, skb); | |
| 1453 | 1455 | if (tcp_child_process(sk, nsk, skb)) { |
| 1454 | 1456 | rsk = nsk; |
| 1455 | 1457 | goto reset; |
| @@ -1661,7 +1663,6 @@ process: · 205 unmodified lines | ||
| 1661 | 1663 | if (sk_filter(sk, skb)) |
| 1662 | 1664 | goto discard_and_relse; |
| 1663 | 1665 | |
| 1664 | − sk_mark_napi_id(sk, skb); | |
| 1665 | 1666 | skb->dev = NULL; |
| 1666 | 1667 | |
| 1667 | 1668 | bh_lock_sock_nested(sk); |
| @@ -1293,6 +1293,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) · 1292 unmodified lines | ||
| 1293 | 1293 | struct dst_entry *dst = sk->sk_rx_dst; |
| 1294 | 1294 | |
| 1295 | 1295 | sock_rps_save_rxhash(sk, skb); |
| 1296 | + sk_mark_napi_id(sk, skb); | |
| 1296 | 1297 | if (dst) { |
| 1297 | 1298 | if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif || |
| 1298 | 1299 | dst->ops->check(dst, np->rx_dst_cookie) == NULL) { |
| @@ -1322,6 +1323,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) · 23 unmodified lines | ||
| 1322 | 1323 | */ |
| 1323 | 1324 | if (nsk != sk) { |
| 1324 | 1325 | sock_rps_save_rxhash(nsk, skb); |
| 1326 | + sk_mark_napi_id(sk, skb); | |
| 1325 | 1327 | if (tcp_child_process(sk, nsk, skb)) |
| 1326 | 1328 | goto reset; |
| 1327 | 1329 | if (opt_skb) |
| @@ -1454,7 +1456,6 @@ process: · 126 unmodified lines | ||
| 1454 | 1456 | if (sk_filter(sk, skb)) |
| 1455 | 1457 | goto discard_and_relse; |
| 1456 | 1458 | |
| 1457 | − sk_mark_napi_id(sk, skb); | |
| 1458 | 1459 | skb->dev = NULL; |
| 1459 | 1460 | |
| 1460 | 1461 | bh_lock_sock_nested(sk); |