Page MenuHomeFreeBSD
Files F108579151

D41197.diff
No OneTemporary
Actions

D41197.diff
View Options

diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -575,6 +575,7 @@
#define IN6P_RTHDRDSTOPTS 0x00200000 /* receive dstoptions before rthdr */
#define IN6P_TCLASS 0x00400000 /* receive traffic class value */
#define IN6P_AUTOFLOWLABEL 0x00800000 /* attach flowlabel automatically */
+/* INP_INLBGROUP 0x01000000 private to in_pcb.c */
#define INP_ONESBCAST 0x02000000 /* send all-ones broadcast */
#define INP_DROPPED 0x04000000 /* protocol drop flag */
#define INP_SOCKREF 0x08000000 /* strong socket reference */
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
@@ -113,7 +113,9 @@
#define INPCBLBGROUP_SIZMIN 8
#define INPCBLBGROUP_SIZMAX 256
-#define INP_FREED 0x00000200 /* See in_pcb.h. */
+
+#define INP_FREED 0x00000200 /* Went through in_pcbfree(). */
+#define INP_INLBGROUP 0x01000000 /* Inserted into inpcblbgroup. */
/*
* These configure the range of local port addresses assigned to
@@ -403,6 +405,7 @@
grp->il_inp[grp->il_inpcnt] = inp;
grp->il_inpcnt++;
+ inp->inp_flags |= INP_INLBGROUP;
return (0);
}
@@ -420,6 +423,7 @@
pcbinfo = inp->inp_pcbinfo;
INP_WLOCK_ASSERT(inp);
+ MPASS(inp->inp_flags & INP_INLBGROUP);
INP_HASH_WLOCK_ASSERT(pcbinfo);
hdr = &pcbinfo->ipi_lbgrouphashbase[
@@ -436,9 +440,11 @@
/* Pull up inpcbs, shrink group if possible. */
in_pcblbgroup_reorder(hdr, &grp, i);
}
+ inp->inp_flags &= ~INP_INLBGROUP;
return;
}
}
+ KASSERT(0, ("%s: did not find %p", __func__, inp));
}
int
@@ -2672,7 +2678,7 @@
if (phd == NULL) {
phd = uma_zalloc_smr(pcbinfo->ipi_portzone, M_NOWAIT);
if (phd == NULL) {
- if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0)
+ if ((inp->inp_flags & INP_INLBGROUP) != 0)
in_pcbremlbgrouphash(inp);
return (ENOMEM);
}
@@ -2717,7 +2723,7 @@
INP_HASH_WLOCK_ASSERT(inp->inp_pcbinfo);
MPASS(inp->inp_flags & INP_INHASHLIST);
- if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0)
+ if ((inp->inp_flags & INP_INLBGROUP) != 0)
in_pcbremlbgrouphash(inp);
#ifdef INET6
if (inp->inp_vflag & INP_IPV6) {

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 27, 1:53 PM (4 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16198535
Default Alt Text
D41197.diff (2 KB)

Event Timeline