Skip to content

Commit 10e1669

Browse files
author
CKI Backport Bot
committed
af_packet: do not call packet_read_pending() from tpacket_destruct_skb()
JIRA: https://issues.redhat.com/browse/RHEL-78307 commit 581073f Author: Eric Dumazet <edumazet@google.com> Date: Wed May 15 16:33:58 2024 +0000 af_packet: do not call packet_read_pending() from tpacket_destruct_skb() trafgen performance considerably sank on hosts with many cores after the blamed commit. packet_read_pending() is very expensive, and calling it in af_packet fast path defeats Daniel intent in commit b013840 ("packet: use percpu mmap tx frame pending refcount") tpacket_destruct_skb() makes room for one packet, we can immediately wakeup a producer, no need to completely drain the tx ring. Fixes: 89ed5b5 ("af_packet: Block execution of tasks waiting for transmit to complete in AF_PACKET") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Neil Horman <nhorman@tuxdriver.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: Willem de Bruijn <willemb@google.com> Link: https://lore.kernel.org/r/20240515163358.4105915-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com>
1 parent 4e3a759 commit 10e1669

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

net/packet/af_packet.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2489,8 +2489,7 @@ static void tpacket_destruct_skb(struct sk_buff *skb)
24892489
ts = __packet_set_timestamp(po, ph, skb);
24902490
__packet_set_status(po, ph, TP_STATUS_AVAILABLE | ts);
24912491

2492-
if (!packet_read_pending(&po->tx_ring))
2493-
complete(&po->skb_completion);
2492+
complete(&po->skb_completion);
24942493
}
24952494

24962495
sock_wfree(skb);

0 commit comments

Comments
 (0)