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

Consistently use the SOCKBUF_MTX() and SOCK_MTX() macros

Browse Source 
This makes it easier to change the socket locking protocols.  No
functional change intended.

MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2021-06-14 17:32:32 -04:00
parent f4bb1869dd
commit a100217489
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/iscsi/icl_soft.c
View File

@ -729,7 +729,7 @@ icl_receive_thread(void *arg)
available = sbavail(&so->so_rcv);
if (read + available < ic->ic_receive_len) {
so->so_rcv.sb_lowat = ic->ic_receive_len - read;
cv_wait(&ic->ic_receive_cv, &so->so_rcv.sb_mtx);
cv_wait(&ic->ic_receive_cv, SOCKBUF_MTX(&so->so_rcv));
so->so_rcv.sb_lowat = so->so_rcv.sb_hiwat + 1;
available = sbavail(&so->so_rcv);
}

2
sys/kern/uipc_sockbuf.c
View File

@ -446,7 +446,7 @@ sbwait(struct sockbuf *sb)
SOCKBUF_LOCK_ASSERT(sb);
sb->sb_flags |= SB_WAIT;
return (msleep_sbt(&sb->sb_acc, &sb->sb_mtx,
return (msleep_sbt(&sb->sb_acc, SOCKBUF_MTX(sb),
(sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, "sbwait",
sb->sb_timeo, 0, 0));
}

2
sys/kern/uipc_socket.c
View File

@ -1015,7 +1015,7 @@ solisten_dequeue(struct socket *head, struct socket **ret, int flags)
while (!(head->so_state & SS_NBIO) && TAILQ_EMPTY(&head->sol_comp) &&
head->so_error == 0) {
error = msleep(&head->sol_comp, &head->so_lock, PSOCK | PCATCH,
error = msleep(&head->sol_comp, SOCK_MTX(head), PSOCK | PCATCH,
"accept", 0);
if (error != 0) {
SOLISTEN_UNLOCK(head);

6
sys/netinet/sctputil.c
View File

@ -376,9 +376,9 @@ sctp_log_lock(struct sctp_inpcb *inp, struct sctp_tcb *stcb, uint8_t from)
}
sctp_clog.x.lock.info_lock = rw_wowned(&SCTP_BASE_INFO(ipi_ep_mtx));
if (inp && (inp->sctp_socket)) {
sctp_clog.x.lock.sock_lock = mtx_owned(&(inp->sctp_socket->so_rcv.sb_mtx));
sctp_clog.x.lock.sockrcvbuf_lock = mtx_owned(&(inp->sctp_socket->so_rcv.sb_mtx));
sctp_clog.x.lock.socksndbuf_lock = mtx_owned(&(inp->sctp_socket->so_snd.sb_mtx));
sctp_clog.x.lock.sock_lock = mtx_owned(SOCK_MTX(inp->sctp_socket));
sctp_clog.x.lock.sockrcvbuf_lock = mtx_owned(SOCKBUF_MTX(&inp->sctp_socket->so_rcv));
sctp_clog.x.lock.socksndbuf_lock = mtx_owned(SOCKBUF_MTX(&inp->sctp_socket->so_snd));
} else {
sctp_clog.x.lock.sock_lock = SCTP_LOCK_UNKNOWN;
sctp_clog.x.lock.sockrcvbuf_lock = SCTP_LOCK_UNKNOWN;

2
sys/sys/socketvar.h
View File

@ -218,7 +218,7 @@ struct socket {
#ifdef _KERNEL
#define SOCK_MTX(so) &(so)->so_lock
#define SOCK_MTX(so) (&(so)->so_lock)
#define SOCK_LOCK(so) mtx_lock(&(so)->so_lock)
#define SOCK_OWNED(so) mtx_owned(&(so)->so_lock)
#define SOCK_UNLOCK(so) mtx_unlock(&(so)->so_lock)