From nobody Mon May 27 11:30:40 2024 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 4Vntk85dvFz5M7jH; Mon, 27 May 2024 11:30: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 4Vntk850hdz4nY3; Mon, 27 May 2024 11:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809440; 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=CiOLyfvKVIuBFqw+yqnVuv/inF/kNGMpIBi4dkcekoU=; b=LGLm1EoedINGIzB82gV0wCbA693FFxK7q/aPV4X36lUOQtXsito6onUpFRFOBxD3ckdSDq bQqXZGFNKQUUKtckzTW9nQPYePurOyPG2Ac2EHsMqJE+x39rXUBpQ2umx6eyctNYc5QMrs 5Q4EfLO/l8JzLF86W7eqn7ysCPa0QxVuO3d+KtsC12rlW9b1BF/7Fj097quQjibJWEDgpG bXa0C2ppe6LJLGlKryX55l/UTKcqirMIz6h9oc7uHYobKCS6jEzjTYw01U5kXYK+WHKyTn fNrIbqyfggOSGRCYN7vMcLPI3dcd2igPffyfrda7JI3XJcxzGm57UW3u4FsC8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716809440; a=rsa-sha256; cv=none; b=GY7G+NC4Zi3Qw+01Awwvv4ZdP0kRPKSFrOUAJU3qA09rfeRODMIJ6dId6w+TJQEF8KOxxq HsPWc9UTBP4dvEAKs7kNCfVoophuvVRUc+vOIEN0vLng4s1KisQ0C7HBd0ofDqM+oJw0Wf tylK3PyVOMI6p+OJcqHcPeclrzKlW0Tcm7hW+ooLPpSETc9rKI4EVv3TwJ1N96mxtmKxB1 U8A/5/Xx/HHQMPnP9RGu1dAIXNAHXZT1aAQZwqCyVgUZZM0EWkoVCCYjxk55ch1c6tn/gz TCjcvn3cPVQHK3N+lNSLKDRU4ReP3FPgSjw3RDCI6Om6t1GoFGVI7aYj7Ipa7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809440; 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=CiOLyfvKVIuBFqw+yqnVuv/inF/kNGMpIBi4dkcekoU=; b=ho390K2MNplyx1m/kaAMzacaA6VxPDYelXSA10h7BtpqRTTfjEG9nlAVvzSKF6PZFcoliU ZjN/uFbp5f7h345LTB4fhH0qcbIV5EYWHLo5UvJzzEa5/ey74cy5vHCcJ3YPCB0QDgbg+H 9BVb7Bla/7LYBxUdVCtrQ0qOPMD4PobHdl8qIoNiY9omUr/Pd4f5GexkhkeLOOJk0pPGbx /qJhbSV/hVkBXlPo8wYH9ZJYCxt09KgL1/lVJcuRymGUY4G4mlPzy+jTuBArQ8ytmmAnx2 qQbbD1c3LCraYavhPgw/Tph4yxHsOoyYZ8PwYCTl+0VWh4xwVfEeLupbSYDqww== 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 4Vntk84WHLzj2P; Mon, 27 May 2024 11:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RBUeX0094704; Mon, 27 May 2024 11:30:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RBUeIC094701; Mon, 27 May 2024 11:30:40 GMT (envelope-from git) Date: Mon, 27 May 2024 11:30:40 GMT Message-Id: <202405271130.44RBUeIC094701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 3f9359a5aa87 - stable/14 - syscalls.master: allow vfork(2) in capsicum(4) capability mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f9359a5aa87acc38942cb0b61c366c0f9ce8aa9 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=3f9359a5aa87acc38942cb0b61c366c0f9ce8aa9 commit 3f9359a5aa87acc38942cb0b61c366c0f9ce8aa9 Author: Edward Tomasz Napierala AuthorDate: 2024-05-13 14:10:01 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-27 11:29:38 +0000 syscalls.master: allow vfork(2) in capsicum(4) capability mode There is no reason not do do this, we already allow fork(2), and I need vfork(2) for CHERI process colocation. Reviewed by: brooks, emaste, oshogbo MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39829 (cherry picked from commit 050555e129789fa2e20eba565f1320936b3d66e4) --- sys/kern/syscalls.master | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index a50d7723378c..4b8973c4b882 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -498,7 +498,7 @@ int flags ); } -66 AUE_VFORK STD { +66 AUE_VFORK STD|CAPENABLED { int vfork(void); } 67 AUE_NULL OBSOL vread From nobody Mon May 27 11:30:41 2024 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 4Vntk965yXz5M7ZV; Mon, 27 May 2024 11:30: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 4Vntk95VYJz4mxj; Mon, 27 May 2024 11:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809441; 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=jztDZi//A0Qlatza3W9GIgo312DaUrd7gfuAUAEbzfs=; b=LHF1qkJw2jnwicmsk7hPZHQb+O7rzNys9vjOHRSh9BZIuDSgIPudMWMin2uP9AAmPLs6/M 0gfhX9o3HbkASXuks15nvcuMQGXSx+cNhctT9jpLlDOAzo7W+ZNKNMhLldOLWf/TNcS/Ls sVnNr7U8+AmvV4J0Yhe1nmQq6C8ERVYLxZuwJCnRO1J/M8sHIIbMN/pteIPWv8njqHKENO iHZ7qnPekIZPmopPlHr56Mpefg9AmDE4pVQ1W3+paUf9ThHgrKsUw7+0XMkzPXp5j9CdUp OOPnyUunvEu3cV8pZgb/Oqp0JGZmPoC9txRGJrlmhPo2T14o0iybO9gvDKoK6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716809441; a=rsa-sha256; cv=none; b=ZJ2ViPgagz2ojIhVkXG28GtUWvQ/40N6YGzorYZSglN5LBzz0ddka7PIlZx+CrT4fSENso AxnGbYp2tdb2p6a/d+ARkCSp4r6CVl8FI/KIp/JqWF5e3DY4+moZavdUzp1oreW+pw9XVf nMq2xor9I+mrq3vCGO0YPQ8w+F8vLd4NyYGj2OtWYC7XqSl4peU0JW3BZjQdn5C57JTBLd wOOxvBjcCJ2JqSnPzFUh1CYf9h/J7O7gAuVWOJvG+DaL8/KWLn8bETFunoqrNkTnA7R0nk drQUl+uk4ZYzsTsFEKdu4iU9NSMHZnEpUPwgO7cHx0xDxJhsafGI61EO3TnMDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809441; 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=jztDZi//A0Qlatza3W9GIgo312DaUrd7gfuAUAEbzfs=; b=RYeoIH/o6Ubvqj72CzPsptrgWH+IN1Yfw+h6p4T3NQzfiY6O6MNvtlOGahnNmDfQzsqP1s PB3Te4WazogJMdzXLW12C83lsb2I2esFetIG020C2UP8kxggOInN9PJeXERLnIpfANbTqw tTsQ2esQazDJer3dXJ2CgTO6+dRcvyzqs1F8OJX8STMcvIr4T9W9CWYeAg/Q81oAhJWXr7 gesOnVBl22bFX/ln9PEyUa4e6tcL/FIRD6KYoeRbW+b9FXrorPih5kw/zRRKnwBcQbdVeA Cjw8tqlsgbtZe0vsctddwg5kgAK1hDMw8NTDPye5CicsnFHKCDkL3bIuEtpjfw== 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 4Vntk956STzjS8; Mon, 27 May 2024 11:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RBUfe8094737; Mon, 27 May 2024 11:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RBUflq094734; Mon, 27 May 2024 11:30:41 GMT (envelope-from git) Date: Mon, 27 May 2024 11:30:41 GMT Message-Id: <202405271130.44RBUflq094734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: f4962dca5699 - stable/14 - sysent: regen 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4962dca56995a4c5b8b41323c44d3ebcda80d0b Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=f4962dca56995a4c5b8b41323c44d3ebcda80d0b commit f4962dca56995a4c5b8b41323c44d3ebcda80d0b Author: Mariusz Zaborski AuthorDate: 2024-05-27 11:30:53 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-27 11:30:53 +0000 sysent: regen --- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- sys/kern/init_sysent.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index ecde86d07965..84ab05d24cee 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -127,7 +127,7 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 63 = obsolete ogetkerninfo */ { compat(0,getpagesize), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 64 = old getpagesize */ { .sy_narg = AS(msync_args), .sy_call = (sy_call_t *)sys_msync, .sy_auevent = AUE_MSYNC, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 65 = msync */ - { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ + { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 67 = obsolete vread */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 68 = obsolete vwrite */ { .sy_narg = AS(sbrk_args), .sy_call = (sy_call_t *)sys_sbrk, .sy_auevent = AUE_SBRK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 69 = sbrk */ diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index a893deb73d9b..20295641e5d1 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -126,7 +126,7 @@ struct sysent sysent[] = { { compat(AS(ogetkerninfo_args),getkerninfo), .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 63 = old getkerninfo */ { compat(0,getpagesize), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 64 = old getpagesize */ { .sy_narg = AS(msync_args), .sy_call = (sy_call_t *)sys_msync, .sy_auevent = AUE_MSYNC, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 65 = msync */ - { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ + { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 67 = obsolete vread */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 68 = obsolete vwrite */ { .sy_narg = AS(sbrk_args), .sy_call = (sy_call_t *)sys_sbrk, .sy_auevent = AUE_SBRK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 69 = sbrk */ From nobody Mon May 27 11:31:29 2024 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 4Vntl53QkQz5M7df; Mon, 27 May 2024 11:31: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 4Vntl52zq7z4p2j; Mon, 27 May 2024 11:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809489; 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=uXm7WufOhPbmGqPKqZxpXJBn5BLf0KoDgz4yUqehgY0=; b=FD6Sf3d0nzhb1IrF2cuquYDvDODvhIWQO/ePQIa8XH5m/5jL628o9FztNkG6AxDP2xtxog QummAaQJYCRyQgHob8Uy48/efYuaEoZMwMCNFieSQ/awmwvnWdT05O+t9I5aF0xODF80DQ ZCHnwVM6HVrCj9qkiMga0MpLYdpRQ6gH0+ZnSYOL5V0lpozAVs159EM3D7FUfnBSHq4HpO kb4o0D4BEE7ltG8IS5ou3xTQQQWsO4cwNyPYcqVGWkfhrDSple9yG+yvAExfQf2t/rn1HE ACOoN4uqNp0g4TrJv0XOPyJvstC2oppFuo6V4BS8HNyg6xU7/q3CaMi+8Qeg8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716809489; a=rsa-sha256; cv=none; b=mTKKx8nT0aSSh4eqIxpjGxx10JynKoObDurKW2lQIXljtktSER/yDredmnb5BNikLGAN1I DSDZggfvE1ciVPTL2cS/eDdrcloKUh2PtJQEU8d3O8/97tpIODt5H0kunhiErWVpx/4mLc LNC7rFeZcuZ3SPh45yIlmf4tSpv4POO+GfubJmJTeHf07M4g6PydTixzg/x7W5BJuW+L7z PZIpL8Q5gupYd5HpzC79PEnS1tL4B9G0J1QIM6mVBRuXj63Zzc97ZMEWR+lh6KPPQbyQ5O cmq3JnOGwEu6DChaQhQnsSaWkT6WQ747jIrjog0mSyhoB11RK0MTgEa09+3bhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809489; 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=uXm7WufOhPbmGqPKqZxpXJBn5BLf0KoDgz4yUqehgY0=; b=knMOV4bCChbSfDMofYBdGJvZpXHIE12To69lXMPPDwNeswCPPE1NgFr25KYUwet+BoGfqb ynbTpBbBrTv1O85FHvTBthNEPtK6VwlbKDxS0sVRdzZKPera4TaMFOaXP58q6X+bKPaCUn I8UY6jW17Klhf2QfILZ1ByVwOhiGEJ5cKN08er0haCEUSMODZoM0GGbSvYiG/IBz0Yuh6v U0eG72a1UO9FY3zykjGXsZ8XQ7r6k7+QcMP9em+nRUfjp6Mw4Mo6+hfEq2k8QTU484Ynqo zL/x69EZYsKod7XdBt4o3Dh4Cl0pPp30VX7hi1jXH6m1kpuMZz6edv34S4fW8g== 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 4Vntl52b4Bzjd5; Mon, 27 May 2024 11:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RBVTFZ099332; Mon, 27 May 2024 11:31:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RBVTlq099329; Mon, 27 May 2024 11:31:29 GMT (envelope-from git) Date: Mon, 27 May 2024 11:31:29 GMT Message-Id: <202405271131.44RBVTlq099329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 44fb543ac92b - stable/14 - capsicum: allow rfork(2) in capability mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44fb543ac92bc9ebedfbfe60225811e257c6daab Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=44fb543ac92bc9ebedfbfe60225811e257c6daab commit 44fb543ac92bc9ebedfbfe60225811e257c6daab Author: Edward Tomasz Napierala AuthorDate: 2024-05-21 19:55:09 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-27 11:32:11 +0000 capsicum: allow rfork(2) in capability mode Reviewed by: brooks, rwatson MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D45040 (cherry picked from commit 6b7e4254a29e3228a7273622556b60416e300509) --- sys/kern/syscalls.master | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 4b8973c4b882..47b67e4dbaa7 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1465,7 +1465,7 @@ int inherit ); } -251 AUE_RFORK STD { +251 AUE_RFORK STD|CAPENABLED { int rfork( int flags ); From nobody Mon May 27 11:31:30 2024 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 4Vntl66ZV8z5M7dl; Mon, 27 May 2024 11:31: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 4Vntl63y1pz4p2k; Mon, 27 May 2024 11:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809490; 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=70czMYcfn5bIei1VLQmiPTOF6BKcHrfURgG7/d3VBDw=; b=DyaWgSbWlwPv1pn3mlCok2qPRsq0FhZKk/BRViv/9vFIb3xQjEweUBCChxcb/Go0aTYcQ5 ZNMXrTCuNF6ja+hI7i6XVhfafMV+RZs0UzBzrnBAbgl0UliO0rNcfnBXXkZOk7GSP1Ejhu Tsbb1Vl4CfvQU0yl8PeIRhc45N2sJRoUvcYae3h9Ww44YHwZUCl7C7hXpBg/oilVWydZ3S u49NAtsTIhCsnr581WnqfIHTvZRKZGAeLCmUJwcvw08KP7205sb2UA2iVYEm3BBfQgQ0wL EFwefEe9GD9Lf/wYtt5jy6mfLA8Ogzz4+bxX+8ujq2TxckCnMOt4/IFWAXMKQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716809490; a=rsa-sha256; cv=none; b=oY/n6KFJFwPnYhxV7MEw6vt5t/lpZVAy2TX99YPgEUsRE9PKiav77PBu1tNzKwxQVfdcik HCn8KScytibKnL3UbvdbS32NsacGV6fhJ0rdZB2GlSCISg865RRD0XIqZ1K8T1syxVUxr4 2lFXdIkCbMJO3oHRAWdG0yfNjIq8MW/vk6ygCMVzyir6kfDF3IJKcqQAf6yBPl4P2hOY9H vcHxDs8IcIQRqStdsQGCl7XUCkS0dnqLDhKQOuvBm/BapnCMGDCUZy5ftHoyjxKyfODxJC YZ0QZg3VZj4s99dpk/JGHB0PvPys4CEz+5h1s+V/E3ouOCo/Zc6e0osoO9OBSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809490; 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=70czMYcfn5bIei1VLQmiPTOF6BKcHrfURgG7/d3VBDw=; b=GBVHoHZlUE5WrfSxVsUbi/9SECVRlJ6oA84cfkksGE7to6qsEkgc57c/9HJ+FEvNMc1LtA DuFOqhlO0By+jVtCKLjl329IRb7iXCXuq1aQHNG2H6ScoGmk7NZY53EorBajePPEXo6Uc4 eO2Nz/bZ+LqGlFlnayOuY15JJDC1gxb7SAhdg/BfZbJwSjVh1PJZaWyURPI78Idr9nUi+g i5bHEZiH79pnyZwafubhHL8Q81mTwIlmJV5/NTS2SXxLk/nAaNWXeMGN+krQQ7kdVSmBIE 6z6dmJ0p3JPqoa4L6kY3ET7ftITxrZtinGkcN5h9Y4lJSTjqD+8SPvh0wxZcOQ== 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 4Vntl63Yxhzjd6; Mon, 27 May 2024 11:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RBVUrW099365; Mon, 27 May 2024 11:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RBVUjv099362; Mon, 27 May 2024 11:31:30 GMT (envelope-from git) Date: Mon, 27 May 2024 11:31:30 GMT Message-Id: <202405271131.44RBVUjv099362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: c6bb723c913d - stable/14 - sysent: regen 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6bb723c913d42a96c1aef5d10ffd96adb55bf15 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=c6bb723c913d42a96c1aef5d10ffd96adb55bf15 commit c6bb723c913d42a96c1aef5d10ffd96adb55bf15 Author: Mariusz Zaborski AuthorDate: 2024-05-27 11:32:23 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-27 11:32:23 +0000 sysent: regen --- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- sys/kern/init_sysent.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 84ab05d24cee..df4ec684ccb1 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -312,7 +312,7 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 248 = ntp_gettime */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 249 = reserved for local use */ { .sy_narg = AS(minherit_args), .sy_call = (sy_call_t *)sys_minherit, .sy_auevent = AUE_MINHERIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 250 = minherit */ - { .sy_narg = AS(rfork_args), .sy_call = (sy_call_t *)sys_rfork, .sy_auevent = AUE_RFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 251 = rfork */ + { .sy_narg = AS(rfork_args), .sy_call = (sy_call_t *)sys_rfork, .sy_auevent = AUE_RFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 251 = rfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 252 = obsolete openbsd_poll */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_issetugid, .sy_auevent = AUE_ISSETUGID, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 253 = issetugid */ { .sy_narg = AS(lchown_args), .sy_call = (sy_call_t *)sys_lchown, .sy_auevent = AUE_LCHOWN, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 254 = lchown */ diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 20295641e5d1..319ced33efbd 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -311,7 +311,7 @@ struct sysent sysent[] = { { .sy_narg = AS(ntp_gettime_args), .sy_call = (sy_call_t *)sys_ntp_gettime, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 248 = ntp_gettime */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 249 = reserved for local use */ { .sy_narg = AS(minherit_args), .sy_call = (sy_call_t *)sys_minherit, .sy_auevent = AUE_MINHERIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 250 = minherit */ - { .sy_narg = AS(rfork_args), .sy_call = (sy_call_t *)sys_rfork, .sy_auevent = AUE_RFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 251 = rfork */ + { .sy_narg = AS(rfork_args), .sy_call = (sy_call_t *)sys_rfork, .sy_auevent = AUE_RFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 251 = rfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 252 = obsolete openbsd_poll */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_issetugid, .sy_auevent = AUE_ISSETUGID, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 253 = issetugid */ { .sy_narg = AS(lchown_args), .sy_call = (sy_call_t *)sys_lchown, .sy_auevent = AUE_LCHOWN, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 254 = lchown */ From nobody Mon May 27 14:43:36 2024 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 4Vnz0m271Cz5LFxK; Mon, 27 May 2024 14:43: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 4Vnz0m1Vg7z49dF; Mon, 27 May 2024 14:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716821016; 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=9dFzgjLilE87GlgPCT0Pw4JoPvtnsO5m1F3gagFVDVE=; b=jWzWEI2Yh853Vmqu6C1CFGGALnCJEQ/QxsQ81S7wg3DRvKO/jd9mruRaRxnZu6lfDvDy37 c/QRamh2BjM8jeBX5ShUa+ee4xTwi46g2+LhOFRc8HeBqzqXALYoIr9bmlPBjO2Ismki+5 Vn8oF7KTU1cTvHuwnKQYkwGnUZjyF0FvqQVGQKIiwINhmFYcVTzZ7y31sZsuJf+5aBY1zw BiBeGPKOR4ox/PugYjVQuAJfkNkJMDLDMsnBvglzlsHz5A3KE7deb/IAfnc5NffIhKmbvL yS34pTgCIg6Yr4YOY5Dtg5R8w7+Z6/IHE17RpAa65pQYZEK2ql8ndmFyoiwDyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716821016; a=rsa-sha256; cv=none; b=n6pMh21yGFklIdPuekiZqmn5k9mh8744/gZh6KHHwguevX/VcXs2rAaBvuVTc9hCHoejkE D3HQEE/3EFs26C0Mu14MieuUZlht0WPqJDn+TE6rp/nBGcAo5O71UiC68R0P+qqCw3z5tL kPhBv74wSpqnVNXAhQizamHcvlH1awxh/UdzqQQN1XVGLv4t01s52ebgICjecXziMGNRfv 5M6xICzj54iWByqi+HrlRba+9TsFfN3HzsoS7Nfw7jJvKqNU5g5FwuBopU00CFSVjvykzN 3Y+F8+qvvozj+5AkOmgtMUidaAdzXOlZodnyCTVjhdeehH5BLlL4T8pIf2VnGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716821016; 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=9dFzgjLilE87GlgPCT0Pw4JoPvtnsO5m1F3gagFVDVE=; b=VWle3KyQRx2p1ajAqlHeSRempaK5is2y1FxLW5t35CKD10CGykTpOoDYbGL5elQa8vMho6 Uz/1nqEWO992GQM9ej5XbMewLCPSKHSY62k+gcZH/cNfB+lrriHsMH4CpbotO6vN2rriSr 3nHIpsQB7pt8zuTmFv25glaBy7Hc8DH2zoZBYdpAontUeJrzDt8YtvkUnouTlk3cJERirp QCeYnVYdLxw9fIzYzjmbtw+ScGepdoWENs5FOcKxcO8DoG2/QJAB4tq8U/KoPpuBMeO+IP VayiLW/QIxZXjfZ2ffcfLH/xAc3zFFl+BHvsXYSs2wX29Q8zY9G+lHLtFrkw+Q== 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 4Vnz0m13CQznpF; Mon, 27 May 2024 14:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44REha2n023752; Mon, 27 May 2024 14:43:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44REhaQ2023749; Mon, 27 May 2024 14:43:36 GMT (envelope-from git) Date: Mon, 27 May 2024 14:43:36 GMT Message-Id: <202405271443.44REhaQ2023749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: ed10a9398d05 - stable/14 - riscv: fix L0 PTE setup (Sv48) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ed10a9398d05738089ee31fed263854ba92884e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ed10a9398d05738089ee31fed263854ba92884e2 commit ed10a9398d05738089ee31fed263854ba92884e2 Author: Mitchell Horne AuthorDate: 2024-05-15 17:07:33 +0000 Commit: Mitchell Horne CommitDate: 2024-05-27 14:41:49 +0000 riscv: fix L0 PTE setup (Sv48) Per the Privilege Spec, the Accessed (A) or Dirty (D) bits must only be set for a leaf PTE. It seems newer versions of QEMU have started to enforce this requirement, and without this change, pmap_bootstrap() hangs when switching to Sv48 mode. Reviewed by: jrtc27, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45210 (cherry picked from commit d7adf3b47a058552270fb2603cc888f40eba3e17) --- sys/riscv/riscv/pmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 8ddc31bed81c..45245fe54a59 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -715,7 +715,7 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) alloc_pages(l0pv, 1); l0p = (void *)l0pv; l1pa = pmap_early_vtophys(l1pt, l1pt); - l0p[pmap_l0_index(KERNBASE)] = PTE_V | PTE_A | PTE_D | + l0p[pmap_l0_index(KERNBASE)] = PTE_V | ((l1pa >> PAGE_SHIFT) << PTE_PPN0_S); l0pa = pmap_early_vtophys(l1pt, l0pv); From nobody Mon May 27 14:43:37 2024 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 4Vnz0n30Ywz5LFyh; Mon, 27 May 2024 14:43:37 +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 4Vnz0n2PkCz49yd; Mon, 27 May 2024 14:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716821017; 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=mtrbQv9OW8enuaqA5WRFYFam7yyfAwiIOW+nFgx21pk=; b=tJhH7U50QQjKztQwhkuD376Yt0Po54fnRINO2M41x/hq78g/wdShl568og38/MvXa9+M/e 5FTExUCW2HD0cwIC3lkCVhnJ+/+EwRU3hXEaTRs5oONAmONoOK+jiL6XSruR36CjDYGsY/ L2MMWToZWfGOr7jZH0fcxHY6bbqIARrRi2jxRDMDfsxXOHpW427eMvFaFaY54UsFK2fEue E7BoHVJbyiNnx7Y5DXNDgunk4/1XNac7Qfh9yaXZxq3SzEB1ILlv1241FnYHWhzvl+KCeW 3sw/UoHC+jI1ww83Y2kYXHiwEZKlJZlnkw0ew1MyptYBvr5RSDPvoHi6t3rPkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716821017; a=rsa-sha256; cv=none; b=Hkkct86O3/G0e5x14aWi+wLRLoFF8pH8rFCphOwuACdc9Y0B1uxX5lstawUNGGK0BlRzdK zgSvW6KDGl0vZW5wKPQ8CCDqL7djI8zaVXBb4sqSZ01vLsLUgkv+kyzstZV3CRGLG76urn GkX8mTF+tUMYMraMiIQq5DaMX9htwqJkNhyCNzE4UQwDSRCnXVy++gHwCGgr6N+ECQyFIx UJW7FX1iykjZxNtmDuEkZobbSUPZW9Vs1OXRXfQ7NrO5hKPxGGQarHW6RiTSzEBsm4wWIS mkk+vcXQSIojcGSH3Rtfd8h5cSyRUq9zVlmfKnKB6MvU/8TUWLvolIbuNmCi8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716821017; 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=mtrbQv9OW8enuaqA5WRFYFam7yyfAwiIOW+nFgx21pk=; b=CXQT8Crtmevf/x16IgfmCHPpyLkl6BotpuuNtDpDHwjprkIR+7u4rQYMiD9hu4lEgcU0hW 6vqAeNmsLFKPq/Ty1ufr7Be0yMR17qi4oLys2Kl4xYxxkx3i719hrrvpLoo4/kN54Xlj/D Hi2L0JIGNSihZbWeBIcZvIdEQHdmUjksCOgTKFOrLVwFxMShVkUeG+oW+poGVn3GpjTE2a /yCkVz3xbcVKtVK4Q3PaOhBIhc2aR1nVdoKN9oaSMFZv8h478wV0Y3+ozCMiee8pW86JFi ve9j5IO299NEfT7HA8q4iVnyAAzbk/AWqC7WLqkBjSPak0xryy2ozhNLBPB2mQ== 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 4Vnz0n225rzp5v; Mon, 27 May 2024 14:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44REhbdH023794; Mon, 27 May 2024 14:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44REhbOi023791; Mon, 27 May 2024 14:43:37 GMT (envelope-from git) Date: Mon, 27 May 2024 14:43:37 GMT Message-Id: <202405271443.44REhbOi023791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: bdfd8f68faaa - stable/14 - arm64, riscv: remove unused declaration 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bdfd8f68faaaa1339b08afb438e217a26a6f7bdd Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bdfd8f68faaaa1339b08afb438e217a26a6f7bdd commit bdfd8f68faaaa1339b08afb438e217a26a6f7bdd Author: Mitchell Horne AuthorDate: 2024-05-24 13:53:43 +0000 Commit: Mitchell Horne CommitDate: 2024-05-27 14:41:49 +0000 arm64, riscv: remove unused declaration It is inherited from arm, where the global exists and is used. No functional change. Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45323 (cherry picked from commit 1d3c23676de33762fd7fc2e3d890fd14738d3ee6) --- sys/arm64/include/vmparam.h | 1 - sys/riscv/include/vmparam.h | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h index fee8e01f72c4..b37bd823878d 100644 --- a/sys/arm64/include/vmparam.h +++ b/sys/arm64/include/vmparam.h @@ -273,7 +273,6 @@ extern vm_paddr_t dmap_phys_base; extern vm_paddr_t dmap_phys_max; extern vm_offset_t dmap_max_addr; -extern vm_offset_t vm_max_kernel_address; #endif diff --git a/sys/riscv/include/vmparam.h b/sys/riscv/include/vmparam.h index 9a710b667c78..2198245d5b20 100644 --- a/sys/riscv/include/vmparam.h +++ b/sys/riscv/include/vmparam.h @@ -242,7 +242,6 @@ extern vm_paddr_t dmap_phys_base; extern vm_paddr_t dmap_phys_max; extern vm_offset_t dmap_max_addr; -extern vm_offset_t vm_max_kernel_address; extern vm_offset_t init_pt_va; #endif From nobody Mon May 27 14:43:38 2024 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 4Vnz0p6w3cz5LFWX; Mon, 27 May 2024 14:43: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 4Vnz0p4T1Gz49tG; Mon, 27 May 2024 14:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716821018; 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=2aEHtvOuJckiOkv73db5GfohijqhFeN8AxwpcFZyVg0=; b=jt8gTNiA1wyUcf+4gZ2gvQAzMacTQUrRk/ErLjdfde6gGHMzZpxRcZYb9OyeBxkqm9kKNS 3M9AWSWabG9s8FnMrkbtGbQq+MCkjOEyFMnw3LVJc82ybukuFH/xHKqslef7m+3gWJHTCc VVVcUvAhESNStPcR74HS8IO9L3/jyDG3OpHSCZ3fh1/dSe5Gwkn9SbmqM2N2nlKkTL9/I9 PgivjXnZBbqGA55hTVb2c/w8ou40E/bdksBlbcUTAK6NcNhDhX8CMWFMYba4dY41INPi7m nV0Rf7ixGJuy4tZIvBu9bNHgN79lf3V9UPJdQs7DRIjnplXDrVyyQzMREeeEGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716821018; a=rsa-sha256; cv=none; b=GybkwXNmrIO45BMfCmvn+2SdhNhhXZThqak3VbET35WtaI7pEz6qPVt5Foo6ZhNz5U9ffy 1XA9qhM7I4CSQ0EtofauCsT5KET1zoMsp2D9Graw3WFusnC2wVrjxvbjXXF3uDIxKwOrRb vjNDxn3DkhWgsr+7z8aTcL1yyb7wM86tPsdEWrMLxanYbbN2SXfrlcNVVETybCZ31KyGV5 s/zKbqr6ZlAZSSz8Q4qzIHMv332rcNs2uqu1n9LxZ9N9uj7lIBU+miwKeuXtxgkdg2sc4/ Aezhr+OvbE4dYBByx43TAAF6BCV5EnBDqdiCJxNC/fppOz2bstGNBvNjCGwQXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716821018; 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=2aEHtvOuJckiOkv73db5GfohijqhFeN8AxwpcFZyVg0=; b=HA2f/NOAuXaAcQimBzUZg3dNN0BlgakCnj2Gqfm6uZykHMEZM/xi1GinPsyGIEpm+zPd5X OcgBXbiMKgMPMEoQxxQgDi0YCJ85AxMh3cGK2chGZiBW7ynVuG6g5Y+dmaz+VqWVItm46d HDof3ohUDtTmjupX5YjYvb4u/8q/lvH4UuY/O5Ttt/L4V0PEry1MGVlJvYpTx97A6fZwD6 lkQ2cqZwOOOwW4N7V6DLvQjBW0PuIcOCDMiOhyIEp8wQRPJIvGT/9ZISfqW981WeKfPu8Q VSydEIw9kRoYU4WV//FC91zt9G3VViDUPoTLuhbKkIOmSZmAl/Zf0FEKso5awA== 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 4Vnz0p34G9zp5w; Mon, 27 May 2024 14:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44REhcNr023839; Mon, 27 May 2024 14:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44REhcQT023836; Mon, 27 May 2024 14:43:38 GMT (envelope-from git) Date: Mon, 27 May 2024 14:43:38 GMT Message-Id: <202405271443.44REhcQT023836@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 1b1c7e088c58 - stable/14 - arm64, riscv: removed unused struct pv_addr 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b1c7e088c58ed610a7bdc3d068ac41b532827fc Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1b1c7e088c58ed610a7bdc3d068ac41b532827fc commit 1b1c7e088c58ed610a7bdc3d068ac41b532827fc Author: Mitchell Horne AuthorDate: 2024-05-24 13:53:14 +0000 Commit: Mitchell Horne CommitDate: 2024-05-27 14:41:49 +0000 arm64, riscv: removed unused struct pv_addr No functional change. Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45322 (cherry picked from commit b5e17840de65ff196b2398211b68ce96d6919f2c) --- sys/arm64/include/pmap.h | 10 ---------- sys/riscv/include/pmap.h | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 4b4d47ccc7af..a250b5a20420 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -69,16 +69,6 @@ struct md_page { vm_memattr_t pv_memattr; }; -/* - * This structure is used to hold a virtual<->physical address - * association and is used mostly by bootstrap code - */ -struct pv_addr { - SLIST_ENTRY(pv_addr) pv_list; - vm_offset_t pv_va; - vm_paddr_t pv_pa; -}; - enum pmap_stage { PM_INVALID, PM_STAGE1, diff --git a/sys/riscv/include/pmap.h b/sys/riscv/include/pmap.h index d65935c4ce7f..e10cbacb6e1f 100644 --- a/sys/riscv/include/pmap.h +++ b/sys/riscv/include/pmap.h @@ -67,16 +67,6 @@ struct md_page { vm_memattr_t pv_memattr; }; -/* - * This structure is used to hold a virtual<->physical address - * association and is used mostly by bootstrap code - */ -struct pv_addr { - SLIST_ENTRY(pv_addr) pv_list; - vm_offset_t pv_va; - vm_paddr_t pv_pa; -}; - struct pmap { struct mtx pm_mtx; struct pmap_statistics pm_stats; /* pmap statictics */ From nobody Mon May 27 15:24:48 2024 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 4VnzwJ5GRpz5LKvJ; Mon, 27 May 2024 15:24: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 4VnzwJ4TkWz4Gk8; Mon, 27 May 2024 15:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716823488; 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=J7YfAwnx0WOHgC32GXSnOPPHRRfN+gDtSpRcHtxF438=; b=sNVArrE/822qpfCELCDce3jyB7hDTe6Rio908yWNO/Q4JCSb+OYxCKBEj1U4hL/FW+pehv 9RkMyLfTjtZVVzhG/WtPln3/SWtVkvDgPtkFZbOsTVVW/ZWJNbrX/P8qFxqQXrXJgc/CTs 6AayAqNNvLjto8XBy7a/1NYkImfSnNTGyqbsBl0BYb+R0B75OUBBbSBHjrAsfOcw6jF0IC Z3SeF/1W30EilS7jxiWpB+22prtqJclAeGMQMf/XUbkOJ/Tvl6GfvS5YLLbqSVpXvz8Tax 2GnbA8+sdERFSxgK38u6f2vYbs6S5+82bjUHKw9SGzKZt/t+OqO2MSXnqhEL3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716823488; a=rsa-sha256; cv=none; b=xnSUDvy0v1XmBTiHek6MSyVHg/z0FKDnXjEMhP43t1Zjoy3Bsqz+R4jRBUxwRp2LYb379W kKG9LdkQEWklMkbxhDStObgtmOaHIVN/5LFiqv8Yi2MwQrSJrWZjo7YbfvWGOfDyg2NPdA AQyz685ZYjJHXrF/bnKTV8h2q2If0+r9L5CbP6JVBmmhNaHt7D9tQqDeSciNPUA5NqJsX1 CpvivPuhYygqedQJeCx8A+FZZZB043pCNX7AZR998wLc5oiYYwDjhSGNZ5k3hoYUlQcUcY oUkQx+16FGV0Z1b0QbpQh++nOYtN0z6CpDyovbSFh6LFeuNCO4p9jwfXC/6U+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716823488; 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=J7YfAwnx0WOHgC32GXSnOPPHRRfN+gDtSpRcHtxF438=; b=Ci5usjkhnffhRdstEf0BqtbtsxFrlAyYnxJlI3KupLR5271dvcA5GrBXfC5jrGyOdhSgI6 a5YVkvU9we5/Hui1TuBR1Y2tN+MNGoduk8Yi0JL73e3obgwKP5f6ZBMqkJRvbSLYBCoekz zdg36vlbjHAeCEArRs+8rRAjhuEnaAh8uQve4RDePoG14lZXOQTQvDTRLEAkTCcGZYLROq IdCONldGoeGRJlmZYK4/YJAZ01zymhJWpDv8czxX/HUbawNBuEU2Jh3rbcUTFobjZk0tOe Cv569q0lq4qo7UBewVTnLSk+j8T0HwMw8O8bZeHs5hPCKKF0hrw/x8tiKJIA1Q== 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 4VnzwJ40MBzqXf; Mon, 27 May 2024 15:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RFOmpL091867; Mon, 27 May 2024 15:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RFOm1t091864; Mon, 27 May 2024 15:24:48 GMT (envelope-from git) Date: Mon, 27 May 2024 15:24:48 GMT Message-Id: <202405271524.44RFOm1t091864@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: 03d3230d5152 - stable/14 - vt(4): add note about sc/UEFI incompatibility 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 03d3230d51529a38e0c90ff324145dbfe209307d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=03d3230d51529a38e0c90ff324145dbfe209307d commit 03d3230d51529a38e0c90ff324145dbfe209307d Author: Ed Maste AuthorDate: 2024-05-24 21:45:14 +0000 Commit: Ed Maste CommitDate: 2024-05-27 15:24:13 +0000 vt(4): add note about sc/UEFI incompatibility syscons is not compatible with UEFI boot. This is noted in syscons(4), but not mentioned in vt(4) where the kern.vty tunable (used to select vt or sc) is documented. Add a note so that if someone reads vt(4) but not sc(4) they are not surprised by having no usable console. PR: 276206 Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45357 (cherry picked from commit f52481f3b8a377e336ecba1b5150023a344ec189) --- share/man/man4/vt.4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 2876d1ca8d84..81eafb6fae6a 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 8, 2023 +.Dd May 24, 2024 .Dt "VT" 4 .Os .Sh NAME @@ -219,6 +219,11 @@ The kernel uses .Nm when this value is not set. +Note that +.Ql sc +is not compatible with +.Xr UEFI 8 +boot. .It Va kern.vt.color. Ns Ar colornum Ns Va .rgb Set this value to override default palette entry for color .Pa colornum From nobody Mon May 27 15:26:51 2024 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 4Vnzyg5hwkz5LL0P; Mon, 27 May 2024 15:26: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 4Vnzyg5FG1z4HBX; Mon, 27 May 2024 15:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716823611; 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=07em0gaTmD97iVbG/h8itt9Z1M1hROSKmSPLkxCLPiM=; b=lrFY7GFab8+qghJIphRJsjTtUMTuL4o0ZPI9ZiDsj9pVZExiIk7ecGg32ylvmfWw0ZhosH OUadXLyZvc1JNQjjf7DTEQPHoxP3K445n9XItk66COWDDU6ERHmR4LmZwWFv15oo83TnAT fCT7m/vbpEUFKBt+/QBGCWhYBD5LlH1k6hB/SVLBOu20IutiVlRQn0Suu6V/aF1KyrmSgo xvm93dPrHhT14yxnTQp1lVDA0iiWoEYwXCH2sI2DJiBfX0TLVh/7vDUitcozGSkRR1isjW dosGizCOKHp/VL3VrizDyensJOnBjgEr/M6U1se6dldAdMjTNa+a0/ac2No/Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716823611; a=rsa-sha256; cv=none; b=WLasWfYjfeWldg9huk/shM3rozA710rhOrHFD31xUVe474VblJXCiaoQOc/Aaiwq2UNIVG rnbsHqizCMpID+VeZOIBa7kXE5keyB26WOzk/Q3yUnyxHrmJyEj04hia4A2Y6ZSXuVBK7v Lpgob5i7fBT7x/pfi3WoKS5RMn6GRkBs2KHNYYvrwLwgFhtV6WlhBcysL+fvWRF43+guSa vJXG2uZdXvfvCRFm01+PejOhkUanG6uY30KQ3h8SLjJBWwRbiSzcoPoCmaAvOZPT2FeoUl hDUm0r0/aV07MGfhsRlaPI1DNVNCZVw/iHmT2o/mpK6wAuBMSDDm+8b57dxFoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716823611; 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=07em0gaTmD97iVbG/h8itt9Z1M1hROSKmSPLkxCLPiM=; b=N80hitL5tpbbcvvSu1UXUgb/YQZ8O7UZQg66vTjwGlacBjzTcbwpT+cd+LxpjcG9D+/F2w HH/dBKeNBsFfdbWt+/rJHLPUsKeB7ZXc2A/wkO6Tjxls95VL7ClR/7KIJFVpaQMNSU244r bRdtU8NTOMpgYXCKuDA5TTN1YW4schoowBBxm4PNC66Ctt7nuKlgcpdx84m2Anhj4Gc7wv BFHJX1XkpPqSk3gp9ZUNm3R1DrR2XhkVVKGz8nwJbxezFG7LXR0DOesPW9z3JNtbEgYduO 4MeYMKhvi+iM4bJXeOEm7S1V61nu0v0LJO2VAsSoJWxnBZE/ZEPFscOJVmX2Vw== 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 4Vnzyg4q4PzqGH; Mon, 27 May 2024 15:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RFQpYV092275; Mon, 27 May 2024 15:26:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RFQph2092272; Mon, 27 May 2024 15:26:51 GMT (envelope-from git) Date: Mon, 27 May 2024 15:26:51 GMT Message-Id: <202405271526.44RFQph2092272@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: bbb6bfeaae46 - stable/13 - vt(4): add note about sc/UEFI incompatibility 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: bbb6bfeaae460ae1be5218d4456e47dfd86fa62d Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bbb6bfeaae460ae1be5218d4456e47dfd86fa62d commit bbb6bfeaae460ae1be5218d4456e47dfd86fa62d Author: Ed Maste AuthorDate: 2024-05-24 21:45:14 +0000 Commit: Ed Maste CommitDate: 2024-05-27 15:25:28 +0000 vt(4): add note about sc/UEFI incompatibility syscons is not compatible with UEFI boot. This is noted in syscons(4), but not mentioned in vt(4) where the kern.vty tunable (used to select vt or sc) is documented. Add a note so that if someone reads vt(4) but not sc(4) they are not surprised by having no usable console. PR: 276206 Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45357 (cherry picked from commit f52481f3b8a377e336ecba1b5150023a344ec189) (cherry picked from commit 03d3230d51529a38e0c90ff324145dbfe209307d) --- share/man/man4/vt.4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index c75830bdd44f..3a8c64746882 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 21, 2022 +.Dd May 24, 2024 .Dt "VT" 4 .Os .Sh NAME @@ -218,6 +218,11 @@ The kernel uses .Nm when this value is not set. +Note that +.Ql sc +is not compatible with +.Xr UEFI 8 +boot. .It Va kern.vt.color. Ns Ar colornum Ns Va .rgb Set this value to override default palette entry for color .Pa colornum From nobody Mon May 27 15:41:29 2024 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 4Vp0HY46Dgz5LMTs; Mon, 27 May 2024 15:41: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 4Vp0HY3bzYz4K4p; Mon, 27 May 2024 15:41:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716824489; 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=6dJuxUTqNiSTJn23MuzklGxLOTTdIW54cRqQkIMSLSQ=; b=mvKbAa4LCk32xRSqTOJbK/QmKItBPVeFDmLwPG77cwvhO1FokL7iLx+c+EBroW+ymeMMwj TNrlbslBjh9HsPfkCcP7WJMiF7V2Pb4kAJvSN1gywA0ozhdqXud+YYSFbsyy+QB9RcwVtj Qmd/JghEgd+sFXrYNfxJsnBnylUPcNfglRW9Og7wLox1bknQ4R9zc//sxDGUhy7bul+KmO Qcm0aFo9L7Mazoo/DQz3HPcqtj4iUKEfiFctrxFc4twrF/wDyQKo3t1wIBZGxsqVsEcdI+ u1bnJLRRBRC9fhdyjJbleTlqtDtYx+Y8Mf16sp6x6u7+n4JvQixyv11D4Y4H4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716824489; a=rsa-sha256; cv=none; b=xjOSt6QSWI3l7O5nEjlgxt57o1ZnWJ2rwCXjEK6fY6wgSaag5HWk4YfpQB4yNEUA3A797B a5M2ndkc4OOPPiqH1uZ7Wx/jkPfepo40szYVUR7Hb1JjCgAINpxdTB99QcnJJiFMNOAeme qs7osqj+ucRyRxxqyi/A0OWkyaY0MayF+oa82FOfwLjkya1+1thXW1wR93jhtnBbZOB4Jl n6ikenWl8hPR4wKQekPZCQja/VGK8CzR3JRPgfo2x/bEtv0B3cUTZFnfZkQP4wDTcpnAk+ klNVKUMFkn+yODfdBaCkdbVLR2SX3jS9RHWh9wff7VrSwOtffGv/Dvgxw5aCjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716824489; 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=6dJuxUTqNiSTJn23MuzklGxLOTTdIW54cRqQkIMSLSQ=; b=ULP5OzOGBJ9DyYAcOrMKJLnqJKajnugwHIEaChifXqWw1GcWn/faRV1+/Ef99Al04E4wfx 6vVJFaKHWcMddenSHQaRJmtg2VXhkf/mtGV3IkAvQqJnoPrWXS5PrjAc+v14O1Xyj8eoIy zWEd7aRstvBi08wrkJtu4peL+uiCvkaakjFvTr2hAlgufpoFdo8upGyl/82yIcPOs+1doj ugOBtInQVZ6gA5QuwfnXfO5Hs5Lb6G+RZLMk5abZvGNnsCvlXTrP88Lq54eg+ViOzjJrFM ri9HkyknQ9/vsQ8zlSzHwN4bseGCVfaM+vSLILPBjoyV5zYMNOGjWMlbKATk5Q== 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 4Vp0HY3C9wzqmQ; Mon, 27 May 2024 15:41:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RFfTVW025344; Mon, 27 May 2024 15:41:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RFfThv025341; Mon, 27 May 2024 15:41:29 GMT (envelope-from git) Date: Mon, 27 May 2024 15:41:29 GMT Message-Id: <202405271541.44RFfThv025341@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: f952f27731ee - stable/13 - Increase IOAPIC_MAX_ID to 255 (from 254) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: f952f27731eea10bfa621bf8d19a1264a3244203 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f952f27731eea10bfa621bf8d19a1264a3244203 commit f952f27731eea10bfa621bf8d19a1264a3244203 Author: Ed Maste AuthorDate: 2024-05-10 17:40:59 +0000 Commit: Ed Maste CommitDate: 2024-05-27 15:25:28 +0000 Increase IOAPIC_MAX_ID to 255 (from 254) A test system provided by AMD panicked with "madt_parse_apics: I/O APIC ID 255 too high". I/O APIC ID 255 is acceptable, so increase the limit. Reviewed by: jhb, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45157 (cherry picked from commit 4e3286818327453efd8e4c133928ba26a169567a) (cherry picked from commit 18119e711f1c844bd6eacf5afc8d4cdec3ac8085) --- sys/x86/include/apicvar.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index 0165d432be80..4d1bd4cc9cb0 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -78,7 +78,12 @@ #define MAX_APIC_ID 0x800 #define APIC_ID_ALL 0xffffffff -#define IOAPIC_MAX_ID xAPIC_MAX_APIC_ID +/* + * The 0xff ID is used for broadcast IPIs for local APICs when not using + * x2APIC. IPIs are not sent to I/O APICs so it's acceptable for an I/O APIC + * to use that ID. + */ +#define IOAPIC_MAX_ID 0xff /* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ #define APIC_IO_INTS (IDT_IO_INTS + 16) From nobody Tue May 28 04:22:02 2024 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 4VpK966MTRz5LXHw; Tue, 28 May 2024 04:22: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 4VpK965d0xz4YXG; Tue, 28 May 2024 04:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716870122; 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=UELdCtdDu3FOiWCSoQbIm/m1RP6cSXk6hcXNhK+o0Po=; b=IaDgmZTZ/D8EbMG2E7ErORgOlRUNRBW8uAuFj9OyE4fuKLWBkLjI5PuplXMpzlooVrfaHg ENHKAdddpqQqlP6nUgbcu+KZFzvGR4Ky8lhb8sQ0KhO5v+d1aGnZZXbZrqc7/FwwQgfTZu X+3FFKq65JWUO+PVnAMwB2o8nfndwvcver6ZMWAHznL2F8BnNRHYwlXYAFbxaoIEOZuloa 2uZSSzDtyyuoAsWXDJXwTa/GJhOy5EzIcUm6/hbZlBSR7TzELxzD6wsnMIFm71ewxjWsSj x5tulrm3D6c/DqArxhX3P7QDtlVktAeXcco7F0yZGPL3xF6djDEfd826yOUtLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716870122; a=rsa-sha256; cv=none; b=SluO/1pW3dLY3nol/jk9xi85i2O4UAVrVf0Wr/a0aB0NLkgahl/A96lbXCOM4ZHIoROB/Z qtQWzQ6GSaSSdZWmylHxeXk0Kdjw2bWxLvqGtweRR4F3AM/dnSBBcQOlXC+am9vDNXludg qL2OrMwoCnacp3QZrH7hlvnHrL0+s1XBypJdnCpypJ/dSmjC0gieANNo0oC91w90bp87KK lebxYdblhdCbes6uvV1rafvs+vDph5wRh7bEH4ehXeCw+dii/qhUIZTedFV+lhsDoel0OT EiH1gVGZHdJ8ULQx6VWZIuMFHIrNOYHx6B6Usbv5UumXuerp7WUmOIc/gYlenQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716870122; 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=UELdCtdDu3FOiWCSoQbIm/m1RP6cSXk6hcXNhK+o0Po=; b=BWgXGz9/75Ner/yXwikQ8dqQnjA9JoFQHB6IRF5aM4Vly+9Fb8BfDE2tzRhT3yGewlZw+i ODyfotO2Kg19WPzFiIJ/ExHCQ58aSeRF+4D1MtbbmtWV0GPMsPKSVKiODjyJynI0nYAwLf /AtVXyinIZgAB0yI+7IKXUYVLGB9qJHJdY/sBK46aWKzbmuulFH2u48c8Xg6m3RI++bKZO DexawGrBit5ffmx2UL1se5oSgz2viWULiARI30VWMBNASTdxlBOqS0SaH9jdx8sHRQ/mZl WwjKBowpcrDl8Rdgo74ZIy+4VtM5nS2LptOJbVzr6bITX05cx7fY4JVfxOBq0Q== 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 4VpK965Dscz1Cfy; Tue, 28 May 2024 04:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S4M2sc015183; Tue, 28 May 2024 04:22:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S4M2CK015180; Tue, 28 May 2024 04:22:02 GMT (envelope-from git) Date: Tue, 28 May 2024 04:22:02 GMT Message-Id: <202405280422.44S4M2CK015180@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: 5fd1902b0c76 - stable/14 - compat_freebsd4: Add const qualifier to the local variable s inside function freebsd4_uname() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 5fd1902b0c768fa43d3d7eebf7efd0957d5e144f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5fd1902b0c768fa43d3d7eebf7efd0957d5e144f commit 5fd1902b0c768fa43d3d7eebf7efd0957d5e144f Author: Zhenlei Huang AuthorDate: 2024-05-28 04:21:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-28 04:21:20 +0000 compat_freebsd4: Add const qualifier to the local variable s inside function freebsd4_uname() This local variable s is for iterating characters of global variable `version`. The content of `version` is not going to be altered by function freebsd4_uname(). MFC after: 1 week (cherry picked from commit 92f2a4c820fea9efcb6ee6a7029495c8152958c1) --- sys/kern/kern_xxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 66d99edb7da1..d6687fae0caf 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -318,7 +318,8 @@ freebsd4_uname(struct thread *td, struct freebsd4_uname_args *uap) { int name[2], error; size_t len; - char *s, *us; + const char *s; + char *us; name[0] = CTL_KERN; name[1] = KERN_OSTYPE; From nobody Tue May 28 04:22:03 2024 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 4VpK981qqYz5LX4h; Tue, 28 May 2024 04:22: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 4VpK976fXFz4Yg6; Tue, 28 May 2024 04:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716870123; 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=zDoMOk7/J/5Y7WYf+YPB5lFvyL1gDf8b4h4WFAze5pA=; b=pgpHEQeqk4C7P+X3XkZ2+brdQWLnARud33K5GkOKx4/1gD5SQ6IYazlZnAQcyeYSq2lCc4 PqeqjWEoxxcHE4mqqrovQgf6wc5ANQmHxld/asoptBI1DHidYhSSR9j/n6w6wkjKX8qWcM yJBI1ajziorWwZK43GjtkCy2TVApglE9p05Dpvo1xN/db7NWGogSheYiMilIOJXXINMo/n pCwsgfyWNKt75KaeEhl+8kStPaYNhJ5wJ+Ag9EssZlyW1TZCI3XS9ANo6mZCDFExr5aHqe fcZyi3cCkRLWA2whEnYSEVHBUl3+OIgCNcku2XioQeUcmPwjcJd0fnIC9Dsg7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716870123; a=rsa-sha256; cv=none; b=biDkP62IYg55iAqq+4EJ8jfxu5ib58hpZuBBpQS/aUY+7eDCAxYswRf2ZtniOIDDUNMhgR wGwMKaXOqvf+0AtZs6vXgJ5PAsWt/nd1oYdv0HE6ZFklo3dp0m/ZYkIo02xMSPG9/jdIrD YnUl73O/CqHY4R3I/aGETh0B20likE+jkw7JDmd03ajrUelVHblSQL62Tj+oi4W9E9/u/U b1Hw0mLZKvaBGOZv9C/JUuBTC8iqlVlE8hG68pO5Oht8x09hoJoogjC6C/Uo4So91QoZ// ISMHbT064L8UQxgghke9Fsn7mCrN0sKxQPEOmUaUKZ9OLaM9bX77JRS05pNhtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716870123; 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=zDoMOk7/J/5Y7WYf+YPB5lFvyL1gDf8b4h4WFAze5pA=; b=YiSxOqvqBplgN9s4BmMcz2/9mEy4sJONUh2Hh/SVbRSbrDNey0fRqkuM6uyR9wsKMAFDJH lBeehHWoXyQ0uTP7vkBewLfljS/xiBKs6aQ5Fh7qS6iwTCjYstE6n8jkEkRt6LQoESGgF3 +js9X7lPXJsT+yVmZTz7G5UOSpJbolKEg0vAP7pxWVb8NcvWouTmyqCNovNh4rbfb6oje9 nVCUFQKiNUysPoOTmnjzsRi421PX7RaJ+A69d6PhW7+ketBdw6x0zLEjPajpug+sojYD9h D1/k2xJNNtL/dehgf+TodqPD2772u1kMdRhQz+UZGJVNwnLAIVJpq2mCDXrShw== 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 4VpK976H0Pz1CYl; Tue, 28 May 2024 04:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S4M3ae015255; Tue, 28 May 2024 04:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S4M3kG015252; Tue, 28 May 2024 04:22:03 GMT (envelope-from git) Date: Tue, 28 May 2024 04:22:03 GMT Message-Id: <202405280422.44S4M3kG015252@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: 1b3f88bc8095 - stable/14 - linux(4): Add const qualifier to the value parameter of function handle_string() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 1b3f88bc809526cc7cd22c88b4fdaadf1a2e5e75 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1b3f88bc809526cc7cd22c88b4fdaadf1a2e5e75 commit 1b3f88bc809526cc7cd22c88b4fdaadf1a2e5e75 Author: Zhenlei Huang AuthorDate: 2024-05-28 04:21:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-28 04:21:20 +0000 linux(4): Add const qualifier to the value parameter of function handle_string() The content that `value` point to is not going to be altered by function handle_string(). MFC after: 1 week (cherry picked from commit 68c890b4433d3655c7df91cc43f89f4d6a8b35e4) --- sys/compat/linux/linux_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 65c64a7ba563..97341c051af7 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -74,7 +74,7 @@ LIN_SDT_PROBE_DEFINE1(sysctl, linux_sysctl, unsupported_sysctl, "char *"); #ifdef LINUX_LEGACY_SYSCALLS static int -handle_string(struct l___sysctl_args *la, char *value) +handle_string(struct l___sysctl_args *la, const char *value) { int error; From nobody Tue May 28 04:42:10 2024 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 4VpKcL4kGdz5LZ2Q; Tue, 28 May 2024 04:42: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 4VpKcL4Hg2z4cH4; Tue, 28 May 2024 04:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716871330; 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=OUPapiRxCYezTbrSe+UI4HtGB5TSCzVsRgr1s3jss/M=; b=e6eUnmi1wUvPqwWoodRJVorG+zWNjGJCCpFkzT/dVo5AMyqXVFaA2YuBEkRCPuqf76uEKG 9e7A6n5rieLhajUxQ7sXkjdlskRV0ktuJPvDox4HeOgqmOLi18RQP4y1jbhWdrfxs/Ag6A dZJJUEyJzrJsd6OOIOvSCWl9YOUxiDmr9Mffnwwl+8WL8YqVokRBmG3oM2OAF8twDZ0VjX O5Amr5KnRcMYQiJ19pIbsQpGksfBEX/Cg4KXFAyeJOXUd555aptEbjKcGsvpewtV+FRRcg aRsA/aj5nuRzqpxiCe2wpLjVWKEY/LFSJHllO7YlwGkUOLM+yMpBxtQ7uWYsyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716871330; a=rsa-sha256; cv=none; b=tabZKG7Ggfns3PPpn9ANv5MflVmD2pYUyVDsshcSQvz4oo1ca9FJO5RJBAlu/6wqD4oB5/ 8FeUyW7j3NkAjqdS2bIrl/MTSXtPnbXsOuyE98G3ObNuDGhh146Wl4s7LmwFMxczX4c94v P/encJrlpTfq5aX197RLCA//kyt0kMIPsvx9DduwBxoBZzINdF3SZrjl48vimff4ou+iw0 rv1AbNId0NI4YXYuXPYJhQg+OYEk0e4oDovYA8hFy3PUiTcnd0r8cd2YKCaJ9KlByPn8dR 4d7i9+NFfm4xfdnPeRFGxr3TlFsdVAPz0Vf1S2J+DodjR4+DT5hzXGHzc/umRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716871330; 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=OUPapiRxCYezTbrSe+UI4HtGB5TSCzVsRgr1s3jss/M=; b=D9wvoNSg8PaopSb/ZL/mx//5G/CNK5ph5DnJCKujjaHNPJABpW61XA1Tv/BqcvoH/a5bAN 1jgFbRNBbC8saxh53qwD2TozppwhEy54Zqmq9vGdmWPEGBRKyztB/xBz7OA5q8bseeas65 K+hQcv9fQjIZBvLCgVddtHbxXWqGuG7T/oXvLTCxLkwPIV0zq67a4r9tK7imi2ZMgnCcCA GYBwvdMvZrW2udP/92DCSWHNeNeyyQX2puX7LKcm4w3eUhMnZFAJykbuFtKhNTGAL2uxOD zJ7ZrIS1LsTxqKdn9ZTOJkk+FWpWiBoS2lSh2gXm0NtrqOF7/s3ZL2IQ+552tQ== 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 4VpKcL3vM2z1DRD; Tue, 28 May 2024 04:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S4gAgU049877; Tue, 28 May 2024 04:42:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S4gAFb049874; Tue, 28 May 2024 04:42:10 GMT (envelope-from git) Date: Tue, 28 May 2024 04:42:10 GMT Message-Id: <202405280442.44S4gAFb049874@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: f183abd1286a - stable/13 - compat_freebsd4: Add const qualifier to the local variable s inside function freebsd4_uname() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: f183abd1286a961ee1bdd3faae4048df40c37906 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f183abd1286a961ee1bdd3faae4048df40c37906 commit f183abd1286a961ee1bdd3faae4048df40c37906 Author: Zhenlei Huang AuthorDate: 2024-05-28 04:21:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-28 04:37:42 +0000 compat_freebsd4: Add const qualifier to the local variable s inside function freebsd4_uname() This local variable s is for iterating characters of global variable `version`. The content of `version` is not going to be altered by function freebsd4_uname(). MFC after: 1 week (cherry picked from commit 92f2a4c820fea9efcb6ee6a7029495c8152958c1) (cherry picked from commit 5fd1902b0c768fa43d3d7eebf7efd0957d5e144f) --- sys/kern/kern_xxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index ae88fc90eb7c..b51a0edaac99 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -325,7 +325,8 @@ freebsd4_uname(struct thread *td, struct freebsd4_uname_args *uap) { int name[2], error; size_t len; - char *s, *us; + const char *s; + char *us; name[0] = CTL_KERN; name[1] = KERN_OSTYPE; From nobody Tue May 28 04:42:11 2024 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 4VpKcM651Tz5LZGQ; Tue, 28 May 2024 04:42: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 4VpKcM5M5qz4chJ; Tue, 28 May 2024 04:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716871331; 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=YFNjRyM6jNR5/Z4Sb/nGMMvm1mESTtEwoHJo1KqzHMw=; b=lUP4EkiEto/SGxz/48uCoHBHdjIN/sw/kLSFecU9uHcNfc+BZJ+t2hzUfnDpa2RXNCZi/Z Ii2MCZFEwTNTZ84QKM8F51VUjuxsZywb9Pw1fUquQ3MR8ikDDO+03jCDVvziV5CToGMq67 zJicVRj+yn9JUPUEfHtV4BJ+ANUmvzyqr+EYZ/XA7CQnZeKTOQN9vCtrJRYYYJoTdgEQLV WOZsWUSoo72uft5Islj4NgPzBE7R+nLBWabn96nol6y56av0TbIR/f7RNzfgjCjMa6Ajb1 Zf5etW2K77GMw6z2mB2+uyh8Xns/ZLHs5JNHJkNHMfZN3tpMKYvV6boQu46p6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716871331; a=rsa-sha256; cv=none; b=TlOEsLnP+AAL0CQw5Kyczcr1MKq96Sg+ypLTQvKAVR2peqToxwcqCZ8+g7OG1DPIObbzCE uyg6/WmYsOQTGC1K6lF/97L5yGXL5xCjjdcobrZtzHuvdPllICxc2Zt6IeuoAAyElv71GU 3jMMVB5LJ8JKRc5K3QWoNaU/u4ixHfDH0ia//fChTvr6T6/6sN4CKcNwP3NsgJkFrQR8xn XEIasmVJDjJE5Xgem00ZbefLji0tIPZWzUNGr4KtS3onAFeDo2HC5dDK94Do3niBoSh2IX bn3V9tv6pT0G/J8KV0dcfA+v75qwN4thHtY1oNT9oH5FHthiiaEf+dCGbES5kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716871331; 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=YFNjRyM6jNR5/Z4Sb/nGMMvm1mESTtEwoHJo1KqzHMw=; b=rijFeta3DreOqIFyx85gk6HjLMJc46cgoNT5X5T5Pxu8cnljses3ePEL8DjugnjplrBs0B xTtK9pMjkOGBtV0a/WHAZ+7HfDHF1m3QyXKuQlHUV9JhZu2SJOjaH67it689f3Y96BgRFJ /u+FMOxP80vfoQjr+xPLgmhUfBvJLwV6U6SpCIoBfSzf8wyECSzoraKs8/yky2VnYKIDl9 K5gOAL3PFXZKFOx11l5NvvLXaPnzvTuI+c5A2Dv4qTA0eBbNiAH7nBi/JyMlER+1cPQAgx aCp4BimkWRkt712Zgdobweq7bbdoA98dNC4hw5dYK7N/FEOBHGp40/26XHjK+g== 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 4VpKcM4yccz1Crt; Tue, 28 May 2024 04:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S4gBZc049939; Tue, 28 May 2024 04:42:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S4gBMo049936; Tue, 28 May 2024 04:42:11 GMT (envelope-from git) Date: Tue, 28 May 2024 04:42:11 GMT Message-Id: <202405280442.44S4gBMo049936@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: a29cc9eca779 - stable/13 - linux(4): Add const qualifier to the value parameter of function handle_string() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: a29cc9eca779394c2f285de5a6ddf648682bffa2 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a29cc9eca779394c2f285de5a6ddf648682bffa2 commit a29cc9eca779394c2f285de5a6ddf648682bffa2 Author: Zhenlei Huang AuthorDate: 2024-05-28 04:21:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-28 04:41:45 +0000 linux(4): Add const qualifier to the value parameter of function handle_string() The content that `value` point to is not going to be altered by function handle_string(). MFC after: 1 week (cherry picked from commit 68c890b4433d3655c7df91cc43f89f4d6a8b35e4) (cherry picked from commit 1b3f88bc809526cc7cd22c88b4fdaadf1a2e5e75) --- sys/compat/linux/linux_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 6753941505b8..891ef6a7e6c5 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -75,7 +75,7 @@ LIN_SDT_PROBE_DEFINE1(sysctl, linux_sysctl, unsupported_sysctl, "char *"); #ifdef LINUX_LEGACY_SYSCALLS static int -handle_string(struct l___sysctl_args *la, char *value) +handle_string(struct l___sysctl_args *la, const char *value) { int error; From nobody Tue May 28 05:27:14 2024 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 4VpLcL4X04z5LfJK; Tue, 28 May 2024 05:27: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 4VpLcL3yLCz4hr9; Tue, 28 May 2024 05:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874034; 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=X97aczaJlO8WZwvqV44/5qRoBUVOCvG6hkSGHa981yA=; b=qDO7HgW3HZ5jo/nOSLeE73tOFBj7wpO34FVMPeuHNc4RFvHzwim7iYGAYYuBj6JZeaMArU gAkeFwtaVqKxHbnCWeiS4a9yBBweGa5bvCDxmnwYKVKqDW7kd7Qit3AHRvmmzLyvKN60IG 7eLRRz3PJTx82ZO+5IUGcgXHJaWMv3t7JoXMxC+nI0u0TPLHaFiCsXcWr1/ETgicDj29B2 1FBL4SrJgUDvEbic7LGfTAkzLaclij05iIXnzCZZrh2KjrDQkdAy48yFujocUKEv1fMeO7 RX5gw8oQWWKehz1s97M0cRXbjVXSaSL6/NOsdLozBUoZ4qmlI1GW9bAIXnDoyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874034; a=rsa-sha256; cv=none; b=cusFPVrJKbem2t+KPrAgbTNCJukCyDUm1TFoeWBDg1iqWIhDoNjvoqWMvQ0F5pBSTTtLhV 94POANMF0fVySIQ0igFE7gBTgaUEy7brsLDyMOQBn40Pg+HEq+fkuSz0yxbtZYHAxk49Ot gkdtqQzk2Xs2HdISkdg+koyEu/+p3vraiKtoWvnieF3g5JA4i0K1TJ6IgEQyR3fpCW7mMz a9Sald1WJIsyfCa7XZ+0+kavZp8IbtrXdc9P/fe+T3Jg6PQE+F0VKepJboIWWOqZDFSxlN LBtSJAb1dkeoW2GVOLSohdl3RVgKIANFdu5LGt885094dH8qY7tUbKWU3Nrczg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874034; 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=X97aczaJlO8WZwvqV44/5qRoBUVOCvG6hkSGHa981yA=; b=MzO1FQtpXQ14I5Z/n/5/kuDs6PhspKTjAHfTiAsZiJV2M0w2AdWupvBA2YHISBam38z6nU 2sjPVn8TrRBl5OS0bi9bw6VnydgrJzd6QMK9kPhOLzxQ4cwYmsh9DD0f26WbGZp8fn74nA LI6yEGWTh6CN+4/pM0L9hnq7qTZmsdgzLEZkgyACGxWVRh+vWoJgJvFyMFTjgzB7irk9FE bcYHIV1Wq5TzPGszW5vWxOE6rrHpdiOdqJh4YvpijxSulnX/7KV1X/VjapNVc63LGAmnX1 J9Nfi9ErMYJKDLuDK11SRnrdKlLUMuNtGrSPxbb5fALutZWlu9lLlKsuWAxIMw== 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 4VpLcL3R6Zz1FL5; Tue, 28 May 2024 05:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S5REHl018507; Tue, 28 May 2024 05:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5REns018504; Tue, 28 May 2024 05:27:14 GMT (envelope-from git) Date: Tue, 28 May 2024 05:27:14 GMT Message-Id: <202405280527.44S5REns018504@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: f1e3279983d6 - stable/14 - Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: f1e3279983d6db1001af5fc9fb3a9821a1c353ef Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f1e3279983d6db1001af5fc9fb3a9821a1c353ef commit f1e3279983d6db1001af5fc9fb3a9821a1c353ef Author: Dimitry Andric AuthorDate: 2024-05-24 15:51:19 +0000 Commit: Dimitry Andric CommitDate: 2024-05-28 05:25:48 +0000 Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67. PR: 276104 MFC after: 3 days (cherry picked from commit 3a0793336edfc21cb6d4c8c5c5d7f1665f3e6c5a) --- .../clang/lib/CodeGen/CodeGenModule.cpp | 14 +++++ .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 3 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 7 ++- .../clang/lib/Format/WhitespaceManager.cpp | 2 +- .../clang/lib/Interpreter/IncrementalParser.cpp | 24 ++++++-- .../clang/lib/Interpreter/IncrementalParser.h | 5 ++ .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 25 +++++++-- contrib/llvm-project/libcxx/src/atomic.cpp | 16 +++++- contrib/llvm-project/libcxx/src/chrono.cpp | 4 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 5 +- .../llvm/include/llvm/CodeGen/MachineFrameInfo.h | 7 +++ .../llvm/lib/Analysis/InstructionSimplify.cpp | 4 ++ .../lib/CodeGen/InterleavedLoadCombinePass.cpp | 3 + .../CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 3 +- .../Target/AArch64/AArch64Arm64ECCallLowering.cpp | 16 ++++-- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 3 +- .../AArch64/GISel/AArch64GlobalISelUtils.cpp | 6 ++ .../Target/AArch64/GISel/AArch64LegalizerInfo.cpp | 1 + .../AArch64/GISel/AArch64RegisterBankInfo.cpp | 5 +- .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 2 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 11 ++++ .../llvm/lib/Target/AMDGPU/SOPInstructions.td | 2 +- .../llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 57 ++++++------------- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp | 8 +-- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.h | 1 - .../lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp | 2 - .../RISCV/MCTargetDesc/RISCVTargetStreamer.cpp | 5 ++ .../RISCV/MCTargetDesc/RISCVTargetStreamer.h | 5 ++ .../llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp | 32 +++++++++-- .../lib/Target/RISCV/RISCVExpandPseudoInsts.cpp | 5 +- .../llvm/lib/Target/RISCV/RISCVFeatures.td | 5 ++ .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 9 ++- .../llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp | 65 +++++++++++++--------- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 6 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 42 +++++++------- .../llvm/lib/Transforms/IPO/FunctionAttrs.cpp | 7 ++- .../llvm/lib/Transforms/IPO/GlobalOpt.cpp | 3 + .../Transforms/InstCombine/InstCombineSelect.cpp | 14 ++++- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 21 +------ lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 46 files changed, 316 insertions(+), 169 deletions(-) diff --git a/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp b/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp index 1280bcd36de9..eb13cd40eb8a 100644 --- a/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp +++ b/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp @@ -67,6 +67,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/RISCVISAInfo.h" #include "llvm/Support/TimeProfiler.h" #include "llvm/Support/xxhash.h" #include "llvm/TargetParser/Triple.h" @@ -1059,6 +1060,19 @@ void CodeGenModule::Release() { llvm::LLVMContext &Ctx = TheModule.getContext(); getModule().addModuleFlag(llvm::Module::Error, "target-abi", llvm::MDString::get(Ctx, ABIStr)); + + // Add the canonical ISA string as metadata so the backend can set the ELF + // attributes correctly. We use AppendUnique so LTO will keep all of the + // unique ISA strings that were linked together. + const std::vector &Features = + getTarget().getTargetOpts().Features; + auto ParseResult = llvm::RISCVISAInfo::parseFeatures( + Arch == llvm::Triple::riscv64 ? 64 : 32, Features); + if (!errorToBool(ParseResult.takeError())) + getModule().addModuleFlag( + llvm::Module::AppendUnique, "riscv-isa", + llvm::MDNode::get( + Ctx, llvm::MDString::get(Ctx, (*ParseResult)->toString()))); } if (CodeGenOpts.SanitizeCfiCrossDso) { diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp index fd6aa4d7e684..00b6c520fcdd 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp @@ -371,7 +371,8 @@ std::string OpenBSD::getCompilerRT(const ArgList &Args, StringRef Component, if (Component == "builtins") { SmallString<128> Path(getDriver().SysRoot); llvm::sys::path::append(Path, "/usr/lib/libcompiler_rt.a"); - return std::string(Path); + if (getVFS().exists(Path)) + return std::string(Path); } SmallString<128> P(getDriver().ResourceDir); std::string CRTBasename = diff --git a/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp b/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp index a6eb18bb2b32..f70affb732a0 100644 --- a/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp +++ b/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp @@ -2510,6 +2510,7 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { assert(FormatTok->is(tok::l_paren) && "'(' expected."); auto *LeftParen = FormatTok; bool SeenEqual = false; + bool MightBeFoldExpr = false; const bool MightBeStmtExpr = Tokens->peekNextToken()->is(tok::l_brace); nextToken(); do { @@ -2521,7 +2522,7 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { parseChildBlock(); break; case tok::r_paren: - if (!MightBeStmtExpr && !Line->InMacroBody && + if (!MightBeStmtExpr && !MightBeFoldExpr && !Line->InMacroBody && Style.RemoveParentheses > FormatStyle::RPS_Leave) { const auto *Prev = LeftParen->Previous; const auto *Next = Tokens->peekNextToken(); @@ -2564,6 +2565,10 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { parseBracedList(); } break; + case tok::ellipsis: + MightBeFoldExpr = true; + nextToken(); + break; case tok::equal: SeenEqual = true; if (Style.isCSharp() && FormatTok->is(TT_FatArrow)) diff --git a/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp b/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp index df84f97a8e8a..7525e6ee650b 100644 --- a/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp +++ b/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp @@ -1466,7 +1466,7 @@ WhitespaceManager::CellDescriptions WhitespaceManager::getCells(unsigned Start, : Cell); // Go to the next non-comment and ensure there is a break in front const auto *NextNonComment = C.Tok->getNextNonComment(); - while (NextNonComment->is(tok::comma)) + while (NextNonComment && NextNonComment->is(tok::comma)) NextNonComment = NextNonComment->getNextNonComment(); auto j = i; while (Changes[j].Tok != NextNonComment && j < End) diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp index 370bcbfee8b0..f5f32b9f3924 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp @@ -209,6 +209,10 @@ IncrementalParser::IncrementalParser(Interpreter &Interp, if (Err) return; CI->ExecuteAction(*Act); + + if (getCodeGen()) + CachedInCodeGenModule = GenModule(); + std::unique_ptr IncrConsumer = std::make_unique(Interp, CI->takeASTConsumer()); CI->setASTConsumer(std::move(IncrConsumer)); @@ -224,11 +228,8 @@ IncrementalParser::IncrementalParser(Interpreter &Interp, return; // PTU.takeError(); } - if (CodeGenerator *CG = getCodeGen()) { - std::unique_ptr M(CG->ReleaseModule()); - CG->StartModule("incr_module_" + std::to_string(PTUs.size()), - M->getContext()); - PTU->TheModule = std::move(M); + if (getCodeGen()) { + PTU->TheModule = GenModule(); assert(PTU->TheModule && "Failed to create initial PTU"); } } @@ -364,6 +365,19 @@ IncrementalParser::Parse(llvm::StringRef input) { std::unique_ptr IncrementalParser::GenModule() { static unsigned ID = 0; if (CodeGenerator *CG = getCodeGen()) { + // Clang's CodeGen is designed to work with a single llvm::Module. In many + // cases for convenience various CodeGen parts have a reference to the + // llvm::Module (TheModule or Module) which does not change when a new + // module is pushed. However, the execution engine wants to take ownership + // of the module which does not map well to CodeGen's design. To work this + // around we created an empty module to make CodeGen happy. We should make + // sure it always stays empty. + assert((!CachedInCodeGenModule || + (CachedInCodeGenModule->empty() && + CachedInCodeGenModule->global_empty() && + CachedInCodeGenModule->alias_empty() && + CachedInCodeGenModule->ifunc_empty())) && + "CodeGen wrote to a readonly module"); std::unique_ptr M(CG->ReleaseModule()); CG->StartModule("incr_module_" + std::to_string(ID++), M->getContext()); return M; diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h index e13b74c7f659..f63bce50acd3 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h @@ -24,6 +24,7 @@ #include namespace llvm { class LLVMContext; +class Module; } // namespace llvm namespace clang { @@ -57,6 +58,10 @@ protected: /// of code. std::list PTUs; + /// When CodeGen is created the first llvm::Module gets cached in many places + /// and we must keep it alive. + std::unique_ptr CachedInCodeGenModule; + IncrementalParser(); public: diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp index b619f5d729e8..a12a64939c46 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp @@ -2404,9 +2404,6 @@ struct ConvertConstructorToDeductionGuideTransform { Args.addOuterRetainedLevel(); } - if (NestedPattern) - Args.addOuterRetainedLevels(NestedPattern->getTemplateDepth()); - FunctionProtoTypeLoc FPTL = CD->getTypeSourceInfo()->getTypeLoc() .getAsAdjusted(); assert(FPTL && "no prototype for constructor declaration"); @@ -2526,11 +2523,27 @@ private: // -- The types of the function parameters are those of the constructor. for (auto *OldParam : TL.getParams()) { - ParmVarDecl *NewParam = - transformFunctionTypeParam(OldParam, Args, MaterializedTypedefs); - if (NestedPattern && NewParam) + ParmVarDecl *NewParam = OldParam; + // Given + // template struct C { + // template struct D { + // template D(U, V); + // }; + // }; + // First, transform all the references to template parameters that are + // defined outside of the surrounding class template. That is T in the + // above example. + if (NestedPattern) { NewParam = transformFunctionTypeParam(NewParam, OuterInstantiationArgs, MaterializedTypedefs); + if (!NewParam) + return QualType(); + } + // Then, transform all the references to template parameters that are + // defined at the class template and the constructor. In this example, + // they're U and V, respectively. + NewParam = + transformFunctionTypeParam(NewParam, Args, MaterializedTypedefs); if (!NewParam) return QualType(); ParamTypes.push_back(NewParam->getType()); diff --git a/contrib/llvm-project/libcxx/src/atomic.cpp b/contrib/llvm-project/libcxx/src/atomic.cpp index 2f0389ae6974..6b1f03c21bbc 100644 --- a/contrib/llvm-project/libcxx/src/atomic.cpp +++ b/contrib/llvm-project/libcxx/src/atomic.cpp @@ -25,16 +25,28 @@ # if !defined(SYS_futex) && defined(SYS_futex_time64) # define SYS_futex SYS_futex_time64 # endif +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) #elif defined(__FreeBSD__) # include # include +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) + +#elif defined(__OpenBSD__) + +# include + +// OpenBSD has no indirect syscalls +# define _LIBCPP_FUTEX(...) futex(__VA_ARGS__) + #else // <- Add other operating systems here // Baseline needs no new headers +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) + #endif _LIBCPP_BEGIN_NAMESPACE_STD @@ -44,11 +56,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val) { static constexpr timespec __timeout = {2, 0}; - syscall(SYS_futex, __ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0); + _LIBCPP_FUTEX(__ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0); } static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const volatile* __ptr, bool __notify_one) { - syscall(SYS_futex, __ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0); + _LIBCPP_FUTEX(__ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0); } #elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK) diff --git a/contrib/llvm-project/libcxx/src/chrono.cpp b/contrib/llvm-project/libcxx/src/chrono.cpp index c5e827c0cb59..e7d6dfbc2292 100644 --- a/contrib/llvm-project/libcxx/src/chrono.cpp +++ b/contrib/llvm-project/libcxx/src/chrono.cpp @@ -31,7 +31,9 @@ # include // for gettimeofday and timeval #endif -#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) +// OpenBSD does not have a fully conformant suite of POSIX timers, but +// it does have clock_gettime and CLOCK_MONOTONIC which is all we need. +#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) # define _LIBCPP_HAS_CLOCK_GETTIME #endif diff --git a/contrib/llvm-project/lld/ELF/Relocations.cpp b/contrib/llvm-project/lld/ELF/Relocations.cpp index 619fbaf5dc54..92a1b9baaca3 100644 --- a/contrib/llvm-project/lld/ELF/Relocations.cpp +++ b/contrib/llvm-project/lld/ELF/Relocations.cpp @@ -1480,7 +1480,10 @@ template void RelocationScanner::scanOne(RelTy *&i) { // Process TLS relocations, including TLS optimizations. Note that // R_TPREL and R_TPREL_NEG relocations are resolved in processAux. - if (sym.isTls()) { + // + // Some RISCV TLSDESC relocations reference a local NOTYPE symbol, + // but we need to process them in handleTlsRelocation. + if (sym.isTls() || oneof(expr)) { if (unsigned processed = handleTlsRelocation(type, sym, *sec, offset, addend, expr)) { i += processed - 1; diff --git a/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h b/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h index 7d11d63d4066..c35faac09c4d 100644 --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h @@ -697,6 +697,13 @@ public: return Objects[ObjectIdx+NumFixedObjects].isAliased; } + /// Set "maybe pointed to by an LLVM IR value" for an object. + void setIsAliasedObjectIndex(int ObjectIdx, bool IsAliased) { + assert(unsigned(ObjectIdx+NumFixedObjects) < Objects.size() && + "Invalid Object Idx!"); + Objects[ObjectIdx+NumFixedObjects].isAliased = IsAliased; + } + /// Returns true if the specified index corresponds to an immutable object. bool isImmutableObjectIndex(int ObjectIdx) const { // Tail calling functions can clobber their function arguments. diff --git a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp index 72b6dfa181e8..8dcffe45c644 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp @@ -4322,6 +4322,10 @@ static Value *simplifyWithOpReplaced(Value *V, Value *Op, Value *RepOp, if (match(I, m_Intrinsic())) return nullptr; + // Don't simplify freeze. + if (isa(I)) + return nullptr; + // Replace Op with RepOp in instruction operands. SmallVector NewOps; bool AnyReplaced = false; diff --git a/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp b/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp index f2d5c3c867c2..bbb0b654dc67 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp @@ -877,6 +877,9 @@ public: if (LI->isAtomic()) return false; + if (!DL.typeSizeEqualsStoreSize(Result.VTy->getElementType())) + return false; + // Get the base polynomial computePolynomialFromPointer(*LI->getPointerOperand(), Offset, BasePtr, DL); diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 5ce1013f30fd..7406a8ac1611 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -10888,7 +10888,7 @@ static void tryToElideArgumentCopy( } // Perform the elision. Delete the old stack object and replace its only use - // in the variable info map. Mark the stack object as mutable. + // in the variable info map. Mark the stack object as mutable and aliased. LLVM_DEBUG({ dbgs() << "Eliding argument copy from " << Arg << " to " << *AI << '\n' << " Replacing frame index " << OldIndex << " with " << FixedIndex @@ -10896,6 +10896,7 @@ static void tryToElideArgumentCopy( }); MFI.RemoveStackObject(OldIndex); MFI.setIsImmutableObjectIndex(FixedIndex, false); + MFI.setIsAliasedObjectIndex(FixedIndex, true); AllocaIndex = FixedIndex; ArgCopyElisionFrameIndexMap.insert({OldIndex, FixedIndex}); for (SDValue ArgVal : ArgVals) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp index 55c5bbc66a3f..862aefe46193 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp @@ -181,13 +181,14 @@ void AArch64Arm64ECCallLowering::getThunkArgTypes( } for (unsigned E = FT->getNumParams(); I != E; ++I) { - Align ParamAlign = AttrList.getParamAlignment(I).valueOrOne(); #if 0 // FIXME: Need more information about argument size; see // https://reviews.llvm.org/D132926 uint64_t ArgSizeBytes = AttrList.getParamArm64ECArgSizeBytes(I); + Align ParamAlign = AttrList.getParamAlignment(I).valueOrOne(); #else uint64_t ArgSizeBytes = 0; + Align ParamAlign = Align(); #endif Type *Arm64Ty, *X64Ty; canonicalizeThunkType(FT->getParamType(I), ParamAlign, @@ -297,7 +298,7 @@ void AArch64Arm64ECCallLowering::canonicalizeThunkType( uint64_t TotalSizeBytes = ElementCnt * ElementSizePerBytes; if (ElementTy->isFloatTy() || ElementTy->isDoubleTy()) { Out << (ElementTy->isFloatTy() ? "F" : "D") << TotalSizeBytes; - if (Alignment.value() >= 8 && !T->isPointerTy()) + if (Alignment.value() >= 16 && !Ret) Out << "a" << Alignment.value(); Arm64Ty = T; if (TotalSizeBytes <= 8) { @@ -328,7 +329,7 @@ void AArch64Arm64ECCallLowering::canonicalizeThunkType( Out << "m"; if (TypeSize != 4) Out << TypeSize; - if (Alignment.value() >= 8 && !T->isPointerTy()) + if (Alignment.value() >= 16 && !Ret) Out << "a" << Alignment.value(); // FIXME: Try to canonicalize Arm64Ty more thoroughly? Arm64Ty = T; @@ -513,7 +514,14 @@ Function *AArch64Arm64ECCallLowering::buildEntryThunk(Function *F) { // Call the function passed to the thunk. Value *Callee = Thunk->getArg(0); Callee = IRB.CreateBitCast(Callee, PtrTy); - Value *Call = IRB.CreateCall(Arm64Ty, Callee, Args); + CallInst *Call = IRB.CreateCall(Arm64Ty, Callee, Args); + + auto SRetAttr = F->getAttributes().getParamAttr(0, Attribute::StructRet); + auto InRegAttr = F->getAttributes().getParamAttr(0, Attribute::InReg); + if (SRetAttr.isValid() && !InRegAttr.isValid()) { + Thunk->addParamAttr(1, SRetAttr); + Call->addParamAttr(0, SRetAttr); + } Value *RetVal = Call; if (TransformDirectToSRet) { diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 95d8ab95b2c0..bcfd0253e73c 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -22122,7 +22122,8 @@ SDValue performCONDCombine(SDNode *N, SDNode *SubsNode = N->getOperand(CmpIndex).getNode(); unsigned CondOpcode = SubsNode->getOpcode(); - if (CondOpcode != AArch64ISD::SUBS || SubsNode->hasAnyUseOfValue(0)) + if (CondOpcode != AArch64ISD::SUBS || SubsNode->hasAnyUseOfValue(0) || + !SubsNode->hasOneUse()) return SDValue(); // There is a SUBS feeding this condition. Is it fed by a mask we can diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp index 92db89cc0915..80fe4bcb8b58 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp @@ -147,6 +147,12 @@ void AArch64GISelUtils::changeFCMPPredToAArch64CC( case CmpInst::FCMP_UNE: CondCode = AArch64CC::NE; break; + case CmpInst::FCMP_TRUE: + CondCode = AArch64CC::AL; + break; + case CmpInst::FCMP_FALSE: + CondCode = AArch64CC::NV; + break; } } diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp index 4b9d549e7911..de3c89e925a2 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp @@ -877,6 +877,7 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST) getActionDefinitionsBuilder(G_INSERT_VECTOR_ELT) .legalIf(typeInSet(0, {v16s8, v8s8, v8s16, v4s16, v4s32, v2s32, v2s64})) + .moreElementsToNextPow2(0) .widenVectorEltsToVectorMinSize(0, 64); getActionDefinitionsBuilder(G_BUILD_VECTOR) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp index b8e5e7bbdaba..06cdd7e4ef48 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp @@ -623,8 +623,11 @@ bool AArch64RegisterBankInfo::isLoadFromFPType(const MachineInstr &MI) const { EltTy = GV->getValueType(); // Look at the first element of the struct to determine the type we are // loading - while (StructType *StructEltTy = dyn_cast(EltTy)) + while (StructType *StructEltTy = dyn_cast(EltTy)) { + if (StructEltTy->getNumElements() == 0) + break; EltTy = StructEltTy->getTypeAtIndex(0U); + } // Look at the first element of the array to determine its type if (isa(EltTy)) EltTy = EltTy->getArrayElementType(); diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp index 6ecb1c8bf6e1..7a3198612f86 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp @@ -1832,7 +1832,7 @@ bool SIInsertWaitcnts::generateWaitcntInstBefore(MachineInstr &MI, // not, we need to ensure the subtarget is capable of backing off barrier // instructions in case there are any outstanding memory operations that may // cause an exception. Otherwise, insert an explicit S_WAITCNT 0 here. - if (MI.getOpcode() == AMDGPU::S_BARRIER && + if (TII->isBarrierStart(MI.getOpcode()) && !ST->hasAutoWaitcntBeforeBarrier() && !ST->supportsBackOffBarrier()) { Wait = Wait.combined( AMDGPU::Waitcnt::allZero(ST->hasExtendedWaitCounts(), ST->hasVscnt())); diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h index 1c9dacc09f81..626d903c0c69 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h @@ -908,6 +908,17 @@ public: return MI.getDesc().TSFlags & SIInstrFlags::IsNeverUniform; } + // Check to see if opcode is for a barrier start. Pre gfx12 this is just the + // S_BARRIER, but after support for S_BARRIER_SIGNAL* / S_BARRIER_WAIT we want + // to check for the barrier start (S_BARRIER_SIGNAL*) + bool isBarrierStart(unsigned Opcode) const { + return Opcode == AMDGPU::S_BARRIER || + Opcode == AMDGPU::S_BARRIER_SIGNAL_M0 || + Opcode == AMDGPU::S_BARRIER_SIGNAL_ISFIRST_M0 || + Opcode == AMDGPU::S_BARRIER_SIGNAL_IMM || + Opcode == AMDGPU::S_BARRIER_SIGNAL_ISFIRST_IMM; + } + static bool doesNotReadTiedSource(const MachineInstr &MI) { return MI.getDesc().TSFlags & SIInstrFlags::TiedSourceNotRead; } diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td index ae5ef0541929..5762efde73f0 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td @@ -1786,7 +1786,7 @@ def : GCNPat< let SubtargetPredicate = isNotGFX12Plus in def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 0))>; let SubtargetPredicate = isGFX12Plus in - def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 1))>; + def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 2))>; // The first 10 bits of the mode register are the core FP mode on all // subtargets. diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index d9465e86d896..ebd876d50c44 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -23,6 +23,7 @@ #include "llvm/Analysis/ScalarEvolutionAliasAnalysis.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Instructions.h" +#include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/Module.h" #include "llvm/IR/ValueSymbolTable.h" #include "llvm/Pass.h" @@ -116,9 +117,20 @@ private: // sure that they can be replaced. static bool hasReplaceableUsers(GlobalVariable &GV) { for (User *CurrentUser : GV.users()) { - // Instruction users are always valid. - if (isa(CurrentUser)) + if (auto *I = dyn_cast(CurrentUser)) { + // Do not merge globals in exception pads. + if (I->isEHPad()) + return false; + + if (auto *II = dyn_cast(I)) { + // Some intrinsics require a plain global. + if (II->getIntrinsicID() == Intrinsic::eh_typeid_for) + return false; + } + + // Other instruction users are always valid. continue; + } // We cannot replace GlobalValue users because they are not just nodes // in IR. To replace a user like this we would need to create a new @@ -302,14 +314,6 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, Users.push_back(CurrentUser); for (User *CurrentUser : Users) { - Instruction *UserInstruction = dyn_cast(CurrentUser); - Constant *UserConstant = dyn_cast(CurrentUser); - - // At this point we expect that the user is either an instruction or a - // constant. - assert((UserConstant || UserInstruction) && - "Expected the user to be an instruction or a constant."); - // The user was not found so it must have been replaced earlier. if (!userHasOperand(CurrentUser, GlobalToReplace)) continue; @@ -318,38 +322,13 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, if (isa(CurrentUser)) continue; - if (!UserInstruction) { - // User is a constant type. - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - UserConstant->handleOperandChange(GlobalToReplace, ConstGEP); - continue; - } - - if (PHINode *UserPHI = dyn_cast(UserInstruction)) { - // GEP instructions cannot be added before PHI nodes. - // With getInBoundsGetElementPtr we create the GEP and then replace it - // inline into the PHI. - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - UserPHI->replaceUsesOfWith(GlobalToReplace, ConstGEP); - continue; - } - // The user is a valid instruction that is not a PHINode. - GetElementPtrInst *GEPInst = - GetElementPtrInst::Create(PooledStructType, GPool, Indices); - GEPInst->insertBefore(UserInstruction); - - LLVM_DEBUG(dbgs() << "Inserting GEP before:\n"); - LLVM_DEBUG(UserInstruction->dump()); - + Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( + PooledStructType, GPool, Indices); LLVM_DEBUG(dbgs() << "Replacing this global:\n"); LLVM_DEBUG(GlobalToReplace->dump()); LLVM_DEBUG(dbgs() << "with this:\n"); - LLVM_DEBUG(GEPInst->dump()); - - // After the GEP is inserted the GV can be replaced. - CurrentUser->replaceUsesOfWith(GlobalToReplace, GEPInst); + LLVM_DEBUG(ConstGEP->dump()); + GlobalToReplace->replaceAllUsesWith(ConstGEP); } } diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp index 961b8f0afe22..cdf7c048a4bf 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp @@ -31,12 +31,13 @@ using namespace llvm; // This part is for ELF object output. RISCVTargetELFStreamer::RISCVTargetELFStreamer(MCStreamer &S, const MCSubtargetInfo &STI) - : RISCVTargetStreamer(S), CurrentVendor("riscv"), STI(STI) { + : RISCVTargetStreamer(S), CurrentVendor("riscv") { MCAssembler &MCA = getStreamer().getAssembler(); const FeatureBitset &Features = STI.getFeatureBits(); auto &MAB = static_cast(MCA.getBackend()); setTargetABI(RISCVABI::computeTargetABI(STI.getTargetTriple(), Features, MAB.getTargetOptions().getABIName())); + setFlagsFromFeatures(STI); // `j label` in `.option norelax; j label; .option relax; ...; label:` needs a // relocation to ensure the jump target is correct after linking. This is due // to a limitation that shouldForceRelocation has to make the decision upfront @@ -87,14 +88,13 @@ void RISCVTargetELFStreamer::finishAttributeSection() { void RISCVTargetELFStreamer::finish() { RISCVTargetStreamer::finish(); MCAssembler &MCA = getStreamer().getAssembler(); - const FeatureBitset &Features = STI.getFeatureBits(); RISCVABI::ABI ABI = getTargetABI(); unsigned EFlags = MCA.getELFHeaderEFlags(); - if (Features[RISCV::FeatureStdExtC]) + if (hasRVC()) EFlags |= ELF::EF_RISCV_RVC; - if (Features[RISCV::FeatureStdExtZtso]) + if (hasTSO()) EFlags |= ELF::EF_RISCV_TSO; switch (ABI) { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h index a6f54bf67b5d..e8f29cd8449b 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h @@ -46,7 +46,6 @@ private: StringRef CurrentVendor; MCSection *AttributeSection = nullptr; - const MCSubtargetInfo &STI; void emitAttribute(unsigned Attribute, unsigned Value) override; void emitTextAttribute(unsigned Attribute, StringRef String) override; diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp index 254a9a4bc0ef..b8e0f3a867f4 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp @@ -207,8 +207,6 @@ void RISCVMCExpr::fixELFSymbolsInTLSFixups(MCAssembler &Asm) const { case VK_RISCV_TLS_GOT_HI: case VK_RISCV_TLS_GD_HI: case VK_RISCV_TLSDESC_HI: - case VK_RISCV_TLSDESC_ADD_LO: - case VK_RISCV_TLSDESC_LOAD_LO: break; } diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp index ac4861bf113e..eee78a8c161f 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp @@ -48,6 +48,11 @@ void RISCVTargetStreamer::setTargetABI(RISCVABI::ABI ABI) { TargetABI = ABI; } +void RISCVTargetStreamer::setFlagsFromFeatures(const MCSubtargetInfo &STI) { + HasRVC = STI.hasFeature(RISCV::FeatureStdExtC); + HasTSO = STI.hasFeature(RISCV::FeatureStdExtZtso); +} + void RISCVTargetStreamer::emitTargetAttributes(const MCSubtargetInfo &STI, bool EmitStackAlign) { if (EmitStackAlign) { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h index 070e72fb157a..cb8bc21cb635 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h @@ -33,6 +33,8 @@ struct RISCVOptionArchArg { class RISCVTargetStreamer : public MCTargetStreamer { RISCVABI::ABI TargetABI = RISCVABI::ABI_Unknown; + bool HasRVC = false; + bool HasTSO = false; public: RISCVTargetStreamer(MCStreamer &S); @@ -58,6 +60,9 @@ public: void emitTargetAttributes(const MCSubtargetInfo &STI, bool EmitStackAlign); void setTargetABI(RISCVABI::ABI ABI); RISCVABI::ABI getTargetABI() const { return TargetABI; } + void setFlagsFromFeatures(const MCSubtargetInfo &STI); + bool hasRVC() const { return HasRVC; } + bool hasTSO() const { return HasTSO; } }; // This part is for ascii assembly output diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp index b2e9cd87373b..87bd9b4048cd 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp @@ -100,7 +100,7 @@ public: bool emitDirectiveOptionArch(); private: - void emitAttributes(); + void emitAttributes(const MCSubtargetInfo &SubtargetInfo); void emitNTLHint(const MachineInstr *MI); @@ -385,8 +385,32 @@ void RISCVAsmPrinter::emitStartOfAsmFile(Module &M) { if (const MDString *ModuleTargetABI = dyn_cast_or_null(M.getModuleFlag("target-abi"))) RTS.setTargetABI(RISCVABI::getTargetABI(ModuleTargetABI->getString())); + + MCSubtargetInfo SubtargetInfo = *TM.getMCSubtargetInfo(); + + // Use module flag to update feature bits. + if (auto *MD = dyn_cast_or_null(M.getModuleFlag("riscv-isa"))) { + for (auto &ISA : MD->operands()) { + if (auto *ISAString = dyn_cast_or_null(ISA)) { + auto ParseResult = llvm::RISCVISAInfo::parseArchString( + ISAString->getString(), /*EnableExperimentalExtension=*/true, + /*ExperimentalExtensionVersionCheck=*/true); + if (!errorToBool(ParseResult.takeError())) { + auto &ISAInfo = *ParseResult; + for (const auto &Feature : RISCVFeatureKV) { + if (ISAInfo->hasExtension(Feature.Key) && + !SubtargetInfo.hasFeature(Feature.Value)) + SubtargetInfo.ToggleFeature(Feature.Key); + } + } + } + } + + RTS.setFlagsFromFeatures(SubtargetInfo); + } + if (TM.getTargetTriple().isOSBinFormatELF()) - emitAttributes(); + emitAttributes(SubtargetInfo); } void RISCVAsmPrinter::emitEndOfAsmFile(Module &M) { @@ -398,13 +422,13 @@ void RISCVAsmPrinter::emitEndOfAsmFile(Module &M) { EmitHwasanMemaccessSymbols(M); } -void RISCVAsmPrinter::emitAttributes() { +void RISCVAsmPrinter::emitAttributes(const MCSubtargetInfo &SubtargetInfo) { RISCVTargetStreamer &RTS = static_cast(*OutStreamer->getTargetStreamer()); // Use MCSubtargetInfo from TargetMachine. Individual functions may have // attributes that differ from other functions in the module and we have no // way to know which function is correct. - RTS.emitTargetAttributes(*TM.getMCSubtargetInfo(), /*EmitStackAlign*/ true); + RTS.emitTargetAttributes(SubtargetInfo, /*EmitStackAlign*/ true); } void RISCVAsmPrinter::emitFunctionEntryLabel() { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp index 0a314fdd41cb..89207640ee54 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp @@ -317,8 +317,9 @@ bool RISCVExpandPseudo::expandRV32ZdinxStore(MachineBasicBlock &MBB, .addReg(MBBI->getOperand(1).getReg()) .add(MBBI->getOperand(2)); if (MBBI->getOperand(2).isGlobal() || MBBI->getOperand(2).isCPI()) { - // FIXME: Zdinx RV32 can not work on unaligned memory. - assert(!STI->hasFastUnalignedAccess()); + // FIXME: Zdinx RV32 can not work on unaligned scalar memory. + assert(!STI->hasFastUnalignedAccess() && + !STI->enableUnalignedScalarMem()); assert(MBBI->getOperand(2).getOffset() % 8 == 0); MBBI->getOperand(2).setOffset(MBBI->getOperand(2).getOffset() + 4); diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td index 26451c80f57b..1bb6b6a561f4 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td @@ -1025,6 +1025,11 @@ def FeatureFastUnalignedAccess "true", "Has reasonably performant unaligned " "loads and stores (both scalar and vector)">; +def FeatureUnalignedScalarMem + : SubtargetFeature<"unaligned-scalar-mem", "EnableUnalignedScalarMem", + "true", "Has reasonably performant unaligned scalar " + "loads and stores">; + def FeaturePostRAScheduler : SubtargetFeature<"use-postra-scheduler", "UsePostRAScheduler", "true", "Schedule again after register allocation">; diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp index d46093b9e260..3fe7ddfdd427 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp @@ -1883,7 +1883,8 @@ bool RISCVTargetLowering::shouldConvertConstantLoadToIntImm(const APInt &Imm, // replace. If we don't support unaligned scalar mem, prefer the constant // pool. // TODO: Can the caller pass down the alignment? - if (!Subtarget.hasFastUnalignedAccess()) + if (!Subtarget.hasFastUnalignedAccess() && + !Subtarget.enableUnalignedScalarMem()) return true; // Prefer to keep the load if it would require many instructions. @@ -19772,8 +19773,10 @@ bool RISCVTargetLowering::allowsMisalignedMemoryAccesses( unsigned *Fast) const { if (!VT.isVector()) { if (Fast) - *Fast = Subtarget.hasFastUnalignedAccess(); - return Subtarget.hasFastUnalignedAccess(); + *Fast = Subtarget.hasFastUnalignedAccess() || + Subtarget.enableUnalignedScalarMem(); + return Subtarget.hasFastUnalignedAccess() || + Subtarget.enableUnalignedScalarMem(); } // All vector implementations must support element alignment diff --git a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp index bf6547cc87ec..2f2dc6b80792 100644 --- a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp @@ -70,49 +70,62 @@ void SystemZInstrInfo::splitMove(MachineBasicBlock::iterator MI, MachineBasicBlock *MBB = MI->getParent(); MachineFunction &MF = *MBB->getParent(); - // Get two load or store instructions. Use the original instruction for one - // of them (arbitrarily the second here) and create a clone for the other. - MachineInstr *EarlierMI = MF.CloneMachineInstr(&*MI); - MBB->insert(MI, EarlierMI); + // Get two load or store instructions. Use the original instruction for + // one of them and create a clone for the other. + MachineInstr *HighPartMI = MF.CloneMachineInstr(&*MI); + MachineInstr *LowPartMI = &*MI; + MBB->insert(LowPartMI, HighPartMI); // Set up the two 64-bit registers and remember super reg and its flags. - MachineOperand &HighRegOp = EarlierMI->getOperand(0); - MachineOperand &LowRegOp = MI->getOperand(0); + MachineOperand &HighRegOp = HighPartMI->getOperand(0); + MachineOperand &LowRegOp = LowPartMI->getOperand(0); Register Reg128 = LowRegOp.getReg(); unsigned Reg128Killed = getKillRegState(LowRegOp.isKill()); unsigned Reg128Undef = getUndefRegState(LowRegOp.isUndef()); HighRegOp.setReg(RI.getSubReg(HighRegOp.getReg(), SystemZ::subreg_h64)); LowRegOp.setReg(RI.getSubReg(LowRegOp.getReg(), SystemZ::subreg_l64)); - if (MI->mayStore()) { - // Add implicit uses of the super register in case one of the subregs is - // undefined. We could track liveness and skip storing an undefined - // subreg, but this is hopefully rare (discovered with llvm-stress). - // If Reg128 was killed, set kill flag on MI. - unsigned Reg128UndefImpl = (Reg128Undef | RegState::Implicit); - MachineInstrBuilder(MF, EarlierMI).addReg(Reg128, Reg128UndefImpl); - MachineInstrBuilder(MF, MI).addReg(Reg128, (Reg128UndefImpl | Reg128Killed)); - } - // The address in the first (high) instruction is already correct. // Adjust the offset in the second (low) instruction. - MachineOperand &HighOffsetOp = EarlierMI->getOperand(2); - MachineOperand &LowOffsetOp = MI->getOperand(2); + MachineOperand &HighOffsetOp = HighPartMI->getOperand(2); + MachineOperand &LowOffsetOp = LowPartMI->getOperand(2); LowOffsetOp.setImm(LowOffsetOp.getImm() + 8); - // Clear the kill flags on the registers in the first instruction. - if (EarlierMI->getOperand(0).isReg() && EarlierMI->getOperand(0).isUse()) - EarlierMI->getOperand(0).setIsKill(false); - EarlierMI->getOperand(1).setIsKill(false); - EarlierMI->getOperand(3).setIsKill(false); - // Set the opcodes. unsigned HighOpcode = getOpcodeForOffset(NewOpcode, HighOffsetOp.getImm()); unsigned LowOpcode = getOpcodeForOffset(NewOpcode, LowOffsetOp.getImm()); assert(HighOpcode && LowOpcode && "Both offsets should be in range"); + HighPartMI->setDesc(get(HighOpcode)); + LowPartMI->setDesc(get(LowOpcode)); + + MachineInstr *FirstMI = HighPartMI; + if (MI->mayStore()) { + FirstMI->getOperand(0).setIsKill(false); + // Add implicit uses of the super register in case one of the subregs is + // undefined. We could track liveness and skip storing an undefined + // subreg, but this is hopefully rare (discovered with llvm-stress). + // If Reg128 was killed, set kill flag on MI. + unsigned Reg128UndefImpl = (Reg128Undef | RegState::Implicit); + MachineInstrBuilder(MF, HighPartMI).addReg(Reg128, Reg128UndefImpl); + MachineInstrBuilder(MF, LowPartMI).addReg(Reg128, (Reg128UndefImpl | Reg128Killed)); + } else { + // If HighPartMI clobbers any of the address registers, it needs to come + // after LowPartMI. + auto overlapsAddressReg = [&](Register Reg) -> bool { + return RI.regsOverlap(Reg, MI->getOperand(1).getReg()) || + RI.regsOverlap(Reg, MI->getOperand(3).getReg()); + }; + if (overlapsAddressReg(HighRegOp.getReg())) { + assert(!overlapsAddressReg(LowRegOp.getReg()) && + "Both loads clobber address!"); + MBB->splice(HighPartMI, MBB, LowPartMI); + FirstMI = LowPartMI; + } + } - EarlierMI->setDesc(get(HighOpcode)); - MI->setDesc(get(LowOpcode)); *** 421 LINES SKIPPED *** From nobody Tue May 28 05:27:15 2024 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 4VpLcM5yzWz5LfPK; Tue, 28 May 2024 05:27: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 4VpLcM4YfYz4j51; Tue, 28 May 2024 05:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874035; 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=i3Ib0Qnf/uuCi60ofH0Dv1g603OB0sqj3/IB7mOdFJE=; b=FC8UUE2Bfdt6kCBoUttBCl1d94iNT4hQy1Cy2vF66fTMJjGIufbOykTrV9g9vfdeNAfT4A rmQkefujVYlHMoPR3+siV5WrJyexAJ/Uzp3K/0n2ttcf1SjZsRbO5x0RUh4T/RryOlT7+Q 6HnsUblyqLBAt3RC5c1NzY/51K7bQFZnCU4Tsw8cT0jCe39612uVAQ75CzpFsIeColHydt M4xnZYq7mP28Vw0/wBGmvOfA+5/Ny+EHIXeBteQr6JDSAO+oRM51UTTqN6YpF7mi+PaevU ziAnIFUqW/2Hezv/rQpdVLLbAgyq2M1N5BRf1Oay8q4vCCZn7RoDq2PF8MUT9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874035; a=rsa-sha256; cv=none; b=oMaatJkZkhOTmpX/iKlrOW46l5Yg5gMJu+g1zhutqxuNtYSWbwm30i50VjwtJKaMXQqVtu 6jrJXarlJ7NK+aZzVY03LHDWA5nzYhADrD6ci17vwPfQ+repxIy/fRDcULazysrapnoBjX LihVk2IKT6fYggpLby09U3Y5vdl5MaHbVc8h8BLk77Fpc3GJWlzLygQtvBCEkuqpeMOqUL NDuGmf09WufEVdRTQxTF3EX+4fOCVA91a7n19lLKKzLf9QoT9byk6aSVHAUQ9kCQU3vMV5 lW5IuUV4HspnFRpsg4QcsfJtL/n+TwYxzylaVtRlSCGnqrwRnUjDmbLtF8nyAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874035; 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=i3Ib0Qnf/uuCi60ofH0Dv1g603OB0sqj3/IB7mOdFJE=; b=freyjD/BXFhT2Aa58K++cZE1FPu3oG/2DJqVfzZW3fhxCkxFZNd5OXyMEaX27zJnJUZy8b 4ciCjNtI80QwaXAlZmI/sEcuYpFqhtKenPi0FU6J5rEVpTADJOilGaAfe27bSHP/4YQBFT 2zJC8tP75qbuCwWzc8Ahj4RxmZpSKDCsxmD/Lo0cRfIXgXyIW5AUYSRh9/Glz7LvFKw8RN eHU7C125t7ZY+HzT3dOQZuqjPHlTgmzjSkpKU0PTW2rW3HnA/eJIMEq7AYl8PE0tH3Cyv5 lQ1Z+ZsDX9X1f57MWiYrUShwG2CpJbcRc29UpiI+KKOy0Xg2TyL2Lg+vl2G2gw== 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 4VpLcM49ndz1FDd; Tue, 28 May 2024 05:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S5RFZh018565; Tue, 28 May 2024 05:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5RFCQ018562; Tue, 28 May 2024 05:27:15 GMT (envelope-from git) Date: Tue, 28 May 2024 05:27:15 GMT Message-Id: <202405280527.44S5RFCQ018562@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: ec38746722a1 - stable/14 - Merge commit d0be944aa511 from llvm-project (by Simon Pilgrim): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: ec38746722a15b4376bed274e96ff7b8c31804e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ec38746722a15b4376bed274e96ff7b8c31804e1 commit ec38746722a15b4376bed274e96ff7b8c31804e1 Author: Dimitry Andric AuthorDate: 2024-05-25 17:52:15 +0000 Commit: Dimitry Andric CommitDate: 2024-05-28 05:25:49 +0000 Merge commit d0be944aa511 from llvm-project (by Simon Pilgrim): [X86] Add slow div64 tuning flag to Nehalem target (#91129) This appears to have been missed because later cpus don't inherit from Nehalem tuning much. Noticed while cleaning up for #90985 Merge commit 8b400de79eff from llvm-project (by Simon Pilgrim): [X86] Enable TuningSlowDivide64 on Barcelona/Bobcat/Bulldozer/Ryzen Families (#91277) Despite most AMD cpus having a lower latency for i64 divisions that converge early, we are still better off testing for values representable as i32 and performing a i32 division if possible. All AMD cpus appear to have been missed when we added the "idivq-to-divl" attribute - this patch now matches Intel cpu behaviour (and the x86-64/v2/3/4 levels). Unfortunately the difference in code scheduling means I've had to stop using the update_llc_test_checks script and just use old-fashioned CHECK-DAG checks for divl/divq pairs. Fixes #90985 This fixes possibly worse runtime performance on AMD Zen hardware, when using -march=znver4 (or any other znver), as opposed to -march=x86-64-v4 or the baseline -march=x86-64. A similar fix is applied for Nehalem. PR: 278908 MFC after: 3 days (cherry picked from commit cadd2ca21765ebcb95b77ec94977b4e74e1edc1b) --- contrib/llvm-project/llvm/lib/Target/X86/X86.td | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86.td b/contrib/llvm-project/llvm/lib/Target/X86/X86.td index e89ddcc570c9..1aff5f9fad97 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86.td +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86.td @@ -867,6 +867,7 @@ def ProcessorFeatures { // Nehalem list NHMFeatures = X86_64V2Features; list NHMTuning = [TuningMacroFusion, + TuningSlowDivide64, TuningInsertVZEROUPPER, TuningNoDomainDelayMov]; @@ -1336,6 +1337,7 @@ def ProcessorFeatures { FeatureCMOV, FeatureX86_64]; list BarcelonaTuning = [TuningFastScalarShiftMasks, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER]; @@ -1358,6 +1360,7 @@ def ProcessorFeatures { list BtVer1Tuning = [TuningFast15ByteNOP, TuningFastScalarShiftMasks, TuningFastVectorShiftMasks, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER]; @@ -1380,6 +1383,7 @@ def ProcessorFeatures { TuningFastVectorShiftMasks, TuningFastMOVBE, TuningSBBDepBreaking, + TuningSlowDivide64, TuningSlowSHLD]; list BtVer2Features = !listconcat(BtVer1Features, BtVer2AdditionalFeatures); @@ -1404,6 +1408,7 @@ def ProcessorFeatures { FeatureLWP, FeatureLAHFSAHF64]; list BdVer1Tuning = [TuningSlowSHLD, + TuningSlowDivide64, TuningFast11ByteNOP, TuningFastScalarShiftMasks, TuningBranchFusion, @@ -1483,6 +1488,7 @@ def ProcessorFeatures { TuningFastScalarShiftMasks, TuningFastVariablePerLaneShuffle, TuningFastMOVBE, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER, From nobody Tue May 28 05:28:37 2024 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 4VpLdy0WkXz5LfJc; Tue, 28 May 2024 05:28: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 4VpLdx719dz4jbQ; Tue, 28 May 2024 05:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874118; 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=r/AteRTCcA57+eD9GIArfXWQDS5sAmVEijG2/9WgTV0=; b=VFx2ORr5b9dM6gd7mHQ8WM3nMYrt5rDp6Qc6CzqsbM5SqyJ7nmIvfbByTupTzDhOgpjqWl 9MA3yJC0YX0Fl+Th2viDMAsDeyVMm28O6JpzF+EkPlxM06WUY17TPYmqZvlLosvzJyAhTN k0f9ifSX8bKszB+0xg5UFZ42Ml4H3S10RxW0jKJtKqA8bomCXTWDT+VUaE+7PjJmpUwTy5 kDH1akPW0t3shdYFiw/rATfwK3pIqwiKDG8aWFqdBLk0BhAw5L17J6Jj+4ZB9FJ+pUlxka 8yLdvkryDW6e+jCNxhcRbWxkDw0KoSyUGZOjXcofvVTh+k49pBnR12wczjAE/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874118; a=rsa-sha256; cv=none; b=th01rhr5PEdKgxB7oQGfv6FKbmWcs1shGnXHv6/yAqxlYIu3iael7OGEq3W8GVF8pZcpI2 rUnpWmxH4Rh2zTCpp+tDtG2Mb+mZLlg3MBg5x+3ylR4zQZhei73zsnh9FssXEpU2A+brvL Flt465zALC4UMFdP7CgeR5Xx7QeksTlmMVAJwgzH79FXklwPfhYNF0UQQo9Aw2opqnwhyi a5eyCdELIrchAeEDOG/tw1ucskl7LhQ2n9agSJ8CqBuYE2F3sp+lkpMf96sLCXnXeuukSf 1mWygOiijRZ4imiooaG351mej82v2E6Zj4mCfPrCTK4RkH9gUstDKMlL06VB2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874117; 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=r/AteRTCcA57+eD9GIArfXWQDS5sAmVEijG2/9WgTV0=; b=nb/tb9nBm66Ao1O32D8GpZpKkNxqEIPuoy+yMpvpgNdpOXxWcxyTv+it//7vuyblon4s6b CWdVWqrPFWLR1p/XPTiEV3GEEMf8t5Xw/b9JUT4Hc+Qn0ihdiwxOJ93jAITwy5bMvN1Q6U TgmozgrHJ9RuxfWN/4msMae8qEToCEkrZHFi07tyQxO4SZtAboSTqMa9boOtyV2ZjV+fiZ Ef0CcjROCzpYQmnGhmdLX6DCPUPoJkpJucUq5a2rbc5NzJYYeDNJWOJyUINtjHE7BkaC3R eSr/rClQKVsTRNLv87DE5les5jrckLt1dt9MOWw5VCyUM2PYiaae7jKvQQSWEA== 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 4VpLdx6Zshz1FPd; Tue, 28 May 2024 05:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S5SbGa018896; Tue, 28 May 2024 05:28:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5SbJS018893; Tue, 28 May 2024 05:28:37 GMT (envelope-from git) Date: Tue, 28 May 2024 05:28:37 GMT Message-Id: <202405280528.44S5SbJS018893@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: 70be2f0deb0f - stable/13 - Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 70be2f0deb0f49e1f454b6d8e80cf56a24322a54 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=70be2f0deb0f49e1f454b6d8e80cf56a24322a54 commit 70be2f0deb0f49e1f454b6d8e80cf56a24322a54 Author: Dimitry Andric AuthorDate: 2024-05-24 15:51:19 +0000 Commit: Dimitry Andric CommitDate: 2024-05-28 05:26:45 +0000 Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67. PR: 276104 MFC after: 3 days (cherry picked from commit 3a0793336edfc21cb6d4c8c5c5d7f1665f3e6c5a) --- .../clang/lib/CodeGen/CodeGenModule.cpp | 14 +++++ .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 3 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 7 ++- .../clang/lib/Format/WhitespaceManager.cpp | 2 +- .../clang/lib/Interpreter/IncrementalParser.cpp | 24 ++++++-- .../clang/lib/Interpreter/IncrementalParser.h | 5 ++ .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 25 +++++++-- contrib/llvm-project/libcxx/src/atomic.cpp | 16 +++++- contrib/llvm-project/libcxx/src/chrono.cpp | 4 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 5 +- .../llvm/include/llvm/CodeGen/MachineFrameInfo.h | 7 +++ .../llvm/lib/Analysis/InstructionSimplify.cpp | 4 ++ .../lib/CodeGen/InterleavedLoadCombinePass.cpp | 3 + .../CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 3 +- .../Target/AArch64/AArch64Arm64ECCallLowering.cpp | 16 ++++-- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 3 +- .../AArch64/GISel/AArch64GlobalISelUtils.cpp | 6 ++ .../Target/AArch64/GISel/AArch64LegalizerInfo.cpp | 1 + .../AArch64/GISel/AArch64RegisterBankInfo.cpp | 5 +- .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 2 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 11 ++++ .../llvm/lib/Target/AMDGPU/SOPInstructions.td | 2 +- .../llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 57 ++++++------------- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp | 8 +-- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.h | 1 - .../lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp | 2 - .../RISCV/MCTargetDesc/RISCVTargetStreamer.cpp | 5 ++ .../RISCV/MCTargetDesc/RISCVTargetStreamer.h | 5 ++ .../llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp | 32 +++++++++-- .../lib/Target/RISCV/RISCVExpandPseudoInsts.cpp | 5 +- .../llvm/lib/Target/RISCV/RISCVFeatures.td | 5 ++ .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 9 ++- .../llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp | 65 +++++++++++++--------- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 6 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 42 +++++++------- .../llvm/lib/Transforms/IPO/FunctionAttrs.cpp | 7 ++- .../llvm/lib/Transforms/IPO/GlobalOpt.cpp | 3 + .../Transforms/InstCombine/InstCombineSelect.cpp | 14 ++++- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 21 +------ lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 46 files changed, 316 insertions(+), 169 deletions(-) diff --git a/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp b/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp index 1280bcd36de9..eb13cd40eb8a 100644 --- a/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp +++ b/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp @@ -67,6 +67,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/RISCVISAInfo.h" #include "llvm/Support/TimeProfiler.h" #include "llvm/Support/xxhash.h" #include "llvm/TargetParser/Triple.h" @@ -1059,6 +1060,19 @@ void CodeGenModule::Release() { llvm::LLVMContext &Ctx = TheModule.getContext(); getModule().addModuleFlag(llvm::Module::Error, "target-abi", llvm::MDString::get(Ctx, ABIStr)); + + // Add the canonical ISA string as metadata so the backend can set the ELF + // attributes correctly. We use AppendUnique so LTO will keep all of the + // unique ISA strings that were linked together. + const std::vector &Features = + getTarget().getTargetOpts().Features; + auto ParseResult = llvm::RISCVISAInfo::parseFeatures( + Arch == llvm::Triple::riscv64 ? 64 : 32, Features); + if (!errorToBool(ParseResult.takeError())) + getModule().addModuleFlag( + llvm::Module::AppendUnique, "riscv-isa", + llvm::MDNode::get( + Ctx, llvm::MDString::get(Ctx, (*ParseResult)->toString()))); } if (CodeGenOpts.SanitizeCfiCrossDso) { diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp index fd6aa4d7e684..00b6c520fcdd 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp @@ -371,7 +371,8 @@ std::string OpenBSD::getCompilerRT(const ArgList &Args, StringRef Component, if (Component == "builtins") { SmallString<128> Path(getDriver().SysRoot); llvm::sys::path::append(Path, "/usr/lib/libcompiler_rt.a"); - return std::string(Path); + if (getVFS().exists(Path)) + return std::string(Path); } SmallString<128> P(getDriver().ResourceDir); std::string CRTBasename = diff --git a/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp b/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp index a6eb18bb2b32..f70affb732a0 100644 --- a/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp +++ b/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp @@ -2510,6 +2510,7 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { assert(FormatTok->is(tok::l_paren) && "'(' expected."); auto *LeftParen = FormatTok; bool SeenEqual = false; + bool MightBeFoldExpr = false; const bool MightBeStmtExpr = Tokens->peekNextToken()->is(tok::l_brace); nextToken(); do { @@ -2521,7 +2522,7 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { parseChildBlock(); break; case tok::r_paren: - if (!MightBeStmtExpr && !Line->InMacroBody && + if (!MightBeStmtExpr && !MightBeFoldExpr && !Line->InMacroBody && Style.RemoveParentheses > FormatStyle::RPS_Leave) { const auto *Prev = LeftParen->Previous; const auto *Next = Tokens->peekNextToken(); @@ -2564,6 +2565,10 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { parseBracedList(); } break; + case tok::ellipsis: + MightBeFoldExpr = true; + nextToken(); + break; case tok::equal: SeenEqual = true; if (Style.isCSharp() && FormatTok->is(TT_FatArrow)) diff --git a/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp b/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp index df84f97a8e8a..7525e6ee650b 100644 --- a/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp +++ b/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp @@ -1466,7 +1466,7 @@ WhitespaceManager::CellDescriptions WhitespaceManager::getCells(unsigned Start, : Cell); // Go to the next non-comment and ensure there is a break in front const auto *NextNonComment = C.Tok->getNextNonComment(); - while (NextNonComment->is(tok::comma)) + while (NextNonComment && NextNonComment->is(tok::comma)) NextNonComment = NextNonComment->getNextNonComment(); auto j = i; while (Changes[j].Tok != NextNonComment && j < End) diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp index 370bcbfee8b0..f5f32b9f3924 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp @@ -209,6 +209,10 @@ IncrementalParser::IncrementalParser(Interpreter &Interp, if (Err) return; CI->ExecuteAction(*Act); + + if (getCodeGen()) + CachedInCodeGenModule = GenModule(); + std::unique_ptr IncrConsumer = std::make_unique(Interp, CI->takeASTConsumer()); CI->setASTConsumer(std::move(IncrConsumer)); @@ -224,11 +228,8 @@ IncrementalParser::IncrementalParser(Interpreter &Interp, return; // PTU.takeError(); } - if (CodeGenerator *CG = getCodeGen()) { - std::unique_ptr M(CG->ReleaseModule()); - CG->StartModule("incr_module_" + std::to_string(PTUs.size()), - M->getContext()); - PTU->TheModule = std::move(M); + if (getCodeGen()) { + PTU->TheModule = GenModule(); assert(PTU->TheModule && "Failed to create initial PTU"); } } @@ -364,6 +365,19 @@ IncrementalParser::Parse(llvm::StringRef input) { std::unique_ptr IncrementalParser::GenModule() { static unsigned ID = 0; if (CodeGenerator *CG = getCodeGen()) { + // Clang's CodeGen is designed to work with a single llvm::Module. In many + // cases for convenience various CodeGen parts have a reference to the + // llvm::Module (TheModule or Module) which does not change when a new + // module is pushed. However, the execution engine wants to take ownership + // of the module which does not map well to CodeGen's design. To work this + // around we created an empty module to make CodeGen happy. We should make + // sure it always stays empty. + assert((!CachedInCodeGenModule || + (CachedInCodeGenModule->empty() && + CachedInCodeGenModule->global_empty() && + CachedInCodeGenModule->alias_empty() && + CachedInCodeGenModule->ifunc_empty())) && + "CodeGen wrote to a readonly module"); std::unique_ptr M(CG->ReleaseModule()); CG->StartModule("incr_module_" + std::to_string(ID++), M->getContext()); return M; diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h index e13b74c7f659..f63bce50acd3 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h @@ -24,6 +24,7 @@ #include namespace llvm { class LLVMContext; +class Module; } // namespace llvm namespace clang { @@ -57,6 +58,10 @@ protected: /// of code. std::list PTUs; + /// When CodeGen is created the first llvm::Module gets cached in many places + /// and we must keep it alive. + std::unique_ptr CachedInCodeGenModule; + IncrementalParser(); public: diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp index b619f5d729e8..a12a64939c46 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp @@ -2404,9 +2404,6 @@ struct ConvertConstructorToDeductionGuideTransform { Args.addOuterRetainedLevel(); } - if (NestedPattern) - Args.addOuterRetainedLevels(NestedPattern->getTemplateDepth()); - FunctionProtoTypeLoc FPTL = CD->getTypeSourceInfo()->getTypeLoc() .getAsAdjusted(); assert(FPTL && "no prototype for constructor declaration"); @@ -2526,11 +2523,27 @@ private: // -- The types of the function parameters are those of the constructor. for (auto *OldParam : TL.getParams()) { - ParmVarDecl *NewParam = - transformFunctionTypeParam(OldParam, Args, MaterializedTypedefs); - if (NestedPattern && NewParam) + ParmVarDecl *NewParam = OldParam; + // Given + // template struct C { + // template struct D { + // template D(U, V); + // }; + // }; + // First, transform all the references to template parameters that are + // defined outside of the surrounding class template. That is T in the + // above example. + if (NestedPattern) { NewParam = transformFunctionTypeParam(NewParam, OuterInstantiationArgs, MaterializedTypedefs); + if (!NewParam) + return QualType(); + } + // Then, transform all the references to template parameters that are + // defined at the class template and the constructor. In this example, + // they're U and V, respectively. + NewParam = + transformFunctionTypeParam(NewParam, Args, MaterializedTypedefs); if (!NewParam) return QualType(); ParamTypes.push_back(NewParam->getType()); diff --git a/contrib/llvm-project/libcxx/src/atomic.cpp b/contrib/llvm-project/libcxx/src/atomic.cpp index 6c7fa1206cf4..98b7f0372369 100644 --- a/contrib/llvm-project/libcxx/src/atomic.cpp +++ b/contrib/llvm-project/libcxx/src/atomic.cpp @@ -25,16 +25,28 @@ # if !defined(SYS_futex) && defined(SYS_futex_time64) # define SYS_futex SYS_futex_time64 # endif +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) #elif defined(__FreeBSD__) # include # include +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) + +#elif defined(__OpenBSD__) + +# include + +// OpenBSD has no indirect syscalls +# define _LIBCPP_FUTEX(...) futex(__VA_ARGS__) + #else // <- Add other operating systems here // Baseline needs no new headers +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) + #endif _LIBCPP_BEGIN_NAMESPACE_STD @@ -44,11 +56,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val) { static constexpr timespec __timeout = {2, 0}; - syscall(SYS_futex, __ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0); + _LIBCPP_FUTEX(__ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0); } static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const volatile* __ptr, bool __notify_one) { - syscall(SYS_futex, __ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0); + _LIBCPP_FUTEX(__ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0); } #elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK) diff --git a/contrib/llvm-project/libcxx/src/chrono.cpp b/contrib/llvm-project/libcxx/src/chrono.cpp index c5e827c0cb59..e7d6dfbc2292 100644 --- a/contrib/llvm-project/libcxx/src/chrono.cpp +++ b/contrib/llvm-project/libcxx/src/chrono.cpp @@ -31,7 +31,9 @@ # include // for gettimeofday and timeval #endif -#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) +// OpenBSD does not have a fully conformant suite of POSIX timers, but +// it does have clock_gettime and CLOCK_MONOTONIC which is all we need. +#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) # define _LIBCPP_HAS_CLOCK_GETTIME #endif diff --git a/contrib/llvm-project/lld/ELF/Relocations.cpp b/contrib/llvm-project/lld/ELF/Relocations.cpp index 619fbaf5dc54..92a1b9baaca3 100644 --- a/contrib/llvm-project/lld/ELF/Relocations.cpp +++ b/contrib/llvm-project/lld/ELF/Relocations.cpp @@ -1480,7 +1480,10 @@ template void RelocationScanner::scanOne(RelTy *&i) { // Process TLS relocations, including TLS optimizations. Note that // R_TPREL and R_TPREL_NEG relocations are resolved in processAux. - if (sym.isTls()) { + // + // Some RISCV TLSDESC relocations reference a local NOTYPE symbol, + // but we need to process them in handleTlsRelocation. + if (sym.isTls() || oneof(expr)) { if (unsigned processed = handleTlsRelocation(type, sym, *sec, offset, addend, expr)) { i += processed - 1; diff --git a/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h b/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h index 7d11d63d4066..c35faac09c4d 100644 --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h @@ -697,6 +697,13 @@ public: return Objects[ObjectIdx+NumFixedObjects].isAliased; } + /// Set "maybe pointed to by an LLVM IR value" for an object. + void setIsAliasedObjectIndex(int ObjectIdx, bool IsAliased) { + assert(unsigned(ObjectIdx+NumFixedObjects) < Objects.size() && + "Invalid Object Idx!"); + Objects[ObjectIdx+NumFixedObjects].isAliased = IsAliased; + } + /// Returns true if the specified index corresponds to an immutable object. bool isImmutableObjectIndex(int ObjectIdx) const { // Tail calling functions can clobber their function arguments. diff --git a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp index 72b6dfa181e8..8dcffe45c644 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp @@ -4322,6 +4322,10 @@ static Value *simplifyWithOpReplaced(Value *V, Value *Op, Value *RepOp, if (match(I, m_Intrinsic())) return nullptr; + // Don't simplify freeze. + if (isa(I)) + return nullptr; + // Replace Op with RepOp in instruction operands. SmallVector NewOps; bool AnyReplaced = false; diff --git a/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp b/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp index f2d5c3c867c2..bbb0b654dc67 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp @@ -877,6 +877,9 @@ public: if (LI->isAtomic()) return false; + if (!DL.typeSizeEqualsStoreSize(Result.VTy->getElementType())) + return false; + // Get the base polynomial computePolynomialFromPointer(*LI->getPointerOperand(), Offset, BasePtr, DL); diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 5ce1013f30fd..7406a8ac1611 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -10888,7 +10888,7 @@ static void tryToElideArgumentCopy( } // Perform the elision. Delete the old stack object and replace its only use - // in the variable info map. Mark the stack object as mutable. + // in the variable info map. Mark the stack object as mutable and aliased. LLVM_DEBUG({ dbgs() << "Eliding argument copy from " << Arg << " to " << *AI << '\n' << " Replacing frame index " << OldIndex << " with " << FixedIndex @@ -10896,6 +10896,7 @@ static void tryToElideArgumentCopy( }); MFI.RemoveStackObject(OldIndex); MFI.setIsImmutableObjectIndex(FixedIndex, false); + MFI.setIsAliasedObjectIndex(FixedIndex, true); AllocaIndex = FixedIndex; ArgCopyElisionFrameIndexMap.insert({OldIndex, FixedIndex}); for (SDValue ArgVal : ArgVals) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp index 55c5bbc66a3f..862aefe46193 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp @@ -181,13 +181,14 @@ void AArch64Arm64ECCallLowering::getThunkArgTypes( } for (unsigned E = FT->getNumParams(); I != E; ++I) { - Align ParamAlign = AttrList.getParamAlignment(I).valueOrOne(); #if 0 // FIXME: Need more information about argument size; see // https://reviews.llvm.org/D132926 uint64_t ArgSizeBytes = AttrList.getParamArm64ECArgSizeBytes(I); + Align ParamAlign = AttrList.getParamAlignment(I).valueOrOne(); #else uint64_t ArgSizeBytes = 0; + Align ParamAlign = Align(); #endif Type *Arm64Ty, *X64Ty; canonicalizeThunkType(FT->getParamType(I), ParamAlign, @@ -297,7 +298,7 @@ void AArch64Arm64ECCallLowering::canonicalizeThunkType( uint64_t TotalSizeBytes = ElementCnt * ElementSizePerBytes; if (ElementTy->isFloatTy() || ElementTy->isDoubleTy()) { Out << (ElementTy->isFloatTy() ? "F" : "D") << TotalSizeBytes; - if (Alignment.value() >= 8 && !T->isPointerTy()) + if (Alignment.value() >= 16 && !Ret) Out << "a" << Alignment.value(); Arm64Ty = T; if (TotalSizeBytes <= 8) { @@ -328,7 +329,7 @@ void AArch64Arm64ECCallLowering::canonicalizeThunkType( Out << "m"; if (TypeSize != 4) Out << TypeSize; - if (Alignment.value() >= 8 && !T->isPointerTy()) + if (Alignment.value() >= 16 && !Ret) Out << "a" << Alignment.value(); // FIXME: Try to canonicalize Arm64Ty more thoroughly? Arm64Ty = T; @@ -513,7 +514,14 @@ Function *AArch64Arm64ECCallLowering::buildEntryThunk(Function *F) { // Call the function passed to the thunk. Value *Callee = Thunk->getArg(0); Callee = IRB.CreateBitCast(Callee, PtrTy); - Value *Call = IRB.CreateCall(Arm64Ty, Callee, Args); + CallInst *Call = IRB.CreateCall(Arm64Ty, Callee, Args); + + auto SRetAttr = F->getAttributes().getParamAttr(0, Attribute::StructRet); + auto InRegAttr = F->getAttributes().getParamAttr(0, Attribute::InReg); + if (SRetAttr.isValid() && !InRegAttr.isValid()) { + Thunk->addParamAttr(1, SRetAttr); + Call->addParamAttr(0, SRetAttr); + } Value *RetVal = Call; if (TransformDirectToSRet) { diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 95d8ab95b2c0..bcfd0253e73c 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -22122,7 +22122,8 @@ SDValue performCONDCombine(SDNode *N, SDNode *SubsNode = N->getOperand(CmpIndex).getNode(); unsigned CondOpcode = SubsNode->getOpcode(); - if (CondOpcode != AArch64ISD::SUBS || SubsNode->hasAnyUseOfValue(0)) + if (CondOpcode != AArch64ISD::SUBS || SubsNode->hasAnyUseOfValue(0) || + !SubsNode->hasOneUse()) return SDValue(); // There is a SUBS feeding this condition. Is it fed by a mask we can diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp index 92db89cc0915..80fe4bcb8b58 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp @@ -147,6 +147,12 @@ void AArch64GISelUtils::changeFCMPPredToAArch64CC( case CmpInst::FCMP_UNE: CondCode = AArch64CC::NE; break; + case CmpInst::FCMP_TRUE: + CondCode = AArch64CC::AL; + break; + case CmpInst::FCMP_FALSE: + CondCode = AArch64CC::NV; + break; } } diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp index 4b9d549e7911..de3c89e925a2 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp @@ -877,6 +877,7 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST) getActionDefinitionsBuilder(G_INSERT_VECTOR_ELT) .legalIf(typeInSet(0, {v16s8, v8s8, v8s16, v4s16, v4s32, v2s32, v2s64})) + .moreElementsToNextPow2(0) .widenVectorEltsToVectorMinSize(0, 64); getActionDefinitionsBuilder(G_BUILD_VECTOR) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp index b8e5e7bbdaba..06cdd7e4ef48 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp @@ -623,8 +623,11 @@ bool AArch64RegisterBankInfo::isLoadFromFPType(const MachineInstr &MI) const { EltTy = GV->getValueType(); // Look at the first element of the struct to determine the type we are // loading - while (StructType *StructEltTy = dyn_cast(EltTy)) + while (StructType *StructEltTy = dyn_cast(EltTy)) { + if (StructEltTy->getNumElements() == 0) + break; EltTy = StructEltTy->getTypeAtIndex(0U); + } // Look at the first element of the array to determine its type if (isa(EltTy)) EltTy = EltTy->getArrayElementType(); diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp index 6ecb1c8bf6e1..7a3198612f86 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp @@ -1832,7 +1832,7 @@ bool SIInsertWaitcnts::generateWaitcntInstBefore(MachineInstr &MI, // not, we need to ensure the subtarget is capable of backing off barrier // instructions in case there are any outstanding memory operations that may // cause an exception. Otherwise, insert an explicit S_WAITCNT 0 here. - if (MI.getOpcode() == AMDGPU::S_BARRIER && + if (TII->isBarrierStart(MI.getOpcode()) && !ST->hasAutoWaitcntBeforeBarrier() && !ST->supportsBackOffBarrier()) { Wait = Wait.combined( AMDGPU::Waitcnt::allZero(ST->hasExtendedWaitCounts(), ST->hasVscnt())); diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h index 1c9dacc09f81..626d903c0c69 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h @@ -908,6 +908,17 @@ public: return MI.getDesc().TSFlags & SIInstrFlags::IsNeverUniform; } + // Check to see if opcode is for a barrier start. Pre gfx12 this is just the + // S_BARRIER, but after support for S_BARRIER_SIGNAL* / S_BARRIER_WAIT we want + // to check for the barrier start (S_BARRIER_SIGNAL*) + bool isBarrierStart(unsigned Opcode) const { + return Opcode == AMDGPU::S_BARRIER || + Opcode == AMDGPU::S_BARRIER_SIGNAL_M0 || + Opcode == AMDGPU::S_BARRIER_SIGNAL_ISFIRST_M0 || + Opcode == AMDGPU::S_BARRIER_SIGNAL_IMM || + Opcode == AMDGPU::S_BARRIER_SIGNAL_ISFIRST_IMM; + } + static bool doesNotReadTiedSource(const MachineInstr &MI) { return MI.getDesc().TSFlags & SIInstrFlags::TiedSourceNotRead; } diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td index ae5ef0541929..5762efde73f0 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td @@ -1786,7 +1786,7 @@ def : GCNPat< let SubtargetPredicate = isNotGFX12Plus in def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 0))>; let SubtargetPredicate = isGFX12Plus in - def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 1))>; + def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 2))>; // The first 10 bits of the mode register are the core FP mode on all // subtargets. diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index d9465e86d896..ebd876d50c44 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -23,6 +23,7 @@ #include "llvm/Analysis/ScalarEvolutionAliasAnalysis.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Instructions.h" +#include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/Module.h" #include "llvm/IR/ValueSymbolTable.h" #include "llvm/Pass.h" @@ -116,9 +117,20 @@ private: // sure that they can be replaced. static bool hasReplaceableUsers(GlobalVariable &GV) { for (User *CurrentUser : GV.users()) { - // Instruction users are always valid. - if (isa(CurrentUser)) + if (auto *I = dyn_cast(CurrentUser)) { + // Do not merge globals in exception pads. + if (I->isEHPad()) + return false; + + if (auto *II = dyn_cast(I)) { + // Some intrinsics require a plain global. + if (II->getIntrinsicID() == Intrinsic::eh_typeid_for) + return false; + } + + // Other instruction users are always valid. continue; + } // We cannot replace GlobalValue users because they are not just nodes // in IR. To replace a user like this we would need to create a new @@ -302,14 +314,6 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, Users.push_back(CurrentUser); for (User *CurrentUser : Users) { - Instruction *UserInstruction = dyn_cast(CurrentUser); - Constant *UserConstant = dyn_cast(CurrentUser); - - // At this point we expect that the user is either an instruction or a - // constant. - assert((UserConstant || UserInstruction) && - "Expected the user to be an instruction or a constant."); - // The user was not found so it must have been replaced earlier. if (!userHasOperand(CurrentUser, GlobalToReplace)) continue; @@ -318,38 +322,13 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, if (isa(CurrentUser)) continue; - if (!UserInstruction) { - // User is a constant type. - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - UserConstant->handleOperandChange(GlobalToReplace, ConstGEP); - continue; - } - - if (PHINode *UserPHI = dyn_cast(UserInstruction)) { - // GEP instructions cannot be added before PHI nodes. - // With getInBoundsGetElementPtr we create the GEP and then replace it - // inline into the PHI. - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - UserPHI->replaceUsesOfWith(GlobalToReplace, ConstGEP); - continue; - } - // The user is a valid instruction that is not a PHINode. - GetElementPtrInst *GEPInst = - GetElementPtrInst::Create(PooledStructType, GPool, Indices); - GEPInst->insertBefore(UserInstruction); - - LLVM_DEBUG(dbgs() << "Inserting GEP before:\n"); - LLVM_DEBUG(UserInstruction->dump()); - + Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( + PooledStructType, GPool, Indices); LLVM_DEBUG(dbgs() << "Replacing this global:\n"); LLVM_DEBUG(GlobalToReplace->dump()); LLVM_DEBUG(dbgs() << "with this:\n"); - LLVM_DEBUG(GEPInst->dump()); - - // After the GEP is inserted the GV can be replaced. - CurrentUser->replaceUsesOfWith(GlobalToReplace, GEPInst); + LLVM_DEBUG(ConstGEP->dump()); + GlobalToReplace->replaceAllUsesWith(ConstGEP); } } diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp index 961b8f0afe22..cdf7c048a4bf 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp @@ -31,12 +31,13 @@ using namespace llvm; // This part is for ELF object output. RISCVTargetELFStreamer::RISCVTargetELFStreamer(MCStreamer &S, const MCSubtargetInfo &STI) - : RISCVTargetStreamer(S), CurrentVendor("riscv"), STI(STI) { + : RISCVTargetStreamer(S), CurrentVendor("riscv") { MCAssembler &MCA = getStreamer().getAssembler(); const FeatureBitset &Features = STI.getFeatureBits(); auto &MAB = static_cast(MCA.getBackend()); setTargetABI(RISCVABI::computeTargetABI(STI.getTargetTriple(), Features, MAB.getTargetOptions().getABIName())); + setFlagsFromFeatures(STI); // `j label` in `.option norelax; j label; .option relax; ...; label:` needs a // relocation to ensure the jump target is correct after linking. This is due // to a limitation that shouldForceRelocation has to make the decision upfront @@ -87,14 +88,13 @@ void RISCVTargetELFStreamer::finishAttributeSection() { void RISCVTargetELFStreamer::finish() { RISCVTargetStreamer::finish(); MCAssembler &MCA = getStreamer().getAssembler(); - const FeatureBitset &Features = STI.getFeatureBits(); RISCVABI::ABI ABI = getTargetABI(); unsigned EFlags = MCA.getELFHeaderEFlags(); - if (Features[RISCV::FeatureStdExtC]) + if (hasRVC()) EFlags |= ELF::EF_RISCV_RVC; - if (Features[RISCV::FeatureStdExtZtso]) + if (hasTSO()) EFlags |= ELF::EF_RISCV_TSO; switch (ABI) { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h index a6f54bf67b5d..e8f29cd8449b 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h @@ -46,7 +46,6 @@ private: StringRef CurrentVendor; MCSection *AttributeSection = nullptr; - const MCSubtargetInfo &STI; void emitAttribute(unsigned Attribute, unsigned Value) override; void emitTextAttribute(unsigned Attribute, StringRef String) override; diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp index 254a9a4bc0ef..b8e0f3a867f4 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp @@ -207,8 +207,6 @@ void RISCVMCExpr::fixELFSymbolsInTLSFixups(MCAssembler &Asm) const { case VK_RISCV_TLS_GOT_HI: case VK_RISCV_TLS_GD_HI: case VK_RISCV_TLSDESC_HI: - case VK_RISCV_TLSDESC_ADD_LO: - case VK_RISCV_TLSDESC_LOAD_LO: break; } diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp index ac4861bf113e..eee78a8c161f 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp @@ -48,6 +48,11 @@ void RISCVTargetStreamer::setTargetABI(RISCVABI::ABI ABI) { TargetABI = ABI; } +void RISCVTargetStreamer::setFlagsFromFeatures(const MCSubtargetInfo &STI) { + HasRVC = STI.hasFeature(RISCV::FeatureStdExtC); + HasTSO = STI.hasFeature(RISCV::FeatureStdExtZtso); +} + void RISCVTargetStreamer::emitTargetAttributes(const MCSubtargetInfo &STI, bool EmitStackAlign) { if (EmitStackAlign) { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h index 070e72fb157a..cb8bc21cb635 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h @@ -33,6 +33,8 @@ struct RISCVOptionArchArg { class RISCVTargetStreamer : public MCTargetStreamer { RISCVABI::ABI TargetABI = RISCVABI::ABI_Unknown; + bool HasRVC = false; + bool HasTSO = false; public: RISCVTargetStreamer(MCStreamer &S); @@ -58,6 +60,9 @@ public: void emitTargetAttributes(const MCSubtargetInfo &STI, bool EmitStackAlign); void setTargetABI(RISCVABI::ABI ABI); RISCVABI::ABI getTargetABI() const { return TargetABI; } + void setFlagsFromFeatures(const MCSubtargetInfo &STI); + bool hasRVC() const { return HasRVC; } + bool hasTSO() const { return HasTSO; } }; // This part is for ascii assembly output diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp index b2e9cd87373b..87bd9b4048cd 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp @@ -100,7 +100,7 @@ public: bool emitDirectiveOptionArch(); private: - void emitAttributes(); + void emitAttributes(const MCSubtargetInfo &SubtargetInfo); void emitNTLHint(const MachineInstr *MI); @@ -385,8 +385,32 @@ void RISCVAsmPrinter::emitStartOfAsmFile(Module &M) { if (const MDString *ModuleTargetABI = dyn_cast_or_null(M.getModuleFlag("target-abi"))) RTS.setTargetABI(RISCVABI::getTargetABI(ModuleTargetABI->getString())); + + MCSubtargetInfo SubtargetInfo = *TM.getMCSubtargetInfo(); + + // Use module flag to update feature bits. + if (auto *MD = dyn_cast_or_null(M.getModuleFlag("riscv-isa"))) { + for (auto &ISA : MD->operands()) { + if (auto *ISAString = dyn_cast_or_null(ISA)) { + auto ParseResult = llvm::RISCVISAInfo::parseArchString( + ISAString->getString(), /*EnableExperimentalExtension=*/true, + /*ExperimentalExtensionVersionCheck=*/true); + if (!errorToBool(ParseResult.takeError())) { + auto &ISAInfo = *ParseResult; + for (const auto &Feature : RISCVFeatureKV) { + if (ISAInfo->hasExtension(Feature.Key) && + !SubtargetInfo.hasFeature(Feature.Value)) + SubtargetInfo.ToggleFeature(Feature.Key); + } + } + } + } + + RTS.setFlagsFromFeatures(SubtargetInfo); + } + if (TM.getTargetTriple().isOSBinFormatELF()) - emitAttributes(); + emitAttributes(SubtargetInfo); } void RISCVAsmPrinter::emitEndOfAsmFile(Module &M) { @@ -398,13 +422,13 @@ void RISCVAsmPrinter::emitEndOfAsmFile(Module &M) { EmitHwasanMemaccessSymbols(M); } -void RISCVAsmPrinter::emitAttributes() { +void RISCVAsmPrinter::emitAttributes(const MCSubtargetInfo &SubtargetInfo) { RISCVTargetStreamer &RTS = static_cast(*OutStreamer->getTargetStreamer()); // Use MCSubtargetInfo from TargetMachine. Individual functions may have // attributes that differ from other functions in the module and we have no // way to know which function is correct. - RTS.emitTargetAttributes(*TM.getMCSubtargetInfo(), /*EmitStackAlign*/ true); + RTS.emitTargetAttributes(SubtargetInfo, /*EmitStackAlign*/ true); } void RISCVAsmPrinter::emitFunctionEntryLabel() { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp index 0a314fdd41cb..89207640ee54 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp @@ -317,8 +317,9 @@ bool RISCVExpandPseudo::expandRV32ZdinxStore(MachineBasicBlock &MBB, .addReg(MBBI->getOperand(1).getReg()) .add(MBBI->getOperand(2)); if (MBBI->getOperand(2).isGlobal() || MBBI->getOperand(2).isCPI()) { - // FIXME: Zdinx RV32 can not work on unaligned memory. - assert(!STI->hasFastUnalignedAccess()); + // FIXME: Zdinx RV32 can not work on unaligned scalar memory. + assert(!STI->hasFastUnalignedAccess() && + !STI->enableUnalignedScalarMem()); assert(MBBI->getOperand(2).getOffset() % 8 == 0); MBBI->getOperand(2).setOffset(MBBI->getOperand(2).getOffset() + 4); diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td index 26451c80f57b..1bb6b6a561f4 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td @@ -1025,6 +1025,11 @@ def FeatureFastUnalignedAccess "true", "Has reasonably performant unaligned " "loads and stores (both scalar and vector)">; +def FeatureUnalignedScalarMem + : SubtargetFeature<"unaligned-scalar-mem", "EnableUnalignedScalarMem", + "true", "Has reasonably performant unaligned scalar " + "loads and stores">; + def FeaturePostRAScheduler : SubtargetFeature<"use-postra-scheduler", "UsePostRAScheduler", "true", "Schedule again after register allocation">; diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp index d46093b9e260..3fe7ddfdd427 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp @@ -1883,7 +1883,8 @@ bool RISCVTargetLowering::shouldConvertConstantLoadToIntImm(const APInt &Imm, // replace. If we don't support unaligned scalar mem, prefer the constant // pool. // TODO: Can the caller pass down the alignment? - if (!Subtarget.hasFastUnalignedAccess()) + if (!Subtarget.hasFastUnalignedAccess() && + !Subtarget.enableUnalignedScalarMem()) return true; // Prefer to keep the load if it would require many instructions. @@ -19772,8 +19773,10 @@ bool RISCVTargetLowering::allowsMisalignedMemoryAccesses( unsigned *Fast) const { if (!VT.isVector()) { if (Fast) - *Fast = Subtarget.hasFastUnalignedAccess(); - return Subtarget.hasFastUnalignedAccess(); + *Fast = Subtarget.hasFastUnalignedAccess() || + Subtarget.enableUnalignedScalarMem(); + return Subtarget.hasFastUnalignedAccess() || + Subtarget.enableUnalignedScalarMem(); } // All vector implementations must support element alignment diff --git a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp index bf6547cc87ec..2f2dc6b80792 100644 --- a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp @@ -70,49 +70,62 @@ void SystemZInstrInfo::splitMove(MachineBasicBlock::iterator MI, MachineBasicBlock *MBB = MI->getParent(); MachineFunction &MF = *MBB->getParent(); - // Get two load or store instructions. Use the original instruction for one - // of them (arbitrarily the second here) and create a clone for the other. - MachineInstr *EarlierMI = MF.CloneMachineInstr(&*MI); - MBB->insert(MI, EarlierMI); + // Get two load or store instructions. Use the original instruction for + // one of them and create a clone for the other. + MachineInstr *HighPartMI = MF.CloneMachineInstr(&*MI); + MachineInstr *LowPartMI = &*MI; + MBB->insert(LowPartMI, HighPartMI); // Set up the two 64-bit registers and remember super reg and its flags. - MachineOperand &HighRegOp = EarlierMI->getOperand(0); - MachineOperand &LowRegOp = MI->getOperand(0); + MachineOperand &HighRegOp = HighPartMI->getOperand(0); + MachineOperand &LowRegOp = LowPartMI->getOperand(0); Register Reg128 = LowRegOp.getReg(); unsigned Reg128Killed = getKillRegState(LowRegOp.isKill()); unsigned Reg128Undef = getUndefRegState(LowRegOp.isUndef()); HighRegOp.setReg(RI.getSubReg(HighRegOp.getReg(), SystemZ::subreg_h64)); LowRegOp.setReg(RI.getSubReg(LowRegOp.getReg(), SystemZ::subreg_l64)); - if (MI->mayStore()) { - // Add implicit uses of the super register in case one of the subregs is - // undefined. We could track liveness and skip storing an undefined - // subreg, but this is hopefully rare (discovered with llvm-stress). - // If Reg128 was killed, set kill flag on MI. - unsigned Reg128UndefImpl = (Reg128Undef | RegState::Implicit); - MachineInstrBuilder(MF, EarlierMI).addReg(Reg128, Reg128UndefImpl); - MachineInstrBuilder(MF, MI).addReg(Reg128, (Reg128UndefImpl | Reg128Killed)); - } - // The address in the first (high) instruction is already correct. // Adjust the offset in the second (low) instruction. - MachineOperand &HighOffsetOp = EarlierMI->getOperand(2); - MachineOperand &LowOffsetOp = MI->getOperand(2); + MachineOperand &HighOffsetOp = HighPartMI->getOperand(2); + MachineOperand &LowOffsetOp = LowPartMI->getOperand(2); LowOffsetOp.setImm(LowOffsetOp.getImm() + 8); - // Clear the kill flags on the registers in the first instruction. - if (EarlierMI->getOperand(0).isReg() && EarlierMI->getOperand(0).isUse()) - EarlierMI->getOperand(0).setIsKill(false); - EarlierMI->getOperand(1).setIsKill(false); - EarlierMI->getOperand(3).setIsKill(false); - // Set the opcodes. unsigned HighOpcode = getOpcodeForOffset(NewOpcode, HighOffsetOp.getImm()); unsigned LowOpcode = getOpcodeForOffset(NewOpcode, LowOffsetOp.getImm()); assert(HighOpcode && LowOpcode && "Both offsets should be in range"); + HighPartMI->setDesc(get(HighOpcode)); + LowPartMI->setDesc(get(LowOpcode)); + + MachineInstr *FirstMI = HighPartMI; + if (MI->mayStore()) { + FirstMI->getOperand(0).setIsKill(false); + // Add implicit uses of the super register in case one of the subregs is + // undefined. We could track liveness and skip storing an undefined + // subreg, but this is hopefully rare (discovered with llvm-stress). + // If Reg128 was killed, set kill flag on MI. + unsigned Reg128UndefImpl = (Reg128Undef | RegState::Implicit); + MachineInstrBuilder(MF, HighPartMI).addReg(Reg128, Reg128UndefImpl); + MachineInstrBuilder(MF, LowPartMI).addReg(Reg128, (Reg128UndefImpl | Reg128Killed)); + } else { + // If HighPartMI clobbers any of the address registers, it needs to come + // after LowPartMI. + auto overlapsAddressReg = [&](Register Reg) -> bool { + return RI.regsOverlap(Reg, MI->getOperand(1).getReg()) || + RI.regsOverlap(Reg, MI->getOperand(3).getReg()); + }; + if (overlapsAddressReg(HighRegOp.getReg())) { + assert(!overlapsAddressReg(LowRegOp.getReg()) && + "Both loads clobber address!"); + MBB->splice(HighPartMI, MBB, LowPartMI); + FirstMI = LowPartMI; + } + } - EarlierMI->setDesc(get(HighOpcode)); - MI->setDesc(get(LowOpcode)); *** 421 LINES SKIPPED *** From nobody Tue May 28 05:28:38 2024 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 4VpLdz1hDWz5LfPS; Tue, 28 May 2024 05:28: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 4VpLdz0wy1z4jkD; Tue, 28 May 2024 05:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874119; 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=sR4u9QyMrPdt/1xjt7gg1Szmgk1oUIDnge8qvolWBLk=; b=nogFvqBphqoxkkZaZeBRNjNqLkEw/vLl4m4IGSFBtu8n87IYnWPz3TYzsrTciKYInMJhmv kCKhFa7hZQ4K+zQ1srZqs0y5t79+j99ZeYDxNPQOUyQkycpsN3j1/4+9eE0KG/vtSa7Nxh UwzbI+v/NjUzJCNgx6rbfZhjBfvOGodG9dDuXl5j7xuBuARz0XJClk29YDQNh+5Y+7ZWNG Pv+ffYHpP5aWKVOc8KW+3F0ovfJ9s1Vb47XQMxskFNQIhSeNvGaINiLCCT4O5Fbg8oLx2I XbgGeWCGoG8Zm2t58WQBznjW8iaKfXT6km8TsBWT1R9uuJfUNWlQIlahYi/tdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874119; a=rsa-sha256; cv=none; b=dhW34OB77u7l3lDErXYt9JIB9GOKK2AqC8HrCtKH2W0c7FBWPlsE0EtDgsHZ4MOlYw7jfV 8Y2oaF3VBmXw+WljnHBMM+yWPEuDb5dth9RhJGIK0XSyhfBd2gmMwmEoLDqsR8Ave5fj9X 9mDRlLSQOLS/3Y5Vb23/uFIvBs3HqbKAV0S8MQtBt2yIINvrUW8AhNu1E2MGndGsZPL9tx 82/YKVdWFNh/gXoMdlwP4GuJTv3uIXKRNI44M+pVMemis38YIaHqmtG405Wf1QbroF1MYM bcPy7xlcyzNn2bRYUrTxy042nSpBzd3eulzmvymnjZfAHQWJw36sRdCXx0UXuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874119; 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=sR4u9QyMrPdt/1xjt7gg1Szmgk1oUIDnge8qvolWBLk=; b=h9eT8eLkLlKJBhMuwElFAxneBLrUB90e1o3539Z4IaM5rcIvCeroLt6Ydg946NYouzCbPS oSeJDNsSXM5A9mZ7QXTi5+ie3J3SqJuCD7oI1GPlL3SdH52QiUZMZ1ZMwZWPnV+Oq51ME/ PobImV+JjfoF21fwJsOghjkOKb1HC3uEufvt1Yy+uQRhpHmCXZTBFhWW7QX3lqQZ39+nfW YAMuieBk9/8DqhN24sp8BrQ6F8adKqYYohfzdzqIZxY2MlxUh3swtQsxbs29w4F75Xh2Ue xcVNehe7MvYP22BaYB6NZDIO8uhpl0kKy94q/PzwaiDIGZY9CPQgnbi+aMR5QQ== 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 4VpLdz0VGpz1F38; Tue, 28 May 2024 05:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S5ScYm018949; Tue, 28 May 2024 05:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5Sc3G018946; Tue, 28 May 2024 05:28:38 GMT (envelope-from git) Date: Tue, 28 May 2024 05:28:38 GMT Message-Id: <202405280528.44S5Sc3G018946@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: a3e6eda79813 - stable/13 - Merge commit d0be944aa511 from llvm-project (by Simon Pilgrim): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: a3e6eda7981319113d39caedf79b94b44773970f Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a3e6eda7981319113d39caedf79b94b44773970f commit a3e6eda7981319113d39caedf79b94b44773970f Author: Dimitry Andric AuthorDate: 2024-05-25 17:52:15 +0000 Commit: Dimitry Andric CommitDate: 2024-05-28 05:26:46 +0000 Merge commit d0be944aa511 from llvm-project (by Simon Pilgrim): [X86] Add slow div64 tuning flag to Nehalem target (#91129) This appears to have been missed because later cpus don't inherit from Nehalem tuning much. Noticed while cleaning up for #90985 Merge commit 8b400de79eff from llvm-project (by Simon Pilgrim): [X86] Enable TuningSlowDivide64 on Barcelona/Bobcat/Bulldozer/Ryzen Families (#91277) Despite most AMD cpus having a lower latency for i64 divisions that converge early, we are still better off testing for values representable as i32 and performing a i32 division if possible. All AMD cpus appear to have been missed when we added the "idivq-to-divl" attribute - this patch now matches Intel cpu behaviour (and the x86-64/v2/3/4 levels). Unfortunately the difference in code scheduling means I've had to stop using the update_llc_test_checks script and just use old-fashioned CHECK-DAG checks for divl/divq pairs. Fixes #90985 This fixes possibly worse runtime performance on AMD Zen hardware, when using -march=znver4 (or any other znver), as opposed to -march=x86-64-v4 or the baseline -march=x86-64. A similar fix is applied for Nehalem. PR: 278908 MFC after: 3 days (cherry picked from commit cadd2ca21765ebcb95b77ec94977b4e74e1edc1b) --- contrib/llvm-project/llvm/lib/Target/X86/X86.td | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86.td b/contrib/llvm-project/llvm/lib/Target/X86/X86.td index e89ddcc570c9..1aff5f9fad97 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86.td +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86.td @@ -867,6 +867,7 @@ def ProcessorFeatures { // Nehalem list NHMFeatures = X86_64V2Features; list NHMTuning = [TuningMacroFusion, + TuningSlowDivide64, TuningInsertVZEROUPPER, TuningNoDomainDelayMov]; @@ -1336,6 +1337,7 @@ def ProcessorFeatures { FeatureCMOV, FeatureX86_64]; list BarcelonaTuning = [TuningFastScalarShiftMasks, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER]; @@ -1358,6 +1360,7 @@ def ProcessorFeatures { list BtVer1Tuning = [TuningFast15ByteNOP, TuningFastScalarShiftMasks, TuningFastVectorShiftMasks, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER]; @@ -1380,6 +1383,7 @@ def ProcessorFeatures { TuningFastVectorShiftMasks, TuningFastMOVBE, TuningSBBDepBreaking, + TuningSlowDivide64, TuningSlowSHLD]; list BtVer2Features = !listconcat(BtVer1Features, BtVer2AdditionalFeatures); @@ -1404,6 +1408,7 @@ def ProcessorFeatures { FeatureLWP, FeatureLAHFSAHF64]; list BdVer1Tuning = [TuningSlowSHLD, + TuningSlowDivide64, TuningFast11ByteNOP, TuningFastScalarShiftMasks, TuningBranchFusion, @@ -1483,6 +1488,7 @@ def ProcessorFeatures { TuningFastScalarShiftMasks, TuningFastVariablePerLaneShuffle, TuningFastMOVBE, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER, From nobody Wed May 29 05:36:02 2024 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 4Vpym23kG6z5LnTW; Wed, 29 May 2024 05:36: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 4Vpym22tQ9z4Zvj; Wed, 29 May 2024 05:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960962; 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=qFNDVZn4rkjT8QkUS5Y5bOqbXx2V9MPiVdoYbZJzJSU=; b=NzchU0fS57wuIPkFV9AJZjQS0+8ODNJZSLDVHMuXt0YhhTZcjZ25F9etnJl34bJq3mtXOg 8AWlJqsckn+TPS7NLmqyDg2E2igMTzbtbLWd3wHRV1V+8f0200o2c9FaYfqjqRDaafX+SQ cinnWurKKp7R8d8IB/F5NgGA9e79BFQa9tmmAYZ3tL7wEvrs4Y5aD/643E9wDGoJE5SMQh 394z/UcMom8FUwX+pYJ2S3QT17WyRUF0c5jNXshblXap24faZ6/zdmvZ6UTKIE+k1OhWzc qObmB8oiPcxY26c5k806hp8Qg+T2ZgVvDxgGeEYdhavMt705xo2kI/IzkOTj1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716960962; a=rsa-sha256; cv=none; b=LVn9b0ZAqvwdQnRl6WVOdV6+MWWuQEEIqCwwYV7gtZFuL7RWTXIgX6MrPhsbUhJ3WJk9gI wDeqcTVp1mAOirs3fHCPziUzLbfIwCpVR3y9vIy71m7oc6a+i7xqi69Y2gm5iyepeGPiJI 4h5A3hsLSMvZRvlZGLocGAhoOl6sdMq4J5xcokghKMJN+1Zp7fXMdy90qtSvkW4+0S/+rh u0Z86NRk5nP7SmdTF/ncdE+YgdQS71d8sEF8zTI8inllPpVZELEtgXISBFSUaP8euxMcNP Lx+JtK8zsbJiMgw+RYmciGIQxQB0Bwj0fqZiC0jIAzpxoMt63yEz/iOu6OpXrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960962; 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=qFNDVZn4rkjT8QkUS5Y5bOqbXx2V9MPiVdoYbZJzJSU=; b=fYj6uTh3En/wJkTFM2SVTuI4A5h6LyzVZHK4y4Kz32IEZCzHC7G8BZg8ww14VyElcgaHu4 sxQt7X5aQH5rBOa8HVajqkDlxzD+s5VJWyDPBn5yh/lXPaX68ilqv8nQbvtxWRZV/Cw+pa WqIbMhr5nvetLFrVkBmyxsCpY1sKPW6QZGbrHjtYfvt7x2N9mfnGv4mOq+yI7ml2E6/6AH fvfl28a12Fh1B/0S5JgFhyUM/GIbYOTK5XOjs8PAzI7eKIavokJRX9ooNkIDidBxP12zV6 fxcSV7VvmJ1pHb5xcEoUVNwAv0cNGYNd6qNhnVRUeACP/comOiXEiLoqrvLhHw== 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 4Vpym22LDNzjyH; Wed, 29 May 2024 05:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44T5a2vF085984; Wed, 29 May 2024 05:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T5a29u085981; Wed, 29 May 2024 05:36:02 GMT (envelope-from git) Date: Wed, 29 May 2024 05:36:02 GMT Message-Id: <202405290536.44T5a29u085981@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: 94d574327018 - stable/14 - mqueuefs: minor style pass 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 94d574327018ce6abfa34ed4e96ef104821d2889 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=94d574327018ce6abfa34ed4e96ef104821d2889 commit 94d574327018ce6abfa34ed4e96ef104821d2889 Author: Konstantin Belousov AuthorDate: 2024-05-22 02:52:47 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-29 05:35:38 +0000 mqueuefs: minor style pass (cherry picked from commit 63f18b37e01ef214de762a091d3c98ae5028c8f4) --- sys/kern/uipc_mqueue.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index f7695945fcc4..bb2e2bab0ba7 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -50,7 +50,6 @@ * use the IPC facility without having to mount mqueue file system. */ -#include #include "opt_capsicum.h" #include @@ -379,7 +378,7 @@ mqfs_fileno_free(struct mqfs_info *mi, struct mqfs_node *mn) static __inline struct mqfs_node * mqnode_alloc(void) { - return uma_zalloc(mqnode_zone, M_WAITOK | M_ZERO); + return (uma_zalloc(mqnode_zone, M_WAITOK | M_ZERO)); } static __inline void @@ -451,8 +450,8 @@ mqfs_create_node(const char *name, int namelen, struct ucred *cred, int mode, node->mn_type = nodetype; node->mn_refcount = 1; vfs_timestamp(&node->mn_birth); - node->mn_ctime = node->mn_atime = node->mn_mtime - = node->mn_birth; + node->mn_ctime = node->mn_atime = node->mn_mtime = + node->mn_birth; node->mn_uid = cred->cr_uid; node->mn_gid = cred->cr_gid; node->mn_mode = mode; @@ -1017,8 +1016,8 @@ mqfs_create(struct vop_create_args *ap) /* * Remove an entry */ -static -int do_unlink(struct mqfs_node *pn, struct ucred *ucred) +static int +do_unlink(struct mqfs_node *pn, struct ucred *ucred) { struct mqfs_node *parent; struct mqfs_vdata *vd; @@ -1244,15 +1243,15 @@ mqfs_setattr(struct vop_setattr_args *ap) td = curthread; vap = ap->a_vap; vp = ap->a_vp; - if ((vap->va_type != VNON) || - (vap->va_nlink != VNOVAL) || - (vap->va_fsid != VNOVAL) || - (vap->va_fileid != VNOVAL) || - (vap->va_blocksize != VNOVAL) || + if (vap->va_type != VNON || + vap->va_nlink != VNOVAL || + vap->va_fsid != VNOVAL || + vap->va_fileid != VNOVAL || + vap->va_blocksize != VNOVAL || (vap->va_flags != VNOVAL && vap->va_flags != 0) || - (vap->va_rdev != VNOVAL) || - ((int)vap->va_bytes != VNOVAL) || - (vap->va_gen != VNOVAL)) { + vap->va_rdev != VNOVAL || + (int)vap->va_bytes != VNOVAL || + vap->va_gen != VNOVAL) { return (EINVAL); } @@ -1281,7 +1280,7 @@ mqfs_setattr(struct vop_setattr_args *ap) * check in VOP_ACCESS() be enough? Also, are the group bits * below definitely right? */ - if (((ap->a_cred->cr_uid != pn->mn_uid) || uid != pn->mn_uid || + if ((ap->a_cred->cr_uid != pn->mn_uid || uid != pn->mn_uid || (gid != pn->mn_gid && !groupmember(gid, ap->a_cred))) && (error = priv_check(td, PRIV_MQ_ADMIN)) != 0) return (error); @@ -1291,7 +1290,7 @@ mqfs_setattr(struct vop_setattr_args *ap) } if (vap->va_mode != (mode_t)VNOVAL) { - if ((ap->a_cred->cr_uid != pn->mn_uid) && + if (ap->a_cred->cr_uid != pn->mn_uid && (error = priv_check(td, PRIV_MQ_ADMIN))) return (error); pn->mn_mode = vap->va_mode; @@ -1345,11 +1344,11 @@ mqfs_read(struct vop_read_args *ap) mq = VTOMQ(vp); snprintf(buf, sizeof(buf), - "QSIZE:%-10ld MAXMSG:%-10ld CURMSG:%-10ld MSGSIZE:%-10ld\n", - mq->mq_totalbytes, - mq->mq_maxmsg, - mq->mq_curmsgs, - mq->mq_msgsize); + "QSIZE:%-10ld MAXMSG:%-10ld CURMSG:%-10ld MSGSIZE:%-10ld\n", + mq->mq_totalbytes, + mq->mq_maxmsg, + mq->mq_curmsgs, + mq->mq_msgsize); buf[sizeof(buf)-1] = '\0'; len = strlen(buf); error = uiomove_frombuf(buf, len, uio); @@ -2014,7 +2013,7 @@ kern_kmq_open(struct thread *td, const char *upath, int flags, mode_t mode, AUDIT_ARG_MODE(mode); pdp = td->td_proc->p_pd; - cmode = (((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT); + cmode = ((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT; mq = NULL; if ((flags & O_CREAT) != 0 && attr != NULL) { if (attr->mq_maxmsg <= 0 || attr->mq_maxmsg > maxmsg) @@ -2809,7 +2808,7 @@ freebsd32_kmq_timedsend(struct thread *td, abs_timeout = NULL; waitok = !(fp->f_flag & O_NONBLOCK); error = mqueue_send(mq, uap->msg_ptr, uap->msg_len, - uap->msg_prio, waitok, abs_timeout); + uap->msg_prio, waitok, abs_timeout); out: fdrop(fp, td); return (error); @@ -2840,7 +2839,7 @@ freebsd32_kmq_timedreceive(struct thread *td, abs_timeout = NULL; waitok = !(fp->f_flag & O_NONBLOCK); error = mqueue_receive(mq, uap->msg_ptr, uap->msg_len, - uap->msg_prio, waitok, abs_timeout); + uap->msg_prio, waitok, abs_timeout); out: fdrop(fp, td); return (error); From nobody Wed May 29 05:36:04 2024 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 4Vpym46m5xz5LnJr; Wed, 29 May 2024 05:36: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 4Vpym45Nb6z4Zfn; Wed, 29 May 2024 05:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960964; 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=+usgUr7kI0sbqgfKpTpVb1/jHRq7w/leyCM1mb0pbwg=; b=b2Qfw4GdvXSooYEn0vpBLF0EBdCdFKeu1a5LWWiSTmYzWIVC5ggr4nMjrsP35J6dBmIAGt GJaAXb8ERcXUlTodeqyslmKfAv7bBp4M69aTKd9jTradyfnVR0Kq0QoihjAvmYGpaZtvgC 90vP19CUqz9OC1ijVvJ7CiwuYJ83kJ6SW8rxZGJlEqCxjyMw3cFYRV2FEoQ/mAa9YkpOUw 7xHfVCWadbrUH0AOlOB3KPTjx4QJ77m0U4CqwH841DRVLuObTU45/uQRMZREGM0Gh1Jj7u 93rixKJX2o1CLYRjlpxvSUOZ4e0+Ta9Ho+Yo1co6fEg84Azcml61Yk4oWpNZpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716960964; a=rsa-sha256; cv=none; b=IsMhuaramYfFU/sxXyub2DCsOzusMlmql+LKXe63x6Oa0ycy+KffD/a8Z74cnhWJsjS8qQ sLcZFSqd+u5t+rDiza6p1RFcz7VORePSuouqjL5HZSEP5KYO9rtoax4cyR3kn6krLbujSL BGWbknFkbp/8CIXAgAUrHaJEKT8+lzAA9+YcgUKwwy4JrXMoX+2ncCRtNdUrHGQz5eTQ5y zev2jJnHFh+QqU0eIhKmCLpHGo2OfvqUmkL9LjjQ8SjK1Av9SxF/gXMM/zKJvp6uH2aFxB 9V1bN3u28V/Nm2q5RdyLyUbVPde5tSuxyDcHlcq2UHwn4T6cLKf/2t7dhsSZ2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960964; 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=+usgUr7kI0sbqgfKpTpVb1/jHRq7w/leyCM1mb0pbwg=; b=TTmU6Ed8YJAafKKQolMhT6iadi9C4XjMZyPZoLc8cNtb6yKDqbdXsuh2JVCYR8x4NWi9Xj zVk7hO0ATkZaRkGs1gTTLTRtx27RQmQw0DX61P2QI2sW+Ad7mjEIxmkVCzCcD8X5d5CBDk 0sjhLKzpu5pv20feOYYYYW5slXMSpu2QlXIt0f/bvasJI569BCFOVPSKkhqLi8hyLTCIEi +KD6fBCeKLuViWdqH++f9gDkajbJycXE2YbQrkVmGbi+2FBtORy1jMvzxs35wEv5LKlMs1 aRCu1j63/jT1SKx0gMND1/bYevyYCdtTRN/BmkwVAijCQrKZ6tr2cA/zf2t8Wg== 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 4Vpym44l4JzkLC; Wed, 29 May 2024 05:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44T5a4GP086101; Wed, 29 May 2024 05:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T5a4iI086099; Wed, 29 May 2024 05:36:04 GMT (envelope-from git) Date: Wed, 29 May 2024 05:36:04 GMT Message-Id: <202405290536.44T5a4iI086099@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: 5e77282d3a35 - stable/14 - mqueuefs: mark newly allocated vnode as constructed, under the lock 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 5e77282d3a35f4bff0f15678b27a71aaac041762 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e77282d3a35f4bff0f15678b27a71aaac041762 commit 5e77282d3a35f4bff0f15678b27a71aaac041762 Author: Konstantin Belousov AuthorDate: 2024-05-22 02:39:59 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-29 05:35:38 +0000 mqueuefs: mark newly allocated vnode as constructed, under the lock (cherry picked from commit f0a4dd6d46e99d47fde12aabdaa52e75b59e95f4) --- sys/kern/uipc_mqueue.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index dd6bf3c4a0a9..5fcabbac7923 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -811,6 +811,7 @@ found: panic("%s has unexpected type: %d", pn->mn_name, pn->mn_type); } sx_xunlock(&mqfs->mi_lock); + vn_set_state(*vpp, VSTATE_CONSTRUCTED); return (0); } From nobody Wed May 29 05:36:26 2024 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 4VpymV3rgkz5LnD6; Wed, 29 May 2024 05:36: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 4VpymV253lz4b0f; Wed, 29 May 2024 05:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960986; 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=dC3oSurCaJoalGs/AA6W/xnktHhbxF4pZW7K4bsHwfM=; b=AMqteLdbXRT2kj9P1cN8tz8ovXQ+r1zf4EtpUVhlniJCXnCOBSIC5VMP3yNfFX1l7vL7zy zNSq4L9cmOXx6xbzy4pGAJw1xcYpnj4Ix4174UM/1FQ05VTgiP8D4hQY8rmgKxqICsfrln meViIi+aMdCBL9K5LxyyDZK785Iu883E7UxzFgXbvXjUlpRGLo3BlwQ33jYm3DUhCBvAKG zP2torSdw9MCtsWDEsHIF7ws5IBDsAzrxgnyypR8kb7Je6u1OUyE5lUN1iCFj4K8fz0meO 1O3JXY9zAYl8A1aeJlbJOlducUAcGhbem6gLKKe2gNXQHbGPC0YIMv1x/8xiJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716960986; a=rsa-sha256; cv=none; b=f/HkBYBVbV0IfGcinCpp7yu20WDyBu1zELil6K9eEvwYKiUxx8M3rOZmoSRebtcXQCj+iQ FUqVIQL7OSAnrwij4q/SCDKA69OIlqcIjnTR7VI5/8IKcOOBEHCZMzjX+Tg+Nih8g/gjyr UHkxn4nZCS0ett40mQf/7nbeBQ470RbIjiuGgEz/Z7xeQH/2J7V52ZZN5d4br7EKd7VUoz s5w4ikPBx946LNqIvgc7yffIjHAfMAw9OOhvyMS2pdI+neyES+Q8J0CucVihMxNtebXbi0 ZLn5VTuUcf6WgCnfo4u7OBmvuyZwzrMi7gp6kgKKTBrq3rU0Ji3H5/a6AB63OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960986; 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=dC3oSurCaJoalGs/AA6W/xnktHhbxF4pZW7K4bsHwfM=; b=JmKrTKZXOOObaBtgN+zy0uiqVW8w3jpeojiYtPb5lE12y0K5yEc3pXvviaD79HDqfLdENs q8EyqwBqVgXYpiyCaEncbxpMvjuB1zCzqvyvPdYCWomOPdXjNnPhHldvKSXhbL/KOIbXbF BKlx1vEMECWgVvhj4XOJTPeF/Wv7AJjTQPQHsXXiOKs44ciq2abDwwuCacRJnblSaPonXG QOyJCD6LDHUFFhjxm368g+Ufj1ni5kXtQSYdHKq0G6b3aeTmGJvQvwOuVijFvh1dyl+qUp 1Bl/xjZpjGPOxmnneRT8UN68qrDIwGx3AdLSDWcaS2fpEyQYU1az9D7P2BxmeA== 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 4VpymV1KRtzk8p; Wed, 29 May 2024 05:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44T5aQHJ086295; Wed, 29 May 2024 05:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T5aQ13086292; Wed, 29 May 2024 05:36:26 GMT (envelope-from git) Date: Wed, 29 May 2024 05:36:26 GMT Message-Id: <202405290536.44T5aQ13086292@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: 3426b8269cab - stable/13 - mqueuefs: minor style pass 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 3426b8269cab35e8d8b3ab33a876bd5fffa9d070 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3426b8269cab35e8d8b3ab33a876bd5fffa9d070 commit 3426b8269cab35e8d8b3ab33a876bd5fffa9d070 Author: Konstantin Belousov AuthorDate: 2024-05-22 02:52:47 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-29 05:36:13 +0000 mqueuefs: minor style pass (cherry picked from commit 63f18b37e01ef214de762a091d3c98ae5028c8f4) --- sys/kern/uipc_mqueue.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 2038de9324fc..5256a00cd831 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -50,7 +50,6 @@ * use the IPC facility without having to mount mqueue file system. */ -#include #include "opt_capsicum.h" #include @@ -379,7 +378,7 @@ mqfs_fileno_free(struct mqfs_info *mi, struct mqfs_node *mn) static __inline struct mqfs_node * mqnode_alloc(void) { - return uma_zalloc(mqnode_zone, M_WAITOK | M_ZERO); + return (uma_zalloc(mqnode_zone, M_WAITOK | M_ZERO)); } static __inline void @@ -451,8 +450,8 @@ mqfs_create_node(const char *name, int namelen, struct ucred *cred, int mode, node->mn_type = nodetype; node->mn_refcount = 1; vfs_timestamp(&node->mn_birth); - node->mn_ctime = node->mn_atime = node->mn_mtime - = node->mn_birth; + node->mn_ctime = node->mn_atime = node->mn_mtime = + node->mn_birth; node->mn_uid = cred->cr_uid; node->mn_gid = cred->cr_gid; node->mn_mode = mode; @@ -1020,8 +1019,8 @@ mqfs_create(struct vop_create_args *ap) /* * Remove an entry */ -static -int do_unlink(struct mqfs_node *pn, struct ucred *ucred) +static int +do_unlink(struct mqfs_node *pn, struct ucred *ucred) { struct mqfs_node *parent; struct mqfs_vdata *vd; @@ -1247,15 +1246,15 @@ mqfs_setattr(struct vop_setattr_args *ap) td = curthread; vap = ap->a_vap; vp = ap->a_vp; - if ((vap->va_type != VNON) || - (vap->va_nlink != VNOVAL) || - (vap->va_fsid != VNOVAL) || - (vap->va_fileid != VNOVAL) || - (vap->va_blocksize != VNOVAL) || + if (vap->va_type != VNON || + vap->va_nlink != VNOVAL || + vap->va_fsid != VNOVAL || + vap->va_fileid != VNOVAL || + vap->va_blocksize != VNOVAL || (vap->va_flags != VNOVAL && vap->va_flags != 0) || - (vap->va_rdev != VNOVAL) || - ((int)vap->va_bytes != VNOVAL) || - (vap->va_gen != VNOVAL)) { + vap->va_rdev != VNOVAL || + (int)vap->va_bytes != VNOVAL || + vap->va_gen != VNOVAL) { return (EINVAL); } @@ -1284,7 +1283,7 @@ mqfs_setattr(struct vop_setattr_args *ap) * check in VOP_ACCESS() be enough? Also, are the group bits * below definitely right? */ - if (((ap->a_cred->cr_uid != pn->mn_uid) || uid != pn->mn_uid || + if ((ap->a_cred->cr_uid != pn->mn_uid || uid != pn->mn_uid || (gid != pn->mn_gid && !groupmember(gid, ap->a_cred))) && (error = priv_check(td, PRIV_MQ_ADMIN)) != 0) return (error); @@ -1294,7 +1293,7 @@ mqfs_setattr(struct vop_setattr_args *ap) } if (vap->va_mode != (mode_t)VNOVAL) { - if ((ap->a_cred->cr_uid != pn->mn_uid) && + if (ap->a_cred->cr_uid != pn->mn_uid && (error = priv_check(td, PRIV_MQ_ADMIN))) return (error); pn->mn_mode = vap->va_mode; @@ -1348,11 +1347,11 @@ mqfs_read(struct vop_read_args *ap) mq = VTOMQ(vp); snprintf(buf, sizeof(buf), - "QSIZE:%-10ld MAXMSG:%-10ld CURMSG:%-10ld MSGSIZE:%-10ld\n", - mq->mq_totalbytes, - mq->mq_maxmsg, - mq->mq_curmsgs, - mq->mq_msgsize); + "QSIZE:%-10ld MAXMSG:%-10ld CURMSG:%-10ld MSGSIZE:%-10ld\n", + mq->mq_totalbytes, + mq->mq_maxmsg, + mq->mq_curmsgs, + mq->mq_msgsize); buf[sizeof(buf)-1] = '\0'; len = strlen(buf); error = uiomove_frombuf(buf, len, uio); @@ -2019,7 +2018,7 @@ kern_kmq_open(struct thread *td, const char *upath, int flags, mode_t mode, AUDIT_ARG_MODE(mode); pdp = td->td_proc->p_pd; - cmode = (((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT); + cmode = ((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT; mq = NULL; if ((flags & O_CREAT) != 0 && attr != NULL) { if (attr->mq_maxmsg <= 0 || attr->mq_maxmsg > maxmsg) @@ -2815,7 +2814,7 @@ freebsd32_kmq_timedsend(struct thread *td, abs_timeout = NULL; waitok = !(fp->f_flag & O_NONBLOCK); error = mqueue_send(mq, uap->msg_ptr, uap->msg_len, - uap->msg_prio, waitok, abs_timeout); + uap->msg_prio, waitok, abs_timeout); out: fdrop(fp, td); return (error); @@ -2846,7 +2845,7 @@ freebsd32_kmq_timedreceive(struct thread *td, abs_timeout = NULL; waitok = !(fp->f_flag & O_NONBLOCK); error = mqueue_receive(mq, uap->msg_ptr, uap->msg_len, - uap->msg_prio, waitok, abs_timeout); + uap->msg_prio, waitok, abs_timeout); out: fdrop(fp, td); return (error); From nobody Wed May 29 05:36:27 2024 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 4VpymW5CMWz5LnRX; Wed, 29 May 2024 05:36: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 4VpymW2n2Hz4bK5; Wed, 29 May 2024 05:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960987; 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=XObJ5DbzVa3tFi1YX0CgYPLUAdTrri0F2Jh+QF+jRNk=; b=bgoFjyy+XvfnfnqE2W2Ap86xOIbUgNqjefb9ZDwgLRAYpKbcmyDZ/qSSHBDQTI5HnuwpNC AAsC7iOYfwRfTxr/0nKFG5DvJPx31rArcJjphlDJbdeV/S8eLG/6X4ZtQaya+aXSfqPjhS eI6RnqRbMjdECTnU1cuTbRgKSQ39fzvvn3mDig5MbGsHbH1adGnANJTdy0LI5+Zn4XCQ3S U6QLNMplogP/9MN4Zfdz8JLKxx4PNwJn3p9q0TzDov8uZXglfThxXPuQhqaFYz1c8Wgkuz zXJ1uWf4iJBT6sgrvjmLHRkzTYCsv0Vgyn4Bf2/dePCAEAkpp4GAwXMrJ5aYRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716960987; a=rsa-sha256; cv=none; b=wMqbzxzwX0ePqSiKWZuq06DZ/PCZzn515EvaoW2ZzO+uWCZzuCd74pWDSyEnmAC/H892o/ pmmNHdN+mggBI13md1dANWaMlMr/YeakpNdQDm0cR3XTJtC9iFRBjfz9LhRecE1WKZcyb1 XXadMtgJW6suyTbGKrn443Hs2R1WUkueufcku4iSZk2sjyszlWd0PkbONc75T68iS750K5 mTshlMs9hndW5No5xAfgKMhKxOkq/rn8u8D2+56Y9oGCg6aboxsz7TMBLGZjVceyTix6aC p4NbmBmUjCtRyWmntavV+o2uLhN/RY/hhd+HLfb9ygxK4Ura3DdpNd31fLYcMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960987; 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=XObJ5DbzVa3tFi1YX0CgYPLUAdTrri0F2Jh+QF+jRNk=; b=yLSLWRfcnhlSGC7NMfJM872uhLRKKfqnil4qukGUcJiWaV9vPYE5yf9QT6c9jcWygrE/PL KoGRAml3bdDtTw/efCnVB5IcAGGq0EigaCTYdH6TUipMNNqOXQkY6PwMHd3UK7ZCm3jTZ5 vMS/iTlHUZaVaOG8KGL4bmvSfjHb/gtDyo6lIcfkjl6XceUWMjf09Wdz6PQ5GOTK3oR2fP 5rPFioz2LBFnTDvAV1KEPSU/1CQrTqKkr9eUE5K1lvwtJjB7BnXvBDMCeJni5SJsA8om3E TBO9W5LGOQJSA2DUjnh32l3kezXKIrHbNmw8ULuvnx86mZr7eY4GAzELn8d0vQ== 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 4VpymW1vmfzkft; Wed, 29 May 2024 05:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44T5aRfB086355; Wed, 29 May 2024 05:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T5aRZ0086352; Wed, 29 May 2024 05:36:27 GMT (envelope-from git) Date: Wed, 29 May 2024 05:36:27 GMT Message-Id: <202405290536.44T5aRZ0086352@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: 6446348a4f37 - stable/13 - mqueuefs: uma_zfree() can be postponed until mqfs sx mi_lock is dropped 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 6446348a4f37d49fe4c674ffe2d81a93b0dca0b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6446348a4f37d49fe4c674ffe2d81a93b0dca0b5 commit 6446348a4f37d49fe4c674ffe2d81a93b0dca0b5 Author: Konstantin Belousov AuthorDate: 2024-05-22 01:46:28 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-29 05:36:13 +0000 mqueuefs: uma_zfree() can be postponed until mqfs sx mi_lock is dropped (cherry picked from commit b6f4a3fa75d24637b4d81035655fcb3d3ea187ad) --- sys/kern/uipc_mqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 5256a00cd831..be3e3fefa749 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -1112,9 +1112,9 @@ mqfs_reclaim(struct vop_reclaim_args *ap) sx_xlock(&mqfs->mi_lock); vp->v_data = NULL; LIST_REMOVE(vd, mv_link); - uma_zfree(mvdata_zone, vd); mqnode_release(pn); sx_xunlock(&mqfs->mi_lock); + uma_zfree(mvdata_zone, vd); return (0); } From nobody Wed May 29 15:40:56 2024 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 4VqDB14n8Jz5MkQQ; Wed, 29 May 2024 15:40: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 4VqDB105Rfz4bBc; Wed, 29 May 2024 15:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716997257; 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=l4lnXLTJQl9BPzzvW56Kc1+9Mz0brGqbuMetXnO64mY=; b=obkY8IqjtNBlbL6hByFKHFUWElFS1dGGSGF2ACDM3uJRq21PeegM2m+AvD20BxshKUQ6AV Wy6St4xp6bQM4GTgBZX7NncBVz8qzXkITYLna/RLv8Q/UZm9Pwpkv7/Ba+cq9w4AaPMMEL lR6vNMUlwrnjSMQtQlgwhunNmL/oLVvKPV/v6jbpwc19wo/cBJ122Rlyu2ESbZoh1Gmajc KvN21KRe4SW95K60mGVC69vXV4zhPBucikImqonXNfXwxHAem5NgAe7++PLwE8v8jBJBzc EucZYmIvQK1hxMqaNVfxHb3UWJ7W74VsBG97KPX4z7xic9MBruh8ufYwgPtbKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716997257; a=rsa-sha256; cv=none; b=m/b8bdEzaX2Lq7T/pVbUVuYbu/Ls398F3dVeU85IpHI4RUqE6/6Aa84l4G4XC6dbFr1oms 8D/QlxgV9I8PoaOt+TAUHazISlzb8dm9FdqF4zEvy0I4vak9m1VHByVyUNpRs5PdyUPWRF fVLAYmBQeRqeEGCvQn/OLenkPHJY8gwsaOYCbEo7MK+r3h+K2/1yuYF9s/XudCTLP0Gquv mwpYimmX4huxNrx9WYJushp1mLUyGdkKCoclELItRBiq2f4zMqVOLLW3wPM2lfTyld4d/T lf4ccgxAKbJFE9lBZfSYT8IfOK4K5LS5z3BOl4rSk0F6Y3DvxPz25c6jha6Kmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716997257; 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=l4lnXLTJQl9BPzzvW56Kc1+9Mz0brGqbuMetXnO64mY=; b=eigZdMAqJ4wee+gbu3hUDiyjsBLhTdtLwoLewFIw9EkuVrLCPfQe53+QQYaHyqeWKVTjUf 5lPZNmjYFAwtnIvuEEMbP8ZAgGbdCoqQw6c73eZ4CsHAxF1FBpieu52Z1MjySr0xxwEXfg 368CFKoc+eFNLsj4XxBV+ywEEejmmUydmUIQzCiMOD2VCYq7EgWizNclSFZvLsFKDO8T6P j7BI58INNq/1BoEqdRvX0lWM3NKL+kSzscOOFe9LRVCZuteT/wlQMm0IN1InBo2fLKQfS1 j1eViL06DXYC5m4eez66SeLutQ0/dDDc+lzj55ioBwz0fSnDJnDnqufL/rzGDA== 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 4VqDB06m3nz12CT; Wed, 29 May 2024 15:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44TFeufK008293; Wed, 29 May 2024 15:40:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TFeu0I008290; Wed, 29 May 2024 15:40:56 GMT (envelope-from git) Date: Wed, 29 May 2024 15:40:56 GMT Message-Id: <202405291540.44TFeu0I008290@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: 1e3dfe0c343c - stable/14 - libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 1e3dfe0c343c74d4c7162e25378b221e5a797917 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1e3dfe0c343c74d4c7162e25378b221e5a797917 commit 1e3dfe0c343c74d4c7162e25378b221e5a797917 Author: Ed Maste AuthorDate: 2024-05-24 17:27:29 +0000 Commit: Ed Maste CommitDate: 2024-05-29 15:40:18 +0000 libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map To fix WITHOUT_NIS build. Building yp_xdr.c is gated by MK_NIS. PR: 279270 Reported by: peterj Reported by: matteo Reported by: Michael Dexter's Build Option Survey run Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45347 (cherry picked from commit 61639bb3fc5abe0bb7b096e643b51c30703ac432) --- lib/libc/rpc/Symbol.map | 31 ------------------------------- lib/libc/yp/Symbol.map | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/lib/libc/rpc/Symbol.map b/lib/libc/rpc/Symbol.map index 5bf364f28d81..e4fecb83ec66 100644 --- a/lib/libc/rpc/Symbol.map +++ b/lib/libc/rpc/Symbol.map @@ -8,37 +8,6 @@ FBSD_1.0 { xdr_desargs; xdr_desresp; - /* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */ - xdr_domainname; - xdr_keydat; - xdr_mapname; - xdr_peername; - xdr_valdat; - xdr_ypbind_binding; - xdr_ypbind_resp; - xdr_ypbind_resptype; - xdr_ypbind_setdom; - xdr_ypmap_parms; - xdr_ypmaplist; - xdr_yppush_status; - xdr_yppushresp_xfr; - xdr_ypreq_key; - xdr_ypreq_nokey; - xdr_ypreq_xfr; - xdr_ypreqtype; - xdr_yprequest; - xdr_ypresp_all; - xdr_ypresp_key_val; - xdr_ypresp_maplist; - xdr_ypresp_master; - xdr_ypresp_order; - xdr_ypresp_val; - xdr_ypresp_xfr; - xdr_ypresponse; - xdr_ypresptype; - xdr_ypstat; - xdr_ypxfrstat; - authdes_seccreate; authdes_pk_seccreate; authnone_create; diff --git a/lib/libc/yp/Symbol.map b/lib/libc/yp/Symbol.map index fff2b2e60e39..f50beed7be31 100644 --- a/lib/libc/yp/Symbol.map +++ b/lib/libc/yp/Symbol.map @@ -18,4 +18,36 @@ FBSD_1.0 { yperr_string; ypprot_err; _yp_check; + + /* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */ + xdr_domainname; + xdr_keydat; + xdr_mapname; + xdr_peername; + xdr_valdat; + xdr_ypbind_binding; + xdr_ypbind_resp; + xdr_ypbind_resptype; + xdr_ypbind_setdom; + xdr_ypmap_parms; + xdr_ypmaplist; + xdr_yppush_status; + xdr_yppushresp_xfr; + xdr_ypreq_key; + xdr_ypreq_nokey; + xdr_ypreq_xfr; + xdr_ypreqtype; + xdr_yprequest; + xdr_ypresp_all; + xdr_ypresp_key_val; + xdr_ypresp_maplist; + xdr_ypresp_master; + xdr_ypresp_order; + xdr_ypresp_val; + xdr_ypresp_xfr; + xdr_ypresponse; + xdr_ypresptype; + xdr_ypstat; + xdr_ypxfrstat; + }; From nobody Wed May 29 16:27:08 2024 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 4VqFCJ6J0tz5Mnq8; Wed, 29 May 2024 16: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 4VqFCJ4J84z4hLK; Wed, 29 May 2024 16: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=1717000028; 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=QTL8ziMqUMOnYTsSqL/6lAPm2uyGYS19HHLXuKWWFAk=; b=aU6uJ4+F0MqInrjfzVcJRwT+TeeT/6h5k8z6+oAzonK8KNwQCuzl+dZUpoH5knqiLLNigI E8yPpfNhBIoub7zNIeWcZiKME09tb82nP6OfbVyJlZm204xAomLpLvRz1cefwIXp+hg5as FWtK1smAd9OWPDRSb/s283U2TcBCEv1qrETy9LgRrCSuvzVf5BjCgspkjV3UG9WLnxF+lp KZoUArHSCewUQVKs3sUu0SiW+ncp4UH8ZsZoyro2kf4nGZG1MCE9KZINVDwnWq9yPrYxVx 6YGw6GFKJMvRzwWnjjnnQ8sJRp+PCbb5A+7PpowjN9PSwvxafyXxfo4aGiyFcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717000028; a=rsa-sha256; cv=none; b=W+78tn7dJxhogrEG0fEI8HqJflQlHXpGH7leXlKmBHks+vlRT0pBGBCgkePJm5ulJqkJb8 m5iU2tiXFsoHs/yhSMwMGcz6TVNm3B1w9cepCOe1YMPYW6I7Bo2uEq3aU4ZklSvqvAInSj N7NF+juzWmwGDIbuBBa1p7j/osSOFxaoIr/XQJnM12Oo2CtndIRh0HPraW9QxEUcVLCmKJ MZtTr372WONwtYlj6c17kn3lMOWc+fUrzURlNh/8uxGOECfc+te2E5M7RRaptt70gqpXq6 QUc6f7OzNTB+QvfJSlrEKwrdkyb1oJuIPM0kY6qES+d6Ttom4gBJRJ0tUvvguA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717000028; 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=QTL8ziMqUMOnYTsSqL/6lAPm2uyGYS19HHLXuKWWFAk=; b=lxl9/I0yq52cxogobM5LJ81YCTAA8MSnb5AnA+Q80lHaQ9L52aoktObE+L40CV854zGWzM ZNDbJgn5KZbu1F6MZ1wWSy5CadXFWDFeB9qfW2RcOMp5z2r4CjK3lnLiVq0vgHa4U9ajMf i6Zi1kuYdKK+N/BykIHyXcV9YrWg3+qJULxbT8y3SxTLVaJPTj619wWBIJaDJV9BYV0fJu +iD5fXCfvVZ2Ic0EUnE6LfxMFKkjBV/sKTcKkcwGrudHSlCr35iLIgbE8d7iF9l5SBSnil r7NUgOE1YdRC2IwZ0ETL6jDCp4LWRoe30acpLWqk3UYmdJCiwY1OA0pK6z/S7A== 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 4VqFCJ3trkz13Lv; Wed, 29 May 2024 16:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44TGR876084205; Wed, 29 May 2024 16:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TGR899084201; Wed, 29 May 2024 16:27:08 GMT (envelope-from git) Date: Wed, 29 May 2024 16:27:08 GMT Message-Id: <202405291627.44TGR899084201@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: 4010c267a55c - stable/13 - libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 4010c267a55c5bdb8f752f023d147de3021f9d75 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4010c267a55c5bdb8f752f023d147de3021f9d75 commit 4010c267a55c5bdb8f752f023d147de3021f9d75 Author: Ed Maste AuthorDate: 2024-05-24 17:27:29 +0000 Commit: Ed Maste CommitDate: 2024-05-29 15:42:17 +0000 libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map To fix WITHOUT_NIS build. Building yp_xdr.c is gated by MK_NIS. PR: 279270 Reported by: peterj Reported by: matteo Reported by: Michael Dexter's Build Option Survey run Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45347 (cherry picked from commit 61639bb3fc5abe0bb7b096e643b51c30703ac432) (cherry picked from commit 1e3dfe0c343c74d4c7162e25378b221e5a797917) --- lib/libc/rpc/Symbol.map | 31 ------------------------------- lib/libc/yp/Symbol.map | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/lib/libc/rpc/Symbol.map b/lib/libc/rpc/Symbol.map index 89b434ce67db..cee6b26bc3d1 100644 --- a/lib/libc/rpc/Symbol.map +++ b/lib/libc/rpc/Symbol.map @@ -11,37 +11,6 @@ FBSD_1.0 { xdr_desargs; xdr_desresp; - /* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */ - xdr_domainname; - xdr_keydat; - xdr_mapname; - xdr_peername; - xdr_valdat; - xdr_ypbind_binding; - xdr_ypbind_resp; - xdr_ypbind_resptype; - xdr_ypbind_setdom; - xdr_ypmap_parms; - xdr_ypmaplist; - xdr_yppush_status; - xdr_yppushresp_xfr; - xdr_ypreq_key; - xdr_ypreq_nokey; - xdr_ypreq_xfr; - xdr_ypreqtype; - xdr_yprequest; - xdr_ypresp_all; - xdr_ypresp_key_val; - xdr_ypresp_maplist; - xdr_ypresp_master; - xdr_ypresp_order; - xdr_ypresp_val; - xdr_ypresp_xfr; - xdr_ypresponse; - xdr_ypresptype; - xdr_ypstat; - xdr_ypxfrstat; - authdes_seccreate; authdes_pk_seccreate; authnone_create; diff --git a/lib/libc/yp/Symbol.map b/lib/libc/yp/Symbol.map index ecd17af4a29a..71cccb3dfebe 100644 --- a/lib/libc/yp/Symbol.map +++ b/lib/libc/yp/Symbol.map @@ -21,4 +21,36 @@ FBSD_1.0 { yperr_string; ypprot_err; _yp_check; + + /* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */ + xdr_domainname; + xdr_keydat; + xdr_mapname; + xdr_peername; + xdr_valdat; + xdr_ypbind_binding; + xdr_ypbind_resp; + xdr_ypbind_resptype; + xdr_ypbind_setdom; + xdr_ypmap_parms; + xdr_ypmaplist; + xdr_yppush_status; + xdr_yppushresp_xfr; + xdr_ypreq_key; + xdr_ypreq_nokey; + xdr_ypreq_xfr; + xdr_ypreqtype; + xdr_yprequest; + xdr_ypresp_all; + xdr_ypresp_key_val; + xdr_ypresp_maplist; + xdr_ypresp_master; + xdr_ypresp_order; + xdr_ypresp_val; + xdr_ypresp_xfr; + xdr_ypresponse; + xdr_ypresptype; + xdr_ypstat; + xdr_ypxfrstat; + }; From nobody Thu May 30 01:42:33 2024 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 4VqTXB4Vftz5Llkw; Thu, 30 May 2024 01:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqTXB48LBz4KRR; Thu, 30 May 2024 01:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717033354; 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=SIJvlwm+oUvhcAyXeUZzrPPPP0uLrsepA/4kJVFhF7s=; b=JOXsXIn99E/MRAXD+9Ia0Rl7VOKnsor/h7mEpFxkJdgEwJUdbgkBo7ELuY8kKVM0IndNAe s8w8UZptn/FQFP2tZFwo+oXC2eat/cVyovNBKDzu2tX6JqFYNF5YuJPQ8tD54s2WcS91BB 4Zsr3moDWWsq1q42nrkbLY5xKHUh8hjlAs8Mn/NAhEK3WRcdaoek8Nd0amgrOENB0IUei1 DrIpXDsLz7IeuRocUNlHXgUYld3DYn5gx05RuezmohND1d0K85rJmtpzP5nRI3y723ZhdO NQlAd9xB614wWOQSdeMOOTmUvgJhiiijng7Tcwwad3mYbo4TIdgSUctQ//3Mng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717033354; a=rsa-sha256; cv=none; b=lpz6kYoRAkhYQkxENJMSGafxGMOw9Gt2AlNfI/I72Zai917BXb2h6BKQ3ta5rBCx4hxqbs DhEJyXadsHCIilr74zZwxERMgw4RcnYKyxc8ELBNvjH5Cdw73ucu9LeiitefSE9Lvh6Cn/ VUKlKjUH8BoDBgItky1tLriho0yAWGz65STMaOE9whxI2ahNvp7YRRcl7HE2WmWcAQ3JWb m2f1JGjxxp1AB4fkKcJ3rcqnu1f4qh+U4GuKsn7rIBKiieMl+Bg21RAloOjghExBWY13YJ wIqizPB5Wb+A/q1AG1+UsO+dvpa0atZd491mA2v6kpCUMr1AqAhacSY+YWK6hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717033354; 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=SIJvlwm+oUvhcAyXeUZzrPPPP0uLrsepA/4kJVFhF7s=; b=CZMHUxvMxfA743CaphaJa/rV1lqWkZxYhK52rD+KIfxGFtg9CQdDaByXz6A8Ba0saTWAU1 Wpl6daznzBy7PXVzG46sDJS4CN1Vp6LYaEB1R2besIHWJwoxHVvq9LZpgTIekkIaTf4GOu 3g3oaNZYscstZ/TFzUs7R382EFl+cOF6sWPfJqBcAqH64zaPDN8lnFmBOUKP+TKJ6Wr4Qc HoJ4o5m6dTpvqqAqGr0UM1/pIJ22o/qqbovW/XTqtOPpcegULUIch6qUf964rkw1L4OvAk XRWIbTqGVEWOLslj2aTSXpNDvTDh15ikbxdhfNh+WWQQ9LMBap9PJnjj6W0T6Q== 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 4VqTXB3lT5zLNr; Thu, 30 May 2024 01:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44U1gYbi028806; Thu, 30 May 2024 01:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U1gXTX028802; Thu, 30 May 2024 01:42:33 GMT (envelope-from git) Date: Thu, 30 May 2024 01:42:33 GMT Message-Id: <202405300142.44U1gXTX028802@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: f9b726163260 - stable/14 - ntp: Vendor import of ntp-4.2.8p18 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: f9b726163260d7428846865abc1d133a68197e09 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=f9b726163260d7428846865abc1d133a68197e09 commit f9b726163260d7428846865abc1d133a68197e09 Author: Cy Schubert AuthorDate: 2024-05-27 01:41:22 +0000 Commit: Cy Schubert CommitDate: 2024-05-30 01:42:19 +0000 ntp: Vendor import of ntp-4.2.8p18 Merge commit '1f833b3fc9968c3dd7ed79ccf0525ebf16c891ad' into main (cherry picked from commit f5f40dd63bc7acbb5312b26ac1ea1103c12352a6) --- contrib/ntp/COPYRIGHT | 4 +- contrib/ntp/ChangeLog | 120 +- contrib/ntp/CommitLog | 3221 ++++ contrib/ntp/Makefile.am | 6 +- contrib/ntp/Makefile.in | 7 +- contrib/ntp/NEWS | 3902 ++++ contrib/ntp/adjtimed/Makefile.in | 13 +- contrib/ntp/check-libntp.mf | 10 +- contrib/ntp/check-libntpd.mf | 13 +- contrib/ntp/check-libunity.mf | 4 +- contrib/ntp/check-scm-rev.mf | 6 +- contrib/ntp/clockstuff/Makefile.in | 13 +- contrib/ntp/config.h.in | 44 +- contrib/ntp/configure | 2726 +-- contrib/ntp/configure.ac | 81 +- contrib/ntp/flock-build | 22 +- contrib/ntp/html/.datecheck | 0 contrib/ntp/html/clockopt.html | 9 +- contrib/ntp/html/copyright.html | 4 +- contrib/ntp/html/release.html | 2 +- contrib/ntp/include/Makefile.am | 1 + contrib/ntp/include/Makefile.in | 2 + contrib/ntp/include/c99_snprintf.h | 28 + contrib/ntp/include/isc/Makefile.in | 1 + contrib/ntp/include/lib_strbuf.h | 30 +- contrib/ntp/include/ntp.h | 73 +- contrib/ntp/include/ntp_config.h | 13 +- contrib/ntp/include/ntp_control.h | 2 +- contrib/ntp/include/ntp_lists.h | 4 +- contrib/ntp/include/ntp_md5.h | 25 +- contrib/ntp/include/ntp_net.h | 13 +- contrib/ntp/include/ntp_psl.h | 11 +- contrib/ntp/include/ntp_stdlib.h | 20 +- contrib/ntp/include/ntp_tty.h | 5 + contrib/ntp/include/ntp_types.h | 10 - contrib/ntp/include/ntpd.h | 80 +- contrib/ntp/include/vint64ops.h | 2 +- contrib/ntp/kernel/Makefile.in | 1 + contrib/ntp/kernel/sys/Makefile.in | 1 + contrib/ntp/libntp/Makefile.am | 1 - contrib/ntp/libntp/Makefile.in | 76 +- contrib/ntp/libntp/a_md5encrypt.c | 169 +- contrib/ntp/libntp/adjtime.c | 2 +- contrib/ntp/libntp/audio.c | 2 +- contrib/ntp/libntp/authkeys.c | 4 + contrib/ntp/libntp/authreadkeys.c | 12 +- contrib/ntp/libntp/bsd_strerror.c | 2 +- contrib/ntp/libntp/clocktypes.c | 1 - contrib/ntp/libntp/dofptoa.c | 2 - contrib/ntp/libntp/dolfptoa.c | 2 - contrib/ntp/libntp/humandate.c | 1 - contrib/ntp/libntp/lib/isc/win32/strerror.c | 64 +- contrib/ntp/libntp/lib_strbuf.c | 51 +- contrib/ntp/libntp/machines.c | 60 +- contrib/ntp/libntp/modetoa.c | 1 - contrib/ntp/libntp/msyslog.c | 6 +- contrib/ntp/libntp/netof.c | 24 +- contrib/ntp/libntp/ntp_calendar.c | 1 - contrib/ntp/libntp/ntp_intres.c | 6 - contrib/ntp/libntp/ntp_realpath.c | 43 +- contrib/ntp/libntp/numtoa.c | 64 +- contrib/ntp/libntp/numtohost.c | 43 - contrib/ntp/libntp/prettydate.c | 1 - contrib/ntp/libntp/recvbuff.c | 39 +- contrib/ntp/libntp/refnumtoa.c | 1 - contrib/ntp/libntp/snprintf.c | 2 +- contrib/ntp/libntp/socket.c | 16 +- contrib/ntp/libntp/socktoa.c | 1 - contrib/ntp/libntp/socktohost.c | 1 - contrib/ntp/libntp/ssl_init.c | 74 +- contrib/ntp/libntp/statestr.c | 1 - contrib/ntp/libntp/systime.c | 1 - contrib/ntp/libntp/timexsup.c | 22 +- contrib/ntp/libntp/uglydate.c | 1 - contrib/ntp/libntp/vint64ops.c | 21 +- contrib/ntp/libntp/work_thread.c | 17 +- contrib/ntp/libparse/Makefile.am | 15 +- contrib/ntp/libparse/Makefile.in | 30 +- contrib/ntp/libparse/clk_computime.c | 2 +- contrib/ntp/libparse/clk_dcf7000.c | 2 +- contrib/ntp/libparse/clk_hopf6021.c | 2 +- contrib/ntp/libparse/clk_meinberg.c | 2 +- contrib/ntp/libparse/clk_rawdcf.c | 2 +- contrib/ntp/libparse/clk_rcc8000.c | 2 +- contrib/ntp/libparse/clk_schmid.c | 2 +- contrib/ntp/libparse/clk_sel240x.c | 2 +- contrib/ntp/libparse/clk_trimtaip.c | 2 +- contrib/ntp/libparse/clk_trimtsip.c | 2 +- contrib/ntp/libparse/clk_varitext.c | 2 +- contrib/ntp/libparse/clk_wharton.c | 2 +- contrib/ntp/libparse/ieee754io.c | 25 +- contrib/ntp/libparse/parse.c | 2 +- contrib/ntp/libparse/parse_conf.c | 2 +- contrib/ntp/ntpd/Makefile.in | 20 +- contrib/ntp/ntpd/cmd_args.c | 18 +- contrib/ntp/ntpd/complete.conf.in | 43 +- contrib/ntp/ntpd/invoke-ntp.conf.texi | 99 +- contrib/ntp/ntpd/invoke-ntp.keys.texi | 2 +- contrib/ntp/ntpd/invoke-ntpd.texi | 4 +- contrib/ntp/ntpd/keyword-gen-utd | 2 +- contrib/ntp/ntpd/keyword-gen.c | 2 +- contrib/ntp/ntpd/ntp.conf.5man | 106 +- contrib/ntp/ntpd/ntp.conf.5mdoc | 106 +- contrib/ntp/ntpd/ntp.conf.def | 100 +- contrib/ntp/ntpd/ntp.conf.html | 102 +- contrib/ntp/ntpd/ntp.conf.man.in | 106 +- contrib/ntp/ntpd/ntp.conf.mdoc.in | 106 +- contrib/ntp/ntpd/ntp.keys.5man | 6 +- contrib/ntp/ntpd/ntp.keys.5mdoc | 6 +- contrib/ntp/ntpd/ntp.keys.html | 2 +- contrib/ntp/ntpd/ntp.keys.man.in | 6 +- contrib/ntp/ntpd/ntp.keys.mdoc.in | 6 +- contrib/ntp/ntpd/ntp_config.c | 696 +- contrib/ntp/ntpd/ntp_control.c | 68 +- contrib/ntp/ntpd/ntp_crypto.c | 134 +- contrib/ntp/ntpd/ntp_io.c | 927 +- contrib/ntp/ntpd/ntp_keyword.h | 2078 +-- contrib/ntp/ntpd/ntp_leapsec.c | 78 +- contrib/ntp/ntpd/ntp_loopfilter.c | 16 + contrib/ntp/ntpd/ntp_monitor.c | 21 +- contrib/ntp/ntpd/ntp_parser.c | 3279 ++-- contrib/ntp/ntpd/ntp_parser.h | 752 +- contrib/ntp/ntpd/ntp_peer.c | 202 +- contrib/ntp/ntpd/ntp_proto.c | 334 +- contrib/ntp/ntpd/ntp_refclock.c | 58 +- contrib/ntp/ntpd/ntp_request.c | 15 +- contrib/ntp/ntpd/ntp_restrict.c | 725 +- contrib/ntp/ntpd/ntp_scanner.c | 22 +- contrib/ntp/ntpd/ntp_timer.c | 303 +- contrib/ntp/ntpd/ntp_util.c | 249 +- contrib/ntp/ntpd/ntpd-opts.c | 20 +- contrib/ntp/ntpd/ntpd-opts.h | 8 +- contrib/ntp/ntpd/ntpd.1ntpdman | 6 +- contrib/ntp/ntpd/ntpd.1ntpdmdoc | 6 +- contrib/ntp/ntpd/ntpd.c | 101 +- contrib/ntp/ntpd/ntpd.html | 4 +- contrib/ntp/ntpd/ntpd.man.in | 6 +- contrib/ntp/ntpd/ntpd.mdoc.in | 6 +- contrib/ntp/ntpd/refclock_acts.c | 2 +- contrib/ntp/ntpd/refclock_arbiter.c | 2 +- contrib/ntp/ntpd/refclock_arc.c | 13 +- contrib/ntp/ntpd/refclock_as2201.c | 2 +- contrib/ntp/ntpd/refclock_atom.c | 2 +- contrib/ntp/ntpd/refclock_bancomm.c | 2 +- contrib/ntp/ntpd/refclock_chronolog.c | 2 +- contrib/ntp/ntpd/refclock_conf.c | 2 +- contrib/ntp/ntpd/refclock_dumbclock.c | 2 +- contrib/ntp/ntpd/refclock_fg.c | 2 +- contrib/ntp/ntpd/refclock_gpsvme.c | 2 +- contrib/ntp/ntpd/refclock_heath.c | 2 +- contrib/ntp/ntpd/refclock_hopfpci.c | 2 +- contrib/ntp/ntpd/refclock_hopfser.c | 2 +- contrib/ntp/ntpd/refclock_hpgps.c | 2 +- contrib/ntp/ntpd/refclock_irig.c | 2 +- contrib/ntp/ntpd/refclock_jjy.c | 2 +- contrib/ntp/ntpd/refclock_jupiter.c | 2 +- contrib/ntp/ntpd/refclock_local.c | 2 +- contrib/ntp/ntpd/refclock_mx4200.c | 2 +- contrib/ntp/ntpd/refclock_neoclock4x.c | 2 +- contrib/ntp/ntpd/refclock_nmea.c | 2 + contrib/ntp/ntpd/refclock_oncore.c | 2 +- contrib/ntp/ntpd/refclock_palisade.c | 2 +- contrib/ntp/ntpd/refclock_pcf.c | 2 +- contrib/ntp/ntpd/refclock_pst.c | 2 +- contrib/ntp/ntpd/refclock_ripencc.c | 2 +- contrib/ntp/ntpd/refclock_tpro.c | 2 +- contrib/ntp/ntpd/refclock_true.c | 2 +- contrib/ntp/ntpd/refclock_tsyncpci.c | 2 +- contrib/ntp/ntpd/refclock_tt560.c | 2 +- contrib/ntp/ntpd/refclock_ulink.c | 2 +- contrib/ntp/ntpd/refclock_wwv.c | 2 +- contrib/ntp/ntpd/refclock_wwvb.c | 2 +- contrib/ntp/ntpd/refclock_zyfer.c | 2 +- contrib/ntp/ntpdate/Makefile.in | 18 +- contrib/ntp/ntpdc/Makefile.in | 18 +- contrib/ntp/ntpdc/invoke-ntpdc.texi | 4 +- contrib/ntp/ntpdc/nl.pl | 1 + contrib/ntp/ntpdc/nl.pl.in | 1 + contrib/ntp/ntpdc/ntpdc-opts.c | 20 +- contrib/ntp/ntpdc/ntpdc-opts.h | 8 +- contrib/ntp/ntpdc/ntpdc.1ntpdcman | 6 +- contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc | 6 +- contrib/ntp/ntpdc/ntpdc.html | 4 +- contrib/ntp/ntpdc/ntpdc.man.in | 6 +- contrib/ntp/ntpdc/ntpdc.mdoc.in | 6 +- contrib/ntp/ntpq/Makefile.in | 18 +- contrib/ntp/ntpq/invoke-ntpq.texi | 4 +- contrib/ntp/ntpq/ntpq-opts.c | 20 +- contrib/ntp/ntpq/ntpq-opts.h | 8 +- contrib/ntp/ntpq/ntpq-subs.c | 41 +- contrib/ntp/ntpq/ntpq.1ntpqman | 6 +- contrib/ntp/ntpq/ntpq.1ntpqmdoc | 6 +- contrib/ntp/ntpq/ntpq.c | 25 +- contrib/ntp/ntpq/ntpq.h | 1 - contrib/ntp/ntpq/ntpq.html | 4 +- contrib/ntp/ntpq/ntpq.man.in | 6 +- contrib/ntp/ntpq/ntpq.mdoc.in | 6 +- contrib/ntp/ntpsnmpd/Makefile.am | 8 +- contrib/ntp/ntpsnmpd/Makefile.in | 22 +- contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi | 4 +- contrib/ntp/ntpsnmpd/netsnmp_daemonize.c | 18 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c | 20 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.html | 2 +- contrib/ntp/ntpsnmpd/ntpsnmpd.man.in | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in | 6 +- contrib/ntp/packageinfo.sh | 4 +- contrib/ntp/parseutil/Makefile.in | 1 + contrib/ntp/scripts/Makefile.in | 1 + contrib/ntp/scripts/build/Makefile.in | 1 + contrib/ntp/scripts/build/checkHtmlFileDates | 24 +- contrib/ntp/scripts/build/genAuthors.in | 1 + contrib/ntp/scripts/build/mkver.in | 2 + contrib/ntp/scripts/calc_tickadj/Makefile.in | 1 + .../calc_tickadj/calc_tickadj.1calc_tickadjman | 4 +- .../calc_tickadj/calc_tickadj.1calc_tickadjmdoc | 4 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.html | 2 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.in | 1 + .../ntp/scripts/calc_tickadj/calc_tickadj.man.in | 4 +- .../ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in | 4 +- .../scripts/calc_tickadj/invoke-calc_tickadj.texi | 2 +- contrib/ntp/scripts/invoke-plot_summary.texi | 4 +- contrib/ntp/scripts/invoke-summary.texi | 4 +- contrib/ntp/scripts/lib/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait-opts | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman | 4 +- .../ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.html | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.in | 1 + contrib/ntp/scripts/ntp-wait/ntp-wait.man.in | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in | 4 +- contrib/ntp/scripts/ntpsweep/Makefile.in | 1 + contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep-opts | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman | 4 +- .../ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.html | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.in | 1 + contrib/ntp/scripts/ntpsweep/ntpsweep.man.in | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in | 4 +- contrib/ntp/scripts/ntptrace/Makefile.in | 1 + contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi | 4 +- contrib/ntp/scripts/ntptrace/ntptrace-opts | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman | 4 +- .../ntp/scripts/ntptrace/ntptrace.1ntptracemdoc | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.html | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.in | 11 + contrib/ntp/scripts/ntptrace/ntptrace.man.in | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in | 4 +- contrib/ntp/scripts/ntpver.in | 3 +- contrib/ntp/scripts/plot_summary-opts | 4 +- contrib/ntp/scripts/plot_summary.1plot_summaryman | 4 +- contrib/ntp/scripts/plot_summary.1plot_summarymdoc | 4 +- contrib/ntp/scripts/plot_summary.html | 4 +- contrib/ntp/scripts/plot_summary.in | 1 + contrib/ntp/scripts/plot_summary.man.in | 4 +- contrib/ntp/scripts/plot_summary.mdoc.in | 4 +- contrib/ntp/scripts/summary-opts | 4 +- contrib/ntp/scripts/summary.1summaryman | 4 +- contrib/ntp/scripts/summary.1summarymdoc | 4 +- contrib/ntp/scripts/summary.html | 4 +- contrib/ntp/scripts/summary.in | 1 + contrib/ntp/scripts/summary.man.in | 4 +- contrib/ntp/scripts/summary.mdoc.in | 4 +- contrib/ntp/scripts/update-leap/Makefile.in | 1 + .../scripts/update-leap/invoke-update-leap.texi | 2 +- contrib/ntp/scripts/update-leap/update-leap-opts | 4 +- .../update-leap/update-leap.1update-leapman | 4 +- .../update-leap/update-leap.1update-leapmdoc | 4 +- contrib/ntp/scripts/update-leap/update-leap.html | 2 +- contrib/ntp/scripts/update-leap/update-leap.in | 1 + contrib/ntp/scripts/update-leap/update-leap.man.in | 4 +- .../ntp/scripts/update-leap/update-leap.mdoc.in | 4 +- contrib/ntp/sntp/COPYRIGHT | 4 +- contrib/ntp/sntp/Makefile.am | 3 +- contrib/ntp/sntp/Makefile.in | 17 +- contrib/ntp/sntp/aclocal.m4 | 1 + contrib/ntp/sntp/check-libntp.mf | 10 +- contrib/ntp/sntp/check-libsntp.mf | 8 +- contrib/ntp/sntp/check-libunity.mf | 3 +- contrib/ntp/sntp/config.h.in | 41 +- contrib/ntp/sntp/configure | 18356 ++++++++++--------- contrib/ntp/sntp/configure.ac | 8 +- contrib/ntp/sntp/crypto.c | 72 +- contrib/ntp/sntp/crypto.h | 15 +- contrib/ntp/sntp/include/Makefile.in | 2 + contrib/ntp/sntp/include/copyright.def | 2 +- contrib/ntp/sntp/include/version.def | 2 +- contrib/ntp/sntp/include/version.texi | 6 +- contrib/ntp/sntp/invoke-sntp.texi | 4 +- contrib/ntp/sntp/libevent/Makefile.in | 3 + contrib/ntp/sntp/libevent/configure | 8 +- contrib/ntp/sntp/libevent/configure.ac | 7 +- contrib/ntp/sntp/libevent/kqueue.c | 2 +- contrib/ntp/sntp/libevent/m4/acx_pthread.m4 | 2 +- contrib/ntp/sntp/libopts/Makefile.am | 4 +- contrib/ntp/sntp/libopts/Makefile.in | 23 +- contrib/ntp/sntp/m4/ntp_compiler.m4 | 68 +- contrib/ntp/sntp/m4/ntp_crypto_rand.m4 | 37 +- contrib/ntp/sntp/m4/ntp_facilitynames.m4 | 33 +- contrib/ntp/sntp/m4/ntp_libevent.m4 | 10 +- contrib/ntp/sntp/m4/ntp_libntp.m4 | 89 +- contrib/ntp/sntp/m4/ntp_openssl.m4 | 827 +- contrib/ntp/sntp/m4/version.m4 | 2 +- contrib/ntp/sntp/main.c | 20 +- contrib/ntp/sntp/scm-rev | 2 +- contrib/ntp/sntp/scripts/Makefile.in | 2 + contrib/ntp/sntp/scripts/cvo.sh | 8 +- contrib/ntp/sntp/sntp-opts.c | 20 +- contrib/ntp/sntp/sntp-opts.h | 8 +- contrib/ntp/sntp/sntp.1sntpman | 6 +- contrib/ntp/sntp/sntp.1sntpmdoc | 6 +- contrib/ntp/sntp/sntp.html | 4 +- contrib/ntp/sntp/sntp.man.in | 6 +- contrib/ntp/sntp/sntp.mdoc.in | 6 +- contrib/ntp/sntp/tests/Makefile.in | 23 +- contrib/ntp/sntp/tests/crypto.c | 235 +- contrib/ntp/sntp/tests/fileHandlingTest.h.in | 8 +- contrib/ntp/sntp/tests/packetHandling.c | 50 +- contrib/ntp/sntp/tests/packetProcessing.c | 168 +- contrib/ntp/sntp/tests/run-crypto.c | 20 +- contrib/ntp/sntp/tests/run-packetProcessing.c | 40 +- contrib/ntp/sntp/unity/Makefile.in | 2 + contrib/ntp/sntp/unity/unity_internals.h | 10 +- contrib/ntp/sntp/utilities.h | 1 - contrib/ntp/tests/libntp/data/ntp.keys | 23 +- contrib/ntp/tests/libntp/digests.c | 125 +- contrib/ntp/tests/libntp/run-digests.c | 6 + contrib/ntp/util/Makefile.am | 4 +- contrib/ntp/util/Makefile.in | 62 +- contrib/ntp/util/invoke-ntp-keygen.texi | 4 +- contrib/ntp/util/lsf-times.c | 220 + contrib/ntp/util/ntp-keygen-opts.c | 20 +- contrib/ntp/util/ntp-keygen-opts.h | 8 +- contrib/ntp/util/ntp-keygen.1ntp-keygenman | 6 +- contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc | 6 +- contrib/ntp/util/ntp-keygen.c | 55 +- contrib/ntp/util/ntp-keygen.html | 4 +- contrib/ntp/util/ntp-keygen.man.in | 6 +- contrib/ntp/util/ntp-keygen.mdoc.in | 6 +- usr.sbin/ntp/config.h | 545 +- usr.sbin/ntp/libntp/Makefile | 2 +- usr.sbin/ntp/ntpd/Makefile | 4 +- usr.sbin/ntp/ntpdate/Makefile | 4 +- usr.sbin/ntp/ntpdc/Makefile | 4 +- usr.sbin/ntp/ntpq/Makefile | 4 +- usr.sbin/ntp/sntp/Makefile | 4 +- 351 files changed, 26986 insertions(+), 17542 deletions(-) diff --git a/contrib/ntp/COPYRIGHT b/contrib/ntp/COPYRIGHT index 013202c0fb09..0cb57168ebfc 100644 --- a/contrib/ntp/COPYRIGHT +++ b/contrib/ntp/COPYRIGHT @@ -3,7 +3,7 @@ This file is automatically generated from html/copyright.html jpg "Clone me," says Dolly sheepishly. - Last update: 2-Mar-2023 05:21 UTC + Last update: 7-Jan-2024 00:29 UTC __________________________________________________________________ The following copyright notice applies to all files collectively called @@ -32,7 +32,7 @@ This file is automatically generated from html/copyright.html Hart, Danny Mayer, Martin Burnicki, and possibly others is: *********************************************************************** * * -* Copyright (c) Network Time Foundation 2011-2023 * +* Copyright (c) Network Time Foundation 2011-2024 * * * * All Rights Reserved * * * diff --git a/contrib/ntp/ChangeLog b/contrib/ntp/ChangeLog index 93cdab8b94eb..f4a196aa57cd 100644 --- a/contrib/ntp/ChangeLog +++ b/contrib/ntp/ChangeLog @@ -1,3 +1,121 @@ +--- +(4.2.8p18) 2024/05/25 Released by Harlan Stenn + +* [Bug 3918] Tweak openssl header/library handling. +* [Bug 3914] Spurious "Unexpected origin timestamp" logged after time + stepped. +* [Bug 3913] Avoid duplicate IPv6 link-local manycast associations. + +* [Bug 3912] Avoid rare math errors in ntptrace. +* [Bug 3910] Memory leak using openssl-3 +* [Bug 3909] Do not select multicast local address for unicast peer. + +* [Bug 3903] lib/isc/win32/strerror.c NTstrerror() is not thread-safe. + +* [Bug 3901] LIB_GETBUF isn't thread-safe. +* [Bug 3900] fast_xmit() selects wrong local addr responding to mcast on + Windows. +* [Bug 3888] ntpd with multiple same-subnet IPs using manycastclient creates + duplicate associations. +* [Bug 3872] Ignore restrict mask for hostname. +* [Bug 3871] 4.2.8p17 build without hopf6021 refclock enabled fails. + Reported by Hans Mayer. Moved NONEMPTY_TRANSLATION_UNIT + declaration from ntp_types.h to config.h. +* [Bug 3870] Server drops client packets with ppoll < 4. +* [Bug 3869] Remove long-gone "calldelay" & "crypto sign" from docs. + Reported by PoolMUC@web.de. +* [Bug 3868] Cannot restrict a pool peer. Thanks to + Edward McGuire for tracking down the deficiency. +* [Bug 3864] ntpd IPv6 refid different for big-endian and little-endian. + +* [Bug 3859] Use NotifyIpInterfaceChange on Windows ntpd. +* [Bug 3856] Enable Edit & Continue debugging with Visual Studio. + +* [Bug 3855] ntpq lacks an equivalent to ntpdc's delrestrict. +* [Bug 3854] ntpd 4.2.8p17 corrupts rawstats file with space in refid. + +* [Bug 3853] Clean up warnings with modern compilers. +* [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as + intended. +* [Bug 3851] Drop pool server when no local address can reach it. + +* [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid. + +* [Bug 3849] ntpd --wait-sync times out. +* [Bug 3847] SSL detection in configure should run-test if runpath is needed. + +* [Bug 3846] Use -Wno-format-truncation by default. +* [Bug 3845] accelerate pool clock_sync when IPv6 has only link-local access. + +* [Bug 3842] Windows ntpd PPSAPI DLL load failure crashes. +* [Bug 3841] 4.2.8p17 build break w/ gcc 12 -Wformat-security without -Wformat + Need to remove --Wformat-security when removing -Wformat to + silence numerous libopts warnings. +* [Bug 3837] NULL pointer deref crash when ntpd deletes last interface. + Reported by renmingshuai. Correct UNLINK_EXPR_SLIST() when the + list is empty. +* [Bug 3835] NTP_HARD_*FLAGS not used by libevent tearoff. +* [Bug 3831] pollskewlist zeroed on runtime configuration. +* [Bug 3830] configure libevent check intersperses output with answer. +* [Bug 3828] BK should ignore a git repo in the same directory. + +* [Bug 3827] Fix build in case CLOCK_HOPF6021 or CLOCK_WHARTON_400A + is disabled. +* [Bug 3825] Don't touch HTML files unless building inside a BK repo. + Fix the script checkHtmlFileDates. +* [Bug 3756] Improve OpenSSL library/header detection. +* [Bug 3753] ntpd fails to start with FIPS-enabled OpenSSL 3. +* [Bug 2734] TEST3 prevents initial interleave sync. Fix from +* Log failures to allocate receive buffers. +* Remove extraneous */ from libparse/ieee754io.c +* Fix .datecheck target line in Makefile.am. +* Update the copyright year. +* Update ntp.conf documentation to add "delrestrict" and correct information + about KoD rate limiting. +* html/clockopt.html cleanup. +* util/lsf-times - added. +* Add DSA, DSA-SHA, and SHA to tests/libntp/digests.c. +* Provide ntpd thread names to debugger on Windows. +* Remove dead code libntp/numtohost.c and its unit tests. +* Remove class A, B, C IPv4 distinctions in netof(). +* Use @configure_input@ in various *.in files to include a comment that + the file is generated from another pointing to the *.in. +* Correct underquoting, indents in ntp_facilitynames.m4. +* Clean up a few warnings seen building with older gcc. +* Fix build on older FreeBSD lacking sys/procctl.h. +* Disable [Bug 3627] workaround on newer FreeBSD which has the kernel fix + that makes it unnecessary, re-enabling ASLR stack gap. +* Use NONEMPTY_COMPILATION_UNIT in more conditionally-compiled files. +* Remove useless pointer to Windows Help from system error messages. +* Avoid newlines within Windows error messages. +* Ensure unique association IDs if wrapped. +* Simplify calc_addr_distance(). +* Clamp min/maxpoll in edge cases in newpeer(). +* Quiet local addr change logging when unpeering. +* Correct missing arg for %s printf specifier in + send_blocking_resp_internal(). +* Suppress OpenSSL 3 deprecation warning clutter. +* Correct OpenSSL usage in Autokey code to avoid warnings about + discarding const qualifiers with OpenSSL 3. +* Display KoD refid as text in recently added message. +* Avoid running checkHtmlFileDates script repeatedly when no html/*.html + files have changed. +* Abort configure if --enable-crypto-rand given & unavailable. +* Add configure --enable-verbose-ssl to trace SSL detection. +* Add build test coverage for --disable-saveconfig to flock-build script. + +* Remove deprecated configure --with-arlib option. +* Remove configure support for ISC UNIX ca. 1998. +* Move NTP_OPENSSL and NTP_CRYPTO_RAND invocations from configure.ac files + to NTP_LIBNTP. +* Remove dead code: HAVE_U_INT32_ONLY_WITH_DNS. +* Eliminate [v]snprintf redefinition warnings on macOS. +* Fix clang 14 cast increases alignment warning on Linux. +* Move ENABLE_CMAC to ntp_openssl.m4, reviving sntp/tests CMAC unit tests. + +* Use NTP_HARD_CPPFLAGS in libopts tearoff. +* wire in --enable-build-framework-help + --- (4.2.8p17) 2023/06/06 Released by Harlan Stenn @@ -10,7 +128,7 @@ Miroslav Lichvar and Matt for rapid testing and identifying the problem. * Add tests/libntp/digests.c to catch regressions reading keys file or with - symmetric authentication digest output. + symmetric authentication digest output. --- (4.2.8p16) 2023/05/31 Released by Harlan Stenn diff --git a/contrib/ntp/CommitLog b/contrib/ntp/CommitLog index adeda2c60402..49952cfaef0d 100644 --- a/contrib/ntp/CommitLog +++ b/contrib/ntp/CommitLog @@ -1,3 +1,3224 @@ +ChangeSet@1.4062, 2024-05-25 00:06:49-07:00, ntpreleng@ntp-build.tal1.ntfo.org + NTP_4_2_8P18 + TAG: NTP_4_2_8P18 + + ChangeLog@1.2103 +1 -0 + NTP_4_2_8P18 + + ntpd/invoke-ntp.conf.texi@1.231 +1 -1 + NTP_4_2_8P18 + + ntpd/invoke-ntp.keys.texi@1.214 +1 -1 + NTP_4_2_8P18 + + ntpd/invoke-ntpd.texi@1.528 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.5man@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.5mdoc@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.html@1.213 +1 -1 + NTP_4_2_8P18 + + ntpd/ntp.conf.man.in@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.mdoc.in@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.5man@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.5mdoc@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.html@1.208 +1 -1 + NTP_4_2_8P18 + + ntpd/ntp.keys.man.in@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.mdoc.in@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd-opts.c@1.553 +245 -245 + NTP_4_2_8P18 + + ntpd/ntpd-opts.h@1.552 +3 -3 + NTP_4_2_8P18 + + ntpd/ntpd.1ntpdman@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.1ntpdmdoc@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.html@1.202 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.man.in@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.mdoc.in@1.357 +2 -2 + NTP_4_2_8P18 + + ntpdc/invoke-ntpdc.texi@1.527 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc-opts.c@1.548 +113 -113 + NTP_4_2_8P18 + + ntpdc/ntpdc-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + ntpdc/ntpdc.1ntpdcman@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.1ntpdcmdoc@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.html@1.372 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.man.in@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.mdoc.in@1.358 +2 -2 + NTP_4_2_8P18 + + ntpq/invoke-ntpq.texi@1.537 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq-opts.c@1.557 +120 -120 + NTP_4_2_8P18 + + ntpq/ntpq-opts.h@1.555 +3 -3 + NTP_4_2_8P18 + + ntpq/ntpq.1ntpqman@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.1ntpqmdoc@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.html@1.202 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.man.in@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.mdoc.in@1.365 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.527 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd-opts.c@1.548 +68 -68 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.html@1.194 +1 -1 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.man.in@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.356 +2 -2 + NTP_4_2_8P18 + + packageinfo.sh@1.553 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.117 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.119 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.html@1.118 +1 -1 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.man.in@1.116 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.119 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.121 +1 -1 + NTP_4_2_8P18 + + scripts/invoke-plot_summary.texi@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/invoke-summary.texi@1.138 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.350 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait-opts@1.86 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.345 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.347 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.html@1.366 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.man.in@1.345 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.347 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.html@1.138 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.man.in@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.125 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/invoke-ntptrace.texi@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.1ntptraceman@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.126 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.html@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.man.in@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.mdoc.in@1.127 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary-opts@1.90 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.1plot_summaryman@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.1plot_summarymdoc@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.html@1.141 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.man.in@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.mdoc.in@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/summary-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/summary.1summaryman@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.1summarymdoc@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.html@1.140 +2 -2 + NTP_4_2_8P18 + + scripts/summary.man.in@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.mdoc.in@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/invoke-update-leap.texi@1.37 +1 -1 + NTP_4_2_8P18 + + scripts/update-leap/update-leap-opts@1.39 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.1update-leapman@1.37 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.1update-leapmdoc@1.38 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.html@1.37 +1 -1 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.man.in@1.37 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.mdoc.in@1.38 +2 -2 + NTP_4_2_8P18 + + sntp/invoke-sntp.texi@1.527 +2 -2 + NTP_4_2_8P18 + + sntp/sntp-opts.c@1.549 +161 -161 + NTP_4_2_8P18 + + sntp/sntp-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + sntp/sntp.1sntpman@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.1sntpmdoc@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.html@1.543 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.man.in@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.mdoc.in@1.362 +2 -2 + NTP_4_2_8P18 + + util/invoke-ntp-keygen.texi@1.530 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen-opts.c@1.551 +174 -174 + NTP_4_2_8P18 + + util/ntp-keygen-opts.h@1.549 +3 -3 + NTP_4_2_8P18 + + util/ntp-keygen.1ntp-keygenman@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.1ntp-keygenmdoc@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.html@1.203 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.man.in@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.mdoc.in@1.358 +2 -2 + NTP_4_2_8P18 + +ChangeSet@1.4061, 2024-05-24 23:46:58-07:00, ntpreleng@ntp-build.tal1.ntfo.org + ntp-4.2.8p18 + + ChangeLog@1.2102 +0 -2 + ntp-4.2.8p18 + +ChangeSet@1.4060, 2024-05-24 22:53:53-07:00, ntpreleng@ntp-build.tal1.ntfo.org + NTP_4_2_8P18_RCGO + TAG: NTP_4_2_8P18_RCGO + + ChangeLog@1.2101 +1 -0 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntp.conf.texi@1.230 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntp.keys.texi@1.213 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntpd.texi@1.527 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.5man@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.5mdoc@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.html@1.212 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.man.in@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.mdoc.in@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.5man@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.5mdoc@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.html@1.207 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.man.in@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.mdoc.in@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd-opts.c@1.552 +7 -7 + NTP_4_2_8P18_RCGO + + ntpd/ntpd-opts.h@1.551 +3 -3 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.1ntpdman@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.1ntpdmdoc@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.html@1.201 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.man.in@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.mdoc.in@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/invoke-ntpdc.texi@1.526 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc-opts.c@1.547 +7 -7 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc-opts.h@1.546 +3 -3 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.1ntpdcman@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.1ntpdcmdoc@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.html@1.371 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.man.in@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.mdoc.in@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/invoke-ntpq.texi@1.536 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq-opts.c@1.556 +7 -7 + NTP_4_2_8P18_RCGO + + ntpq/ntpq-opts.h@1.554 +3 -3 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.1ntpqman@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.1ntpqmdoc@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.html@1.201 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.man.in@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.mdoc.in@1.364 +2 -2 + NTP_4_2_8P18_RCGO + *** 59789 LINES SKIPPED *** From nobody Thu May 30 01:42:35 2024 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 4VqTXC6cLNz5Llky; Thu, 30 May 2024 01: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 4VqTXC5YF8z4K0C; Thu, 30 May 2024 01: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=1717033355; 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=YChly7MGF3OEpOKg6/XxQKMso8LLA9Cqu/QNoJP5PfY=; b=eudqGVuyE4l12VPqN2mjfilTqLUGlaQ5nnhFpHHgu7s5/3MsS2kLlXdqFfxl+DFwrQoonm gF1mpdbazH5vjURUebj7seDETdAYr1AP9YbbJn1m+xpV78jfWoHtsIEKbxJRqY5RLBFpm0 qUNALgUiwdD1eSvONS3jx5S8a8MfIr3zAfb5MhomVkxLAbbhsj3DcKvL3ZfXm2QAVuXHH6 xgDq0BUlpLePWZ5dbZOd3aPbsq4NuspYyb2utIDDUDAPrGmcgCFTYsYQsfcNWrUFBqQb5g 9gPvhAHOXPhh9dWG5Z3dLXjxdJwqlyfhK3M5LqO/JfQryTpbdyVlZsaoPqIW4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717033355; a=rsa-sha256; cv=none; b=ghhSCEaD6xKQKjI/+ESzShR04t+zIlfiu45O7Rvn1JzUFsjJDPVjOABo/G6LJ4Kqq/FgWh +EvwfxGht8nldlQJ9l0rOEhKlDgWuGUPOd9JfRXbPWyYbPwsqBQBrUh3xcBUBffBrCmfwp X6gGJFmEyGk0XmKdQ+cNwt6TYBkhj2K5oE5gmnFV3wThuN+RKzuNtKnbjb3mULplwTlQ2f dEYAN03NwvROxmQbhuwTOS58IkKRzoLPHby0T6Hl37hMi2J2sH017rFgx/AWL9rS7GgBI+ 2WW4t7R3YCCSx2ALEWfGOkBhA5fjBwiirHAy7+OymxZpaH7YnPUt+dyuEDdUfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717033355; 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=YChly7MGF3OEpOKg6/XxQKMso8LLA9Cqu/QNoJP5PfY=; b=Rm6AmwTSawD5Fr+RC3FOVo7bXDXZYo/LQ0tSumtZegMY7qYZOxuzEsKVpzl7lRufkbTjUV 9dc9vpnsl3QaHC2DjUBvUSgsUuBv5imp+EmagGLP6Lc2uxD9Hcih80aMZSG/ZcUy8y7WwS evYdLtkxYUuc7ass3lnbEdGEwG7bLO2oWlvkmZYyitGUQhKzE6VS+5uzJ4FQkUbikvZ42g zsbe6FsgYozAIp/Un2xbTjEJui6ij1YmaacjNUqLlZ7zJmhYM8RZdbELEbwzKYsvbOfioZ OmA41QK1oUnF5pgeWA2QcY0V8oxqDWCD+6M0Ct3svWjp8DlQE1ZI343PSE4HjQ== 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 4VqTXC51NmzLRF; Thu, 30 May 2024 01:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44U1gZel028848; Thu, 30 May 2024 01:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U1gZGt028845; Thu, 30 May 2024 01:42:35 GMT (envelope-from git) Date: Thu, 30 May 2024 01:42:35 GMT Message-Id: <202405300142.44U1gZGt028845@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: 1ed9f1b038fc - stable/14 - ntp: Update version strings 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 1ed9f1b038fc78e6f2813868d3db0fe885ebf714 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1ed9f1b038fc78e6f2813868d3db0fe885ebf714 commit 1ed9f1b038fc78e6f2813868d3db0fe885ebf714 Author: Cy Schubert AuthorDate: 2024-05-27 09:12:49 +0000 Commit: Cy Schubert CommitDate: 2024-05-30 01:42:19 +0000 ntp: Update version strings Reported by: "Herbert J. Skuhra" Fixes: f5f40dd63bc7 (cherry picked from commit 018a4ab7b04deb0710743533f2b799d68b406f85) --- usr.sbin/ntp/config.h | 4 ++-- usr.sbin/ntp/scripts/mkver | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 2e5eea82ff29..3d6a1364dd10 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1494,7 +1494,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.8p18-RC1" +#define PACKAGE_STRING "ntp 4.2.8p18" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1768,7 +1768,7 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.8p18-RC1" +#define VERSION "4.2.8p18" /* vsnprintf expands "%m" to strerror(errno) */ #define VSNPRINTF_PERCENT_M 1 diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 279468a1af1c..2336dd71bacb 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -7,7 +7,7 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.2.8p16" +ConfStr="$ConfStr 4.2.8p18" case "$CSET" in '') ;; From nobody Thu May 30 01:43:06 2024 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 4VqTXq4Gmyz5Lm4B; Thu, 30 May 2024 01: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 4VqTXq427Sz4Klp; Thu, 30 May 2024 01: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=1717033387; 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=cQeSxBXAx1yLDhIGiN95rJ52v+d9qChatyCDHnm42cw=; b=b/hfC82pBsxcBq7zPJCD5bZQfYsk6FWvMaAoz3aK5TTN7fCpezI6Ow8KDSqQxse55e+ez0 WycgzDsgTdddY5XCiwH6Tf1qXmJV1WNC+qj2rqiNaI8EyXVmhr20e7B0ddRrcwZGG2e/PD 3fueqPdQPLJ1ulVNZh3lMuwoxHdtbNN89lbqnZ41M9rnEbvNAanm6AhrEuud+6OjqsjQrT a1m690QVyP/+YExTW/BE3UOZOeEuPvEXS2b60lS6E1TBOsfxfihuWAaiskIFqBtggVEWhe 49IYTko9kiMmqSaP7aWvmFUR8FnGiTthh3trgSRGCcU/eAElsI71TaSUyyFRvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717033387; a=rsa-sha256; cv=none; b=KgTZKmSQ8rx2cWWzLS+S705D7h6p8jFk6nTC+SdnlZuJp5I2KF8BDfhMevQZXvYJ9/qY23 ed1Le0M9hBQygsPhcyMlYNVGuZAnLyU9fSskiDZBMZRcoBMMMGLLO9Vdrf8kfDedVBoBf9 T0lukfz6JV3goBUj0dtyU4aFq8PXN7Et/bpxozeWbGSQAoSvVWZz6Dga/Q1yCG9fqAaGlG sdm1MsPOrXU07GMjAzlBGZYDsrsPQWNeChsRtMtEWbl9Phqn3y+5j6PzVgl3iZg3xwK+d5 4SXvBOXeOR0P63eEWKN1qzHFIei6pbdZXbWRPOAPqNr1XkKFNdE2Rv81F14qBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717033387; 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=cQeSxBXAx1yLDhIGiN95rJ52v+d9qChatyCDHnm42cw=; b=epTFYvn4/rE84RU5ueFBYgc4XSs22T4Nmyay10HOzA9yOECslEqUcsEM0efCWICF4ZWA2S ouvESuJ1qkpA9KhKfZJytyRlgNx/7ORbZts5VrW/bZEIqMGXu46Pg0Ad1Is7keTI3QJ8Uo D6lVUvgIZeetka1Xvaob3HdnslxJwUTuOhvkaQsHFMjBqBECSejVC3L4Ixglh6NCnYiIci 2jEfl+xSMSYZIp/ZZG99TxvcD9chsXQRmxHDm9ovxx3atu5et+gc+inaXUHPTYxI63Cs9H jPkx8ajQmcvBEE27QdeSVifhKgnYxnt6Gnc126I+VYr9FIsuxMYmY4ghmvhaUg== 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 4VqTXq39q1zLRG; Thu, 30 May 2024 01:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44U1h7Cn029051; Thu, 30 May 2024 01:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U1h6s0029047; Thu, 30 May 2024 01:43:06 GMT (envelope-from git) Date: Thu, 30 May 2024 01:43:06 GMT Message-Id: <202405300143.44U1h6s0029047@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: 6f3fd5d45e98 - stable/13 - ntp: Vendor import of ntp-4.2.8p18 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 6f3fd5d45e98738a3035abc2d179d457f29bc541 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6f3fd5d45e98738a3035abc2d179d457f29bc541 commit 6f3fd5d45e98738a3035abc2d179d457f29bc541 Author: Cy Schubert AuthorDate: 2024-05-27 01:41:22 +0000 Commit: Cy Schubert CommitDate: 2024-05-30 01:42:54 +0000 ntp: Vendor import of ntp-4.2.8p18 Merge commit '1f833b3fc9968c3dd7ed79ccf0525ebf16c891ad' into main (cherry picked from commit f5f40dd63bc7acbb5312b26ac1ea1103c12352a6) --- contrib/ntp/COPYRIGHT | 4 +- contrib/ntp/ChangeLog | 120 +- contrib/ntp/CommitLog | 3221 ++++ contrib/ntp/Makefile.am | 6 +- contrib/ntp/Makefile.in | 7 +- contrib/ntp/NEWS | 3902 ++++ contrib/ntp/adjtimed/Makefile.in | 13 +- contrib/ntp/check-libntp.mf | 10 +- contrib/ntp/check-libntpd.mf | 13 +- contrib/ntp/check-libunity.mf | 4 +- contrib/ntp/check-scm-rev.mf | 6 +- contrib/ntp/clockstuff/Makefile.in | 13 +- contrib/ntp/config.h.in | 44 +- contrib/ntp/configure | 2726 +-- contrib/ntp/configure.ac | 81 +- contrib/ntp/flock-build | 22 +- contrib/ntp/html/.datecheck | 0 contrib/ntp/html/clockopt.html | 9 +- contrib/ntp/html/copyright.html | 4 +- contrib/ntp/html/release.html | 2 +- contrib/ntp/include/Makefile.am | 1 + contrib/ntp/include/Makefile.in | 2 + contrib/ntp/include/c99_snprintf.h | 28 + contrib/ntp/include/isc/Makefile.in | 1 + contrib/ntp/include/lib_strbuf.h | 30 +- contrib/ntp/include/ntp.h | 73 +- contrib/ntp/include/ntp_config.h | 13 +- contrib/ntp/include/ntp_control.h | 2 +- contrib/ntp/include/ntp_lists.h | 4 +- contrib/ntp/include/ntp_md5.h | 25 +- contrib/ntp/include/ntp_net.h | 13 +- contrib/ntp/include/ntp_psl.h | 11 +- contrib/ntp/include/ntp_stdlib.h | 20 +- contrib/ntp/include/ntp_tty.h | 5 + contrib/ntp/include/ntp_types.h | 10 - contrib/ntp/include/ntpd.h | 80 +- contrib/ntp/include/vint64ops.h | 2 +- contrib/ntp/kernel/Makefile.in | 1 + contrib/ntp/kernel/sys/Makefile.in | 1 + contrib/ntp/libntp/Makefile.am | 1 - contrib/ntp/libntp/Makefile.in | 76 +- contrib/ntp/libntp/a_md5encrypt.c | 169 +- contrib/ntp/libntp/adjtime.c | 2 +- contrib/ntp/libntp/audio.c | 2 +- contrib/ntp/libntp/authkeys.c | 4 + contrib/ntp/libntp/authreadkeys.c | 12 +- contrib/ntp/libntp/bsd_strerror.c | 2 +- contrib/ntp/libntp/clocktypes.c | 1 - contrib/ntp/libntp/dofptoa.c | 2 - contrib/ntp/libntp/dolfptoa.c | 2 - contrib/ntp/libntp/humandate.c | 1 - contrib/ntp/libntp/lib/isc/win32/strerror.c | 64 +- contrib/ntp/libntp/lib_strbuf.c | 51 +- contrib/ntp/libntp/machines.c | 60 +- contrib/ntp/libntp/modetoa.c | 1 - contrib/ntp/libntp/msyslog.c | 6 +- contrib/ntp/libntp/netof.c | 24 +- contrib/ntp/libntp/ntp_calendar.c | 1 - contrib/ntp/libntp/ntp_intres.c | 6 - contrib/ntp/libntp/ntp_realpath.c | 43 +- contrib/ntp/libntp/numtoa.c | 64 +- contrib/ntp/libntp/numtohost.c | 43 - contrib/ntp/libntp/prettydate.c | 1 - contrib/ntp/libntp/recvbuff.c | 39 +- contrib/ntp/libntp/refnumtoa.c | 1 - contrib/ntp/libntp/snprintf.c | 2 +- contrib/ntp/libntp/socket.c | 16 +- contrib/ntp/libntp/socktoa.c | 1 - contrib/ntp/libntp/socktohost.c | 1 - contrib/ntp/libntp/ssl_init.c | 74 +- contrib/ntp/libntp/statestr.c | 1 - contrib/ntp/libntp/systime.c | 1 - contrib/ntp/libntp/timexsup.c | 22 +- contrib/ntp/libntp/uglydate.c | 1 - contrib/ntp/libntp/vint64ops.c | 21 +- contrib/ntp/libntp/work_thread.c | 17 +- contrib/ntp/libparse/Makefile.am | 15 +- contrib/ntp/libparse/Makefile.in | 30 +- contrib/ntp/libparse/clk_computime.c | 2 +- contrib/ntp/libparse/clk_dcf7000.c | 2 +- contrib/ntp/libparse/clk_hopf6021.c | 2 +- contrib/ntp/libparse/clk_meinberg.c | 2 +- contrib/ntp/libparse/clk_rawdcf.c | 2 +- contrib/ntp/libparse/clk_rcc8000.c | 2 +- contrib/ntp/libparse/clk_schmid.c | 2 +- contrib/ntp/libparse/clk_sel240x.c | 2 +- contrib/ntp/libparse/clk_trimtaip.c | 2 +- contrib/ntp/libparse/clk_trimtsip.c | 2 +- contrib/ntp/libparse/clk_varitext.c | 2 +- contrib/ntp/libparse/clk_wharton.c | 2 +- contrib/ntp/libparse/ieee754io.c | 25 +- contrib/ntp/libparse/parse.c | 2 +- contrib/ntp/libparse/parse_conf.c | 2 +- contrib/ntp/ntpd/Makefile.in | 20 +- contrib/ntp/ntpd/cmd_args.c | 18 +- contrib/ntp/ntpd/complete.conf.in | 43 +- contrib/ntp/ntpd/invoke-ntp.conf.texi | 99 +- contrib/ntp/ntpd/invoke-ntp.keys.texi | 2 +- contrib/ntp/ntpd/invoke-ntpd.texi | 4 +- contrib/ntp/ntpd/keyword-gen-utd | 2 +- contrib/ntp/ntpd/keyword-gen.c | 2 +- contrib/ntp/ntpd/ntp.conf.5man | 106 +- contrib/ntp/ntpd/ntp.conf.5mdoc | 106 +- contrib/ntp/ntpd/ntp.conf.def | 100 +- contrib/ntp/ntpd/ntp.conf.html | 102 +- contrib/ntp/ntpd/ntp.conf.man.in | 106 +- contrib/ntp/ntpd/ntp.conf.mdoc.in | 106 +- contrib/ntp/ntpd/ntp.keys.5man | 6 +- contrib/ntp/ntpd/ntp.keys.5mdoc | 6 +- contrib/ntp/ntpd/ntp.keys.html | 2 +- contrib/ntp/ntpd/ntp.keys.man.in | 6 +- contrib/ntp/ntpd/ntp.keys.mdoc.in | 6 +- contrib/ntp/ntpd/ntp_config.c | 696 +- contrib/ntp/ntpd/ntp_control.c | 68 +- contrib/ntp/ntpd/ntp_crypto.c | 134 +- contrib/ntp/ntpd/ntp_io.c | 927 +- contrib/ntp/ntpd/ntp_keyword.h | 2078 +-- contrib/ntp/ntpd/ntp_leapsec.c | 78 +- contrib/ntp/ntpd/ntp_loopfilter.c | 16 + contrib/ntp/ntpd/ntp_monitor.c | 21 +- contrib/ntp/ntpd/ntp_parser.c | 3279 ++-- contrib/ntp/ntpd/ntp_parser.h | 752 +- contrib/ntp/ntpd/ntp_peer.c | 202 +- contrib/ntp/ntpd/ntp_proto.c | 334 +- contrib/ntp/ntpd/ntp_refclock.c | 58 +- contrib/ntp/ntpd/ntp_request.c | 15 +- contrib/ntp/ntpd/ntp_restrict.c | 725 +- contrib/ntp/ntpd/ntp_scanner.c | 22 +- contrib/ntp/ntpd/ntp_timer.c | 303 +- contrib/ntp/ntpd/ntp_util.c | 249 +- contrib/ntp/ntpd/ntpd-opts.c | 20 +- contrib/ntp/ntpd/ntpd-opts.h | 8 +- contrib/ntp/ntpd/ntpd.1ntpdman | 6 +- contrib/ntp/ntpd/ntpd.1ntpdmdoc | 6 +- contrib/ntp/ntpd/ntpd.c | 101 +- contrib/ntp/ntpd/ntpd.html | 4 +- contrib/ntp/ntpd/ntpd.man.in | 6 +- contrib/ntp/ntpd/ntpd.mdoc.in | 6 +- contrib/ntp/ntpd/refclock_acts.c | 2 +- contrib/ntp/ntpd/refclock_arbiter.c | 2 +- contrib/ntp/ntpd/refclock_arc.c | 13 +- contrib/ntp/ntpd/refclock_as2201.c | 2 +- contrib/ntp/ntpd/refclock_atom.c | 2 +- contrib/ntp/ntpd/refclock_bancomm.c | 2 +- contrib/ntp/ntpd/refclock_chronolog.c | 2 +- contrib/ntp/ntpd/refclock_conf.c | 2 +- contrib/ntp/ntpd/refclock_dumbclock.c | 2 +- contrib/ntp/ntpd/refclock_fg.c | 2 +- contrib/ntp/ntpd/refclock_gpsvme.c | 2 +- contrib/ntp/ntpd/refclock_heath.c | 2 +- contrib/ntp/ntpd/refclock_hopfpci.c | 2 +- contrib/ntp/ntpd/refclock_hopfser.c | 2 +- contrib/ntp/ntpd/refclock_hpgps.c | 2 +- contrib/ntp/ntpd/refclock_irig.c | 2 +- contrib/ntp/ntpd/refclock_jjy.c | 2 +- contrib/ntp/ntpd/refclock_jupiter.c | 2 +- contrib/ntp/ntpd/refclock_local.c | 2 +- contrib/ntp/ntpd/refclock_mx4200.c | 2 +- contrib/ntp/ntpd/refclock_neoclock4x.c | 2 +- contrib/ntp/ntpd/refclock_nmea.c | 2 + contrib/ntp/ntpd/refclock_oncore.c | 2 +- contrib/ntp/ntpd/refclock_palisade.c | 2 +- contrib/ntp/ntpd/refclock_pcf.c | 2 +- contrib/ntp/ntpd/refclock_pst.c | 2 +- contrib/ntp/ntpd/refclock_ripencc.c | 2 +- contrib/ntp/ntpd/refclock_tpro.c | 2 +- contrib/ntp/ntpd/refclock_true.c | 2 +- contrib/ntp/ntpd/refclock_tsyncpci.c | 2 +- contrib/ntp/ntpd/refclock_tt560.c | 2 +- contrib/ntp/ntpd/refclock_ulink.c | 2 +- contrib/ntp/ntpd/refclock_wwv.c | 2 +- contrib/ntp/ntpd/refclock_wwvb.c | 2 +- contrib/ntp/ntpd/refclock_zyfer.c | 2 +- contrib/ntp/ntpdate/Makefile.in | 18 +- contrib/ntp/ntpdc/Makefile.in | 18 +- contrib/ntp/ntpdc/invoke-ntpdc.texi | 4 +- contrib/ntp/ntpdc/nl.pl | 1 + contrib/ntp/ntpdc/nl.pl.in | 1 + contrib/ntp/ntpdc/ntpdc-opts.c | 20 +- contrib/ntp/ntpdc/ntpdc-opts.h | 8 +- contrib/ntp/ntpdc/ntpdc.1ntpdcman | 6 +- contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc | 6 +- contrib/ntp/ntpdc/ntpdc.html | 4 +- contrib/ntp/ntpdc/ntpdc.man.in | 6 +- contrib/ntp/ntpdc/ntpdc.mdoc.in | 6 +- contrib/ntp/ntpq/Makefile.in | 18 +- contrib/ntp/ntpq/invoke-ntpq.texi | 4 +- contrib/ntp/ntpq/ntpq-opts.c | 20 +- contrib/ntp/ntpq/ntpq-opts.h | 8 +- contrib/ntp/ntpq/ntpq-subs.c | 41 +- contrib/ntp/ntpq/ntpq.1ntpqman | 6 +- contrib/ntp/ntpq/ntpq.1ntpqmdoc | 6 +- contrib/ntp/ntpq/ntpq.c | 25 +- contrib/ntp/ntpq/ntpq.h | 1 - contrib/ntp/ntpq/ntpq.html | 4 +- contrib/ntp/ntpq/ntpq.man.in | 6 +- contrib/ntp/ntpq/ntpq.mdoc.in | 6 +- contrib/ntp/ntpsnmpd/Makefile.am | 8 +- contrib/ntp/ntpsnmpd/Makefile.in | 22 +- contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi | 4 +- contrib/ntp/ntpsnmpd/netsnmp_daemonize.c | 18 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c | 20 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.html | 2 +- contrib/ntp/ntpsnmpd/ntpsnmpd.man.in | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in | 6 +- contrib/ntp/packageinfo.sh | 4 +- contrib/ntp/parseutil/Makefile.in | 1 + contrib/ntp/scripts/Makefile.in | 1 + contrib/ntp/scripts/build/Makefile.in | 1 + contrib/ntp/scripts/build/checkHtmlFileDates | 24 +- contrib/ntp/scripts/build/genAuthors.in | 1 + contrib/ntp/scripts/build/mkver.in | 2 + contrib/ntp/scripts/calc_tickadj/Makefile.in | 1 + .../calc_tickadj/calc_tickadj.1calc_tickadjman | 4 +- .../calc_tickadj/calc_tickadj.1calc_tickadjmdoc | 4 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.html | 2 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.in | 1 + .../ntp/scripts/calc_tickadj/calc_tickadj.man.in | 4 +- .../ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in | 4 +- .../scripts/calc_tickadj/invoke-calc_tickadj.texi | 2 +- contrib/ntp/scripts/invoke-plot_summary.texi | 4 +- contrib/ntp/scripts/invoke-summary.texi | 4 +- contrib/ntp/scripts/lib/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait-opts | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman | 4 +- .../ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.html | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.in | 1 + contrib/ntp/scripts/ntp-wait/ntp-wait.man.in | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in | 4 +- contrib/ntp/scripts/ntpsweep/Makefile.in | 1 + contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep-opts | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman | 4 +- .../ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.html | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.in | 1 + contrib/ntp/scripts/ntpsweep/ntpsweep.man.in | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in | 4 +- contrib/ntp/scripts/ntptrace/Makefile.in | 1 + contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi | 4 +- contrib/ntp/scripts/ntptrace/ntptrace-opts | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman | 4 +- .../ntp/scripts/ntptrace/ntptrace.1ntptracemdoc | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.html | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.in | 11 + contrib/ntp/scripts/ntptrace/ntptrace.man.in | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in | 4 +- contrib/ntp/scripts/ntpver.in | 3 +- contrib/ntp/scripts/plot_summary-opts | 4 +- contrib/ntp/scripts/plot_summary.1plot_summaryman | 4 +- contrib/ntp/scripts/plot_summary.1plot_summarymdoc | 4 +- contrib/ntp/scripts/plot_summary.html | 4 +- contrib/ntp/scripts/plot_summary.in | 1 + contrib/ntp/scripts/plot_summary.man.in | 4 +- contrib/ntp/scripts/plot_summary.mdoc.in | 4 +- contrib/ntp/scripts/summary-opts | 4 +- contrib/ntp/scripts/summary.1summaryman | 4 +- contrib/ntp/scripts/summary.1summarymdoc | 4 +- contrib/ntp/scripts/summary.html | 4 +- contrib/ntp/scripts/summary.in | 1 + contrib/ntp/scripts/summary.man.in | 4 +- contrib/ntp/scripts/summary.mdoc.in | 4 +- contrib/ntp/scripts/update-leap/Makefile.in | 1 + .../scripts/update-leap/invoke-update-leap.texi | 2 +- contrib/ntp/scripts/update-leap/update-leap-opts | 4 +- .../update-leap/update-leap.1update-leapman | 4 +- .../update-leap/update-leap.1update-leapmdoc | 4 +- contrib/ntp/scripts/update-leap/update-leap.html | 2 +- contrib/ntp/scripts/update-leap/update-leap.in | 1 + contrib/ntp/scripts/update-leap/update-leap.man.in | 4 +- .../ntp/scripts/update-leap/update-leap.mdoc.in | 4 +- contrib/ntp/sntp/COPYRIGHT | 4 +- contrib/ntp/sntp/Makefile.am | 3 +- contrib/ntp/sntp/Makefile.in | 17 +- contrib/ntp/sntp/aclocal.m4 | 1 + contrib/ntp/sntp/check-libntp.mf | 10 +- contrib/ntp/sntp/check-libsntp.mf | 8 +- contrib/ntp/sntp/check-libunity.mf | 3 +- contrib/ntp/sntp/config.h.in | 41 +- contrib/ntp/sntp/configure | 18356 ++++++++++--------- contrib/ntp/sntp/configure.ac | 8 +- contrib/ntp/sntp/crypto.c | 72 +- contrib/ntp/sntp/crypto.h | 15 +- contrib/ntp/sntp/include/Makefile.in | 2 + contrib/ntp/sntp/include/copyright.def | 2 +- contrib/ntp/sntp/include/version.def | 2 +- contrib/ntp/sntp/include/version.texi | 6 +- contrib/ntp/sntp/invoke-sntp.texi | 4 +- contrib/ntp/sntp/libevent/Makefile.in | 3 + contrib/ntp/sntp/libevent/configure | 8 +- contrib/ntp/sntp/libevent/configure.ac | 7 +- contrib/ntp/sntp/libevent/kqueue.c | 2 +- contrib/ntp/sntp/libevent/m4/acx_pthread.m4 | 2 +- contrib/ntp/sntp/libopts/Makefile.am | 4 +- contrib/ntp/sntp/libopts/Makefile.in | 23 +- contrib/ntp/sntp/m4/ntp_compiler.m4 | 68 +- contrib/ntp/sntp/m4/ntp_crypto_rand.m4 | 37 +- contrib/ntp/sntp/m4/ntp_facilitynames.m4 | 33 +- contrib/ntp/sntp/m4/ntp_libevent.m4 | 10 +- contrib/ntp/sntp/m4/ntp_libntp.m4 | 89 +- contrib/ntp/sntp/m4/ntp_openssl.m4 | 827 +- contrib/ntp/sntp/m4/version.m4 | 2 +- contrib/ntp/sntp/main.c | 20 +- contrib/ntp/sntp/scm-rev | 2 +- contrib/ntp/sntp/scripts/Makefile.in | 2 + contrib/ntp/sntp/scripts/cvo.sh | 8 +- contrib/ntp/sntp/sntp-opts.c | 20 +- contrib/ntp/sntp/sntp-opts.h | 8 +- contrib/ntp/sntp/sntp.1sntpman | 6 +- contrib/ntp/sntp/sntp.1sntpmdoc | 6 +- contrib/ntp/sntp/sntp.html | 4 +- contrib/ntp/sntp/sntp.man.in | 6 +- contrib/ntp/sntp/sntp.mdoc.in | 6 +- contrib/ntp/sntp/tests/Makefile.in | 23 +- contrib/ntp/sntp/tests/crypto.c | 235 +- contrib/ntp/sntp/tests/fileHandlingTest.h.in | 8 +- contrib/ntp/sntp/tests/packetHandling.c | 50 +- contrib/ntp/sntp/tests/packetProcessing.c | 168 +- contrib/ntp/sntp/tests/run-crypto.c | 20 +- contrib/ntp/sntp/tests/run-packetProcessing.c | 40 +- contrib/ntp/sntp/unity/Makefile.in | 2 + contrib/ntp/sntp/unity/unity_internals.h | 10 +- contrib/ntp/sntp/utilities.h | 1 - contrib/ntp/tests/libntp/data/ntp.keys | 23 +- contrib/ntp/tests/libntp/digests.c | 125 +- contrib/ntp/tests/libntp/run-digests.c | 6 + contrib/ntp/util/Makefile.am | 4 +- contrib/ntp/util/Makefile.in | 62 +- contrib/ntp/util/invoke-ntp-keygen.texi | 4 +- contrib/ntp/util/lsf-times.c | 220 + contrib/ntp/util/ntp-keygen-opts.c | 20 +- contrib/ntp/util/ntp-keygen-opts.h | 8 +- contrib/ntp/util/ntp-keygen.1ntp-keygenman | 6 +- contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc | 6 +- contrib/ntp/util/ntp-keygen.c | 55 +- contrib/ntp/util/ntp-keygen.html | 4 +- contrib/ntp/util/ntp-keygen.man.in | 6 +- contrib/ntp/util/ntp-keygen.mdoc.in | 6 +- usr.sbin/ntp/config.h | 545 +- usr.sbin/ntp/libntp/Makefile | 2 +- usr.sbin/ntp/ntpd/Makefile | 4 +- usr.sbin/ntp/ntpdate/Makefile | 4 +- usr.sbin/ntp/ntpdc/Makefile | 4 +- usr.sbin/ntp/ntpq/Makefile | 4 +- usr.sbin/ntp/sntp/Makefile | 4 +- 351 files changed, 26986 insertions(+), 17542 deletions(-) diff --git a/contrib/ntp/COPYRIGHT b/contrib/ntp/COPYRIGHT index 013202c0fb09..0cb57168ebfc 100644 --- a/contrib/ntp/COPYRIGHT +++ b/contrib/ntp/COPYRIGHT @@ -3,7 +3,7 @@ This file is automatically generated from html/copyright.html jpg "Clone me," says Dolly sheepishly. - Last update: 2-Mar-2023 05:21 UTC + Last update: 7-Jan-2024 00:29 UTC __________________________________________________________________ The following copyright notice applies to all files collectively called @@ -32,7 +32,7 @@ This file is automatically generated from html/copyright.html Hart, Danny Mayer, Martin Burnicki, and possibly others is: *********************************************************************** * * -* Copyright (c) Network Time Foundation 2011-2023 * +* Copyright (c) Network Time Foundation 2011-2024 * * * * All Rights Reserved * * * diff --git a/contrib/ntp/ChangeLog b/contrib/ntp/ChangeLog index 93cdab8b94eb..f4a196aa57cd 100644 --- a/contrib/ntp/ChangeLog +++ b/contrib/ntp/ChangeLog @@ -1,3 +1,121 @@ +--- +(4.2.8p18) 2024/05/25 Released by Harlan Stenn + +* [Bug 3918] Tweak openssl header/library handling. +* [Bug 3914] Spurious "Unexpected origin timestamp" logged after time + stepped. +* [Bug 3913] Avoid duplicate IPv6 link-local manycast associations. + +* [Bug 3912] Avoid rare math errors in ntptrace. +* [Bug 3910] Memory leak using openssl-3 +* [Bug 3909] Do not select multicast local address for unicast peer. + +* [Bug 3903] lib/isc/win32/strerror.c NTstrerror() is not thread-safe. + +* [Bug 3901] LIB_GETBUF isn't thread-safe. +* [Bug 3900] fast_xmit() selects wrong local addr responding to mcast on + Windows. +* [Bug 3888] ntpd with multiple same-subnet IPs using manycastclient creates + duplicate associations. +* [Bug 3872] Ignore restrict mask for hostname. +* [Bug 3871] 4.2.8p17 build without hopf6021 refclock enabled fails. + Reported by Hans Mayer. Moved NONEMPTY_TRANSLATION_UNIT + declaration from ntp_types.h to config.h. +* [Bug 3870] Server drops client packets with ppoll < 4. +* [Bug 3869] Remove long-gone "calldelay" & "crypto sign" from docs. + Reported by PoolMUC@web.de. +* [Bug 3868] Cannot restrict a pool peer. Thanks to + Edward McGuire for tracking down the deficiency. +* [Bug 3864] ntpd IPv6 refid different for big-endian and little-endian. + +* [Bug 3859] Use NotifyIpInterfaceChange on Windows ntpd. +* [Bug 3856] Enable Edit & Continue debugging with Visual Studio. + +* [Bug 3855] ntpq lacks an equivalent to ntpdc's delrestrict. +* [Bug 3854] ntpd 4.2.8p17 corrupts rawstats file with space in refid. + +* [Bug 3853] Clean up warnings with modern compilers. +* [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as + intended. +* [Bug 3851] Drop pool server when no local address can reach it. + +* [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid. + +* [Bug 3849] ntpd --wait-sync times out. +* [Bug 3847] SSL detection in configure should run-test if runpath is needed. + +* [Bug 3846] Use -Wno-format-truncation by default. +* [Bug 3845] accelerate pool clock_sync when IPv6 has only link-local access. + +* [Bug 3842] Windows ntpd PPSAPI DLL load failure crashes. +* [Bug 3841] 4.2.8p17 build break w/ gcc 12 -Wformat-security without -Wformat + Need to remove --Wformat-security when removing -Wformat to + silence numerous libopts warnings. +* [Bug 3837] NULL pointer deref crash when ntpd deletes last interface. + Reported by renmingshuai. Correct UNLINK_EXPR_SLIST() when the + list is empty. +* [Bug 3835] NTP_HARD_*FLAGS not used by libevent tearoff. +* [Bug 3831] pollskewlist zeroed on runtime configuration. +* [Bug 3830] configure libevent check intersperses output with answer. +* [Bug 3828] BK should ignore a git repo in the same directory. + +* [Bug 3827] Fix build in case CLOCK_HOPF6021 or CLOCK_WHARTON_400A + is disabled. +* [Bug 3825] Don't touch HTML files unless building inside a BK repo. + Fix the script checkHtmlFileDates. +* [Bug 3756] Improve OpenSSL library/header detection. +* [Bug 3753] ntpd fails to start with FIPS-enabled OpenSSL 3. +* [Bug 2734] TEST3 prevents initial interleave sync. Fix from +* Log failures to allocate receive buffers. +* Remove extraneous */ from libparse/ieee754io.c +* Fix .datecheck target line in Makefile.am. +* Update the copyright year. +* Update ntp.conf documentation to add "delrestrict" and correct information + about KoD rate limiting. +* html/clockopt.html cleanup. +* util/lsf-times - added. +* Add DSA, DSA-SHA, and SHA to tests/libntp/digests.c. +* Provide ntpd thread names to debugger on Windows. +* Remove dead code libntp/numtohost.c and its unit tests. +* Remove class A, B, C IPv4 distinctions in netof(). +* Use @configure_input@ in various *.in files to include a comment that + the file is generated from another pointing to the *.in. +* Correct underquoting, indents in ntp_facilitynames.m4. +* Clean up a few warnings seen building with older gcc. +* Fix build on older FreeBSD lacking sys/procctl.h. +* Disable [Bug 3627] workaround on newer FreeBSD which has the kernel fix + that makes it unnecessary, re-enabling ASLR stack gap. +* Use NONEMPTY_COMPILATION_UNIT in more conditionally-compiled files. +* Remove useless pointer to Windows Help from system error messages. +* Avoid newlines within Windows error messages. +* Ensure unique association IDs if wrapped. +* Simplify calc_addr_distance(). +* Clamp min/maxpoll in edge cases in newpeer(). +* Quiet local addr change logging when unpeering. +* Correct missing arg for %s printf specifier in + send_blocking_resp_internal(). +* Suppress OpenSSL 3 deprecation warning clutter. +* Correct OpenSSL usage in Autokey code to avoid warnings about + discarding const qualifiers with OpenSSL 3. +* Display KoD refid as text in recently added message. +* Avoid running checkHtmlFileDates script repeatedly when no html/*.html + files have changed. +* Abort configure if --enable-crypto-rand given & unavailable. +* Add configure --enable-verbose-ssl to trace SSL detection. +* Add build test coverage for --disable-saveconfig to flock-build script. + +* Remove deprecated configure --with-arlib option. +* Remove configure support for ISC UNIX ca. 1998. +* Move NTP_OPENSSL and NTP_CRYPTO_RAND invocations from configure.ac files + to NTP_LIBNTP. +* Remove dead code: HAVE_U_INT32_ONLY_WITH_DNS. +* Eliminate [v]snprintf redefinition warnings on macOS. +* Fix clang 14 cast increases alignment warning on Linux. +* Move ENABLE_CMAC to ntp_openssl.m4, reviving sntp/tests CMAC unit tests. + +* Use NTP_HARD_CPPFLAGS in libopts tearoff. +* wire in --enable-build-framework-help + --- (4.2.8p17) 2023/06/06 Released by Harlan Stenn @@ -10,7 +128,7 @@ Miroslav Lichvar and Matt for rapid testing and identifying the problem. * Add tests/libntp/digests.c to catch regressions reading keys file or with - symmetric authentication digest output. + symmetric authentication digest output. --- (4.2.8p16) 2023/05/31 Released by Harlan Stenn diff --git a/contrib/ntp/CommitLog b/contrib/ntp/CommitLog index adeda2c60402..49952cfaef0d 100644 --- a/contrib/ntp/CommitLog +++ b/contrib/ntp/CommitLog @@ -1,3 +1,3224 @@ +ChangeSet@1.4062, 2024-05-25 00:06:49-07:00, ntpreleng@ntp-build.tal1.ntfo.org + NTP_4_2_8P18 + TAG: NTP_4_2_8P18 + + ChangeLog@1.2103 +1 -0 + NTP_4_2_8P18 + + ntpd/invoke-ntp.conf.texi@1.231 +1 -1 + NTP_4_2_8P18 + + ntpd/invoke-ntp.keys.texi@1.214 +1 -1 + NTP_4_2_8P18 + + ntpd/invoke-ntpd.texi@1.528 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.5man@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.5mdoc@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.html@1.213 +1 -1 + NTP_4_2_8P18 + + ntpd/ntp.conf.man.in@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.mdoc.in@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.5man@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.5mdoc@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.html@1.208 +1 -1 + NTP_4_2_8P18 + + ntpd/ntp.keys.man.in@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.mdoc.in@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd-opts.c@1.553 +245 -245 + NTP_4_2_8P18 + + ntpd/ntpd-opts.h@1.552 +3 -3 + NTP_4_2_8P18 + + ntpd/ntpd.1ntpdman@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.1ntpdmdoc@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.html@1.202 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.man.in@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.mdoc.in@1.357 +2 -2 + NTP_4_2_8P18 + + ntpdc/invoke-ntpdc.texi@1.527 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc-opts.c@1.548 +113 -113 + NTP_4_2_8P18 + + ntpdc/ntpdc-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + ntpdc/ntpdc.1ntpdcman@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.1ntpdcmdoc@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.html@1.372 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.man.in@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.mdoc.in@1.358 +2 -2 + NTP_4_2_8P18 + + ntpq/invoke-ntpq.texi@1.537 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq-opts.c@1.557 +120 -120 + NTP_4_2_8P18 + + ntpq/ntpq-opts.h@1.555 +3 -3 + NTP_4_2_8P18 + + ntpq/ntpq.1ntpqman@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.1ntpqmdoc@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.html@1.202 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.man.in@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.mdoc.in@1.365 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.527 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd-opts.c@1.548 +68 -68 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.html@1.194 +1 -1 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.man.in@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.356 +2 -2 + NTP_4_2_8P18 + + packageinfo.sh@1.553 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.117 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.119 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.html@1.118 +1 -1 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.man.in@1.116 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.119 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.121 +1 -1 + NTP_4_2_8P18 + + scripts/invoke-plot_summary.texi@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/invoke-summary.texi@1.138 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.350 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait-opts@1.86 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.345 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.347 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.html@1.366 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.man.in@1.345 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.347 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.html@1.138 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.man.in@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.125 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/invoke-ntptrace.texi@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.1ntptraceman@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.126 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.html@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.man.in@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.mdoc.in@1.127 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary-opts@1.90 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.1plot_summaryman@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.1plot_summarymdoc@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.html@1.141 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.man.in@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.mdoc.in@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/summary-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/summary.1summaryman@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.1summarymdoc@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.html@1.140 +2 -2 + NTP_4_2_8P18 + + scripts/summary.man.in@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.mdoc.in@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/invoke-update-leap.texi@1.37 +1 -1 + NTP_4_2_8P18 + + scripts/update-leap/update-leap-opts@1.39 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.1update-leapman@1.37 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.1update-leapmdoc@1.38 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.html@1.37 +1 -1 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.man.in@1.37 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.mdoc.in@1.38 +2 -2 + NTP_4_2_8P18 + + sntp/invoke-sntp.texi@1.527 +2 -2 + NTP_4_2_8P18 + + sntp/sntp-opts.c@1.549 +161 -161 + NTP_4_2_8P18 + + sntp/sntp-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + sntp/sntp.1sntpman@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.1sntpmdoc@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.html@1.543 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.man.in@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.mdoc.in@1.362 +2 -2 + NTP_4_2_8P18 + + util/invoke-ntp-keygen.texi@1.530 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen-opts.c@1.551 +174 -174 + NTP_4_2_8P18 + + util/ntp-keygen-opts.h@1.549 +3 -3 + NTP_4_2_8P18 + + util/ntp-keygen.1ntp-keygenman@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.1ntp-keygenmdoc@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.html@1.203 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.man.in@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.mdoc.in@1.358 +2 -2 + NTP_4_2_8P18 + +ChangeSet@1.4061, 2024-05-24 23:46:58-07:00, ntpreleng@ntp-build.tal1.ntfo.org + ntp-4.2.8p18 + + ChangeLog@1.2102 +0 -2 + ntp-4.2.8p18 + +ChangeSet@1.4060, 2024-05-24 22:53:53-07:00, ntpreleng@ntp-build.tal1.ntfo.org + NTP_4_2_8P18_RCGO + TAG: NTP_4_2_8P18_RCGO + + ChangeLog@1.2101 +1 -0 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntp.conf.texi@1.230 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntp.keys.texi@1.213 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntpd.texi@1.527 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.5man@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.5mdoc@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.html@1.212 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.man.in@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.mdoc.in@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.5man@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.5mdoc@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.html@1.207 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.man.in@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.mdoc.in@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd-opts.c@1.552 +7 -7 + NTP_4_2_8P18_RCGO + + ntpd/ntpd-opts.h@1.551 +3 -3 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.1ntpdman@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.1ntpdmdoc@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.html@1.201 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.man.in@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.mdoc.in@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/invoke-ntpdc.texi@1.526 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc-opts.c@1.547 +7 -7 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc-opts.h@1.546 +3 -3 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.1ntpdcman@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.1ntpdcmdoc@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.html@1.371 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.man.in@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.mdoc.in@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/invoke-ntpq.texi@1.536 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq-opts.c@1.556 +7 -7 + NTP_4_2_8P18_RCGO + + ntpq/ntpq-opts.h@1.554 +3 -3 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.1ntpqman@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.1ntpqmdoc@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.html@1.201 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.man.in@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.mdoc.in@1.364 +2 -2 + NTP_4_2_8P18_RCGO + *** 59789 LINES SKIPPED *** From nobody Thu May 30 01:43:08 2024 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 4VqTXr4kMvz5LldS; Thu, 30 May 2024 01: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 4VqTXr48Vrz4Kp5; Thu, 30 May 2024 01: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=1717033388; 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=Gh1P8G8ks48e7K9Kt2J0UZQ5OSn0SVlRhm40Lliz2Ko=; b=ZQE1yigwGiJk0BWmsrkwB9a2MAXSFhNYsRrCjR0SbkSpTiLrrsVqXmNmnblVZwMTji60lF lPzCCiOLvhvW7zD8tmh9CxWJJgc9bARu94xrCnWia9CSH+e+OnfnUoVJ7B+r3fCEliG/XL scDg3DamgY+NnvW+GqxO0xiw5sOCinEX2rHVqavWLWXemI3UVHwSrlZlCcUi5aT+NRZPtL WDnAofTaFDKhPqqt41hYzZDABKhhzMF9Urw+7bmWR+6ZCkaqBJHtO2yMuJGgtaEGSW9EZg 6w19m64/moYUE7Or6xpIRpy5IL6SvxjOTV8YeV3JrsH3JnJIbnCiUkz3Lb8WBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717033388; a=rsa-sha256; cv=none; b=TVbL6lLl3WCfrizVtOXRMhBLGB4IUjBUq9sNNxF81ES7vE5U3LZfgdOqf+18PZ0jtqbW4I JVwZDtYVM2EhxAIvC1HK9PazaG6NvU9biSiB4TnThpqOhBmxsB0+h1/+nRuLDb62oXTKbh KyFS8c1OrCT86kAe+hb5OXfaTSiGq4BYuD5MYNMnicr8J9TAL485M2kh81XYvcv2dtVDS2 4EkzOiiV88ORa7zQ26bTPIbNJH2M7oj8a8TOdc7VrE78Q1SPa8h51GU7RkhcUp+a5Guo5H i8xNKLwbdT5k2j9gJtrIJHf/NyvbkH9N7BP4AiuTi81pwBwidnPJ+MfzQ1FL3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717033388; 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=Gh1P8G8ks48e7K9Kt2J0UZQ5OSn0SVlRhm40Lliz2Ko=; b=nAsVGo8RDreWTD6aWexYz2r29FfmnPpDR/f37ErJqW6OLJr2DxpBmk0hPTw6F8yqfz0DAL G9qy6E62iAbMWE8pBOxwMsNiHjptTj70zLd3GGAY3H/MToCc/S5XtlbGCFLVebzT9biPzr 7DMWSosefAv0sk3BeKZJfD9rHgp/U00uXm91qJDWe2whMlx9qUJDfvISjcBKT02rJz2PfI hF2wAoVHkilaoSMG+5jnAFr/jm8wElofz5iLrTNhPRFtZ8vVmlXFi2tQXSb3vx9x7valMv wtDwKoAaD+15ltGYVPoxcZdhGT8v4zYbJN9PjiJWzqnf8/zBPlRl132gAerZBg== 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 4VqTXr3lp8zKvk; Thu, 30 May 2024 01:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44U1h8Vv029098; Thu, 30 May 2024 01:43:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U1h8j7029096; Thu, 30 May 2024 01:43:08 GMT (envelope-from git) Date: Thu, 30 May 2024 01:43:08 GMT Message-Id: <202405300143.44U1h8j7029096@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: 858f4e52dd32 - stable/13 - ntp: Update version strings 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 858f4e52dd323054b16719e0602189774d70cfc5 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=858f4e52dd323054b16719e0602189774d70cfc5 commit 858f4e52dd323054b16719e0602189774d70cfc5 Author: Cy Schubert AuthorDate: 2024-05-27 09:12:49 +0000 Commit: Cy Schubert CommitDate: 2024-05-30 01:42:54 +0000 ntp: Update version strings Reported by: "Herbert J. Skuhra" Fixes: f5f40dd63bc7 (cherry picked from commit 018a4ab7b04deb0710743533f2b799d68b406f85) --- usr.sbin/ntp/config.h | 4 ++-- usr.sbin/ntp/scripts/mkver | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 03f55ef07819..c8e918a9128b 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1494,7 +1494,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.8p18-RC1" +#define PACKAGE_STRING "ntp 4.2.8p18" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1772,7 +1772,7 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.8p18-RC1" +#define VERSION "4.2.8p18" /* vsnprintf expands "%m" to strerror(errno) */ #define VSNPRINTF_PERCENT_M 1 diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 279468a1af1c..2336dd71bacb 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -7,7 +7,7 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.2.8p16" +ConfStr="$ConfStr 4.2.8p18" case "$CSET" in '') ;; From nobody Fri May 31 00:34:57 2024 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 4Vr3zj64gXz5LlXc; Fri, 31 May 2024 00:34: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 4Vr3zj5Wynz4l1b; Fri, 31 May 2024 00:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717115697; 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=044e7TfXmz+Cw9P8JVDHNpdgVmFkrSJ2c2XW7m/6mfI=; b=oeSq0iUr8exrSD7Ka7CSl+GcJhrRVTXmjxOnf1QPQfE91FoNzdyai5+xyd6Ux6G/5UAJpP H1JZqZ1x4h8yMbADI3jXzk9kbMtPPXpj7bTKHEJKZithp1C6R5753NfxUsOnYv5DLLW7kt Dkj+pEvfJ0gydUPo/fBdOSUur6AY4CV3ahrU/3QCXcZSc+mzuT/D6xju7HyL8wKgNnr056 06zwWxDdLbsFcJQarSkty0CKEVvyPGcija9C0Cdi8/AipcE/MUgydZsyyutnOJyzuY/RCZ rt+30Xa6GEOBWKpFsL30HeNhoK2d2TGFQaYwRl19x0CzuP5LfLSVygrYUZzMMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717115697; a=rsa-sha256; cv=none; b=wk1ENCR+P74SanveaxiZrzgMdCbvVPXTOF5aaW3cwqasJFUyfsxKaxSpMy1aDnCZzDpxU8 O9vYgFEHQgrlyRYqr2BDoaNcah7J9QaltMu30qc+NrNlkPoI3QcRevIPRFY9Fdm1HzC6rK 6B51i1SD85XNDJ9Hc6WZgHU8X0TOm3Wxc3uXLP9KmFfALxWYbbmNSx0Ml+w3T3ri/UStXa cTEVpkguC3e5hnS6C/HZ8cIk3G0X4TLd6v8nj1jdZdB5wcfhhqTHyEoRoDthiiaDQhftSa 0hh0QF6IehBfpUiMBWxmSMbH/IuPA9k1XVyF0F3aZYL3GX7AoSQ3Fy+NIaSynA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717115697; 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=044e7TfXmz+Cw9P8JVDHNpdgVmFkrSJ2c2XW7m/6mfI=; b=WUUhDIW2RznRgROuMHGpZDFd9DfrHiyIRnxwOp6UA7PKk0hUjKsF/6MF1afhja+zQ3hLHX VlDh/4dprbkLyIl3zLhZUUT4TDI6caq6+/pY1mUNnw1O/vIGZr/lbSCz5mYnKpIa7kZ8kq mM7SqQHhOc0fZ02jG/a9kIpZuvTcNJ42cPfEHg/83+u30S5hYckRh9ISAVCnYs/zl9fRs/ PhwS/COvATFp+S2jw4Mfq+nIUyIkdBVGrF85s4ltR6d/OoXyOrRwdtlVafzcAtA/GypPoV MYZ7AGuVEoENlZZyaWJ/SBpTXgKqTkEO4hGCKR3ul9DT67unIeTghP35WzcIsw== 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 4Vr3zj51N7z12mN; Fri, 31 May 2024 00:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44V0Yvhj043446; Fri, 31 May 2024 00:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V0Yvtj043443; Fri, 31 May 2024 00:34:57 GMT (envelope-from git) Date: Fri, 31 May 2024 00:34:57 GMT Message-Id: <202405310034.44V0Yvtj043443@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: 10e31f0946d8 - releng/14.1 - Update in preparation for 14.1-RELEASE 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14.1 X-Git-Reftype: branch X-Git-Commit: 10e31f0946d820d53adc58b7d013b969e4a9a8ed Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10e31f0946d820d53adc58b7d013b969e4a9a8ed commit 10e31f0946d820d53adc58b7d013b969e4a9a8ed Author: Colin Percival AuthorDate: 2024-05-31 00:31:16 +0000 Commit: Colin Percival CommitDate: 2024-05-31 00:31:16 +0000 Update in preparation for 14.1-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- UPDATING | 3 +++ lib/csu/common/crtbrand.S | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 83b0d8b27cda..2d4a66d0d29c 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240604: + 14.1-RELEASE. + 20240202: Loader now also read configuration files listed in local_loader_conf_files. Files listed here are the last ones read. And /boot/loader.conf.local was diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S index b59e2fd8056b..65c0c3863bde 100644 --- a/lib/csu/common/crtbrand.S +++ b/lib/csu/common/crtbrand.S @@ -43,7 +43,7 @@ .4byte NT_FREEBSD_ABI_TAG 1: .asciz NOTE_FREEBSD_VENDOR 2: .p2align 2 -3: .4byte __FreeBSD_version +3: .4byte 1401000 4: .section .note.GNU-stack,"",%progbits diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 7ba6ed47b3b8..38d445be32a6 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.1" -BRANCH="RC1" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 31 00:35:08 2024 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 4Vr3zw4QVFz5LlVD; Fri, 31 May 2024 00:35: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 4Vr3zw3xtsz4lHN; Fri, 31 May 2024 00:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717115708; 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=mj5pqxuXXMkXwWZR+2empqVOueWPraXmYPnwKx6Lte0=; b=BOQ2WCsFCY6GXplKgT5rFc809/QEv3LkiTH3MWHIgZ7jJBSj5AGuNbwiSxZSjZS6Pa1jDv EJd4/oP/qeT9VibcLP6OWx7IgAhjtlABDNLsrD223F4u0wAd1gQd1Zjy4a1Io1CWbnFmR2 wP3Fw1wVg31ZAOG0URU79NvZ/l8ZaX/ywYe40eUFKvmCQ4J4t1I1jK3f4uj6LKln4i3wag nWl3rV+n8JbKfEQmYoLivi2vszxFXaJ6DnEj03lTxHQ/iJVi19hEqyOGnPoHs5UBKxDWgn EPcVf31y0yZERWbLk8RhFRyG6xmzWWSMn08xT0tDOh87PgACvQWrCDnXNTeafQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717115708; a=rsa-sha256; cv=none; b=jv1lf5M3/RiuGXNo97ndXl6d1qB1CJPZF+CqF5fIOgP2AT+zsOMALG+ken5pTbXw3x6+jg sSgbVDK0E1shLVpBwKKaMGYR4NyP16KM2bSak7Yu7bhOjdVHYltgEJdId5GgufRE9f3oBt UxwCM+8Phgmws8QeThWBMRMGpeHIxaSlG+l0CT4kYXhCMMoG8BpqPScWY+Tia/cl2mO9YC eDFYR1eYF0YnXutU6L2Z8b8LYOLlkCTGZm3BqMVIQLjMEqxx7Sg3+XNvRJpqczf8SL93iW MdYHxXSAabacjwLaYX21MM9sxoOZEB6OLDIsMKWj8+kl1JZUvPpOfU+/tU7PcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717115708; 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=mj5pqxuXXMkXwWZR+2empqVOueWPraXmYPnwKx6Lte0=; b=qL85mVlvx3ioQl6OB0Sjg12bsTuZ0kt/+ZWSxOEbbsTcTtvngl9D9gXNZXdSpfOHImSm1t l4uyLEn84nuFzOn2FvTwvFVvB8UU6+sdtYT3DwXKpXMmtlozZHdFC8HXePbNBmXUqeI8Mr FCpgs+MfZRdCgW0juPCe/z88RM6CF+rCjjqImNb6Q+iso9qpiDSwXMKDat9fJtl5Dx0236 R5tkgIjrwZ5p8HkculYFtpyJOBhluu3uUqBDJ3odZb8aSEVJzdybs/ntKSxZT5DpPVVEKD CpG2AQMbz5xtwhqmP07ERH7zRw56BSuIjzKCcNvjhU5/Qo8D+IB7JZ4KtslwGg== 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 4Vr3zw3Ybhz121k; Fri, 31 May 2024 00:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44V0Z850043569; Fri, 31 May 2024 00:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V0Z8Bh043568; Fri, 31 May 2024 00:35:08 GMT (envelope-from git) Date: Fri, 31 May 2024 00:35:08 GMT Message-Id: <202405310035.44V0Z8Bh043568@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: 9699c03aaf9a - Create tag release/14.1.0 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/tags/release/14.1.0 X-Git-Reftype: annotated tag X-Git-Commit: 9699c03aaf9a4530f1a5eb193591e1e919f075e8 Auto-Submitted: auto-generated The annotated tag release/14.1.0 has been created by cperciva: URL: https://cgit.FreeBSD.org/src/tag/?h=release/14.1.0 tag release/14.1.0 Tagger: Colin Percival TaggerDate: 2024-05-31 00:34:21 +0000 Tag 14.1-RELEASE from 10e31f0946d820d53adc58b7d013b969e4a9a8ed -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEglY7hNBiDtwN+4ZBOJfy4i5lrT8FAmZZGw0ACgkQOJfy4i5l rT81KxAAgMHObpgfoTUaNveIOfu8W7C38VRO6+UBQNCVgTX7+vh68uXbwHKwGqXd 5SLExEMbNHuBz/nIF90dB9rReQmjP3MUMVgqkdQxdrrTCPCxp1pzjsyapWZ3UCvC aUBSVV1isbOksthavq1AhOwVWquvrt4mtbEX+8yo4nryYj8ATWx9++zIqhi7bmGI /680hLNRpd4NlNPneLRNTdcVD8SOeqCpPCwWAakUN3Ax80j+aPpjtzMDLveGbFwE ZKTbbc/uCFqYSgCcJacPwppKAEhcJ52M21dF9ND1J6aLhAyeKmj0zHfWmF6pImWC rXB4xNZCCiMOZEvb70k+Achoxx2OIimf6OltcyZiuhbbA1Q/ZMnOXILPXTm38Oqu 4IDjSR8ClI6ZK5+kDQTrJiEGUiD0NQFI6lKGEyyVsxbHsaXi+Jqr4beExKYa1Sn8 LEQddB5ld/sGj139PXwbP7HJx9onbzxyXy3hFbi3X/WQTRSmQWayUejz0pXDmgY4 OhQ6Mjkzg2SdX9vnAvxv0uUc3f3jqfQ/Qhf9WoFgRuWKKK3QV0Qd1Y8jkNW3oRmb e9HJ8raRV4j0L/R1Lolu6YwH9Mdhqy+9Y3a5aDIripkhYORyII0UBQ5efPmDJARv Y1dmI2IH7+tIjouxHF60Lic8Qpb98+RpWHAXujKkybLkXa7s70Y= =5ldh -----END PGP SIGNATURE----- commit 10e31f0946d820d53adc58b7d013b969e4a9a8ed Author: Colin Percival AuthorDate: 2024-05-31 00:31:16 +0000 Commit: Colin Percival CommitDate: 2024-05-31 00:31:16 +0000 Update in preparation for 14.1-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva From nobody Fri May 31 22:36:19 2024 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 4VrdJM5fmRz5LXyM; Fri, 31 May 2024 22:36: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 4VrdJM58fnz4j9J; Fri, 31 May 2024 22:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717194979; 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=f/1HrI+lJxWzjN7oAGtmHMVRXXfFjc8SbCQgmNpZIPw=; b=k78lWzoxpV4tk6teD6wEtW44/rVhgkCuhuFMp8vYy6XBV0KnBmSLTFgkVye+DgTVBmWOTF xq1drXr+/ukEG7T7X/zN7l6AA7nHd1+4ifYixBgdUV9V7cvWwC0tisGpqRSAPdPwoPf4xU 4+64Ev4a0foRZZ5Qolr7NnKqd0t7Rxd2OLKTmyE2uLIM26m/Nk2liNux9Ys+KjGBBoZLSn KFsLtFMBbm1xwl5P1xOeZ+RFg49u864VakuzBUy90sId1TlD4FZNtEvKiis74RzfcL5P+1 1gULRY3Ivv0Y7j2BwfCmbdZXG+h7/fXIBT0jsi5GQVPKUCJRJVADxVYYIBGmjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717194979; a=rsa-sha256; cv=none; b=eH2OSN9Zknv3XAtYpNZFhLbSiSU2NX83V/FQ/u0vfor9qlM47Drkqu5FuGoPgXqT6hWX8W 50coen7y0z2yW3Igli4kl97AYa/qPr7CbKdzY1XP2DtQWJ96avnvgsT74jq7/KPGFuOvXR 92Sbks/kemirkKExVf8SamxIkQo6R0eyHzBIY/tpoewLp8fkwUdGYC/qwUkE6OjxJkMBXU WlrBcGgVtRh1oACKEZo1DS6MSERRXAQhxzFArwjhucY//tujdjdtXlAEJclznPl/QaRzXY k2z0l/4gceTqxADnlvFYslH0GVNc5srtF3881Gcngy4rYoyy+DYaoPK4gqXoMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717194979; 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=f/1HrI+lJxWzjN7oAGtmHMVRXXfFjc8SbCQgmNpZIPw=; b=T1cgoz1FPGEDMZYdMmNZbz8afVBVcgR7zreJXJvpf6YhYboI8i+DBPwUzQeO94CRxl8mlq 6Fqfb4lHEb+zmiIKeClAXFPW/YJsxLBR7noM621FBBLCa3ejE9Uqy5XB9JYRJBsVjoaw5h GrRhAGDlFfYhhWVX7tta8pg6A7s9n8ctsRVr/iIglmR3NnJRG+80eTbqMV9P5Vmadu48aL vSX3Nuqtwllxz0hP8aj8YR/vw9ZdjUc8h7CTJv9e6BlPjua1ZPs0sHRYH+Y0uhuqnvVaKQ 4ws0FycTqOyxzgGkZvh3wGwYa9j3kryl4xnuWz/USWwTTx1SQ7DBWn21TBm8Tw== 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 4VrdJM4lmyzjDm; Fri, 31 May 2024 22:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44VMaJxP072621; Fri, 31 May 2024 22:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VMaJRH072618; Fri, 31 May 2024 22:36:19 GMT (envelope-from git) Date: Fri, 31 May 2024 22:36:19 GMT Message-Id: <202405312236.44VMaJRH072618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 4c136aad80e6 - stable/14 - svc.c: Check for a non-NULL xp_socket 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4c136aad80e6da1c9aa99de863642fe64a54f9a8 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4c136aad80e6da1c9aa99de863642fe64a54f9a8 commit 4c136aad80e6da1c9aa99de863642fe64a54f9a8 Author: Rick Macklem AuthorDate: 2024-05-28 02:22:04 +0000 Commit: Rick Macklem CommitDate: 2024-05-31 22:35:18 +0000 svc.c: Check for a non-NULL xp_socket Commit a16ff32f04b5 added support to the kernel RPC to set TCP_USE_DDP. However, for the unusual case of a NFSv4.1/4.2 non-NULL callback, the xp_socket field of SVCXPRT is NULL, since it uses the same socket as the client->server connection. This patch adds the check for this to avoid crashes. This only affects NFSv4.1/4.2 mounts where either pNFS or delegations are in use. (cherry picked from commit 6c9170e0afc4ebec81ba88a6370ebf6cb55520ba) --- sys/rpc/svc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c index 6d19a0b1ea7d..1e0e02c23cc1 100644 --- a/sys/rpc/svc.c +++ b/sys/rpc/svc.c @@ -1000,6 +1000,7 @@ svc_getreq(SVCXPRT *xprt, struct svc_req **rqstp_ret) * enable TLS offload first. */ if (xprt->xp_doneddp == 0 && r->rq_proc != NULLPROC && + xprt->xp_socket != NULL && atomic_cmpset_int(&xprt->xp_doneddp, 0, 1)) { if (xprt->xp_socket->so_proto->pr_protocol == IPPROTO_TCP) { From nobody Sat Jun 1 09:24:46 2024 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 4Vrvhb0JGtz5MXhq; Sat, 01 Jun 2024 09:24: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 4Vrvhb03W6z4m48; Sat, 1 Jun 2024 09:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717233887; 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=wrFttcU+7c8z+bQGXPKgabhV80vxXoes6OH4Turw6vg=; b=kzZJpF5bEoJ6FCKC6qc4Wh7lHudP7+5Wjg8CWOXkmylOKzzrChyyu2b9Uk8iPPP9zJwQJ3 DJVplWTrwT4g3pQiLg/Nv1HZl3/odEE5tQKHS2/UKacgCJxLlOFSSBLc89KIyIAs852LQB NbCieV7ebPhMcgXJo84Arvdv6TC0/QMDDn20rVBmrCkaSmO34oya2OzxF4ABp/paK8/tfq feKRSShiM7Pid9Se4X5CO9WYGwIlt7heeHQS30+ONyF5WyllgngbbudGChaYIaJiObypyU 3Mh5cVeyLdbZIojo3Jzu/2Qq4mbnSewRo6m9l8/CeNVCsYIYDrKTwDIte/naaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717233887; a=rsa-sha256; cv=none; b=D8vi427cK9Fup5436xAaJtl7Thd3B4HesZeUVYPmGo79N1n8Q1HRzHSxE89xgSxJpnDAfB s8pXvzDOnHxApTjHY/mgFVqSn6NqgH0iCcRzjZUXdd9qw/N38tJpR4taACq4mWbWCQLXln acUlyhrilA56nqn0I9YICxdzbUB6+5xILX7nTH9LDK///h17qkVfug1+1HsKXJ8SFPUIob wbDS+fXDVWmiOA23O4vZ+aHMdFgQt4ViYZN6yVFrdiFrQgWtStBP/3LSinaDDdaSyLG1HT +nwJ1hVzr4WbWqXzHpMUiqZ83DjZckX7eV+L2gj/Rh8Gnnr++ZW1EIT+uDrYlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717233887; 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=wrFttcU+7c8z+bQGXPKgabhV80vxXoes6OH4Turw6vg=; b=SXE1iz6g1AGC3S5Cj67u/l2LkfFsQSCdgutgScJray6Dlx6s1yD0uq25lncDT0z62kIrY/ w8Mc6hTM75XYe20KFmgU8CFNZNJhIfrDz9ye5Cdb8fITvPU3kXIEOWiO05jDz8RjrB2XnN dbYCHM3yZ2xjUhWgCuobNlGVJpw9zXX1wFpGcvRgQg+3JXfjvMMb0Swz497KpPe/R1j5ok Yuz0MmDagQYhxTGuCDR/dCKUCqeqT0dAek+K6+O2hMS8kkuMZXSeNLR9TLdG97mSPFvmy5 wkZUMX2VW3mc6aiF/0f6UxSQfMctykVWORrlGXuLCTSoehkynLUzFryi0WIrfw== 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 4VrvhZ6mypz12yX; Sat, 1 Jun 2024 09:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4519OktC070917; Sat, 1 Jun 2024 09:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4519OkDS070914; Sat, 1 Jun 2024 09:24:46 GMT (envelope-from git) Date: Sat, 1 Jun 2024 09:24:46 GMT Message-Id: <202406010924.4519OkDS070914@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: 339b47f01985 - stable/14 - x86/iommu: extract useful utilities into x86_iommu.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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 339b47f01985628ccc4c3e9a29c36f26edb034c3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=339b47f01985628ccc4c3e9a29c36f26edb034c3 commit 339b47f01985628ccc4c3e9a29c36f26edb034c3 Author: Konstantin Belousov AuthorDate: 2024-05-25 00:47:26 +0000 Commit: Konstantin Belousov CommitDate: 2024-06-01 09:24:24 +0000 x86/iommu: extract useful utilities into x86_iommu.c (cherry picked from commit 40d951bc5932deb87635f5c1780a6706d0c7c012) --- sys/conf/files.x86 | 1 + sys/x86/include/iommu.h | 1 + sys/x86/iommu/intel_ctx.c | 25 +++---- sys/x86/iommu/intel_dmar.h | 9 +-- sys/x86/iommu/intel_drv.c | 7 +- sys/x86/iommu/intel_fault.c | 1 + sys/x86/iommu/intel_idpgtbl.c | 77 ++++++++++---------- sys/x86/iommu/intel_intrmap.c | 3 +- sys/x86/iommu/intel_qi.c | 3 +- sys/x86/iommu/intel_quirks.c | 1 + sys/x86/iommu/intel_reg.h | 15 +--- sys/x86/iommu/intel_utils.c | 128 +++------------------------------ sys/x86/iommu/iommu_utils.c | 164 ++++++++++++++++++++++++++++++++++++++++++ sys/x86/iommu/x86_iommu.h | 62 ++++++++++++++++ 14 files changed, 302 insertions(+), 195 deletions(-) diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 15781eea8fee..445bbf9091ba 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -320,6 +320,7 @@ x86/iommu/intel_intrmap.c optional acpi iommu pci x86/iommu/intel_qi.c optional acpi iommu pci x86/iommu/intel_quirks.c optional acpi iommu pci x86/iommu/intel_utils.c optional acpi iommu pci +x86/iommu/iommu_utils.c optional acpi iommu pci x86/isa/atrtc.c standard x86/isa/clock.c standard x86/isa/isa.c optional isa diff --git a/sys/x86/include/iommu.h b/sys/x86/include/iommu.h index a95480b53acc..98c6661aa8e3 100644 --- a/sys/x86/include/iommu.h +++ b/sys/x86/include/iommu.h @@ -7,6 +7,7 @@ #include #include +#include #include #endif /* !_MACHINE_IOMMU_H_ */ diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 65ca88b052ed..444640570df7 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -66,6 +66,7 @@ #include #include #include +#include #include static MALLOC_DEFINE(M_DMAR_CTX, "dmar_ctx", "Intel DMAR Context"); @@ -85,7 +86,7 @@ dmar_ensure_ctx_page(struct dmar_unit *dmar, int bus) /* * Allocated context page must be linked. */ - ctxm = dmar_pgalloc(dmar->ctx_obj, 1 + bus, IOMMU_PGF_NOALLOC); + ctxm = iommu_pgalloc(dmar->ctx_obj, 1 + bus, IOMMU_PGF_NOALLOC); if (ctxm != NULL) return; @@ -96,14 +97,14 @@ dmar_ensure_ctx_page(struct dmar_unit *dmar, int bus) * threads are equal. */ TD_PREP_PINNED_ASSERT; - ctxm = dmar_pgalloc(dmar->ctx_obj, 1 + bus, IOMMU_PGF_ZERO | + ctxm = iommu_pgalloc(dmar->ctx_obj, 1 + bus, IOMMU_PGF_ZERO | IOMMU_PGF_WAITOK); - re = dmar_map_pgtbl(dmar->ctx_obj, 0, IOMMU_PGF_NOALLOC, &sf); + re = iommu_map_pgtbl(dmar->ctx_obj, 0, IOMMU_PGF_NOALLOC, &sf); re += bus; dmar_pte_store(&re->r1, DMAR_ROOT_R1_P | (DMAR_ROOT_R1_CTP_MASK & VM_PAGE_TO_PHYS(ctxm))); dmar_flush_root_to_ram(dmar, re); - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); TD_PINNED_ASSERT; } @@ -115,7 +116,7 @@ dmar_map_ctx_entry(struct dmar_ctx *ctx, struct sf_buf **sfp) dmar = CTX2DMAR(ctx); - ctxp = dmar_map_pgtbl(dmar->ctx_obj, 1 + PCI_RID2BUS(ctx->context.rid), + ctxp = iommu_map_pgtbl(dmar->ctx_obj, 1 + PCI_RID2BUS(ctx->context.rid), IOMMU_PGF_NOALLOC | IOMMU_PGF_WAITOK, sfp); ctxp += ctx->context.rid & 0xff; return (ctxp); @@ -188,7 +189,7 @@ ctx_id_entry_init(struct dmar_ctx *ctx, dmar_ctx_entry_t *ctxp, bool move, ("ctx %p non-null pgtbl_obj", ctx)); ctx_root = NULL; } else { - ctx_root = dmar_pgalloc(domain->pgtbl_obj, 0, + ctx_root = iommu_pgalloc(domain->pgtbl_obj, 0, IOMMU_PGF_NOALLOC); } @@ -274,7 +275,7 @@ domain_init_rmrr(struct dmar_domain *domain, device_t dev, int bus, "region (%jx, %jx) corrected\n", domain->iodom.iommu->unit, start, end); } - entry->end += DMAR_PAGE_SIZE * 0x20; + entry->end += IOMMU_PAGE_SIZE * 0x20; } size = OFF_TO_IDX(entry->end - entry->start); ma = malloc(sizeof(vm_page_t) * size, M_TEMP, M_WAITOK); @@ -603,9 +604,9 @@ dmar_get_ctx_for_dev1(struct dmar_unit *dmar, device_t dev, uint16_t rid, func, rid, domain->domain, domain->mgaw, domain->agaw, id_mapped ? "id" : "re"); } - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); } else { - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); dmar_domain_destroy(domain1); /* Nothing needs to be done to destroy ctx1. */ free(ctx1, M_DMAR_CTX); @@ -705,7 +706,7 @@ dmar_move_ctx_to_domain(struct dmar_domain *domain, struct dmar_ctx *ctx) ctx->context.domain = &domain->iodom; dmar_ctx_link(ctx); ctx_id_entry_init(ctx, ctxp, true, PCI_BUSMAX + 100); - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); error = dmar_flush_for_ctx_entry(dmar, true); /* If flush failed, rolling back would not work as well. */ printf("dmar%d rid %x domain %d->%d %s-mapped\n", @@ -789,7 +790,7 @@ dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx) if (ctx->refs > 1) { ctx->refs--; DMAR_UNLOCK(dmar); - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); TD_PINNED_ASSERT; return; } @@ -811,7 +812,7 @@ dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx) else dmar_inv_iotlb_glob(dmar); } - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); domain = CTX2DOM(ctx); dmar_ctx_unlink(ctx); free(ctx->context.tag, M_DMAR_CTX); diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index e20144094c80..8289478aed19 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -238,16 +238,11 @@ iommu_gaddr_t pglvl_page_size(int total_pglvl, int lvl); iommu_gaddr_t domain_page_size(struct dmar_domain *domain, int lvl); int calc_am(struct dmar_unit *unit, iommu_gaddr_t base, iommu_gaddr_t size, iommu_gaddr_t *isizep); -struct vm_page *dmar_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags); -void dmar_pgfree(vm_object_t obj, vm_pindex_t idx, int flags); -void *dmar_map_pgtbl(vm_object_t obj, vm_pindex_t idx, int flags, - struct sf_buf **sf); -void dmar_unmap_pgtbl(struct sf_buf *sf); int dmar_load_root_entry_ptr(struct dmar_unit *unit); int dmar_inv_ctx_glob(struct dmar_unit *unit); int dmar_inv_iotlb_glob(struct dmar_unit *unit); int dmar_flush_write_bufs(struct dmar_unit *unit); -void dmar_flush_pte_to_ram(struct dmar_unit *unit, dmar_pte_t *dst); +void dmar_flush_pte_to_ram(struct dmar_unit *unit, iommu_pte_t *dst); void dmar_flush_ctx_to_ram(struct dmar_unit *unit, dmar_ctx_entry_t *dst); void dmar_flush_root_to_ram(struct dmar_unit *unit, dmar_root_entry_t *dst); int dmar_disable_protected_regions(struct dmar_unit *unit); @@ -315,9 +310,7 @@ void dmar_quirks_pre_use(struct iommu_unit *dmar); int dmar_init_irt(struct dmar_unit *unit); void dmar_fini_irt(struct dmar_unit *unit); -extern iommu_haddr_t dmar_high; extern int haw; -extern int dmar_tbl_pagecnt; extern int dmar_batch_coalesce; extern int dmar_rmrr_enable; diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 7346162d1502..9a2fedf90b6a 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #ifdef DEV_APIC @@ -179,9 +180,9 @@ dmar_identify(driver_t *driver, device_t parent) return; haw = dmartbl->Width + 1; if ((1ULL << (haw + 1)) > BUS_SPACE_MAXADDR) - dmar_high = BUS_SPACE_MAXADDR; + iommu_high = BUS_SPACE_MAXADDR; else - dmar_high = 1ULL << (haw + 1); + iommu_high = 1ULL << (haw + 1); if (bootverbose) { printf("DMAR HAW=%d flags=<%b>\n", dmartbl->Width, (unsigned)dmartbl->Flags, @@ -490,7 +491,7 @@ dmar_attach(device_t dev) * address translation after the required invalidations are * done. */ - dmar_pgalloc(unit->ctx_obj, 0, IOMMU_PGF_WAITOK | IOMMU_PGF_ZERO); + iommu_pgalloc(unit->ctx_obj, 0, IOMMU_PGF_WAITOK | IOMMU_PGF_ZERO); DMAR_LOCK(unit); error = dmar_load_root_entry_ptr(unit); if (error != 0) { diff --git a/sys/x86/iommu/intel_fault.c b/sys/x86/iommu/intel_fault.c index e275304c8d51..59b482720cf1 100644 --- a/sys/x86/iommu/intel_fault.c +++ b/sys/x86/iommu/intel_fault.c @@ -54,6 +54,7 @@ #include #include #include +#include #include /* diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index 26f067e35278..82cac8bb2d39 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -64,6 +64,7 @@ #include #include #include +#include #include static int domain_unmap_buf_locked(struct dmar_domain *domain, @@ -109,7 +110,7 @@ domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, iommu_gaddr_t addr) { vm_page_t m1; - dmar_pte_t *pte; + iommu_pte_t *pte; struct sf_buf *sf; iommu_gaddr_t f, pg_sz; vm_pindex_t base; @@ -118,28 +119,28 @@ domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, VM_OBJECT_ASSERT_LOCKED(tbl->pgtbl_obj); if (addr >= tbl->maxaddr) return; - (void)dmar_pgalloc(tbl->pgtbl_obj, idx, IOMMU_PGF_OBJL | + (void)iommu_pgalloc(tbl->pgtbl_obj, idx, IOMMU_PGF_OBJL | IOMMU_PGF_WAITOK | IOMMU_PGF_ZERO); - base = idx * DMAR_NPTEPG + 1; /* Index of the first child page of idx */ + base = idx * IOMMU_NPTEPG + 1; /* Index of the first child page of idx */ pg_sz = pglvl_page_size(tbl->pglvl, lvl); if (lvl != tbl->leaf) { - for (i = 0, f = addr; i < DMAR_NPTEPG; i++, f += pg_sz) + for (i = 0, f = addr; i < IOMMU_NPTEPG; i++, f += pg_sz) domain_idmap_nextlvl(tbl, lvl + 1, base + i, f); } VM_OBJECT_WUNLOCK(tbl->pgtbl_obj); - pte = dmar_map_pgtbl(tbl->pgtbl_obj, idx, IOMMU_PGF_WAITOK, &sf); + pte = iommu_map_pgtbl(tbl->pgtbl_obj, idx, IOMMU_PGF_WAITOK, &sf); if (lvl == tbl->leaf) { - for (i = 0, f = addr; i < DMAR_NPTEPG; i++, f += pg_sz) { + for (i = 0, f = addr; i < IOMMU_NPTEPG; i++, f += pg_sz) { if (f >= tbl->maxaddr) break; pte[i].pte = (DMAR_PTE_ADDR_MASK & f) | DMAR_PTE_R | DMAR_PTE_W; } } else { - for (i = 0, f = addr; i < DMAR_NPTEPG; i++, f += pg_sz) { + for (i = 0, f = addr; i < IOMMU_NPTEPG; i++, f += pg_sz) { if (f >= tbl->maxaddr) break; - m1 = dmar_pgalloc(tbl->pgtbl_obj, base + i, + m1 = iommu_pgalloc(tbl->pgtbl_obj, base + i, IOMMU_PGF_NOALLOC); KASSERT(m1 != NULL, ("lost page table page")); pte[i].pte = (DMAR_PTE_ADDR_MASK & @@ -147,7 +148,7 @@ domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, } } /* domain_get_idmap_pgtbl flushes CPU cache if needed. */ - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); VM_OBJECT_WLOCK(tbl->pgtbl_obj); } @@ -301,7 +302,7 @@ put_idmap_pgtbl(vm_object_t obj) rmobj = tbl->pgtbl_obj; if (rmobj->ref_count == 1) { LIST_REMOVE(tbl, link); - atomic_subtract_int(&dmar_tbl_pagecnt, + atomic_subtract_int(&iommu_tbl_pagecnt, rmobj->resident_page_count); vm_object_deallocate(rmobj); free(tbl, M_DMAR_IDPGTBL); @@ -323,9 +324,9 @@ static int domain_pgtbl_pte_off(struct dmar_domain *domain, iommu_gaddr_t base, int lvl) { - base >>= DMAR_PAGE_SHIFT + (domain->pglvl - lvl - 1) * - DMAR_NPTEPGSHIFT; - return (base & DMAR_PTEMASK); + base >>= IOMMU_PAGE_SHIFT + (domain->pglvl - lvl - 1) * + IOMMU_NPTEPGSHIFT; + return (base & IOMMU_PTEMASK); } /* @@ -344,18 +345,18 @@ domain_pgtbl_get_pindex(struct dmar_domain *domain, iommu_gaddr_t base, int lvl) for (pidx = idx = 0, i = 0; i < lvl; i++, pidx = idx) { idx = domain_pgtbl_pte_off(domain, base, i) + - pidx * DMAR_NPTEPG + 1; + pidx * IOMMU_NPTEPG + 1; } return (idx); } -static dmar_pte_t * +static iommu_pte_t * domain_pgtbl_map_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, int flags, vm_pindex_t *idxp, struct sf_buf **sf) { vm_page_t m; struct sf_buf *sfp; - dmar_pte_t *pte, *ptep; + iommu_pte_t *pte, *ptep; vm_pindex_t idx, idx1; DMAR_DOMAIN_ASSERT_PGLOCKED(domain); @@ -363,13 +364,13 @@ domain_pgtbl_map_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, idx = domain_pgtbl_get_pindex(domain, base, lvl); if (*sf != NULL && idx == *idxp) { - pte = (dmar_pte_t *)sf_buf_kva(*sf); + pte = (iommu_pte_t *)sf_buf_kva(*sf); } else { if (*sf != NULL) - dmar_unmap_pgtbl(*sf); + iommu_unmap_pgtbl(*sf); *idxp = idx; retry: - pte = dmar_map_pgtbl(domain->pgtbl_obj, idx, flags, sf); + pte = iommu_map_pgtbl(domain->pgtbl_obj, idx, flags, sf); if (pte == NULL) { KASSERT(lvl > 0, ("lost root page table page %p", domain)); @@ -378,7 +379,7 @@ retry: * it and create a pte in the preceeding page level * to reference the allocated page table page. */ - m = dmar_pgalloc(domain->pgtbl_obj, idx, flags | + m = iommu_pgalloc(domain->pgtbl_obj, idx, flags | IOMMU_PGF_ZERO); if (m == NULL) return (NULL); @@ -399,7 +400,7 @@ retry: KASSERT(m->pindex != 0, ("loosing root page %p", domain)); m->ref_count--; - dmar_pgfree(domain->pgtbl_obj, m->pindex, + iommu_pgfree(domain->pgtbl_obj, m->pindex, flags); return (NULL); } @@ -408,7 +409,7 @@ retry: dmar_flush_pte_to_ram(domain->dmar, ptep); sf_buf_page(sfp)->ref_count += 1; m->ref_count--; - dmar_unmap_pgtbl(sfp); + iommu_unmap_pgtbl(sfp); /* Only executed once. */ goto retry; } @@ -421,7 +422,7 @@ static int domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size, vm_page_t *ma, uint64_t pflags, int flags) { - dmar_pte_t *pte; + iommu_pte_t *pte; struct sf_buf *sf; iommu_gaddr_t pg_sz, base1; vm_pindex_t pi, c, idx, run_sz; @@ -438,7 +439,7 @@ domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, pi += run_sz) { for (lvl = 0, c = 0, superpage = false;; lvl++) { pg_sz = domain_page_size(domain, lvl); - run_sz = pg_sz >> DMAR_PAGE_SHIFT; + run_sz = pg_sz >> IOMMU_PAGE_SHIFT; if (lvl == domain->pglvl - 1) break; /* @@ -477,7 +478,7 @@ domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, KASSERT((flags & IOMMU_PGF_WAITOK) == 0, ("failed waitable pte alloc %p", domain)); if (sf != NULL) - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); domain_unmap_buf_locked(domain, base1, base - base1, flags); TD_PINNED_ASSERT; @@ -489,7 +490,7 @@ domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, sf_buf_page(sf)->ref_count += 1; } if (sf != NULL) - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); TD_PINNED_ASSERT; return (0); } @@ -513,10 +514,10 @@ domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, KASSERT((domain->iodom.flags & IOMMU_DOMAIN_IDMAP) == 0, ("modifying idmap pagetable domain %p", domain)); - KASSERT((base & DMAR_PAGE_MASK) == 0, + KASSERT((base & IOMMU_PAGE_MASK) == 0, ("non-aligned base %p %jx %jx", domain, (uintmax_t)base, (uintmax_t)size)); - KASSERT((size & DMAR_PAGE_MASK) == 0, + KASSERT((size & IOMMU_PAGE_MASK) == 0, ("non-aligned size %p %jx %jx", domain, (uintmax_t)base, (uintmax_t)size)); KASSERT(size > 0, ("zero size %p %jx %jx", domain, (uintmax_t)base, @@ -563,7 +564,7 @@ domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, } static void domain_unmap_clear_pte(struct dmar_domain *domain, - iommu_gaddr_t base, int lvl, int flags, dmar_pte_t *pte, + iommu_gaddr_t base, int lvl, int flags, iommu_pte_t *pte, struct sf_buf **sf, bool free_fs); static void @@ -571,7 +572,7 @@ domain_free_pgtbl_pde(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, int flags) { struct sf_buf *sf; - dmar_pte_t *pde; + iommu_pte_t *pde; vm_pindex_t idx; sf = NULL; @@ -581,7 +582,7 @@ domain_free_pgtbl_pde(struct dmar_domain *domain, iommu_gaddr_t base, static void domain_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, - int flags, dmar_pte_t *pte, struct sf_buf **sf, bool free_sf) + int flags, iommu_pte_t *pte, struct sf_buf **sf, bool free_sf) { vm_page_t m; @@ -589,7 +590,7 @@ domain_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, dmar_flush_pte_to_ram(domain->dmar, pte); m = sf_buf_page(*sf); if (free_sf) { - dmar_unmap_pgtbl(*sf); + iommu_unmap_pgtbl(*sf); *sf = NULL; } m->ref_count--; @@ -601,7 +602,7 @@ domain_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, KASSERT(m->pindex != 0, ("lost reference (idx) on root pg domain %p base %jx lvl %d", domain, (uintmax_t)base, lvl)); - dmar_pgfree(domain->pgtbl_obj, m->pindex, flags); + iommu_pgfree(domain->pgtbl_obj, m->pindex, flags); domain_free_pgtbl_pde(domain, base, lvl - 1, flags); } @@ -612,7 +613,7 @@ static int domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size, int flags) { - dmar_pte_t *pte; + iommu_pte_t *pte; struct sf_buf *sf; vm_pindex_t idx; iommu_gaddr_t pg_sz; @@ -624,10 +625,10 @@ domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, KASSERT((domain->iodom.flags & IOMMU_DOMAIN_IDMAP) == 0, ("modifying idmap pagetable domain %p", domain)); - KASSERT((base & DMAR_PAGE_MASK) == 0, + KASSERT((base & IOMMU_PAGE_MASK) == 0, ("non-aligned base %p %jx %jx", domain, (uintmax_t)base, (uintmax_t)size)); - KASSERT((size & DMAR_PAGE_MASK) == 0, + KASSERT((size & IOMMU_PAGE_MASK) == 0, ("non-aligned size %p %jx %jx", domain, (uintmax_t)base, (uintmax_t)size)); KASSERT(base < (1ULL << domain->agaw), @@ -670,7 +671,7 @@ domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, (uintmax_t)base, (uintmax_t)size, (uintmax_t)pg_sz)); } if (sf != NULL) - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); /* * See 11.1 Write Buffer Flushing for an explanation why RWBF * can be ignored there. @@ -706,7 +707,7 @@ domain_alloc_pgtbl(struct dmar_domain *domain) domain->pgtbl_obj = vm_pager_allocate(OBJT_PHYS, NULL, IDX_TO_OFF(pglvl_max_pages(domain->pglvl)), 0, 0, NULL); DMAR_DOMAIN_PGLOCK(domain); - m = dmar_pgalloc(domain->pgtbl_obj, 0, IOMMU_PGF_WAITOK | + m = iommu_pgalloc(domain->pgtbl_obj, 0, IOMMU_PGF_WAITOK | IOMMU_PGF_ZERO | IOMMU_PGF_OBJL); /* No implicit free of the top level page table page. */ m->ref_count = 1; diff --git a/sys/x86/iommu/intel_intrmap.c b/sys/x86/iommu/intel_intrmap.c index b2642197902a..02bf58dde299 100644 --- a/sys/x86/iommu/intel_intrmap.c +++ b/sys/x86/iommu/intel_intrmap.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -341,7 +342,7 @@ dmar_init_irt(struct dmar_unit *unit) } unit->irte_cnt = clp2(num_io_irqs); unit->irt = kmem_alloc_contig(unit->irte_cnt * sizeof(dmar_irte_t), - M_ZERO | M_WAITOK, 0, dmar_high, PAGE_SIZE, 0, + M_ZERO | M_WAITOK, 0, iommu_high, PAGE_SIZE, 0, DMAR_IS_COHERENT(unit) ? VM_MEMATTR_DEFAULT : VM_MEMATTR_UNCACHEABLE); if (unit->irt == NULL) diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c index 37e2bf211e32..590cbac9bcbd 100644 --- a/sys/x86/iommu/intel_qi.c +++ b/sys/x86/iommu/intel_qi.c @@ -55,6 +55,7 @@ #include #include #include +#include #include static bool @@ -501,7 +502,7 @@ dmar_init_qi(struct dmar_unit *unit) /* The invalidation queue reads by DMARs are always coherent. */ unit->inv_queue = kmem_alloc_contig(unit->inv_queue_size, M_WAITOK | - M_ZERO, 0, dmar_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); + M_ZERO, 0, iommu_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); unit->inv_waitd_seq_hw_phys = pmap_kextract( (vm_offset_t)&unit->inv_waitd_seq_hw); diff --git a/sys/x86/iommu/intel_quirks.c b/sys/x86/iommu/intel_quirks.c index 589764bd0fa9..486bd1bc9496 100644 --- a/sys/x86/iommu/intel_quirks.c +++ b/sys/x86/iommu/intel_quirks.c @@ -59,6 +59,7 @@ #include #include #include +#include #include typedef void (*dmar_quirk_cpu_fun)(struct dmar_unit *); diff --git a/sys/x86/iommu/intel_reg.h b/sys/x86/iommu/intel_reg.h index 26a18ff94890..0fafcce7accf 100644 --- a/sys/x86/iommu/intel_reg.h +++ b/sys/x86/iommu/intel_reg.h @@ -31,16 +31,6 @@ #ifndef __X86_IOMMU_INTEL_REG_H #define __X86_IOMMU_INTEL_REG_H -#define DMAR_PAGE_SIZE PAGE_SIZE -#define DMAR_PAGE_MASK (DMAR_PAGE_SIZE - 1) -#define DMAR_PAGE_SHIFT PAGE_SHIFT -#define DMAR_NPTEPG (DMAR_PAGE_SIZE / sizeof(dmar_pte_t)) -#define DMAR_NPTEPGSHIFT 9 -#define DMAR_PTEMASK (DMAR_NPTEPG - 1) - -#define IOMMU_PAGE_SIZE DMAR_PAGE_SIZE -#define IOMMU_PAGE_MASK DMAR_PAGE_MASK - typedef struct dmar_root_entry { uint64_t r1; uint64_t r2; @@ -49,7 +39,7 @@ typedef struct dmar_root_entry { #define DMAR_ROOT_R1_CTP_MASK 0xfffffffffffff000 /* Mask for Context-Entry Table Pointer */ -#define DMAR_CTX_CNT (DMAR_PAGE_SIZE / sizeof(dmar_root_entry_t)) +#define DMAR_CTX_CNT (IOMMU_PAGE_SIZE / sizeof(dmar_root_entry_t)) typedef struct dmar_ctx_entry { uint64_t ctx1; @@ -73,9 +63,6 @@ typedef struct dmar_ctx_entry { #define DMAR_CTX2_DID(x) ((x) << 8) /* Domain Identifier */ #define DMAR_CTX2_GET_DID(ctx2) (((ctx2) & DMAR_CTX2_DID_MASK) >> 8) -typedef struct dmar_pte { - uint64_t pte; -} dmar_pte_t; #define DMAR_PTE_R 1 /* Read */ #define DMAR_PTE_W (1 << 1) /* Write */ #define DMAR_PTE_SP (1 << 7) /* Super Page */ diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c index 19d4ec7d22bd..b0f2d167658a 100644 --- a/sys/x86/iommu/intel_utils.c +++ b/sys/x86/iommu/intel_utils.c @@ -64,6 +64,7 @@ #include #include #include +#include #include u_int @@ -183,7 +184,7 @@ pglvl_max_pages(int pglvl) int i; for (res = 0, i = pglvl; i > 0; i--) { - res *= DMAR_NPTEPG; + res *= IOMMU_NPTEPG; res++; } return (res); @@ -214,12 +215,12 @@ pglvl_page_size(int total_pglvl, int lvl) { int rlvl; static const iommu_gaddr_t pg_sz[] = { - (iommu_gaddr_t)DMAR_PAGE_SIZE, - (iommu_gaddr_t)DMAR_PAGE_SIZE << DMAR_NPTEPGSHIFT, - (iommu_gaddr_t)DMAR_PAGE_SIZE << (2 * DMAR_NPTEPGSHIFT), - (iommu_gaddr_t)DMAR_PAGE_SIZE << (3 * DMAR_NPTEPGSHIFT), - (iommu_gaddr_t)DMAR_PAGE_SIZE << (4 * DMAR_NPTEPGSHIFT), - (iommu_gaddr_t)DMAR_PAGE_SIZE << (5 * DMAR_NPTEPGSHIFT) + (iommu_gaddr_t)IOMMU_PAGE_SIZE, + (iommu_gaddr_t)IOMMU_PAGE_SIZE << IOMMU_NPTEPGSHIFT, + (iommu_gaddr_t)IOMMU_PAGE_SIZE << (2 * IOMMU_NPTEPGSHIFT), + (iommu_gaddr_t)IOMMU_PAGE_SIZE << (3 * IOMMU_NPTEPGSHIFT), + (iommu_gaddr_t)IOMMU_PAGE_SIZE << (4 * IOMMU_NPTEPGSHIFT), + (iommu_gaddr_t)IOMMU_PAGE_SIZE << (5 * IOMMU_NPTEPGSHIFT), }; KASSERT(lvl >= 0 && lvl < total_pglvl, @@ -244,7 +245,7 @@ calc_am(struct dmar_unit *unit, iommu_gaddr_t base, iommu_gaddr_t size, int am; for (am = DMAR_CAP_MAMV(unit->hw_cap);; am--) { - isize = 1ULL << (am + DMAR_PAGE_SHIFT); + isize = 1ULL << (am + IOMMU_PAGE_SHIFT); if ((base & (isize - 1)) == 0 && size >= isize) break; if (am == 0) @@ -254,113 +255,9 @@ calc_am(struct dmar_unit *unit, iommu_gaddr_t base, iommu_gaddr_t size, return (am); } -iommu_haddr_t dmar_high; int haw; int dmar_tbl_pagecnt; -vm_page_t -dmar_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags) -{ - vm_page_t m; - int zeroed, aflags; - - zeroed = (flags & IOMMU_PGF_ZERO) != 0 ? VM_ALLOC_ZERO : 0; - aflags = zeroed | VM_ALLOC_NOBUSY | VM_ALLOC_SYSTEM | VM_ALLOC_NODUMP | - ((flags & IOMMU_PGF_WAITOK) != 0 ? VM_ALLOC_WAITFAIL : - VM_ALLOC_NOWAIT); - for (;;) { - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WLOCK(obj); - m = vm_page_lookup(obj, idx); - if ((flags & IOMMU_PGF_NOALLOC) != 0 || m != NULL) { - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); - break; - } - m = vm_page_alloc_contig(obj, idx, aflags, 1, 0, - dmar_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); - if (m != NULL) { - if (zeroed && (m->flags & PG_ZERO) == 0) - pmap_zero_page(m); - atomic_add_int(&dmar_tbl_pagecnt, 1); - break; - } - if ((flags & IOMMU_PGF_WAITOK) == 0) - break; - } - return (m); -} - -void -dmar_pgfree(vm_object_t obj, vm_pindex_t idx, int flags) -{ - vm_page_t m; - - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WLOCK(obj); - m = vm_page_grab(obj, idx, VM_ALLOC_NOCREAT); - if (m != NULL) { - vm_page_free(m); - atomic_subtract_int(&dmar_tbl_pagecnt, 1); - } - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); -} - -void * -dmar_map_pgtbl(vm_object_t obj, vm_pindex_t idx, int flags, - struct sf_buf **sf) -{ - vm_page_t m; - bool allocated; - - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WLOCK(obj); - m = vm_page_lookup(obj, idx); - if (m == NULL && (flags & IOMMU_PGF_ALLOC) != 0) { - m = dmar_pgalloc(obj, idx, flags | IOMMU_PGF_OBJL); - allocated = true; - } else - allocated = false; - if (m == NULL) { - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); - return (NULL); - } - /* Sleepable allocations cannot fail. */ - if ((flags & IOMMU_PGF_WAITOK) != 0) - VM_OBJECT_WUNLOCK(obj); - sched_pin(); - *sf = sf_buf_alloc(m, SFB_CPUPRIVATE | ((flags & IOMMU_PGF_WAITOK) - == 0 ? SFB_NOWAIT : 0)); - if (*sf == NULL) { - sched_unpin(); - if (allocated) { - VM_OBJECT_ASSERT_WLOCKED(obj); - dmar_pgfree(obj, m->pindex, flags | IOMMU_PGF_OBJL); - } - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); - return (NULL); - } - if ((flags & (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) == - (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) - VM_OBJECT_WLOCK(obj); - else if ((flags & (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) == 0) - VM_OBJECT_WUNLOCK(obj); - return ((void *)sf_buf_kva(*sf)); -} - -void -dmar_unmap_pgtbl(struct sf_buf *sf) -{ - - sf_buf_free(sf); - sched_unpin(); -} - static void dmar_flush_transl_to_ram(struct dmar_unit *unit, void *dst, size_t sz) { @@ -375,7 +272,7 @@ dmar_flush_transl_to_ram(struct dmar_unit *unit, void *dst, size_t sz) } void -dmar_flush_pte_to_ram(struct dmar_unit *unit, dmar_pte_t *dst) +dmar_flush_pte_to_ram(struct dmar_unit *unit, iommu_pte_t *dst) { dmar_flush_transl_to_ram(unit, dst, sizeof(*dst)); @@ -687,11 +584,6 @@ dmar_timeout_sysctl(SYSCTL_HANDLER_ARGS) return (error); } -static SYSCTL_NODE(_hw_iommu, OID_AUTO, dmar, CTLFLAG_RD | CTLFLAG_MPSAFE, - NULL, ""); -SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD, - &dmar_tbl_pagecnt, 0, - "Count of pages used for DMAR pagetables"); SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, batch_coalesce, CTLFLAG_RWTUN, &dmar_batch_coalesce, 0, "Number of qi batches between interrupt"); diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c new file mode 100644 index 000000000000..ffea1cc1a190 --- /dev/null +++ b/sys/x86/iommu/iommu_utils.c @@ -0,0 +1,164 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2013, 2014 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * 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 THE 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 THE 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +vm_page_t +iommu_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags) +{ + vm_page_t m; + int zeroed, aflags; + + zeroed = (flags & IOMMU_PGF_ZERO) != 0 ? VM_ALLOC_ZERO : 0; + aflags = zeroed | VM_ALLOC_NOBUSY | VM_ALLOC_SYSTEM | VM_ALLOC_NODUMP | + ((flags & IOMMU_PGF_WAITOK) != 0 ? VM_ALLOC_WAITFAIL : + VM_ALLOC_NOWAIT); + for (;;) { + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WLOCK(obj); + m = vm_page_lookup(obj, idx); + if ((flags & IOMMU_PGF_NOALLOC) != 0 || m != NULL) { + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); + break; + } + m = vm_page_alloc_contig(obj, idx, aflags, 1, 0, + iommu_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); + if (m != NULL) { + if (zeroed && (m->flags & PG_ZERO) == 0) + pmap_zero_page(m); + atomic_add_int(&iommu_tbl_pagecnt, 1); + break; + } + if ((flags & IOMMU_PGF_WAITOK) == 0) + break; + } + return (m); +} + +void +iommu_pgfree(vm_object_t obj, vm_pindex_t idx, int flags) +{ + vm_page_t m; + + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WLOCK(obj); + m = vm_page_grab(obj, idx, VM_ALLOC_NOCREAT); + if (m != NULL) { + vm_page_free(m); + atomic_subtract_int(&iommu_tbl_pagecnt, 1); + } + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); +} + +void * +iommu_map_pgtbl(vm_object_t obj, vm_pindex_t idx, int flags, + struct sf_buf **sf) +{ + vm_page_t m; + bool allocated; + + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WLOCK(obj); + m = vm_page_lookup(obj, idx); + if (m == NULL && (flags & IOMMU_PGF_ALLOC) != 0) { + m = iommu_pgalloc(obj, idx, flags | IOMMU_PGF_OBJL); + allocated = true; + } else + allocated = false; + if (m == NULL) { + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); + return (NULL); + } + /* Sleepable allocations cannot fail. */ + if ((flags & IOMMU_PGF_WAITOK) != 0) + VM_OBJECT_WUNLOCK(obj); + sched_pin(); + *sf = sf_buf_alloc(m, SFB_CPUPRIVATE | ((flags & IOMMU_PGF_WAITOK) + == 0 ? SFB_NOWAIT : 0)); + if (*sf == NULL) { + sched_unpin(); + if (allocated) { + VM_OBJECT_ASSERT_WLOCKED(obj); + iommu_pgfree(obj, m->pindex, flags | IOMMU_PGF_OBJL); + } + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); + return (NULL); + } + if ((flags & (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) == + (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) + VM_OBJECT_WLOCK(obj); + else if ((flags & (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) == 0) + VM_OBJECT_WUNLOCK(obj); + return ((void *)sf_buf_kva(*sf)); +} + +void +iommu_unmap_pgtbl(struct sf_buf *sf) +{ + + sf_buf_free(sf); + sched_unpin(); +} + +iommu_haddr_t iommu_high; +int iommu_tbl_pagecnt; + +SYSCTL_NODE(_hw_iommu, OID_AUTO, dmar, CTLFLAG_RD | CTLFLAG_MPSAFE, + NULL, ""); +SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD, + &iommu_tbl_pagecnt, 0, + "Count of pages used for DMAR pagetables"); diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h new file mode 100644 index 000000000000..3789586f1eaf --- /dev/null +++ b/sys/x86/iommu/x86_iommu.h @@ -0,0 +1,62 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2013-2015 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * *** 54 LINES SKIPPED *** From nobody Sun Jun 2 09:30:59 2024 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 4VsWnH6Fzdz5MRMG; Sun, 02 Jun 2024 09:30:59 +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 4VsWnH5mRgz4q3j; Sun, 2 Jun 2024 09:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717320659; 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=Dq1k46bA7XIwtgdaDOtmlaZEGg050EXnRc42ztwW8pM=; b=QKCoq+Z+pljY9SdvcHICJjb2BDQYaDs94gm4/eUE9fEHrhYvurMVCxKeS68ANMgKvkgGG7 p9WMDOoNtY8gA14NsA6ItIbiuX4Z+cwE77vi98Mei+cWfUUAXFoKFS2VviSnWai7ByswzI NNOWfGdCUOdx6f3a3G9Q2kChjmcoCmKrduKztVU2UkNZTMTCAZwNCWz3eow1qyACNn1/3c A902WUfMopRZ4RkV8qBnFyfEXwZXM2uxRw7vG+MIE9qUaYd0gAc4Sbg4t3l87yvwcEK4Pv H2BoKTKjSqxSiPzOCStRwA9Ypdn2ZYeO0NmMAH6PTH3MfombolyAGbavx2VDpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717320659; a=rsa-sha256; cv=none; b=K4bA0pSxjRBStp3ggQ7iz+439jMpArUR40jJ4RBBHf+kLsT5Rpi2pS7XsaaFpRnhC8keGq XVO+vBHPGGBFlIeYyrw5NjxfH5whJvTZCaYE9XZ5D3sFdVL9esC/XfrlGxxU6WvEiD0K2l qJbhko3FD/s1c8ST5NgDSx0RkBGmyaPGuM1F9Yuim8/+Xw4HBx20LgtG29nGVevHVg3SnH hByYElRlfpsnkIrdNPc+DPXAoBH9021uyFzRtb6vSBAgjV+RXwUhoPNQ8Rwfp7v8EgUOs8 L0cOLI9UEIcKO9mXNcRYJGdL+BlrkI6tD31GcW628UQbJ8wOnaVJmq9Q1UtaMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717320659; 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=Dq1k46bA7XIwtgdaDOtmlaZEGg050EXnRc42ztwW8pM=; b=WG6xDfDmM/dn5aRnyk0+ZgPXdw4DZ/WdqV+gMN8FdJehVtUpEev/ezwxbANP7HkrPzEdwY 46U6Xh3LuNYsNU4saoq/2T0bW/SDD/AYlMpbnKWkXNEK5LBGcxB7HwXAI/0M3x6SRLWlIk 2XTdLMxWbEZWgzOlKM7Uk7vboC23IbSGO/Lfzx0ZMxXuZWDeE1PcARLEMydTJC0v3xW2rJ eS5ryKke6tJk/SVp5EfQNLShMdzE6ct6MHDo3dweDE7u2Ks7T3nuAHbchLWhbpMv78FBE6 Ed6+zGLNYgppLzc9zTzy28KiCtmBocbxGLcKjcQKp78fDUHfCFigAbnRSzgbwg== 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 4VsWnH5NwKzm42; Sun, 2 Jun 2024 09:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4529Ux5F016040; Sun, 2 Jun 2024 09:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4529UxrI016037; Sun, 2 Jun 2024 09:30:59 GMT (envelope-from git) Date: Sun, 2 Jun 2024 09:30:59 GMT Message-Id: <202406020930.4529UxrI016037@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: f5fb251a553e - stable/14 - Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: f5fb251a553e95a84fcff8ed4a79a9659582019a Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f5fb251a553e95a84fcff8ed4a79a9659582019a commit f5fb251a553e95a84fcff8ed4a79a9659582019a Author: Dimitry Andric AuthorDate: 2024-05-30 15:35:15 +0000 Commit: Dimitry Andric CommitDate: 2024-06-02 09:30:42 +0000 Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): [PPCMergeStringPool] Only replace constant once (#92996) In #88846 I changed this code to use RAUW to perform the replacement instead of manual updates -- but kept the outer loop, which means we try to perform RAUW once per user. However, some of the users might be freed by the RAUW operation, resulting in use-after-free. The case where this happens is constant users where the replacement might result in the destruction of the original constant. Fixes https://github.com/llvm/llvm-project/issues/92991. This fixes a possible crash when building crypto/openssh/sshkey.c for PowerPC targets. Reported by: cperciva PR: 276104 MFC after: 3 days (cherry picked from commit f30188c4680a85126e793de157b851bf5ee47529) --- .../llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 37 ++++------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index ebd876d50c44..0830b02370cd 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -290,13 +290,6 @@ bool PPCMergeStringPool::mergeModuleStringPool(Module &M) { return true; } -static bool userHasOperand(User *TheUser, GlobalVariable *GVOperand) { - for (Value *Op : TheUser->operands()) - if (Op == GVOperand) - return true; - return false; -} - // For pooled strings we need to add the offset into the pool for each string. // This is done by adding a Get Element Pointer (GEP) before each user. This // function adds the GEP. @@ -307,29 +300,13 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), 0)); Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), ElementIndex)); - // Need to save a temporary copy of each user list because we remove uses - // as we replace them. - SmallVector Users; - for (User *CurrentUser : GlobalToReplace->users()) - Users.push_back(CurrentUser); - - for (User *CurrentUser : Users) { - // The user was not found so it must have been replaced earlier. - if (!userHasOperand(CurrentUser, GlobalToReplace)) - continue; - - // We cannot replace operands in globals so we ignore those. - if (isa(CurrentUser)) - continue; - - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - LLVM_DEBUG(dbgs() << "Replacing this global:\n"); - LLVM_DEBUG(GlobalToReplace->dump()); - LLVM_DEBUG(dbgs() << "with this:\n"); - LLVM_DEBUG(ConstGEP->dump()); - GlobalToReplace->replaceAllUsesWith(ConstGEP); - } + Constant *ConstGEP = + ConstantExpr::getInBoundsGetElementPtr(PooledStructType, GPool, Indices); + LLVM_DEBUG(dbgs() << "Replacing this global:\n"); + LLVM_DEBUG(GlobalToReplace->dump()); + LLVM_DEBUG(dbgs() << "with this:\n"); + LLVM_DEBUG(ConstGEP->dump()); + GlobalToReplace->replaceAllUsesWith(ConstGEP); } } // namespace From nobody Sun Jun 2 09:31:10 2024 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 4VsWnV3kxLz5MR5T; Sun, 02 Jun 2024 09: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 4VsWnV3Cd3z4qR3; Sun, 2 Jun 2024 09: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=1717320670; 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=TmPk6T4NT02nw689cefW5S+jdxD9Zzb3RyHxRjOmR00=; b=hrF9ws7io/UM4bMr9PlmQIYKs75G4TdULUuuvdie8Zh0cqAlag4Ipk7+k+TAvTS/TwVrUK nPsbJtDB/SUPdNoQYNe28kDprA5+lEWbmf5iuLVJIaojmt+hDDu1JyUxUgi0EPG7teWju6 vAb3uTTfMK5qXuaPvxdWfDmmWvon1wqRBCqZs7U6rGQAwoL2TIxRM7nTIMaA0p1P5uq8XX NS2qTLfvLZQEekE5ixKZRzAGRWpLDVL62eTT4XLp0ZUG3XpDJy63jppQN569LZWC6mMX4h LaAlmeFeh0bvRriNF3RgDFlIf2gIovopEEjPHM//P1gh1x2D5sqtShV/bvyZZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717320670; a=rsa-sha256; cv=none; b=nbKr0wF1khpL5FRmt3XlGIpwlGcRwxvmlrmRrJu0uL8kF91CeY4O9n2Qwcp6WN2sQf9bZs pc2iKiiac6x+nhw/cq0CWwAe2C0oROq/LmpWL6QnxSw2s8xk6ZbG41ybrJAb/ukTfUhiRd afCI8DDSlOjztqYqcGMEpPJLV2XhNluD1IZuVbs1xGjMkFpFmkUsjwfiqmBbhWAJr2kTo6 3hWr7i9h1Z5XzDDEW+E4hbPgub5DXPhMjFkSMH985ItEhW3DMEy3UW5EIbIKivYcuEVA9O BjcpSB/wrT1OtHQV5kMkfO+HvdN43h1Xjjx11NB173upHden0tZt7XUEqPSepw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717320670; 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=TmPk6T4NT02nw689cefW5S+jdxD9Zzb3RyHxRjOmR00=; b=VQAqwxjX1FnuVOHXoKuqZJ9ZVbmHjP4lqa2c1Hk4CqgcV9E2LX2ttGdnZ2yZx2d6vlszz7 Sfv6zMEtY6I3A9xnBFZusqQdxBiEe76olIMK0+bwgtu4eY3j4rHLShthl/7Kq+Xf90wfQD NHH12LI5kMFFNaO2/IRfDFz82B1Kk7qtzEmFsolO4O98jW4rAlRTyqyiPR9RNyyLf/d7w/ mPQ8IaWq34K482i7Ba+rz4K/v34fRg6F/ofGfTrDHXdJKCMvBcSWHpxQUX1jV0m+hQONcA VwxhtDkPK/JdCWHMJLHMkmKWEoUCnNm9SCsibbpr08Obs8sIHMVEr6zsVa8fCg== 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 4VsWnV2qKmzmLT; Sun, 2 Jun 2024 09:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4529VABr016220; Sun, 2 Jun 2024 09:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4529VAEE016217; Sun, 2 Jun 2024 09:31:10 GMT (envelope-from git) Date: Sun, 2 Jun 2024 09:31:10 GMT Message-Id: <202406020931.4529VAEE016217@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: c7f08a11dfbc - stable/13 - Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: c7f08a11dfbc4a49f7f11a2a4a92f41bfa5ec622 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f08a11dfbc4a49f7f11a2a4a92f41bfa5ec622 commit c7f08a11dfbc4a49f7f11a2a4a92f41bfa5ec622 Author: Dimitry Andric AuthorDate: 2024-05-30 15:35:15 +0000 Commit: Dimitry Andric CommitDate: 2024-06-02 09:30:46 +0000 Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): [PPCMergeStringPool] Only replace constant once (#92996) In #88846 I changed this code to use RAUW to perform the replacement instead of manual updates -- but kept the outer loop, which means we try to perform RAUW once per user. However, some of the users might be freed by the RAUW operation, resulting in use-after-free. The case where this happens is constant users where the replacement might result in the destruction of the original constant. Fixes https://github.com/llvm/llvm-project/issues/92991. This fixes a possible crash when building crypto/openssh/sshkey.c for PowerPC targets. Reported by: cperciva PR: 276104 MFC after: 3 days (cherry picked from commit f30188c4680a85126e793de157b851bf5ee47529) --- .../llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 37 ++++------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index ebd876d50c44..0830b02370cd 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -290,13 +290,6 @@ bool PPCMergeStringPool::mergeModuleStringPool(Module &M) { return true; } -static bool userHasOperand(User *TheUser, GlobalVariable *GVOperand) { - for (Value *Op : TheUser->operands()) - if (Op == GVOperand) - return true; - return false; -} - // For pooled strings we need to add the offset into the pool for each string. // This is done by adding a Get Element Pointer (GEP) before each user. This // function adds the GEP. @@ -307,29 +300,13 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), 0)); Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), ElementIndex)); - // Need to save a temporary copy of each user list because we remove uses - // as we replace them. - SmallVector Users; - for (User *CurrentUser : GlobalToReplace->users()) - Users.push_back(CurrentUser); - - for (User *CurrentUser : Users) { - // The user was not found so it must have been replaced earlier. - if (!userHasOperand(CurrentUser, GlobalToReplace)) - continue; - - // We cannot replace operands in globals so we ignore those. - if (isa(CurrentUser)) - continue; - - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - LLVM_DEBUG(dbgs() << "Replacing this global:\n"); - LLVM_DEBUG(GlobalToReplace->dump()); - LLVM_DEBUG(dbgs() << "with this:\n"); - LLVM_DEBUG(ConstGEP->dump()); - GlobalToReplace->replaceAllUsesWith(ConstGEP); - } + Constant *ConstGEP = + ConstantExpr::getInBoundsGetElementPtr(PooledStructType, GPool, Indices); + LLVM_DEBUG(dbgs() << "Replacing this global:\n"); + LLVM_DEBUG(GlobalToReplace->dump()); + LLVM_DEBUG(dbgs() << "with this:\n"); + LLVM_DEBUG(ConstGEP->dump()); + GlobalToReplace->replaceAllUsesWith(ConstGEP); } } // namespace