On 6/17/25 5:18 PM, Greg Kroah-Hartman wrote:
6.15-stable review patch. If anyone has any objections, please let me know.
From: Paolo Abeni pabeni@redhat.com
[ Upstream commit 5d7f5b2f6b935517ee5fd8058dc32342a5cba3e1 ]
It's quite common to have a single UDP tunnel type active in the whole system. In such a case we can replace the indirect call for the UDP tunnel GRO callback with a static call.
Add the related accounting in the control path and switch to static call when possible. To keep the code simple use a static array for the registered tunnel types, and size such array based on the kernel config.
Note that there are valid kernel configurations leading to UDP_MAX_TUNNEL_TYPES == 0 even with IS_ENABLED(CONFIG_NET_UDP_TUNNEL), Explicitly skip the accounting in such a case, to avoid compile warning when accessing "udp_tunnel_gro_types".
Signed-off-by: Paolo Abeni pabeni@redhat.com Reviewed-by: Willem de Bruijn willemb@google.com Link: https://patch.msgid.link/53d156cdfddcc9678449e873cc83e68fa1582653.1744040675... Signed-off-by: Jakub Kicinski kuba@kernel.org Stable-dep-of: c26c192c3d48 ("udp: properly deal with xfrm encap and ADDRFORM") Signed-off-by: Sasha Levin sashal@kernel.org
This, the previous patch (185/780 - udp_tunnel: create a fastpath GRO lookup.) and the next one (187/780 - udp: properly deal with xfrm encap and ADDRFORM) are not intended for stable trees.
185 && 186 are about performance improvement, and 187 fixes a bug introduced by them, and is irrelevant otherwise.
Thanks,
Paolo