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

Allow udp_notify() to accept read, as well as write, locks on the passed

Browse Source 
inpcb.  When directly invoking udp_notify() from udp_ctlinput(), acquire
only a read lock; we may still see write locks in udp_notify() as the
in_pcbnotifyall() routine is shared with TCP and always uses a write lock
on the inpcb being notified.

MFC after:	1 month
This commit is contained in:
Robert Watson 2008-07-07 12:27:55 +00:00
parent 2db44b8410
commit ac9ae27991
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netinet/udp_usrreq.c
View File

@ -567,7 +567,13 @@ struct inpcb *
udp_notify(struct inpcb *inp, int errno) udp_notify(struct inpcb *inp, int errno)
{ {
INP_WLOCK_ASSERT(inp); /*
* While udp_ctlinput() always calls udp_notify() with a read lock
* when invoking it directly, in_pcbnotifyall() currently uses write
* locks due to sharing code with TCP. For now, accept either a read
* or a write lock, but a read lock is sufficient.
*/
INP_LOCK_ASSERT(inp);
inp->inp_socket->so_error = errno; inp->inp_socket->so_error = errno;
sorwakeup(inp->inp_socket); sorwakeup(inp->inp_socket);
@ -609,11 +615,11 @@ udp_ctlinput(int cmd, struct sockaddr *sa, void *vip)
inp = in_pcblookup_hash(&udbinfo, faddr, uh->uh_dport, inp = in_pcblookup_hash(&udbinfo, faddr, uh->uh_dport,
ip->ip_src, uh->uh_sport, 0, NULL); ip->ip_src, uh->uh_sport, 0, NULL);
if (inp != NULL) { if (inp != NULL) {
INP_WLOCK(inp); INP_RLOCK(inp);
if (inp->inp_socket != NULL) { if (inp->inp_socket != NULL) {
udp_notify(inp, inetctlerrmap[cmd]); udp_notify(inp, inetctlerrmap[cmd]);
} }
INP_WUNLOCK(inp); INP_RUNLOCK(inp);
} }
INP_INFO_RUNLOCK(&udbinfo); INP_INFO_RUNLOCK(&udbinfo);
} else } else