From nobody Thu Feb 17 12:54:33 2022 X-Original-To: dev-commits-src-branches@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 9730219CA6F6; Thu, 17 Feb 2022 12:54:34 +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 4Jzvt15JPCz3Fg8; Thu, 17 Feb 2022 12:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645102473; 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=3EGWhFvyEqrh4QS1Ok3Ya/vDuxZEK4R8xBY+UmYE+58=; b=dGO1g1/6SiEIAC3bfcSOrPrHrPFImtGbsTgK89OZ0z3xef0wrIhrDjlwmKZD4uByYY+5Ci 2AxHhgQcBHISHcpPWVHKKGuXntvNWqT0NYsN/A+1hWaxyPzj6FoJuzqUrvGbwhl4KkQhl1 TKacdKvHnAULZ6K8zehVDpYsGshXwu02yneV+fC0pl34pjtihC+8CvHoa8MvneEk5bxmvZ ETufJGlKV65tVHWGWTOA4gR4hVIK+8hx2o4Kxf/4x3TZ1i/VXL4TKBYp2tJX/zRBu/Ef38 kCRE9GWr62ABx3Ot5ufugsz9fvKn9YHDvRfL/g81hebWQPS2+OhclhLQSjI6oA== 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 606281F62; Thu, 17 Feb 2022 12:54:33 +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 21HCsXB2080325; Thu, 17 Feb 2022 12:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HCsX9l080324; Thu, 17 Feb 2022 12:54:33 GMT (envelope-from git) Date: Thu, 17 Feb 2022 12:54:33 GMT Message-Id: <202202171254.21HCsX9l080324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: e19cb5cc3c2c - stable/13 - linux: recognize TCP_INFO and ratelimit the warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e19cb5cc3c2cdee4e4b5c6b75aff3da38d8e9b1e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645102473; 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=3EGWhFvyEqrh4QS1Ok3Ya/vDuxZEK4R8xBY+UmYE+58=; b=vhCjQ8Ky9d1wuGUTJw9N1G5hRCvwCLPWsSzHrFDyXioDxDWj0YNKI5OuNItnDWcEyRTQQz +ObXC9FhMPoBXMIBtLWlrFLPrMDnHIDeyak7KvQb50dxLq1qrgXAWLQD6G/Sys9JNHOO5C lA1StYxRrrRh3TTksry2+pF6mvTL+7fGYjQAAv33EeQWbtR/uygy1Yf92kI/JGQ1/Qk6H/ D0o/XD4MIJGgoL6mlPrbLdn68J1cLyPFFPHbAU1Vb1kLoZ/ktmTX8eqPljPOxJC6hv48YR 2+ZDhMypVRGFazVEGrPlI7Z+BvenXsb4hyxJDHZgrdBKUIYeARcrrmj8Jh82gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645102473; a=rsa-sha256; cv=none; b=iAu7cAxCVJDdc+OTYh+gPbMhzIT3d2VO9c3uXRmQINN/yjRbIQvr1dPxqYDYGVOj7DtxaB S/5XujSsQOFxLbzXJeAmB5Lt4oeTvP3DVYTkUW/cqBWJaTfd9lB0tXKYMjfAHyUpinQSm4 fgXtJhkN6vH2Egia4qSG7Xgl+35Uh/q6UltNwWC+sIUSzQ+YoquwWIGhyBMJBkat1jbOQd 70sDEmWFClM7tTyfp1S9O3wsyCfcbgsXaRJ06kBGv7ReD/12m1dfoELZ1+WRmEtWwhajn7 YJSfnk9LhkTTHFjch8IPVJayBBw98rm3VVeQBvJSG0p3ZIPZOyMD63ODjIPJ9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=e19cb5cc3c2cdee4e4b5c6b75aff3da38d8e9b1e commit e19cb5cc3c2cdee4e4b5c6b75aff3da38d8e9b1e Author: Edward Tomasz Napierala AuthorDate: 2021-10-17 12:19:05 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-13 22:24:59 +0000 linux: recognize TCP_INFO and ratelimit the warning This ratelimits the "unsupported getsockopt level 6 optname 11" warnings that happen all the time when watching Netflix. Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D32454 (cherry picked from commit 99f563ed76f49c541e587a2f81bc43c62c86c0e5) --- sys/compat/linux/linux_socket.c | 4 ++++ sys/compat/linux/linux_socket.h | 1 + 2 files changed, 5 insertions(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index a4c5bf0b581e..707426582bbc 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -574,6 +574,10 @@ linux_to_bsd_tcp_sockopt(int opt) return (TCP_KEEPINTVL); case LINUX_TCP_KEEPCNT: return (TCP_KEEPCNT); + case LINUX_TCP_INFO: + LINUX_RATELIMIT_MSG_OPT1( + "unsupported TCP socket option TCP_INFO (%d)", opt); + return (-2); case LINUX_TCP_MD5SIG: return (TCP_MD5SIG); } diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h index 32a19a348312..71fee5f9af68 100644 --- a/sys/compat/linux/linux_socket.h +++ b/sys/compat/linux/linux_socket.h @@ -313,6 +313,7 @@ int linux_accept(struct thread *td, struct linux_accept_args *args); #define LINUX_TCP_KEEPIDLE 4 #define LINUX_TCP_KEEPINTVL 5 #define LINUX_TCP_KEEPCNT 6 +#define LINUX_TCP_INFO 11 #define LINUX_TCP_MD5SIG 14 #endif /* _LINUX_SOCKET_H_ */