From nobody Thu Jul 10 14:42:48 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 4bdHd50wCTz617hR; Thu, 10 Jul 2025 14:42:49 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdHd431VYz4Mjt; Thu, 10 Jul 2025 14:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752158568; 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=RjCSPTyagvwzP6Za8MmiS+FjnWYkqKDw+qsZoIw6wEY=; b=dgCW0JZ87D1Azs/UXIHPQyIB3ql8lN8MVSfaBycvmqGABHHthoiNxFe9caxr+taZ3YVsRL t81X3/O2Ot+jNNAJ/v/zEz6GchU3ZL9fNF+InOH5pxO3eXFgdZZA45GR+GGa31ELUBKLJe wpWVYE3/YKcrJUHkxUAL/vXqx5/asLh6P4sWQ/w2RB8Ix8tCsmy6hEWM/EBSbrIplHtdgb HpsRaFGTi1xyKrdECtCjylJ85ztKt9Szg9hsag8wJq71KaoSOwIs3jcqO2/mKb2K5RoAY+ WZTbgp1YPDfkBwfLrUgyefXlkAQ1wH5H6IaTzT1JyTCgLzp6gZldNF7PT5gxbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752158568; 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=RjCSPTyagvwzP6Za8MmiS+FjnWYkqKDw+qsZoIw6wEY=; b=f2s1KMJP33WqtLIhJURndX1hcrhoZrzc3OQSuhz9eWk5i23glhK/GfzSRF2RGbMDNhJxak slBCravn/KeXOJNoZA1Nmytuh1T9RbuEQHN7lDIDxCCpCkYZcM3l7UW3UgCWBPvjSDl08Y oQZb1j9lX21kvmDmT61Lie2MfFu9ejQTAKBegjQqMydlZondD0SKUEE5/1Mu70EQWmn/Yy yFQDKSuLkSRntMpXBSs8k1blogeu3QnZtPI5vp5F8935qFS7wFjSYsSgsfxThiKzUuicPp lO45Y5gyqBo3sashhApWGb2F/aqtzBoGZU4WkAV5gD/M2JBUF6clC9TUttT/jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752158568; a=rsa-sha256; cv=none; b=VPvmMWXkU9CHsJb1L/9MVNyzeS/YGnT9vUW7iGaRq+uSRCnare8xPozAR/kyO3M3oOh/Pg vRLwauThnkNXQJwohavCib9DxMPPgGQfNN8zo7Rk9yMwyRnNMatIKy/Aw+Lzuh+fs8zLPA gXqTaKTbrsr2f5p4AfPb/IZHYWszjS74QPExZzqP2ShuPRPYiVm1Fgra0c70e6T1gpFKvm aJ6tBY4IS0s9IQciKTFvl8EwOu3Zdg8g2IQSpjY1DbH8F1MRaU9+kupbwrMb+FRS1fwouh hiWRaXMpEh+8MG/itzvNK73AcSXIyiEgoB8V0PI+O2e6OawF/iBcAqnJPDWxoQ== 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 4bdHd42dDBz19xJ; Thu, 10 Jul 2025 14:42:48 +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 56AEgmZE015079; Thu, 10 Jul 2025 14:42:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AEgmHP015076; Thu, 10 Jul 2025 14:42:48 GMT (envelope-from git) Date: Thu, 10 Jul 2025 14:42:48 GMT Message-Id: <202507101442.56AEgmHP015076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 18905fc31b31 - main - sysctl net.inet.tcp.ktcplist: try to handle EDEADLK 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18905fc31b31fd72a1a1918b26ebbf6c4f0fb5aa Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=18905fc31b31fd72a1a1918b26ebbf6c4f0fb5aa commit 18905fc31b31fd72a1a1918b26ebbf6c4f0fb5aa Author: Konstantin Belousov AuthorDate: 2025-07-03 17:59:30 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-10 14:42:27 +0000 sysctl net.inet.tcp.ktcplist: try to handle EDEADLK If EDEADLK is returned from the locked handler, restart it. Do it limited number of times. Catch signals between tries. Reviewed by: glebius, markj Sponsored by: Nvidia networking Differential revision: https://reviews.freebsd.org/D51143 --- sys/netinet/tcp_subr.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index f8811649fe19..45048fb3848d 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2869,21 +2869,28 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) zfree(buf, M_TEMP); return (error); - -again_reset: - req->oldidx = 0; - goto again; } static int tcp_ktlslist1(SYSCTL_HANDLER_ARGS, bool export_keys) { - int res; - - sx_xlock(&ktlslist_lock); - res = tcp_ktlslist_locked(oidp, arg1, arg2, req, export_keys); - sx_xunlock(&ktlslist_lock); - return (res); + int repeats, error; + + for (repeats = 0; repeats < 100; repeats++) { + if (sx_xlock_sig(&ktlslist_lock)) + return (EINTR); + error = tcp_ktlslist_locked(oidp, arg1, arg2, req, + export_keys); + sx_xunlock(&ktlslist_lock); + if (error != EDEADLK) + break; + if (sig_intr() != 0) { + error = EINTR; + break; + } + req->oldidx = 0; + } + return (error); } static int