Page MenuHomeFreeBSD
Files F160775655

D56482.diff
No OneTemporary
Actions

D56482.diff
View Options

diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -134,10 +134,9 @@
VNET_DEFINE(int, ipport_randomized) = 1;
#ifdef INET
-static struct inpcb *in_pcblookup_hash_locked(struct inpcbinfo *pcbinfo,
- struct in_addr faddr, u_int fport_arg,
- struct in_addr laddr, u_int lport_arg,
- int lookupflags, uint8_t numa_domain, int fib);
+static struct inpcb *in_pcblookup_internal(struct inpcbinfo *pcbinfo,
+ struct in_addr faddr, u_int fport_arg, struct in_addr laddr,
+ u_int lport_arg, int lookupflags, uint8_t numa_domain, int fib);
#define RANGECHK(var, min, max) \
if ((var) < (min)) { (var) = (min); } \
@@ -809,14 +808,14 @@
if (fsa != NULL) {
#ifdef INET
if (lsa->sa_family == AF_INET) {
- tmpinp = in_pcblookup_hash_locked(pcbinfo,
+ tmpinp = in_pcblookup_internal(pcbinfo,
faddr, fport, laddr, lport, lookupflags,
M_NODOM, RT_ALL_FIBS);
}
#endif
#ifdef INET6
if (lsa->sa_family == AF_INET6) {
- tmpinp = in6_pcblookup_hash_locked(pcbinfo,
+ tmpinp = in6_pcblookup_internal(pcbinfo,
faddr6, fport, laddr6, lport, lookupflags,
M_NODOM, RT_ALL_FIBS);
}
@@ -1171,7 +1170,7 @@
INP_HASH_WUNLOCK(inp->inp_pcbinfo);
return (error);
}
- } else if (in_pcblookup_hash_locked(inp->inp_pcbinfo, faddr,
+ } else if (in_pcblookup_internal(inp->inp_pcbinfo, faddr,
sin->sin_port, laddr, inp->inp_lport, 0, M_NODOM, RT_ALL_FIBS) !=
NULL) {
INP_HASH_WUNLOCK(inp->inp_pcbinfo);
@@ -2242,7 +2241,7 @@
}
static struct inpcb *
-in_pcblookup_hash_exact(struct inpcbinfo *pcbinfo, struct in_addr faddr,
+in_pcblookup_exact(struct inpcbinfo *pcbinfo, struct in_addr faddr,
u_short fport, struct in_addr laddr, u_short lport)
{
struct inpcbhead *head;
@@ -2288,7 +2287,7 @@
#define INP_LOOKUP_AGAIN ((struct inpcb *)(uintptr_t)-1)
static struct inpcb *
-in_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo, struct in_addr laddr,
+in_pcblookup_wild_smr(struct inpcbinfo *pcbinfo, struct in_addr laddr,
u_short lport, int fib, const inp_lookup_t lockflags)
{
struct inpcbhead *head;
@@ -2325,7 +2324,7 @@
}
static struct inpcb *
-in_pcblookup_hash_wild_locked(struct inpcbinfo *pcbinfo, struct in_addr laddr,
+in_pcblookup_wild_locked(struct inpcbinfo *pcbinfo, struct in_addr laddr,
u_short lport, int fib)
{
struct inpcbhead *head;
@@ -2404,7 +2403,7 @@
* out incoming packets.
*/
static struct inpcb *
-in_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr,
+in_pcblookup_internal(struct inpcbinfo *pcbinfo, struct in_addr faddr,
u_int fport_arg, struct in_addr laddr, u_int lport_arg, int lookupflags,
uint8_t numa_domain, int fib)
{
@@ -2419,7 +2418,7 @@
("%s: invalid local address", __func__));
INP_HASH_WLOCK_ASSERT(pcbinfo);
- inp = in_pcblookup_hash_exact(pcbinfo, faddr, fport, laddr, lport);
+ inp = in_pcblookup_exact(pcbinfo, faddr, fport, laddr, lport);
if (inp != NULL)
return (inp);
@@ -2427,7 +2426,7 @@
inp = in_pcblookup_lbgroup(pcbinfo, &faddr, fport,
&laddr, lport, numa_domain, fib);
if (inp == NULL) {
- inp = in_pcblookup_hash_wild_locked(pcbinfo, laddr,
+ inp = in_pcblookup_wild_locked(pcbinfo, laddr,
lport, fib);
}
}
@@ -2435,8 +2434,12 @@
return (inp);
}
+/*
+ * Lookup inpcb using locks. Used by in_pcblookup_smr() in case inp_smr_lock()
+ * failed.
+ */
static struct inpcb *
-in_pcblookup_hash(struct inpcbinfo *pcbinfo, struct in_addr faddr,
+in_pcblookup_with_lock(struct inpcbinfo *pcbinfo, struct in_addr faddr,
u_int fport, struct in_addr laddr, u_int lport, int lookupflags,
uint8_t numa_domain, int fib)
{
@@ -2447,7 +2450,7 @@
("%s: LOCKPCB not set", __func__));
INP_HASH_WLOCK(pcbinfo);
- inp = in_pcblookup_hash_locked(pcbinfo, faddr, fport, laddr, lport,
+ inp = in_pcblookup_internal(pcbinfo, faddr, fport, laddr, lport,
lookupflags & ~INPLOOKUP_LOCKMASK, numa_domain, fib);
if (inp != NULL && !inp_trylock(inp, lockflags)) {
in_pcbref(inp);
@@ -2463,7 +2466,7 @@
}
static struct inpcb *
-in_pcblookup_hash_smr(struct inpcbinfo *pcbinfo, struct in_addr faddr,
+in_pcblookup_smr(struct inpcbinfo *pcbinfo, struct in_addr faddr,
u_int fport_arg, struct in_addr laddr, u_int lport_arg, int lookupflags,
uint8_t numa_domain, int fib)
{
@@ -2477,7 +2480,7 @@
("%s: LOCKPCB not set", __func__));
smr_enter(pcbinfo->ipi_smr);
- inp = in_pcblookup_hash_exact(pcbinfo, faddr, fport, laddr, lport);
+ inp = in_pcblookup_exact(pcbinfo, faddr, fport, laddr, lport);
if (inp != NULL) {
if (__predict_true(inp_smr_lock(inp, lockflags))) {
/*
@@ -2494,8 +2497,8 @@
* We failed to lock the inpcb, or its connection state changed
* out from under us. Fall back to a precise search.
*/
- return (in_pcblookup_hash(pcbinfo, faddr, fport, laddr, lport,
- lookupflags, numa_domain, fib));
+ return (in_pcblookup_with_lock(pcbinfo, faddr, fport, laddr,
+ lport, lookupflags, numa_domain, fib));
}
if ((lookupflags & INPLOOKUP_WILDCARD) != 0) {
@@ -2510,12 +2513,12 @@
}
inp = INP_LOOKUP_AGAIN;
} else {
- inp = in_pcblookup_hash_wild_smr(pcbinfo, laddr, lport,
+ inp = in_pcblookup_wild_smr(pcbinfo, laddr, lport,
fib, lockflags);
}
if (inp == INP_LOOKUP_AGAIN) {
- return (in_pcblookup_hash(pcbinfo, faddr, fport, laddr,
- lport, lookupflags, numa_domain, fib));
+ return (in_pcblookup_with_lock(pcbinfo, faddr, fport,
+ laddr, lport, lookupflags, numa_domain, fib));
}
}
@@ -2537,7 +2540,7 @@
int fib;
fib = (lookupflags & INPLOOKUP_FIB) ? if_getfib(ifp) : RT_ALL_FIBS;
- return (in_pcblookup_hash_smr(pcbinfo, faddr, fport, laddr, lport,
+ return (in_pcblookup_smr(pcbinfo, faddr, fport, laddr, lport,
lookupflags, M_NODOM, fib));
}
@@ -2550,7 +2553,7 @@
M_ASSERTPKTHDR(m);
fib = (lookupflags & INPLOOKUP_FIB) ? M_GETFIB(m) : RT_ALL_FIBS;
- return (in_pcblookup_hash_smr(pcbinfo, faddr, fport, laddr, lport,
+ return (in_pcblookup_smr(pcbinfo, faddr, fport, laddr, lport,
lookupflags, m->m_pkthdr.numa_domain, fib));
}
#endif /* INET */
@@ -2563,7 +2566,7 @@
/*
* Insert the PCB into a hash chain using ordering rules which ensure that
- * in_pcblookup_hash_wild_*() always encounter the highest-ranking PCB first.
+ * in_pcblookup_wild_*() always encounter the highest-ranking PCB first.
*
* Specifically, keep jailed PCBs in front of non-jailed PCBs, and keep PCBs
* with exact local addresses ahead of wildcard PCBs. Unbound v4-mapped v6 PCBs
diff --git a/sys/netinet6/in6_pcb.h b/sys/netinet6/in6_pcb.h
--- a/sys/netinet6/in6_pcb.h
+++ b/sys/netinet6/in6_pcb.h
@@ -76,7 +76,7 @@
void in6_pcbdisconnect(struct inpcb *);
struct inpcb *in6_pcblookup_local(struct inpcbinfo *, const struct in6_addr *,
u_short, int, int, struct ucred *);
-struct inpcb *in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo,
+struct inpcb *in6_pcblookup_internal(struct inpcbinfo *pcbinfo,
const struct in6_addr *faddr, u_int fport_arg,
const struct in6_addr *laddr, u_int lport_arg,
int lookupflags, uint8_t numa_domain, int fib);
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -485,8 +485,8 @@
return (error);
}
- if (in6_pcblookup_hash_locked(pcbinfo, &sin6->sin6_addr,
- sin6->sin6_port, IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr) ?
+ if (in6_pcblookup_internal(pcbinfo, &sin6->sin6_addr, sin6->sin6_port,
+ IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr) ?
&laddr6.sin6_addr : &inp->in6p_laddr, inp->inp_lport, 0,
M_NODOM, RT_ALL_FIBS) != NULL) {
INP_HASH_WUNLOCK(pcbinfo);
@@ -992,9 +992,8 @@
}
static struct inpcb *
-in6_pcblookup_hash_exact(struct inpcbinfo *pcbinfo,
- const struct in6_addr *faddr, u_short fport,
- const struct in6_addr *laddr, u_short lport)
+in6_pcblookup_exact(struct inpcbinfo *pcbinfo, const struct in6_addr *faddr,
+ u_short fport, const struct in6_addr *laddr, u_short lport)
{
struct inpcbhead *head;
struct inpcb *inp;
@@ -1041,7 +1040,7 @@
#define INP_LOOKUP_AGAIN ((struct inpcb *)(uintptr_t)-1)
static struct inpcb *
-in6_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo,
+in6_pcblookup_wild_smr(struct inpcbinfo *pcbinfo,
const struct in6_addr *laddr, u_short lport, int fib,
const inp_lookup_t lockflags)
{
@@ -1080,7 +1079,7 @@
}
static struct inpcb *
-in6_pcblookup_hash_wild_locked(struct inpcbinfo *pcbinfo,
+in6_pcblookup_wild_locked(struct inpcbinfo *pcbinfo,
const struct in6_addr *laddr, u_short lport, int fib)
{
struct inpcbhead *head;
@@ -1139,9 +1138,8 @@
}
struct inpcb *
-in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo,
- const struct in6_addr *faddr, u_int fport_arg,
- const struct in6_addr *laddr, u_int lport_arg,
+in6_pcblookup_internal(struct inpcbinfo *pcbinfo, const struct in6_addr *faddr,
+ u_int fport_arg, const struct in6_addr *laddr, u_int lport_arg,
int lookupflags, uint8_t numa_domain, int fib)
{
struct inpcb *inp;
@@ -1155,7 +1153,7 @@
("%s: invalid local address", __func__));
INP_HASH_LOCK_ASSERT(pcbinfo);
- inp = in6_pcblookup_hash_exact(pcbinfo, faddr, fport, laddr, lport);
+ inp = in6_pcblookup_exact(pcbinfo, faddr, fport, laddr, lport);
if (inp != NULL)
return (inp);
@@ -1163,15 +1161,15 @@
inp = in6_pcblookup_lbgroup(pcbinfo, faddr, fport, laddr,
lport, numa_domain, fib);
if (inp == NULL) {
- inp = in6_pcblookup_hash_wild_locked(pcbinfo,
- laddr, lport, fib);
+ inp = in6_pcblookup_wild_locked(pcbinfo, laddr, lport,
+ fib);
}
}
return (inp);
}
static struct inpcb *
-in6_pcblookup_hash(struct inpcbinfo *pcbinfo, const struct in6_addr *faddr,
+in6_pcblookup_with_lock(struct inpcbinfo *pcbinfo, const struct in6_addr *faddr,
u_int fport, const struct in6_addr *laddr, u_int lport, int lookupflags,
uint8_t numa_domain, int fib)
{
@@ -1182,7 +1180,7 @@
("%s: LOCKPCB not set", __func__));
INP_HASH_WLOCK(pcbinfo);
- inp = in6_pcblookup_hash_locked(pcbinfo, faddr, fport, laddr, lport,
+ inp = in6_pcblookup_internal(pcbinfo, faddr, fport, laddr, lport,
lookupflags & ~INPLOOKUP_LOCKMASK, numa_domain, fib);
if (inp != NULL && !inp_trylock(inp, lockflags)) {
in_pcbref(inp);
@@ -1198,7 +1196,7 @@
}
static struct inpcb *
-in6_pcblookup_hash_smr(struct inpcbinfo *pcbinfo, const struct in6_addr *faddr,
+in6_pcblookup_smr(struct inpcbinfo *pcbinfo, const struct in6_addr *faddr,
u_int fport_arg, const struct in6_addr *laddr, u_int lport_arg,
int lookupflags, uint8_t numa_domain, int fib)
{
@@ -1212,7 +1210,7 @@
("%s: LOCKPCB not set", __func__));
smr_enter(pcbinfo->ipi_smr);
- inp = in6_pcblookup_hash_exact(pcbinfo, faddr, fport, laddr, lport);
+ inp = in6_pcblookup_exact(pcbinfo, faddr, fport, laddr, lport);
if (inp != NULL) {
if (__predict_true(inp_smr_lock(inp, lockflags))) {
if (__predict_true(in6_pcblookup_exact_match(inp,
@@ -1224,8 +1222,8 @@
* We failed to lock the inpcb, or its connection state changed
* out from under us. Fall back to a precise search.
*/
- return (in6_pcblookup_hash(pcbinfo, faddr, fport, laddr, lport,
- lookupflags, numa_domain, fib));
+ return (in6_pcblookup_with_lock(pcbinfo, faddr, fport, laddr,
+ lport, lookupflags, numa_domain, fib));
}
if ((lookupflags & INPLOOKUP_WILDCARD) != 0) {
@@ -1240,12 +1238,12 @@
}
inp = INP_LOOKUP_AGAIN;
} else {
- inp = in6_pcblookup_hash_wild_smr(pcbinfo, laddr, lport,
+ inp = in6_pcblookup_wild_smr(pcbinfo, laddr, lport,
fib, lockflags);
}
if (inp == INP_LOOKUP_AGAIN) {
- return (in6_pcblookup_hash(pcbinfo, faddr, fport, laddr,
- lport, lookupflags, numa_domain, fib));
+ return (in6_pcblookup_with_lock(pcbinfo, faddr, fport,
+ laddr, lport, lookupflags, numa_domain, fib));
}
}
@@ -1267,7 +1265,7 @@
int fib;
fib = (lookupflags & INPLOOKUP_FIB) ? if_getfib(ifp) : RT_ALL_FIBS;
- return (in6_pcblookup_hash_smr(pcbinfo, faddr, fport, laddr, lport,
+ return (in6_pcblookup_smr(pcbinfo, faddr, fport, laddr, lport,
lookupflags, M_NODOM, fib));
}
@@ -1280,7 +1278,7 @@
M_ASSERTPKTHDR(m);
fib = (lookupflags & INPLOOKUP_FIB) ? M_GETFIB(m) : RT_ALL_FIBS;
- return (in6_pcblookup_hash_smr(pcbinfo, faddr, fport, laddr, lport,
+ return (in6_pcblookup_smr(pcbinfo, faddr, fport, laddr, lport,
lookupflags, m->m_pkthdr.numa_domain, fib));
}

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 28, 5:28 PM (18 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34440363
Default Alt Text
D56482.diff (12 KB)

Event Timeline