From nobody Fri Feb 24 12:21:18 2023 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 4PNTWy6blRz3tB7x; Fri, 24 Feb 2023 12:21:18 +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 4PNTWy64ZQz3xFV; Fri, 24 Feb 2023 12:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677241278; 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=k9K0FtcRn7cYGbLYCP8CEUzxSvqGoYty44z87/TnxXg=; b=ab6LoaAV5n9a+TAQxTTPMkdE9Sg4oyf5SjUtB7jtNrMN69kovoZUNspZV7YUhUvboGxSqk B0/dcJrVlicyahM3HrgY2n3WbBAGxOlFCqcM7Mx/3i9kWqCaLh56PHq22yKiH4tkpZFLPl 6+iUHUSoUtvsrK5qYEtShwMnlNkHHjVP7DkEjrd6Rt44+uWxdgyWAvv4VGaJApQSFuy+Fj AjdSe8IrBSSzbIKJuCgzah2xWTf263CF+fgNcrk5OKQ7OHvmDd7Shy3S+syyEZsPW75+xo U4A2WnlgmNaC8FXTGbQcpJ9RJ/N8rIYXJe/ZMUdYwOKF/tfQFHec1BmmXK2n3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677241278; 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=k9K0FtcRn7cYGbLYCP8CEUzxSvqGoYty44z87/TnxXg=; b=PxeJaf9WNGIcL38p2U3V/PxeWbcVdG5bdBTqE9R+QmJ5NeJ23rxFjR7wYWkPs4q0/wWnu5 UjjwsfN6iCGWGwHQudiL9U2PyYiBHm902APTsaT+VZxIVJHtd8U12evdKlKra+YSL0ygQW 4J2j5WYVxzvnW3rTjgY20iVqwTvWpCaIAXvXq3SVoiYc4u2IIz+DOcNPV/GKfRvcDkgd3S Iey5jU2/ZI680bul32qdYEgZXbl1nQhCAOXmXGkEMbcXfZamrZge+GxFwKINHXOjSKTWuJ z2L7UK7eY1Tyn8eC5VgLf+lYxUlluErSOFj0epiSvNvVa3XCiXjOxy3WOz+PxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677241278; a=rsa-sha256; cv=none; b=jgqgzVtTI9atPBhu3ZelkrkdI+8Pw/qA3JP2xi1CpzKfe0BV/KHCRV8gF93oPI/UasbaBl Tst1WpyiIb0q9KECri6ySlmAK8x88jgyk+eM28LTBCjiAcO8deOMTFjfjtYe66JiVBUsun QdCWxdWInUEF3+BtkolfKLFoJIdVFVz/RDWspqeHwaNJGG5LquFdXHzO91BqLoXQkHtDx+ QJgOGAcOLN501Dx51/yjzuzN31j/AopYDzvlS8Jm9OA9eVnPwN3EVgWvaTDpgFhwS2ftNX /VotH3ctywAZRv1EP9sPVTrcqAbl3rwXXDWTJzxXcw1FbYN4DdtILFgO36OIZg== 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 4PNTWy57qlzNW9; Fri, 24 Feb 2023 12:21:18 +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 31OCLIeA059325; Fri, 24 Feb 2023 12:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31OCLIqO059324; Fri, 24 Feb 2023 12:21:18 GMT (envelope-from git) Date: Fri, 24 Feb 2023 12:21:18 GMT Message-Id: <202302241221.31OCLIqO059324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 44a6088278ea - stable/13 - kern/sysv_ipc.c: use ANSI C function definition 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 44a6088278ea3ae6e98b04d9863d7fdf033f26a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=44a6088278ea3ae6e98b04d9863d7fdf033f26a3 commit 44a6088278ea3ae6e98b04d9863d7fdf033f26a3 Author: Konstantin Belousov AuthorDate: 2023-02-21 14:00:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-24 12:20:50 +0000 kern/sysv_ipc.c: use ANSI C function definition (cherry picked from commit 836e4b371b6eacc8a7e14cdf30fbced59c343455) --- sys/kern/sysv_ipc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index 884ea9a7111f..46ec6b159ea5 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -56,23 +56,18 @@ void (*shmexit_hook)(struct vmspace *) = NULL; /* called from kern_fork.c */ void -shmfork(p1, p2) - struct proc *p1, *p2; +shmfork(struct proc *p1, struct proc *p2) { - if (shmfork_hook != NULL) shmfork_hook(p1, p2); - return; } /* called from kern_exit.c */ void shmexit(struct vmspace *vm) { - if (shmexit_hook != NULL) shmexit_hook(vm); - return; } #endif From nobody Sun Feb 26 01:54:58 2023 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 4PPRXL2gk3z3v89X; Sun, 26 Feb 2023 01:54:58 +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 4PPRXL26vsz3Ljb; Sun, 26 Feb 2023 01:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677376498; 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=IAtRYq2lrqn0g8Yo3gjiGJ9az74LmLQIu1FlLj51evE=; b=EO5FTG3Ih60rt7jI/I3sWFm9bleQaRtHuiyOUbZ0ovfsYPFrfPIHA8LTUSH8hI0CCuNVR/ szwNSdNamK83nyIGPPVloUhs27MgP57PiEhEmp2zQ0fW+TosOxMGw8yl92zL6YE6HQYFHU RTr2fYfCDVldo9lLCOi/22DTKqSxhqHsgidLjwQgoCs7TlBO7K8+OFl4y7vN/YueayttJa OSCTJorKciD8DkKBP2umDa9iRxoy9m7cLHXlDzgVGX7X0kdf8Trt3Vj9ZTSA7nI5A1rDS1 HDVgDaA0TWd6FPdgc2Pfo4CHZt1zu3D85GJvQzBbMxVXIM/H4tkhoQJVidxSUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677376498; 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=IAtRYq2lrqn0g8Yo3gjiGJ9az74LmLQIu1FlLj51evE=; b=LDkp6uYRWtlmzw0qRPQDxj4SbULlJdsQjaWikCw6wzTNBMzdbtdJ/L2hengtlcunGA0Q6u W7vxj528NlBqOOETrZK5d7sOV0+x1m4olemE/3kEK4yS7u0Ecvf8hScsdkjGkDoBaMz3T4 4l66bLqNbDZmFUhVGIQV4wuU7DciCOcqLi9xLi6XtZ9idSIqI2T92NsH3doW7Bkf1J5UgD quosDoDOdi+8bBsvjt3piGSumF2ZzmPHSS26j889D5WSqYIGEIiTJ9NsDW/xMmOyiYqg7K 8Tc1W/LeJv3yk2xWAoraGBJo4VvIr1yYM0GdiFL9C+zVnV4qODNDqXaWab4qmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677376498; a=rsa-sha256; cv=none; b=W3R8MLzk+oAXw6OyAM4E3H2mtYjHcXa1krz1U6T/aHqU+4lnJN8WxnSemoWCcYI/ieQQG0 anbxUfHIHpyqjr8jfmi3lHGEtVfNTL5ze6XAFVx4XCzDhcPfSjeHbPGL6lqzpTeA/djewq XUPpiiCZdFtptyv/mJg9SkzH6r4df+9nTAVRTI1B/cCbh+CpKm8LIQc9d3K6KvSoW2DgZ5 GMCsf1h/m1fT/+6o9XXFORA8ToQByghwwawB1sK/G0PzhHZkU5uaecPbu5qMdUbfMrRTW8 B71/+419IdBvpnHnzCfj2eLzhZ6NLSVCziQnxqmr9kmHCF1HEzedb80JP8enKA== 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 4PPRXL18fFzRnV; Sun, 26 Feb 2023 01:54:58 +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 31Q1swhO061282; Sun, 26 Feb 2023 01:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q1swff061281; Sun, 26 Feb 2023 01:54:58 GMT (envelope-from git) Date: Sun, 26 Feb 2023 01:54:58 GMT Message-Id: <202302260154.31Q1swff061281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 994eb2fb8a90 - stable/13 - ctfdump: Use getprogname() 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 994eb2fb8a901c883f2bd24fa29c6cd513cb4340 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=994eb2fb8a901c883f2bd24fa29c6cd513cb4340 commit 994eb2fb8a901c883f2bd24fa29c6cd513cb4340 Author: Zhenlei Huang AuthorDate: 2023-02-23 16:28:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-26 01:53:15 +0000 ctfdump: Use getprogname() Also remove no longer used function `getpname()`. Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D38740 (cherry picked from commit 3dd5524264095ed8612c28908e13f80668eff2f9) --- cddl/contrib/opensolaris/tools/ctf/common/utils.c | 24 ----------------------- cddl/contrib/opensolaris/tools/ctf/dump/dump.c | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.c b/cddl/contrib/opensolaris/tools/ctf/common/utils.c index f74eb8de40fa..fda29486d94b 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.c +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.c @@ -35,30 +35,6 @@ /*LINTLIBRARY*/ -static const char *pname; - -#pragma init(getpname) -const char * -getpname(void) -{ - const char *p, *q; - - if (pname != NULL) - return (pname); - - if ((p = getexecname()) != NULL) - q = strrchr(p, '/'); - else - q = NULL; - - if (q == NULL) - pname = p; - else - pname = q + 1; - - return (pname); -} - void vdie(const char *format, va_list alist) { diff --git a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c index 06c00a7b0e7f..5cbf46af1b73 100644 --- a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c +++ b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c @@ -856,7 +856,7 @@ print_stats(void) static int print_usage(FILE *fp, int verbose) { - (void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getpname()); + (void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getprogname()); if (verbose) { (void) fprintf(fp, From nobody Sun Feb 26 01:59:38 2023 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 4PPRdk2MN1z3v7ws; Sun, 26 Feb 2023 01:59:38 +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 4PPRdk1rNzz3MQt; Sun, 26 Feb 2023 01:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677376778; 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=OwSbY+n+KwkXL69FPwugFMmJD4Wf186XpXKtkiMUIPs=; b=xGAHk3UaF/1Mfm/5lVv4UGOA+X3FvsE8zteZLU6xw4dA3RTRqsR0dcbAPRFK8kPyrqz3Wp NSmzG6STVRgBFuD3sOYfQrnCfupxQZnRm+jDldLGgk077MiJF0yfCySxOQH6Cxh32RV7Hf VTsQOV6wPV0xo3sfSYhNMr5tQlbG9IekBJiL78Msdjh8hgw7IWsqJUbmiXOrOSHWc8nrUw zDZBm/60FAGxCBrlWr5Pxoo/28Vfz/NshB8feeghrSeM1812IjFNFIKEKl1f0am/HbvN6w veAPpB/V+8NRJdexupOWiY4GdeTeYPjL1Hp5qEyjTwcaiTVZNc3SUaR06Kosbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677376778; 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=OwSbY+n+KwkXL69FPwugFMmJD4Wf186XpXKtkiMUIPs=; b=JMKCJWPk7gYcmJzVTY+HwJQeSNK3HDTaF3gs3ydr1sRu7l40EpSA6RGUErm81NqdCyaq6G J+PvRh9QhhrpXFKSSjZjnenfVfyPKqaQ8kWiENlDw1YjCzfYTjdzVNk99dpOUiC23OAkvX 8JG2dYpdJMLgzc+ksdf1uQBBPs+vGW7kdBTm4eLdAoWWRM0EUF3xXg02FNsviwgDP7a671 v8IXGo0dOqwZ5qqlcYEWIGjf8FAhin2OOA4WNzMZd6uHB/ZvEjacK8M5Km2gorXjaCL/cQ M1vZSXt/kcyaRVWRuwEMV5eUOzhZ4CCRc/0MTB/yrcRsYw3dIZCLuS2Z5tX8iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677376778; a=rsa-sha256; cv=none; b=MsYr6xVntIB10tvPGBnlFCOQfJk0cLR9g/bdqcJcSH+HLA3Rwur1VwoXUK23PH81Tve5tq ECzVMoLlSYrvzrEdpmc6Qt8zBDcnpLfQWr7uKK7siKJmJ8DryOXl/fulluwHrZaL7UV3c6 rumaL43CT5+wCckRDtpCZQnttqyDpKeMgCY7wna10WRqBG1MXShKtgl37/oDbcFPlemQLc FRb7pKp86ayP+daGfLww2oA+lquvsa1T23RF+EYNfDEQp4RqxNx8ERm8P/SoGUa930ohgD iHs6GnGa0cFnU/ZmKdexcVzr+QKmuIM885DvAR/sItYh3ZDRzib5fFoT2YF/JA== 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 4PPRdk0pNZzRxX; Sun, 26 Feb 2023 01:59:38 +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 31Q1xcUX061993; Sun, 26 Feb 2023 01:59:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q1xc4v061992; Sun, 26 Feb 2023 01:59:38 GMT (envelope-from git) Date: Sun, 26 Feb 2023 01:59:38 GMT Message-Id: <202302260159.31Q1xc4v061992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 96200385228e - stable/12 - ctfdump: Use getprogname() 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 96200385228ea9c749e455dae50cca1d42818325 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=96200385228ea9c749e455dae50cca1d42818325 commit 96200385228ea9c749e455dae50cca1d42818325 Author: Zhenlei Huang AuthorDate: 2023-02-23 16:28:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-26 01:55:23 +0000 ctfdump: Use getprogname() Also remove no longer used function `getpname()`. Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D38740 (cherry picked from commit 3dd5524264095ed8612c28908e13f80668eff2f9) (cherry picked from commit 994eb2fb8a901c883f2bd24fa29c6cd513cb4340) --- cddl/contrib/opensolaris/tools/ctf/common/utils.c | 24 ----------------------- cddl/contrib/opensolaris/tools/ctf/dump/dump.c | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.c b/cddl/contrib/opensolaris/tools/ctf/common/utils.c index b9db1a870165..38509ec36343 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.c +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.c @@ -36,30 +36,6 @@ /*LINTLIBRARY*/ -static const char *pname; - -#pragma init(getpname) -const char * -getpname(void) -{ - const char *p, *q; - - if (pname != NULL) - return (pname); - - if ((p = getexecname()) != NULL) - q = strrchr(p, '/'); - else - q = NULL; - - if (q == NULL) - pname = p; - else - pname = q + 1; - - return (pname); -} - void vwarn(const char *format, va_list alist) { diff --git a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c index 740485ddff03..f3e8120192da 100644 --- a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c +++ b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c @@ -767,7 +767,7 @@ print_stats(void) static int print_usage(FILE *fp, int verbose) { - (void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getpname()); + (void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getprogname()); if (verbose) { (void) fprintf(fp, From nobody Sun Feb 26 05:30:54 2023 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 4PPXKV2WQZz3rtPt; Sun, 26 Feb 2023 05:30:54 +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 4PPXKV1zqsz40bS; Sun, 26 Feb 2023 05:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677389454; 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=/3K0yk/9mksjWJN61wavFavftRBADvJ0cNwcN5MLaBw=; b=UkJa7UBXqlmLtxz3qTv39UESC9/UUzRTWfvjpd8eM7HbWO39WQ+Xu7anu00Oi9tRm7J62+ MN+X6BnzCgaZZjEtrGhRaI16kcppkumWYWUx7sQNznbNhEBv1sx05PAKb/ztF65Jl7pRB1 ZipEf3jqkiRFKa2lX2lXyVY63qtjPXoCCTxW87L5MfNfX5JbpSlWxrScpS7I1B3IkwMCPk d0FZWsyV8GyPzmsFdNmMYLTfBoS4DxFS0p6Es1MArS9N9D28IFsNyhJC3+WxQQibaOVnjA wRrmRiAFRaaBERp8og/F9jv6082NXpzUtnoH0RFVmIYuwUr7ofyv9Ugq6HvNRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677389454; 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=/3K0yk/9mksjWJN61wavFavftRBADvJ0cNwcN5MLaBw=; b=QQnETz/cZf5JRJH3iKnnfRRxdig4w4M1l+czbWIVQRjPnRJdieoAiCVrxmTTvdpO7Wfqqb T2Bf6ekpvAj7i7s4TQgq64VzV15K3g6WQpN44j8I6HuPbFAnOta6TcOJSJOGofpcg95WqH 24bgo0l+lQAjqi4PWgenp7aH92F6lkwpsaW/WpbDkOI74xdwFwTddURcobeN3h6EhmNyRl kbn5REz+zBEeF5Eu+L7GfkFcaazIvwbrvxJHeyER09qNFK2x0F3b6vR9RcicVyqoAKLFG/ HxstPLok7plXkye6KiAxMXyWLdk3d9/yfngZBKGVVFL9rHKwd7HdiYBkbFtfRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677389454; a=rsa-sha256; cv=none; b=lwVLKpKLem1E6n1Hemp6XpJmRql3+Dpq2TzzLwB87FWYgNIyyWJpFU2KKJX9vAglElNQ9M 26b0oKE62VBJNPeKK766PkVY+Mzn3sRgVzB00e6u5MucD6EbOFTGEhcZTD+znGMpJaPGJ0 DoLqe+Mk67ulBnCwI/RExKklKmR07nkD+PDfWRRPZ6ToX5UiUvNuOdiGWUp2Ucu9bVthHD CrJr/UjpyQRMAexavG8KnLYfMrv0ZHqA5QHYvfNuN9+ITcIitBltmElNtaa3aYzx9hlPPA uiVdgBZX/WeOmEmZDc7N14A7wEX6xDFFf+V1Er3YiRS9VeFutmCBK0vexajzAA== 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 4PPXKV13XVzY6Z; Sun, 26 Feb 2023 05:30:54 +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 31Q5Us1B016663; Sun, 26 Feb 2023 05:30:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q5UslK016662; Sun, 26 Feb 2023 05:30:54 GMT (envelope-from git) Date: Sun, 26 Feb 2023 05:30:54 GMT Message-Id: <202302260530.31Q5UslK016662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: fcacb96b345a - stable/12 - ctfdump: Remove definitions of warn() and vwarn() 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: fcacb96b345a16c4619686ab388e6b77fb715828 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fcacb96b345a16c4619686ab388e6b77fb715828 commit fcacb96b345a16c4619686ab388e6b77fb715828 Author: Mark Johnston AuthorDate: 2022-04-21 14:49:22 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-26 05:26:17 +0000 ctfdump: Remove definitions of warn() and vwarn() The presence of the latter causes a link error when building a statically linked ctfdump(1) because libc defines the same symbol. libc's warn() is defined as a weak symbol and so does not cause the same problem, but let's just use libc's version. Reported by: stephane rochoy Sponsored by: The FreeBSD Foundation (cherry picked from commit 45dd2eaac379e5576f745380260470204c49beac) (cherry picked from commit 5def1805d144f3e95dac966d72a6fc3878ce6b98) --- cddl/contrib/opensolaris/tools/ctf/common/utils.c | 28 +---------------------- cddl/contrib/opensolaris/tools/ctf/common/utils.h | 2 -- cddl/contrib/opensolaris/tools/ctf/dump/dump.c | 3 +-- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.c b/cddl/contrib/opensolaris/tools/ctf/common/utils.c index 38509ec36343..fda29486d94b 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.c +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.c @@ -24,8 +24,7 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - +#include #include #include #include @@ -36,31 +35,6 @@ /*LINTLIBRARY*/ -void -vwarn(const char *format, va_list alist) -{ - int err = errno; - - if (pname != NULL) - (void) fprintf(stderr, "%s: ", pname); - - (void) vfprintf(stderr, format, alist); - - if (strchr(format, '\n') == NULL) - (void) fprintf(stderr, ": %s\n", strerror(err)); -} - -/*PRINTFLIKE1*/ -void -warn(const char *format, ...) -{ - va_list alist; - - va_start(alist, format); - vwarn(format, alist); - va_end(alist); -} - void vdie(const char *format, va_list alist) { diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.h b/cddl/contrib/opensolaris/tools/ctf/common/utils.h index 9b07361a53ab..99378bb4f251 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.h +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.h @@ -39,8 +39,6 @@ extern "C" { #define E_ERROR 1 /* Exit status for error */ #define E_USAGE 2 /* Exit status for usage error */ -extern void vwarn(const char *, va_list); -extern void warn(const char *, ...); extern void vdie(const char *, va_list); extern void die(const char *, ...); diff --git a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c index f3e8120192da..a4a954d97453 100644 --- a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c +++ b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c @@ -24,13 +24,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include #include +#include #include #include #include From nobody Sun Feb 26 06:45:37 2023 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 4PPYzr5ySMz3ryYn; Sun, 26 Feb 2023 06:45:44 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PPYzr4B85z46YX; Sun, 26 Feb 2023 06:45:44 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677393944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CGgMVzeSCFkE+UpKtYXlI2ETLDzOrKAspiF7PwThX6U=; b=NLtj4ez4Rcww2qi/U1PQKEWdKBzWTLSUY89eGkAeR/KhNByhvZKui8WMOh6EcwNwVwK08Q +xn1SfM1zh9sNhyUzDxwA/RJMprQYX0R7nY9JOS0kjy3S2QaR/mMTxuyrW8Oxc93b7zAoP uCCFVB7C5CACSGZ1Jjk77ayfpGBl4M1Cg56GFvEeu7u4/T5SSCmTgWvP9tON8Y5Zmylqya B05r/Z9t+tZbNZ7qGrQ+bx3VkyK7dvU1cKFCj4UWDy9raG+62Ce/fC5Pt5ypBiCVDHxp53 1PpURGn9YmBhbFnCcl4EK6IzD+aNIgMfrAt9T4ZWhavbHPe4UVwTLiwfeDhD2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677393944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CGgMVzeSCFkE+UpKtYXlI2ETLDzOrKAspiF7PwThX6U=; b=dq9uX6gXDUF4xPJWujivwmUChnQKadUIIN1gY9jB1/VD3QAt6roR5u3ACjhVj6IpAyFArc 1cwqXUTt6smZiZTocc1lbASG9eWI6ZFBDV57LMDAC+Stqyg47KY8JvGwKAEOWvLZMWc7Tc n4gzhgItSM8oWnIzxnjJ9JclZc1YXFDnJcBxtRM5AbihEbjyUrIClQmwPUNKJQSMu0bCjx L/htZV4vJoMRAa7VEoCEJ6mZU/p8iXOB9P9rGpceP2c5IcDa4TIndVJuD3a8/1xFMF7+b+ 9w2/9H31IVqo9oz6NuHVAsq/Bwbqlq1GrUDm3xEHEQkutEMO/1MnEs5FhQWQdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677393944; a=rsa-sha256; cv=none; b=kLNIi3cqtBtpzBcd7EGnCMvRS52N1KLcMVFrIl9jmiZVJbzFSHgjp6KUWR5JjYR20qsFli 5Jc0Tp76VaNgv5vtbjSJe9fbGnsmfMigEliFFeumH1pmEF5h5pTDGtXytSWzGKVhk+y4tT RmoD+jUH6ALbevN1VLpW7DvNuV4Kh9ueEI8EKc8w+sDZzbPTQHQ/jKezKUp8z+8jNqKxpY uY5SEFgUY8ZaObix33brsBfUHf8jHT+GOjmATdFSxNkftaJS1D4QLsw3v5+o6ZdTMjzsr+ jN2DjYnliF+yi6TQNfw2TwRKCex+6P5PWhVuRrteq7Cwh91M+bjqXeQswZ+fQw== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PPYzp6MxBzTTc; Sun, 26 Feb 2023 06:45:42 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <2AFA7DFF-388C-4C6C-8CF3-9B9FAC95BF14@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_43556049-0686-4CE7-9184-53C249EA0B2C" 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 (Mac OS X Mail 16.0 \(3696.120.41.1.2\)) Subject: Re: git: 26ba9518ffec - stable/13 - unbound: Vendor import 1.17.1 Date: Sun, 26 Feb 2023 14:45:37 +0800 In-Reply-To: <202302141833.31EIXkwO001829@gitrepo.freebsd.org> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" To: Cy Schubert References: <202302141833.31EIXkwO001829@gitrepo.freebsd.org> X-Mailer: Apple Mail (2.3696.120.41.1.2) X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_43556049-0686-4CE7-9184-53C249EA0B2C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Hi, Will this been merged into releng/13.2 ? RC1 is coming, as per the release schedule = https://www.freebsd.org/releases/13.2R/schedule/ = . Best regards, Zhenlei > On Feb 15, 2023, at 2:33 AM, Cy Schubert wrote: >=20 > The branch stable/13 has been updated by cy: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D26ba9518ffeccd0b64d2f610e7319891= 93844814 >=20 > commit 26ba9518ffeccd0b64d2f610e731989193844814 > Author: Cy Schubert > AuthorDate: 2023-01-15 05:39:31 +0000 > Commit: Cy Schubert > CommitDate: 2023-02-14 18:32:39 +0000 >=20 > unbound: Vendor import 1.17.1 >=20 > Release notes at > = https://www.nlnetlabs.nl/news/2023/Jan/12/unbound-1.17.1-released/. >=20 > Merge commit '7699e1386a16236002b26107ffd2dcbde375e197' into main >=20 > (cherry picked from commit = 1838dec31895fd4752fa8631322ab93be0705a66) > --- >=20 > *** LINES SKIPPED *** --Apple-Mail=_43556049-0686-4CE7-9184-53C249EA0B2C Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii Hi,

Will = this been merged into releng/13.2 ?

RC1 is coming, as per = the release schedule https://www.freebsd.org/releases/13.2R/schedule/ .

Best = regards,
Zhenlei

On Feb 15, 2023, at 2:33 AM, Cy Schubert = <cy@freebsd.org> = wrote:

The branch stable/13 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D26ba9518ffeccd0b64d2f= 610e731989193844814

commit = 26ba9518ffeccd0b64d2f610e731989193844814
Author: =     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-01-15 = 05:39:31 +0000
Commit:     Cy Schubert = <cy@FreeBSD.org>CommitDate: 2023-02-14 18:32:39 +0000

   unbound: Vendor import 1.17.1

   Release notes at
       https://www.nlnetlabs.nl/news/2023/Jan/12/unbound-1.17.1-releas= ed/.

   Merge commit = '7699e1386a16236002b26107ffd2dcbde375e197' into main

   (cherry picked from commit = 1838dec31895fd4752fa8631322ab93be0705a66)
---

*** LINES SKIPPED ***



= --Apple-Mail=_43556049-0686-4CE7-9184-53C249EA0B2C-- From nobody Sun Feb 26 08:11:22 2023 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 4PPbtf2pV1z3s3nj; Sun, 26 Feb 2023 08:11:22 +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 4PPbtf2GFrz4FF9; Sun, 26 Feb 2023 08:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399082; 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=a4TNEI1HXw7n3ESMDpymOABV4+lFrn8SvPcJHLzYnG4=; b=bzmD2vsnKfOzhsX3Uf8JinbmZ0VBduHhdJx3dKWC/dgztzsULt5x+8E0EKZQlaoCYHFY64 DeLBcA91IDnWmwFxAEBA/H2r7j6Ky4orwtTESsVkpzOKTFoQmob0NBgj1Q8fzg+HPADQsY p7+ku8H34pd5FmV1pjdmwd9+ZjmhPblVtb3mtCzovgke7dtBwAMyZEdWOQlK85XVlkgtcW L7OaG+XGx2/H0zAvGScoGxu2fQzThdFO5IMpjL5QCTAU69+8vgt/pzqp4tXZF0ZGBjVUVu n+4RFam60Ji+x6ymrgW6FCemOb0oIOPQFhM5Ksagt3XobqXybE1PTmLYJ4qWOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399082; 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=a4TNEI1HXw7n3ESMDpymOABV4+lFrn8SvPcJHLzYnG4=; b=RB2/9jbqpp2PV0Ty4MM7t5oIa2OJT9m1WCZ+sle38sNH4XDVeSdjiC3JXsEFOg0P+6gp6v rpwD0D9TYEEfJ388sx0j3N+ZOWtKuzA4Vx2BkdSBavr+CIqoS7UiBK+SrBowqrG9BXxAVO ze2Raez2ey8j4vRYyronCidpm1oIc1sVXJGv3n69tjFBblbcUvt9TUs8AHFR+mnVuL4/bn rMrYYIUl5EzT7hv5TVgzhCHbUd4Xt8zgMTADNznWR+YAG25sI5jNp9UFAl4xPT5NIRSML6 MlZJKnfHyGyiYnLygNIAl8pelB5YT6BZF4TZYXZaE23Mxb5gVpCZ6ZyizXpwjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677399082; a=rsa-sha256; cv=none; b=ic0HiP8Ycvyn8+7qx2e0PSZi/0DZQNmlG+sG7PWKOcC1wdfbNBNSaCsqVLw4V+nmr5tKot XMRT84lvlmbgJYbhRfk8kfJnkQXxOd82cycV+yhg8iLG3/R38H2FmmWi/dYY9lonhe1m3T sPzn6jfHZRT5guPGDAdAQro2WwQyjBfdla7iQo28CDnjkzgrZlE1Qmbe+FT69Mn9BIqVmR 4aUDbQ+0S5xGRDfVyQCUzQf8A2nfH+qj0K90AKRRnABHP6MgENx2Y8oVahxXiXpRFzKwb+ NJ1bEkoUu3fjv6nHoirqFjSukxGu8sv+dy5mTvMoHTsO838Y3XFHZxvqccGzwA== 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 4PPbtf1K6nzd38; Sun, 26 Feb 2023 08:11:22 +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 31Q8BMsj081445; Sun, 26 Feb 2023 08:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q8BMbW081444; Sun, 26 Feb 2023 08:11:22 GMT (envelope-from git) Date: Sun, 26 Feb 2023 08:11:22 GMT Message-Id: <202302260811.31Q8BMbW081444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: cb182d5f52c1 - stable/13 - modules: Add missing opt_*.h files for stand-alone compile 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb182d5f52c163e4b3e5fda6633432224d4a6176 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=cb182d5f52c163e4b3e5fda6633432224d4a6176 commit cb182d5f52c163e4b3e5fda6633432224d4a6176 Author: Warner Losh AuthorDate: 2022-10-29 14:49:20 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-26 08:10:43 +0000 modules: Add missing opt_*.h files for stand-alone compile Standalone compile that we at least create these opt_*.h files. Sponsored by: Netflix (cherry picked from commit 010175a76d0676ff8d9b8d54276aff093abbc3f2) --- sys/modules/linux/Makefile | 1 + sys/modules/linux64/Makefile | 1 + sys/modules/linux_common/Makefile | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index fad03e8a8ca0..dd6536f1c174 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -36,6 +36,7 @@ SRCS= linux${SFX}_dummy_machdep.c \ linux_vdso.c \ opt_compat.h \ opt_inet6.h \ + opt_ktrace.h \ opt_posix.h \ opt_usb.h \ bus_if.h \ diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index ef6644c3deb7..0857f4e7126f 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -30,6 +30,7 @@ SRCS= linux_dummy_machdep.c \ linux_vdso.c \ linux_timer.c \ opt_compat.h \ + opt_ktrace.h \ opt_inet6.h \ opt_posix.h \ opt_usb.h \ diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 204cfe5059e5..7ebb56ba6473 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -8,7 +8,7 @@ KMOD= linux_common SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ linux_dummy.c linux_errno.c linux_netlink.c \ - linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h + linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_x86.c linux_vdso_selector_x86.c From nobody Sun Feb 26 08:11:23 2023 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 4PPbtg3rFNz3s3RN; Sun, 26 Feb 2023 08:11:23 +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 4PPbtg37Plz4FSv; Sun, 26 Feb 2023 08:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399083; 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=fZmvQg371csc/OZxcrUqcN0pxLFL590MQWOq7GbtfVM=; b=If3azkuT3RELETT74YbKcQXFMCHp/8m8mULq0bO+3AxBGJ0ui/eePdFUWeJ0jY7BpZMTM5 Kh4mHNO6+qrproXfb9fT0GmlrMpfbp+fGFDe7CZHdQklnsyY1DjZVt+hJtxzP438lfHLhb eRW3X4IsBMZE/CDJUHNWddJbVKi5vAxSAm2sm7+iFGwn+RQ0n/QKtorO21t1LEE+dJ/qkF iZOZPpg4kGYYJ6udV3pXZZzoOuts8tMoZx7j5X5/4Ud+1I0K4jGYcDn+WrEKa5QJhjC9SW 6K/yNjd6p4DIpuoCkwWMwsMa+N3IoPQ6ekLTutoKzVW6psxqI6I1V3SzYhcHtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399083; 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=fZmvQg371csc/OZxcrUqcN0pxLFL590MQWOq7GbtfVM=; b=s6nf5Pkc++k/0zjhCDPn4/i7U+nEHFSA3Oh+Gh1Pq+n4xXjT3hnK6WADz6GfEz50Ez3Wkp vwhBhgNxyIDym7Xik6UfOGzBSLf6EH4ze0MVo7Xfd9dNx01KGDGWWFS/tq79UEfx1X/uYp DpwOepu06RgGdFgYzEWxKSUuVwEpXQalrIAnsR6WyNINh6bpGS1orCGZwjYkjv9fXd0TPs hkJIx+gINHrXOSQPaglpdr2ErrPDNl/z16i+jaiNfcJehJOcyTgz1Mc26220xg/f2C4Chj ALz80LmXblMBKFalJ6Gc01UAjtxFVS/zqGIpu5TYjl4KN6M1HtU77aIen7+fQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677399083; a=rsa-sha256; cv=none; b=HpEXfugoV02O4lRXcdvNJIvdxjCVJWCPbPiDB4eAyOqJ+L0RJ5yIF8aUJnVp6zd8YQpt9k h6GSrsCfAvZHkCkNYE5t0nc022fVKQgQGwvRYF6mgSn8JD6U7tLjxGWTOU3V7w6Df8BOef sY3UWHchp9pS52mBywLhPob2s6SvO+INP6R86mXDpUb6XFDwIJ7ITfNuemrgSachUAFytr /nP35llxAkZwGNAxViLxGJELplhzF5SQtO+L3ijx2duZogrrebeM649donK6E1pEOuKpH6 sLlHDc8DsFRsDfI7/Sgk93GfRR8J2+B2no3mMPupC2LgbdopjNihc52/n+AEaw== 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 4PPbtg26vmzdl8; Sun, 26 Feb 2023 08:11:23 +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 31Q8BNp0081472; Sun, 26 Feb 2023 08:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q8BNO0081471; Sun, 26 Feb 2023 08:11:23 GMT (envelope-from git) Date: Sun, 26 Feb 2023 08:11:23 GMT Message-Id: <202302260811.31Q8BNO0081471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 69834d6c3196 - stable/13 - linux(4): Get rid of the opt_compat.h include. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 69834d6c319681cc6719d8b07a1fa9797edaedae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=69834d6c319681cc6719d8b07a1fa9797edaedae commit 69834d6c319681cc6719d8b07a1fa9797edaedae Author: Dmitry Chagin AuthorDate: 2023-02-12 17:24:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-26 08:10:44 +0000 linux(4): Get rid of the opt_compat.h include. Since e013e369 COMPAT_LINUX, COMPAT_LINUX32 build options are removed, so include of opt_compat.h is no more needed. MFC after: 2 weeks (cherry picked from commit 10d16789a383a5b9e007dfd4c2e7844e044eaf7d) --- sys/amd64/linux32/linux32_machdep.c | 2 -- sys/amd64/linux32/linux32_sysvec.c | 2 -- sys/arm64/linux/linux_dummy_machdep.c | 2 -- sys/compat/linux/linux_event.c | 2 -- sys/compat/linux/linux_file.c | 2 -- sys/compat/linux/linux_fork.c | 2 -- sys/compat/linux/linux_futex.c | 2 -- sys/compat/linux/linux_getcwd.c | 2 -- sys/compat/linux/linux_ioctl.c | 2 -- sys/compat/linux/linux_ipc.c | 2 -- sys/compat/linux/linux_misc.c | 2 -- sys/compat/linux/linux_signal.c | 2 -- sys/compat/linux/linux_socket.c | 2 -- sys/compat/linux/linux_stats.c | 2 -- sys/compat/linux/linux_sysctl.c | 2 -- sys/compat/linux/linux_time.c | 2 -- sys/compat/linux/linux_timer.c | 2 -- sys/compat/linux/linux_uid16.c | 2 -- sys/compat/linux/linux_vdso.c | 2 -- sys/i386/linux/linux_copyout.c | 2 -- sys/modules/linux/Makefile | 1 - sys/modules/linux64/Makefile | 1 - sys/x86/linux/linux_dummy_x86.c | 2 -- 23 files changed, 44 deletions(-) diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index 9746c4bd7cdf..5599cbff2525 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -33,8 +33,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index c2b54369552f..8afa0f848e62 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -32,8 +32,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_compat.h" - #include __FBSDID("$FreeBSD$"); diff --git a/sys/arm64/linux/linux_dummy_machdep.c b/sys/arm64/linux/linux_dummy_machdep.c index 22ad39a84eeb..40cab9baad10 100644 --- a/sys/arm64/linux/linux_dummy_machdep.c +++ b/sys/arm64/linux/linux_dummy_machdep.c @@ -28,8 +28,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index f720c471a27b..b6c90970a6dc 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 3b712cf71e60..29a0afaeedda 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c index 2839e865e95f..7ea0f8c4225a 100644 --- a/sys/compat/linux/linux_fork.c +++ b/sys/compat/linux/linux_fork.c @@ -31,8 +31,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index d16e047f831c..7d75889d2dce 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 4917641be5e5..304a72d06588 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -38,8 +38,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index cd89c16cad64..29edea547725 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include "opt_compat.h" - #include __FBSDID("$FreeBSD$"); diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 134e353122c1..5f0c22b49e58 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #include diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index b6e23cafdf9f..0e429e0a29ca 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -32,8 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 09bcbcef4427..26da86eba9f7 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$"); #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #include diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index a5dd6de9134d..c828be1598a1 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -/* XXX we use functions that might not exist. */ -#include "opt_compat.h" #include "opt_inet6.h" #include diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index a1cc2bb7bf8b..1049cb54748b 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 36f76c088ca3..abf2c898902d 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index 32db84a570b9..c35d257cd78c 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -37,8 +37,6 @@ __FBSDID("$FreeBSD$"); __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $"); #endif -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index 3e844704f132..4b888eac7718 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -30,8 +30,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c index 4dd4129cfa0b..149d75459bc8 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/compat/linux/linux_vdso.c b/sys/compat/linux/linux_vdso.c index dc82f614e5f0..9b013b0b7fe8 100644 --- a/sys/compat/linux/linux_vdso.c +++ b/sys/compat/linux/linux_vdso.c @@ -26,8 +26,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) #define __ELF_WORD_SIZE 32 #else diff --git a/sys/i386/linux/linux_copyout.c b/sys/i386/linux/linux_copyout.c index 5672787d5df7..3227d904a235 100644 --- a/sys/i386/linux/linux_copyout.c +++ b/sys/i386/linux/linux_copyout.c @@ -31,8 +31,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index dd6536f1c174..d23be5421b16 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -34,7 +34,6 @@ SRCS= linux${SFX}_dummy_machdep.c \ linux_timer.c \ linux_uid16.c \ linux_vdso.c \ - opt_compat.h \ opt_inet6.h \ opt_ktrace.h \ opt_posix.h \ diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 0857f4e7126f..a9bb4d2e8f73 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -29,7 +29,6 @@ SRCS= linux_dummy_machdep.c \ linux_time.c \ linux_vdso.c \ linux_timer.c \ - opt_compat.h \ opt_ktrace.h \ opt_inet6.h \ opt_posix.h \ diff --git a/sys/x86/linux/linux_dummy_x86.c b/sys/x86/linux/linux_dummy_x86.c index c48443096180..54799c1f0df2 100644 --- a/sys/x86/linux/linux_dummy_x86.c +++ b/sys/x86/linux/linux_dummy_x86.c @@ -28,8 +28,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_compat.h" - #include #include #include From nobody Sun Feb 26 08:11:24 2023 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 4PPbth6YnFz3s3cR; Sun, 26 Feb 2023 08:11:24 +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 4PPbth3xXpz4FNl; Sun, 26 Feb 2023 08:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399084; 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=CETzIJQRBORjB/aOVAM8U+PXE6iQb28b0Pwd6LWkot4=; b=hBD2AVRSJ8xw9Dq0htr3FU8jVFbavdmRNlNUliRIKTLLd2+h69VNeAVRdiLvadc2qDewEG emObTnb1nXNn1IFS3l2o6Cz4NheCYGaBDA1Nz9bo9QN/Jsb+dxWKPtBw+rLjWR0bNj8QUM iyF2Dbghfx6GMCoa1TO1SU4pbdEKEfm8JjR/F1yld28ZQNQ7Lqf6p7xvR6fb5m5aCBKLB4 GNLUfXlh7bDbXhbCmFUr15C8/iiYVGQj55t8bRV96yuFEHjFThbui7QFFACp1GGf/VWgLk L98e+Q+WfIhQV4jcYzIcQn8+r2EVJIPAFhHBo7Hnna3RhGof8pNNlaCefZH3Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399084; 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=CETzIJQRBORjB/aOVAM8U+PXE6iQb28b0Pwd6LWkot4=; b=beW+OWL3DGCQxbgyqqOY+EIsEqzxExSFYd6+0vtz8Z5XjTBdbnFMe+PwdWjYvhgqQyhPpf IsfYvYT5qqpL4Wo4oY/Yw97LlA9gjMrGWDkfyDunmelsah+Rq6PReiATevqCeUUzCmc/bz bYuzkl5BXsIWK3MGQQl2Ez/PPMfMrlWjb5EcxmAO7QqCHRF8KV3LlVRPKSBZdkiduLFk6w dsIwYnwvsweEXscjDzbuFKHHFXTCNxEETzDYNs0DlEyiqEISxSLZtZ2zaNLOxak+eZsBEL mFUtjmVVHYCTbg7ojMAnTntEP+J4DjUpwE+IrKvuYOnyF3pHw7Tchj8Xxw7qJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677399084; a=rsa-sha256; cv=none; b=fEsvOBPueeSuqMVsXE99pqhq+iiR1jU19seO3nmkBwPwi3uxQWAzS+cqYC+hKPpGX9o990 vb93zVb0qLVtQMvMw8IiGamOcbBlgpvaYmUQbNgDTjO/5qnjE4kWxuKa9xeS9SuVcE1CQd VRvTv+aq3+uiErHH8BEAdM0O9RG9Fpe2iF6FHd5kAhWm4V7GjNVLTksHY0BveH7W3SYPOl UH3kfxhtRdCgRLi17Z5ltWT0AQ/yPHo5LNTDTqkt9Oq63NvRIYmZbWrdutdc3/mpeZWB/e Tq9X/V+nBkeYra7t+HrcFRiRIkUgB5kmrYRRzE+5LoFKlBejCRZ7aX81guxIiA== 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 4PPbth31YYzdlB; Sun, 26 Feb 2023 08:11:24 +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 31Q8BOSI082449; Sun, 26 Feb 2023 08:11:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q8BODq082448; Sun, 26 Feb 2023 08:11:24 GMT (envelope-from git) Date: Sun, 26 Feb 2023 08:11:24 GMT Message-Id: <202302260811.31Q8BODq082448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 884ea80d4ebb - stable/13 - linux(4): Move use_real_names knob to the linux.c 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 884ea80d4ebbd2d8ff03d56eddc1dc64d49be908 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=884ea80d4ebbd2d8ff03d56eddc1dc64d49be908 commit 884ea80d4ebbd2d8ff03d56eddc1dc64d49be908 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-26 08:10:44 +0000 linux(4): Move use_real_names knob to the linux.c MI linux.[c|h] are the module independent in terms of the Linux emulation layer (ie, intended for both ISA - 32 & 64 bit), analogue of MD linux.h. There must be a code here that cannot be placed into the corresponding by common sense MI source and header files, i.e., code is machine independent, but ISA dependent. For the use_real_names knob, the code must be placed into the linux_socket.[c|h], however linux_socket is ISA dependent. MFC after: 2 weeks (cherry picked from commit 32fdc75fe7276083d446964055b0de0e29970b7c) --- sys/compat/linux/linux.c | 12 ++++++++++++ sys/compat/linux/linux.h | 10 ++++++++++ sys/compat/linux/linux_util.c | 15 --------------- sys/compat/linux/linux_util.h | 9 --------- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 5351575ed6e1..bf0479b89588 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -59,6 +59,11 @@ __FBSDID("$FreeBSD$"); CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ); +static bool use_real_ifnames = false; +SYSCTL_BOOL(_compat_linux, OID_AUTO, use_real_ifnames, CTLFLAG_RWTUN, + &use_real_ifnames, 0, + "Use FreeBSD interface names instead of generating ethN aliases"); + static int bsd_to_linux_sigtbl[LINUX_SIGTBLSZ] = { LINUX_SIGHUP, /* SIGHUP */ LINUX_SIGINT, /* SIGINT */ @@ -726,3 +731,10 @@ bsd_to_linux_poll_events(short bev, short *lev) *lev = bits; } + +bool +linux_use_real_ifname(const struct ifnet *ifp) +{ + + return (use_real_ifnames || !IFP_IS_ETH(ifp)); +} diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 40e563014fde..a8cdab07a70b 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -286,6 +286,16 @@ struct l_statx { ktrstruct("l_sigset_t", (s), l) #endif +/* + * Criteria for interface name translation + */ +#define IFP_IS_ETH(ifp) ((ifp)->if_type == IFT_ETHER) +#define IFP_IS_LOOP(ifp) ((ifp)->if_type == IFT_LOOP) + +struct ifnet; + +bool linux_use_real_ifname(const struct ifnet *); + void linux_netlink_register(void); void linux_netlink_deregister(void); diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index e41c505425ee..ad6ad8f26261 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -50,10 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include - #include #include @@ -86,11 +82,6 @@ SYSCTL_STRING(_compat_linux, OID_AUTO, emul_path, CTLFLAG_RWTUN, linux_emul_path, sizeof(linux_emul_path), "Linux runtime environment path"); -static bool use_real_ifnames = false; -SYSCTL_BOOL(_compat_linux, OID_AUTO, use_real_ifnames, CTLFLAG_RWTUN, - &use_real_ifnames, 0, - "Use FreeBSD interface names instead of generating ethN aliases"); - /* * Search an alternate path before passing pathname arguments on to * system calls. Useful for keeping a separate 'emulation tree'. @@ -324,9 +315,3 @@ linux_device_unregister_handler(struct linux_device_handler *d) return (EINVAL); } - -bool -linux_use_real_ifname(const struct ifnet *ifp) -{ - return (use_real_ifnames || !IFP_IS_ETH(ifp)); -} diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index 6f7b55be8123..d751267e6d54 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -120,15 +120,6 @@ int linux_vn_get_major_minor(const struct vnode *vn, int *major, int *minor); char *linux_get_char_devices(void); void linux_free_get_char_devices(char *string); -/* - * Criteria for interface name translation - */ -#define IFP_IS_ETH(ifp) ((ifp)->if_type == IFT_ETHER) -#define IFP_IS_LOOP(ifp) ((ifp)->if_type == IFT_LOOP) - -struct ifnet; -bool linux_use_real_ifname(const struct ifnet *ifp); - #if defined(KTR) #define KTR_LINUX KTR_SUBSYS From nobody Sun Feb 26 08:11:25 2023 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 4PPbtj5qlwz3s3fW; Sun, 26 Feb 2023 08:11:25 +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 4PPbtj53CBz4FWN; Sun, 26 Feb 2023 08:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399085; 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=tg7SnVrGV4z7DEsxqeOJuQayBgpzd07CRSTofqv6N7k=; b=psvKn7cIbg+I+AofqQYoAuC6RP9q+S8ZDWNfJZGvPKEHBxlqH0HumDcYMLd702LGIw5rOD agBKkdg9W12Dlfo7siiBCs0TZib1Hmwb8IWkF9osNLNXZXj2Y4zGWf0rV6Z5D3TtJhn2iO vAsn23IcfL4umfaTDw/Bhp/aJPXgIEiWdKfSPMbc383QTLkfEjtNQcCS3bVNziFlZY8xSA 4jHALHT8DlEguQ9e2rK0U0k+uWMPrXC9HghusHbq6Z8WVhxhLVzw6tpcJOIbPgA1o7LCKt mjMXu+Vaa3b5KZytbAihPq60KBbqYbNCLaDh3qi8AmuTIIc07HYcgzAo3TxMLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399085; 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=tg7SnVrGV4z7DEsxqeOJuQayBgpzd07CRSTofqv6N7k=; b=juIpEIkk1eK6hj3jPCaJY4lFhDI7e9GE17xpKcCNfMxJ9HT0gCVuG8tI97GCDqXvvg4Cy/ vWb56CadlWS0ddkAszOjI2wXeolCVnPUA294NwTNsIJOQ4EHnJjjPLmc6ewtXXD/QsBtJ1 xeT8n2FmBHnFU0+u1q//ddU2ox1sqicTtqVbFXUlLrpKRmXqIYC3VNlrqsVMbuFy4Hx+uq mFtZMdxGCuaFfOFRcauucg2R1G6xUbqWgF1z9mNAwXdv3PoTcfsVaE03K3gPRzxcrFDaaF MPR31p1SuMBGkrXrn48+yUOMXVgVdglZJrBDwn9NTGVD3q15ohIDijxviN66TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677399085; a=rsa-sha256; cv=none; b=mUCkPJHl7lMLVXGkkYq5OLrBunbfNJPWKsUsNTP+w11vlCl2bc9IcOwGP/suRrzVy/dtyx e8KuRDv1VK3WeQH44wzW+p4G8yR2dlnQQLHacJ3an1DQnoS6ssPM4diiNrGesJ7zmUBVqL Rz5CzomI0WCRJyR/whrnPQkYHny/g7Q9+Omn6tcFnmLOhjOYVyToFRzeitSIE2SX1tmsVm ABoHHaEiNpwEeg51eB1u6iTvgxtWqsooi7JHgobmHYEFTwPMjt1qJZf4Jb6o9h/Q6LwPGx 18AArLkiFsbzVu3ljeCRCXHGoslsN3SMddPmUDk0TqsexK9fkvSt3RehCDOrxw== 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 4PPbtj3x3QzdWT; Sun, 26 Feb 2023 08:11: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 31Q8BP2U082491; Sun, 26 Feb 2023 08:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q8BPxL082490; Sun, 26 Feb 2023 08:11:25 GMT (envelope-from git) Date: Sun, 26 Feb 2023 08:11:25 GMT Message-Id: <202302260811.31Q8BPxL082490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: de1770946d5b - stable/13 - linux(4): Use predefined constant instead of hardcoded value 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: de1770946d5bfc231638ca9d5e0bb004d7a5e384 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=de1770946d5bfc231638ca9d5e0bb004d7a5e384 commit de1770946d5bfc231638ca9d5e0bb004d7a5e384 Author: Dmitry Chagin AuthorDate: 2023-02-23 07:59:34 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-26 08:10:44 +0000 linux(4): Use predefined constant instead of hardcoded value Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D38713 MFC after: 3 days (cherry picked from commit 200fe6e3a0c8f2fc4fb8f48abd6528418a8a370c) --- sys/compat/linux/linux_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index 4cf872b3722d..bcbf39cdcb85 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -297,7 +297,7 @@ rtnl_newlink_to_linux(struct nlmsghdr *hdr, struct nlpcb *nlp, /* Convert interface type */ switch (ifinfo->ifi_type) { case IFT_ETHER: - ifinfo->ifi_type = 1; // ARPHRD_ETHER + ifinfo->ifi_type = LINUX_ARPHRD_ETHER; break; } ifinfo->ifi_flags = rtnl_if_flags_to_linux(ifinfo->ifi_flags); From nobody Sun Feb 26 08:11:26 2023 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 4PPbtk6zg9z3s3ZW; Sun, 26 Feb 2023 08:11: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 4PPbtk5zBWz4FRX; Sun, 26 Feb 2023 08:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399086; 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=418k3Olwv4J9t9daylnmjKPWrhhUxCE5isvsgZ2eRpI=; b=CQLCbgPLMK5mPtL0l8UzxENdYakXVy2bizztDUjmZ5bQQeLEXCvvID/k6UzTRZoza6FP1c YY4L7GaQeVCOQ+jBerLh4P+82QzNJywkLJFgafF0x2HIqu24dS7v5X/qeLLzhYJQiFYbb0 dvh2aqAdBUoODHeRHa8czUgEHf8YfU8f0ALkkJeYXTQbz9kFodOLzH2L1Y5wNx+msI4cSx 3nsuERLPgoz3WVpIwvf15+D4P9ASo1uFKtgXzFd3WmmkqpL7VoWN/6LuzRhPG+I2QzZsLS 2sFoSgugPpjx8XN5w4ShNAOIKWXMiR4kgpYKj6LKSBcHspASV88QfAWSiAMupg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399086; 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=418k3Olwv4J9t9daylnmjKPWrhhUxCE5isvsgZ2eRpI=; b=MhUqI1b2G2rN/+lyYgJ5qQ+oGaq5z8K6PypYjMwF59Wnpt0X1/rrdGqnFfSyZ6s4QAl3pr IEBrUAljA1vIltaAzTgJMTxm/telDuPwoPIzCEgs83XLNquu5/WzZsqR6rPG9bnFeyWKut crfKz5Rc+Zos9aSf+O+Fjt3H/pBDgBdwVMp/4jDKXpLBy1SnV4AOWKbUwwU23JlQZYbAgE fT6FCIzZYQ4qm8UXiqgXSIb5k5rIqGRi42OCFTXyPL1FZEscqlKv+3wxt/2xGjdZnVF8KV A2bErw5NtLOJlrFugc4+lIbnJQ4o8/WMXcWyWWQkvHlu190S5RuBAYps35GLiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677399086; a=rsa-sha256; cv=none; b=tTxIBtXYDddG0A7KiTpQ7IJ1DUL5GpGhSUUQGDi0Oh1hjRvifDteZOxrnTCl3U9OazaO15 WUJKHo3BjGN0vvOICXwZpneQVK4s930oT40lDk2JLZKChWOuo4+GJ5whcj/WjFEuUFIGnz v2xrTW98bMzSCPFRt/n2oNGVw+X9QK9Gu46QlXkfl6DekyZJRr8ai370desWX7kNLDFT5T 9vNZjMJyQU6GILs0m9uEZmbc8VySPWyVUxfgzVXmVn/Ht2Jr7pL+zEOF7SwdYxVc3yFYq8 hDyEzBr4cv+5zJw8pRayfyFJ/+vnidgB0kh9KaWMkIau/IrEIO2XO44O9TcP7Q== 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 4PPbtk4t1mzdXw; Sun, 26 Feb 2023 08:11:26 +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 31Q8BQDV082510; Sun, 26 Feb 2023 08:11:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q8BQFf082509; Sun, 26 Feb 2023 08:11:26 GMT (envelope-from git) Date: Sun, 26 Feb 2023 08:11:26 GMT Message-Id: <202302260811.31Q8BQFf082509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: a83551a52d1c - stable/13 - linux(4): Consolidate a FreeBSD interface names translation code 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a83551a52d1cfa8a756ef8dd298cab8042e27437 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a83551a52d1cfa8a756ef8dd298cab8042e27437 commit a83551a52d1cfa8a756ef8dd298cab8042e27437 Author: Dmitry Chagin AuthorDate: 2023-02-23 08:00:29 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-26 08:10:44 +0000 linux(4): Consolidate a FreeBSD interface names translation code We have some amount of interface names translation functions which are differs by bugs implementation. Consolidates it in a one place. Fixup loopback interface names translation and use ifnet methods and accessors, where possible. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D38714 MFC after: 3 days X-MFC with: 32fdc75fe7 (cherry picked from commit 3ab3c9c29cf0e5df8dbbaaf2003456445534bad8) --- sys/compat/linprocfs/linprocfs.c | 40 +++++------------- sys/compat/linux/linux.c | 87 ++++++++++++++++++++++++++++++++++++++-- sys/compat/linux/linux_common.h | 4 ++ sys/compat/linux/linux_ioctl.c | 56 +++++++------------------- 4 files changed, 113 insertions(+), 74 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index a93f8a1dbb8b..3aa01de9ce65 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -111,6 +111,7 @@ __FBSDID("$FreeBSD$"); #endif /* __i386__ || __amd64__ */ #include +#include #include #include #include @@ -1474,36 +1475,13 @@ linprocfs_doprocmem(PFS_FILL_ARGS) return (error); } -static int -linux_ifname(struct ifnet *ifp, char *buffer, size_t buflen) -{ - struct ifnet *ifscan; - int ethno; - - IFNET_RLOCK_ASSERT(); - - /* Short-circuit non ethernet interfaces */ - if (linux_use_real_ifname(ifp)) - return (strlcpy(buffer, ifp->if_xname, buflen)); - - /* Determine the (relative) unit number for ethernet interfaces */ - ethno = 0; - CK_STAILQ_FOREACH(ifscan, &V_ifnet, if_link) { - if (ifscan == ifp) - return (snprintf(buffer, buflen, "eth%d", ethno)); - if (!linux_use_real_ifname(ifscan)) - ethno++; - } - - return (0); -} - /* * Filler function for proc/net/dev */ static int linprocfs_donetdev(PFS_FILL_ARGS) { + struct epoch_tracker et; char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; @@ -1515,9 +1493,9 @@ linprocfs_donetdev(PFS_FILL_ARGS) "bytes packets errs drop fifo colls carrier compressed"); CURVNET_SET(TD_TO_VNET(curthread)); - IFNET_RLOCK(); + NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - linux_ifname(ifp, ifname, sizeof ifname); + ifname_bsd_to_linux_ifp(ifp, ifname, sizeof(ifname)); sbuf_printf(sb, "%6.6s: ", ifname); sbuf_printf(sb, "%7ju %7ju %4ju %4ju %4lu %5lu %10lu %9ju ", (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IBYTES), @@ -1546,7 +1524,7 @@ linprocfs_donetdev(PFS_FILL_ARGS) * tx_heartbeat_errors*/ 0UL); /* tx_compressed */ } - IFNET_RUNLOCK(); + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); return (0); @@ -1576,7 +1554,8 @@ linux_route_print(struct rtentry *rt, void *vw) /* select only first route in case of multipath */ nh = nhop_select_func(rnd.rnd_nhop, 0); - linux_ifname(nh->nh_ifp, ifname, sizeof(ifname)); + if (ifname_bsd_to_linux_ifp(nh->nh_ifp, ifname, sizeof(ifname)) <= 0) + return (ENODEV); gw = (nh->nh_flags & NHF_GATEWAY) ? nh->gw4_sa.sin_addr.s_addr : 0; @@ -1605,6 +1584,7 @@ linux_route_print(struct rtentry *rt, void *vw) static int linprocfs_donetroute(PFS_FILL_ARGS) { + struct epoch_tracker et; struct walkarg w = { .sb = sb }; @@ -1615,9 +1595,9 @@ linprocfs_donetroute(PFS_FILL_ARGS) "\tWindow\tIRTT"); CURVNET_SET(TD_TO_VNET(curthread)); - IFNET_RLOCK(); + NET_EPOCH_ENTER(et); rib_walk(fibnum, AF_INET, false, linux_route_print, &w); - IFNET_RUNLOCK(); + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); return (0); diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index bf0479b89588..41297d549c26 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -242,6 +242,84 @@ bsd_to_linux_sigset(sigset_t *bss, l_sigset_t *lss) } } +/* + * Translate a FreeBSD interface name to a Linux interface name + * by interface name, and return the number of bytes copied to lxname. + */ +int +ifname_bsd_to_linux_name(const char *bsdname, char *lxname, size_t len) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int ret; + + ret = 0; + CURVNET_SET(TD_TO_VNET(curthread)); + NET_EPOCH_ENTER(et); + ifp = ifunit(bsdname); + if (ifp != NULL) + ret = ifname_bsd_to_linux_ifp(ifp, lxname, len); + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (ret); +} + +/* + * Translate a FreeBSD interface name to a Linux interface name + * by interface index, and return the number of bytes copied to lxname. + */ +int +ifname_bsd_to_linux_idx(u_int idx, char *lxname, size_t len) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int ret; + + ret = 0; + CURVNET_SET(TD_TO_VNET(curthread)); + NET_EPOCH_ENTER(et); + ifp = ifnet_byindex(idx); + if (ifp != NULL) + ret = ifname_bsd_to_linux_ifp(ifp, lxname, len); + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (ret); +} + +/* + * Translate a FreeBSD interface name to a Linux interface name, + * and return the number of bytes copied to lxname. + */ +int +ifname_bsd_to_linux_ifp(struct ifnet *ifp, char *lxname, size_t len) +{ + struct ifnet *ifscan; + int unit; + + NET_EPOCH_ASSERT(); + + /* + * Linux loopback interface name is lo (not lo0), + * we translate lo to lo0, loX to loX. + */ + if (IFP_IS_LOOP(ifp) && strncmp(ifp->if_xname, "lo0", IFNAMSIZ) == 0) + return (strlcpy(lxname, "lo", len)); + + /* Short-circuit non ethernet interfaces. */ + if (!IFP_IS_ETH(ifp) || linux_use_real_ifname(ifp)) + return (strlcpy(lxname, ifp->if_xname, len)); + + /* Determine the (relative) unit number for ethernet interfaces. */ + unit = 0; + CK_STAILQ_FOREACH(ifscan, &V_ifnet, if_link) { + if (ifscan == ifp) + return (snprintf(lxname, len, "eth%d", unit)); + if (IFP_IS_ETH(ifscan)) + unit++; + } + return (0); +} + /* * Translate a Linux interface name to a FreeBSD interface name, * and return the associated ifnet structure @@ -262,8 +340,11 @@ ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) break; if (len == 0 || len == LINUX_IFNAMSIZ) return (NULL); - /* Linux loopback interface name is lo (not lo0) */ - is_lo = (len == 2 && strncmp(lxname, "lo", len) == 0); + /* + * Linux loopback interface name is lo (not lo0), + * we translate lo to lo0, loX to loX. + */ + is_lo = (len == 2 && strncmp(lxname, "lo", LINUX_IFNAMSIZ) == 0); unit = (int)strtoul(lxname + len, &ep, 10); if ((ep == NULL || ep == lxname + len || ep >= lxname + LINUX_IFNAMSIZ) && is_lo == 0) @@ -736,5 +817,5 @@ bool linux_use_real_ifname(const struct ifnet *ifp) { - return (use_real_ifnames || !IFP_IS_ETH(ifp)); + return (use_real_ifnames); } diff --git a/sys/compat/linux/linux_common.h b/sys/compat/linux/linux_common.h index 0eb302bfcd17..9ebaff26b9ff 100644 --- a/sys/compat/linux/linux_common.h +++ b/sys/compat/linux/linux_common.h @@ -30,6 +30,10 @@ #ifndef _LINUX_COMMON_H_ #define _LINUX_COMMON_H_ +int ifname_bsd_to_linux_ifp(struct ifnet *, char *, size_t); +int ifname_bsd_to_linux_idx(u_int, char *, size_t); +int ifname_bsd_to_linux_name(const char *, char *, size_t); + struct ifnet *ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname); void linux_ifflags(struct ifnet *ifp, short *flags); diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 29edea547725..cd739522c496 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2105,39 +2105,17 @@ static int linux_ioctl_ifname(struct thread *td, struct l_ifreq *uifr) { struct l_ifreq ifr; - struct ifnet *ifp; - int error, ethno, index; + int error, ret; error = copyin(uifr, &ifr, sizeof(ifr)); if (error != 0) return (error); - - CURVNET_SET(TD_TO_VNET(curthread)); - IFNET_RLOCK(); - index = 1; /* ifr.ifr_ifindex starts from 1 */ - ethno = 0; - error = ENODEV; - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifr.ifr_ifindex == index) { - if (!linux_use_real_ifname(ifp)) - snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, - "eth%d", ethno); - else - strlcpy(ifr.ifr_name, ifp->if_xname, - LINUX_IFNAMSIZ); - error = 0; - break; - } - if (!linux_use_real_ifname(ifp)) - ethno++; - index++; - } - IFNET_RUNLOCK(); - if (error == 0) - error = copyout(&ifr, uifr, sizeof(ifr)); - CURVNET_RESTORE(); - - return (error); + ret = ifname_bsd_to_linux_idx(ifr.ifr_ifindex, ifr.ifr_name, + LINUX_IFNAMSIZ); + if (ret > 0) + return (copyout(&ifr, uifr, sizeof(ifr))); + else + return (ENODEV); } /* @@ -2147,6 +2125,7 @@ linux_ioctl_ifname(struct thread *td, struct l_ifreq *uifr) static int linux_ifconf(struct thread *td, struct ifconf *uifc) { + struct epoch_tracker et; #ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else @@ -2156,7 +2135,7 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) struct ifnet *ifp; struct ifaddr *ifa; struct sbuf *sb; - int error, ethno, full = 0, valid_len, max_len; + int error, full = 0, valid_len, max_len; error = copyin(uifc, &ifc, sizeof(ifc)); if (error != 0) @@ -2168,7 +2147,7 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) /* handle the 'request buffer size' case */ if ((l_uintptr_t)ifc.ifc_buf == PTROUT(NULL)) { ifc.ifc_len = 0; - IFNET_RLOCK(); + NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { struct sockaddr *sa = ifa->ifa_addr; @@ -2176,7 +2155,7 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) ifc.ifc_len += sizeof(ifr); } } - IFNET_RUNLOCK(); + NET_EPOCH_EXIT(et); error = copyout(&ifc, uifc, sizeof(ifc)); CURVNET_RESTORE(); return (error); @@ -2188,8 +2167,6 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) } again: - /* Keep track of eth interfaces */ - ethno = 0; if (ifc.ifc_len <= max_len) { max_len = ifc.ifc_len; full = 1; @@ -2199,16 +2176,13 @@ again: valid_len = 0; /* Return all AF_INET addresses of all interfaces */ - IFNET_RLOCK(); + NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { int addrs = 0; bzero(&ifr, sizeof(ifr)); - if (IFP_IS_ETH(ifp)) - snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "eth%d", - ethno++); - else - strlcpy(ifr.ifr_name, ifp->if_xname, LINUX_IFNAMSIZ); + ifname_bsd_to_linux_ifp(ifp, ifr.ifr_name, + sizeof(ifr.ifr_name)); /* Walk the address list */ CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { @@ -2235,7 +2209,7 @@ again: valid_len = sbuf_len(sb); } } - IFNET_RUNLOCK(); + NET_EPOCH_EXIT(et); if (valid_len != max_len && !full) { sbuf_delete(sb); From nobody Sun Feb 26 08:11:27 2023 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 4PPbtm0kcYz3s3ld; Sun, 26 Feb 2023 08:11:28 +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 4PPbtl6fswz4FgM; Sun, 26 Feb 2023 08:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399088; 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=CzPIxFwV/oS9zlPteiciOrqY6or4uIxfcE6RBMeYzH4=; b=hOZR7i8VrlTVTL2qYOASvRHVU5c0Pqx6JjGHng6PcB859WZBcT0XnJQdFnUoeBUzvHzbLT u3LJpIfm9t3QH2mD3Zc8fVkWfovs3cOjI1Eqmb29vylm1hZuc5L4bMvJ93MBBYU7yc822u JN6/HyFF8PAKiaH+UDLVzsvLoE0RfoUP6FndsmZLKmTFrmTElBDm28c9qCmBcuQ13Jk/64 quk6Un0ua9uNQ0RyS8Vyp3QPEMUqJYRGsskDLjn7nFU/+Q6tDf8ILFULb/0tT6r2QRM/Qj rpaGchau0mpH2Rs3WuRtwGD54svxsLZ/z0MCOBRG4RluD1QxZbQIxQhJcbOjag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677399088; 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=CzPIxFwV/oS9zlPteiciOrqY6or4uIxfcE6RBMeYzH4=; b=R/xqsyTeEwNWU8hBCPKq7WdZOkklD67xv6rkFCBByzesALRaPWhNMr2ZpIveF/XYrYrxUa hf33RBArMiGqm+F7FEwoUg4C3nmjK2Deg2tHY311BZalSBfTjnIHPUOayUwIIO/jSSRqHj PuRhbAD20IEuxxHduIvANzpM725RkMgsLKjAXHYzxOJKeFwSz+ww2KwgE1+38QOL6GWDQu Kzw9IQ29XSDVnDwAKaQ94ql/DjPmgkWUBfGi8U1HdktokQ0KPSOd88Ow45/HeNNcH3Obnw vMymIzeDBXTNbGLRsH/wEwkjGapKHeU+CGc2283gGkwNVZ81OmVRUApmV8TOhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677399088; a=rsa-sha256; cv=none; b=O6C2WZnKO15hFUuNBB5NxZS0LjghYH9DFlm7047bvvtplWzqbwkdX2bI55MUIKpk9WFUF8 J1iY2cjjAW9hjB2yr31KayvBPIZ2o/T7gEvDB5DzRt25ZcEskuHAEcKlSXxoxYpx9HCbob sYCkzE8Eeq7COVb5NxZtzlfv69JmTLi+PwNxlKsnSbyHYirUr4K3kJQSQscQ39RL5jpn90 WHw+vmP3thwzo+egmYqVOFSy4ZncM5LqzfW3xFCv6q4snhZrgYYKPx+pi6dkc62qe8ajFN uxQ7AgOsjd4QlT6gTRXCumM6umoCJV6gVetcngbSzlpV2R+a4vfBEUdPNhMuEg== 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 4PPbtl5mY4zd39; Sun, 26 Feb 2023 08:11:27 +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 31Q8BRWg082537; Sun, 26 Feb 2023 08:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q8BRlZ082536; Sun, 26 Feb 2023 08:11:27 GMT (envelope-from git) Date: Sun, 26 Feb 2023 08:11:27 GMT Message-Id: <202302260811.31Q8BRlZ082536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 123ca9ab1189 - stable/13 - linux(4): Fixup the interface name translation in netlink 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 123ca9ab11896f356245537ee41207fb6943fccd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=123ca9ab11896f356245537ee41207fb6943fccd commit 123ca9ab11896f356245537ee41207fb6943fccd Author: Dmitry Chagin AuthorDate: 2023-02-23 08:01:18 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-26 08:10:44 +0000 linux(4): Fixup the interface name translation in netlink Netlink should translate a FreeBSD interface name to a Linux interface name. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D38715 MFC after: 3 days (cherry picked from commit e55e4a6ba3f4cd31d47b74574ea7370d5ab14b48) --- sys/compat/linux/linux_netlink.c | 48 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index bcbf39cdcb85..4fc962c7ea0b 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -220,10 +220,52 @@ nlmsg_copy_nla(const struct nlattr *nla_orig, struct nl_writer *nw) return (false); } +/* + * Translate a FreeBSD interface name to a Linux interface name. + */ +static bool +nlmsg_translate_ifname_nla(struct nlattr *nla, struct nl_writer *nw) +{ + char ifname[LINUX_IFNAMSIZ]; + + if (ifname_bsd_to_linux_name((char *)(nla + 1), ifname, + sizeof(ifname)) <= 0) + return (false); + return (nlattr_add_string(nw, IFLA_IFNAME, ifname)); +} + +#define LINUX_NLA_UNHANDLED -1 +/* + * Translate a FreeBSD attribute to a Linux attribute. + * Returns LINUX_NLA_UNHANDLED when the attribute is not processed + * and the caller must take care of it, otherwise the result is returned. + */ +static int +nlmsg_translate_all_nla(struct nlmsghdr *hdr, struct nlattr *nla, + struct nl_writer *nw) +{ + + switch (hdr->nlmsg_type) { + case NL_RTM_NEWLINK: + case NL_RTM_DELLINK: + case NL_RTM_GETLINK: + switch (nla->nla_type) { + case IFLA_IFNAME: + return (nlmsg_translate_ifname_nla(nla, nw)); + default: + break; + } + default: + break; + } + return (LINUX_NLA_UNHANDLED); +} + static bool nlmsg_copy_all_nla(struct nlmsghdr *hdr, int raw_hdrlen, struct nl_writer *nw) { struct nlattr *nla; + int ret; int hdrlen = NETLINK_ALIGN(raw_hdrlen); int attrs_len = hdr->nlmsg_len - sizeof(struct nlmsghdr) - hdrlen; @@ -234,11 +276,15 @@ nlmsg_copy_all_nla(struct nlmsghdr *hdr, int raw_hdrlen, struct nl_writer *nw) if (nla->nla_len < sizeof(struct nlattr)) { return (false); } - if (!nlmsg_copy_nla(nla, nw)) + ret = nlmsg_translate_all_nla(hdr, nla, nw); + if (ret == LINUX_NLA_UNHANDLED) + ret = nlmsg_copy_nla(nla, nw); + if (!ret) return (false); } return (true); } +#undef LINUX_NLA_UNHANDLED static unsigned int rtnl_if_flags_to_linux(unsigned int if_flags) From nobody Sun Feb 26 18:20:35 2023 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 4PPsQk40cvz3tspn; Sun, 26 Feb 2023 18:21:34 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PPsQk1N2Dz464J; Sun, 26 Feb 2023 18:21:34 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id WEugpg0UEuZMSWLePp4E7z; Sun, 26 Feb 2023 18:21:33 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id WLeNp4kYpyAOeWLeOpzzXV; Sun, 26 Feb 2023 18:21:33 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=63fba32d a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=IkcTkHD0fZMA:10 a=m04uMKEZRckA:10 a=6I5d2MoRAAAA:8 a=kyzJ9L_xAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=KBKPjRILYM7lkmaT7jQA:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 a=GQrHswQfl4I-Q0Y8ISRM:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from [127.0.0.1] (unknown [192.168.0.252]) by spqr.komquats.com (Postfix) with ESMTPSA id 60B0C3E23; Sun, 26 Feb 2023 10:21:31 -0800 (PST) Date: Sun, 26 Feb 2023 10:20:35 -0800 From: Cy Schubert To: Zhenlei Huang , Cy Schubert CC: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" , re@freebsd.org Subject: Re: git: 26ba9518ffec - stable/13 - unbound: Vendor import 1.17.1 In-Reply-To: <2AFA7DFF-388C-4C6C-8CF3-9B9FAC95BF14@FreeBSD.org> References: <202302141833.31EIXkwO001829@gitrepo.freebsd.org> <2AFA7DFF-388C-4C6C-8CF3-9B9FAC95BF14@FreeBSD.org> Message-ID: 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: quoted-printable X-CMAE-Envelope: MS4xfG1Pt5t1nnJg6rPu12Q4WBTqwKIBvWAKerMDJfTUqhA1wmkQSQNyBbpJkR6OMO0tVdyxgHQ1InvT4KFzoicO+QiuPWToqrEeHzIUdahO9ML5vHrkMMXa cUdh73ZixIFtl5oNswM94QuIHkLfNWR9TRe90koOkBdW8k1VY/eEQCKGJuhu9JGp4rUFpioYZ1wH+F2JPFjHOFvjWVj/xIN827mHqMdLnMV70xoo3N5zddZ6 eR3X1hqt0dQbB9o86QW8lILPUWQxaQoC5dA8r4ucldIDt0hZ1P+G+gjlNfo8pSt+Y1G7BWvgWIHHN1FAhVw7p3mSbzUpJFUT8bZDgXXHUWzfbQkIAJBU628i Li5R+cDRFg2B4k1FdaqXk8R2B659Bg== X-Rspamd-Queue-Id: 4PPsQk1N2Dz464J X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On February 25, 2023 10:45:37 PM PST, Zhenlei Huang wr= ote: >Hi, > >Will this been merged into releng/13=2E2 ? > >RC1 is coming, as per the release schedule https://www=2Efreebsd=2Eorg/re= leases/13=2E2R/schedule/ =2E > >Best regards, >Zhenlei > >> On Feb 15, 2023, at 2:33 AM, Cy Schubert wrote: >>=20 >> The branch stable/13 has been updated by cy: >>=20 >> URL: https://cgit=2EFreeBSD=2Eorg/src/commit/?id=3D26ba9518ffeccd0b64d2= f610e731989193844814 >>=20 >> commit 26ba9518ffeccd0b64d2f610e731989193844814 >> Author: Cy Schubert >> AuthorDate: 2023-01-15 05:39:31 +0000 >> Commit: Cy Schubert >> CommitDate: 2023-02-14 18:32:39 +0000 >>=20 >> unbound: Vendor import 1=2E17=2E1 >>=20 >> Release notes at >> https://www=2Enlnetlabs=2Enl/news/2023/Jan/12/unbound-1=2E17=2E1= -released/=2E >>=20 >> Merge commit '7699e1386a16236002b26107ffd2dcbde375e197' into main >>=20 >> (cherry picked from commit 1838dec31895fd4752fa8631322ab93be0705a66) >> --- >>=20 >> *** LINES SKIPPED *** > > > We will need to as the Release Engineer, as MFS to releng/13=2E2 is not my= decision=2E --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD=2Eorg NTP: Web: https://nwtime=2Eorg e^(i*pi)+1=3D0 Pardon the typos=2E Small keyboard in use=2E From nobody Sun Feb 26 22:23:28 2023 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 4PPynr2b6Xz3v8nG; Sun, 26 Feb 2023 22:23:28 +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 4PPynr1qdGz4WXJ; Sun, 26 Feb 2023 22:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677450208; 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=G+F4Ekb9Hu2j6B45dSR6wDdlUpDPBYUX1odUnhmE0Uo=; b=DRdw8/OxwoAYZIcPBJiADuMn3Fe67pa09N1PoVo83FBLryVpV7tlkdWJUiSCXprRxainEC 0d/EBB8OBXLbkqxqrSEAOeAbmyIs6HE+LrMAuDYMiHkYtNuGjg41lDh1gwc1CBOGWSwJOm gTNVga9g2tYwm8YO9FAjYty7LrywSrY3hvp06gZuHsrKQvx+o0rkm5NmGIvNmPK4jeG18N AgO0R7bNK1kpbqi55EngjLr5fSWVrcAwl1iHv6vfLwcRWCy/2S+EvBkMGBrm6hRnpR2NBQ QZfTfgAY9S42YmGcSo4X/8dAR4WZ4FuugK01kho4kDe9zmLxEecM0zNyJZNLgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677450208; 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=G+F4Ekb9Hu2j6B45dSR6wDdlUpDPBYUX1odUnhmE0Uo=; b=QxM/Tkl/pkseZxGWaWHpZMQ6qLb3Hm6UAtaiNtDH8pWwMrx59HvD6DtKimlkLvWZeHS7bI Ar/iGINgJdPx9IzVXEAIYhAtFHvJ0O8TzXB2MPphFm3UkPd7DuaViQ59WBmMVyHXLxyTWI CiNrun+NNrS+8240HFDYBVbNcnToP7MlV5u16SllzRzZb76F8FJeGs5ehsMwypscNIkfjH 3z2Ou0UVvsRPBM3ggVwN5ch9M4tkbVuUDcOy25nMpZ6R7XQgcc/Xx8p56CokVLXwwkHxCt pqDiewtujv2i2kZ96P+njTFfI2Y0zTQUU2JoZH8vpWQWUZFFhrFrvcfL5phOpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677450208; a=rsa-sha256; cv=none; b=AnWSn/XUxTM1cVovydx5oYaCy5QPYYex5EUQbCqtp5q88azPHELINsZMFmtuXH4/wAohEO JBrOCdL77U5kawYXrgKpqlQ4wdmzgV7aMwCW+MazvsponhxA48euLfBSZGc3AfrYY/Lo0Y cZ+dpobVoe4RousTWZdVP1Uy3qpAtu5CQSOmGgetRJzKiWUeOlmQWw4dwG5Z/8xLwDd9rH juz+gjloWrRmaTF/qQtWDy5rrjWEAC7UfNvw6VkunW7a/8zC9mqyG+4iRxVkOCn9084Ssw mMHIeNw58isiF9Zdp+XLmR43sP6JX6+ooiZB+mnY2tXkxs1uxlmZ1DwyOV5E1A== 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 4PPynr0vW8z12KK; Sun, 26 Feb 2023 22:23:28 +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 31QMNSYD079365; Sun, 26 Feb 2023 22:23:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QMNSES079364; Sun, 26 Feb 2023 22:23:28 GMT (envelope-from git) Date: Sun, 26 Feb 2023 22:23:28 GMT Message-Id: <202302262223.31QMNSES079364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joerg Wunsch Subject: git: 13524c57726a - stable/13 - MFC: ARM release build: enable IPv6 SLAAC by default 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: joerg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 13524c57726a4bf14a92ecde6f5cccbda5152751 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by joerg: URL: https://cgit.FreeBSD.org/src/commit/?id=13524c57726a4bf14a92ecde6f5cccbda5152751 commit 13524c57726a4bf14a92ecde6f5cccbda5152751 Author: Joerg Wunsch AuthorDate: 2023-02-12 21:26:52 +0000 Commit: Joerg Wunsch CommitDate: 2023-02-26 22:22:32 +0000 MFC: ARM release build: enable IPv6 SLAAC by default When building ARM release images, enable IPv6 SLAAC by default in addition to IPv4 DHCP. Unlike amd64 (and other desktop/server) releases, ARM releases on SoC setups are usually deployed by just using the installation image, so there is no interactive network configuration. Not having IPv6 included by default is kind of an anachronism these days, given that FreeBSD with the KAME project once pioneered IPv6 technology. (cherry picked from commit 57228a49333505aebbc992f3799819667630f255) --- release/tools/arm.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index d07dbb41b48b..5159907d9689 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -218,7 +218,7 @@ arm_install_base() { local hostname hostname="$(echo ${KERNEL} | tr '[:upper:]' '[:lower:]')" echo "hostname=\"${hostname}\"" > ${CHROOTDIR}/${DESTDIR}/etc/rc.conf - echo 'ifconfig_DEFAULT="DHCP"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + echo 'ifconfig_DEFAULT="DHCP inet6 accept_rtadv"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf echo 'sshd_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf echo 'sendmail_enable="NONE"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf echo 'sendmail_submit_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf From nobody Sun Feb 26 22:24:39 2023 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 4PPyqC4yfwz3v8R4; Sun, 26 Feb 2023 22:24:39 +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 4PPyqC4NDcz4Ww2; Sun, 26 Feb 2023 22:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677450279; 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=A/v5ql0IkyEWwxU5etb5PNmLYtBx1mMoTBlNoU1j0lA=; b=hIb7YZx3cy5Hn7xXZ3QjptVSrcTHdgvjVAyCi3SY/LryR8nZqhj5jWC4uvU2RRIZC/KlnK NWJFqaljpaZ4B7CWVGE8VFknBWu8uoMrVyovwJ5gfAJOuQRc0bYRWKiCVBacb8REjcO/59 PBS4kHpOx9fP8Gzt8BzEy8sEfTIhQ1wJrQLvoyP5pvQdU2Jq/eoIsracbM46OrixaNbXu8 IEKRxsCX7e7m/pVHqM+d/z9Um6SyJmokR0YQy0axDxG70Mjby01TbuZ5QwgyYFd04zV/db yNV7HYezYdfXgpbDmEvZyRIuQGFIp1bIFhN1squjVk3gkp4lNuvonUUbbaDakQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677450279; 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=A/v5ql0IkyEWwxU5etb5PNmLYtBx1mMoTBlNoU1j0lA=; b=N16+tj4q5u8iAGoTVWWnhG4f5+OWy2FimWrE5UuB+Z/f2m/PUq5D0dqrGsCKs/AcPOlEh1 9gD5PqWRDpUA93B2DH+ZQAIlTDbp9EXpcOlTTpcdoguD4rjpTYnwiiKNYaqPeqjOlpovxX SNPmbAD+fewAgIOM99+nJaaG/cejnR5FdVe9na2Zr28jxg0Wc4LA1WqehXDGlvjmej02n1 1ZJ96uk6oaSgkPPeSsgz1aFISb+F7PlgU1at1ahL6aA+xv6dpWcuMvTFXiLh/P4+B+Le3V b/sOqcBH7p1xIWDnorngWUyDaxKp1e/aafWkfoQyktCAHQ4H+nGzgEdW5sp4jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677450279; a=rsa-sha256; cv=none; b=hUpvWQ5QGk2H0cc9XD+aFofSSXpmmg3Loe5jWqrTIDv+RWkUQqtCd7HdcjA6gElsdk1SvG qK2MxEMRTk45mJMdrcuVkYHVhpx495Y0e25LrVrqV+Fl/7fyRNTDjvTrzFZD8JbW0jOt2j D7QlkdH2u64zXKa79UdhedbYoSPndBqcAKfvKUueGhYgJNfqYCpOjxiYsvo5GOAM2fnJDT F0m8joCOOoucFFINtkykgg99iyiuZQmz+7mE5UpsYc7XG0ES5AXKJaQ58eDAxpf5PRtDn6 NqqVhFpQpzMj2QEQIZsc2IWhuUYtlJMKq2jI4qUMwxCYwGT9bR9AcV1LqU9Mag== 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 4PPyqC3P8qz12fl; Sun, 26 Feb 2023 22:24:39 +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 31QMOdPb079581; Sun, 26 Feb 2023 22:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QMOdhd079580; Sun, 26 Feb 2023 22:24:39 GMT (envelope-from git) Date: Sun, 26 Feb 2023 22:24:39 GMT Message-Id: <202302262224.31QMOdhd079580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joerg Wunsch Subject: git: 2178d68a54e0 - stable/12 - MFC: ARM release build: enable IPv6 SLAAC by default 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: joerg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2178d68a54e0aabedc75373cd7593b1b163261aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by joerg: URL: https://cgit.FreeBSD.org/src/commit/?id=2178d68a54e0aabedc75373cd7593b1b163261aa commit 2178d68a54e0aabedc75373cd7593b1b163261aa Author: Joerg Wunsch AuthorDate: 2023-02-12 21:26:52 +0000 Commit: Joerg Wunsch CommitDate: 2023-02-26 22:24:17 +0000 MFC: ARM release build: enable IPv6 SLAAC by default When building ARM release images, enable IPv6 SLAAC by default in addition to IPv4 DHCP. Unlike amd64 (and other desktop/server) releases, ARM releases on SoC setups are usually deployed by just using the installation image, so there is no interactive network configuration. Not having IPv6 included by default is kind of an anachronism these days, given that FreeBSD with the KAME project once pioneered IPv6 technology. (cherry picked from commit 57228a49333505aebbc992f3799819667630f255) --- release/tools/arm.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index ea0d16f5e9de..062fcec0a18d 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -209,7 +209,7 @@ arm_install_base() { local hostname hostname="$(echo ${KERNEL} | tr '[:upper:]' '[:lower:]')" echo "hostname=\"${hostname}\"" > ${CHROOTDIR}/${DESTDIR}/etc/rc.conf - echo 'ifconfig_DEFAULT="DHCP"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + echo 'ifconfig_DEFAULT="DHCP inet6 accept_rtadv"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf echo 'sshd_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf echo 'sendmail_enable="NONE"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf echo 'sendmail_submit_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf From nobody Sun Feb 26 23:10:37 2023 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 4PPzrH1wWQz3vCCH for ; Sun, 26 Feb 2023 23:10:39 +0000 (UTC) (envelope-from 010001868ffe1006-70011df3-9aab-4a0b-9460-cdc3b5f04abd-000000@amazonses.com) Received: from a8-237.smtp-out.amazonses.com (a8-237.smtp-out.amazonses.com [54.240.8.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4PPzrG50Vgz4ZPk for ; Sun, 26 Feb 2023 23:10:38 +0000 (UTC) (envelope-from 010001868ffe1006-70011df3-9aab-4a0b-9460-cdc3b5f04abd-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn; d=tarsnap.com; t=1677453037; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=8b/s+9jjeDuH8E8qn7SWtFVj17VdP1xEDyOzUksCHBM=; b=bfw/TgRKS7y06MdlKK/aiq6A4+6xxFKgsy2h2mCfQxs4wui+v6H46S8ilHvEbRCL KcDEQy0But89e5K8VtlY8o0csHkEJ9rkfWpJDstUSWDigexMdhIpEGWWj5RFQ3F2a+n VG/3FQBVFPnSwpCV+LMNAhtd9gF6cmhJXrBCA55g= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1677453037; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=8b/s+9jjeDuH8E8qn7SWtFVj17VdP1xEDyOzUksCHBM=; b=QKlFdhO8fUDntjN/6TWwBe3wullMoABdpCD12JH1HRdEcuUGRMSgD50KTShO6sm7 bVKYw+lb3NZutAXjgvyiBCOUxl2Sy6Ak02XOuzCZwPRjI2oHZCJ3JeYhDRACW4tIQ3l /SAsTML1XiOE7gDcnJxvVwuwKLlDayeS67mim+xs= Message-ID: <010001868ffe1006-70011df3-9aab-4a0b-9460-cdc3b5f04abd-000000@email.amazonses.com> Date: Sun, 26 Feb 2023 23:10:37 +0000 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: git: 26ba9518ffec - stable/13 - unbound: Vendor import 1.17.1 Content-Language: en-US To: Cy Schubert , Zhenlei Huang , Cy Schubert Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" , re@freebsd.org References: <202302141833.31EIXkwO001829@gitrepo.freebsd.org> <2AFA7DFF-388C-4C6C-8CF3-9B9FAC95BF14@FreeBSD.org> From: Colin Percival In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2023.02.26-54.240.8.237 X-Rspamd-Queue-Id: 4PPzrG50Vgz4ZPk X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 2/26/23 10:20, Cy Schubert wrote: > On February 25, 2023 10:45:37 PM PST, Zhenlei Huang wrote: >> Will this been merged into releng/13.2 ? >> >> RC1 is coming, as per the release schedule https://www.freebsd.org/releases/13.2R/schedule/ . >> >>> On Feb 15, 2023, at 2:33 AM, Cy Schubert wrote: >>> unbound: Vendor import 1.17.1 > > We will need to as the Release Engineer, as MFS to releng/13.2 is not my decision. In general yes, it's better to have newer versions of "contrib" code in the release -- among other things, it makes it easier for secteam to handle any security vulnerabilities. That said, I haven't looked at what has changed in this version; if there's some reason you don't think it should be merged, I'll absolutely trust your expertise here. So I'm not going to ask for this to be merged to releng/13.2, but if you'd like to do it (in the next few days!) I think it's safe to say that you can expect it to be approved. ;-) -- Colin Percival FreeBSD Deputy Release Engineer & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Mon Feb 27 03:14:45 2023 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 4PQ5Fy1Wmfz3tDd2; Mon, 27 Feb 2023 03:14:46 +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 4PQ5Fy0vk9z3MlF; Mon, 27 Feb 2023 03:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677467686; 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=EhETwk/9GthwsZ/VqudzPbJbPsb9o78vA88n6FYTH84=; b=vRwl6kppnk7em1kooMxfwR6KbN5rHtAkruiUyn/k01L3iDE9IcA6o0Hebm8tAuwuufqRxS alaLlmIy+A7MvoQ7TxIQwGxvcE4LZaxdAuY3bEUuGpk8cO0Auo+qDmx7Zgboqe8iorITb/ mCCcYcAxYDGoERkKrEkRV69TeU7kplFDn/KjRw5euzwL77YSN8led/mIC0tI3HjZQCp4bF QlOMuIL0Oj3B+eng3kK9/DGq4f/ZvDDMiBrbf868d48+oKKGsCKHX6oubslTP/JnrWzzPC 2SJb/4o3hwM9XigRwaagdIetxt899mEk8OHSxrH9Ne5/ytiZd0cQLXrcTyK4pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677467686; 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=EhETwk/9GthwsZ/VqudzPbJbPsb9o78vA88n6FYTH84=; b=F//9hzyMYIPZ8fGP2cyuTcqCCsd5+28CVR01lYRQEfIHyRUyJFA8QN4DcuFJ9GHLkvc7gi bTmBYDT9XbfIwygPlzco0B3ZqlwssH6XXYV2FKk7CzU0qRAtWW2iAwKkMI+x13AVtWVXMQ +/K1655B+ONbNtHUfMkFT39TlLftZN4qOlEg4BxGyH3WJ9zgPjcwvozHBshKj6JNrjuDCU owrftB6ieEfAbB9Pr8LnvBh6ViZVflaJOOueqRj7dg35aaBfMeI49+76E8ziNLzlKX/Xqp /1wfnRj6qPPoszlr/CK1QaUblHwcaB/4BO2By+kOtPgfZarUsI8HikaHaAdnzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677467686; a=rsa-sha256; cv=none; b=lWjInokEsYp1rMEgxF7l3GlbtAIr+ssrhAa4zacCfy6zo6KtWbPo7KyQg2f/nzTyDLpC/s 0ye7PJRIDzrHO5MJzyaVPfQlj6fvt40vQwRRmHPR/9rWPy1mUmcRwJrEMPHkTKVt6hrO/o 0xwq2bO7MsemzR9+Q3Hw2T0vvPWbXUW70n9KGkUGqFPME16nQCagDs1vtUk0BfDphZ5UnZ he+Oh9Bntv104fkVk4C90ZHJfLTlyxhx9GqhxahdSLlptj4nOCRwgYKDOz42+rmauXHmJ7 n1oc0TW7U2K7M/CVQVIMOsxYbhn8L7QgL4vfebTHpueDc4Caw0ISlEU6TQKgTg== 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 4PQ5Fx74vCz19LZ; Mon, 27 Feb 2023 03:14:45 +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 31R3Ej8J056074; Mon, 27 Feb 2023 03:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31R3EjIB056073; Mon, 27 Feb 2023 03:14:45 GMT (envelope-from git) Date: Mon, 27 Feb 2023 03:14:45 GMT Message-Id: <202302270314.31R3EjIB056073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: eba26d0ba37e - stable/13 - ctf: Remove unused function prototype for getpname() 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eba26d0ba37e647572b3ec285352f778ef0ec9f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=eba26d0ba37e647572b3ec285352f778ef0ec9f0 commit eba26d0ba37e647572b3ec285352f778ef0ec9f0 Author: Zhenlei Huang AuthorDate: 2023-02-26 04:18:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-27 03:12:48 +0000 ctf: Remove unused function prototype for getpname() This function prototype should have been removed along with the implementation. Fixes: 3dd552426409 ctfdump: Use getprogname() MFC after: 1 day (cherry picked from commit f8e1aa85fed08d5f689cb36d65a76d191f6500dd) --- cddl/contrib/opensolaris/tools/ctf/common/utils.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.h b/cddl/contrib/opensolaris/tools/ctf/common/utils.h index 99378bb4f251..6918bdab89aa 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.h +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.h @@ -42,8 +42,6 @@ extern "C" { extern void vdie(const char *, va_list); extern void die(const char *, ...); -extern const char *getpname(void); - #ifdef __cplusplus } #endif From nobody Mon Feb 27 03:15:58 2023 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 4PQ5HL2T9vz3tDvl; Mon, 27 Feb 2023 03:15:58 +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 4PQ5HL1z0Hz3N8H; Mon, 27 Feb 2023 03:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677467758; 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=XyO9trR4/A3jw7s3FZZGer45Bpz6/k0mRk4vYeWN+qw=; b=R61pyCtPoKsWwc/d3cxHQExCNxV9WznuxKkfZ/zH372j4qemtpf0UmhPT8XySfHgmt4ntx vKIe1BsmisiAARivT+SqIu/U7g0Ag6sDfkfVBf6w3rqcyu33BNBuY++mXFMKORI/nQ/hb1 HqbonqUI9hXTi2QH2JPeKhnKp5v5q1mRG4SD5WgWY29fgmr9+Qi3RPBEWt+ydBEkZaH4aF LcmjHC8kg3VmiN34sfZcDs7JjJSgaUYIrdXdnqDxKQJdfakpBzdq2veN8TatmZlW+Fj4DY XosPztgIq6YKtiJjmWDFzsLPHOnHsVoKRPO6TCOzxfiiChnfcBOdRMpJgcVQ5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677467758; 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=XyO9trR4/A3jw7s3FZZGer45Bpz6/k0mRk4vYeWN+qw=; b=nVBoFacS9s8rhiT/Qxg1sQzUAJRU43ck4OS3opO0hTJqCCyBDujWRROBibN1NxyxAyUGYB K4cSpB2VB/t9IHJF066R0r/qL8JVyMdhz7F9bvpnzKvdgM3bkKj8pfdp05fxXl6XHdsgt0 0wxLFfzQqPTyh5ybI2nw2s4aJoyYl2D0VI8rmVwnkv4AtQ03PDsYl/MJU/PUANwwnP7al+ 7Eh9UtR/SIb3DxlehBuVyQb5Xz+lhmR6+0N7GyT7RTL+CfvxU/ZvmqkUFXEPfXKu2JSc9A S/+Vz3yhsVdw7du9B1Hhg3N2ZP30FkPIb7PLCMyEagpmaPaa5MRqd19mclG7JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677467758; a=rsa-sha256; cv=none; b=oAbDu+wYc0f/IVZC1siF7n58vK7Wmzm5uAS8fVp3j50R7hp/mGnND6I92pP+9+024bJJ5x NqhxGuItSwhuAGwwtKrnEApr+W/iC1CPi/pHATkjYaojBYQrCi18V82Pj2Q/rSxiOWTLGT 3Q9rGngTJkj6Chp4U73VQ/GcbOGswfhDa24YUfIALPXEN3mgoBc1855DJKD9mkGXQft4Wk MTi+DGmxzK+Q6ghlZGAA2F8qImZBViQfa9l/+7g2hws6rsabrngUX4ainy4HZsEz5B4nCL V/MVhWf7nZl92SwfNZlvcGpfEDA53ZJ+IIBqu56Ve1L9FFL+62Gh0S5j8v+x5g== 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 4PQ5HL11Q6z19gv; Mon, 27 Feb 2023 03:15:58 +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 31R3FwXu056457; Mon, 27 Feb 2023 03:15:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31R3FwQU056456; Mon, 27 Feb 2023 03:15:58 GMT (envelope-from git) Date: Mon, 27 Feb 2023 03:15:58 GMT Message-Id: <202302270315.31R3FwQU056456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2bd7bd0bbe79 - stable/12 - ctf: Remove unused function prototype for getpname() 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2bd7bd0bbe796f3d538923d9f59de66a5694260b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2bd7bd0bbe796f3d538923d9f59de66a5694260b commit 2bd7bd0bbe796f3d538923d9f59de66a5694260b Author: Zhenlei Huang AuthorDate: 2023-02-26 04:18:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-27 03:15:00 +0000 ctf: Remove unused function prototype for getpname() This function prototype should have been removed along with the implementation. Fixes: 3dd552426409 ctfdump: Use getprogname() MFC after: 1 day (cherry picked from commit f8e1aa85fed08d5f689cb36d65a76d191f6500dd) (cherry picked from commit eba26d0ba37e647572b3ec285352f778ef0ec9f0) --- cddl/contrib/opensolaris/tools/ctf/common/utils.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.h b/cddl/contrib/opensolaris/tools/ctf/common/utils.h index 99378bb4f251..6918bdab89aa 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.h +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.h @@ -42,8 +42,6 @@ extern "C" { extern void vdie(const char *, va_list); extern void die(const char *, ...); -extern const char *getpname(void); - #ifdef __cplusplus } #endif From nobody Mon Feb 27 04:05:58 2023 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 4PQ6P80X0Yz3tHQW; Mon, 27 Feb 2023 04:06:04 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQ6P65mmgz3Qp6; Mon, 27 Feb 2023 04:06:02 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 3.97.99.32) smtp.mailfrom=cy.schubert@cschubert.com; dmarc=none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id WLujpgbzmuZMSWUm1p5Nyg; Mon, 27 Feb 2023 04:06:01 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id WUlzp7MwvyAOeWUm0p0pj5; Mon, 27 Feb 2023 04:06:01 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=63fc2c29 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=m04uMKEZRckA:10 a=B8ibFTVmAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=4fO6pwKum5zzkLsr_NEA:9 a=CjuIK1q_8ugA:10 a=xvSgdcfEVHFitugM1GHH:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 52C7D5C8B; Sun, 26 Feb 2023 20:05:59 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 2CCD6658; Sun, 26 Feb 2023 20:05:58 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Colin Percival cc: Cy Schubert , Zhenlei Huang , Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" , re@freebsd.org Subject: Re: git: 26ba9518ffec - stable/13 - unbound: Vendor import 1.17.1 In-reply-to: <010001868ffe0ff1-0859a410-c83d-4924-9ecf-23ddbb2aeb67-000000@email.amazonses.com> References: <202302141833.31EIXkwO001829@gitrepo.freebsd.org> <2AFA7DFF-388C-4C6C-8CF3-9B9FAC95BF14@FreeBSD.org> <010001868ffe0ff1-0859a410-c83d-4924-9ecf-23ddbb2aeb67-000000@email.amazonses.com> Comments: In-reply-to Colin Percival message dated "Sun, 26 Feb 2023 23:10:37 +0000." 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=us-ascii Date: Sun, 26 Feb 2023 20:05:58 -0800 Message-Id: <20230227040559.2CCD6658@slippy.cwsent.com> X-CMAE-Envelope: MS4xfKsKUbDO9KUDnoYzbKIaaQagoaED+QYFF0WsRPCsYBL4+gST/uB97zgQoQXg5Ky9R7InGylP8aJgSBulr/OIu/FkuhZzwpApy1n7VRny0n20WXr93ZSt 3OhPboF8HpaEQ0Cpd7v/kwN8J1HhRywFxZHJBfFP0+a+mRsAwYwuY9hQU+2CUqZNpUgN4c4myPFENhSbC5EYOUCjYORcb62GMf3eXoaZhG/WPKYgnDlr27sR awBu+BrZ90OKLpTE4E0Bwo9w5fxxsdLTXkZe5+b6hHURgbx70k9/3/hZovZQqHqzAmKG9mKCbjHUykEsEZPrOgRTxF3sgRncFjLqS5NhfJhesAu/BwOq6Iuw UMj3YJC/kPPoQQ25qhfgF5Xdht0dxA8h2TRIaNNMVwJnp1w7TWj+PoYyyeHeeT2LPBxevlRA X-Spamd-Result: default: False [-1.80 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MV_CASE(0.50)[]; RCVD_IN_DNSWL_MED(-0.20)[3.97.99.32:from]; MIME_GOOD(-0.10)[text/plain]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_COUNT_FIVE(0.00)[5]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-branches@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; R_SPF_NA(0.00)[no SPF record]; RCPT_COUNT_SEVEN(0.00)[8]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[3.97.99.32:from] X-Rspamd-Queue-Id: 4PQ6P65mmgz3Qp6 X-Spamd-Bar: - X-ThisMailContainsUnwantedMimeParts: N In message <010001868ffe0ff1-0859a410-c83d-4924-9ecf-23ddbb2aeb67-000000@ema il. amazonses.com>, Colin Percival writes: > On 2/26/23 10:20, Cy Schubert wrote: > > On February 25, 2023 10:45:37 PM PST, Zhenlei Huang wrot > e: > >> Will this been merged into releng/13.2 ? > >> > >> RC1 is coming, as per the release schedule https://www.freebsd.org/release > s/13.2R/schedule/ . > >> > >>> On Feb 15, 2023, at 2:33 AM, Cy Schubert wrote: > >>> unbound: Vendor import 1.17.1 > > > > We will need to as the Release Engineer, as MFS to releng/13.2 is not my de > cision. > > In general yes, it's better to have newer versions of "contrib" code in the > release -- among other things, it makes it easier for secteam to handle any > security vulnerabilities. > > That said, I haven't looked at what has changed in this version; if there's > some reason you don't think it should be merged, I'll absolutely trust your > expertise here. > > So I'm not going to ask for this to be merged to releng/13.2, but if you'd > like to do it (in the next few days!) I think it's safe to say that you can > expect it to be approved. ;-) I'll make a formal request first thing tomorrow morning. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Mon Feb 27 08:59:07 2023 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 4PQDvH3PLtz3trBt; Mon, 27 Feb 2023 08:59:07 +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 4PQDvH2x7rz45Lh; Mon, 27 Feb 2023 08:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677488347; 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=d5+GXXqQLbKgwNXSn4iIHgB9LJkh+Qb39MX4aCWstNk=; b=qV9g/ig84Yu5eH2Vv9c+VShca9TKaxoipO7grElSSwsFf7s6fjlfz5hAZMUnuA3MsJDfNI fxLiKsiggVvCCUMS0PbkNr27yh1OErP/h8SLh87QQOxCogZBzoC3CM59gxbRWZsppkgzBP 2C5s2RoVBoPak0z4FIeCOTphpxih/lRtUqH3XUa57U0cLtXObYaeMcpdZfs3p+dyeemMr7 EQUPo4tuAmhTeWk4ODb+gUaifdsAZRYD43rhGL4RHVShvXLdhlfvkfvkevmN13xZmDVK3T JH9evmJpN7BySgwAnvXpatvRK70I1gT1xhBb16pX+ZDfgBAemP9aLnXHifbgsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677488347; 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=d5+GXXqQLbKgwNXSn4iIHgB9LJkh+Qb39MX4aCWstNk=; b=GX7SsaBlNMmG4YnWvLeFkGe11CeQTroskYVm+ZtdJAupkDaHg4FAtuBWtjQTgrhYcrfZhe szIZ/t3zV7FHGYo2DBiww+c/+Q53hkh26YPm7Lc0/hWFLdH7hEkb26pXMxcEeo6EbtNdsn RzUDacnbk3KRaDPmK9RUin6M7x+ZN46lxpqMpFUV7+eTY67YFDZMLiyxvnUFoIQkKtnjH4 gEu8yMQGCubbHMnPbXZdz/LPRat2SYaenSgZ/tvtAwSe2CopdB6p/tF73N5XsYbawRjQxo zp3yMwDDYRusZSW5Jbc/u0K5H32K/Pn639xq+iV7MT9GAgpZNwLQ3rQt3HxhWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677488347; a=rsa-sha256; cv=none; b=HWovlvmZh3Vx7N9ZvpaCCzcjQ9cO6wkEo2ABYjxJ5m2G8Ftd+lkQN8oglT+6lkHe1V3VjR 29hQrXC15m9XczbgHuss070y/aOEafiBjK5BvFqDoR3kmzvamYbtnaOi59stofYUg8bl7P R4Yjsw0ByrR9B0aGrRlU2G0MAknvE7Ht2qP0dmbT4Avx5qzlvY9i9fR5XrDe44bbpu+7oE fsuA5x4hLvaBOQZC09bMy3ySMVr0IE68zm3U1ZhO5jsklz4G0lRgO8ltzill1prooob2HC E5DiF0MNTH8oAdJr8F6DTRBIuVgVR+45scywvIwbKSP+nUBMBnc0huhjb3hQsg== 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 4PQDvH1vSkzL1s; Mon, 27 Feb 2023 08:59:07 +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 31R8x7YC011900; Mon, 27 Feb 2023 08:59:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31R8x7rB011899; Mon, 27 Feb 2023 08:59:07 GMT (envelope-from git) Date: Mon, 27 Feb 2023 08:59:07 GMT Message-Id: <202302270859.31R8x7rB011899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 30ae823b2d44 - stable/13 - arm ti: Fix a typo in a kernel message 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 30ae823b2d44e35b7e0d719716397175d996073a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=30ae823b2d44e35b7e0d719716397175d996073a commit 30ae823b2d44e35b7e0d719716397175d996073a Author: Gordon Bergling AuthorDate: 2023-02-22 08:43:49 +0000 Commit: Gordon Bergling CommitDate: 2023-02-27 08:58:20 +0000 arm ti: Fix a typo in a kernel message - s/adress/address/ (cherry picked from commit 49bf65be44adc3fbcc64a672530e52afb5cf5555) --- sys/arm/ti/ti_sysc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/ti/ti_sysc.c b/sys/arm/ti/ti_sysc.c index b16158aa5d83..3b1569270c92 100644 --- a/sys/arm/ti/ti_sysc.c +++ b/sys/arm/ti/ti_sysc.c @@ -340,7 +340,7 @@ parse_regfields(struct ti_sysc_softc *sc) { sc->offset_reg[prop_idx] = sc->reg[prop_idx].address - sc->sc.ranges[REG_REV].host; - DPRINTF(sc->dev, "reg[%s] adress %#jx size %#jx\n", + DPRINTF(sc->dev, "reg[%s] address %#jx size %#jx\n", reg_names[idx], sc->reg[prop_idx].address, sc->reg[prop_idx].size); From nobody Mon Feb 27 09:21:36 2023 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 4PQFPD3Vy4z3ts8n; Mon, 27 Feb 2023 09:21:36 +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 4PQFPD34pZz46P0; Mon, 27 Feb 2023 09:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677489696; 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=mrE5NT6Hj3B5rcdYjvoBg58cD7Wgc+UQbQy5zHm6CqQ=; b=qcoTrV1GmwG3qQj/3cZt76aXeCqnQUaADJT6+uv2PofZyv5S5mpw5KzExLW4RoGcF99sQB KQ6T0uV2LfqVBIAblnNCBAtVDjG4siWVwvOYcOmsKcmXD5DePqzvWpvVM5rs+V2SPKPMl+ RCtHk9xARHSEnIUGfCgyWtDxUm+Gfu0nJraP3I6+xz9cZYwJmS2crGKy1sWr8U5Jjd9VKR OZ6spwV3vEs51IgUrCNyKTIqSWWqpWnu2iQnXh7KmBJF+oZGgTddvNNGVA7gwDxxiQ+/gg mWTyaKOGO7H2E3l6yWqVGtaAiatbsJTSu/nwXm2UlWqFOcst015oJDkUbP7I6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677489696; 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=mrE5NT6Hj3B5rcdYjvoBg58cD7Wgc+UQbQy5zHm6CqQ=; b=MPmXqiYXiSvlE+LX2gWzIgN+Ah1irURDnMZyCm8RGL2Av5Wq+xz9jvdYlUA92ct2FcNa6q SPY1JKeQaz4Z6KYQZwr6ysmmVqA4O20ex5KHzOV5vjeXOKMq8HMhcu7G1iAzvIjSq0qq5Y OpstURqs2jNCRzwnIlmsBGLBMcoUfE5esxl/IOHJQMn9WY9ZyCVvpDUdEWKZWTriZFhSsG kF0M3Vb8w4XUicFEtQb3+iPgmEa7KpVTJ72DAtRJnvD0yxc+p0DiXTQ9ILeQeaW9fQKpOu xuDpgup/GZFAgXc0RIU7orMnn5L1tCcycLKCEz5pBrIKRYrTsb1JQExpChjmqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677489696; a=rsa-sha256; cv=none; b=uoDW4YaCKvY1HCpIpG90zO2xaRw6fCoy+S2yP3mzpo51rR0q+koAWeKNbNFzjNaAPNP4pe blWsAAJ3cQ6/G5f94LrMjb/WW8kbLCPJ7OQXeCyKbxdAnKg3AG9AYDTSwS1BVesv2dB8kY o482FSAOcWu4xm0ao02+YQjqBlyiI0H8ap9Mga6C2+yGsXimEBSV62MHJtxKE7z0103yDz NOw6MInBUzAm3Nbc4BunXeCUmTPfddfkZTeyCY5PRchzr3phSnn+QHLx9nWAUOMh2WvbIG f9F4Ekd2HPOp0b8rrdoe+P1eEJWs0bHbDMAmcInOKPFX2zhYYuAo9dqrm0K2NA== 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 4PQFPD295BzLdY; Mon, 27 Feb 2023 09:21:36 +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 31R9LaXp059750; Mon, 27 Feb 2023 09:21:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31R9Laij059749; Mon, 27 Feb 2023 09:21:36 GMT (envelope-from git) Date: Mon, 27 Feb 2023 09:21:36 GMT Message-Id: <202302270921.31R9Laij059749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 0196b0944430 - stable/13 - Update leap-seconds to latest leap-seconds.3676924800 (expires 2023-12-28) 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0196b0944430916d5aaf0bb87571626b391c3138 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0196b0944430916d5aaf0bb87571626b391c3138 commit 0196b0944430916d5aaf0bb87571626b391c3138 Author: Dimitry Andric AuthorDate: 2023-02-24 12:17:16 +0000 Commit: Dimitry Andric CommitDate: 2023-02-27 09:21:16 +0000 Update leap-seconds to latest leap-seconds.3676924800 (expires 2023-12-28) Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800 MFC after: 3 days (cherry picked from commit df2fbbfa71b8ecc9e9e75ce85a635aade9c691cb) --- usr.sbin/ntp/ntpd/leap-seconds | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ntp/ntpd/leap-seconds b/usr.sbin/ntp/ntpd/leap-seconds index 0f43115c8e53..17e3a100f943 100644 --- a/usr.sbin/ntp/ntpd/leap-seconds +++ b/usr.sbin/ntp/ntpd/leap-seconds @@ -204,10 +204,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C63 -# File expires on: 28 December 2022 +# Updated through IERS Bulletin C65 +# File expires on: 28 December 2023 # -#@ 3881174400 +#@ 3912710400 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -252,4 +252,4 @@ # the hash line is also ignored in the # computation. # -#h 732b2044 5863a938 b7e43179 1339c710 ded63837 +#h e76a99dc 65f15cc7 e613e040 f5078b5e b23834fe From nobody Mon Feb 27 10:36:08 2023 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 4PQH3D5CKvz3twW0; Mon, 27 Feb 2023 10:36:08 +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 4PQH3D4mVrz4Ddc; Mon, 27 Feb 2023 10:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677494168; 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=IcHJscc1EtsG0tAjNj0wlzMqQ4jnyeMphyc9UGdoQ1U=; b=y22tmo160tYOOX4AH3KgfuHLTgJc5Oq2Wsit8XEQVMubmF3+emEA3H/pSdIn8h+yqbrFY+ 5t4E7IzwzC5jXy1e2qSVQ8+OTgjuxSgFc7oOoeGc8tt9POMbADynwV5nC0tIITBldULNpG +BiTLwhoops1UQQvPpE5NYykfoZE3qtca72wBaQn7XjnSitOkQnw2yYsYXFRgqgeBmi1Gw g6+17PVdnCTiIWEORr9azAnoFGKYYCSiyh65YncDkLXLv8DOXSk/WhEc0VUIZ+J8qNXaUH e9lWhkyKcAOEGE4VWxXmWydi8rLJoZSvRbhqNvDOLxdj+TO5T8RtL//+eW067Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677494168; 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=IcHJscc1EtsG0tAjNj0wlzMqQ4jnyeMphyc9UGdoQ1U=; b=H6CHM6mBVdQsyQFtc6uQ8s0b8AVQUM/+tzsSTlz7xWHQ9ETqo8TOeMp8NirlwjSDFddnT8 tP2vtQUsRx+Go73vLIWgx8lUkuAQ/S318w5bx5qzmcQVbVVTBxiFtq76guafE0EaUBla/B tWCPctM6WRPsWA0E7eSWUJ/uF8nhYiVRstCw3aZno7levN+4gmUpfZAaJhWBalS+B822TQ jpsIwX+Rui6wL/QREBscnYRgxg2PH5sAgnxjW4fzgVARrZfv41eiUXAYZtFYzZdRWapUJr ntJc/86z6zAUbfghuNL0majK5nNajcVGG1kQpFe4K1pEusec8AFvZ2Eq7nVV5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677494168; a=rsa-sha256; cv=none; b=ThVbHWLGmIDWOmWxu+vCcg7jQ7IVS0HxDoenBUuZaVOzT7hd6CGPf5y00opN7xrkLbgic/ rIH/qSYw0yE5mL23D21bcM63CmDwKScXAsMocLGIyBslCiMBPsprHzRobR0j+fAwtmbF6p jZ0u9IKm7CEAd1PXbjJKQGnwrHNPjTDnb2sHnlbWRUukQFpef3KU8VV8qMQqvDtRlkQ43/ 8YtXRmI5TauX2m3y8ZFk1XcZS0Q55/EKtPAXLedqDIF59bsI6FpvhbtAwyMH7mDzKuIRjJ JKQoCIjWKm6k9vIo+c58uVV/4i/B1JFrgTItCrUcsoj6J6NzJobSzdlsU6RPig== 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 4PQH3D3scBzNBk; Mon, 27 Feb 2023 10:36:08 +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 31RAa8Bx075575; Mon, 27 Feb 2023 10:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RAa84w075574; Mon, 27 Feb 2023 10:36:08 GMT (envelope-from git) Date: Mon, 27 Feb 2023 10:36:08 GMT Message-Id: <202302271036.31RAa84w075574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: f054a56ef3e8 - stable/13 - netlink: fix addition of blackhole/reject routes. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f054a56ef3e8dc30ba0904d43cf7ec7b3e6e0ed4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=f054a56ef3e8dc30ba0904d43cf7ec7b3e6e0ed4 commit f054a56ef3e8dc30ba0904d43cf7ec7b3e6e0ed4 Author: Alexander V. Chernikov AuthorDate: 2023-02-23 17:38:18 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-27 10:29:53 +0000 netlink: fix addition of blackhole/reject routes. * Make nhop_set_blackhole() set all necessary properties for the nexthop * Make nexthops blackhole/reject based on the rtm_type netlink property instead of using rtflags. Reported by: Marek Zarychta MFC after: 3 days (cherry picked from commit d2deebe21b591336fbd8915b37d409b25da54d4d) --- sys/net/route/nhop_ctl.c | 23 +++++++++++++++++++++++ sys/netlink/route/rt.c | 28 ++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index d042d9519f6b..390e5eddd496 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -822,6 +822,29 @@ nhop_set_blackhole(struct nhop_object *nh, int blackhole_rt_flag) nh->nh_flags |= NHF_REJECT; nh->nh_priv->rt_flags |= RTF_REJECT; break; + default: + /* Not a blackhole nexthop */ + return; + } + + nh->nh_ifp = V_loif; + nh->nh_flags &= ~NHF_GATEWAY; + nh->nh_priv->rt_flags &= ~RTF_GATEWAY; + nh->nh_priv->nh_neigh_family = nh->nh_priv->nh_upper_family; + + bzero(&nh->gw_sa, sizeof(nh->gw_sa)); + + switch (nh->nh_priv->nh_upper_family) { + case AF_INET: + nh->gw4_sa.sin_family = AF_INET; + nh->gw4_sa.sin_len = sizeof(struct sockaddr_in); + nh->gw4_sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + break; + case AF_INET6: + nh->gw6_sa.sin6_family = AF_INET6; + nh->gw6_sa.sin6_len = sizeof(struct sockaddr_in6); + nh->gw6_sa.sin6_addr = in6addr_loopback; + break; } } diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index dabdaea3e03b..badd8d937be2 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -458,6 +458,7 @@ struct nl_parsed_route { uint8_t rtm_family; uint8_t rtm_dst_len; uint8_t rtm_protocol; + uint8_t rtm_type; }; #define _IN(_field) offsetof(struct rtmsg, _field) @@ -481,9 +482,10 @@ static const struct nlattr_parser nla_p_rtmsg[] = { }; static const struct nlfield_parser nlf_p_rtmsg[] = { - {.off_in = _IN(rtm_family), .off_out = _OUT(rtm_family), .cb = nlf_get_u8 }, - {.off_in = _IN(rtm_dst_len), .off_out = _OUT(rtm_dst_len), .cb = nlf_get_u8 }, - {.off_in = _IN(rtm_protocol), .off_out = _OUT(rtm_protocol), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_family), .off_out = _OUT(rtm_family), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_dst_len), .off_out = _OUT(rtm_dst_len), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_protocol), .off_out = _OUT(rtm_protocol), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_type), .off_out = _OUT(rtm_type), .cb = nlf_get_u8 }, }; #undef _IN #undef _OUT @@ -828,13 +830,23 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, nhop_set_mtu(nh, attrs->rtax_mtu, true); if (attrs->rta_rtflags & RTF_BROADCAST) nhop_set_broadcast(nh, true); - if (attrs->rta_rtflags & RTF_BLACKHOLE) - nhop_set_blackhole(nh, NHF_BLACKHOLE); - if (attrs->rta_rtflags & RTF_REJECT) - nhop_set_blackhole(nh, NHF_REJECT); - nhop_set_rtflags(nh, attrs->rta_rtflags); if (attrs->rtm_protocol > RTPROT_STATIC) nhop_set_origin(nh, attrs->rtm_protocol); + nhop_set_rtflags(nh, attrs->rta_rtflags); + + switch (attrs->rtm_type) { + case RTN_UNICAST: + break; + case RTN_BLACKHOLE: + nhop_set_blackhole(nh, RTF_BLACKHOLE); + break; + case RTN_PROHIBIT: + case RTN_UNREACHABLE: + nhop_set_blackhole(nh, RTF_REJECT); + break; + /* TODO: return ENOTSUP for other types if strict option is set */ + } + nh = finalize_nhop(nh, perror); } From nobody Mon Feb 27 10:36:09 2023 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 4PQH3F5plWz3twlB; Mon, 27 Feb 2023 10:36:09 +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 4PQH3F5PK0z4DkN; Mon, 27 Feb 2023 10:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677494169; 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=r1o0dURGpUJhIWnHiBmOfsnNwMKX2jxRobJ9NDDI4ak=; b=ALmapi651ua13mk2x78f0s69CnxD9PyrFTSXr1JdBp7hhSn4oO+oA0V2UHPigVVN2tLzGz sgQ+J+6+5Qf4R4iCNH71a4pEBVyRkyUSqL8xCl+oHkvugSZG9IqdewlDOEpqrMJmkuxV8i LRkxZ0lAwSVDTyJQ7W5Dlg1IZ3tW/FIxdh+2RwouNeUL1Nd82Mt2DwQSRUjCgw6OGc9s1/ 5m1BfsYHv2vKLFAf0dc+kasKOiMscVjHABhtvf1/qFHPkwfvIZe8zfkSu918THC/pUi1EC 1XpIYON4o4vrbl8PlhNiCa3o5ahU3jk0YDj6NlNutLuxGOtxkiiilgpoqIeThw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677494169; 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=r1o0dURGpUJhIWnHiBmOfsnNwMKX2jxRobJ9NDDI4ak=; b=h4R/JWX7wS9qEGg+7BywYKpk2q4sTBpKdhQA6/RmJ/zdyUKq9G1S57zSVdJIR0Cp5RxdrB h3ENFPzZJmmSbHyrinuzfiy80b9pqy9+qM++x6EqGybVzctjn8csk+BX1Yo7myZiqEJKGp iPEwPO4cqpBG0Zs5PvfReZeChfEb80sRmL7LKgaREaxkBCNOEPZG9PRzKSzulaxcmWkGpo kNoPzOx/rGpYkYJrh1/l164yNn0+N/IAMOogF4pKCnb38ZfsMkz9eMkHo4Vh8KDUlshVZr +mkwqcTmJY2JbOzkWvkNgcU17/ENucYIU8NWHKCKAJ1xudmJAgsrg0Qail5sTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677494169; a=rsa-sha256; cv=none; b=rt0kWkWlPA6fIaR6hBhDcsaEixjwjnWrcT6vloWFfb5pPCB1/ntZ8sYh+kJ0wgPJT8Q2Hb Kwx6MnJ/c2W1GnocR7FuZ3Vn7H9/YA6rIPfveIJxT1ePl4yunZ6S7GhONHz4SfPqxNHer/ B96mfAWWwOhMJoWkEbwOR6G9lTeUxxcTRLXTLRbxrSI3vQXMl/D/TagTn29ZhljK2ZcPvA pOJgRVmA11qURLHhE4CPd5DnBkGrU0JCEn8id25b58ozerus7Gs1mXmdzZ50I4hc43gUTs aMgoe4+ZjSDd7Mislp+VJzBy0M1K4oS1Luvj90/oadDQuVM+IAr2JBw+wWyEzA== 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 4PQH3F4Tb8zMcC; Mon, 27 Feb 2023 10:36:09 +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 31RAa9pB075598; Mon, 27 Feb 2023 10:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RAa9JU075597; Mon, 27 Feb 2023 10:36:09 GMT (envelope-from git) Date: Mon, 27 Feb 2023 10:36:09 GMT Message-Id: <202302271036.31RAa9JU075597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 7af6e00d62f3 - stable/13 - netlink: fix NOINET6 build. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7af6e00d62f3ba75c91146015724b44a05567efe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=7af6e00d62f3ba75c91146015724b44a05567efe commit 7af6e00d62f3ba75c91146015724b44a05567efe Author: Alexander V. Chernikov AuthorDate: 2023-02-24 10:19:12 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-27 10:29:53 +0000 netlink: fix NOINET6 build. Reported by: Michael Paepcke PR: 269787 MFC after: 3 days (cherry picked from commit efeb8003117073d29bf82c8a69e036b8dbd78352) --- sys/net/route/nhop_ctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index 390e5eddd496..b92977ca42b0 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -835,16 +835,20 @@ nhop_set_blackhole(struct nhop_object *nh, int blackhole_rt_flag) bzero(&nh->gw_sa, sizeof(nh->gw_sa)); switch (nh->nh_priv->nh_upper_family) { +#ifdef INET case AF_INET: nh->gw4_sa.sin_family = AF_INET; nh->gw4_sa.sin_len = sizeof(struct sockaddr_in); nh->gw4_sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); break; +#endif +#ifdef INET6 case AF_INET6: nh->gw6_sa.sin6_family = AF_INET6; nh->gw6_sa.sin6_len = sizeof(struct sockaddr_in6); nh->gw6_sa.sin6_addr = in6addr_loopback; break; +#endif } } From nobody Mon Feb 27 13:28:17 2023 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 4PQLst03pDz3v6n9; Mon, 27 Feb 2023 13:28:18 +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 4PQLss6ggQz4QdL; Mon, 27 Feb 2023 13:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677504497; 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=0pK/MktQvdozYyKrjZZOWA17Whzr7PcrMRqyXd3Id6Q=; b=CS7fhlXi2z4E9sXQWzFCdP/ik6NOcwb+3wDD8/cc3dsq7uc+mPu/Q6NsTOzxXZa5Fo4Own RXHZQKmQOtmzY0zWy24lVe2DU6D5gEQYQrD+XXInJX82gSAhJVZGdQufRs5l1YlExS5BFO NM9mGxE3DbyTJuHiy1ToaRcA5QmPFzld/KKYmhexcGAYR4l4c0L3texmq/W12YUbNUD4ay Do/ZUkTk5Z1nJ26jMgnTjWy4MKyz3pNkY/ObytNTrLapDEgemV2IWOfMxiOuBlAgaNb1tg kMJrdAtHXInacwgQ5uV4gJz3hmZnmWYz1Mbn1kEVoP4VM/EYv7hpduUwAEw8eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677504497; 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=0pK/MktQvdozYyKrjZZOWA17Whzr7PcrMRqyXd3Id6Q=; b=Sqix+2YZuTCbYXfTHCDMmenH0neG+tdEOGBXAqR1eVXd2ZvRyzX3behxeNob/vcpR/HQzF bQhL7/jpYUW14NzHYcx38DMb2KdYvi7meBmQlelpAe5UbJXfkudcmON5bN37Et6yux8N4I pNkC78AcUXxCAwlye8VXjpoAXCEiQQLxIBX6A5VPtj8wPpAzEClwZGE2LPDcTWmS9Ah/TA FrA+xw2kFZAexZRMOedj91yX2FgGZRdF9Z3r9kqaDrGOG9CvXle0YWej6Bq6UQARMRaSzj kCfD18/WlfSUxpAfzKnVFdkuO6Jf6MlgHyYoQDD71vn8X8X6Ph1PEFgUiOaRIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677504497; a=rsa-sha256; cv=none; b=MkyZysfpBTepl8oxCFWKGmy6MBoZg97wdjY2c84zT+eV2taq909lVC2raPzr22UrbVesj3 qsuMYJ+UqQrg+exSpF1pebUR1V6eiJNnY3EKyUgIlngIrtyWCY8tVM5d1sbuRTAebRRUed CDW8gZSGdKrqAti+qnRspj2csTvMqCBVBaDektJ7lqFp9BrwkwcgxIOfE8leab2hbH57oe Zhxiuh0Y7vD2lxzQtNDvN6bDIjw5dwRnW9wt9WrExgFYgoosNTMktuSEYQxeUtblk59vzA Ds2XOYm4rlhtZvWQN5UD3C+OyyG0oFnfe0NoP+LEmGO8MvZb+NfddWuiebcLVQ== 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 4PQLss5RsTzSM8; Mon, 27 Feb 2023 13:28:17 +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 31RDSHGt056228; Mon, 27 Feb 2023 13:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RDSHfd056227; Mon, 27 Feb 2023 13:28:17 GMT (envelope-from git) Date: Mon, 27 Feb 2023 13:28:17 GMT Message-Id: <202302271328.31RDSHfd056227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2f57ef2d3b8f - stable/13 - vm_fault: Fix a race in vm_fault_soft_fast() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2f57ef2d3b8f776a28e195cd780a3bb4924570be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2f57ef2d3b8f776a28e195cd780a3bb4924570be commit 2f57ef2d3b8f776a28e195cd780a3bb4924570be Author: Mark Johnston AuthorDate: 2023-02-13 21:24:40 +0000 Commit: Mark Johnston CommitDate: 2023-02-27 13:22:33 +0000 vm_fault: Fix a race in vm_fault_soft_fast() When vm_fault_soft_fast() creates a mapping, it release the VM map lock before unbusying the top-level object. Without the map lock, however, nothing prevents the VM object from being deallocated while still busy. Fix the problem by unbusying the object before releasing the VM map lock. If vm_fault_soft_fast() fails to create a mapping, the VM map lock is not released, so those cases don't need to change. Reported by: syzkaller Reviewed by: kib (previous version) Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D38527 (cherry picked from commit d0991948182a1a149ee84f1b9c4d3e30450c8f0b) --- sys/vm/vm_fault.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 605cf1203554..4872990c33ec 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -322,20 +322,16 @@ vm_fault_soft_fast(struct faultstate *fs) #endif int psind; vm_offset_t vaddr; - enum fault_status res; MPASS(fs->vp == NULL); - res = FAULT_SUCCESS; vaddr = fs->vaddr; vm_object_busy(fs->first_object); m = vm_page_lookup(fs->first_object, fs->first_pindex); /* A busy page can be mapped for read|execute access. */ if (m == NULL || ((fs->prot & VM_PROT_WRITE) != 0 && - vm_page_busied(m)) || !vm_page_all_valid(m)) { - res = FAULT_FAILURE; - goto out; - } + vm_page_busied(m)) || !vm_page_all_valid(m)) + goto fail; m_map = m; psind = 0; #if VM_NRESERVLEVEL > 0 @@ -370,10 +366,8 @@ vm_fault_soft_fast(struct faultstate *fs) #endif if (pmap_enter(fs->map->pmap, vaddr, m_map, fs->prot, fs->fault_type | PMAP_ENTER_NOSLEEP | (fs->wired ? PMAP_ENTER_WIRED : 0), psind) != - KERN_SUCCESS) { - res = FAULT_FAILURE; - goto out; - } + KERN_SUCCESS) + goto fail; if (fs->m_hold != NULL) { (*fs->m_hold) = m; vm_page_wire(m); @@ -382,12 +376,13 @@ vm_fault_soft_fast(struct faultstate *fs) vm_fault_prefault(fs, vaddr, PFBAK, PFFOR, true); VM_OBJECT_RUNLOCK(fs->first_object); vm_fault_dirty(fs, m); + vm_object_unbusy(fs->first_object); vm_map_lookup_done(fs->map, fs->entry); curthread->td_ru.ru_minflt++; - -out: + return (FAULT_SUCCESS); +fail: vm_object_unbusy(fs->first_object); - return (res); + return (FAULT_FAILURE); } static void From nobody Mon Feb 27 15:58:55 2023 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 4PQQCg2cdrz3vHTb; Mon, 27 Feb 2023 15:58:55 +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 4PQQCg21fJz3jJb; Mon, 27 Feb 2023 15:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677513535; 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=UIS4OFVUDSy8ERSIRzICO9mmXc4Hknu/vG0sKZq1OvI=; b=uMevh7U23O3Ry6THiUKw79NATdkHMjraxI2akrmff6UZ4WbzxCNNkLHp7TUDJmMAFfNwoY aBMLJx5KPM34+mHRpBH/HN/FQm3aocuGovzAI4TcgTrCb8Q9UI0AdJ6JbcxLwICEyMuJcl 1SCzBxPg7OEVyvN2syU3CY9+pw5ADEAATyV5s+pRwPeVnNz5g8H9VsOeXdrPCuU70MLhUY YBLsl/AZtNKSVs2Z+FeW70NnvIVhc3M6cO3fspjeZFr19BEob1+72I7eyyX6Pe10vc4shu DdCekiY39n35PZoigFy5hkAoKGqGumylHQt6+vmlQOqHnJv73vMkug18TAZRaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677513535; 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=UIS4OFVUDSy8ERSIRzICO9mmXc4Hknu/vG0sKZq1OvI=; b=j4ukjG7RkdcnCzo7kXnSX7RtqQ8kZJUxc54j7u6NBaPh+Hs6uifnwZ/I3Buur5s4GLl5nv C7A3qMRoHmdllL55cb0Bmgli8TYdQCictR6qn9psXaNapSwslEPcUC56fBf7q21g23Fvp6 C4xcj6VquX1NeHfLGPhmZs7JD3JX0wJKERFu4l/adhoKVqqzbIcD/yxtGJrcbwAKJKzGMb gKHEY59R7rxsrfLqV5l9dkxn6z4PEf8m0/smUzFCM7B9iOE/8fCex47ZWyUOD2db3/qa06 F0JM50pQLDyBATjqF29lbUraofN6HI/TZGO2FGK+8dQVBvLNt7+cW9Uep+JCEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677513535; a=rsa-sha256; cv=none; b=c13fuNxL29wdxL344gCbOqltt7Vv/OFi7O/rY3Tj8je3poo8ZtseH4SHT1GS+tfjgjcwip YgC8mIFUsX96zLfMJ/yMNgehdwNLEpmxNrmUdzlV6efKOS+U8i+hSRY9C1rd8jPaDR8tC9 oEtYXWLSqsfXWSPiIZ8cbxKIsQmNjOQlXPebmiRZFFefEEJ+7ZzDcWBV6Jw6zk+KYVpXy/ PG9j5MhqifczTF1xdIMxZ/9/KF1ZY6AiL2DNBrvgLVGVL30oVXyxJ0HObhYT8oUp6tTkuu PevFplUxEryjDMbRtf5IDsfM1/Lhu5YiSR4bZCYeZ7QT1//z7eeyDPSKLRsFBg== 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 4PQQCg13D8zWZx; Mon, 27 Feb 2023 15:58:55 +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 31RFwtvn002982; Mon, 27 Feb 2023 15:58:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RFwtjs002981; Mon, 27 Feb 2023 15:58:55 GMT (envelope-from git) Date: Mon, 27 Feb 2023 15:58:55 GMT Message-Id: <202302271558.31RFwtjs002981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1780bdba96d3 - releng/13.2 - vm_fault: Fix a race in vm_fault_soft_fast() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 1780bdba96d381a9e473ab15ed92009893c822cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1780bdba96d381a9e473ab15ed92009893c822cb commit 1780bdba96d381a9e473ab15ed92009893c822cb Author: Mark Johnston AuthorDate: 2023-02-13 21:24:40 +0000 Commit: Mark Johnston CommitDate: 2023-02-27 15:58:34 +0000 vm_fault: Fix a race in vm_fault_soft_fast() When vm_fault_soft_fast() creates a mapping, it release the VM map lock before unbusying the top-level object. Without the map lock, however, nothing prevents the VM object from being deallocated while still busy. Fix the problem by unbusying the object before releasing the VM map lock. If vm_fault_soft_fast() fails to create a mapping, the VM map lock is not released, so those cases don't need to change. Approved by: re (cperciva) Reported by: syzkaller Reviewed by: kib (previous version) Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D38527 (cherry picked from commit d0991948182a1a149ee84f1b9c4d3e30450c8f0b) (cherry picked from commit 2f57ef2d3b8f776a28e195cd780a3bb4924570be) --- sys/vm/vm_fault.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 605cf1203554..4872990c33ec 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -322,20 +322,16 @@ vm_fault_soft_fast(struct faultstate *fs) #endif int psind; vm_offset_t vaddr; - enum fault_status res; MPASS(fs->vp == NULL); - res = FAULT_SUCCESS; vaddr = fs->vaddr; vm_object_busy(fs->first_object); m = vm_page_lookup(fs->first_object, fs->first_pindex); /* A busy page can be mapped for read|execute access. */ if (m == NULL || ((fs->prot & VM_PROT_WRITE) != 0 && - vm_page_busied(m)) || !vm_page_all_valid(m)) { - res = FAULT_FAILURE; - goto out; - } + vm_page_busied(m)) || !vm_page_all_valid(m)) + goto fail; m_map = m; psind = 0; #if VM_NRESERVLEVEL > 0 @@ -370,10 +366,8 @@ vm_fault_soft_fast(struct faultstate *fs) #endif if (pmap_enter(fs->map->pmap, vaddr, m_map, fs->prot, fs->fault_type | PMAP_ENTER_NOSLEEP | (fs->wired ? PMAP_ENTER_WIRED : 0), psind) != - KERN_SUCCESS) { - res = FAULT_FAILURE; - goto out; - } + KERN_SUCCESS) + goto fail; if (fs->m_hold != NULL) { (*fs->m_hold) = m; vm_page_wire(m); @@ -382,12 +376,13 @@ vm_fault_soft_fast(struct faultstate *fs) vm_fault_prefault(fs, vaddr, PFBAK, PFFOR, true); VM_OBJECT_RUNLOCK(fs->first_object); vm_fault_dirty(fs, m); + vm_object_unbusy(fs->first_object); vm_map_lookup_done(fs->map, fs->entry); curthread->td_ru.ru_minflt++; - -out: + return (FAULT_SUCCESS); +fail: vm_object_unbusy(fs->first_object); - return (res); + return (FAULT_FAILURE); } static void From nobody Mon Feb 27 16:33:43 2023 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 4PQQzq4tRlz3vKXn; Mon, 27 Feb 2023 16:33:43 +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 4PQQzq3cj6z3lSr; Mon, 27 Feb 2023 16:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515623; 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=e0idSiLFArk5JQEyA8Dsfu5PNVTF6eYID5OLxME+T+U=; b=glg58RLmIE53nOA8uRxqbeKyDj0FS5gJ9CVjUHq6NJSZ+PcM/VqNf5H6Z4FwvDho2vRo1G vHrjRS+/m4FpOCbIy4wN9iTgCs8KHHBUVE+vN+YMg8fOd2kJaTOOt0r2bMAU/YxVk+3sct NsGBqIZwQZw872KmQ/ct5+TGoUc8E1JU16w9NHSoLbHZIIwqvKLfQu/jvKCX2B9P+OswvX I7g2c76Aiv5E/ows8JD/Lqi+agdD6XvJT5WJP23dPB1DBG50jWwrFejrzFb5VAmc7lWNgF JJtN9N/7dvuPYnBxLcRvo0Zd1tTwPGUtg5Qyc1cowFPdB46Q+AZNxQATinDZWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515623; 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=e0idSiLFArk5JQEyA8Dsfu5PNVTF6eYID5OLxME+T+U=; b=QxXfbXDabwJdhq82mnd8rQyi5ZYsj6aYJj/WnNInVVv8XAcAUxKhaBs1XadU+MEQiOGu+6 9bFkxwZqFo4VI4ZG1HwwMc+7FY3K6mll6X5kGnSPRWhiTEAfiRMssgGxFHoWWeEZ6zqyEM 2ggWBIwlk6ZDEemDkrTAd52pWuqQYiDRbM0/sUPwwNbzf2b5fYtuBoJM+lDxxbau9j++sX QXxV6W4C0BeNbjBA00jPBcEiGu9Yk3hjUWep+dOiYEg3PB6GYKOOWimhbW1bHLqUW+6X+/ bFH6i2Ud2g1liahk4rs6DaJgl2VOZNMcGOeeNbAWflTq+t3NZ2UHZuFKqNdK5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677515623; a=rsa-sha256; cv=none; b=e0x4ghGOTZKJlnbnf6VQGRaLwkadk+aif1aGppFf7JNcjEFZlnYnvWrM4h4hwdF6klNYK2 RcSd7IU8E9VDrAZpMUW2L3ElifdCVFZHyQijExdcMdA93fmgcfhI7FtOsHyO5NIhSL1gKy +BgG/bCZcOgcPaPrhJIx688zf3KPCAFNX5HfsBaAKTHRg0DDXhKI4g0yyHLSE9EbPmVN2R b6yktF8pkrjMG0aA2eNy+R74rN4eQB5tHRu8Jbh7FmakPT6eVJ1YrBYCU8kBi0DRKu08l1 UFXtdPqsIjsfZ1FzxV1kbNqzmvvOkNyY63sqJleO5/7axNpvL/6hwBCXPjTKCg== 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 4PQQzq2jGszYPc; Mon, 27 Feb 2023 16:33:43 +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 31RGXhk9068018; Mon, 27 Feb 2023 16:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RGXhpr068017; Mon, 27 Feb 2023 16:33:43 GMT (envelope-from git) Date: Mon, 27 Feb 2023 16:33:43 GMT Message-Id: <202302271633.31RGXhpr068017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 6899e0be9433 - releng/13.2 - netlink: fix IPv6 route addition with link-local gateway 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 6899e0be9433a2b2e3190e8642fb43910839982a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=6899e0be9433a2b2e3190e8642fb43910839982a commit 6899e0be9433a2b2e3190e8642fb43910839982a Author: Alexander V. Chernikov AuthorDate: 2023-02-20 14:24:01 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-27 16:27:16 +0000 netlink: fix IPv6 route addition with link-local gateway Currently kernel assumes that IPv6 gateway address is in "embedded" form - that is, for the link-local IPv6 addresses, interface index is embedded in bytes 2 and 3 of the address. Fix address embedding in netlink by wrapping nhop_set_gw() in the netlink-specific nl_set_nexthop_gw(), which does such embedding automatically. Reported by: Marek Zarychta MFC after: 3 days Approved by: re(cperciva) (cherry picked from commit c7c348162101a70b1f99299578dabe1d3b100e48) (cherry picked from commit 240ee0183fa190502a5e1f163c49f336f8f10cd4) --- sys/netlink/route/nexthop.c | 42 ++++++++++++++++++++++++++++++++++++------ sys/netlink/route/route_var.h | 2 ++ sys/netlink/route/rt.c | 15 ++++++++++++--- 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c index e9f008842644..63e491687249 100644 --- a/sys/netlink/route/nexthop.c +++ b/sys/netlink/route/nexthop.c @@ -741,8 +741,34 @@ newnhg(struct unhop_ctl *ctl, struct nl_parsed_nhop *attrs, struct user_nhop *un return (0); } +/* + * Sets nexthop @nh gateway specified by @gw. + * If gateway is IPv6 link-local, alters @gw to include scopeid equal to + * @ifp ifindex. + * Returns 0 on success or errno. + */ +int +nl_set_nexthop_gw(struct nhop_object *nh, struct sockaddr *gw, struct ifnet *ifp, + struct nl_pstate *npt) +{ +#ifdef INET6 + if (gw->sa_family == AF_INET6) { + struct sockaddr_in6 *gw6 = (struct sockaddr_in6 *)gw; + if (IN6_IS_ADDR_LINKLOCAL(&gw6->sin6_addr)) { + if (ifp == NULL) { + NLMSG_REPORT_ERR_MSG(npt, "interface not set"); + return (EINVAL); + } + in6_set_unicast_scopeid(&gw6->sin6_addr, ifp->if_index); + } + } +#endif + nhop_set_gw(nh, gw, true); + return (0); +} + static int -newnhop(struct nl_parsed_nhop *attrs, struct user_nhop *unhop) +newnhop(struct nl_parsed_nhop *attrs, struct user_nhop *unhop, struct nl_pstate *npt) { struct ifaddr *ifa = NULL; struct nhop_object *nh; @@ -750,17 +776,17 @@ newnhop(struct nl_parsed_nhop *attrs, struct user_nhop *unhop) if (!attrs->nha_blackhole) { if (attrs->nha_gw == NULL) { - NL_LOG(LOG_DEBUG, "missing NHA_GATEWAY"); + NLMSG_REPORT_ERR_MSG(npt, "missing NHA_GATEWAY"); return (EINVAL); } if (attrs->nha_oif == NULL) { - NL_LOG(LOG_DEBUG, "missing NHA_OIF"); + NLMSG_REPORT_ERR_MSG(npt, "missing NHA_OIF"); return (EINVAL); } if (ifa == NULL) ifa = ifaof_ifpforaddr(attrs->nha_gw, attrs->nha_oif); if (ifa == NULL) { - NL_LOG(LOG_DEBUG, "Unable to determine default source IP"); + NLMSG_REPORT_ERR_MSG(npt, "Unable to determine default source IP"); return (EINVAL); } } @@ -777,7 +803,11 @@ newnhop(struct nl_parsed_nhop *attrs, struct user_nhop *unhop) if (attrs->nha_blackhole) nhop_set_blackhole(nh, NHF_BLACKHOLE); else { - nhop_set_gw(nh, attrs->nha_gw, true); + error = nl_set_nexthop_gw(nh, attrs->nha_gw, attrs->nha_oif, npt); + if (error != 0) { + nhop_free(nh); + return (error); + } nhop_set_transmit_ifp(nh, attrs->nha_oif); nhop_set_src(nh, ifa); } @@ -839,7 +869,7 @@ rtnl_handle_newnhop(struct nlmsghdr *hdr, struct nlpcb *nlp, if (attrs.nha_group) error = newnhg(ctl, &attrs, unhop); else - error = newnhop(&attrs, unhop); + error = newnhop(&attrs, unhop, npt); if (error != 0) { free(unhop, M_NETLINK); diff --git a/sys/netlink/route/route_var.h b/sys/netlink/route/route_var.h index f1e522c7ae05..f3b1d7d929a5 100644 --- a/sys/netlink/route/route_var.h +++ b/sys/netlink/route/route_var.h @@ -104,6 +104,8 @@ void rtnl_iface_drivers_register(void); void rtnl_nexthops_init(void); struct nhop_object *nl_find_nhop(uint32_t fibnum, int family, uint32_t uidx, int nh_flags, int *perror); +int nl_set_nexthop_gw(struct nhop_object *nh, struct sockaddr *gw, + struct ifnet *ifp, struct nl_pstate *npt); #endif diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index aca69e75fea8..534186447b4d 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -736,7 +736,11 @@ create_nexthop_one(struct nl_parsed_route *attrs, struct rta_mpath_nh *mpnh, if (nh == NULL) return (ENOMEM); - nhop_set_gw(nh, mpnh->gw, true); + error = nl_set_nexthop_gw(nh, mpnh->gw, mpnh->ifp, npt); + if (error != 0) { + nhop_free(nh); + return (error); + } if (mpnh->ifp != NULL) nhop_set_transmit_ifp(nh, mpnh->ifp); nhop_set_rtflags(nh, attrs->rta_rtflags); @@ -800,8 +804,13 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, *perror = ENOMEM; return (NULL); } - if (attrs->rta_gw != NULL) - nhop_set_gw(nh, attrs->rta_gw, true); + if (attrs->rta_gw != NULL) { + *perror = nl_set_nexthop_gw(nh, attrs->rta_gw, attrs->rta_oif, npt); + if (*perror != 0) { + nhop_free(nh); + return (NULL); + } + } if (attrs->rta_oif != NULL) nhop_set_transmit_ifp(nh, attrs->rta_oif); if (attrs->rtax_mtu != 0) From nobody Mon Feb 27 16:33:44 2023 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 4PQQzr5XGBz3vKdh; Mon, 27 Feb 2023 16:33:44 +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 4PQQzr4b5gz3lC3; Mon, 27 Feb 2023 16:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515624; 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=muUVsr6Eu7AYNlZDlittFPGtliEBYlPhkpnArn9o3vQ=; b=lbxtz4Zu4P3GRbkFOlcrYm2kiE+Hj9sSAIj4DCmApY13zG+8gMQJNezDH+Gub0Mw1ucXwB gUBJDl4GzG1l8FfZMvzTQzNT7++2DS7eeeezZUMvcjKdnnelQABPGk59TSQG5lBs0TatBc 8l8yzzWPI28S6beR1Jpmx1aYKln8wYzXOrh45jJ7ydiuyPBoGTtE6cjLXwXjUfUKT72hwe VLt4RJB9bEi9W+BGCNhmEETnfPzJlFc+rA83LGUak/sphSAhiYHIcIMzp5x8KC10zdPBQ4 0GIHc6BJ1UGgo2oRSX3GsP59POVEVCYkL87s8qgC7L3vnuXPwo6Ar43Ed7ZlBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515624; 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=muUVsr6Eu7AYNlZDlittFPGtliEBYlPhkpnArn9o3vQ=; b=MwWKki1F39f2ro6VR7+e/gk3x3hr8ZItTo9i3ndFb8fmHbiLgLRD6Zvs1eCWdMG3p2rylu OkOXHYLUz7LWESdLyC4J9jcfnj82u+HHHykdymtjxCzzZdXO69A81IZh59OHQRtigZ9HqB nOqcB/KPL/3VNxoGvB1MbPtaoh48bqi6P/wCS4ztf9WM3N6PdQONHwhlkGqtu6UTUtLKAg TWnsXTLS2GtDosA3wLgYOEt9E/W1kaZfj2kqozLnwRxAQcfKQ1Zlv9BtUbx5E5LY+JB5o+ /UMtv+Qjgws5uUDp52sXKKNlfN1K93eAP2Fb6jYkoY3xWVALZzVbez/LFGvsgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677515624; a=rsa-sha256; cv=none; b=E8Peei+WBfitrJ7bYnIdnm7wX9ax0PHM+3fcXa67wXlGpiPgQiYN0WhQ6GpGq2KM2oy/ll ekOnZbo0Xt02uSG1PQgLcNiMrYhHeE+fTv1JEUHHc33sAzjtL00zH64VPd5WnSS/iIc3XA ncLxGEUgCMCU8GY/YGeVN2Q3FLdobY+3wRVb1zJNheyjnB3M66O4MQQDLgwQ9MJwFhZ7Ff Lvp6uHY0a0j/T0ikPkVtoYl89q7c7OBgKDOrnUeR2RkbYuJ8/dbBsyFR589jLDHxL02gI1 5tCMbbong9oulW0tNkEkbTFpA46NT9NPXgNnM+oUE56s99ZhapQs48tmaWbYNA== 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 4PQQzr3bszzYGl; Mon, 27 Feb 2023 16:33:44 +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 31RGXilI068037; Mon, 27 Feb 2023 16:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RGXijZ068036; Mon, 27 Feb 2023 16:33:44 GMT (envelope-from git) Date: Mon, 27 Feb 2023 16:33:44 GMT Message-Id: <202302271633.31RGXijZ068036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 09510a1a755c - releng/13.2 - netlink: clear IPv6 embedded scope when dumping route gateways. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 09510a1a755cf85b46b72854fb42e44cf4ba4dd4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=09510a1a755cf85b46b72854fb42e44cf4ba4dd4 commit 09510a1a755cf85b46b72854fb42e44cf4ba4dd4 Author: Alexander V. Chernikov AuthorDate: 2023-02-21 12:25:58 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-27 16:27:16 +0000 netlink: clear IPv6 embedded scope when dumping route gateways. Reported by: zarychtam@plan-b.pwste.edu.pl MFC after: 3 days Approved by: re(cperciva) (cherry picked from commit b9b2184322da85e1f4d52e3b0a6322dd214210ec) (cherry picked from commit d101991d8dcc1e056d1c06ca83b88826f4d65ae5) --- sys/netlink/route/rt.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 534186447b4d..dabdaea3e03b 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -123,7 +124,9 @@ rc_get_nhop(const struct rib_cmd_info *rc) static void dump_rc_nhop_gw(struct nl_writer *nw, const struct nhop_object *nh) { +#ifdef INET6 int upper_family; +#endif switch (nhop_get_neigh_family(nh)) { case AF_LINK: @@ -132,19 +135,27 @@ dump_rc_nhop_gw(struct nl_writer *nw, const struct nhop_object *nh) case AF_INET: nlattr_add(nw, NL_RTA_GATEWAY, 4, &nh->gw4_sa.sin_addr); break; +#ifdef INET6 case AF_INET6: upper_family = nhop_get_upper_family(nh); if (upper_family == AF_INET6) { - nlattr_add(nw, NL_RTA_GATEWAY, 16, &nh->gw6_sa.sin6_addr); + struct in6_addr gw6 = nh->gw6_sa.sin6_addr; + in6_clearscope(&gw6); + + nlattr_add(nw, NL_RTA_GATEWAY, 16, &gw6); } else if (upper_family == AF_INET) { /* IPv4 over IPv6 */ + struct in6_addr gw6 = nh->gw6_sa.sin6_addr; + in6_clearscope(&gw6); + char buf[20]; struct rtvia *via = (struct rtvia *)&buf[0]; via->rtvia_family = AF_INET6; - memcpy(via->rtvia_addr, &nh->gw6_sa.sin6_addr, 16); + memcpy(via->rtvia_addr, &gw6, 16); nlattr_add(nw, NL_RTA_VIA, 17, via); } break; +#endif } } From nobody Mon Feb 27 16:33:45 2023 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 4PQQzs6hnZz3vKPm; Mon, 27 Feb 2023 16:33:45 +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 4PQQzs5jjbz3lLm; Mon, 27 Feb 2023 16:33:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515625; 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=IQlUYPaXgbB0inhOIWPTwsHEujdPKR4shoGwWN12wnA=; b=o7bx53hZkWE26oD0WOXIsJc3OMSGzWN36wlAVT2IdSknbcjZSyHDJMW00JMvf0YvDtMkHR AQiFX/lXMI7gzUu7yc4BXFPIHXVqjH6Q+0gM/JWBJcMObAhhxK1VKbCY5y/7/OzvzTSwHJ KKAHVE7e8PPkIGtVF8GKGY1CFgHWi47TTnaja55x+Gwn8DQlq/9m2F+IriOBBByNDIs8LK 4udmkhkJIWMyz4xDpTDmV9zdMl6xSCEO2DHc3D3XvqYmmhTtLsxw5FhT83fBRSipshavMO E23xjT6Vo56dxK/BxHaOfd/fr20TC/kllkLkr4MakFRUErlds3PEKqC176rSDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515625; 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=IQlUYPaXgbB0inhOIWPTwsHEujdPKR4shoGwWN12wnA=; b=xRdaQdrpjEVxzoyLXQbrcDRrsows0DcsZdqpdcx8t0IOApeMHH/gATb8XC1BrpTJOCy08T VpNCk/tdNhUsWHvNRC7N0eOr04BUDIouOtXTZx2xFRg7hMLFrnqnMohmbdQ9tHWSTeTLaZ mfsJHoBT1YivhBDWXl3X0B8vPMO03QLYITsELL2FfUrg6GsmhtW31bm77MPFfqr4AVYqPL 7NiRuc3emFXobWeaMRMvtWqDIlTkuCsX7l6dXM1LN2DlxfaJ77m6x7EOuUp4QrtHiZWvOi dKI8w99IqQKh2Mncre2KtWJ3Y4Fk1nbu/7WPVu0fGeFmJM2nxYGdnC9VUkJMyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677515625; a=rsa-sha256; cv=none; b=Azv30YTZfsSPNiWY2YhzwWD84IXTjivySsRXGWZSOoyUBcMRJYwUKs3ophSyYWGhqVltWP 4ceSfG9USvBU7Qe7QVCx0tP3mNdjv9B4QOCDFgnrZXx2rJGLnuGzNltWmY791fAc6tCcFd Ypu8xtH7WUk08nmTfBURbZVOFDJ9JwMuGP9k1j42p1In/KhVf8/ZXKH2iWZcIL0/JoAKKk dUJtK/79S4Jcrv0PFCWk7Ucw8T05EmJH7Xynx3R/m8wybe+nS5zKndj/w93jFaL39cUj1x EfC3vWPVRYEb/1WLL+BZbZg0trrhFT8rrY/v9ZVCclc7mCaaHBUBt6RcPSE9Rw== 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 4PQQzs4XjHzXxF; Mon, 27 Feb 2023 16:33:45 +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 31RGXjBM068056; Mon, 27 Feb 2023 16:33:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RGXjwL068055; Mon, 27 Feb 2023 16:33:45 GMT (envelope-from git) Date: Mon, 27 Feb 2023 16:33:45 GMT Message-Id: <202302271633.31RGXjwL068055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 7dea81a4ed19 - releng/13.2 - netlink: fix addition of blackhole/reject routes. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 7dea81a4ed19e18a6f1104f14cd3e0ce57c8f5f5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=7dea81a4ed19e18a6f1104f14cd3e0ce57c8f5f5 commit 7dea81a4ed19e18a6f1104f14cd3e0ce57c8f5f5 Author: Alexander V. Chernikov AuthorDate: 2023-02-23 17:38:18 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-27 16:27:16 +0000 netlink: fix addition of blackhole/reject routes. * Make nhop_set_blackhole() set all necessary properties for the nexthop * Make nexthops blackhole/reject based on the rtm_type netlink property instead of using rtflags. Reported by: Marek Zarychta MFC after: 3 days Approved by: re(cperciva) (cherry picked from commit d2deebe21b591336fbd8915b37d409b25da54d4d) (cherry picked from commit f054a56ef3e8dc30ba0904d43cf7ec7b3e6e0ed4) --- sys/net/route/nhop_ctl.c | 27 +++++++++++++++++++++++++++ sys/netlink/route/rt.c | 28 ++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index d042d9519f6b..b92977ca42b0 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -822,6 +822,33 @@ nhop_set_blackhole(struct nhop_object *nh, int blackhole_rt_flag) nh->nh_flags |= NHF_REJECT; nh->nh_priv->rt_flags |= RTF_REJECT; break; + default: + /* Not a blackhole nexthop */ + return; + } + + nh->nh_ifp = V_loif; + nh->nh_flags &= ~NHF_GATEWAY; + nh->nh_priv->rt_flags &= ~RTF_GATEWAY; + nh->nh_priv->nh_neigh_family = nh->nh_priv->nh_upper_family; + + bzero(&nh->gw_sa, sizeof(nh->gw_sa)); + + switch (nh->nh_priv->nh_upper_family) { +#ifdef INET + case AF_INET: + nh->gw4_sa.sin_family = AF_INET; + nh->gw4_sa.sin_len = sizeof(struct sockaddr_in); + nh->gw4_sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + break; +#endif +#ifdef INET6 + case AF_INET6: + nh->gw6_sa.sin6_family = AF_INET6; + nh->gw6_sa.sin6_len = sizeof(struct sockaddr_in6); + nh->gw6_sa.sin6_addr = in6addr_loopback; + break; +#endif } } diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index dabdaea3e03b..badd8d937be2 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -458,6 +458,7 @@ struct nl_parsed_route { uint8_t rtm_family; uint8_t rtm_dst_len; uint8_t rtm_protocol; + uint8_t rtm_type; }; #define _IN(_field) offsetof(struct rtmsg, _field) @@ -481,9 +482,10 @@ static const struct nlattr_parser nla_p_rtmsg[] = { }; static const struct nlfield_parser nlf_p_rtmsg[] = { - {.off_in = _IN(rtm_family), .off_out = _OUT(rtm_family), .cb = nlf_get_u8 }, - {.off_in = _IN(rtm_dst_len), .off_out = _OUT(rtm_dst_len), .cb = nlf_get_u8 }, - {.off_in = _IN(rtm_protocol), .off_out = _OUT(rtm_protocol), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_family), .off_out = _OUT(rtm_family), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_dst_len), .off_out = _OUT(rtm_dst_len), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_protocol), .off_out = _OUT(rtm_protocol), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_type), .off_out = _OUT(rtm_type), .cb = nlf_get_u8 }, }; #undef _IN #undef _OUT @@ -828,13 +830,23 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, nhop_set_mtu(nh, attrs->rtax_mtu, true); if (attrs->rta_rtflags & RTF_BROADCAST) nhop_set_broadcast(nh, true); - if (attrs->rta_rtflags & RTF_BLACKHOLE) - nhop_set_blackhole(nh, NHF_BLACKHOLE); - if (attrs->rta_rtflags & RTF_REJECT) - nhop_set_blackhole(nh, NHF_REJECT); - nhop_set_rtflags(nh, attrs->rta_rtflags); if (attrs->rtm_protocol > RTPROT_STATIC) nhop_set_origin(nh, attrs->rtm_protocol); + nhop_set_rtflags(nh, attrs->rta_rtflags); + + switch (attrs->rtm_type) { + case RTN_UNICAST: + break; + case RTN_BLACKHOLE: + nhop_set_blackhole(nh, RTF_BLACKHOLE); + break; + case RTN_PROHIBIT: + case RTN_UNREACHABLE: + nhop_set_blackhole(nh, RTF_REJECT); + break; + /* TODO: return ENOTSUP for other types if strict option is set */ + } + nh = finalize_nhop(nh, perror); } From nobody Mon Feb 27 16:33:46 2023 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 4PQQzt6vXFz3vKPr; Mon, 27 Feb 2023 16:33:46 +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 4PQQzt6N14z3lfk; Mon, 27 Feb 2023 16:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515626; 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=KqemyWD5vZpiN7Ecrr4ztQwSaM4CfjszQwabD7Ye04k=; b=jEZYwsfTIpnZBuHZYiQsSmd9nAaseQ52OL3A8fJZlCcUXt/beeCoJnD5zBBjmwBJwGdMfv sFqQAsRH0S9mo3JSkAwR7IpawBYkn7MoNbOYMMyvdUJqwx++AD8uOna9J6C4ophQ3UpM8P Yzug24r8xNda/3KJQQ4HKKr50j69fxjTHNb/pIo0dEKcjDmhFC9395XmoGenmYRtkVgy1w eQ8tCWtkpPyJZoYfNNp+H3/7BaGyLsv1E42Vvl0cUEtr2kTSzqSPgSgXjI68Jdje00FY9J QXMRumE8JOWnYjS6krquTuQpwtwkad9x5m3szsDKXOCJE4RXJt2q9BlgDmkkRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677515626; 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=KqemyWD5vZpiN7Ecrr4ztQwSaM4CfjszQwabD7Ye04k=; b=vGvtgRAXx6Vyd+YXyqfaCbixrB9JHcctJbGHhDqbwvRwScK46/ImjFGP/38dZHiHwVyqdv 0mhhAgDOd4MkHMxvauy7wpmN5T+7S6o+BewR/IvLECyEV0ClljUUvilHsTS3Fqpma7ycFY 3TwpucSwB2VCXTnNRVdtqY3n+fswnLbnxeceE2sSCJRqhKkLXEUEtBKY5irSAeNzyQyQOU R+AJ712XO4+rBbjF8j6KiReUa7znkX2N4/hJCHcN8IfOe7c062E40b0gkgvWif9dc1Txfh TDCAiEz0lTtni8cXKTI9Q+xkXdJzwo/TTZHsvGDxa2I8QqN8tvFUUial5+PLow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677515626; a=rsa-sha256; cv=none; b=p+XC6Anr+8eQbuR37q84ua7a9PM2H+CwU28xmK1AnX5WGwB6YbNGZYf1v3YH7ctbVTs9Iv R4KahZnK5DrMXPyxwEcjoiRQPXwqLF7+R6IEJKHAIvTKrxE5Cni62LB79KvGQPGGFKp4Lb r8u5IRjAJT3ls1InW0wcR9XR3ezlS0/PSo3YHWQUzFcfLzaWbwy9mi8rf+Xb3Eu7UveTYU GzxUancahr+Cpnh7FDlXlN2X0XOSiqeXgDkp7Djdcjfj5h4IVGUD0OHgGWeAYGd94/e3z6 9JsqUD4sTFLiikIwHXJvlbPgQ178rbZwxyqT16DeTZ5TzJ2qr6LB9BxRTEmYEQ== 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 4PQQzt5RmLzXvb; Mon, 27 Feb 2023 16:33:46 +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 31RGXkrR068082; Mon, 27 Feb 2023 16:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RGXk4B068081; Mon, 27 Feb 2023 16:33:46 GMT (envelope-from git) Date: Mon, 27 Feb 2023 16:33:46 GMT Message-Id: <202302271633.31RGXk4B068081@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: a052a188766f - releng/13.2 - Revert "netlink: add NETLINK to GENERIC." 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: a052a188766f022d4b0cb2484bda636a3345f644 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=a052a188766f022d4b0cb2484bda636a3345f644 commit a052a188766f022d4b0cb2484bda636a3345f644 Author: Alexander V. Chernikov AuthorDate: 2023-02-27 15:43:41 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-27 16:33:29 +0000 Revert "netlink: add NETLINK to GENERIC." This is a Direct commit to releng/13.2. Requested by: re (cperciva) Approved by: re (cperciva) This reverts commit 6058f6cc48f5ec02476bf46693673bd71291a5c0. This reverts commit 692e19cf519578176d51d4c1001b01b1f355c1de. --- sys/amd64/conf/GENERIC | 1 - sys/arm/conf/std.armv7 | 1 - sys/arm64/conf/GENERIC | 1 - sys/i386/conf/GENERIC | 1 - sys/powerpc/conf/GENERIC64 | 1 - sys/riscv/conf/GENERIC | 1 - 6 files changed, 6 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 41d1e57b7dca..9a02a7127955 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -31,7 +31,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options FIB_ALGO # Modular fib lookups options TCP_OFFLOAD # TCP offload diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 7cc4adb5bef2..dbe863d9da92 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -11,7 +11,6 @@ options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP device crypto # core crypto support options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options SCTP_SUPPORT # Allow kldload of SCTP options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index 9f7a67e2079a..f8842d672c0e 100644 --- a/sys/arm64/conf/GENERIC +++ b/sys/arm64/conf/GENERIC @@ -31,7 +31,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options FIB_ALGO # Modular fib lookups options TCP_OFFLOAD # TCP offload diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 921b099ecf17..0bac5ba4c846 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -32,7 +32,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options TCP_HHOOK # hhook(9) framework for TCP options TCP_OFFLOAD # TCP offload diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 73d6ce5d4576..1e7fd9759874 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -42,7 +42,6 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET #InterNETworking options INET6 #IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 9c97e40f1db2..7d158269cde0 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -31,7 +31,6 @@ options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support options ROUTE_MPATH # Multipath routing support options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging From nobody Mon Feb 27 18:15:49 2023 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 4PQTFd6ZGXz3vRPh; Mon, 27 Feb 2023 18:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQTFd4s0Pz3wpp; Mon, 27 Feb 2023 18:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521749; 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=y3MHPFegr4odxvIeb+e6a7YKH0XsiOjdfpsYNGdxa7c=; b=JcTFW+WrcQEZw7IlSNXsjqFOdOJUA82Zp63aiiLOBhDkgAplRmM0HSD/TzrJk9DNgVGUCx Ts61BICW1yH6JGR+YgM1HuNa916dpW2q7Lerqnrw/mf3hedvognhDoHeQIXXDCpsx6Vn5x i2rIg9dRdp3nkqQo6VQerimrwVm/JIesIEF6oQTY5FQmaw3dJIyXm+fR4RL081Jsdu5jNu nvNHC8KZWD0EZQdrOnMRmZrHGfYg+8dJrKXS0UW8NzzTWlrib51v3GzBBFdMzAZwbQk5yM 0B+D6ok2ROOVa0vXBkYucgwhOajVgvy4yFSgLclVZjy63AOaTWofaxSALu1HCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521749; 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=y3MHPFegr4odxvIeb+e6a7YKH0XsiOjdfpsYNGdxa7c=; b=K5lWZUZRzpvsmqtyXoHQO6VmX5zYXaRtAscA2dS8ZBzJhUfGBqa9ZkaBhKiEkdjMx/2T9h MBLv/9wnMtlgD64Rm0eqiBFVLuH6Zhc0OXVXf52nmktwnvSv2iLIGi9ULDV8nzBbwqxr19 xDyKknZBCsnP8Wxspva6C0EvokTXB/dh985nOAb49UjTdJfRxv43WbLCRcpuejxjBxEZNb tcdB+KRBsYPn5zf7vnk2ZmJUTdNT4rakfN/sdP/J7qHyrllhNABTF+nxicr2fQlDKSLpp1 LPlrMu6foPAoEBgSyGYTO1ZyH22/2TC5qZ5qK6u332kmAohBFVD6EJ6aqJBamQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677521749; a=rsa-sha256; cv=none; b=d/7JjoMDm4iOXI4MxA8kXcGG2A3RKUuBY1I5E1nv1O8sLHa3dd+yys7Qdyyczpkta+EaBb /CSGr29JWtkRf1rPIaNDTOkZT8LxHj0fWzBtUtRoebWtMFu6SkYFd9ba6YBqKcotWP00sh 8gWJa7DlKiWEb4ulG5JaP6EgIlIgngu04S+l9CZpArKtsZ6kW77s5N3pKfemNfwPe+hsU1 N+sdwIEFRdu1Hmaxp6AeXT8HiKS2nGpz9pOVXvuGgZ+/SxYi4KlcWtCs4Tb0SHCWzHb//h 8h5pWFQesVkj75PMXEiWo9CG7Y1fYqDfswf9P2YvQ8TJHHTiiYehiC17NKG3eA== 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 4PQTFd3yhSzbby; Mon, 27 Feb 2023 18:15:49 +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 31RIFnRK033738; Mon, 27 Feb 2023 18:15:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RIFnL2033737; Mon, 27 Feb 2023 18:15:49 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:15:49 GMT Message-Id: <202302271815.31RIFnL2033737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 8fd0f86abdfa - releng/13.2 - linux(4): Move use_real_names knob to the linux.c 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 8fd0f86abdfa8b98facb22649cb03545d0cf0df6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8fd0f86abdfa8b98facb22649cb03545d0cf0df6 commit 8fd0f86abdfa8b98facb22649cb03545d0cf0df6 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-27 18:15:25 +0000 linux(4): Move use_real_names knob to the linux.c MI linux.[c|h] are the module independent in terms of the Linux emulation layer (ie, intended for both ISA - 32 & 64 bit), analogue of MD linux.h. There must be a code here that cannot be placed into the corresponding by common sense MI source and header files, i.e., code is machine independent, but ISA dependent. For the use_real_names knob, the code must be placed into the linux_socket.[c|h], however linux_socket is ISA dependent. Approved by: re (cperciva) MFC after: 2 weeks (cherry picked from commit 32fdc75fe7276083d446964055b0de0e29970b7c) (cherry picked from commit 884ea80d4ebbd2d8ff03d56eddc1dc64d49be908) --- sys/compat/linux/linux.c | 12 ++++++++++++ sys/compat/linux/linux.h | 10 ++++++++++ sys/compat/linux/linux_util.c | 15 --------------- sys/compat/linux/linux_util.h | 9 --------- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 5351575ed6e1..bf0479b89588 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -59,6 +59,11 @@ __FBSDID("$FreeBSD$"); CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ); +static bool use_real_ifnames = false; +SYSCTL_BOOL(_compat_linux, OID_AUTO, use_real_ifnames, CTLFLAG_RWTUN, + &use_real_ifnames, 0, + "Use FreeBSD interface names instead of generating ethN aliases"); + static int bsd_to_linux_sigtbl[LINUX_SIGTBLSZ] = { LINUX_SIGHUP, /* SIGHUP */ LINUX_SIGINT, /* SIGINT */ @@ -726,3 +731,10 @@ bsd_to_linux_poll_events(short bev, short *lev) *lev = bits; } + +bool +linux_use_real_ifname(const struct ifnet *ifp) +{ + + return (use_real_ifnames || !IFP_IS_ETH(ifp)); +} diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 40e563014fde..a8cdab07a70b 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -286,6 +286,16 @@ struct l_statx { ktrstruct("l_sigset_t", (s), l) #endif +/* + * Criteria for interface name translation + */ +#define IFP_IS_ETH(ifp) ((ifp)->if_type == IFT_ETHER) +#define IFP_IS_LOOP(ifp) ((ifp)->if_type == IFT_LOOP) + +struct ifnet; + +bool linux_use_real_ifname(const struct ifnet *); + void linux_netlink_register(void); void linux_netlink_deregister(void); diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index e41c505425ee..ad6ad8f26261 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -50,10 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include - #include #include @@ -86,11 +82,6 @@ SYSCTL_STRING(_compat_linux, OID_AUTO, emul_path, CTLFLAG_RWTUN, linux_emul_path, sizeof(linux_emul_path), "Linux runtime environment path"); -static bool use_real_ifnames = false; -SYSCTL_BOOL(_compat_linux, OID_AUTO, use_real_ifnames, CTLFLAG_RWTUN, - &use_real_ifnames, 0, - "Use FreeBSD interface names instead of generating ethN aliases"); - /* * Search an alternate path before passing pathname arguments on to * system calls. Useful for keeping a separate 'emulation tree'. @@ -324,9 +315,3 @@ linux_device_unregister_handler(struct linux_device_handler *d) return (EINVAL); } - -bool -linux_use_real_ifname(const struct ifnet *ifp) -{ - return (use_real_ifnames || !IFP_IS_ETH(ifp)); -} diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index 6f7b55be8123..d751267e6d54 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -120,15 +120,6 @@ int linux_vn_get_major_minor(const struct vnode *vn, int *major, int *minor); char *linux_get_char_devices(void); void linux_free_get_char_devices(char *string); -/* - * Criteria for interface name translation - */ -#define IFP_IS_ETH(ifp) ((ifp)->if_type == IFT_ETHER) -#define IFP_IS_LOOP(ifp) ((ifp)->if_type == IFT_LOOP) - -struct ifnet; -bool linux_use_real_ifname(const struct ifnet *ifp); - #if defined(KTR) #define KTR_LINUX KTR_SUBSYS From nobody Mon Feb 27 18:16:21 2023 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 4PQTGG0qL4z3vRPw; Mon, 27 Feb 2023 18:16:22 +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 4PQTGG06vFz3x9n; Mon, 27 Feb 2023 18:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521782; 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=I5bQUVng5FNkiNPwFOr9SywMZOjNQxQpXa59X6c1a88=; b=Y6W1c7eNYjKFvraIU0vJU2NK7F3qSekNDN93QfWI3MNuCjSasq0e+73YCI/bFWDFUVNEG4 2FQmR1u9KCQmVoDUdyqu+h2mmFip/JLtnvZpUbD/FK5xr0143YjXn85rJ/xq+RsjEDPThd c4FdBQsdZxfrWjYTxDdgZYEKhZn59P6mivBnkjOBN9eEA594McsY7xuYWN1DUlAOHiAhmP sUYBGrNZffMUUUnPMg7Vl1lK515gJm3AML13JwdeH7fOWmqSlcJBJBIPTBuitb0lZ+lQ57 YtCucm6+T2BNInCKIchXcbFnWh9WcKDkeDRtIkQGOqocG/ldjOaNZPJnDR0Ojw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521782; 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=I5bQUVng5FNkiNPwFOr9SywMZOjNQxQpXa59X6c1a88=; b=FHl3exE5ZxxxtxX8zKXbha6tkTwkfek4D8l13jci2qphaw7WwOCVP+oolHXgeH0q3oXpEv WvYUH/EpBmwCcyjf6HAPl47ns69aWdKRWDuOERJstJVmWrLxwvoOqi0l5C4RqvBi1bHqXV PUBRZI/cpIr03x4vJD368IDQgtlxuSqF8J9eSqJvhu6fq75IfLMXDQq1N9I8semlaekNUU d4o0rVJkOiOrkKzK8elc6sNb85AzhL43H+Zl4/m+/Bm+KdDcJaG7/2vAZ9kBG8sQVaRf8X EanDcbUO0tqTv6prKK/lJI0sCBwf0S4QiIC7Ji4bCozNRtHoZK3MOBE6dMR95A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677521782; a=rsa-sha256; cv=none; b=tDUt1XH1qd+0U4xgQg5VlgBNzf39IkkVdmJyIXvsDBH+UjpVsuI5crrifPN8pP8W+VkyCq UyLOOLaxwHUiSH4fr6GcgcEf1yETtIdOOUtQXGPMJIqgUnZ3pubaEVPrBTSdo+VUDiswDL zGYLvjy13gbBtfgxtoQLsIddcghs7PZfvdr8ey8ETCSvEhwIMnreASZrzKevG8VB7Z87Il iqtgfOgmLvu4ieYH6nlrpDd8OFJQNh6cmUwXbc8EF9xpohYETyTIN+/iKTFIen7A/4HRY8 wfL+wg6I/dkAAxhJLZghIceqzPrgQCL3jUkoiWSr+LgJllycH0CaqajSkNcFnQ== 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 4PQTGF6JVPzbK7; Mon, 27 Feb 2023 18:16:21 +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 31RIGLTH033991; Mon, 27 Feb 2023 18:16:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RIGL6b033990; Mon, 27 Feb 2023 18:16:21 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:16:21 GMT Message-Id: <202302271816.31RIGL6b033990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: aeed04a32e45 - releng/13.2 - linux(4): Consolidate a FreeBSD interface names translation code 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: aeed04a32e459f2b7e0f78ca00ba257d7ac18123 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=aeed04a32e459f2b7e0f78ca00ba257d7ac18123 commit aeed04a32e459f2b7e0f78ca00ba257d7ac18123 Author: Dmitry Chagin AuthorDate: 2023-02-23 08:00:29 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-27 18:16:00 +0000 linux(4): Consolidate a FreeBSD interface names translation code We have some amount of interface names translation functions which are differs by bugs implementation. Consolidates it in a one place. Fixup loopback interface names translation and use ifnet methods and accessors, where possible. Approved by: re (cperciva) Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D38714 MFC after: 3 days X-MFC with: 32fdc75fe7 (cherry picked from commit 3ab3c9c29cf0e5df8dbbaaf2003456445534bad8) (cherry picked from commit a83551a52d1cfa8a756ef8dd298cab8042e27437) --- sys/compat/linprocfs/linprocfs.c | 40 +++++------------- sys/compat/linux/linux.c | 87 ++++++++++++++++++++++++++++++++++++++-- sys/compat/linux/linux_common.h | 4 ++ sys/compat/linux/linux_ioctl.c | 56 +++++++------------------- 4 files changed, 113 insertions(+), 74 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index a93f8a1dbb8b..3aa01de9ce65 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -111,6 +111,7 @@ __FBSDID("$FreeBSD$"); #endif /* __i386__ || __amd64__ */ #include +#include #include #include #include @@ -1474,36 +1475,13 @@ linprocfs_doprocmem(PFS_FILL_ARGS) return (error); } -static int -linux_ifname(struct ifnet *ifp, char *buffer, size_t buflen) -{ - struct ifnet *ifscan; - int ethno; - - IFNET_RLOCK_ASSERT(); - - /* Short-circuit non ethernet interfaces */ - if (linux_use_real_ifname(ifp)) - return (strlcpy(buffer, ifp->if_xname, buflen)); - - /* Determine the (relative) unit number for ethernet interfaces */ - ethno = 0; - CK_STAILQ_FOREACH(ifscan, &V_ifnet, if_link) { - if (ifscan == ifp) - return (snprintf(buffer, buflen, "eth%d", ethno)); - if (!linux_use_real_ifname(ifscan)) - ethno++; - } - - return (0); -} - /* * Filler function for proc/net/dev */ static int linprocfs_donetdev(PFS_FILL_ARGS) { + struct epoch_tracker et; char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; @@ -1515,9 +1493,9 @@ linprocfs_donetdev(PFS_FILL_ARGS) "bytes packets errs drop fifo colls carrier compressed"); CURVNET_SET(TD_TO_VNET(curthread)); - IFNET_RLOCK(); + NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - linux_ifname(ifp, ifname, sizeof ifname); + ifname_bsd_to_linux_ifp(ifp, ifname, sizeof(ifname)); sbuf_printf(sb, "%6.6s: ", ifname); sbuf_printf(sb, "%7ju %7ju %4ju %4ju %4lu %5lu %10lu %9ju ", (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IBYTES), @@ -1546,7 +1524,7 @@ linprocfs_donetdev(PFS_FILL_ARGS) * tx_heartbeat_errors*/ 0UL); /* tx_compressed */ } - IFNET_RUNLOCK(); + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); return (0); @@ -1576,7 +1554,8 @@ linux_route_print(struct rtentry *rt, void *vw) /* select only first route in case of multipath */ nh = nhop_select_func(rnd.rnd_nhop, 0); - linux_ifname(nh->nh_ifp, ifname, sizeof(ifname)); + if (ifname_bsd_to_linux_ifp(nh->nh_ifp, ifname, sizeof(ifname)) <= 0) + return (ENODEV); gw = (nh->nh_flags & NHF_GATEWAY) ? nh->gw4_sa.sin_addr.s_addr : 0; @@ -1605,6 +1584,7 @@ linux_route_print(struct rtentry *rt, void *vw) static int linprocfs_donetroute(PFS_FILL_ARGS) { + struct epoch_tracker et; struct walkarg w = { .sb = sb }; @@ -1615,9 +1595,9 @@ linprocfs_donetroute(PFS_FILL_ARGS) "\tWindow\tIRTT"); CURVNET_SET(TD_TO_VNET(curthread)); - IFNET_RLOCK(); + NET_EPOCH_ENTER(et); rib_walk(fibnum, AF_INET, false, linux_route_print, &w); - IFNET_RUNLOCK(); + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); return (0); diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index bf0479b89588..41297d549c26 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -242,6 +242,84 @@ bsd_to_linux_sigset(sigset_t *bss, l_sigset_t *lss) } } +/* + * Translate a FreeBSD interface name to a Linux interface name + * by interface name, and return the number of bytes copied to lxname. + */ +int +ifname_bsd_to_linux_name(const char *bsdname, char *lxname, size_t len) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int ret; + + ret = 0; + CURVNET_SET(TD_TO_VNET(curthread)); + NET_EPOCH_ENTER(et); + ifp = ifunit(bsdname); + if (ifp != NULL) + ret = ifname_bsd_to_linux_ifp(ifp, lxname, len); + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (ret); +} + +/* + * Translate a FreeBSD interface name to a Linux interface name + * by interface index, and return the number of bytes copied to lxname. + */ +int +ifname_bsd_to_linux_idx(u_int idx, char *lxname, size_t len) +{ + struct epoch_tracker et; + struct ifnet *ifp; + int ret; + + ret = 0; + CURVNET_SET(TD_TO_VNET(curthread)); + NET_EPOCH_ENTER(et); + ifp = ifnet_byindex(idx); + if (ifp != NULL) + ret = ifname_bsd_to_linux_ifp(ifp, lxname, len); + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (ret); +} + +/* + * Translate a FreeBSD interface name to a Linux interface name, + * and return the number of bytes copied to lxname. + */ +int +ifname_bsd_to_linux_ifp(struct ifnet *ifp, char *lxname, size_t len) +{ + struct ifnet *ifscan; + int unit; + + NET_EPOCH_ASSERT(); + + /* + * Linux loopback interface name is lo (not lo0), + * we translate lo to lo0, loX to loX. + */ + if (IFP_IS_LOOP(ifp) && strncmp(ifp->if_xname, "lo0", IFNAMSIZ) == 0) + return (strlcpy(lxname, "lo", len)); + + /* Short-circuit non ethernet interfaces. */ + if (!IFP_IS_ETH(ifp) || linux_use_real_ifname(ifp)) + return (strlcpy(lxname, ifp->if_xname, len)); + + /* Determine the (relative) unit number for ethernet interfaces. */ + unit = 0; + CK_STAILQ_FOREACH(ifscan, &V_ifnet, if_link) { + if (ifscan == ifp) + return (snprintf(lxname, len, "eth%d", unit)); + if (IFP_IS_ETH(ifscan)) + unit++; + } + return (0); +} + /* * Translate a Linux interface name to a FreeBSD interface name, * and return the associated ifnet structure @@ -262,8 +340,11 @@ ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) break; if (len == 0 || len == LINUX_IFNAMSIZ) return (NULL); - /* Linux loopback interface name is lo (not lo0) */ - is_lo = (len == 2 && strncmp(lxname, "lo", len) == 0); + /* + * Linux loopback interface name is lo (not lo0), + * we translate lo to lo0, loX to loX. + */ + is_lo = (len == 2 && strncmp(lxname, "lo", LINUX_IFNAMSIZ) == 0); unit = (int)strtoul(lxname + len, &ep, 10); if ((ep == NULL || ep == lxname + len || ep >= lxname + LINUX_IFNAMSIZ) && is_lo == 0) @@ -736,5 +817,5 @@ bool linux_use_real_ifname(const struct ifnet *ifp) { - return (use_real_ifnames || !IFP_IS_ETH(ifp)); + return (use_real_ifnames); } diff --git a/sys/compat/linux/linux_common.h b/sys/compat/linux/linux_common.h index 0eb302bfcd17..9ebaff26b9ff 100644 --- a/sys/compat/linux/linux_common.h +++ b/sys/compat/linux/linux_common.h @@ -30,6 +30,10 @@ #ifndef _LINUX_COMMON_H_ #define _LINUX_COMMON_H_ +int ifname_bsd_to_linux_ifp(struct ifnet *, char *, size_t); +int ifname_bsd_to_linux_idx(u_int, char *, size_t); +int ifname_bsd_to_linux_name(const char *, char *, size_t); + struct ifnet *ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname); void linux_ifflags(struct ifnet *ifp, short *flags); diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index cd89c16cad64..c9a04b51b4fa 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2107,39 +2107,17 @@ static int linux_ioctl_ifname(struct thread *td, struct l_ifreq *uifr) { struct l_ifreq ifr; - struct ifnet *ifp; - int error, ethno, index; + int error, ret; error = copyin(uifr, &ifr, sizeof(ifr)); if (error != 0) return (error); - - CURVNET_SET(TD_TO_VNET(curthread)); - IFNET_RLOCK(); - index = 1; /* ifr.ifr_ifindex starts from 1 */ - ethno = 0; - error = ENODEV; - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifr.ifr_ifindex == index) { - if (!linux_use_real_ifname(ifp)) - snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, - "eth%d", ethno); - else - strlcpy(ifr.ifr_name, ifp->if_xname, - LINUX_IFNAMSIZ); - error = 0; - break; - } - if (!linux_use_real_ifname(ifp)) - ethno++; - index++; - } - IFNET_RUNLOCK(); - if (error == 0) - error = copyout(&ifr, uifr, sizeof(ifr)); - CURVNET_RESTORE(); - - return (error); + ret = ifname_bsd_to_linux_idx(ifr.ifr_ifindex, ifr.ifr_name, + LINUX_IFNAMSIZ); + if (ret > 0) + return (copyout(&ifr, uifr, sizeof(ifr))); + else + return (ENODEV); } /* @@ -2149,6 +2127,7 @@ linux_ioctl_ifname(struct thread *td, struct l_ifreq *uifr) static int linux_ifconf(struct thread *td, struct ifconf *uifc) { + struct epoch_tracker et; #ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else @@ -2158,7 +2137,7 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) struct ifnet *ifp; struct ifaddr *ifa; struct sbuf *sb; - int error, ethno, full = 0, valid_len, max_len; + int error, full = 0, valid_len, max_len; error = copyin(uifc, &ifc, sizeof(ifc)); if (error != 0) @@ -2170,7 +2149,7 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) /* handle the 'request buffer size' case */ if ((l_uintptr_t)ifc.ifc_buf == PTROUT(NULL)) { ifc.ifc_len = 0; - IFNET_RLOCK(); + NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { struct sockaddr *sa = ifa->ifa_addr; @@ -2178,7 +2157,7 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) ifc.ifc_len += sizeof(ifr); } } - IFNET_RUNLOCK(); + NET_EPOCH_EXIT(et); error = copyout(&ifc, uifc, sizeof(ifc)); CURVNET_RESTORE(); return (error); @@ -2190,8 +2169,6 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) } again: - /* Keep track of eth interfaces */ - ethno = 0; if (ifc.ifc_len <= max_len) { max_len = ifc.ifc_len; full = 1; @@ -2201,16 +2178,13 @@ again: valid_len = 0; /* Return all AF_INET addresses of all interfaces */ - IFNET_RLOCK(); + NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { int addrs = 0; bzero(&ifr, sizeof(ifr)); - if (IFP_IS_ETH(ifp)) - snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "eth%d", - ethno++); - else - strlcpy(ifr.ifr_name, ifp->if_xname, LINUX_IFNAMSIZ); + ifname_bsd_to_linux_ifp(ifp, ifr.ifr_name, + sizeof(ifr.ifr_name)); /* Walk the address list */ CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { @@ -2237,7 +2211,7 @@ again: valid_len = sbuf_len(sb); } } - IFNET_RUNLOCK(); + NET_EPOCH_EXIT(et); if (valid_len != max_len && !full) { sbuf_delete(sb); From nobody Mon Feb 27 18:16:56 2023 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 4PQTGw6xLYz3vRHw; Mon, 27 Feb 2023 18:16:56 +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 4PQTGw5zFqz3xVN; Mon, 27 Feb 2023 18:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521816; 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=PtCUK7v+qsEUMFqEMsil2yTIV+pVCxCP/5p7kqXtWcU=; b=sYQhbWsck2xbMrYZfu1OwSUwwJDxOCm3chaNhevsqv/TYk7Pw6f7UvwgsJ0SjPTO3OcLBj cy0D75SmO1zRR4GIHVQ2npoO5M/1LTzDKxbpA6W/POcisnzwgOSx1TT3OcQSLtrwxCAs/Q fKAXigBZN7/nX3/H4Pldkouvu3m/pVK5uEN3ktvWDv+XJ2nS/V+V7jIg5HKqxRvZsYYkw9 feOio8HmvnjShP998Lo9qmVsUUHFJirgJyW5FJ+NnWKrr/gOcFhIkOY6MR2vFsBLZERjOB 03Q+ZC+j6bwU/XCH/1fGJJFtdJDRx0mt3VqokqMETUk+CaNapn4OXoFUW0a/TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521816; 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=PtCUK7v+qsEUMFqEMsil2yTIV+pVCxCP/5p7kqXtWcU=; b=fptC6QoD8Q5MGGB0vFjWQ5shJYBWzJJea1ri39WVIU1/Gkjopp8JJKAFnb7LsEqQLrlC0z VsAH6ik4fSDLmz6zLCC4IbU8olRb03CclwzEg+xKdeRhudZGnDKzIw5wkFQywLedrrS1Py 4qPDTXi1XkQp9ZFYLMsSc11Nk0h884tXLHOSx3IuoRa13xu3MJYiob5HzYrlPoBCYpBC4E eI2onH25RrdS7Tr1VqZxBNE5hV+9/qSgk7JJmJYVugr3pywWMnFQ5iRUbV2PnPtSWGCxlP DY+Wv1M/0OMnNyEEMAVi67we9qZ/PfojqTCYnoOa/nE7FyYE+c5Y+PjPKIucGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677521816; a=rsa-sha256; cv=none; b=CSU3PwfRIeLxu9DZ8CUuo3LkKs5ryoWcxup1E1Uj8hbyHzoYZ4W15UF0ZgTDbTxejx1vyg aEcaG5U4Fk0+hwBMYzyMJowkYLniqImQOFW3yKvTjztPTsnKULDHL43s2cj9/ClO2SQ/jw Twki/hFouNzSnXoarOAmpiPc1TMrW81Puj8kh+oh9B35iSAG7ygKL9ALVRUOVw2k2Vd6oV x+d49C0RN/DW0IDBEz1Uz+AYGah1Z7wMngXJQem9ueJ2Rp4MYpGn02MXFsheGuDRbJ74E2 E17WjhAgFAt99/1zh7BmqtoOA2gp5kweZl/f90IR2wpzxsZrWFt4PqMNgobbFg== 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 4PQTGw4kC4zbq7; Mon, 27 Feb 2023 18:16:56 +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 31RIGuQk034167; Mon, 27 Feb 2023 18:16:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RIGuWS034166; Mon, 27 Feb 2023 18:16:56 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:16:56 GMT Message-Id: <202302271816.31RIGuWS034166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 9006cd0fd543 - releng/13.2 - linux(4): Fixup the interface name translation in netlink 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 9006cd0fd543379c13de8fe274abc0f71710e93a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=9006cd0fd543379c13de8fe274abc0f71710e93a commit 9006cd0fd543379c13de8fe274abc0f71710e93a Author: Dmitry Chagin AuthorDate: 2023-02-23 08:01:18 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-27 18:16:36 +0000 linux(4): Fixup the interface name translation in netlink Netlink should translate a FreeBSD interface name to a Linux interface name. Approved by: re (cperciva) Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D38715 MFC after: 3 days (cherry picked from commit e55e4a6ba3f4cd31d47b74574ea7370d5ab14b48) (cherry picked from commit 123ca9ab11896f356245537ee41207fb6943fccd) --- sys/compat/linux/linux_netlink.c | 48 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index 4cf872b3722d..86b861fdbc47 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -220,10 +220,52 @@ nlmsg_copy_nla(const struct nlattr *nla_orig, struct nl_writer *nw) return (false); } +/* + * Translate a FreeBSD interface name to a Linux interface name. + */ +static bool +nlmsg_translate_ifname_nla(struct nlattr *nla, struct nl_writer *nw) +{ + char ifname[LINUX_IFNAMSIZ]; + + if (ifname_bsd_to_linux_name((char *)(nla + 1), ifname, + sizeof(ifname)) <= 0) + return (false); + return (nlattr_add_string(nw, IFLA_IFNAME, ifname)); +} + +#define LINUX_NLA_UNHANDLED -1 +/* + * Translate a FreeBSD attribute to a Linux attribute. + * Returns LINUX_NLA_UNHANDLED when the attribute is not processed + * and the caller must take care of it, otherwise the result is returned. + */ +static int +nlmsg_translate_all_nla(struct nlmsghdr *hdr, struct nlattr *nla, + struct nl_writer *nw) +{ + + switch (hdr->nlmsg_type) { + case NL_RTM_NEWLINK: + case NL_RTM_DELLINK: + case NL_RTM_GETLINK: + switch (nla->nla_type) { + case IFLA_IFNAME: + return (nlmsg_translate_ifname_nla(nla, nw)); + default: + break; + } + default: + break; + } + return (LINUX_NLA_UNHANDLED); +} + static bool nlmsg_copy_all_nla(struct nlmsghdr *hdr, int raw_hdrlen, struct nl_writer *nw) { struct nlattr *nla; + int ret; int hdrlen = NETLINK_ALIGN(raw_hdrlen); int attrs_len = hdr->nlmsg_len - sizeof(struct nlmsghdr) - hdrlen; @@ -234,11 +276,15 @@ nlmsg_copy_all_nla(struct nlmsghdr *hdr, int raw_hdrlen, struct nl_writer *nw) if (nla->nla_len < sizeof(struct nlattr)) { return (false); } - if (!nlmsg_copy_nla(nla, nw)) + ret = nlmsg_translate_all_nla(hdr, nla, nw); + if (ret == LINUX_NLA_UNHANDLED) + ret = nlmsg_copy_nla(nla, nw); + if (!ret) return (false); } return (true); } +#undef LINUX_NLA_UNHANDLED static unsigned int rtnl_if_flags_to_linux(unsigned int if_flags) From nobody Mon Feb 27 18:25:26 2023 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 4PQTSk4wZ6z3vRkk; Mon, 27 Feb 2023 18:25: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 4PQTSk4PCZz410W; Mon, 27 Feb 2023 18:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677522326; 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=yOznJ+oWf7uhHtHPAweHq3WEMimlpJZ/n3ulyJl8l7s=; b=w/gJSgKa4HqGBr4UMmSB6PNlPsfLD31RyB6D+SC97UOrnKacCm5qmKAKfD9vuJD9UE0ltZ eRiAEbhxWV6MRy90FzLa2xPZb0ov5oI3zlmuMU3ql3SM1LdXYkR1czGWz+HGYHwWQg2+7L fZBd8j+jNvz649qJwmLjo9R0x5UGi5eScv47HVkfupEyROLhp6npoO2aMM8CHaRlw9yzGV j3oowETXGjJ8YacVbyvBCkAKQXjBLlqQBHkrWjf6N6UpkYbTFfkcPUX+0/3To939ybIyeZ xUDWLyd0uJOzd8raZV9jy3RRFQee6Fp5lc417WS8JTzLx66WMvSOxJv+ssIOrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677522326; 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=yOznJ+oWf7uhHtHPAweHq3WEMimlpJZ/n3ulyJl8l7s=; b=Da0Zm6RNmFBxW9R1mkg7h6vTXLhfi/aRV3Vg6ppNtenucczfH1LHE88NZqUuLyiu4y/4/j 7hT9tMu5ePFkAkBzsQVmKtSBJUSavBHsrc7dfwQ8mNFQnamWZsMN54q2olyg5E9watOmHe KVzoiKJPrzcbdEBumi62WHmeT/VTBmbLD0kTVbQpmNlfdUfPn7BK5ezV8VH1Wo82PBPNUJ lSbiQa05Uz79/5gs23/+M1Fdagqvr+IS4vlVRaVSA/5DUWxdpOVNCd0HEWcYZ/PayzucFr c1vZyj8vAA+AZasFDvi5cbytGfJ3asnzp1Pz2tS2tsmZIs0/SvlVmjARKI6Fzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677522326; a=rsa-sha256; cv=none; b=HxPX4b8Y5b7cO8+u3sBIxkjjbBHkVhL5mfovv7crhKlQ007SulRSCFfgn/40IuuzpLZtDD 21os+i6Tp12zSakTgZvL/bLqjFQKUjQSdP0RtQ6jwNgNnhc6E6CMjppF+xkKhcd2DivWRZ n8KsTblABmrSkxnKXjhyKFqo0eAbbAwAfeIvBgWu7ktOyP/6EoXSfamd1iv3JB57p37w3B q3STqo/qaLcFLCA/VH86auoH1PyiGFuYScT/mdLOWU5Icat0ZQl9pVshBMhP9UnizmWqpe vCWmyvFb93cn0OcckxyM/a+gr64XVmX88gfrHKmeWlMFLAfplWj++3Yj8tn7Dg== 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 4PQTSk3HFyzc4p; Mon, 27 Feb 2023 18:25:26 +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 31RIPQvU050204; Mon, 27 Feb 2023 18:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RIPQSq050203; Mon, 27 Feb 2023 18:25:26 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:25:26 GMT Message-Id: <202302271825.31RIPQSq050203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 18936d3526f3 - stable/13 - ping: Fix unsigned integer underflow resuling in a ping -R segfault 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 18936d3526f3090e4164b8155762bf5bd54038a8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=18936d3526f3090e4164b8155762bf5bd54038a8 commit 18936d3526f3090e4164b8155762bf5bd54038a8 Author: Cy Schubert AuthorDate: 2023-02-23 05:43:17 +0000 Commit: Cy Schubert CommitDate: 2023-02-27 18:24:53 +0000 ping: Fix unsigned integer underflow resuling in a ping -R segfault ping -R (F_RROUTE) will loop at ping.c:1381 until it segfaults or the unsigned int hlen happens to be less than the size of an IP header: slippy$ ping -R 192.168.0.101 PING 192.168.0.101 (192.168.0.101): 56 data bytes 64 bytes from 192.168.0.101: icmp_seq=0 ttl=63 time=1.081 ms RR: 192.168.0.1 192.168.0.101 192.168.0.101 10.1.1.254 10.1.1.91 unknown option bb unknown option 32 unknown option 6 ... unknown option 96 unknown option 2d Segmentation fault The reason for this is while looping through loose source routing (LSRR) and strict source routing (SSRR), hlen will become smaller than the IP header. It may even become negative. This should terminate the loop. However, when hlen is unsigned, an integer underflow occurs becoming a large number causing the loop to continue virtually forever until hlen is either by chance smaller than the lenghth of an IP header or it segfaults. Reviewed by: asomers Fixes: 46d7b45a267b Differential Revision: https://reviews.freebsd.org/D38744 (cherry picked from commit 70960bb86a3ba5b6f5c4652e613e6313a7ed1ac1) --- sbin/ping/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 6956b9a68ad2..2fc876e50776 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1150,7 +1150,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) ssize_t icmp_data_raw_len; double triptime; int dupflag, i, j, recv_len; - uint8_t hlen; + int8_t hlen; uint16_t seq; static int old_rrlen; static char old_rr[MAX_IPOPTLEN]; @@ -1171,7 +1171,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) hlen = (l & 0x0f) << 2; /* Reject IP packets with a short header */ - if (hlen < sizeof(struct ip)) { + if (hlen < (int8_t) sizeof(struct ip)) { if (options & F_VERBOSE) warn("IHL too short (%d bytes) from %s", hlen, inet_ntoa(from->sin_addr)); From nobody Mon Feb 27 18:27:07 2023 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 4PQTVh0hcXz3vS82; Mon, 27 Feb 2023 18:27:08 +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 4PQTVh09S6z41WG; Mon, 27 Feb 2023 18:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677522428; 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=QjNRM22LhgUguMenChncM8BKzSZg0IHVKpa2B5rftgM=; b=QbzHZz+X+vmQ0gv9lg/V6vg9lOcdrHpGba/G2j2Bwpfjc9QhrZM3ERRbZtlHRNMZCt2teF 0X5cusIY39Nmz3aCdldBaWC/Fs3bFK+FlCPrOD0UqnvLYtUarKiJ5ldZgCGKrdKHxUpdEX +ujGf0OzkbsYXqMjamThHpO9vA4IF1CZ7Rzi1J07sJsw77sebtubOkfucn/ftWc+2DjScS fTNaLy9OTcpifL+3OkbJqPKqtyl6BssH/A0ygRC3ubpUY6fcEkx1eGZzromI5Yv8oJq5wv SOVgstPy35+S1kVVPOrnkSplnrNCio16oRbkuZZrvkE7eFYtrvNDSApRfFwdoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677522428; 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=QjNRM22LhgUguMenChncM8BKzSZg0IHVKpa2B5rftgM=; b=RieYPW1mgM/3c9AgTRgKkHV/1zu4HLbMvUT23J8bzI0VlmqZhlS5TqB7xBht28A+EwRN/k mdB3a7snAnq9JwRZHfAtYfcVpCvFAjBvwKVu1XGljhjDEJmcuFEhkcGuXCGqgWTp1PTUWP iuo14QstWufPi6z12yzE8Y/mPdox4tlmbz8ocLF8grybSZjrNusQe/NpR9zQTX2D6ZTh9q okme+k14rNwgK4RzyWzLhEjIEdOXyLONqGrfNDZljGuMGJ0q+jJ1XRJu9P1ZnZJlbG86m/ +lIlmVXUNUEd1iF6IMkm75vtqwKkereLOTVi5dq7AWR0onggoOBFLkKaDslskQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677522428; a=rsa-sha256; cv=none; b=eyJqshWZdJOHX5jRcen0/H60TKO5trmaBz7NAjL7n+J2TBFb6fbg8icPxmrtwxGJLrbsIG 4Ea0eXb6+QQsKUvKqGkf/8hQQF5BChCZsanO8GkWwP0NIB3NuV3xyKExL/2GIwei99vexc rrgkjNjZEKqtB2oQ3LUwutNnKFmieKJ0aV/ktzZhq2tPCxbpru+8Fjne0w6L1tpzcyipbU KiR2wcEu2BntvRObpQHtKNEIQBfuzL7qAfj+gptxsr0y0H1m5f0aU1fg7bLJg4LoA5sDhs mg8EuqMfKN9WSlZy91KLj39xCSX/Cns4SMqC82MIv7x5m4qOErrgpZoXZC3sjw== 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 4PQTVg6L9zzbwp; Mon, 27 Feb 2023 18:27:07 +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 31RIR7YC050625; Mon, 27 Feb 2023 18:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RIR7hX050624; Mon, 27 Feb 2023 18:27:07 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:27:07 GMT Message-Id: <202302271827.31RIR7hX050624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 4cafd65c8f1d - stable/12 - ping: Fix unsigned integer underflow resuling in a ping -R segfault 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4cafd65c8f1d3adfa6ff80db3ef9f58c75d7d14c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4cafd65c8f1d3adfa6ff80db3ef9f58c75d7d14c commit 4cafd65c8f1d3adfa6ff80db3ef9f58c75d7d14c Author: Cy Schubert AuthorDate: 2023-02-23 05:43:17 +0000 Commit: Cy Schubert CommitDate: 2023-02-27 04:32:59 +0000 ping: Fix unsigned integer underflow resuling in a ping -R segfault ping -R (F_RROUTE) will loop at ping.c:1381 until it segfaults or the unsigned int hlen happens to be less than the size of an IP header: slippy$ ping -R 192.168.0.101 PING 192.168.0.101 (192.168.0.101): 56 data bytes 64 bytes from 192.168.0.101: icmp_seq=0 ttl=63 time=1.081 ms RR: 192.168.0.1 192.168.0.101 192.168.0.101 10.1.1.254 10.1.1.91 unknown option bb unknown option 32 unknown option 6 ... unknown option 96 unknown option 2d Segmentation fault The reason for this is while looping through loose source routing (LSRR) and strict source routing (SSRR), hlen will become smaller than the IP header. It may even become negative. This should terminate the loop. However, when hlen is unsigned, an integer underflow occurs becoming a large number causing the loop to continue virtually forever until hlen is either by chance smaller than the lenghth of an IP header or it segfaults. Reviewed by: asomers Fixes: 46d7b45a267b Differential Revision: https://reviews.freebsd.org/D38744 (cherry picked from commit 70960bb86a3ba5b6f5c4652e613e6313a7ed1ac1) --- sbin/ping/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index eda8bfbd35ea..a0eb570e6f0c 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1134,7 +1134,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) ssize_t icmp_data_raw_len; double triptime; int dupflag, i, j, recv_len; - uint8_t hlen; + int8_t hlen; uint16_t seq; static int old_rrlen; static char old_rr[MAX_IPOPTLEN]; @@ -1155,7 +1155,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) hlen = (l & 0x0f) << 2; /* Reject IP packets with a short header */ - if (hlen < sizeof(struct ip)) { + if (hlen < (int8_t) sizeof(struct ip)) { if (options & F_VERBOSE) warn("IHL too short (%d bytes) from %s", hlen, inet_ntoa(from->sin_addr)); From nobody Mon Feb 27 18:27:55 2023 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 4PQTWb3v5rz3vSHf; Mon, 27 Feb 2023 18:27:55 +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 4PQTWb3LqZz4208; Mon, 27 Feb 2023 18:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677522475; 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=lVue5TAO7btO6EAcw5yOXxqe8pTkepfZ+KDT2C13W3w=; b=QnizIj293//v43saNfaxKsb5tS5DrjZBPQSJr6qLa/1D/pF+ndENPt6YJLQFfjCDAZUYWL 88PiAmbUc3EZMIfqOox5C+V6w4dNH3kRre4M9FZaqYo69aWWm45KppwvLYGa0Uyjy7BOTX uXFrszUVk0USqlXKUi4uuGnWFkMN9BaRTKcSX3+imhaOLz+QO41frKO7Qhkr/zceN/Z5bp yWGvQtR78p9C5Sreb1T0u57Z06HWj5VUGSw/5YiCxrApQen9BAlkQJVB1l9Sz9a+kBttBP ZOuYhIFZ9Xo76OQsKcTyl2O8OLZK82eZE/LFwqHlCy6NtfVhPdMzSX9jyXzLGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677522475; 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=lVue5TAO7btO6EAcw5yOXxqe8pTkepfZ+KDT2C13W3w=; b=RduW5FL62HKfYEnJgsmvjnSszw2Zbn285rZEv38ohxabJ/kafwRtUPStxFc374hFnPLEZ6 1RczedMTt5a1+moWNCsCGdD5nte65DpzOi8WcCG1J9nJfsjQPqiZxW2ApUxdJESdtgn2Xg twENeG0FlEUfWOEFuI9MPprRnxjgvXLdHtiJDE2VszthbTcfLqwB2/30Xrbes8+MC2FCOM MdrQ4RLoaV6UkXHuJNbDhs7r12q2CDLkqIi/bFodfRe/dJ5e2BANsyq5/AXq/uVGMgAsXw HNH34TjWVVxtyCKGg4YBCrcqaHavbmHFUo2h60SEZ+f61IIFV7vk+2IlGFb4/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677522475; a=rsa-sha256; cv=none; b=LMEEe7OSjyWhcNOjjEt03Q1gVZeQ5dyHEzxD2lAZtQDZqh/CNUXg4/GuqxTOTkdOutKPyK 9jpw0NDPlziX9Hh17DyaPzEh6jf0cOeNm+3o3s+INFZdKSEMG3ay+UwuKv79LSkZr17cDe NMlCaU13DG9xvjlscBIfe1B57Jk31LaNjYObPP2KkUw+j1+LL2LfgMwx9artI/+yFpNlOc AClvtv+c8sS6aq9ZyBJGuqhatRCe2tr05kmrQ61goERnnK9zcHEjf1OAz/ZQ7r3mXsVp1l 2cPPfCJjs5BbwousthOB6lma1R7a3etkXlnTbxUnuIwAf0nneX9q8jEMjuGSwQ== 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 4PQTWb2PLyzbwq; Mon, 27 Feb 2023 18:27:55 +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 31RIRtvu050812; Mon, 27 Feb 2023 18:27:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RIRtVS050811; Mon, 27 Feb 2023 18:27:55 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:27:55 GMT Message-Id: <202302271827.31RIRtVS050811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 08627f81cde1 - releng/13.2 - Update leap-seconds to latest leap-seconds.3676924800 (expires 2023-12-28) 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 08627f81cde12f5deb282993416ec1923da887b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=08627f81cde12f5deb282993416ec1923da887b3 commit 08627f81cde12f5deb282993416ec1923da887b3 Author: Dimitry Andric AuthorDate: 2023-02-24 12:17:16 +0000 Commit: Dimitry Andric CommitDate: 2023-02-27 18:26:52 +0000 Update leap-seconds to latest leap-seconds.3676924800 (expires 2023-12-28) Approved by: re (cperciva) Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800 MFC after: 3 days (cherry picked from commit df2fbbfa71b8ecc9e9e75ce85a635aade9c691cb) (cherry picked from commit 0196b0944430916d5aaf0bb87571626b391c3138) --- usr.sbin/ntp/ntpd/leap-seconds | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ntp/ntpd/leap-seconds b/usr.sbin/ntp/ntpd/leap-seconds index 0f43115c8e53..17e3a100f943 100644 --- a/usr.sbin/ntp/ntpd/leap-seconds +++ b/usr.sbin/ntp/ntpd/leap-seconds @@ -204,10 +204,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C63 -# File expires on: 28 December 2022 +# Updated through IERS Bulletin C65 +# File expires on: 28 December 2023 # -#@ 3881174400 +#@ 3912710400 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -252,4 +252,4 @@ # the hash line is also ignored in the # computation. # -#h 732b2044 5863a938 b7e43179 1339c710 ded63837 +#h e76a99dc 65f15cc7 e613e040 f5078b5e b23834fe From nobody Mon Feb 27 18:47:25 2023 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 4PQTy60bgrz3vTH4; Mon, 27 Feb 2023 18: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 4PQTy575Cmz446k; Mon, 27 Feb 2023 18:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677523646; 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=x8Sp9xx85vjUacFp0x74CliDhX9IxpMUfCF+H+rwE30=; b=EunJ8RXBH7hf7eM0yelTsa3ugEh0YVpd22SYAihxmsR/llt0awpBtI/LJ0QFM/yw7LyuLz 2oyhUx+X/lGqjWN274qomQMYVyGswykIgOzinq+OOeOHQQi0xkemUmSP+iKf8sP2s82j8H DA6t5mylYhTEm0h7Gu4vCCl7MjeOZBcYJK3tKZb20zpFuV3+Y9a3U0uXcF0jqtte0IZadz MbfkEJ+cPZgg5Tv1TYmDmUCPZQyfLTlIpIo4OBKbMnUKFDK7DtpT1tOJkLRQPw8DCHf5ih oA+7Wt4CHFcEOykwwBbGLDU8S8t57ukmoNqPMx2vKbFwUGlTk4g889sECsOepg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677523646; 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=x8Sp9xx85vjUacFp0x74CliDhX9IxpMUfCF+H+rwE30=; b=Ibsf5KX6cbPJ78jfurbG7Fjp78HfM9zhrcUMrZSgcogDjJ/OgQvTTvXngasf5TStE6cxmI dEeFQvd3CNOgdnodTSgL/q7ttSsHT7DWUuL+CpToLqUZd99cwIr6s+u5mheedDDYx9UYif 9/UEyhhbcepYVASxL3etzjENchw5H4c54IIENF0f6Oy1q20BnaL44VkqufCbzx88SVVMNk Pfvt3mTQOv15iEXflbKuGKVVNFYjJZ6P8US6mulDGSZs+VelJh7UC17ozi6UL+yWtc5Evn Qei3bBE13HeeYaxx9haMGFC3jXTDsQ4GsnBeybTM/VQkcOafs4PHvYcHdeI/Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677523646; a=rsa-sha256; cv=none; b=ilBCe/hd4kBVNH0r2LtakxCsde8IWEVFWTIbsyT3AtmYAafzxUSI1AgvNe/pN2jldwTNGe yHuw5x5HALqWAfq6jTZQ5QAOom+SldsgKnGQStQWEQVFW2J93wdlLnzMVK16PX++l7dPvd n6Kb6aatKIWk7vgVrEnIo+9DZSpSx0wGL8TkyiQOyOKmTy6uuXVLGwUBM/O0YqH+muwf3D zwuAxAefXaAeiL4POIabQLaWKTP3AxEWGlI9RvISYNgd/2YJFgNCwhtr+/DskeogSXPzD9 fUJBNJVmFyGIRSROVMPkoJt9t+v5rit3H88OqZtxOmNuj3QboUx8r8wh5U9HVw== 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 4PQTy5697tzcVT; Mon, 27 Feb 2023 18: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 31RIlPUo084507; Mon, 27 Feb 2023 18: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 31RIlPTH084506; Mon, 27 Feb 2023 18:47:25 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:47:25 GMT Message-Id: <202302271847.31RIlPTH084506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: ed4f9a251868 - releng/13.2 - ping: Fix unsigned integer underflow resuling in a ping -R segfault 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: ed4f9a251868149dd738640568b2fc48338b39e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ed4f9a251868149dd738640568b2fc48338b39e1 commit ed4f9a251868149dd738640568b2fc48338b39e1 Author: Cy Schubert AuthorDate: 2023-02-23 05:43:17 +0000 Commit: Cy Schubert CommitDate: 2023-02-27 18:46:42 +0000 ping: Fix unsigned integer underflow resuling in a ping -R segfault ping -R (F_RROUTE) will loop at ping.c:1381 until it segfaults or the unsigned int hlen happens to be less than the size of an IP header: slippy$ ping -R 192.168.0.101 PING 192.168.0.101 (192.168.0.101): 56 data bytes 64 bytes from 192.168.0.101: icmp_seq=0 ttl=63 time=1.081 ms RR: 192.168.0.1 192.168.0.101 192.168.0.101 10.1.1.254 10.1.1.91 unknown option bb unknown option 32 unknown option 6 ... unknown option 96 unknown option 2d Segmentation fault The reason for this is while looping through loose source routing (LSRR) and strict source routing (SSRR), hlen will become smaller than the IP header. It may even become negative. This should terminate the loop. However, when hlen is unsigned, an integer underflow occurs becoming a large number causing the loop to continue virtually forever until hlen is either by chance smaller than the lenghth of an IP header or it segfaults. Approved by: re (cperciva) Reviewed by: asomers Fixes: 46d7b45a267b Differential Revision: https://reviews.freebsd.org/D38744 (cherry picked from commit 70960bb86a3ba5b6f5c4652e613e6313a7ed1ac1) (cherry picked from commit 18936d3526f3090e4164b8155762bf5bd54038a8) --- sbin/ping/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 6956b9a68ad2..2fc876e50776 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1150,7 +1150,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) ssize_t icmp_data_raw_len; double triptime; int dupflag, i, j, recv_len; - uint8_t hlen; + int8_t hlen; uint16_t seq; static int old_rrlen; static char old_rr[MAX_IPOPTLEN]; @@ -1171,7 +1171,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) hlen = (l & 0x0f) << 2; /* Reject IP packets with a short header */ - if (hlen < sizeof(struct ip)) { + if (hlen < (int8_t) sizeof(struct ip)) { if (options & F_VERBOSE) warn("IHL too short (%d bytes) from %s", hlen, inet_ntoa(from->sin_addr)); From nobody Mon Feb 27 23:04:41 2023 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 4PQbg3085Nz3tJ2D; Mon, 27 Feb 2023 23:04:47 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQbg15QCPz3tdg; Mon, 27 Feb 2023 23:04:45 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 3.97.99.32) smtp.mailfrom=cy.schubert@cschubert.com; dmarc=none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id WelgpiAZBuZMSWmY0p88lu; Mon, 27 Feb 2023 23:04:44 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id WmXypjl8qHFsOWmXzptIU7; Mon, 27 Feb 2023 23:04:44 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=63fd370c a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=m04uMKEZRckA:10 a=VxmjJ2MpAAAA:8 a=B8ibFTVmAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=pSiawZxUykX_V_PwvVEA:9 a=CjuIK1q_8ugA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=xvSgdcfEVHFitugM1GHH:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 0845C5F8; Mon, 27 Feb 2023 15:04:41 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id AA198C9; Mon, 27 Feb 2023 15:04:41 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Colin Percival , Zhenlei Huang cc: Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" , re@freebsd.org Subject: Re: git: 26ba9518ffec - stable/13 - unbound: Vendor import 1.17.1 In-reply-to: <20230227040559.2CCD6658@slippy.cwsent.com> References: <202302141833.31EIXkwO001829@gitrepo.freebsd.org> <2AFA7DFF-388C-4C6C-8CF3-9B9FAC95BF14@FreeBSD.org> <010001868ffe0ff1-0859a410-c83d-4924-9ecf-23ddbb2aeb67-000000@email.amazonses.com> <20230227040559.2CCD6658@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Sun, 26 Feb 2023 20:05:58 -0800." 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=us-ascii Date: Mon, 27 Feb 2023 15:04:41 -0800 Message-Id: <20230227230441.AA198C9@slippy.cwsent.com> X-CMAE-Envelope: MS4xfC+PcfVqMRCChQNs5CDkpGgdaTTrYid6PuKebWi7ksdFOWDVjsKwHQfrOV2WmgU7N8xlBwl/LgVPOAngnMkPt2fS5pANC4d/HMywRNI388iipfH4jHQo d+s0Bs4JYtwIAaENY7oKlNSGKXGXI+Y2PFjhwp0LPu4FNSBQGMBZviqqBM9QfDyIqmarg0ll17WVpUcebMdsoUlBOasQvRIoVOPcBUFN47b9UMHUDM1fmy29 o4gj4GN7CEO2NM83Vrg8PiLbSUaE246bvqIeCsEPELlnWGyOOW7k/BZwmfEG1gD+R7v3KLDeFwZpJR3za8MiAzxE+LLSZMJWpgVMwfC0FfnPQpqbIs0D5y1i O8Po4QMwNW2uRuOHo3hXko4zTzRHffmTFU7t4ulFL/OlpFxs78dPthSKCTL/FBM4mjnFYlKc X-Spamd-Result: default: False [-1.79 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.993]; MV_CASE(0.50)[]; RCVD_IN_DNSWL_MED(-0.20)[3.97.99.32:from]; MIME_GOOD(-0.10)[text/plain]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_COUNT_FIVE(0.00)[5]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-branches@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; R_SPF_NA(0.00)[no SPF record]; RCPT_COUNT_SEVEN(0.00)[7]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[3.97.99.32:from] X-Rspamd-Queue-Id: 4PQbg15QCPz3tdg X-Spamd-Bar: - X-ThisMailContainsUnwantedMimeParts: N In message <20230227040559.2CCD6658@slippy.cwsent.com>, Cy Schubert writes: > In message <010001868ffe0ff1-0859a410-c83d-4924-9ecf-23ddbb2aeb67-000000@ema > il. > amazonses.com>, Colin Percival writes: > > On 2/26/23 10:20, Cy Schubert wrote: > > > On February 25, 2023 10:45:37 PM PST, Zhenlei Huang wr > ot > > e: > > >> Will this been merged into releng/13.2 ? > > >> > > >> RC1 is coming, as per the release schedule https://www.freebsd.org/relea > se > > s/13.2R/schedule/ . > > >> > > >>> On Feb 15, 2023, at 2:33 AM, Cy Schubert wrote: > > >>> unbound: Vendor import 1.17.1 > > > > > > We will need to as the Release Engineer, as MFS to releng/13.2 is not my > de > > cision. > > > > In general yes, it's better to have newer versions of "contrib" code in the > > release -- among other things, it makes it easier for secteam to handle any > > security vulnerabilities. > > > > That said, I haven't looked at what has changed in this version; if there's > > some reason you don't think it should be merged, I'll absolutely trust your > > expertise here. > > > > So I'm not going to ask for this to be merged to releng/13.2, but if you'd > > like to do it (in the next few days!) I think it's safe to say that you can > > expect it to be approved. ;-) > > I'll make a formal request first thing tomorrow morning. Having looked at this, this afternoon (unexpectedly crazy in a bad sense morning), this would be an MFS of three separate commits to releng/13.2. I was toying with the idea of a squashed commit but I think a squashed commit would could confuse the cherry-picked lines. I'll try to get it an approval email sent to re@ as soon as I can. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Tue Feb 28 02:01:56 2023 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 4PQgbS2g2pz3tknM; Tue, 28 Feb 2023 02:01:56 +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 4PQgbS2584z4JLG; Tue, 28 Feb 2023 02:01:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677549716; 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=zzupcXBmowZRBmo1vngnfYUbETXIXCZ6qL+Gkkxiibo=; b=lkFdlvis9ws8sondXO8N1Xmc3XHE2XjbIGU7SNp4b1lxXV1UalgKiSs9Afw51yjdNtTZgm 2CliqDuPZBMBOHpERw9hGOLJUYzanYgRCgmpnCnWvov6JXL5ljfoU0hPbVW0nVzyl0H9ez GnIo46qEMb1Lb7+CQ/GD3yZN/i561AxZWgb0y6hpzE8N7U1vT9+D26tVTlZxPtUjkbvGA0 q4+GMV5ss5wfFbQP0BKX1nR+t2qUxagHSPwq6vXRnT6/9tQsCjsUORpw309ARFDjirbLY5 5n5fpfUu2henXu2xrZIGxOB5k16XjTzjS7BEjJZVzosnyoqXWGPTYugZ4328hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677549716; 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=zzupcXBmowZRBmo1vngnfYUbETXIXCZ6qL+Gkkxiibo=; b=IkUrB3IQU923ZyriFVOSHO0eNj5niXchxNnOk0PsauPqtI36bw0/INOGDSkER/e8sCbmCR C6mbiOzw7wzJpb2pJ10PuWwgdPgACthiReSo+CEpqDtmTkGILqW1xcVolOWl1SJ5gaK1pf 7x/UG5uE3SZaciHeEF82cONICwzyv45IqabfW6XXF7jB6YgaL8BM0WTuzEv7KMYFHAJwgI g1kMqDhYEXTECx3CwM6uA3kDRsMRCvSROPRlz85UHHPjYQ3iDLzZCxE+Y1Amg1GbYCbQ4T tLLqtyTTgPMapFH7RWPBAx20Jl9FUrzdQwwd7QQyrrEbgF2f1h2QYarlmErC/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677549716; a=rsa-sha256; cv=none; b=lNMuPsbLoE6a6w0KV49RyyT42yJRDvYj+TWsE9+oQ6iZjRTg8qYBUGJY/WHuwwfnikbJkD sYivfE0iQExEdQUgfIJ9lM9T1DtKEWkQ2QaqUGCsCQXfli4Udv4X5zxdNpD+Xd2M1aTotL 3GxXt/NhvKdZpYrkf5TW+oUksbHQaMRLVamXNv/y64Woq+Kf8k/Q9O1jIfvxhL5bifQmVJ ieb442lTuds6yul8TXkFFEYRDN+M866McPQ87xW5WsereJuOmqUZfnUghjUpQK6zKd1eAB LyQcpy9k0sNEBBq7YqvBpw7/lZVyh4IlBZEn0AJTRaU56Bu08NT7eOP9VYLJKQ== 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 4PQgbS1B0qzq1g; Tue, 28 Feb 2023 02:01:56 +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 31S21uW0005297; Tue, 28 Feb 2023 02:01:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S21u5a005296; Tue, 28 Feb 2023 02:01:56 GMT (envelope-from git) Date: Tue, 28 Feb 2023 02:01:56 GMT Message-Id: <202302280201.31S21u5a005296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 7b6d9cae9760 - stable/13 - vnet: Make vnet_sys[un]init() static 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b6d9cae9760152f0994d0825ee49cb5b5e204dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7b6d9cae9760152f0994d0825ee49cb5b5e204dc commit 7b6d9cae9760152f0994d0825ee49cb5b5e204dc Author: Zhenlei Huang AuthorDate: 2023-02-21 16:22:23 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-28 02:00:34 +0000 vnet: Make vnet_sys[un]init() static These two functions are intended to be used only when allocating or destroying vnet instances. No functional change intended. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37955 (cherry picked from commit fb9b76e05247e014f5faa554161028f6aa409bfd) --- sys/net/vnet.c | 10 ++++++++-- sys/net/vnet.h | 6 ------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index 2480fc8dd86c..b46ed9e270e0 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -220,6 +220,12 @@ SDT_PROBE_DEFINE2(vnet, functions, vnet_destroy, entry, SDT_PROBE_DEFINE1(vnet, functions, vnet_destroy, return, "int"); +/* + * Run per-vnet sysinits or sysuninits during vnet creation/destruction. + */ +static void vnet_sysinit(void); +static void vnet_sysuninit(void); + #ifdef DDB static void db_show_vnet_print_vs(struct vnet_sysinit *, int); #endif @@ -571,7 +577,7 @@ vnet_deregister_sysuninit(void *arg) * vnet construction. The caller is responsible for ensuring the new vnet is * the current vnet and that the vnet_sysinit_sxlock lock is locked. */ -void +static void vnet_sysinit(void) { struct vnet_sysinit *vs; @@ -589,7 +595,7 @@ vnet_sysinit(void) * vnet destruction. The caller is responsible for ensuring the dying vnet * the current vnet and that the vnet_sysinit_sxlock lock is locked. */ -void +static void vnet_sysuninit(void) { struct vnet_sysinit *vs; diff --git a/sys/net/vnet.h b/sys/net/vnet.h index dcfcb5f99064..813ba2da921b 100644 --- a/sys/net/vnet.h +++ b/sys/net/vnet.h @@ -355,12 +355,6 @@ struct vnet_sysinit { SYSUNINIT(vnet_uninit_ ## ident, subsystem, order, \ vnet_deregister_sysuninit, &ident ## _vnet_uninit) -/* - * Run per-vnet sysinits or sysuninits during vnet creation/destruction. - */ -void vnet_sysinit(void); -void vnet_sysuninit(void); - /* * Interfaces for managing per-vnet constructors and destructors. */ From nobody Tue Feb 28 02:03:48 2023 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 4PQgdd30PTz3tl9J; Tue, 28 Feb 2023 02:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQgdd1KKmz4JqJ; Tue, 28 Feb 2023 02:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677549829; 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=AsnGgCJnlJROG2xPVBe9KCz7+2hBCOn2Lc1kU2BwR+U=; b=HjJ9nObHGrPppX73J+NMJNp5jnZNr1vtLIDNkIefR3gUiWIjCSuSJKSS3/Y0nECwfxBKaA fjaaPQnI3Xsriugf3qRkWjkSPYfe3gJKTFeud6HyasLMDaKTT9tSJuz06jVJTHiVAnZuf4 YSArzQ6claBZTRUjdugJc6XOMmOS8qEQT3u+E12itZCBR1wVeoWa2n1QXiiFNJlbgL9853 hGcFY///z8gq+mB+ug8ErKUYYxvn/f8fc2/HFkSM9iaUP+hH6lUPMr8Uj/1qQ8cbIz4EDE CDNmuYUrbLB2zlRIdZ+jrrKphsPsZDi/8SuK5vBhPKFXpBJboqHcamtu4ymC5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677549829; 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=AsnGgCJnlJROG2xPVBe9KCz7+2hBCOn2Lc1kU2BwR+U=; b=N2OIh/YPk14HIE8T5QvQGto/ACukTMIaaAobsXudl+ddeIpj6HycH7rxmvyMAPQtegh0tt MlRtHGcCM85ELHrpzVlEW8DGmndR73cO4TbJGGxDxKUsN2/oCjMzIZQGb8Wqk4kp2nfQ2a W0Eufqf65Bp6s+4oFDmJU6FBUmk0Ch1HjvupkHpZ4K/be+G+iTBN3+stTRQxd/w3zcSVc+ lYMnmz/8ZltXIqJrBUftlWz+l6/hnwqRbaxnpropVkR6xOgoM6E9gzXWga+KllYLdhblDg ZsQZnEUaeswViHFOXi3I36SpbDYog+WbkjaZUg+1EUIaV3ZtB3rXtI/1oSOSWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677549829; a=rsa-sha256; cv=none; b=rRfiYYYhKzFTXUUpF1qK8GQHG9Iht3zbbiD6soi9PDG4pheCKwl2TP8MnRzSkph2lFzLgB jaBEkK7GTR1h6KTigx3djX4sRGhy4XJ3zdlRlC01xuCkr2E0rzEjIZzLEKW6b7c2smKYG6 gYRSvpR8rUJRylv86n94GuOsE48+8TVE47GVj67udQ9CZ/GyzY7T8ZZTHfTZ86SMNlRYIh Bh7HPHKZQo3xv+ZJYAYnMupVrXtkAXklRlnO834dZ9szpUEIFc/9gmKpBZmsGWNRmVm4gj IcsFEu9yJx9k36dmeki7X6Ekggy6T8LjV01ohxVlaqVp4lO4an4rVn6kf6koEA== 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 4PQgdd0R6vzpsT; Tue, 28 Feb 2023 02:03:49 +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 31S23mGL007320; Tue, 28 Feb 2023 02:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S23m1r007319; Tue, 28 Feb 2023 02:03:48 GMT (envelope-from git) Date: Tue, 28 Feb 2023 02:03:48 GMT Message-Id: <202302280203.31S23m1r007319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 78c22dde834a - stable/12 - vnet: Make vnet_sys[un]init() static 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 78c22dde834a99302e746262fd5440713cc55fcd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=78c22dde834a99302e746262fd5440713cc55fcd commit 78c22dde834a99302e746262fd5440713cc55fcd Author: Zhenlei Huang AuthorDate: 2023-02-21 16:22:23 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-28 02:02:17 +0000 vnet: Make vnet_sys[un]init() static These two functions are intended to be used only when allocating or destroying vnet instances. No functional change intended. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37955 (cherry picked from commit fb9b76e05247e014f5faa554161028f6aa409bfd) (cherry picked from commit 7b6d9cae9760152f0994d0825ee49cb5b5e204dc) --- sys/net/vnet.c | 10 ++++++++-- sys/net/vnet.h | 6 ------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index 3fd423d22d1d..0c8755990520 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -220,6 +220,12 @@ SDT_PROBE_DEFINE2(vnet, functions, vnet_destroy, entry, SDT_PROBE_DEFINE1(vnet, functions, vnet_destroy, return, "int"); +/* + * Run per-vnet sysinits or sysuninits during vnet creation/destruction. + */ +static void vnet_sysinit(void); +static void vnet_sysuninit(void); + #ifdef DDB static void db_show_vnet_print_vs(struct vnet_sysinit *, int); #endif @@ -569,7 +575,7 @@ vnet_deregister_sysuninit(void *arg) * vnet construction. The caller is responsible for ensuring the new vnet is * the current vnet and that the vnet_sysinit_sxlock lock is locked. */ -void +static void vnet_sysinit(void) { struct vnet_sysinit *vs; @@ -587,7 +593,7 @@ vnet_sysinit(void) * vnet destruction. The caller is responsible for ensuring the dying vnet * the current vnet and that the vnet_sysinit_sxlock lock is locked. */ -void +static void vnet_sysuninit(void) { struct vnet_sysinit *vs; diff --git a/sys/net/vnet.h b/sys/net/vnet.h index 2d69a8a96633..034c120f0dd0 100644 --- a/sys/net/vnet.h +++ b/sys/net/vnet.h @@ -352,12 +352,6 @@ struct vnet_sysinit { SYSUNINIT(vnet_uninit_ ## ident, subsystem, order, \ vnet_deregister_sysuninit, &ident ## _vnet_uninit) -/* - * Run per-vnet sysinits or sysuninits during vnet creation/destruction. - */ -void vnet_sysinit(void); -void vnet_sysuninit(void); - /* * Interfaces for managing per-vnet constructors and destructors. */ From nobody Tue Feb 28 03:00:29 2023 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 4PQhv13RV5z3tnx8; Tue, 28 Feb 2023 03:00:29 +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 4PQhv12sfvz4Nkh; Tue, 28 Feb 2023 03:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677553229; 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=mBQ8Vibe88dk7oXK4NDrWpiEVNd5D3jz0d4bwMTCpGY=; b=BHxliEmiqBjM/bi2hxfPzafmsstsP3Co2AedeaErtnt22+nLZAGfTuFQRj9+zKN9JE/8+i pVp7Ybj+fUBug9xqGDXBo6E5pr6eTeFpUaVBcN0xQDhSWqDUHLvQWbxw/uhKOZA0egyAlh 0/iOmThBMDL6GanarEctCFuwJQJxntYZzpQGGtEFv+baNmKHEwC17lpXj0L++4B1CjzuI5 MatJVrFsPgP87WrGltl0wDNVrb5ZQDXJJkTNTW3d/l7zzq/m1A4SntXNtZspkGcv4cFn94 kgUd3QI2edhPZMCpQ9VPDGxh08iaq2BfX6oYbam4F6fUoBYXJrfbn0XYzZmV+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677553229; 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=mBQ8Vibe88dk7oXK4NDrWpiEVNd5D3jz0d4bwMTCpGY=; b=cMKZLvtZ45s1jV9BHzZtjk4lg/D1waVpBna3Gzn2iLY5TnqNIAMuhbBRL53V9uR8uru2B0 9jZr68uTq1XSz+V9OilFhYUp+cFSjLeXH6nbZ7o+Tsco3e159zQ99FKbR2qMyKRuOcVLxm vYXHKzmeZTZ3naGrCsBxR9ECqArmmMIBR9YqgpShej7V2Ppn9bbUVL/WgNIaVP1imcSEJt h3OBXFq9Pk3/Ya5cwXx464b0mgvYMcWMeFIsQNEeEinabSRXKlvj7gR8NqKjpicZyrVMxi 4akXsgiaOuKoRlT5qV/kz3jB7Qm62l3P6+uVdYEu71mpDlelJifOYkwy7AtHCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677553229; a=rsa-sha256; cv=none; b=x2hCKEGnMdheRD8rMnHz5AaCOl4/Lx8dcLxgh51pf/NmKUdgCj+a/2K4zrabOwd2LMmsc5 5sdHydXXKyhyptuWnjypTsH4wnd6vJkW3T3+zZuE4O5j1uHzgW8xeJVHuHjpt7Jd/dYyRN nmuydFE6O5TQ3FDE0/GIztIme/vt9Ysv4ffZFaPJw8JLPGyyyaUuJSAyQgRDXfRuLeVSGc 4NaOIzH3SKTd3ir2bIXCZFM8oDfRD8iiHMRF2kTQF7P7uolrWJchNjuSH22PAhV4CNR/rJ xtOEKC36Du0Q79ecnxl1XNI/u2skk+wB9/ol5oXOc+iCnuQ8bQ5YjaSdc7oyEA== 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 4PQhv11wtmzr0q; Tue, 28 Feb 2023 03:00:29 +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 31S30TUE098616; Tue, 28 Feb 2023 03:00:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S30TGU098615; Tue, 28 Feb 2023 03:00:29 GMT (envelope-from git) Date: Tue, 28 Feb 2023 03:00:29 GMT Message-Id: <202302280300.31S30TGU098615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3464fc5f2a33 - stable/13 - stand: fix build userboot without zfs 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3464fc5f2a3376b4cd5612f1ee0986072b4a65f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3464fc5f2a3376b4cd5612f1ee0986072b4a65f3 commit 3464fc5f2a3376b4cd5612f1ee0986072b4a65f3 Author: Michael Paepcke AuthorDate: 2023-02-28 02:58:03 +0000 Commit: Warner Losh CommitDate: 2023-02-28 02:58:03 +0000 stand: fix build userboot without zfs Fix regression in building userboot -DWITHOUT_LOADER_ZFS Fixes: e307eb94ae520 MFC After: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/665 (cherry picked from commit 4d59545d0cacb5881e2515eecce15e8478f07276) --- stand/userboot/userboot/Makefile | 4 ++++ stand/userboot/userboot/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 43011b9577c9..986bfdccfdd6 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -36,9 +36,13 @@ SRCS+= gfx_fb_stub.c CFLAGS+= -Wall CFLAGS+= -I${BOOTSRC}/userboot + +.if ${MK_LOADER_ZFS} != "no" CFLAGS.main.c+= -I${BOOTSRC}/libsa/zfs CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs +.endif + CWARNFLAGS.main.c += -Wno-implicit-function-declaration CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index 40911f35020a..b134d86de9bd 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -32,13 +32,13 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "bootstrap.h" #include "disk.h" #include "libuserboot.h" #if defined(USERBOOT_ZFS_SUPPORT) +#include #include "libzfs.h" static void userboot_zfs_probe(void); From nobody Tue Feb 28 03:00:30 2023 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 4PQhv256WGz3tp17; Tue, 28 Feb 2023 03:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQhv23lNvz4Nl7; Tue, 28 Feb 2023 03:00:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677553230; 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=88NjhhiV5cs5Alt0U5H9M0pw0wlE1O/inp6a9QsuWmY=; b=t3t/aXtvO3rsk9Tp4tFbCPyaG5WhnBMpFI+KkPmsFFbFK7Qy+gJG9Fh0SI5mvA5OHjDZkr 2IPTJpLhwAA69Of7ujxPNQYDq4TChP9iqCuftzvZxqoKNjKhyPBKYg3vn44oguIy3diV5/ uQ4Hz3a3L9pjk7BQaWf/RZPTY7+A2qQ7yFfaJrM2nA5Utjjw4Mj3cDZTXfG/kvjlaMmlWE X5bSx7TS/MVSLMnczCHwNL1MwmfhPYSlyRCcIxJ3m/B8zGEZsVT12HXDcyBcSTOR84FT7X S2agxKt/1cQzM87QyxsrxvLcp9N2WmHB7j6lYzc1kBchxW9nzTOuvuhHgiaCng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677553230; 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=88NjhhiV5cs5Alt0U5H9M0pw0wlE1O/inp6a9QsuWmY=; b=cf2pQD0QSeLHdMLIPCuwhtIoYsU8FQj4BXL1e9mHVk/k3wHdIgJiO54YXCFKUKbucqpKfc WLgRFcjLxRLQEuCOxn1HiDn0DVGrdadb8K46zDtdwrusz0xHQxymeLRutH63vzoCZZhU4c 4YbkCwGdT03mFEFgwvWABMA41rOvt01loSiOdNNtvJTSf3SMXe7FavEshyD1bUWwkUmj28 65G4pCdZjKjVu8V4m3Dzw3wZC5uA26XPzNdiGxjGTDKcPT0VBb6tsg19M6CDeJ6u7oqfsr 9nABDpNM9hUfUHb7d36zTK9YCS+iVhQfMoSUlk5e6xOrEOCxsSR8HX0Kjrlmew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677553230; a=rsa-sha256; cv=none; b=V5vvkGcjwde8RyTVuVo7iRfBeU3m9rU3XQin+HNaHqYVddyzOaZXIqJVzsbcvVaERaWbPC oagS3m6CXy+GQq7M5/I0z6AFwD/41m85BQh0apttsCEMoh+MUlqLzGq0cF3OiXcxwhxi/a pcDhAgCUN1kCAgebxzYXOnlBuOeE51xO8+Dz12RmIzVM898LDtTwSLYaDbsuYwpvnWf8EJ IsKqK4cMi7IfL/XT4DCuRl0S3dEsy8smlwvSDixtGNnZ7qPbu+ZW7Oed6ifjxmAdZRJi3G MlGUb26cI4sdIU8BuRIwKMT3Rc8VHsL3zQxkveOMuoQhb5AcUx5THio+leqyZg== 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 4PQhv22WsGzr9B; Tue, 28 Feb 2023 03:00:30 +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 31S30UKR098635; Tue, 28 Feb 2023 03:00:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S30UrQ098634; Tue, 28 Feb 2023 03:00:30 GMT (envelope-from git) Date: Tue, 28 Feb 2023 03:00:30 GMT Message-Id: <202302280300.31S30UrQ098634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: a1c63b8e29e8 - stable/13 - apic: prevent divide by zero in CPU frequency init 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a1c63b8e29e832d9ada7c252e7e80ce8b94aeb41 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a1c63b8e29e832d9ada7c252e7e80ce8b94aeb41 commit a1c63b8e29e832d9ada7c252e7e80ce8b94aeb41 Author: Mina Galić AuthorDate: 2023-02-28 02:58:45 +0000 Commit: Warner Losh CommitDate: 2023-02-28 02:58:45 +0000 apic: prevent divide by zero in CPU frequency init If a CPU for some reason returns 0 as CPU frequency, we currently panic on the resulting divide by zero when trying to initialize the CPU(s) via APIC. When this happens, we'll fallback to measuring the frequency instead. PR: 269767 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/664 (cherry picked from commit 499171a98c8813e4dc6e085461d5c47750efa555) --- sys/x86/x86/local_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 4ab4e78f20e7..482b0ebd81bc 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -1027,7 +1027,7 @@ lapic_calibrate_initcount_cpuid_vm(void) /* Record divided frequency. */ count_freq = freq / lapic_timer_divisor; - return (true); + return (count_freq != 0); } static uint64_t From nobody Tue Feb 28 10:14:07 2023 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 4PQtWN2QcPz3vGwZ; Tue, 28 Feb 2023 10:14:08 +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 4PQtWN0RCfz3qkx; Tue, 28 Feb 2023 10:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579248; 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=4E33uvyPgLXQ3NBgCCPL5+BrjZrNeeUQjy3COaZfumM=; b=rhxMXctgCvkWXRlCqb68qNbYMA48Vd18CpY/eEW/wtTzcstfrr5yYBeK01H6760gVDA3Yp JR6SfP2+Bo84WdR+Wd1Kwu5v2lygWmNDYC/woZ3wHu2AoTkfylV0kgbV2LY8KgJKCd8MJY mq+95zzFtE0m8WELKKYOcv1p5X9y/xgr7P6wsygAdsT+CLkgp0VFcAJXL21WEw0bII/f3B /jUQ/ZJItApIGgcv0s7iE2Ffmc+nAAU2wk4nDWya157LVBPl/01Gl94Gv2us+8tZiUAENe yw1bdFgQsV3mU61MXGD0zOlR8J8/gNhm5BDBT8QLEzPSX7DZArEwAQC/y6JSTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579248; 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=4E33uvyPgLXQ3NBgCCPL5+BrjZrNeeUQjy3COaZfumM=; b=SpTyZzahx1AMyykRowcgtRwI4bPORWTgNSznpW+1gYsNEqkJUbBgVeZ6r4rZ68Ld/voDbR OjA5Gf6176EJcJ6oMejYny2N+OcnpVbCJjvRBhXb9ucVwV7DPsxHoYg9HFoSrsNnYjwWVd vC/DDxw5gjA1QaPYg8fjJKfa7Jzkzz/F26mLFC+Q1xbxSMONNT9xLiqk+izosKOT+JYvQ9 YoR5TetBssf8Q3gpZb42XzvnKj35OzyOcIpN9K/+3iBy97fZ7GYHv6GXM+vQp5JOd1EFBE /weYaO5cd1Vnc96VPuhLtIRXKmmOjrWdP8hwqoI4SOXP+D7RyLYysyCJ3D2cIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579248; a=rsa-sha256; cv=none; b=Yscx2LSaYK6fUlIe7CTurlF4wRYNreusoN7AIhpV4HLatqDbt3xNDHS+sCnIyOohibGlLo +9IVjhUZJqe6RRA8VJTpIujBjoExvakjaJQ/kuMznBu8du/8wfJe5Wxv0X5Ru8gxjAQOQ3 cC+LEBq3IlYHhNb0at74O/Ke3gTm1PhlaukPH+1hUMarCkTCsFtTA3BZwi/iszb1tFtXJt PTasnkUbdCz8572vFhCroQ40+WgLqbozLZ1o0ezO/x4CPKa7m6TsqTOuH8rhZuXy5xdUrb v36hEtFHyLWUWYqkF7LN3czZCuofAAIL94Ys8y0xcXCT7n1p+lGraX/e9QXUrA== 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 4PQtWM6f6Hz13ny; Tue, 28 Feb 2023 10:14:07 +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 31SAE7ho013693; Tue, 28 Feb 2023 10:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAE7mO013692; Tue, 28 Feb 2023 10:14:07 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:14:07 GMT Message-Id: <202302281014.31SAE7mO013692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b5d47fa9a511 - stable/13 - bhyve: add helper struct for acpi device handling 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b5d47fa9a5112f13cac8282c18d36f40661967a0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b5d47fa9a5112f13cac8282c18d36f40661967a0 commit b5d47fa9a5112f13cac8282c18d36f40661967a0 Author: Corvin Köhne AuthorDate: 2021-10-07 13:54:46 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 10:04:26 +0000 bhyve: add helper struct for acpi device handling To simplify the handling of different acpi devices like qemu fwcfg or a tpm, add a helper struct. It will handle the reporting of acpi resources. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38327 (cherry picked from commit 1231f047c3ed46ca6041df62f2b71f6e879bbb40) --- usr.sbin/bhyve/Makefile | 1 + usr.sbin/bhyve/acpi_device.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/acpi_device.h | 31 +++++++++++++++ 3 files changed, 124 insertions(+) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index a456d507a071..bf0a17edc59e 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -15,6 +15,7 @@ MAN= bhyve.8 bhyve_config.5 BHYVE_SYSDIR?=${SRCTOP} SRCS= \ + acpi_device.c \ atkbdc.c \ acpi.c \ audio.c \ diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c new file mode 100644 index 000000000000..66d50de814fd --- /dev/null +++ b/usr.sbin/bhyve/acpi_device.c @@ -0,0 +1,92 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG + * Author: Corvin Köhne + */ + +#include +#include + +#include + +#include +#include +#include + +#include "acpi.h" +#include "acpi_device.h" + +/** + * List entry to enumerate all resources used by an ACPI device. + * + * @param chain Used to chain multiple elements together. + * @param type Type of the ACPI resource. + * @param data Data of the ACPI resource. + */ +struct acpi_resource_list_entry { + SLIST_ENTRY(acpi_resource_list_entry) chain; + UINT32 type; + ACPI_RESOURCE_DATA data; +}; + +/** + * Holds information about an ACPI device. + * + * @param vm_ctx VM context the ACPI device was created in. + * @param name Name of the ACPI device. + * @param hid Hardware ID of the ACPI device. + * @param crs Current resources used by the ACPI device. + */ +struct acpi_device { + struct vmctx *vm_ctx; + const char *name; + const char *hid; + SLIST_HEAD(acpi_resource_list, acpi_resource_list_entry) crs; +}; + +int +acpi_device_create(struct acpi_device **const new_dev, + struct vmctx *const vm_ctx, const char *const name, const char *const hid) +{ + if (new_dev == NULL || vm_ctx == NULL || name == NULL || hid == NULL) { + return (EINVAL); + } + + struct acpi_device *const dev = calloc(1, sizeof(*dev)); + if (dev == NULL) { + return (ENOMEM); + } + + dev->vm_ctx = vm_ctx; + dev->name = strdup(name); + dev->hid = strdup(hid); + SLIST_INIT(&dev->crs); + if (dev->name == NULL || dev->hid == NULL) { + acpi_device_destroy(dev); + return (ENOMEM); + } + + *new_dev = dev; + + return (0); +} + +void +acpi_device_destroy(struct acpi_device *const dev) +{ + if (dev == NULL) { + return; + } + + struct acpi_resource_list_entry *res; + while (!SLIST_EMPTY(&dev->crs)) { + res = SLIST_FIRST(&dev->crs); + SLIST_REMOVE_HEAD(&dev->crs, chain); + free(res); + } + + free(__DECONST(void *, dev->hid)); + free(__DECONST(void *, dev->name)); + free(dev); +} diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h new file mode 100644 index 000000000000..1728acd4cdcd --- /dev/null +++ b/usr.sbin/bhyve/acpi_device.h @@ -0,0 +1,31 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG + * Author: Corvin Köhne + */ + +#pragma once + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" +#include +#pragma GCC diagnostic pop + +struct vmctx; + +struct acpi_device; + +/** + * Creates an ACPI device. + * + * @param[out] new_dev Returns the newly create ACPI device. + * @param[in] vm_ctx VM context the ACPI device is created in. + * @param[in] name Name of the ACPI device. Should always be a NULL + * terminated string. + * @param[in] hid Hardware ID of the ACPI device. Should always be a NULL + * terminated string. + */ +int acpi_device_create(struct acpi_device **const new_dev, + struct vmctx *const vm_ctx, const char *const name, const char *const hid); +void acpi_device_destroy(struct acpi_device *const dev); From nobody Tue Feb 28 10:14:08 2023 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 4PQtWP2rcyz3vGhQ; Tue, 28 Feb 2023 10:14:09 +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 4PQtWP1L24z3ql4; Tue, 28 Feb 2023 10:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579249; 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=zYUGIjwTwodeeCHauOwbPSxPeZ947YnQ7Ac/Rb5pSwE=; b=lL5SxdF5Gti2d/4VSKyocSsPV0b9y2re5QkWdmyfHD6o5tsFaWRUblTaslM4P4viLNnKgf f5CeGJj87op+S4QOenxBT4wpGGn4VXx1BtDHosglis5FEtKQEdtWp1QK5tGRhhVhfc3s1M 5IondbB5ft/7C6HclqZ9ELQ/ZaR78RrWEhSi+FeAynty7vZiULu00wq15eA+MZ5F0QTvkk P9Js8tY0Y3iNDCRVGWkYyD8SfbeNcjmA7w1XYGQaNV9cL1o1xbeEW87uQ+AVkRCeStprzS WhER8kKeCKL4UAJfmCCVnbPT646Mq8qCPr6ZQHvsIzebG84G2Bq8qHlUn0zrdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579249; 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=zYUGIjwTwodeeCHauOwbPSxPeZ947YnQ7Ac/Rb5pSwE=; b=mj/DMhBiq0MS286bn4Z7WtfdjQ/vzN/Si9EhrFmxe2WBdAE6dJB1l7Mr9P7TL84A7lB9DV XuT+RyjWsGQ5eN51/SbqJBELZZklAPGoMjLwCRLukOH/xSEGsYvILaRY3q0AxmCo92uyPm VQoVMiMOfZlx2uoJ6jy9QlRCt48+i0SDZ8QVvAKNID5SIHsRYmhJT/bJomOl8CGpdXM58J DiBz6+7KvUU0YCTSTfIl32um00BtLLlUZcmXPLiCcsxhReap0Bx2AN0BgjvF+LEWXiRERt MB6Zstyb09BHWih1dZ1bBctspS/jd4iPHfEl9YFk9BqQjODqUEh//a7ESb64pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579249; a=rsa-sha256; cv=none; b=gPPOWU2PzTn1CyPt2+NrRg1d5nptupkuDfF2wS1QWBF6ddgWAItjaohADZXdJCxFnAmGHv m9B7WJC9bBwtsMgzaNBk0p6aEYV0/thQrWW7/xSKbxHoyM0etCfe6Et2ysyTcS5stn4HwC 4kTpUFlWjXLy9f7XlkldnUfGtYm1Qmre8RuZe91Mp7Q0SDYBeA7FAEoAO3Sloy1KsfJLZr LWjUagm4elNBE/UaZNyXjhY43X7KNX0lMINh0uyjJAtb5MLqyOmbS7pnWFUr4mVimDaIVH wZ/4NByf1OOnyUko6s2FE3fpFU6q2yy6xCivHj4hgW+BkbU5/R8aLr3olnXuQQ== 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 4PQtWP0779z13lX; Tue, 28 Feb 2023 10:14:09 +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 31SAE8L7013717; Tue, 28 Feb 2023 10:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAE8HD013716; Tue, 28 Feb 2023 10:14:08 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:14:08 GMT Message-Id: <202302281014.31SAE8HD013716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: eb8931d77cee - stable/13 - bhyve: add helper func to add acpi resources 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb8931d77cee0af57578159297f95571a2d723f8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=eb8931d77cee0af57578159297f95571a2d723f8 commit eb8931d77cee0af57578159297f95571a2d723f8 Author: Corvin Köhne AuthorDate: 2021-10-07 13:57:01 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 10:04:33 +0000 bhyve: add helper func to add acpi resources These helper function can be used to assign acpi resources to an acpi_device. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38328 (cherry picked from commit 13a1df5b85e992570f45248bfe9d581dc182b755) --- usr.sbin/bhyve/acpi_device.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/acpi_device.h | 5 +++++ 2 files changed, 50 insertions(+) diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index 66d50de814fd..402e32faa93a 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -90,3 +90,48 @@ acpi_device_destroy(struct acpi_device *const dev) free(__DECONST(void *, dev->name)); free(dev); } + +int +acpi_device_add_res_fixed_ioport(struct acpi_device *const dev, + const UINT16 port, const UINT8 length) +{ + if (dev == NULL) { + return (EINVAL); + } + + struct acpi_resource_list_entry *const res = calloc(1, sizeof(*res)); + if (res == NULL) { + return (ENOMEM); + } + + res->type = ACPI_RESOURCE_TYPE_FIXED_IO; + res->data.FixedIo.Address = port; + res->data.FixedIo.AddressLength = length; + + SLIST_INSERT_HEAD(&dev->crs, res, chain); + + return (0); +} + +int +acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, + const UINT8 write_protected, const UINT32 address, const UINT32 length) +{ + if (dev == NULL) { + return (EINVAL); + } + + struct acpi_resource_list_entry *const res = calloc(1, sizeof(*res)); + if (res == NULL) { + return (ENOMEM); + } + + res->type = ACPI_RESOURCE_TYPE_FIXED_MEMORY32; + res->data.FixedMemory32.WriteProtect = write_protected; + res->data.FixedMemory32.Address = address; + res->data.FixedMemory32.AddressLength = length; + + SLIST_INSERT_HEAD(&dev->crs, res, chain); + + return (0); +} diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index 1728acd4cdcd..d9618d7e0a43 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -29,3 +29,8 @@ struct acpi_device; int acpi_device_create(struct acpi_device **const new_dev, struct vmctx *const vm_ctx, const char *const name, const char *const hid); void acpi_device_destroy(struct acpi_device *const dev); + +int acpi_device_add_res_fixed_ioport(struct acpi_device *const dev, + const UINT16 port, UINT8 length); +int acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, + const UINT8 write_protected, const UINT32 address, const UINT32 length); From nobody Tue Feb 28 10:14:10 2023 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 4PQtWQ4ptGz3vGvJ; Tue, 28 Feb 2023 10:14:10 +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 4PQtWQ1qLkz3qZ8; Tue, 28 Feb 2023 10:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579250; 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=VmEIMYM8+SuBxrEmELMNvkdTqrJfVOGPxr5wd/jIXzs=; b=JhnPFec/uJFZcgtu2ziL+zVJjHztpceuefKefdUa303IgBX3CERTnp9TSzMD24clL81Xc8 HxFZpwCB1CNt9fPlHSKj/y7GweOHUDyUiamAzwgDgW9pQCw30hfwxiKTJQlx11othCHD8t b9GWYpbsxOcc7fZXh4gOYF2JcscajqI2Ja5bh689YCC8lRuuk03vSZw4aOazWpUkSS8z99 oJUv3Uy4ag31gusrQeP7eB/6AXRtRSgdPEBJOvPuHJ84YTdJ9xiHO5qIsVXGFsXW75Eh3E CW+WHWqS+oeGf/0vBKXGDXJSjaKJZubvCWxSqo6nTrJft2VVVJyYJh7rKy04Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579250; 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=VmEIMYM8+SuBxrEmELMNvkdTqrJfVOGPxr5wd/jIXzs=; b=JM5NJ5K7jatm6EaiTJzOFfltxe73K9i4o9SQZPihGbEx3/rGw4rMJfuIzb+f37VcD48tHN mAejY42ZNNAbe7If/AdmGxm3e1bOYupRcTWeALG56LzT40RqvEf9L9Hnupb+VQ4T9Ep4ea FOxe0xndg0YfCH/oZ6zOb9wc0FBKYbaKWXMjbBnU8AXBK8yo0i6XQwLKrCISIaveTVcpHs tGmXRX3P4Vh8YA84ybdXQehmhT8/hwUzc/ATenv3io87MmzAyPsBlPrbVQKA/ov3twRWjD GIlrw82ru8/uyL6OOVgNco09PCPARsosPAjoYq2CgxsYk/Ns0wapd2DYOYvA/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579250; a=rsa-sha256; cv=none; b=LDdZYsK+kswxp6pFKUl+nAAHQwW6s1f1up2tOFvAYlVM6vcZYEM8hCcmxQDyiu8kfyXyC1 owl1+qJx8TWo4Zzfs/6Z5594c6Ml1//B6dJq0iSIkotTQ0uEV+VQtWBl1suCIjPK3j3lYk VnE86U+2ATOHCP6eDzHwrWvgyURHy01YruEbFEMllXXcJM/aDfCzOPx8xN5mhMYJJmJ2Rh sOkpW7KgZfHLdoByujlAp/AS718B6AawuPLB2xu6f/4iC57XMjU6WccTbKi+YwVfNUO6Em jtYvdnl6qGjgT1kjhZNt8T5ZjyT6dHfj9dpIwaLnGOAUGPjvRI/ysR0TLxtN3w== 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 4PQtWQ0xDLz13p0; Tue, 28 Feb 2023 10:14:10 +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 31SAEAgA013748; Tue, 28 Feb 2023 10:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAEAkQ013747; Tue, 28 Feb 2023 10:14:10 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:14:10 GMT Message-Id: <202302281014.31SAEAkQ013747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 6726130d6860 - stable/13 - bhyve: add helper func to write a dsdt entry 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6726130d6860fa5a19181e69546976eafb044538 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6726130d6860fa5a19181e69546976eafb044538 commit 6726130d6860fa5a19181e69546976eafb044538 Author: Corvin Köhne AuthorDate: 2021-10-07 13:58:27 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 10:04:34 +0000 bhyve: add helper func to write a dsdt entry The guest will check the dsdt to detect acpi devices. Therefore, add a helper function to create such a dsdt entry for an acpi device. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38329 (cherry picked from commit 682a522d61223920f23a202aa57901f38bdfd8dd) --- usr.sbin/bhyve/acpi_device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/acpi_device.h | 2 ++ 2 files changed, 48 insertions(+) diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index 402e32faa93a..10259006c619 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -10,6 +10,7 @@ #include +#include #include #include #include @@ -135,3 +136,48 @@ acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, return (0); } + +static void +acpi_device_write_dsdt_crs(const struct acpi_device *const dev) +{ + const struct acpi_resource_list_entry *res; + SLIST_FOREACH(res, &dev->crs, chain) { + switch (res->type) { + case ACPI_RESOURCE_TYPE_FIXED_IO: + dsdt_fixed_ioport(res->data.FixedIo.Address, + res->data.FixedIo.AddressLength); + break; + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: + dsdt_fixed_mem32(res->data.FixedMemory32.Address, + res->data.FixedMemory32.AddressLength); + break; + default: + assert(0); + break; + } + } +} + +void +acpi_device_write_dsdt(const struct acpi_device *const dev) +{ + if (dev == NULL) { + return; + } + + dsdt_line(""); + dsdt_line(" Scope (\\_SB)"); + dsdt_line(" {"); + dsdt_line(" Device (%s)", dev->name); + dsdt_line(" {"); + dsdt_line(" Name (_HID, \"%s\")", dev->hid); + dsdt_line(" Name (_STA, 0x0F)"); + dsdt_line(" Name (_CRS, ResourceTemplate ()"); + dsdt_line(" {"); + dsdt_indent(4); + acpi_device_write_dsdt_crs(dev); + dsdt_unindent(4); + dsdt_line(" })"); + dsdt_line(" }"); + dsdt_line(" }"); +} diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index d9618d7e0a43..5fb3ea18e481 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -34,3 +34,5 @@ int acpi_device_add_res_fixed_ioport(struct acpi_device *const dev, const UINT16 port, UINT8 length); int acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, const UINT8 write_protected, const UINT32 address, const UINT32 length); + +void acpi_device_write_dsdt(const struct acpi_device *const dev); From nobody Tue Feb 28 10:14:11 2023 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 4PQtWR5l6Zz3vGgX; Tue, 28 Feb 2023 10:14:11 +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 4PQtWR2gCBz3qg2; Tue, 28 Feb 2023 10:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579251; 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=FTEZZ0ADHhqgEg5ZBkq9zf4sd0sVeWq2y2tFonykvWc=; b=R8bI67+XWpHgKb3E8cmgDR2yQAfIYC9UkyO0WkXIB+Ey7AOHvBrCtPBrR7wz6jTdI+FjGV OzagyhlCDYk5oJgLugzKyZ2OmTwGUrNSNHJzDzDqIF+jZcDdHsaQCkh6qJcFxvg7p2s/7X 4s3mBts8nhH1EOboY8XiuambVcV8ZK61BebGQxIszEUXUCG551j9l3+NpZHGvFBSsCUE/R SiVTbHf/UuMXhQNEzOyF/w0JV6koZLzBBKKiRpaMgBGyCGO1sJ1twGFMLxl1cNCCqPtM4m 65aVDWJLeLEJA9Y8Mmo+J7pZJLW2JknaAqZ9yAR6legS5EwktRnEW/1Z578Z4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579251; 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=FTEZZ0ADHhqgEg5ZBkq9zf4sd0sVeWq2y2tFonykvWc=; b=I8mDyRmd0nOLbxEjDt5oIpdYHI7kAbqBLoHCFt2/gefZV4wcTDgTaLchuZBU/q+S/1LXWa PoSbZRd+PfGenDQ716++wff3UwZZe3ZjLMX86fVIIgTuOKd6XGsR+nq4OHbGA3c1L8s2CA nXvBlzlHmnDfR+dfhtXulRlBmSwerKRFNJInaDNiikjGzfovc0vsRZfisB60/5wEKoy4b1 ei+O3Jndy1HdE2BBtPjfbtga0hWp3Pzr5HAGzXNxqu/lXVD+g0z+2vuJbPQXhvmQtunYV/ s3BwZ2x7YDHxdsbc/UgkeDtwuRZ2p0p7oyDp+qSBgRYlRUNlHg/VXODUDslLjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579251; a=rsa-sha256; cv=none; b=D3dT1iHz0wtIkq1UN9hAHQqz7BxyZnaJg62gwdB6j8qT1SbCXFGEYYnMsIS8+VDO5EiF3A lKql7GlVwKgZaaWqD1ZUYz8mwwvwguJmiehRGOYc2a0wpjQ6WxjK+Fd14nUAwKyjU6cWuD U54QAtCmBlclpHp4Pqzgl8d5R3Vsg7QvCYyq7+q5hyCXg35EemlzACrCOWsZGtZkADkNeS B45BX4Z1/t68dM8uPQki3XPgBEAuacy9T1LJ1RR/9SlM/5SKVzKw2/EWFF34q9j/rKTUhi ymLoGsq6zf6tydgBeLYq1uROdjPBaWtvr+VOXJjedMRZ8xiKPnpdo1VVbzdQrQ== 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 4PQtWR1mrbz13Rb; Tue, 28 Feb 2023 10:14:11 +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 31SAEB5j013772; Tue, 28 Feb 2023 10:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAEBeu013771; Tue, 28 Feb 2023 10:14:11 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:14:11 GMT Message-Id: <202302281014.31SAEBeu013771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 2c1cbd083696 - stable/13 - bhyve: maintain a list of acpi devices 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c1cbd083696086aeb9f0d75ddcfbb04183de081 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=2c1cbd083696086aeb9f0d75ddcfbb04183de081 commit 2c1cbd083696086aeb9f0d75ddcfbb04183de081 Author: Corvin Köhne AuthorDate: 2021-10-07 14:14:31 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 10:04:34 +0000 bhyve: maintain a list of acpi devices The list is used to generate the dsdt entry for every acpi device. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D3830 (cherry picked from commit fbd045021d9ffdae5e5bb20e1d1890fd4b46498e) --- usr.sbin/bhyve/acpi.c | 29 +++++++++++++++++++++++++++++ usr.sbin/bhyve/acpi.h | 3 +++ usr.sbin/bhyve/acpi_device.c | 6 ++++++ 3 files changed, 38 insertions(+) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index bdb0e97076ad..84a54cc485c5 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -106,6 +106,30 @@ struct basl_fio { #define EFFLUSH(x) \ if (fflush(x) != 0) goto err_exit; +/* + * A list for additional ACPI devices like a TPM. + */ +struct acpi_device_list_entry { + SLIST_ENTRY(acpi_device_list_entry) chain; + const struct acpi_device *dev; +}; +static SLIST_HEAD(acpi_device_list, + acpi_device_list_entry) acpi_devices = SLIST_HEAD_INITIALIZER(acpi_devices); + +int +acpi_tables_add_device(const struct acpi_device *const dev) +{ + struct acpi_device_list_entry *const entry = calloc(1, sizeof(*entry)); + if (entry == NULL) { + return (ENOMEM); + } + + entry->dev = dev; + SLIST_INSERT_HEAD(&acpi_devices, entry, chain); + + return (0); +} + /* * Helper routines for writing to the DSDT from other modules. */ @@ -219,6 +243,11 @@ basl_fwrite_dsdt(FILE *fp) vmgenc_write_dsdt(); + const struct acpi_device_list_entry *entry; + SLIST_FOREACH(entry, &acpi_devices, chain) { + acpi_device_write_dsdt(entry->dev); + } + dsdt_line("}"); if (dsdt_error != 0) diff --git a/usr.sbin/bhyve/acpi.h b/usr.sbin/bhyve/acpi.h index 50e5337f332a..98479913732c 100644 --- a/usr.sbin/bhyve/acpi.h +++ b/usr.sbin/bhyve/acpi.h @@ -31,6 +31,8 @@ #ifndef _ACPI_H_ #define _ACPI_H_ +#include "acpi_device.h" + #define SCI_INT 9 #define SMI_CMD 0xb2 @@ -55,6 +57,7 @@ struct vmctx; int acpi_build(struct vmctx *ctx, int ncpu); void acpi_raise_gpe(struct vmctx *ctx, unsigned bit); +int acpi_tables_add_device(const struct acpi_device *const dev); void dsdt_line(const char *fmt, ...); void dsdt_fixed_ioport(uint16_t iobase, uint16_t length); void dsdt_fixed_irq(uint8_t irq); diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index 10259006c619..047d411deec2 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -68,6 +68,12 @@ acpi_device_create(struct acpi_device **const new_dev, return (ENOMEM); } + const int error = acpi_tables_add_device(dev); + if (error) { + acpi_device_destroy(dev); + return (error); + } + *new_dev = dev; return (0); From nobody Tue Feb 28 10:14:12 2023 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 4PQtWS4X4nz3vGc4; Tue, 28 Feb 2023 10:14:12 +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 4PQtWS3fYSz3qlr; Tue, 28 Feb 2023 10:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579252; 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=7ughXBXUHLAlij46mecu8mxegZqd5DCqZToXYrDLo9c=; b=oPUKxsI5FXUxQv+7WIuyo/qh9LHt+NBV9zWMwegv3CEzNYkhH1xsvJIm8FQD9zqizOUnIV LvpTQfrbS/mgVDiFQEXSSUw92V/WjqrR79uMdqgnpwcx+spIC33FPPZAU1gH3Mw6H7UrFo +gjOeEB+QC1lhZlg7+TQk+3GOuipjrudw2nDVnWashXkt3CHm4eHIJmZVQtG7/4N5WUJTh ZsDLIE624MBPqljVpd+JjVT1himPj4a/jJ1gbilYkGrt6Bl7+hXQtwySnhX+vnUvBpWM49 PyN3gX/zO+ho9qUke/2Mba68bQdvK4hb8pm2tL8UlPPr8t+8wJ+UDnol3HrYTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579252; 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=7ughXBXUHLAlij46mecu8mxegZqd5DCqZToXYrDLo9c=; b=kqBwnv+0hxmQzG4Oez2FTLwtgRwl+6pz8P2zUTx/3klylT3KrwIOZzRprgP9E+uxAGOxJ8 UdvIKbnq6rq/cSwH5VBN0CujM/oLnlCDHsrcrEXHIUC0p4rbHUmqysOu4Zjp7HXYd/2bny 3yc7SFeivdnfOwsDGRYKAettXetHXfFtYWHr5MyPw5alf8Y66RiWCCF+2KaXnZ08ZrgyvU Pw+cZlthq9mH4pt5tI4+FOq286xFOam7lhOmSVEIUUjtZLFqCAldwBIdF+VgWhcucuXHOC RVM2Utt5UPaaXEA2AA8tgrrOagBLRLWPG7Mle+/7r++a1Npqhq6LHqpO1D8lOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579252; a=rsa-sha256; cv=none; b=kpCsdIV6DWC4uiO9D4oKZIlXkinsvnhyr5qR25V8LFZjFKYFx2/UZ33gUpljzEL7YjDlpU iFUzzVAQaM82DgvAeRZ7L3aZDDE5oCF8fyWQqh179bQ11RpTJUW0c4X6G/Yrwm6LK7s0Fi PcE/yNawS+MhSW1m6CppRWxTw/5QXZeLIjqvl2K22mjmheiPcX+pCoQfir5i+TkqkQMMYV pDo1r6f7zpbLrd+uvmSsUT2RyQYLjZtcNdZjUEFHDekvBTbtLsIm8Li96WDc5NoaG5sVQL lqk6/fS7xHqlF5wenCEUqj20eDKGd8ljmVsA8gBNOmPKJMNi7tuKRCHIvp4vUg== 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 4PQtWS2k9Qz138y; Tue, 28 Feb 2023 10:14:12 +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 31SAECCE013796; Tue, 28 Feb 2023 10:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAECxf013795; Tue, 28 Feb 2023 10:14:12 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:14:12 GMT Message-Id: <202302281014.31SAECxf013795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 0232125972f5 - stable/13 - bhyve: add basic qemu fwcfg implementation 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0232125972f5f9f9e88e2555d2f8d0837d117298 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=0232125972f5f9f9e88e2555d2f8d0837d117298 commit 0232125972f5f9f9e88e2555d2f8d0837d117298 Author: Corvin Köhne AuthorDate: 2021-08-11 07:58:15 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 10:04:35 +0000 bhyve: add basic qemu fwcfg implementation qemu's fwcfg and bhyve's fwctl are both used to configure ovmf. qemu's fwcfg is much more powerfull than bhyve's fwctl. For that reason, add support for qemu's fwcfg. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38331 (cherry picked from commit 9b99de77f16029dd55326e0210072b14ec1ad960) --- usr.sbin/bhyve/qemu_fwcfg.c | 114 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/qemu_fwcfg.h | 12 +++++ 2 files changed, 126 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c new file mode 100644 index 000000000000..5d3070abf285 --- /dev/null +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -0,0 +1,114 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG + * Author: Corvin Köhne + */ + +#include + +#include + +#include +#include +#include +#include + +#include "acpi_device.h" +#include "inout.h" +#include "qemu_fwcfg.h" + +#define QEMU_FWCFG_ACPI_DEVICE_NAME "FWCF" +#define QEMU_FWCFG_ACPI_HARDWARE_ID "QEMU0002" + +#define QEMU_FWCFG_SELECTOR_PORT_NUMBER 0x510 +#define QEMU_FWCFG_SELECTOR_PORT_SIZE 1 +#define QEMU_FWCFG_SELECTOR_PORT_FLAGS IOPORT_F_INOUT +#define QEMU_FWCFG_DATA_PORT_NUMBER 0x511 +#define QEMU_FWCFG_DATA_PORT_SIZE 1 +#define QEMU_FWCFG_DATA_PORT_FLAGS \ + IOPORT_F_INOUT /* QEMU v2.4+ ignores writes */ + +struct qemu_fwcfg_softc { + struct acpi_device *acpi_dev; +}; + +static struct qemu_fwcfg_softc fwcfg_sc; + +static int +qemu_fwcfg_selector_port_handler(struct vmctx *const ctx __unused, const int in, + const int port __unused, const int bytes, uint32_t *const eax, + void *const arg __unused) +{ + return (0); +} + +static int +qemu_fwcfg_data_port_handler(struct vmctx *const ctx __unused, const int in, + const int port __unused, const int bytes, uint32_t *const eax, + void *const arg __unused) +{ + return (0); +} + +static int +qemu_fwcfg_register_port(const char *const name, const int port, const int size, + const int flags, const inout_func_t handler) +{ + struct inout_port iop; + + bzero(&iop, sizeof(iop)); + iop.name = name; + iop.port = port; + iop.size = size; + iop.flags = flags; + iop.handler = handler; + + return (register_inout(&iop)); +} + +int +qemu_fwcfg_init(struct vmctx *const ctx) +{ + int error; + + error = acpi_device_create(&fwcfg_sc.acpi_dev, ctx, + QEMU_FWCFG_ACPI_DEVICE_NAME, QEMU_FWCFG_ACPI_HARDWARE_ID); + if (error) { + warnx("%s: failed to create ACPI device for QEMU FwCfg", + __func__); + goto done; + } + + error = acpi_device_add_res_fixed_ioport(fwcfg_sc.acpi_dev, + QEMU_FWCFG_SELECTOR_PORT_NUMBER, 2); + if (error) { + warnx("%s: failed to add fixed IO port for QEMU FwCfg", + __func__); + goto done; + } + + /* add handlers for fwcfg ports */ + if ((error = qemu_fwcfg_register_port("qemu_fwcfg_selector", + QEMU_FWCFG_SELECTOR_PORT_NUMBER, QEMU_FWCFG_SELECTOR_PORT_SIZE, + QEMU_FWCFG_SELECTOR_PORT_FLAGS, + qemu_fwcfg_selector_port_handler)) != 0) { + warnx("%s: Unable to register qemu fwcfg selector port 0x%x", + __func__, QEMU_FWCFG_SELECTOR_PORT_NUMBER); + goto done; + } + if ((error = qemu_fwcfg_register_port("qemu_fwcfg_data", + QEMU_FWCFG_DATA_PORT_NUMBER, QEMU_FWCFG_DATA_PORT_SIZE, + QEMU_FWCFG_DATA_PORT_FLAGS, qemu_fwcfg_data_port_handler)) != 0) { + warnx("%s: Unable to register qemu fwcfg data port 0x%x", + __func__, QEMU_FWCFG_DATA_PORT_NUMBER); + goto done; + } + +done: + if (error) { + acpi_device_destroy(fwcfg_sc.acpi_dev); + } + + return (error); +} diff --git a/usr.sbin/bhyve/qemu_fwcfg.h b/usr.sbin/bhyve/qemu_fwcfg.h new file mode 100644 index 000000000000..26c4db0ff71e --- /dev/null +++ b/usr.sbin/bhyve/qemu_fwcfg.h @@ -0,0 +1,12 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG + * Author: Corvin Köhne + */ + +#pragma once + +#include + +int qemu_fwcfg_init(struct vmctx *const ctx); From nobody Tue Feb 28 10:14:13 2023 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 4PQtWT5D45z3vH05; Tue, 28 Feb 2023 10:14:13 +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 4PQtWT4kvNz3r7h; Tue, 28 Feb 2023 10:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579253; 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=i+BP2ocuDQIyAHE7TIyLCWU4MaRzxHi/j6ERyBUJhL0=; b=DHcYl+v0oL1xamXffj4TiHstivuCDBC7LOy0xldezyOIyjjsifMJkVHbQ17/TuL2MaE7p3 BFkcB3xUDXr0ZyeSaBUNY1LokbjChfOt9xYRLLt8Cg7ilu5C5RXXgla0ewlI8aATPhFIlT WVxztWWld/S6YMPIllEUT0CL+QvCwGz1hvT5gxC38rTvFqd03p8o+rQNOy0BQauKN+fR+s QFOsqBm8/EyRkgGp2jJWiBfjvvPVFGsjjPt46EA8mKijDfN/ptp4CyRNfswCczoe8Tgsll HJzDJeNl4ru+kMtoV6IGshwbwJX4a8wYQYZTkZNSuJ2Q/9p2o3WwXTcj4IHzMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579253; 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=i+BP2ocuDQIyAHE7TIyLCWU4MaRzxHi/j6ERyBUJhL0=; b=fOPR9J8s6jv1zgek1c8F9M6FCal13IdR4RQS5xAMVkelggVz+YWCaiiHYWqNrcuQApIfVa kCYL9RGUdM4kq7lRsi25AAn0S+rmHjJYtp82dszMX2dtCoe+oJDFrlHOqe2m0uiM+sbKwJ r3ugHO4eUYibkW4EZsPzCyZ4i9Wt252jxLJB+smKRllbW5UGRuzrQTPKSRxrrS4nnsFTvP GOa23c0h1822K4YDvysHboQsIiFP9nACaAkRcttnW1ofk7QO2CR3pmh5HR0qKELFzVR7l/ gUKoA5H0F5HGEaj3v58jgornR/wGN0SVnTSXNIgJL7VEcLVcmCxCcAkQUJCrKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579253; a=rsa-sha256; cv=none; b=WoYjYZoVHWZU1HkD7xMkjQPS/4H/azE0lcTtDRhujPpShU1JK3jvkjUm8O6l7QzLHuaJBJ 9S+1FJW8zLtQzBNNFJWptyjqGhSiQ5c/owJ0BO65Pr779VJQmsyKxcByYQc8LLKeK+IazV H36u/CshWrkF+N4L/SE8at1H49td1gl5H8UdIcPQBVE4BjVwUOov1Tt9R4xILo4LH3MMYw fLoMO8idi0Xdmna5w0ZfzFyp/EEO7ENuJ9QSGeOLORheuH7oyH0Phj01GOuagDV5f0WU/l ZB/Ixf6FTLx7FjeYIVKqJcpU7N1NTCPktGKgij8ORxqgz3M8qAIqeurNv2wG2g== 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 4PQtWT3f7Fz13jl; Tue, 28 Feb 2023 10:14:13 +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 31SAEDpe013820; Tue, 28 Feb 2023 10:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAEDvN013819; Tue, 28 Feb 2023 10:14:13 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:14:13 GMT Message-Id: <202302281014.31SAEDvN013819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: bd8366500e15 - stable/13 - bhyve: add emulation for the qemu fwcfg selector port 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bd8366500e15e6aa840e80d21661d5f3bf4d835e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=bd8366500e15e6aa840e80d21661d5f3bf4d835e commit bd8366500e15e6aa840e80d21661d5f3bf4d835e Author: Corvin Köhne AuthorDate: 2021-08-11 07:59:16 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 10:04:36 +0000 bhyve: add emulation for the qemu fwcfg selector port The selector port is used to select the desired fwcfg item. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38332 (cherry picked from commit 151d8131a817e7a6a629e9bb7fde4d7a158e5211) --- usr.sbin/bhyve/qemu_fwcfg.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 5d3070abf285..dec3fa83c493 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -29,8 +29,33 @@ #define QEMU_FWCFG_DATA_PORT_FLAGS \ IOPORT_F_INOUT /* QEMU v2.4+ ignores writes */ +#define QEMU_FWCFG_ARCHITECTURE_MASK 0x0001 +#define QEMU_FWCFG_INDEX_MASK 0x3FFF + +#define QEMU_FWCFG_SELECT_READ 0 +#define QEMU_FWCFG_SELECT_WRITE 1 + +#define QEMU_FWCFG_ARCHITECTURE_GENERIC 0 +#define QEMU_FWCFG_ARCHITECTURE_SPECIFIC 1 + +#pragma pack(1) + +union qemu_fwcfg_selector { + struct { + uint16_t index : 14; + uint16_t writeable : 1; + uint16_t architecture : 1; + }; + uint16_t bits; +}; + +#pragma pack() + struct qemu_fwcfg_softc { struct acpi_device *acpi_dev; + + uint32_t data_offset; + union qemu_fwcfg_selector selector; }; static struct qemu_fwcfg_softc fwcfg_sc; @@ -40,6 +65,20 @@ qemu_fwcfg_selector_port_handler(struct vmctx *const ctx __unused, const int in, const int port __unused, const int bytes, uint32_t *const eax, void *const arg __unused) { + if (bytes != sizeof(uint16_t)) { + warnx("%s: invalid size (%d) of IO port access", __func__, + bytes); + return (-1); + } + + if (in) { + *eax = htole16(fwcfg_sc.selector.bits); + return (0); + } + + fwcfg_sc.data_offset = 0; + fwcfg_sc.selector.bits = le16toh(*eax); + return (0); } From nobody Tue Feb 28 10:14:14 2023 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 4PQtWV6QjFz3vGZ0; Tue, 28 Feb 2023 10:14:14 +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 4PQtWV5qlyz3r1m; Tue, 28 Feb 2023 10:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579254; 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=BDPEhIMcPLOgUYvwthjYTOT1/02dG+J7758e+Zrl7XY=; b=WqslTRDhnALDhFXnZPTBrv0U2pdiam54vFKSqsiBWe4dD69rj/4yosx1WYdAmMf+HaLrxT 9ZlHxaTnjgkCM2M5xcBiWd5srZSZ6FhY4nd6KqeukuAO/LHgbp+6OgtlOm9vmRBEsv4PfB 1tRrUC83cYeF7lpTE2kSnPZBePfwl9mvU5HiONoBpEBYVB4yoGc2jFRCkapaPfaP07c/Fz AyargtUxLJ26MSGTCObfXkRmKO6N6QVIEx3VcwNHsHa+QlNO4qGk299PoMyfAyVYPEEFZf S/+W2SPgyaFa/9YPK4D1jvsUx7TaGsRRDS3ELXo+QDPKGslu7nqGi8nRcXNq/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579254; 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=BDPEhIMcPLOgUYvwthjYTOT1/02dG+J7758e+Zrl7XY=; b=wcvdp4qii4boIK1Zpch9cx8uGUj2MdDM/r4yKnmxmFsgxOyalByvnIXZ+TaIDrEEjZDykP xej/ZPLWah3YAVjivk3ucZYYN0dXoitTzCMr/6QMv82Dicdk/RGRHWMU9E06G4i9WiLFJc OVNCmGuXFEu9qtCxWqae16CvSoW56LCd3bxxoqOPMg49+uhjGVbRBVUvU+PvyT1CYKwn7J zvXuxNdd6hr56fM3fxJurJbn8bLQwz/8HvyvfmhMzu/BVXrcWHDEXWWVVv3guVxtRM9LPg lSjDjWcOnfu7ec28NPEmIVMobpBg29Razh6F/jWSTorCercdh7UNhjxmT6t32g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579254; a=rsa-sha256; cv=none; b=wJW9i2WStYfZy4JzhmmYDtBi1LDYMZcz0FnXZnWjaM8iysd18VJUfXS8U0pGm7kU8C5zxO SbgN6qg4hh1KOZEQs1mFVOnEvnKN9M7+PpmKScQDtRF0guN4gcjFeLerNTK5gNmlJtwRTv VHRL+ysjnEJAL22/pTdD/TzrMOvadOFIb+iaF8iW6awQZ+qw6GZFOfLhNe8PQppbfk0uay Bc4iSzjdQzINDjrjELm3rqq6axVChc/Dsn7e3ioZ/E7Z9UJ/dSF9qNUgcfF1C9pVmk7WOs 1p3gonWbe33Q3trSoHUcJ6xIVe36tet6XB6miRTH2YxS9S4n3jvAq2RScNBCPw== 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 4PQtWV4bLCz13p1; Tue, 28 Feb 2023 10:14:14 +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 31SAEE0B013844; Tue, 28 Feb 2023 10:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAEEEp013843; Tue, 28 Feb 2023 10:14:14 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:14:14 GMT Message-Id: <202302281014.31SAEEEp013843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 3c12bcba78ea - stable/13 - bhyve: add emulation for qemu's fwcfg data port 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c12bcba78ea2b6a9299f30f60c5988ba159ad44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=3c12bcba78ea2b6a9299f30f60c5988ba159ad44 commit 3c12bcba78ea2b6a9299f30f60c5988ba159ad44 Author: Corvin Köhne AuthorDate: 2021-08-11 08:00:34 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 10:04:37 +0000 bhyve: add emulation for qemu's fwcfg data port The data port returns the data of the fwcfg item. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38333 (cherry picked from commit b11081dca76b8e283495632b86b41539ee013857) --- usr.sbin/bhyve/qemu_fwcfg.c | 40 ++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/qemu_fwcfg.h | 8 ++++++++ 2 files changed, 48 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index dec3fa83c493..13e21daca7ff 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -56,6 +56,8 @@ struct qemu_fwcfg_softc { uint32_t data_offset; union qemu_fwcfg_selector selector; + struct qemu_fwcfg_item items[QEMU_FWCFG_MAX_ARCHS] + [QEMU_FWCFG_MAX_ENTRIES]; }; static struct qemu_fwcfg_softc fwcfg_sc; @@ -87,6 +89,44 @@ qemu_fwcfg_data_port_handler(struct vmctx *const ctx __unused, const int in, const int port __unused, const int bytes, uint32_t *const eax, void *const arg __unused) { + if (bytes != sizeof(uint8_t)) { + warnx("%s: invalid size (%d) of IO port access", __func__, + bytes); + return (-1); + } + + if (!in) { + warnx("%s: Writes to qemu fwcfg data port aren't allowed", + __func__); + return (-1); + } + + /* get fwcfg item */ + struct qemu_fwcfg_item *const item = + &fwcfg_sc.items[fwcfg_sc.selector.architecture] + [fwcfg_sc.selector.index]; + if (item->data == NULL) { + warnx( + "%s: qemu fwcfg item doesn't exist (architecture %s index 0x%x)", + __func__, + fwcfg_sc.selector.architecture ? "specific" : "generic", + fwcfg_sc.selector.index); + *eax = 0x00; + return (0); + } else if (fwcfg_sc.data_offset >= item->size) { + warnx( + "%s: qemu fwcfg item read exceeds size (architecture %s index 0x%x size 0x%x offset 0x%x)", + __func__, + fwcfg_sc.selector.architecture ? "specific" : "generic", + fwcfg_sc.selector.index, item->size, fwcfg_sc.data_offset); + *eax = 0x00; + return (0); + } + + /* return item data */ + *eax = item->data[fwcfg_sc.data_offset]; + fwcfg_sc.data_offset++; + return (0); } diff --git a/usr.sbin/bhyve/qemu_fwcfg.h b/usr.sbin/bhyve/qemu_fwcfg.h index 26c4db0ff71e..58ef5ed3c6bf 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.h +++ b/usr.sbin/bhyve/qemu_fwcfg.h @@ -9,4 +9,12 @@ #include +#define QEMU_FWCFG_MAX_ARCHS 0x2 +#define QEMU_FWCFG_MAX_ENTRIES 0x4000 + +struct qemu_fwcfg_item { + uint32_t size; + uint8_t *data; +}; + int qemu_fwcfg_init(struct vmctx *const ctx); From nobody Tue Feb 28 13:38:11 2023 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 4PQz2q5kj9z3vT5g; Tue, 28 Feb 2023 13:38:11 +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 4PQz2q5Qtfz4Dgv; Tue, 28 Feb 2023 13:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591491; 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=KvD23llR9mbzD6JDOocbOCyaj26tX3ComBuxPMbpzAE=; b=DrKhwbVFhOWOL++ggR/ioSZ8nYgO5qytlgwbf+nEUCvIa5UhAKwZFkmGOp2+wmuNF7ql79 agq0O2Gow6FOvv5oruc0SBBusZU/FFLhWegYtrg5SJV+6wykHZBkhljayKPa5yIeV533ha vVT0FNqAjc8Xfi67ev9k9sNAWiTPbkxESCLAilpI9MEwwRN6Ka4rZLnoyasBoaMyfj2Y9/ Ai/ZywN/Y/CZ+S30JLql3mUDdAjJk6urS/QnZRKmUoxXGguxGafg5WIokzhZpfvB44P2cf sMoUDCjplBe6wCBDUlpmcD4ZeG3I4JnmjedovACbJa+jJAN+RwjXMWW85pF7pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591491; 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=KvD23llR9mbzD6JDOocbOCyaj26tX3ComBuxPMbpzAE=; b=V6SW1NAUzxO3mMjaz6WDgPi+8APldaDUjXDuVUXcexXQpu9jzPGWHitsITdMEPce9tgRAp y+S/jcPmKaKFumbURSw/H9/d/bM4kMyo2ciWWb/6sZjZ8HYWORv/900kEwDAEJi+Ixmn+/ T801o59j3LX4UxBcbWvS8CZb1a2olPWz/LuPybxkyCmG9SzIaRSpGsjNKagIPlc7FBKpma gsPpjsUTCgG1VOV4yDoAXnkN5VaDgb9UeRO0QoNgow/eIsHH8y84KNifu9wzQAxFaZEnbi 56qURJ5ocBFdOV5oYUnRtjsQxPXL73mcBgQIp3SQznBeavus2sHopNr2CBuDZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677591491; a=rsa-sha256; cv=none; b=wKk9XymwugPxvrmxbhR0ZG8hNLMf6dMw4GshfZL/MFVJx9UeGCcuzt/Q32t0wdXS/MzV/S 9oQB9AvU7zpub2r3fkdYL7qpIwyV+Xpf5ssvqKcfb0ypjCTiV+379Wyw1YLUH302io6vCd Nd1HCuCZbJuCzXI2xxW0N4ITunHG4DwdviNV48JSqgCq2jXLcCsjIUje+Lig32XPSlwz5r LgMdbNp4LhDrhGwehVHdb5RUpFf53CBkje9fw5VCvEUMFH32lA50WqzMmMRFQeOtSH9bAY W3L7nnzlZaGdu+yXqzD8XjA714lVtW8jWiryfpEHA00Lq2WzKvVq9nVl/wPFIw== 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 4PQz2q4Whyz17w7; Tue, 28 Feb 2023 13:38:11 +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 31SDcBmD041281; Tue, 28 Feb 2023 13:38:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDcB5g041280; Tue, 28 Feb 2023 13:38:11 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:38:11 GMT Message-Id: <202302281338.31SDcB5g041280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 38ee8862632e - releng/13.2 - unbound: Vendor import 1.17.1 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 38ee8862632ed99f009dc1d7981671432ed02888 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=38ee8862632ed99f009dc1d7981671432ed02888 commit 38ee8862632ed99f009dc1d7981671432ed02888 Author: Cy Schubert AuthorDate: 2023-01-15 05:39:31 +0000 Commit: Cy Schubert CommitDate: 2023-02-28 02:40:27 +0000 unbound: Vendor import 1.17.1 Release notes at https://www.nlnetlabs.nl/news/2023/Jan/12/unbound-1.17.1-released/. Approved by: re (cperciva) Merge commit '7699e1386a16236002b26107ffd2dcbde375e197' into main (cherry picked from commit 1838dec31895fd4752fa8631322ab93be0705a66) (cherry picked from commit 26ba9518ffeccd0b64d2f610e731989193844814) --- contrib/unbound/Makefile.in | 4 +- contrib/unbound/README.md | 1 + contrib/unbound/cachedb/cachedb.c | 21 ++- contrib/unbound/configure | 25 +-- contrib/unbound/configure.ac | 5 +- contrib/unbound/contrib/unbound.service.in | 5 +- contrib/unbound/daemon/cachedump.c | 9 +- contrib/unbound/daemon/daemon.c | 91 ++++++++- contrib/unbound/daemon/daemon.h | 6 + contrib/unbound/daemon/remote.c | 16 +- contrib/unbound/daemon/worker.c | 21 ++- contrib/unbound/daemon/worker.h | 4 +- contrib/unbound/doc/Changelog | 86 +++++++++ contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 18 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 10 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 36 +++- contrib/unbound/edns-subnet/subnetmod.c | 11 ++ contrib/unbound/iterator/iter_utils.c | 2 + contrib/unbound/iterator/iterator.c | 7 +- contrib/unbound/iterator/iterator.h | 10 +- contrib/unbound/libunbound/context.c | 1 + contrib/unbound/libunbound/context.h | 6 + contrib/unbound/libunbound/libunbound.c | 39 +++- contrib/unbound/libunbound/libworker.c | 1 + contrib/unbound/libunbound/unbound-event.h | 3 +- contrib/unbound/services/authzone.c | 1 + contrib/unbound/services/cache/dns.c | 8 + contrib/unbound/sldns/rrdef.h | 4 +- contrib/unbound/smallapp/unbound-control.c | 12 +- .../09-unbound-control.tdir/conf.bad_credentials | 5 + .../conf.spoofed_credentials | 5 + .../unbound/testdata/cachedb_servfail_cname.crpl | 181 ++++++++++++++++++ .../testdata/serve_expired_cached_servfail.rpl | 130 +++++++++++++ .../unbound/testdata/subnet_cached_servfail.crpl | 167 +++++++++++++++++ contrib/unbound/util/config_file.c | 9 + contrib/unbound/util/config_file.h | 7 + contrib/unbound/util/configlexer.lex | 3 + contrib/unbound/util/configparser.y | 34 +++- contrib/unbound/util/iana_ports.inc | 1 + contrib/unbound/util/netevent.c | 30 ++- contrib/unbound/util/tube.c | 53 ++++-- usr.sbin/unbound/config.h | 204 +++++++++++++++++---- 48 files changed, 1169 insertions(+), 139 deletions(-) diff --git a/contrib/unbound/Makefile.in b/contrib/unbound/Makefile.in index e7c76c2588aa..bc021aa1eb00 100644 --- a/contrib/unbound/Makefile.in +++ b/contrib/unbound/Makefile.in @@ -616,7 +616,7 @@ install-all: all $(PYTHONMOD_INSTALL) $(PYUNBOUND_INSTALL) $(UNBOUND_EVENT_INSTA $(INSTALL) -c -m 644 doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5 $(INSTALL) -c -m 644 doc/unbound-host.1 $(DESTDIR)$(mandir)/man1 $(INSTALL) -c -m 755 unbound-control-setup $(DESTDIR)$(sbindir)/unbound-control-setup - if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile); fi + if test ! -e "$(DESTDIR)$(configfile)"; then $(INSTALL) -d `dirname "$(DESTDIR)$(configfile)"`; $(INSTALL) -c -m 644 doc/example.conf "$(DESTDIR)$(configfile)"; fi pythonmod-uninstall: rm -f -- $(DESTDIR)$(PYTHON_SITE_PKG)/unboundmodule.py @@ -645,7 +645,7 @@ uninstall: $(PYTHONMOD_UNINSTALL) $(PYUNBOUND_UNINSTALL) $(UNBOUND_EVENT_UNINSTA rm -f -- $(DESTDIR)$(includedir)/unbound.h $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libunbound.la @echo - @echo "You still need to remove "`dirname $(DESTDIR)$(configfile)`" , $(DESTDIR)$(configfile) by hand" + @echo "You still need to remove "`dirname "$(DESTDIR)$(configfile)"`" , $(DESTDIR)$(configfile) by hand" iana_update: curl -o port-numbers.tmp https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml --compressed diff --git a/contrib/unbound/README.md b/contrib/unbound/README.md index d1bbcf2b7797..c3d9bc2492ef 100644 --- a/contrib/unbound/README.md +++ b/contrib/unbound/README.md @@ -4,6 +4,7 @@ [![Packaging status](https://repology.org/badge/tiny-repos/unbound.svg)](https://repology.org/project/unbound/versions) [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/unbound.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:unbound) [![Documentation Status](https://readthedocs.org/projects/unbound/badge/?version=latest)](https://unbound.readthedocs.io/en/latest/?badge=latest) +[![Mastodon Follow](https://img.shields.io/mastodon/follow/109262826617293067?domain=https%3A%2F%2Ffosstodon.org&style=social)](https://fosstodon.org/@nlnetlabs) Unbound is a validating, recursive, caching DNS resolver. It is designed to be fast and lean and incorporates modern features based on open standards. If you diff --git a/contrib/unbound/cachedb/cachedb.c b/contrib/unbound/cachedb/cachedb.c index b07743d85259..245daa986967 100644 --- a/contrib/unbound/cachedb/cachedb.c +++ b/contrib/unbound/cachedb/cachedb.c @@ -390,6 +390,15 @@ prep_data(struct module_qstate* qstate, struct sldns_buffer* buf) if(!qstate->return_msg || !qstate->return_msg->rep) return 0; + /* do not store failures like SERVFAIL in the cachedb, this avoids + * overwriting expired, valid, content with broken content. */ + if(FLAGS_GET_RCODE(qstate->return_msg->rep->flags) != + LDNS_RCODE_NOERROR && + FLAGS_GET_RCODE(qstate->return_msg->rep->flags) != + LDNS_RCODE_NXDOMAIN && + FLAGS_GET_RCODE(qstate->return_msg->rep->flags) != + LDNS_RCODE_YXDOMAIN) + return 0; /* We don't store the reply if its TTL is 0 unless serve-expired is * enabled. Such a reply won't be reusable and simply be a waste for * the backend. It's also compatible with the default behavior of @@ -542,10 +551,16 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf) verbose(VERB_ALGO, "cachedb msg expired"); /* If serve-expired is enabled, we still use an expired message * setting the TTL to 0. */ - if(qstate->env->cfg->serve_expired) - adjust = -1; - else + if(!qstate->env->cfg->serve_expired || + (FLAGS_GET_RCODE(qstate->return_msg->rep->flags) + != LDNS_RCODE_NOERROR && + FLAGS_GET_RCODE(qstate->return_msg->rep->flags) + != LDNS_RCODE_NXDOMAIN && + FLAGS_GET_RCODE(qstate->return_msg->rep->flags) + != LDNS_RCODE_YXDOMAIN)) return 0; /* message expired */ + else + adjust = -1; } verbose(VERB_ALGO, "cachedb msg adjusted down by %d", (int)adjust); adjust_msg_ttl(qstate->return_msg, adjust); diff --git a/contrib/unbound/configure b/contrib/unbound/configure index a2837d18553b..5823e49f2f80 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.17.0. +# Generated by GNU Autoconf 2.69 for unbound 1.17.1. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.17.0' -PACKAGE_STRING='unbound 1.17.0' +PACKAGE_VERSION='1.17.1' +PACKAGE_STRING='unbound 1.17.1' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -1477,7 +1477,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.17.0 to adapt to many kinds of systems. +\`configure' configures unbound 1.17.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1543,7 +1543,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.17.0:";; + short | recursive ) echo "Configuration of unbound 1.17.1:";; esac cat <<\_ACEOF @@ -1785,7 +1785,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.17.0 +unbound configure 1.17.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2494,7 +2494,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.17.0, which was +It was created by unbound $as_me 1.17.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2846,11 +2846,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=17 -UNBOUND_VERSION_MICRO=0 +UNBOUND_VERSION_MICRO=1 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=20 +LIBUNBOUND_REVISION=21 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2938,6 +2938,7 @@ LIBUNBOUND_AGE=1 # 1.16.2 had 9:18:1 # 1.16.3 had 9:19:1 # 1.17.0 had 9:20:1 +# 1.17.1 had 9:21:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -22085,7 +22086,7 @@ _ACEOF -version=1.17.0 +version=1.17.1 date=`date +'%b %e, %Y'` @@ -22604,7 +22605,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.17.0, which was +This file was extended by unbound $as_me 1.17.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22670,7 +22671,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.17.0 +unbound config.status 1.17.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/unbound/configure.ac b/contrib/unbound/configure.ac index 57cc7e604b1e..2c7583310f20 100644 --- a/contrib/unbound/configure.ac +++ b/contrib/unbound/configure.ac @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[17]) -m4_define([VERSION_MICRO],[0]) +m4_define([VERSION_MICRO],[1]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=20 +LIBUNBOUND_REVISION=21 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -106,6 +106,7 @@ LIBUNBOUND_AGE=1 # 1.16.2 had 9:18:1 # 1.16.3 had 9:19:1 # 1.17.0 had 9:20:1 +# 1.17.1 had 9:21:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary diff --git a/contrib/unbound/contrib/unbound.service.in b/contrib/unbound/contrib/unbound.service.in index ada5fac9c224..5a05c525170f 100644 --- a/contrib/unbound/contrib/unbound.service.in +++ b/contrib/unbound/contrib/unbound.service.in @@ -42,9 +42,8 @@ [Unit] Description=Validating, recursive, and caching DNS resolver Documentation=man:unbound(8) -After=network-online.target -Before=nss-lookup.target -Wants=network-online.target nss-lookup.target +After=network.target +Before=network-online.target nss-lookup.target [Install] WantedBy=multi-user.target diff --git a/contrib/unbound/daemon/cachedump.c b/contrib/unbound/daemon/cachedump.c index baf8008ea80f..943eb63f326c 100644 --- a/contrib/unbound/daemon/cachedump.c +++ b/contrib/unbound/daemon/cachedump.c @@ -387,7 +387,7 @@ move_into_cache(struct ub_packed_rrset_key* k, struct rrset_ref ref; uint8_t* p; - ak = alloc_special_obtain(&worker->alloc); + ak = alloc_special_obtain(worker->alloc); if(!ak) { log_warn("error out of memory"); return 0; @@ -398,7 +398,7 @@ move_into_cache(struct ub_packed_rrset_key* k, ak->rk.dname = (uint8_t*)memdup(k->rk.dname, k->rk.dname_len); if(!ak->rk.dname) { log_warn("error out of memory"); - ub_packed_rrset_parsedelete(ak, &worker->alloc); + ub_packed_rrset_parsedelete(ak, worker->alloc); return 0; } s = sizeof(*ad) + (sizeof(size_t) + sizeof(uint8_t*) + @@ -408,7 +408,7 @@ move_into_cache(struct ub_packed_rrset_key* k, ad = (struct packed_rrset_data*)malloc(s); if(!ad) { log_warn("error out of memory"); - ub_packed_rrset_parsedelete(ak, &worker->alloc); + ub_packed_rrset_parsedelete(ak, worker->alloc); return 0; } p = (uint8_t*)ad; @@ -431,7 +431,8 @@ move_into_cache(struct ub_packed_rrset_key* k, ref.key = ak; ref.id = ak->id; (void)rrset_cache_update(worker->env.rrset_cache, &ref, - &worker->alloc, *worker->env.now); + worker->alloc, *worker->env.now); + return 1; } diff --git a/contrib/unbound/daemon/daemon.c b/contrib/unbound/daemon/daemon.c index 71091133a487..193608d40e05 100644 --- a/contrib/unbound/daemon/daemon.c +++ b/contrib/unbound/daemon/daemon.c @@ -488,6 +488,27 @@ static int daemon_get_shufport(struct daemon* daemon, int* shufport) return avail; } +/** + * Clear and delete per-worker alloc caches, and free memory maintained in + * superalloc. + * The rrset and message caches must be empty at the time of call. + * @param daemon: the daemon that maintains the alloc caches to be cleared. + */ +static void +daemon_clear_allocs(struct daemon* daemon) +{ + int i; + + for(i=0; inum; i++) { + alloc_clear(daemon->worker_allocs[i]); + free(daemon->worker_allocs[i]); + } + free(daemon->worker_allocs); + daemon->worker_allocs = NULL; + + alloc_clear_special(&daemon->superalloc); +} + /** * Allocate empty worker structures. With backptr and thread-number, * from 0..numthread initialised. Used as user arguments to new threads. @@ -540,6 +561,21 @@ daemon_create_workers(struct daemon* daemon) /* the above is not ports/numthr, due to rounding */ fatal_exit("could not create worker"); } + /* create per-worker alloc caches if not reusing existing ones. */ + if(!daemon->worker_allocs) { + daemon->worker_allocs = (struct alloc_cache**)calloc( + (size_t)daemon->num, sizeof(struct alloc_cache*)); + if(!daemon->worker_allocs) + fatal_exit("could not allocate worker allocs"); + for(i=0; inum; i++) { + struct alloc_cache* alloc = calloc(1, + sizeof(struct alloc_cache)); + if (!alloc) + fatal_exit("could not allocate worker alloc"); + alloc_init(alloc, &daemon->superalloc, i); + daemon->worker_allocs[i] = alloc; + } + } free(shufport); } @@ -771,6 +807,7 @@ daemon_fork(struct daemon* daemon) /* Shutdown SHM */ shm_main_shutdown(daemon); + daemon->reuse_cache = daemon->workers[0]->reuse_cache; daemon->need_to_exit = daemon->workers[0]->need_to_exit; } @@ -785,9 +822,16 @@ daemon_cleanup(struct daemon* daemon) log_thread_set(NULL); /* clean up caches because * a) RRset IDs will be recycled after a reload, causing collisions - * b) validation config can change, thus rrset, msg, keycache clear */ - slabhash_clear(&daemon->env->rrset_cache->table); - slabhash_clear(daemon->env->msg_cache); + * b) validation config can change, thus rrset, msg, keycache clear + * + * If we are trying to keep the cache as long as possible, we should + * defer the cleanup until we know whether the new configuration allows + * the reuse. (If we're exiting, cleanup should be done here). */ + if(!daemon->reuse_cache || daemon->need_to_exit) { + slabhash_clear(&daemon->env->rrset_cache->table); + slabhash_clear(daemon->env->msg_cache); + } + daemon->old_num = daemon->num; /* save the current num */ local_zones_delete(daemon->local_zones); daemon->local_zones = NULL; respip_set_delete(daemon->respip_set); @@ -802,8 +846,13 @@ daemon_cleanup(struct daemon* daemon) worker_delete(daemon->workers[i]); free(daemon->workers); daemon->workers = NULL; + /* Unless we're trying to keep the cache, worker alloc_caches should be + * cleared and freed here. We do this after deleting workers to + * guarantee that the alloc caches are valid throughout the lifetime + * of workers. */ + if(!daemon->reuse_cache || daemon->need_to_exit) + daemon_clear_allocs(daemon); daemon->num = 0; - alloc_clear_special(&daemon->superalloc); #ifdef USE_DNSTAP dt_delete(daemon->dtenv); daemon->dtenv = NULL; @@ -900,8 +949,42 @@ daemon_delete(struct daemon* daemon) void daemon_apply_cfg(struct daemon* daemon, struct config_file* cfg) { + int new_num = cfg->num_threads?cfg->num_threads:1; + daemon->cfg = cfg; config_apply(cfg); + + /* If this is a reload and we deferred the decision on whether to + * reuse the alloc, RRset, and message caches, then check to see if + * it's safe to keep the caches: + * - changing the number of threads is obviously incompatible with + * keeping the per-thread alloc caches. It also means we have to + * clear RRset and message caches. (note that 'new_num' may be + * adjusted in daemon_create_workers, but for our purpose we can + * simply compare it with 'old_num'; if they are equal here, + * 'new_num' won't be adjusted to a different value than 'old_num'). + * - changing RRset cache size effectively clears any remaining cache + * entries. We could keep their keys in alloc caches, but it would + * be more consistent with the sense of the change to clear allocs + * and free memory. To do so we also have to clear message cache. + * - only changing message cache size does not necessarily affect + * RRset or alloc cache. But almost all new subsequent queries will + * require recursive resolution anyway, so it doesn't help much to + * just keep RRset and alloc caches. For simplicity we clear/free + * the other two, too. */ + if(daemon->worker_allocs && + (new_num != daemon->old_num || + !slabhash_is_size(daemon->env->msg_cache, cfg->msg_cache_size, + cfg->msg_cache_slabs) || + !slabhash_is_size(&daemon->env->rrset_cache->table, + cfg->rrset_cache_size, cfg->rrset_cache_slabs))) + { + log_warn("cannot reuse caches due to critical config change"); + slabhash_clear(&daemon->env->rrset_cache->table); + slabhash_clear(daemon->env->msg_cache); + daemon_clear_allocs(daemon); + } + if(!slabhash_is_size(daemon->env->msg_cache, cfg->msg_cache_size, cfg->msg_cache_slabs)) { slabhash_delete(daemon->env->msg_cache); diff --git a/contrib/unbound/daemon/daemon.h b/contrib/unbound/daemon/daemon.h index 58713e9ce466..57665446d41b 100644 --- a/contrib/unbound/daemon/daemon.h +++ b/contrib/unbound/daemon/daemon.h @@ -99,8 +99,12 @@ struct daemon { void* listen_sslctx, *connect_sslctx; /** num threads allocated */ int num; + /** num threads allocated in the previous config or 0 at first */ + int old_num; /** the worker entries */ struct worker** workers; + /** per-worker allocation cache */ + struct alloc_cache **worker_allocs; /** do we need to exit unbound (or is it only a reload?) */ int need_to_exit; /** master random table ; used for port div between threads on reload*/ @@ -140,6 +144,8 @@ struct daemon { /** the dnscrypt environment */ struct dnsc_env* dnscenv; #endif + /** reuse existing cache on reload if other conditions allow it. */ + int reuse_cache; }; /** diff --git a/contrib/unbound/daemon/remote.c b/contrib/unbound/daemon/remote.c index 7d4a414002ac..7c5a036f343d 100644 --- a/contrib/unbound/daemon/remote.c +++ b/contrib/unbound/daemon/remote.c @@ -105,8 +105,6 @@ /** what to put on statistics lines between var and value, ": " or "=" */ #define SQ "=" -/** if true, inhibits a lot of =0 lines from the stats output */ -static const int inhibit_zero = 1; /** subtract timers and the values do not overflow or become negative */ static void @@ -684,8 +682,9 @@ do_stop(RES* ssl, struct worker* worker) /** do the reload command */ static void -do_reload(RES* ssl, struct worker* worker) +do_reload(RES* ssl, struct worker* worker, int reuse_cache) { + worker->reuse_cache = reuse_cache; worker->need_to_exit = 0; comm_base_exit(worker->base); send_ok(ssl); @@ -920,7 +919,7 @@ print_hist(RES* ssl, struct ub_stats_info* s) /** print extended stats */ static int -print_ext(RES* ssl, struct ub_stats_info* s) +print_ext(RES* ssl, struct ub_stats_info* s, int inhibit_zero) { int i; char nm[32]; @@ -1129,7 +1128,7 @@ do_stats(RES* ssl, struct worker* worker, int reset) return; if(!print_hist(ssl, &total)) return; - if(!print_ext(ssl, &total)) + if(!print_ext(ssl, &total, daemon->cfg->stat_inhibit_zero)) return; } } @@ -1963,6 +1962,8 @@ do_flush_name(RES* ssl, struct worker* w, char* arg) do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_PTR, LDNS_RR_CLASS_IN); do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_SRV, LDNS_RR_CLASS_IN); do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_NAPTR, LDNS_RR_CLASS_IN); + do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_SVCB, LDNS_RR_CLASS_IN); + do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_HTTPS, LDNS_RR_CLASS_IN); free(nm); send_ok(ssl); @@ -3029,8 +3030,11 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd, if(cmdcmp(p, "stop", 4)) { do_stop(ssl, worker); return; + } else if(cmdcmp(p, "reload_keep_cache", 17)) { + do_reload(ssl, worker, 1); + return; } else if(cmdcmp(p, "reload", 6)) { - do_reload(ssl, worker); + do_reload(ssl, worker, 0); return; } else if(cmdcmp(p, "stats_noreset", 13)) { do_stats(ssl, worker, 0); diff --git a/contrib/unbound/daemon/worker.c b/contrib/unbound/daemon/worker.c index caefad621409..99dcf9940004 100644 --- a/contrib/unbound/daemon/worker.c +++ b/contrib/unbound/daemon/worker.c @@ -133,7 +133,7 @@ worker_mem_report(struct worker* ATTR_UNUSED(worker), rrset = slabhash_get_mem(&worker->env.rrset_cache->table); infra = infra_get_mem(worker->env.infra_cache); mesh = mesh_get_mem(worker->env.mesh); - ac = alloc_get_mem(&worker->alloc); + ac = alloc_get_mem(worker->alloc); superac = alloc_get_mem(&worker->daemon->superalloc); anch = anchors_get_mem(worker->env.anchors); iter = 0; @@ -623,6 +623,14 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo, if(worker->env.cfg->serve_expired_ttl && rep->serve_expired_ttl < timenow) return 0; + /* Ignore expired failure answers */ + if(FLAGS_GET_RCODE(rep->flags) != + LDNS_RCODE_NOERROR && + FLAGS_GET_RCODE(rep->flags) != + LDNS_RCODE_NXDOMAIN && + FLAGS_GET_RCODE(rep->flags) != + LDNS_RCODE_YXDOMAIN) + return 0; if(!rrset_array_lock(rep->ref, rep->rrset_count, 0)) return 0; *is_expired_answer = 1; @@ -730,8 +738,6 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo, goto bail_out; } } else { - /* We don't check the global ede as this is a warning, not - * an error */ if (*is_expired_answer == 1 && worker->env.cfg->ede_serve_expired && worker->env.cfg->ede) { EDNS_OPT_LIST_APPEND_EDE(&edns->opt_list_out, @@ -2059,15 +2065,14 @@ worker_init(struct worker* worker, struct config_file *cfg, } server_stats_init(&worker->stats, cfg); - alloc_init(&worker->alloc, &worker->daemon->superalloc, - worker->thread_num); - alloc_set_id_cleanup(&worker->alloc, &worker_alloc_cleanup, worker); + worker->alloc = worker->daemon->worker_allocs[worker->thread_num]; + alloc_set_id_cleanup(worker->alloc, &worker_alloc_cleanup, worker); worker->env = *worker->daemon->env; comm_base_timept(worker->base, &worker->env.now, &worker->env.now_tv); worker->env.worker = worker; worker->env.worker_base = worker->base; worker->env.send_query = &worker_send_query; - worker->env.alloc = &worker->alloc; + worker->env.alloc = worker->alloc; worker->env.outnet = worker->back; worker->env.rnd = worker->rndstate; /* If case prefetch is triggered, the corresponding mesh will clear @@ -2211,7 +2216,7 @@ worker_delete(struct worker* worker) #endif /* USE_DNSTAP */ comm_base_delete(worker->base); ub_randfree(worker->rndstate); - alloc_clear(&worker->alloc); + /* don't touch worker->alloc, as it's maintained in daemon */ regional_destroy(worker->env.scratch); regional_destroy(worker->scratchpad); free(worker); diff --git a/contrib/unbound/daemon/worker.h b/contrib/unbound/daemon/worker.h index 3fb52abd9d87..ab2fc728d274 100644 --- a/contrib/unbound/daemon/worker.h +++ b/contrib/unbound/daemon/worker.h @@ -118,7 +118,7 @@ struct worker { /** do we need to restart or quit (on signal) */ int need_to_exit; /** allocation cache for this thread */ - struct alloc_cache alloc; + struct alloc_cache *alloc; /** per thread statistics */ struct ub_server_stats stats; /** thread scratch regional */ @@ -131,6 +131,8 @@ struct worker { /** dnstap environment, changed for this thread */ struct dt_env dtenv; #endif + /** reuse existing cache on reload if other conditions allow it. */ + int reuse_cache; }; /** diff --git a/contrib/unbound/doc/Changelog b/contrib/unbound/doc/Changelog index 727d1543ea4e..899026352434 100644 --- a/contrib/unbound/doc/Changelog +++ b/contrib/unbound/doc/Changelog @@ -1,7 +1,93 @@ +5 January 2023: Wouter + - Tag for 1.17.1 release. + +2 January 2023: Wouter + - Fix windows compile for libunbound subprocess reap comm point closes. + - Update github workflows to use checkout v3. + +14 December 2022: George + - Merge #569 from JINMEI Tatuya: add keep-cache option to + 'unbound-control reload' to keep caches. + +13 December 2022: George + - Expose 'statistics-inhibit-zero' as a configuration option; the + default value retains Unbound's behavior. + - Expose 'max-sent-count' as a configuration option; the + default value retains Unbound's behavior. + - Merge #461 from Christian Allred: Add max-query-restarts option. + Exposes an internal configuration but the default value retains + Unbound's behavior. + +13 December 2022: Wouter + - Merge #808: Wrap Makefile script's directory variables in quotes. + - Fix to wrap Makefile scripts directory in quotes for uninstall. + +1 December 2022: Wouter + - Fix #773: When used with systemd-networkd, unbound does not start + until systemd-networkd-wait-online.service times out. + +30 November 2022: George + - Add SVCB and HTTPS to the types removed by 'unbound-control flush'. + - Clear documentation for interactivity between the subnet module and + the serve-expired and prefetch configuration options. + +30 November 2022: Wouter + - Fix #782: Segmentation fault in stats.c:404. + +28 November 2022: Wouter + - Fix for the ignore of tcp events for closed comm points, preserve + the use after free protection features. + +23 November 2022: Philip + - Merge #720 from jonathangray: fix use after free when + WSACreateEvent() fails. + +22 November 2022: George + - Ignore expired error responses. + +11 November 2022: Wouter + - Fix #779: [doc] Missing documention in ub_resolve_event() for + callback parameter was_ratelimited. + +9 November 2022: George + - Complementary fix for distutils.sysconfig deprecation in Python 3.10 + to commit 62c5039ab9da42713e006e840b7578e01d66e7f2. + +8 November 2022: Wouter + - Fix to ignore tcp events for closed comm points. + - Fix to make sure to not read again after a tcp comm point is closed. + - Fix #775: libunbound: subprocess reap causes parent process reap + to hang. + - iana portlist update. + +21 October 2022: George + - Merge #767 from jonathangray: consistently use IPv4/IPv6 in + unbound.conf.5. + +21 October 2022: Wouter + - Fix that cachedb does not store failures in the external cache. + +18 October 2022: George + - Clarify the use of MAX_SENT_COUNT in the iterator code. + +17 October 2022: Wouter + - testcode/dohclient sets log identity to its name. + +14 October 2022: Wouter + - Merge #768 from fobser: Arithmetic on a pointer to void is a GNU + extension. + - In unit test, print python script name list correctly. + +13 October 2022: Wouter + - Tag for 1.17.0 release. The code repository continues with 1.17.1. + 11 October 2022: George - Fix PROXYv2 header read for TCP connections when no proxied addresses are provided. +7 October 2022: Wouter + - Tag for 1.17.0rc1 release. + 7 October 2022: George - Fix to stop possible loops in the tcp reuse code (write_wait list and tcp_wait list). Based on analysis and patch from Prad Seniappan diff --git a/contrib/unbound/doc/README b/contrib/unbound/doc/README index 88444a5e3c99..faab92bcb077 100644 --- a/contrib/unbound/doc/README +++ b/contrib/unbound/doc/README @@ -1,4 +1,4 @@ -README for Unbound 1.17.0 +README for Unbound 1.17.1 Copyright 2007 NLnet Labs http://unbound.net diff --git a/contrib/unbound/doc/example.conf.in b/contrib/unbound/doc/example.conf.in index df0b2a1fb2c0..8cf3d868285e 100644 --- a/contrib/unbound/doc/example.conf.in +++ b/contrib/unbound/doc/example.conf.in @@ -1,7 +1,7 @@ # # Example configuration file. # -# See unbound.conf(5) man page, version 1.17.0. +# See unbound.conf(5) man page, version 1.17.1. # # this is a comment. @@ -35,9 +35,14 @@ server: # statistics-cumulative: no # enable extended statistics (query types, answer codes, status) - # printed from unbound-control. default off, because of speed. + # printed from unbound-control. Default off, because of speed. # extended-statistics: no + # Inhibits selected extended statistics (qtype, qclass, qopcode, rcode, + # rpz-actions) from printing if their value is 0. + # Default on. + # statistics-inhibit-zero: yes + # number of threads to create. 1 disables threading. # num-threads: 1 @@ -173,6 +178,15 @@ server: # a throwaway response (also timeouts) is received. # outbound-msg-retry: 5 + # Hard limit on the number of outgoing queries Unbound will make while + # resolving a name, making sure large NS sets do not loop. + # It resets on query restarts (e.g., CNAME) and referrals. + # max-sent-count: 32 + + # Hard limit on the number of times Unbound is allowed to restart a + # query upon encountering a CNAME record. + # max-query-restarts: 11 + # msec for waiting for an unknown server to reply. Increase if you # are behind a slow satellite link, to eg. 1128. # unknown-server-time-limit: 376 diff --git a/contrib/unbound/doc/libunbound.3.in b/contrib/unbound/doc/libunbound.3.in index b87289e0d764..19a213e1aa6f 100644 --- a/contrib/unbound/doc/libunbound.3.in +++ b/contrib/unbound/doc/libunbound.3.in @@ -1,4 +1,4 @@ -.TH "libunbound" "3" "Oct 13, 2022" "NLnet Labs" "unbound 1.17.0" +.TH "libunbound" "3" "Jan 12, 2023" "NLnet Labs" "unbound 1.17.1" .\" .\" libunbound.3 -- unbound library functions manual .\" @@ -44,7 +44,7 @@ .B ub_ctx_zone_remove, .B ub_ctx_data_add, .B ub_ctx_data_remove -\- Unbound DNS validating resolver 1.17.0 functions. +\- Unbound DNS validating resolver 1.17.1 functions. .SH "SYNOPSIS" .B #include .LP diff --git a/contrib/unbound/doc/unbound-anchor.8.in b/contrib/unbound/doc/unbound-anchor.8.in index dc61b72dadb4..9bba2522a19c 100644 --- a/contrib/unbound/doc/unbound-anchor.8.in +++ b/contrib/unbound/doc/unbound-anchor.8.in @@ -1,4 +1,4 @@ -.TH "unbound-anchor" "8" "Oct 13, 2022" "NLnet Labs" "unbound 1.17.0" +.TH "unbound-anchor" "8" "Jan 12, 2023" "NLnet Labs" "unbound 1.17.1" .\" .\" unbound-anchor.8 -- unbound anchor maintenance utility manual .\" diff --git a/contrib/unbound/doc/unbound-checkconf.8.in b/contrib/unbound/doc/unbound-checkconf.8.in index ba6c334c7c78..128f1cebd94b 100644 --- a/contrib/unbound/doc/unbound-checkconf.8.in +++ b/contrib/unbound/doc/unbound-checkconf.8.in @@ -1,4 +1,4 @@ -.TH "unbound-checkconf" "8" "Oct 13, 2022" "NLnet Labs" "unbound 1.17.0" +.TH "unbound-checkconf" "8" "Jan 12, 2023" "NLnet Labs" "unbound 1.17.1" .\" .\" unbound-checkconf.8 -- unbound configuration checker manual .\" diff --git a/contrib/unbound/doc/unbound-control.8.in b/contrib/unbound/doc/unbound-control.8.in index 3841b9737f4e..10be612fe20e 100644 --- a/contrib/unbound/doc/unbound-control.8.in +++ b/contrib/unbound/doc/unbound-control.8.in @@ -1,4 +1,4 @@ -.TH "unbound-control" "8" "Oct 13, 2022" "NLnet Labs" "unbound 1.17.0" +.TH "unbound-control" "8" "Jan 12, 2023" "NLnet Labs" "unbound 1.17.1" .\" .\" unbound-control.8 -- unbound remote control manual .\" @@ -54,6 +54,12 @@ Stop the server. The server daemon exits. .B reload Reload the server. This flushes the cache and reads the config file fresh. .TP +.B reload_keep_cache +Reload the server but try to keep the RRset and message cache if +(re)configuration allows for it. +That means the caches sizes and the number of threads must not change between +reloads. +.TP .B verbosity \fInumber Change verbosity value for logging. Same values as \fBverbosity\fR keyword in \fIunbound.conf\fR(5). This new setting lasts until the server is issued @@ -130,7 +136,7 @@ name specified. .TP .B flush \fIname Remove the name from the cache. Removes the types -A, AAAA, NS, SOA, CNAME, DNAME, MX, PTR, SRV and NAPTR. +A, AAAA, NS, SOA, CNAME, DNAME, MX, PTR, SRV, NAPTR, SVCB and HTTPS. Because that is fast to do. Other record types can be removed using .B flush_type or diff --git a/contrib/unbound/doc/unbound-host.1.in b/contrib/unbound/doc/unbound-host.1.in index 8371084c575b..0af5777f0492 100644 --- a/contrib/unbound/doc/unbound-host.1.in +++ b/contrib/unbound/doc/unbound-host.1.in @@ -1,4 +1,4 @@ -.TH "unbound\-host" "1" "Oct 13, 2022" "NLnet Labs" "unbound 1.17.0" +.TH "unbound\-host" "1" "Jan 12, 2023" "NLnet Labs" "unbound 1.17.1" .\" .\" unbound-host.1 -- unbound DNS lookup utility .\" diff --git a/contrib/unbound/doc/unbound.8.in b/contrib/unbound/doc/unbound.8.in index ac61b0f7a10c..498690805c85 100644 --- a/contrib/unbound/doc/unbound.8.in +++ b/contrib/unbound/doc/unbound.8.in @@ -1,4 +1,4 @@ -.TH "unbound" "8" "Oct 13, 2022" "NLnet Labs" "unbound 1.17.0" +.TH "unbound" "8" "Jan 12, 2023" "NLnet Labs" "unbound 1.17.1" .\" .\" unbound.8 -- unbound manual .\" @@ -9,7 +9,7 @@ .\" .SH "NAME" .B unbound -\- Unbound DNS validating resolver 1.17.0. +\- Unbound DNS validating resolver 1.17.1. .SH "SYNOPSIS" .B unbound .RB [ \-h ] diff --git a/contrib/unbound/doc/unbound.conf.5.in b/contrib/unbound/doc/unbound.conf.5.in index 6c021b900d89..3844d52551c6 100644 --- a/contrib/unbound/doc/unbound.conf.5.in +++ b/contrib/unbound/doc/unbound.conf.5.in @@ -1,4 +1,4 @@ -.TH "unbound.conf" "5" "Oct 13, 2022" "NLnet Labs" "unbound 1.17.0" +.TH "unbound.conf" "5" "Jan 12, 2023" "NLnet Labs" "unbound 1.17.1" .\" .\" unbound.conf.5 -- unbound.conf manual .\" @@ -112,6 +112,14 @@ If enabled, extended statistics are printed from \fIunbound\-control\fR(8). Default is off, because keeping track of more statistics takes time. The counters are listed in \fIunbound\-control\fR(8). .TP +.B statistics\-inhibit\-zero: \fI +If enabled, selected extended statistics with a value of 0 are inhibited from +printing with \fIunbound\-control\fR(8). +These are query types, query classes, query opcodes, answer rcodes +(except NOERROR, FORMERR, SERVFAIL, NXDOMAIN, NOTIMPL, REFUSED) and +RPZ actions. +Default is on. +.TP .B num\-threads: \fI The number of threads to create to serve clients. Use 1 for no threading. .TP @@ -349,7 +357,7 @@ ip\-transparent option is also available. The value of the Differentiated Services Codepoint (DSCP) in the differentiated services field (DS) of the outgoing IP packet headers. The field replaces the outdated IPv4 Type-Of-Service field and the -IPV6 traffic class field. +IPv6 traffic class field. .TP .B rrset\-cache\-size: \fI Number of bytes size of the RRset cache. Default is 4 megabytes. @@ -416,7 +424,7 @@ Enable or disable whether ip4 queries are answered or issued. Default is yes. Enable or disable whether ip6 queries are answered or issued. Default is yes. If disabled, queries are not answered on IPv6, and queries are not sent on IPv6 to the internet nameservers. With this option you can disable the -ipv6 transport for sending DNS traffic, it does not impact the contents of +IPv6 transport for sending DNS traffic, it does not impact the contents of the DNS traffic, which may have ip4 and ip6 addresses in it. .TP .B prefer\-ip4: \fI @@ -1671,7 +1679,7 @@ This specifies the action data for \fIresponse-ip\fR with action being to redirect as specified by "\fIresource record string\fR". "Resource record string" is similar to that of \fIaccess-control-tag-action\fR, but it must be of either AAAA, A or CNAME types. -If the IP-netblock is an IPv6/IPV4 prefix, the record +If the IP-netblock is an IPv6/IPv4 prefix, the record must be AAAA/A respectively, unless it is a CNAME (which can be used for both versions of IP netblocks). If it is CNAME there must not be more than one \fIresponse-ip-data\fR for the same IP-netblock. @@ -1820,6 +1828,21 @@ If a forward/stub zone is used, this is the number of retries per nameserver in the zone. Default is 5. .TP 5 +.B max\-sent\-count: \fI +Hard limit on the number of outgoing queries Unbound will make while resolving +a name, making sure large NS sets do not loop. +Results in SERVFAIL when reached. +It resets on query restarts (e.g., CNAME) and referrals. +Default is 32. +.TP 5 +.B max\-query\-restarts: \fI +Hard limit on the number of times Unbound is allowed to restart a query upon +encountering a CNAME record. +Results in SERVFAIL when reached. +Changing this value needs caution as it can allow long CNAME chains to be +accepted, where Unbound needs to verify (resolve) each link individually. +Default is 11. +.TP 5 .B fast\-server\-permil: \fI Specify how many times out of 1000 to pick from the set of fastest servers. 0 turns the feature off. A value of 900 would pick from the fastest @@ -1853,7 +1876,7 @@ errors. Default is "no". When the \fBval-log-level\fR option is also set to \fB2\fR, responses with Extended DNS Errors concerning DNSSEC failures that are not served from cache, *** 1649 LINES SKIPPED *** From nobody Tue Feb 28 13:38:12 2023 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 4PQz2s1p2Gz3vT1s; Tue, 28 Feb 2023 13:38:13 +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 4PQz2r6lD4z4DYK; Tue, 28 Feb 2023 13:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591493; 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=KfKcXzvT1i87XCgodVo4A8OGgpY+YHBJcVbbjXdmDe8=; b=qb2D6ejZM3wazgw3kNAt/9eQj1tgc7NCDWtj0k8eEWitGsNQBqOnZ9HvfTfPFL6Kie2d2s o93b+bfZZFtgiquc3I+coPAVVv0nOyxipfKqKXi7S5rWBGtcI7P2++3O/zwLNi9kndMEa7 z9Eg6YnXPQ+g5mSl5t29W2HCVs7D6nF2gXWrmLtZxbetmZMU07SwCasApGY2JbiQ8GM759 oncrciXY5VClZPk8nZLxH5cDbSIzXgOrDufZu/QZ2ODPh30IFZ5vCD1Vy1BTsaDekngK5h D1HxGVbO+wyFqYSc7ra/jyj2oz5dvF4+goGoVb9pwq76K5HFjFrZjrQvMYLPKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591493; 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=KfKcXzvT1i87XCgodVo4A8OGgpY+YHBJcVbbjXdmDe8=; b=FN+8XylCT7RBhReLhWasz1F0EKh80c/jty6NN4yu8xCP8YQ5wXYSuLvOxIclfv24cM+/rE J8UH7UyH3AZPSucQbXOHcE/qyQDhy20ld+iwNoiTGPCYBIQNl7jc1tsJeykficjccIu6KR VN2PovSSJdQPxnCbhzd8Cn/YGAj7yNgXg36LlBXXpceeRzR2O1IjnI1yvopCsxrTE1WoPg H0WFj1TyCmodRUYujE3R1wF8FGsB3Sx+sbc9XD5OyeyfJHErgRBzpO0Zbp6gdfhRP7zp/P jGA11Jit5GJdc1CnfdFHLlJf+1mZJl/N8hQpKUB/sxbIB6sMEZHN70s6hUJX4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677591493; a=rsa-sha256; cv=none; b=Z0YopDo+/x5d9sjzAxM8rHV7MWlkSp3fpvyzGw4TXuvPndgrdEmLKvOMwyPgjNRpeTkW0m V28bke+T0iTJLKVRxkfMrN0noZzv85MTBsJ479BzRAf9+Q3K2Nhlv/7SYixj+eQ6lj15jY s+2vU1O622lMBjuuF2kWrsP9dcr/42U1UlUym45H+FXiYsYauJR3wwdyjJKsPzjMazoD9n 8647X3udjgKgWGLm6BCHFuygQpYHLj4TdJqp/2sWo55P1+L7rgl3zS+4LEwXYk3ij/2B4I aKUr7AIy2iZ0+yZqMtd2rxkJgxgAJKcGQw2Xf/RbW/yJFIsSMhbA8bHAPE6xdQ== 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 4PQz2r5P33z18Zd; Tue, 28 Feb 2023 13:38:12 +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 31SDcCkM041306; Tue, 28 Feb 2023 13:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDcCam041305; Tue, 28 Feb 2023 13:38:12 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:38:12 GMT Message-Id: <202302281338.31SDcCam041305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: b3231760c215 - releng/13.2 - unbound: Fix config.h 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: b3231760c215a9d05f0a441bff14a5fb47fb80d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b3231760c215a9d05f0a441bff14a5fb47fb80d1 commit b3231760c215a9d05f0a441bff14a5fb47fb80d1 Author: Cy Schubert AuthorDate: 2023-01-15 06:55:05 +0000 Commit: Cy Schubert CommitDate: 2023-02-28 02:41:08 +0000 unbound: Fix config.h FreeBSD src does not support HAVE_DECL_EVSIGNAL_ASSIGN. While reviewing the new config.h after regenerating it, this definition was not removed. Updating config.h is a manual process of configuring the port and copying/merging the generated config.h into src. This definition was missed and not removed (#undef'd). Approved by: re (cperciva) Fixes: 1838dec31895fd4752fa8631322ab93be0705a66 (cherry picked from commit 06b93ef8cda227d755d7f6cfa95d08c0ccc9dc2d) (cherry picked from commit 9f9f2a1270c510b33e1e50b1bac09ebe10bbb974) --- usr.sbin/unbound/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/unbound/config.h b/usr.sbin/unbound/config.h index 7ea0d3151ac5..bd36bb7573f8 100644 --- a/usr.sbin/unbound/config.h +++ b/usr.sbin/unbound/config.h @@ -117,7 +117,7 @@ /* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if you don't. */ -#define HAVE_DECL_EVSIGNAL_ASSIGN 1 +/* #undef HAVE_DECL_EVSIGNAL_ASSIGN */ /* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you don't. */ From nobody Tue Feb 28 13:38:13 2023 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 4PQz2t3wJ4z3vT85; Tue, 28 Feb 2023 13:38:14 +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 4PQz2t0nb1z4DYY; Tue, 28 Feb 2023 13:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591494; 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=bTlo11FHaJVc+f1NJJJsZ49O5wrxELYZfDzJO66Gy7w=; b=Os1UuiOxAvSTVX0DOQR0l8NPOHBenAe0Vmqim9Dsf427/OaqCNsX3/wc45R0QleYBKSfdK am/1XPgZWfzU9MPbNO4Td4U4KznhPAZ60dK3uvJ880xCLLHgi+h8rJM5ljldn4E3xusmrJ Sn41lFMTTWWOiq87EwAE4n7Q3OhixNXtxhAOknKqbLOtS8U8PHZD9b9Sj6/+o4c1KMkKw2 dstbA+yHGOTHgCTpQOwrH4hMr7Fgcz9Hp1unOUpYT8SBpvhjtK200LREK6qTBxuHa6Fbex tKFij5vBFVFrKcPZ/N7zVo0s6EkWaOrQXyftcbFhI1dz23ZHkqVjliC0JE30GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591494; 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=bTlo11FHaJVc+f1NJJJsZ49O5wrxELYZfDzJO66Gy7w=; b=Po5XgEgJcnVeEcmYBKqSRlZ93HJQk9nY7ukSUz/a8q+C4Mjwwpqvf5rQygpA9LDZQZl2DX QTvFCbIh14sWxWuBhKye+Qi6nVj9/48tDRv6NB1u1bkXEpjfYQgV7CuYNO475WhBPnhFb2 SdeEWFAZ93uCSpYMr9sVus4bwD4CIPbCJE/RTtjdvZYbsRDzBwdqLv5iJhVFXy37B12gS/ 1mda1Feh8iObBfNMt7VSAGPc8D5z0jCi03sz/hl0cdn/lAyKl4E4SVx4mRX+kpJWr6rOzj Wa4W+o+5BlhELPzlUD7rDfa+5aJKPDsSOoadz42Xs6GSB+URXLnXsfF99SamUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677591494; a=rsa-sha256; cv=none; b=WAiTLlhe/76MjBSe+4XU5RvVx78O+Bj+UqOmPv9WBa4FM+1P/pKhihGl42a5gw4U4sWEu3 KwVgbZftBEaLZTKVULpaILMrFMMNNKtdYv9SX+0/nFru2ZeoADdWJQg2TetbuVGjzrNWxA 1JIBQQnJkj7v5DhyHQE5b7SljygDO9fg0CdOb3imzF0qMTt84LrcTFORKM1zJjpfWCsgyK wlnWD0VtOKVDXwxoYvJbmFv6H50mXaCVaoJvdHngrsUcSWyYurj/N/OSuybrbRYKGK14kN B5pjpzeNFFM/oxn8xq4nIt3jMBy+BPnjsEJjLvNMc7WMViRYCE7yWlI06s2Dxg== 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 4PQz2s66DTz17w8; Tue, 28 Feb 2023 13:38:13 +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 31SDcDfN041326; Tue, 28 Feb 2023 13:38:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDcDdw041325; Tue, 28 Feb 2023 13:38:13 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:38:13 GMT Message-Id: <202302281338.31SDcDdw041325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: fb2147e30f97 - releng/13.2 - unbound: Fix config file path 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: fb2147e30f970a6d4329dd6d7efcb99461698c8f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fb2147e30f970a6d4329dd6d7efcb99461698c8f commit fb2147e30f970a6d4329dd6d7efcb99461698c8f Author: Juraj Lutter AuthorDate: 2023-01-17 17:25:47 +0000 Commit: Cy Schubert CommitDate: 2023-02-28 13:37:55 +0000 unbound: Fix config file path Commit 1838dec31895fd4752fa8631322ab93be0705a66 changed the config file path to /usr/local/etc/unbound/unbound.conf which is wrong for unbound in base. Reported by: Ihor Antonov Approved by: re (cperciva) Reviewed by: zlei Approved by: zlei Differential Revision: https://reviews.freebsd.org/D38106 Fixes: 1838dec31895fd4752fa8631322ab93be0705a66 (cherry picked from commit 1d577bedbae80ced38ccb834e6835e5fd98bc411) (cherry picked from commit e0c3f2a1e2961b5e4813399bf2a4bea467d2c301) --- usr.sbin/unbound/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/unbound/config.h b/usr.sbin/unbound/config.h index bd36bb7573f8..2068cbfe7295 100644 --- a/usr.sbin/unbound/config.h +++ b/usr.sbin/unbound/config.h @@ -21,7 +21,7 @@ #define CONFCMDLINE "--with-ssl=/usr --with-libexpat=/usr --disable-dnscrypt --disable-dnstap --enable-ecdsa --disable-event-api --enable-gost --with-libevent --disable-subnet --disable-tfo-client --disable-tfo-server --with-pthreads--prefix=/usr --localstatedir=/var/unbound --mandir=/usr/share/man --build=freebsd" /* Pathname to the Unbound configuration file */ -#define CONFIGFILE "/usr/local/etc/unbound/unbound.conf" +#define CONFIGFILE "/var/unbound/unbound.conf" /* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work */ From nobody Tue Feb 28 14:05:23 2023 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 4PQzfC1T1qz3vV0x; Tue, 28 Feb 2023 14:05:23 +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 4PQzfC1CX7z4J5p; Tue, 28 Feb 2023 14:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677593123; 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=7WOGDsX3l7F2jfNTw/i3WxeIApiN+qD51I2qkMox0OQ=; b=Kky2zfNwoQJiyS5QtdgxPcmfyTRg8d18mBx7tMAYcwDvSedno+U5W8fwUqYBideG9Yihc/ p17H8EeFnrsLP5xSONxAXuVHhOTrQcjENfNnFewcO/l+Y5RwCaE6OaRNryjYUmP+q8wsvI Bqu3l86dDA7GCk8aR+GpMlcgFIgRjPpr21wksjxUgRnjXzGZTrdl+ajg9PUSlp676XmpIo 5SoIzcUs4HFy7k+I2QvCyHSG6AxzIBXesGEvgqUfbka2s0CFG9Q93/uRC6OG2jBAMlNd+B uKyE7pAKwDGeWFlz0+OnJXV97hZfaRUZ+9AEO/tlrY/T/3YXfxuZyx++ZRlTpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677593123; 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=7WOGDsX3l7F2jfNTw/i3WxeIApiN+qD51I2qkMox0OQ=; b=EoKN4CjUENLzEA6tAhk+PiK6hVTNT2EBeR7Qlj1wSC+MGAXTnFALVSQiiKbUuSQNFXLKYk mmqRN85HMTSx32IumFSbOIOvJeZC4t9gS3JcO0MBbVENc+mzNOthpSqnPViLkJHZ17Uw3x ie23pazjjuZWOtBIFO2BAouTSf6dNPJpKl3TMG18wdIrTzY6q7Jk8C7LfyICLbOE2ZVmZL CxvYc4HlpUEs2+P+8sg1tHTfrrqZ5ttdwb4c5sOIGfQqr2jBGPtwyFcXuJf8q0QkPy8LVd EIkR4YZN+rFgs6agLehrXe7WZg4ZoDzCbq5S9aXdBSu7yzCh6nE6vPHho7CH/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677593123; a=rsa-sha256; cv=none; b=D+KQnw0RoF0DpIx2GI4OLhgkTwqhFbwDQtQQd1BoEs7GIVY9TorjCdMxhEh4quTn5ya2F9 e/tueF3rUvx96EK9HvALr55heYyYQMhD5oRvQaVBL2md4wVAR75rmK0+pKAFTwd8wBILpT rkxwTCc/Aqqu5mpabwGUT+1vkHrC9RPkN16vN5US38GFkFX5PaNSZDD/P6XWG64ZHQhSqm xcOQsD83wp4ksFxJhFlF66fdYoSlMbGryUbxxelu2pWimnC1V7ePGaUzkHicQSbo3SwuPm xvHLTvH6pPCLE2ld/9N1Ta2dJQSijeelf0Jkaopb6SmU20NquH28qm2pFdMSTQ== 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 4PQzfC0GlBz18g0; Tue, 28 Feb 2023 14:05:23 +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 31SE5Nvu090825; Tue, 28 Feb 2023 14:05:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SE5Ntj090824; Tue, 28 Feb 2023 14:05:23 GMT (envelope-from git) Date: Tue, 28 Feb 2023 14:05:23 GMT Message-Id: <202302281405.31SE5Ntj090824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: dc1ba2a432ff - stable/13 - libdwarf: Add some constants from DWARF 5 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dc1ba2a432ff156f84bf101a440ddd8fb47104ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dc1ba2a432ff156f84bf101a440ddd8fb47104ac commit dc1ba2a432ff156f84bf101a440ddd8fb47104ac Author: Mark Johnston AuthorDate: 2023-02-07 19:33:27 +0000 Commit: Mark Johnston CommitDate: 2023-02-28 14:05:00 +0000 libdwarf: Add some constants from DWARF 5 This is not exhaustive - DWARF 5 has some new enumeration types not implemented here - but I think I caught all the ones that are extended in DWARF 5, plus the new compilation unit type (DW_UT_*), needed when parsing .debug_info headers. These were useful when extending libdwarf/ctfconvert/readelf to handle DWARF generated by gcc 12, which is version 5 by default. Reviewed by: emaste MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38273 (cherry picked from commit 7bb441c866781ec14b3e79a4f3e95fd319ab7ff9) --- contrib/elftoolchain/libdwarf/Version.map | 1 + contrib/elftoolchain/libdwarf/dwarf.h | 83 +++++++++++ contrib/elftoolchain/libdwarf/dwarf_dump.c | 168 +++++++++++++++++++++- contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 | 11 +- contrib/elftoolchain/libdwarf/libdwarf.h | 1 + lib/libdwarf/Makefile | 1 + 6 files changed, 263 insertions(+), 2 deletions(-) diff --git a/contrib/elftoolchain/libdwarf/Version.map b/contrib/elftoolchain/libdwarf/Version.map index 669f70e44dac..6714457e7ede 100644 --- a/contrib/elftoolchain/libdwarf/Version.map +++ b/contrib/elftoolchain/libdwarf/Version.map @@ -100,6 +100,7 @@ global: dwarf_get_OP_name; dwarf_get_ORD_name; dwarf_get_TAG_name; + dwarf_get_UT_name; dwarf_get_VIRTUALITY_name; dwarf_get_VIS_name; dwarf_get_abbrev; diff --git a/contrib/elftoolchain/libdwarf/dwarf.h b/contrib/elftoolchain/libdwarf/dwarf.h index 8f3733566527..99e934078e7d 100644 --- a/contrib/elftoolchain/libdwarf/dwarf.h +++ b/contrib/elftoolchain/libdwarf/dwarf.h @@ -90,6 +90,14 @@ #define DW_TAG_type_unit 0x41 #define DW_TAG_rvalue_reference_type 0x42 #define DW_TAG_template_alias 0x43 +#define DW_TAG_coarray_type 0x44 +#define DW_TAG_generic_subrange 0x45 +#define DW_TAG_dynamic_type 0x46 +#define DW_TAG_atomic_type 0x47 +#define DW_TAG_call_site 0x48 +#define DW_TAG_call_site_parameter 0x49 +#define DW_TAG_skeleton_unit 0x4a +#define DW_TAG_immutable_type 0x4b #define DW_TAG_lo_user 0x4080 #define DW_TAG_hi_user 0xffff @@ -205,6 +213,35 @@ #define DW_AT_const_expr 0x6c #define DW_AT_enum_class 0x6d #define DW_AT_linkage_name 0x6e +#define DW_AT_string_length_bit_size 0x6f +#define DW_AT_string_length_byte_size 0x70 +#define DW_AT_rank 0x71 +#define DW_AT_str_offsets_base 0x72 +#define DW_AT_addr_base 0x73 +#define DW_AT_rnglists_base 0x74 +#define DW_AT_dwo_name 0x76 +#define DW_AT_reference 0x77 +#define DW_AT_rvalue_reference 0x78 +#define DW_AT_macros 0x79 +#define DW_AT_call_all_calls 0x7a +#define DW_AT_call_all_source_calls 0x7b +#define DW_AT_call_all_tail_calls 0x7c +#define DW_AT_call_return_pc 0x7d +#define DW_AT_call_value 0x7e +#define DW_AT_call_origin 0x7f +#define DW_AT_call_parameter 0x80 +#define DW_AT_call_pc 0x81 +#define DW_AT_call_tail_call 0x82 +#define DW_AT_call_target 0x83 +#define DW_AT_call_target_clobbered 0x84 +#define DW_AT_call_data_location 0x85 +#define DW_AT_call_data_value 0x86 +#define DW_AT_noreturn 0x87 +#define DW_AT_alignment 0x88 +#define DW_AT_export_symbols 0x89 +#define DW_AT_deleted 0x8a +#define DW_AT_defaulted 0x8b +#define DW_AT_loclists_base 0x8c #define DW_AT_lo_user 0x2000 #define DW_AT_hi_user 0x3fff @@ -292,7 +329,25 @@ #define DW_FORM_sec_offset 0x17 #define DW_FORM_exprloc 0x18 #define DW_FORM_flag_present 0x19 +#define DW_FORM_strx 0x1a +#define DW_FORM_addrx 0x1b +#define DW_FORM_ref_sup4 0x1c +#define DW_FORM_strp_sup 0x1d +#define DW_FORM_data16 0x1e +#define DW_FORM_line_strp 0x1f #define DW_FORM_ref_sig8 0x20 +#define DW_FORM_implicit_const 0x21 +#define DW_FORM_loclistx 0x22 +#define DW_FORM_rnglistx 0x23 +#define DW_FORM_ref_sup8 0x24 +#define DW_FORM_ref_strx1 0x25 +#define DW_FORM_ref_strx2 0x26 +#define DW_FORM_ref_strx3 0x27 +#define DW_FORM_ref_strx4 0x28 +#define DW_FORM_ref_addrx1 0x29 +#define DW_FORM_ref_addrx2 0x2a +#define DW_FORM_ref_addrx3 0x2b +#define DW_FORM_ref_addrx4 0x2c #define DW_FORM_GNU_ref_alt 0x1f20 #define DW_FORM_GNU_strp_alt 0x1f21 @@ -450,6 +505,16 @@ #define DW_OP_bit_piece 0x9d #define DW_OP_implicit_value 0x9e #define DW_OP_stack_value 0x9f +#define DW_OP_implicit_pointer 0xa0 +#define DW_OP_addrx 0xa1 +#define DW_OP_constx 0xa2 +#define DW_OP_entry_value 0xa3 +#define DW_OP_const_type 0xa4 +#define DW_OP_regval_type 0xa5 +#define DW_OP_deref_type 0xa6 +#define DW_OP_xderef_type 0xa7 +#define DW_OP_convert 0xa8 +#define DW_OP_reinterpret 0xa9 #define DW_OP_lo_user 0xe0 #define DW_OP_hi_user 0xff @@ -483,6 +548,9 @@ #define DW_ATE_signed_fixed 0xd #define DW_ATE_unsigned_fixed 0xe #define DW_ATE_decimal_float 0xf +#define DW_ATE_UTF 0x10 +#define DW_ATE_UCS 0x11 +#define DW_ATE_ASCII 0x12 #define DW_ATE_lo_user 0x80 #define DW_ATE_hi_user 0xff @@ -553,6 +621,8 @@ #define DW_CC_normal 0x01 #define DW_CC_program 0x02 #define DW_CC_nocall 0x03 +#define DW_CC_pass_by_reference 0x04 +#define DW_CC_pass_by_value 0x05 #define DW_CC_lo_user 0x40 #define DW_CC_hi_user 0xff @@ -649,4 +719,17 @@ #define DW_EH_PE_aligned 0x50 #define DW_EH_PE_omit 0xff +/* + * Compilation unit types. DWARF5 only. + */ + +#define DW_UT_compile 0x01 +#define DW_UT_type 0x02 +#define DW_UT_partial 0x03 +#define DW_UT_skeleton 0x04 +#define DW_UT_split_compile 0x05 +#define DW_UT_split_type 0x06 +#define DW_UT_lo_user 0x80 +#define DW_UT_hi_user 0xff + #endif /* !_DWARF_H_ */ diff --git a/contrib/elftoolchain/libdwarf/dwarf_dump.c b/contrib/elftoolchain/libdwarf/dwarf_dump.c index fe61bffc6a17..e847d8e443f2 100644 --- a/contrib/elftoolchain/libdwarf/dwarf_dump.c +++ b/contrib/elftoolchain/libdwarf/dwarf_dump.c @@ -250,6 +250,64 @@ dwarf_get_AT_name(unsigned attr, const char **s) *s = "DW_AT_visibility"; break; case DW_AT_vtable_elem_location: *s = "DW_AT_vtable_elem_location"; break; + case DW_AT_string_length_bit_size: + *s = "DW_AT_string_length_bit_size"; break; + case DW_AT_string_length_byte_size: + *s = "DW_AT_string_length_byte_size"; break; + case DW_AT_rank: + *s = "DW_AT_rank"; break; + case DW_AT_str_offsets_base: + *s = "DW_AT_str_offsets_base"; break; + case DW_AT_addr_base: + *s = "DW_AT_addr_base"; break; + case DW_AT_rnglists_base: + *s = "DW_AT_rnglists_base"; break; + case DW_AT_dwo_name: + *s = "DW_AT_dwo_name"; break; + case DW_AT_reference: + *s = "DW_AT_reference"; break; + case DW_AT_rvalue_reference: + *s = "DW_AT_rvalue_reference"; break; + case DW_AT_macros: + *s = "DW_AT_macros"; break; + case DW_AT_call_all_calls: + *s = "DW_AT_call_all_calls"; break; + case DW_AT_call_all_source_calls: + *s = "DW_AT_call_all_source_calls"; break; + case DW_AT_call_all_tail_calls: + *s = "DW_AT_call_all_tail_calls"; break; + case DW_AT_call_return_pc: + *s = "DW_AT_call_return_pc"; break; + case DW_AT_call_value: + *s = "DW_AT_call_value"; break; + case DW_AT_call_origin: + *s = "DW_AT_call_origin"; break; + case DW_AT_call_parameter: + *s = "DW_AT_call_parameter"; break; + case DW_AT_call_pc: + *s = "DW_AT_call_pc"; break; + case DW_AT_call_tail_call: + *s = "DW_AT_call_tail_call"; break; + case DW_AT_call_target: + *s = "DW_AT_call_target"; break; + case DW_AT_call_target_clobbered: + *s = "DW_AT_call_target_clobbered"; break; + case DW_AT_call_data_location: + *s = "DW_AT_call_data_location"; break; + case DW_AT_call_data_value: + *s = "DW_AT_call_data_value"; break; + case DW_AT_noreturn: + *s = "DW_AT_noreturn"; break; + case DW_AT_alignment: + *s = "DW_AT_alignment"; break; + case DW_AT_export_symbols: + *s = "DW_AT_export_symbols"; break; + case DW_AT_deleted: + *s = "DW_AT_deleted"; break; + case DW_AT_defaulted: + *s = "DW_AT_defaulted"; break; + case DW_AT_loclists_base: + *s = "DW_AT_loclists_base"; break; case DW_AT_sf_names: *s = "DW_AT_sf_names"; break; case DW_AT_src_info: @@ -371,7 +429,7 @@ dwarf_get_ATE_name(unsigned ate, const char **s) assert(s != NULL); - switch(ate) { + switch (ate) { case DW_ATE_address: *s = "DW_ATE_address"; break; case DW_ATE_boolean: @@ -402,6 +460,12 @@ dwarf_get_ATE_name(unsigned ate, const char **s) *s = "DW_ATE_unsigned_fixed"; break; case DW_ATE_decimal_float: *s = "DW_ATE_decimal_float"; break; + case DW_ATE_UTF: + *s = "DW_ATE_UTF"; break; + case DW_ATE_UCS: + *s = "DW_ATE_UCS"; break; + case DW_ATE_ASCII: + *s = "DW_ATE_ASCII"; break; case DW_ATE_lo_user: *s = "DW_ATE_lo_user"; break; case DW_ATE_hi_user: @@ -426,6 +490,10 @@ dwarf_get_CC_name(unsigned cc, const char **s) *s = "DW_CC_program"; break; case DW_CC_nocall: *s = "DW_CC_nocall"; break; + case DW_CC_pass_by_reference: + *s = "DW_CC_pass_by_reference"; break; + case DW_CC_pass_by_value: + *s = "DW_CC_pass_by_value"; break; case DW_CC_lo_user: *s = "DW_CC_lo_user"; break; case DW_CC_hi_user: @@ -582,6 +650,42 @@ dwarf_get_FORM_name(unsigned form, const char **s) *s = "DW_FORM_strp"; break; case DW_FORM_udata: *s = "DW_FORM_udata"; break; + case DW_FORM_strx: + *s = "DW_FORM_strx"; break; + case DW_FORM_addrx: + *s = "DW_FORM_addrx"; break; + case DW_FORM_ref_sup4: + *s = "DW_FORM_ref_sup4"; break; + case DW_FORM_strp_sup: + *s = "DW_FORM_strp_sup"; break; + case DW_FORM_data16: + *s = "DW_FORM_data16"; break; + case DW_FORM_line_strp: + *s = "DW_FORM_line_strp"; break; + case DW_FORM_implicit_const: + *s = "DW_FORM_implicit_const"; break; + case DW_FORM_loclistx: + *s = "DW_FORM_loclistx"; break; + case DW_FORM_rnglistx: + *s = "DW_FORM_rnglistx"; break; + case DW_FORM_ref_sup8: + *s = "DW_FORM_ref_sup8"; break; + case DW_FORM_ref_strx1: + *s = "DW_FORM_ref_strx1"; break; + case DW_FORM_ref_strx2: + *s = "DW_FORM_ref_strx2"; break; + case DW_FORM_ref_strx3: + *s = "DW_FORM_ref_strx3"; break; + case DW_FORM_ref_strx4: + *s = "DW_FORM_ref_strx4"; break; + case DW_FORM_ref_addrx1: + *s = "DW_FORM_ref_addrx1"; break; + case DW_FORM_ref_addrx2: + *s = "DW_FORM_ref_addrx2"; break; + case DW_FORM_ref_addrx3: + *s = "DW_FORM_ref_addrx3"; break; + case DW_FORM_ref_addrx4: + *s = "DW_FORM_ref_addrx4"; break; default: return (DW_DLV_NO_ENTRY); } @@ -1238,6 +1342,26 @@ dwarf_get_OP_name(unsigned op, const char **s) *s = "DW_OP_implicit_value"; break; case DW_OP_stack_value: *s = "DW_OP_stack_value"; break; + case DW_OP_implicit_pointer: + *s = "DW_OP_implicit_pointer"; break; + case DW_OP_addrx: + *s = "DW_OP_addrx"; break; + case DW_OP_constx: + *s = "DW_OP_constx"; break; + case DW_OP_entry_value: + *s = "DW_OP_entry_value"; break; + case DW_OP_const_type: + *s = "DW_OP_const_type"; break; + case DW_OP_regval_type: + *s = "DW_OP_regval_type"; break; + case DW_OP_deref_type: + *s = "DW_OP_deref_type"; break; + case DW_OP_xderef_type: + *s = "DW_OP_xderef_type"; break; + case DW_OP_convert: + *s = "DW_OP_convert"; break; + case DW_OP_reinterpret: + *s = "DW_OP_reinterpret"; break; case DW_OP_GNU_push_tls_address: *s = "DW_OP_GNU_push_tls_address"; break; case DW_OP_GNU_uninit: @@ -1414,6 +1538,22 @@ dwarf_get_TAG_name(unsigned tag, const char **s) *s = "DW_TAG_volatile_type"; break; case DW_TAG_with_stmt: *s = "DW_TAG_with_stmt"; break; + case DW_TAG_coarray_type: + *s = "DW_TAG_coarray_type"; break; + case DW_TAG_generic_subrange: + *s = "DW_TAG_generic_subrange"; break; + case DW_TAG_dynamic_type: + *s = "DW_TAG_dynamic_type"; break; + case DW_TAG_atomic_type: + *s = "DW_TAG_atomic_type"; break; + case DW_TAG_call_site: + *s = "DW_TAG_call_site"; break; + case DW_TAG_call_site_parameter: + *s = "DW_TAG_call_site_parameter"; break; + case DW_TAG_skeleton_unit: + *s = "DW_TAG_skeleton_unit"; break; + case DW_TAG_immutable_type: + *s = "DW_TAG_immutable_type"; break; case DW_TAG_format_label: *s = "DW_TAG_format_label"; break; case DW_TAG_function_template: @@ -1441,6 +1581,32 @@ dwarf_get_TAG_name(unsigned tag, const char **s) return (DW_DLV_OK); } +int +dwarf_get_UT_name(unsigned unit_type, const char **s) +{ + + assert(s != NULL); + + switch (unit_type) { + case DW_UT_compile: + *s = "DW_UT_compile"; break; + case DW_UT_type: + *s = "DW_UT_type"; break; + case DW_UT_partial: + *s = "DW_UT_partial"; break; + case DW_UT_skeleton: + *s = "DW_UT_skeleton"; break; + case DW_UT_split_compile: + *s = "DW_UT_split_compile"; break; + case DW_UT_split_type: + *s = "DW_UT_split_type"; break; + default: + return (DW_DLV_NO_ENTRY); + } + + return (DW_DLV_OK); +} + int dwarf_get_VIRTUALITY_name(unsigned vir, const char **s) { diff --git a/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 b/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 index f84202664557..4beb430f6006 100644 --- a/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 +++ b/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 @@ -24,7 +24,7 @@ .\" .\" $Id: dwarf_get_AT_name.3 3644 2018-10-15 19:55:01Z jkoshy $ .\" -.Dd April 22, 2011 +.Dd January 30, 2023 .Dt DWARF_GET_AT_NAME 3 .Os .Sh NAME @@ -48,6 +48,7 @@ .Nm dwarf_get_OP_name , .Nm dwarf_get_ORD_name , .Nm dwarf_get_TAG_name , +.Nm dwarf_get_UT_name , .Nm dwarf_get_VIRTUALITY_name , .Nm dwarf_get_VIS_name .Nd retrieve the symbolic names of DWARF constants @@ -156,6 +157,11 @@ .Fa "char **str" .Fc .Ft int +.Fo dwarf_get_UT_name +.Fa "unsigned unit_type" +.Fa "const char **str" +.Fc +.Ft int .Fo dwarf_get_VIRTUALITY_name .Fa "unsigned val" .Fa "char **str" @@ -241,6 +247,9 @@ constants. .It Fn dwarf_get_TAG_name .Dv DW_TAG_* constants. +.It Fn dwarf_get_UT_name +.Dv DW_UT_* +constants. .It Fn dwarf_get_VIRTUALITY_name .Dv DW_VIRTUALITY_* constants. diff --git a/contrib/elftoolchain/libdwarf/libdwarf.h b/contrib/elftoolchain/libdwarf/libdwarf.h index 6ec8f99c56a1..75ebb56d288e 100644 --- a/contrib/elftoolchain/libdwarf/libdwarf.h +++ b/contrib/elftoolchain/libdwarf/libdwarf.h @@ -599,6 +599,7 @@ int dwarf_get_MACINFO_name(unsigned, const char **); int dwarf_get_OP_name(unsigned, const char **); int dwarf_get_ORD_name(unsigned, const char **); int dwarf_get_TAG_name(unsigned, const char **); +int dwarf_get_UT_name(unsigned, const char **); int dwarf_get_VIRTUALITY_name(unsigned, const char **); int dwarf_get_VIS_name(unsigned, const char **); int dwarf_get_abbrev(Dwarf_Debug, Dwarf_Unsigned, Dwarf_Abbrev *, diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile index a3ef95b2572a..eb8254fd4dd1 100644 --- a/lib/libdwarf/Makefile +++ b/lib/libdwarf/Makefile @@ -280,6 +280,7 @@ MLINKS+= \ dwarf_get_AT_name.3 dwarf_get_OP_name.3 \ dwarf_get_AT_name.3 dwarf_get_ORD_name.3 \ dwarf_get_AT_name.3 dwarf_get_TAG_name.3 \ + dwarf_get_AT_name.3 dwarf_get_UT_name.3 \ dwarf_get_AT_name.3 dwarf_get_VIRTUALITY_name.3 \ dwarf_get_AT_name.3 dwarf_get_VIS_name.3 \ dwarf_get_cu_die_offset.3 dwarf_get_arange_cu_header_offset.3 \ From nobody Tue Feb 28 20:52:01 2023 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 4PR8gQ3dWtz3twT1; Tue, 28 Feb 2023 20:52:02 +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 4PR8gP71htz40FT; Tue, 28 Feb 2023 20:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677617522; 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=ANAiUWI/ASyiFnJ6zypQ+sBFEGattBREY7914TZAAT4=; b=TxKdsbYyjNRNUTraCJ93PyyUAJDL7ifncuEsvaqs8rWIX3rahoo/rTzxogtDyk+4bZzmrw akACfaCj0+LOqkUJxuYe5Oy+jgzb/KG+HaTt8qeAOFtcOZScPgVLvQSnKtXa2eggjIgUT4 ui1RUwrb+/G64hwnh1Gp/PSGVn18ZTgcuMulRX/4GZJEPguQd6J6SP+2IVugSxEwO+rcn3 26P7zROjFtKTxS+k4OosUcFGjK6QxNtiFCFOymA9OxOjvNvh2C9R1dLf5Wf55tqLuowT5x hbt1IQK/+5s0YlegeBO6R3W4o/xtPRTNKcESsqunLLijISwJrI9MlVB/GWKo4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677617522; 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=ANAiUWI/ASyiFnJ6zypQ+sBFEGattBREY7914TZAAT4=; b=P/xm7wbwHVIIYPhF/4hLp2Mw/4P8FR1uJlhX1RVfzZ0wcbmB0QzleI3cuFbUzDQjUU8pgn 57wY7Y+x+VE5zbBx1zxK18bmJf6lfLjKkCCixCsoI1514EpSd4gW7KWAn5zo4oJipkrwwq x2zOpg2VpZTAxnFa2WcZZShAZi/WiemzMxSkb2dZJf6PmTCqIkaIyLUlP2TGX+zbZDCxaE +VRaPdGPFP/+DcsTLpavSOdOwXrN3SijvY64hOKhWagg+z5T2a3C3g1uDhLhjiTmn9sTI6 ELxV6cyiBe5xOU97wdZQ0KHpQ5VWREnmDy2fmDka/ojvzgZkG3tqaOePBDDOKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677617522; a=rsa-sha256; cv=none; b=AppR9yvjDkEEuhNAQqSwoYGl58FDVuGSxNTyC1frr0eQF/Qp3k/5yNtms3s9URJQD7OPAQ zgHK9cv3Ci3jCmo32gCf2CZpBxTpE17etnZ5Rf+H9lK3yXwdzLFR1x/8aYGin/dpu1yr7/ efYvfUnK/QYclVdu17QjUL6VKU9XTqjzOZh3ELtzg4gaVhGkCs50j2/IRQlyaW5pYuhT+T fEYEPBBK62d7BA1wTE0gfTcSabhv7SB3uUIbSnWuh95Z6XN8KaMUcV2mTuCeWUXwzZBYUl nSF8TG02aG55mgcEFc666AFnWqWSxRgncx+xu46bzR7dPyYX0JYYcih0RM20dQ== 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 4PR8gP62lwz1M2Y; Tue, 28 Feb 2023 20:52:01 +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 31SKq1BP062936; Tue, 28 Feb 2023 20:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SKq1h3062935; Tue, 28 Feb 2023 20:52:01 GMT (envelope-from git) Date: Tue, 28 Feb 2023 20:52:01 GMT Message-Id: <202302282052.31SKq1h3062935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d29b33328174 - stable/13 - Do not delete objdump when WITH_LLVM_BINUTILS is true 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d29b333281746cf9a68a247a79991585cdf38732 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d29b333281746cf9a68a247a79991585cdf38732 commit d29b333281746cf9a68a247a79991585cdf38732 Author: Ed Maste AuthorDate: 2022-09-25 19:29:38 +0000 Commit: Ed Maste CommitDate: 2023-02-28 20:51:33 +0000 Do not delete objdump when WITH_LLVM_BINUTILS is true WITH_LLVM_BINUTILS links /usr/bin/objdump to llvm-objdump, and similarly for the man page. Do not delete them in `make delete-old`. PR: 266603 Sponsored by: The FreeBSD Foundation (cherry picked from commit d1a351be19d4bd03918d44ea33fa7c09655f810a) --- ObsoleteFiles.inc | 4 ---- tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 64214e29e93f..37f07a708986 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -3277,10 +3277,6 @@ OLD_FILES+=usr/include/crypto/skipjack.h # 20200511: Remove ubsec(4) OLD_FILES+=usr/share/man/man4/ubsec.4.gz -# 20200506: GNU objdump 2.17.50 retired -OLD_FILES+=usr/bin/objdump -OLD_FILES+=usr/share/man/man1/objdump.1.gz - # 20200428: route_var.h moved to net/route OLD_FILES+=usr/include/net/route_var.h diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 7131c4e3d8ac..c3febff5800e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2095,6 +2095,11 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz .endif +.if ${MK_LLVM_BINUTILS} == no +OLD_FILES+=usr/bin/objdump +OLD_FILES+=usr/share/man/man1/objdump.1.gz +.endif + .if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC) OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz From nobody Tue Feb 28 21:44:51 2023 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 4PR9rM46j8z3tyxl; Tue, 28 Feb 2023 21:44:51 +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 4PR9rM3frPz45wn; Tue, 28 Feb 2023 21:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677620691; 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=z/14jtNF4uYReBI1Hudh5HBBMnCt/QblxUgBWj3rmoQ=; b=hLxjdWloe06rV5NAgBGRswgQP78ByGo/9/xV7gCrNqzIya6sCK5hZLn+bSLUn4sCzaztGh EVqlEQqGM7DcmYqJ1Y1yvDafzgDTDV2AKt1nXqbPPa/nCZGySrtvbxjcli3HhHreMlJPGs oB8wFMQJI9TIJ0xH/hFxBi8ikr7a+v6xCodPqkA5lmy7wrMuKgOMWOXzA2gjpRtl2XryHV 3M7wcN0Mg7N9sCz2w7cU8rehia4kgLC0j0OjvOFKcYYAByMq/pgZ/Ps/nU1Sg5vo9HKQDO vc+9KvIUrNrnjADppqONExLOkIeBqhj0bLBpGDrKZ316wiMfbPIgjZOhn8V0xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677620691; 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=z/14jtNF4uYReBI1Hudh5HBBMnCt/QblxUgBWj3rmoQ=; b=yHS+Xfc78yF9HpvmMaTj6FW8s5FV8t55hm9MmJT4szDbqKs9mtM7y7wee4UIFnYfYuRgmn WqnPFtiirG0ImUUKgU/3vsHAjtBADLtpeKIuFqhbZBsOPT3BmizrpYM0BI5LbycqpaBwrE m0bkO+JQPNlZWkxnoffsohDz3ainPiV+HlP1VvX2li23xb8hwIuQEvt547hUaZJxf/kCF4 HL313oiBxo2pSPy7J7N87XtLZ6+4ZuAaQ73tklGGlANXdovTPDwRAr/fHxQ03hKrW0vPAZ vE2mYXm2SHaJSCgN6jZdcbRQ7PodjYSE8qOQ2Z+uHRDnLdD5W0vFkXVw2tciIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677620691; a=rsa-sha256; cv=none; b=AfL5KsJgfxohuKKmWjA0cGakonpOmTiGP/Q/5VG8DueR4i6v6VrV19y+KVDTkGiQgIns0M cyC9GmiTfbeadvEWgofw3W+c+HnHPZLITa4OMhSP3f5RPQRNEKWfVsRh0mow2WnRuLKNwR LBSxbtEfmzivFbQhWAn1EPOfyck4u05VcpC0oFQ/gII1cyd1IgBnjVRIVAeIMN0jE8S50A Z93BBiTyR0gdgMs0PzHXvmn5diOfy6onTrWfFPVyycXKw18oy+3DLDRWjdluPgneVQJIEr RAoQQcKSTwczXHu2If0DbznclfD96E4ruxQ2knzStr92Oa7Q31cNG7izprkktw== 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 4PR9rM2j2Sz1N5T; Tue, 28 Feb 2023 21:44:51 +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 31SLip80045550; Tue, 28 Feb 2023 21:44:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SLipra045549; Tue, 28 Feb 2023 21:44:51 GMT (envelope-from git) Date: Tue, 28 Feb 2023 21:44:51 GMT Message-Id: <202302282144.31SLipra045549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 242ef804209c - stable/13 - src.conf: regen man page 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 242ef804209cce56cb9689283a5d4507a3714fce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=242ef804209cce56cb9689283a5d4507a3714fce commit 242ef804209cce56cb9689283a5d4507a3714fce Author: Ed Maste AuthorDate: 2023-02-28 21:42:53 +0000 Commit: Ed Maste CommitDate: 2023-02-28 21:44:19 +0000 src.conf: regen man page This hadn't been regenerated on the stable branch after some MFCs. Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 99ffdb38d8e1..d7bb2f063fcc 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd September 9, 2022 +.Dd February 28, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -452,6 +452,12 @@ When set, it enforces these options: .It .Va WITHOUT_GOOGLETEST .It +.Va WITHOUT_LLD +.It +.Va WITHOUT_LLDB +.It +.Va WITHOUT_LLVM_BINUTILS +.It .Va WITHOUT_LLVM_COV .It .Va WITHOUT_OFED @@ -467,6 +473,8 @@ When set, it enforces these options: .It Va WITHOUT_DEBUG_FILES Avoid building or installing standalone debug files for each executable binary and shared library. +.It Va WITH_DETECT_TZ_CHANGES +Make the time handling code detect changes to the timezone files. .It Va WITHOUT_DIALOG Do not build .Xr dialog 1 , From nobody Wed Mar 1 08:43:01 2023 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 4PRSRn6Nk3z3vbs7; Wed, 1 Mar 2023 08:43:01 +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 4PRSRn5s6Bz45Hf; Wed, 1 Mar 2023 08:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660181; 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=wX8QTLfzE4lHfR7Lr/uB9W47+CNpOlM+amuzMZSseGU=; b=qPoI04hWHXwSJuK7By8Bm+KYLjNZ2tR1cZfLRd7v5QqjgiK3v4T1c4/vGWM4TM6t8wYVgl b1VHEnDtpIAu0Md3diIN5eY+Rk0oJXXpo6cZXmKEd056RrLjfXbjvt5ei8SRTq2bN42wUw nkG2HYmVULqgTA2bUfIRmwq35oGpBums3/WnYdfVRK8JP8htd1BKar8u+Bqb4PGRr9zO32 2hcdzcS5BS3muvWCQ/35MVGWgLJwR9JMobvKgQfkroHa3PvUNA8jZ3a8LeGNzboq0RQ7o8 fXRA7PXbewyU64zV+pC/sGKpClSnxHKVhFMY2anxfXwLeNXSQfWJMYsJTuRIZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660181; 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=wX8QTLfzE4lHfR7Lr/uB9W47+CNpOlM+amuzMZSseGU=; b=B2Hqok/i9AeAZqAEq3kY8gNhdiPjdcWhWBM5S83UL0XzBGwwUARR7XIWCJ/z5BGn7mg5nu 6YFXuQ4uZskH+qsPOCGXSgzV3ZMTXFevQdPYnu3z0D9QfUX+AR49fE84/YQqNTpPfr37KR lm74GZxvhEZFzl8sqrr435DX8auTq/1Lw9QBkVE9IUHePExFOVuA6Gle7//BI+dZ5PmGGi DF3GhAkYEkuqeWEO5IKIz5gxrbfc2siHV+qI4zsgn3AWuV9AcUtRr5GrQ+rN/BPOy82jy6 wkEQXFCqjhtRdyzS60VQmHcqh7wAA1h6C/+OaEqzvDr0jcKasoHynBEiLJ++ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660181; a=rsa-sha256; cv=none; b=ak6ob1ANNPMFU1B1TUSRXO2XyelBVvu2n1shMUfC6JCyr+8x/iWmYINxX1WaNknI1jTFfr gVw8f7+SzIP91Lo2WZ+RWfrUVh53YLZ1YSpGDa1OCrGLiRVPQXnEEj9YFQh1FV0AFdRr+I hmfNLJc0J4RcTHLGnMavEnX17SZWpq2hfYLFfyCtblTXa1vbB6xeMZz2EzUltUtieQcsHY cf18DITcCDQn1LMPqTAUN/BSIgUi/qPUFys2sZ0g9LNYk7B5ISZrQSJPteATsmz3NsXcPV zsMMx7q65EQPkSS1tqc6bh1nSoNuf0JdQAFqYiZc97RZ6YwqQxxo8kLfphQ81w== 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 4PRSRn4wszzSKg; Wed, 1 Mar 2023 08:43:01 +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 3218h1g8028346; Wed, 1 Mar 2023 08:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218h1tS028345; Wed, 1 Mar 2023 08:43:01 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:01 GMT Message-Id: <202303010843.3218h1tS028345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 7b7e409c77cc - stable/13 - linux(4): Cleanup unneeded includes from linux_util.h 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b7e409c77cca914176437d8a7935b81d4a315de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7b7e409c77cca914176437d8a7935b81d4a315de commit 7b7e409c77cca914176437d8a7935b81d4a315de Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:30 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:41:49 +0000 linux(4): Cleanup unneeded includes from linux_util.h MFC after: 2 weeks (cherry picked from commit 81e7a800552196a65c9c8b3fef82c2ef6c8058ff) --- sys/compat/linux/linux_util.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index d751267e6d54..f8b4d0aaaa75 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -38,11 +38,7 @@ #include #include -#include -#include #include -#include -#include #include MALLOC_DECLARE(M_LINUX); From nobody Wed Mar 1 08:43:02 2023 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 4PRSRq01DCz3vbgV; Wed, 1 Mar 2023 08:43:03 +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 4PRSRp6WZ0z45LQ; Wed, 1 Mar 2023 08:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660182; 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=1Z2/K5xtI3pBEwWn954LR2ZFVTDejwVFCnVzBBxYP2c=; b=QzZw002gu0qbJZllg/PdP3kvw8u/nkysuO2rYI5DWv5CMVFiRsFs4amO34vAfi24TrTBvO WZIqZO02/HMtDo9yPIHG38dYi9zBFb1hpdWNxCvVUy81BBoORVFN6ISZgHFZk7EL4WABko /MvW/ohRWWhK66iZ7aDqZrA7cQsIgTaItj4nBilL4/i1eUqKPf1Zv87p6DQ2V1anQjvPuu 4XGABloQ/MTq4qtD/OE9ixWeE2V4D2nxMNMtbx7IJQ3ePktF/qLW9cJj+ZWYTs3QZ71t6l YO9ugizEgjzoVVM4qNz/w7QECSdwf5uLLDZqbPb3PqWYSwUhJTrjqGnuve0ygQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660182; 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=1Z2/K5xtI3pBEwWn954LR2ZFVTDejwVFCnVzBBxYP2c=; b=VHnX/itHQiaJT6KCQoSv9Oxcf34TAECP9L6PSUyBtMK7D/PzAmvTBEYqNV1lTjNtGjpt5/ ruaEO497cDMfMmb4Bq5zNy/O+PJ21a0tQ9fRhZwttT5iu47tmp0eDdl3b+ZgjY8mKqkT4l zr/JyT0+y/x/WJ9XVYqkE6RJZ+v7wDa3PGbskDwuXmA7nu1FrImifZYfNL80mxtL56hRhp /yrRV0ZT1N9R8DCoBJTYVeVXyMDSG+vS+jb/XwXZONxwQzuobop3TAqA13ePGIxoTJ5akN WX8M0/SruEVCw/xIQ4nPBvqCV7gTiu7hTF6iTfhC2focO+FpnMQ2DSW55bAyfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660182; a=rsa-sha256; cv=none; b=ZNRbLT3BR1/E7wAUnQ5bf/AhpETuVFwirAS/qJOZCMJ8EL1Czs2T7FBJ89wFwSD/LiZCyv GLxqd9AjMStRQ1NfnFy1rscOK9LeJ0cfYmDBTlelDl7fJW9TrE8wngy3BoP9As584Rx7zC UPKXJrIpo9KvTomzw8Y9KI29oEjpWY8ZYuFcsbe9j1+J0gp/MaNy1TNLpbAmq8gVgYeu2b l59suWpRnffGC8S3bdRi9eOd1KcgfvduT9/hPGzLy5egzSkYKGXo3y/KYYWZXOYQmMA5E2 sF99AnVZDPKqr39kycweWdl+x0HOgEz4PXDqnqDICJmbl+af21ngitQzhDVecA== 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 4PRSRp5cNZzScP; Wed, 1 Mar 2023 08:43:02 +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 3218h2kg028365; Wed, 1 Mar 2023 08:43:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218h2PI028364; Wed, 1 Mar 2023 08:43:02 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:02 GMT Message-Id: <202303010843.3218h2PI028364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 4f6b7aef517f - stable/13 - linux(4): Cleanup vm includes from linux_util.h 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4f6b7aef517f38a6a580e3c9f6b1aaff90a741b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4f6b7aef517f38a6a580e3c9f6b1aaff90a741b0 commit 4f6b7aef517f38a6a580e3c9f6b1aaff90a741b0 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:30 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:41:49 +0000 linux(4): Cleanup vm includes from linux_util.h Include vm headers directly where they needed. The linux_util.h included in a most source files of the Linuxulator, avoid collecting a rarely used includes here. MFC after: 2 weeks (cherry picked from commit 31e938c531dcbb708dbcd0e1d0a4ea80dcc82300) --- sys/amd64/linux/linux_machdep.c | 1 + sys/arm64/linux/linux_machdep.c | 2 ++ sys/compat/linux/linux_misc.c | 1 + sys/compat/linux/linux_util.h | 2 -- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 1c042424f3ea..ed905518fdf4 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index 0bfe51f7da1e..4b12476f7865 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -39,6 +39,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 0e429e0a29ca..5b9cb4cb7b49 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index f8b4d0aaaa75..044116f76b57 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -36,8 +36,6 @@ #ifndef _LINUX_UTIL_H_ #define _LINUX_UTIL_H_ -#include -#include #include #include From nobody Wed Mar 1 08:43:03 2023 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 4PRSRr11mbz3vbwx; Wed, 1 Mar 2023 08:43:04 +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 4PRSRr0V8dz45GW; Wed, 1 Mar 2023 08:43:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660184; 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=HvKf/rlOwczfbwVom9DRzgn4z7QL4g3d6c1C9S0Ou0c=; b=WXo4G3VfGbELlLqNxyzx3RqlsTRsm7RlVPJP9DPY8BTQnqhWYYWFrhB4U5+UQyxZHmsjdy wQKsDJ1L588s4Sc6qgZ9925o4eIU5HFCoASRFZvVgIjVY46F2h96xZIsKsFibj7TJAgqVC tUWwir9Hfiw5P3bCrQ/ly7DhLd0ju3M35Cq784r1oaMEHYpakcQGYmXphG2Wa3kuU2MtOm /7ORD6XZ5B3+JHZX9kmQyb4FoDneMCJLGbk/r8YeVXrUQdm1CELCakaLfdVlSuevEs/7CH JwkM7fmE5T0m1FypGjwRRKgHov5BlB6oePapB1PH4GtzMwIuyG7CBKAp64NBpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660184; 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=HvKf/rlOwczfbwVom9DRzgn4z7QL4g3d6c1C9S0Ou0c=; b=MmDz+9TwoB8xNUBacKevQp65mhovozWXAoFI5jRMoe+o7rpazWN8x9ooM0rAg1xYg7sNHi TmRdkRyOPguQR0NTqZ8VQDC0EjqqPX9aU+1o8E+Y5Jmw7djUaOxdB++4I+OYhPxIR466hD LSc8JXnc6XOaZa7CrhFIzVMqgTX5q/GJEJGlWnKwAsOJS21AgwxtQHGGVx9GZbcIyNTwB5 e0+FyJAZMKmZ+/aXb81PrWf3mmwPubHU1MxVeghhy95mu9XD9ONN7WkYgavY8SXe+fVdWW O7Z9uxyk3TN0gadim8NQvcWCVDTYxgSzF48WV+z4P0F3uZBYBoYIjq0ihjHffw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660184; a=rsa-sha256; cv=none; b=Wimd9+Gd6zpvKHBjKGzTTeTiMQ+RWVmqQOK2enZvPfbAs+KtFOhDH8N/RhyoTtb8ZhAaPW D3eTs7mDqtet17o7X1ELLBjBw9vX3uTFEBI4/Wj9CjD+rVItLv2GWg6BiuF40CRQ7Vj4MU 7xaIuoXAuXsyPzS+SCI2S2e+7sJt3Q0AbQ+ppvqHf7GA5NbtfR+xRLyQytodLdMsnRrzov H6AsyKHWmVcM4sc21pxkKXxm6njOl6PaTsq2Dlk4dkVNvgOhp51xLHqLn7GLN67ZUQWGH9 IMDJnvMcg0LBx7ed9MxfOUhH6QlYlEjOxrSAxRQXT7LPBoPKyGi2BBuzp/pR/w== 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 4PRSRq6kJczSDL; Wed, 1 Mar 2023 08:43:03 +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 3218h3re028384; Wed, 1 Mar 2023 08:43:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218h3CP028383; Wed, 1 Mar 2023 08:43:03 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:03 GMT Message-Id: <202303010843.3218h3CP028383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: a0f00d737c7a - stable/13 - linux(4): Cleanup sys/sysent.h from linux_util 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a0f00d737c7ac6bf74ea332ac63507410e3de1ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a0f00d737c7ac6bf74ea332ac63507410e3de1ba commit a0f00d737c7ac6bf74ea332ac63507410e3de1ba Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:41:50 +0000 linux(4): Cleanup sys/sysent.h from linux_util Include sys/sysent.h directly where it needed. The linux_util.h included in a most source files of the Linuxulator, avoid collecting a rarely used includes here. MFC after: 2 weeks (cherry picked from commit 513eb69edf382923bff1b09edda64010d89f74bd) --- sys/compat/linux/linux_futex.c | 1 + sys/compat/linux/linux_ipc.c | 1 + sys/compat/linux/linux_misc.c | 1 + sys/compat/linux/linux_util.h | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index 7d75889d2dce..aed6bbf94cee 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #ifdef COMPAT_LINUX32 diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 5f0c22b49e58..a72b0a9709b5 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef COMPAT_LINUX32 #include diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 5b9cb4cb7b49..823b79cc373d 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index 044116f76b57..37445ad0af27 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -36,7 +36,6 @@ #ifndef _LINUX_UTIL_H_ #define _LINUX_UTIL_H_ -#include #include MALLOC_DECLARE(M_LINUX); From nobody Wed Mar 1 08:43:04 2023 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 4PRSRs4HG1z3vbnb; Wed, 1 Mar 2023 08:43:05 +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 4PRSRs1byFz45Zg; Wed, 1 Mar 2023 08:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660185; 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=xZwQ2Ce5dlUUJNJY4/xo0D/Yq85dtGKF73kV21ZjAks=; b=t3Z/wo8gEMa3jcSJr4I/hNHa6MBWQoOekjWsTngd9/HZV7E8kBr5xi3OqRZBw/pMotd6tM l3/z/7JTcf/DSCrhpRIzDfaGobuUeJR1p2cYW+LQCxDIhklq74u537x94i2/zCXuSzYcOj OanMq4Dlo/eFpvRlTKjCIYAHX2x0hCn6WMeO5JYNO/J+qLXdjZH/4fgU2dt/iD+gW6Wk5U HmNirmG3lpd+njp8z2NzOoaXhMoml9cDmIZSUZK3HJGpDGcMZlwGyigJ+i8nN5T0imKcS6 blX7v50Em/iBG1MTCg5evqzrJcq2F+wuDvuJkJ86yEcNR27gq4MwE06XgFpr9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660185; 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=xZwQ2Ce5dlUUJNJY4/xo0D/Yq85dtGKF73kV21ZjAks=; b=lrbOkfwm/Brpc6TjLX9XQ6VR3ortOSynnll3yQRhK2eH1AcYuFIDEb+WUlP7yS4tFlF8fY nKhMg/4bvlsAms+BD4CznTXeizy3M5U3wsCbOY00mr6x2okf6f4Dofx+gBsdrXq/L+iXGC UyktyUcjV2rirBM439E45neuFx3ZxYDQpsGaaJe8p0KdNVoKKgmxqGyG+qnA1PnZXO4ptA 93JN69nSFliKTBpZ8mmwFC3i3onX1lrJ5JmGwFrclAaSqPAl7dsx/yS88jJAyFX9wPqT0L gW0HTE/5nTHbp1SpQ6QmERnscWE3nTkLTqOvNm/mWArb0z01he8HTZtkjS9jCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660185; a=rsa-sha256; cv=none; b=VdNycMIKdnI/0wzdjsLuOTPxm1AAYPr9v3ppgcmj1AtDjgaJPjcCeLTkcWCJghpccJG2kM GTv6VEScGmLNPcLTIaA34ACElICKBF5TKjLSi+lkEnUmkK5pqnlURU4ExtLL4buSirVOV/ NpU7ozqCie8ksp/7UDzJeY0ookgrvn321WNDuySIjEfjdZsvxMIqtwJbVVnL/dPPHIf3HE YmMavm6YU6DETxueegyEVbflLMxsGuBKrkb5sEZFPEBpSnUsTXSUo0UA7zQg8aex0dYMRw IF9+iiQDOooqccmtIC1uUPRR0UVAVTRlTJANHEno3F/6tuR1X2P84+6XIIHLvA== 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 4PRSRs0XbkzRhs; Wed, 1 Mar 2023 08:43:05 +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 3218h4xt028403; Wed, 1 Mar 2023 08:43:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218h4bD028402; Wed, 1 Mar 2023 08:43:04 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:04 GMT Message-Id: <202303010843.3218h4bD028402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: ff193c9bd91e - stable/13 - linux(4): Cleanup sys/queue.h from linux.h 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ff193c9bd91e862df173c3b21b0c5500b4c27439 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ff193c9bd91e862df173c3b21b0c5500b4c27439 commit ff193c9bd91e862df173c3b21b0c5500b4c27439 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:41:50 +0000 linux(4): Cleanup sys/queue.h from linux.h Leftover after converting futexes to the umtx API. NFC after: 2 weeks (cherry picked from commit 007986714c78c8e087038fb05442f17da1171bfa) --- sys/compat/linux/linux.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index a8cdab07a70b..055d8e3b9cf6 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -28,8 +28,6 @@ #ifndef _LINUX_MI_H_ #define _LINUX_MI_H_ -#include - /* * Private Brandinfo flags */ From nobody Wed Mar 1 08:43:06 2023 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 4PRSRt2dxRz3vbsF; Wed, 1 Mar 2023 08:43:06 +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 4PRSRt2CHfz45N6; Wed, 1 Mar 2023 08:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660186; 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=HamcE5pEN/RrKOhM9BodfPH3bVgkhq8nLIFGuquzZdc=; b=ZHVOD09Ml7MiA32rCfjJVloOHbrd+V8qIkZPWzJsQhUDHVQ5ZucM6Ajhuez+V+BFhixjO1 3jQMUMuo9iA15PUgh92WpIIIxX+IsJxkpt0mDlu560manxdtZNp6WIm7bDVVEc7V6dt/70 ZpkFyhekK95oxWQBK94r47I2NQzyVfS+I2YLq3z4kj+dh7V8AZp4FXUFwvmVhB8t+eQVks 3SCFOx1c9Xrr8ZChtU0lhDq7WZYqKITgkyWK7SmYrBb7YsJhsKymKToQ+1azur+nNS2m1s fEIIxVrgDh8BgbEK8b5se2vd6v7ewEzeatdROlCLjBDYZKtU/0BJQTKsPXMG8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660186; 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=HamcE5pEN/RrKOhM9BodfPH3bVgkhq8nLIFGuquzZdc=; b=h9p14bQkk6tbt+jwEG0g0/blBG7WVOQ7x6AlQP6IamMXYI5cF0GuGxCLyiJFB6o9Lr7fOa yVuaCKz3zmpdtLJx4wx7LsPSBamMAXaYxn0LZCD2+EUTQWwCYMZDDtYOGoU8yUyyG4NCH6 vJjgMIqCsK6GCA+H3b3lSmO2GmSaKJ86l3kGeRtkw/g6knSugkKe5E8C5GTfPd0+zDAcwl P6udORUHPvuIutRGhotr+JxVPtY24XPIl2odT23+1bRxU/Z6EoTs3z1M/393nIkoEy4bkQ 8I9LNqzc2IOkluEd5Ljm/f14TDCdJV1q55NQyiJVchlSfBz1emhS6ufRLnh3rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660186; a=rsa-sha256; cv=none; b=lTXiG6va6eFynQqoTtcgShc6eCPsiofW5X0rNZgX1qBaREMtFFCYCxG0j0NHZRshrQyXJ+ OKBtTSJ2yxG/oF4Et+1tzPsANBZXLsqY1awpTo3E6jEZjb93JotFAUOtbB063jJVZ0H08n 9IMmPEs/XSSzK/0irGq/dF6ds5fJcHEHONeTsJoR706XC47Vr58PvVPErv6i0znU4jFxQ1 pxW8CP30bewU682vRn0k6THL2xUfAd36PsaNBXU2BSvkmXRksmgfBVpyJnvr8xLbrCWIrt D3wBBKX+ip4JPWclpIOhYU78MCo3VZIE54nUCNrjE1S/ftWtR/uFjyA2N4PX4Q== 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 4PRSRt1HH4zSQx; Wed, 1 Mar 2023 08:43:06 +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 3218h6X3028422; Wed, 1 Mar 2023 08:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218h60a028421; Wed, 1 Mar 2023 08:43:06 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:06 GMT Message-Id: <202303010843.3218h60a028421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 7f4ad94efb72 - stable/13 - linux(4): Cleanup abi_compat.h include from linux_timer.h 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f4ad94efb729e3ee52071b88f4240495975f74f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7f4ad94efb729e3ee52071b88f4240495975f74f commit 7f4ad94efb729e3ee52071b88f4240495975f74f Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:41:50 +0000 linux(4): Cleanup abi_compat.h include from linux_timer.h Leftover after timespec copyin/copyout routines was implemented. MFC after: 2 weeks (cherry picked from commit 86f9efef2c44f6be007cbc9ab383ee6a277d5880) --- sys/compat/linux/linux_timer.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/compat/linux/linux_timer.h b/sys/compat/linux/linux_timer.h index b9f877cc83a4..a01411cec847 100644 --- a/sys/compat/linux/linux_timer.h +++ b/sys/compat/linux/linux_timer.h @@ -33,8 +33,6 @@ #ifndef _LINUX_TIMER_H #define _LINUX_TIMER_H -#include - #ifndef __LINUX_ARCH_SIGEV_PREAMBLE_SIZE #define __LINUX_ARCH_SIGEV_PREAMBLE_SIZE \ (sizeof(l_int) * 2 + sizeof(l_sigval_t)) From nobody Wed Mar 1 08:43:07 2023 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 4PRSRv3Fmjz3vbjx; Wed, 1 Mar 2023 08:43:07 +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 4PRSRv2qR1z45pt; Wed, 1 Mar 2023 08:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660187; 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=QaKBEgM45Cu5iR1ToFp4d7tGDMubpUv7hDvnV6++/lk=; b=kzjC/8PvbrTtPwUGnEq6rUjDHUKz0T9QAy8NjRtnL1MD0YYy6ykjTaaWNEXCArh8AjjyVL hzjyBr1AezFmCuM8w5rpyqChn6dpOhZoHNDJU2rjSt14cJsuflr+bnCANsOMceJoWA15bb Ks/UXBdsPyobtuanycAjRcJ6cbf0qJRDSDZmIBYDCGCPo4IUqqC/V97Vs1fx3CUwmJx9wM eI2xkvvI/4duqSnqKOry/nRU8uhztN5Pqqea5vdb3Fn8OL3/RkmwMe1d+sFacFQGmqDqnk wEjlZy9i5VGNdw1omAItMtJcFoG8HDSE4sJ3nicHVz3mNeCqnnRQLG+knS2+eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660187; 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=QaKBEgM45Cu5iR1ToFp4d7tGDMubpUv7hDvnV6++/lk=; b=JWl5FrWg0PN6+qLAY0wZr0Og7H9ZsTdZvQacM6Ll8sAVQiHxC/GdvFCbyDX/Dgf2dZdkD3 Pru+L1b6SqluW9s13dLW5ETjJmDqZI+tvx2h6p9StDhgDuBXvKYy3iLu4yhv96WbSu6jlQ H0TGZM9BuCzicZVqZS3O27oBKqFaZlpci0ymjDi9kxluTZ4fQiYbYymKyBYyWu7gLFZdF5 xemWUHRoavCQlorK5PHjhOCAMw28DEAz0vYDGjQNpJjnUYv7pg5AKz9Dz6cRFDwbLe9RKX xvjpUYent1rpnh/+WkGwrzaOYMglnYcT1MGE2pMcwOzAjDXPTvFjC3JCoUxhtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660187; a=rsa-sha256; cv=none; b=oevlnCQEhpqI0U4YoX0RqltFwQ89aviiQvWtHbu4Kin9yW7ePrMWedUcq3K++L924kVadz Nuvw3pMkDJur5JRNpF3cAylLwfwpFLTehFAv8JWT064xMxalFQ3fcFtJM4UPEeNRIwO7fi cCBA0Q9hiDFvhBo3v1Y84IMocOJwMjg8/OdroCPwfgzbONIaQXT98knCNwELI5/6hZaG4K xdm+DFntBHGsWnHbxJf2yvT6XYSLxz6RezRd4qjCEdg6ptEpOwlTm/sbPO1bgoXvZkfUXu ed9JH1fH9R9BoTg9w8XLbGIRcEUO7ZaUsdfZgKg1FpUuJHLOV9UWSTASfz4Ezg== 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 4PRSRv1wsBzSdj; Wed, 1 Mar 2023 08:43:07 +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 3218h7oj028448; Wed, 1 Mar 2023 08:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218h7Jf028447; Wed, 1 Mar 2023 08:43:07 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:07 GMT Message-Id: <202303010843.3218h7Jf028447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 28b647373119 - stable/13 - linux(4): Move uselib() to i386 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 28b6473731192395d1da81789f1ffa7c786d2b09 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=28b6473731192395d1da81789f1ffa7c786d2b09 commit 28b6473731192395d1da81789f1ffa7c786d2b09 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:32 +0000 linux(4): Move uselib() to i386 This obsolete system call is not supported by glibc. In ancient libc versions (before glibc 2.0), uselib() was used to load the shared libraries with names found in an array of names in the binary. On Linux, since 3.15, this system call is available only when the kernel is configured with the CONFIG_USELIB option. It doesn't look like anyone needs this syscall for others Linuxulators, so move it to the corresponding MD Linuxulator. MFC after: 2 weeks (cherry picked from commit 50c85a32d9c667779494850b6238b8d7ec13da75) --- sys/compat/linux/linux_misc.c | 264 ----------------------------------------- sys/i386/linux/linux_machdep.c | 260 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 260 insertions(+), 264 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 823b79cc373d..4dba124a918f 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -35,9 +35,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if defined(__i386__) -#include -#endif #include #include #include @@ -48,13 +45,11 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -77,12 +72,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include -#include #include -#include -#include #include #ifdef COMPAT_LINUX32 @@ -251,261 +242,6 @@ linux_brk(struct thread *td, struct linux_brk_args *args) return (0); } -#if defined(__i386__) -/* XXX: what about amd64/linux32? */ - -int -linux_uselib(struct thread *td, struct linux_uselib_args *args) -{ - struct nameidata ni; - struct vnode *vp; - struct exec *a_out; - vm_map_t map; - vm_map_entry_t entry; - struct vattr attr; - vm_offset_t vmaddr; - unsigned long file_offset; - unsigned long bss_size; - char *library; - ssize_t aresid; - int error; - bool locked, opened, textset; - - a_out = NULL; - vp = NULL; - locked = false; - textset = false; - opened = false; - - if (!LUSECONVPATH(td)) { - NDINIT(&ni, LOOKUP, ISOPEN | FOLLOW | LOCKLEAF | AUDITVNODE1, - UIO_USERSPACE, args->library, td); - error = namei(&ni); - } else { - LCONVPATHEXIST(args->library, &library); - NDINIT(&ni, LOOKUP, ISOPEN | FOLLOW | LOCKLEAF | AUDITVNODE1, - UIO_SYSSPACE, library, td); - error = namei(&ni); - LFREEPATH(library); - } - if (error) - goto cleanup; - - vp = ni.ni_vp; - NDFREE(&ni, NDF_ONLY_PNBUF); - - /* - * From here on down, we have a locked vnode that must be unlocked. - * XXX: The code below largely duplicates exec_check_permissions(). - */ - locked = true; - - /* Executable? */ - error = VOP_GETATTR(vp, &attr, td->td_ucred); - if (error) - goto cleanup; - - if ((vp->v_mount->mnt_flag & MNT_NOEXEC) || - ((attr.va_mode & 0111) == 0) || (attr.va_type != VREG)) { - /* EACCESS is what exec(2) returns. */ - error = ENOEXEC; - goto cleanup; - } - - /* Sensible size? */ - if (attr.va_size == 0) { - error = ENOEXEC; - goto cleanup; - } - - /* Can we access it? */ - error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td); - if (error) - goto cleanup; - - /* - * XXX: This should use vn_open() so that it is properly authorized, - * and to reduce code redundancy all over the place here. - * XXX: Not really, it duplicates far more of exec_check_permissions() - * than vn_open(). - */ -#ifdef MAC - error = mac_vnode_check_open(td->td_ucred, vp, VREAD); - if (error) - goto cleanup; -#endif - error = VOP_OPEN(vp, FREAD, td->td_ucred, td, NULL); - if (error) - goto cleanup; - opened = true; - - /* Pull in executable header into exec_map */ - error = vm_mmap(exec_map, (vm_offset_t *)&a_out, PAGE_SIZE, - VM_PROT_READ, VM_PROT_READ, 0, OBJT_VNODE, vp, 0); - if (error) - goto cleanup; - - /* Is it a Linux binary ? */ - if (((a_out->a_magic >> 16) & 0xff) != 0x64) { - error = ENOEXEC; - goto cleanup; - } - - /* - * While we are here, we should REALLY do some more checks - */ - - /* Set file/virtual offset based on a.out variant. */ - switch ((int)(a_out->a_magic & 0xffff)) { - case 0413: /* ZMAGIC */ - file_offset = 1024; - break; - case 0314: /* QMAGIC */ - file_offset = 0; - break; - default: - error = ENOEXEC; - goto cleanup; - } - - bss_size = round_page(a_out->a_bss); - - /* Check various fields in header for validity/bounds. */ - if (a_out->a_text & PAGE_MASK || a_out->a_data & PAGE_MASK) { - error = ENOEXEC; - goto cleanup; - } - - /* text + data can't exceed file size */ - if (a_out->a_data + a_out->a_text > attr.va_size) { - error = EFAULT; - goto cleanup; - } - - /* - * text/data/bss must not exceed limits - * XXX - this is not complete. it should check current usage PLUS - * the resources needed by this library. - */ - PROC_LOCK(td->td_proc); - if (a_out->a_text > maxtsiz || - a_out->a_data + bss_size > lim_cur_proc(td->td_proc, RLIMIT_DATA) || - racct_set(td->td_proc, RACCT_DATA, a_out->a_data + - bss_size) != 0) { - PROC_UNLOCK(td->td_proc); - error = ENOMEM; - goto cleanup; - } - PROC_UNLOCK(td->td_proc); - - /* - * Prevent more writers. - */ - error = VOP_SET_TEXT(vp); - if (error != 0) - goto cleanup; - textset = true; - - /* - * Lock no longer needed - */ - locked = false; - VOP_UNLOCK(vp); - - /* - * Check if file_offset page aligned. Currently we cannot handle - * misalinged file offsets, and so we read in the entire image - * (what a waste). - */ - if (file_offset & PAGE_MASK) { - /* Map text+data read/write/execute */ - - /* a_entry is the load address and is page aligned */ - vmaddr = trunc_page(a_out->a_entry); - - /* get anon user mapping, read+write+execute */ - error = vm_map_find(&td->td_proc->p_vmspace->vm_map, NULL, 0, - &vmaddr, a_out->a_text + a_out->a_data, 0, VMFS_NO_SPACE, - VM_PROT_ALL, VM_PROT_ALL, 0); - if (error) - goto cleanup; - - error = vn_rdwr(UIO_READ, vp, (void *)vmaddr, file_offset, - a_out->a_text + a_out->a_data, UIO_USERSPACE, 0, - td->td_ucred, NOCRED, &aresid, td); - if (error != 0) - goto cleanup; - if (aresid != 0) { - error = ENOEXEC; - goto cleanup; - } - } else { - /* - * for QMAGIC, a_entry is 20 bytes beyond the load address - * to skip the executable header - */ - vmaddr = trunc_page(a_out->a_entry); - - /* - * Map it all into the process's space as a single - * copy-on-write "data" segment. - */ - map = &td->td_proc->p_vmspace->vm_map; - error = vm_mmap(map, &vmaddr, - a_out->a_text + a_out->a_data, VM_PROT_ALL, VM_PROT_ALL, - MAP_PRIVATE | MAP_FIXED, OBJT_VNODE, vp, file_offset); - if (error) - goto cleanup; - vm_map_lock(map); - if (!vm_map_lookup_entry(map, vmaddr, &entry)) { - vm_map_unlock(map); - error = EDOOFUS; - goto cleanup; - } - entry->eflags |= MAP_ENTRY_VN_EXEC; - vm_map_unlock(map); - textset = false; - } - - if (bss_size != 0) { - /* Calculate BSS start address */ - vmaddr = trunc_page(a_out->a_entry) + a_out->a_text + - a_out->a_data; - - /* allocate some 'anon' space */ - error = vm_map_find(&td->td_proc->p_vmspace->vm_map, NULL, 0, - &vmaddr, bss_size, 0, VMFS_NO_SPACE, VM_PROT_ALL, - VM_PROT_ALL, 0); - if (error) - goto cleanup; - } - -cleanup: - if (opened) { - if (locked) - VOP_UNLOCK(vp); - locked = false; - VOP_CLOSE(vp, FREAD, td->td_ucred, td); - } - if (textset) { - if (!locked) { - locked = true; - VOP_LOCK(vp, LK_SHARED | LK_RETRY); - } - VOP_UNSET_TEXT_CHECKED(vp); - } - if (locked) - VOP_UNLOCK(vp); - - /* Release the temporary mapping. */ - if (a_out) - kmap_free_wakeup(exec_map, (vm_offset_t)a_out, PAGE_SIZE); - - return (error); -} - -#endif /* __i386__ */ - #ifdef LINUX_LEGACY_SYSCALLS int linux_select(struct thread *td, struct linux_select_args *args) diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index fb42c3e9df84..45aad4935613 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -31,15 +31,18 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include #include #include #include +#include #include #include #include +#include #include #include #include @@ -49,8 +52,12 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include +#include + #include #include #include @@ -58,7 +65,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include +#include #include @@ -701,3 +711,253 @@ bsd_to_linux_regset(const struct reg *b_reg, l_regset->esp = b_reg->r_esp; l_regset->ss = b_reg->r_ss; } + +int +linux_uselib(struct thread *td, struct linux_uselib_args *args) +{ + struct nameidata ni; + struct vnode *vp; + struct exec *a_out; + vm_map_t map; + vm_map_entry_t entry; + struct vattr attr; + vm_offset_t vmaddr; + unsigned long file_offset; + unsigned long bss_size; + char *library; + ssize_t aresid; + int error; + bool locked, opened, textset; + + a_out = NULL; + vp = NULL; + locked = false; + textset = false; + opened = false; + + if (!LUSECONVPATH(td)) { + NDINIT(&ni, LOOKUP, ISOPEN | FOLLOW | LOCKLEAF | AUDITVNODE1, + UIO_USERSPACE, args->library, td); + error = namei(&ni); + } else { + LCONVPATHEXIST(args->library, &library); + NDINIT(&ni, LOOKUP, ISOPEN | FOLLOW | LOCKLEAF | AUDITVNODE1, + UIO_SYSSPACE, library, td); + error = namei(&ni); + LFREEPATH(library); + } + if (error) + goto cleanup; + + vp = ni.ni_vp; + NDFREE(&ni, NDF_ONLY_PNBUF); + + /* + * From here on down, we have a locked vnode that must be unlocked. + * XXX: The code below largely duplicates exec_check_permissions(). + */ + locked = true; + + /* Executable? */ + error = VOP_GETATTR(vp, &attr, td->td_ucred); + if (error) + goto cleanup; + + if ((vp->v_mount->mnt_flag & MNT_NOEXEC) || + ((attr.va_mode & 0111) == 0) || (attr.va_type != VREG)) { + /* EACCESS is what exec(2) returns. */ + error = ENOEXEC; + goto cleanup; + } + + /* Sensible size? */ + if (attr.va_size == 0) { + error = ENOEXEC; + goto cleanup; + } + + /* Can we access it? */ + error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td); + if (error) + goto cleanup; + + /* + * XXX: This should use vn_open() so that it is properly authorized, + * and to reduce code redundancy all over the place here. + * XXX: Not really, it duplicates far more of exec_check_permissions() + * than vn_open(). + */ +#ifdef MAC + error = mac_vnode_check_open(td->td_ucred, vp, VREAD); + if (error) + goto cleanup; +#endif + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, NULL); + if (error) + goto cleanup; + opened = true; + + /* Pull in executable header into exec_map */ + error = vm_mmap(exec_map, (vm_offset_t *)&a_out, PAGE_SIZE, + VM_PROT_READ, VM_PROT_READ, 0, OBJT_VNODE, vp, 0); + if (error) + goto cleanup; + + /* Is it a Linux binary ? */ + if (((a_out->a_magic >> 16) & 0xff) != 0x64) { + error = ENOEXEC; + goto cleanup; + } + + /* + * While we are here, we should REALLY do some more checks + */ + + /* Set file/virtual offset based on a.out variant. */ + switch ((int)(a_out->a_magic & 0xffff)) { + case 0413: /* ZMAGIC */ + file_offset = 1024; + break; + case 0314: /* QMAGIC */ + file_offset = 0; + break; + default: + error = ENOEXEC; + goto cleanup; + } + + bss_size = round_page(a_out->a_bss); + + /* Check various fields in header for validity/bounds. */ + if (a_out->a_text & PAGE_MASK || a_out->a_data & PAGE_MASK) { + error = ENOEXEC; + goto cleanup; + } + + /* text + data can't exceed file size */ + if (a_out->a_data + a_out->a_text > attr.va_size) { + error = EFAULT; + goto cleanup; + } + + /* + * text/data/bss must not exceed limits + * XXX - this is not complete. it should check current usage PLUS + * the resources needed by this library. + */ + PROC_LOCK(td->td_proc); + if (a_out->a_text > maxtsiz || + a_out->a_data + bss_size > lim_cur_proc(td->td_proc, RLIMIT_DATA) || + racct_set(td->td_proc, RACCT_DATA, a_out->a_data + + bss_size) != 0) { + PROC_UNLOCK(td->td_proc); + error = ENOMEM; + goto cleanup; + } + PROC_UNLOCK(td->td_proc); + + /* + * Prevent more writers. + */ + error = VOP_SET_TEXT(vp); + if (error != 0) + goto cleanup; + textset = true; + + /* + * Lock no longer needed + */ + locked = false; + VOP_UNLOCK(vp); + + /* + * Check if file_offset page aligned. Currently we cannot handle + * misalinged file offsets, and so we read in the entire image + * (what a waste). + */ + if (file_offset & PAGE_MASK) { + /* Map text+data read/write/execute */ + + /* a_entry is the load address and is page aligned */ + vmaddr = trunc_page(a_out->a_entry); + + /* get anon user mapping, read+write+execute */ + error = vm_map_find(&td->td_proc->p_vmspace->vm_map, NULL, 0, + &vmaddr, a_out->a_text + a_out->a_data, 0, VMFS_NO_SPACE, + VM_PROT_ALL, VM_PROT_ALL, 0); + if (error) + goto cleanup; + + error = vn_rdwr(UIO_READ, vp, (void *)vmaddr, file_offset, + a_out->a_text + a_out->a_data, UIO_USERSPACE, 0, + td->td_ucred, NOCRED, &aresid, td); + if (error != 0) + goto cleanup; + if (aresid != 0) { + error = ENOEXEC; + goto cleanup; + } + } else { + /* + * for QMAGIC, a_entry is 20 bytes beyond the load address + * to skip the executable header + */ + vmaddr = trunc_page(a_out->a_entry); + + /* + * Map it all into the process's space as a single + * copy-on-write "data" segment. + */ + map = &td->td_proc->p_vmspace->vm_map; + error = vm_mmap(map, &vmaddr, + a_out->a_text + a_out->a_data, VM_PROT_ALL, VM_PROT_ALL, + MAP_PRIVATE | MAP_FIXED, OBJT_VNODE, vp, file_offset); + if (error) + goto cleanup; + vm_map_lock(map); + if (!vm_map_lookup_entry(map, vmaddr, &entry)) { + vm_map_unlock(map); + error = EDOOFUS; + goto cleanup; + } + entry->eflags |= MAP_ENTRY_VN_EXEC; + vm_map_unlock(map); + textset = false; + } + + if (bss_size != 0) { + /* Calculate BSS start address */ + vmaddr = trunc_page(a_out->a_entry) + a_out->a_text + + a_out->a_data; + + /* allocate some 'anon' space */ + error = vm_map_find(&td->td_proc->p_vmspace->vm_map, NULL, 0, + &vmaddr, bss_size, 0, VMFS_NO_SPACE, VM_PROT_ALL, + VM_PROT_ALL, 0); + if (error) + goto cleanup; + } + +cleanup: + if (opened) { + if (locked) + VOP_UNLOCK(vp); + locked = false; + VOP_CLOSE(vp, FREAD, td->td_ucred, td); + } + if (textset) { + if (!locked) { + locked = true; + VOP_LOCK(vp, LK_SHARED | LK_RETRY); + } + VOP_UNSET_TEXT_CHECKED(vp); + } + if (locked) + VOP_UNLOCK(vp); + + /* Release the temporary mapping. */ + if (a_out) + kmap_free_wakeup(exec_map, (vm_offset_t)a_out, PAGE_SIZE); + + return (error); +} From nobody Wed Mar 1 08:43:08 2023 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 4PRSRw49cJz3vbk3; Wed, 1 Mar 2023 08:43:08 +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 4PRSRw3X21z45Yh; Wed, 1 Mar 2023 08:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660188; 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=8tMeRTOOygfIQmc2FbFVP0S2y2UR5NzJvQl6D5hmBuM=; b=KiodDEYanlg0aH2LGontqyyBvG8W5xXoiena8wiAzoJlVOgz9PLKMmqKnkDYCHi0DVo0We dU4G4sPwYbneJyEeLcktN8GiZq/iE1vu7yeeBVAwfPFhj5xPahb6CNr+EG51AQRqRkO/Nb IiPKBhQz2gM2gTr0VFREmYOCvGaT8JWv3EE40tOW5lY7vztPrYgAm34I0Vqq9geZkTrUxS eRR2kdLo1FydOgvCygAGGO9L6VhJ20/vnjKTQdMOHZOKq1fXtbE0vwRbVPmM+OfFz8tNSj w/RV9EGwdwJA8A2CNrJ9n5DRrfSSyn80FQOZPVvsOPkve7Fr8bP4oFymgNR4Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660188; 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=8tMeRTOOygfIQmc2FbFVP0S2y2UR5NzJvQl6D5hmBuM=; b=jpdxZR+QALIEwlp7N02XMT1Uj2acuAc+axHOXN/lE1ZxLF3VQDCQ19DcyTpMrb0SDNL08U 7LCMQQ7FxKdjEv+7rO01hm6d9H31KmCxNdzxSNsh1qiKIaHvsFVmgGN1yMIEVP7SbTKcMb GPEUthF1WtIxbgPqE3Bc7nz73OZXHU9KVHRHLCS4TyYZuu4svRtZdsO4LFIc5l5BP02gk9 td/ml9DeOhDB6DZu8FjMBh/2m16Dwhi5Qub6CtTgiEEoe/v5H0Sd0ReuHg+ndvOJX7IDFe w25upOZgFrysY+33hqjIqskSuTwNMhoqTJ5I57amkR916XstMCnRjdbLFvE0PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660188; a=rsa-sha256; cv=none; b=KHgT6VyfFbVTi3JsyWKLRdOL6K2guA+QYQP3OazN1LZ070uZ2p7q27cvRBdrN1g8cTN4E4 LGoay7yWHmahcGp3/On2IsUJF+mq+A4ds84GG9/BCB5aayOGrasJcTKLUCx7i3eJvnAMjj WHAmMbtj5jW+bjdf6j37eyRIwRLoYryd8AYgD43Rr6G5ZDF7DV9iCMY/D3w0I6A5K/ADfT 1FAVtSrf23jRSJ5SUfutteN0MzfAHZcpaTyuhrWvMYe2+zJKdhF08o5virmIozzVL+z/7Y UMRVG9he0XYci17ginUQMBBFvXiWYrVBpPS6G28UTOuB8HoAOrUHUeiXSGXLlA== 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 4PRSRw2f0lzSKh; Wed, 1 Mar 2023 08:43:08 +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 3218h8hC028467; Wed, 1 Mar 2023 08:43:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218h8Mv028466; Wed, 1 Mar 2023 08:43:08 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:08 GMT Message-Id: <202303010843.3218h8Mv028466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 56c33d2da3b9 - stable/13 - linux(4): Cleanup sys/uio.h where linux_uitl.h is included 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 56c33d2da3b99df4587097cbd6748c508bf7cca3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=56c33d2da3b99df4587097cbd6748c508bf7cca3 commit 56c33d2da3b99df4587097cbd6748c508bf7cca3 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:34 +0000 linux(4): Cleanup sys/uio.h where linux_uitl.h is included MFC after: 2 weeks (cherry picked from commit acbbd5c0393345f13aa4b902e2c1ac83b7e39b59) --- sys/compat/linux/linux_ioctl.c | 1 - sys/compat/linux/linux_misc.c | 1 - sys/compat/linux/linux_socket.c | 1 - 3 files changed, 3 deletions(-) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index cd739522c496..726127ed698f 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 4dba124a918f..562b2f3170a7 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index c828be1598a1..cb3b63c9d539 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include From nobody Wed Mar 1 08:43:09 2023 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 4PRSRx73JGz3vbpt; Wed, 1 Mar 2023 08:43:09 +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 4PRSRx4KZBz45gB; Wed, 1 Mar 2023 08:43:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660189; 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=YGL9Esm5mdFJwqzl4p5q7axnSJQxMPkxUWhZ+axqj5U=; b=eMe6swxdo4Um2vepzfWswwV+pCuLVQaHGReKV1RnxzSG7pGPvflaAwCu1Q5Bx/ip/y6B9Y jl5Q7ZJ0CECFfWAP28QdgHNldmNd0PiwYkWWMkbFh7HHqP9NBJaH/5FjExz+QTN0JoGFzs sYyErM7i/8O7pap/NAv4VdvWd1aglFQTLBnY9Sw34EOjIX4c17y9b0RjXboR3EcYbCz1tr rVC2bnc0Df55+3Y7j4M3Mn6H33gL2ZVPcm3VGiR1lZHVkuhlFMwDKwBIfVNtEaG6X5j/s9 /zrXfqlp48JkobGcYwIFQLFXzMIJG8rmJAmrz0tKNukooB+AD2hVcgo7qZ8xyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660189; 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=YGL9Esm5mdFJwqzl4p5q7axnSJQxMPkxUWhZ+axqj5U=; b=WbvmHZHaMmo3cz9n4G4MmE3O6rLh/euOXPLBZn0QWpFG47pnyfdhCNv5Y07VU62zo1Squv VfNYP5nm35xcgiRz185iHBSx9+c1ptVZyGWW5xboGr0APunvixLjqT/zlU0aXDEPRrO+TC sxsm6q5McLX6T8lC27l5r0LLBS/W44U85fAUuHV/VeWTr8EwnhqiRk0QyVppxsYZmumBBs osglKQwshOcwZc/ek5RpdVym0QQzaxhHUYLn7Q/jDWjbxlH2olBn88AuIwpA6ivBtNqb6z NqTcPrZ16tQO/MyseeTb4va3TOnCG/UB6m0zqXyzLMCk9Dltd5sFxJIwlwaOQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660189; a=rsa-sha256; cv=none; b=CAhaaYqBuBx9jFXHh8todCtPov0GlWRWhm/dnLpivHh2ZNRXcyr43QKU614YmhMZQOrc6h 5x9s5gk7jtfo6K2vu76N7hbDhcuBqVuUt2kQQe60jEgfaw/E03wxMrNN2sN9fSmnmAK5X3 SCnp5fWdy+XiEVkshSKLTkf6n7KJ31K1+JWCULEJNKwW0icu4zNuIJD8zHecbfK/4GgPdj /dIua/4BVe7nghQi7oJRQpskWlhYfRJ1gTB8hDqR7jxvjm0e5w/5ypcaoG4UYi5fK7TtXl xz/RiHIhw7u7wAdtlP74Z/PR0cgtZhD7u/ajOQCp5fWXdJjTA+5/1lndxGPpeQ== 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 4PRSRx3P1CzSRn; Wed, 1 Mar 2023 08:43:09 +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 3218h953028486; Wed, 1 Mar 2023 08:43:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218h9AV028485; Wed, 1 Mar 2023 08:43:09 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:09 GMT Message-Id: <202303010843.3218h9AV028485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 97d640a2b48e - stable/13 - linux(4): Fix brackets of local include opt_inet6 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 97d640a2b48e5b8232215ce2857b34ff1de2bc66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=97d640a2b48e5b8232215ce2857b34ff1de2bc66 commit 97d640a2b48e5b8232215ce2857b34ff1de2bc66 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:34 +0000 linux(4): Fix brackets of local include opt_inet6 MFC after: 2 weeks (cherry picked from commit 77f66834b059ae8327b731a19794788eed59178c) --- sys/compat/linux/linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 41297d549c26..54e5e40289fe 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -26,7 +26,7 @@ #include __FBSDID("$FreeBSD$"); -#include +#include "opt_inet6.h" #include #include From nobody Wed Mar 1 08:43:10 2023 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 4PRSRz0KDQz3vbq0; Wed, 1 Mar 2023 08:43:11 +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 4PRSRy5STgz45yR; Wed, 1 Mar 2023 08:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660190; 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=Wf0oumaDKiN7okz59evlSELUfr7Mcwacw4k44D0y3Lg=; b=tHS9puS/rARN2IqpmTO599DgCm7+zTGRo7c34rIRTeypYQ6nfRrRH9BRYYbW9vRvfV9xkb 4xfxqA6eiYJOVwp3zKwWh+BOinO9gJU1OAyCFkIGMWLfegmpYlfsiNxiZm9l+RLXsV61Hv YQE1sA4V90LsPd5pg16gveJneDfq+ahXAjRmU8+gHjIld2xk7egtjmu1hhXS1+HWDN07SU GTVw9MYQ7aYpRTIjoS0OnzKb3/JcWt8e1TYcKnmuM+TcUyQNXWszAD5bA+zvBkcvqGUzBL wexaHt4GOcAagmhZZinm15a6dObgUrhN4vBZRkCAsFPSQWuVw+lLZx2ZFwITag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660190; 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=Wf0oumaDKiN7okz59evlSELUfr7Mcwacw4k44D0y3Lg=; b=A0xDdQMmOG86F/tRP86x7IUwFtIydVXZ6ROrAkQ8ZN4D6IJo4dhHIGzLZbbpmLQvJz/g82 e6rPm9C5A8zR8G32/d2l1uV1hizlP2WWf1s0Ubn/nnl/FvIzVSo6hY8hINyc89MEgx0oCx OHncbFqWusLx9xiaDpy65njUv1YUekVnyWC7PjAl58c3ZEEATZRKkMpU5qSFKPDcvMZwaz OxqaNjrI6L7l3Vkz5+eAaBtDmpr7ighLU8d+3NsQN89pkgGc1DtoTLAd3x+mYeyyd2zw/8 0s+bAq/PMsd6hsTO8fyIOrUBTvLkRdVJseMof8oJgjOcn6JoJpEJ7RoOGwL8nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660190; a=rsa-sha256; cv=none; b=dnIEeUoqhcQymnxfTCMTEE/2IhnqIG/EjwkgSLOTEmArcZBBEiDlYkLrWLPtyytX0RidXZ Ev5iJE/3ZoGknNmyjVIE+IzO3IF00yWgIllu9n+89/JebrTN8P47OMdZBkZpSk7smjqi1t bripdeYbPyVpxS5FcspkkJC79wD6dJVN3ufP7aO9gxjb0ZHPniFgyB6p25gp4IpFdcXSFA W6N3q1bq58euLdOEUWkw2+EEaVJF465fPYqqP3B6X9TIqfWhDynI36iaqSlOzcirKKijzb bIM84lREWXlzDp6McgMuNXm5XKnvv52MlRbS5SBu1KJ3WZ9ZQB4RCBy5Lq3tSg== 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 4PRSRy4Q7bzSKk; Wed, 1 Mar 2023 08:43:10 +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 3218hABI028505; Wed, 1 Mar 2023 08:43:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218hAaW028504; Wed, 1 Mar 2023 08:43:10 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:10 GMT Message-Id: <202303010843.3218hAaW028504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 9e963bd8e7b7 - stable/13 - linux(4): Cleanup sys/sysctl.h from linux_misc.h 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9e963bd8e7b71010e88b7be38158d6acaa2c4c9f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=9e963bd8e7b71010e88b7be38158d6acaa2c4c9f commit 9e963bd8e7b71010e88b7be38158d6acaa2c4c9f Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:34 +0000 linux(4): Cleanup sys/sysctl.h from linux_misc.h Leftover after c5156c77 (r374538). MFC after: 2 weeks (cherry picked from commit e2028292e54a4541d1e80159c78516a0b3332e0c) --- sys/compat/linux/linux_misc.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h index 7a8073539e87..96fcfcbf52b9 100644 --- a/sys/compat/linux/linux_misc.h +++ b/sys/compat/linux/linux_misc.h @@ -31,8 +31,6 @@ #ifndef _LINUX_MISC_H_ #define _LINUX_MISC_H_ -#include - #define LINUX_MAX_PID_NS_LEVEL 32 /* bits per mask */ From nobody Wed Mar 1 08:43:11 2023 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 4PRSRz6MyNz3vbsR; Wed, 1 Mar 2023 08:43:11 +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 4PRSRz67q9z4600; Wed, 1 Mar 2023 08:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660191; 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=gNsmG/JY6G2Vq9FqxYFZJ9kLbsHC48KdnkOT+0lA2ig=; b=ZcyIiDZh+nemJxSs/71JXVDU0tDVWSisofCQaUrSTxWNnb6ZB75kQRBPosLpj8PPE8ivIM w+eGRj5VDr7VAyzw1SxDi8cmQVw4ohQUVf4heoWNUe/hCsejYLSqRHk3DHmx3EQIQDCPsZ EXD1U0Fl80CG88m23zp/W9+8tQ09oHOoHvdj8hXJhiybAu3rzHNtKevs9mFBemQ5zL20Ev 5RO2CVJjW6Pt1e6aoGjL6/AbDqsWW4FurkDoXV75zOac0RK/yGUdAcEUsxWcxN/kBYXmcJ bDovWaj330dHCWgKBZuzGUCVdFtyq5hqYJHVz+p/D+caZ+QOFEcRy53uksaGfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660191; 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=gNsmG/JY6G2Vq9FqxYFZJ9kLbsHC48KdnkOT+0lA2ig=; b=ZktVUPJ7HakpuXFKIwh8D5uCwsHP88D3UJQuAURCZSHwjkhCMbIWF/0iNAKNUEUDksLedW Ycz+VDI4KHU1iyqHBOLdUUSJetPhYY9C8mhidor+fJawfBJybtU9QsolVac9fRw3jQsCjM T1AhlWFCiVygCliQ21xmVR6EWtsz7uc/X2vIBDPwibyHdFIIXS6qySsuIzKZoGZJRez4vO +a1mLolcaVGm7ASzdYgdVyzlci2lo/ExNa9nt48iaZAk3XtCFsEtCvZ2MK51D6mfFuZdo0 PTjCkhY/uxWrSZt+me7PIbHEugHFo1oceikTd4S307EBVXomkfvZ5P0XoTNqJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660191; a=rsa-sha256; cv=none; b=puNXmSh4Bl+Cmg1DT04F+mtS39DcwgXAHMa6zj1AyrD+kvZAx4cIg/ZIFUXWyxOrQEKb3/ cFy7E8cTydpjQm5YMZp06Phrk+8pLt6of/L+WNeyDlx1zuxg7fvpcVH7aUsjoJ7hjaec/e I/YhH+rvVnUfHRi7vGquii4q1zjtcUp1CzAydNUPDix4403idW0eoAizX+3aM0veLzpMZX fCJOafsl+hheObPM491wldQ4h7qmVg/6TsZf0zZ0Wdhe85sPBUzlJocvV9imYykZndKD8F zfotPxlitWzi3WFk1M/9u7S/LRpMbXJX5DGNrXtujzSV8dlnB01zK9TXmYDwtg== 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 4PRSRz57bzzSGk; Wed, 1 Mar 2023 08:43:11 +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 3218hBIm028524; Wed, 1 Mar 2023 08:43:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218hB7j028523; Wed, 1 Mar 2023 08:43:11 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:11 GMT Message-Id: <202303010843.3218hB7j028523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: dd082cbf8cd4 - stable/13 - linux(4): Cleanup includes under compat/linux 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd082cbf8cd4bcdf125657090ab424c808d51ff8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=dd082cbf8cd4bcdf125657090ab424c808d51ff8 commit dd082cbf8cd4bcdf125657090ab424c808d51ff8 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:34 +0000 linux(4): Cleanup includes under compat/linux Cleanup unneeded includes, sort the rest according to style(9). No functional changes. MFC after: 2 weeks (cherry picked from commit d8e53d94fae90cf3c83db5af0eaba0be0f55e00a) --- sys/compat/linux/linux.c | 1 - sys/compat/linux/linux_common.c | 4 ---- sys/compat/linux/linux_dummy.c | 3 +-- sys/compat/linux/linux_emul.c | 4 +--- sys/compat/linux/linux_errno.c | 2 +- sys/compat/linux/linux_event.c | 18 +++++++----------- sys/compat/linux/linux_file.c | 7 ------- sys/compat/linux/linux_fork.c | 3 --- sys/compat/linux/linux_futex.c | 3 ++- sys/compat/linux/linux_getcwd.c | 6 ++---- sys/compat/linux/linux_ioctl.c | 22 +++++----------------- sys/compat/linux/linux_ipc.c | 7 +++---- sys/compat/linux/linux_mib.c | 8 ++------ sys/compat/linux/linux_misc.c | 10 ---------- sys/compat/linux/linux_mmap.c | 3 +-- sys/compat/linux/linux_netlink.c | 6 +++++- sys/compat/linux/linux_signal.c | 3 +-- sys/compat/linux/linux_socket.c | 12 ++---------- sys/compat/linux/linux_stats.c | 11 +++-------- sys/compat/linux/linux_sysctl.c | 5 +---- sys/compat/linux/linux_time.c | 12 ++---------- sys/compat/linux/linux_timer.c | 4 +--- sys/compat/linux/linux_uid16.c | 5 +---- sys/compat/linux/linux_util.c | 5 ----- sys/compat/linux/linux_vdso.c | 6 ++---- 25 files changed, 43 insertions(+), 127 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 54e5e40289fe..8be1594730f7 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include -#include #include #include #include diff --git a/sys/compat/linux/linux_common.c b/sys/compat/linux/linux_common.c index 9762f16fd747..338b1a0b6989 100644 --- a/sys/compat/linux/linux_common.c +++ b/sys/compat/linux/linux_common.c @@ -28,17 +28,13 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include -#include #include #include #include #include -#include -#include #include #include diff --git a/sys/compat/linux/linux_dummy.c b/sys/compat/linux/linux_dummy.c index 6bfeeaf5c298..45b0db6d6dde 100644 --- a/sys/compat/linux/linux_dummy.c +++ b/sys/compat/linux/linux_dummy.c @@ -29,9 +29,8 @@ __FBSDID("$FreeBSD$"); #include -#include -#include #include +#include #include /* diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 08510fc29a3f..afe25f2cf035 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -32,17 +32,15 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include -#include #include #include #include #include -#include #include #include +#include #include #include diff --git a/sys/compat/linux/linux_errno.c b/sys/compat/linux/linux_errno.c index 69880db86319..a8a259fda15a 100644 --- a/sys/compat/linux/linux_errno.c +++ b/sys/compat/linux/linux_errno.c @@ -4,8 +4,8 @@ __FBSDID("$FreeBSD$"); #include -#include #include +#include #include #include diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index b6c90970a6dc..4a18881934ff 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -30,21 +30,17 @@ __FBSDID("$FreeBSD$"); #include -#include -#include -#include -#include -#include -#include #include #include -#include -#include +#include +#include +#include #include #include #include -#include -#include +#include +#include +#include #include #include #include @@ -52,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #ifdef COMPAT_LINUX32 #include diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 29a0afaeedda..db4b1151bc60 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -31,25 +31,18 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include #include #include #include #include -#include #include -#include -#include -#include #include #include #include #include #include #include -#include #include #include #include diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c index 7ea0f8c4225a..76c534f86f38 100644 --- a/sys/compat/linux/linux_fork.c +++ b/sys/compat/linux/linux_fork.c @@ -32,8 +32,6 @@ __FBSDID("$FreeBSD$"); #include -#include -#include #include #include #include @@ -45,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index aed6bbf94cee..af16ecfe53fe 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -30,15 +30,16 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include +#include #include #include #include #include #include +#include #include #ifdef COMPAT_LINUX32 diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 304a72d06588..1c893737f8a6 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -39,10 +39,9 @@ __FBSDID("$FreeBSD$"); #include -#include -#include -#include #include +#include +#include #ifdef COMPAT_LINUX32 #include @@ -52,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #endif #include -#include /* * Find pathname of process's current directory. diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 726127ed698f..b2bae8830e86 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -30,21 +30,12 @@ __FBSDID("$FreeBSD$"); #include -#include -#include -#ifdef COMPAT_LINUX32 -#include -#endif #include #include -#include -#include -#include #include -#include +#include +#include #include -#include -#include #include #include #include @@ -53,18 +44,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include -#include #include #include -#include -#include #include +#include +#include #include -#include -#include -#include #include #include diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index a72b0a9709b5..0791e1ad2cbe 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -30,16 +30,15 @@ __FBSDID("$FreeBSD$"); #include -#include -#include -#include -#include #include #include +#include #include #include #include +#include #include +#include #ifdef COMPAT_LINUX32 #include diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index ed1bdc528278..1ff82fc79289 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -30,15 +30,11 @@ __FBSDID("$FreeBSD$"); #include -#include -#include -#include -#include -#include +#include #include #include #include -#include +#include #include #include diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 562b2f3170a7..a4aa5903e3b9 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -33,16 +33,11 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include -#include #include #include -#include -#include -#include #include #include #include @@ -53,20 +48,15 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include #include #include #include #include -#include #include #include #include -#include -#include #include #include diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c index 6d91bb575a62..94d74f84b59a 100644 --- a/sys/compat/linux/linux_mmap.c +++ b/sys/compat/linux/linux_mmap.c @@ -34,9 +34,8 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #include -#include #include #include #include diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index 4fc962c7ea0b..9ae2b42a0dba 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -27,13 +27,17 @@ #include __FBSDID("$FreeBSD$"); + #include "opt_inet.h" #include "opt_inet6.h" + #include +#include +#include #include #include #include -#include +#include #include #include diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 26da86eba9f7..4bff891d4206 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -32,13 +32,12 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" #include -#include #include #include #include -#include #include #include +#include #include #include #ifdef KTRACE diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index cb3b63c9d539..528f32f7e163 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -32,23 +32,16 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include -#include -#include -#include #include -#include -#include #include #include -#include #include -#include #include +#include #include #include #include -#include -#include +#include #include #include @@ -57,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #ifdef INET6 diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 1049cb54748b..d00888e77e84 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -32,19 +32,14 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include -#include +#include #include -#include -#include +#include +#include #include #include -#include #include #include -#include -#include #ifdef COMPAT_LINUX32 #include diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index abf2c898902d..6c4d049821ec 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -30,15 +30,12 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include -#include -#include #include -#include #include +#include #ifdef COMPAT_LINUX32 #include diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index c35d257cd78c..102dc4fff4bd 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -38,21 +38,13 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp #endif #include -#include -#include -#include #include -#include +#include #include +#include #include -#include -#include -#include #include -#include #include -#include -#include #ifdef COMPAT_LINUX32 #include diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index 4b888eac7718..5f0f5b28e624 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -31,12 +31,10 @@ __FBSDID("$FreeBSD$"); #include -#include +#include #include #include -#include #include -#include #ifdef COMPAT_LINUX32 #include diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c index 149d75459bc8..e6ad3fb967fb 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -29,18 +29,15 @@ #include __FBSDID("$FreeBSD$"); -#include #include -#include +#include #include #include #include #include #include -#include #include #include -#include #ifdef COMPAT_LINUX32 #include diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index ad6ad8f26261..2a21fdc10bd7 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -40,14 +40,9 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include -#include #include -#include -#include #include #include diff --git a/sys/compat/linux/linux_vdso.c b/sys/compat/linux/linux_vdso.c index 9b013b0b7fe8..f711620fdb12 100644 --- a/sys/compat/linux/linux_vdso.c +++ b/sys/compat/linux/linux_vdso.c @@ -33,22 +33,20 @@ __FBSDID("$FreeBSD$"); #endif #include -#include #include #include -#include +#include #include #include -#include #include -#include #include #include #include #include #include #include +#include #include From nobody Wed Mar 1 08:43:12 2023 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 4PRSS10TsDz3vbgf; Wed, 1 Mar 2023 08:43:13 +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 4PRSS06sw6z467f; Wed, 1 Mar 2023 08:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660193; 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=fceyo4pg6/Udeho1GFX1NoUtxhs3e6WlvYQ+SPBO030=; b=F2gCeYY3/IAKvnob5dtMnryPLDicGqIxkqY11+6A1bxl+PgmuOYpg9tzllXgZQINOtXkpq ThHmGkObVx+MX4vbe+71BLwsBiUeXbCCUEmNbuG/Hlbbw53MMf7jHIMchPw9ttZp7MX0XX QwvPsJRM9kwBEQrasfm8h0UurMFQ/T3FiszTAUemY2RdlMB5asIe8uLbX9ATVbC/HovjMn Mn5h3b8DoIpbmSLMk34iS67e4EsMaHi1+wWWWt9cUC6qod8sc1J+EvMbhWOBE9RI3ElpHL CRmAbPljPaB+Uw9TUDbqv23vQCg4n/jTYPT05iZp2Ga+Si5vgSKImyAqv2sK5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660193; 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=fceyo4pg6/Udeho1GFX1NoUtxhs3e6WlvYQ+SPBO030=; b=UzVDe52nMhcQ499tW40775gR4ONEzMi9jAL/dgJHZu9YHnqvJut6W/JZ4BSQJ1OupMVlAX PqcDEBdKKLHVeHHWOKsmOuyZ1RnsNqXdxncXjozpkODjEijp0PPv51gkTO6uauNfp2RnPW YbAMk0FeAfkJDX0E/cDb+SLy/hDsOfNW8pZLg/FKURzF0wxWJbF/179k7nhGYsX62sQrsd iXWmZb6CQNrjKAgHf1Vsk9LBENAaLwbC5MXS0GDVAZ7oF79KSUlCqb3kb2TrukFfaV7PSI 0CKu8KxE3SsdfLSRp1J/EHG2Ioifor9+lRd6qMIOjpkJCZWtAVXxb8vdzCjLyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660193; a=rsa-sha256; cv=none; b=vfPUwnWqRgBGA5OxdLRQZb0Bmno15raeMy2IywDxpjogtsXDIj37u50l8qjte3taEn12Z2 Ef79c7d39IfIDpTt6Jz6MsePxQjdKe36Wq91F3vbjjvfyEUVeSrRJfKO+vNM7pd/pYeNhZ 0qRd9xLaTQlfCsmG3F95aTO26+2FwiQpRoHZeS+WTKW7kVC22GPIV/OsDsGq8erO8Cbi5A Nu1CQ30CQNOm7dN59mruspTp9u6if+ktK7e23PlX+2tw8etZnwCcVqE1BfP26pSZOCVDEz Cz+EOPa0Z7FCJg2TwKBw0AFVk93F8D4qVY8ltw0aHZosUcLx4BjdtyjgfaTuzQ== 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 4PRSS05tJmzSdk; Wed, 1 Mar 2023 08:43:12 +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 3218hCU1028549; Wed, 1 Mar 2023 08:43:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218hCRO028548; Wed, 1 Mar 2023 08:43:12 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:12 GMT Message-Id: <202303010843.3218hCRO028548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 2caa52c46ca1 - stable/13 - linux(4): Cleanup includes under i386/linux 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2caa52c46ca1dc337949fc30f24db7ae49c53e45 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2caa52c46ca1dc337949fc30f24db7ae49c53e45 commit 2caa52c46ca1dc337949fc30f24db7ae49c53e45 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:35 +0000 linux(4): Cleanup includes under i386/linux Cleanup unneeded includes, sort the rest according to style(9). No functional changes. MFC after: 2 weeks (cherry picked from commit f4a512a5f187d9139c04111784fe811572bc0ed6) --- sys/i386/linux/linux_copyout.c | 2 +- sys/i386/linux/linux_dummy_machdep.c | 3 +-- sys/i386/linux/linux_machdep.c | 17 ++++------------- sys/i386/linux/linux_sysvec.c | 10 +++------- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/sys/i386/linux/linux_copyout.c b/sys/i386/linux/linux_copyout.c index 3227d904a235..833d25b911c9 100644 --- a/sys/i386/linux/linux_copyout.c +++ b/sys/i386/linux/linux_copyout.c @@ -32,10 +32,10 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include + #include #include #include diff --git a/sys/i386/linux/linux_dummy_machdep.c b/sys/i386/linux/linux_dummy_machdep.c index 0e41a4b3fc56..7f29d2a6808c 100644 --- a/sys/i386/linux/linux_dummy_machdep.c +++ b/sys/i386/linux/linux_dummy_machdep.c @@ -31,9 +31,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include +#include #include #include diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 45aad4935613..898192efc99d 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -29,11 +29,11 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_posix.h" + #include -#include #include #include -#include #include #include #include @@ -41,32 +41,26 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include -#include -#include #include #include -#include -#include -#include #include -#include #include #include #include +#include /* needed for pcb definition in linux_set_thread_area */ #include #include #include #include #include -#include #include +#include #include #include @@ -82,9 +76,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* needed for pcb definition in linux_set_thread_area */ - -#include "opt_posix.h" struct l_descriptor { l_uint entry_number; diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index d8eee3f96a93..ce61cfdec205 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -32,31 +32,27 @@ __FBSDID("$FreeBSD$"); #define __ELF_WORD_SIZE 32 #include -#include #include #include #include #include #include #include +#include #include #include +#include #include #include -#include #include #include #include #include -#include -#include #include -#include +#include #include -#include #include -#include #include #include From nobody Wed Mar 1 08:43:13 2023 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 4PRSS22WSmz3vbc4; Wed, 1 Mar 2023 08:43:14 +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 4PRSS20VX8z460s; Wed, 1 Mar 2023 08:43:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660194; 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=/0eU3tRwLrbcmriH6E8di7XYvN53p9L8M9NQKlCaimc=; b=XgM69SLaH4GxadjxVzNs+jyPoAlMT7KN+blh9OzaQnmb3gOvi1OGjN7vnAE2rAJuhXowdx CNkPjKOUGyEfVETPc5y06r+tdVd+2C5XbbHtLRFFYWH1ri46l+SXWIbfaTIaOB+TKcrU3B wuCjtnot+4ku4QITQWvsIJCufoTihfeBPLL04cnQKJRY5jU6H112xOeP0kfGl6oh42dJ7t PlLsqmWEEfOBtfZiAx1SJz2DCzDQcMcPUAqHSDi6cIeuMBVsA0U/ZlBxuS4BF/19VLdY9g l5NHiQ89h1Jg1C2OXwT/VDk/C0Hukj/xPYLsxmvWXsvZxD6dyS5liP1vammaeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660194; 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=/0eU3tRwLrbcmriH6E8di7XYvN53p9L8M9NQKlCaimc=; b=j7p9y4dY4TGPktxIJ8CYE8yyLeb5YG0ov8j8WKNE/as8zhoxriKFrTZC6OoT98rHg9FLTp uod7XW7fHYKzjmrGl8aEjBhALHidgJVrZ6h3PjtcXFU9KkeSzWeAwGXBDmS2IJn+UUFh2E Yb+REFLABblQzuID/t8axQ2aznQlyN74oBl1L5G0Bbs9rdPs2+S7+pJZGHt0rhZOKoqPrL QGxDQkcT+t5Zg2+GNRDr1hr3rbuNjSPg8GRU2EeavZu80uJbcKqSWRVieuvo+UCnSZ2/zy 3I2UcxLmyE5P5q4oq+i2Pj11J0lQzcph8YzQkF5V+SBgSQbOVZvfnpgjpdeuSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660194; a=rsa-sha256; cv=none; b=NQhmc88euuA8+pBA4cahi3vFP10nR6aFv54CHNr9e0/7XTtOco8J9vVXI/VcU5BlvP0t+b v4hyflfFHoNpYeWOm4XWKncAq36N9MkvvkW36pjxKJP5OMFZLKpGD5/xCQF6O55Vdklkei U9qPvlXogNAv0qReRbW0HRvCz2cCSCNT7GVhkSNcUIxhIJb4jBARWFi1V01RPdLzCXnqaL riN00ez+xLlmJJjnUbTq8uTfCl4D01/CQDFgDqaxCqiHVxiDBcWzo8FLZFy16o4M2ynIv9 mCVZxygc4Xl2psvLCf1VoFvMebhOlGLL72BkLYX3nQ3aULUIgiOqAFJx/UfuAQ== 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 4PRSS16jv2zRht; Wed, 1 Mar 2023 08:43:13 +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 3218hD5X028568; Wed, 1 Mar 2023 08:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218hDqP028567; Wed, 1 Mar 2023 08:43:13 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:13 GMT Message-Id: <202303010843.3218hDqP028567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: bfda8d0651ed - stable/13 - linux(4): Cleanup includes under amd64/linux 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bfda8d0651eddd4d22cc0b53419c20a3ae55596e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bfda8d0651eddd4d22cc0b53419c20a3ae55596e commit bfda8d0651eddd4d22cc0b53419c20a3ae55596e Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:35 +0000 linux(4): Cleanup includes under amd64/linux Cleanup unneeded includes, sort the rest according to style(9). No functional changes. MFC after: 2 weeks (cherry picked from commit 2456a45929328ce73a40ef6577600b0f1e2cced6) --- sys/amd64/linux/linux_dummy_machdep.c | 3 +-- sys/amd64/linux/linux_genassym.c | 2 +- sys/amd64/linux/linux_machdep.c | 21 +-------------------- sys/amd64/linux/linux_sysvec.c | 12 +----------- sys/amd64/linux32/linux32_dummy_machdep.c | 3 +-- sys/amd64/linux32/linux32_genassym.c | 2 +- sys/amd64/linux32/linux32_machdep.c | 11 ----------- sys/amd64/linux32/linux32_sysvec.c | 11 +---------- 8 files changed, 7 insertions(+), 58 deletions(-) diff --git a/sys/amd64/linux/linux_dummy_machdep.c b/sys/amd64/linux/linux_dummy_machdep.c index 3ce407af291c..ed148a5a6500 100644 --- a/sys/amd64/linux/linux_dummy_machdep.c +++ b/sys/amd64/linux/linux_dummy_machdep.c @@ -30,9 +30,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include +#include #include #include diff --git a/sys/amd64/linux/linux_genassym.c b/sys/amd64/linux/linux_genassym.c index 14880afcc89b..70e1ae91eab9 100644 --- a/sys/amd64/linux/linux_genassym.c +++ b/sys/amd64/linux/linux_genassym.c @@ -2,8 +2,8 @@ __FBSDID("$FreeBSD$"); #include -#include #include +#include #include #include diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index ed905518fdf4..6c96dd496fdc 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -33,15 +33,8 @@ __FBSDID("$FreeBSD$"); #include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include #include #include #include @@ -49,15 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include #include @@ -85,13 +70,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include -#include #include #include -#include #include #define LINUX_ARCH_AMD64 0xc000003e diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 05dd618fa510..2ad1868db8d4 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -37,9 +37,7 @@ __FBSDID("$FreeBSD$"); #define __ELF_WORD_SIZE 64 #include -#include #include -#include #include #include #include @@ -49,23 +47,15 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include -#include #include #include #include -#include -#include -#include -#include #include -#include +#include #include -#include #include -#include #include #include diff --git a/sys/amd64/linux32/linux32_dummy_machdep.c b/sys/amd64/linux32/linux32_dummy_machdep.c index f3bd8717524a..bc7a3c0aa69b 100644 --- a/sys/amd64/linux32/linux32_dummy_machdep.c +++ b/sys/amd64/linux32/linux32_dummy_machdep.c @@ -31,9 +31,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include +#include #include #include diff --git a/sys/amd64/linux32/linux32_genassym.c b/sys/amd64/linux32/linux32_genassym.c index 4a87b5a423bc..323634b3001d 100644 --- a/sys/amd64/linux32/linux32_genassym.c +++ b/sys/amd64/linux32/linux32_genassym.c @@ -2,9 +2,9 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include -#include #include #include diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index 5599cbff2525..0bd398042c3f 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -34,27 +34,16 @@ __FBSDID("$FreeBSD$"); #include -#include -#include #include -#include #include -#include #include #include #include -#include #include #include #include #include -#include -#include #include -#include -#include -#include -#include #include #include diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 8afa0f848e62..a67f2166deb0 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #define __ELF_WORD_SIZE 32 #include -#include #include #include #include @@ -53,23 +52,15 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include -#include #include #include #include -#include -#include -#include -#include #include -#include +#include #include -#include #include -#include #include #include From nobody Wed Mar 1 08:43:15 2023 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 4PRSS333RHz3vbsg; Wed, 1 Mar 2023 08:43:15 +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 4PRSS31fwgz468F; Wed, 1 Mar 2023 08:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660195; 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=JiFTk337VBppSTs2ZIcl9VCggt13E8MGAiMFIoZVuNE=; b=nPyfCsV03Zi2ywOgYGqH7OV0bDygLB0pTSoYgLtl64Au8gooszSW8/WiLCQgzxfdV1+r5l YfugoM5bWJG0QcYP4PzP+tGLgX6LmTHALS/zq97ruDLH4ZLAJRScB3BIAP9ng8TyN3FbLy sds0BHh1O/mda3mtygOdtqxDVKqkuXeUF4HHYnr0KbrrJncLiPaId+ByYgOARGVBNWCfql nNy4Ih3KV+TIzT4Ft+0H3ru/+cvHnjQKQzXiUOPqFU4ncQUnZfS4Bfmz4GAtwdAYr8pc/6 CRYY2SuYjrC1X4bb/3R/+AECkO2y3GF40g/qryz/OzbAQKZP+cwM0DOMJpilvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660195; 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=JiFTk337VBppSTs2ZIcl9VCggt13E8MGAiMFIoZVuNE=; b=bJsPrjZQ129SnoJlWDIn4fGawFECl4AynJKafL44dg0m7KNIE6UOSVVcY0cdP0Op8pRbNn 24h0VlZRKLQttqhjpiqW1RreBMUqdOuONV9niJPJaOp2VGPHRIJEOcnbah5r9lRIJ6Mf9J wOpflYP1tqGyOvhyZYwslcw9W9PtsjMUZTGpsQoIE/kurlzfDvVMpzYTNGc818GYmNdmP1 ONmKZsfQIrFX8+/TsQQBvUoC7q7ftAD6vyJoh7U8BVMucK/2c5kLLOVxr4srgezbvTdaf/ oDPMqVXBP+GMU51c9FiqjiPxyMes2+yStSIdGSm7UrwkjHNW5mSCuDK/w55JIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660195; a=rsa-sha256; cv=none; b=kukH6Cj6cXyOCNulWdXEd0cGgoHc+G01cxWhCjieYUVNHBxa7k51AyEI5aKNpU476OwO1N lAJd/h4Y3ZW/I4WvBz4eMHpl6+iNOAsY793/vgcMhmFV1ViNsXdJp/1i45ubNsn/Lcbatx Jp7Hk3HtW6nEs/CQqnglHtRuRI7Yp9sUpw6TIr3Fd7d995Lk3ACOQEGSDRkQdeCJufbl6Q XOczYRMcE8iRQzccRwkUJDw79pTmFxG2DY+g4cs9QdEobMD9+8PjKkL2xyhBpSxQMA5rPC 7mNZpiytfTSGjTCiynllyHc2u4yF9syo768UbjFTsUrRFAaruRATshPAgmzNag== 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 4PRSS30mQ6zSDM; Wed, 1 Mar 2023 08:43:15 +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 3218hFUA028588; Wed, 1 Mar 2023 08:43:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218hFHT028587; Wed, 1 Mar 2023 08:43:15 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:15 GMT Message-Id: <202303010843.3218hFHT028587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 513957e11cfe - stable/13 - linux(4): Cleanup includes under x86/linux 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 513957e11cfedc6ecbc92790f08b4194e9491f4d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=513957e11cfedc6ecbc92790f08b4194e9491f4d commit 513957e11cfedc6ecbc92790f08b4194e9491f4d Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:33 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:35 +0000 linux(4): Cleanup includes under x86/linux Cleanup unneeded includes, sort the rest according to style(9). No functional changes. MFC after: 2 weeks (cherry picked from commit 496a9a4f60716b3ba236c3f20639da03fefe3a3f) --- sys/x86/linux/linux_dummy_x86.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/x86/linux/linux_dummy_x86.c b/sys/x86/linux/linux_dummy_x86.c index 54799c1f0df2..92905600742e 100644 --- a/sys/x86/linux/linux_dummy_x86.c +++ b/sys/x86/linux/linux_dummy_x86.c @@ -30,9 +30,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include +#include #ifdef COMPAT_LINUX32 #include From nobody Wed Mar 1 08:43:16 2023 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 4PRSS45268z3vc0D; Wed, 1 Mar 2023 08:43:16 +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 4PRSS42Z5zz45y6; Wed, 1 Mar 2023 08:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660196; 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=dMf/mun8INtcx7VKstPVVr+//c6dgcVO6It8klF9yas=; b=UymgwnjyMWV/Vv+EbxGM2nUJORt4rsdF50UVrKSSTU/DJzARYWcyDom4q+/2ybZ3ubDm39 bi0yRxjqJITTiCT6elOUhleDkdWzpzyddfHERgRB3Lz5JG/mFYsWneDD6qPHfOF3djxCKi V48gNFCYcIWu4bWUdC86RjroOAZAW8lfoUA5dgGbo/jyfJL1AjcWLflUT4r3pVTbVSR1g+ a4hql70idCXcV/nh+1tN/G3GIqyfT7Dr0TlMSQX7PtyIkRfP6X/qBX9ery//AAgdXrYZ6Q 4ZSOd6b/pPomO6FlcWc0/FoScgqtrEy6j+xSp5idTMFvXVMx95PwlhfnGsWQbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660196; 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=dMf/mun8INtcx7VKstPVVr+//c6dgcVO6It8klF9yas=; b=BjSvYmB7bnUVdwkewylTJ3ysUKuUeZn1qAvdjlpSeC4ELrpkgHkNdQFiaw/UIPiI/plxv6 BnjtsBnn7DXr2hi2rpo+CuvIypQ9VCB2wSe0ckp3n1xSRmmQB511pasEjTQoAMyRDnHz2k Eomxak45jIaUzRo/yFdxDsnoD1PItU8dxAV44lg370yBmbhDSYWiOtfktsAvY+wMXpWIXt fId5n9e4iuisYGRD2kTrB25uiuwzEMPPJOX0p7cQCbfqk1NJUp3Pe+8mGTroJa/cOZAPy/ Iwfh7VvsAgC3RmMy6DyK5itsbjm4lDwUieotG59L/zhaRpzH43R1ln3/oxi2xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660196; a=rsa-sha256; cv=none; b=TGJw5u0vT/+ympY0WwcDyDCGTkICoi2OJ7Jf6uvJJP53lsOvKBYsplDrWaBPc7MiCr8NUd fHDJ8HHqkupRKtrtDRerzbWCmcvBk1h859tWQ5bYZbE4UYbMw6ErICV1t92cs2BBpw4jg9 ZbdiRxX8MKRrdajnD3EYoUaC1/MUdb+xLZehR0kvrL8+03MAhEYZGiPAbJcUQtC17U8v2E 6A+/CI29xlNPMNToywA27NHNgAmQ/8zNQfjaFM3h/okF1+GSZ17NZLFmstox39/LhLZI9b YBPPzj+3x0OwOU5iKVEwmdppX1skMnaiZlGDdc2vNn4wKwE7FNsuBuSXyocggQ== 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 4PRSS41gjlzSKl; Wed, 1 Mar 2023 08:43:16 +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 3218hG4X028608; Wed, 1 Mar 2023 08:43:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218hGaC028607; Wed, 1 Mar 2023 08:43:16 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:16 GMT Message-Id: <202303010843.3218hGaC028607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 41e898d9f24b - stable/13 - linux(4): Cleanup includes under arm64/linux 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 41e898d9f24b8cdc7bb13fc4a510bfc7aec84c22 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=41e898d9f24b8cdc7bb13fc4a510bfc7aec84c22 commit 41e898d9f24b8cdc7bb13fc4a510bfc7aec84c22 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:33 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:35 +0000 linux(4): Cleanup includes under arm64/linux Cleanup unneeded includes, sort the rest according to style(9). No functional changes. MFC after: 2 weeks (cherry picked from commit 55d3e181fc10edb4810f33009b65342c3e23dd88) --- sys/arm64/linux/linux_dummy_machdep.c | 3 +-- sys/arm64/linux/linux_sysvec.c | 8 +------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/arm64/linux/linux_dummy_machdep.c b/sys/arm64/linux/linux_dummy_machdep.c index 40cab9baad10..571b9f0b2a4f 100644 --- a/sys/arm64/linux/linux_dummy_machdep.c +++ b/sys/arm64/linux/linux_dummy_machdep.c @@ -30,9 +30,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include #include +#include #include #include diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 0bd8d60dcd93..7e1e35e6bae3 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -32,8 +32,6 @@ __FBSDID("$FreeBSD$"); #define __ELF_WORD_SIZE 64 #include -#include -#include #include #include #include @@ -45,18 +43,14 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include -#include #include +#include #include -#include -#include #include -#include #include #include From nobody Wed Mar 1 08:43:17 2023 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 4PRSS566Kvz3vbqk; Wed, 1 Mar 2023 08:43:17 +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 4PRSS54TsCz466X; Wed, 1 Mar 2023 08:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660197; 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=/M9isRZCtMBZFKDQQybpxCSKJ9D50Eov1hfKCWFWZzU=; b=IglthLcjwb/9lsThVCcDDka0ZmROODYRrx4RKH719dVwKE+1VVascas/jjhTIgNK9seWmm zfGY8/w8v15peG6dGMucGlySm+qw9dGSAZ8UltnpUmUf75dth6R2fu+uHFc0ZoBK+sWC1e RkCkNq5hF+8Wct7kZQV9xIVTy0PulXHz/nxiMJfiGDduc47LBnU3VG2kIMpMNbOLvWa1hy hI+N0AFsna35lM5SLpyoF6p4Rk8+5BNgveDJRdL4LGsFnBgLD6NXgtd/rs34VfBVHGrMVQ /EiGjK9ILuka4YaR4Sp54t/s++36dKFHYjiY7XKiHrXbqn/0DdYPWYhPryUIXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660197; 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=/M9isRZCtMBZFKDQQybpxCSKJ9D50Eov1hfKCWFWZzU=; b=ZFuovvBxY0cKeY1G34NkQmhCZqvCjrYAE3zTILU3akTYLw+GYDOA+VZwp22UFNvuiVNxot chKh/zFQdcglhwU58+Sy1KDeIbSOufzjhgwPDa7+OHwo/I0CsNRn8uGxXnnmA2Bdq28rga R2q+hhFlxWkk7cVuwEbL+gs7se4yvjv4hg2X8Ul+NaHki9+zNgURz37BkoB28ijqWjMOZk gy6NhFICI+oOOn7OUF10KoaHEOBhHHbIa4bsljvcXmFR2xidczUZDP5gW5XteIUTD0Dr+O o9Qdv0ssv3sbzBsyL5+jFLMNxxpWy1rxOu/Wg6a5f+lxxkAh2qfb12+1khC37w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660197; a=rsa-sha256; cv=none; b=HHWSWAzi0Ax9caGWZx3wOQKGSAWVeV7YufFbNSBcHzH8l1FGubygorEU7CzUM5kYt3qcIz eeAygW/iN8GqBcmw+/SE+ZrdBOq3G1zkmxIghNjYEGn8fbA7dBud6jicBu6kSvXP25cyUb OjQMCTLBazzRGjLbIUJXEyZWY9z6RjsEZNf2i+0raqPMwc1BOBz1179/0IBrPTuHByFNzE 2B9nXqBTtRltd6va7ZoLJXPyC18HWlqjC6VL080VX63HlrErLy1ICSeG5/PToFehPdbdJa 9XhIcKvPzAyUeYvOU/ADJkpWFrmIATMxo/ISmyU16GzQ2t7He8sNkxcErF3tdA== 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 4PRSS52dzczSKm; Wed, 1 Mar 2023 08:43:17 +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 3218hH5t028627; Wed, 1 Mar 2023 08:43:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218hHpS028626; Wed, 1 Mar 2023 08:43:17 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:17 GMT Message-Id: <202303010843.3218hHpS028626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d41e592190fd - stable/13 - linux(4): Rename linux_timer.h to linux_time.h 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d41e592190fdd7ae643b0abbf28e3607c1ac25ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d41e592190fdd7ae643b0abbf28e3607c1ac25ab commit d41e592190fdd7ae643b0abbf28e3607c1ac25ab Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:33 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:35 +0000 linux(4): Rename linux_timer.h to linux_time.h To avoid confusing people, rename linux_timer.h to linux_time.h, as linux_timer.c is the implementation of timer syscalls only, while linux_time.c contains implementation of all stuff declared in linux_time.h. MFC after: 2 weeks (cherry picked from commit c8a79231a5a74fc4263ec3d18c6519a974efb529) --- lib/libsysdecode/linux.c | 2 +- lib/libsysdecode/mklinuxtables | 6 +++--- sys/amd64/linux/linux_vdso_gtod.c | 2 +- sys/amd64/linux32/linux32_vdso_gtod.c | 2 +- sys/arm64/linux/linux_vdso_gtod.c | 2 +- sys/compat/linux/linux_event.c | 2 +- sys/compat/linux/linux_futex.c | 2 +- sys/compat/linux/linux_ioctl.c | 2 +- sys/compat/linux/linux_ipc.c | 2 +- sys/compat/linux/linux_misc.c | 2 +- sys/compat/linux/linux_signal.c | 2 +- sys/compat/linux/linux_socket.c | 2 +- sys/compat/linux/linux_time.c | 2 +- sys/compat/linux/{linux_timer.h => linux_time.h} | 6 +++--- sys/compat/linux/linux_timer.c | 2 +- sys/i386/linux/linux_vdso_gtod.c | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/libsysdecode/linux.c b/lib/libsysdecode/linux.c index 76065ddf404e..4b6aab478a33 100644 --- a/lib/libsysdecode/linux.c +++ b/lib/libsysdecode/linux.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #define X(a,b) { a, #b }, #define XEND { 0, NULL } diff --git a/lib/libsysdecode/mklinuxtables b/lib/libsysdecode/mklinuxtables index bcd6ddb5f618..eebdadd03613 100644 --- a/lib/libsysdecode/mklinuxtables +++ b/lib/libsysdecode/mklinuxtables @@ -89,9 +89,9 @@ cat <<_EOF_ _EOF_ gen_table "atflags" "LINUX_AT_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_file.h" -gen_table "clockids" "LINUX_CLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_timer.h" -gen_table "clockflags" "LINUX_TIMER_[A-Z_]+[[:space:]]+0x[0-9]+" "compat/linux/linux_timer.h" -gen_table "clockcpuids" "LINUX_CPUCLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_timer.h" "_MASK|_MAX" +gen_table "clockids" "LINUX_CLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_time.h" +gen_table "clockflags" "LINUX_TIMER_[A-Z_]+[[:space:]]+0x[0-9]+" "compat/linux/linux_time.h" +gen_table "clockcpuids" "LINUX_CPUCLOCK_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_time.h" "_MASK|_MAX" gen_table "openflags" "LINUX_O_[A-Z_]+[[:space:]]+[0-9]+" "compat/linux/linux_file.h" "O_RDONLY|O_RDWR|O_WRONLY|O_ACCMODE" gen_table "sigprocmaskhow" "LINUX_SIG_[A-Z]+[[:space:]]+[0-9]+" "compat/linux/linux.h" diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c index 3d18b551e6fb..95e0ae145fa6 100644 --- a/sys/amd64/linux/linux_vdso_gtod.c +++ b/sys/amd64/linux/linux_vdso_gtod.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include /* The kernel fixup this at vDSO install */ uintptr_t *kern_timekeep_base = NULL; diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index 4f9892af3fa5..075b6f3af7f4 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include /* The kernel fixup this at vDSO install */ uintptr_t *kern_timekeep_base = NULL; diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c index 6fdff8335f5d..ff6fe56adbdf 100644 --- a/sys/arm64/linux/linux_vdso_gtod.c +++ b/sys/arm64/linux/linux_vdso_gtod.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include /* The kernel fixup this at vDSO install */ uintptr_t *kern_timekeep_base = NULL; diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 4a18881934ff..57b5a3ea8d3a 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include typedef uint64_t epoll_udata_t; diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index af16ecfe53fe..74f89e3d49fb 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #define FUTEX_SHARED 0x8 /* shared futex */ diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index b2bae8830e86..fd4afd3004be 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 0791e1ad2cbe..94c645adc099 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #endif #include #include -#include +#include #include /* diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index a4aa5903e3b9..bc62c6b24d2c 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include #include diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 4bff891d4206..5a3cb97c385f 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); #endif #include #include -#include +#include #include #include #include diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 528f32f7e163..0397fadb837d 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #define SECURITY_CONTEXT_STRING "unconfined" diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index 102dc4fff4bd..1a9f6cca22e0 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp #include #include -#include +#include #include /* DTrace init */ diff --git a/sys/compat/linux/linux_timer.h b/sys/compat/linux/linux_time.h similarity index 98% rename from sys/compat/linux/linux_timer.h rename to sys/compat/linux/linux_time.h index a01411cec847..55a3cd44cafa 100644 --- a/sys/compat/linux/linux_timer.h +++ b/sys/compat/linux/linux_time.h @@ -30,8 +30,8 @@ * $FreeBSD$ */ -#ifndef _LINUX_TIMER_H -#define _LINUX_TIMER_H +#ifndef _LINUX_TIME_H +#define _LINUX_TIME_H #ifndef __LINUX_ARCH_SIGEV_PREAMBLE_SIZE #define __LINUX_ARCH_SIGEV_PREAMBLE_SIZE \ @@ -141,4 +141,4 @@ int linux_to_native_itimerspec64(struct itimerspec *, int linux_to_native_timerflags(int *, int); -#endif /* _LINUX_TIMER_H */ +#endif /* _LINUX_TIME_H */ diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index 5f0f5b28e624..e2cef8347c22 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #endif -#include +#include static int linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig) diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c index 20f754bfaa17..f4f7472ce9d0 100644 --- a/sys/i386/linux/linux_vdso_gtod.c +++ b/sys/i386/linux/linux_vdso_gtod.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include /* The kernel fixup this at vDSO install */ uintptr_t *kern_timekeep_base = NULL; From nobody Wed Mar 1 08:43:18 2023 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 4PRSS64XCqz3vbcF; Wed, 1 Mar 2023 08:43:18 +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 4PRSS646NYz46QL; Wed, 1 Mar 2023 08:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660198; 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=D4o0Mz2jSkogFiTQY5z9LR1169LFVBKgUYFBjLDm+Vk=; b=Mk2FHnrBpdvP/RpJEywBurvMxs2F0NFuBVuIonsO6BymiHonw4TkY+vk95jB9V3iSiFXgV KIjin+zc1vZ0T/N85oo72quNDCFcAZ6J2LaU2gJd+AUHJqIf7nsvf3nAmJwAGubh6YRVBN 8Axco6xfJAsxSgrkhZl6dAzg/31u/rRHKeRZ/JmU9TQh9IPoh1AJoPHVuq8a2IHL8UbBt7 ue2EUQR5sOzg8bF2kXlFThgwHo3g1fERzK2jrLMyW/F1/OZmGS6/XU1qhDTFqXnn3Q+jpO Dkkku1YokCsuHXBbh2Gqx6UA1y6X91Ci7cEF4z35DtzFqKglMW/RCN4g5f9HyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677660198; 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=D4o0Mz2jSkogFiTQY5z9LR1169LFVBKgUYFBjLDm+Vk=; b=G0b3ifdU9FowgQ4p4OR8bVR87vTmg44+FZZbMXvMBSfpWP9dK6tDa5w2sNVx9AinrGI/gP j+gpcwMFb/N7HCgqsCfe63x4RPX25MWPAHkUtXtBkVEa5QvAOhz8CQTgvpuyij8aIpCnyM XVzl7hlnL+hpTUZVIXbO5d8OOhZQcZvZllruahxdYe8mJpnFdDrZjUxVoB5kmHrKf6d6pS T9JcQ7dXtx4V5V1p8WXuTuyLhuEwbwp9K6CrGBjy9778nu4JASNxL+9+aMkO7LXARlhQE7 3GgnyjWnZHBw2OVJshMTJVo4TrnhdcDvl2l38qegU+K5x4zMpnbcnWwdYGUQAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677660198; a=rsa-sha256; cv=none; b=jRxKcT66Cm5fEetxcICiPqo9RSPMiYfRnmriXib34B3ombgymyxXf1npquv7TMM18Pt64k jeHBLw7mfAA5K3aQf9AOZE1HXmXocP5r6pfM2PjO9zmmFQTsoq/1syGwEChOvQYur8D3Cv SO5TVeTdt0YRVTL0XdkoIXJIrb0g43rHu6R7yfLYf3MNtfTzmKzewxUB4/h+07Bq+j9uWL kstZSJmK6IJVgDWKkX34NnxAU0x+RETZ+A4SiPBh5ZR6aPwX2nWkAOrhzcJlHWO4Mc8QVc E7j9QX7QkhTa+kAc498P6T/FeZfplAadB41/r41+kXeTjAGU5W7ZKpd2+kp7lw== 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 4PRSS63CGHzScR; Wed, 1 Mar 2023 08:43:18 +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 3218hIXL028654; Wed, 1 Mar 2023 08:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3218hImF028653; Wed, 1 Mar 2023 08:43:18 GMT (envelope-from git) Date: Wed, 1 Mar 2023 08:43:18 GMT Message-Id: <202303010843.3218hImF028653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 1054a068aa97 - stable/13 - linux(4): Trim unused opt_usb.h from modules Makefiles 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1054a068aa97b663a464a3ff5d02d4f42d5657f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1054a068aa97b663a464a3ff5d02d4f42d5657f1 commit 1054a068aa97b663a464a3ff5d02d4f42d5657f1 Author: Dmitry Chagin AuthorDate: 2023-02-14 14:46:33 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 08:42:35 +0000 linux(4): Trim unused opt_usb.h from modules Makefiles MFC after: 2 weeks (cherry picked from commit 825fbd087e6150eaf601612a5e7468ddc808e004) --- sys/modules/linux/Makefile | 1 - sys/modules/linux64/Makefile | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index d23be5421b16..cbd49d4bd63b 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -37,7 +37,6 @@ SRCS= linux${SFX}_dummy_machdep.c \ opt_inet6.h \ opt_ktrace.h \ opt_posix.h \ - opt_usb.h \ bus_if.h \ device_if.h \ vnode_if.h diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index a9bb4d2e8f73..7a855a3a9da8 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -32,7 +32,6 @@ SRCS= linux_dummy_machdep.c \ opt_ktrace.h \ opt_inet6.h \ opt_posix.h \ - opt_usb.h \ bus_if.h \ device_if.h \ vnode_if.h \ From nobody Wed Mar 1 09:46:08 2023 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 4PRTrd06Rzz3vfdg; Wed, 1 Mar 2023 09:46:09 +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 4PRTrc6hh3z4GtY; Wed, 1 Mar 2023 09:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677663968; 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=EyWdogyp7D/hEHX2gVqf3lEPls4tgTvyv+32q8JDQZg=; b=J1zVKNooM1D8mj8GZBRLqcxtlcK9GX1MnpZq6Jx+66aZw+JOeYqoaxhd63W+RDe++PPlud yHZ04R77Sx8+T6wdFQmh9lDqG870OdwzmbbEu0vfJe7Y/C9KqNzymUnnJz74sBfA5Igrfg zxDnloJARl2RHX3FdHoXC+Oek42xvbCMKoJAcFmNSCZ32C84ScpRAVy0F4eimqt3aL0WwD GO1mp/Pc6+2RK0ldvFYinxf3nuDqZ7xvWKr2rIPIgvP/1Rpj7iaWcMHQRPTKKxxjT4XZMq F1rZztIqpHf4qbjRady4+DXlzqhl6QInem2/kvrDIIYq0LC/2oRAqQKNEn8rnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677663968; 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=EyWdogyp7D/hEHX2gVqf3lEPls4tgTvyv+32q8JDQZg=; b=Fh9pbxeEoYnKA6GLlMTQKk2vJmz54qd7+c/z0Fqaq5065T6WoHvCgPtCqjPk3fGF8Rv1xC LvkkK/NV2OW4f5NCV7Mw3MyDYA0gmzKwD9B+v7/39W425M2w57yHVsWpFdJhlNurJvnVNQ v7/iM5mepbTOTYXlfw8PjUEsD10cviUQeGVVcyCNtHWg7rBYHxCMKhr6q6d7rqY3KJkKGR C9lROgVeWjZpUsIAQFs6Td0zI6aG9d9Gcp7Fctp7XsLATdKhfiuzpMe7oXEpsNUoNvFqAn fJuI5e66Z4uHoDNKNXMhuMzyZmCcp8IUqlvtWCoDXfbVVQdfiqVtp3sK4rWU2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677663968; a=rsa-sha256; cv=none; b=QG49Jn1qY70jmw5/XTRaIFfF8MkUhhIeWS6c59PfimX4fKQ5wdYLtqmYlDMO/ps8WqKnac IPcTx51MbT8xwNWBIotADNeJ5bgm/m/0VSoxhHwLHJTYkvRDZqfR3jbLRCSb7NaCsyqRto aKFcJ+xmtprqazFLAPFmffPfF5nrLXEy1OYNMTbwogCmUKY12ppQV4wHg5LKu/sM5GPWYA vBgALKexoCcnT2jpv5TbcX8GaFje/eLHbrcVyQedKRZDprW9wnMbD3xqZMMcgWhYK7TkzC PA153Ft6Sb+HHVQjDrSp7P/4BzblhfP6RvETM78ZgMlJcRkbUEBEjXBG3dIKWg== 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 4PRTrc5lpJzTMR; Wed, 1 Mar 2023 09:46:08 +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 3219k82l027781; Wed, 1 Mar 2023 09:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3219k8FO027780; Wed, 1 Mar 2023 09:46:08 GMT (envelope-from git) Date: Wed, 1 Mar 2023 09:46:08 GMT Message-Id: <202303010946.3219k8FO027780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 867e8404efed - stable/13 - linprocfs(4): Fixup process size in the /proc/pid/stat file 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 867e8404efed7a33553646b89588831db1a2102b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=867e8404efed7a33553646b89588831db1a2102b commit 867e8404efed7a33553646b89588831db1a2102b Author: Dmitry Chagin AuthorDate: 2023-02-26 13:42:22 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-01 09:45:56 +0000 linprocfs(4): Fixup process size in the /proc/pid/stat file According to the Linux sources the kernel exposes a proces virtual memory size via proc filesystem into the three files - stat, status and statm. This is the struct mm->total_vm value adjusted to the corresponding units - bytes, kilobytes and pages. The fix is based on a fernape@ analysis. PR: 265937 Reported by: Ray Bellis MFC after: 3 days (cherry picked from commit a55b5a9aed3981fcec205e246436991d138c78a2) --- sys/compat/linprocfs/linprocfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 3aa01de9ce65..9166e46355ec 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1023,7 +1023,7 @@ linprocfs_doprocstat(PFS_FILL_ARGS) PS_ADD("0", "%d", 0); /* removed field */ PS_ADD("itrealvalue", "%d", 0); /* XXX */ PS_ADD("starttime", "%lu", TV2J(&kp.ki_start) - TV2J(&boottime)); - PS_ADD("vsize", "%ju", P2K((uintmax_t)kp.ki_size)); + PS_ADD("vsize", "%ju", (uintmax_t)kp.ki_size); PS_ADD("rss", "%ju", (uintmax_t)kp.ki_rssize); PS_ADD("rlim", "%lu", kp.ki_rusage.ru_maxrss); PS_ADD("startcode", "%ju", (uintmax_t)startcode); From nobody Wed Mar 1 10:18:11 2023 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 4PRVYb6Wv3z3vhC5; Wed, 1 Mar 2023 10:18:11 +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 4PRVYb67r4z4Krx; Wed, 1 Mar 2023 10:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677665891; 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=iW9sWZQ+OLC1d9mNY2c6TfswuARIBgM5sqdnTfIE5HU=; b=nuExB92i89z+VF6KcuhaXib3SSw+5m/qHrqxi6Uq9pwXcM+mel3qbjzCBdjDKKdvO9xMVK PbFj4xBjqlTM1jR8HOXqHEn+5EgzT77xx7UJ4BYP7McO/HYK2OATCyz+vlUJjzsNm5/e62 JIHsAh3pe55On5owEc8SYr2v3uJwWhnTmvn0in0MlxXiWEIgLNT49B4IGMzXdHjCgcsNuu Z69nA8Zyw5kQgOgrkfrzHJloA90JCDSTW6iQFAk+3X5kIpfVmfozp6HVI+0J1jE3BTgigk G9tqmaSvjpZmlICguKcdr7E3UcsY44JOZUrieSXxjDF5p3SaNVgqL++qxHCYsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677665891; 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=iW9sWZQ+OLC1d9mNY2c6TfswuARIBgM5sqdnTfIE5HU=; b=GcW9j/scQQdtr6X2nxjMkY5Zvdl8/2AAquMmpFEprin7ZJ3D8bHnsqJIVZ6RnHneMVEAOy K/t2y+fQTNLTj2LX81a169CTJ7Ef88ENcbhy+5D3gEhFRbgBNSevFR/HLiyzOogK9Z2aYM 19q3/7t8Ym7CD1+/wCoht5mxVZwdbBv0cwSXVYMHAKaKyPZHfYstuiw5LI6YPDcMBTl3kX zIUyu7xP2r5W3SUthPhBRF9fVrvjs3YoeHNDtKrZrbi4haj9He6udYBdIJJn0YJLf+flnm BVUJjKPAjw55bWXM1FzO+j586mWzQD0TRPbMQH4ZavwVss6a3dRMpm7ud387yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677665891; a=rsa-sha256; cv=none; b=xjHSZVLgj+pVfoQGmNU0VaxpDdwoAEanUV+TwbJKsKhBghDL8t8s0IwixV0niZiuH25Jhl wQyzWbw2FrpE32f1CTtoT0+yXw9uHZCPTukNK3ysnAIpgC2rqS9dP71CVFX/BDyiFPCTuO da7LTfaZXg/mR3K7KzFbyCFu3oD800oejHZ30lOA8lhiueKd47c6vEkOqRAkUnoFhLC/13 vkbE4rFDsN8EKMGdlt1zgjyG1gCziFuJ1KjZfOHm5Hact+TC6qFVMlMdmctbWzmoSd8bqM hP3g3dpvAQUnO3F5CUxTqsnBcu+Mv6mwMkCL4YGUnMyH3EVwevrFwJw+2hfxjg== 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 4PRVYb5BpXzW8r; Wed, 1 Mar 2023 10:18:11 +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 321AIBHu078210; Wed, 1 Mar 2023 10:18:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321AIBsc078209; Wed, 1 Mar 2023 10:18:11 GMT (envelope-from git) Date: Wed, 1 Mar 2023 10:18:11 GMT Message-Id: <202303011018.321AIBsc078209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pau Amma Subject: git: 07f1d6b99587 - stable/13 - Fix a slew of mdoc warnings/errors. 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: pauamma X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 07f1d6b9958738fc3dabfabb62341e8ad79e90e3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by pauamma: URL: https://cgit.FreeBSD.org/src/commit/?id=07f1d6b9958738fc3dabfabb62341e8ad79e90e3 commit 07f1d6b9958738fc3dabfabb62341e8ad79e90e3 Author: Christian Brueffer AuthorDate: 2022-04-12 21:52:54 +0000 Commit: Pau Amma CommitDate: 2023-03-01 10:14:38 +0000 Fix a slew of mdoc warnings/errors. MFC requested by meeena in IRC. share/man/man9/VOP_SETLABEL.9 and share/man/man9/hz.9 omitted since they didn't exist in 13-STABLE. share/man/man9/mod_cc.9 omitted as some of the changes are in text not applicable to 13-STABLE. (cherry picked from commit 320686674b3c8ce3ffe135c421a22d063917ee46) Approved by: carlavilla (mentor) --- share/man/man3/pthread_set_name_np.3 | 6 +++--- share/man/man3/pthread_testcancel.3 | 1 - share/man/man9/OF_child.9 | 1 - share/man/man9/OF_device_from_xref.9 | 1 - share/man/man9/OF_finddevice.9 | 4 ++-- share/man/man9/OF_getprop.9 | 3 +-- share/man/man9/OF_node_from_xref.9 | 3 +-- share/man/man9/OF_package_to_path.9 | 1 - share/man/man9/atomic.9 | 4 ++-- share/man/man9/backlight.9 | 2 +- share/man/man9/crypto_buffer.9 | 2 +- share/man/man9/crypto_driver.9 | 1 - share/man/man9/crypto_request.9 | 3 +-- share/man/man9/dev_refthread.9 | 4 ++-- share/man/man9/drbr.9 | 2 +- share/man/man9/epoch.9 | 2 +- share/man/man9/fdt_pinctrl.9 | 2 +- share/man/man9/iflibdi.9 | 1 - share/man/man9/iflibtxrx.9 | 1 - share/man/man9/ifnet.9 | 1 - share/man/man9/kern_reboot.9 | 6 +++--- share/man/man9/namei.9 | 2 +- share/man/man9/nvmem.9 | 4 ++-- share/man/man9/ofw_graph.9 | 4 +--- share/man/man9/owll.9 | 2 +- share/man/man9/pmap_zero_page.9 | 2 +- share/man/man9/printf.9 | 4 ++-- share/man/man9/prng.9 | 1 - share/man/man9/sglist.9 | 2 +- share/man/man9/vrele.9 | 2 +- 30 files changed, 30 insertions(+), 44 deletions(-) diff --git a/share/man/man3/pthread_set_name_np.3 b/share/man/man3/pthread_set_name_np.3 index 5fb627a5a182..5423ef898f58 100644 --- a/share/man/man3/pthread_set_name_np.3 +++ b/share/man/man3/pthread_set_name_np.3 @@ -30,7 +30,7 @@ .Sh NAME .Nm pthread_get_name_np , .Nm pthread_getname_np , -.Nm pthread_set_name_np +.Nm pthread_set_name_np , .Nm pthread_setname_np .Nd set and retrieve the thread name .Sh LIBRARY @@ -90,8 +90,8 @@ and functions, all errors that may appear inside are silently ignored. .Sh SEE ALSO -.Xr pthread_np 3 , -.Xr thr_set_name 2 +.Xr thr_set_name 2 , +.Xr pthread_np 3 .Sh STANDARDS .Fn pthread_set_name_np and diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3 index 5d0efcb2d635..9ba1403dffdc 100644 --- a/share/man/man3/pthread_testcancel.3 +++ b/share/man/man3/pthread_testcancel.3 @@ -69,7 +69,6 @@ function creates a cancellation point in the calling thread. The .Fn pthread_testcancel function has no effect if cancelability is disabled. -.Pp .Ss Cancelability States The cancelability state of a thread determines the action taken upon receipt of a cancellation request. diff --git a/share/man/man9/OF_child.9 b/share/man/man9/OF_child.9 index 03036197f5ab..8227401f5f14 100644 --- a/share/man/man9/OF_child.9 +++ b/share/man/man9/OF_child.9 @@ -43,7 +43,6 @@ .Ft phandle_t .Fn OF_peer "phandle_t node" .Sh DESCRIPTION -.Pp .Fn OF_child returns the phandle value of the first child of the .Fa node . diff --git a/share/man/man9/OF_device_from_xref.9 b/share/man/man9/OF_device_from_xref.9 index f6a483f9fd5c..c8c206afe777 100644 --- a/share/man/man9/OF_device_from_xref.9 +++ b/share/man/man9/OF_device_from_xref.9 @@ -43,7 +43,6 @@ .Ft phandle_t .Fn OF_xref_from_device "device_t dev" .Sh DESCRIPTION -.Pp When a device tree node references another node, the driver may need to get a device_t instance associated with the referenced node. For instance, an Ethernet driver accessing a PHY device. diff --git a/share/man/man9/OF_finddevice.9 b/share/man/man9/OF_finddevice.9 index 30341e779bf2..d524a182f01c 100644 --- a/share/man/man9/OF_finddevice.9 +++ b/share/man/man9/OF_finddevice.9 @@ -52,8 +52,8 @@ Returns -1 if the path cannot be found in the tree. } .Ed .Sh SEE ALSO -.Xr OF_child 9 -.Xr OF_parent 9 +.Xr OF_child 9 , +.Xr OF_parent 9 , .Xr OF_peer 9 .Sh AUTHORS .An -nosplit diff --git a/share/man/man9/OF_getprop.9 b/share/man/man9/OF_getprop.9 index 9ad996f4395b..5d0607a0a3bf 100644 --- a/share/man/man9/OF_getprop.9 +++ b/share/man/man9/OF_getprop.9 @@ -83,7 +83,6 @@ .Fn OF_setprop "phandle_t node" "const char *propname" \ "const void *buf" "size_t len" .Sh DESCRIPTION -.Pp Device nodes can have associated properties. Properties consist of a name and a value. A name is a human-readable string from 1 to 31 characters long. @@ -345,7 +344,7 @@ cannot be created. return; .Ed .Sh SEE ALSO -.Xr OF_device_from_xref 9 +.Xr OF_device_from_xref 9 , .Xr OF_node_from_xref 9 .Sh AUTHORS .An -nosplit diff --git a/share/man/man9/OF_node_from_xref.9 b/share/man/man9/OF_node_from_xref.9 index fd4fae8c5375..41b683fac928 100644 --- a/share/man/man9/OF_node_from_xref.9 +++ b/share/man/man9/OF_node_from_xref.9 @@ -40,7 +40,6 @@ .Ft phandle_t .Fn OF_xref_from_node "phandle_t node" .Sh DESCRIPTION -.Pp Some OpenFirmware implementations (FDT, IBM) have a concept of effective phandle or xrefs. They are used to cross-reference device tree nodes. @@ -92,7 +91,7 @@ the input value. return; .Ed .Sh SEE ALSO -.Xr OF_device_from_xref 9 +.Xr OF_device_from_xref 9 , .Xr OF_device_register_xref 9 .Sh AUTHORS .An -nosplit diff --git a/share/man/man9/OF_package_to_path.9 b/share/man/man9/OF_package_to_path.9 index 6726ccde9cf5..93ff504bfaae 100644 --- a/share/man/man9/OF_package_to_path.9 +++ b/share/man/man9/OF_package_to_path.9 @@ -37,7 +37,6 @@ .Ft ssize_t .Fn OF_package_to_path "phandle_t node" "char *buf" "size_t len" .Sh DESCRIPTION -.Pp .Fn OF_package_to_path copies at most .Fa len diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9 index e95bfbdbf4e8..7513d569c2f1 100644 --- a/share/man/man9/atomic.9 +++ b/share/man/man9/atomic.9 @@ -296,11 +296,11 @@ For example, they can be used to avoid executing a memory barrier until a memory access shows that some condition is satisfied. .Ss Interrupt Fence Operations The -.Fn atomic_interrupt_fence() +.Fn atomic_interrupt_fence function establishes ordering between its call location and any interrupt handler executing on the same CPU. It is modeled after the similar C11 function -.Fn atomic_signal_fence() , +.Fn atomic_signal_fence , and adapted for the kernel environment. .Ss Multiple Processors In multiprocessor systems, the atomicity of the atomic operations on memory diff --git a/share/man/man9/backlight.9 b/share/man/man9/backlight.9 index 5151ab1e91da..322946a76877 100644 --- a/share/man/man9/backlight.9 +++ b/share/man/man9/backlight.9 @@ -30,7 +30,7 @@ .Nm backlight_register , .Nm backlight_destroy , .Nm BACKLIGHT_GET_STATUS , -.Nm BACKLIGHT_SET_STATUS , +.Nm BACKLIGHT_SET_STATUS .Nd BACKLIGHT methods .Sh SYNOPSIS .Cd "device backlight" diff --git a/share/man/man9/crypto_buffer.9 b/share/man/man9/crypto_buffer.9 index 064c6fbc12e3..7f3839970dfa 100644 --- a/share/man/man9/crypto_buffer.9 +++ b/share/man/man9/crypto_buffer.9 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Feburary 11, 2022 +.Dd February 11, 2022 .Dt CRYPTO_BUFFER 9 .Os .Sh NAME diff --git a/share/man/man9/crypto_driver.9 b/share/man/man9/crypto_driver.9 index 930cc0d8bde4..a6ab8fa92429 100644 --- a/share/man/man9/crypto_driver.9 +++ b/share/man/man9/crypto_driver.9 @@ -294,7 +294,6 @@ indicates that the driver is able to handle asymmetric requests passed to .Fn CRYPTODEV_KPROCESS . .El .Pp -.Pp .Fn hmac_init_ipad prepares an authentication context to generate the inner hash of an HMAC. .Fa axf diff --git a/share/man/man9/crypto_request.9 b/share/man/man9/crypto_request.9 index 18012adc4322..a28cd33c2956 100644 --- a/share/man/man9/crypto_request.9 +++ b/share/man/man9/crypto_request.9 @@ -456,7 +456,6 @@ invoked in the same order that requests were queued to the session via .Fn crypto_dispatch . This flag is used by IPsec to ensure that decrypted network packets are passed up the network stack in roughly the same order they were received. -.Pp .Ss Other Request Fields In addition to the fields and flags enumerated above, .Vt struct cryptop @@ -539,7 +538,7 @@ was passed in .Xr crypto 7 , .Xr crypto 9 , .Xr crypto_session 9 , -.Xr mbuf 9 +.Xr mbuf 9 , .Xr uio 9 .Sh BUGS Not all drivers properly handle mixing session and per-request keys diff --git a/share/man/man9/dev_refthread.9 b/share/man/man9/dev_refthread.9 index 74e8d69d150c..c6aa7d955230 100644 --- a/share/man/man9/dev_refthread.9 +++ b/share/man/man9/dev_refthread.9 @@ -145,8 +145,8 @@ and do not initialize the value pointed to by the parameter in any way. .Ef .Sh SEE ALSO -.Xr destroy_dev 9 , -.Xr devfs 5 +.Xr devfs 5 , +.Xr destroy_dev 9 .Sh CAVEATS Do not invoke .Fn dev_relthread diff --git a/share/man/man9/drbr.9 b/share/man/man9/drbr.9 index eebc3a7df157..9c641cd0e841 100644 --- a/share/man/man9/drbr.9 +++ b/share/man/man9/drbr.9 @@ -36,7 +36,7 @@ .Nm drbr_dequeue_cond , .Nm drbr_flush , .Nm drbr_empty , -.Nm drbr_inuse , +.Nm drbr_inuse .Nd network driver interface to buf_ring .Sh SYNOPSIS .In sys/param.h diff --git a/share/man/man9/epoch.9 b/share/man/man9/epoch.9 index e81b715f872a..1f191211b041 100644 --- a/share/man/man9/epoch.9 +++ b/share/man/man9/epoch.9 @@ -43,7 +43,7 @@ .Nm epoch_call , .Nm epoch_drain_callbacks , .Nm in_epoch , -.Nm in_epoch_verbose , +.Nm in_epoch_verbose .Nd kernel epoch based reclamation .Sh SYNOPSIS .In sys/param.h diff --git a/share/man/man9/fdt_pinctrl.9 b/share/man/man9/fdt_pinctrl.9 index f4cb92368136..8f1f24a07a52 100644 --- a/share/man/man9/fdt_pinctrl.9 +++ b/share/man/man9/fdt_pinctrl.9 @@ -185,7 +185,7 @@ static device_method_t foo_methods[] = { DRIVER_MODULE(foo, simplebus, foo_driver, foo_devclass, NULL, NULL); .Ed .Sh SEE ALSO -.Xr fdt_pinctrl 4 , +.Xr fdt_pinctrl 4 .Sh AUTHORS This manual page was written by .An Oleksandr Tymoshenko . diff --git a/share/man/man9/iflibdi.9 b/share/man/man9/iflibdi.9 index c37832ede6af..0d40333dd528 100644 --- a/share/man/man9/iflibdi.9 +++ b/share/man/man9/iflibdi.9 @@ -100,7 +100,6 @@ Each queue has its own transmit (iflib_txq_t) and receive (iflib_rxq_t) queue. The transmit queue is used to hold packets while the interface is in the process of sending another. The receive queue is used to receive packets that are awaiting processing. -.Pp .Ss The if_ctx_t Structure The fields of .Vt "struct if_ctx_t" diff --git a/share/man/man9/iflibtxrx.9 b/share/man/man9/iflibtxrx.9 index f99a91b05838..adb44def1d3f 100644 --- a/share/man/man9/iflibtxrx.9 +++ b/share/man/man9/iflibtxrx.9 @@ -61,7 +61,6 @@ primarily defined by the functions named above. The if_pkt_info data structure contains statistics and identifying info necessary for packet transmission. While the data structure for packet receipt is the if_rxd_info structure. -.Pp .Ss The if_pkt_info Structure The fields of .Vt "struct if_pkt_info" diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 90a95106b1d5..d604a2092e19 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -218,7 +218,6 @@ Interfaces are also associated with an output queue, defined as a .Vt "struct ifqueue" ; this structure is used to hold packets while the interface is in the process of sending another. -.Pp .Ss The ifnet Structure The fields of .Vt "struct ifnet" diff --git a/share/man/man9/kern_reboot.9 b/share/man/man9/kern_reboot.9 index 587d4ab114db..fe8ccd7390c3 100644 --- a/share/man/man9/kern_reboot.9 +++ b/share/man/man9/kern_reboot.9 @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Sept 23, 2021 +.Dd September 23, 2021 .Dt KERN_REBOOT 9 .Os .Sh NAME @@ -105,6 +105,6 @@ The .Fn kern_reboot function does not return. .Sh SEE ALSO -.Xr reboot 2 -.Xr EVENTHANDLER 9 +.Xr reboot 2 , +.Xr EVENTHANDLER 9 , .Xr vfs_unmountall 9 diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9 index b51b9c48a48a..f98646725fb3 100644 --- a/share/man/man9/namei.9 +++ b/share/man/man9/namei.9 @@ -39,7 +39,7 @@ .Sh NAME .Nm namei , .Nm NDINIT , -.Nm NDFREE , +.Nm NDFREE .Nd pathname translation and lookup operations .Sh SYNOPSIS .In sys/param.h diff --git a/share/man/man9/nvmem.9 b/share/man/man9/nvmem.9 index 281bb93ba80b..5325700639e0 100644 --- a/share/man/man9/nvmem.9 +++ b/share/man/man9/nvmem.9 @@ -26,12 +26,12 @@ .Dt nvmem 9 .Os .Sh NAME -.Nm nvmem +.Nm nvmem , .Nm nvmem_get_cell_len , .Nm nvmem_read_cell_by_name , .Nm nvmem_read_cell_by_idx , .Nm nvmem_write_cell_by_name , -.Nm nvmem_write_cell_by_idx , +.Nm nvmem_write_cell_by_idx .Sh SYNOPSIS .Cd "options EXT_RESOURCES" .Cd "options FDT" diff --git a/share/man/man9/ofw_graph.9 b/share/man/man9/ofw_graph.9 index 0c121f7a05b2..becb5caffc1f 100644 --- a/share/man/man9/ofw_graph.9 +++ b/share/man/man9/ofw_graph.9 @@ -32,7 +32,7 @@ .Nm ofw_graph_get_endpoint_by_idx , .Nm ofw_graph_get_remote_endpoint , .Nm ofw_graph_get_remote_parent , -.Nm ofw_graph_get_device_by_port_ep , +.Nm ofw_graph_get_device_by_port_ep .Nd Helpers for the graph bindings .Sh SYNOPSIS .In dev/ofw/openfirm.h @@ -50,7 +50,6 @@ .Ft device_t .Fn ofw_graph_get_device_by_port_ep "phandle_t node" "uint32_t port_id" "uin32_t ep_id" .Sh DESCRIPTION -.Pp The ofw_graph functions are helpers to parse the DTS graph bindings .Pp .Fn ofw_graph_get_port_by_idx @@ -96,7 +95,6 @@ if none. The device driver should have called .Fn OF_device_register_xref before. -.Fn .Sh HISTORY The .Nm ofw_graph diff --git a/share/man/man9/owll.9 b/share/man/man9/owll.9 index 715dd96c1e8c..a8b623a73a50 100644 --- a/share/man/man9/owll.9 +++ b/share/man/man9/owll.9 @@ -27,7 +27,7 @@ .Dt OWLL 9 .Os .Sh NAME -.Nm owll +.Nm owll , .Nm OWLL_WRITE_ONE , .Nm OWLL_WRITE_ZERO , .Nm OWLL_READ_DATA , diff --git a/share/man/man9/pmap_zero_page.9 b/share/man/man9/pmap_zero_page.9 index f02b3a59bbba..52e76520ec40 100644 --- a/share/man/man9/pmap_zero_page.9 +++ b/share/man/man9/pmap_zero_page.9 @@ -30,7 +30,7 @@ .Os .Sh NAME .Nm pmap_zero_page , -.Nm pmap_zero_area , +.Nm pmap_zero_area .Nd zero-fill a page using machine-dependent optimizations .Sh SYNOPSIS .In sys/param.h diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9 index 1a3640871bd1..4d3a6fb8b2a5 100644 --- a/share/man/man9/printf.9 +++ b/share/man/man9/printf.9 @@ -53,7 +53,7 @@ .Fn vlog "int pri" "const char *fmt" "va_list ap" .Sh DESCRIPTION The -.Xr printf 9 +.Nm family of functions are similar to the .Xr printf 3 family of functions. @@ -82,7 +82,7 @@ Each of these related functions use the parameter in the same manner as .Xr printf 3 . However, -.Xr printf 9 +.Nm adds two other conversion specifiers and omits one. .Pp The diff --git a/share/man/man9/prng.9 b/share/man/man9/prng.9 index 63132c28c198..20cfcf910442 100644 --- a/share/man/man9/prng.9 +++ b/share/man/man9/prng.9 @@ -68,7 +68,6 @@ random numbers generated by the .Xr random 4 kernel cryptographically secure random number generator subsystem, see .Xr arc4random 9 . -.Pp .Bl -tag -width indent .It Fn prng32 Generate a 32-bit integer uniformly distributed in [0, 2^32-1]. diff --git a/share/man/man9/sglist.9 b/share/man/man9/sglist.9 index 408d23573489..ec452194527b 100644 --- a/share/man/man9/sglist.9 +++ b/share/man/man9/sglist.9 @@ -35,7 +35,7 @@ .Nm sglist_append , .Nm sglist_append_bio , .Nm sglist_append_mbuf , -.Nm sglist_append_mbuf_epg, +.Nm sglist_append_mbuf_epg , .Nm sglist_append_phys , .Nm sglist_append_sglist , .Nm sglist_append_single_mbuf , diff --git a/share/man/man9/vrele.9 b/share/man/man9/vrele.9 index 1eae4426e7ef..a0d6a1e3f0ac 100644 --- a/share/man/man9/vrele.9 +++ b/share/man/man9/vrele.9 @@ -68,7 +68,7 @@ The is operationally equivalent to calling .Xr VOP_UNLOCK 9 followed by -.Xr vrele 9 , +.Fn vrele , with less overhead. .Pp The From nobody Wed Mar 1 14:29:43 2023 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 4PRc7q4ykYz3twJL; Wed, 1 Mar 2023 14:29:43 +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 4PRc7q4PDxz3JbN; Wed, 1 Mar 2023 14:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677680983; 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=RR7DdxSzI8sA5Q6EpmhZQEkhrEIc4cjAzWYzE++4of8=; b=Nl6BsRtQNw6h5sKX2fYUWK5mVUzBFpKxDsCf1dGPuMtqe4XIjtPx+r1Uu+s/YrzNmTI+Bo pBDxgzeuZ+F9yDN+RvTQlDErkRuz9YrpnymQGHOXtzwVwHAEpsoYuBsjLNsW8RdOvC7NB0 pXVrufzgmKaKadmz+9YygjNyq6GRua4gCNhNQr1GWxq76gyeXVpf1GDqEQc8td64K5p9+Y UrR6DgCO07frHosUewvHyrmFhr7fC2qVBU+vGUX5GOfk9A5rW6qjVOsFg17RkFqnA8O5NA CXL50SSU+b9ObEG2srPjDQMshLTbY2SnhWbiRJduH3QGd80HkYAQm+0O5iPpKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677680983; 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=RR7DdxSzI8sA5Q6EpmhZQEkhrEIc4cjAzWYzE++4of8=; b=i1N5TUVNlvLjuSlq4V1vvYm97jkMI2e6h6+/lx+Ng9w4JRzSzgF45w49C5blukjlxl0d63 0+cAGUwgMhXsE9EE9vK3MGTlRGQbUVnAxkFMxMtudniMJi7vq2PlmyVfJJWUOaCsY4yR0n xMNvYUtUTG7OQUvUWkCc5nAAPfqktqesWWkDN8evBT9GRd3TeVVKuOlzjiFZA2ykG9e+sC 0+3iD8aV6GaTQc7iFOl1pI3/0dz6H7JF0OKEYXb0621Ill+JzAHG4T1hI7H2MtWgnTaskb EzL39AUhrKz80HjVQniHwphqBc9+TzhLe+SKVhkojvr4SEw3QUMh9aPa74ltdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677680983; a=rsa-sha256; cv=none; b=yDy8mTv2dN1YwHXbDAcEQdnkEajPJX2aF7CNJeGv4Gy+/KPZ2iDKH7wJVySufURpuUDj2X 8dwEjruuR847B7AeQ94FPT/w+lMaoGFYfR/BGBbbmQ5l6MiX4Wiv/WRJ2qmjcKXc8N462v L6YfrAwSirgObIYqE7VuWsxVZBmt/G+44EhP4uR8UHgpIYsAJcbDf3K0nkHBlExlUxoNfB vfNW5daZOOQH7dTDodcBGShPWttDvP7tkC4l5XRYTfzh4o3VMwUeSibs+rEC1JVuSaTc9o WBkAFpTdcvl3NY9n/HufRrw8YSIiXePM+EcwwPVhEJzZK77w1N/zf4ShBtABKQ== 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 4PRc7q3SC6zd4b; Wed, 1 Mar 2023 14:29:43 +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 321EThfY088378; Wed, 1 Mar 2023 14:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321EThH4088377; Wed, 1 Mar 2023 14:29:43 GMT (envelope-from git) Date: Wed, 1 Mar 2023 14:29:43 GMT Message-Id: <202303011429.321EThH4088377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: b656161b84dc - stable/13 - netlink: make the maximum allowed netlink socket buffer runtime tunable. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b656161b84dce0322ab00d7958267fa47cda6318 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=b656161b84dce0322ab00d7958267fa47cda6318 commit b656161b84dce0322ab00d7958267fa47cda6318 Author: Alexander V. Chernikov AuthorDate: 2023-02-27 10:44:54 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-01 14:28:47 +0000 netlink: make the maximum allowed netlink socket buffer runtime tunable. Dumping large routng tables (>1M paths with multipath) require the socket buffer which is larger than the currently defined limit. Allow the limit to be set in runtime, similar to kern.ipc.maxsockbuf. Reported by: Marek Zarychta MFC after: 1 day (cherry picked from commit 28a5d88f7091d1fc72f4f1bd8562d3c8b15883f5) --- share/man/man4/netlink.4 | 6 ++++++ sys/kern/uipc_socket.c | 3 ++- sys/netlink/netlink_domain.c | 25 ++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/share/man/man4/netlink.4 b/share/man/man4/netlink.4 index a5cde2852158..e1a0c4b12933 100644 --- a/share/man/man4/netlink.4 +++ b/share/man/man4/netlink.4 @@ -280,6 +280,12 @@ Default receive buffer for the netlink socket. Note that the socket recvspace has to be least as long as the longest message that can be received from this socket. .El +.Bl -tag -width indent +.It Va net.netlink.nl_maxsockbuf +Maximum receive buffer for the netlink socket that can be set via +.Dv SO_RCVBUF +socket option. +.El .Sh DEBUGGING Netlink implements per-functional-unit debugging, with different severities controllable via the diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index fdf718de2483..5b1e572d786f 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2976,12 +2976,13 @@ sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen) return (0); } +u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ + u_long sogetmaxbuf(struct socket *so) { if (so->so_proto->pr_domain->dom_family != PF_NETLINK) return (sb_max); - u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ return ((priv_check(curthread, PRIV_NET_ROUTE) == 0) ? nl_maxsockbuf : sb_max); } diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index c451274b1e63..348788434175 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -76,9 +76,12 @@ SYSCTL_ULONG(_net_netlink, OID_AUTO, recvspace, CTLFLAG_RW, &nl_recvspace, 0, "Default netlink socket receive space"); extern u_long sb_max_adj; -#if 0 -static u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ -#endif +extern u_long nl_maxsockbuf; +static int sysctl_handle_nl_maxsockbuf(SYSCTL_HANDLER_ARGS); +SYSCTL_OID(_net_netlink, OID_AUTO, nl_maxsockbuf, + CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE, &nl_maxsockbuf, 0, + sysctl_handle_nl_maxsockbuf, "LU", + "Maximum Netlink socket buffer size"); uint32_t nlp_get_pid(const struct nlpcb *nlp) @@ -673,6 +676,22 @@ nl_ctloutput(struct socket *so, struct sockopt *sopt) return (error); } +static int +sysctl_handle_nl_maxsockbuf(SYSCTL_HANDLER_ARGS) +{ + int error = 0; + u_long tmp_maxsockbuf = nl_maxsockbuf; + + error = sysctl_handle_long(oidp, &tmp_maxsockbuf, arg2, req); + if (error || !req->newptr) + return (error); + if (tmp_maxsockbuf < MSIZE + MCLBYTES) + return (EINVAL); + nl_maxsockbuf = tmp_maxsockbuf; + + return (0); +} + #if 0 static int nl_setsbopt(struct socket *so, struct sockopt *sopt) From nobody Wed Mar 1 16:09:51 2023 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 4PRfMN0xhKz3v2sR; Wed, 1 Mar 2023 16:09:52 +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 4PRfMN0RYCz3nsv; Wed, 1 Mar 2023 16:09:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677686992; 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=hBl7tBqnE+HpRMYYoo5vtKAHk+aHdf/TZA3myJizZAA=; b=HCJKeJ7aNwrVWW1KBxQ2XVlvHuTNOJ16AEmEO+F7oKDSbqV6CS3QIOAdrv9nQhyaIHotWe UOTZoHltOhkFJcMfhjmlM9QgWMUdTOtXBDeypPm0PxksWVA6RyuBWisw+R0RTu0j2w6Qxe +V+ZPMCrKq3X+LW5nQL6cCgaxTyf05h2b6MO3jSN5CkHNpFq9zMVmRhAMbtZYb4N+//le4 UJMIaznaqStpjXySoFWXm3fwZt8BUFXNrshcAsiyZh1TjZeq7fcUxmHDc2pQpiOnpKiQWw O7Ym87bJxTO4CqkxVZM+JklOYnGinyAC0ekO45xh9x4DaX/k88SRIYcSpX6Log== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677686992; 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=hBl7tBqnE+HpRMYYoo5vtKAHk+aHdf/TZA3myJizZAA=; b=Qd9rVniO9xV12dovATfvdZpMyUL/Jh9OKM4K0ZTqtfr1zpSizJ1UCD2Um+M4DqWxp3lhJ8 94y+1jDiu+ey+XwsjElWEJm8yXnk9ZHnJYeJMxB5uJ6I5n3XYeT4KCc7nWsO58eRIvPlFU OZqgTjFB7mp/phr5JRLr75ts5hg2K7bjpZKnQfcHVgBKnO/1PL7w3is5jjGZs/40ssMkRw mcCTUkPK42vZW/ISbvsIP8HIA/T7IoGGLI0vmX9MZy25QDC57gdt1ikDfm6GkdmqIR/3nP +jBnPC/ZqrKcwFLhkU5SA7Xs7UyJNgCoRuXTMoTygpUbI8hYllfE2iEU7ZKwpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677686992; a=rsa-sha256; cv=none; b=bK/iIdH10NRiUGbcYDanCrW8KAG7tgk3Nk5dP1DE3vJqhkEMZCbidaMqYicaKxrSrDHvlf XEm3wgibTBVWXRNVZv39aALKQFr1TNgVZinVcay6C6tg5rWIs2e4cgOn37//x52IIn0Oj4 CVUN167yCeIKuAjGgXA0SlL+hTxQi0Lwl2TA2HWBmJU6F0QsRoY0kWNfMiu01WSLN/JhBa fCC9wTulTvxvU3pz53hODk6lNNks5S2LDq8hwv8rA9A3xWrxVfFa2QWziWV8UopBaSnImD DP8+vISK4BwBpkhpQ7wPjOq9czmJtNL/ZvyUjbm3o2QU42LfsUjPB1EluwT0qg== 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 4PRfMM6fNMzfsG; Wed, 1 Mar 2023 16:09:51 +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 321G9pAm054191; Wed, 1 Mar 2023 16:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321G9pMt054190; Wed, 1 Mar 2023 16:09:51 GMT (envelope-from git) Date: Wed, 1 Mar 2023 16:09:51 GMT Message-Id: <202303011609.321G9pMt054190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8c545c54f2e5 - releng/13.2 - src.conf: regen man page 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 8c545c54f2e547922972832123fee250f381e75a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8c545c54f2e547922972832123fee250f381e75a commit 8c545c54f2e547922972832123fee250f381e75a Author: Ed Maste AuthorDate: 2023-02-28 21:42:53 +0000 Commit: Ed Maste CommitDate: 2023-03-01 16:07:06 +0000 src.conf: regen man page This hadn't been regenerated on the stable branch after some MFCs. Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation (cherry picked from commit 242ef804209cce56cb9689283a5d4507a3714fce) --- share/man/man5/src.conf.5 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 99ffdb38d8e1..d7bb2f063fcc 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd September 9, 2022 +.Dd February 28, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -452,6 +452,12 @@ When set, it enforces these options: .It .Va WITHOUT_GOOGLETEST .It +.Va WITHOUT_LLD +.It +.Va WITHOUT_LLDB +.It +.Va WITHOUT_LLVM_BINUTILS +.It .Va WITHOUT_LLVM_COV .It .Va WITHOUT_OFED @@ -467,6 +473,8 @@ When set, it enforces these options: .It Va WITHOUT_DEBUG_FILES Avoid building or installing standalone debug files for each executable binary and shared library. +.It Va WITH_DETECT_TZ_CHANGES +Make the time handling code detect changes to the timezone files. .It Va WITHOUT_DIALOG Do not build .Xr dialog 1 , From nobody Wed Mar 1 16:09:52 2023 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 4PRfMP2LjMz3v2sT; Wed, 1 Mar 2023 16:09:53 +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 4PRfMP1NX2z3nlK; Wed, 1 Mar 2023 16:09:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677686993; 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=TdURa68i9fp9m9LvNNlgKU8OirNrxeCsjUTUblb2dJU=; b=PG+hnrzdmTioCmvTgcjP+C6+b3vwOOLR8lHChBuLmiY4v1k8lZo/NY1XeTGu6NFyfYGzn1 SjswL0SdEzr0UJI1SjF2VNdDRl1RhCyfqu/PDxIgdTg4K6fs6ltIuJQnmSWucvkzvR2PEk Y53WBAm3QHiO6ZAFm9fD6iWbZwVCr1aNfkWK3jIOEPY1bnWA+MAxk3nnTD990NhR/6SyJp cZv79Q8yNkp6GqO3lEkhERlStcYZpT0Xw0iexp1PI2py4wvtqb1Gs3z88vDtpIt2M+REa6 iy6GyixbJG4eB3P45jnjULH0E6m8KCtgoUH2jvsIc6Wv0C511OCTJhpTn8OF7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677686993; 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=TdURa68i9fp9m9LvNNlgKU8OirNrxeCsjUTUblb2dJU=; b=pU+E6Ad57S+L2OH1iQNCAGIQakGiTtJR9ubmmLuGU2L47OBkAbyzlW28XbTFOTZNt6Am63 XCVu3T0L3bdul8m1OBmtJHbWqlrPVxObpix8VsRCO2TemSFUtG2BYF9Y7se48nn9BQDRh6 tBOZMRCu2+orKx41m22ovh7IjZcWyAW+EyERZgZhJfYD8lssAhy9qgYXi6UVPcs0ZkHsun iuMQZA+2893wpyT4/oDkQtPDxmbLU99Jw+ao7giEI7z9ub3H5zUMuddB4AuXxDTadHsh7p fnNmmr0xf97tl/xqIYtLKw1lnU3ELKF8sBPSpMbHvL8GaIyCzdj3tR1zhQaVsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677686993; a=rsa-sha256; cv=none; b=dFwa1db0pZq7yzPN/BgECl7j0j0VAFYBNCQL2ATjTkxLtcvU78ajykv+5pGKIo+L5z7SQ2 Kb3Y/u2N3IAmzEYQtQeQJmoZ1tYd/GPGrmuL4VCW3UxB4gPyXnZ7KzBECGZvw+KgcKcqdZ FScr6FE3zAsWRQ5ogkaAql2tKgF95miHFbFlcjvrMvI4T48SZaEBY1lG21e1ToKiCdk1pN lfxxN35nBhrglwvoIGvrO4u7hQmKyyKbxtcoAjXvUV/L2mQXHErQiN9kyHwOA4pGiLdRNV uktzHwB9yVgx72Gxtjw+WdRWI77db+Iu4TKwazgqAbW4iMos8LZtnFsOBtNrbg== 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 4PRfMP0PgbzfsH; Wed, 1 Mar 2023 16:09:53 +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 321G9qTl054210; Wed, 1 Mar 2023 16:09:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321G9q8o054209; Wed, 1 Mar 2023 16:09:52 GMT (envelope-from git) Date: Wed, 1 Mar 2023 16:09:52 GMT Message-Id: <202303011609.321G9q8o054209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3623575a8613 - releng/13.2 - src.conf: regen man page for settings on release branch 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 3623575a8613ce4faf40e3f29e926272309e6498 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3623575a8613ce4faf40e3f29e926272309e6498 commit 3623575a8613ce4faf40e3f29e926272309e6498 Author: Ed Maste AuthorDate: 2023-03-01 16:09:06 +0000 Commit: Ed Maste CommitDate: 2023-03-01 16:09:06 +0000 src.conf: regen man page for settings on release branch Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index d7bb2f063fcc..2dea23711981 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd February 28, 2023 +.Dd March 1, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1425,10 +1425,10 @@ by proxy. .It Va WITHOUT_RBOOTD Do not build or install .Xr rbootd 8 . -.It Va WITH_REPRODUCIBLE_BUILD -Exclude build metadata (such as the build time, user, or host) -from the kernel, boot loaders, and uname output, so that builds produce -bit-for-bit identical output. +.It Va WITHOUT_REPRODUCIBLE_BUILD +Include build metadata (such as the build time, user, and host) +in the kernel, boot loaders, and uname output. +Successive builds will not be bit-for-bit identical. .It Va WITHOUT_RESCUE Do not build .Xr rescue 8 . From nobody Wed Mar 1 16:53:53 2023 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 4PRgL93d15z3v5hf; Wed, 1 Mar 2023 16:53:53 +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 4PRgL935hYz3wWm; Wed, 1 Mar 2023 16:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677689633; 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=LGiJeoQ+V7sknwT7S/MTish5okJVlRDsh9QM/e7/ciA=; b=dNI18l6K86aBdvSr8jU0O8nvetk769QdTflX40VUkWXWBHEqg+RK1lWL7Cs3qmk2t0de3s ey7CQeA4VTtS1cXcbZNY4Cr/UmCAkG7+e1WP5Mx/ShdOhsNcGg4O/0ppcwBBQkDb8UtJda r0+NkI8kcFb7bFVyCh4xULqf5U0wES+3h3tk0/OZgF+uOhb7R9W7bVUKEU4aVPkaJxh5Vc o+qc++qrJHVUDQslzKUJVS6TfyEWiD3IM84t3k8kIhHXGK5LYRaYO3HIRhRqALytp8pHdp mfvG+Tl9PQcrVll9j05XP+TTeXfv5B42FgEYcdvNMcRY78M9W/qTIFRojtUh5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677689633; 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=LGiJeoQ+V7sknwT7S/MTish5okJVlRDsh9QM/e7/ciA=; b=SU6NIbPtBjQGyQdqYRmemEQo+HMC7PvAI3A4XfWcQaP6Qbjdr2DwF0x4taz4NQkvFCqLZc f0Bj7WDDqAHNXwsGCJFpD1Bq9cKULWy3kXM2fAau3jEwC/8d7QvWntzTZgi1orj6YjP9tS /coAVO9COse6nLg8lvqlTkbvo1beVM9JdryY5ugN6mL90yoDfhBgJpwM9VT95DrrbE9XtS nf4P8TgMo/D7xjQn7bv+HrlHauq1nLKBgMnDnukmvLXrVkRI8pnqmMWwmsXRI/T/QiRKDn s7uTwLgCco5qEbzEVczh3gMUwcmlq+/vptsNNRcymjZraAW/vCojHhw9l95TLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677689633; a=rsa-sha256; cv=none; b=w2tJii5yL7vfGCAV/eRbIrpAfID3PqK6BySP1uox3Kuy76S2inrHcBQ67Juspt8t2wp3gN dUS6/ohZmrLrNqBZjXJLFwgN+01mTGUJ3Mi5LJTCMXaEjUyDKV8PF6hZuw9C2b9kk+nmy4 MyqxrE/2IKBFztWq6m2D1zxCnQtcJq+rJyUxSVcqe3nqU7YbLl8M207mdI9+Nm6xiXne6a YzW97EQLx3HWjHikYPgkJgvc8VeCQ/Sgaej8Jt+al2DfOM7TLjSHbtjL8JWGdf3X8gRyyo +AdG6nNcf0vNUDKL4ByZs9v0SCCEMH9ZSmSqrtcrni+qTAjyhlCpnLZooGvzJw== 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 4PRgL929skzhx4; Wed, 1 Mar 2023 16:53:53 +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 321GrrMC034245; Wed, 1 Mar 2023 16:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321Grrcl034244; Wed, 1 Mar 2023 16:53:53 GMT (envelope-from git) Date: Wed, 1 Mar 2023 16:53:53 GMT Message-Id: <202303011653.321Grrcl034244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: aa330214cf1d - releng/13.2 - netlink: make the maximum allowed netlink socket buffer runtime tunable. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: aa330214cf1daacfdf706d12c01a34dc2f862693 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=aa330214cf1daacfdf706d12c01a34dc2f862693 commit aa330214cf1daacfdf706d12c01a34dc2f862693 Author: Alexander V. Chernikov AuthorDate: 2023-02-27 10:44:54 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-01 16:53:36 +0000 netlink: make the maximum allowed netlink socket buffer runtime tunable. Dumping large routng tables (>1M paths with multipath) require the socket buffer which is larger than the currently defined limit. Allow the limit to be set in runtime, similar to kern.ipc.maxsockbuf. Reported by: Marek Zarychta MFC after: 1 day Approved by: re(cperciva) (cherry picked from commit 28a5d88f7091d1fc72f4f1bd8562d3c8b15883f5) (cherry picked from commit b656161b84dce0322ab00d7958267fa47cda6318) --- share/man/man4/netlink.4 | 6 ++++++ sys/kern/uipc_socket.c | 3 ++- sys/netlink/netlink_domain.c | 25 ++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/share/man/man4/netlink.4 b/share/man/man4/netlink.4 index 1894de5841fe..c0d9b5a88ade 100644 --- a/share/man/man4/netlink.4 +++ b/share/man/man4/netlink.4 @@ -276,6 +276,12 @@ Default receive buffer for the netlink socket. Note that the socket recvspace has to be least as long as the longest message that can be received from this socket. .El +.Bl -tag -width indent +.It Va net.netlink.nl_maxsockbuf +Maximum receive buffer for the netlink socket that can be set via +.Dv SO_RCVBUF +socket option. +.El .Sh DEBUGGING Netlink implements per-functional-unit debugging, with different severities controllable via the diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index fdf718de2483..5b1e572d786f 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2976,12 +2976,13 @@ sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen) return (0); } +u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ + u_long sogetmaxbuf(struct socket *so) { if (so->so_proto->pr_domain->dom_family != PF_NETLINK) return (sb_max); - u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ return ((priv_check(curthread, PRIV_NET_ROUTE) == 0) ? nl_maxsockbuf : sb_max); } diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index c451274b1e63..348788434175 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -76,9 +76,12 @@ SYSCTL_ULONG(_net_netlink, OID_AUTO, recvspace, CTLFLAG_RW, &nl_recvspace, 0, "Default netlink socket receive space"); extern u_long sb_max_adj; -#if 0 -static u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ -#endif +extern u_long nl_maxsockbuf; +static int sysctl_handle_nl_maxsockbuf(SYSCTL_HANDLER_ARGS); +SYSCTL_OID(_net_netlink, OID_AUTO, nl_maxsockbuf, + CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE, &nl_maxsockbuf, 0, + sysctl_handle_nl_maxsockbuf, "LU", + "Maximum Netlink socket buffer size"); uint32_t nlp_get_pid(const struct nlpcb *nlp) @@ -673,6 +676,22 @@ nl_ctloutput(struct socket *so, struct sockopt *sopt) return (error); } +static int +sysctl_handle_nl_maxsockbuf(SYSCTL_HANDLER_ARGS) +{ + int error = 0; + u_long tmp_maxsockbuf = nl_maxsockbuf; + + error = sysctl_handle_long(oidp, &tmp_maxsockbuf, arg2, req); + if (error || !req->newptr) + return (error); + if (tmp_maxsockbuf < MSIZE + MCLBYTES) + return (EINVAL); + nl_maxsockbuf = tmp_maxsockbuf; + + return (0); +} + #if 0 static int nl_setsbopt(struct socket *so, struct sockopt *sopt) From nobody Wed Mar 1 18:24:36 2023 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 4PRjLr6ZGpz3vBN9; Wed, 1 Mar 2023 18:24:36 +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 4PRjLr67KSz45xb; Wed, 1 Mar 2023 18:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695076; 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=FaEvVwFvQbNN8HduRnwHYkiFMprYdP4xwKKBRSOIew4=; b=jUZWU8jOvhhMWVqCMQ6ADoCJ5wiLaC9Jk98rV9aD75mOsdPyeHMsbnqwJbQI5A/gJyROs8 Fhm05NA+o9mOGZ0hKFFGbm/qQ3PNrPGCYp4uvHZngry1Iv6H99d2JYdKGqrxZESw7/0CH8 6wG08grIz1oWQfEINoa70PCHspbpzty1MW2PnzfooURih8rx7WWrPk8mgtfkTDXUrIzcL1 o9yn6QGWZWaKu1ILJKSFoVus0kialeD1Bx8BSuO6txhR2YRx5oaiYAb5xNzx9tlZGKCdCV Pcgb6foTyjYFbV75CwkQMMlKqIMKciYrpbmi7tyaGG0Xhep7xJpmQM+cbDtIIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695076; 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=FaEvVwFvQbNN8HduRnwHYkiFMprYdP4xwKKBRSOIew4=; b=I26Ptvfkxx2uYZA6NvgY2zcymI2pCOaejiq6ruvWkMSZv9kNxhJc4GEsHXz1SvqVW0rOWQ PcAULMAg6cCvpyOVwdFzsNZ/nliOO4slHp6ka2LdR4Sss1AE6B6bMImobgSse27dNCOCKh 06bxdHWoamXmldvt7d2I6xdF0feQCt4g9O82uD4fn96p8A8NGiBtwNbG6D4oqMEGeJgis7 0Cp/SwRq/nyR25avBVsr/INgx8p2LwYTamfaqPM1GQaBgvP9LIj8qiyKzyoW7UAYX/psxv w/SQNTG4TILzevA5K+92YudoOSwszkvqwvDOMHZtDBYlJf9GocpZUmtYfQal6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677695076; a=rsa-sha256; cv=none; b=hpl8i8YOcTsC3vcDwv40KEd/EyUhOXUE6WVf2w5YA5L6Ha8q4MUpFBqh1Zf7lu9ckZS5r1 kxLgAY8QcSToJnwgL6MVVhIKXH2/4BtSuLOcLgPam/RDdctBxOg6TI9t6DBmIKM/UlnmOn UZm+6NnINR+yWWrS9osN5lpfzOp3sysW+znLUo6qMbavD6OU13b1Yl5vS2FP9CWkodKWnY CwfBPwHNqrHDxvWchKHGHZuUKpvml8X6TePX0fVf7+lkLWvy2QFUjzgqn3fC9q0+EZ/J2M b+W7AXsf108hIm5XZlsN/cLI6AQ6pkT0EzQAPbN8ccIsCj45ku9toar56VCDTw== 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 4PRjLr5BxQzl1c; Wed, 1 Mar 2023 18:24:36 +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 321IOabB083960; Wed, 1 Mar 2023 18:24:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IOaY8083959; Wed, 1 Mar 2023 18:24:36 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:24:36 GMT Message-Id: <202303011824.321IOaY8083959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 3912f99ecae6 - stable/13 - Ensure .inc files are regenerated when llvm/clang tblgen binaries change 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3912f99ecae61dc7fe89c076a654332e3adb1bdc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3912f99ecae61dc7fe89c076a654332e3adb1bdc commit 3912f99ecae61dc7fe89c076a654332e3adb1bdc Author: Dimitry Andric AuthorDate: 2023-02-25 15:25:57 +0000 Commit: Dimitry Andric CommitDate: 2023-03-01 18:24:18 +0000 Ensure .inc files are regenerated when llvm/clang tblgen binaries change When doing a fully incremental build (with WITHOUT_CLEAN enabled), from a commit before llvm 15 was merged (3264f6b88fce), to a commit after that, a number of .inc files were not regenerated. This could lead to unexpected compilation errors when these .inc files were included from llvm-project sources, similar to: In file included from /usr/src/contrib/llvm-project/clang/lib/CodeGen/CGBuiltin.cpp:8268: /usr/obj/usr/src/amd64.amd64/lib/clang/libclang/clang/Basic/arm_mve_builtin_cg.inc:279:18: error: no matching constructor for initialization of 'clang::CodeGen::Address' Address Val2 = Address(Val1, CharUnits::fromQuantity(2)); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Work around this by making the .inc files dependent on the tblgen binary used for generating them. E.g., we can relatively safely assume that if the binary gets updated, the .inc files must also be updated. (Although this is not 100% optimal, the gain by complicating things even more is probaby not worth the effort.) MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38770 (cherry picked from commit ab80f0b21fbb9c44d40e6f7a99090188f4ed2f71) --- lib/clang/clang.pre.mk | 1 + lib/clang/headers/Makefile | 2 ++ lib/clang/libclang/Makefile | 22 +++++++++++++++------- lib/clang/liblldb/Makefile | 3 +++ lib/clang/libllvm/Makefile | 2 ++ lib/clang/llvm.pre.mk | 1 + usr.bin/clang/lld/Makefile | 2 ++ usr.bin/clang/lldb-server/Makefile | 2 ++ usr.bin/clang/lldb/Makefile | 2 ++ usr.bin/clang/llvm-cxxfilt/Makefile | 2 ++ usr.bin/clang/llvm-nm/Makefile | 2 ++ usr.bin/clang/llvm-objcopy/Makefile | 2 ++ usr.bin/clang/llvm-objdump/Makefile | 2 ++ usr.bin/clang/llvm-readobj/Makefile | 2 ++ usr.bin/clang/llvm-size/Makefile | 2 ++ usr.bin/clang/llvm-strings/Makefile | 2 ++ usr.bin/clang/llvm-symbolizer/Makefile | 2 ++ 17 files changed, 46 insertions(+), 7 deletions(-) diff --git a/lib/clang/clang.pre.mk b/lib/clang/clang.pre.mk index 520a9300e6ce..9ef401645f14 100644 --- a/lib/clang/clang.pre.mk +++ b/lib/clang/clang.pre.mk @@ -5,3 +5,4 @@ CLANG_SRCS= ${LLVM_BASE}/clang CLANG_TBLGEN?= clang-tblgen +CLANG_TBLGEN_BIN!= which ${CLANG_TBLGEN} diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index 80a1250f6366..c4643e9353e6 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -200,6 +200,8 @@ riscv_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td GENINCS+= riscv_${hdr:H}.h .endfor +${GENINCS}: ${CLANG_TBLGEN_BIN} + CLEANFILES= ${GENINCS} ${GENINCS:C/$/.d/} .include diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index a2612bc9d894..cdffedfe3d36 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1010,13 +1010,6 @@ clang/Basic/riscv_vector_builtin_cg.inc: \ -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td TGHDRS+= clang/Basic/riscv_vector_builtin_cg.inc -clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Driver/Options.td -TGHDRS+= clang/Driver/Options.inc - clang/Parse/AttrParserStringSwitches.inc: \ ${CLANG_SRCS}/include/clang/Basic/Attr.td ${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \ @@ -1094,10 +1087,25 @@ OpenCLBuiltins.inc: ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td TGHDRS+= OpenCLBuiltins.inc +${TGHDRS}: ${CLANG_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} +clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td + ${LLVM_TBLGEN} -gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Driver/Options.td +LTGHDRS+= clang/Driver/Options.inc + +${LTGHDRS}: ${LLVM_TBLGEN_BIN} + +DEPENDFILES+= ${LTGHDRS:C/$/.d/} +DPSRCS+= ${LTGHDRS} +CLEANFILES+= ${LTGHDRS} ${LTGHDRS:C/$/.d/} + .include "../clang.build.mk" INTERNALLIB= diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 28778cb04c57..dbf9c6d696e7 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -693,6 +693,7 @@ SRCS+= Utility/VMRange.cpp SRCS+= Version/Version.cpp LLDB_TBLGEN?= lldb-tblgen +LLDB_TBLGEN_BIN!= which ${LLDB_TBLGEN} CommandOptions.inc: ${LLDB_SRCS}/source/Commands/Options.td ${LLDB_TBLGEN} -gen-lldb-option-defs \ @@ -720,6 +721,8 @@ ${path:T}PropertiesEnum.inc: ${LLDB_SRCS}/source/${path}Properties.td TGHDRS+= ${path:T}PropertiesEnum.inc .endfor +${TGHDRS}: ${LLDB_TBLGEN_BIN} + DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 868f9aa48964..ef9d87dd7d2f 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2026,6 +2026,8 @@ TGHDRS+= X86GenRegisterInfo.inc TGHDRS+= X86GenSubtargetInfo.inc .endif # MK_LLVM_TARGET_X86 +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/lib/clang/llvm.pre.mk b/lib/clang/llvm.pre.mk index 774d7d47ea37..92124a7bf092 100644 --- a/lib/clang/llvm.pre.mk +++ b/lib/clang/llvm.pre.mk @@ -5,3 +5,4 @@ LLVM_BASE= ${SRCTOP}/contrib/llvm-project LLVM_SRCS= ${LLVM_BASE}/llvm LLVM_TBLGEN?= llvm-tblgen +LLVM_TBLGEN_BIN!= which ${LLVM_TBLGEN} diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 9f114dbb81bf..1113072e4e9d 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -95,6 +95,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 9c3883984618..efe8529f3611 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -37,6 +37,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 10ffd3b90057..8e160b18eaa5 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -30,6 +30,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index a61e32db9aa7..073316b7b4a7 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -19,6 +19,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 0df48744632d..d3099e5a75be 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -19,6 +19,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 80aa29949edf..995a8b461344 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -36,6 +36,8 @@ ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index 443128460f99..8a9587129f36 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -25,6 +25,8 @@ ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index 4b547d81c583..8926eb03bdbf 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -30,6 +30,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index 20bd5de61192..f39e5db6f872 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -19,6 +19,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-strings/Makefile b/usr.bin/clang/llvm-strings/Makefile index 1438aa847997..253766ba084d 100644 --- a/usr.bin/clang/llvm-strings/Makefile +++ b/usr.bin/clang/llvm-strings/Makefile @@ -17,6 +17,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index c4677169f912..ae417356df6b 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -20,6 +20,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} From nobody Thu Mar 2 02:30:53 2023 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 4PRw7x6J5hz3vhdN; Thu, 2 Mar 2023 02:30:53 +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 4PRw7x5Kdwz415b; Thu, 2 Mar 2023 02:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677724253; 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=IZ3EngTE4AqFh0rYrJupBOZ69BDyy7aBGxxWi0T2PbE=; b=I3KDbEzD6EvplIP4oxHVXRIUKWOrTvYrzds50FUjbNOtw65cs+b3EfdVcVZL0puQsPwuXl MoUC3oe+oqdi9VithWTmmXFOr5IK58j1TO5dkJiKYMmZupFffFDr9kq8yvxBnGy8xoTZH2 WRIJf9gVz0cJI8Z79E+iNpLs6G65t8ej19l69TeLAqFt9GVhJKBIE5edfvGoRp2b9FntUk g+SWJbAzsd/2FQjTuczwcqr+y72r0EmiSI+KJe88qFOhlwFfjNV67VlxO6v07EhMbsMkHV oN94QlPPVPdlCD8VsEnzhMEiMP+bANTmMu+cWTYU2fnw9f9c6TLuBMKzAhTiwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677724253; 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=IZ3EngTE4AqFh0rYrJupBOZ69BDyy7aBGxxWi0T2PbE=; b=nuLOckwv5xdrjYOY2OWxAiTUg6vfl3ZYm+I0NeA1lbHhHntKGPXQZKayjXp77GsiqKxLQz FEng9+lygqZfvHzwDmAA7n2Ocao6ndU8QMsKvn6zX+4bxOgO4C/yioek5sKeVj1ZovaPic ZvLUeMgO1j+BwGel6ZmKZ2bzVmLf5Y1FC6SXnVetZsW766JtSwY5e1dx5anDEt2jq4/IMf RB2WNPzhS79UNR/U+SbaTls6G2ebzk+9L7M0jaknFs8Y7lLkOAyGMrLUBNO5PORu4YjWnb CbaWfS3hRFMuvjToOV9mQOsoq1xylAgobdqWiqkUzbcY/ER1VZVSfhUU6Rll1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677724253; a=rsa-sha256; cv=none; b=slrKoCS8fusB4EgNLBYesmZi2bUutTqpob8UJGxMTN75sbX31zYJrgbbL+HjxMuWd6qBuL 2TAjfj4eGdPYtblp6D2DXxo46G4RTSzlprSZQSghQV5qQAhaFmFiSA8mGcG8k3y28Xo5WS bIchu7vc4lyoebjTQ/5TkicRh9K8mtsIOdnmyg64rI/lcdz514x1vvPhnU0xz2mZGiNIWd pAdMh/yt/iYR84NgOO3FaJ8hJ98J02EmU5MtOUBHt9PIDbbcZw4gQ45c+7Py6NN7Hd6TnW 9ZHT/HYV6oCwr4rfkPc07uDZ6ekMcxaj9vclR6DC/QelDfaXJGFJ55fT8sSFUg== 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 4PRw7x4PM3zy1p; Thu, 2 Mar 2023 02:30:53 +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 3222Ur9t081780; Thu, 2 Mar 2023 02:30:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3222UrC6081779; Thu, 2 Mar 2023 02:30:53 GMT (envelope-from git) Date: Thu, 2 Mar 2023 02:30:53 GMT Message-Id: <202303020230.3222UrC6081779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 84494004f925 - stable/13 - tmpfs: support the nosymfollow mount option 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 84494004f9258b90f34c535cc5de6a176b0ee2b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=84494004f9258b90f34c535cc5de6a176b0ee2b0 commit 84494004f9258b90f34c535cc5de6a176b0ee2b0 Author: Konstantin Belousov AuthorDate: 2023-02-23 13:15:17 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-02 02:30:24 +0000 tmpfs: support the nosymfollow mount option PR: 269772 (cherry picked from commit 15df90218bb62df96ce27f47ad9953f4c1f37900) --- sys/fs/tmpfs/tmpfs_vfsops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index 883cdd060ce6..019d04adc75f 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -93,11 +93,11 @@ static int tmpfs_statfs(struct mount *, struct statfs *); static const char *tmpfs_opts[] = { "from", "size", "maxfilesize", "inodes", "uid", "gid", "mode", "export", - "union", "nonc", "nomtime", NULL + "union", "nonc", "nomtime", "nosymfollow", NULL }; static const char *tmpfs_updateopts[] = { - "from", "export", "nomtime", "size", NULL + "from", "export", "nomtime", "size", "nosymfollow", NULL }; static int From nobody Thu Mar 2 02:56:49 2023 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 4PRwjs3hZbz3vjSP; Thu, 2 Mar 2023 02:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRwjs35Fvz43VB; Thu, 2 Mar 2023 02:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677725809; 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=SzHXzZyEoSPO2Dzs9n5wK8G2ldFK4DlY3LlVMZNJZU8=; b=Nzfd2uAk3pTWifW20HbESZS/a4z1j20RaaleYtLHgQJEK/5QI9g3NRdPqBQfZrwRTdANxG h5zLQiFzVPPjxqeOK+0V+9BzJ/6K6HI6kI55Ud/vf5mbyVVaBEZh2rFTcZUHe5PqQv2w8S aBppB1eGo7lxXUHo6Twa6XO9ByinfEFwA4pemRGkBxsRj1vWFhfpg1OA/a6ZHVvZJn4oMf D16cVONw+o54LNulRd8mEfDBDx6X/QVosLH6X7qhAJO3WKYk8BsDIPAWiKMIuDIdQbw7Q8 hZADFmZY12+/z3wc9/wSP9kmwa6mRCIy78bofreiHOADiopsgr06ZmY1wImWJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677725809; 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=SzHXzZyEoSPO2Dzs9n5wK8G2ldFK4DlY3LlVMZNJZU8=; b=o1C4MIhemLaUTwO7503oRgD7eUgAicpFox1krhyKtrgrUeaxKRgyVujeCNDCo4Qt7qJMXl fICe2MSsx3Sag5ymxoF4KuPT2oZwrJNiSojwHu2yEDEnXKWq83gEZBR3jmHF8c+dCfY4yN sYqsZbofx/CqDiIFhVzHcGVQfd/7ADZW2uDidhMnK3PiiGTiGUNpsnHcV5ggmq2fEu6vPZ cj9jFIQbkbTeLI5Guo3NjiuczFzbKHTLDHVAHd+v0yIVCNiDL3LzETj8Cz5HXcd3HN7sfZ cA8x4YC3mfAg1AvS2khi7pGvaqmhoZL6hg+zk3fPbHd12axbZCM2xEqC/u/D/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677725809; a=rsa-sha256; cv=none; b=B1KGQJtaf1tdrzMAtogS/nHobciEYf/s8DxV9lqcOr6OCbHrpBKjjIhuRbe+kgFcTPXa9s 6edNbPb8NNF0nfdJgySLSUb+4fHXvLgP4z5tYYEUDUdVOopEeCGiTOp49XutwxOBQyWKpV vDQrjwuqFJxVhZbIpX8BBq+W3zmcwIt6MifilUB9XiFTsHk1C8J+gvHEHYcIL5DmyH2m20 7yOdIZRzy9rpGW5O3wTtg7wMyXx8lDdTyOZupKmoqbKMM+ydcuCcAymIJbhx+VLA0I58Wi 2p8UifmdnI2qOWTZrSYvo/AiydzEfwNAZ6Sh/u1GMfkzfx1NfVBbH3u0ubqTSw== 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 4PRwjs1qgCzyv2; Thu, 2 Mar 2023 02:56:49 +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 3222unu4019766; Thu, 2 Mar 2023 02:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3222unrJ019765; Thu, 2 Mar 2023 02:56:49 GMT (envelope-from git) Date: Thu, 2 Mar 2023 02:56:49 GMT Message-Id: <202303020256.3222unrJ019765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 95f418fe2a0f - stable/13 - Delete obsolete Solaris compat header file stdlib.h 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95f418fe2a0fb96080afbd2afc160929a32d12fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=95f418fe2a0fb96080afbd2afc160929a32d12fb commit 95f418fe2a0fb96080afbd2afc160929a32d12fb Author: Zhenlei Huang AuthorDate: 2023-02-23 18:00:09 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-02 02:56:05 +0000 Delete obsolete Solaris compat header file stdlib.h This drops function `getexecname()` redirection. Historically `getexecname()` is a compatibility definition. Since openzfs has its own implementation of function `getexecname()` in libspl and has been merged into base, the compat header file stdlib.h is no longer needed and should not be used. Also without this fix libspl will end up an incompatible version of `getprogname()` with libc. In particular, if zfs is enabled, programs such as pgrep in /rescue can be wrongly statically linked with libspl and will not function properly. PR: 269738 Reviewed by: markj Fixes: 9e5787d2284e Merge OpenZFS support in to HEAD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38733 (cherry picked from commit 7f0ebf0876c82a098bd5815ea6bf3a8efa6dd6f3) --- cddl/compat/opensolaris/include/stdlib.h | 37 -------------------------------- 1 file changed, 37 deletions(-) diff --git a/cddl/compat/opensolaris/include/stdlib.h b/cddl/compat/opensolaris/include/stdlib.h deleted file mode 100644 index 9ba32322c03b..000000000000 --- a/cddl/compat/opensolaris/include/stdlib.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2007 John Birrell - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - * - */ - -#include_next - -#ifndef _COMPAT_OPENSOLARIS_STDLIB_H_ -#define _COMPAT_OPENSOLARIS_STDLIB_H_ - -#define getexecname getprogname - -#endif From nobody Thu Mar 2 03:10:00 2023 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 4PRx146KjFz3vkFQ; Thu, 2 Mar 2023 03:10:00 +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 4PRx145nbGz4897; Thu, 2 Mar 2023 03:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726600; 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=rtYrzJJ4NNn7PO5RS0rGIRcf2gYUpcAFC71tpiVyHKE=; b=fQ5O+tvrBfMWmvDe5e1kMweNxEXoW44kFXvFsCiObEq/X89Cqy4AqJxBEFxECwMxsd6+jT GWGV3nG7GJ5Cw84WX9uotbGic6HqngMxfzRkzMOV1b96zyz/Y3LmQswkDViR3qOcOvci/a zARKdfHKeDkCKXqav/92MktnQfsS3S5bWGU39nraCW5TD2Qpx6i/ezs7I8xNV3V8n7Vj3o ZVitud1FsWYI/HoeCpd2cG6ffyDi6BELF/Z2pprD6aK2LmPZHy0yURhLTvT/XMGmSj03sj 2MDTC9qkHscuSqSfwB+x3usIN6A/KI8WCv0dblGeQ9MOKeRA2MyRieb8nxLL2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726600; 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=rtYrzJJ4NNn7PO5RS0rGIRcf2gYUpcAFC71tpiVyHKE=; b=a5NH3XQOZbRGEvNGYHg3EA1F2JrivUlnMUpcuzXZ+NPXPr3N8H1M9OihwKqjrzIh+wbg3B qWODtRFDd5sEErQ6Cys76EUreulXh8awv/HTwUw5ZbWUD1rjlaFZwGCKRmPWryCOxTt3Hw yKVVlbIlwuSiksRQ5OqjFhiOb+dEZc39jAybFS7AnVHcOgFvIRFLd6CP2mfGPo2X4PJJA9 iNV4nS4Lo6PN79NGyrnRv9OKdSlnxxW+BMsluyXab4lWkHnkMeFWR1QGghODpc2R24JQaM nozBkdd/V4WscDnjV4n8y8X24RGzYfkDOt1Q9Run89vrbBz6AzUPqfRrioajEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726600; a=rsa-sha256; cv=none; b=iwqOlDObLBtaO/shSQBPyjnDbRlRxeu+UtSPB6C6VUHSiSJzB3xu62NXBFOBZHzaa4Tfhu ZF9TR+QGnOBlNcRL+UbrKmboojhvQCIW438ghJODE69moOrb0+EHfGXa4bphVy7u1/lXjS J3jqvWr4rdRIs7IUvHRTvjsSe/a+IVq3Q+opTkK0hN1o33P/x2Q8mTAJee3G+5JRcjqK5o eFlvO74zDQGPcYoJQG+NKryEdvXzQMsJ3qA6GnOnqv3XzNk3cib6nOiO7fQNwOhMUjasEG tBiNv6Ib/Pj89djTxWIdSd/3Os2z8GhhMs5dzvBPkNldshhFXr4C8jCvVO2Jtw== 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 4PRx144r84z10j0; Thu, 2 Mar 2023 03:10:00 +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 3223A0l3041225; Thu, 2 Mar 2023 03:10:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3223A0Wm041199; Thu, 2 Mar 2023 03:10:00 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:10:00 GMT Message-Id: <202303020310.3223A0Wm041199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 43fd77233cd4 - stable/13 - ssh: default VerifyHostKeyDNS to no, following upstream 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 43fd77233cd49061839cfdd936cfeba53e9855c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=43fd77233cd49061839cfdd936cfeba53e9855c3 commit 43fd77233cd49061839cfdd936cfeba53e9855c3 Author: Ed Maste AuthorDate: 2023-02-17 01:26:41 +0000 Commit: Ed Maste CommitDate: 2023-03-02 03:09:45 +0000 ssh: default VerifyHostKeyDNS to no, following upstream Revert to upstream's default. Using VerifyHostKeyDNS may depend on a trusted nameserver and network path. This reverts commit 83c6a5242c80160fff76fb85454938761645b0c4. Reported by: David Leadbeater, G-Research Reviewed by: gordon Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38648 (cherry picked from commit 41ff5ea22cb95deb9e7415510eb2f5f00b91537a) --- crypto/openssh/FREEBSD-upgrade | 1 - crypto/openssh/readconf.c | 6 ------ crypto/openssh/ssh_config | 1 - crypto/openssh/ssh_config.5 | 5 +---- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index c8603577a2a2..17161df93316 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -136,7 +136,6 @@ We've modified some configuration defaults in ssh: - CheckHostIP defaults to "no". - - VerifyHostKeyDNS defaults to "yes" if built with LDNS. - VersionAddendum defaults to "FreeBSD-YYYYMMDD". 3) Canonic host names diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 3440d05e4e3b..52c9c47c6879 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -2611,14 +2611,8 @@ fill_default_options(Options * options) options->rekey_limit = 0; if (options->rekey_interval == -1) options->rekey_interval = 0; -#if HAVE_LDNS - if (options->verify_host_key_dns == -1) - /* automatically trust a verified SSHFP record */ - options->verify_host_key_dns = 1; -#else if (options->verify_host_key_dns == -1) options->verify_host_key_dns = 0; -#endif if (options->server_alive_interval == -1) options->server_alive_interval = 0; if (options->server_alive_count_max == -1) diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index 7c7ad542e4ef..2dee303a128e 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -44,5 +44,4 @@ # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h # UserKnownHostsFile ~/.ssh/known_hosts.d/%k -# VerifyHostKeyDNS yes # VersionAddendum FreeBSD-20220415 diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index b642c5a6b17a..d783ea6ff835 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -1994,10 +1994,7 @@ need to confirm new host keys according to the .Cm StrictHostKeyChecking option. The default is -.Cm yes -if compiled with LDNS and -.Cm no -otherwise. +.Cm no . .Pp See also .Sx VERIFYING HOST KEYS From nobody Thu Mar 2 03:12:40 2023 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 4PRx483YFnz3vkTk; Thu, 2 Mar 2023 03:12:40 +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 4PRx4834y5z49gT; Thu, 2 Mar 2023 03:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726760; 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=oALiJ+P5cnb6bKrYviCjl+iZfYYMtDYZvKWkq3FZ8BY=; b=nmWqWyxlfTvwetbY+WKaRSCllBCNjkqdv1OFsn4Zi4ZpbRbJJrzwL9xbboKnaaY1Oz0/Di i5xWegfKN8QLW48M371F7fHKQ7nqKxsG6MFBMpwktL5OkYLXdzsHf171Jsa6txBCjkXlva 6MJddDXBVynpzzPi69ae6EjjH3TZEuv8Tf63Fjb1LzgTHIYNLZL4+qNi9vApcga537d6If B7KbLqSXL75qtUCNhHZjHf9nmX4i3X1jwLrQOxVqlPn1SHA9BNPD2t+qtkvDe2c1PMeiQO n3V+/RvdLQruOPJlvDK88ACDJj5/yPIA0t0FfnzLvd0GD7y7dWynSVwFft/5Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726760; 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=oALiJ+P5cnb6bKrYviCjl+iZfYYMtDYZvKWkq3FZ8BY=; b=hiYapGI3W/yAjOyXMdXR08MhPsUohsOW6Rz1BQ50SYmXziOnEORY8Up5ridrj9eayxcJnL bNe9chRSj2II4GGQbXp+njO7Ohyi/dg66qb1gB8zuzuqUpRPtj+ohQuCnwcdJBVyoxb2ML 8meduAlf/HT5pXWAZvMCXSxR1BSMyRl6Lu4Tk1blwgGrxyPW0yclcK3HpaTft5lYNcaTuf m+Y7NirZbfjG9Ct/n9b3Zxgp716Rjw3/H5YbT8EhGE29/jF2VF4lyKwUoDfD98FiQlq3c6 n2PLm7YHAu8hQBZXbh4IovlJB4D3IeBcn5fep3ZVHAy6XkE4JvZ696QuxvmPZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726760; a=rsa-sha256; cv=none; b=Xmj+6gektOsinqkFmDH0Ut8ht4glT2H3CeqSYOm7VSCFXpe6gqjUS5szpH+Ee8IzPCgt/J 8fPLRG6bi6JM/aPFJlsKa26MugV6KjdMKLNodnvZSLzfGYnH4fBvOOa6vEr5Qv5OQ6a2E6 emI19jQmRQ2S0Na/dQTiBnBlEolB8+qtD6TdLUuwbtsfE1SS5cN/Q3Niq0L1UyLOtemu3X TTFb5hVgsH4oD0lTHIVb8o5wym5zgggR8ts4tSiqg3GBL6Khyw13qpSzY4krwLzmZmfJoG 9L0xpM2xEvbQsP0HonE+NvDFXFi/8JyXvjA4ZY6RWvByi4y12YczXRPkWHNp0A== 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 4PRx4829hcz10vj; Thu, 2 Mar 2023 03:12:40 +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 3223Ceol055216; Thu, 2 Mar 2023 03:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3223CeGl055215; Thu, 2 Mar 2023 03:12:40 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:12:40 GMT Message-Id: <202303020312.3223CeGl055215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cf25fa7f31e7 - stable/13 - amd64: Avoid copying td_frame from kernel procs 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf25fa7f31e7bda9b8aa20757659524db9c4ef97 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cf25fa7f31e7bda9b8aa20757659524db9c4ef97 commit cf25fa7f31e7bda9b8aa20757659524db9c4ef97 Author: Mark Johnston AuthorDate: 2021-09-25 14:15:31 +0000 Commit: Ed Maste CommitDate: 2023-03-02 03:11:16 +0000 amd64: Avoid copying td_frame from kernel procs When creating a new thread, we unconditionally copy td_frame from the creating thread. For threads which never return to user mode, this is unnecessary since td_frame just points to the base of the stack or a random interrupt frame. If KASAN is configured this copying may also trigger false positives since the td_frame region may contain poisoned stack regions. It was not noticed before since thread0 used a dummy proc0_tf trapframe, and kernel procs are generally created by thread0. Since commit df8dd6025af88a99d34f549fa9591a9b8f9b75b1, though, we call cpu_thread_alloc(&thread0) when initializing FPU state, which reinitializes thread0.td_frame. Work around the problem by not copying the frame unless the copying thread came from user mode. While here, de-duplicate the copying and remove redundant re(initialization) of td_frame. Reported by: syzbot+2ec89312bffbf38d9aec@syzkaller.appspotmail.com Reviewed by: kib Fixes: df8dd6025af8 MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32057 (cherry picked from commit ca1e447b1048b26b855d7f7fbcdad78309e4d741) --- sys/amd64/amd64/vm_machdep.c | 48 +++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index e308f4a44b3e..c9c498180c7e 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -193,6 +193,24 @@ copy_thread(struct thread *td1, struct thread *td2) td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I; pmap_thread_init_invl_gen(td2); + + /* + * Copy the trap frame for the return to user mode as if from a syscall. + * This copies most of the user mode register values. Some of these + * registers are rewritten by cpu_set_upcall() and linux_set_upcall(). + */ + if ((td1->td_proc->p_flag & P_KPROC) == 0) { + bcopy(td1->td_frame, td2->td_frame, sizeof(struct trapframe)); + + /* + * If the current thread has the trap bit set (i.e. a debugger + * had single stepped the process to the system call), we need + * to clear the trap flag from the new frame. Otherwise, the new + * thread will receive a (likely unexpected) SIGTRAP when it + * executes the first instruction after returning to userland. + */ + td2->td_frame->tf_rflags &= ~PSL_T; + } } /* @@ -236,23 +254,9 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) mdp2 = &p2->p_md; bcopy(&p1->p_md, mdp2, sizeof(*mdp2)); - /* - * Copy the trap frame for the return to user mode as if from a - * syscall. This copies most of the user mode register values. - */ - td2->td_frame = (struct trapframe *)td2->td_md.md_stack_base - 1; - bcopy(td1->td_frame, td2->td_frame, sizeof(struct trapframe)); - /* Set child return values. */ p2->p_sysent->sv_set_fork_retval(td2); - /* - * If the parent process has the trap bit set (i.e. a debugger - * had single stepped the process to the system call), we need - * to clear the trap flag from the new frame. - */ - td2->td_frame->tf_rflags &= ~PSL_T; - /* As on i386, do not copy io permission bitmap. */ pcb2->pcb_tssp = NULL; @@ -602,22 +606,6 @@ cpu_copy_thread(struct thread *td, struct thread *td0) { copy_thread(td0, td); - /* - * Copy user general-purpose registers. - * - * Some of these registers are rewritten by cpu_set_upcall() - * and linux_set_upcall(). - */ - bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe)); - - /* If the current thread has the trap bit set (i.e. a debugger had - * single stepped the process to the system call), we need to clear - * the trap flag from the new frame. Otherwise, the new thread will - * receive a (likely unexpected) SIGTRAP when it executes the first - * instruction after returning to userland. - */ - td->td_frame->tf_rflags &= ~PSL_T; - set_pcb_flags_raw(td->td_pcb, PCB_FULL_IRET); } From nobody Thu Mar 2 08:29:00 2023 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 4PS4585fFwz3w2g2; Thu, 2 Mar 2023 08:29:00 +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 4PS45859H7z3h1r; Thu, 2 Mar 2023 08:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677745740; 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=E4XBMnjBmTmMacCt02Gjo9whtCJD1Q6ZTgGwubLNiZE=; b=xbucNmp46QkdzbPdcU4902WJoO6Z5RdnWdFAkc4yJoBEWUp3uPubh2zInyEJX649S/ZOS3 gZsvP9qDOD3d0mZ8ubTz/E9AGFmNta05FH0srPFyjqs+JiNynoz41ZxwQxJyMVdUtO1/FV 1cXvai/OfM1TxaAU3fUaahUL/mFWITYzkvjOvYZPm1hE1Xq08Iv4162YIVq6cUlM8SxDwt glBMZoudUc1KkURnFKwh8e6tZibLkPG/gW0HOXW/fComBmtJzLgenWIt79KMCAafre8VR6 ycD0j8MY05sm/XEhHKZ6BagboKzN7W+9nH93+CjZ6bxclztx2wDOCk/OvYrXgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677745740; 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=E4XBMnjBmTmMacCt02Gjo9whtCJD1Q6ZTgGwubLNiZE=; b=xUyh3q/Nxzo0P7z3U0NXp2npuRrLG9t4TviwUxK2XSzfvvWwWoOw6jqDdrNiVgHHn+P1Dq lG5apmhRUvQ14iWieSyCOmATgiwesaPmg5p37npxKxsl2z/YhJ2T5SqiQX0VAn7f8MDq+o 8Vh6z3kQBcFpJVit6L/0lr1JE+TUGNMv/aCc3heO2nidVmKsGwbDTK+bZk15CgAVzbet4m hUYbylk+KlQo0NeWYSRQboYHrHjlxFUAVBsjR6RzZckM3JsnSzkmF+ooEyXbgXFiTVLNvk yVJ3uIJntX7O1ueakC7FpnpvBByKBHwBP4iGbVx6N8F7nwY6+mMXysT18F8JIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677745740; a=rsa-sha256; cv=none; b=cqhwvZMPhv0uBinxMC7iYY++icBDA3+5q/fCHziuz2njB1SmhBX1FBiQ4C0Ye1tGZ3ROAX deTIgm+mZyC7yjgbtPjpwpM4T7Ec7AUdcWCPiMTDr3mePGi3ECFK7htO1Fyxsoki/j+2A4 eHa8JyK2VVOCd12TAuovLo6SzfUSuM+xDj3SkBmBziEVQ8YCehbyGe5mzf13pab8UcAuUE AL2QHFBiWSZaiUtlUqvIC1+1EZVRrFa7I9f8gBxzpKVXfRamyy80SiiJlfKZcEbwpS2/on l4t6C3dX6CAj72bvSRwxy+W8ywZzuOx1eIeRtXIt/AptAIp8tjsfzA/S0S5YxA== 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 4PS4584CrKz17vm; Thu, 2 Mar 2023 08:29:00 +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 3228T0nK066175; Thu, 2 Mar 2023 08:29:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3228T05n066174; Thu, 2 Mar 2023 08:29:00 GMT (envelope-from git) Date: Thu, 2 Mar 2023 08:29:00 GMT Message-Id: <202303020829.3228T05n066174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 83d88726ce26 - releng/13.2 - ctfdump: Use getprogname() 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 83d88726ce267979e320e03270710d11e4f210d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=83d88726ce267979e320e03270710d11e4f210d9 commit 83d88726ce267979e320e03270710d11e4f210d9 Author: Zhenlei Huang AuthorDate: 2023-02-23 16:28:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-02 08:12:15 +0000 ctfdump: Use getprogname() Also remove no longer used function `getpname()`. Reviewed by: markj Approved by: re (delphij) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D38740 (cherry picked from commit 3dd5524264095ed8612c28908e13f80668eff2f9) (cherry picked from commit 994eb2fb8a901c883f2bd24fa29c6cd513cb4340) ctf: Remove unused function prototype for getpname() (cherry picked from commit f8e1aa85fed08d5f689cb36d65a76d191f6500dd) (cherry picked from commit eba26d0ba37e647572b3ec285352f778ef0ec9f0) --- cddl/contrib/opensolaris/tools/ctf/common/utils.c | 24 ----------------------- cddl/contrib/opensolaris/tools/ctf/common/utils.h | 2 -- cddl/contrib/opensolaris/tools/ctf/dump/dump.c | 2 +- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.c b/cddl/contrib/opensolaris/tools/ctf/common/utils.c index f74eb8de40fa..fda29486d94b 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.c +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.c @@ -35,30 +35,6 @@ /*LINTLIBRARY*/ -static const char *pname; - -#pragma init(getpname) -const char * -getpname(void) -{ - const char *p, *q; - - if (pname != NULL) - return (pname); - - if ((p = getexecname()) != NULL) - q = strrchr(p, '/'); - else - q = NULL; - - if (q == NULL) - pname = p; - else - pname = q + 1; - - return (pname); -} - void vdie(const char *format, va_list alist) { diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.h b/cddl/contrib/opensolaris/tools/ctf/common/utils.h index 99378bb4f251..6918bdab89aa 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.h +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.h @@ -42,8 +42,6 @@ extern "C" { extern void vdie(const char *, va_list); extern void die(const char *, ...); -extern const char *getpname(void); - #ifdef __cplusplus } #endif diff --git a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c index 06c00a7b0e7f..5cbf46af1b73 100644 --- a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c +++ b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c @@ -856,7 +856,7 @@ print_stats(void) static int print_usage(FILE *fp, int verbose) { - (void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getpname()); + (void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getprogname()); if (verbose) { (void) fprintf(fp, From nobody Thu Mar 2 08:29:01 2023 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 4PS4596Rqvz3w2SD; Thu, 2 Mar 2023 08:29:01 +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 4PS45962J9z3RG3; Thu, 2 Mar 2023 08:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677745741; 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=IaKO5K8i3nJOKN50wUg71+8bwHJTHbChdO2pguCKHao=; b=qGjaSnNqlmajbun/KbLHsCEVaQ4MYC4GqIj++V5+GQT87t7fXneUOjVjE//784r3Wo6bHw kBtGA+4Cj+6UMN4JrtaLykWR+v9QfsPGgCejbUrDuiwNapKzLjXVh2L2RX6UE8p/WbAoGn 5xZwuKMF4XW+D7x4/mIFRZewzLvu25raTQ0dY6nTvXRei+DLI+OponhDswp5Le0DOAuLGM 9BaWpdrz0l1eCQHhF9lI2TCusCjTCZLJQUe0FhAfFWA1NNZUTTGjypFiHtbBxfKPlyfrE5 RXgKYg5kabfstd+DEa4qFYwFeQKXWP4on7icQCc2KTsyv0QxS4IoQuGuZlAmNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677745741; 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=IaKO5K8i3nJOKN50wUg71+8bwHJTHbChdO2pguCKHao=; b=XP+Du+JBLE6yu1ZYWQsamq+M5EieNQ+U1Pow18wgKj6ow3QddpGF2ZXSQze3UR/sYNc82V EERdzapY8faZMCORyqe/NbVhfsEbQurHjI5UnqBbWe9ozYOe0EywEqnRcMUDMZXBdvYtEZ SJLaeLHWhrjrv8LLdp2oW0NPaUbhKCfZjXFISYG1gGVMF35wMhDmo+YdDQY1kRqt5JsGqh aMP4vpKhtpU332cUXRwdEdwYCblOaxWjCp5Rd/zKX5f+In1MDq7oxOrP85is+W9Xpk4npJ Jy9ZU1brI3CGaP4oT6bNaLGtDzTF56xFhJ4H1W7+3W5Y2tWcX8a2/FGMp3ukYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677745741; a=rsa-sha256; cv=none; b=wF6Qp7MRZNYmXtuM/o5lxfRQQcTeb+bd7V+upSM+r90k9grvKRlPC9tzilc8JdWnSc055t gVvM+5KFUvt3zercqUpgKuW7hx6r+psJUtuZjUWJIlGqLhjdo91hfOX8R9sd50UIFEhv+q alZUFUn/JDJHtUQ6OdbadfstFta1IeEXCQZMOlVWD+fs0bfMP7iDYPSz8neCaMa01nFs/Q OPcVrTLdCHMBeKb4J9+Uh2I94ZIG9Lz0m5P7c2wj/QbLaRl4tYpw6GDEpEu5DFR/Dzdufb DnFs0PfRLXE3XU+Icvo9SWaIJkL1ioT6fADF7RiU3EsQxe1JypXNWXvtOB9SNw== 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 4PS45954HXz17vp; Thu, 2 Mar 2023 08:29:01 +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 3228T1O8066194; Thu, 2 Mar 2023 08:29:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3228T1uB066193; Thu, 2 Mar 2023 08:29:01 GMT (envelope-from git) Date: Thu, 2 Mar 2023 08:29:01 GMT Message-Id: <202303020829.3228T1uB066193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: b4eb5f81eead - releng/13.2 - Delete obsolete Solaris compat header file stdlib.h 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: b4eb5f81eead115fe49e349a933c72046158b930 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b4eb5f81eead115fe49e349a933c72046158b930 commit b4eb5f81eead115fe49e349a933c72046158b930 Author: Zhenlei Huang AuthorDate: 2023-02-23 18:00:09 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-02 08:22:26 +0000 Delete obsolete Solaris compat header file stdlib.h This drops function `getexecname()` redirection. Historically `getexecname()` is a compatibility definition. Since openzfs has its own implementation of function `getexecname()` in libspl and has been merged into base, the compat header file stdlib.h is no longer needed and should not be used. Also without this fix libspl will end up an incompatible version of `getprogname()` with libc. In particular, if zfs is enabled, programs such as pgrep in /rescue can be wrongly statically linked with libspl and will not function properly. PR: 269738 Reviewed by: markj Approved by: re (delphij) Fixes: 9e5787d2284e Merge OpenZFS support in to HEAD MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38733 (cherry picked from commit 7f0ebf0876c82a098bd5815ea6bf3a8efa6dd6f3) (cherry picked from commit 95f418fe2a0fb96080afbd2afc160929a32d12fb) --- cddl/compat/opensolaris/include/stdlib.h | 37 -------------------------------- 1 file changed, 37 deletions(-) diff --git a/cddl/compat/opensolaris/include/stdlib.h b/cddl/compat/opensolaris/include/stdlib.h deleted file mode 100644 index 9ba32322c03b..000000000000 --- a/cddl/compat/opensolaris/include/stdlib.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2007 John Birrell - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - * - */ - -#include_next - -#ifndef _COMPAT_OPENSOLARIS_STDLIB_H_ -#define _COMPAT_OPENSOLARIS_STDLIB_H_ - -#define getexecname getprogname - -#endif From nobody Thu Mar 2 09:43:28 2023 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 4PS5l42XfTz3vc0n; Thu, 2 Mar 2023 09:43:28 +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 4PS5l41k9Pz3rsy; Thu, 2 Mar 2023 09:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677750208; 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=BwowQf/L2wf0K/U+L7oUVNbI+hMoeQiq3x6fHVBqbMo=; b=vXGXkQlLo5y91eoD58Unb2ankQsULjiLR+yb51HS4zU51b/1vFZTKuAseWsTMCsk586QR8 9rl/gSbaiLzlMpquhA0dHSQhuk118UxoCxf6bwjGFHR73aLwYYawrmkc7w19iM4At4/npu ANGaDpXBz2vZiv5TfeJUn8GExk6pOBXMNow/7ZeFmZrqULtbrTH9Aho1U05x6eogp8OAzJ 9vCFo8DDw2I2RWUQwMyPgAM242LFaawHCHwEKuAx482XPCPsjnAXiOmw14ZGfDZf4WTcHy GQLpvLPIQk4OzgKn9EqrYGexOY2gSGLRFAMlNaV+jcvU8Px8KjGuKHoaM3gqBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677750208; 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=BwowQf/L2wf0K/U+L7oUVNbI+hMoeQiq3x6fHVBqbMo=; b=cdjNqn/Dd0H2tVe8S8ELDYRTIXpMJS9fxgxlNO4e97IfqacqXE6D7d189NeFFipbKKKU3h JLZe5umnxiGSQtSks4ww5txtN7jnUNFb61bmqHJ0ZBG1/9oL4v+2YXs6LXLznaJpOoglX9 H9+ME1torbcEFZbUFEltRXDsyt75FNAH4mpPiAh+ICP8Zfhe1Kg4vPNPSa1oAJtoOG9Eq3 O8xmXY4Xd9fgHFvoQDpxOxhmvunA3LNK4zE3PIhodz/kvKUEbKgDExLvHeX/9GR0+eMagm U8JU62fwAcTFk+rRRtTc7w0qzdZME53TZ27opZJa6RuwOPuMkIZZ9xsR7pFPqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677750208; a=rsa-sha256; cv=none; b=B2JwYCDauNA0ViUecSpewFCBtFeS2ZyB4ru+KFtW5CnZczSjZf4JGmPFkXwL3czEEljjuR orjWaHInZ5g2lGFhJfRJi4Uoy033Qn13W7GvjWFRiS7F2b8qakD0D4ScSO0+Fm3m9JuyV9 oAIU4QPuUhD+C7teWuhEm+RBaKiN+V0grr3kfrhxj/Vnf71Qr05EL+FSSXGsCYIEFBnanz azKXAnM/iL0PKJ6M9axzUX6YKlU1tWzvAOmSA/qhgBZXmeqdwPFmjbqnZL3kUCz887l0en QGCIglpdiNinZW0wKFHaFyaMhaLCmiswCRikGlWKtvvZMVrI25QhZHm1G8+w8Q== 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 4PS5l40n8tz1B6h; Thu, 2 Mar 2023 09:43:28 +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 3229hStZ096774; Thu, 2 Mar 2023 09:43:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3229hSbB096773; Thu, 2 Mar 2023 09:43:28 GMT (envelope-from git) Date: Thu, 2 Mar 2023 09:43:28 GMT Message-Id: <202303020943.3229hSbB096773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: f36ca798c429 - stable/13 - Remove an extra argument to SYSCTL_FOREACH 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f36ca798c42960383e0ff9612e56eb20c796cf04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f36ca798c42960383e0ff9612e56eb20c796cf04 commit f36ca798c42960383e0ff9612e56eb20c796cf04 Author: Andrew Turner AuthorDate: 2022-10-05 09:27:48 +0000 Commit: Andrew Turner CommitDate: 2023-03-02 09:42:58 +0000 Remove an extra argument to SYSCTL_FOREACH This was missed in e0853c933661. Sponsored by: The FreeBSD Foundation (cherry picked from commit fbc9f1b2d6cf90c02b918671fb7791cf36472cfd) --- sys/dev/drm2/drm_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/drm2/drm_sysctl.c b/sys/dev/drm2/drm_sysctl.c index 2879f2df1220..bf3a1c4f80c6 100644 --- a/sys/dev/drm2/drm_sysctl.c +++ b/sys/dev/drm2/drm_sysctl.c @@ -78,7 +78,7 @@ int drm_sysctl_init(struct drm_device *dev) /* Find the next free slot under hw.dri */ i = 0; - SYSCTL_FOREACH(oid, SYSCTL_CHILDREN(drioid), oid_link) { + SYSCTL_FOREACH(oid, SYSCTL_CHILDREN(drioid)) { if (i <= oid->oid_arg2) i = oid->oid_arg2 + 1; } From nobody Thu Mar 2 14:12:00 2023 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 4PSChw5cvMz3vryp; Thu, 2 Mar 2023 14:12:00 +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 4PSChw55PDz4GGW; Thu, 2 Mar 2023 14:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677766320; 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=xJxJ6u43zHN4N8BqxTJEFByewr/AOVg+cFdWsyfkvjM=; b=wD9SAMQffYvk+pAyATyklNq/J+OPBrPUFct2VrdOdvpUUFCbVO/ULBqseRMYT+mB6bBXXs zz46TabC9KZRB9KPZZJ65Y3dA2amYe4HX50/qGH5rzqrCJvuFqxqDEQD0YJhDw5gC8Ifjj 9LVg1avdikE8NqtujGUrdndeX0l3f06EBlohDY3IURufghBylOz8cJ4p/Ovb2CkIMZhgB5 aprbNyYeeah0FKB9cBBJ96HVp+ZjZzq3gb6ltGoXz+Y4Ppmx91BmqLefBodGr4lE+QHUB8 Ph99XTg3E2u3Pwh93oRU3SkWtMYmmhrWYsvyiE3JNnVZ9/PrtCeBj4TtoPGumQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677766320; 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=xJxJ6u43zHN4N8BqxTJEFByewr/AOVg+cFdWsyfkvjM=; b=gcX+MzJ6OuV/zS0wEfw9ubF0IQXT1BvLpA+ULOshs4wIh0bCzGcM5vCuUlUR2ND1ryVS2p 7F7vH8Q2z1haqMnrLBqX9nDdhSIKZ77VOlgEvgIFq+UHylvNao0NYAEQT+7C8qXdr24ECq i0cu8qKbRpoMhc1BUV+lHI1j0A+r7wAGcRdTHMgcPUtq1khLyNtxfEoL/fT9zpCWfz8yrq KhSgjmsvk6wtcKozpn/iZrwAeTjAjEkONNJ/+OrV+AlrmpeZmXAnOU6jMQnrEdBGtCd0AP gD+MawAkeBZZk3fBXhp3e+VVcjiYrqLDMZdz/hVajB9Bj7fWbHcHb7F6O7/b6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677766320; a=rsa-sha256; cv=none; b=i9nBkPE7DDQ1UIWq1iL0Lty2ThDCo7KmJjcy8j3+lA6r8hrV4ZZEPbakQjd+ehbDPJI1+t 35RiCXBkJR8ECiSyf/sUf22mK/uqOsKyED4n8jQet/V7JMv86u78Q7JR7VMXqLTi6yCw8A Few0L+p3ZYUg1rFasobH8FGWnXFu8Ky0N+XHt+iVu1K71W7C0MxEyx5KhrMFZaWmFqMLR2 854k9AmS7EpMLHBEs8SfmF+r6rGBQQMYsB08gCsvxI2pGjHWrWAwdsI5zWnotdYoOWwnff AUbcJU8c+nbetG2S2xIAmtJSMJGonjM+1a21jKDdQ6GGTlh/PGo9T8USEEWAwg== 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 4PSChw48TLzK97; Thu, 2 Mar 2023 14:12:00 +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 322EC0lW037432; Thu, 2 Mar 2023 14:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322EC04Z037431; Thu, 2 Mar 2023 14:12:00 GMT (envelope-from git) Date: Thu, 2 Mar 2023 14:12:00 GMT Message-Id: <202303021412.322EC04Z037431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e8f143cc4c58 - stable/13 - Cirrus-CI: use makefs if root size exceeds QEMU's virtual FAT limit 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8f143cc4c5811a9ecbd3f2b1df02dd1ea2dfa94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e8f143cc4c5811a9ecbd3f2b1df02dd1ea2dfa94 commit e8f143cc4c5811a9ecbd3f2b1df02dd1ea2dfa94 Author: Ed Maste AuthorDate: 2023-02-13 17:39:39 +0000 Commit: Ed Maste CommitDate: 2023-03-02 14:11:53 +0000 Cirrus-CI: use makefs if root size exceeds QEMU's virtual FAT limit We use QEMU's virtual FAT support to avoid having to create a disk image because it is much faster, but it has a limit of about 500MB. Artifacts produced by the GCC 12 CI job exceeded this size. Add support for creating a FAT partition image and MBR-partitioned disk image and use it when the file system is too large for QEMU. In one run the Cirrus-CI LLVM test task took 1m33s using QEMU's virtual FAT while the GCC task took 6m48s using makefs+mkimg. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38589 (cherry picked from commit 7b0593fdcbbb9c73d282fc0024d844c044423b31) --- tools/boot/ci-qemu-test.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/boot/ci-qemu-test.sh b/tools/boot/ci-qemu-test.sh index e6481c794af5..b730e9725014 100755 --- a/tools/boot/ci-qemu-test.sh +++ b/tools/boot/ci-qemu-test.sh @@ -21,7 +21,7 @@ die() tempdir_cleanup() { trap - EXIT SIGINT SIGHUP SIGTERM SIGQUIT - rm -rf ${ROOTDIR} + rm -rf ${WORKDIR} } tempdir_setup() @@ -99,18 +99,31 @@ arm64) esac # Create a temp dir to hold the boot image. -ROOTDIR=$(mktemp -d -t ci-qemu-test-fat-root) +WORKDIR=$(mktemp -d -t ci-qemu-test-fat-root) +ROOTDIR=${WORKDIR}/stage-root trap tempdir_cleanup EXIT SIGINT SIGHUP SIGTERM SIGQUIT # Populate the boot image in a temp dir. ( cd ${SRCTOP} && tempdir_setup ) +# Using QEMU's virtual FAT support is much faster than creating a disk image, +# but only supports about 500MB. Fall back to creating a disk image if the +# staged root is too large. +hda="fat:${ROOTDIR}" +rootsize=$(du -skA ${ROOTDIR} | sed 's/[[:space:]].*$//') +if [ $rootsize -gt 512000 ]; then + echo "Root size ${rootsize}K too large for QEMU virtual FAT" >&2 + makefs -t msdos -s 1g $WORKDIR/image.fat $ROOTDIR + mkimg -s mbr -p efi:=$WORKDIR/image.fat -o $WORKDIR/image.mbr + hda="$WORKDIR/image.mbr" +fi + # And, boot in QEMU. : ${BOOTLOG:=${TMPDIR:-/tmp}/ci-qemu-test-boot.log} timeout 300 \ $QEMU -m 256M -nodefaults \ -serial stdio -vga none -nographic -monitor none \ - -snapshot -hda fat:${ROOTDIR} 2>&1 | tee ${BOOTLOG} + -snapshot -hda $hda 2>&1 | tee ${BOOTLOG} # Check whether we succesfully booted... if grep -q 'Hello world.' ${BOOTLOG}; then From nobody Thu Mar 2 16:07:45 2023 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 4PSGGT6bnxz3vyLC; Thu, 2 Mar 2023 16:07:45 +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 4PSGGT654hz4Rtj; Thu, 2 Mar 2023 16:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677773265; 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=rLSSbKuhog5uPfpVm55PYaSPIPSYsmJLxHoa9qljdDg=; b=qFNmBy8LKBSNzYIjfsf/1YP8LV5E/eOpN4K5//TCNYF5tQnEdsExFeOteovGcURRFnezPu /scSGw2y014conzkBDnx6fWVCXS52oVnd+78dCOwZ9CrtS+8IPG1MnmrpQ6D8XzFu8k73N q08jf33hFRepVL8jk58XeiidIUlJkWYGsnbp66+QFKEFvH/zwyqZKirdT4l34QbeplqGIl 1euTDzWhC+/WFnKq4gb/HwHVpjR/paPz+oLo6SGPZSKgNzXBk/sI+VwRe8qn+aWtLRKgfR UDiRiWx1JEOARzG8XmUfA2yrEk3LrMzRpo2H2ge+p40N10cQGX8TQRNhVrpT3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677773265; 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=rLSSbKuhog5uPfpVm55PYaSPIPSYsmJLxHoa9qljdDg=; b=R7Od0ecZQq+MDUr/kabk/mOmNzmLwAZKKhP1NSpwgjwH8uLLPReX9/b/HZsby4cHYEfBXB pOCzdQADCjAhUa6j88DkKn6vHi2S4+FhIWlkY4eIg/r5e7gnu8xtNSSlnn7Dv3eHbx6g3+ msofjwToFQLR3CnV59v0e2nusPb3hoVmSw8vDN1OyKeCFWr1ne8/CUl+sfnuVic1ebLVcG TBN1b/asgU5Afrr27W6DaPbbuW2Cc2noxlupoFKEcLR8wryZqVjO+nea8rwJ6yTnJFC57h jpSdAFdRbkSdi00rL2lNGjmLil6pWQMcKAcDiMJ8qcQOXlkYZSWMuONckecADQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677773265; a=rsa-sha256; cv=none; b=XbS0p5k5xlPW/QlCQvfcPFR1m2UNCMRg0h4lHR8XOmllx1HQFu6FzR0MnjtxvOLHjR0d7u rUWti72L3CzFSp57/BHKt4tvovlu3GWegXgpIZQf8IUEm4n2S0sGR4RAeS8WevzYgEVJL+ ovdjtcMx1UCjy6Mf9Z7IBkqDl9r4CbyFBRtQnS5/J0fger6yapaIitivnzevsa5FdOCqA4 CjS70ubb0yD6PhXM1N+XU7ydK+h5MhWpH4Y1kk+stEwAeALc37KXdzvMa7WOJRE9SPDjOr 2BsHautUePncvpV3Vg8jbY/YnJCUbIOWDfglFbUs+jgI3zaeE+vWmd18OK+rnQ== 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 4PSGGT582gzN47; Thu, 2 Mar 2023 16:07:45 +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 322G7jco021259; Thu, 2 Mar 2023 16:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322G7j6u021258; Thu, 2 Mar 2023 16:07:45 GMT (envelope-from git) Date: Thu, 2 Mar 2023 16:07:45 GMT Message-Id: <202303021607.322G7j6u021258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2b29bd3a6d59 - stable/13 - blacklistd: whitespace cleanup 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2b29bd3a6d59eec73db76575303dac145d82aa57 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2b29bd3a6d59eec73db76575303dac145d82aa57 commit 2b29bd3a6d59eec73db76575303dac145d82aa57 Author: Ed Maste AuthorDate: 2022-10-12 17:40:38 +0000 Commit: Ed Maste CommitDate: 2023-03-02 14:25:27 +0000 blacklistd: whitespace cleanup Diff reduction against NetBSD external/bsd/blacklist (at commit 03c74c04f277). Sponsored by: The FreeBSD Foundation (cherry picked from commit 631bdcf3043c00b90fc29aedb8da91251be2cd8a) --- contrib/blacklist/bin/blacklistd.c | 17 ++++++++--------- contrib/blacklist/bin/conf.c | 30 +++++++++++++++--------------- contrib/blacklist/bin/run.c | 2 +- contrib/blacklist/bin/support.c | 2 +- contrib/blacklist/diff/proftpd.diff | 2 +- contrib/blacklist/lib/bl.c | 4 ++-- 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/contrib/blacklist/bin/blacklistd.c b/contrib/blacklist/bin/blacklistd.c index e880eb457df0..4aa845e46525 100644 --- a/contrib/blacklist/bin/blacklistd.c +++ b/contrib/blacklist/bin/blacklistd.c @@ -123,7 +123,7 @@ getremoteaddress(bl_info_t *bi, struct sockaddr_storage *rss, socklen_t *rsl) return 0; if (errno != ENOTCONN) { - (*lfun)(LOG_ERR, "getpeername failed (%m)"); + (*lfun)(LOG_ERR, "getpeername failed (%m)"); return -1; } @@ -141,13 +141,13 @@ getremoteaddress(bl_info_t *bi, struct sockaddr_storage *rss, socklen_t *rsl) break; default: (*lfun)(LOG_ERR, "bad client passed socket family %u", - (unsigned)bi->bi_ss.ss_family); + (unsigned)bi->bi_ss.ss_family); return -1; } if (*rsl != bi->bi_slen) { (*lfun)(LOG_ERR, "bad client passed socket length %u != %u", - (unsigned)*rsl, (unsigned)bi->bi_slen); + (unsigned)*rsl, (unsigned)bi->bi_slen); return -1; } @@ -157,7 +157,7 @@ getremoteaddress(bl_info_t *bi, struct sockaddr_storage *rss, socklen_t *rsl) if (*rsl != rss->ss_len) { (*lfun)(LOG_ERR, "bad client passed socket internal length %u != %u", - (unsigned)*rsl, (unsigned)rss->ss_len); + (unsigned)*rsl, (unsigned)rss->ss_len); return -1; } #endif @@ -176,12 +176,12 @@ process(bl_t bl) struct timespec ts; if (clock_gettime(CLOCK_REALTIME, &ts) == -1) { - (*lfun)(LOG_ERR, "clock_gettime failed (%m)"); + (*lfun)(LOG_ERR, "clock_gettime failed (%m)"); return; } if ((bi = bl_recv(bl)) == NULL) { - (*lfun)(LOG_ERR, "no message (%m)"); + (*lfun)(LOG_ERR, "no message (%m)"); return; } @@ -251,7 +251,6 @@ process(bl_t bl) (*lfun)(LOG_INFO, "blocked %s/%d:%d for %d seconds", rbuf, c.c_lmask, c.c_port, c.c_duration); - } break; case BL_DELETE: @@ -264,7 +263,7 @@ process(bl_t bl) /* ignore for now */ break; default: - (*lfun)(LOG_ERR, "unknown message %d", bi->bi_type); + (*lfun)(LOG_ERR, "unknown message %d", bi->bi_type); } state_put(state, &c, &dbi); @@ -306,7 +305,7 @@ update(void) void *ss = &c.c_ss; if (clock_gettime(CLOCK_REALTIME, &ts) == -1) { - (*lfun)(LOG_ERR, "clock_gettime failed (%m)"); + (*lfun)(LOG_ERR, "clock_gettime failed (%m)"); return; } diff --git a/contrib/blacklist/bin/conf.c b/contrib/blacklist/bin/conf.c index f21dd8b05158..5fc614d794b1 100644 --- a/contrib/blacklist/bin/conf.c +++ b/contrib/blacklist/bin/conf.c @@ -174,9 +174,9 @@ again: } break; } - } else + } else tot = im; - + if (e == 0) { c->c_duration = (int)tot; return 0; @@ -215,7 +215,7 @@ static int conf_getmask(const char *f, size_t l, bool local, const char **p, int *mask) { char *d; - const char *s = *p; + const char *s = *p; if ((d = strchr(s, ':')) != NULL) { *d++ = '\0'; @@ -266,7 +266,7 @@ conf_gethostport(const char *f, size_t l, bool local, struct conf *c, sin6->sin6_len = sizeof(*sin6); #endif port = &sin6->sin6_port; - } + } } else if (pstr != p || strchr(p, '.') || conf_is_interface(p)) { if (pstr == p) pstr = "*"; @@ -368,7 +368,7 @@ conf_getname(const char *f, size_t l, bool local, struct conf *c, { if (conf_getmask(f, l, local, &p, &c->c_rmask) == -1) return -1; - + if (strcmp(p, "*") == 0) { strlcpy(c->c_name, rulename, CONFNAMESZ); return 0; @@ -475,7 +475,7 @@ conf_amask_eq(const void *v1, const void *v2, size_t len, int mask) return 1; goto out; case FEQUAL: - + (*lfun)(LOG_CRIT, "%s: Internal error: bad mask %d", __func__, mask); abort(); @@ -689,7 +689,7 @@ conf_addr_eq(const struct sockaddr_storage *s1, static int conf_eq(const struct conf *c1, const struct conf *c2) { - + if (!conf_addr_eq(&c1->c_ss, &c2->c_ss, c2->c_lmask)) return 0; @@ -746,7 +746,7 @@ fmtport(char *b, size_t l, int port) if (port == FSTAR) return; - if (b[0] == '\0' || strcmp(b, "*") == 0) + if (b[0] == '\0' || strcmp(b, "*") == 0) snprintf(b, l, "%d", port); else { snprintf(buf, sizeof(buf), ":%d", port); @@ -822,7 +822,7 @@ conf_print(char *buf, size_t len, const char *pref, const char *delim, fmtmask(ha, sizeof(ha), c->c_family, c->c_lmask); fmtport(ha, sizeof(ha), c->c_port); - + sp = *delim == '\t' ? 20 : -1; hb[0] = '\0'; if (*delim) @@ -880,7 +880,7 @@ conf_merge(struct conf *c, const struct conf *sc) (*lfun)(LOG_DEBUG, "%s: %s", __func__, conf_print(buf, sizeof(buf), "to:\t", "", c)); } - + if (sc->c_name[0]) memcpy(c->c_name, sc->c_name, CONFNAMESZ); if (sc->c_uid != FEQUAL) @@ -1014,13 +1014,13 @@ conf_find(int fd, uid_t uid, const struct sockaddr_storage *rss, slen = sizeof(lss); memset(&lss, 0, slen); if (getsockname(fd, (void *)&lss, &slen) == -1) { - (*lfun)(LOG_ERR, "getsockname failed (%m)"); + (*lfun)(LOG_ERR, "getsockname failed (%m)"); return NULL; } slen = sizeof(proto); if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &proto, &slen) == -1) { - (*lfun)(LOG_ERR, "getsockopt failed (%m)"); + (*lfun)(LOG_ERR, "getsockopt failed (%m)"); return NULL; } @@ -1037,7 +1037,7 @@ conf_find(int fd, uid_t uid, const struct sockaddr_storage *rss, cr->c_proto = IPPROTO_UDP; break; default: - (*lfun)(LOG_ERR, "unsupported protocol %d", proto); + (*lfun)(LOG_ERR, "unsupported protocol %d", proto); return NULL; } @@ -1049,7 +1049,7 @@ conf_find(int fd, uid_t uid, const struct sockaddr_storage *rss, cr->c_port = ntohs(((struct sockaddr_in6 *)&lss)->sin6_port); break; default: - (*lfun)(LOG_ERR, "unsupported family %d", lss.ss_family); + (*lfun)(LOG_ERR, "unsupported family %d", lss.ss_family); return NULL; } @@ -1134,7 +1134,7 @@ conf_parse(const char *f) fclose(fp); confset_sort(&lc); confset_sort(&rc); - + confset_replace(&rconf, &rc); confset_replace(&lconf, &lc); diff --git a/contrib/blacklist/bin/run.c b/contrib/blacklist/bin/run.c index 8499edd3d9c2..5588f0198c04 100644 --- a/contrib/blacklist/bin/run.c +++ b/contrib/blacklist/bin/run.c @@ -75,7 +75,7 @@ run(const char *cmd, const char *name, ...) (argv[i] = va_arg(ap, char *)) != NULL; i++) continue; va_end(ap); - + if (debug) { size_t z; int r; diff --git a/contrib/blacklist/bin/support.c b/contrib/blacklist/bin/support.c index 79a1c6ee93ac..d560d2303223 100644 --- a/contrib/blacklist/bin/support.c +++ b/contrib/blacklist/bin/support.c @@ -46,7 +46,7 @@ __RCSID("$NetBSD: support.c,v 1.9 2018/09/18 22:12:19 christos Exp $"); #include "support.h" static __attribute__((__format_arg__(3))) const char * -expandm(char *buf, size_t len, const char *fmt) +expandm(char *buf, size_t len, const char *fmt) { char *p; size_t r; diff --git a/contrib/blacklist/diff/proftpd.diff b/contrib/blacklist/diff/proftpd.diff index c811c9cf50bc..455b7cd60c64 100644 --- a/contrib/blacklist/diff/proftpd.diff +++ b/contrib/blacklist/diff/proftpd.diff @@ -1,7 +1,7 @@ --- Make.rules.in.orig 2015-05-27 20:25:54.000000000 -0400 +++ Make.rules.in 2016-01-25 21:48:47.000000000 -0500 @@ -110,3 +110,8 @@ - + FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o + diff --git a/contrib/blacklist/lib/bl.c b/contrib/blacklist/lib/bl.c index ab2bd7c43ebe..a3aa4ef1f9f6 100644 --- a/contrib/blacklist/lib/bl.c +++ b/contrib/blacklist/lib/bl.c @@ -496,12 +496,12 @@ bl_recv(bl_t b) } if (got != (GOT_CRED|GOT_FD)) { - bl_log(b->b_fun, LOG_ERR, "message missing %s %s", + bl_log(b->b_fun, LOG_ERR, "message missing %s %s", #if GOT_CRED != 0 (got & GOT_CRED) == 0 ? "cred" : #endif "", (got & GOT_FD) == 0 ? "fd" : ""); - + return NULL; } From nobody Thu Mar 2 16:07:46 2023 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 4PSGGW48qzz3vyLG; Thu, 2 Mar 2023 16:07:47 +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 4PSGGV6bxvz4Rv4; Thu, 2 Mar 2023 16:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677773267; 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=/OFmWpqE8JnjdZeXT0nKQBC0cJHW/mm5w4KcDVlqtnI=; b=jhPqrlUwXlYiMjpZf7LSZwdTXfD3V4iOg52ZaDDC9zyuZ+SNTaFNZ4oWHhrX/sJJu+g6A0 Bjyqok8PY8Fvpw0XtGL42A/ywzdIau0PyXdLDqM26dtO4BIuyfEhrYO0cVdWNo+QQwcz8j AIJ7H0tki+G0BD5Cx0ZY561r9exzscyb8uIo8AM2LG4ioYLY58d0SFQOR/S+P6YW0odmWT /w/oRTqKZbTYsNELWjlh3bdqPPuF8u0Cx/5CCO9/XorpHQb/oFi1wQQrjluwvEe9iNF9s+ S43IsuCBJJXUNwgvRXuXY+Yh891ChCeobnbKKuYpOIXP9F3LBsboMlrc5fR6MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677773267; 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=/OFmWpqE8JnjdZeXT0nKQBC0cJHW/mm5w4KcDVlqtnI=; b=lv4EmjbsBbKnKVlJBRro0tb/2WYBq7IZEViBQZ7dK09DDVHMLB7iJzNjhAozKs4GNf1e0z sFCLxntjxVEpjvsw4s/VuibNa/hPkPsSm3qgyghOuldb/C/9f6Id8SjvRxJARUv/ePABeK fIx4M4yh8IKRmjGCW4h0Mx6OdT77UMUHjfX35BecdUXI+hMmiQhyx10WmuFF5dvE2X+VLk It1K5WXpGmc41EwYRmdiAz3mbhb4zsD78bnfd9UvPaMwggJFdYgstR4iro73MnlgA48J4+ lfziI1SVR4ZbQGUlUD/UxRX95k/EMmoAsJPm4CmM9Jlv5b/uUkauoYEt3JHlLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677773267; a=rsa-sha256; cv=none; b=ez8PuZNvU8DI4FUWgZAZ45CKS5hUGI6Vh1w/U74HvL973aA/X6kLQFjvsQkkNsISrC6gER Dd2AdWB8gOwsXIbH0G3KPW+hkIZwA0QBXlaMvggJ9E7HxB+8pVKzAOqwxWwjNhxCD6Yok7 k9wTSrFo6k+5d9PvKnwBQdcPSaiHW7zJTOraHvm4itIAvsEDDz/9DfPN+Dw3gUaoqIXldB 247ff4SR46IyKPR6XInBc6N479vMr1xdF7lFg4uWj4cHOuCETnbfapYl3WrCORSvrTybvn vpjx5NXu3gqnMBqecOQH6SV9vK9T2i+XFiATmdFVIDK6lZqXOFz6WD4xCslFUA== 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 4PSGGV5j5fzN48; Thu, 2 Mar 2023 16:07:46 +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 322G7kvU021278; Thu, 2 Mar 2023 16:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322G7koZ021277; Thu, 2 Mar 2023 16:07:46 GMT (envelope-from git) Date: Thu, 2 Mar 2023 16:07:46 GMT Message-Id: <202303021607.322G7koZ021277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ee71c37bc123 - stable/13 - Add RELRO build knob, default to enabled 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ee71c37bc1231f56b82e6b8993d370ccb22a91f6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ee71c37bc1231f56b82e6b8993d370ccb22a91f6 commit ee71c37bc1231f56b82e6b8993d370ccb22a91f6 Author: Ed Maste AuthorDate: 2022-06-22 12:58:04 +0000 Commit: Ed Maste CommitDate: 2023-03-02 14:25:27 +0000 Add RELRO build knob, default to enabled Note that lld enables relro by default, so that we already had either partial or full RELRO, depending on the state of the BIND_NOW knob. Add a RELRO knob so that the option can be disabled if desired, and so that builds using the GNU toolchain are equivalent to those using the standard Clang/LLVM toolchain. Reviewed by: markj MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35545 (cherry picked from commit 2f3a961487c97dc879f07bb97bc62d7bd70b3f8d) --- share/mk/bsd.lib.mk | 5 +++++ share/mk/bsd.opts.mk | 1 + share/mk/bsd.prog.mk | 5 +++++ tools/build/options/WITHOUT_RELRO | 4 ++++ tools/build/options/WITH_BIND_NOW | 7 +++++++ tools/build/options/WITH_RELRO | 5 +++++ 6 files changed, 27 insertions(+) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index d4819615d50c..71c3dab011ef 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -77,6 +77,11 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif +.if ${MK_RELRO} == "no" +LDFLAGS+= -Wl,-znorelro +.else +LDFLAGS+= -Wl,-zrelro +.endif .if ${MK_RETPOLINE} != "no" .if ${COMPILER_FEATURES:Mretpoline} && ${LINKER_FEATURES:Mretpoline} CFLAGS+= -mretpoline diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 33d843593427..33516070ac67 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -62,6 +62,7 @@ __DEFAULT_YES_OPTIONS = \ NLS \ OPENSSH \ PROFILE \ + RELRO \ SSP \ TESTS \ TOOLCHAIN \ diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 5e7aaaeb37f8..78fc920ec337 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -41,6 +41,11 @@ MK_DEBUG_FILES= no .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif +.if ${MK_RELRO} == "no" +LDFLAGS+= -Wl,-znorelro +.else +LDFLAGS+= -Wl,-zrelro +.endif .if ${MK_PIE} != "no" # Static PIE is not yet supported/tested. .if !defined(NO_SHARED) || ${NO_SHARED:tl} == "no" diff --git a/tools/build/options/WITHOUT_RELRO b/tools/build/options/WITHOUT_RELRO new file mode 100644 index 000000000000..f5b661f5916d --- /dev/null +++ b/tools/build/options/WITHOUT_RELRO @@ -0,0 +1,4 @@ +Do not apply the Relocation Read-Only (RELRO) vulnerability mitigation. +See also the +.Va BIND_NOW +option. diff --git a/tools/build/options/WITH_BIND_NOW b/tools/build/options/WITH_BIND_NOW index 02e4c37352b4..a2d3ac7e7779 100644 --- a/tools/build/options/WITH_BIND_NOW +++ b/tools/build/options/WITH_BIND_NOW @@ -3,3 +3,10 @@ Build all binaries with the .Dv DF_BIND_NOW flag set to indicate that the run-time loader should perform all relocation processing at process startup rather than on demand. +The combination of the +.Va BIND_NOW +and +.Va RELRO +options provide "full" Relocation Read-Only (RELRO) support. +With full RELRO the entire GOT is made read-only after performing relocation at +startup, avoiding GOT overwrite attacks. diff --git a/tools/build/options/WITH_RELRO b/tools/build/options/WITH_RELRO new file mode 100644 index 000000000000..cfc344dd9cfe --- /dev/null +++ b/tools/build/options/WITH_RELRO @@ -0,0 +1,5 @@ +Build all binaries with the Relocation Read-Only (RELRO) vulnerability +mitigation applied. +See also the +.Va BIND_NOW +option. From nobody Thu Mar 2 16:07:47 2023 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 4PSGGX1FYqz3vyR8; Thu, 2 Mar 2023 16:07:48 +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 4PSGGX0gYyz4Rk0; Thu, 2 Mar 2023 16:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677773268; 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=lolsnNfZ4Vbj2AOdQdCSiMGRBk7Q3+dTpzDyJPJ5DjI=; b=bQdnNC1s4C1LvsLh/KCvymVcBYBlpbIFky1LGnQlMh3WL2ktlu7+NPjgSNLtIXymEi3hVh byUCyZX0dkZNmmDblG4MuwcUN2caEQKedNnD6QBo1ZN9cX19fkpq1J7VF8yN9YMSYHM/EP 9Tx+MetvuRnwZTEYm2KD4w5PeO8kbGCnVxx6vg/l0QUzwWTRNkrJEz/7z2UFDDz4KA9l/Y iv4NAOLW7TXrnHQ77CoMSfntb0jLwbxl8kIHWUCu1pY2Hc4tQfzbYisrHY1ZHv/helePbf CZCIzl8BGNPZ8HyPp4Xin0A4jU3MBVLBQgXuY2WEVbRvEd3pa2H17OL5Juw5Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677773268; 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=lolsnNfZ4Vbj2AOdQdCSiMGRBk7Q3+dTpzDyJPJ5DjI=; b=XyoHMzCLavPKgtkB0gGVG8+2JB7yydhinBRjPtaQENYrx1de5IHnyQTPIWwZc3LdSKKSSb q+WKlQBifzP62MrFCfPoAZh8YEtMhvWDrEKYRg7wGtBsd0XX2VSKtcPYxo9ZVzbSBRLU4N V5UPF42K15KnJ1Kn65QyT3Z55rGyTKoxjXBL8l41o505XTyYsUEGNY4Ta/ptUM08uCbkkr 3iQ1PXSetumSrx21VMJywADX/opYRZHdx1oO8lZ6J2h7HAk3rs6yP8hBkwbNxYyLs+1zcb 0DKUcpDKFJmTf1O8eCBM/qwOnxcVHJnbaLCHpdtLY9b9mHQpHF57CNqQehGGWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677773268; a=rsa-sha256; cv=none; b=M/HCPhzPHME5+9p3jV7NvRhSIyqUngPTXR+0L6EHr4Zg5CW6RlJVfBMAHC/jSZRAaIxkS2 HcJNPUSW9c1h/A1sI1o337zuDDU24s0gA19nYGjUPJG2JhZS7AqZDGznFP/KS9rrqDESar 6RamNdzTGQqSndHoSOnE3wiWoN7RJRAciEm4wsgCkSTdN1SCMqBan30p0SYe8kBrKQvYr3 YV1uqNXpGl2sqDxMppABt9ueJhnpTqnmusPien6WHeyweEzd3f54efOALhtFfczrsxgKN/ bqbHR/xui5jNitzX2Llzii8tBbsse9R4qsI/MZ+74dFGpj/bVxvah69CCEk8zA== 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 4PSGGW6tKRzN2C; Thu, 2 Mar 2023 16:07:47 +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 322G7lDv021298; Thu, 2 Mar 2023 16:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322G7lZe021297; Thu, 2 Mar 2023 16:07:47 GMT (envelope-from git) Date: Thu, 2 Mar 2023 16:07:47 GMT Message-Id: <202303021607.322G7lZe021297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 65d7644bdb16 - stable/13 - src.conf: regen man page after RELRO change 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 65d7644bdb167b549aa0d1480424cc4e186649f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=65d7644bdb167b549aa0d1480424cc4e186649f2 commit 65d7644bdb167b549aa0d1480424cc4e186649f2 Author: Ed Maste AuthorDate: 2023-03-02 14:34:43 +0000 Commit: Ed Maste CommitDate: 2023-03-02 14:35:23 +0000 src.conf: regen man page after RELRO change --- share/man/man5/src.conf.5 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index d7bb2f063fcc..62439ee77a41 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd February 28, 2023 +.Dd March 2, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -183,6 +183,13 @@ Build all binaries with the .Dv DF_BIND_NOW flag set to indicate that the run-time loader should perform all relocation processing at process startup rather than on demand. +The combination of the +.Va BIND_NOW +and +.Va RELRO +options provide "full" Relocation Read-Only (RELRO) support. +With full RELRO the entire GOT is made read-only after performing relocation at +startup, avoiding GOT overwrite attacks. .It Va WITHOUT_BLACKLIST Set this if you do not want to build .Xr blacklistd 8 @@ -1425,6 +1432,11 @@ by proxy. .It Va WITHOUT_RBOOTD Do not build or install .Xr rbootd 8 . +.It Va WITHOUT_RELRO +Do not apply the Relocation Read-Only (RELRO) vulnerability mitigation. +See also the +.Va BIND_NOW +option. .It Va WITH_REPRODUCIBLE_BUILD Exclude build metadata (such as the build time, user, or host) from the kernel, boot loaders, and uname output, so that builds produce From nobody Thu Mar 2 16:25:46 2023 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 4PSGgH21cZz3w0HH; Thu, 2 Mar 2023 16:25:47 +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 4PSGgH1XM6z4Vhw; Thu, 2 Mar 2023 16:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677774347; 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=XapmfBicozpJc67Kolyki8i+SlfP60KY6YB6VGlErmw=; b=gcYLnocsR/srqZEYRBCfjhB/ksirETLbpemlCWBG5R+lRRjLqV212SUdK8tWzmur/gh/Hn jmB6Lc0S2a17avLhdeNDbSG1IZVVfOYevUiy79YXIoMu58A1XC/xlPVaTYv//GRbgOdKuh PAv+Q5sEguW3a2WFKQrYDPfYCmAqE7ZmXIiOQJWLmiWGUK1s/1Rg6JEwthyZ6eLXTXYUnQ 001KUydSz1FXtcLrUWtJdmiPEH3ZV/jGauufio7XMcz3FuQqvE+U23BnsAavlCaTvNRNnO 1aOeSkPqMgTsqkAkNnv+g9Lm1orHrZrWwL22eWgx7jCmqVCTsSf4rsNaapMrdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677774347; 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=XapmfBicozpJc67Kolyki8i+SlfP60KY6YB6VGlErmw=; b=rzdQcGadFVHMM836MdZojEkUmrajO+ftJ4ToECm6AXY94n/2m7kaYdo3SmhtCLh7+HCz+Y dhilrgP5jpvYZjnKFGNTjvbehm3FnjBXzo+lu/MqyJpjsq8DAtwvz4OordVPUd7mxKlV3M UUllWuLwUNFcTfQuAlvc6uvHM5+TPIczD/0GlNaWRGCux2Me6GSomxtLsHVLtctCwUfWX0 jFnY5U+IRvoLE4r8VNgHzsDyseoBbgcSqrL5xfSaRt52clJA1sW+nwCZdCwoZFj6u6butv P5RRuTAmqA5RDcTjkxmMenjPZGKIOsqArnieWqYzRY9J0KXsAWieHN3ywcFJrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677774347; a=rsa-sha256; cv=none; b=dPoZBLfGTmBBYNNp4QfO+jhD+vHZ2WXy6l25yVNZuJ+zjIlOIWcIc5tkLjuE+WbJm3UNZb Mayc36iErsT63hTi/6vJ2xK/qMr6ukJyLApf53LszkOVcBsOYJc/p1X3wQaXilBG6nf0Fw CnRRw0GQUGasWEakeAbNW3GvdTQrQXzVNtDXpUr+SZD8BTESqJclG4uVfTKveDHu4HVEOi 1hQa2AmH3VYLFcFJG3HHjYtu4w+nVjExI6e4ryj78yFoqUWolr2JqeaR5j7+zrtsPinH6l 7XAvkM/Ya7tSToX94rUaZEynSTR2ZEL+5OjYRIL8tOVAe1pPkX/oIDgrvZMl2A== 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 4PSGgH0bH6zNR7; Thu, 2 Mar 2023 16:25:47 +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 322GPkBA053072; Thu, 2 Mar 2023 16:25:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322GPk8W053071; Thu, 2 Mar 2023 16:25:46 GMT (envelope-from git) Date: Thu, 2 Mar 2023 16:25:46 GMT Message-Id: <202303021625.322GPk8W053071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: dacffdd4dc51 - stable/12 - pfsync: support deferring IPv6 packets 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: dacffdd4dc511ae73e8fd3eb19f9efe4ecb26ba1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dacffdd4dc511ae73e8fd3eb19f9efe4ecb26ba1 commit dacffdd4dc511ae73e8fd3eb19f9efe4ecb26ba1 Author: Kristof Provost AuthorDate: 2023-02-14 06:11:38 +0000 Commit: Kristof Provost CommitDate: 2023-03-02 11:15:28 +0000 pfsync: support deferring IPv6 packets When we send out a deferred packet we must make sure to call ip6_output() for IPv6 packets. If not we might end up attempting to ip_fragment() an IPv6 packet, which could lead to us reading outside of the mbuf. PR: 268246 Reviewed by: melifaro, zlei MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D38586 (cherry picked from commit 9a1cab6d79b7286e5f650f57ed95625e6ddb8e4b) --- sys/netpfil/pf/if_pfsync.c | 71 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 98319f2b583f..e3e3fa3ad6a2 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -102,12 +102,16 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include + #define PFSYNC_MINPKT ( \ sizeof(struct ip) + \ sizeof(struct pfsync_header) + \ sizeof(struct pfsync_subheader) ) struct pfsync_bucket; +struct pfsync_softc; struct pfsync_pkt { struct ip *ip; @@ -170,6 +174,7 @@ static void pfsync_q_ins(struct pf_kstate *, int, bool); static void pfsync_q_del(struct pf_kstate *, bool, struct pfsync_bucket *); static void pfsync_update_state(struct pf_kstate *); +static void pfsync_tx(struct pfsync_softc *, struct mbuf *); struct pfsync_upd_req_item { TAILQ_ENTRY(pfsync_upd_req_item) ur_entry; @@ -186,8 +191,6 @@ struct pfsync_deferral { struct mbuf *pd_m; }; -struct pfsync_sofct; - struct pfsync_bucket { int b_id; @@ -1839,7 +1842,7 @@ pfsync_defer_tmo(void *arg) free(pd, M_PFSYNC); PFSYNC_BUCKET_UNLOCK(b); - ip_output(m, NULL, NULL, 0, NULL, NULL); + pfsync_tx(sc, m); pf_release_state(st); @@ -2321,6 +2324,55 @@ pfsync_push_all(struct pfsync_softc *sc) } } +static void +pfsync_tx(struct pfsync_softc *sc, struct mbuf *m) +{ + struct ip *ip; + int error, af; + + ip = mtod(m, struct ip *); + MPASS(ip->ip_v == IPVERSION || ip->ip_v == (IPV6_VERSION >> 4)); + + af = ip->ip_v == IPVERSION ? AF_INET : AF_INET6; + + /* + * We distinguish between a deferral packet and our + * own pfsync packet based on M_SKIP_FIREWALL + * flag. This is XXX. + */ + switch (af) { +#ifdef INET + case AF_INET: + if (m->m_flags & M_SKIP_FIREWALL) { + error = ip_output(m, NULL, NULL, 0, + NULL, NULL); + } else { + error = ip_output(m, NULL, NULL, + IP_RAWOUTPUT, &sc->sc_imo, NULL); + } + break; +#endif +#ifdef INET6 + case AF_INET6: + if (m->m_flags & M_SKIP_FIREWALL) { + error = ip6_output(m, NULL, NULL, 0, + NULL, NULL, NULL); + } else { + MPASS(false); + /* We don't support pfsync over IPv6. */ + /*error = ip6_output(m, NULL, NULL, + IP_RAWOUTPUT, &sc->sc_imo6, NULL);*/ + } + break; +#endif + } + + if (error == 0) + V_pfsyncstats.pfsyncs_opackets++; + else + V_pfsyncstats.pfsyncs_oerrors++; +} + static void pfsyncintr(void *arg) { @@ -2347,18 +2399,7 @@ pfsyncintr(void *arg) n = m->m_nextpkt; m->m_nextpkt = NULL; - /* - * We distinguish between a deferral packet and our - * own pfsync packet based on M_SKIP_FIREWALL - * flag. This is XXX. - */ - if (m->m_flags & M_SKIP_FIREWALL) - ip_output(m, NULL, NULL, 0, NULL, NULL); - else if (ip_output(m, NULL, NULL, IP_RAWOUTPUT, &sc->sc_imo, - NULL) == 0) - V_pfsyncstats.pfsyncs_opackets++; - else - V_pfsyncstats.pfsyncs_oerrors++; + pfsync_tx(sc, m); } } CURVNET_RESTORE(); From nobody Thu Mar 2 16:25:48 2023 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 4PSGgJ3p1dz3w0cG; Thu, 2 Mar 2023 16:25:48 +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 4PSGgJ3308z4Vl7; Thu, 2 Mar 2023 16:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677774348; 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=wbnawJnAeU1lhVdBBKFNBV2Vz9lJ+OMBKlsdYUlZLAM=; b=Ud71NIDo/DP1bfwGBSrJ0/Lw+7c13OLMOA3t8+Vr/mU76paquJkYPH3Q/v+HNYjUnIPCkA HtptSruwGVsMUE46Xc+qEqLcMS//qGpkRBlO9X0bTec8PFwVMd2nYJIweLdLKk3fKj0uhB +cioUyOIbcH6ewgHMMqSx2DcuOT81e63o11ZA4RixyxW4x4T8JnqPw+0in289sbgt5xpEz APxn7EtUD1z0mAmu+4vkL2hBMZifAJiC9K9ffthJW+Xep5w/Y5YCQ+BFHd/qxPDn4sOxmJ 7twA5Stzpl3qf6L0z0dQq098myVDuXcToUoVM2fax6Q8VetGLc4s4OPu9a76Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677774348; 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=wbnawJnAeU1lhVdBBKFNBV2Vz9lJ+OMBKlsdYUlZLAM=; b=OTdFz4Y3IOSGNZAG9He5BlqNmP1ywxLjXjzQrCjdOzgIQELrmLLlj2RB83jW5sBFfzuPsN HsvuuFj3/aDmuLE4XREalM9ylXaa4Fxvnm32Aiew9aw+kfiqVxP2SEPRns7MAebeBbkDKH djv3tM2dbn4zsdY/QEQqfrO26Jowv3TbCU84xG5AFEN/Xnvn8Kil25AOKTWpg39IOvgFjZ /jmEmK9YcHf4cS6qsPTCW1HsJjFXrHUr3wi9b4/k1IX+lPE6roa4o/I2db883QUIa7xcJJ acLz2M4k4Gzm2k0mmQXIJhQs7cio1ydEpjBhiswoD5X4mGT8fFfuo38ly8/UtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677774348; a=rsa-sha256; cv=none; b=XZVOSwdxj+TOP1QTf3vWkcz0qKtHAdcd9bH3puDkg49DQUeykCke4DbtcHkiELATSkm856 lXcavwC1ekiPoRiSCIO0RVbihfEbZt40TFCbBdJaiObQP+PXsbazArfzR6fxg6Y+IGpJF1 dBVMOM8HZGrQHsvy6AgIPc2n/MrskLaCprQtoomFpUU4yRk8yXIKZ59UmnTQdjOTjniLrS vchcRt3mVG5PCO+cbFw/k9v6A/CotwIzM3vE0JQeUKhCZyX0GC4DKqwQh5hkYhI7MYDuTW NdaRdFokHlS6YiumgsOYr+bTa+rMzD/YgCIibCoNWdKpa/gpL/RBzzqEYF6ACQ== 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 4PSGgJ25R3zMrv; Thu, 2 Mar 2023 16:25:48 +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 322GPmuQ053170; Thu, 2 Mar 2023 16:25:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322GPmYX053169; Thu, 2 Mar 2023 16:25:48 GMT (envelope-from git) Date: Thu, 2 Mar 2023 16:25:48 GMT Message-Id: <202303021625.322GPmYX053169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 3dec62eded04 - stable/13 - pfsync: support deferring IPv6 packets 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3dec62eded04eaf431bf0948f4e6412deede87d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3dec62eded04eaf431bf0948f4e6412deede87d5 commit 3dec62eded04eaf431bf0948f4e6412deede87d5 Author: Kristof Provost AuthorDate: 2023-02-14 06:11:38 +0000 Commit: Kristof Provost CommitDate: 2023-03-02 16:21:59 +0000 pfsync: support deferring IPv6 packets When we send out a deferred packet we must make sure to call ip6_output() for IPv6 packets. If not we might end up attempting to ip_fragment() an IPv6 packet, which could lead to us reading outside of the mbuf. PR: 268246 Reviewed by: melifaro, zlei MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D38586 (cherry picked from commit 9a1cab6d79b7286e5f650f57ed95625e6ddb8e4b) --- sys/netpfil/pf/if_pfsync.c | 71 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index f6c7bd9b566d..6c25ddb7f6b3 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -102,12 +102,16 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include + #define PFSYNC_MINPKT ( \ sizeof(struct ip) + \ sizeof(struct pfsync_header) + \ sizeof(struct pfsync_subheader) ) struct pfsync_bucket; +struct pfsync_softc; struct pfsync_pkt { struct ip *ip; @@ -170,6 +174,7 @@ static void pfsync_q_ins(struct pf_kstate *, int, bool); static void pfsync_q_del(struct pf_kstate *, bool, struct pfsync_bucket *); static void pfsync_update_state(struct pf_kstate *); +static void pfsync_tx(struct pfsync_softc *, struct mbuf *); struct pfsync_upd_req_item { TAILQ_ENTRY(pfsync_upd_req_item) ur_entry; @@ -186,8 +191,6 @@ struct pfsync_deferral { struct mbuf *pd_m; }; -struct pfsync_sofct; - struct pfsync_bucket { int b_id; @@ -1839,7 +1842,7 @@ pfsync_defer_tmo(void *arg) free(pd, M_PFSYNC); PFSYNC_BUCKET_UNLOCK(b); - ip_output(m, NULL, NULL, 0, NULL, NULL); + pfsync_tx(sc, m); pf_release_state(st); @@ -2322,6 +2325,55 @@ pfsync_push_all(struct pfsync_softc *sc) } } +static void +pfsync_tx(struct pfsync_softc *sc, struct mbuf *m) +{ + struct ip *ip; + int error, af; + + ip = mtod(m, struct ip *); + MPASS(ip->ip_v == IPVERSION || ip->ip_v == (IPV6_VERSION >> 4)); + + af = ip->ip_v == IPVERSION ? AF_INET : AF_INET6; + + /* + * We distinguish between a deferral packet and our + * own pfsync packet based on M_SKIP_FIREWALL + * flag. This is XXX. + */ + switch (af) { +#ifdef INET + case AF_INET: + if (m->m_flags & M_SKIP_FIREWALL) { + error = ip_output(m, NULL, NULL, 0, + NULL, NULL); + } else { + error = ip_output(m, NULL, NULL, + IP_RAWOUTPUT, &sc->sc_imo, NULL); + } + break; +#endif +#ifdef INET6 + case AF_INET6: + if (m->m_flags & M_SKIP_FIREWALL) { + error = ip6_output(m, NULL, NULL, 0, + NULL, NULL, NULL); + } else { + MPASS(false); + /* We don't support pfsync over IPv6. */ + /*error = ip6_output(m, NULL, NULL, + IP_RAWOUTPUT, &sc->sc_imo6, NULL);*/ + } + break; +#endif + } + + if (error == 0) + V_pfsyncstats.pfsyncs_opackets++; + else + V_pfsyncstats.pfsyncs_oerrors++; +} + static void pfsyncintr(void *arg) { @@ -2349,18 +2401,7 @@ pfsyncintr(void *arg) n = m->m_nextpkt; m->m_nextpkt = NULL; - /* - * We distinguish between a deferral packet and our - * own pfsync packet based on M_SKIP_FIREWALL - * flag. This is XXX. - */ - if (m->m_flags & M_SKIP_FIREWALL) - ip_output(m, NULL, NULL, 0, NULL, NULL); - else if (ip_output(m, NULL, NULL, IP_RAWOUTPUT, &sc->sc_imo, - NULL) == 0) - V_pfsyncstats.pfsyncs_opackets++; - else - V_pfsyncstats.pfsyncs_oerrors++; + pfsync_tx(sc, m); } } CURVNET_RESTORE(); From nobody Thu Mar 2 16:25:48 2023 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 4PSGgJ3lf5z3w0j1; Thu, 2 Mar 2023 16:25:48 +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 4PSGgJ2FqTz4Vfp; Thu, 2 Mar 2023 16:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677774348; 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=pUrQ/h6eN3dHV3d5jWKc6Mu83DfUeQHwykR8+QdQEOY=; b=SIY40QtvHvhcrZjDpLJXxNaeL4zTtoDyQlefMUvwKEcXSDJbpDeRr4xVXnCwuFxFA54+T8 6Q8jFd/ScfAWtpFGYcEpwTgVpSFtCnVQ4wQgtBD44MTIZ4sGtJ+zzYpVp7E7hwNz30SHhU hKjn6NCxkIRVwPyKtOq/NzbAm+WscfzjnPlcJ2YB2gXUGYbAsUYem9vk7JX1lENdrj4/71 cRBZv8qR0UX/yL60tMwn8fqCOVbPJAdJnJJZ9aIkyDNXV+rEOZO8o9oPFBSwGFPl41QF7g 0sIwR7I+OibpiaKBeWhZF+P3XKFVFlwuHwTsez/+aIZ2IeX2c+c/3fJ8LKTpeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677774348; 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=pUrQ/h6eN3dHV3d5jWKc6Mu83DfUeQHwykR8+QdQEOY=; b=k2bu3eCAembvUbVz7tYj1rQtIg4wuRmYF3PpuaU0uwtWSKC7h5+kgwPTvIHAj/wBkuA1ZH pVJhz6iE8OeeKjJ2vq6grVE0cSCzv6C2FzoKtPG1V3OIUKPbtwDaQYmudVd3LmkCR0RHnz VClnbmZ9X1kSeG/i783WxlS/zYCmhv/uH6pVgDrzqtmTsIWfufcuwJEPYroXBjoGLh7+Qz X0CaazFoL/XguUCPZLTJmNg6sGaBkXvRtf9xAYsVKLlCD7X29EYU/hzQdwBbipHwpZ+iOU txZy4CUq8L294eFZdMce8aVLRUbA0JBgtdQrJodHNLAcaM2GLFpntkaKxJ0PPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677774348; a=rsa-sha256; cv=none; b=jhyyWdQfYJNgFk3ls8C+w/ooHgGc7aG0AqMNj+iY4cMPSqgvWHuSOIfl6oIoSaX0MeHW4W tIwF7cPXjYDGqI5+2HQsy1irX7pvG2cqT5sTv6EWPRJL/3Ou6845Nw3GWBlV0QzvlEZC5b IL1mpXBYTaRI1iUn9DSD1UJ1EDWcXGSzOPIgT4eYIlqSfpemnIFV1LE+BMHhubqeSnF8Ff TbqxCPPB+Qq6a5H9jCUJJQ88TrLHzQtHdkMWNDUhQ/QDu/s5vXCEmpnJQgnGK5cZiJorZk mRmAlgnysBGrKr3X+IvER+Ggko7UyDNzRiQ4jcZv0ONCFbAYttTd+KZJ6YoH/A== 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 4PSGgJ1DN1zMfn; Thu, 2 Mar 2023 16:25:48 +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 322GPmat053122; Thu, 2 Mar 2023 16:25:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322GPmYC053113; Thu, 2 Mar 2023 16:25:48 GMT (envelope-from git) Date: Thu, 2 Mar 2023 16:25:48 GMT Message-Id: <202303021625.322GPmYC053113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 7e2de012f38a - stable/12 - pfsync: ensure 'error' is always initialised 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7e2de012f38a7cb36357efb8cb00174bab4b479e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7e2de012f38a7cb36357efb8cb00174bab4b479e commit 7e2de012f38a7cb36357efb8cb00174bab4b479e Author: Kristof Provost AuthorDate: 2023-02-16 08:16:35 +0000 Commit: Kristof Provost CommitDate: 2023-03-02 11:15:28 +0000 pfsync: ensure 'error' is always initialised Reported by: Herbert J. Skuhra MFC after: 2 weeks (cherry picked from commit f52ca3dfd5520332e8cb8d08eda1b92aca2a159c) --- sys/netpfil/pf/if_pfsync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index e3e3fa3ad6a2..8d90f76a3faa 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2328,7 +2328,7 @@ static void pfsync_tx(struct pfsync_softc *sc, struct mbuf *m) { struct ip *ip; - int error, af; + int af, error = 0; ip = mtod(m, struct ip *); MPASS(ip->ip_v == IPVERSION || ip->ip_v == (IPV6_VERSION >> 4)); From nobody Thu Mar 2 16:25:49 2023 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 4PSGgK4gFWz3w0cN; Thu, 2 Mar 2023 16:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSGgK3fQ4z4VtF; Thu, 2 Mar 2023 16:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677774349; 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=k4VYSbsw4QIcftzTL9dkk43VRg4y2OxD65jsIXr6t6M=; b=tO8ZtAchpThIEEmYIsu+edcfE/dalq+YMAqy6mDfboSH4wa/z+ZlZVsRBtYw2NSmChMauR WN0RBLglmAJ915V5th7jhMUIGMKzoM4XcLtEiyKipJPrJdYbMRxqKMxvisq4C1KorlxBqd sZNZj612D3FUTvhXnUAhhm7geBfA2MOLLivbSXsuJ11ELaJn99EAaa1yPsncXYT+E/GoyO 0ov6TGfVru8teoDeyMKH37HFfy6DI3vAA76DJ/4x6//Sq5xltBppxTKrLwYNP8QgG0tCSM QTGrTZ4ruBwE2bGY61EPfjGpNGL0sZBw9x8bmZEtOzxhSNZA0Rc8IGEo85ENPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677774349; 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=k4VYSbsw4QIcftzTL9dkk43VRg4y2OxD65jsIXr6t6M=; b=TEwpBThrwsZ4Fm6WUE8u7mUyLC9N8wK0j2P/KpCPYLNyU1M7qJZoM6yZZgp8b3A1ZhdkVJ T2jPukRKdxbpnn2hnoOvD5cAF1VBDQMD0zrNNENf7LtJRgb2pFMUpnqhNl4opN//+SW50u R5gPmvV8+APvsiHiuJtJoSt10bryqa5Jax1VTRfEtR+eRZBA1zn0VuS0wLglqTqM8g9wtf fgequTjN4ZJK92SBi/3emIaCpquKCdrXp+uW0oqsHCA9VzPMXfu1fzqSeIBv35nDJU0uoQ wCWUbktXjYQkZCf4peBKkBZg/ToRllh+Y/sOVR9Lfa1QZMq2wdABd+pHiZpZVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677774349; a=rsa-sha256; cv=none; b=XoA2bahM96YbazdXmmc2oTD0Scv572GOzr7lIUbSFAkqVoexF4T/7XOFFRmKnzaxvLr/DL KA2tolrkZ6J9siei/HEy5whem+nl4tPsPH3WE7GIAgxNcu00YrXJeb9/asa7eVix/HBADc scuqXPvGs1Sj6pzWozKnBHdEjvU8yFoxJueBEK8KWTtpBPyLHlbkGoBOYtHDQx6UfLkdLA ZIGupsmeBnG6cxi3eHWKAoj2ZmrIlMu8ORzXbEsDsUDR0ALrv9mzXLXZpK1mVvo8qAQB4H 55SAeuV9GHTJOCwL8vq63XQMC93PKrJsDysSl6+nbrFzaM3CFtmqnceczXTxNg== 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 4PSGgK2lmBzNHN; Thu, 2 Mar 2023 16:25:49 +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 322GPnLd053224; Thu, 2 Mar 2023 16:25:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322GPnNB053223; Thu, 2 Mar 2023 16:25:49 GMT (envelope-from git) Date: Thu, 2 Mar 2023 16:25:49 GMT Message-Id: <202303021625.322GPnNB053223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 5e9b79c4e652 - stable/13 - pfsync: ensure 'error' is always initialised 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5e9b79c4e652be192e76bb4df842ea5228e8c4ca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5e9b79c4e652be192e76bb4df842ea5228e8c4ca commit 5e9b79c4e652be192e76bb4df842ea5228e8c4ca Author: Kristof Provost AuthorDate: 2023-02-16 08:16:35 +0000 Commit: Kristof Provost CommitDate: 2023-03-02 16:21:59 +0000 pfsync: ensure 'error' is always initialised Reported by: Herbert J. Skuhra MFC after: 2 weeks (cherry picked from commit f52ca3dfd5520332e8cb8d08eda1b92aca2a159c) --- sys/netpfil/pf/if_pfsync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 6c25ddb7f6b3..610252a9fdf3 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2329,7 +2329,7 @@ static void pfsync_tx(struct pfsync_softc *sc, struct mbuf *m) { struct ip *ip; - int error, af; + int af, error = 0; ip = mtod(m, struct ip *); MPASS(ip->ip_v == IPVERSION || ip->ip_v == (IPV6_VERSION >> 4)); From nobody Thu Mar 2 17:10:19 2023 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 4PSHfg5mLHz3w375; Thu, 2 Mar 2023 17:10:19 +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 4PSHfg4tbcz3BsY; Thu, 2 Mar 2023 17:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677777019; 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=0v6AOUt6x2q+nSEWiMaUUti/tjNIkBxOneMoeRJqyU4=; b=CstmiHS3qOJg6+KrMZXjXSrkTUEl5dxMhXQBd2WoySwH4fdQeR+6kmrScatz0E8mTjfbgp 2yTNVIuLVowXzxrxbTTxHopngcnJdNVkkBtc8o8vmx5PUFHHN+kqj7L/Ux//FQF3QsNCMH 79qUJ7Fe0TyRwZuenoN3skzEWFw1jimwh2NOF6ChEmc2/1F77VbzmAmzl8LQm5BtXT68M6 FSIK274gE0bcxlmJpcD9/RZRQQOrukmFytSWTelkq4mGssw+5KnC8mG94woXV9gb4jx6gT EVraaa13levQz0q5bcOlBiA0KTrElCIcxblt4QxYSxR0gMeAraCv+j8jG1ezvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677777019; 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=0v6AOUt6x2q+nSEWiMaUUti/tjNIkBxOneMoeRJqyU4=; b=Q8cXQqvLj+lwwuCSkQ5AfkdaiUtL58CpuWmfPJurt+BDzpX3yoMBdRdwuYPVb6fze3T08j K/thOeFcF6JekVnq1J+4zrKmp88to79XRDm6o2tY850eTkevirCN6E94vjsxG6jh3F5cPS pgXjwLOZbnhoWC7oCXWuk0nckTrZ2zV5ObXBTLksHs3XLb9V0VnQv0EjCUitTIYMLkmhKB kqshwT8XtD3tU+5L/qWX2PVoVgpXirCWVkg28H4QA3h4IXoJEPNKln4O+ATGmDkqcuD1YD CQB3+tycbAzj2rs8nojwOEXDzPH1wf/xGGooKn+/4WUVeelgnUDUgNnMUByzNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677777019; a=rsa-sha256; cv=none; b=yVxhu5q5f/SXBGo3fArqNFradtTong7ciHRTAc5OYpiooDoFXb7IELq0EXXkAuAPxyO7H4 ojnwux8jct1Fs0YdORB0UBrd6yQjKiPb5eIJre5QQl7RLCCdnUpk60JzoEuqxKTPaJIlJB /sIiz///J7NDJPpKuYODj2hniXp+OzBvwirZCa5bAImHavEJVx5+q/a06i2pPMOlrBKi1c 5po637UE/fc/BigWIc1v+uFcG8ZkxyIGiCUYuC/ppm4yXwyQcqZlfDc4dtowtm/bxiQkqX WBbEOFkfj9uwAsUWTJTzXBtaE/zHoIjcwc3GDnM+ociiGe9kmX2SoVpYve3YMQ== 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 4PSHfg3vVmzPRm; Thu, 2 Mar 2023 17:10:19 +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 322HAJbu028204; Thu, 2 Mar 2023 17:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322HAJ4r028203; Thu, 2 Mar 2023 17:10:19 GMT (envelope-from git) Date: Thu, 2 Mar 2023 17:10:19 GMT Message-Id: <202303021710.322HAJ4r028203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 572900bd93fd - releng/13.2 - stand: fix build userboot without zfs 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 572900bd93fdbbc2b42f0ad7374f390d8dd54de8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=572900bd93fdbbc2b42f0ad7374f390d8dd54de8 commit 572900bd93fdbbc2b42f0ad7374f390d8dd54de8 Author: Michael Paepcke AuthorDate: 2023-02-28 02:58:03 +0000 Commit: Warner Losh CommitDate: 2023-03-02 17:09:32 +0000 stand: fix build userboot without zfs Fix regression in building userboot -DWITHOUT_LOADER_ZFS Fixes: e307eb94ae520 MFC After: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/665 Approved by: re@ (cperciva) (cherry picked from commit 4d59545d0cacb5881e2515eecce15e8478f07276) (cherry picked from commit 3464fc5f2a3376b4cd5612f1ee0986072b4a65f3) --- stand/userboot/userboot/Makefile | 4 ++++ stand/userboot/userboot/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 43011b9577c9..986bfdccfdd6 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -36,9 +36,13 @@ SRCS+= gfx_fb_stub.c CFLAGS+= -Wall CFLAGS+= -I${BOOTSRC}/userboot + +.if ${MK_LOADER_ZFS} != "no" CFLAGS.main.c+= -I${BOOTSRC}/libsa/zfs CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs +.endif + CWARNFLAGS.main.c += -Wno-implicit-function-declaration CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index 40911f35020a..b134d86de9bd 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -32,13 +32,13 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "bootstrap.h" #include "disk.h" #include "libuserboot.h" #if defined(USERBOOT_ZFS_SUPPORT) +#include #include "libzfs.h" static void userboot_zfs_probe(void); From nobody Thu Mar 2 17:10:20 2023 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 4PSHfh5r5sz3w321; Thu, 2 Mar 2023 17:10:20 +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 4PSHfh5N1Lz3C53; Thu, 2 Mar 2023 17:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677777020; 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=KRnLz4f9rpgfGSjk28CklZoTqMBeJp/pimiM3+AnbbA=; b=QX7AXqQApnO/D/RWc3e/jPP5Toiev4nKBIpGXh+D49Uy54QnUUKcOSsrbuDb5Fq2g83ZGT 8vY32w69oEVZs9IBSjSG2jFEohZ2+SnkYmVs/IgAtikDXlCkjlbiO4mX94cK4E7kOQiM/B enE1Xa17qWzT2HIUEbUezX24WTQvwTocvVvFjcMIUn7je5jxTM65TYXMB5gPuYEC/WH3/4 SZTgdMWuP+OyoEtQnIRuGbaan0Ju+1yaAxF7R4KGEMdyPKYYTi1QbKSnYWWMBBNhFf0oZJ i1+/5gjSGyt7+Q6dX2htb/s60le6peQdbN8kikS3fD3tC/gVWW0IvXpMH+hBEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677777020; 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=KRnLz4f9rpgfGSjk28CklZoTqMBeJp/pimiM3+AnbbA=; b=pk0GPwyB/euZxmMy3VKSAUBiImmOdIywmSuqIrRx/mpmdRa1cZ6i9MSV2zf0NBnIAlS8H4 Cx/MyvYy5Iq/OoeHDgVW96qtxQFqOaEgcKlWzaVEtABcfOn6fhDIN2MWsLuZhinzKuVUsw T2vMS0GuhnitfpGY6EQqwocEJm/g9LqOjpXnwyWL5MepjNc7l77DO7InGtNr9RHmWJbTLM 0jXldeA8bcL/vhzLuKbdM2z7gUyZC2G9/qZGXULZJG3bDXaskAg6FHdxo2wMSI6ZZ3H1Fi TMEX7dRYVPHFt7jB4d++SPbrtFYV8gJdSPvbiJOAIOxJtWOw5KlIQxt8hAnGUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677777020; a=rsa-sha256; cv=none; b=KmdfTP3fvjv59uR9dzV4+/ARQFTSJInOJM1iwintNjx3Uijk7xG0GYblwAr0S9sI0GAct3 JcERbzptjP+1mz39o5LFP9WyGaKES1S/KgS3JcqEjXC2qhUFQcz7AxPXPFHcsQ1+AyB2t9 g2aDx8oEokMCif76H9Mj+Dd5AtLDrTYRuqtcDMnXfmaG713iILiTkfsa7RQhYyNkSUVfFe LEA5S5DF3YUyQlobbsLZxRmWuFiy7y0kP56zXDIiuhHDi9xcE15ESEsdHh3lddUpLrc7Px hH6z30AtLBkXO113rqbtlB39h3dikR8v+Cju34Z+GZp6Hpf/xmRhakxpC9Cwug== 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 4PSHfh4TbVzNyL; Thu, 2 Mar 2023 17:10:20 +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 322HAK1G028230; Thu, 2 Mar 2023 17:10:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322HAKf0028229; Thu, 2 Mar 2023 17:10:20 GMT (envelope-from git) Date: Thu, 2 Mar 2023 17:10:20 GMT Message-Id: <202303021710.322HAKf0028229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 55639067a29b - releng/13.2 - apic: prevent divide by zero in CPU frequency init 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 55639067a29b1250f7ba7dfc012723a843c5f91c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=55639067a29b1250f7ba7dfc012723a843c5f91c commit 55639067a29b1250f7ba7dfc012723a843c5f91c Author: Mina Galić AuthorDate: 2023-02-28 02:58:45 +0000 Commit: Warner Losh CommitDate: 2023-03-02 17:09:47 +0000 apic: prevent divide by zero in CPU frequency init If a CPU for some reason returns 0 as CPU frequency, we currently panic on the resulting divide by zero when trying to initialize the CPU(s) via APIC. When this happens, we'll fallback to measuring the frequency instead. PR: 269767 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/664 Approved by: re@ (cperciva) (cherry picked from commit 499171a98c8813e4dc6e085461d5c47750efa555) (cherry picked from commit a1c63b8e29e832d9ada7c252e7e80ce8b94aeb41) --- sys/x86/x86/local_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 4ab4e78f20e7..482b0ebd81bc 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -1027,7 +1027,7 @@ lapic_calibrate_initcount_cpuid_vm(void) /* Record divided frequency. */ count_freq = freq / lapic_timer_divisor; - return (true); + return (count_freq != 0); } static uint64_t From nobody Thu Mar 2 17:43:40 2023 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 4PSJP914dNz3w4MJ; Thu, 2 Mar 2023 17:43:41 +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 4PSJP90ZkBz3HHb; Thu, 2 Mar 2023 17:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779021; 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=flbGUJoH4yQB+bMnXUyb9UwzoEwaB89QoCE4GBOYhv8=; b=osSFjUcLsTlbeG8VSV15nCMCbD89Xw+Kp00L2qpNbXNveSA4rMnS568/RGsFvhzJ1UG13t uDlPZ/aLvv0nx0Pijg1PokjMPtr3XWTButgfPTWs2Qfm1UU5cfXktfJwN/qY0D4NFxxD2A 8igsEl1L/6ngIYv7yMi7b19dz6hI4XpZwKMa1UinM7UeM8aMELH1ryFd6/2Wts4x3IP6NA EKYT7guyHXubcvoWaBuBpVO7GP5CPekS8TEkQXdsKATofDfCLDu6rdbLYeZfNjMOf/fUIA gHqEjDDXqljn2td+mhT+8cgCj6GgHMB6YvXJsaQ+YCiaXtxw1li/kDQaP7d7nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779021; 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=flbGUJoH4yQB+bMnXUyb9UwzoEwaB89QoCE4GBOYhv8=; b=kBNwSiVDlIC7uCfIyMuLycSleppWjAUgY32Yh4anznfFS/jj/gwY+poChtBHLMSiu/AYHv wip/TqDJ4indoypQsQ+VaxLRGn4kFe/JcwhqgJlm46PBvnSdOT+pfvMBQYaFBlEj/ikmP8 AMR1S1VDhPA8iGF9+3A3mYAkcC74UF7O+wEdbucwYmuZEsMXwQ09iodupQcxCvApSuZTKT mlD9043o1QaApyhH/IjA61PHGc8uGCbwyOB6h8GTzMiPEHJ7M+z9EQeq1je2lkreFEE6aG 2x/H8EBwTtEdQJspzrLWXp7PWoRxktMjio6O35LMU78Ro1ir7oOZ/EiuwDSdsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677779021; a=rsa-sha256; cv=none; b=PUYYjiZXP3qrhJ7ogb39iWPYZr5m6PynfXuzKpoeI1633tKvL/I7ptA3SoTCW3sL+nr4Vb iv9YJgSNCmfo3P4dXZXZ4mI/yMye494WE4d7fhikCNZWtyWFbkmhpo6bqLV/HVu4m/7uzE oSs9RCtV5FhHfxoWKpk0t/Fu/Pp7AiVUjcuUCRW9eKm7ehU8zvKihEh2rb5fTOwSNOZidI BrBuIktV4vff0cNnNP1ai0GwEi+sFM7BL3HWzJNMt/q02C3/qqSiQR+moNr6zA8TRH5vht kBTMTjoM0YDCJUSFMRYqTSz/Sw/eaQd1Ly/Tjr4qP0qAN8ytuaUSuNBCvJiXqw== 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 4PSJP86RbvzPmD; Thu, 2 Mar 2023 17:43:40 +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 322HheoB084215; Thu, 2 Mar 2023 17:43:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322HheVv084214; Thu, 2 Mar 2023 17:43:40 GMT (envelope-from git) Date: Thu, 2 Mar 2023 17:43:40 GMT Message-Id: <202303021743.322HheVv084214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d54953d6abc9 - releng/13.2 - ssh: default VerifyHostKeyDNS to no, following upstream 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: d54953d6abc9b79d94c5bd4969864fa261e35ee8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d54953d6abc9b79d94c5bd4969864fa261e35ee8 commit d54953d6abc9b79d94c5bd4969864fa261e35ee8 Author: Ed Maste AuthorDate: 2023-02-17 01:26:41 +0000 Commit: Ed Maste CommitDate: 2023-03-02 17:43:28 +0000 ssh: default VerifyHostKeyDNS to no, following upstream Revert to upstream's default. Using VerifyHostKeyDNS may depend on a trusted nameserver and network path. This reverts commit 83c6a5242c80160fff76fb85454938761645b0c4. Reported by: David Leadbeater, G-Research Reviewed by: gordon Approved by: re (delphij) Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38648 (cherry picked from commit 41ff5ea22cb95deb9e7415510eb2f5f00b91537a) (cherry picked from commit 43fd77233cd49061839cfdd936cfeba53e9855c3) --- crypto/openssh/FREEBSD-upgrade | 1 - crypto/openssh/readconf.c | 6 ------ crypto/openssh/ssh_config | 1 - crypto/openssh/ssh_config.5 | 5 +---- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index c8603577a2a2..17161df93316 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -136,7 +136,6 @@ We've modified some configuration defaults in ssh: - CheckHostIP defaults to "no". - - VerifyHostKeyDNS defaults to "yes" if built with LDNS. - VersionAddendum defaults to "FreeBSD-YYYYMMDD". 3) Canonic host names diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 3440d05e4e3b..52c9c47c6879 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -2611,14 +2611,8 @@ fill_default_options(Options * options) options->rekey_limit = 0; if (options->rekey_interval == -1) options->rekey_interval = 0; -#if HAVE_LDNS - if (options->verify_host_key_dns == -1) - /* automatically trust a verified SSHFP record */ - options->verify_host_key_dns = 1; -#else if (options->verify_host_key_dns == -1) options->verify_host_key_dns = 0; -#endif if (options->server_alive_interval == -1) options->server_alive_interval = 0; if (options->server_alive_count_max == -1) diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index 7c7ad542e4ef..2dee303a128e 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -44,5 +44,4 @@ # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h # UserKnownHostsFile ~/.ssh/known_hosts.d/%k -# VerifyHostKeyDNS yes # VersionAddendum FreeBSD-20220415 diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index b642c5a6b17a..d783ea6ff835 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -1994,10 +1994,7 @@ need to confirm new host keys according to the .Cm StrictHostKeyChecking option. The default is -.Cm yes -if compiled with LDNS and -.Cm no -otherwise. +.Cm no . .Pp See also .Sx VERIFYING HOST KEYS From nobody Thu Mar 2 17:48:31 2023 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 4PSJVm1SLFz3w4ZW; Thu, 2 Mar 2023 17:48:32 +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 4PSJVm0bS9z3JRZ; Thu, 2 Mar 2023 17:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779312; 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=3EiJbt/gXlq/afTlJZzneluXbJW8fg+QsQhNxEx5KkE=; b=GWD55khsOpVqz0kLbFstqeB1uzWQRCFZxEAHRk3LSNfOS4owmBfHyWjrGRF7sd3pYbrL/g PXsRagIerzF503eShwH1zNYq27vDBnuDZOusTOcvTORElbOufnv/RtNuHb2cttsSnxtuVd EfpqgO+bwxkcdjY8OD9foL0dhwVYKOjX8MpbLsYo8qRsW3qpr7wzbsfqz5b1xZCG3LLpl8 mk5N4mDl6NoJbVCuNKk+TDJzoJDg1bigreNii+K7grjDDBQE1LgB/xAMvF8rktdwvo1EzK FLlAaQ+fcm2NFiwAfRuSRgC0NmlGrxTJPNQdmzDzc+VH3OUa191gfUi0Q4b0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779312; 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=3EiJbt/gXlq/afTlJZzneluXbJW8fg+QsQhNxEx5KkE=; b=CoUshXX5JOcZ9SXIUSiptY8yTpbt7Tq9oBSJXEnhbz/0fhFwxCukXU+1UGekqrqL2yAgUp zF919ODCoI1lS4ydiL5WLxByCqAZs54ZN+EotwbUQnlIj6yNaumt4/ET+Njfft/lfDtRfm oV0ro22RBiBCqX2ZnOiNeZxbAJKXUvJVfIn9saJHt6wP017sKNbDJVDdQQRlFGb1uVkv/N +fV2JlLMOGsynVC2277gRrDxEYrTPMRsS0PBnXHLBdMqH0pDC+PrIe7YbP2yI8LqJ/DVmR KUoGo24r9SHGC9owqvh38cgjJGFVVUewLJFQuZQEVKOjuPOsEy9y/+SI7RXC3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677779312; a=rsa-sha256; cv=none; b=iu94NGDwfvsMzhcBQ0fvJRxmRX59KFHbpCQcEI7jYm0uDU9dfqLDh13DLaynooUqqzEhEb wJCF9X1QWH5fpuaj6PN5tIBx7EItAnfWSOiQDykfHObxwm1EDVujjBsVOSBmRRzj1SPSC0 PVzRga66GanOSpgqrlwrhYmHauvp5PsE+fHi7n27sYKaoNpbgbFZaWORID3asjT7vCbJCx g3ckMJmXh0cuiL0/ZTI03PILuD6rrZATKeoQuEYaENU0ig2CrFgMJ9TjOdv4tM8lo4Z+PZ zrkqqvdIB9sB3JBfZLago16iSUZWAtgg3RRtkr6wA1nlfOiKbxE4IaA23w+pXQ== 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 4PSJVl6nTKzQFH; Thu, 2 Mar 2023 17:48:31 +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 322HmVeZ084945; Thu, 2 Mar 2023 17:48:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322HmVBP084944; Thu, 2 Mar 2023 17:48:31 GMT (envelope-from git) Date: Thu, 2 Mar 2023 17:48:31 GMT Message-Id: <202303021748.322HmVBP084944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 413a08a9b668 - releng/13.2 - linprocfs(4): Fixup process size in the /proc/pid/stat file 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 413a08a9b66871fe599310e358555edf54dd61a8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=413a08a9b66871fe599310e358555edf54dd61a8 commit 413a08a9b66871fe599310e358555edf54dd61a8 Author: Dmitry Chagin AuthorDate: 2023-02-26 13:42:22 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-02 17:47:36 +0000 linprocfs(4): Fixup process size in the /proc/pid/stat file According to the Linux sources the kernel exposes a proces virtual memory size via proc filesystem into the three files - stat, status and statm. This is the struct mm->total_vm value adjusted to the corresponding units - bytes, kilobytes and pages. The fix is based on a fernape@ analysis. Approved by: re (delphij) PR: 265937 Reported by: Ray Bellis MFC after: 3 days (cherry picked from commit a55b5a9aed3981fcec205e246436991d138c78a2) (cherry picked from commit 867e8404efed7a33553646b89588831db1a2102b) --- sys/compat/linprocfs/linprocfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 3aa01de9ce65..9166e46355ec 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1023,7 +1023,7 @@ linprocfs_doprocstat(PFS_FILL_ARGS) PS_ADD("0", "%d", 0); /* removed field */ PS_ADD("itrealvalue", "%d", 0); /* XXX */ PS_ADD("starttime", "%lu", TV2J(&kp.ki_start) - TV2J(&boottime)); - PS_ADD("vsize", "%ju", P2K((uintmax_t)kp.ki_size)); + PS_ADD("vsize", "%ju", (uintmax_t)kp.ki_size); PS_ADD("rss", "%ju", (uintmax_t)kp.ki_rssize); PS_ADD("rlim", "%lu", kp.ki_rusage.ru_maxrss); PS_ADD("startcode", "%ju", (uintmax_t)startcode); From nobody Thu Mar 2 17:51:38 2023 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 4PSJZM18wCz3w4lq; Thu, 2 Mar 2023 17:51:39 +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 4PSJZM0jnHz3K7b; Thu, 2 Mar 2023 17:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779499; 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=8J1DmIqM7JX6AnboiKmXrv2CtEe5r7PGzNd2Cji+wNo=; b=kPH5DRzGdpdwWS4cWjQzlCfY2E6+sL8aljqTMUMsyIuRj9Au1cy6pGXOnXkwXJaeCA6P4z yEB8Ud0QaleiIlBjBbJFVkAwuGPKAc4NVnQYULNkhRhgbcoXclh/DVKzKJc4ouPa+Xsknl z2tRAGOKjr3qpQu32Hb23TVFRrNm+MjJyYXVvzzN3rPbjqP11DIlVrv1tF2nA/3f084m2e lb83DXdCAmz9qGN31JdmgZb2SD/t36pMrf3Zq6OmQd/g3EuY4oAE2+UvGaIidtoyfbMb0S 5KP+ZOuerCT5qlkCMBBv/gzyUh+zfZvgnHiuteA5UQomZUgM71jb0pDrlTFgzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779499; 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=8J1DmIqM7JX6AnboiKmXrv2CtEe5r7PGzNd2Cji+wNo=; b=IVS9U58YwdLpUcB4WSSe/hkuoaJWwWNUI9152sZAObw+TtC+rJx5mZmrZGqfygac0nJTsx 21p/z9wCzxdeWmMqAGTPqUPmuS287pkdnks4I3grLkTbtHykDzAxA93PsQ1TkSkzetU6sH MGagixm0J/2zKmWtdeqMrxdZpoqH6gu24bC4S2DaDbUmOmoy/w/VMweW0aCisMSSZEiL2t smAX6EiWxD9ZwKLdCYWHSufUejPGBxtYZxDvim3CQfP4g0f8Ifx5rwzFHr39X1Q5LG/ajt Iy9t8MxJlV7Db6hLCdNSMHeQGdYsnGgEKr8qgyhTfjc5lSzVVUq3HJzUfxHFBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677779499; a=rsa-sha256; cv=none; b=F2PaIHeebQgt6zkJvyvDjPL78DLK2DnXTeNkWL9JSvRESO9kWYZUdnK1zT6Cq9NtxdnCQ1 VwkXU6wdeb5ZmdTje5xDsHOxZj6/yZwsGY9h7QspkAuUKnd9aL+vAVLLYYSW7+iW7khDbW VCIMYVD1UtQ7Aeo2phOfj84ARnc66XmhX/r48Nt0EoG1lNgbfD/te7o5ILKG3Z8whwD3Gn rpc5cEyfaE2ortOoa/Gcpfs5pe9O5hpxt2DouthLldPbP3YN7MtynI8Q47p9wXRdzHWg61 QmiSZ1iJIAVWQozlybMVkCftuAqEW7r568h4SiRPJqsKQpvrqwREB3ywiO/hBQ== 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 4PSJZL6v57zQ45; Thu, 2 Mar 2023 17:51:38 +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 322HpcTA099503; Thu, 2 Mar 2023 17:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322HpcTR099502; Thu, 2 Mar 2023 17:51:38 GMT (envelope-from git) Date: Thu, 2 Mar 2023 17:51:38 GMT Message-Id: <202303021751.322HpcTR099502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7e8aaae6b8ad - stable/12 - Bump EC2 image size to 5 GB 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7e8aaae6b8adaad76605e222f2a8bd48f2ee6c8d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7e8aaae6b8adaad76605e222f2a8bd48f2ee6c8d commit 7e8aaae6b8adaad76605e222f2a8bd48f2ee6c8d Author: Colin Percival AuthorDate: 2023-03-02 17:50:22 +0000 Commit: Colin Percival CommitDate: 2023-03-02 17:50:22 +0000 Bump EC2 image size to 5 GB The latest weekly snapshots failed to install mandatory packages due to the snapshot disk running out of space. Direct commit to stable/12. --- release/tools/ec2.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 22735e7a3f27..1f3b581a4f27 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -19,12 +19,12 @@ fi # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs ntpd dev_aws_disk" -# Build with a 3.9 GB UFS partition; the growfs rc.d script will expand +# Build with a 4.9 GB UFS partition; the growfs rc.d script will expand # the partition to fill the root disk after the EC2 instance is launched. # Note that if this is set to G, we will end up with an GB disk # image since VMSIZE is the size of the UFS partition, not the disk which # it resides within. -export VMSIZE=4000M +export VMSIZE=5000M # No swap space; the ec2_ephemeralswap rc.d script will allocate swap # space on EC2 ephemeral disks. (If they exist -- the T2 low-cost instances From nobody Thu Mar 2 18:31:10 2023 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 4PSKRy230hz3w6qb; Thu, 2 Mar 2023 18:31:10 +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 4PSKRy1bSSz3Q4C; Thu, 2 Mar 2023 18:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781870; 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=IKuFIRcddA/AMM/Bx8gQ2Kf2MqeBgQdOAK9jojo+Gk8=; b=plz22H1NDiifVcgCK89uzCfN37smMQWPkBs1d+Eg8QRDl4jdjBbw/R4I9eWmANSiA7qvjR DOABVGcUhzron9CUB3HeR74HvYaO8L1YR5tRR5toqFkAvezaXNSXzg4VnYM+AWoe0Y6r7b 4d5xeQG156qISY9mAowSutq969pSbHg4LwkaMEdMy3HSMPwvr5A/UI9qnyDQLKZw7G43yE XiUCTBAe7xmnVKNJRAxB387a8AcM0Tdt8ncISWMyTszxV3NkKTqymVxX5O2aFV5j91qAQ1 e/IyJpsLrqiTbMkAZJTBP8wD9G4y2G2Hkv3QfmpSJKxhmjbXJZDB15qz97fSjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781870; 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=IKuFIRcddA/AMM/Bx8gQ2Kf2MqeBgQdOAK9jojo+Gk8=; b=kogjlWIpgzhHz3PjtRcOuaYxF/2ef4mvDg9W5UBtUZ3gdsOLAuxN3949yubP3fRNZX+LR1 xi+9V4UJvP7ew3b6u1FHhutXr2LWw1uZp19l3LlmBDSeasixey1zDaI5BBRwSTW7qeibCk 0QP5J1R3VrVKer3n5y/o5HvgZKOeanXuzSf/hwnswbIN/HubPD1+zK/RBgWwNAuYBbklqs wiEG+LM95RvfAWehdhjzLmCippeXKyKp9n/lhMJTCH3d/arSuub1DFLUb4DfhV08FC8rBF JmXIyfXCFQEX9CZ1vgMJs2HIWUK8XVdyMwveXRiTf1Olda9xUZKbPXt5soNnlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781870; a=rsa-sha256; cv=none; b=vQNpBG3U7kxYeFsg4bPmHtqQjRJZFYV1Wf/mUbBJPqWdRJ7EXiOYUIRVZP5ifg0SSPLgY2 2FyCxHLzydT65I6IDO7baXAvBBCjCiQoPP0RNQN4aC2MDJeXAW5c0F6j4uEhk82LUQUoXs eLooWUyrA9SvfEsm3gL1vBraSHVfgO8VsRTvOdUgIau+sE51lhuzZlWja41BJmo8RHWT8w JASifPgnpMVlabMMAMjVtUXUnrQ1bXk66nUxxWRKpWhPEl3CYUdu3B1gG5w2SBBGbmEco3 Knmohjrn6NxzZ2gxBD0BD+MVnT6XUhdRDOjhtvcOx/KZkQ+WLRNghKyyQWaw3A== 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 4PSKRy0gWfzRHV; Thu, 2 Mar 2023 18:31:10 +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 322IVA6a062590; Thu, 2 Mar 2023 18:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IVAOH062589; Thu, 2 Mar 2023 18:31:10 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:31:10 GMT Message-Id: <202303021831.322IVAOH062589@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c7e370335203 - stable/13 - freebsd-update: re-edit files if merge conflict markers remain 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c7e3703352037a5afacdc4126725f351fe7da72b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c7e3703352037a5afacdc4126725f351fe7da72b commit c7e3703352037a5afacdc4126725f351fe7da72b Author: Ed Maste AuthorDate: 2022-12-14 17:34:59 +0000 Commit: Ed Maste CommitDate: 2023-03-02 18:29:57 +0000 freebsd-update: re-edit files if merge conflict markers remain freebsd-update will open ${EDITOR} if conflicts occur while merging updates to config files. Inform the user if they've left conflict markers behind, and go back to editing the file. PR: 185546 PR: 229689 Reviewed by: delphij Approved by: re (cperciva, expedited MFC) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37703 (cherry picked from commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f) --- usr.sbin/freebsd-update/freebsd-update.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 078043326115..ca043de20f62 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2543,8 +2543,21 @@ The following file could not be merged automatically: ${F} Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... EOF - read dummy >>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then + break + fi + cat <<-EOF + +Merge conflict markers remain in: ${F} +These must be resolved for the system to be functional. + +Press Enter to return to editing this file. + EOF + done done < failed.merges rm failed.merges From nobody Thu Mar 2 18:31:11 2023 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 4PSKRz3RcYz3w7MP; Thu, 2 Mar 2023 18:31:11 +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 4PSKRz2nFRz3QWx; Thu, 2 Mar 2023 18:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781871; 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=EoLsJKLb+Vcm3cjOORwlUU6LHemP9KoGjnFhc3V7BjE=; b=KVoS/4M3XGfofKq8x5Er3Jx1n/fbUyZZQ64+nYdCYeKvx7uvT48wLS+aHuZ+h8CEFmx4fn AvCAB+1MlRic5b+FmnbquD5QP99kqrzUvL5zeJjcoC9LK+tuVoKcB7135zygts0O0I5UzC TBVQ7vEuIYF8Kwe1e0zpsf36HRKzXvGcxb5BHdC0einsKhiza6LxNpE3sbK5B765sDlqBY d4ZdhVM3Awqg6K69P5wfpqvhhS0Ind5USl0WHHua1Lo1R4CCv+R+Y7hphrH2L8g5nsb6JR 639BSHet6vGvwNlCs10/Ic+CRxav5kX68qWeUjX1KaFMcpmnCAC7CzjT+Me4Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781871; 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=EoLsJKLb+Vcm3cjOORwlUU6LHemP9KoGjnFhc3V7BjE=; b=lnqEe2uojGEiwjcv9yXsTzHa6rKY+TmEv6F8aRslVhIvdKVcoP8hUVxgfl9JRh4wqfBgsL 41or8qr1kOZqiS5wz98gkLHeB3tJJ756Zg+5NXcwGiLFq99OKpfR149w48ChhvmFSSFF6F meWARV/GOpSeWmhYwk2ckoPY1aP9uaU4zG2tk5V/WrUuih0amXHoYxhyC1qqHV6iLCmpq2 x38tJAS23D9NBKrGWdP0nJsA95kIEcmWz6Qufc3TaTWv3ha0KAwEMCzr0HVxHE9n4UbRmk jWFSskoPywenw/m5N8ybaWeacID/ulR15ijOwPvKSJuKPc0uNIdE0V1kFNsjMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781871; a=rsa-sha256; cv=none; b=IhRwSyKkS4eYd81YtJwVxouAen+O70USyEdsdD8mx3KkqDyiE1QNydbbvC1jNhwhsrWqVH 3hJ1QyttwtjzPGmkSknq86GkYFRJ+ufVU4PJZdFJz+6gc5dRx4Kbmoh5Mwzzudl/tZSNsu xelgoLEeqsuj9HOffzX1A7NEUEj1Rf+lqsDWT3/25wJqN7rppLawwiO1Zis83PJ6M9NSZn 3lEuiXnpcsygmxWWGtbeqpevHwL2KvU4YTqmHLPEAi+0RWW/OIdKiDZBL+sqAi3kWzwsd7 pC16TNioJVkpTEpazryB21VPp3xRE8nusnK4Jpa6hDKI1pwgIKelqP6tmZ3SCA== 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 4PSKRz1rZRzRWr; Thu, 2 Mar 2023 18:31:11 +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 322IVBUn062609; Thu, 2 Mar 2023 18:31:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IVBbE062608; Thu, 2 Mar 2023 18:31:11 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:31:11 GMT Message-Id: <202303021831.322IVBbE062608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 24fe8a518324 - stable/13 - freebsd-update: avoid effects of user's environment on grep 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 24fe8a518324e291b9ea3fe4e60f2e0fb4f857c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=24fe8a518324e291b9ea3fe4e60f2e0fb4f857c5 commit 24fe8a518324e291b9ea3fe4e60f2e0fb4f857c5 Author: Ed Maste AuthorDate: 2022-12-14 17:13:19 +0000 Commit: Ed Maste CommitDate: 2023-03-02 18:30:54 +0000 freebsd-update: avoid effects of user's environment on grep A user had GREP_OPTIONS containing --color=always, which broke grep use in freebsd-update. Unset this environment variable. PR: 255990 Reviewed by: kevans Approved by: re (cperciva, expedited MFC) Sponsored by: The FreeBSD Foundation (cherry picked from commit e093c61b2d69e9cca54a2332096c0e36f97bffc0) --- usr.sbin/freebsd-update/freebsd-update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index ca043de20f62..225d1e31e3ec 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3505,6 +3505,9 @@ fi # Set LC_ALL in order to avoid problems with character ranges like [A-Z]. export LC_ALL=C +# Clear environment variables that may affect operation of tools that we use. +unset GREP_OPTIONS + get_params $@ for COMMAND in ${COMMANDS}; do cmd_${COMMAND} From nobody Thu Mar 2 18:54:05 2023 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 4PSKyQ1CT5z3w8N2; Thu, 2 Mar 2023 18:54:06 +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 4PSKyQ0YS1z3jx7; Thu, 2 Mar 2023 18:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783246; 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=LcLS/q36ZDq1vWBz4B02uANDiIvo9OQBGd+mMktM6C0=; b=TbCF677AyHJNdxD42xKGWlVBIyPjG3Rbo84V5vIRUAp9DwCr8jZr4KfLDyF3GdMfRtiQhw osymm4YXKgQbNz+Bkqr/MU86PkjKzGjVIJ6M+9CTPujIMl/ADRmh8TnhqLmqGc/gZ2KVC/ ISUDE92Tej5HlnNjzccQoOlNSmzkRpsu+aMlbJwYJ8ffoDEpAgET+DpOH4tPiYQXthugYE NeUThvKU7PcrIwEyBmsnP0TQcEfjvAJuX4q4vdlKoopzmXZom+bCI3UU6xSJm7iAhwq0Sv qEU3lvAdXBeJNMj1pjpU97efR9RC6At8K91iCVAZRGcdSHkvcNiYcv4pNqYQbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783246; 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=LcLS/q36ZDq1vWBz4B02uANDiIvo9OQBGd+mMktM6C0=; b=RoKfnxTyr5Bo+x78dG30TWcYIlQLY7GPieUvH/O3xaK0+LsJbS0ZwYQDOvLPGauN5rAHMk I629ebiVihYz+ri/yIP4beeRAB8a/YVLugVE7V8cCoki3ZIDHhf/9SzbCv0W3+goTXrdhj hu447Tl54b/DZBsyqGBAbtfzUiBBIgXNw2aehmyZy6iOFW7JR6Pruln3TcWsytP3nmtH8A LkXc3wRYMHikExaiIu+viTHbPFXGJCbO2/pFYdUi23OVg6qLb5XC47o1eACfxpbJy6q2HI ogLRzRewpq64xDcuBY6BtS0VyFLTMpSYzsoc9214kUqk8GPbAnxGoe/Q/WS0hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677783246; a=rsa-sha256; cv=none; b=h16D4CdGX54YxQX44OOcUclss+yU3Yx/JqEvz7cFDUGv+eCCodyeDUU1UX3dMjsyvE68br Lhui5qSOek3YPmBZ/gepVJI1nI1wGbwt/3ktjMKzCKcstcSfeNffj9/sZtITLU8Qeh7p9x YZcI7SgEzVQi3/sZVDzjeMCU7LpJ3JV2PmQWHlbicdtQl5vapFM8f20CDc6xQRI/FR4d5D 9HSdTmdZ1jXikf6m+NTSrNXV0ghHQI68zh3EUcH6nuNMtdiIVlmDKAyfkY6PJTJRmYjPAQ /YR40tEACQLSBZr+fi27G9M5t41FEXtaytxO3ztKyxUn7RJPoHqDOAB8AD+MoQ== 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 4PSKyP6kKXzRjD; Thu, 2 Mar 2023 18:54:05 +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 322Is5n5099932; Thu, 2 Mar 2023 18:54:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322Is5LY099931; Thu, 2 Mar 2023 18:54:05 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:54:05 GMT Message-Id: <202303021854.322Is5LY099931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 4ec0ecb2ad69 - releng/13.2 - Remove an extra argument to SYSCTL_FOREACH 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 4ec0ecb2ad69f461f59e47070229bfd86794e969 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4ec0ecb2ad69f461f59e47070229bfd86794e969 commit 4ec0ecb2ad69f461f59e47070229bfd86794e969 Author: Andrew Turner AuthorDate: 2022-10-05 09:27:48 +0000 Commit: Andrew Turner CommitDate: 2023-03-02 18:29:50 +0000 Remove an extra argument to SYSCTL_FOREACH This was missed in e0853c933661. Approved by: re (cperciva, delphij) Sponsored by: The FreeBSD Foundation (cherry picked from commit fbc9f1b2d6cf90c02b918671fb7791cf36472cfd) (cherry picked from commit f36ca798c42960383e0ff9612e56eb20c796cf04) --- sys/dev/drm2/drm_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/drm2/drm_sysctl.c b/sys/dev/drm2/drm_sysctl.c index 2879f2df1220..bf3a1c4f80c6 100644 --- a/sys/dev/drm2/drm_sysctl.c +++ b/sys/dev/drm2/drm_sysctl.c @@ -78,7 +78,7 @@ int drm_sysctl_init(struct drm_device *dev) /* Find the next free slot under hw.dri */ i = 0; - SYSCTL_FOREACH(oid, SYSCTL_CHILDREN(drioid), oid_link) { + SYSCTL_FOREACH(oid, SYSCTL_CHILDREN(drioid)) { if (i <= oid->oid_arg2) i = oid->oid_arg2 + 1; } From nobody Thu Mar 2 18:59:30 2023 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 4PSL4g0Vzyz3w8Np; Thu, 2 Mar 2023 18:59:31 +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 4PSL4f6zp4z3kNK; Thu, 2 Mar 2023 18:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783571; 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=JKOje6UrYQ2uAMENjKncaVf/tjQwvF7/J/bZuI1oxNw=; b=OTpU54MwlDnfytxklE9IQbXZiu3AYP2J8/Akdnhrmpy2ZnpBnh1sLb2cWm2NP2R9QEH2ki ygkZDmc+7E6O8sz0/PntEQjEb4Cuj2ye9DstawexWoOlXT9GClt7qpsgi0yivlHTEv1ahT QKlrN4I4sc4luBBmK7Z/A6ZXR3lyxxFj6BKTrIk2Fn3B9qKd/QmOYE6G3FB+oVHPzDRtYi YgyYjON+37MembgQsoZ/b5eUR/vgIb4vhtDJfpEYgUQSH75DjGTKb75wivLx7pdTGeLRMD Dd+vDdnp7XRCr8Zq672lefFobJf4ScN3RTeZ5MHzCU4k87qslISdb0ix+69BiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783571; 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=JKOje6UrYQ2uAMENjKncaVf/tjQwvF7/J/bZuI1oxNw=; b=tgnGoHfWwteAb0G7gLsMH1IbPCUqJc7k/Y8OmZe8Fqhpd/nof72+1rZgQdaHRe2UPsdkAX 3uCw1sYV78gcNT8E6UdSXb276QWkm62gEi26e9eZdmCDpBT8tgC/Co06Qrs3TQyGaxsxSj nfCB2iwJnDjhSKZGvQgY2HNZWz106zqYf+68iltxrtRIuwTfVjuOnNAXq8XfvyaS5L38c2 9VXnuvgkfEn3bbMkJRsNOwwCKR/mXpWr7XJQjNUqRJUurBACEg6waHgt2f53F+3CVL0W3V UDXtnkV6qsENmIJjyezOx6d/wnT2MWoL+a1V6y2DHJNZZnWSTUP7B276GnVxeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677783571; a=rsa-sha256; cv=none; b=BflFhc4KU2tICYZ5uJp6IT0Upfo41s8dr88Vrl1rXqZ1Eeh8F3lh564HiOy8VUF0rSYZoM ezJUB+LWoclhQhKoAcKsnQ8+rSGdOuqB4KNkkNM2o1Ni9ARI3QRJ9Hgc3QFLb5uaPcw/iE fl/hBHRPzPM+HaHOekwsGOdc4v8KkjuZXFxFimgFrlyI/6mC6VClE2QvlgnM56cEa2Rzzx ESkhJkjUDKPRS0ILybtpWXGce3IRlrTcSrhpKhgLmeY1JaZcbDyc/dubsqvvkr295LuDXt aWZ7iMBv98TlvyjlLhiKXnNRVOgo68xoxVyKldPm0CsETYpAOjz9LIQSDgoKFw== 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 4PSL4f63JWzS5F; Thu, 2 Mar 2023 18:59:30 +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 322IxUDS000788; Thu, 2 Mar 2023 18:59:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IxUPS000787; Thu, 2 Mar 2023 18:59:30 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:59:30 GMT Message-Id: <202303021859.322IxUPS000787@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 3c4af6fe955f - stable/12 - linprocfs(4): Fixup process size in the /proc/pid/stat file 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3c4af6fe955fa8427ebc1206046bdc0d35a692bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=3c4af6fe955fa8427ebc1206046bdc0d35a692bb commit 3c4af6fe955fa8427ebc1206046bdc0d35a692bb Author: Dmitry Chagin AuthorDate: 2023-02-26 13:42:22 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-02 18:59:19 +0000 linprocfs(4): Fixup process size in the /proc/pid/stat file According to the Linux sources the kernel exposes a proces virtual memory size via proc filesystem into the three files - stat, status and statm. This is the struct mm->total_vm value adjusted to the corresponding units - bytes, kilobytes and pages. The fix is based on a fernape@ analysis. PR: 265937 Reported by: Ray Bellis MFC after: 3 days (cherry picked from commit a55b5a9aed3981fcec205e246436991d138c78a2) --- sys/compat/linprocfs/linprocfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index de65078e7ee9..e0491581b090 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -848,7 +848,7 @@ linprocfs_doprocstat(PFS_FILL_ARGS) PS_ADD("0", "%d", 0); /* removed field */ PS_ADD("itrealvalue", "%d", 0); /* XXX */ PS_ADD("starttime", "%lu", TV2J(&kp.ki_start) - TV2J(&boottime)); - PS_ADD("vsize", "%ju", P2K((uintmax_t)kp.ki_size)); + PS_ADD("vsize", "%ju", (uintmax_t)kp.ki_size); PS_ADD("rss", "%ju", (uintmax_t)kp.ki_rssize); PS_ADD("rlim", "%lu", kp.ki_rusage.ru_maxrss); PS_ADD("startcode", "%ju", (uintmax_t)startcode); From nobody Thu Mar 2 20:51:04 2023 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 4PSNYN2tSmz3wFdL; Thu, 2 Mar 2023 20:51:04 +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 4PSNYN2RNRz3vdk; Thu, 2 Mar 2023 20:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790264; 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=+DBB5HqqpdmVTpYLzYHUBf/UNaWBDv4jc1yof3LIMCk=; b=xC2FKyvYjckFbNlI7jyZpXjSeVRJoKRJ3QQNZiHUuUwhmvT/hC5ZgRGD9aTml/qnPoYUY9 UB/hUnygspFUPyI0O/Y6CDZv54LHI07xrpx1Yerdy2L8kiqF6j4srlbRpa5F7XA2rw7L9D LSoUD9/O9cFypDw4YsS3Zq8lYEIYOpld8OiNuGRAJl3xnrbz9uRSwctg/216b6bh87n7MU Br9ot9EwBtbzB8L4kMJn2j2Y3XMF+EDcqMJOpM22jYo7fygYmwlJFRe/nwRQsAtXrAWK/Q Qurg6E8Efr7MHlm71DT96tIdLcSCaAMY8EoihWNauIK4Jbx/uHAZtwZLLMu7Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790264; 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=+DBB5HqqpdmVTpYLzYHUBf/UNaWBDv4jc1yof3LIMCk=; b=EBCU7lgOjoX+3CAbTfl/ySXyQl3W+DeqevybxGCw42Wo4GNNqZMoUvKaPOflMpzQ2WqkJl pw5u748wAXWfT94VzSJLM3y0D72HMoWnFMhvE4ISD4fKKU86iLQXHxaMoJDWiGi6jmKTPs LWdoOXr6gAs+4anINVkn6MHfYk33gWCfLPFd21O/x4gxK0SZlQc1uFOo13BY8vp9uLp4QY S4OVoh/dA1eeWFtI/6OlNkebJ5aJoOFJNnkVzyyeWRs9elEO0JNFYWDv26vS9R5lNduW0m 3h7SyC58+Lry6ypEJcwjuPy8W7QS4buShgzrCpAPdpwp8RcqAjEwST/Z68D8Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677790264; a=rsa-sha256; cv=none; b=apM3Yb1ptcncw9NFOR0OhgOtB3iEFVhAaXJtFrZ2t4luON0L4/x39gX0UVR2n9AoomIs3c zGxkC7Rv/mqAih95XISfweBkmYGdjDdzIWpikDUj5u2z6EHVAkm+oEXgRf9oie05Lf4Kja GI4fUPuen576cjsQ3HqFUfNvVxvhIBbn4nrzFnZBdqFKLHcnONbk74mzPWu18BtkW8YYdb bJ5LMA72cD0ytPM/qjgZqtgzOgIzaOexW2LeTAeCWod1du/Z/fTKi+d+ghUI+vci0YjgmX rVRbO4U1USucTGsgcj3OuZTd4uqNigDH61II9j15aofz3js6n3Gt+loHVdGsYA== 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 4PSNYN1DtszWB2; Thu, 2 Mar 2023 20:51:04 +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 322Kp4VH093757; Thu, 2 Mar 2023 20:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322Kp4Bf093756; Thu, 2 Mar 2023 20:51:04 GMT (envelope-from git) Date: Thu, 2 Mar 2023 20:51:04 GMT Message-Id: <202303022051.322Kp4Bf093756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a6c6edbe9d37 - releng/13.2 - freebsd-update: re-edit files if merge conflict markers remain 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: a6c6edbe9d37caf1dbc81f918adf8c1f451a534e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a6c6edbe9d37caf1dbc81f918adf8c1f451a534e commit a6c6edbe9d37caf1dbc81f918adf8c1f451a534e Author: Ed Maste AuthorDate: 2022-12-14 17:34:59 +0000 Commit: Ed Maste CommitDate: 2023-03-02 20:50:57 +0000 freebsd-update: re-edit files if merge conflict markers remain freebsd-update will open ${EDITOR} if conflicts occur while merging updates to config files. Inform the user if they've left conflict markers behind, and go back to editing the file. PR: 185546 PR: 229689 Reviewed by: delphij Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37703 (cherry picked from commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f) (cherry picked from commit c7e3703352037a5afacdc4126725f351fe7da72b) --- usr.sbin/freebsd-update/freebsd-update.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 078043326115..ca043de20f62 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2543,8 +2543,21 @@ The following file could not be merged automatically: ${F} Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... EOF - read dummy >>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then + break + fi + cat <<-EOF + +Merge conflict markers remain in: ${F} +These must be resolved for the system to be functional. + +Press Enter to return to editing this file. + EOF + done done < failed.merges rm failed.merges From nobody Thu Mar 2 20:51:05 2023 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 4PSNYP4KW3z3wFqc; Thu, 2 Mar 2023 20:51:05 +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 4PSNYP3hZmz3vsC; Thu, 2 Mar 2023 20:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790265; 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=cpwd/NCx053Fjf2YvPQbUA7lIdX7eKWs+5NeBqkr1AE=; b=L9yUDPJQaQPideIhpCWJZbSkOd5wlKkqfuHVYDMk35s0Iv1d03JdfO6UZY9CUhzuUPPtEO QcZ9bxCdMGXmAKn7HqHdxqXjIjAGzcm/OTrE/wsQKIwwjmnQWRWepHrEBd1U7l4x8JzDcf yl3Dv77TLzPHp8vnyCYhYP1D/SVVtCa5X9s51MLIKC4OyXo7OdTI0X43pfmT9Ay7cWqmgd kYhxBKNZXIdWfjOZv6mLVOnAi1RNcY+ZX6Q7CeLxJNh8klUOygVeSWrqN8KoAbB6mWC20f VNqbZUW43KOuUcmoXOG4lPcrKgRXndvStL8DpLsd3+L6vKn8XHv5CfKEgj43Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790265; 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=cpwd/NCx053Fjf2YvPQbUA7lIdX7eKWs+5NeBqkr1AE=; b=CmDRNs437ULlwvdPBG61/M/+6R/Wx0IkzELOzqr5yU+7u/EIkKd7nZipwwlU+F11+hq5U1 XlMx5UMZQILTC5iS9SD8O0tv0aR1R5uhebqA57pN8H4SZiQ4fclfRY/hqdJUB7k2K+cLm4 0+YnDVxSWrKADspPu0Yr/a8kuhgx+zTUqy3J+N0XfG0DV68ujfS9xISkhik2CGhtdoqKXf x8CG7+AsWCLNXI/3i2cKgBOtHdJpTHYnxP+r6gSn2ALYYazjOCIrD63hQnl6JTQCz3GbV3 mxNQgsjkgbYYc6Hmq/lkcrFO8bMT6/5m/F0Dbc0yUEFJFrA9J+peO3KnwSv/lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677790265; a=rsa-sha256; cv=none; b=rP/Y30gBE3f8SjNnYwKL0H3rkJLGAuvYSk44UjuK43qGnq9+krPGE/3prCkONAgR9p86LT m7xhQVrAfS4ywXOZo7AatOa1dyj8KziMspAwyN0mQlM4mOCHDNXrz7G/s3LkdsZum5RKcK NBrbXyiAdq0NLpVbGzJgOE/ARTSrFtFrMo4QHk2+oY/cRwJQL1LnxzChiKqiFPPArat/Hx huXrTkxLpe81vjo8Vf3HYD/M2h3s/N0M9WqchZdUQ/snQY0qCY3w6LjSFiZ1kR010M4z7f zhYAl1WHjJGiD4CJVo0pJYWH7z9WwgX8vwYw8rM/n3ENnnSaS8MGcyCpNVKS8A== 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 4PSNYP2NCxzWSD; Thu, 2 Mar 2023 20:51:05 +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 322Kp5l0093776; Thu, 2 Mar 2023 20:51:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322Kp5W4093775; Thu, 2 Mar 2023 20:51:05 GMT (envelope-from git) Date: Thu, 2 Mar 2023 20:51:05 GMT Message-Id: <202303022051.322Kp5W4093775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 735c962a4944 - releng/13.2 - freebsd-update: avoid effects of user's environment on grep 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 735c962a4944cf40e2315ada58f6cab8b9d16726 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=735c962a4944cf40e2315ada58f6cab8b9d16726 commit 735c962a4944cf40e2315ada58f6cab8b9d16726 Author: Ed Maste AuthorDate: 2022-12-14 17:13:19 +0000 Commit: Ed Maste CommitDate: 2023-03-02 20:50:57 +0000 freebsd-update: avoid effects of user's environment on grep A user had GREP_OPTIONS containing --color=always, which broke grep use in freebsd-update. Unset this environment variable. PR: 255990 Reviewed by: kevans Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation (cherry picked from commit e093c61b2d69e9cca54a2332096c0e36f97bffc0) (cherry picked from commit 24fe8a518324e291b9ea3fe4e60f2e0fb4f857c5) --- usr.sbin/freebsd-update/freebsd-update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index ca043de20f62..225d1e31e3ec 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3505,6 +3505,9 @@ fi # Set LC_ALL in order to avoid problems with character ranges like [A-Z]. export LC_ALL=C +# Clear environment variables that may affect operation of tools that we use. +unset GREP_OPTIONS + get_params $@ for COMMAND in ${COMMANDS}; do cmd_${COMMAND} From nobody Fri Mar 3 00:01:27 2023 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 4PSSn35Fbkz3wQHc; Fri, 3 Mar 2023 00:01:27 +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 4PSSn34pWRz4LTl; Fri, 3 Mar 2023 00:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677801687; 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=yH1+o3VOHHy+vVuRRylq96PjrHhTbzaMzwcFaM7Va+E=; b=iu7eUOs5Z8hhrAiNt9zMqjCHYO79fL9yqkp8UApPd/cRzhyY2w0ooCC0xYG/fb/PcUrbeN g5ZJTE+h14ol+D+4Tux4xHZlvTCgFzwnHNQ3HqmfeAuBqDLbeVb/Civ82E8up54vX5zoSV h6dWa5iO7Tw94NezN8OlqFVX7RzsdxKf08W51Zuwr7oDrZiy84ft5f7mxXoY5C2+Sh0D49 syNiO70JlG+JJubqOEREeJpWBp3Y6Wth1SPBwmKqw6zAD3uC+LhibegZbMOtL3piIzSF7o 4QCjFM3InK3DvLHmsveXhx70CQnG0syZlDzieN/wGNSiH0cOfCbqghixP9NZgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677801687; 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=yH1+o3VOHHy+vVuRRylq96PjrHhTbzaMzwcFaM7Va+E=; b=wgWBkAT+swJgwevbrLedIachi+4B2cSws+uKAg9DAWCC/wWwttRwbstPNNkT1u4BWvmD/F S00B4T8/sOQWGleWxNkG8fYeH6rKevKiHLNugkG2K0ITlpMSeW3jWkAavcktQOH+Uw6yer Nv7rd7h+rHeLWye5rPM2453aKG79QgTMMUMJHnFeu6X4U5VqRj95tgxA3mI0dtzapX7le8 i2e2/zJ6EdhBLsMuB+C92V8eUhuYA7JGPXKgg4gySQes3UzFIpAY56gy4KEPp3Oi4UdihL d5lrnATKy7P/ewqngOhRP2RiNNqBzzF+vdwNhhmESa75jkpVYGjksxRHqGfETg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677801687; a=rsa-sha256; cv=none; b=JeO2D+A2NNg7vw3LCmZ9NJLLZUaB6psQ4WCixt64j/iIFPM58IEk+eI1/8RquOU0KzwVmC WP+A4vFZNjwcgaM9/NPKqqeGYmbQv/kiz+SnBBPU5TL5oi/Ce8RyjznY24jANtIMwZYqP0 VE4vXktFbKEcukJ/4Eznh9+RMbJhwlCgfUDDAFZ86nMj54IL2/vvNV5GiShgajcoRLgNnP PTn1Ih95JZ34MDRFekK8v3DCw+HbzE5TjwV3NPe2J3CIxSGKhM4aIe7HoTPtBY7Dw+EoN0 J7czPZsNg63ZmQzyotev3sHN8FECDNkOcWruNNS3WN+97wowUSPzLu7BHVrFZg== 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 4PSSn33sFRzbr3; Fri, 3 Mar 2023 00:01:27 +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 32301RXP003851; Fri, 3 Mar 2023 00:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32301Rhh003850; Fri, 3 Mar 2023 00:01:27 GMT (envelope-from git) Date: Fri, 3 Mar 2023 00:01:27 GMT Message-Id: <202303030001.32301Rhh003850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 13264ea9a370 - releng/13.2 - 13.2: update to RC1 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 13264ea9a370bac94da680a929c3f548209ff94d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=13264ea9a370bac94da680a929c3f548209ff94d commit 13264ea9a370bac94da680a929c3f548209ff94d Author: Colin Percival AuthorDate: 2023-03-03 00:01:05 +0000 Commit: Colin Percival CommitDate: 2023-03-03 00:01:05 +0000 13.2: update to RC1 Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index f49a96657cdd..fee68579a00b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="BETA3" +BRANCH="RC1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Mar 3 00:23:40 2023 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 4PSTGj2B4Sz3wRLL; Fri, 3 Mar 2023 00:23:41 +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 4PSTGj1ZXWz4NpL; Fri, 3 Mar 2023 00:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677803021; 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=Ejfi2ZsWsgaHBVxKzwG1bUX6C9RAi/Y5aoAxidDeO68=; b=jnMsxra6RE3fESNaePKRHVc1nCaJrUx46obpVyfr4ZgVE4uOxlPJ34Q00lQ9TCOoHb5lqn 9ZA/B7acTXDKG6J+Ebokud7MohFVLazckOJgPfzJ0JRnLkhHKT/wQc85YJjF2p61J+CjC4 zl3yLBHBU+nFNl/kM4UUoqujvyksF9UoM/fddNZvKWoS9hXKkyr/4xLEsfKgqxUUN28dgu FCQ1561ynu5bCZ+cBni8KcHlU5/ej1C8ilQOHA1jcNIb6pdn6WQSgKDsPftyv/wahzpkXo AR9u3dQF+M1wy4Y7UTjKzvNsT0CjDByE4E4tmLtVsU5L05yumROFiquBe9HIBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677803021; 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=Ejfi2ZsWsgaHBVxKzwG1bUX6C9RAi/Y5aoAxidDeO68=; b=kb4HjWInN2VeogXPFnd1dzyfDhSt6l4nKvRDsqWsNAvSLq1Iqh/5mB4AxuivucDjUlkzD5 yj3piZC3UGp+S2xIIJwsagCwQNHfM+Z+6Gkxqs89p/Xp90jo+25egc0wHJKOvrLXWuuSMN tqR0vljowWlO76CyIw+3BzYsgMnZeE0X2kxn7/7ITtDJ9nzfQEi94Sbqv8nyHZum0vQ7zd p3ON/OuHgVhhCrLwSm0e92VKVoyUXa9/Kl08VM1u3vPvo4uDQ4b92wgoGvIKcsGB0khziX eA3YfiIzvMYaRquwfRuwkSSSGTUMJJNFHR+CTxCPUuLrkwI4LjQC84fGi4AhWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677803021; a=rsa-sha256; cv=none; b=F/e1sdLS8e/lyqxFEnDl8Z1LF9RH3jrcu+lMzqkcQ5O2E/YZUP2HX8P6kl/x1a1Y5gotC4 03l1ByH4rsCCAxQHiadYf6mww0mHAxovpCI4F5sEc72jVhLRt6Sr1KcKnS/GX2HpZjhhYU ClTcLly0RW8AWw2fSZwBv+hq8hu2R5byy4UznkrNjTMeLC1GjcN94xSxRiBagTelqxObb0 z9zNXeR+/0pfIGY6zgeB6ibHfK6tB4v3hHxx5i0mUPVxM/CHT2lHotUnMnR281QJtrGjK5 GwneH0pN93qFaf4G02IU7B2dQJeOCP1ovSX53NiK0LKqYerC9OZCxKVRkFj3bg== 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 4PSTGj0cNCzcbS; Fri, 3 Mar 2023 00:23:41 +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 3230Nebm042564; Fri, 3 Mar 2023 00:23:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3230NefL042563; Fri, 3 Mar 2023 00:23:40 GMT (envelope-from git) Date: Fri, 3 Mar 2023 00:23:40 GMT Message-Id: <202303030023.3230NefL042563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1b1d2aea020e - stable/13 - libc: handle zero alignment in memalign() 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b1d2aea020e88b3d2076207b13fec3adde42aa9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1b1d2aea020e88b3d2076207b13fec3adde42aa9 commit 1b1d2aea020e88b3d2076207b13fec3adde42aa9 Author: Paul Floyd AuthorDate: 2023-02-24 16:29:01 +0000 Commit: Ed Maste CommitDate: 2023-03-03 00:23:24 +0000 libc: handle zero alignment in memalign() For compatibility with glibc. The previous code would trigger a division by zero in roundup() and terminate. Instead, just pass through to malloc() for align == 0. PR: 269688 Reviewed by: imp, mjg MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/655 (cherry picked from commit 2c709ee70ade9fd8f77b37917a4169d667dda41d) --- lib/libc/gen/memalign.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/memalign.c b/lib/libc/gen/memalign.c index ff1c967482cd..88feeaef7afd 100644 --- a/lib/libc/gen/memalign.c +++ b/lib/libc/gen/memalign.c @@ -36,5 +36,12 @@ __FBSDID("$FreeBSD$"); void * memalign(size_t align, size_t size) { - return (aligned_alloc(align, roundup(size, align))); + /* + * glibc allows align == 0, but that is not valid for roundup. + * Just pass through to malloc in that case. + */ + if (align != 0) + return (aligned_alloc(align, roundup(size, align))); + else + return (malloc(size)); } From nobody Fri Mar 3 13:42:34 2023 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 4PSq0W0dZlz3vwGn; Fri, 3 Mar 2023 13:42:35 +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 4PSq0W07hXz4Nnp; Fri, 3 Mar 2023 13:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677850955; 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=GXR81pQO6SUjUnPSrDylurXMO8dXfIpR2WoKxFZyqUE=; b=hijhmW66iVz5TtEQ8GJbkHAfbN0vBaa2tUEQERLrNdRKFmOFI9X5ngJmi4CMI8srCFNZ8k bifu/nBnekiFMBRYDbZVenXhWxv8FGENqjeK/1mZqkoTgvL0brLW6BeM5svCkLtSAiCTLQ srQWXGMX/UY2FrsMx8Jo6lZAWszbnCoonUW7pHZ+RQmClXIjY2uEyaXEBFGx02ekyU+FY6 GDsb44aIECIIhWBwEj9Oasj5GTf9EYTOAMmW6oxI2XVtz0zAs6TwGlt8COeZyRShB88Gl8 Kz3gmnJ+SlyKLhhkIrk3ddx+yTPfX4RWQ1RbFZzyai6l2KcHUGTHPo+ZecQgjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677850955; 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=GXR81pQO6SUjUnPSrDylurXMO8dXfIpR2WoKxFZyqUE=; b=uQNsoKKZzXTjE5u2eqeqjk3la7e/Un6tZxxMm19V0cTpYUk9vpHJTXnh0Eu2CmBq7oON/7 XzU+FWkufMf3qK+1VM8AgLIF+E1Uobny2PUiKIdscyYmvq0T57PG2WlFiHtyxYmNppeQXu vWOfBtv5YyK2HdSnputzGZrfsI2OGxvk9q5mEJNZu8xhU5QVhDb9YDvSvvVGxeesi5nwRf jBFkhwukjSd7GKiswJguWVuyV0omM3V1APmsSStaLzfpMtuKN1GwQn4tXr481wThsux3R/ jY4VOHnOicn9CkKd+GlNrMEHsLt3Hgvnc9amNppoxKg+DhYP2GMght7P7uGT9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677850955; a=rsa-sha256; cv=none; b=Tyfq4t7aru5bBWAOJqrvRVOdQfX3EwPDTTPqeJBU1BsYuH5P6XzsmMZWE1i/59t+tPBQ0/ XnBuEkr+llwJvL9EPW/vYeajNEXMyrTySX4e487MN3waZBIzS6IWTHHR9wrS+tmJhNNpRt R0ZgqQBEfqrXYnomIeOcuKDFA2yoocDLYwaijy2bmcvzYI/02yoXxBQJ/8xxpCFCi0523k mgF7xf2UU9pG6X1sXtyftNq3aYuHmVjXfslUZMMniw38FmHsen6imzy5596irK69GmG+IK SOe1RmOUZSj84Tc+g+VSVEMOFYRVz4LRByzOtx4h44RxLtfegej835oXyybGDA== 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 4PSq0V6Kbhz10VK; Fri, 3 Mar 2023 13:42:34 +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 323DgYqB053461; Fri, 3 Mar 2023 13:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323DgYIt053460; Fri, 3 Mar 2023 13:42:34 GMT (envelope-from git) Date: Fri, 3 Mar 2023 13:42:34 GMT Message-Id: <202303031342.323DgYIt053460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 947344774cf3 - stable/13 - blacklistd: silence sign-conversion warning from Clang 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 947344774cf3d405d0eae0d132fc2d7f63dc6330 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=947344774cf3d405d0eae0d132fc2d7f63dc6330 commit 947344774cf3d405d0eae0d132fc2d7f63dc6330 Author: Ed Maste AuthorDate: 2022-10-12 18:10:21 +0000 Commit: Ed Maste CommitDate: 2023-03-03 13:42:25 +0000 blacklistd: silence sign-conversion warning from Clang Obtained from: NetBSD 518a28b2e752 (cherry picked from commit b290769b981193cbc0985206e11930b2eb79428e) --- contrib/blacklist/lib/blacklist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/blacklist/lib/blacklist.c b/contrib/blacklist/lib/blacklist.c index 913753f11101..ba376c3daf0d 100644 --- a/contrib/blacklist/lib/blacklist.c +++ b/contrib/blacklist/lib/blacklist.c @@ -61,7 +61,7 @@ int blacklist_sa_r(struct blacklist *bl, int action, int rfd, const struct sockaddr *sa, socklen_t slen, const char *msg) { - int internal_action; + bl_type_t internal_action; /* internal values are not the same as user application values */ switch (action) { From nobody Fri Mar 3 14:28:04 2023 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 4PSr105RcDz3vyrv; Fri, 3 Mar 2023 14:28:04 +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 4PSr104qqDz3Dft; Fri, 3 Mar 2023 14:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677853684; 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=PZlECAY15X+WFcdFQ0EVPDZgkRm9uh/dd9/OA8IPPjo=; b=AEYVmbdic52Sm8fdvoD1DOji58vePJ5moSKucBAN8B3vwR5mV9wZBWnDrVc6WlIWkUgrkC VUbR/SJS6dr2ZumeElN1nMy/PijzlRmd8c5w80t+arASOoLWN2QADqZJM1kiLBPuJmU46P 9vBw+u9W5BroD7qsO34lBc89WkeekELupEEhmz/QFV5U2EZO1L0CO/d7UB3nGd8aoGM3Xm xK8fxwoKWKXW0BpDAtrYPIPP3anpmSZFv2iMjMTOIk/WSMFl5OCYLsksAvEM3lWMuzdemY 7Z9eqRQPrylTzEYEIR0isgLjdAbx5B95IFCjINnXA4VpJBul3+L+pkLc4k4eqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677853684; 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=PZlECAY15X+WFcdFQ0EVPDZgkRm9uh/dd9/OA8IPPjo=; b=FFVr+WZcor/VwQSBNKqXX21YdPYuCWk3IUM0iSa4IpAzfnRyI0DH51VlugZutvsri5KKnu UxV/8qTex2spALhK053VHdu6k9EU13zJFqbqUiNFcpq0mBsud02KCzyb5papgeRaw4cG5Y vct0E4Lh+1FQb0Hw8AL75nm37UnuVhSQ+GDkHB3YY0bHnPcVFrlc7/hQ3TtBls7TGcblD2 rDWr6a6NqnUe2wOIdMohX6AxGqHaukMco4mAPOuTtSiaHOqjNSY1u4v2tLhH97o2J33Ocm v8F6zTk7my0VOgVvqhp6Hkir71Mdv9qYyJ1erh8F+3qVdlk9BCtQywPZ6cPE6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677853684; a=rsa-sha256; cv=none; b=m4sWST8Kyu8AevAoKcjAajR1vA0lKa/plYYsRim1FrSH4t4nMMRn8tmLoV/K+7m0hQPj8P V9MZYUpM9IBZwzC7vbEPrj6QmfrFNTr5ZjkZegztYYRkonhb5eFL/QyZTuOBi/8viatU0R dIeXbsRwMb9OZcOEbGUqkcxGqvIi1Cp6NE0sf6US9x5cj2yCcJ2/G9J7fCQCrUOYd1RvEp VLwbzO5FoOs9aJmKuQY33yFaFNTjdRvK02wl2lnUl7+7Hv2I9Pylbm/9U9cqz5ppkmDjoN E4LVmAOAN9Og6e2IRdf9Zh0E1BH+IsA1N5gEzRKVPozBNWvcclAjj3hDgrBsPw== 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 4PSr103tPgz11Mj; Fri, 3 Mar 2023 14:28:04 +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 323ES4Bl019958; Fri, 3 Mar 2023 14:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323ES4in019957; Fri, 3 Mar 2023 14:28:04 GMT (envelope-from git) Date: Fri, 3 Mar 2023 14:28:04 GMT Message-Id: <202303031428.323ES4in019957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a102020bf393 - stable/13 - buf: Make bufspace_daemon_shutdown() a no-op after a panic 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a102020bf39374210de95e54b83886ecedd8b166 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a102020bf39374210de95e54b83886ecedd8b166 commit a102020bf39374210de95e54b83886ecedd8b166 Author: Mark Johnston AuthorDate: 2023-02-24 02:56:36 +0000 Commit: Mark Johnston CommitDate: 2023-03-03 14:27:50 +0000 buf: Make bufspace_daemon_shutdown() a no-op after a panic This function doesn't need to do anything in that context, and calling wakeup() can lead to recursive panics. Discussed with: mhorne MFC after: 1 week (cherry picked from commit 9d7cc536e261a7d207476115dac6058c38f469bd) --- sys/kern/vfs_bio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 6a479ed335ef..98047f161077 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -764,6 +764,9 @@ bufspace_daemon_shutdown(void *arg, int howto __unused) struct bufdomain *bd = arg; int error; + if (KERNEL_PANICKED()) + return; + BD_RUN_LOCK(bd); bd->bd_shutdown = true; wakeup(&bd->bd_running); From nobody Fri Mar 3 21:28:32 2023 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 4PT1L83mtFz3wMXj; Fri, 3 Mar 2023 21:28:32 +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 4PT1L82xQ4z4C9W; Fri, 3 Mar 2023 21:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677878912; 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=AEk/aa6nWqghJiu44JtmoObJrIViaKPiYfPRXH9JT0o=; b=lWg4fD1IjA0g4ZlR7rXwGH7zkBvUEQDD3h0/1XEn31hHBxH0OR7HiJvvrAfljjBS+ATmpp CzWfVEsGqh9ZdKbCzxXl3mTpfZ7xuCRx60/XXY4NVz65EMbpMCLFvHjjdELS6c5yyQqTDb zRXiromLzL7pOE2cQiI01urpYS6QBwUZoOHl8FGlMceulzJ8MpZYE4NJ/G+m0bV0bhm+gu ZRZtkv5kNBqMOzlsyzGmR0dPHXsW6QWNbhFhkB0Q5j5MYjDX8AwIl9iP6kiNqDjYsS3q9t W1rdskKh2drobiQ4jjl5Qmiqes7KVCPzWciOn3ygH8ynDXw7dCpshK7rliTQMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677878912; 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=AEk/aa6nWqghJiu44JtmoObJrIViaKPiYfPRXH9JT0o=; b=P6G63XZUAKqDKNmXBpeh6dl+pW4zIvv/F/TBUS7XmB5u6BVMGsKXUpQT7Kl6u7DBO4BCwt xZkg/iXnkUOVOtlsA4IHDen+HdJmcJWPqT6UpwMZsg9/yuWR1YBIXJRsEOz/AtLLpRfEm3 wZlyw/HoFD2xc7JmKyrFaYcS5tBQ23lF1bZoMV/SCqS4J2zIEYXPBGzO87NKs3yFMM9tD1 7kb8Zx42sNIuALVvcxwe8DgKPbjlwmeWDZfjWxfCFLNGbUMNZRYv4pmZ7Y69lWJVmL/Atk S5+IZevfkzdEYpubtw1CWnln+gXLuuqVbFcbgLEEJi/L/BU/xj+RRpUpVe0EBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677878912; a=rsa-sha256; cv=none; b=CJ7KitWEXw27UfRznYGzTByLAcc2as4yT+MybE93OiHHcTDBUtnybQG4XJ9uCO9U8LXvwl Fcxc/WlD9h6/0snxM4DTHkcr3gvMHKtXFixr7zqK4FPVNkKCvAilAR2Jvj5ZXiCaYJhU77 DF9YQERJc1E/7OzXt2ayLiCqxrZAEdnicdmm8hib10W2zNgnBJz0CJTqHP2Wqa0GlpVSyZ GtDzvYDIANmfZvDzrGeDu44f7S0JT1Hr+KeG4pphLqyiKuOoNGqhxJOo8lv0d+hjFJLCvE DTcIp5gw4c2lJO8zuGvWRmSEo9+PPGrkXqYo6UI+KWCMqfT0iemf2QdyUHW+pw== 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 4PT1L81zthz1CwZ; Fri, 3 Mar 2023 21:28:32 +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 323LSWdA009182; Fri, 3 Mar 2023 21:28:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323LSWG8009181; Fri, 3 Mar 2023 21:28:32 GMT (envelope-from git) Date: Fri, 3 Mar 2023 21:28:32 GMT Message-Id: <202303032128.323LSWG8009181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 2be7e3df7275 - stable/13 - tcp: Make TCP PCAP buffer properly configurable. 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2be7e3df72758f46c853c08cd4e35f4e5fb0b187 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=2be7e3df72758f46c853c08cd4e35f4e5fb0b187 commit 2be7e3df72758f46c853c08cd4e35f4e5fb0b187 Author: Richard Scheffenegger AuthorDate: 2023-02-28 18:57:30 +0000 Commit: Richard Scheffenegger CommitDate: 2023-03-02 07:36:21 +0000 tcp: Make TCP PCAP buffer properly configurable. Reviewed By: tuexen, cc, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D38824 (cherry picked from commit 399a5655e6edf69a63f1c37e66fdad19dcfdb5cf) --- sys/netinet/tcp_usrreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 0706e55f439b..0b9e1841bc0e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2257,7 +2257,8 @@ unlock_and_done: INP_WLOCK_RECHECK(inp); if (optval >= 0) - tcp_pcap_set_sock_max(TCP_PCAP_OUT ? + tcp_pcap_set_sock_max( + (sopt->sopt_name == TCP_PCAP_OUT) ? &(tp->t_outpkts) : &(tp->t_inpkts), optval); else @@ -2494,7 +2495,8 @@ unhold: #ifdef TCPPCAP case TCP_PCAP_OUT: case TCP_PCAP_IN: - optval = tcp_pcap_get_sock_max(TCP_PCAP_OUT ? + optval = tcp_pcap_get_sock_max( + (sopt->sopt_name == TCP_PCAP_OUT) ? &(tp->t_outpkts) : &(tp->t_inpkts)); INP_WUNLOCK(inp); error = sooptcopyout(sopt, &optval, sizeof optval); From nobody Fri Mar 3 21:29:19 2023 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 4PT1M33ZKzz3wMbB; Fri, 3 Mar 2023 21:29:19 +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 4PT1M32gPyz4D74; Fri, 3 Mar 2023 21:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677878959; 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=0JBVhn8KmuFqiJEI0zYKWw7OZzVy0NYvY41fYSHOhe8=; b=GF6dqUx0UmSGiq1wNnzaKJ1w9LgKgMIxo5Jlg5fcLzK+g4o+jGPuUg4mZJKoOta1M0bzm2 9uU4dHniAO+HRqZk81MIL5hojUGuHI1Y8dwDhVH/tkcyC82U5qyN8J6MtJPgvkX33S1r02 cQYMpjjkGP7UG9uRyFBnGkPbNmaKFBjTIccs+ARZErULbFZh/nvK2f+2ct++cupBwV/OB5 c0sSiq1us0WLOm9CgVscQm/LA7X13/KEmtxO8H+x5JIFSTvOe94oEQ3uoimyVhkQxbg4Xk Kgs0E77TYVSu0JiUslCCgilihBDx0c4d++6xb/vqWLkYa1573OwrxyzIHbFJ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677878959; 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=0JBVhn8KmuFqiJEI0zYKWw7OZzVy0NYvY41fYSHOhe8=; b=Ecgd1aXxC2lZK53rm/DU87Fb7C9K5iSVbex3YTLRbzxudUHknm46ZXw9Vc/FsBzesnKBaI QmC+LIvII+a6UijLDJuMQ9vBSldw2gwyf4nw+oZh6TpL+y2jps/FYF0Md+DKk0GLuIk+5J mkBKObRCxx9eu+OWE9Au7Hlmg6jTxq8NtOC2nQG9dXETRYDJbi5OoHX82qXPp4U1Viifyy JfKwtubSvXGkpE3RLhztEYIho+O2uAp0Y9WIdpcd0gpAJI3cthGHEEHadT4FenEyUOPrCE 2elZr68ZQRgLv4kgOPHpeNpdQst/r17cnjRSTb/Pe3NZtp7UqOR0elz9Af5JeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677878959; a=rsa-sha256; cv=none; b=otVf1nnRaYBr1zzoyx7tWL0ugVQ+rss6r2fw/5zl22WFnNrsBG4tCXFiZjeWSgfGels3nt XP43FjmDsrRLCMgauUavWjtLvAetXujade5mDrzGWqL7zcaHIxvOW2lRlDg8TaAjaOoGdp pn8h2oXrN0+oEvsqFeqRUGFlx2fUNs/ny5DqbU6U8eKUxYkElTpX1ExSYhj9YLw8QlB6+6 D0cuzRHm/3Qs8n7TKPx2A5pj/1pfn2U11ZDdvU9q9J5EippQIH6NZOZoHAW+ERI6ijoB6Y aJRwAYW0aQL8nyFuvFRFoxFReZtbqZNVWbZpKmxnny4qzUMkwIkrqPz2uAzjAw== 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 4PT1M31kGBz1Cwb; Fri, 3 Mar 2023 21:29:19 +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 323LTJj9009389; Fri, 3 Mar 2023 21:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323LTJ6t009388; Fri, 3 Mar 2023 21:29:19 GMT (envelope-from git) Date: Fri, 3 Mar 2023 21:29:19 GMT Message-Id: <202303032129.323LTJ6t009388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 9b3d6127716e - stable/12 - tcp: Make TCP PCAP buffer properly configurable. 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9b3d6127716ec0fcc22a5794ffceebdf9220db3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=9b3d6127716ec0fcc22a5794ffceebdf9220db3e commit 9b3d6127716ec0fcc22a5794ffceebdf9220db3e Author: Richard Scheffenegger AuthorDate: 2023-02-28 18:57:30 +0000 Commit: Richard Scheffenegger CommitDate: 2023-03-02 02:30:07 +0000 tcp: Make TCP PCAP buffer properly configurable. Reviewed By: tuexen, cc, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D38824 (cherry picked from commit 399a5655e6edf69a63f1c37e66fdad19dcfdb5cf) --- sys/netinet/tcp_usrreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 968b1f4c5e30..33c8ed715581 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2076,7 +2076,8 @@ unlock_and_done: INP_WLOCK_RECHECK(inp); if (optval >= 0) - tcp_pcap_set_sock_max(TCP_PCAP_OUT ? + tcp_pcap_set_sock_max( + (sopt->sopt_name == TCP_PCAP_OUT) ? &(tp->t_outpkts) : &(tp->t_inpkts), optval); else @@ -2260,7 +2261,8 @@ unlock_and_done: #ifdef TCPPCAP case TCP_PCAP_OUT: case TCP_PCAP_IN: - optval = tcp_pcap_get_sock_max(TCP_PCAP_OUT ? + optval = tcp_pcap_get_sock_max( + (sopt->sopt_name == TCP_PCAP_OUT) ? &(tp->t_outpkts) : &(tp->t_inpkts)); INP_WUNLOCK(inp); error = sooptcopyout(sopt, &optval, sizeof optval); From nobody Sat Mar 4 14:58:57 2023 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 4PTSf975Kcz3w6d9; Sat, 4 Mar 2023 14:58:57 +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 4PTSf96ZS0z3Hsy; Sat, 4 Mar 2023 14:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677941937; 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=kmvm3jeebJLtYftFvKxB9ISqnElf5kqYcqo/W0YNUIg=; b=ukJU58BBqZsxX19zrAAeXFCYJ7iNBDPJRb5UHOeW8uOoXHbrdFeRd5JD1UX/1z0FXU9ZAB dEzsvyTvvSYPqp7PDWTjijjnWo7HsPr69/OixeaFXwZ/IxwiZ6d3Q8iIq+rOQ5sY9M8BQg oEF24edFc7rO9v+ZwqahFn3uzKy+P+Z5KikGZfTpCUqNBNearbHAOH6k1C4OzetI/qMUQr 692MCeuf/8xvvZlUmlhdPvNVj5JGaEO70bQHcvea0CqUJXrd8/jlXw8CGuleVi+xpCf2RF +p8nyIjX/RsBfSJNvnlBj8KDsL7MVfLX5YAgbt0Czzj5X0GdhxSHKSTnp+uNEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677941937; 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=kmvm3jeebJLtYftFvKxB9ISqnElf5kqYcqo/W0YNUIg=; b=ZqYqsoIQDs48+uXZsbf15dIQgRFnRky2I6orFe9G79+CAeIq06PJuFIGKb5f1lu8vyEvAT Tb33vUGXrARpLMvBQhyCqEoxzrhNCY05mck+ElyiS887p5d0BauxzBTK9WoG6f/7mQ7aU+ mq4HR18v1kUbdqXksD1HV+PQqbdR7gfn5osrdZqTCMH1a5tMlqALE6nxCvk9WbSZPjyo7j 7Pjjn+i6gQ/R3CsJVjD4ITnbkZ4CVg5XpbMZOLzTBJrEzcibFu53IyRc4jJ71U6vcf8w6g r3daJ/TRpfePN70J2lQmoP9svSi5m9YcDMWINtg+cTnwXx1jummamu1PQUGjeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677941937; a=rsa-sha256; cv=none; b=c5pke6tfcpMyMVhAxLRNVznU2PsU/ne/ION1aIVKWOm9sC5m6uIknhKjpn9mnoAf1yMipB DR5eHxcWbXPafsRZ9l5UOciZwIb5qN7q7JrfSWcqe0USjoxEvTgVntkO1Z71dx0hAAxBx+ 7/knfyBJ3xQ+13iESU8X4aFhfCiMvntTgDZtktss+3u408f63TKcu0bv+l+PCpA7QjhIFh rGE1gTS+MPiqb9cwA+BcN6Bn+DqNuMabRMlY5nIyDWx9qnQtnKl7zCkFMctscDZRwJmglJ vCqhmveL0zSVNDmMUlh6ldK1qjCWnV2xq3s/w9/3xQoSJCtn265fIxghZMYusw== 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 4PTSf95cXXzkdK; Sat, 4 Mar 2023 14:58:57 +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 324Ewvjs037245; Sat, 4 Mar 2023 14:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 324EwveO037244; Sat, 4 Mar 2023 14:58:57 GMT (envelope-from git) Date: Sat, 4 Mar 2023 14:58:57 GMT Message-Id: <202303041458.324EwveO037244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 009abff336b6 - stable/13 - growfs_fstab startup script: set dumpdev to AUTO 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 009abff336b6e83219178e7d87f6a91f54e31839 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=009abff336b6e83219178e7d87f6a91f54e31839 commit 009abff336b6e83219178e7d87f6a91f54e31839 Author: Mike Karels AuthorDate: 2023-02-28 13:55:35 +0000 Commit: Mike Karels CommitDate: 2023-03-04 14:58:41 +0000 growfs_fstab startup script: set dumpdev to AUTO The growfs_fstab script has been testing dumpdev, and if it is AUTO, enables dumps on the newly-added swap device for the initial boot. However, dumpdev defaults to AUTO on main, but NO on stable/13 and release branches. On the other hand, bsdinstall adds dumpdev="AUTO" by default (controlled by a menu item). bsdinstall is not used when booting an SD card or other disk image. Adopt the default from bsdinstall, and set dumpdev to AUTO in /etc/rc.conf in the growfs_fstab script if a swap partition has been added, along with the explanatory comment added by bsdinstall. Differential Revision: https://reviews.freebsd.org/D38751 (cherry picked from commit eef9f9900f118b5efcabbd5864e7b8b993d09922) --- libexec/rc/rc.d/growfs_fstab | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libexec/rc/rc.d/growfs_fstab b/libexec/rc/rc.d/growfs_fstab index 8ad34f452ce0..c51f0dd6f3de 100755 --- a/libexec/rc/rc.d/growfs_fstab +++ b/libexec/rc/rc.d/growfs_fstab @@ -51,14 +51,9 @@ growfs_fstab_start() ' < /etc/fstab then printf "/dev/label/growfs_swap\tnone\t\tswap\tsw\t\t0\t0\n" >>/etc/fstab - - case "$dumpdev" in - [Aa][Uu][Tt][Oo]) - dumpon $dumpon_flags /dev/label/growfs_swap - ;; - *) - ;; - esac + printf '# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable\n' >>/etc/rc.conf + printf 'dumpdev="AUTO"\n' >>/etc/rc.conf + dumpon $dumpon_flags /dev/label/growfs_swap fi fi } From nobody Sat Mar 4 20:18:28 2023 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 4PTbkr5k6Bz3wQNK; Sat, 4 Mar 2023 20:18:28 +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 4PTbkr55Vvz42ry; Sat, 4 Mar 2023 20:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677961108; 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=zKUmrp7WIhAFiaa7odOCSUxlkyO7FdNkFqpG2T9vR+c=; b=RYoUUnc6bD6gyMHOHi8TTWBrprGnAtUEqo2jJLJqkoAdAWJUBGekHO/ISW2Ka/IggJsuMP p2ocgCLV1HppH6SOROrruu8XSBrdMilkKS5KeK3WyUJlygcVmc8QxlgjL7m9aoTwk9UuCz Pz97lXya/3Usj83Ijkm9tUszEzt90XRDxRyNkWrLUyE2nNOzXW0UqLX51zeFG9STsTyI27 bYic7/UH8mYwRQCFZJ1E6l0TTzgHxuyFrW50/7wG0IyslERxrcFisFFIykfx/jA49Hf2ER JhA9i6ExC2QDvWQiiHFZLG4y2HojpNky7zP3tktPvvwoqTH96gEKBw5FHdX7TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677961108; 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=zKUmrp7WIhAFiaa7odOCSUxlkyO7FdNkFqpG2T9vR+c=; b=jeeophSTmdJFTCv21SV5uZLkH9IEh1v9O7hcEwcpvIerdh0iCoT3m4II8RkOReC1kA8//1 QBgpetym0kUvZzw+baBT5soeuExTme17kF2ZlVCSHkEqW2YZIXZPRHzL8PtSKSC3Zi4F9j gdufj8jBN8Wg3qomfbTNCHHnOeqJVK9nQhHUtUotVKhluL2vOnWTadYuDKgwTRxy+V4ZLT Ik4w0gYApqpOLZ6wmblG3zGvpzfus7fUZI0UIprvoKo/IWfhw+qs7pHrrj/stL9W5tOkI7 mclb0hRp0dmD1zKU7HRSgf8zXfnhOyG9kdJNVJ3Y1sMGK8WFYn0r1jo+Cc4arg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677961108; a=rsa-sha256; cv=none; b=elbME7OVXd/Ae7nRfFqzODAUhJaeEz/B8z+MNO/S2ximOe+2JzOkRe1IUDpu34TpPF1pT4 coOOsUjoT3vgOCoSPKoFUUiLGVUDc3mLXjzmcTYwiLse0dbDjahMDMNJqaPYfqeJEXJFzL Rdpv9gti3Wmb6s9xwt4tgr1kDJRiIvfde+jCLle1xWes1BWLugV31hXRTLXFxQHl7zYH84 t52vZks/blx1LMYbcP2QiQcOo017rd1q/2uNAwk8biOcexA6CoCiajIUkrG3XEkr0P/tyW Ep81h2LG6Dg5/aAo/z5fo5O0/fhpcnLRIA2KdCQg+USAG6wHvHclaTdCiXPv2Q== 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 4PTbkr48fTzt4J; Sat, 4 Mar 2023 20:18:28 +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 324KISaR061631; Sat, 4 Mar 2023 20:18:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 324KISvY061630; Sat, 4 Mar 2023 20:18:28 GMT (envelope-from git) Date: Sat, 4 Mar 2023 20:18:28 GMT Message-Id: <202303042018.324KISvY061630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8534a7f045bd - releng/13.2 - Ensure .inc files are regenerated when llvm/clang tblgen binaries change 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 8534a7f045bd50240b7dfb417c2240d8aee6646d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8534a7f045bd50240b7dfb417c2240d8aee6646d commit 8534a7f045bd50240b7dfb417c2240d8aee6646d Author: Dimitry Andric AuthorDate: 2023-02-25 15:25:57 +0000 Commit: Dimitry Andric CommitDate: 2023-03-04 20:17:27 +0000 Ensure .inc files are regenerated when llvm/clang tblgen binaries change When doing a fully incremental build (with WITHOUT_CLEAN enabled), from a commit before llvm 15 was merged (3264f6b88fce), to a commit after that, a number of .inc files were not regenerated. This could lead to unexpected compilation errors when these .inc files were included from llvm-project sources, similar to: In file included from /usr/src/contrib/llvm-project/clang/lib/CodeGen/CGBuiltin.cpp:8268: /usr/obj/usr/src/amd64.amd64/lib/clang/libclang/clang/Basic/arm_mve_builtin_cg.inc:279:18: error: no matching constructor for initialization of 'clang::CodeGen::Address' Address Val2 = Address(Val1, CharUnits::fromQuantity(2)); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Work around this by making the .inc files dependent on the tblgen binary used for generating them. E.g., we can relatively safely assume that if the binary gets updated, the .inc files must also be updated. (Although this is not 100% optimal, the gain by complicating things even more is probaby not worth the effort.) Approved by: re (cperciva) MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38770 (cherry picked from commit ab80f0b21fbb9c44d40e6f7a99090188f4ed2f71) (cherry picked from commit 3912f99ecae61dc7fe89c076a654332e3adb1bdc) --- lib/clang/clang.pre.mk | 1 + lib/clang/headers/Makefile | 2 ++ lib/clang/libclang/Makefile | 22 +++++++++++++++------- lib/clang/liblldb/Makefile | 3 +++ lib/clang/libllvm/Makefile | 2 ++ lib/clang/llvm.pre.mk | 1 + usr.bin/clang/lld/Makefile | 2 ++ usr.bin/clang/lldb-server/Makefile | 2 ++ usr.bin/clang/lldb/Makefile | 2 ++ usr.bin/clang/llvm-cxxfilt/Makefile | 2 ++ usr.bin/clang/llvm-nm/Makefile | 2 ++ usr.bin/clang/llvm-objcopy/Makefile | 2 ++ usr.bin/clang/llvm-objdump/Makefile | 2 ++ usr.bin/clang/llvm-readobj/Makefile | 2 ++ usr.bin/clang/llvm-size/Makefile | 2 ++ usr.bin/clang/llvm-strings/Makefile | 2 ++ usr.bin/clang/llvm-symbolizer/Makefile | 2 ++ 17 files changed, 46 insertions(+), 7 deletions(-) diff --git a/lib/clang/clang.pre.mk b/lib/clang/clang.pre.mk index 520a9300e6ce..9ef401645f14 100644 --- a/lib/clang/clang.pre.mk +++ b/lib/clang/clang.pre.mk @@ -5,3 +5,4 @@ CLANG_SRCS= ${LLVM_BASE}/clang CLANG_TBLGEN?= clang-tblgen +CLANG_TBLGEN_BIN!= which ${CLANG_TBLGEN} diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index 80a1250f6366..c4643e9353e6 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -200,6 +200,8 @@ riscv_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td GENINCS+= riscv_${hdr:H}.h .endfor +${GENINCS}: ${CLANG_TBLGEN_BIN} + CLEANFILES= ${GENINCS} ${GENINCS:C/$/.d/} .include diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index a2612bc9d894..cdffedfe3d36 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1010,13 +1010,6 @@ clang/Basic/riscv_vector_builtin_cg.inc: \ -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td TGHDRS+= clang/Basic/riscv_vector_builtin_cg.inc -clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Driver/Options.td -TGHDRS+= clang/Driver/Options.inc - clang/Parse/AttrParserStringSwitches.inc: \ ${CLANG_SRCS}/include/clang/Basic/Attr.td ${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \ @@ -1094,10 +1087,25 @@ OpenCLBuiltins.inc: ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td TGHDRS+= OpenCLBuiltins.inc +${TGHDRS}: ${CLANG_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} +clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td + ${LLVM_TBLGEN} -gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Driver/Options.td +LTGHDRS+= clang/Driver/Options.inc + +${LTGHDRS}: ${LLVM_TBLGEN_BIN} + +DEPENDFILES+= ${LTGHDRS:C/$/.d/} +DPSRCS+= ${LTGHDRS} +CLEANFILES+= ${LTGHDRS} ${LTGHDRS:C/$/.d/} + .include "../clang.build.mk" INTERNALLIB= diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 28778cb04c57..dbf9c6d696e7 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -693,6 +693,7 @@ SRCS+= Utility/VMRange.cpp SRCS+= Version/Version.cpp LLDB_TBLGEN?= lldb-tblgen +LLDB_TBLGEN_BIN!= which ${LLDB_TBLGEN} CommandOptions.inc: ${LLDB_SRCS}/source/Commands/Options.td ${LLDB_TBLGEN} -gen-lldb-option-defs \ @@ -720,6 +721,8 @@ ${path:T}PropertiesEnum.inc: ${LLDB_SRCS}/source/${path}Properties.td TGHDRS+= ${path:T}PropertiesEnum.inc .endfor +${TGHDRS}: ${LLDB_TBLGEN_BIN} + DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 868f9aa48964..ef9d87dd7d2f 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2026,6 +2026,8 @@ TGHDRS+= X86GenRegisterInfo.inc TGHDRS+= X86GenSubtargetInfo.inc .endif # MK_LLVM_TARGET_X86 +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/lib/clang/llvm.pre.mk b/lib/clang/llvm.pre.mk index 774d7d47ea37..92124a7bf092 100644 --- a/lib/clang/llvm.pre.mk +++ b/lib/clang/llvm.pre.mk @@ -5,3 +5,4 @@ LLVM_BASE= ${SRCTOP}/contrib/llvm-project LLVM_SRCS= ${LLVM_BASE}/llvm LLVM_TBLGEN?= llvm-tblgen +LLVM_TBLGEN_BIN!= which ${LLVM_TBLGEN} diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 9f114dbb81bf..1113072e4e9d 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -95,6 +95,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 9c3883984618..efe8529f3611 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -37,6 +37,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 10ffd3b90057..8e160b18eaa5 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -30,6 +30,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index a61e32db9aa7..073316b7b4a7 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -19,6 +19,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 0df48744632d..d3099e5a75be 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -19,6 +19,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 80aa29949edf..995a8b461344 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -36,6 +36,8 @@ ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index 443128460f99..8a9587129f36 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -25,6 +25,8 @@ ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index 4b547d81c583..8926eb03bdbf 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -30,6 +30,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index 20bd5de61192..f39e5db6f872 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -19,6 +19,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-strings/Makefile b/usr.bin/clang/llvm-strings/Makefile index 1438aa847997..253766ba084d 100644 --- a/usr.bin/clang/llvm-strings/Makefile +++ b/usr.bin/clang/llvm-strings/Makefile @@ -17,6 +17,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index c4677169f912..ae417356df6b 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -20,6 +20,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}