From nobody Thu May 18 19:16:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QMfpF4Xxrz4Bvs4; Thu, 18 May 2023 19:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QMfpF40ycz3nBq; Thu, 18 May 2023 19:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684437365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5R3nyWjbSMsKc0WEcd73fPFZe3ju4aX1K5q4Zxhsjiw=; b=kyfflnFaIu1PH/Y1Yf12y0+1ox0JRnmPKcOI+744zWWVQX7gmHRE6NvGIIQl3OWn+6Hmv8 5yRqNO7H96VfK14RnC+pFdecRubB1YxaAwDGZi7ZmG0pM1ITmAAPNDhgUSWv/Z7pNespwC MbaU4bzm6mokvNahFyRfMvuKR0PSDs4aN4zUwEyxXyoAB/Y7G/h5P2kMCsln1mG9ikHsUK KLmPlMyVxMWOUyjSsJQ+y+7Fu9myBUfJ7TpkQoRE3/CKt7VfRg0i0WyU22g5i9gl/MBHVw uHkus1tURK2wM9ULgsjzL6LUk+W6smD10LbvQWzoeS/7ZuoTkruJrgBP5mNb3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684437365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5R3nyWjbSMsKc0WEcd73fPFZe3ju4aX1K5q4Zxhsjiw=; b=Zxn1J+yTAYmV1/tvvJ8Ma6nIJDTq4tQBskyh1aCF76aCpJyDAQewXceGBoc+owR7Cz2RqA xqQegdtNBvgDxWM+IeQHwTLV03PvxpgZ2SOG6vRcTdlJUGfsm5xKDiJ+V+LBMmdrNEkmlf hkTbebAcM1dK/i34d9rDQX8xSv4PwxAp1GqIs5jIIUCW9YidkpBYYf5v5rQmDp6dShzdxK dJELzQw+iwAnm/UE4cReD9INpQ9jjEGPKEdrUStA/RCg0Cu98LYz1bxGj26iL31bHGo6S5 9NDuXDzswkq2a2iVn2LLxhWXXVqhpESknSjWxKfNqdlJrE0xgeX54dHwe1TNCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684437365; a=rsa-sha256; cv=none; b=KkzPduo2l3MsStSkSU16kHr4xttlG/wgXaa3YmRi33pgMSgbzd/jz8dgoD4E3Fz3t4Y4MY f3jkkAdl2ZLGMSKGT1NXQwTKsqyKXaOEgHVMyaamyfR+6en59jttUYBEFh8Rk5+myFN6Z8 A56SeXCkZgz5BgLOWsvfyWoRyDz+QjOjRuNbB2TsVvxMhpb1YaYQok7agFCADytbTJ5q5f DhxZPRKRzCEdPvF5uFPn+4n1ZRXZBAg9dCzr9IPwphQWkWkY+vFY6j99nZd2aqfrK24gWh ezcf6sPhHvUTYxIlxgxPa3y2STe+2zJ11um9ncA0QeM9o6BVk93I8SfJmMRdyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QMfpF33Pczxjm; Thu, 18 May 2023 19:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34IJG5M8033769; Thu, 18 May 2023 19:16:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34IJG5cn033768; Thu, 18 May 2023 19:16:05 GMT (envelope-from git) Date: Thu, 18 May 2023 19:16:05 GMT Message-Id: <202305181916.34IJG5cn033768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: e5738ee04bf0 - main - Under RSS, assign a TCP flow's inp_flowid anyway. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5738ee04bf07edde5a394da83ac119b13c4f9e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=e5738ee04bf07edde5a394da83ac119b13c4f9e9 commit e5738ee04bf07edde5a394da83ac119b13c4f9e9 Author: Cheng Cui AuthorDate: 2023-05-11 09:06:04 +0000 Commit: Cheng Cui CommitDate: 2023-05-18 15:11:53 +0000 Under RSS, assign a TCP flow's inp_flowid anyway. Summary: This brings some benefit of a tcp flow identification for some kernel modules, such as siftr. Reviewers: rrs, rscheff, tuexen, #transport! Approved by: tuexen (mentor), rrs Subscribers: imp, melifaro, glebius Differential Revision: https://reviews.freebsd.org/D40061 --- sys/netinet/tcp_input.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 55d3e41a07c1..10daab2d61ba 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_rss.h" #include #include @@ -83,6 +84,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #define TCPSTATES /* for logging */ @@ -90,6 +92,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include /* required for icmp_var.h */ @@ -99,6 +102,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -936,10 +940,35 @@ findpcb: INP_LOCK_ASSERT(inp); if ((inp->inp_flowtype == M_HASHTYPE_NONE) && - (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) && !SOLISTENING(inp->inp_socket)) { - inp->inp_flowid = m->m_pkthdr.flowid; - inp->inp_flowtype = M_HASHTYPE_GET(m); + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { + inp->inp_flowid = m->m_pkthdr.flowid; + inp->inp_flowtype = M_HASHTYPE_GET(m); +#ifdef RSS + } else { + /* assign flowid by software RSS hash */ +#ifdef INET6 + if (isipv6) { + rss_proto_software_hash_v6(&inp->in6p_faddr, + &inp->in6p_laddr, + inp->inp_fport, + inp->inp_lport, + IPPROTO_TCP, + &inp->inp_flowid, + &inp->inp_flowtype); + } else +#endif /* INET6 */ + { + rss_proto_software_hash_v4(inp->inp_faddr, + inp->inp_laddr, + inp->inp_fport, + inp->inp_lport, + IPPROTO_TCP, + &inp->inp_flowid, + &inp->inp_flowtype); + } +#endif /* RSS */ + } } #if defined(IPSEC) || defined(IPSEC_SUPPORT) #ifdef INET6