From nobody Tue May 31 03:47:25 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3F5F11B4A3AB; Tue, 31 May 2022 03:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LBysB0q03z3nXm; Tue, 31 May 2022 03:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653968846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZF1zmESFAqwGqWNxs/W28v2ChwekGwh94Sn2Vf6k00=; b=VlaxerR4miXnUmG1RZmZYyh2xHNkIUlJzSmmkFPSDQeK6iInO/hiWSRkDCrlt+qKcwc631 ZaSelNk3moa7OscHBFIBUFt2L4teUQDP7y5+A/BoJUzhJpeofkVjYkzt24iyHR478YxOWd Bg3/MqV2RlEUWbQ8XfkwMY8+TJqstrcjPQG3MOARSGc8M0dWmA7RI/wdrFmDVuWSOIV33t cDo1wXNgJNLr3R58COXLIZ8pnZXYqVNP4m5950ns5V6rSCi041gyX9cZ6FM+K/DNc3EYt2 W3+bPpoxoHlX9K9fwlviTA3cNcDq2sPnq9bbRQYM5fAlISpMEDl4kKcz3Vts3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1CA72427E; Tue, 31 May 2022 03:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24V3lP97031107; Tue, 31 May 2022 03:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24V3lPML031106; Tue, 31 May 2022 03:47:25 GMT (envelope-from git) Date: Tue, 31 May 2022 03:47:25 GMT Message-Id: <202205310347.24V3lPML031106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: f083739350fb - main - soo_aio_*: use socket buffer mutexes in struct socket directly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f083739350fbb541b37783a23e8d7fd2aba03e07 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653968846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZF1zmESFAqwGqWNxs/W28v2ChwekGwh94Sn2Vf6k00=; b=ey9SeMF1job/XIpv/7pARptIr2bd8AnQFoYo+vxqD5o5G4fuxNREBDu+3auk0eN1yRrDPL kDe/nLYX+mMQH7aM1ZERxaR6khQGw2ggD/Vwki9uCvlakiCA+s82MSpjE7FEkWH1QEOVhX SwcNlpoOX4a1IwUdSXaz812kdtPZAInVAsIdGD8KrnTX0+9IcZ0WqIqx0arXl3U7UWAOco GaPuaLTCgbyIziTjkIPFhUiTDdJvoZzCTRXpL4bb8WPBJrQdI4nBrDorFLF1WOxbmzfjJi QOkRJazhLo6uZFhi8L+oRADl+5l87aWD2sxteJYVxnaCQEQ5znTssWoqLPlKTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653968846; a=rsa-sha256; cv=none; b=gwiC0Dl38Qrj1tYI4+aryy7xdbn23fiYCAgw03K773w3bnxr77xiZ9czHtUTVLIpyk9/6T v4It6HZ+olWlzlUN5gyoGkGQlBk4g6+HgvZxP6+d4uWc1Gscebzq/POd36FBl3HNi2V5dm nbLA0PNe8FPHEDSSRCasDq2S7myCEbju+rJ4nF0iUWBMaBRXNbsTz4RvCzD4/3PMGRphFd dK6LZjmpfPrZsJFdG3mw3mA5dRTcY39G33E4cnUyU1QBH2/fNCaDv6pCCm1j8uur3PL3Nr gD6R1knfz0nPq3X4ohMPV2y1VAdrgRhPQqNw2H0SZdaqhXcJdXe8A6WOZaTsnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f083739350fbb541b37783a23e8d7fd2aba03e07 commit f083739350fbb541b37783a23e8d7fd2aba03e07 Author: Gleb Smirnoff AuthorDate: 2022-05-31 03:38:34 +0000 Commit: Gleb Smirnoff CommitDate: 2022-05-31 03:46:38 +0000 soo_aio_*: use socket buffer mutexes in struct socket directly A miss from commit 4328318445a. --- sys/kern/sys_socket.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index b1b47d3d3c26..3480af70832a 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -772,22 +772,25 @@ soo_aio_cancel(struct kaiocb *job) struct sockbuf *sb; long done; int opcode; + sb_which which; so = job->fd_file->f_data; opcode = job->uaiocb.aio_lio_opcode; - if (opcode & LIO_READ) + if (opcode & LIO_READ) { sb = &so->so_rcv; - else { + which = SO_RCV; + } else { MPASS(opcode & LIO_WRITE); sb = &so->so_snd; + which = SO_SND; } - SOCKBUF_LOCK(sb); + SOCK_BUF_LOCK(so, which); if (!aio_cancel_cleared(job)) TAILQ_REMOVE(&sb->sb_aiojobq, job, list); if (TAILQ_EMPTY(&sb->sb_aiojobq)) sb->sb_flags &= ~SB_AIO; - SOCKBUF_UNLOCK(sb); + SOCK_BUF_UNLOCK(so, which); done = job->aio_done; if (done != 0) @@ -826,10 +829,7 @@ soo_aio_queue(struct file *fp, struct kaiocb *job) } if (SOLISTENING(so)) { - if (sb == &so->so_rcv) - SOCK_RECVBUF_UNLOCK(so); - else - SOCK_SENDBUF_UNLOCK(so); + SOCK_BUF_UNLOCK(so, which); return (EINVAL); } @@ -842,6 +842,6 @@ soo_aio_queue(struct file *fp, struct kaiocb *job) else sb->sb_flags |= SB_AIO; } - SOCKBUF_UNLOCK(sb); + SOCK_BUF_UNLOCK(so, which); return (0); }