From nobody Mon Feb 03 06:41:29 2025 X-Original-To: dev-commits-src-main@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 4YmcNB1vGgz5mc01; Mon, 03 Feb 2025 06:41:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YmcNB1RJPz41hk; Mon, 03 Feb 2025 06:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738564890; 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=3W8Gog8LhYDqHIxVAUSnfVZ8i8tFLpXVRMqYOJiT6Aw=; b=W/t+c88R5HrYJFC2udSX1MKb39xflAiq1zBvk/q17R7RGVrO0LPyGf+VFa+jWCnQpSMT7V IqZEFL9mSG82FN84TPYDbmiZudOJxklBCg0CocQD4LtQGyotJQdSA72h9t3lW0s52o7WGJ 4CL47aHstCRBLV/peI2/CylyH/R3SrX8J6KgVhwkEN7b8AHSyati38TiKbFnQClIKJrFgh uEDKFR2vldZGrccws0QZreKAjprGYfu6hzgwD75mDI9BiKW2BT52EwPaboHeh6OJsfvX9c kj1kx1OJgEDFs4XsEKlYFxFyyUiKpzsfIDf6VzLiSYlGO6hwk8TCkXdpeUE2yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738564890; 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=3W8Gog8LhYDqHIxVAUSnfVZ8i8tFLpXVRMqYOJiT6Aw=; b=HWtnDx+4OtMv6X+vS8hDzUvbpGbKQt7DnBeL8pelSCyGvjEozTdzDqcgTFPDYdRpCEzDRQ npVFphodpDdEpEu8+DIL9doY/QPApNxsqn5wDaU5lL0z+2bbaeabIaDMuvmYIu8rGH3qde lubcWVwJqUuWHGwODYlQBz0ZPpNi5m0Si88gSOoDLDyGhmshitHfoyGNuXA13X6vJjnNCg /PLgistzWcTfjMzVKIzOeBU73Q70GAPpJDQBpzflDz6p2VnvE4iNzMIEUtN0ss7UmYO64D sYA/amqhdXm4WTfB+0MX1y7WScJVDd16k0knuhrBLjRYNUvB7AOz/wxqaW8iwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738564890; a=rsa-sha256; cv=none; b=KKrQD74MbineY7V22hDkjMwfC/3c/Bn/dIhj/I9zaQbdg0dDCO+3Shk6y4k/gKBFuLEFS7 A/MeKRjor6fnDYyILNi5vgMjb8pXTF76yAjpZJZMxiLt2rbWRHmvOFzeyinBslLmOqJDJw hW5Mp/Ld8cCsHUvcuT6FA5oEfapER/xCgggj+jAC6HVRvzjH4esZs2KYD87VvwrpTXOaps X4kjGqeJfYI68Y1kp6K8YnKSilJNyE70WDQ113ux4OIbp2wMmfLoW5DB0Y7UKSfUq1x4Lz 9eJ6FLkMDs90gIp1KjRRmQ2CnYokf0IqJt+ZvcwhD5XRhiLt76YlKYAQW2vODQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YmcNB0rwcz998; Mon, 03 Feb 2025 06:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5136fTA9055744; Mon, 3 Feb 2025 06:41:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5136fTCd055741; Mon, 3 Feb 2025 06:41:29 GMT (envelope-from git) Date: Mon, 3 Feb 2025 06:41:29 GMT Message-Id: <202502030641.5136fTCd055741@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: 9d7fb768543b - main - sockets: garbage collect SB_NOINTR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9d7fb768543bbd1ddcd6a6d7bc2477838c59368f Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=9d7fb768543bbd1ddcd6a6d7bc2477838c59368f commit 9d7fb768543bbd1ddcd6a6d7bc2477838c59368f Author: Gleb Smirnoff AuthorDate: 2025-02-01 20:06:21 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-03 06:38:18 +0000 sockets: garbage collect SB_NOINTR Not used. All socket buffer sleeps are interruptible. --- sys/kern/uipc_debug.c | 4 ---- sys/kern/uipc_sockbuf.c | 3 +-- sys/netsmb/smb_trantcp.c | 6 ------ sys/sys/sockbuf.h | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/kern/uipc_debug.c b/sys/kern/uipc_debug.c index 83cb7f6dc00a..bbd6c078fd06 100644 --- a/sys/kern/uipc_debug.c +++ b/sys/kern/uipc_debug.c @@ -328,10 +328,6 @@ db_print_sbflags(short sb_flags) db_printf("%sSB_UPCALL", comma ? ", " : ""); comma = 1; } - if (sb_flags & SB_NOINTR) { - db_printf("%sSB_NOINTR", comma ? ", " : ""); - comma = 1; - } if (sb_flags & SB_AIO) { db_printf("%sSB_AIO", comma ? ", " : ""); comma = 1; diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 95c7241d5f13..e8d410b00c15 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -456,8 +456,7 @@ sbwait(struct socket *so, sb_which which) sb = sobuf(so, which); sb->sb_flags |= SB_WAIT; return (msleep_sbt(&sb->sb_acc, soeventmtx(so, which), - (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, "sbwait", - sb->sb_timeo, 0, 0)); + PSOCK | PCATCH, "sbwait", sb->sb_timeo, 0, 0)); } /* diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c index f19eea45f265..fbbf987367d8 100644 --- a/sys/netsmb/smb_trantcp.c +++ b/sys/netsmb/smb_trantcp.c @@ -161,12 +161,6 @@ nb_connect_in(struct nbpcb *nbp, struct sockaddr_in *to, struct thread *td) goto bad; nb_setsockopt_int(so, SOL_SOCKET, SO_KEEPALIVE, 1); nb_setsockopt_int(so, IPPROTO_TCP, TCP_NODELAY, 1); - SOCKBUF_LOCK(&so->so_rcv); - so->so_rcv.sb_flags &= ~SB_NOINTR; - SOCKBUF_UNLOCK(&so->so_rcv); - SOCKBUF_LOCK(&so->so_snd); - so->so_snd.sb_flags &= ~SB_NOINTR; - SOCKBUF_UNLOCK(&so->so_snd); error = soconnect(so, (struct sockaddr*)to, td); if (error) goto bad; diff --git a/sys/sys/sockbuf.h b/sys/sys/sockbuf.h index fd503d021282..73dd7afa371f 100644 --- a/sys/sys/sockbuf.h +++ b/sys/sys/sockbuf.h @@ -40,7 +40,7 @@ #define SB_SEL 0x08 /* someone is selecting */ #define SB_ASYNC 0x10 /* ASYNC I/O, need signals */ #define SB_UPCALL 0x20 /* someone wants an upcall */ -#define SB_NOINTR 0x40 /* operations not interruptible */ +/* was SB_NOINTR 0x40 */ #define SB_AIO 0x80 /* AIO operations queued */ #define SB_KNOTE 0x100 /* kernel note attached */ #define SB_NOCOALESCE 0x200 /* don't coalesce new data into existing mbufs */