From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 089A93209; Thu, 13 Jun 2024 12:19:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718281169; cv=none; b=pNmX7CngMiJdXyMOZPTgkyrq3hjrDb1PNDZpmcFNsgGqoIM+i+utimGHZqBui4DVh56QgJnxUwP7whYOef4yopXiv54tcCgsjKfMFehkcMx15rtuflPSO/6P9nBnjvhvp9DPvzTxOOsxRHHT185usvh9WUZDFUoJeosS4eesxVM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718281169; c=relaxed/simple; bh=fve0pm7Zu/A/LNfC2hWg0YnfRO7guhi08M3t2TFVwXg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hxz1mmnKI/dIChnrcOvv7mcW+bxFv6UYrHQPB9UeTK2qNjf6J/Pq/ebKLwXIdS0Wa//hDATcSrD3KktN82tRuxNxSaW4ecqvHkpr8s/RTg5Y3MN8EX95pdYgNoyLnWkzKOMIgSzGCFgnjDIKU+G/kymtdQKQp6BxiYsm/dvdJz0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=m3h/aMzr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="m3h/aMzr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81474C2BBFC; Thu, 13 Jun 2024 12:19:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718281168; bh=fve0pm7Zu/A/LNfC2hWg0YnfRO7guhi08M3t2TFVwXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m3h/aMzrsPM4nrGF0R7sRu70G7/wIVr/4MHQ+uxJd/mKn8atfxIenpPErBQhiicPH jrwn8jmSxdm3eLctVKB6JB9/BiWG7abv7HLHLrSkThDZg6oW9+o6I9TD2fKsziVayg bgt6mZJPpno681zJ25q6OlnDEYoCa+3tkON/e3js= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Neil Horman , Daniel Borkmann , Willem de Bruijn , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 133/317] af_packet: do not call packet_read_pending() from tpacket_destruct_skb() Date: Thu, 13 Jun 2024 13:32:31 +0200 Message-ID: <20240613113252.701877614@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113247.525431100@linuxfoundation.org> References: <20240613113247.525431100@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 581073f626e387d3e7eed55c48c8495584ead7ba ] 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 b013840810c2 ("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: 89ed5b519004 ("af_packet: Block execution of tasks waiting for transmit to complete in AF_PACKET") Signed-off-by: Eric Dumazet Cc: Neil Horman Cc: Daniel Borkmann Reviewed-by: Willem de Bruijn Link: https://lore.kernel.org/r/20240515163358.4105915-1-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/packet/af_packet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index db5d16c5d5b11..8e52f09493053 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2487,8 +2487,7 @@ static void tpacket_destruct_skb(struct sk_buff *skb) ts = __packet_set_timestamp(po, ph, skb); __packet_set_status(po, ph, TP_STATUS_AVAILABLE | ts); - if (!packet_read_pending(&po->tx_ring)) - complete(&po->skb_completion); + complete(&po->skb_completion); } sock_wfree(skb); -- 2.43.0