d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for receiving flowtype, flowid and RSS bucket information as part of recvmsg().

Browse Source 
Submitted by:	Tiwei Bie <btw@mail.ustc.edu.cn>
Differential Revision:	https://reviews.freebsd.org/D3562
This commit is contained in:
Adrian Chadd 2015-09-06 20:57:57 +00:00
parent 499baf0aa7
commit 68bb8d6249
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=287525
3 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netinet6/in6.h
View File

@ -485,6 +485,8 @@ struct route_in6 {
#define IPV6_FLOWID 67 /* int; flowid of given socket */
#define IPV6_FLOWTYPE 68 /* int; flowtype of given socket */
#define IPV6_RSSBUCKETID 69 /* int; RSS bucket ID of given socket */
#define IPV6_RECVFLOWID 70 /* bool; receive IP6 flowid/flowtype w/ datagram */
#define IPV6_RECVRSSBUCKETID 71 /* bool; receive IP6 RSS bucket id w/ datagram */
/*
* The following option is private; do not use it from user applications.

39
sys/netinet6/ip6_input.c
View File

@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/route.h>
#include <net/netisr.h>
#include <net/rss_config.h>
#include <net/pfil.h>
#include <net/vnet.h>
@ -1349,6 +1350,44 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp)
loopend:
;
}
if (in6p->inp_flags2 & INP_RECVFLOWID) {
uint32_t flowid, flow_type;
flowid = m->m_pkthdr.flowid;
flow_type = M_HASHTYPE_GET(m);
/*
* XXX should handle the failure of one or the
* other - don't populate both?
*/
*mp = sbcreatecontrol((caddr_t) &flowid,
sizeof(uint32_t), IPV6_FLOWID, IPPROTO_IPV6);
if (*mp)
mp = &(*mp)->m_next;
*mp = sbcreatecontrol((caddr_t) &flow_type,
sizeof(uint32_t), IPV6_FLOWTYPE, IPPROTO_IPV6);
if (*mp)
mp = &(*mp)->m_next;
}
#ifdef RSS
if (in6p->inp_flags2 & INP_RECVRSSBUCKETID) {
uint32_t flowid, flow_type;
uint32_t rss_bucketid;
flowid = m->m_pkthdr.flowid;
flow_type = M_HASHTYPE_GET(m);
if (rss_hash2bucket(flowid, flow_type, &rss_bucketid) == 0) {
*mp = sbcreatecontrol((caddr_t) &rss_bucketid,
sizeof(uint32_t), IPV6_RSSBUCKETID, IPPROTO_IPV6);
if (*mp)
mp = &(*mp)->m_next;
}
}
#endif
}
#undef IS2292

24
sys/netinet6/ip6_output.c
View File

@ -1400,6 +1400,10 @@ ip6_ctloutput(struct socket *so, struct sockopt *sopt)
case IPV6_RECVRTHDR:
case IPV6_RECVPATHMTU:
case IPV6_RECVTCLASS:
case IPV6_RECVFLOWID:
#ifdef RSS
case IPV6_RECVRSSBUCKETID:
#endif
case IPV6_V6ONLY:
case IPV6_AUTOFLOWLABEL:
case IPV6_BINDANY:
@ -1548,6 +1552,16 @@ do { \
OPTSET(IN6P_MTU);
break;
case IPV6_RECVFLOWID:
OPTSET2(INP_RECVFLOWID, optval);
break;
#ifdef RSS
case IPV6_RECVRSSBUCKETID:
OPTSET2(INP_RECVRSSBUCKETID, optval);
break;
#endif
case IPV6_V6ONLY:
/*
* make setsockopt(IPV6_V6ONLY)
@ -1811,8 +1825,10 @@ do { \
case IPV6_BINDANY:
case IPV6_FLOWID:
case IPV6_FLOWTYPE:
case IPV6_RECVFLOWID:
#ifdef RSS
case IPV6_RSSBUCKETID:
case IPV6_RECVRSSBUCKETID:
#endif
switch (optname) {
@ -1883,6 +1899,10 @@ do { \
case IPV6_FLOWTYPE:
optval = in6p->inp_flowtype;
break;
case IPV6_RECVFLOWID:
optval = OPTBIT2(INP_RECVFLOWID);
break;
#ifdef RSS
case IPV6_RSSBUCKETID:
retval =
@ -1894,6 +1914,10 @@ do { \
else
error = EINVAL;
break;
case IPV6_RECVRSSBUCKETID:
optval = OPTBIT2(INP_RECVRSSBUCKETID);
break;
#endif
case IPV6_BINDMULTI: