On Sat, Oct 26, 2024 at 07:24:56PM +0300, Vitaliy Makkoveev wrote:
> Please test it with -current. You only need to update kernel sources
> and rebuild kernel.
>
> > On 26 Oct 2024, at 19:11, Holger Glaess <[email protected]> wrote:
> >
> >
> > hi
> >
> > what i did and hope there is not to mutch wrong:
> >
> > cvs -qd [email protected]:/cvs checkout -rOPENBSD_7_6 -P src
> > /usr/src 317>cat vxlan_v2.patch | patch -p0
> >
> > i rework all the files where i get an rej.
> >
> > /usr/src 319>find . -name "*.rej"
> > ./sys/kern/kern_sysctl.c.rej
> > ./sys/netinet/in_pcb.c.rej
> > ./sys/netinet/in_pcb.h.rej
> > ./sys/netinet/ip_divert.c.rej
> > ./sys/netinet/raw_ip.c.rej
> > ./sys/netinet/udp_usrreq.c.rej
> > ./sys/netinet6/in6_pcb.c.rej
> > ./sys/netinet6/ip6_divert.c.rej
> > ./sys/netinet6/raw_ip6.c.rej
> >
> >
> > keep in sys/netinet/udp_usrreq.c close at line 494
> > udpstat_inc(udps_noportbcast);
> >
I just checked this diff with 7.6-stable. It perfectly applies to
sources, compiles and runs. I'm not surprised, because -current is very
close to release. It seems you did something wrong.
The attached diff was made against 7.6-stable. As you can see it is the
same. Please be sure your mail client doesn't drop spaces in the
beginning of line or something else.
Index: sys/kern/kern_sysctl.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_sysctl.c,v
retrieving revision 1.447
diff -u -p -r1.447 kern_sysctl.c
--- sys/kern/kern_sysctl.c 24 Sep 2024 12:37:11 -0000 1.447
+++ sys/kern/kern_sysctl.c 26 Oct 2024 23:03:22 -0000
@@ -1673,34 +1673,52 @@ sysctl_file(int *name, u_int namelen, ch
NET_LOCK();
mtx_enter(&tcbtable.inpt_mtx);
- TAILQ_FOREACH(inp, &tcbtable.inpt_queue, inp_queue)
+ TAILQ_FOREACH(inp, &tcbtable.inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
FILLSO(inp->inp_socket);
+ }
mtx_leave(&tcbtable.inpt_mtx);
#ifdef INET6
mtx_enter(&tcb6table.inpt_mtx);
- TAILQ_FOREACH(inp, &tcb6table.inpt_queue, inp_queue)
+ TAILQ_FOREACH(inp, &tcb6table.inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
FILLSO(inp->inp_socket);
+ }
mtx_leave(&tcb6table.inpt_mtx);
#endif
mtx_enter(&udbtable.inpt_mtx);
- TAILQ_FOREACH(inp, &udbtable.inpt_queue, inp_queue)
+ TAILQ_FOREACH(inp, &udbtable.inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
FILLSO(inp->inp_socket);
+ }
mtx_leave(&udbtable.inpt_mtx);
#ifdef INET6
mtx_enter(&udb6table.inpt_mtx);
- TAILQ_FOREACH(inp, &udb6table.inpt_queue, inp_queue)
+ TAILQ_FOREACH(inp, &udb6table.inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
FILLSO(inp->inp_socket);
+ }
mtx_leave(&udb6table.inpt_mtx);
#endif
mtx_enter(&rawcbtable.inpt_mtx);
- TAILQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue)
+ TAILQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
FILLSO(inp->inp_socket);
+ }
mtx_leave(&rawcbtable.inpt_mtx);
#ifdef INET6
mtx_enter(&rawin6pcbtable.inpt_mtx);
TAILQ_FOREACH(inp, &rawin6pcbtable.inpt_queue,
- inp_queue)
+ inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
FILLSO(inp->inp_socket);
+ }
mtx_leave(&rawin6pcbtable.inpt_mtx);
#endif
NET_UNLOCK();
Index: sys/netinet/in_pcb.c
===================================================================
RCS file: /cvs/src/sys/netinet/in_pcb.c,v
retrieving revision 1.303
diff -u -p -r1.303 in_pcb.c
--- sys/netinet/in_pcb.c 12 Jul 2024 19:50:35 -0000 1.303
+++ sys/netinet/in_pcb.c 26 Oct 2024 23:03:22 -0000
@@ -644,6 +644,39 @@ in_pcbunref(struct inpcb *inp)
pool_put(&inpcb_pool, inp);
}
+struct inpcb *
+in_pcb_iterator(struct inpcbtable *table, struct inpcb *inp,
+ struct inpcb_iterator *iter)
+{
+ struct inpcb *tmp;
+
+ mtx_enter(&table->inpt_mtx);
+
+ if (inp)
+ tmp = TAILQ_NEXT(inp, inp_queue);
+ else
+ tmp = TAILQ_FIRST(&table->inpt_queue);
+
+ while (tmp && tmp->inp_table == NULL)
+ tmp = TAILQ_NEXT(tmp, inp_queue);
+
+ if (inp)
+ TAILQ_REMOVE(&table->inpt_queue, (struct inpcb *)iter,
+ inp_queue);
+ if (tmp) {
+ TAILQ_INSERT_AFTER(&table->inpt_queue, tmp,
+ (struct inpcb *)iter, inp_queue);
+ in_pcbref(tmp);
+ }
+
+ mtx_leave(&table->inpt_mtx);
+
+ if (inp)
+ in_pcbunref(inp);
+
+ return tmp;
+}
+
void
in_setsockaddr(struct inpcb *inp, struct mbuf *nam)
{
@@ -743,6 +776,8 @@ in_pcbnotifyall(struct inpcbtable *table
rw_enter_write(&table->inpt_notify);
mtx_enter(&table->inpt_mtx);
TAILQ_FOREACH(inp, &table->inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
KASSERT(!ISSET(inp->inp_flags, INP_IPV6));
if (inp->inp_faddr.s_addr != dst->sin_addr.s_addr ||
@@ -1098,6 +1133,8 @@ in_pcbresize(struct inpcbtable *table, i
table->inpt_size = hashsize;
TAILQ_FOREACH(inp, &table->inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
LIST_REMOVE(inp, inp_lhash);
LIST_REMOVE(inp, inp_hash);
in_pcbhash_insert(inp);
Index: sys/netinet/in_pcb.h
===================================================================
RCS file: /cvs/src/sys/netinet/in_pcb.h,v
retrieving revision 1.158
diff -u -p -r1.158 in_pcb.h
--- sys/netinet/in_pcb.h 12 Jul 2024 19:50:35 -0000 1.158
+++ sys/netinet/in_pcb.h 26 Oct 2024 23:03:22 -0000
@@ -178,6 +178,20 @@ struct inpcb {
LIST_HEAD(inpcbhead, inpcb);
+struct inpcb_iterator {
+ LIST_ENTRY(inpcb) inp_hash; /* unused */
+ LIST_ENTRY(inpcb) inp_lhash; /* unused */
+ TAILQ_ENTRY(inpcb) inp_queue; /* [t] inet PCB queue */
+ SIMPLEQ_ENTRY(inpcb) inp_notify; /* unused */
+ struct inpcbtable *inp_table; /* [I] always NULL */
+};
+
+static inline int
+in_pcb_is_iterator(struct inpcb *inp)
+{
+ return (inp->inp_table == NULL ? 1 : 0);
+}
+
struct inpcbtable {
struct mutex inpt_mtx; /* protect queue and hash */
struct rwlock inpt_notify; /* protect inp_notify list */
@@ -302,6 +316,9 @@ struct inpcb *
in_pcbref(struct inpcb *);
void in_pcbunref(struct inpcb *);
void in_pcbdisconnect(struct inpcb *);
+struct inpcb *
+ in_pcb_iterator(struct inpcbtable *, struct inpcb *,
+ struct inpcb_iterator *);
struct inpcb *
in_pcblookup(struct inpcbtable *, struct in_addr,
u_int, struct in_addr, u_int, u_int);
Index: sys/netinet/ip_divert.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_divert.c,v
retrieving revision 1.97
diff -u -p -r1.97 ip_divert.c
--- sys/netinet/ip_divert.c 16 Aug 2024 09:20:35 -0000 1.97
+++ sys/netinet/ip_divert.c 26 Oct 2024 23:03:22 -0000
@@ -203,6 +203,8 @@ divert_packet(struct mbuf *m, int dir, u
mtx_enter(&divbtable.inpt_mtx);
TAILQ_FOREACH(inp, &divbtable.inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
if (inp->inp_lport != divert_port)
continue;
in_pcbref(inp);
Index: sys/netinet/raw_ip.c
===================================================================
RCS file: /cvs/src/sys/netinet/raw_ip.c,v
retrieving revision 1.160
diff -u -p -r1.160 raw_ip.c
--- sys/netinet/raw_ip.c 12 Jul 2024 19:50:35 -0000 1.160
+++ sys/netinet/raw_ip.c 26 Oct 2024 23:03:22 -0000
@@ -167,6 +167,8 @@ rip_input(struct mbuf **mp, int *offp, i
rw_enter_write(&rawcbtable.inpt_notify);
mtx_enter(&rawcbtable.inpt_mtx);
TAILQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
KASSERT(!ISSET(inp->inp_flags, INP_IPV6));
/*
Index: sys/netinet/udp_usrreq.c
===================================================================
RCS file: /cvs/src/sys/netinet/udp_usrreq.c,v
retrieving revision 1.324
diff -u -p -r1.324 udp_usrreq.c
--- sys/netinet/udp_usrreq.c 6 Aug 2024 20:15:53 -0000 1.324
+++ sys/netinet/udp_usrreq.c 26 Oct 2024 23:03:22 -0000
@@ -381,7 +381,8 @@ udp_input(struct mbuf **mp, int *offp, i
}
if (m->m_flags & (M_BCAST|M_MCAST)) {
- SIMPLEQ_HEAD(, inpcb) inpcblist;
+ struct inpcb_iterator iter = {.inp_table = NULL};
+ struct inpcb *tinp = NULL;
struct inpcbtable *table;
/*
@@ -400,11 +401,6 @@ udp_input(struct mbuf **mp, int *offp, i
* fixing the interface. Maybe 4.5BSD will remedy this?)
*/
- /*
- * Locate pcb(s) for datagram.
- * (Algorithm copied from raw_intr().)
- */
- SIMPLEQ_INIT(&inpcblist);
#ifdef INET6
if (ip6)
table = &udb6table;
@@ -412,9 +408,8 @@ udp_input(struct mbuf **mp, int *offp, i
#endif
table = &udbtable;
- rw_enter_write(&table->inpt_notify);
- mtx_enter(&table->inpt_mtx);
- TAILQ_FOREACH(inp, &table->inpt_queue, inp_queue) {
+ inp = NULL;
+ while ((inp = in_pcb_iterator(table, inp, &iter)) != NULL){
if (ip6)
KASSERT(ISSET(inp->inp_flags, INP_IPV6));
else
@@ -465,8 +460,18 @@ udp_input(struct mbuf **mp, int *offp, i
continue;
}
- in_pcbref(inp);
- SIMPLEQ_INSERT_TAIL(&inpcblist, inp, inp_notify);
+ if (tinp != NULL) {
+ struct mbuf *n;
+
+ n = m_copym(m, 0, M_COPYALL, M_NOWAIT);
+ if (n != NULL) {
+ udp_sbappend(tinp, n, ip, ip6, iphlen,
+ uh, &srcsa.sa, 0);
+ }
+ in_pcbunref(tinp);
+ }
+
+ tinp = in_pcbref(inp);
/*
* Don't look for additional matches if this one does
@@ -477,14 +482,13 @@ udp_input(struct mbuf **mp, int *offp, i
* clear these options after setting them.
*/
if ((inp->inp_socket->so_options & (SO_REUSEPORT |
- SO_REUSEADDR)) == 0)
+ SO_REUSEADDR)) == 0) {
+ in_pcbunref(inp);
break;
+ }
}
- mtx_leave(&table->inpt_mtx);
-
- if (SIMPLEQ_EMPTY(&inpcblist)) {
- rw_exit_write(&table->inpt_notify);
+ if (tinp == NULL) {
/*
* No matching pcb found; discard datagram.
* (No need to send an ICMP Port Unreachable
@@ -494,21 +498,8 @@ udp_input(struct mbuf **mp, int *offp, i
goto bad;
}
- while ((inp = SIMPLEQ_FIRST(&inpcblist)) != NULL) {
- struct mbuf *n;
-
- SIMPLEQ_REMOVE_HEAD(&inpcblist, inp_notify);
- if (SIMPLEQ_EMPTY(&inpcblist))
- n = m;
- else
- n = m_copym(m, 0, M_COPYALL, M_NOWAIT);
- if (n != NULL) {
- udp_sbappend(inp, n, ip, ip6, iphlen, uh,
- &srcsa.sa, 0);
- }
- in_pcbunref(inp);
- }
- rw_exit_write(&table->inpt_notify);
+ udp_sbappend(tinp, m, ip, ip6, iphlen, uh, &srcsa.sa, 0);
+ in_pcbunref(tinp);
return IPPROTO_DONE;
}
Index: sys/netinet6/in6_pcb.c
===================================================================
RCS file: /cvs/src/sys/netinet6/in6_pcb.c,v
retrieving revision 1.144
diff -u -p -r1.144 in6_pcb.c
--- sys/netinet6/in6_pcb.c 12 Apr 2024 16:07:09 -0000 1.144
+++ sys/netinet6/in6_pcb.c 26 Oct 2024 23:03:22 -0000
@@ -479,6 +479,8 @@ in6_pcbnotify(struct inpcbtable *table,
rw_enter_write(&table->inpt_notify);
mtx_enter(&table->inpt_mtx);
TAILQ_FOREACH(inp, &table->inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
KASSERT(ISSET(inp->inp_flags, INP_IPV6));
/*
Index: sys/netinet6/ip6_divert.c
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_divert.c,v
retrieving revision 1.97
diff -u -p -r1.97 ip6_divert.c
--- sys/netinet6/ip6_divert.c 16 Aug 2024 09:20:35 -0000 1.97
+++ sys/netinet6/ip6_divert.c 26 Oct 2024 23:03:22 -0000
@@ -212,6 +212,8 @@ divert6_packet(struct mbuf *m, int dir,
mtx_enter(&divb6table.inpt_mtx);
TAILQ_FOREACH(inp, &divb6table.inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
if (inp->inp_lport != divert_port)
continue;
in_pcbref(inp);
Index: sys/netinet6/raw_ip6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/raw_ip6.c,v
retrieving revision 1.185
diff -u -p -r1.185 raw_ip6.c
--- sys/netinet6/raw_ip6.c 12 Jul 2024 19:50:35 -0000 1.185
+++ sys/netinet6/raw_ip6.c 26 Oct 2024 23:03:22 -0000
@@ -181,6 +181,8 @@ rip6_input(struct mbuf **mp, int *offp,
rw_enter_write(&rawin6pcbtable.inpt_notify);
mtx_enter(&rawin6pcbtable.inpt_mtx);
TAILQ_FOREACH(inp, &rawin6pcbtable.inpt_queue, inp_queue) {
+ if (in_pcb_is_iterator(inp))
+ continue;
KASSERT(ISSET(inp->inp_flags, INP_IPV6));
/*
