From patchwork Fri Nov 8 05:48:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philo Lu X-Patchwork-Id: 13867583 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) (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 3F4E91C3F0B; Fri, 8 Nov 2024 05:48:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.101 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731044924; cv=none; b=T0kU1f9p0D72da9l2+xOXGQ5bDXGZ1R66eN+3DwVFVk6Dmj1avj7Qsni2WV7AlqZqqSuERQCZf401DocOAu74zBsx4aLFRh4NDONMGadBeg4HO6pkTPJbfHyryV+c67Wb1Iy0fdiStITZLbVoJV0xfOBdWVXcBxhJnUPc0sWd0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731044924; c=relaxed/simple; bh=BC2ckwWkVtQbg+crF3fb4Uz/bxIhCg6EwMU2xvSjZ9Q=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=aP2kZEoPnv4ZGcp+jGmEbzuIJUsdvRXhy7Qxmonn3a1VUrfIBZNkz6C9FMa69+VrIHkl0Jqgbz4iGUGHwEM9arrz3QIGvtty+gm6R9b7wTxY0KHx8o2MHH/W2KqB61kb39StzRoJm+NT+iEEUB8CSTkv/I3/4e+QJSnvDFGLguc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=Yqqik/wl; arc=none smtp.client-ip=115.124.30.101 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="Yqqik/wl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731044917; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=R+XoQMp47jHzDCgNkX/MTBF2dU+HVLOQB0c6h9SrfAE=; b=Yqqik/wlJAQiHR8PED1owHp5wQZ7IiaOcAA1piqyxBA5kNsugFbpmmfILBEqdNfzGcslqvMt4uOVGy9VaL3WUrksHdjg56RtJxURlcF4lGhpDu+Bp7E6CtlECv/EXwz10WbXLo4hxY8fge+s9W2Ls8Vns6LxUnqUM2xI//zft+g= Received: from localhost(mailfrom:lulie@linux.alibaba.com fp:SMTPD_---0WIxm7Pa_1731044916 cluster:ay36) by smtp.aliyun-inc.com; Fri, 08 Nov 2024 13:48:37 +0800 From: Philo Lu To: netdev@vger.kernel.org Cc: willemdebruijn.kernel@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, horms@kernel.org, antony.antony@secunet.com, steffen.klassert@secunet.com, linux-kernel@vger.kernel.org, dust.li@linux.alibaba.com, jakub@cloudflare.com, fred.cc@alibaba-inc.com, yubing.qiuyubing@alibaba-inc.com Subject: [PATCH v8 net-next 0/4] udp: Add 4-tuple hash for connected sockets Date: Fri, 8 Nov 2024 13:48:32 +0800 Message-Id: <20241108054836.123484-1-lulie@linux.alibaba.com> X-Mailer: git-send-email 2.32.0.3.g01195cf9f Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This patchset introduces 4-tuple hash for connected udp sockets, to make connected udp lookup faster. Stress test results (with 1 cpu fully used) are shown below, in pps: (1) _un-connected_ socket as server [a] w/o hash4: 1,825176 [b] w/ hash4: 1,831750 (+0.36%) (2) 500 _connected_ sockets as server [c] w/o hash4: 290860 (only 16% of [a]) [d] w/ hash4: 1,889658 (+3.1% compared with [b]) With hash4, compute_score is skipped when lookup, so [d] is slightly better than [b]. Patch1: Add a new counter for hslot2 named hash4_cnt, to avoid cache line miss when lookup. Patch2: Add hslot/hlist_nulls for 4-tuple hash. Patch3 and 4: Implement 4-tuple hash for ipv4 and ipv6. The detailed motivation is described in Patch 3. The 4-tuple hash increases the size of udp_sock and udp_hslot. Thus add it with CONFIG_BASE_SMALL, i.e., it's a no op with CONFIG_BASE_SMALL. changelogs: v7 -> v8: - add EXPORT_SYMBOL for ipv6.ko build v6 -> v7 (Kuniyuki Iwashima): - export udp_ehashfn to be used by udpv6 rehash v5 -> v6 (Paolo Abeni): - move udp_table_hash4_init from patch2 to patch1 - use hlist_nulls for lookup-rehash race - add test results in commit log - add more comment, e.g., for rehash4 used in hash4 - add ipv6 support (Patch4), and refactor some functions for better sharing, without functionality change v4 -> v5 (Paolo Abeni): - add CONFIG_BASE_SMALL with which udp hash4 does nothing v3 -> v4 (Willem de Bruijn): - fix mistakes in udp_pernet_table_alloc() RFCv2 -> v3 (Gur Stavi): - minor fix in udp_hashslot2() and udp_table_init() - add rcu sync in rehash4() RFCv1 -> RFCv2: - add a new struct for hslot2 - remove the sockopt UDP_HASH4 because it has little side effect for unconnected sockets - add rehash in connect() - re-organize the patch into 3 smaller ones - other minor fix v7: https://lore.kernel.org/all/20241105121225.12513-1-lulie@linux.alibaba.com/ v6: https://lore.kernel.org/all/20241031124550.20227-1-lulie@linux.alibaba.com/ v5: https://lore.kernel.org/all/20241018114535.35712-1-lulie@linux.alibaba.com/ v4: https://lore.kernel.org/all/20241012012918.70888-1-lulie@linux.alibaba.com/ v3: https://lore.kernel.org/all/20241010090351.79698-1-lulie@linux.alibaba.com/ RFCv2: https://lore.kernel.org/all/20240924110414.52618-1-lulie@linux.alibaba.com/ RFCv1: https://lore.kernel.org/all/20240913100941.8565-1-lulie@linux.alibaba.com/ Philo Lu (4): net/udp: Add a new struct for hash2 slot net/udp: Add 4-tuple hash list basis ipv4/udp: Add 4-tuple hash for connected socket ipv6/udp: Add 4-tuple hash for connected socket include/linux/udp.h | 11 ++ include/net/udp.h | 137 +++++++++++++++++++++++-- net/ipv4/udp.c | 245 +++++++++++++++++++++++++++++++++++++++----- net/ipv6/udp.c | 117 +++++++++++++++++++-- 4 files changed, 468 insertions(+), 42 deletions(-) Acked-by: Willem de Bruijn --- 2.32.0.3.g01195cf9f