From nobody Sat Jun 17 16:35:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qk1qT4vkpz4dwpS; Sat, 17 Jun 2023 16:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qk1qT4VMGz4MZg; Sat, 17 Jun 2023 16:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687019749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PGGS0nm80MMgFpyh5WIanwrD/CRQhbJupUKqVK3Cibw=; b=NvuY/ZVcqy6kOt4ZACoG9qklD4VEtQnNGZf1dYFEIKCDXrIJS6JR7LdhapurxyRrkDFBYW CTe48Tw/Mu/6b7PtoG7y+t03aXJEbarkUjxf1hN/gE9hAQp8E21gUvoxRkjUDE/jOk2TeJ qM9M/r79m8D/f30/Ae3JDhBRaDNV2PBp5UClDYoGuL+eoHQ/tIPFz/7bbVhqvNBtwh12fF hUCRzj1RSookGyn1nCPTJ/BWJEUYXXG/fwIPBQvYn14+Wp66TSziUNrpLEnPpkMwlX1k2n uzdHmDmWqz2WomewBiML7f4fkxXaK4/ey+Kfz/TkCSa53udNVvB+0btcenVVsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687019749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PGGS0nm80MMgFpyh5WIanwrD/CRQhbJupUKqVK3Cibw=; b=TccpGDDFDLvruUjh3fxkZzObQ+tr70IWDGsY+yafzodF4isnpZwXJPPU32QeXxkXN+ccvF nQKMHV5382WLuU7cBo8JCI/4Lzm7MEQycjIdyabGk8Z2p2sSTgfx8p80JsEt6GBHtyCVCm dGzEnKTZmqdN/iLEkCJipjHhLFQmT0xUvhruV4wdD6Ri4C2I3KGG7vPS9jIWxGR8iyGT39 U4izQkhGKpaScglHPNswKBAi9QcnNhfttgO/CGz4OLxLc5CrtLMwini0/dpNV/baZR+I79 caTHY74Ef28qIxWEMgDSvg4qx9SxCslZmmMwSNTM7kb4SdkoNVPI2537nE46qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687019749; a=rsa-sha256; cv=none; b=IVAHotsb3EGoJw/FbkjCpweeOW5jSExvq1BEUAJJ2mvK9M0zKUwGbDkB5aKvJjjITVgOPk RpyiXxA/ftCebsS7GqcygVqDUNJP/ZPvJ7G8uR6VGQs6UwrMd7WGJR1GyOIIvvEuxLKY3O E5xTl1OUHNh2ujI/JcrUWFSxAhN2esEnJwzydOSbQQo0/PcdiUPafEKgvX89KCD9whd5y5 UwyNrjKSeKtAqgH6szab2Wc2RD/UsG1yyuDYfLnQpEB5mYKotzh/+QJbm7O3k2dZC+fxQz 8C/Mr/i8kiMN70pvDtdE2BKREvynaXkq/7Fqv8bpCJ0qS/lcmP3W7d+AhPY3sg== 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 4Qk1qT3Z6qz1GqB; Sat, 17 Jun 2023 16:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35HGZndR033082; Sat, 17 Jun 2023 16:35:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35HGZnHM033081; Sat, 17 Jun 2023 16:35:49 GMT (envelope-from git) Date: Sat, 17 Jun 2023 16:35:49 GMT Message-Id: <202306171635.35HGZnHM033081@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c1cbabe8ae57 - main - amdtemp: Fix missing 49 degree offset on current EPYC CPUs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c1cbabe8ae5702a1e54d62401fe3b58a84fcb3e4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c1cbabe8ae5702a1e54d62401fe3b58a84fcb3e4 commit c1cbabe8ae5702a1e54d62401fe3b58a84fcb3e4 Author: Val Packett AuthorDate: 2023-06-17 16:29:53 +0000 Commit: Mitchell Horne CommitDate: 2023-06-17 16:34:39 +0000 amdtemp: Fix missing 49 degree offset on current EPYC CPUs On an EPYC 7313P, the temperature reported by amdtemp was off, because the offset was not applied. Turns out it needs to be applied with one more condition: https://lkml.org/lkml/2023/4/13/1095 Reviewed by: mhorne Tested by: mike.jakubik@gmail.com MFC after: 1 week Sponsored by: https://www.patreon.com/valpackett Pull Request: https://github.com/freebsd/freebsd-src/pull/754 --- sys/dev/amdtemp/amdtemp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index c020d481797a..fa58a3a4fc83 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -165,6 +165,12 @@ static const struct amdtemp_product { */ #define AMDTEMP_17H_CUR_TMP 0x59800 #define AMDTEMP_17H_CUR_TMP_RANGE_SEL (1u << 19) +/* + * Bits 16-17, when set, mean that CUR_TMP is read-write. When it is, the + * 49 degree offset should apply as well. This was revealed in a Linux + * patch from an AMD employee. + */ +#define AMDTEMP_17H_CUR_TMP_TJ_SEL ((1u << 17) | (1u << 16)) /* * The following register set was discovered experimentally by Ondrej Čerman * and collaborators, but is not (yet) documented in a PPR/OSRR (other than @@ -731,7 +737,8 @@ amdtemp_decode_fam17h_tctl(int32_t sc_offset, uint32_t val) { bool minus49; - minus49 = ((val & AMDTEMP_17H_CUR_TMP_RANGE_SEL) != 0); + minus49 = ((val & AMDTEMP_17H_CUR_TMP_RANGE_SEL) != 0) + || ((val & AMDTEMP_17H_CUR_TMP_TJ_SEL) == AMDTEMP_17H_CUR_TMP_TJ_SEL); return (amdtemp_decode_fam10h_to_17h(sc_offset, val >> AMDTEMP_REPTMP10H_CURTMP_SHIFT, minus49)); } From nobody Sun Jun 18 04:17:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkKNd0kCrz4dxh3; Sun, 18 Jun 2023 04:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QkKNd0Dfpz47Lh; Sun, 18 Jun 2023 04:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687061825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCpcOFKxQSsWFsX6kQdgiKyjlNFoAWgEES4axNPm5Vg=; b=UKDHm/wSuIQS5X/PGZHa0tNB0ALT6JeaTxL8TfiHhN0hxr8/CcjkOo0TiglC62Dk2uczx6 QcUEVtkRk9FgDLjFdhyuBW3mqfUxqZHdkqNxSfkxBJ3w5dcUbzFbuyXKcPi01NB0lEZB3Y N7a9c4doLPAgA2Tkgmod4o84heE5i7+3C7cfJ7sahCfMIfBioLk7/efLWAUJqWVdz8n9HH f3+MH6x2a7m7CzJP8r9ZWtnTQ8yheEyRiHlEThwX0+C+L/c760EOlQZA1sfjV2brbifJnZ AoZMWX9ZSL4L9oUiS/bYBcx+bSm+ffBtlreJ2rRuybOle3QKZ6Q/rvaRj85KYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687061825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCpcOFKxQSsWFsX6kQdgiKyjlNFoAWgEES4axNPm5Vg=; b=fjpbFJp9JjFGF2a4KmpANZ9sFdub8ZyYsn+6Y0GELnK+6Cpi5M1TAMY+B5M8Zvy2M+3bnq MqiZO4N7PAxnr1M3t54RdGpTs+jZ/Szdh6BeB0aiTup7tSCDPvLq/1qXUexP7H1GvY4ASK xkCFTN98E+/86hPKcSb/a/bLqJQ/SmtbgqRUnoXWIB3iEEoKRfD8FnssHrhDqtNTZ3xqOC TokakUc4AVJoRkMzVYiiAqcfhqLWAbZccuh6yiBPJSHpYcLF/ZGXVgMiPqX04y2tbsjKLn C5MDI17FtPzSj5MF0VYUJ0+O522v+2qUVgS2vrp2yeBZcUfz/vSqSp7nvfaDRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687061825; a=rsa-sha256; cv=none; b=qGcWZWiavB3GEG1e/cVDvbYkp+W+pSE3A4S4tnQ9RjwdEPprzR4OjRpIKDSYcEKxJdOBc/ Kcjv8L7SaEHR6HgBoPGDRJjTjOUdjMkcd/90JYo+7Jx5A2j7/0X7jEOy/Gy7KiG+QH2yW9 UmF5ebVkQZtKwsDPhMo0D6eGT6bC/6t0oNMYBD1/k1DrXcaDnimS5NDlfsB3T0pRkgu+C6 HDvPZKNotf+ynY5fmVl7SDcmXr6LOWLCpbfs0b9Y6Xb9EMTODfRTPQRGXBA0B4qo0+rqwL +F7/txzhsAr/u9ALGDSUgjC4svXnfuEQY+WTR/UBoRYAKCaXPc24yamAwJeLpA== 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 4QkKNc6PnPzMNR; Sun, 18 Jun 2023 04:17:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35I4H4YW088939; Sun, 18 Jun 2023 04:17:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35I4H40g088938; Sun, 18 Jun 2023 04:17:04 GMT (envelope-from git) Date: Sun, 18 Jun 2023 04:17:04 GMT Message-Id: <202306180417.35I4H40g088938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Lo Subject: git: 4d5842c020a0 - main - mlx4en(4): add missing newline to debug messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevlo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d5842c020a0d3ef64e34ce8f3a00d8dcb550bfa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevlo: URL: https://cgit.FreeBSD.org/src/commit/?id=4d5842c020a0d3ef64e34ce8f3a00d8dcb550bfa commit 4d5842c020a0d3ef64e34ce8f3a00d8dcb550bfa Author: Kevin Lo AuthorDate: 2023-06-18 04:14:41 +0000 Commit: Kevin Lo CommitDate: 2023-06-18 04:14:41 +0000 mlx4en(4): add missing newline to debug messages Add newline to debug messages after dumping uar_page_shift and reserved_uars. Reviewed by: hselasky MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40582 --- sys/dev/mlx4/mlx4_core/mlx4_pd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx4/mlx4_core/mlx4_pd.c b/sys/dev/mlx4/mlx4_core/mlx4_pd.c index 25fb9e754535..35aa6191ee2c 100644 --- a/sys/dev/mlx4/mlx4_core/mlx4_pd.c +++ b/sys/dev/mlx4/mlx4_core/mlx4_pd.c @@ -273,8 +273,8 @@ int mlx4_init_uar_table(struct mlx4_dev *dev) { int num_reserved_uar = mlx4_get_num_reserved_uar(dev); - mlx4_dbg(dev, "uar_page_shift = %d", dev->uar_page_shift); - mlx4_dbg(dev, "Effective reserved_uars=%d", dev->caps.reserved_uars); + mlx4_dbg(dev, "uar_page_shift = %d\n", dev->uar_page_shift); + mlx4_dbg(dev, "Effective reserved_uars=%d\n", dev->caps.reserved_uars); if (dev->caps.num_uars <= num_reserved_uar) { mlx4_err(dev, "Only %d UAR pages (need more than %d)\n", From nobody Sun Jun 18 06:01:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkMhf0r89z4fpMk; Sun, 18 Jun 2023 06:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QkMhd6TRqz3GNG; Sun, 18 Jun 2023 06:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687068065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Jr3Q0/C+d1FjjRuUjHAHXSPNfhDtrWtJFlNuN4/otI=; b=wyt8927MuZz6RhN/4Bs1AofGHftvWdKTxMSYhvW8VgMm6/yWVMNh/cZi64SoT7c03Y6s7Y jJDoSd8HA7BuhGmPoBMQsrliSTUM+yAsF1Su+t7kWcCRJgddVlYSeaGRJ4/oALhVs0aVet W9aEuDpdRcAwAiizaasA9AmRnyC4iNYfzDJnv5dS9YVOpgvjCNnBKZG577a6XPPAn/f06b tmy3lws8X1GddvBaxZs4Zp7u0SFdx+dWNHcTT1mGHvE/PN4mUxxhLWubLyBCqLAi62DkrX AKuasWY6uWvAKD3ITZWwv/vPyDzhCzNN94C3E6ZFVutOSxiM44rR6BOsfQLsfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687068065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Jr3Q0/C+d1FjjRuUjHAHXSPNfhDtrWtJFlNuN4/otI=; b=bIRh/7APoV8l3TKK5v5TZ2VMKmg9ZdDcVFJ3kzn6h8x4Lveym9Lw9uXPdI0vGTw//PpIHd K3HsOGPLEyY7jcfNK80NSC3nV3WeBTIS5qkBtSjo0nC+/bEtrGMyT9gVGVnZ6ftUDmcHhG GR7rdiFiszq4romw5dmluidx81AWo9tyhRpb+/o07UV9Sx38bAUovv5HfVV/XEKptAHyLX /6iELy4bltOUt4j3tOpKE+ur1GfmtLaovKjgOjOmd75X4rlWGQdNZZYn/hUHhPuVNUE9Sa FV/78jLhdFRy0IQU3o87QQJjRpTN5h6SbR0exr0mJ3KtVKPxrdv4dUhau8E2sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687068065; a=rsa-sha256; cv=none; b=ASJuu/q5gdK9gPZ1JGnL8IusiBE2kdMAkrsGXU2RsHFtlzblr8SA09jzvDWBzrPJzdq5QV sGWgnmtqWP8grSUEMWSH4sSS1nwip0O0neQLwNhbNm7LhWxbYZRjr1KCBrS7YbKG5V43uD HVPghujevltLBJVHIG9WTkdly9axT6G7aI5hOV7WGreuImXzoJGt/urrcBOqbFzdDufA8I PFwhtWWGXDHtH+Cia1GMBoBJ/VcOXGZlwbZ0e6p738HvJEb6voxVQ6e0i1BQLOsBHejjXH ZW4bb4FINAljcyKFC8Wj3L7f6qje4nTQI62PG0CNapGx9TRjiq4pqxcw0JUHBA== 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 4QkMhd5ZykzPnV; Sun, 18 Jun 2023 06:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35I6156q063651; Sun, 18 Jun 2023 06:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35I615fR063650; Sun, 18 Jun 2023 06:01:05 GMT (envelope-from git) Date: Sun, 18 Jun 2023 06:01:05 GMT Message-Id: <202306180601.35I615fR063650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: ab3e6234ab6e - main - examples/kld/syscall: unbreak compilation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab3e6234ab6e03671e9be94da7b5dd2d5348b280 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=ab3e6234ab6e03671e9be94da7b5dd2d5348b280 commit ab3e6234ab6e03671e9be94da7b5dd2d5348b280 Author: Maxim Konovalov AuthorDate: 2023-06-18 05:52:01 +0000 Commit: Maxim Konovalov CommitDate: 2023-06-18 05:52:01 +0000 examples/kld/syscall: unbreak compilation modfind(9)/modstat(9) need sys/param.h. --- share/examples/kld/syscall/test/call.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/examples/kld/syscall/test/call.c b/share/examples/kld/syscall/test/call.c index 1fb509d1f0ab..e257c6cc18dc 100644 --- a/share/examples/kld/syscall/test/call.c +++ b/share/examples/kld/syscall/test/call.c @@ -28,7 +28,7 @@ * $FreeBSD$ */ -#include +#include #include #include From nobody Sun Jun 18 20:03:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkkNv2s0Cz4fZl6; Sun, 18 Jun 2023 20:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QkkNv1R0Nz4JL7; Sun, 18 Jun 2023 20:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687118623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ujkJZVb5xv+oAbc+AbcsTUXCu5Ai35Foewe0pn7XSg=; b=ucFlgxuoCwXTUXd5BAKtEtWF+Sfhvr24eLajhq+qhonnTn2OP2FN27g4zmMTDuOFQ5jzyn 6VgI/sA7Kh8iYw/vXC1CsPCZdujWUmTge39vetnqrNLzrBtDxJ7eY7PjOcv/BuxiblkV/i wd4QuFWtPE61MxrFeC8zOw0PWE99eZx9P8o/qDVcFA0kvXuaaziDQNow98QE8czm26pbNB AHEdCTllNqvXwb2UWiOqoYtnby/yACJZ0qNLHbI/ilT24VjFMzS5R+jwfEmg2wppU4jdvH qCk7v+wyrjJeZ9gtzZ77X9PrjaN4HyF8KaxmaP4vxvo9lM/hijY3z10nveYaWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687118623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ujkJZVb5xv+oAbc+AbcsTUXCu5Ai35Foewe0pn7XSg=; b=hyL9+CAQH5+s8vUD76DyYgYbbya8skeSq6mMngVRxeFw78UoAYFZr1l0rnUZs40xNpR5q9 n0md/L2KgdPDD4pNMA3zrovftADqgMyqOoXGkLfhg8BaxHglJxW2DU/hf9zB7hWEw8tm2j fU7TntMcZ2X8F4uJHgPyaj1q4IHCejgHdHbDh2GANeRFtu1pcB5bLhRk2hbkf2/63yqIxq 1TkXnzKpm83z4HlizaExHZhXmqUl+bO/ktMAHr8/StKNpLEIH9E8Szrfnvon/J+1ku6rJt xiy3ZoVPZ3PgL+IqwvZEThvB9XA/m9hcd0DLzqfX9az13azfjF3ucIdcV7N0MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687118623; a=rsa-sha256; cv=none; b=MZavFkFHcX7lZtbDB58FDPH1anFjAxX85hNFxAQbeD2GYZUjcYtgn4dL5aMEQgnZaHr2Od dY+I3lJYMbDFk/yUN/Tbrfswpe6vN3EiURAeoDivWiTd3HbC7/63//yv3/W+/t9ZSkprga UfwR0P0FOD7L84of6J48raeEd6dF1qW+mjGXDZchUoz9I1W4h8LmbV5QFjMPjeCfhhwTKn bu0p0qjr4qoJMf+71RyR9ytmfa1hMLv1R2u0okB5vhNI0NQK6BMVBRbj8RGPgJPWKNSro2 ihsqCDAPXCDIiPXaCtDU+t2Vw1+h2UlT+oqQURILMMlWdbEsH4r2AcE8o7Hfwg== 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 4QkkNv0StPzpVL; Sun, 18 Jun 2023 20:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35IK3g4K053734; Sun, 18 Jun 2023 20:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35IK3gYe053733; Sun, 18 Jun 2023 20:03:42 GMT (envelope-from git) Date: Sun, 18 Jun 2023 20:03:42 GMT Message-Id: <202306182003.35IK3gYe053733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 7e53f16baa3a - main - mount_nfs.8: Note a case where the "nconnect" option does not work List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7e53f16baa3a02118f40c50587efde0338b5053e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=7e53f16baa3a02118f40c50587efde0338b5053e commit 7e53f16baa3a02118f40c50587efde0338b5053e Author: Rick Macklem AuthorDate: 2023-06-18 20:02:20 +0000 Commit: Rick Macklem CommitDate: 2023-06-18 20:02:20 +0000 mount_nfs.8: Note a case where the "nconnect" option does not work The "nconnect" NFS mount option will not work correctly for servers where the TCP connections might connect to different NFS clusters that do not share NFSv4.1/4.2 state information, such as file locks. This patch adds a sentence to the "nconnect" section of mount_nfs.8 noting this case. This is a content change. Reviewed by: karels, pauamma_gundo.com (manpages) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D40547 --- sbin/mount_nfs/mount_nfs.8 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index 4f4b8891f67a..319e3bc2638d 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -28,7 +28,7 @@ .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd April 3, 2023 +.Dd June 14, 2023 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -231,6 +231,9 @@ This option will result in more IP port#s being used. This option requires the .Cm nfsv4 option. +Note that for NFS servers such as AmazonEFS, where each new TCP +connection can connect to a different cluster that maintains lock +state separately, this option cannot be used. .It Cm nfsv2 Use the NFS Version 2 protocol (the default is to try version 3 first then version 2). From nobody Mon Jun 19 05:47:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkzLC2lDZz4f0QB; Mon, 19 Jun 2023 05:47: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 4QkzLC1zlkz4Dyj; Mon, 19 Jun 2023 05:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687153635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xuId22CyFE4/T0nXkZY331H8k3gYCL7YtnyWoH32CH8=; b=rO7l50H44WhMrRaLdkViPReKMnB995OXYEKjAOzq0skJwpeEM+F0qqPuPSzBAeVDQJtJf5 5yebuaf/1j+i8Ua7UHkQH85V9IG9IS5AgK2QCXRG0nKo+RN1YLO3Jtr74v/EewvnDtFRrW SdE9qbRPZUUyiKGoKlO2lXkrG0Xb4/PHIr96ljX1wJJlnkq2Ny2BYiIatlYWub3OIUr+nW MOLbZjvrifmRgl1w/nrXNxO9rPnON8FtY9NyB331SzBdYsDgRWGN9N+q1MhdZFKyBV5MK/ 0TpT/bUQWHpRnlaUJo1yCIyBtdITfinyD5He7TV1OaKIHuvpJf26ICI9I8AYZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687153635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xuId22CyFE4/T0nXkZY331H8k3gYCL7YtnyWoH32CH8=; b=sEMHRsBuZei9L96uE9MN6+VcJXG88086f4z9nqGmoxcB1aMsvNcIyxaaC4uZcAOZ81NINA 40/n5ewDFWf1bUKnRQfWTZTjIjDHpfHyOK6WVYFZZbGtelkHXf+YtBWaBULLl1qOVDJEYV 0Npk7nOBPVr0G0dLI0hQH/v55L4Uoh3j34Jdf7wUIRTyRjKB6z3KzOBqp6xj3GUAfkAbMr qo7ULpELIDcqRHKNwU4VEIXSVn805YB8zDcdCHbGwli80Ftt0e1PqA/GpTHZZpdT0OKAkm 7d6i15TSN1rsb2K5VvuEpRuOp7mvJOtlzJwooMdAZsN35iqoVOonFVfcEjCscQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687153635; a=rsa-sha256; cv=none; b=e/eHpyv2vjm7te4ChS4WfNlGEKblcHRn15CHL+mQbUklD7RGZkqX7uxmqASEDLFQiXm6BI 5UWsgsO86kAeyhFXP/WjjGk96Z6fK6zUvLZoJoG3eh23mQuUckTwbYZfMxuiG1TCQq/yaC 8u2tpc8KkGjJs2IjEiOVluRx6LzhpM8+7pWEreQ0Rf93wmS4HkRKcZYMRb2ky9mZ596ihQ NWSJtT5XSgnxlVdrR7nWV+KeP0hu7uOJAIFI7LHY+ymDWN4gTtYftfZkjWB0pPj3mCCjoc ZBTHJD/7XQq0qL7hKdYhDlAWQWy8Ug1caGgDaJkBzHAMdRGQ4zzs7squIqDE2w== 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 4QkzLC08C9z15NN; Mon, 19 Jun 2023 05:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J5lEPw009701; Mon, 19 Jun 2023 05:47:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J5lEhJ009700; Mon, 19 Jun 2023 05:47:14 GMT (envelope-from git) Date: Mon, 19 Jun 2023 05:47:14 GMT Message-Id: <202306190547.35J5lEhJ009700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 0e96337b1191 - main - acl_is_trivial_np(3): minor fixes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e96337b11910b444763439a722c89983d660a09 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0e96337b11910b444763439a722c89983d660a09 commit 0e96337b11910b444763439a722c89983d660a09 Author: Kyle Evans AuthorDate: 2023-06-19 05:31:16 +0000 Commit: Kyle Evans CommitDate: 2023-06-19 05:47:04 +0000 acl_is_trivial_np(3): minor fixes - Correct the document title - This function has an _np suffix - acl_strip_np has a manpage, xref it - RETURN VALUES should describe acl_is_trivial_np, not acl_get_tag_type Sponsored by: Klara, Inc. --- lib/libc/posix1e/acl_is_trivial_np.3 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/libc/posix1e/acl_is_trivial_np.3 b/lib/libc/posix1e/acl_is_trivial_np.3 index bd00d88191b4..28fac67a20f6 100644 --- a/lib/libc/posix1e/acl_is_trivial_np.3 +++ b/lib/libc/posix1e/acl_is_trivial_np.3 @@ -26,8 +26,8 @@ .\" .\" $FreeBSD$ .\" -.Dd November 12, 2013 -.Dt ACL_STRIP_NP 3 +.Dd June 19, 2023 +.Dt ACL_IS_TRIVIAL_NP 3 .Os .Sh NAME .Nm acl_is_trivial_np @@ -41,7 +41,7 @@ .Fn acl_is_trivial_np "const acl_t aclp" "int *trivialp" .Sh DESCRIPTION The -.Fn acl_is_trivial +.Fn acl_is_trivial_np function determines whether the ACL pointed to by the argument .Va acl is trivial. @@ -56,13 +56,14 @@ any access rules. For POSIX.1e ACLs, ACL is trivial if it has the three required entries, one for owner, one for owning group, and one for other. For NFSv4 ACLs, ACL is trivial if it is identical to the ACL generated by -.Fn acl_strip_np 3 . +.Xr acl_strip_np 3 . Files that have non-trivial ACL have a plus sign appended after mode bits in "ls -l" output. .Sh RETURN VALUES -.Rv -std acl_get_tag_type +.Rv -std acl_is_trivial_np .Sh SEE ALSO .Xr acl 3 , +.Xr acl_strip_np 3 , .Xr posix1e 3 .Sh STANDARDS POSIX.1e is described in IEEE POSIX.1e draft 17. From nobody Mon Jun 19 05:57:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkzZY2RBrz4fCN0; Mon, 19 Jun 2023 05:57: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 4QkzZY1SQPz4KCr; Mon, 19 Jun 2023 05:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mWylfvB3Wsi4NnqvyY61zxKqtW3Z78qLIoL9LZWEz74=; b=IopofepLLtVlyLO+H1KTAQhS1M+66UyXOwXMQpD9YtA+59INQFadCMI5EDqb33TDPALGb1 9N3WWYJSEaRYOshGbuP9gqQVds1GGQUOx8p+K9hKrqtokgylj0QrtLl3cLzvZfViCl/qyU RMirnNupz02tTZRiTgUfN4jOraVVd0L8zZezPOtfdEQSt5BRd4xVkKpiLCJkauJ9TRuUUt dbT/2r2Gp0I/w7ofbEspTTxwBviO5XCbaGhjdMH9KU9FHER/45EoCuij7C06q0scIeV+/C UdSFyIC5GgloHfJqMKSBBLP9bIxpftnYSMsfYSYV+qHl1kjkv2HLll8q3siw+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mWylfvB3Wsi4NnqvyY61zxKqtW3Z78qLIoL9LZWEz74=; b=kK6lyGWUmUUO39bqbAznrqRuOLi6Pm6V0piDJpXg158CbzackAOmHX3TfCCtsDTJZIk4CG PF1GynAzNE6vBK8pqqpVKGAXus0FqUx7OMS5X+Bm5uKfTzUzdj2Wvf7lWNican/KsrO0wa 7qm0/iIC8DaqhH+aGD+Y1LAKloYmbKX0mGbSAFX7kAxT/nLPMd0H+KABq+prywkjkMSa7v T8EIGd7sUhCqs0mtQHjyd2X8Df3VTYiwTKYNxtgTEvNOMk74h7xhAo+S+ElbV1hMa0r5oo 2CSo/pvJqRC8gll9rNezSdSL7dXfWt/hswkJjmwZCxaacNV+VuOuZYPlQ8uOPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687154277; a=rsa-sha256; cv=none; b=iXRg4HoNqS4gbWWCmJ4mEyEEFn7mUcG5MTAGyScoVzesQuhqZNUNsZpOnY5agvrUsJfB2v D4wzT6QP1kCvqycqPVpQHWT3kam32gI0McAr4BIRdpLzSfhaIeNL/xvVxapU+aeX+KAOf7 P8YvC3J8ytl3DRTLcoWD9u2xhQbsrljvKwAVtL4U+uWTyfHumo2jCt/rQEWaXP2u+rfHYt WXqkJp+Zh5Igd8NV47x7TmEkOOGTR4bzFZrQ0VDQb6qht+S23Wfkom7zPCLSLNAwlBzZh9 FPJTw3LKjC20dVELvj9tDO1GJGTGtlTVe8Y6bpOQIz+y+ulZiMbTvUDeHvxFKw== 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 4QkzZY06VQz15Xx; Mon, 19 Jun 2023 05:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J5vuXo025936; Mon, 19 Jun 2023 05:57:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J5vunN025935; Mon, 19 Jun 2023 05:57:56 GMT (envelope-from git) Date: Mon, 19 Jun 2023 05:57:56 GMT Message-Id: <202306190557.35J5vunN025935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 50aef9f62c1b - main - bhyve: rename 'structs' snapshot key with 'kern_structs' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50aef9f62c1be9e723169ef57920c3fca07bd2fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=50aef9f62c1be9e723169ef57920c3fca07bd2fb commit 50aef9f62c1be9e723169ef57920c3fca07bd2fb Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:25:15 +0000 Commit: Corvin Köhne CommitDate: 2023-06-19 05:50:36 +0000 bhyve: rename 'structs' snapshot key with 'kern_structs' Using key 'structs' is ambiguous. This section contains data related to the kernel. It should use a more informative naming. Reviewed by: corvink, rew MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40104 --- usr.sbin/bhyve/snapshot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index a9e172588870..7e635c13ef31 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -119,10 +119,10 @@ static sig_t old_winch_handler; #define SNAPSHOT_BUFFER_SIZE (20 * MB) -#define JSON_STRUCT_ARR_KEY "structs" +#define JSON_KERNEL_ARR_KEY "kern_structs" #define JSON_DEV_ARR_KEY "devices" #define JSON_BASIC_METADATA_KEY "basic metadata" -#define JSON_SNAPSHOT_REQ_KEY "snapshot_req" +#define JSON_SNAPSHOT_REQ_KEY "device" #define JSON_SIZE_KEY "size" #define JSON_FILE_OFFSET_KEY "file_offset" @@ -423,16 +423,16 @@ lookup_struct(enum snapshot_req struct_id, struct restore_state *rstate, ucl_object_iter_t it = NULL; int64_t snapshot_req, size, file_offset; - structs = ucl_object_lookup(rstate->meta_root_obj, JSON_STRUCT_ARR_KEY); + structs = ucl_object_lookup(rstate->meta_root_obj, JSON_KERNEL_ARR_KEY); if (structs == NULL) { fprintf(stderr, "Failed to find '%s' object.\n", - JSON_STRUCT_ARR_KEY); + JSON_KERNEL_ARR_KEY); return (NULL); } if (ucl_object_type(structs) != UCL_ARRAY) { fprintf(stderr, "Object '%s' is not an array.\n", - JSON_STRUCT_ARR_KEY); + JSON_KERNEL_ARR_KEY); return (NULL); } @@ -1059,7 +1059,7 @@ vm_snapshot_kern_struct(struct vmctx *ctx, int data_fd, xo_handle_t *xop, meta->dev_req); xo_emit_h(xop, "{:" JSON_SIZE_KEY "/%lu}\n", data_size); xo_emit_h(xop, "{:" JSON_FILE_OFFSET_KEY "/%lu}\n", *offset); - xo_close_instance_h(xop, JSON_STRUCT_ARR_KEY); + xo_close_instance_h(xop, JSON_KERNEL_ARR_KEY); *offset += data_size; @@ -1093,7 +1093,7 @@ vm_snapshot_kern_structs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) .op = VM_SNAPSHOT_SAVE, }; - xo_open_list_h(xop, JSON_STRUCT_ARR_KEY); + xo_open_list_h(xop, JSON_KERNEL_ARR_KEY); for (i = 0; i < nitems(snapshot_kern_structs); i++) { meta->dev_name = snapshot_kern_structs[i].struct_name; meta->dev_req = snapshot_kern_structs[i].req; @@ -1109,7 +1109,7 @@ vm_snapshot_kern_structs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) goto err_vm_snapshot_kern_data; } } - xo_close_list_h(xop, JSON_STRUCT_ARR_KEY); + xo_close_list_h(xop, JSON_KERNEL_ARR_KEY); err_vm_snapshot_kern_data: if (buffer != NULL) From nobody Mon Jun 19 05:57:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkzZb24PPz4fCFq; Mon, 19 Jun 2023 05:57: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 4QkzZZ2k8pz4KNr; Mon, 19 Jun 2023 05:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2qnsUeCOGOW3pmRUpnSdq/THJTCFxZKjdSABIXKJzh0=; b=fEIBxgFepHjqCrTKBm5Ciwm9plf01N22/6jYMfV3LxwrxGN3zYvE1y5JLmavX6jeoiq2zp 8Ifoc1idfO2gJn9Hgjgi3tZ2dN4u35CN3pI6RwY+OHhpcNxK5Slfyio1qjwZCnIJA9PRH+ g2QbTCBH/6A4ToUYPMrsJY7SD5Qv3dXYydiV4oOZKTJcKzUYEb/W0meZG5wYxPPToQl3Dl GenOY7oFNEUQG41yIV8TjutYYO1NUiXwCe5L5PpOrAY419oqTq+6mCpSf1Mg5LCQCnXQnk R+aiTnzpT4n0zNnhEH56WbQ2IY1ochymtEb1fshT92/+MrndbmkwOR2FVQVjew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2qnsUeCOGOW3pmRUpnSdq/THJTCFxZKjdSABIXKJzh0=; b=MFHdidVbuA6OIU0uUr5cfp5P4SNQAeDZqXovXSN4l6G18nLhUNRXZklkjmjjPyPbklNvZL mxhiV+OgFlRTpsIk2mwIskbxLH9iuUenQBIA/xO5tZLzrE1Rx6Dw3bpKN/jGN0AUnNfYoD RQs9TGhjaIolI6On4Eyycjm65TCKlXPsCW3+8HmRjydIrCbwuFrOt9cZeBxagC/tqkIARM x5fDoRvPoicTPcX7BpZCZMdD6/0Bvr0AB9zNUP/7wzHm8b1UlB2RpWcBK2OkzE46PDz/DC eBOne7ttj7DKozNxKzXaeOIysn8g7mFjAQ/lVEwGpEF82ul4lRQw7F+Xd5B+9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687154278; a=rsa-sha256; cv=none; b=fneKdeOlqdTJ0JJOpWYHV+O0MtvEJxRRjYDgqfy0ciTlSKJ6XPd2vdIWLn3LVQlb0F5+UJ Cp+xWn0sJG+Xo8BfTYePZAX9g6fixuvhZv2FmBBtZBbp4LjmYBjJwdJS+6SttkL8Gb3hOF aKFfoH9Tn1VfbAL539+JwNm2KptIEZsQxDVqXEJzXC+Pk/TT3uo3XRkHJvPBloaZfXhaCR r2LoVWfTImKktcKsr+VWx4/5Pf+h2TDNuvUPvxZ9M0anszhWMFMuneXp2PRavDWamcsdqi +4/3qnO1uo4i7iqy8M4FXCWrYIs9xaMkizSTgeicOj3djmDzwt3ZSqsaoA+liw== 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 4QkzZZ14YSz15fS; Mon, 19 Jun 2023 05:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J5vwDi025967; Mon, 19 Jun 2023 05:57:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J5vwbh025966; Mon, 19 Jun 2023 05:57:58 GMT (envelope-from git) Date: Mon, 19 Jun 2023 05:57:58 GMT Message-Id: <202306190557.35J5vwbh025966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: ee5023f3c2f4 - main - bhyve: simplify restore of kernel structs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee5023f3c2f46987fd051de2696c1743e4226a37 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=ee5023f3c2f46987fd051de2696c1743e4226a37 commit ee5023f3c2f46987fd051de2696c1743e4226a37 Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:27:29 +0000 Commit: Corvin Köhne CommitDate: 2023-06-19 05:51:33 +0000 bhyve: simplify restore of kernel structs Both devices and kernel struct can use the same 'lookup_dev' function instead of having duplicated code. Reviewed by: corvink, rew MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40105 --- usr.sbin/bhyve/snapshot.c | 149 ++++++++++++---------------------------------- 1 file changed, 39 insertions(+), 110 deletions(-) diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 7e635c13ef31..dfe341c598b8 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -415,51 +415,6 @@ do { \ } \ } while(0) -static void * -lookup_struct(enum snapshot_req struct_id, struct restore_state *rstate, - size_t *struct_size) -{ - const ucl_object_t *structs = NULL, *obj = NULL; - ucl_object_iter_t it = NULL; - int64_t snapshot_req, size, file_offset; - - structs = ucl_object_lookup(rstate->meta_root_obj, JSON_KERNEL_ARR_KEY); - if (structs == NULL) { - fprintf(stderr, "Failed to find '%s' object.\n", - JSON_KERNEL_ARR_KEY); - return (NULL); - } - - if (ucl_object_type(structs) != UCL_ARRAY) { - fprintf(stderr, "Object '%s' is not an array.\n", - JSON_KERNEL_ARR_KEY); - return (NULL); - } - - while ((obj = ucl_object_iterate(structs, &it, true)) != NULL) { - snapshot_req = -1; - JSON_GET_INT_OR_RETURN(JSON_SNAPSHOT_REQ_KEY, obj, - &snapshot_req, NULL); - assert(snapshot_req >= 0); - if ((enum snapshot_req) snapshot_req == struct_id) { - JSON_GET_INT_OR_RETURN(JSON_SIZE_KEY, obj, - &size, NULL); - assert(size >= 0); - - JSON_GET_INT_OR_RETURN(JSON_FILE_OFFSET_KEY, obj, - &file_offset, NULL); - assert(file_offset >= 0); - assert((uint64_t)file_offset + size <= - rstate->kdata_len); - - *struct_size = (size_t)size; - return ((uint8_t *)rstate->kdata_map + file_offset); - } - } - - return (NULL); -} - static void * lookup_check_dev(const char *dev_name, struct restore_state *rstate, const ucl_object_t *obj, size_t *data_size) @@ -488,15 +443,15 @@ lookup_check_dev(const char *dev_name, struct restore_state *rstate, return (NULL); } -static void* -lookup_dev(const char *dev_name, struct restore_state *rstate, - size_t *data_size) +static void * +lookup_dev(const char *dev_name, const char *key, struct restore_state *rstate, + size_t *data_size) { const ucl_object_t *devs = NULL, *obj = NULL; ucl_object_iter_t it = NULL; void *ret; - devs = ucl_object_lookup(rstate->meta_root_obj, JSON_DEV_ARR_KEY); + devs = ucl_object_lookup(rstate->meta_root_obj, key); if (devs == NULL) { fprintf(stderr, "Failed to find '%s' object.\n", JSON_DEV_ARR_KEY); @@ -861,67 +816,42 @@ restore_vm_mem(struct vmctx *ctx, struct restore_state *rstate) return (0); } -static int -vm_restore_kern_struct(struct vmctx *ctx, struct restore_state *rstate, - const struct vm_snapshot_kern_info *info) +int +vm_restore_kern_structs(struct vmctx *ctx, struct restore_state *rstate) { - void *struct_ptr; - size_t struct_size; - int ret; - struct vm_snapshot_meta *meta; - - struct_ptr = lookup_struct(info->req, rstate, &struct_size); - if (struct_ptr == NULL) { - fprintf(stderr, "%s: Failed to lookup struct %s\r\n", - __func__, info->struct_name); - ret = -1; - goto done; - } + for (unsigned i = 0; i < nitems(snapshot_kern_structs); i++) { + const struct vm_snapshot_kern_info *info; + struct vm_snapshot_meta *meta; + void *data; + size_t size; - if (struct_size == 0) { - fprintf(stderr, "%s: Kernel struct size was 0 for: %s\r\n", - __func__, info->struct_name); - ret = -1; - goto done; - } + info = &snapshot_kern_structs[i]; + data = lookup_dev(info->struct_name, JSON_KERNEL_ARR_KEY, rstate, &size); + if (data == NULL) + errx(EX_DATAERR, "Cannot find kern struct %s", + info->struct_name); - meta = &(struct vm_snapshot_meta) { - .dev_name = info->struct_name, - .dev_req = info->req, - - .buffer.buf_start = struct_ptr, - .buffer.buf_size = struct_size, + if (size == 0) + errx(EX_DATAERR, "data with zero size for %s", + info->struct_name); - .buffer.buf = struct_ptr, - .buffer.buf_rem = struct_size, + meta = &(struct vm_snapshot_meta) { + .dev_name = info->struct_name, + .dev_req = info->req, - .op = VM_SNAPSHOT_RESTORE, - }; + .buffer.buf_start = data, + .buffer.buf_size = size, - ret = vm_snapshot_req(ctx, meta); - if (ret != 0) { - fprintf(stderr, "%s: Failed to restore struct: %s\r\n", - __func__, info->struct_name); - goto done; - } + .buffer.buf = data, + .buffer.buf_rem = size, -done: - return (ret); -} - -int -vm_restore_kern_structs(struct vmctx *ctx, struct restore_state *rstate) -{ - size_t i; - int ret; + .op = VM_SNAPSHOT_RESTORE, + }; - for (i = 0; i < nitems(snapshot_kern_structs); i++) { - ret = vm_restore_kern_struct(ctx, rstate, - &snapshot_kern_structs[i]); - if (ret != 0) - return (ret); + if (vm_snapshot_req(ctx, meta)) + err(EX_DATAERR, "Failed to restore %s", + info->struct_name); } - return (0); } @@ -934,7 +864,8 @@ vm_restore_user_dev(struct restore_state *rstate, int ret; struct vm_snapshot_meta *meta; - dev_ptr = lookup_dev(info->dev_name, rstate, &dev_size); + dev_ptr = lookup_dev(info->dev_name, JSON_DEV_ARR_KEY, rstate, + &dev_size); if (dev_ptr == NULL) { fprintf(stderr, "Failed to lookup dev: %s\r\n", info->dev_name); fprintf(stderr, "Continuing the restore/migration process\r\n"); @@ -1027,7 +958,7 @@ vm_resume_user_devs(void) } static int -vm_snapshot_kern_struct(struct vmctx *ctx, int data_fd, xo_handle_t *xop, +vm_save_kern_struct(struct vmctx *ctx, int data_fd, xo_handle_t *xop, const char *array_key, struct vm_snapshot_meta *meta, off_t *offset) { int ret; @@ -1054,9 +985,8 @@ vm_snapshot_kern_struct(struct vmctx *ctx, int data_fd, xo_handle_t *xop, /* Write metadata. */ xo_open_instance_h(xop, array_key); - xo_emit_h(xop, "{:debug_name/%s}\n", meta->dev_name); - xo_emit_h(xop, "{:" JSON_SNAPSHOT_REQ_KEY "/%d}\n", - meta->dev_req); + xo_emit_h(xop, "{:" JSON_SNAPSHOT_REQ_KEY "/%s}\n", + meta->dev_name); xo_emit_h(xop, "{:" JSON_SIZE_KEY "/%lu}\n", data_size); xo_emit_h(xop, "{:" JSON_FILE_OFFSET_KEY "/%lu}\n", *offset); xo_close_instance_h(xop, JSON_KERNEL_ARR_KEY); @@ -1068,7 +998,7 @@ done: } static int -vm_snapshot_kern_structs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) +vm_save_kern_structs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) { int ret, error; size_t buf_size, i, offset; @@ -1102,7 +1032,7 @@ vm_snapshot_kern_structs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) meta->buffer.buf = meta->buffer.buf_start; meta->buffer.buf_rem = meta->buffer.buf_size; - ret = vm_snapshot_kern_struct(ctx, data_fd, xop, + ret = vm_save_kern_struct(ctx, data_fd, xop, JSON_DEV_ARR_KEY, meta, &offset); if (ret != 0) { error = -1; @@ -1385,8 +1315,7 @@ vm_checkpoint(struct vmctx *ctx, int fddir, const char *checkpoint_file, goto done; } - - ret = vm_snapshot_kern_structs(ctx, kdata_fd, xop); + ret = vm_save_kern_structs(ctx, kdata_fd, xop); if (ret != 0) { fprintf(stderr, "Failed to snapshot vm kernel data.\n"); error = -1; From nobody Mon Jun 19 05:57:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkzZb54mFz4fCY0; Mon, 19 Jun 2023 05:57: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 4QkzZb3Zy4z4KPJ; Mon, 19 Jun 2023 05:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5k1oRoM+5kRTtn4r2nZk2fAIQanUZI+/hUc56fItGGY=; b=orCO68/PRVv4rIY5I4LDUdS8FED8cIfFJaLuQW/sgPs5qFKwK7mg98YsFf8stIL2I6vBhg TqXpIRPLvLavOf3EytFNUxngwwCHkQUJZT5nXQNeDzrrFo7yDW1xwRjj1XhiNLb16omAG3 WOX1EKb/XRqSYQ9sTm/TETaKTjaWl2YRD/wVm44tHdXmxr1iZ3B0VLV4sdinQELbwKtAcT TtZaXdkOLXpwLzBoBHMuEKhDi8q98FUAxBgdzuUWZNTGU+51wV2bDvzWfskfhA5QPpmDm8 JfURj/7yNxOGp6hMtEOOSEdOrPr418458Rc2I770ku36ViKoyt4JZqbF3dkB6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5k1oRoM+5kRTtn4r2nZk2fAIQanUZI+/hUc56fItGGY=; b=aPsOLwVzbTlUfGwhzh2ln77QOVuExFvXd+7v/R2CPiz06qoN/zwDAChzf2Lzn8Q/1+/Wfs Anl4rgtiHd5lrVlq6fbNKyUitYVP1w1v+59iRxJf7+LA46E6TnJaBHiCIi4XD2d2vGWygS 4Z6qDVb1ObqTF+O4WLla8zJwTNbHM4/tZ8vvTDXA0yJyawHaznVNxX7RNlbwlPB6sO6Ev6 RvGlLt3xiFEisfcTFi36S3k53aWi08VTIZSkGyi/MHIGWYrOUZFhlmUorYSpRmXFUCxNFH w45eN6LFvdtqToUBV+BfyVWWHboLsNUY8+GEK4fPNf6YWqyg5XnnFD3HGEUsxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687154279; a=rsa-sha256; cv=none; b=xaq32jlk9AdGWG7yzyOi0a+/T8Fd3XdAP0wEwgmp7c7j2bmtZw0GfEMd2qjsNxynTLQvBK /5a6Rt+DRTDZpX1LHWslXANr0cmGXRfrTZsNPiRcSlmssWN6iM3SiZHwnR/YJY/gmPh7Oi pAiHaIHNl+Ljijd94oA3f3YmOSpoFI+7XEHt/+TneMFABwbbbyHkKwduENGKPytxt9PvIO 8J5phXeo7L3v8bONmycEWwC7pXbtcMwWeTFn0eAilXiMp+XFbjIZX4Z/gCx2Xb6XB15HWG 8KDLzkVm74MOkyeUL7/bepkCbv1HHym+7RbQIw6fYn5dtDWXpv+i0gWdKUtnXg== 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 4QkzZb1zYtz15S6; Mon, 19 Jun 2023 05:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J5vxpI025991; Mon, 19 Jun 2023 05:57:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J5vxCN025990; Mon, 19 Jun 2023 05:57:59 GMT (envelope-from git) Date: Mon, 19 Jun 2023 05:57:59 GMT Message-Id: <202306190557.35J5vxCN025990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b10d65a420f0 - main - bhyve: rename 'user_dev' with 'devices' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b10d65a420f068bccf6aaf2942157a5347211dc5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b10d65a420f068bccf6aaf2942157a5347211dc5 commit b10d65a420f068bccf6aaf2942157a5347211dc5 Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:28:14 +0000 Commit: Corvin Köhne CommitDate: 2023-06-19 05:57:01 +0000 bhyve: rename 'user_dev' with 'devices' Bhyve don't use 'user' specifier for emulated devices. And using 'user' adds duality. Reviewed by: corvink, rew MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40106 --- usr.sbin/bhyve/bhyverun.c | 6 +++--- usr.sbin/bhyve/snapshot.c | 23 +++++++++++------------ usr.sbin/bhyve/snapshot.h | 6 +++--- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 052657a50dbf..5ced5df0b4cb 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1512,7 +1512,7 @@ main(int argc, char *argv[]) #ifdef BHYVE_SNAPSHOT if (restore_file != NULL) { fprintf(stdout, "Pausing pci devs...\r\n"); - if (vm_pause_user_devs() != 0) { + if (vm_pause_devices() != 0) { fprintf(stderr, "Failed to pause PCI device state.\n"); exit(1); } @@ -1524,7 +1524,7 @@ main(int argc, char *argv[]) } fprintf(stdout, "Restoring pci devs...\r\n"); - if (vm_restore_user_devs(&rstate) != 0) { + if (vm_restore_devices(&rstate) != 0) { fprintf(stderr, "Failed to restore PCI device state.\n"); exit(1); } @@ -1536,7 +1536,7 @@ main(int argc, char *argv[]) } fprintf(stdout, "Resuming pci devs...\r\n"); - if (vm_resume_user_devs() != 0) { + if (vm_resume_devices() != 0) { fprintf(stderr, "Failed to resume PCI device state.\n"); exit(1); } diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index dfe341c598b8..f7bff85e3361 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -856,7 +856,7 @@ vm_restore_kern_structs(struct vmctx *ctx, struct restore_state *rstate) } static int -vm_restore_user_dev(struct restore_state *rstate, +vm_restore_device(struct restore_state *rstate, const struct vm_snapshot_dev_info *info) { void *dev_ptr; @@ -901,15 +901,14 @@ vm_restore_user_dev(struct restore_state *rstate, return (0); } - int -vm_restore_user_devs(struct restore_state *rstate) +vm_restore_devices(struct restore_state *rstate) { size_t i; int ret; for (i = 0; i < nitems(snapshot_devs); i++) { - ret = vm_restore_user_dev(rstate, &snapshot_devs[i]); + ret = vm_restore_device(rstate, &snapshot_devs[i]); if (ret != 0) return (ret); } @@ -918,7 +917,7 @@ vm_restore_user_devs(struct restore_state *rstate) } int -vm_pause_user_devs(void) +vm_pause_devices(void) { const struct vm_snapshot_dev_info *info; size_t i; @@ -938,7 +937,7 @@ vm_pause_user_devs(void) } int -vm_resume_user_devs(void) +vm_resume_devices(void) { const struct vm_snapshot_dev_info *info; size_t i; @@ -1090,7 +1089,7 @@ vm_snapshot_dev_write_data(int data_fd, xo_handle_t *xop, const char *array_key, } static int -vm_snapshot_user_dev(const struct vm_snapshot_dev_info *info, +vm_snapshot_device(const struct vm_snapshot_dev_info *info, int data_fd, xo_handle_t *xop, struct vm_snapshot_meta *meta, off_t *offset) { @@ -1112,7 +1111,7 @@ vm_snapshot_user_dev(const struct vm_snapshot_dev_info *info, } static int -vm_snapshot_user_devs(int data_fd, xo_handle_t *xop) +vm_snapshot_devices(int data_fd, xo_handle_t *xop) { int ret; off_t offset; @@ -1152,7 +1151,7 @@ vm_snapshot_user_devs(int data_fd, xo_handle_t *xop) meta->buffer.buf = meta->buffer.buf_start; meta->buffer.buf_rem = meta->buffer.buf_size; - ret = vm_snapshot_user_dev(&snapshot_devs[i], data_fd, xop, + ret = vm_snapshot_device(&snapshot_devs[i], data_fd, xop, meta, &offset); if (ret != 0) goto snapshot_err; @@ -1294,7 +1293,7 @@ vm_checkpoint(struct vmctx *ctx, int fddir, const char *checkpoint_file, vm_vcpu_pause(ctx); - ret = vm_pause_user_devs(); + ret = vm_pause_devices(); if (ret != 0) { fprintf(stderr, "Could not pause devices\r\n"); error = ret; @@ -1322,7 +1321,7 @@ vm_checkpoint(struct vmctx *ctx, int fddir, const char *checkpoint_file, goto done; } - ret = vm_snapshot_user_devs(kdata_fd, xop); + ret = vm_snapshot_devices(kdata_fd, xop); if (ret != 0) { fprintf(stderr, "Failed to snapshot device state.\n"); error = -1; @@ -1337,7 +1336,7 @@ vm_checkpoint(struct vmctx *ctx, int fddir, const char *checkpoint_file, } done: - ret = vm_resume_user_devs(); + ret = vm_resume_devices(); if (ret != 0) fprintf(stderr, "Could not resume devices\r\n"); vm_vcpu_resume(ctx); diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index c3d0a7c8371a..95201deb1e5a 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -95,9 +95,9 @@ void checkpoint_cpu_suspend(int vcpu); int restore_vm_mem(struct vmctx *ctx, struct restore_state *rstate); int vm_restore_kern_structs(struct vmctx *ctx, struct restore_state *rstate); -int vm_restore_user_devs(struct restore_state *rstate); -int vm_pause_user_devs(void); -int vm_resume_user_devs(void); +int vm_restore_devices(struct restore_state *rstate); +int vm_pause_devices(void); +int vm_resume_devices(void); int get_checkpoint_msg(int conn_fd, struct vmctx *ctx); void *checkpoint_thread(void *param); From nobody Mon Jun 19 05:58:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkzZd1pKQz4fCQh; Mon, 19 Jun 2023 05:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QkzZc6Hznz4KHC; Mon, 19 Jun 2023 05:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z48KrY2aoFTVUvrTJtV8VJKzEJUSNeCZVmL4YRS9pBc=; b=sEGrFPLiEc4eR5n40aTChIMxAaG2eEnreCWDCfgIj8Gz/tqeYOanEDMaDPdenWwEwzRZ9l LnPY0ZogX7KjrvhdUfdOOCD8ruN0PMacQAOCAlD09qAbCx24zt1bqoDInGx72MEpAZjsPQ jpGfT9gcY2BcIp502sjeY6Lt4rzTo/sBcDK0JTwehgs6XEyvbOmPQoDtrXbKloMcobHe3J CwzvisK47VNCCTJDKLhtiS+x3WoffzTPxhBcneylDiyGngFsPgKTh2LEIRJJxIjTEBYpUx Ksz+xr29pUA1dBZpGRVUTS53652FUntg5H0O4vbDdIpjH4SBSw46rV5dnjoOiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z48KrY2aoFTVUvrTJtV8VJKzEJUSNeCZVmL4YRS9pBc=; b=MdqnGSC4r3lwFyVqHGlaAEZi1Vqp/HVv4tL09LaWbLgtwNOfrXMuJXTc6Uhba4cNwqbA70 uiGHQoCjCng/Al3EnuAHAXlxuogopptsjzaaay1X1q5JyeakAb8ZhZ7nX4DoMt1BaFsJWj 7WbSh8/DDXRn2lJZDHznc1KlM+Oxo/6bTOPiDnt4DKWGCsju2pYd5uXCaxVzjWyrJSxCJ1 D0dsm/sz91cmY3xiRYd6Du9BJcuiLqqbwtmxF8CGDY1DH6jLSp6rDpuuApnEpyE3Q6yHKM 6HTvqBJj6BH/zkGps5NjRtg7h/0FR9Jd/D3OmNCNkn/8/QrBjrlGYd+KXa9xwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687154280; a=rsa-sha256; cv=none; b=AVlUWmVTK55Np4BxJMuMuhS2CDXo1MUdq/pwgb8QmCpqrOxJ0pglfwlxHTYXkiaLXuh0ap vlRgUF9/2klZq4ezazlG4CUvB8i/Tf79rE80beJTADriLAugEisLnQEQzSy3XgqsICKgWr 3U8L2YPZSLzhruT3cVke2WEuPQXBLJhIBlrqUISqGXQDpceS9mCpLHyi9/n/HsSqDwefT/ L3TqWR4OgJCRnViU6aM1Tc3ZKhgDFmA1KBN68+6gTypxei+d02pehtBoROOjgWWa+dTffq LKCo7cKUCaBDsW/iHFceURKq0clpDPWMiWx0b7laDvFUCdIn7CPj4XxObSQW/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 4QkzZc2Qhsz15Xy; Mon, 19 Jun 2023 05:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J5w0c1026015; Mon, 19 Jun 2023 05:58:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J5w0sa026014; Mon, 19 Jun 2023 05:58:00 GMT (envelope-from git) Date: Mon, 19 Jun 2023 05:58:00 GMT Message-Id: <202306190558.35J5w0sa026014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 14c80457b0f6 - main - bhyve: add bus, slot and func to device name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14c80457b0f6a5eb6ff9a1db573462410c64a454 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=14c80457b0f6a5eb6ff9a1db573462410c64a454 commit 14c80457b0f6a5eb6ff9a1db573462410c64a454 Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:28:45 +0000 Commit: Corvin Köhne CommitDate: 2023-06-19 05:57:04 +0000 bhyve: add bus, slot and func to device name Each device needs a unique identifier to store and restore snapshots properly. Adding the pci bsf information to the device name creates a unique identifier as a bsf can't be occupied twice. Reviewed by: corvink MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40107 --- usr.sbin/bhyve/pci_emul.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index ef98c459e327..6eb428e76817 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -1029,7 +1029,8 @@ pci_emul_init(struct vmctx *ctx, struct pci_devemu *pde, int bus, int slot, pdi->pi_lintr.pirq_pin = 0; pdi->pi_lintr.ioapic_irq = 0; pdi->pi_d = pde; - snprintf(pdi->pi_name, PI_NAMESZ, "%s-pci-%d", pde->pe_emu, slot); + snprintf(pdi->pi_name, PI_NAMESZ, "%s@pci.%d.%d.%d", pde->pe_emu, bus, + slot, func); /* Disable legacy interrupts */ pci_set_cfgdata8(pdi, PCIR_INTLINE, 255); From nobody Mon Jun 19 05:58:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkzZd74LTz4fCQs; Mon, 19 Jun 2023 05:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QkzZd4pbFz4KPm; Mon, 19 Jun 2023 05:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KX3Txi0/OK0bBsxlIru9LFr9nY/5N2dqERozcTqr68=; b=GUs1p9hpyZ/+1BT9QRP+5kr8xquABNQKlxV9b9mteM5uaXEeJjLN69vhC6M4VQGWDh/UZO HyH7t8oiDbk2F9NqXUZlBQ1lRtWBhhGcP++ThKnfJ2aSAPm8txFx9tZnJj71/P44SLDZ7W M2ggktTazky6GrGtPHoec1HMy3qtKlYONUxQYpRwzeyluq0MvavIi2hbehW65xhP9FyQg8 6oeZ3WJmlGwUUqn3PXazuN9X9OLzieRhTNn0XkRYgQRGo4Gg4ooIjNsrYPjOhRM2qVHwg5 CqIBN3ZWhEgok1x4feZq/tpp8mEAQS5ojK0ZwKJKNedZYrkWG741MxWo6UFHpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KX3Txi0/OK0bBsxlIru9LFr9nY/5N2dqERozcTqr68=; b=hS81z92itl6xruBb2q3YQynecHDB/jNXeFLBtO2AN9PIKIpzOqD46pUIqHodzf/yagKTc0 1lIMSKEOhSSW6qY+MmmmelJ9T1VT+0ZnTa9TWZiNBY+fzBZh3hbA0vtbqdwwgY5GjwCaRs mb2EypK18I+1gKrvpdWOPr8GwLN2hLDOXzBBSLisdE+V914PDrcES32lynTVvNszud2bbY eXYeTUH05gMBMPOsxyu4PUqPqA9aQ+2Kmk81RRf6WOj7mD82FAj55A7+JJQhHKcixGihg+ T7NDcgCBffAv/Nu4NpeRChXXVupoDOKGPVXDnizEStFcbLQuOi1/vRMrF2Minw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687154281; a=rsa-sha256; cv=none; b=iRZKT7bJAQE3t9D7w3WOMLbfOQt2ZYUY5O/Wc4545tq3rKCc0whcl1jD2bwuzN687pOqNG FP7DYDleNTcwdfHZ5NoilF3KsBAmwAoczFBP53JdNGRL+XUC31eYKMW46+hSevZ4VG9rKD WIRVdyFQxJ2U0l2FsElShlYvJcfz/JoNC0O4lvQn4TapqUSlVBHYNRZNWAjYy6LCYvh2YQ V1VNjPL5oBsp7rqLt1OAckYifAv8PrlCFFlHQtYOe7EIGKWPVnfBmL8o4liMDaLebat63P jjXpWA22DI8yPRgDcxqt+Y+35N7Gr7I5xuxiosJl0ICd0KczvPKyqUnIPP4/iw== 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 4QkzZd3cNdz15S7; Mon, 19 Jun 2023 05:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J5w1XK026041; Mon, 19 Jun 2023 05:58:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J5w10e026040; Mon, 19 Jun 2023 05:58:01 GMT (envelope-from git) Date: Mon, 19 Jun 2023 05:58:01 GMT Message-Id: <202306190558.35J5w10e026040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 6f7d2cf8bbb5 - main - bhyve: add .pe_snapshot method for PCI 'hostbridge' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f7d2cf8bbb5ce6c4dbe0153d54cdc474b5266f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6f7d2cf8bbb5ce6c4dbe0153d54cdc474b5266f4 commit 6f7d2cf8bbb5ce6c4dbe0153d54cdc474b5266f4 Author: Vitaliy Gusev AuthorDate: 2023-05-15 16:29:56 +0000 Commit: Corvin Köhne CommitDate: 2023-06-19 05:57:04 +0000 bhyve: add .pe_snapshot method for PCI 'hostbridge' There is no error when dump doesn't have it, but to be more consistent this PCI devices should be saved as well. Reviewed by: corvink, rew MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40108 --- usr.sbin/bhyve/pci_hostbridge.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/usr.sbin/bhyve/pci_hostbridge.c b/usr.sbin/bhyve/pci_hostbridge.c index 03eacc5e134a..90ccda0a79cd 100644 --- a/usr.sbin/bhyve/pci_hostbridge.c +++ b/usr.sbin/bhyve/pci_hostbridge.c @@ -86,6 +86,14 @@ pci_amd_hostbridge_legacy_config(nvlist_t *nvl, const char *opts __unused) return (0); } +#ifdef BHYVE_SNAPSHOT +static int +pci_de_snapshot(struct vm_snapshot_meta *meta __unused) +{ + return (0); +} +#endif + static const struct pci_devemu pci_de_amd_hostbridge = { .pe_emu = "amd_hostbridge", .pe_legacy_config = pci_amd_hostbridge_legacy_config, @@ -96,5 +104,8 @@ PCI_EMUL_SET(pci_de_amd_hostbridge); static const struct pci_devemu pci_de_hostbridge = { .pe_emu = "hostbridge", .pe_init = pci_hostbridge_init, +#ifdef BHYVE_SNAPSHOT + .pe_snapshot = pci_de_snapshot, +#endif }; PCI_EMUL_SET(pci_de_hostbridge); From nobody Mon Jun 19 05:58:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkzZg0HQCz4fCXC; Mon, 19 Jun 2023 05:58:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QkzZf5ghvz4KNN; Mon, 19 Jun 2023 05:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hvr+PDGuw+jUsQuiCP2wYsiOH4b5JBcDzea8e1NqXcc=; b=KOWhOMZrUAIiVKlFyCZ3Nk7oS2lejFwY6z68M5ipE4l4ZyxkoLYGU1uVhX7zBfGXb190r9 J3Jc0+thPT9ZFMj+G08O8WO6aODkVJutr/+WiPMawMXyg9pTcCPwDEt+NgOEPkaFwDwc+o x1uMWq1KnxpQWFlyxC0GrfDJEUPBvPaKr3/CG49ZmwuHgV5sdFbiGKki4FEAddSSasX4lV HKCIWbzuhSa0Pv2VxRroPTCxtgKwZ1H5hGabCAKAYwD/Q7jYuMGL7d+7MP/CPezy5b8uEH MsgF1fBEFpnUBymyWFM32KWWvp+FHhJLcxAhpE23A/qdiNmAANpL0W/3/SqmvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hvr+PDGuw+jUsQuiCP2wYsiOH4b5JBcDzea8e1NqXcc=; b=nswiPTZwfgYH0+JkmXCbMerU7WmSa4lyNntGp3c0pz+xi7jbZtGZmUgcNzg668ur+WMS+d 07GOgRuZFC2vGYGciYflehnfZMONrXGk3L0ztKvNEG0Yq6A+H/4gytWVvdA+Zaz0i8Ds8y OTje+1LaEwbkbgRbULA/rx4WD3gno4ndZVEp36A4y9i6Q+xA2q6ffnD4ST2YK+9Etnw0XD gnht9UHGf2ah1lGEKSSp5kXz/l270jinOTmy4Qe32+tEDzkxEg/ujD4wjdEFg0MdEb5skC Nx7SUH7OZX93JLO+IJdok6eA1AX5YMnjt2633a1VsAom9e2e3Do/UsemgLauBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687154282; a=rsa-sha256; cv=none; b=Sn2qcnoux8huyafReI56mFwC7BhcIEVaHDAh0ixKELsOm931SB2dYgk5MuvU9y3li52hYM NqBEZ+22yRMZzeWM6WX0dDlN2k9q+m7JdmzE3FZNQiHRnz9BUInHdfWvRD6CPiC83BBJ7H YwxV/rIHEQCOX1For6UyPLJPnOpuvqxpzB1DPp0PWbi/Q4LFV00MVozdr2q3+/JnDLQPxC M9zq/x0IUfLor3nmi0HCZvJ0sfQOQ+Z34+ep5UqoaLPa7PGRcJ6tUFQazZu+my5Fa4VONS jdZwNrbnLxFn0sAst1XvDFD8VixpY+gI4z+D3hySWZLvMlaObWkn4FdJ31CkNw== 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 4QkzZf4Nrwz15S8; Mon, 19 Jun 2023 05:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J5w24N026065; Mon, 19 Jun 2023 05:58:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J5w2BM026064; Mon, 19 Jun 2023 05:58:02 GMT (envelope-from git) Date: Mon, 19 Jun 2023 05:58:02 GMT Message-Id: <202306190558.35J5w2BM026064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 381ef27d7b7f - main - bhyve: use pci_next() to save/restore pci devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 381ef27d7b7f9d9130b6b308d1d598d093d7cfba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=381ef27d7b7f9d9130b6b308d1d598d093d7cfba commit 381ef27d7b7f9d9130b6b308d1d598d093d7cfba Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:29:04 +0000 Commit: Corvin Köhne CommitDate: 2023-06-19 05:57:05 +0000 bhyve: use pci_next() to save/restore pci devices Current snapshot implementation doesn't support multiple devices with similar type. For example, two virtio-blk or two CD-ROM-s, etc. So the following configuration cannot be restored. bhyve \ -s 3,virtio-blk,disk.img \ -s 4,virtio-blk,disk2.img In some cases it is restored silently, but doesn't work. In some cases it fails during restore stage. This commit fixes that issue. Reviewed by: corvink, rew MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40109 --- usr.sbin/bhyve/pci_emul.c | 139 +++++++++++++++------------------------------- usr.sbin/bhyve/pci_emul.h | 5 +- usr.sbin/bhyve/snapshot.c | 121 +++++++++++++++++----------------------- 3 files changed, 100 insertions(+), 165 deletions(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 6eb428e76817..cb92ea9edb09 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -2364,42 +2364,6 @@ done: return (ret); } -static int -pci_find_slotted_dev(const char *dev_name, struct pci_devemu **pde, - struct pci_devinst **pdi) -{ - struct businfo *bi; - struct slotinfo *si; - struct funcinfo *fi; - int bus, slot, func; - - assert(dev_name != NULL); - assert(pde != NULL); - assert(pdi != NULL); - - for (bus = 0; bus < MAXBUSES; bus++) { - if ((bi = pci_businfo[bus]) == NULL) - continue; - - for (slot = 0; slot < MAXSLOTS; slot++) { - si = &bi->slotinfo[slot]; - for (func = 0; func < MAXFUNCS; func++) { - fi = &si->si_funcs[func]; - if (fi->fi_pde == NULL) - continue; - if (strcmp(dev_name, fi->fi_pde->pe_emu) != 0) - continue; - - *pde = fi->fi_pde; - *pdi = fi->fi_devi; - return (0); - } - } - } - - return (EINVAL); -} - int pci_snapshot(struct vm_snapshot_meta *meta) { @@ -2409,57 +2373,26 @@ pci_snapshot(struct vm_snapshot_meta *meta) assert(meta->dev_name != NULL); - ret = pci_find_slotted_dev(meta->dev_name, &pde, &pdi); - if (ret != 0) { - fprintf(stderr, "%s: no such name: %s\r\n", - __func__, meta->dev_name); - memset(meta->buffer.buf_start, 0, meta->buffer.buf_size); - return (0); - } - - meta->dev_data = pdi; + pdi = meta->dev_data; + pde = pdi->pi_d; - if (pde->pe_snapshot == NULL) { - fprintf(stderr, "%s: not implemented yet for: %s\r\n", - __func__, meta->dev_name); - return (-1); - } + if (pde->pe_snapshot == NULL) + return (ENOTSUP); ret = pci_snapshot_pci_dev(meta); - if (ret != 0) { - fprintf(stderr, "%s: failed to snapshot pci dev\r\n", - __func__); - return (-1); - } - - ret = (*pde->pe_snapshot)(meta); + if (ret == 0) + ret = (*pde->pe_snapshot)(meta); return (ret); } int -pci_pause(const char *dev_name) +pci_pause(struct pci_devinst *pdi) { - struct pci_devemu *pde; - struct pci_devinst *pdi; - int ret; - - assert(dev_name != NULL); - - ret = pci_find_slotted_dev(dev_name, &pde, &pdi); - if (ret != 0) { - /* - * It is possible to call this function without - * checking that the device is inserted first. - */ - fprintf(stderr, "%s: no such name: %s\n", __func__, dev_name); - return (0); - } + struct pci_devemu *pde = pdi->pi_d; if (pde->pe_pause == NULL) { /* The pause/resume functionality is optional. */ - fprintf(stderr, "%s: not implemented for: %s\n", - __func__, dev_name); return (0); } @@ -2467,28 +2400,12 @@ pci_pause(const char *dev_name) } int -pci_resume(const char *dev_name) +pci_resume(struct pci_devinst *pdi) { - struct pci_devemu *pde; - struct pci_devinst *pdi; - int ret; - - assert(dev_name != NULL); - - ret = pci_find_slotted_dev(dev_name, &pde, &pdi); - if (ret != 0) { - /* - * It is possible to call this function without - * checking that the device is inserted first. - */ - fprintf(stderr, "%s: no such name: %s\n", __func__, dev_name); - return (0); - } + struct pci_devemu *pde = pdi->pi_d; if (pde->pe_resume == NULL) { /* The pause/resume functionality is optional. */ - fprintf(stderr, "%s: not implemented for: %s\n", - __func__, dev_name); return (0); } @@ -2665,6 +2582,42 @@ pci_emul_dior(struct pci_devinst *pi, int baridx, uint64_t offset, int size) } #ifdef BHYVE_SNAPSHOT +struct pci_devinst * +pci_next(const struct pci_devinst *cursor) +{ + unsigned bus = 0, slot = 0, func = 0; + struct businfo *bi; + struct slotinfo *si; + struct funcinfo *fi; + + bus = cursor ? cursor->pi_bus : 0; + slot = cursor ? cursor->pi_slot : 0; + func = cursor ? (cursor->pi_func + 1) : 0; + + for (; bus < MAXBUSES; bus++) { + if ((bi = pci_businfo[bus]) == NULL) + continue; + + if (slot >= MAXSLOTS) + slot = 0; + + for (; slot < MAXSLOTS; slot++) { + si = &bi->slotinfo[slot]; + if (func >= MAXFUNCS) + func = 0; + for (; func < MAXFUNCS; func++) { + fi = &si->si_funcs[func]; + if (fi->fi_devi == NULL) + continue; + + return (fi->fi_devi); + } + } + } + + return (NULL); +} + static int pci_emul_snapshot(struct vm_snapshot_meta *meta __unused) { diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h index ac30c03d9411..d68920524398 100644 --- a/usr.sbin/bhyve/pci_emul.h +++ b/usr.sbin/bhyve/pci_emul.h @@ -263,9 +263,10 @@ void pci_write_dsdt(void); uint64_t pci_ecfg_base(void); int pci_bus_configured(int bus); #ifdef BHYVE_SNAPSHOT +struct pci_devinst *pci_next(const struct pci_devinst *cursor); int pci_snapshot(struct vm_snapshot_meta *meta); -int pci_pause(const char *dev_name); -int pci_resume(const char *dev_name); +int pci_pause(struct pci_devinst *pdi); +int pci_resume(struct pci_devinst *pdi); #endif static __inline void diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index f7bff85e3361..5569ffcb2e24 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -138,20 +138,6 @@ static sig_t old_winch_handler; _a < _b ? _a : _b; \ }) -static const struct vm_snapshot_dev_info snapshot_devs[] = { - { "atkbdc", atkbdc_snapshot, NULL, NULL }, - { "virtio-net", pci_snapshot, pci_pause, pci_resume }, - { "virtio-blk", pci_snapshot, pci_pause, pci_resume }, - { "virtio-rnd", pci_snapshot, NULL, NULL }, - { "lpc", pci_snapshot, NULL, NULL }, - { "fbuf", pci_snapshot, NULL, NULL }, - { "xhci", pci_snapshot, NULL, NULL }, - { "e1000", pci_snapshot, NULL, NULL }, - { "ahci", pci_snapshot, pci_pause, pci_resume }, - { "ahci-hd", pci_snapshot, pci_pause, pci_resume }, - { "ahci-cd", pci_snapshot, pci_pause, pci_resume }, -}; - static const struct vm_snapshot_kern_info snapshot_kern_structs[] = { { "vhpet", STRUCT_VHPET }, { "vm", STRUCT_VM }, @@ -856,31 +842,29 @@ vm_restore_kern_structs(struct vmctx *ctx, struct restore_state *rstate) } static int -vm_restore_device(struct restore_state *rstate, - const struct vm_snapshot_dev_info *info) +vm_restore_device(struct restore_state *rstate, vm_snapshot_dev_cb func, + const char *name, void *data) { void *dev_ptr; size_t dev_size; int ret; struct vm_snapshot_meta *meta; - dev_ptr = lookup_dev(info->dev_name, JSON_DEV_ARR_KEY, rstate, - &dev_size); + dev_ptr = lookup_dev(name, JSON_DEV_ARR_KEY, rstate, &dev_size); + if (dev_ptr == NULL) { - fprintf(stderr, "Failed to lookup dev: %s\r\n", info->dev_name); - fprintf(stderr, "Continuing the restore/migration process\r\n"); - return (0); + EPRINTLN("Failed to lookup dev: %s", name); + return (EINVAL); } if (dev_size == 0) { - fprintf(stderr, "%s: Device size is 0. " - "Assuming %s is not used\r\n", - __func__, info->dev_name); - return (0); + EPRINTLN("Restore device size is 0: %s", name); + return (EINVAL); } meta = &(struct vm_snapshot_meta) { - .dev_name = info->dev_name, + .dev_name = name, + .dev_data = data, .buffer.buf_start = dev_ptr, .buffer.buf_size = dev_size, @@ -891,11 +875,10 @@ vm_restore_device(struct restore_state *rstate, .op = VM_SNAPSHOT_RESTORE, }; - ret = (*info->snapshot_cb)(meta); + ret = func(meta); if (ret != 0) { - fprintf(stderr, "Failed to restore dev: %s\r\n", - info->dev_name); - return (-1); + EPRINTLN("Failed to restore dev: %s %d", name, ret); + return (ret); } return (0); @@ -904,33 +887,30 @@ vm_restore_device(struct restore_state *rstate, int vm_restore_devices(struct restore_state *rstate) { - size_t i; int ret; + struct pci_devinst *pdi = NULL; - for (i = 0; i < nitems(snapshot_devs); i++) { - ret = vm_restore_device(rstate, &snapshot_devs[i]); - if (ret != 0) + while ((pdi = pci_next(pdi)) != NULL) { + ret = vm_restore_device(rstate, pci_snapshot, pdi->pi_name, pdi); + if (ret) return (ret); } - return 0; + return (vm_restore_device(rstate, atkbdc_snapshot, "atkbdc", NULL)); } int vm_pause_devices(void) { - const struct vm_snapshot_dev_info *info; - size_t i; int ret; + struct pci_devinst *pdi = NULL; - for (i = 0; i < nitems(snapshot_devs); i++) { - info = &snapshot_devs[i]; - if (info->pause_cb == NULL) - continue; - - ret = info->pause_cb(info->dev_name); - if (ret != 0) + while ((pdi = pci_next(pdi)) != NULL) { + ret = pci_pause(pdi); + if (ret) { + EPRINTLN("Cannot pause dev %s: %d", pdi->pi_name, ret); return (ret); + } } return (0); @@ -939,18 +919,15 @@ vm_pause_devices(void) int vm_resume_devices(void) { - const struct vm_snapshot_dev_info *info; - size_t i; int ret; + struct pci_devinst *pdi = NULL; - for (i = 0; i < nitems(snapshot_devs); i++) { - info = &snapshot_devs[i]; - if (info->resume_cb == NULL) - continue; - - ret = info->resume_cb(info->dev_name); - if (ret != 0) + while ((pdi = pci_next(pdi)) != NULL) { + ret = pci_resume(pdi); + if (ret) { + EPRINTLN("Cannot resume '%s': %d", pdi->pi_name, ret); return (ret); + } } return (0); @@ -1089,16 +1066,21 @@ vm_snapshot_dev_write_data(int data_fd, xo_handle_t *xop, const char *array_key, } static int -vm_snapshot_device(const struct vm_snapshot_dev_info *info, - int data_fd, xo_handle_t *xop, - struct vm_snapshot_meta *meta, off_t *offset) +vm_snapshot_device(vm_snapshot_dev_cb func, const char *dev_name, + void *devdata, int data_fd, xo_handle_t *xop, + struct vm_snapshot_meta *meta, off_t *offset) { int ret; - ret = (*info->snapshot_cb)(meta); + memset(meta->buffer.buf_start, 0, meta->buffer.buf_size); + meta->buffer.buf = meta->buffer.buf_start; + meta->buffer.buf_rem = meta->buffer.buf_size; + meta->dev_name = dev_name; + meta->dev_data = devdata; + + ret = func(meta); if (ret != 0) { - fprintf(stderr, "Failed to snapshot %s; ret=%d\r\n", - meta->dev_name, ret); + EPRINTLN("Failed to snapshot %s; ret=%d", dev_name, ret); return (ret); } @@ -1116,8 +1098,9 @@ vm_snapshot_devices(int data_fd, xo_handle_t *xop) int ret; off_t offset; void *buffer; - size_t buf_size, i; + size_t buf_size; struct vm_snapshot_meta *meta; + struct pci_devinst *pdi; buf_size = SNAPSHOT_BUFFER_SIZE; @@ -1143,20 +1126,18 @@ vm_snapshot_devices(int data_fd, xo_handle_t *xop) xo_open_list_h(xop, JSON_DEV_ARR_KEY); - /* Restore other devices that support this feature */ - for (i = 0; i < nitems(snapshot_devs); i++) { - meta->dev_name = snapshot_devs[i].dev_name; - - memset(meta->buffer.buf_start, 0, meta->buffer.buf_size); - meta->buffer.buf = meta->buffer.buf_start; - meta->buffer.buf_rem = meta->buffer.buf_size; - - ret = vm_snapshot_device(&snapshot_devs[i], data_fd, xop, - meta, &offset); + /* Save PCI devices */ + pdi = NULL; + while ((pdi = pci_next(pdi)) != NULL) { + ret = vm_snapshot_device(pci_snapshot, pdi->pi_name, pdi, + data_fd, xop, meta, &offset); if (ret != 0) goto snapshot_err; } + ret = vm_snapshot_device(atkbdc_snapshot, "atkbdc", NULL, + data_fd, xop, meta, &offset); + xo_close_list_h(xop, JSON_DEV_ARR_KEY); snapshot_err: From nobody Mon Jun 19 06:54:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ql0rB3My9z4f4Pd; Mon, 19 Jun 2023 06:54:50 +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 4Ql0rB2pBFz3nCg; Mon, 19 Jun 2023 06:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687157690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E4Z+ksToocsWC5gCUbeEz9w/0VvtEpldgyTsmVv6i0A=; b=kqA6indlLJue7ytU+CZxXe1G5nN1W9Ov0v3bXpsZYLSt7UGdFuHA3wN+yerU1m2e8Wu594 awoFNEvZBES0hpA34ocOH7rXBCPtQn/IAPiag7ne5IH6xQph4JXu/Q/sYn47T/e5Ka6U0n U9FTn6XSs7t7B8pGmt6CG5eAVS++y0Z+z4KVWeuio3YHGIkG7TUd0Nr59plMJNV4E92lUc dIHAmRFsTNZhFIAk2tuq8xkj3AleW3GOBhn9oQzqsAwXK5lL0pvfAaUhRF8V+CnAgOvw7T 6ADX7wfxIRNKHdEoy1+4k9yS+1Zuc5tUmfRDpp2IqnaBB5rXl7dpWx9qMTiZDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687157690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E4Z+ksToocsWC5gCUbeEz9w/0VvtEpldgyTsmVv6i0A=; b=OOND59PQAcunO8k4JY+DXSla805Emn5hfI7mTdF25NPMof6k2yndhkP5pJ5wzqwj7W6XF+ RXa4ojtyHZIBpWXnsqFSyIariHVowJPbrRmwM2pb/6mW5uR9+awqnRYvgvybqD+WRr8jFE boijXAkSBcY42T8TfUfHcyNNak92LkJh7iVVRHhsR6nnk7KhgV/fQiy7FUEsr4el5pAk7k 2KzUlV6OF1AcMv68ih8wlMDNayWo8yHrIdQ8eiOZlh+WcZ/veOSiM0l7Ss2VUGfJ+E4lJ7 9U5smYHYNN30DgiKRBU/i3ePzuoGNrqveiyPo/Nso8KSlW8txJa8hiJZSXtIJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687157690; a=rsa-sha256; cv=none; b=khNMIWtC9CgR5F25PsKTp/q3U1DU2ZQSatBkIWurK94uD+5VeBQFOBcnJoqSnWe7tE+8DI IbiGbKCJSpbjfcXkshcEyehdWaq2rcW64U4X98jlKGC7638MhYxYLu+KQSOdaURnIfB2Mm +Jc0VgQJXSHnNpyhk9hN5bThgf48FmaWSMqNecqeCz4jK/Q7r3D1OcNi5pEvyzUO9wodQJ nIwQ2Q2mjTBYcSX9n39BFPZB7SwxTyWYg1hJOLTxkc6qB/81W0EXuSTfaD9UQ4W6JOczan ZmoSsbmXRehKctpAVhdtc+9FNhyPrzp7S8CDFM5UP4bTttGyNDXg5dCLvcxJZA== 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 4Ql0rB1nX0z16M5; Mon, 19 Jun 2023 06:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J6so4p024721; Mon, 19 Jun 2023 06:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J6soNG024720; Mon, 19 Jun 2023 06:54:50 GMT (envelope-from git) Date: Mon, 19 Jun 2023 06:54:50 GMT Message-Id: <202306190654.35J6soNG024720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: c9fdd4f3cc18 - main - bhyve: add command line parameter and parsing for migration List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9fdd4f3cc18c03683de85318ba8d318f96b58c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=c9fdd4f3cc18c03683de85318ba8d318f96b58c4 commit c9fdd4f3cc18c03683de85318ba8d318f96b58c4 Author: Mihai Burcea AuthorDate: 2023-06-19 06:46:28 +0000 Commit: Corvin Köhne CommitDate: 2023-06-19 06:47:35 +0000 bhyve: add command line parameter and parsing for migration This covers warm and live migration. Reviewed by: corvink MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D34717 --- usr.sbin/bhyve/Makefile | 1 + usr.sbin/bhyve/bhyve.8 | 12 ++++++ usr.sbin/bhyve/bhyverun.c | 66 ++++++++++++++++++++--------- usr.sbin/bhyve/migration.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/migration.h | 27 ++++++++++++ usr.sbin/bhyve/snapshot.c | 35 ++++++++++++++++ usr.sbin/bhyvectl/bhyvectl.8 | 19 +++++++++ usr.sbin/bhyvectl/bhyvectl.c | 57 +++++++++++++++++++++++++- 8 files changed, 294 insertions(+), 21 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 9b8a7274d793..d4909fb87b76 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -88,6 +88,7 @@ SRCS= \ .if ${MK_BHYVE_SNAPSHOT} != "no" SRCS+= snapshot.c +SRCS+= migration.c .endif CFLAGS.kernemu_dev.c+= -I${SRCTOP}/sys/amd64 diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 38891ab33c40..479ab75be60f 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -80,6 +80,11 @@ .Op Fl o Ar var Ns Cm = Ns Ar value .Op Fl p Ar vcpu Ns Cm \&: Ns Ar hostcpu .Op Fl r Ar file +.Oo Fl R +.Sm off +.Ar host Op Cm \&: Ar port +.Sm on +.Oc .Sm off .Oo Fl s\~ .Ar slot Cm \&, Ar emulation Op Cm \&, Ar conf @@ -276,6 +281,13 @@ and .Fl l options. The count of vCPUs and memory configuration are read from the snapshot. +.It Fl R Ar host Ns Op Cm \&: Ns Ar port +Receive migration from a source guest. +Await for a connection from +.Ar host +on the specified +.Ar port +and resume execution. The default migration port is 24983. .It Fl S Wire guest memory. .It Fl s Cm help diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 5ced5df0b4cb..f5365a352d07 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -98,6 +98,9 @@ __FBSDID("$FreeBSD$"); #include "kernemu_dev.h" #include "mem.h" #include "mevent.h" +#ifdef BHYVE_SNAPSHOT +#include "migration.h" +#endif #include "mptbl.h" #include "pci_emul.h" #include "pci_irq.h" @@ -231,6 +234,7 @@ usage(int code) " -p: pin 'vcpu' to 'hostcpu'\n" #ifdef BHYVE_SNAPSHOT " -r: path to checkpoint file\n" + " -R: the source vm host and port for migration\n" #endif " -S: guest memory cannot be swapped\n" " -s: PCI slot config\n" @@ -1082,7 +1086,11 @@ do_open(const char *vmname) exit(4); } } else { +#ifndef BHYVE_SNAPSHOT if (!romboot) { +#else + if (!romboot && !get_config_bool_default("is_migrated", false)) { +#endif /* * If the virtual machine was just created then a * bootrom must be configured to boot it. @@ -1227,9 +1235,11 @@ main(int argc, char *argv[]) const char *optstr, *value, *vmname; #ifdef BHYVE_SNAPSHOT char *restore_file; + char *migration_host; struct restore_state rstate; restore_file = NULL; + migration_host = NULL; #endif init_config(); @@ -1237,7 +1247,7 @@ main(int argc, char *argv[]) progname = basename(argv[0]); #ifdef BHYVE_SNAPSHOT - optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:r:"; + optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:r:R:"; #else optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:"; #endif @@ -1294,6 +1304,10 @@ main(int argc, char *argv[]) case 'r': restore_file = optarg; break; + case 'R': + migration_host = optarg; + set_config_bool("is_migrated", true); + break; #endif case 's': if (strncmp(optarg, "help", strlen(optarg)) == 0) { @@ -1510,38 +1524,51 @@ main(int argc, char *argv[]) spinup_vcpu(&vcpu_info[vcpuid], vcpuid == BSP); #ifdef BHYVE_SNAPSHOT - if (restore_file != NULL) { - fprintf(stdout, "Pausing pci devs...\r\n"); + if (restore_file != NULL || migration_host != NULL) { + fprintf(stdout, "Pausing pci devs...\n"); if (vm_pause_devices() != 0) { fprintf(stderr, "Failed to pause PCI device state.\n"); exit(1); } - fprintf(stdout, "Restoring vm mem...\r\n"); - if (restore_vm_mem(ctx, &rstate) != 0) { - fprintf(stderr, "Failed to restore VM memory.\n"); - exit(1); - } + if (restore_file != NULL) { + fprintf(stdout, "Restoring vm mem...\n"); + if (restore_vm_mem(ctx, &rstate) != 0) { + fprintf(stderr, + "Failed to restore VM memory.\n"); + exit(1); + } - fprintf(stdout, "Restoring pci devs...\r\n"); - if (vm_restore_devices(&rstate) != 0) { - fprintf(stderr, "Failed to restore PCI device state.\n"); - exit(1); + fprintf(stdout, "Restoring pci devs...\n"); + if (vm_restore_devices(&rstate) != 0) { + fprintf(stderr, + "Failed to restore PCI device state.\n"); + exit(1); + } + + fprintf(stdout, "Restoring kernel structs...\n"); + if (vm_restore_kern_structs(ctx, &rstate) != 0) { + fprintf(stderr, + "Failed to restore kernel structs.\n"); + exit(1); + } } - fprintf(stdout, "Restoring kernel structs...\r\n"); - if (vm_restore_kern_structs(ctx, &rstate) != 0) { - fprintf(stderr, "Failed to restore kernel structs.\n"); - exit(1); + if (migration_host != NULL) { + fprintf(stdout, "Starting the migration process...\n"); + if (receive_vm_migration(ctx, migration_host) != 0) { + fprintf(stderr, "Failed to migrate the vm.\n"); + exit(1); + } } - fprintf(stdout, "Resuming pci devs...\r\n"); + fprintf(stdout, "Resuming pci devs...\n"); if (vm_resume_devices() != 0) { fprintf(stderr, "Failed to resume PCI device state.\n"); exit(1); } } -#endif +#endif /* BHYVE_SNAPSHOT */ error = vm_get_register(bsp, VM_REG_GUEST_RIP, &rip); assert(error == 0); @@ -1609,8 +1636,9 @@ main(int argc, char *argv[]) #endif #ifdef BHYVE_SNAPSHOT - if (restore_file != NULL) { + if (restore_file != NULL) destroy_restore_state(&rstate); + if (restore_file != NULL || migration_host != NULL) { if (vm_restore_time(ctx) < 0) err(EX_OSERR, "Unable to restore time"); diff --git a/usr.sbin/bhyve/migration.c b/usr.sbin/bhyve/migration.c new file mode 100644 index 000000000000..daa67b370d47 --- /dev/null +++ b/usr.sbin/bhyve/migration.c @@ -0,0 +1,98 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2017-2020 Elena Mihailescu + * Copyright (c) 2017-2020 Darius Mihai + * Copyright (c) 2017-2020 Mihai Carabas + * + * The migration feature was developed under sponsorships + * from Matthew Grooms. + * + */ + +#include +#include +#include +#include +#include + +#include +#ifndef WITHOUT_CAPSICUM +#include +#include +#include +#include +#endif +#include +#include +#include +#include +#include +#include +#include + +#include "migration.h" +#include "pci_emul.h" +#include "snapshot.h" + + +#ifdef BHYVE_DEBUG +#define DPRINTF(FMT, ...) \ +({ \ + fprintf(stderr, "%s: " FMT "\n", __func__, ##__VA_ARGS__); \ + }) +#else +#define DPRINTF(FMT, ...) +#endif + +#define EPRINTF(FMT, ...) \ +({ \ + fprintf(stderr, "%s: " FMT "\n", __func__, ##__VA_ARGS__); \ + }) + +int +receive_vm_migration(struct vmctx *ctx, char *migration_data) +{ + struct migrate_req req; + size_t len; + char *hostname, *pos; + unsigned int port = DEFAULT_MIGRATION_PORT; + int rc; + + assert(ctx != NULL); + assert(migration_data != NULL); + + memset(req.host, 0, MAXHOSTNAMELEN); + hostname = strdup(migration_data); + + if ((pos = strchr(hostname, ':')) != NULL) { + *pos = '\0'; + pos = pos + 1; + + rc = sscanf(pos, "%u", &port); + + if (rc <= 0) { + EPRINTF("Could not parse the port"); + free(hostname); + return (EINVAL); + } + } + req.port = port; + + len = strlen(hostname); + if (len > MAXHOSTNAMELEN - 1) { + EPRINTF("Hostname length %lu bigger than maximum allowed %d", + len, MAXHOSTNAMELEN - 1); + free(hostname); + return (EINVAL); + } + + strlcpy(req.host, hostname, MAXHOSTNAMELEN); + + // rc = vm_recv_migrate_req(ctx, req); + rc = EOPNOTSUPP; + EPRINTF("Migration not implemented yet"); + + free(hostname); + return (rc); +} diff --git a/usr.sbin/bhyve/migration.h b/usr.sbin/bhyve/migration.h new file mode 100644 index 000000000000..b72a4aa3611f --- /dev/null +++ b/usr.sbin/bhyve/migration.h @@ -0,0 +1,27 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2017-2020 Elena Mihailescu + * Copyright (c) 2017-2020 Darius Mihai + * Copyright (c) 2017-2020 Mihai Carabas + * + * The migration feature was developed under sponsorships + * from Matthew Grooms. + * + */ + +#pragma once + +#include +#include + +#define DEFAULT_MIGRATION_PORT 24983 + +struct vmctx; + +struct migrate_req { + char host[MAXHOSTNAMELEN]; + unsigned int port; +}; + +int receive_vm_migration(struct vmctx *ctx, char *migration_data); diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 5569ffcb2e24..58ae29782b43 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$"); #include "ioapic.h" #include "mem.h" #include "mevent.h" +#include "migration.h" #include "mptbl.h" #include "pci_emul.h" #include "pci_irq.h" @@ -1400,6 +1401,40 @@ vm_do_checkpoint(struct vmctx *ctx, const nvlist_t *nvl) } IPC_COMMAND(ipc_cmd_set, checkpoint, vm_do_checkpoint); +static int +vm_do_migrate(struct vmctx __unused *ctx, const nvlist_t *nvl) +{ + size_t len; + struct migrate_req req; + + if (!nvlist_exists_string(nvl, "hostname") || + !nvlist_exists_number(nvl, "port")) + return (EINVAL); + + memset(&req, 0, sizeof(struct migrate_req)); + req.port = nvlist_get_number(nvl, "port"); + + len = strlen(nvlist_get_string(nvl, "hostname")); + if (len > MAXHOSTNAMELEN - 1) { + EPRINTLN("Hostname length %lu bigger than maximum allowed %d", + len, MAXHOSTNAMELEN - 1); + return (EINVAL); + } + + strlcpy(req.host, nvlist_get_string(nvl, "hostname"), MAXHOSTNAMELEN); + + printf("%s: IP address used for migration: %s;\n" + "Port used for migration: %d\n", + __func__, + req.host, + req.port); + + // return (vm_send_migrate_req(ctx, req, nvlist_get_bool(nvl, "live"))); + EPRINTLN("Migration operation not implemented yet\n"); + return (EOPNOTSUPP); +} +IPC_COMMAND(ipc_cmd_set, migrate, vm_do_migrate); + void init_snapshot(void) { diff --git a/usr.sbin/bhyvectl/bhyvectl.8 b/usr.sbin/bhyvectl/bhyvectl.8 index 636529a7a53b..9b917f14270e 100644 --- a/usr.sbin/bhyvectl/bhyvectl.8 +++ b/usr.sbin/bhyvectl/bhyvectl.8 @@ -41,6 +41,11 @@ .Op Fl -force-poweroff .Op Fl -checkpoint= Ns Ar .Op Fl -suspend= Ns Ar +.Oo +.Fl -migrate= Ns Ar host Ns Op Cm \&: Ns Ar port +| +.Fl -migrate-live= Ns Ar host Ns Op Cm \&: Ns Ar port +.Oc .Sh DESCRIPTION The .Nm @@ -85,6 +90,20 @@ Save a snapshot of a virtual machine similar to .Fl -checkpoint . The virtual machine will terminate after the snapshot has been saved. +.It Fl -migrate= Ns Ar host Ns Op Cm \&: Ns Ar port +Warm migrate the virtual machine to a +.Ar host +on the specified +.Ar port . +The default migration port is 24983. +The virtual machine will be destroyed after the migration finishes. +.It Fl -migrate-live= Ns Ar host Ns Op Cm \&: Ns Ar port +Live migrate the virtual machine to a +.Ar host +on the specified +.Ar port . +The default migration port is 24983. +The virtual machine will be destroyed after the migration finishes. .El .Sh EXIT STATUS .Ex -std diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index f723ff1f2e82..3c41938d0e18 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #ifdef BHYVE_SNAPSHOT #include "snapshot.h" +#include "migration.h" #endif #define MB (1UL << 20) @@ -87,6 +88,7 @@ usage(bool cpu_intel) " [--destroy]\n" #ifdef BHYVE_SNAPSHOT " [--checkpoint= | --suspend=]\n" + " [--migrate=[:] | --migrate-live=[:]]\n" #endif " [--get-all]\n" " [--get-stats]\n" @@ -299,6 +301,7 @@ static int run; static int get_cpu_topology; #ifdef BHYVE_SNAPSHOT static int vm_suspend_opt; +static int vm_migrate_live; #endif /* @@ -589,6 +592,8 @@ enum { #ifdef BHYVE_SNAPSHOT SET_CHECKPOINT_FILE, SET_SUSPEND_FILE, + MIGRATE_VM, + MIGRATE_VM_LIVE, #endif }; @@ -1456,6 +1461,8 @@ setup_options(bool cpu_intel) #ifdef BHYVE_SNAPSHOT { "checkpoint", REQ_ARG, 0, SET_CHECKPOINT_FILE}, { "suspend", REQ_ARG, 0, SET_SUSPEND_FILE}, + { "migrate", REQ_ARG, 0, MIGRATE_VM}, + { "migrate-live", REQ_ARG, 0, MIGRATE_VM_LIVE}, #endif }; @@ -1743,7 +1750,42 @@ snapshot_request(const char *vmname, char *file, bool suspend) return (send_message(vmname, nvl)); } -#endif + +static int +migration_request(const char *vmname, const char *migrate_vm, bool live) +{ + nvlist_t *nvl; + char *hostname, *pos; + int rc; + unsigned int port = DEFAULT_MIGRATION_PORT; + + hostname = strdup(migrate_vm); + + if ((pos = strchr(hostname, ':')) != NULL) { + *pos = '\0'; + pos = pos + 1; + + rc = sscanf(pos, "%u", &port); + + if (rc <= 0) { + fprintf(stderr, "Could not parse the port\n"); + free(hostname); + return (EINVAL); + } + } + + nvl = nvlist_create(0); + nvlist_add_string(nvl, "cmd", "migrate"); + nvlist_add_string(nvl, "hostname", hostname); + nvlist_add_number(nvl, "port", port); + nvlist_add_bool(nvl, "live", live); + + free(hostname); + + return (send_message(vmname, nvl)); +} + +#endif /* BHYVE_SNAPSHOT */ int main(int argc, char *argv[]) @@ -1763,7 +1805,7 @@ main(int argc, char *argv[]) struct tm tm; struct option *opts; #ifdef BHYVE_SNAPSHOT - char *checkpoint_file = NULL; + char *checkpoint_file = NULL, *migrate_host = NULL; #endif cpu_intel = cpu_vendor_intel(); @@ -1932,6 +1974,14 @@ main(int argc, char *argv[]) checkpoint_file = optarg; vm_suspend_opt = (ch == SET_SUSPEND_FILE); break; + case MIGRATE_VM: + case MIGRATE_VM_LIVE: + if (migrate_host != NULL) + usage(cpu_intel); + + migrate_host = optarg; + vm_migrate_live = (ch == MIGRATE_VM_LIVE); + break; #endif default: usage(cpu_intel); @@ -2414,6 +2464,9 @@ main(int argc, char *argv[]) #ifdef BHYVE_SNAPSHOT if (!error && checkpoint_file) error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt); + + if (!error && migrate_host) + error = migration_request(vmname, migrate_host, vm_migrate_live); #endif free (opts); From nobody Mon Jun 19 07:53:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ql27W2HG9z4f0Fp; Mon, 19 Jun 2023 07:53: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 4Ql27W13SNz4HN7; Mon, 19 Jun 2023 07:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687161191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3s2SbmOm8E/ws+tRITDNGs1bzl5bD7RoMhYZueTJaU=; b=cpSi2MqKGMZE0CTgYxQx+jNIG5KRgZjlVOwS2FeGDBoReGouPr+DBffDMfUJcKQkt8ANbF mQ5chuSNjlcoH6zlW07oloS3CshRwgCHthVqMhgcStnTcxwJHPKxISim8zktLIOgG0hL0m xjvLYyhLIvCT8mvNTSb8jhblDPd41yi/5dTFT5HCmkR5oTGQ8P7C26O9d3w+yPZ3Xrk5X6 o79TgvcADQW/OT43hHn37OaAtnu0ND/aBSFQK1GDTbBE/Wk9Iqt+I7o2S5xtsZQExyNOpO C4MrGHnPRRcyJNyWRcGN9Xtc8SeQnFqcENQyMwZbboKdz35sLitg/57xHtDtbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687161191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3s2SbmOm8E/ws+tRITDNGs1bzl5bD7RoMhYZueTJaU=; b=DEJaMiLytlKYHDUghqCIcr3x9MjKK3Z0GlxibiJrXc584kvHAzXfnNI5BTRHRypSizm3a8 GTHZnLKMRKV5oHWMz0BtvEl5EeJWXz3ibDm8bz8Bkcpzwed5oG1tm/U3JnZO2KpZODlvr0 D0nzOzHF57IygWleN8QarQ1JE5CiyiyRwkaXmfNKBi9nnkXYlNUEihptuD/92sbVQGPuKZ 4HhHSPWTJA4w7oe1irzbOI6ckP3pwMExoZJ280EEb8fZJYiN5sW4fCUpyp14CFRpFNM47e u6NKtKfyI0Nj6iWmadTfbhomTt4Dxxh5TWZV8V8QAQYmxm+66spcprHGCzZdrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687161191; a=rsa-sha256; cv=none; b=Rig0o4EQ73RFBg4HFQWlXBLkzazUjqewbuUMNvjzdugeumo0xx3A2kWUgKzcsQFRfUoahn WzMZtCJOo/t0bc6vloZwYVLTBv7zprZzhC4tzUrB8sh6cVNma74nRKzG3w16/5VvelZsrD Sn8BGsym3wXqHvwW6dF/hZigOde1Ubb3nHD80pYaewVNoeAIIixVHr1wNhUHjDlQNhfQRx 3u88YMHex3JJoC6tYIHpSf013tPH8AKPUunaMVLW6y0VgkbIyUYvjBiaEkoicyo4YV+wWo 0Pn+IvIrHkPs3QCVySO1UO5hFj34z28Sde+Aow1DkFRRICvg0U1jdDKFo0GUcA== 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 4Ql27W08Cbz18Q0; Mon, 19 Jun 2023 07:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J7rAR4022700; Mon, 19 Jun 2023 07:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J7rAZn022699; Mon, 19 Jun 2023 07:53:10 GMT (envelope-from git) Date: Mon, 19 Jun 2023 07:53:10 GMT Message-Id: <202306190753.35J7rAZn022699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 79a96e294c1a - main - motd: unbreak for source upgrade List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79a96e294c1acb4a2d17447a35f08647a6d09978 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=79a96e294c1acb4a2d17447a35f08647a6d09978 commit 79a96e294c1acb4a2d17447a35f08647a6d09978 Author: Eugene Grosbein AuthorDate: 2023-06-19 07:49:35 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-19 07:49:35 +0000 motd: unbreak for source upgrade In case of source upgrade path from 12.x proper merge of new /etc installs /etc/motd.template. Becase of that, the system in left without symlink /etc/motd -> /var/run/motd but with stale /etc/motd contents. Fix it creating symlink despite of presence of /etc/motd.template. MFC after: 1 week --- libexec/rc/rc.d/motd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/rc/rc.d/motd b/libexec/rc/rc.d/motd index e27cf273741d..da050882c367 100755 --- a/libexec/rc/rc.d/motd +++ b/libexec/rc/rc.d/motd @@ -38,10 +38,10 @@ motd_start() # Otherwise, create an empty template file. install -c -o root -g wheel -m ${PERMS} /dev/null "${TEMPLATE}" fi - # Provide compatibility symlink: - if [ ! -h "${COMPAT_MOTD}" ]; then - ln -sF "${TARGET}" "${COMPAT_MOTD}" - fi + fi + # Provide compatibility symlink: + if [ ! -h "${COMPAT_MOTD}" ]; then + ln -sF "${TARGET}" "${COMPAT_MOTD}" fi T=`mktemp -t motd` From nobody Mon Jun 19 10:04:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ql53T1n2sz4fH2k; Mon, 19 Jun 2023 10:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ql53S5pQkz4MYR; Mon, 19 Jun 2023 10:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687169092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HX5YLngNPdOilqscUKXm8bJXgcV4CjYe+pdhndqVZ1Y=; b=lT7yKTXmNPFF9y3M4IwVqSPbFGVFF2Ln74X3tl+4tMteBpd7UBIycyunCFvwzWw7LcCEgQ lVgLGNdPRx6B/NZbRjrXhPeY9FlTqWEawgKmlXrLweTilc16SKb6wIdBYDGW0Ur7kYhE/N PG/9Wqn3CwaAW9U57zHJ3xJL8eicxZGx4tYJ3pToJ31Df0NuMCx92ljaHD1FsIdTnxSb8h pR45KvkH97eA5NXVtOpfHVJ9PfiTALPOtBZrmx14FPiNmfLNLDdOy1MxWHi0Rd9OHqvGVH bEJXfPCIPbjZKsvKTzx0IYuhARMzwYc8UUkScRbw4k3M8IFKA84w7HD8AvxCUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687169092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HX5YLngNPdOilqscUKXm8bJXgcV4CjYe+pdhndqVZ1Y=; b=CfAA6G6ldJlPmNnocwJuBIm+yVLzAJQc2xF94Z/7y/CBBRJ4siqOSzlPpmsCulQsNBM73/ 2dJ9abZyUPYZYp1oyXM8XRkojhmfDKFWWU2OMO283mLPbqVp8pN/F9P+j8lTEbpr4bW8QU 4SFw+RngSWYirCflMAbVpWFr3/GV7VRVd1wUVUqbAHj+tZK0txip0Uv4XjL1adGV5MkQMN IC/kpwWJVuOVwzJWn4cayHGoi5BzTtVhXHuxFgMYDFVw2u27FNvwyokUwwJMlz+HvcyzD9 QR2TNk2rYv5Fy+vbgQm4VwW08fNsTcsQx1QamrkLDBMLJHmr+OmfjmeXxnvn3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687169092; a=rsa-sha256; cv=none; b=SP+Ef+SvP/FSOl8EmirvVcRSuGlBM8tCZoJkEPwBswWpu5ARRQ9hkoMmXx38MQluv98ekj sh2MLONNDhn2EREBhylH37yICmc45znR44sd7DFlX2mvOPAffXaw5FkE58MQWK2VE+42FP bZxntyYXF6viuiTN6uQE7L5U56JNU9LMkf51n4d96O4Z2tS60hvrUDI7M8GUSZ/JJFOZPw hahixYfn5feFAkhBpUH2Z3k6z7WXM04tUQN0io8iAg7NoeSrhOazmhKMrliPMW85y9qF8O ihZgAgiuIXikqjtyflL5dxS8+1FHzseO1/VKXeTPlUEN3O9D5YOHsxwJcA8Z4Q== 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 4Ql53S4RPKz1CjZ; Mon, 19 Jun 2023 10:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JA4qrx038412; Mon, 19 Jun 2023 10:04:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JA4qie038411; Mon, 19 Jun 2023 10:04:52 GMT (envelope-from git) Date: Mon, 19 Jun 2023 10:04:52 GMT Message-Id: <202306191004.35JA4qie038411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ba94bf2880b8 - main - pf: extend use of skip steps for Ethernet rules List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba94bf2880b8f33593323db50ced99c8daf8bd05 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ba94bf2880b8f33593323db50ced99c8daf8bd05 commit ba94bf2880b8f33593323db50ced99c8daf8bd05 Author: Kristof Provost AuthorDate: 2023-06-15 15:12:11 +0000 Commit: Kristof Provost CommitDate: 2023-06-19 08:18:30 +0000 pf: extend use of skip steps for Ethernet rules Use the already populated PFE_SKIP_DST_ADDR and extend the skip infrastructure to also skip on IP source/destination addresses. This should make evaluating the rules slightly faster. Reported by: R. Christian McDonald Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D40567 --- sys/net/pfvar.h | 6 +++++- sys/netpfil/pf/pf.c | 10 ++++------ sys/netpfil/pf/pf_ioctl.c | 6 ++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index a658573cf6f1..4176dbd3e37d 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -697,7 +697,9 @@ struct pf_keth_rule { #define PFE_SKIP_PROTO 2 #define PFE_SKIP_SRC_ADDR 3 #define PFE_SKIP_DST_ADDR 4 -#define PFE_SKIP_COUNT 5 +#define PFE_SKIP_SRC_IP_ADDR 5 +#define PFE_SKIP_DST_IP_ADDR 6 +#define PFE_SKIP_COUNT 7 union pf_keth_rule_ptr skip[PFE_SKIP_COUNT]; TAILQ_ENTRY(pf_keth_rule) entries; @@ -2215,6 +2217,8 @@ extern void pf_unlink_src_node(struct pf_ksrc_node *); extern u_int pf_free_src_nodes(struct pf_ksrc_node_list *); extern void pf_print_state(struct pf_kstate *); extern void pf_print_flags(u_int8_t); +extern int pf_addr_wrap_neq(struct pf_addr_wrap *, + struct pf_addr_wrap *); extern u_int16_t pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t, u_int8_t); extern u_int16_t pf_proto_cksum_fixup(struct mbuf *, u_int16_t, diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ebc201e4f5b4..7b52f6f0d2aa 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -321,8 +321,6 @@ static int pf_check_proto_cksum(struct mbuf *, int, int, u_int8_t, sa_family_t); static void pf_print_state_parts(struct pf_kstate *, struct pf_state_key *, struct pf_state_key *); -static int pf_addr_wrap_neq(struct pf_addr_wrap *, - struct pf_addr_wrap *); static void pf_patch_8(struct mbuf *, u_int16_t *, u_int8_t *, u_int8_t, bool, u_int8_t); static struct pf_kstate *pf_find_state(struct pfi_kkif *, @@ -2429,7 +2427,7 @@ pf_calc_skip_steps(struct pf_krulequeue *rules) PF_SET_SKIP_STEPS(i); } -static int +int pf_addr_wrap_neq(struct pf_addr_wrap *aw1, struct pf_addr_wrap *aw2) { if (aw1->type != aw2->type) @@ -4014,19 +4012,19 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) else if (! pf_match_eth_addr(e->ether_dhost, &r->dst)) { SDT_PROBE3(pf, eth, test_rule, mismatch, r->nr, r, "dst"); - r = TAILQ_NEXT(r, entries); + r = r->skip[PFE_SKIP_DST_ADDR].ptr; } else if (src != NULL && PF_MISMATCHAW(&r->ipsrc.addr, src, af, r->ipsrc.neg, kif, M_GETFIB(m))) { SDT_PROBE3(pf, eth, test_rule, mismatch, r->nr, r, "ip_src"); - r = TAILQ_NEXT(r, entries); + r = r->skip[PFE_SKIP_SRC_IP_ADDR].ptr; } else if (dst != NULL && PF_MISMATCHAW(&r->ipdst.addr, dst, af, r->ipdst.neg, kif, M_GETFIB(m))) { SDT_PROBE3(pf, eth, test_rule, mismatch, r->nr, r, "ip_dst"); - r = TAILQ_NEXT(r, entries); + r = r->skip[PFE_SKIP_DST_IP_ADDR].ptr; } else if (r->match_tag && !pf_match_eth_tag(m, r, &tag, mtag ? mtag->tag : 0)) { diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index cb6d22885ef4..e76a92fb7e7f 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -843,6 +843,12 @@ pf_eth_calc_skip_steps(struct pf_keth_ruleq *rules) PF_SET_SKIP_STEPS(PFE_SKIP_SRC_ADDR); if (memcmp(&cur->dst, &prev->dst, sizeof(cur->dst)) != 0) PF_SET_SKIP_STEPS(PFE_SKIP_DST_ADDR); + if (cur->ipsrc.neg != prev->ipsrc.neg || + pf_addr_wrap_neq(&cur->ipsrc.addr, &prev->ipsrc.addr)) + PF_SET_SKIP_STEPS(PFE_SKIP_SRC_IP_ADDR); + if (cur->ipdst.neg != prev->ipdst.neg || + pf_addr_wrap_neq(&cur->ipdst.addr, &prev->ipdst.addr)) + PF_SET_SKIP_STEPS(PFE_SKIP_DST_IP_ADDR); prev = cur; cur = TAILQ_NEXT(cur, entries); From nobody Mon Jun 19 10:04:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ql53V2wKkz4fHWQ; Mon, 19 Jun 2023 10:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ql53T664Jz4MRs; Mon, 19 Jun 2023 10:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687169093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fUkYrOi/9SAbMM9i5ZPIhLZrwZ4NuTkcG1FOIu8fU0=; b=wV3bmn3esbFHMFJVsv1qTFqE9AnNsD7Rt9efdt1Vvh52fAYxNgVts8Dqlt++j0QKcwly0j 0OLbNP3cwGwLpn24vlkUBVbh8Yx1LCndai5lHcH+ZDWUoIEMmiR5686dMnGwRlQW2aQ8tR +cScqCQBLSBcV4R1Phi8M5eAslP66qNVKmLixHSh/2mlvQ6fXha9VYXaHjiabEeEJfVt71 mgbojbIviOz8tYhQELKXQYUSZVcEmyxYMNLDucX5Yl3s2Lp9wzOz23cxdIXfcHb4kRxSJC NgHaxaIm622NI2PwXDyjrmLsNRAwFAYmMh3KcvtjhhPopP0G4MGN777J+cMKJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687169093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fUkYrOi/9SAbMM9i5ZPIhLZrwZ4NuTkcG1FOIu8fU0=; b=YQ56V2CRoECOAlNAwl5G8A1dCDz9D9/5q7oVcjKBaMocQULwX6RWfs8uR91fPC4zm29mN8 hy6ej47OPP8xy9F/Al8pQ3v31qUrpFMoOMQn+F2OUICmVM7psZe+t3zKDlrDlCdx3jqo3H U/4vneMz3ivTHgGMc+uq7SWYWz3dzEPOwd030CPy4cl0tDmVEqa6YNTUkBMJdlObvdRb1t KsAVYvB2cP5YpNJHZNd5VQem9BovvFe5mwffKsv7UiJvwMf8V2+fdcuzqh0eCWcVVJv4si TLpCQLIp3JmlbBNYqB6VUHjDIcJKeHcrbLpspuBEcG2QftYqltKaSuTxmr4aqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687169093; a=rsa-sha256; cv=none; b=Ej5Jfr9sW3izjxRWtPCYXREECXGNzO8C6NSccJ80CeNT7Wp8NaHw6UTpMZ1MHSJ2Oxvexa 0WHLPRKuLGwoXVY9sRrtyWCAD2lFFsZlJWhRPK+612Cx6Mx86VRtWV8vKSFOSGqn5pvpHQ LEo4WAq/4mNnkia0TV+bbRj7MmxUCXg/SwA9ajwTbTFAKJNlGIt6KuMm5G0QetQQpg3hss Z/r9HJDoaQ567H+4M9CSckOWloLCeskCGVndBmqczcbNhPJ8HrmPwQeKNc14Nz/Te80tlG 8osUBUGC+riarBwL3EjEpss7aQoRIsRnISu2bbqyEC1Vr901UQqfnxirYgMsQg== 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 4Ql53T594Rz1Cjb; Mon, 19 Jun 2023 10:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JA4rUi038431; Mon, 19 Jun 2023 10:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JA4rd1038430; Mon, 19 Jun 2023 10:04:53 GMT (envelope-from git) Date: Mon, 19 Jun 2023 10:04:53 GMT Message-Id: <202306191004.35JA4rd1038430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7dc3be36b282 - main - pf: Fix usage of pf tags with syncookies List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dc3be36b2824372b0771117e169386028042b18 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7dc3be36b2824372b0771117e169386028042b18 commit 7dc3be36b2824372b0771117e169386028042b18 Author: Kajetan Staszkiewicz AuthorDate: 2023-06-19 08:21:29 +0000 Commit: Kristof Provost CommitDate: 2023-06-19 10:03:55 +0000 pf: Fix usage of pf tags with syncookies The value stored in pf_mtag->tag comes from "tag" and "match tag" keywords in pf.conf and must not be abused for storing other information. A ruleset with enough tags could set or remove the bits responsible for PF_TAG_SYNCOOKIE_RECREATED. Move this syncookie status to pf_mtag->flags. Rename this and other related constants in a way that will prevent such mistakes in the future. Move PF_REASSEMBLED constant to mbuf.h and rename accordingly because it's not a flag stored in pf_mtag, but an identifier of a different m_tag. Change the value of the constant to avoid conflicts with other m_tags using MTAG_ABI_COMPAT. Rename the variables in pf_build_tcp() and pf_send_tcp() in to reduce confusion. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D40587 --- sys/net/pfvar.h | 8 ++-- sys/netpfil/pf/pf.c | 90 +++++++++++++++++++++--------------------- sys/netpfil/pf/pf_mtag.h | 17 ++++---- sys/netpfil/pf/pf_norm.c | 4 +- sys/netpfil/pf/pf_syncookies.c | 8 ++-- sys/sys/mbuf.h | 1 + 6 files changed, 66 insertions(+), 62 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 4176dbd3e37d..57b2383b1549 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2361,13 +2361,13 @@ u_int8_t pf_get_wscale(struct mbuf *, int, u_int16_t, sa_family_t); struct mbuf *pf_build_tcp(const struct pf_krule *, sa_family_t, const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, - u_int8_t, u_int16_t, u_int16_t, u_int8_t, int, - u_int16_t, int); + u_int8_t, u_int16_t, u_int16_t, u_int8_t, bool, + u_int16_t, u_int16_t, int); void pf_send_tcp(const struct pf_krule *, sa_family_t, const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, - u_int8_t, u_int16_t, u_int16_t, u_int8_t, int, - u_int16_t, int); + u_int8_t, u_int16_t, u_int16_t, u_int8_t, bool, + u_int16_t, u_int16_t, int); void pf_syncookies_init(void); void pf_syncookies_cleanup(void); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 7b52f6f0d2aa..df015fd3347b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -367,7 +367,7 @@ VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]); } while (0) #define PACKET_LOOPED(pd) ((pd)->pf_mtag && \ - (pd)->pf_mtag->flags & PF_PACKET_LOOPED) + (pd)->pf_mtag->flags & PF_MTAG_FLAG_PACKET_LOOPED) #define STATE_LOOKUP(i, k, d, s, pd) \ do { \ @@ -2049,7 +2049,7 @@ pf_unlink_state(struct pf_kstate *s) s->key[PF_SK_WIRE]->port[1], s->key[PF_SK_WIRE]->port[0], s->src.seqhi, s->src.seqlo + 1, - TH_RST|TH_ACK, 0, 0, 0, 1, s->tag, s->rtableid); + TH_RST|TH_ACK, 0, 0, 0, true, s->tag, 0, s->rtableid); } LIST_REMOVE(s, entry); @@ -2798,8 +2798,8 @@ struct mbuf * pf_build_tcp(const struct pf_krule *r, sa_family_t af, const struct pf_addr *saddr, const struct pf_addr *daddr, u_int16_t sport, u_int16_t dport, u_int32_t seq, u_int32_t ack, - u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, - u_int16_t rtag, int rtableid) + u_int8_t tcp_flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, + bool skip_firewall, u_int16_t mtag_tag, u_int16_t mtag_flags, int rtableid) { struct mbuf *m; int len, tlen; @@ -2847,9 +2847,10 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, m_freem(m); return (NULL); } - if (tag) + if (skip_firewall) m->m_flags |= M_SKIP_FIREWALL; - pf_mtag->tag = rtag; + pf_mtag->tag = mtag_tag; + pf_mtag->flags = mtag_flags; if (rtableid >= 0) M_SETFIB(m, rtableid); @@ -2903,7 +2904,7 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, th->th_seq = htonl(seq); th->th_ack = htonl(ack); th->th_off = tlen >> 2; - th->th_flags = flags; + th->th_flags = tcp_flags; th->th_win = htons(win); if (mss) { @@ -2949,14 +2950,14 @@ void pf_send_tcp(const struct pf_krule *r, sa_family_t af, const struct pf_addr *saddr, const struct pf_addr *daddr, u_int16_t sport, u_int16_t dport, u_int32_t seq, u_int32_t ack, - u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, - u_int16_t rtag, int rtableid) + u_int8_t tcp_flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, + bool skip_firewall, u_int16_t mtag_tag, u_int16_t mtag_flags, int rtableid) { struct pf_send_entry *pfse; struct mbuf *m; - m = pf_build_tcp(r, af, saddr, daddr, sport, dport, seq, ack, flags, - win, mss, ttl, tag, rtag, rtableid); + m = pf_build_tcp(r, af, saddr, daddr, sport, dport, seq, ack, tcp_flags, + win, mss, ttl, skip_firewall, mtag_tag, mtag_flags, rtableid); if (m == NULL) return; @@ -3046,7 +3047,7 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, pf_send_tcp(r, af, pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ack, TH_RST|TH_ACK, 0, 0, - r->return_ttl, 1, 0, rtableid); + r->return_ttl, true, 0, 0, rtableid); } } else if (pd->proto != IPPROTO_ICMP && af == AF_INET && r->return_icmp) @@ -3932,14 +3933,14 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) SDT_PROBE3(pf, eth, test_rule, entry, dir, kif->pfik_ifp, m); mtag = pf_find_mtag(m); - if (mtag != NULL && mtag->flags & PF_TAG_DUMMYNET) { + if (mtag != NULL && mtag->flags & PF_MTAG_FLAG_DUMMYNET) { /* Dummynet re-injects packets after they've * completed their delay. We've already * processed them, so pass unconditionally. */ /* But only once. We may see the packet multiple times (e.g. * PFIL_IN/PFIL_OUT). */ - mtag->flags &= ~PF_TAG_DUMMYNET; + mtag->flags &= ~PF_MTAG_FLAG_DUMMYNET; return (PF_PASS); } @@ -4157,10 +4158,10 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) PF_RULES_RUNLOCK(); - mtag->flags |= PF_TAG_DUMMYNET; + mtag->flags |= PF_MTAG_FLAG_DUMMYNET; ip_dn_io_ptr(m0, &dnflow); if (*m0 != NULL) - mtag->flags &= ~PF_TAG_DUMMYNET; + mtag->flags &= ~PF_MTAG_FLAG_DUMMYNET; } else { PF_RULES_RUNLOCK(); } @@ -4807,7 +4808,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, s->src.mss = mss; pf_send_tcp(r, pd->af, pd->dst, pd->src, th->th_dport, th->th_sport, s->src.seqhi, ntohl(th->th_seq) + 1, - TH_SYN|TH_ACK, 0, s->src.mss, 0, 1, 0, pd->act.rtableid); + TH_SYN|TH_ACK, 0, s->src.mss, 0, true, 0, 0, + pd->act.rtableid); REASON_SET(&reason, PFRES_SYNPROXY); return (PF_SYNPROXY_DROP); } @@ -5280,7 +5282,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), 0, TH_RST, 0, 0, - (*state)->rule.ptr->return_ttl, 1, 0, + (*state)->rule.ptr->return_ttl, true, 0, 0, (*state)->rtableid); src->seqlo = 0; src->seqhi = 1; @@ -5417,7 +5419,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, pd->src, th->th_dport, th->th_sport, (*state)->src.seqhi, ntohl(th->th_seq) + 1, - TH_SYN|TH_ACK, 0, (*state)->src.mss, 0, 1, 0, + TH_SYN|TH_ACK, 0, (*state)->src.mss, 0, true, 0, 0, (*state)->rtableid); REASON_SET(reason, PFRES_SYNPROXY); return (PF_SYNPROXY_DROP); @@ -5449,7 +5451,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) &sk->addr[pd->sidx], &sk->addr[pd->didx], sk->port[pd->sidx], sk->port[pd->didx], (*state)->dst.seqhi, 0, TH_SYN, 0, - (*state)->src.mss, 0, 0, (*state)->tag, + (*state)->src.mss, 0, false, (*state)->tag, 0, (*state)->rtableid); REASON_SET(reason, PFRES_SYNPROXY); return (PF_SYNPROXY_DROP); @@ -5464,13 +5466,13 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ntohl(th->th_seq) + 1, - TH_ACK, (*state)->src.max_win, 0, 0, 0, - (*state)->tag, (*state)->rtableid); + TH_ACK, (*state)->src.max_win, 0, 0, false, + (*state)->tag, 0, (*state)->rtableid); pf_send_tcp((*state)->rule.ptr, pd->af, &sk->addr[pd->sidx], &sk->addr[pd->didx], sk->port[pd->sidx], sk->port[pd->didx], (*state)->src.seqhi + 1, (*state)->src.seqlo + 1, - TH_ACK, (*state)->dst.max_win, 0, 0, 1, 0, + TH_ACK, (*state)->dst.max_win, 0, 0, true, 0, 0, (*state)->rtableid); (*state)->src.seqdiff = (*state)->dst.seqhi - (*state)->src.seqlo; @@ -6471,7 +6473,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, } if (r_rt == PF_DUPTO) { - if ((pd->pf_mtag->flags & PF_DUPLICATED)) { + if ((pd->pf_mtag->flags & PF_MTAG_FLAG_DUPLICATED)) { if (s == NULL) { ifp = r->rpool.cur->kif ? r->rpool.cur->kif->pfik_ifp : NULL; @@ -6492,7 +6494,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, goto bad; } } else { - pd->pf_mtag->flags |= PF_DUPLICATED; + pd->pf_mtag->flags |= PF_MTAG_FLAG_DUPLICATED; if (((m0 = m_dup(*m, M_NOWAIT)) == NULL)) { if (s) PF_STATE_UNLOCK(s); @@ -6684,7 +6686,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, } if (r_rt == PF_DUPTO) { - if ((pd->pf_mtag->flags & PF_DUPLICATED)) { + if ((pd->pf_mtag->flags & PF_MTAG_FLAG_DUPLICATED)) { if (s == NULL) { ifp = r->rpool.cur->kif ? r->rpool.cur->kif->pfik_ifp : NULL; @@ -6705,7 +6707,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, goto bad; } } else { - pd->pf_mtag->flags |= PF_DUPLICATED; + pd->pf_mtag->flags |= PF_MTAG_FLAG_DUPLICATED; if (((m0 = m_dup(*m, M_NOWAIT)) == NULL)) { if (s) PF_STATE_UNLOCK(s); @@ -7088,7 +7090,7 @@ pf_dummynet_route(struct pf_pdesc *pd, int dir, struct pf_kstate *s, } if (ifp != NULL) { - pd->pf_mtag->flags |= PF_TAG_ROUTE_TO; + pd->pf_mtag->flags |= PF_MTAG_FLAG_ROUTE_TO; pd->pf_mtag->if_index = ifp->if_index; pd->pf_mtag->if_idxgen = ifp->if_idxgen; @@ -7104,11 +7106,11 @@ pf_dummynet_route(struct pf_pdesc *pd, int dir, struct pf_kstate *s, } if (pf_pdesc_to_dnflow(dir, pd, r, s, &dnflow)) { - pd->pf_mtag->flags |= PF_TAG_DUMMYNET; + pd->pf_mtag->flags |= PF_MTAG_FLAG_DUMMYNET; ip_dn_io_ptr(m0, &dnflow); if (*m0 != NULL) { - pd->pf_mtag->flags &= ~PF_TAG_ROUTE_TO; - pd->pf_mtag->flags &= ~PF_TAG_DUMMYNET; + pd->pf_mtag->flags &= ~PF_MTAG_FLAG_ROUTE_TO; + pd->pf_mtag->flags &= ~PF_MTAG_FLAG_DUMMYNET; } } } @@ -7175,8 +7177,8 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, memcpy(&pd.act, default_actions, sizeof(pd.act)); pd.pf_mtag = pf_find_mtag(m); - if (pd.pf_mtag != NULL && (pd.pf_mtag->flags & PF_TAG_ROUTE_TO)) { - pd.pf_mtag->flags &= ~PF_TAG_ROUTE_TO; + if (pd.pf_mtag != NULL && (pd.pf_mtag->flags & PF_MTAG_FLAG_ROUTE_TO)) { + pd.pf_mtag->flags &= ~PF_MTAG_FLAG_ROUTE_TO; ifp = ifnet_byindexgen(pd.pf_mtag->if_index, pd.pf_mtag->if_idxgen); @@ -7198,14 +7200,14 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, } if (ip_dn_io_ptr != NULL && pd.pf_mtag != NULL && - pd.pf_mtag->flags & PF_TAG_DUMMYNET) { + pd.pf_mtag->flags & PF_MTAG_FLAG_DUMMYNET) { /* Dummynet re-injects packets after they've * completed their delay. We've already * processed them, so pass unconditionally. */ /* But only once. We may see the packet multiple times (e.g. * PFIL_IN/PFIL_OUT). */ - pd.pf_mtag->flags &= ~PF_TAG_DUMMYNET; + pd.pf_mtag->flags &= ~PF_MTAG_FLAG_DUMMYNET; PF_RULES_RUNLOCK(); return (PF_PASS); @@ -7220,12 +7222,12 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, action = PF_DROP; goto done; } - pd.pf_mtag->flags |= PF_PACKET_LOOPED; + pd.pf_mtag->flags |= PF_MTAG_FLAG_PACKET_LOOPED; m_tag_delete(m, ipfwtag); } - if (pd.pf_mtag && pd.pf_mtag->flags & PF_FASTFWD_OURS_PRESENT) { + if (pd.pf_mtag && pd.pf_mtag->flags & PF_MTAG_FLAG_FASTFWD_OURS_PRESENT) { m->m_flags |= M_FASTFWD_OURS; - pd.pf_mtag->flags &= ~PF_FASTFWD_OURS_PRESENT; + pd.pf_mtag->flags &= ~PF_MTAG_FLAG_FASTFWD_OURS_PRESENT; } } else if (pf_normalize_ip(m0, dir, kif, &reason, &pd) != PF_PASS) { /* We do IP header normalization and packet reassembly here */ @@ -7543,7 +7545,7 @@ done: ("pf: failed to allocate tag\n")); } else { pd.pf_mtag->flags |= - PF_FASTFWD_OURS_PRESENT; + PF_MTAG_FLAG_FASTFWD_OURS_PRESENT; m->m_flags &= ~M_FASTFWD_OURS; } } @@ -7739,8 +7741,8 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb memcpy(&pd.act, default_actions, sizeof(pd.act)); pd.pf_mtag = pf_find_mtag(m); - if (pd.pf_mtag != NULL && (pd.pf_mtag->flags & PF_TAG_ROUTE_TO)) { - pd.pf_mtag->flags &= ~PF_TAG_ROUTE_TO; + if (pd.pf_mtag != NULL && (pd.pf_mtag->flags & PF_MTAG_FLAG_ROUTE_TO)) { + pd.pf_mtag->flags &= ~PF_MTAG_FLAG_ROUTE_TO; ifp = ifnet_byindexgen(pd.pf_mtag->if_index, pd.pf_mtag->if_idxgen); @@ -7763,8 +7765,8 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb } if (ip_dn_io_ptr != NULL && pd.pf_mtag != NULL && - pd.pf_mtag->flags & PF_TAG_DUMMYNET) { - pd.pf_mtag->flags &= ~PF_TAG_DUMMYNET; + pd.pf_mtag->flags & PF_MTAG_FLAG_DUMMYNET) { + pd.pf_mtag->flags &= ~PF_MTAG_FLAG_DUMMYNET; /* Dummynet re-injects packets after they've * completed their delay. We've already * processed them, so pass unconditionally. */ @@ -8187,7 +8189,7 @@ done: /* If reassembled packet passed, create new fragments. */ if (action == PF_PASS && *m0 && dir == PF_OUT && - (mtag = m_tag_find(m, PF_REASSEMBLED, NULL)) != NULL) + (mtag = m_tag_find(m, PACKET_TAG_PF_REASSEMBLED, NULL)) != NULL) action = pf_refragment6(ifp, m0, mtag, pflags & PFIL_FWD); SDT_PROBE4(pf, ip, test6, done, action, reason, r, s); diff --git a/sys/netpfil/pf/pf_mtag.h b/sys/netpfil/pf/pf_mtag.h index b3e671c68649..0bf72ccc01ee 100644 --- a/sys/netpfil/pf/pf_mtag.h +++ b/sys/netpfil/pf/pf_mtag.h @@ -36,14 +36,15 @@ #ifdef _KERNEL -#define PF_TAG_ROUTE_TO 0x01 -#define PF_TAG_DUMMYNET 0x02 -#define PF_TAG_TRANSLATE_LOCALHOST 0x04 -#define PF_PACKET_LOOPED 0x08 -#define PF_FASTFWD_OURS_PRESENT 0x10 -#define PF_REASSEMBLED 0x20 -#define PF_DUPLICATED 0x40 -#define PF_TAG_SYNCOOKIE_RECREATED 0x80 +/* pf_mtag -> flags */ +#define PF_MTAG_FLAG_ROUTE_TO 0x01 +#define PF_MTAG_FLAG_DUMMYNET 0x02 +#define PF_MTAG_FLAG_TRANSLATE_LOCALHOST 0x04 +#define PF_MTAG_FLAG_PACKET_LOOPED 0x08 +#define PF_MTAG_FLAG_FASTFWD_OURS_PRESENT 0x10 +/* 0x20 unused */ +#define PF_MTAG_FLAG_DUPLICATED 0x40 +#define PF_MTAG_FLAG_SYNCOOKIE_RECREATED 0x80 struct pf_mtag { void *hdr; /* saved hdr pos in mbuf, for ECN */ diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index a902937c1253..0c7989dd7169 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -898,8 +898,8 @@ pf_reassemble6(struct mbuf **m0, struct ip6_hdr *ip6, struct ip6_frag *fraghdr, m->m_pkthdr.len = plen; } - if ((mtag = m_tag_get(PF_REASSEMBLED, sizeof(struct pf_fragment_tag), - M_NOWAIT)) == NULL) + if ((mtag = m_tag_get(PACKET_TAG_PF_REASSEMBLED, + sizeof(struct pf_fragment_tag), M_NOWAIT)) == NULL) goto fail; ftag = (struct pf_fragment_tag *)(mtag + 1); ftag->ft_hdrlen = hdrlen; diff --git a/sys/netpfil/pf/pf_syncookies.c b/sys/netpfil/pf/pf_syncookies.c index d2cc47751f76..b5e59178e7e8 100644 --- a/sys/netpfil/pf/pf_syncookies.c +++ b/sys/netpfil/pf/pf_syncookies.c @@ -267,7 +267,7 @@ pf_synflood_check(struct pf_pdesc *pd) MPASS(pd->proto == IPPROTO_TCP); PF_RULES_RASSERT(); - if (pd->pf_mtag && (pd->pf_mtag->tag & PF_TAG_SYNCOOKIE_RECREATED)) + if (pd->pf_mtag && (pd->pf_mtag->flags & PF_MTAG_FLAG_SYNCOOKIE_RECREATED)) return (0); if (V_pf_status.syncookies_mode != PF_SYNCOOKIES_ADAPTIVE) @@ -300,7 +300,7 @@ pf_syncookie_send(struct mbuf *m, int off, struct pf_pdesc *pd) iss = pf_syncookie_generate(m, off, pd, mss); pf_send_tcp(NULL, pd->af, pd->dst, pd->src, *pd->dport, *pd->sport, iss, ntohl(pd->hdr.tcp.th_seq) + 1, TH_SYN|TH_ACK, 0, mss, - 0, 1, 0, pd->act.rtableid); + 0, true, 0, 0, pd->act.rtableid); counter_u64_add(V_pf_status.lcounters[KLCNT_SYNCOOKIES_SENT], 1); /* XXX Maybe only in adaptive mode? */ atomic_add_64(&V_pf_status.syncookies_inflight[V_pf_syncookie_status.oddeven], @@ -518,6 +518,6 @@ pf_syncookie_recreate_syn(uint8_t ttl, int off, struct pf_pdesc *pd) wscale = pf_syncookie_wstab[cookie.flags.wscale_idx]; return (pf_build_tcp(NULL, pd->af, pd->src, pd->dst, *pd->sport, - *pd->dport, seq, 0, TH_SYN, wscale, mss, ttl, 0, - PF_TAG_SYNCOOKIE_RECREATED, pd->act.rtableid)); + *pd->dport, seq, 0, TH_SYN, wscale, mss, ttl, false, 0, + PF_MTAG_FLAG_SYNCOOKIE_RECREATED, pd->act.rtableid)); } diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 4798c9c2a9ab..c0b660a265b9 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1385,6 +1385,7 @@ extern bool mb_use_ext_pgs; /* Use ext_pgs for sendfile */ #define PACKET_TAG_CARP 28 /* CARP info */ #define PACKET_TAG_IPSEC_NAT_T_PORTS 29 /* two uint16_t */ #define PACKET_TAG_ND_OUTGOING 30 /* ND outgoing */ +#define PACKET_TAG_PF_REASSEMBLED 31 /* Specific cookies and tags. */ From nobody Mon Jun 19 11:07:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ql6Rr5ZqRz4fTtX; Mon, 19 Jun 2023 11:07: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 4Ql6Rr2dsPz3h7R; Mon, 19 Jun 2023 11:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687172856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxvYVOge8/mgs4ttgVNJW1WjCFbCWCnMlGG0go4Gpvg=; b=lPrCHMUPudK5narflsATbjrOyQPXhILC7wiDjmlH2u+ivcI0Lf8lpC7VNoQ9LZtO2QlHYv utac++NpH5hkOLt6j+RsIC+bt5S0nOQ3SpNnZrJ3/oD7ktwuCckqC7Eq9ZEe8IKsHYf8bZ gM99oAXp9VH+cc7M+OorNAVuTbhnkio9jKZVGf30YKk58eeJ3uUZCYiHEyEYWiCSqEWfwA qC6GN0+AF7RpW/qCC8k5hGjXuIStgDw9gsH5Z2lBoKse5ht/OaxbVJXFOtqaANwofppXdE 1gFsBL638oxrTD2mMjtGDBuqRCgT1miipShh/6TtWxa5lZ28fJqaTRQfkLXf7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687172856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxvYVOge8/mgs4ttgVNJW1WjCFbCWCnMlGG0go4Gpvg=; b=EoIL4o6iAIrACxaCvGfEL0n5BLmdDPHj6m32iBjlpsMAt2Mf2V9K1RhPNnog9ra7tcaoC3 3AI1APnAJZQqkjo+BVe3hLGiCQwf9DFBL93z2zG4c3qkrYvQxmfFpWhaZ5/MuQm/A/6r+Q D3uo3+btd8CuofZYW9Nkee6BCLmjcLkmLY2SDiwJpFjN+hJ13TWGlB1D+1YAYZ1YyacKqC MagY4CmTtyfkvdlM7XV0sf774GkC0Rklm9wWcTVMbkdwn/8eBPuKZMUipRGvlx3aAf5S45 77hlozCLL4xYGKxlDppYUqSReNPim6XFEb0ovRhaJTcIFk5PQ3Soo/0OIjRAWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687172856; a=rsa-sha256; cv=none; b=hIg37qjCdNoKznv79Op+Qf8krCLKP2/3if3ohHauaZEugMU8FTz/T2QHW2nrkRxv0RQ227 QCJipBGr9zDQDJlT62QdY+UeBeEv1wZ9gVlg0y+lhgHBgXilorHeoDwTKgLrm8PZtN+3NE taIwZuzlF8AkNpLsfGEdk/2R/PsC/Kx+XLWLgreuhS8MTvmu18ST+G3lnPsZt4WH6TjLtD DJaCOzzZhRY/MsPfnXv3+vDynEEuwPFkk8nrdxjbRKOly6VzGq5kQBrddDVNgpWvZS4Trd LhOmWtuH/D/o/eD8wHTijsVY2PjBaXDXW+40n+BhGmoJnDwnYeNLOixkl6TYzA== 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 4Ql6Rr1l1nzFZM; Mon, 19 Jun 2023 11:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JB7aie037999; Mon, 19 Jun 2023 11:07:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JB7aWU037998; Mon, 19 Jun 2023 11:07:36 GMT (envelope-from git) Date: Mon, 19 Jun 2023 11:07:36 GMT Message-Id: <202306191107.35JB7aWU037998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Benedict Reuschling Subject: git: 7ad4d94d5bf2 - main - Fix some shell issues by adding quotes and replace backticks with $() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ad4d94d5bf275f745907d8bf4614219f5ce4d34 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=7ad4d94d5bf275f745907d8bf4614219f5ce4d34 commit 7ad4d94d5bf275f745907d8bf4614219f5ce4d34 Author: Benedict Reuschling AuthorDate: 2023-06-19 11:03:06 +0000 Commit: Benedict Reuschling CommitDate: 2023-06-19 11:03:06 +0000 Fix some shell issues by adding quotes and replace backticks with $() This patch fixes the following issues reported by shellcheck: - Quote default assignments (SC2223) - Use $() instead of backticks (SC2006) - Double quote $@ (SC2068) - Double quote variables in if-statements and other places (SC2086) While here, fix a whitespace at one end of line instance in the license text. Approved by: manu Differential Revision: https://reviews.freebsd.org/D40604 --- usr.sbin/fwget/fwget.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/usr.sbin/fwget/fwget.sh b/usr.sbin/fwget/fwget.sh index 2d5ad8adffd8..61acaee86687 100644 --- a/usr.sbin/fwget/fwget.sh +++ b/usr.sbin/fwget/fwget.sh @@ -7,7 +7,7 @@ # Copyright 2023 Bjoern A. Zeeb # # Redistribution and use in source and binary forms, with or without -# modification, are permitted providing that the following conditions +# modification, are permitted providing 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. @@ -27,12 +27,12 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -: ${LIBEXEC_PATH:="/usr/libexec/fwget"} +: "${LIBEXEC_PATH:='/usr/libexec/fwget'}" usage() { cat < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 8f79b07564df - main - nameser: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f79b07564df4deccf63478c2a87dafabeac95c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8f79b07564df4deccf63478c2a87dafabeac95c3 commit 8f79b07564df4deccf63478c2a87dafabeac95c3 Author: Gordon Bergling AuthorDate: 2023-06-19 11:49:23 +0000 Commit: Gordon Bergling CommitDate: 2023-06-19 11:49:23 +0000 nameser: Fix a typo in a source code comment -s /unknwon/unknown/ MFC after: 3 days --- lib/libc/nameser/ns_name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/nameser/ns_name.c b/lib/libc/nameser/ns_name.c index f45278b989b1..9ff3d3f9da7b 100644 --- a/lib/libc/nameser/ns_name.c +++ b/lib/libc/nameser/ns_name.c @@ -1150,7 +1150,7 @@ labellen(const u_char *lp) bitlen = 256; return ((bitlen + 7 ) / 8 + 1); } - return (-1); /*%< unknwon ELT */ + return (-1); /*%< unknown ELT */ } return (l); } From nobody Mon Jun 19 15:03:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlCgV2PmJz4fTFF; Mon, 19 Jun 2023 15:03: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 4QlCgT6JLnz44s5; Mon, 19 Jun 2023 15:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687186981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nSCgQxcSOFoNRqWRthQ8twE4iqOgom35y7jdXv/taFQ=; b=sZsZGnEtfl2ScVqKWfHk/Yij1vvPTlvV32brViB0QfLasJYkJgKEQElALxDVcYk9BAZiKv o3aNh6gmzmTIvwTqn5wWmfGtOLe2nAzAnnXBztVT9mFKlofQQgUduVCllOPwYNLybeRAPf rdleQbI0tRefCbWZmZkVpQohKz1e/LEAwCqLA1QirfWS58+x3CNdQ0qSLQ+ourEMQvxCEB MCUoeP6VN6tIRvd6bZt5wyegz/ueReRZTVA4rk2yxLAzSR+I4EldjY3chP4E69yIxJztqS SlNC6/1qsISItOKRBbJUqvDHCMpSD2oDhj+E5QaUtVM/O1GwaVLuU1Z/xKb5vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687186981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nSCgQxcSOFoNRqWRthQ8twE4iqOgom35y7jdXv/taFQ=; b=VxSCILKS3CETM/lmpejb9NasBVerqnRTo0SoPZoVqg1HS2iOliyTYg+QChfeJEWbpEpe2P 7Gd/xPS3wpT0eEPDMMzcaSI/R1NExLFqwkMenuQFPG/Kicclr5k0c+WS6FuyPXaT6ggobY A32byqo9RLzcMK1nMZs3UFiYbUb5JyDyV4Bu8bJW/pQsDr6pzLH6ZA0vwGKbrGX0rawkOQ 2TcpVldJyLScG4OLMAEGcs5Ys8ZZ5VkVahUj5aID6B227pQ478XCBIesH7V5cLhC2T41im 38jFKsB9Au14InwacNCVOBWR+pjl4aZIfMygUj4gfwpXL0XITMWWyAFWg2tbiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687186981; a=rsa-sha256; cv=none; b=BElRZM7UDl0GgnZGOYLQGirRs5zYYJ4eQON7Pgk9MHz32kFJdhf2KXkaTSCIVgXTNITkZl h8AtGfSQVh097EWBCECMvpdAyU9bSSYUwQ7CVHBajzSeg6CUqtUlSz8G09r9xEmHgZRcUA m7eyvVKYMT6Xp/VHVVsYeGaSaB7VkErnWKxZWKUfLZnVyigXIGIt5ZMIsMAv4p+l0gUK7P I6/2gysD8nKl/XMFV6ipbJ1z9Qc4hiEfj8HKXcxIcVN0sfX+8Oc1h7W5wzPXqcjJSIZL1H 8eY38N2GzPEUF+2N04DG/Eb2Qkjywz8is45cIhEZmtLJM2kpALZ5J8GmRrfbqA== 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 4QlCgT5NXZzMWm; Mon, 19 Jun 2023 15:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JF31rq034159; Mon, 19 Jun 2023 15:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JF31L3034158; Mon, 19 Jun 2023 15:03:01 GMT (envelope-from git) Date: Mon, 19 Jun 2023 15:03:01 GMT Message-Id: <202306191503.35JF31L3034158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e77b2ea427c8 - main - ifconfig: set boolean to true rather than incrementing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e77b2ea427c8aad502e0b56954745570e2fc8cd2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e77b2ea427c8aad502e0b56954745570e2fc8cd2 commit e77b2ea427c8aad502e0b56954745570e2fc8cd2 Author: Ed Maste AuthorDate: 2023-06-19 15:01:08 +0000 Commit: Ed Maste CommitDate: 2023-06-19 15:02:38 +0000 ifconfig: set boolean to true rather than incrementing GCC warns about "increment of a boolean expression." Reported by: amd64-gcc12 Cirrus-CI run Sponsored by: The FreeBSD Foundation --- sbin/ifconfig/ifconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index fa22f09f8100..6d66677467c1 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -501,7 +501,7 @@ args_parse(struct ifconfig_args *args, int argc, char *argv[]) args->printkeys = true; break; case 'l': /* scan interface names only */ - args->namesonly++; + args->namesonly = true; break; case 'm': /* show media choices in status */ args->supmedia = true; From nobody Mon Jun 19 15:28:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlDFP335mz4dtmN; Mon, 19 Jun 2023 15:28: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 4QlDFP0JR2z4Ll7; Mon, 19 Jun 2023 15:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687188537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nUVVgiHJrNLTTr+6/RJb3lScCRepigYhd5HmjSy4B0o=; b=qKASwubp//2PrbuHs5cGtVGpGsK294Cp77HqyV704TML6KS2KjsqfiW7ocTcTG3/w3DLJ5 aTCZVAfnNkR4gzpusnkM2osyhn8ec2VFjiV3TgNem26T0c5IMiy5RYpp9YtaoqDe4iWhk4 Syn7dVs4dDrpQieUlYtNEm/ABTcsGNHUeqo1cHiCQNCmPzARfV3glnJkFP+nkfc0JWtUZo +lGXyhOZ4cKSPD4KkkSFaOtirNx+/SRIH0LJUkpQej6/rHE/Ks8SJeo69WrMRvLJCzEazY 3EggI8KpV1bnFzUHPOxQ8MJjrbDA4u2ElcihAL+erpt+FitgODpUo4ycWNSiwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687188537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nUVVgiHJrNLTTr+6/RJb3lScCRepigYhd5HmjSy4B0o=; b=TRgh1xej66wHtP0qBO5MhjAo3VYWG1fdXnMUL/dRe8MVJzrbS81A336jn+6Iv0kMgKRxTg MIj9Oooi7WuVrCFA/J+GM9ucTf8bSkTbKsH1nFwPP00CR9+/UzWcY7o7twecgZo3iZJSPm wlQxRzTyy4w3mfzBK3g16ky+ZkHaXW/obRQUA+g/IquUPFei7ybZYkiNcX0P5Ru7FKL1sY cxhxBZe/CDezEDQkdvL72inrWZ51hzQxBgRCt3AI2EDccjqa5nOfGcQyL/aqH5hA68IxqW TXFAbY9ALsMl2F6ZoRmL3PuPGnhtH7ly/gTe0ozl7rehqw/K5sZAVK5vBWxDdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687188537; a=rsa-sha256; cv=none; b=hcqHFtXRBfC86AsmhJfcXeY0ha/2INY+y57G1mxNaBRg0ua1JfLBJLNaMI0lZ1e1g8yfOO yLRT4Lbx6H84ajZHMT6hwunBSDdUs9hJONN4KAvv2SgNzaQEB5jtGshoKAmVyY+BV7VCJ8 vX9U6enwr43EyyNfukT3NEXKWjeL6UeE86aOFHJIC7tjysHUGwM7C5USqnFj10lVEoZwxp ys3k3dlXnF60/dEqRDjsGapam7OhYFU+E9jj6YlWXdhd9AU9Ih+BpiOnlbpPM9aEYUhmYN VEXpax6CMD8HPzfPaZ0rmiXB6BI0UBJMzVJF0JQr6qAHWAgKiBO0zV2w8QRn8w== 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 4QlDFN6BsDzMt2; Mon, 19 Jun 2023 15:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JFSuUQ066772; Mon, 19 Jun 2023 15:28:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JFSusJ066771; Mon, 19 Jun 2023 15:28:56 GMT (envelope-from git) Date: Mon, 19 Jun 2023 15:28:56 GMT Message-Id: <202306191528.35JFSusJ066771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e54db9a9ccd5 - main - seq: fix check for rounding error/truncation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e54db9a9ccd588f650a2e57bf9d1cbbafc0e12eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e54db9a9ccd588f650a2e57bf9d1cbbafc0e12eb commit e54db9a9ccd588f650a2e57bf9d1cbbafc0e12eb Author: Ed Maste AuthorDate: 2023-06-19 01:37:06 +0000 Commit: Ed Maste CommitDate: 2023-06-19 15:02:38 +0000 seq: fix check for rounding error/truncation Based on OpenBSD 30f0fd29ba6c: > We need to compare the printable version of the last value displayed, > not the floating point representation. Otherwise, we may print the > last value twice. PR: 271964 Reported by: Daniel Kolesa Reviewed by: yuripv Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40601 --- usr.bin/seq/seq.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/usr.bin/seq/seq.c b/usr.bin/seq/seq.c index 85fca6e88792..3618a106ec9e 100644 --- a/usr.bin/seq/seq.c +++ b/usr.bin/seq/seq.c @@ -88,14 +88,14 @@ main(int argc, char *argv[]) { const char *sep, *term; struct lconv *locale; - char pad, *fmt, *cur_print, *last_print; - double first, last, incr, last_shown_value, cur, step; + char pad, *fmt, *cur_print, *last_print, *prev_print; + double first, last, incr, prev, cur, step; int c, errflg, equalize; pad = ZERO; fmt = NULL; first = 1.0; - last = incr = last_shown_value = 0.0; + last = incr = prev = 0.0; c = errflg = equalize = 0; sep = "\n"; term = NULL; @@ -186,7 +186,7 @@ main(int argc, char *argv[]) cur = first + incr * step++) { printf(fmt, cur); fputs(sep, stdout); - last_shown_value = cur; + prev = cur; } /* @@ -194,10 +194,9 @@ main(int argc, char *argv[]) * * We might have, so check if the printable version of the last * computed value ('cur') and desired 'last' value are equal. If they - * are equal after formatting truncation, but 'cur' and - * 'last_shown_value' are not equal, it means the exit condition of the - * loop held true due to a rounding error and we still need to print - * 'last'. + * are equal after formatting truncation, but 'cur' and 'prev' are not + * equal, it means the exit condition of the loop held true due to a + * rounding error and we still need to print 'last'. */ if (asprintf(&cur_print, fmt, cur) < 0) { err(1, "asprintf"); @@ -205,12 +204,17 @@ main(int argc, char *argv[]) if (asprintf(&last_print, fmt, last) < 0) { err(1, "asprintf"); } - if (strcmp(cur_print, last_print) == 0 && cur != last_shown_value) { + if (asprintf(&prev_print, fmt, prev) < 0) { + err(1, "asprintf"); + } + if (strcmp(cur_print, last_print) == 0 && + strcmp(cur_print, prev_print) != 0) { fputs(last_print, stdout); fputs(sep, stdout); } free(cur_print); free(last_print); + free(prev_print); if (term != NULL) fputs(term, stdout); From nobody Mon Jun 19 16:16:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlFHw5Z0Kz4dtZp; Mon, 19 Jun 2023 16:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlFHw3VPpz3N3j; Mon, 19 Jun 2023 16:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687191372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mT0ma8m1kFjmruayQiWFZ6TvmFoIncgq5vRgxAIaL1Y=; b=KUywjcNOsZfZeHh1zQQaWFjTmsX8Tv0oFMiDazvgnIWTNeXGh0FF9nWV7ruAdixNHQDTbf L/yKLw1XFYjdzgv3dVUE3UHkwbc0S70gyGTd/+bg86jfCCOmMuV0jcG4QAVdh0BbV+vwQn QCXUO9TU/NAv1iow9Q+r+ta6Zhlo8UME6Z8gnNSrAUn5wQO2calEAZzQen0iVF6stgfdmD DUb6PcmkN0PHpJMkQ+VObAud8Dci7frHpon2rktZFXZWB1Jh0jrk5ZxNZPMhu7Gy6P3rnW JK8WS4XIZy7mq1girCVHuEYVI2uSJseApgRByaL3OswsR+E18pDtnYu58sh+0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687191372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mT0ma8m1kFjmruayQiWFZ6TvmFoIncgq5vRgxAIaL1Y=; b=LfoSxobqpMYKaV9ulBGK+LDqgbgcv2xDLjFnu7OR590yCAIAoJ3D0JbWlqHgkXb5KPHjaU BUdjsSAYwmKAX0I4M2dicWjr0ePNvfPQRwm0702F3UPkrUQ9+gSvph4ieW35dDHNrkz2ZZ YB3TYPrUty8jPtUSvo9BAw6r2P4aSmKpTCS3zBDvb21IzZHcXATYZBHaplSfwH8s4eqefD njAanxs7PLvN/ROxz6qUHTTYjHRVHZIBIySgqV9JDb/4Xjzn8unMu7k+aao4fZgyQNWfnT G40Q/IFwseQ6ZLtF4ObAFsp0rU6Ri8gNUr/eJ0cCmc0Egjdc7WWokTsr7s1N9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687191372; a=rsa-sha256; cv=none; b=mEohK0IL7RGUL4gq2I9la4Kthsty2NQwuhaIxdfWnt1iat4ciSFVs9ndME8joebEeG0OPL 7PWNfJGREXzmVVnREEjE7XXT5VNj+b1ns4q9QbmbmEWhXP7PefA85ROuwz89or1Uh+xpgq 3fF/l27mDOKTTG3kC/GTDIKtXBKF1Tz6auZw5ZEt+5d6FVmD0PhzACEvrjPSmf6mZR5jFI oejqHZzpqPUomGGzXi7nj9EnO9CekgnmWR/nlmEkANVmzPlh49litiid5KMzHcC3NO6wIE /Fnx34T5eNBOByhKSc7zsw2gNENuq+LXI8XSgPWY3h5+CKj0XzHxRRJEd+d6aw== 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 4QlFHw2c5QzP6Y; Mon, 19 Jun 2023 16:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JGGCUf050012; Mon, 19 Jun 2023 16:16:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JGGCbd050011; Mon, 19 Jun 2023 16:16:12 GMT (envelope-from git) Date: Mon, 19 Jun 2023 16:16:12 GMT Message-Id: <202306191616.35JGGCbd050011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e6b838363fb4 - main - pcib: Allocate the memory BAR with the MSI-X table. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6b838363fb473b5e35a8ae6a1da5e15f5b52960 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e6b838363fb473b5e35a8ae6a1da5e15f5b52960 commit e6b838363fb473b5e35a8ae6a1da5e15f5b52960 Author: John Baldwin AuthorDate: 2023-06-19 16:15:48 +0000 Commit: John Baldwin CommitDate: 2023-06-19 16:15:48 +0000 pcib: Allocate the memory BAR with the MSI-X table. This is required for pci_alloc_msix() to work and to thus use MSI-X interrupts for PCI-e hotplug. Reported by: cperciva Reviewed by: cperciva MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40581 --- sys/dev/pci/pci_pci.c | 23 ++++++++++++++++++----- sys/dev/pci/pcib_private.h | 1 + 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index a2b0d1f556aa..f05e34527118 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -1321,7 +1321,7 @@ static int pcib_alloc_pcie_irq(struct pcib_softc *sc) { device_t dev; - int count, error, rid; + int count, error, mem_rid, rid; rid = -1; dev = sc->dev; @@ -1333,9 +1333,17 @@ pcib_alloc_pcie_irq(struct pcib_softc *sc) */ count = pci_msix_count(dev); if (count == 1) { - error = pci_alloc_msix(dev, &count); - if (error == 0) - rid = 1; + mem_rid = pci_msix_table_bar(dev); + sc->pcie_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &mem_rid, RF_ACTIVE); + if (sc->pcie_mem == NULL) { + device_printf(dev, + "Failed to allocate BAR for MSI-X table\n"); + } else { + error = pci_alloc_msix(dev, &count); + if (error == 0) + rid = 1; + } } if (rid < 0 && pci_msi_count(dev) > 0) { @@ -1383,7 +1391,12 @@ pcib_release_pcie_irq(struct pcib_softc *sc) error = bus_free_resource(dev, SYS_RES_IRQ, sc->pcie_irq); if (error) return (error); - return (pci_release_msi(dev)); + error = pci_release_msi(dev); + if (error) + return (error); + if (sc->pcie_mem != NULL) + error = bus_free_resource(dev, SYS_RES_MEMORY, sc->pcie_mem); + return (error); } static void diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h index af0b70a7add3..0dea325b6436 100644 --- a/sys/dev/pci/pcib_private.h +++ b/sys/dev/pci/pcib_private.h @@ -134,6 +134,7 @@ struct pcib_softc uint16_t pcie_link_sta; uint16_t pcie_slot_sta; uint32_t pcie_slot_cap; + struct resource *pcie_mem; struct resource *pcie_irq; void *pcie_ihand; struct task pcie_hp_task; From nobody Mon Jun 19 16:17:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlFKW3CJDz4dwS2; Mon, 19 Jun 2023 16:17: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 4QlFKW2gQ2z3P7Y; Mon, 19 Jun 2023 16:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687191455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9VbTNv1xpG/hfUeoPteUa4exSyd8v8bGwCAY86uVHm4=; b=KJaKl+s3JUHRMl1XtwS/UY2eDYInCl1up8RVEkrlCdlrDZYDwPnJJyYl5+8LOgiQOPBzdo +M3/mLZEUXnIAe1I67onIwC/nmVNKiyQ1md5yXceZrPxzrrx41RwEltijfTpz9fUVYSoK3 /+0eyAnLj2vCu0J9Y4HFre1w/E/0/IYaGg3XU5bY42CPNnkpbiEHDwnTIiU6BOuD90GKN2 +6enyEaqnZ3PpyeESuqpO/LYJNUboRXrWoYpdSmKo8J2B5bsAExUKXm+Zut6ZGfzAqexiV 9QQbaKs5HArqvvTUUDsxtQx/9nrxa1S849aH/Zb6Jm2CXF2RJBH/pB0Vil76bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687191455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9VbTNv1xpG/hfUeoPteUa4exSyd8v8bGwCAY86uVHm4=; b=yvk5CXYUIGjZMHerIsls1v5qVsl9AIu+wHptfO/zvHHh5anZQc/2eEQgZPTuVy/Pm56Gmg O5tlL/lNL2jc5BQUEAKtxfb+xwPpBV98+iUtSFykNmPzFbr43tOBLr6JH0Lh1IKz0FPbIG Z/pgraFQJILRmYKHAimNeuS/vxGzcvhdyYjfnJrdAgze52rn/8+rL1rslHvjuzL+1WkZCZ Ail9guAZtMeAxL15leWVdmMKZXtP6hxOQHzHGttuknCAZ5KKd7amelurPogWuL99S3Co1O dVAuqHHiNBFy6yEeONL5OqDCSs3JyLpKydC97kay38R/miq3N/eMOQs9PCQAcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687191455; a=rsa-sha256; cv=none; b=SmhVg6AkvkZnSknULpXxk8pMW7yW4/WLMT1FMqWgoeKbJHWcWjIpVaeotWVAZU2LcZs8un cyylugBgDUjm8s0k6eWb9jmKUJhEJ6cXanqhLuYfBSFL7xX+/2Qp4vAWNPMdCDR5CmBo+T vhKsqN4BKmu+si8cXshLmQoHgKdRi6Ucw1TMHz2l6QodhtfTe4Q24J5uDB24CtS6a0/cW3 8L/eEa1r/WPp7moqyNTCoSIZbKUmpA49VmvU55Ti1gdgq4VuietaZHDZ/AIVxUshzt2sa4 byFgpJnNV/ye/dVzEFjYJIqapTKHbt/hbXSN6UJNWYeBQ4CHEFw3a85hkQIcdg== 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 4QlFKW1dWKzP3p; Mon, 19 Jun 2023 16:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JGHZRM050376; Mon, 19 Jun 2023 16:17:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JGHZUR050375; Mon, 19 Jun 2023 16:17:35 GMT (envelope-from git) Date: Mon, 19 Jun 2023 16:17:35 GMT Message-Id: <202306191617.35JGHZUR050375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 7a91ccd2fb8e - main - mpi3mr: fix GCC kernel build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7a91ccd2fb8e575b6000c74e5a025a3b31644f1f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7a91ccd2fb8e575b6000c74e5a025a3b31644f1f commit 7a91ccd2fb8e575b6000c74e5a025a3b31644f1f Author: Ed Maste AuthorDate: 2023-06-19 13:23:45 +0000 Commit: Ed Maste CommitDate: 2023-06-19 16:16:39 +0000 mpi3mr: fix GCC kernel build Previously every file that included mpi3mr_app.h but did not use mpi3mr_mgmt_info reported error: 'mpi3mr_mgmt_info' defined but not used. Fixes: 2d1d418e1e7b ("mpi3mr: 3rd Generation Tri-Mode NVMe/SAS/SATA...") Reported by: amd64-gcc12 Cirrus-CI job Sponsored by: The FreeBSD Foundation --- sys/dev/mpi3mr/mpi3mr_app.c | 2 ++ sys/dev/mpi3mr/mpi3mr_app.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/mpi3mr/mpi3mr_app.c b/sys/dev/mpi3mr/mpi3mr_app.c index 0cf25b968283..901bc88eb412 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.c +++ b/sys/dev/mpi3mr/mpi3mr_app.c @@ -67,6 +67,8 @@ static struct cdevsw mpi3mr_cdevsw = { .d_name = "mpi3mr", }; +static struct mpi3mr_mgmt_info mpi3mr_mgmt_info; + static int mpi3mr_open(struct cdev *dev, int flags, int fmt, struct thread *td) { diff --git a/sys/dev/mpi3mr/mpi3mr_app.h b/sys/dev/mpi3mr/mpi3mr_app.h index fa52db051003..733aeb0ae53d 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.h +++ b/sys/dev/mpi3mr/mpi3mr_app.h @@ -75,7 +75,6 @@ int mpi3mr_app_attach(struct mpi3mr_softc *); void mpi3mr_app_detach(struct mpi3mr_softc *); -static struct mpi3mr_mgmt_info mpi3mr_mgmt_info; enum mpi3mr_ioctl_adp_state { MPI3MR_IOCTL_ADP_STATE_UNKNOWN = 0, From nobody Mon Jun 19 17:28:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlGvB0SSNz4fWHT; Mon, 19 Jun 2023 17:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlGv973KWz4LvH; Mon, 19 Jun 2023 17:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687195702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nwhBf2945KrqanAdCyYT8HIjXIuGvQt9hxtqONRmdM=; b=Z+ws+sP82S2hlTPNvGV5XIsOJguEm0do7GuxdEfwJrZRJa7VRTo+pYMfPY6l1v7DYWBFxf rj2HNPWhCpq5c/ThLrXn61GcC5in/r9/4HEtHb/FcpwbqkVqPYpQA7nmZudozF7LxVqoRB At525Bi5PZ3laWWuS5TSF2z1sMqswhEE/J/F8jzqHtG+qgf19Sj02SPIwLvNY4RhWY9ZVy mXdYekq9Vv9TirgIQGLfIhnKn8a4iixuBanNmRdVSQouebtkWxoq/9uihPi96lDczogw7g EqC6y2P2Gd8YcukXb7ZZOsHIurgXTFptLUlXXvgdr4iamHd8AQwGgVmOLXdu0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687195702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nwhBf2945KrqanAdCyYT8HIjXIuGvQt9hxtqONRmdM=; b=H6YorIiXwKF9Jzd7KN+fAth9z1AjZtVBgvHGth1UneB3EuTWs9Q5NnY4NpWHn+moUjwerM /Fj0jcudviXli+WftgYX0dputNR6PX5De9N8+VmCSZqSupEGnUJi5y/0bsv/CFi/d4Ah5U 2UZuxxNfc7ldFe0yBRhPNDT1mPKuPspapV2Hjw9D+S+vWY0wrtL/Gvj5bwD2hmAjdzpeIV /o83WTfy3E388Wv/WBrEoRckLIow2x4izbetHyBS/4jx8WkhkhTI4nDThd23iOF1cJls0M Wk1vuQJ5O0cWZKoslVQY1H/+jLsrwMk4X81wPpOE3MQ+rs0BHEmsuV6FwQSXMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687195702; a=rsa-sha256; cv=none; b=jPHQ872fqkH7qnsVVDpxUjpNbKeZ6SelIhU37OdAIsU95KaGoOv0FZ2mmsz73U0cLrHs9G ThEItOo/8ohD1HZblF8CEmsigf/eT4zolTw9Waa+umHLgZ7aLEjqdf4wdE79fiwsmBce7A ei8g+bg1SBQ7M852v5n5/IFGhkNIRE63004NhY5sh9E833FzlFgJwKouICZ8MUSmWSdsvh EnHtLC126Mp0pKCtDy1rY7Q1uyKwEt2NH0OI5VmsF0FTFt7ToEifCrTzbRFaRXihI4Qv4R RnkaDOEonIhzH6STKFh/Jlky3COFUp+MSwPneLXf/pyMEI3DYHkl5Hk/eASCjg== 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 4QlGv95lhdzQnP; Mon, 19 Jun 2023 17:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JHSLXl065352; Mon, 19 Jun 2023 17:28:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JHSLL5065351; Mon, 19 Jun 2023 17:28:21 GMT (envelope-from git) Date: Mon, 19 Jun 2023 17:28:21 GMT Message-Id: <202306191728.35JHSLL5065351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 14dd001235f9 - main - sh: also auto-complete built-ins List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14dd001235f993f2c58d8ceddb5b0ac23db02367 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=14dd001235f993f2c58d8ceddb5b0ac23db02367 commit 14dd001235f993f2c58d8ceddb5b0ac23db02367 Author: Piotr Pawel Stefaniak AuthorDate: 2023-04-29 15:53:58 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-06-19 17:27:20 +0000 sh: also auto-complete built-ins Reported in a comment in PR 261728. Reported by: Oleg Reviewed by: jilles (previous version), bapt Differential Revision: https://reviews.freebsd.org/D39839 --- bin/sh/histedit.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 07a344ebd17b..e13f38548a40 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -594,6 +594,20 @@ comparator(const void *a, const void *b, void *thunk) *(char *const *)b + curpos)); } +static char +**add_match(char **matches, size_t i, size_t *size, char *match_copy) +{ + if (match_copy == NULL) + return (NULL); + matches[i] = match_copy; + if (i >= *size - 1) { + *size *= 2; + matches = reallocarray(matches, *size, sizeof(matches[0])); + } + + return (matches); +} + /* * This function is passed to libedit's fn_complete2(). The library will use * it instead of its standard function that finds matching files in current @@ -605,7 +619,7 @@ static char { char *free_path = NULL, *path; const char *dirname; - char **matches = NULL; + char **matches = NULL, **rmatches; size_t i = 0, size = 16, uniq; size_t curpos = end - start, lcstring = -1; @@ -631,7 +645,6 @@ static char } while ((entry = readdir(dir)) != NULL) { struct stat statb; - char **rmatches; if (strncmp(entry->d_name, text, curpos) != 0) continue; @@ -642,11 +655,8 @@ static char continue; } else if (entry->d_type != DT_REG) continue; - matches[++i] = strdup(entry->d_name); - if (i < size - 1) - continue; - size *= 2; - rmatches = reallocarray(matches, size, sizeof(matches[0])); + rmatches = add_match(matches, ++i, &size, + strdup(entry->d_name)); if (rmatches == NULL) { closedir(dir); goto out; @@ -655,6 +665,14 @@ static char } closedir(dir); } + for (const unsigned char *bp = builtincmd; *bp != 0; bp += 2 + bp[0]) { + if (curpos > bp[0] || memcmp(bp + 2, text, curpos) != 0) + continue; + rmatches = add_match(matches, ++i, &size, strndup(bp + 2, bp[0])); + if (rmatches == NULL) + goto out; + matches = rmatches; + } out: free(free_path); if (i == 0) { From nobody Mon Jun 19 17:32:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlH0G0srMz4fdPL; Mon, 19 Jun 2023 17:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlH0G0Rqtz4PS6; Mon, 19 Jun 2023 17:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687195966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bO6hg//We0UfH6DP4YQzWx6aFdNHQ/Kicm8zf8c9aAQ=; b=wVwMuD1A8raMhsN1MbrvsGYcpmAQp2/w1uz4xvQjXqiaSpCxyiQIsD4qNEyIm361j8xg9G mHWyKmoZpIvqa/zI7PzdIZtpY/ctUJhhGs+82W9W5te806Yl2N7b+DYuWoG/qPMd0+gq3X Jbz8YQsBlJRK8q5jUL8RPJjqglB9fG69O1NQmPwEaG9nXARhDISMrX5Lz1XAUUzD5ZRFlH +R9gvF85MIH9vfp/hSwfOH6kCUR1G2DamlvkIxoY7UdtiVUUfWTIKQN5DgPpJekyXDWgXR SI+h5eKYc7RvDYYykgqdUnqrv/X7jyfGAufWGHRdE9YZ249UN4Sw4M0aQhatvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687195966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bO6hg//We0UfH6DP4YQzWx6aFdNHQ/Kicm8zf8c9aAQ=; b=Yp56txaN9sIHOenX4+ApftipYLranxoC0dIr+SebWpiEHgsS4ny7S/znIHuXq0i9uQZjW/ 3HJ+2j4AGQZhAYZHHRfR3y1yI+kEAZOnUATNOlngWdnAh+zGFuqmw/bxbPyn+co5hLq3bm GP0s5e/22MTq/aJ9XjE/G5u3lZZxFdKGyNRrU+N9wbGJ5YkLzSk2b5OZFVTNg+qcEa9ahC m1lg5OnRfV1vajUUXJwbQ/MaQ9eQgwna2qJlLNXniTzUi6SnwXYJ7gVRmDG4Sep/KwuVP4 k7mb/7oTP2Bj78As8UBwni9O6dJ8d+oI6tusIe/kygNhmm/OxJtxZqOzQ2tePw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687195966; a=rsa-sha256; cv=none; b=fSeGwCpF1u7ySsHekf2iWoksvAafEZxgSL7/nH+qLDQXQT/oFtuYGdS71wsa083ZxJ7AlW rRyy67TIA1xqkWISF57KZPM30CQiTnp8R/1bsp4z0n+YsUejh44CQzC/ocSApQ3KHgu6ZV f9VNORSffmMXbUCIanEP2WSQjdsfaaUeYbkD4LoyYC06ReFG9PjCvtyO5LzCWHGagbtuuj S66VY8Ke6V/WTf6KjMfEGByff6nf+jCxMYsjPrf+J9thQ50kQ9Uhqkvg3ZbtXHCC9uAjXj LrjqEhqVHIxLN2ZXsv8CDKrg2qXlr0MUFZFLvhBcI2LEHramhGUJXk4qMAXwqA== 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 4QlH0F6btXzQcC; Mon, 19 Jun 2023 17:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JHWj2M080845; Mon, 19 Jun 2023 17:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JHWjLw080844; Mon, 19 Jun 2023 17:32:45 GMT (envelope-from git) Date: Mon, 19 Jun 2023 17:32:45 GMT Message-Id: <202306191732.35JHWjLw080844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e60316d1eac9 - main - x86: Add defines for a couple of thermal and PM bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e60316d1eac91000e187ae248839fca31143090c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e60316d1eac91000e187ae248839fca31143090c commit e60316d1eac91000e187ae248839fca31143090c Author: Mark Johnston AuthorDate: 2023-06-19 17:26:07 +0000 Commit: Mark Johnston CommitDate: 2023-06-19 17:32:22 +0000 x86: Add defines for a couple of thermal and PM bits MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/x86/include/specialreg.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index 1b109b48818b..2d3d2b8080ae 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -338,7 +338,9 @@ #define CPUTPM1_HWP_PECI_OVR 0x00010000 #define CPUTPM1_HWP_FLEXIBLE 0x00020000 #define CPUTPM1_HWP_FAST_MSR 0x00040000 +#define CPUTPM1_HW_FEEDBACK 0x00080000 #define CPUTPM1_HWP_IGN_IDLE 0x00100000 +#define CPUTPM1_THREAD_DIRECTOR 0x00800000 /* Ebx. */ #define CPUTPM_B_NSENSINTTHRESH 0x0000000f From nobody Mon Jun 19 17:38:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlH6t0DBVz4fmcL; Mon, 19 Jun 2023 17:38: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 4QlH6s6sqFz3DSY; Mon, 19 Jun 2023 17:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=99xe9aVXU323qdUpDwLKfK22j+xakT3J/Hf6avG2ArI=; b=YTtwhc7/QE1Kx4zNTICx7cLgAx8f7ezGd6YOAF3ph0WqW0/Qp5EoviaI7oUBP6mYcsBQq+ 3NcXr3FG9zP/Vm1l8u626FmcY/NNQe3sBX0XmwfLnzjIUgg9JiYM4mb0+SfyofpMKl+UQy zh6txrx4tlJmuuKI1GtiGS720MKd+wPNvhvf4SohtASsXb/ssikPxXN+S2dRDIPNTeDe1P TjElHltQepY4a61bgLgJggA8l4Mj18SfZqC0wvl4lkdvljuB685aNCMof3yGlguD6he8+I MewGlLmOwiieMk1KViZNkq4sJcmEywOpPCYOAPB7svQpwX2NX4gZdqf5h8FdMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=99xe9aVXU323qdUpDwLKfK22j+xakT3J/Hf6avG2ArI=; b=cf7nniuqrsOCQfIuoQzIBl3Oaltf1NhWgv9VmyfyJDVC4pqi8ignX+DJxpN8+vol8/PnJ8 Vo5XNZHZWTRrasq0baFuxhTn40z4n88lcOPxsSSfBQLV4O9BN/AF7duTCKD33DYg+JzV3Q 1+WIkXyWE56aFy0u9KP08pdGsCyQJt5hydcy/w/CFS/HdLApkiVASFPM5ElMt2d/vfj6KG /GkuX8BWLJRQD7DUJoPEy67sxBah87F6jWAwerh00tV0NWbSRtem4sLwpkAXed4GbCfpRN +wLtLBQNbRRA/pfugS3ozPVPnlYSILmAApZIOPCzreZr+y70HvXNKKCvzKS5WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687196310; a=rsa-sha256; cv=none; b=oDqCfRCDx6MwkB8t6cBQE8//NDv9t+Bbi2KMOAMONS3p4/IPT/hhAn85ru5tCAwyyHZ8rN twazfVR54FuZpkZ+Ti+asjfSmfptHKJG9WXaQtWNNdtYlMZ4m+VGIPpk4stm3rXGc6vo17 Fd/GyJI9DSFruInaiprXkNYT/cAKMr565ZuY/PF6msYXnpPabXhj3kzzWDMiIyZ1PyHg3i 64W4srsyNqkJGc8rWyrsdQiYLhQM05TW6KXoNtvvmwgcsiqNvW5dpEP8cT8/s61ettKCp0 2BEkI5QyY+kH9sOcHbG+srioXMQXP6V7GphI2X7bJuUiILb6lNIwTNVj+acuSA== 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 4QlH6s5xKlzRCr; Mon, 19 Jun 2023 17:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JHcTvK081726; Mon, 19 Jun 2023 17:38:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JHcT8p081725; Mon, 19 Jun 2023 17:38:29 GMT (envelope-from git) Date: Mon, 19 Jun 2023 17:38:29 GMT Message-Id: <202306191738.35JHcT8p081725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 08992b2078f6 - main - ifconfig: Avoid issues with trying to negate unsigned values. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08992b2078f673b2806e0be30d07f41012a650e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=08992b2078f673b2806e0be30d07f41012a650e7 commit 08992b2078f673b2806e0be30d07f41012a650e7 Author: John Baldwin AuthorDate: 2023-06-19 17:37:52 +0000 Commit: John Baldwin CommitDate: 2023-06-19 17:37:52 +0000 ifconfig: Avoid issues with trying to negate unsigned values. The if_flags and if_cap fields hold a bitmask of flags. If a flag is the MSB of the field, then the logic in setifflags and setifcap which uses a < 0 check does the wrong thing (it tries to clear the flag rather than setting it). Also, trying to use - doesn't actually work as the result is a nop. To fix, stop overloading setifcap and setifflags and instead add new dedicated action functions clearifcap and clearifflags for clearing a flag. The value passed in the argument to the command is now always the raw flag. This was reported by a GCC warning after raising WARNS: sbin/ifconfig/ifconfig.c:2061:33: error: integer overflow in expression '-2147483648' of type 'int' results in '-2147483648' [-Werror=overflow] 2061 | DEF_CMD("-txtlsrtlmt", -IFCAP_TXTLS_RTLMT, setifcap), | ^ Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40608 --- sbin/ifconfig/ifconfig.c | 113 +++++++++++++++++++++++++++++------------------ sbin/ifconfig/ifconfig.h | 1 + sbin/ifconfig/ifvlan.c | 10 ++--- sbin/ifconfig/ifvxlan.c | 4 +- 4 files changed, 79 insertions(+), 49 deletions(-) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 6d66677467c1..5d789795e636 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1396,6 +1396,22 @@ getifflags(const char *ifname, int us, bool err_ok) * of the ifreq structure, which may confuse other parts of ifconfig. * Make a private copy so we can avoid that. */ +static void +clearifflags(if_ctx *ctx, const char *vname, int value) +{ + struct ifreq my_ifr; + int flags; + + flags = getifflags(ctx->ifname, ctx->io_s, false); + flags &= ~value; + memset(&my_ifr, 0, sizeof(my_ifr)); + strlcpy(my_ifr.ifr_name, ctx->ifname, sizeof(my_ifr.ifr_name)); + my_ifr.ifr_flags = flags & 0xffff; + my_ifr.ifr_flagshigh = flags >> 16; + if (ioctl(ctx->io_s, SIOCSIFFLAGS, (caddr_t)&my_ifr) < 0) + Perror(vname); +} + static void setifflags(if_ctx *ctx, const char *vname, int value) { @@ -1403,11 +1419,7 @@ setifflags(if_ctx *ctx, const char *vname, int value) int flags; flags = getifflags(ctx->ifname, ctx->io_s, false); - if (value < 0) { - value = -value; - flags &= ~value; - } else - flags |= value; + flags |= value; memset(&my_ifr, 0, sizeof(my_ifr)); strlcpy(my_ifr.ifr_name, ctx->ifname, sizeof(my_ifr.ifr_name)); my_ifr.ifr_flags = flags & 0xffff; @@ -1416,6 +1428,27 @@ setifflags(if_ctx *ctx, const char *vname, int value) Perror(vname); } +void +clearifcap(if_ctx *ctx, const char *vname, int value) +{ + struct ifreq ifr = {}; + int flags; + + if (ioctl_ctx_ifr(ctx, SIOCGIFCAP, &ifr) < 0) { + Perror("ioctl (SIOCGIFCAP)"); + exit(1); + } + flags = ifr.ifr_curcap; + flags &= ~value; + flags &= ifr.ifr_reqcap; + /* Check for no change in capabilities. */ + if (ifr.ifr_curcap == flags) + return; + ifr.ifr_reqcap = flags; + if (ioctl_ctx(ctx, SIOCSIFCAP, &ifr) < 0) + Perror(vname); +} + void setifcap(if_ctx *ctx, const char *vname, int value) { @@ -1427,11 +1460,7 @@ setifcap(if_ctx *ctx, const char *vname, int value) exit(1); } flags = ifr.ifr_curcap; - if (value < 0) { - value = -value; - flags &= ~value; - } else - flags |= value; + flags |= value; flags &= ifr.ifr_reqcap; /* Check for no change in capabilities. */ if (ifr.ifr_curcap == flags) @@ -1972,17 +2001,17 @@ ifmaybeload(struct ifconfig_args *args, const char *name) static struct cmd basic_cmds[] = { DEF_CMD("up", IFF_UP, setifflags), - DEF_CMD("down", -IFF_UP, setifflags), - DEF_CMD("arp", -IFF_NOARP, setifflags), + DEF_CMD("down", IFF_UP, clearifflags), + DEF_CMD("arp", IFF_NOARP, clearifflags), DEF_CMD("-arp", IFF_NOARP, setifflags), DEF_CMD("debug", IFF_DEBUG, setifflags), - DEF_CMD("-debug", -IFF_DEBUG, setifflags), + DEF_CMD("-debug", IFF_DEBUG, clearifflags), DEF_CMD_ARG("description", setifdescr), DEF_CMD_ARG("descr", setifdescr), DEF_CMD("-description", 0, unsetifdescr), DEF_CMD("-descr", 0, unsetifdescr), DEF_CMD("promisc", IFF_PPROMISC, setifflags), - DEF_CMD("-promisc", -IFF_PPROMISC, setifflags), + DEF_CMD("-promisc", IFF_PPROMISC, clearifflags), DEF_CMD("add", IFF_UP, notealias), DEF_CMD("alias", IFF_UP, notealias), DEF_CMD("-alias", -IFF_UP, notealias), @@ -1991,7 +2020,7 @@ static struct cmd basic_cmds[] = { #ifdef notdef #define EN_SWABIPS 0x1000 DEF_CMD("swabips", EN_SWABIPS, setifflags), - DEF_CMD("-swabips", -EN_SWABIPS, setifflags), + DEF_CMD("-swabips", EN_SWABIPS, clearifflags), #endif DEF_CMD_ARG("netmask", setifnetmask), DEF_CMD_ARG("metric", setifmetric), @@ -2004,64 +2033,64 @@ static struct cmd basic_cmds[] = { DEF_CMD_ARG("-vnet", setifrvnet), #endif DEF_CMD("link0", IFF_LINK0, setifflags), - DEF_CMD("-link0", -IFF_LINK0, setifflags), + DEF_CMD("-link0", IFF_LINK0, clearifflags), DEF_CMD("link1", IFF_LINK1, setifflags), - DEF_CMD("-link1", -IFF_LINK1, setifflags), + DEF_CMD("-link1", IFF_LINK1, clearifflags), DEF_CMD("link2", IFF_LINK2, setifflags), - DEF_CMD("-link2", -IFF_LINK2, setifflags), + DEF_CMD("-link2", IFF_LINK2, clearifflags), DEF_CMD("monitor", IFF_MONITOR, setifflags), - DEF_CMD("-monitor", -IFF_MONITOR, setifflags), + DEF_CMD("-monitor", IFF_MONITOR, clearifflags), DEF_CMD("mextpg", IFCAP_MEXTPG, setifcap), - DEF_CMD("-mextpg", -IFCAP_MEXTPG, setifcap), + DEF_CMD("-mextpg", IFCAP_MEXTPG, clearifcap), DEF_CMD("staticarp", IFF_STATICARP, setifflags), - DEF_CMD("-staticarp", -IFF_STATICARP, setifflags), + DEF_CMD("-staticarp", IFF_STATICARP, clearifflags), DEF_CMD("stickyarp", IFF_STICKYARP, setifflags), - DEF_CMD("-stickyarp", -IFF_STICKYARP, setifflags), + DEF_CMD("-stickyarp", IFF_STICKYARP, clearifflags), DEF_CMD("rxcsum6", IFCAP_RXCSUM_IPV6, setifcap), - DEF_CMD("-rxcsum6", -IFCAP_RXCSUM_IPV6, setifcap), + DEF_CMD("-rxcsum6", IFCAP_RXCSUM_IPV6, clearifcap), DEF_CMD("txcsum6", IFCAP_TXCSUM_IPV6, setifcap), - DEF_CMD("-txcsum6", -IFCAP_TXCSUM_IPV6, setifcap), + DEF_CMD("-txcsum6", IFCAP_TXCSUM_IPV6, clearifcap), DEF_CMD("rxcsum", IFCAP_RXCSUM, setifcap), - DEF_CMD("-rxcsum", -IFCAP_RXCSUM, setifcap), + DEF_CMD("-rxcsum", IFCAP_RXCSUM, clearifcap), DEF_CMD("txcsum", IFCAP_TXCSUM, setifcap), - DEF_CMD("-txcsum", -IFCAP_TXCSUM, setifcap), + DEF_CMD("-txcsum", IFCAP_TXCSUM, clearifcap), DEF_CMD("netcons", IFCAP_NETCONS, setifcap), - DEF_CMD("-netcons", -IFCAP_NETCONS, setifcap), + DEF_CMD("-netcons", IFCAP_NETCONS, clearifcap), DEF_CMD_ARG("pcp", setifpcp), DEF_CMD("-pcp", 0, disableifpcp), DEF_CMD("polling", IFCAP_POLLING, setifcap), - DEF_CMD("-polling", -IFCAP_POLLING, setifcap), + DEF_CMD("-polling", IFCAP_POLLING, clearifcap), DEF_CMD("tso6", IFCAP_TSO6, setifcap), - DEF_CMD("-tso6", -IFCAP_TSO6, setifcap), + DEF_CMD("-tso6", IFCAP_TSO6, clearifcap), DEF_CMD("tso4", IFCAP_TSO4, setifcap), - DEF_CMD("-tso4", -IFCAP_TSO4, setifcap), + DEF_CMD("-tso4", IFCAP_TSO4, clearifcap), DEF_CMD("tso", IFCAP_TSO, setifcap), - DEF_CMD("-tso", -IFCAP_TSO, setifcap), + DEF_CMD("-tso", IFCAP_TSO, clearifcap), DEF_CMD("toe", IFCAP_TOE, setifcap), - DEF_CMD("-toe", -IFCAP_TOE, setifcap), + DEF_CMD("-toe", IFCAP_TOE, clearifcap), DEF_CMD("lro", IFCAP_LRO, setifcap), - DEF_CMD("-lro", -IFCAP_LRO, setifcap), + DEF_CMD("-lro", IFCAP_LRO, clearifcap), DEF_CMD("txtls", IFCAP_TXTLS, setifcap), - DEF_CMD("-txtls", -IFCAP_TXTLS, setifcap), + DEF_CMD("-txtls", IFCAP_TXTLS, clearifcap), DEF_CMD_SARG("rxtls", IFCAP2_RXTLS4_NAME "," IFCAP2_RXTLS6_NAME, setifcapnv), DEF_CMD_SARG("-rxtls", "-"IFCAP2_RXTLS4_NAME ",-" IFCAP2_RXTLS6_NAME, setifcapnv), DEF_CMD("wol", IFCAP_WOL, setifcap), - DEF_CMD("-wol", -IFCAP_WOL, setifcap), + DEF_CMD("-wol", IFCAP_WOL, clearifcap), DEF_CMD("wol_ucast", IFCAP_WOL_UCAST, setifcap), - DEF_CMD("-wol_ucast", -IFCAP_WOL_UCAST, setifcap), + DEF_CMD("-wol_ucast", IFCAP_WOL_UCAST, clearifcap), DEF_CMD("wol_mcast", IFCAP_WOL_MCAST, setifcap), - DEF_CMD("-wol_mcast", -IFCAP_WOL_MCAST, setifcap), + DEF_CMD("-wol_mcast", IFCAP_WOL_MCAST, clearifcap), DEF_CMD("wol_magic", IFCAP_WOL_MAGIC, setifcap), - DEF_CMD("-wol_magic", -IFCAP_WOL_MAGIC, setifcap), + DEF_CMD("-wol_magic", IFCAP_WOL_MAGIC, clearifcap), DEF_CMD("txrtlmt", IFCAP_TXRTLMT, setifcap), - DEF_CMD("-txrtlmt", -IFCAP_TXRTLMT, setifcap), + DEF_CMD("-txrtlmt", IFCAP_TXRTLMT, clearifcap), DEF_CMD("txtlsrtlmt", IFCAP_TXTLS_RTLMT, setifcap), - DEF_CMD("-txtlsrtlmt", -IFCAP_TXTLS_RTLMT, setifcap), + DEF_CMD("-txtlsrtlmt", IFCAP_TXTLS_RTLMT, clearifcap), DEF_CMD("hwrxtstmp", IFCAP_HWRXTSTMP, setifcap), - DEF_CMD("-hwrxtstmp", -IFCAP_HWRXTSTMP, setifcap), - DEF_CMD("normal", -IFF_LINK0, setifflags), + DEF_CMD("-hwrxtstmp", IFCAP_HWRXTSTMP, clearifcap), + DEF_CMD("normal", IFF_LINK0, clearifflags), DEF_CMD("compress", IFF_LINK0, setifflags), DEF_CMD("noicmp", IFF_LINK1, setifflags), DEF_CMD_ARG("mtu", setifmtu), diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index e33a2c63aec1..84c1ac7eebce 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -255,6 +255,7 @@ extern int allmedia; extern int exit_code; extern char *f_inet, *f_inet6, *f_ether, *f_addr; +void clearifcap(if_ctx *ctx, const char *, int value); void setifcap(if_ctx *ctx, const char *, int value); void setifcapnv(if_ctx *ctx, const char *vname, const char *arg); diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c index b871e953c44a..adc3c4692f8b 100644 --- a/sbin/ifconfig/ifvlan.c +++ b/sbin/ifconfig/ifvlan.c @@ -286,15 +286,15 @@ static struct cmd vlan_cmds[] = { /* XXX For compatibility. Should become DEF_CMD() some day. */ DEF_CMD_OPTARG("-vlandev", unsetvlandev), DEF_CMD("vlanmtu", IFCAP_VLAN_MTU, setifcap), - DEF_CMD("-vlanmtu", -IFCAP_VLAN_MTU, setifcap), + DEF_CMD("-vlanmtu", IFCAP_VLAN_MTU, clearifcap), DEF_CMD("vlanhwtag", IFCAP_VLAN_HWTAGGING, setifcap), - DEF_CMD("-vlanhwtag", -IFCAP_VLAN_HWTAGGING, setifcap), + DEF_CMD("-vlanhwtag", IFCAP_VLAN_HWTAGGING, clearifcap), DEF_CMD("vlanhwfilter", IFCAP_VLAN_HWFILTER, setifcap), - DEF_CMD("-vlanhwfilter", -IFCAP_VLAN_HWFILTER, setifcap), - DEF_CMD("-vlanhwtso", -IFCAP_VLAN_HWTSO, setifcap), + DEF_CMD("-vlanhwfilter", IFCAP_VLAN_HWFILTER, clearifcap), + DEF_CMD("-vlanhwtso", IFCAP_VLAN_HWTSO, clearifcap), DEF_CMD("vlanhwtso", IFCAP_VLAN_HWTSO, setifcap), DEF_CMD("vlanhwcsum", IFCAP_VLAN_HWCSUM, setifcap), - DEF_CMD("-vlanhwcsum", -IFCAP_VLAN_HWCSUM, setifcap), + DEF_CMD("-vlanhwcsum", IFCAP_VLAN_HWCSUM, clearifcap), }; static struct afswtch af_vlan = { .af_name = "af_vlan", diff --git a/sbin/ifconfig/ifvxlan.c b/sbin/ifconfig/ifvxlan.c index 4f54bee88b41..72e2eac35c2d 100644 --- a/sbin/ifconfig/ifvxlan.c +++ b/sbin/ifconfig/ifvxlan.c @@ -613,9 +613,9 @@ static struct cmd vxlan_cmds[] = { DEF_CMD("vxlanflushall", 1, setvxlan_flush), DEF_CMD("vxlanhwcsum", IFCAP_VXLAN_HWCSUM, setifcap), - DEF_CMD("-vxlanhwcsum", -IFCAP_VXLAN_HWCSUM, setifcap), + DEF_CMD("-vxlanhwcsum", IFCAP_VXLAN_HWCSUM, clearifcap), DEF_CMD("vxlanhwtso", IFCAP_VXLAN_HWTSO, setifcap), - DEF_CMD("-vxlanhwtso", -IFCAP_VXLAN_HWTSO, setifcap), + DEF_CMD("-vxlanhwtso", IFCAP_VXLAN_HWTSO, clearifcap), }; static struct afswtch af_vxlan = { From nobody Mon Jun 19 17:38:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlH6v2J7jz4fmtV; Mon, 19 Jun 2023 17:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlH6v183xz3DhC; Mon, 19 Jun 2023 17:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3VwSWHtAUROz+nWJiChxFZZKCYcFvRzUhxQGHLo1Zps=; b=MhjrQNSWL05KzMkPiPLlrg0TjL85zEzYMgUidCv1BvYz0o2soWJVEMBbwksCFa5YWe9lte MX5d0rkecYitPhNaeZeMzKtiG6loPA7/F8Cgqgnrgz/X9+HMg+rR8yao3FpotZ2plvYZO3 FXfP/Icn+3WC3ACdjGE++eJ+CAYiu12mu/fuvfBxwdINbIPN/J6nuzm3wscjxJvMp8OE6P HnZjrlomUS5hcQrUhzB0Fe5yi6zHjQxFlK2SIdVPQaxNwVoL379Px1mktEWPM1vM6Lx2bB Brj4gkUUuJsaK+Z8sgJWNdD40tT+7i/9IK8lPTsEqZb/i5mZtOYxbs98krSzDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3VwSWHtAUROz+nWJiChxFZZKCYcFvRzUhxQGHLo1Zps=; b=yM3YmwRuzbLOlaeC8hFii5p/Wk4QOYcUu2jmMNijHHJW/OgstAoUi7/ZJnPhvriRhEessN iiFrzAVtVZaiUwEL+GjCu03BxkwHL8sQMUuDi1RUAuphwBpZM2g1M3DKrh7AavB7jgECZv fl5pACxxUtrNHiOvQqlnoO9gvxC/aTwBvjHesjC/m5FU9/U1sIM6tVCLTaqtisXxoXqsXk GchNTM3u3H4Twkj/RKackH51dyEKoH6lgkwiyEn32XCYb43ySIpuL0xcf8AV6cZDOfB7Z0 Fye0VZtlHzdbuwKI9f2GFC1+R3c3oWiIxJsa0JtsFoqzKCdU3StoILXG8oGR8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687196311; a=rsa-sha256; cv=none; b=eWAxFDf/JVvaCkCOPCfcDU0V8O5BASkn0BtKFK3J+U5hmZuI6z2em28E+xM/QhybVf253T eT2tj5leI0KVSTBogU8BvT8MG7B8qh+b/4VqL6BVpNLSmdm4BLCyD5dyRFkYr7PK08aMEr XrPVSvH85NDv7IRmlVUuLgRlhC2JczJjjXi7jxztvOIwbSPhOExyxsb+pGgC7xUrg4k549 eHQchWj+Uz9ewLSq5B/txrRvLfHDEHVSDcSn0+ZUUJV5d4L9Ez8d0JFpFFeZ3XjYsC0JsK W4MZPMYl6tIK9PrSMTqR9Yz/QqVUkia9oxnANitWQ7gMvullMnHCVm6ZxVrHRg== 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 4QlH6t6tbBzRGC; Mon, 19 Jun 2023 17:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JHcUhQ081745; Mon, 19 Jun 2023 17:38:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JHcUmv081744; Mon, 19 Jun 2023 17:38:30 GMT (envelope-from git) Date: Mon, 19 Jun 2023 17:38:30 GMT Message-Id: <202306191738.35JHcUmv081744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a3b1138778f3 - main - ifconfig: Consistently use uint32_t for wireless channel flags. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3b1138778f347288f0f3f08c1e46b1ea411afdb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a3b1138778f347288f0f3f08c1e46b1ea411afdb commit a3b1138778f347288f0f3f08c1e46b1ea411afdb Author: John Baldwin AuthorDate: 2023-06-19 17:38:07 +0000 Commit: John Baldwin CommitDate: 2023-06-19 17:38:07 +0000 ifconfig: Consistently use uint32_t for wireless channel flags. Reported by: GCC -Wsign-compare Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40609 --- sbin/ifconfig/ifieee80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index d5a1dab4e064..93477f999003 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -2069,7 +2069,7 @@ regdomain_sort(const void *a, const void *b) static const struct ieee80211_channel * chanlookup(const struct ieee80211_channel chans[], int nchans, - int freq, int flags) + int freq, uint32_t flags) { int i; @@ -2084,7 +2084,7 @@ chanlookup(const struct ieee80211_channel chans[], int nchans, } static int -chanfind(const struct ieee80211_channel chans[], int nchans, unsigned int flags) +chanfind(const struct ieee80211_channel chans[], int nchans, uint32_t flags) { for (int i = 0; i < nchans; i++) { const struct ieee80211_channel *c = &chans[i]; @@ -2098,7 +2098,7 @@ chanfind(const struct ieee80211_channel chans[], int nchans, unsigned int flags) * Check channel compatibility. */ static int -checkchan(const struct ieee80211req_chaninfo *avail, int freq, int flags) +checkchan(const struct ieee80211req_chaninfo *avail, int freq, uint32_t flags) { flags &= ~REQ_FLAGS; /* From nobody Mon Jun 19 17:38:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlH6w3WTTz4fmpW; Mon, 19 Jun 2023 17:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlH6w25Vdz3Dmb; Mon, 19 Jun 2023 17:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ad9456iUBHBZrrsP5s8uLZPgoE3khFL6DCpUcWP0zUc=; b=myKRXJ5cLrYqiOVEptQIr6COxa/Xw0fZd61bIoCVLNVJHaMV233OdjhU1ODnbQCV2ANVKA ihOEBdRASxlB/sS1RLVR4EPyI8KhJIozq0zIk9ngLEbzMAcERFFBPnCa0Zo3ooBuFKNGL/ q2CfwKLN6sBirm/bHTFgxmnieIQTXqT3u+ZCJ+t4B/U0gbu4F98bk6ww+M/zn3gRmwOEP2 bfmZ/XNg0qJskHPoNAC8mo9tyjgR6wdjvFSuLa9SHeFpUdqZTgn4MEKz9oQLOD+OdU/pd4 DmtuZLU2sNdD8NOAkps9bzfsqid3hAXX6dLXgQDCO7Pc+CQzZH/edpuocmJ75g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ad9456iUBHBZrrsP5s8uLZPgoE3khFL6DCpUcWP0zUc=; b=WfgnXv4s2XLtQCoDvAxsXpBfhXbNEqAReZSdoUVDgDH0/AHYoSOufBLbNrVIXSVpExvFQD uX5rVqvStPZlXBKm1wUGUbryFCydILhWw8v1g+W2fCei0+Ugg1FoIxKRT2nCwWIgftnLe+ 8LKwKYXYSTu+efMjYlowA+z1T/+jef2khDbTe8+oL13/Q4x5pJEGpNf/jcya000cjYzFaS B1qXOzKknoF3u2IqC7XzeBikA4wyfxHgOoJDz7RXvvxRqlVk1183grMPG6X1wJ17oL55hy dvyHm/sjhhrQbwR3rpsC/yUs3fL70abF3OPOLbSgJh94W7VdagmgypLxdOllHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687196312; a=rsa-sha256; cv=none; b=yIE6pxNc7gN09iyloCY5OZUqyEfQyV7kOYMWwRAZu3yCkNBiff2P7CGr0zWBR+x44I1L84 4b61RxDTN1LOSboyyfAzNFCSOMwPAKgsvZzcK/rsHwZBLEsqDgdbgUGnphBgYxEEsxe9tY nFz3/tOd/F+N9DQndyK3TeJGSXTGImsTMmq+WGj7qfSUXK53FEK8TxQM3ARRxIN8wmML4u WJRGNhtHLTsrsnSpyi58T6gCXWjoXeA7u8k0vaRNqsUawgJ+mWMlJygWQ2GYVuE3lq5dqB g1APXrALvykM7hPR4GIS6UhGR9oA5sEAUexJ/9CJlbRccUqHgduflB7MNHV1Iw== 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 4QlH6w0ctjzR3Q; Mon, 19 Jun 2023 17:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JHcVwK081764; Mon, 19 Jun 2023 17:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JHcVsk081763; Mon, 19 Jun 2023 17:38:31 GMT (envelope-from git) Date: Mon, 19 Jun 2023 17:38:31 GMT Message-Id: <202306191738.35JHcVsk081763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f19ae3633be1 - main - ifconfig: Pacify a sign comparison warning in regdomain_sort. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f19ae3633be133c8a30dd9b709451ce71e147bcb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f19ae3633be133c8a30dd9b709451ce71e147bcb commit f19ae3633be133c8a30dd9b709451ce71e147bcb Author: John Baldwin AuthorDate: 2023-06-19 17:38:18 +0000 Commit: John Baldwin CommitDate: 2023-06-19 17:38:18 +0000 ifconfig: Pacify a sign comparison warning in regdomain_sort. Both ic_flags values are unsigned (uint32_t), so cast them to a signed int to generate a signed result. Both ic_req values are also unsigned, but since they are uint16_t, they are implicitly promited to int before the subtraction. Reported by: GCC -Wsign-compare Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40610 --- sbin/ifconfig/ifieee80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 93477f999003..c0f53a012dfa 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -2062,7 +2062,7 @@ regdomain_sort(const void *a, const void *b) const struct ieee80211_channel *cb = b; return ca->ic_freq == cb->ic_freq ? - (ca->ic_flags & CHAN_ALL) - (cb->ic_flags & CHAN_ALL) : + (int)(ca->ic_flags & CHAN_ALL) - (int)(cb->ic_flags & CHAN_ALL) : ca->ic_freq - cb->ic_freq; #undef CHAN_ALL } From nobody Mon Jun 19 17:46:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlHHf1vh6z4g091; Mon, 19 Jun 2023 17:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlHHf1QW9z3K38; Mon, 19 Jun 2023 17:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4BvkBSY+eh9C4rlvWRYwXsPVvg3E60Ua7sG3pBBRUw=; b=KI52TetY1eDG4HJejhxZMZfERWx/P63YXT3iMwm5w73yWrPFZgdI46l8FXFwRLKXtkjmbm B9J4exZZJhJ8UlPZionU/faxWD74eJilHkkZgemQ4AQNkqepRkl4AWATevnbN0AgcmRSCB 56zsTvj/vihHdB57Ig4X7mS/LkEJAt/TtcJ4PVMT3bXoKqJjxC5/NoE9pLnQI0vTt3QBD8 1i5vamXNZgYLd+H3E7J92fPn0dLYPX6p2ZMFitVtGJkpd0NdKSrVL7gzOnta2koiQ+hT72 uv1Xbd2NrAIsUMH0rief30eXBE7Euq+soRkH/gusjpC9o2V0hiHckH9WU1/E/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4BvkBSY+eh9C4rlvWRYwXsPVvg3E60Ua7sG3pBBRUw=; b=cyD9XuXAEB5NjZVsYfd8G6ktAhugjT0nDmbxIBvjabYyocITOLEoXTR9E69+ZRbU3mxmiW ILx+Cc/F5Jmpr2utxyIq7godzmyOsLVRE9+5Nu3qFB++CnFujffpfOU9msEur/0l52MygB hMdeykWvPaNKtXs1ITqE8c/RK5uWa+CUGeoXdR0aBNN8j51/FNX0EB1GbIo1lP/RMWGRQ8 N/ESXiZON9X5gwVz/S/KMA+4waXCoZORFBXe3DlkehuFbQ+vrRRY89OLznixATQQdv5HAQ S7lNBVhYfxKExCJkwANweYlobJK26O3MpeQnSMFbW9vO4cju2dbzZWyFtUpdmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687196766; a=rsa-sha256; cv=none; b=ugv/Au7j9Snr5PKyTf5w13gMJxBoUVfIpfIp2DQFHgY+JVleUMYr1/FZur9Wv1R35UnNF7 hlplM5gGrorvQWqGORrG25W96g+6gU57OPiESkvU5s5TOWPueq99Xv/3tJvTYBoxz4IdFG if3ZFQK/2t1nzIC46jzFvqcYj5nj+jO9n0GtoLX5SLLWV1ry755Dtag+h0RzRu7E+tnZ0b b6CtA/ISimNOiwNrmMsk6cakcd4xIXwv6OPx5ZotJp5JZd/bKfga5YHl71kyrJU1HLH+Gg xC116tTmJigxEQ4on3ZsgJsb2duMx/y2eGwR0MIlB4/+MP3rT1fw2ZyFF1Wxfg== 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 4QlHHf0KkTzRWq; Mon, 19 Jun 2023 17:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JHk5Ye097563; Mon, 19 Jun 2023 17:46:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JHk5sV097562; Mon, 19 Jun 2023 17:46:05 GMT (envelope-from git) Date: Mon, 19 Jun 2023 17:46:05 GMT Message-Id: <202306191746.35JHk5sV097562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: 194e059bb803 - main - service: Add -E option to set environment variables before starting a service. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 194e059bb80334e6f4f791a186015b20d7f6f4b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=194e059bb80334e6f4f791a186015b20d7f6f4b8 commit 194e059bb80334e6f4f791a186015b20d7f6f4b8 Author: Alexander Leidinger AuthorDate: 2022-11-30 18:31:41 +0000 Commit: Alexander Leidinger CommitDate: 2023-06-19 17:45:54 +0000 service: Add -E option to set environment variables before starting a service. This allows for quicker testing/debugging of rc scripts and is a pre-req for automatic service jails. Differential Revision: https://reviews.freebsd.org/D40369 Reviewed by: se --- usr.sbin/service/service.8 | 12 ++++++++++++ usr.sbin/service/service.sh | 23 ++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8 index 9902ae3c8574..c2be0e0af037 100644 --- a/usr.sbin/service/service.8 +++ b/usr.sbin/service/service.8 @@ -48,6 +48,7 @@ .Nm .Op Fl j Ar jail .Op Fl v +.Op Fl E Ar var=value .Ar script .Ar command .Sh DESCRIPTION @@ -67,6 +68,13 @@ the scripts using various criteria. .Pp The options are as follows: .Bl -tag -width F1 +.It Fl E Ar var=value +Set the environment variable +.Ar var +to the specified +.Ar value +before starting the script. +This option can be used multiple times. .It Fl e List services that are enabled. The list of scripts to check is compiled using @@ -117,6 +125,9 @@ to which is how they are set in .Pa /etc/rc at boot time. +If the +.Fl E +option is used, the corresponding variable is set accordingly. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES @@ -126,6 +137,7 @@ command: .Bd -literal -offset -ident service named status service -j dns named status +service -E LC_ALL=C.UTF-8 named start service -rv .Ed .Pp diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh index f056c43d3c98..5f232955bdff 100755 --- a/usr.sbin/service/service.sh +++ b/usr.sbin/service/service.sh @@ -37,21 +37,23 @@ usage () { echo "${0##*/} [-j ] -e" echo "${0##*/} [-j ] -R" echo "${0##*/} [-j ] [-v] -l | -r" - echo "${0##*/} [-j ] [-v] start|stop|etc." + echo "${0##*/} [-j ] [-v] [-E var=value] start|stop|etc." echo "${0##*/} -h" echo '' - echo "-j Perform actions within the named jail" - echo '-e Show services that are enabled' - echo "-R Stop and start enabled $local_startup services" - echo "-l List all scripts in /etc/rc.d and $local_startup" - echo '-r Show the results of boot time rcorder' - echo '-v Verbose' + echo "-j Perform actions within the named jail" + echo "-E n=val Set variable n to val before executing the rc.d script" + echo '-e Show services that are enabled' + echo "-R Stop and start enabled $local_startup services" + echo "-l List all scripts in /etc/rc.d and $local_startup" + echo '-r Show the results of boot time rcorder' + echo '-v Verbose' echo '' } -while getopts 'j:ehlrRv' COMMAND_LINE_ARGUMENT ; do +while getopts 'j:E:ehlrRv' COMMAND_LINE_ARGUMENT ; do case "${COMMAND_LINE_ARGUMENT}" in j) JAIL="${OPTARG}" ;; + E) VARS="${VARS} ${OPTARG}" ;; e) ENABLED=eopt ;; h) usage ; exit 0 ;; l) LIST=lopt ;; @@ -72,6 +74,9 @@ if [ -n "${JAIL}" ]; then [ -n "${RCORDER}" ] && args="${args} -r" [ -n "${RESTART}" ] && args="${args} -R" [ -n "${VERBOSE}" ] && args="${args} -v" + for var in ${VARS}; do + args="${args} -E ${var}" + done # Call jexec(8) with the rebuild args and any positional args that # were left in $@ @@ -171,7 +176,7 @@ cd / for dir in /etc/rc.d $local_startup; do if [ -x "$dir/$script" ]; then [ -n "$VERBOSE" ] && echo "$script is located in $dir" - exec env -i -L -/daemon HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin "$dir/$script" "$@" + exec env -i -L -/daemon HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin ${VARS} "$dir/$script" "$@" fi done From nobody Mon Jun 19 18:33:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlJLl4HlSz4g1gY; Mon, 19 Jun 2023 18:33: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 4QlJLl3tRZz43PV; Mon, 19 Jun 2023 18:33:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687199631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2EULLuh3Ypapucy67dKYBWJpJhCfAmeBuB4UAKyH2yM=; b=ywlK9UfGUIqX7kM+JAtbd7npobQ4IeEuRTf6zMiB5Ez8Wy62B1qyszNq7Q82TaPx4RRjTe N+LrNbRT5ORpGSfIHQPH6WSWtVrC5SpSYgAsOYVuCf+AVj7LrK3uITPlGsHxHBalAAlB/B OToCxT4mZ1XXFVVMxkM4Zzj2EZT1BJaP4TAem8IMYfSknM3h5/ihEUb7er/2hHhghKPQK3 kDuqsmr7imGRmMEUGXQQO2z75AXBT/DngrmKeT9gXwAMS+ErQ74kXyqQ/6O6DAIlfx8R16 KjCe9TYFaXFh9PzB/J86OvV4yh/XhLTevbZ6dORI7jkF94bh3dOi1A/mLuGOuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687199631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2EULLuh3Ypapucy67dKYBWJpJhCfAmeBuB4UAKyH2yM=; b=oeiGqw7ndqk5KIG+a4wRRlNc1a5BQRe9vL4v4uKBTZuIvfnUKFuhgr/aU9FDXhZydi/m1K HxAhmSaEuGU5tBhbQh7i7X2y9VYb3RBauPoqE6hK0W/1PgtcaIH3Cn76K2Lci2Y5rp14JQ asET58lk9At2CVk1wcwOPnFni7Ztyeq8LLodb+zbQntArVRHq/Qw79KOlaMgc8Ay74JPe8 EM0WL46GOfjz9KVi7HNHNxWjj/CsA2eLOIeE8C6gQGl8sw6OWWppcpERuK3j5Up8RlB/uN jxKvHDLAbM5kRXto33v6GVIm6Tx9BAMaUt3tJiIfHWgF3PLn2qXlPdpHn8HbVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687199631; a=rsa-sha256; cv=none; b=TZGYqjCelju7Ejf2rvoaUG0tRfxbOXPgSMn1VEnO0Tgahn+lOaUHJMctAq370h5iJXekf0 Dn/esCeulgFUIn03dyDxefDcMTS7mBvkEDnLBFjfqdCj1GLOmVpOBNl3y1UmWnQDZ08amp kz6lile9pfnL+OMAhPL+WJs18LVDx1sG5X6itwa5zsKgMRw3E/AXBRKurUqwSx5Bv66R9l R7DCt1giz08w6zrw0vmBHgStU72uB383WO6b9p8geN4vLOSQ16sMwEJI/acudqMu3oOEGI D91jCWS3cwd7VpA77U07BzvvOkJ0PcTqCoIjeTxWTDb3sj3ralxlDTuadxgwmQ== 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 4QlJLl2yqHzSbp; Mon, 19 Jun 2023 18:33:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JIXpFF079938; Mon, 19 Jun 2023 18:33:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JIXp3h079937; Mon, 19 Jun 2023 18:33:51 GMT (envelope-from git) Date: Mon, 19 Jun 2023 18:33:51 GMT Message-Id: <202306191833.35JIXp3h079937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: dbbaf77801a8 - main - Apply llvm fix for hanging gcc builds on 32-bit arm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: dbbaf77801a8f30e49731395e85757f339f345bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=dbbaf77801a8f30e49731395e85757f339f345bf commit dbbaf77801a8f30e49731395e85757f339f345bf Author: Dimitry Andric AuthorDate: 2023-06-19 18:32:40 +0000 Commit: Dimitry Andric CommitDate: 2023-06-19 18:33:33 +0000 Apply llvm fix for hanging gcc builds on 32-bit arm Merge commit 962c306a11d0 from llvm-project (by Florian Hahn): [LV] Don't consider pointer as uniform if it is also stored. Update isVectorizedMemAccessUse to also check if the pointer is stored. This prevents LV to incorrectly consider a pointer as uniform if it is used as both pointer and stored by the same StoreInst. Fixes #61396. PR: 271992 Reported by: John F. Carr MFC after: 3 days --- .../llvm/lib/Transforms/Vectorize/LoopVectorize.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp index 5fd4e45d80fb..9d95cb25efa0 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -4627,11 +4627,17 @@ void LoopVectorizationCostModel::collectLoopUniforms(ElementCount VF) { WideningDecision == CM_Interleave); }; - // Returns true if Ptr is the pointer operand of a memory access instruction - // I, and I is known to not require scalarization. + // I, I is known to not require scalarization, and the pointer is not also + // stored. auto isVectorizedMemAccessUse = [&](Instruction *I, Value *Ptr) -> bool { - return getLoadStorePointerOperand(I) == Ptr && isUniformDecision(I, VF); + auto GetStoredValue = [I]() -> Value * { + if (!isa(I)) + return nullptr; + return I->getOperand(0); + }; + return getLoadStorePointerOperand(I) == Ptr && isUniformDecision(I, VF) && + GetStoredValue() != Ptr; }; // Holds a list of values which are known to have at least one uniform use. @@ -4679,8 +4685,8 @@ void LoopVectorizationCostModel::collectLoopUniforms(ElementCount VF) { if (isa(I) && Legal->isUniformMemOp(I)) addToWorklistIfAllowed(&I); - if (isUniformDecision(&I, VF)) { - assert(isVectorizedMemAccessUse(&I, Ptr) && "consistency check"); + if (isVectorizedMemAccessUse(&I, Ptr)) { + assert(isUniformDecision(&I, VF) && "consistency check"); HasUniformUse.insert(Ptr); } } From nobody Mon Jun 19 19:54:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlL7t3VbPz4fcbC; Mon, 19 Jun 2023 19:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlL7t34Vfz3v72; Mon, 19 Jun 2023 19:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687204474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01SRApkALunZy5c+p8sUS4SRmaceM3CfnIAfXOw5YCI=; b=PYeerniPnsttvVOSaLzquER9ctEIDrmbp0keSR/+w2HBQCG6/BY7laTbYNfCrrqGYWz+8Z B8m0rSfGiQt3DnlDk7EMmuLsJzPzf3JTPUiEUCEuryPyXM2gO3bgN4asLOXJ8ox34Xvapc LhwSUHXVxFuK3Hp+lJLtGf5UBzCRhqcGvGLVySnSsQ3NDKO4lsBbHgMzcUr9U9Z5Tq4QDk 814ATvuKcawnLK5qPCSRfyJ7VCLhc89O+4iZS8O6NaQu3kRspz1DrCbVJ7lyq7mIZXcgf8 uHvB5UJaTElPN/T4MxhhxJGMAy/82Gg4aCDLIhMJQIRs+Cjx/tkSFJ2YAJGg7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687204474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01SRApkALunZy5c+p8sUS4SRmaceM3CfnIAfXOw5YCI=; b=f4FOxRdzRAJjolV58Wi2c4LiIQJqqdEvNXKex2+CozX5pPgFlfdSV3D/oFFDCTyfV0+Z/b /OfFtykSra6ZF4EdqjkfKGIqnqFcbo4GLysc3mCbXwv2dq8i4/G+p0d18UM0tWWC6+Axes QmMRv7A259eL97YO1Kz2/w/N2GNnQBlFy68gwYG1ItPxI7xdMvPwez6quVeGeYUxd3rwK+ WDoE6OTURMX1d97Lgmc7rpi+R8zICzg+TISrCkHp7Icjzp2AmnpDoFJgft7GnuKHAdzRTF SEyqp3k2wAVf4bV1C/TMoCTTPw71hmcstwtZRRgV2OOVORo67idG9jSyMcxvsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687204474; a=rsa-sha256; cv=none; b=DoXpjaLK882+KFgOETyOvRqK0t4gAEgOlOBIHYJOpGfTWSC/eVn3m9Bi0IRAWAIYrxV0CR zKyhd/pAjlReUhw8wo99bcaNPFSwn5Bmdy/iGYJ9VXaMhFK7Sce/5i8hy0UjRcOI2qyXkZ zV38czOdo95P4gXIXD5poVwFtAodwDM/Jw3GfA3UKkEIFQsY2qo1NBVpENiifUwy56zQCC H/smPXX4UodrmsJ+hLVBLeholybbPcG7f9mV4/AORKoqIDJ14xKiPatm8IWo5dwKmWxnxB 3EISb5wDwATED/wS5UNuhXvY3UED8i9WPQgo07BtfBs5YPcyGDrXOYTmWlfk1A== 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 4QlL7t2922zVkl; Mon, 19 Jun 2023 19:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JJsYTL012890; Mon, 19 Jun 2023 19:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JJsYXZ012889; Mon, 19 Jun 2023 19:54:34 GMT (envelope-from git) Date: Mon, 19 Jun 2023 19:54:34 GMT Message-Id: <202306191954.35JJsYXZ012889@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6d1dfc87416f - main - bhyve: Remove some unneeded includes of segments.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d1dfc87416f451164e79ebdc4a0fb53b001bfd9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6d1dfc87416f451164e79ebdc4a0fb53b001bfd9 commit 6d1dfc87416f451164e79ebdc4a0fb53b001bfd9 Author: Mark Johnston AuthorDate: 2023-06-08 21:24:45 +0000 Commit: Mark Johnston CommitDate: 2023-06-19 19:44:44 +0000 bhyve: Remove some unneeded includes of segments.h They are not needed and are specific to x86. No functional change intended. MFC after: 1 week Sponsored by: Innovate UK --- usr.sbin/bhyve/inout.c | 1 - usr.sbin/bhyve/snapshot.c | 1 - usr.sbin/bhyve/task_switch.c | 1 - 3 files changed, 3 deletions(-) diff --git a/usr.sbin/bhyve/inout.c b/usr.sbin/bhyve/inout.c index 2ac6407c0c3d..a743647287d4 100644 --- a/usr.sbin/bhyve/inout.c +++ b/usr.sbin/bhyve/inout.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 58ae29782b43..31c5e76cecef 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/task_switch.c b/usr.sbin/bhyve/task_switch.c index 17b311d8f211..f6bf7210f46c 100644 --- a/usr.sbin/bhyve/task_switch.c +++ b/usr.sbin/bhyve/task_switch.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include From nobody Mon Jun 19 19:54:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlL7v5G60z4fcST; Mon, 19 Jun 2023 19:54: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 4QlL7v4V1sz3vJQ; Mon, 19 Jun 2023 19:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687204475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PR/wZu08Nokque4YEk3eKHfUF8i7h6V/rEWcu5EZ+2c=; b=XoLR4a+Ni2AngCcIshS0plwthOHUqlnhbm7drCxuypyTRZyjYAswos9lp+c6wTFoEO7Zak e+KXxCSyNbbDM0qHoXx8K3vPq+QoOWs87NjaMXQseofC2VL6iXrBeCAVCB5B5DuA95YkCC 7khFgJEL4RXd0muIOjeuuhLcTX6vAcj8MTVHzhifwhsSannpk2tX1kjKBPu/1862nNcXgP oOMGCZDQWIunnMeUA9Omn7LqXuJPAibNDf/0EVq3ArtEHA/zKFl9X8uXbTErEgM1m0FP/x F+WR0oiDiIET/31Zq9EEZZ/HS4CeVlM/vsbQkZP9ca7inYSxZet9zbS3QnDDRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687204475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PR/wZu08Nokque4YEk3eKHfUF8i7h6V/rEWcu5EZ+2c=; b=hFdQL96Lx+HLhS17Yc9XnVB5VhI1OdwqlMYbIV8eG2NioesFQutlVkyy/Qb5HsGA/Wby/d aGOQIw3M7vgY+pWOlsPjT8uoVBmF0FOIWZhgRTzi3qtcXGJpFtHvQdxcHv1xWU+VAbD3OJ 8aqgNQBwCxat5VlZrb5lpI9FvkkvkfdQOMZmuIKK7VUvom3ot7lt+pGKGufiGWC+Nn8WIu 9pGzdF4fo17c5BMcpKKq+EUlGWakz05E8RUvQaY7PPE3Lqj7ZG338YomHBg4wLiCazxXGI VIAJjnAWYtYnXZ4eu4eFWXYjl8ta+Fp+Vf57f5LsOlKmwTU3BD+LBx1KYd9v5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687204475; a=rsa-sha256; cv=none; b=QXrgh1z2m3cV3imrtxGiw+zC31r06S/RRkqXFD+7vMUydYUhPCuTwUJd2xB96xHvPTW7gS bC643Efzw2+RjdokVLtndLFw6eyal0FT6JnsMNiuNEAvWD7yYj41QzCe7ik2Lc0UPBbL/8 bsKX1Y5oTXIujV1MJ6o1xpuI+RRg2T3FNa7rNHvJdjVo5g6+RXu+Y01IR4bJxt/0r2AeMa AFCrJKBg3QfKh1J1jKpWdGfm75zl4F/ByHL69WsoEcdxQXY2cPUdFfCLA0icK/nXmCxa8G aGX+JO8LbDQ1YAzfp8p0QQMSYgg6VOkZT7eQmaPCf1b3kESFuhE5Jz9d0rWPDg== 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 4QlL7v34VpzVb7; Mon, 19 Jun 2023 19:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JJsZP5012918; Mon, 19 Jun 2023 19:54:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JJsZ4e012917; Mon, 19 Jun 2023 19:54:35 GMT (envelope-from git) Date: Mon, 19 Jun 2023 19:54:35 GMT Message-Id: <202306191954.35JJsZ4e012917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1da1a2643649 - main - bhyve: Include vmm.h via the usual path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1da1a2643649ef83a5ddb2df16010dd2a48c1347 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1da1a2643649ef83a5ddb2df16010dd2a48c1347 commit 1da1a2643649ef83a5ddb2df16010dd2a48c1347 Author: Mark Johnston AuthorDate: 2023-06-08 21:25:25 +0000 Commit: Mark Johnston CommitDate: 2023-06-19 19:45:19 +0000 bhyve: Include vmm.h via the usual path No functional change intended. MFC after: 1 week Sponsored by: Innovate UK --- usr.sbin/bhyve/kernemu_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/kernemu_dev.c b/usr.sbin/bhyve/kernemu_dev.c index b3986cfc152b..d66c5b7d2b70 100644 --- a/usr.sbin/bhyve/kernemu_dev.c +++ b/usr.sbin/bhyve/kernemu_dev.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include struct vm; struct vm_hpet_cap; From nobody Mon Jun 19 19:54:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlL7x12Brz4fcvC; Mon, 19 Jun 2023 19:54: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 4QlL7w52QZz3vTq; Mon, 19 Jun 2023 19:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687204476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/GWKzFcVy5kLjApWAsLApHCtTtw2z0gRw/Nikf1hn7I=; b=NJDn6M/c2RyUpBItj6xoVZfqV3bmgbDqTolYcePN/pnERuy8x5eU8fYiW8e08Fpo4C29MB eB3yShncNJ3q1Lvr5NUCwwQUDpCF0EvV/FCaLSrCibom7Zw+eJ3H7d8tOdUAacBDoTalOu HZ9P/q1OWVT7zPgK94NH0pJyko0WxEk2YHJUrZpmLI6aMnwTv7EFB/dfWieqRjK36Ngyqx uatke8k3Y4DUR9pculOoJIJ9LypL3ysErxzr2JE9XIY5FIB0UxQpvwKpePQivsKqGVJUCr FS44KXVS6m+W9pLWaDMIWjQ74DKePA6ixkH5Bar1ZynVLjT2deRYaxVDC7K2/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687204476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/GWKzFcVy5kLjApWAsLApHCtTtw2z0gRw/Nikf1hn7I=; b=PEAprgSBKkuR7vgIGAEaELpoUCrcVMNLGxfRtfXRPtihNyTXRvZfaPSTynGYQlv/JF8CAc NcwRi/gUaOen7drZ1PEHPSpfpxZ9S+p1YMSHfR3YdIe0Lc4qJsa9NJaYlVAx6O7GbnL+Zf 5Vr6kpZR33/H0qDAAkrCbP0+hwlMyn+VaMf8+7Qw9RfCJK9btYULHsMi6TMdrZ9A+C4Rju /5wxVAAddrU508UA3b4C+eKY7EYa52pu17FdUuIWnhYtyY7drKnGb0rjQkSgYCytkcTVv8 GL+Pnh0cT0xY7nj2HLz/qmTgttYHdbSSk4zoTXD/yIEqteuBmjAWWfPwU9435A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687204476; a=rsa-sha256; cv=none; b=ShPNO5afOVbLTOtWfmUCjixS5ONXkiV48U4ywii0cM2N7SsCVOus0XFCWikQPnh0zp6CZk zhalGox5icjYkLaBFRbVligUDPY6w/MPPycIS6CU0H+8aaKAnE74n8E45xEah1UDlOfqqS SF4Y3+QpyPQO+GBQ5JkwAs96UtliXnPZ1qzMPJBO6RTzlNePxErRkjNP5xnkGbBpETJqlH LrRSMKy2DYkr0ZOs1QGfL+2pAwKshC1zdoh/SPX2lCi6jwpmWJjgTAwIdx/Sr1zJaMQOfz HzWVuDukvfr78/qDqVdthEFDpIepADy6V5hB5SOSuAdXil5R8/+NY3vdHm1+uw== 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 4QlL7w3zrDzVh6; Mon, 19 Jun 2023 19:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JJsaUb012938; Mon, 19 Jun 2023 19:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JJsasK012937; Mon, 19 Jun 2023 19:54:36 GMT (envelope-from git) Date: Mon, 19 Jun 2023 19:54:36 GMT Message-Id: <202306191954.35JJsasK012937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 15c1f0cc2c1f - main - bhyve: Register hlt and pause vmexit handlers unconditionally List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15c1f0cc2c1f991fc3895d2a96f48705604d1987 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=15c1f0cc2c1f991fc3895d2a96f48705604d1987 commit 15c1f0cc2c1f991fc3895d2a96f48705604d1987 Author: Mark Johnston AuthorDate: 2023-06-19 19:46:02 +0000 Commit: Mark Johnston CommitDate: 2023-06-19 19:46:02 +0000 bhyve: Register hlt and pause vmexit handlers unconditionally These exit handlers might not be used if the corresponding VM capabilities are not set, but there is no harm in putting them into the handler table regardless. Doing so simplifies initialization code, makes it easier to split vmexit handlers into a separate file, and lets us declare the handler table as const. Reviewed by: corvink, jhb MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40572 --- usr.sbin/bhyve/bhyverun.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index f5365a352d07..888fbe1cd8fc 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -930,7 +930,7 @@ vmexit_ipi(struct vmctx *ctx __unused, struct vcpu *vcpu __unused, return (error); } -static vmexit_handler_t handler[VM_EXITCODE_MAX] = { +static const vmexit_handler_t handler[VM_EXITCODE_MAX] = { [VM_EXITCODE_INOUT] = vmexit_inout, [VM_EXITCODE_INOUT_STR] = vmexit_inout, [VM_EXITCODE_VMX] = vmexit_vmx, @@ -946,6 +946,8 @@ static vmexit_handler_t handler[VM_EXITCODE_MAX] = { [VM_EXITCODE_DEBUG] = vmexit_debug, [VM_EXITCODE_BPT] = vmexit_breakpoint, [VM_EXITCODE_IPI] = vmexit_ipi, + [VM_EXITCODE_HLT] = vmexit_hlt, + [VM_EXITCODE_PAUSE] = vmexit_pause, }; static void @@ -1012,7 +1014,7 @@ num_vcpus_allowed(struct vmctx *ctx, struct vcpu *vcpu) } static void -fbsdrun_set_capabilities(struct vcpu *vcpu, bool bsp) +fbsdrun_set_capabilities(struct vcpu *vcpu) { int err, tmp; @@ -1023,8 +1025,6 @@ fbsdrun_set_capabilities(struct vcpu *vcpu, bool bsp) exit(4); } vm_set_capability(vcpu, VM_CAP_HALT_EXIT, 1); - if (bsp) - handler[VM_EXITCODE_HLT] = vmexit_hlt; } if (get_config_bool_default("x86.vmexit_on_pause", false)) { @@ -1038,8 +1038,6 @@ fbsdrun_set_capabilities(struct vcpu *vcpu, bool bsp) exit(4); } vm_set_capability(vcpu, VM_CAP_PAUSE_EXIT, 1); - if (bsp) - handler[VM_EXITCODE_PAUSE] = vmexit_pause; } if (get_config_bool_default("x86.x2apic", false)) @@ -1130,7 +1128,7 @@ spinup_vcpu(struct vcpu_info *vi, bool bsp) int error; if (!bsp) { - fbsdrun_set_capabilities(vi->vcpu, false); + fbsdrun_set_capabilities(vi->vcpu); /* * Enable the 'unrestricted guest' mode for APs. @@ -1432,7 +1430,7 @@ main(int argc, char *argv[]) exit(4); } - fbsdrun_set_capabilities(bsp, true); + fbsdrun_set_capabilities(bsp); /* Allocate per-VCPU resources. */ vcpu_info = calloc(guest_ncpus, sizeof(*vcpu_info)); From nobody Mon Jun 19 19:54:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlL7y0Wb6z4fchb; Mon, 19 Jun 2023 19:54: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 4QlL7x5qGfz3vZx; Mon, 19 Jun 2023 19:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687204477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFtJoFSZ0CWRim1pRA81Iyv2Ca3AkF05viQwZULNaac=; b=gAHa5r3VHpnptBbbDcqNO2FH+QW2/Pa6BYiXwrdT1fCd2+LqVXW1QXZUSHYBexVZPX5sf8 8RbIeF8eQ3LlJb1AnQTKIUee1QrXXGkkIaX8vyvzVwfHnAJ+vxu2oldR6EVrKwlc0qrw0e kmaQLhcrCNtFOYapakIn+RwGqlz1K1DlX+A78wJdqQ3UsRDpREfVno1DRXqowxL9WvbEgA Ca5uz35fB1E91kklAE47TtJDbibPQRuISJfMCXAUGLJN2nsvo4POJeTHJWxptcJWdsprnM 7DvqpyJ+QeOwOB7oCB+Nh7TwMzW/faXxyYQ1m1z/QqlTEZjQGSLZkD4gGrHUDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687204477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFtJoFSZ0CWRim1pRA81Iyv2Ca3AkF05viQwZULNaac=; b=cJBswBOgiX+OP3KtrxBACpT4YlQz7ZL+SIIKd8sWBJ8J8VripHLyM+YnEQn6qfjHWBoepb ooZPGsEQK+9pXY5LKPgBlWBjyYGdcGaEFoMv16FvuYvsl182RrcAof7YeYiCvW3VJoSVI0 +yYC9zuVpHRYtCU+MKrNKhrZMwkkCEm4GRwrPoz9viP3Q47nt1KSBeqzmQ2JSL44CUJ+71 PtW9FB5b4MDCjPYe0fhfGPBqDLEtu12b8ALwWDF99LH3Tc+aDp7jbAH2j2M0p5LuJFHrdE OiWx/Pl6V0C2XK/kPBIitb7jxriT/ssogAQz1AdTMrCjsclt1796UHIkOtTaKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687204477; a=rsa-sha256; cv=none; b=SyXqCe9ae4XPpTydeUn+hHGpHuDyeuol6T9ClQJQebQtN31ohSYS+0wvjzEOpUpNGQJAeD s1ZhexVtnBVARq6qha2RCbjkvkvfJwK4gSiDPO+tfMTJ8qWTn4AkovaTBbddErLd6LA98q kLdDIQ6sFA6NNFJdKkJ4kv/FwfNV7TdtqBK9+Vho2kZ8gT/rAYYgjPMcHZ6eq6rf6FxbXp HMjXz8D/jwDaNzy31dJTcFkhZhOvf7th0wqqs0YlLRhEhof3Gg3vjsBwfsYTwqiKkSEgxZ 0L4TsptIdMLLb1EQ0v3+g1BX5ryJynG8uaTAeznpYkJHeLXI0/7NQ74gRp8d0A== 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 4QlL7x4wc3zVkm; Mon, 19 Jun 2023 19:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JJsbbV012957; Mon, 19 Jun 2023 19:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JJsbDD012956; Mon, 19 Jun 2023 19:54:37 GMT (envelope-from git) Date: Mon, 19 Jun 2023 19:54:37 GMT Message-Id: <202306191954.35JJsbDD012956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: eb9fac0edbc7 - main - bhyve: Refactor vmexit_suspend() a bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb9fac0edbc7ed5435f693ba3d3826363d8a7110 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb9fac0edbc7ed5435f693ba3d3826363d8a7110 commit eb9fac0edbc7ed5435f693ba3d3826363d8a7110 Author: Mark Johnston AuthorDate: 2023-06-19 19:46:32 +0000 Commit: Mark Johnston CommitDate: 2023-06-19 19:46:32 +0000 bhyve: Refactor vmexit_suspend() a bit Move some of its logic into fbsdrun_deletecpu(). This makes it easier to split vmexit handlers into a separate file, which in turn makes landing arm64 support easier. Also increase the scope of the mutex and use it to synchronize updates to the vcpu mask. No functional change intended. Reviewed by: corvink, jhb MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40573 --- usr.sbin/bhyve/bhyverun.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 888fbe1cd8fc..9eef1ea7225d 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -553,17 +553,31 @@ fbsdrun_addcpu(struct vcpu_info *vi) assert(error == 0); } -static int +static void fbsdrun_deletecpu(int vcpu) { + static pthread_mutex_t resetcpu_mtx = PTHREAD_MUTEX_INITIALIZER; + static pthread_cond_t resetcpu_cond = PTHREAD_COND_INITIALIZER; + pthread_mutex_lock(&resetcpu_mtx); if (!CPU_ISSET(vcpu, &cpumask)) { fprintf(stderr, "Attempting to delete unknown cpu %d\n", vcpu); exit(4); } - CPU_CLR_ATOMIC(vcpu, &cpumask); - return (CPU_EMPTY(&cpumask)); + CPU_CLR(vcpu, &cpumask); + + if (vcpu != BSP) { + pthread_cond_signal(&resetcpu_cond); + pthread_mutex_unlock(&resetcpu_mtx); + pthread_exit(NULL); + /* NOTREACHED */ + } + + while (!CPU_EMPTY(&cpumask)) { + pthread_cond_wait(&resetcpu_cond, &resetcpu_mtx); + } + pthread_mutex_unlock(&resetcpu_mtx); } static int @@ -818,9 +832,6 @@ fail: return (VMEXIT_ABORT); } -static pthread_mutex_t resetcpu_mtx = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t resetcpu_cond = PTHREAD_COND_INITIALIZER; - static int vmexit_suspend(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) { @@ -834,19 +845,6 @@ vmexit_suspend(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) fbsdrun_deletecpu(vcpuid); - if (vcpuid != BSP) { - pthread_mutex_lock(&resetcpu_mtx); - pthread_cond_signal(&resetcpu_cond); - pthread_mutex_unlock(&resetcpu_mtx); - pthread_exit(NULL); - } - - pthread_mutex_lock(&resetcpu_mtx); - while (!CPU_EMPTY(&cpumask)) { - pthread_cond_wait(&resetcpu_cond, &resetcpu_mtx); - } - pthread_mutex_unlock(&resetcpu_mtx); - switch (how) { case VM_SUSPEND_RESET: exit(0); From nobody Mon Jun 19 20:47:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMJS1YRyz4fjvX; Mon, 19 Jun 2023 20:47: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 4QlMJS0zRKz4R4p; Mon, 19 Jun 2023 20:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3rCGwzoaUA4YwRkfs+SnrugGxnhr5iIalu49sEB3tY=; b=m9OfKoNkdCQp/6q2Z+k//jgOH4Ix10mrpaLhVCAdUKwHNSkfk6n8X8DkChVlfXGV1pZIOx m8e05VBwJqIc9jOCHZqDqnv2uK2Pv4UaFfcz5eCBRnEr1qcRh6+OM41MEdHfQjH+Na6Rm8 1G3WxRv+qCyCWr6PABQKEnC32nQLeMunpCX1I1IffrmrXN5rh7KcRC1DRWAb5tqFjAGYcJ GiWxNLrhFH30CrPbI/GKGX0CK38t3uRURxbetR06/UQAarLXIc2b9AAtjrZniVKQ8q04Rl WjI8aZpp1CYLhm/TR6KFpDCJ3NEy77pGts0aIicZbJth1snD+9jYqAMvzntVXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3rCGwzoaUA4YwRkfs+SnrugGxnhr5iIalu49sEB3tY=; b=Ht8yssNjxoHHTwgw+GYC5C5Z7XdydEtK0U0xXPD5+nudI8mT8J2pPEbzflI+d+58StpZRY YOAzl/SCJVg00Vwoih9/ydCl0iPWrTxTJ2G03h7XzZZatmnyUEOoeWl/kwlqT+KbG5Sad8 CvC/bqmoxsssGb90h1EPfgrEkY11Tv1wmpIREe6oXfM3m3zuGT87E6zFX3O0qzy+aFX33C w4MOl7RDpofRTitTM/gIq17g3PoW4X5NjAST0yXuf8o40xz0uglqzmFuQoK542RrIrngMO ZNLwjtTTynIfqR5e5N6L+QCRIlFtUuUsr77KH5CRYszqVAZkZPQFVJTPMfdOeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687207624; a=rsa-sha256; cv=none; b=aZANuX9n+mOERbjFme9mOlTEzuf4UwrhxILiU/sh0jHKE7is1qPNfCuUzVpZR6+KNhe6v0 2kScrJIZVRMuPL2wlkeeDeMxokcd3qlo6hBlrt3iy+gYadLkCIKnt6zO4ZoHob+eSuJ1f8 +LR4Y4yoKUl+/FyYEnoVqkXHSBms+HUComwjGNTh9OpGGIXHFypXdMUmLuAGNbzF9V9Exu MbJGKQ1eAQAY5T/tRiIFOU5pacNO2UubHhAxY1SBRgqz4bZtWcqmn2tDubrShWN3vlkKmu e7gC2LC3RqwklH27wbb8mgEp0VqfTOg9CqbrwcP5wvTY+Gz1nnVH8D39AqXX3w== 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 4QlMJR73fSzXBn; Mon, 19 Jun 2023 20:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKl3VM095680; Mon, 19 Jun 2023 20:47:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKl3B1095679; Mon, 19 Jun 2023 20:47:03 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:47:03 GMT Message-Id: <202306192047.35JKl3B1095679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8259fc46ac37 - main - camcontrol: Label the unused command args List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8259fc46ac37e56eb819760b611be9564793dc00 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8259fc46ac37e56eb819760b611be9564793dc00 commit 8259fc46ac37e56eb819760b611be9564793dc00 Author: Warner Losh AuthorDate: 2023-06-19 20:42:48 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:45:43 +0000 camcontrol: Label the unused command args Remove CAM_ARG_FORMAT_{BLOCK,BLI,PHYS} since they are not used. Label all the unused CAM_ARG_ bits as unused in comments to make them stand out. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40520 --- sbin/camcontrol/camcontrol.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 55a6ba93c99b..49786dae9ffe 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -123,18 +123,21 @@ typedef enum { CAM_ARG_LUN = 0x00000010, CAM_ARG_EJECT = 0x00000020, CAM_ARG_UNIT = 0x00000040, - CAM_ARG_FORMAT_BLOCK = 0x00000080, - CAM_ARG_FORMAT_BFI = 0x00000100, - CAM_ARG_FORMAT_PHYS = 0x00000200, + /* unused 0x00000080 */ + /* unused 0x00000100 */ + /* unused 0x00000200 */ CAM_ARG_PLIST = 0x00000400, CAM_ARG_GLIST = 0x00000800, CAM_ARG_GET_SERIAL = 0x00001000, CAM_ARG_GET_STDINQ = 0x00002000, CAM_ARG_GET_XFERRATE = 0x00004000, CAM_ARG_INQ_MASK = 0x00007000, + /* unused 0x00008000 */ + /* unused 0x00010000 */ CAM_ARG_TIMEOUT = 0x00020000, CAM_ARG_CMD_IN = 0x00040000, CAM_ARG_CMD_OUT = 0x00080000, + /* unused 0x00100000 */ CAM_ARG_ERR_RECOVER = 0x00200000, CAM_ARG_RETRIES = 0x00400000, CAM_ARG_START_UNIT = 0x00800000, @@ -145,6 +148,7 @@ typedef enum { CAM_ARG_DEBUG_XPT = 0x10000000, CAM_ARG_DEBUG_PERIPH = 0x20000000, CAM_ARG_DEBUG_PROBE = 0x40000000, + /* unused 0x80000000 */ } cam_argmask; struct camcontrol_opts { From nobody Mon Jun 19 20:47:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMJT2mJcz4fk9p; Mon, 19 Jun 2023 20:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlMJT28lYz4RBk; Mon, 19 Jun 2023 20:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LHFtlYEjWvngBm3Rvjn7XW2i9sM90r4rj7guJdyx1I=; b=fNm9LZektPhdK5h6n7Lm5UMos+GKSZTETq1KnLGzyfJ6cLJgE5hSa2Kr3ZfpreOUkcs9p5 aEB+dnkUYCCeDtZ1CVFBmmIjMxwf0+XE15S3V/LUEvAe2jmogJOZVg4vYMTD4y2W3AgPNe ugU0h2jaHW9bAmruK17MYAjSb2H6T2mkkAbRT3FDpxh7/CLYh0Icn3SxF3U8GTgZtRchpB WlGXq5IQSTCLy6MhMx9lK/4VJWCzpHmnIXuPWRDAJR4ssFfurUzls3sOid3p3C9A4g5GXS kmW4RkLDzmM/ZTZlOvMlfdk2HFG6Svoouabh8GApRxXvARdu1ZqDALAW7agZeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LHFtlYEjWvngBm3Rvjn7XW2i9sM90r4rj7guJdyx1I=; b=CAJBhfOe4EyToBCJ9Oadzje8P8Kdk3kMAZPBeAevCQwULUIfdjXlAAnSXz5ZqDIV9wisfn phy3lG2KPwl721ugAzICATE/Q7uEQ7HvgRPCese/kHNhNcfmcTFn33cxN9gqPt+7WlQau4 Go+MTiW0ICEzKPsO/j2M5Ej+7UYOztzl0KwmNOb+8OxcSTY4oW7ni1tymAT/nxM5T0sOYF CIdH9KlLwWZKBTWdCwpQa908BzzDGt/T7CTm+NcWrisxFBxguJLjhXRsrLjLv2cBZQUhYw NbH+sOClU6yo1ucZvXsmk6qMUN+Y5+N5ok4wgMEVN8WOzChWDM+6cDE8onOxNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687207625; a=rsa-sha256; cv=none; b=bmEYV6lwySLFyGDfpXR553v9rSvHTLO5qrIoeodgM3FSYwGR6flhIs5/NVYE0B77qpnF9a g0MnDIbYh1GPkMIg61BQyEkr4IIszPscE6KyIn09K4zMZo99iSx4pXkIrzSCKFIlYUB0Lf mQ/DZDZNmFh0B6al/NmNIqCkHaSvGGyySRXBRu739FJC+g+pF0Ab9mUrURb/vnFfhHDTEp DNN7IcmJATdMR0Z08Y93Q399yyLXoOIsG33cEfKNZUR80WC5szn/S7d4SB6Lt3ZgKDW1U1 eI4XDttMLlRuLMN257DMise3SA5zbbe5iDlE9CehPXNfZ5JPIdKdiYIadNWw6A== 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 4QlMJT0hLtzX3X; Mon, 19 Jun 2023 20:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKl4QY095699; Mon, 19 Jun 2023 20:47:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKl4v2095698; Mon, 19 Jun 2023 20:47:04 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:47:04 GMT Message-Id: <202306192047.35JKl4v2095698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fc78fd9dae66 - main - camcontrol: Convert int used as booleans to bools List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc78fd9dae66b90da70cd6c62c4d95f8e6da03f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fc78fd9dae66b90da70cd6c62c4d95f8e6da03f1 commit fc78fd9dae66b90da70cd6c62c4d95f8e6da03f1 Author: Warner Losh AuthorDate: 2023-06-19 20:42:57 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:45:43 +0000 camcontrol: Convert int used as booleans to bools Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40521 --- sbin/camcontrol/camcontrol.c | 77 +++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 49786dae9ffe..0a1245e9cc48 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -3827,11 +3827,8 @@ readdefects(struct cam_device *device, int argc, char **argv, struct scsi_read_defect_data_hdr_10 *hdr10 = NULL; struct scsi_read_defect_data_hdr_12 *hdr12 = NULL; size_t hdr_size = 0, entry_size = 0; - int use_12byte = 0; - int hex_format = 0; u_int8_t *defect_list = NULL; u_int8_t list_format = 0; - int list_type_set = 0; u_int32_t dlist_length = 0; u_int32_t returned_length = 0, valid_len = 0; u_int32_t num_returned = 0, num_valid = 0; @@ -3839,11 +3836,11 @@ readdefects(struct cam_device *device, int argc, char **argv, u_int32_t starting_offset = 0; u_int8_t returned_format, returned_type; unsigned int i; - int summary = 0, quiet = 0; int c, error = 0; - int lists_specified = 0; - int get_length = 1, first_pass = 1; - int mads = 0; + int mads = 0, lists_specified = 0; + bool summary = false, quiet = false, list_type_set = false; + bool get_length = true, use_12byte = false, first_pass = true; + bool hex_format = false; while ((c = getopt(argc, argv, combinedopt)) != -1) { switch(c){ @@ -3860,7 +3857,7 @@ readdefects(struct cam_device *device, int argc, char **argv, if (status == SCSI_NV_FOUND) { list_format = defect_list_type_map[ entry_num].value; - list_type_set = 1; + list_type_set = true; } else { warnx("%s: %s %s option %s", __func__, (status == SCSI_NV_AMBIGUOUS) ? @@ -3878,10 +3875,10 @@ readdefects(struct cam_device *device, int argc, char **argv, arglist |= CAM_ARG_PLIST; break; case 'q': - quiet = 1; + quiet = true; break; case 's': - summary = 1; + summary = true; break; case 'S': { char *endptr; @@ -3895,14 +3892,14 @@ readdefects(struct cam_device *device, int argc, char **argv, break; } case 'X': - hex_format = 1; + hex_format = true; break; default: break; } } - if (list_type_set == 0) { + if (!list_type_set) { error = 1; warnx("no defect list format specified"); goto defect_bailout; @@ -3922,7 +3919,7 @@ readdefects(struct cam_device *device, int argc, char **argv, * This implies a summary, and was the previous behavior. */ if (lists_specified == 0) - summary = 1; + summary = true; ccb = cam_getccb(device); @@ -3934,7 +3931,7 @@ retry_12byte: * if you ask for more data than the drive has. Once we know the * length, we retry the command with the returned length. */ - if (use_12byte == 0) + if (!use_12byte) dlist_length = sizeof(*hdr10); else dlist_length = sizeof(*hdr12); @@ -3983,7 +3980,7 @@ next_batch: valid_len = ccb->csio.dxfer_len - ccb->csio.resid; - if (use_12byte == 0) { + if (!use_12byte) { hdr10 = (struct scsi_read_defect_data_hdr_10 *)defect_list; hdr_size = sizeof(*hdr10); hdr_max = SRDDH10_MAX_LENGTH; @@ -4037,8 +4034,8 @@ next_batch: num_valid = min(returned_length, valid_len - hdr_size); num_valid /= entry_size; - if (get_length != 0) { - get_length = 0; + if (get_length) { + get_length = false; if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_SCSI_STATUS_ERROR) { @@ -4059,10 +4056,10 @@ next_batch: if ((sense_key == SSD_KEY_RECOVERED_ERROR) && (asc == 0x1c) && (ascq == 0x00) && (returned_length > 0)) { - if ((use_12byte == 0) + if (!use_12byte && (returned_length >= max_possible_size)) { - get_length = 1; - use_12byte = 1; + get_length = true; + use_12byte = true; goto retry_12byte; } dlist_length = returned_length + hdr_size; @@ -4077,9 +4074,9 @@ next_batch: * command can support. Retry with the 12 * byte command. */ - if (use_12byte == 0) { - get_length = 1; - use_12byte = 1; + if (!use_12byte) { + get_length = true; + use_12byte = true; goto retry_12byte; } dlist_length = returned_length + hdr_size; @@ -4093,9 +4090,9 @@ next_batch: * error and no data. Retry with the 12 * byte command. */ - if (use_12byte == 0) { - get_length = 1; - use_12byte = 1; + if (!use_12byte) { + get_length = true; + use_12byte = true; goto retry_12byte; } dlist_length = returned_length + hdr_size; @@ -4108,11 +4105,11 @@ next_batch: if (returned_length == 0) dlist_length = SRDD10_MAX_LENGTH; else { - if ((use_12byte == 0) + if (!use_12byte && (returned_length >= max_possible_size)) { - get_length = 1; - use_12byte = 1; + get_length = true; + use_12byte = true; goto retry_12byte; } dlist_length = returned_length + @@ -4128,17 +4125,17 @@ next_batch: CAM_EPF_ALL, stderr); goto defect_bailout; } else { - if ((use_12byte == 0) + if (!use_12byte && (returned_length >= max_possible_size)) { - get_length = 1; - use_12byte = 1; + get_length = true; + use_12byte = true; goto retry_12byte; } dlist_length = returned_length + hdr_size; } - if (summary != 0) { + if (summary) { fprintf(stdout, "%u", num_returned); - if (quiet == 0) { + if (!quiet) { fprintf(stdout, " defect%s", (num_returned != 1) ? "s" : ""); } @@ -4222,7 +4219,7 @@ next_batch: goto defect_bailout; } - if (first_pass != 0) { + if (first_pass) { fprintf(stderr, "Got %d defect", num_returned); if ((lists_specified == 0) || (num_returned == 0)) { @@ -4233,7 +4230,7 @@ next_batch: else fprintf(stderr, "s:\n"); - first_pass = 0; + first_pass = false; } /* @@ -4258,7 +4255,7 @@ next_batch: 0 : 1; sector &= ~SDD_EXT_PHYS_FLAG_MASK; } - if (hex_format == 0) + if (!hex_format) fprintf(stdout, "%d:%d:%d%s", scsi_3btoul(dlist[i].cylinder), dlist[i].head, @@ -4294,7 +4291,7 @@ next_batch: mads = (bfi & SDD_EXT_BFI_MADS) ? 1 : 0; bfi &= ~SDD_EXT_BFI_FLAG_MASK; } - if (hex_format == 0) + if (!hex_format) fprintf(stdout, "%d:%d:%d%s", scsi_3btoul(dlist[i].cylinder), dlist[i].head, @@ -4323,7 +4320,7 @@ next_batch: (defect_list + hdr_size); for (i = 0; i < num_valid; i++) { - if (hex_format == 0) + if (!hex_format) fprintf(stdout, "%u\n", scsi_4btoul(dlist[i].address)); else @@ -4346,7 +4343,7 @@ next_batch: (defect_list + hdr_size); for (i = 0; i < num_valid; i++) { - if (hex_format == 0) + if (!hex_format) fprintf(stdout, "%ju\n", (uintmax_t)scsi_8btou64( dlist[i].address)); From nobody Mon Jun 19 20:47:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMJV3Y3vz4fk0x; Mon, 19 Jun 2023 20:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlMJV2TYGz4RDq; Mon, 19 Jun 2023 20:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BonaccLMMZG2rhjMo/HO3UJPiMdt93mTVZrPBpW3hmE=; b=Ats0rWEBojPZz3hDX6/jqb6QHVMK9W5Sq5wEWUnHlAYIPDJroHrYJXPrgdZxLJXeLp++NR KNsYJimiSiEf1RPhsTNdR7WcAseLPwpVc/yFyMeFszcdaB6vLnFzKQ+O7+Jq8pWXmF5tU2 qG/u0e+1lcN+249BIDBMoSFxJKD5qmIqRHm1r/dzwG+BjmSWuRhvev/QV4olEKBkb3BD48 RgsTmE//9bFfNc99lPZXeLoHoEmYMPbwdBBQ5m2YfPIqYeXkknwyIAY31gsR3LQsvrXLJ+ J+9+RouJUwF7hBkqMS8inABlgE3t49yHgmOWVlaJHJRRdmBkhtM4OBSk8csQqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BonaccLMMZG2rhjMo/HO3UJPiMdt93mTVZrPBpW3hmE=; b=CsK6uCJYor7ZOytXzQu9OPDdErYQxUjxdDeIpeClBhlbxQ5rMXuuwxzC72Vb0maM7ttLw2 fpPuPWRBKbTe9ArDoV1q3DxrixfyB371gqzWTQHcqUX29W/+//nJdqOCyf1acxWfgZgEhJ +tAKvWrXLK7uBQya1lgwDRRMDshJ0XtuDfX6087Uzucixyeb7F0BRIyGeiaesLst2fNKcZ ub0iqWAQm0G4zvgWLFaliAOAMgIeuWLhHv6t807t9y2TYOJLi222Ai2tEs3IyOf4N3GmRx Y60XFunUVojOvJSeDJj+Hfiyl6izVpfR+iDAVdBUO9p4ais5Dfd7EVgGgKbgeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687207626; a=rsa-sha256; cv=none; b=W4+M4y0yageEiNp6+ofPpmacZUVpwzPbQEMJQiop1exZQR+Q3cNUBanVe9qhJN8i16j3NY Ro9YfqC67kjgZeTG0+4cVAsuB2etiNpQbj3DRv7NG9oQnJCfGTRm42f4+RlDD41ChkkoL9 OjQ/Y3tnx5Tqb7elQxW3NpmttAXJvU0W5oC8AMe28jeayc2xzj/A5vlPk1JgDO1C1S9EFJ 0MRyx0k1oVhfmar60A5P6xAJiletsRE8DNc5r9hbWAYT2vVqn0nbGYsACQZCEzNeE0UlGW KKXweYzs6Vj8cWRxzCNV840qt8TMOcSx+a1IaEJRuacx6hkk6tPvEuiqtrYSRA== 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 4QlMJV1R7szXKm; Mon, 19 Jun 2023 20:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKl6Fx095718; Mon, 19 Jun 2023 20:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKl66p095717; Mon, 19 Jun 2023 20:47:06 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:47:06 GMT Message-Id: <202306192047.35JKl66p095717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 97e24c386868 - main - camcontrol: Simplfiy 12-byte retry logic in defects command List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97e24c3868682bcad5d37a5f1679a87b82acd255 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=97e24c3868682bcad5d37a5f1679a87b82acd255 commit 97e24c3868682bcad5d37a5f1679a87b82acd255 Author: Warner Losh AuthorDate: 2023-06-19 20:43:05 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:45:43 +0000 camcontrol: Simplfiy 12-byte retry logic in defects command We always start out using the 10-byte version of READ DEFECT DATA, and then switch to 12-byte when necessary due to errors or data length requirements. We always need to get the length again when we do this, and we're always going to be using 12-byte commands from that point forward. Simplify the logic a bit based on this observation. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40522 --- sbin/camcontrol/camcontrol.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 0a1245e9cc48..c059d64652c5 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -3923,18 +3923,23 @@ readdefects(struct cam_device *device, int argc, char **argv, ccb = cam_getccb(device); -retry_12byte: - /* - * We start off asking for just the header to determine how much - * defect data is available. Some Hitachi drives return an error - * if you ask for more data than the drive has. Once we know the - * length, we retry the command with the returned length. + * We start off asking for just the header to determine how much defect + * data is available. Some Hitachi drives return an error if you ask + * for more data than the drive has. Once we know the length, we retry + * the command with the returned length. When we're retrying the with + * 12-byte command, we're always changing to the 12-byte command and + * need to get the length. Simplify the logic below by always setting + * use_12byte in this case with this slightly more complex logic here. */ - if (!use_12byte) + if (!use_12byte) { dlist_length = sizeof(*hdr10); - else + } else { +retry_12byte: + get_length = true; + use_12byte = true; dlist_length = sizeof(*hdr12); + } retry: if (defect_list != NULL) { @@ -4058,8 +4063,6 @@ next_batch: && (returned_length > 0)) { if (!use_12byte && (returned_length >= max_possible_size)) { - get_length = true; - use_12byte = true; goto retry_12byte; } dlist_length = returned_length + hdr_size; @@ -4075,8 +4078,6 @@ next_batch: * byte command. */ if (!use_12byte) { - get_length = true; - use_12byte = true; goto retry_12byte; } dlist_length = returned_length + hdr_size; @@ -4091,8 +4092,6 @@ next_batch: * byte command. */ if (!use_12byte) { - get_length = true; - use_12byte = true; goto retry_12byte; } dlist_length = returned_length + hdr_size; @@ -4108,8 +4107,6 @@ next_batch: if (!use_12byte && (returned_length >= max_possible_size)) { - get_length = true; - use_12byte = true; goto retry_12byte; } dlist_length = returned_length + @@ -4127,8 +4124,6 @@ next_batch: } else { if (!use_12byte && (returned_length >= max_possible_size)) { - get_length = true; - use_12byte = true; goto retry_12byte; } dlist_length = returned_length + hdr_size; From nobody Mon Jun 19 20:47:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMJW5jy7z4fjxq; Mon, 19 Jun 2023 20:47: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 4QlMJW3kVsz4RLD; Mon, 19 Jun 2023 20:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZMpbD7Y01qIKNGUg1BnAF79OLEXu1+I9/STn04eR2BY=; b=LNEMqF5ot1f9ZFcxe/9H0WyOXFneNfVM2Rq7j2dtIAa8RKSDF1vRt1ejt80NM2PgiqhCpC ZkfmhdkzHhTuxAnzoMm13JgFsElCbtIH9krCOu+ZW+yGzG8/8aHY2BefIqDJX8xIEh1k5N 3v8V9+B1oSjVhWNjEbVY1KGUlrkPiTWTkh6o6aUYLuobFcVeWC9KHs1p65hKFKJi832pse ob9P/QqO/Ai4BsbrU4yo9dU3ozToMCfDO6lrCLveJy3SQFYkdUk55scQ6ThvzQJur2VfWH eej4xIVe8jJDBe0LfQp33sPBCRIrlCFkmAd79CjMdyoZKKB49ZkbPDIo4kikYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZMpbD7Y01qIKNGUg1BnAF79OLEXu1+I9/STn04eR2BY=; b=Jxe8qlrNLvAdrju5/XaKeaxsu2v5pF2dm013lqr67pdGX8DKnz2vmR87wsrui/wtMzVwl4 kPCOe9bUW7Lg0ZyO8l7iq3RPiLauOc+7rXJZ4c0mxi4uEIgHfwOC2EmZKydxmGnOU+LQa6 /9iA2rXvxhh3vNDtr1r8MGpKzS37e4h+i0kQFzG3Eo+Jfo73bkgpU9zh3EMqsVBg0Uy6kI MABl0g8D39b9TtpJg3IxKmedoQKFJWkyAKuO9fSRVbZt4VXKGlAwEgHxwKgjTGlppM0VLA dFeYWrsNwI7j3t/ewJJPVfgmYUwP4IdN43R0zj4YXjK+jkTCmPEnXNhtDJlPSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687207627; a=rsa-sha256; cv=none; b=SuvSd8pzmRsIgUVMNfd/Pd5GHVHIjyU62eA4jvAbXf/hUfizfyuYZbwSb5y1Rq0w4N6Gb4 RKMr5OdIVRF0aqh0r/wHC+QD5WBeCbW16P/xT67RO8PExGilASrEVLqagfOKzIJt+ntcms P4AoHoHl33qfXlX5YeUB92AtlxB6O0D9Vpu7exSEE1YZLWVhPTXpIU6n5YeQGyWSlztBzO Z2PG0+/0n2Cstu55SBXw1upnSaFGsWGe1+/9D0VnHCKBNKr7Nqd+S8aABNXO4XrEqanvpt Ag+dqwy25E1BSTA552d/McupaRGOPDTcC5rekG2ph1sH54Fb2TgxfC62CQ+S3g== 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 4QlMJW2CvrzX3Y; Mon, 19 Jun 2023 20:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKl775095737; Mon, 19 Jun 2023 20:47:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKl795095736; Mon, 19 Jun 2023 20:47:07 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:47:07 GMT Message-Id: <202306192047.35JKl795095736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f20d86e17143 - main - camcontrol: No need to set CAM_ARG_[PG]LIST in defects List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f20d86e1714365ae4d098d101aac302a3572eb1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f20d86e1714365ae4d098d101aac302a3572eb1d commit f20d86e1714365ae4d098d101aac302a3572eb1d Author: Warner Losh AuthorDate: 2023-06-19 20:43:12 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:45:43 +0000 camcontrol: No need to set CAM_ARG_[PG]LIST in defects We can or in the the list_format bits directly if we or in the list_format when we look it up the first time. Free up CAM_ARG_[PG]LIST from the CAM_ARG_xxx enum. Sponsored by: Netflix Reviewed by: mav (I made his suggested change) Differential Revision: https://reviews.freebsd.org/D40523 --- sbin/camcontrol/camcontrol.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index c059d64652c5..487d0d64a969 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -126,8 +126,8 @@ typedef enum { /* unused 0x00000080 */ /* unused 0x00000100 */ /* unused 0x00000200 */ - CAM_ARG_PLIST = 0x00000400, - CAM_ARG_GLIST = 0x00000800, + /* unused 0x00000400 */ + /* unused 0x00000800 */ CAM_ARG_GET_SERIAL = 0x00001000, CAM_ARG_GET_STDINQ = 0x00002000, CAM_ARG_GET_XFERRATE = 0x00004000, @@ -3849,13 +3849,19 @@ readdefects(struct cam_device *device, int argc, char **argv, scsi_nv_status status; int entry_num = 0; + if (list_type_set) { + warnx("%s: -f specified twice", __func__); + error = 1; + goto defect_bailout; + } + status = scsi_get_nv(defect_list_type_map, sizeof(defect_list_type_map) / sizeof(defect_list_type_map[0]), optarg, &entry_num, SCSI_NV_FLAG_IG_CASE); if (status == SCSI_NV_FOUND) { - list_format = defect_list_type_map[ + list_format |= defect_list_type_map[ entry_num].value; list_type_set = true; } else { @@ -3869,10 +3875,12 @@ readdefects(struct cam_device *device, int argc, char **argv, break; } case 'G': - arglist |= CAM_ARG_GLIST; + list_format |= SRDD10_GLIST; + lists_specified++; break; case 'P': - arglist |= CAM_ARG_PLIST; + list_format |= SRDD10_PLIST; + lists_specified++; break; case 'q': quiet = true; @@ -3905,16 +3913,6 @@ readdefects(struct cam_device *device, int argc, char **argv, goto defect_bailout; } - if (arglist & CAM_ARG_PLIST) { - list_format |= SRDD10_PLIST; - lists_specified++; - } - - if (arglist & CAM_ARG_GLIST) { - list_format |= SRDD10_GLIST; - lists_specified++; - } - /* * This implies a summary, and was the previous behavior. */ From nobody Mon Jun 19 20:47:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMJX5gpCz4fkDV; Mon, 19 Jun 2023 20:47: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 4QlMJX4Jmyz4Rh7; Mon, 19 Jun 2023 20:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vXwJzJFMhlWmXiDbs/LCzkd+vZSSfP+R1ha80r3SoHs=; b=S8NaPKJJQEJZVQGAAdxnPeKCCsTf/EHQK10oWVDe+4zwOnTASuyfQul8PlFtvAN9jUpZL3 UMt4wLrutoP9m7rDwSQpD17CQLiyCIBkhzcSuLz+LNDShtjYvLoFyfLV9AaTbYM44rIKPK 1S41h5dniL/7EQbduEDLSIPVMl6HiMyYU4H4GnR63uGO/dCsPCpTmYe/Y8qzmxhGVPAIud 3cX+x4UQKFrDQC86D/DDvR6WhnnKkI4SiEpY/K3d4WExi+6eUttvF31auc/QcPBA8CyQ11 jvWJQeeYttUpUYiUkTkDpwu03rJfrmnXH1P/G1GBDXziePFNgV5aMkjDmiywSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vXwJzJFMhlWmXiDbs/LCzkd+vZSSfP+R1ha80r3SoHs=; b=sczhJK7VrzOMeaHZ0MZB55HynTG8OIWxX6mpakWib8QWfQAIdM1kLtLE/xd6lUJXcLz/aw ByrGWsgTvMv835ffMpqmfvP/d3Y5pkTTcWdGDQCsI/agZzRY3vgeFK6rszG8ed33jDVjLu jpBjuBrdBrO5rAj2/35qT7jVn0msw9HuCaIsHk2tyiy3B5J6FKO6hq+CJNVIsLFhwWLx8O Tu57/9Q+nH9Eg9UnAn2K6gmozapKdhdS72RQTq9S0MuwSgB0LD1EKkJRQAKlz1A4D6Qr5p 6DbQ0FLDYH1v3GaOQbe8tEEg0zHpd5mbOCLcwoqD2sbpu4y/fnz28itNLOCpCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687207628; a=rsa-sha256; cv=none; b=yhZxfz+ZmU+GXF8z1cunyFVo72ZBH80i04sAd4fjw68YijEjDsdKdxhSusxoiDJwUZS/Fn 1XsrKa7Mk7qBo743ESOf32WTYjYcvOLi24uhvYxPRvhI8OgAjrEh0wtKRo5FfU2StFdcC4 SoAWHqlrJpalyLf5SH1hkrXrSr5GLAdhq+RdWBX72P8wj37es71/NEWX2lhrO2W0SFIOa4 JiiqRe+zBWTijJW1nYMRNtvArNN2MPZsMay00Lf8puXxEFwvRS0bRvkHdstxBIN8eUdjwe 5HF5QvVDsUo4Auh1hWyHIKHtGjALWcvKw0xII592Tcq5YQsDbEGC8ajC8n8lbw== 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 4QlMJX3DJwzX3Z; Mon, 19 Jun 2023 20:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKl8Us095763; Mon, 19 Jun 2023 20:47:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKl8Tc095762; Mon, 19 Jun 2023 20:47:08 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:47:08 GMT Message-Id: <202306192047.35JKl8Tc095762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2e105b61e98d - main - camcontrol: simplify summary logic for defects List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e105b61e98d976045f0ec042cfcb5d45504bde0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2e105b61e98d976045f0ec042cfcb5d45504bde0 commit 2e105b61e98d976045f0ec042cfcb5d45504bde0 Author: Warner Losh AuthorDate: 2023-06-19 20:43:30 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:45:43 +0000 camcontrol: simplify summary logic for defects We don't need to count the number of lists requested. Instead, use the more general form of checking to see if any of the non-defect format bits are set. Also, check summary boolean to control summary reporting behavior. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40524 --- sbin/camcontrol/camcontrol.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 487d0d64a969..45b769589da8 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -3837,7 +3837,7 @@ readdefects(struct cam_device *device, int argc, char **argv, u_int8_t returned_format, returned_type; unsigned int i; int c, error = 0; - int mads = 0, lists_specified = 0; + int mads = 0; bool summary = false, quiet = false, list_type_set = false; bool get_length = true, use_12byte = false, first_pass = true; bool hex_format = false; @@ -3876,11 +3876,9 @@ readdefects(struct cam_device *device, int argc, char **argv, } case 'G': list_format |= SRDD10_GLIST; - lists_specified++; break; case 'P': list_format |= SRDD10_PLIST; - lists_specified++; break; case 'q': quiet = true; @@ -3916,7 +3914,7 @@ readdefects(struct cam_device *device, int argc, char **argv, /* * This implies a summary, and was the previous behavior. */ - if (lists_specified == 0) + if ((list_format & ~SRDD10_DLIST_FORMAT_MASK) == 0) summary = true; ccb = cam_getccb(device); @@ -4215,7 +4213,7 @@ next_batch: if (first_pass) { fprintf(stderr, "Got %d defect", num_returned); - if ((lists_specified == 0) || (num_returned == 0)) { + if (!summary || (num_returned == 0)) { fprintf(stderr, "s.\n"); goto defect_bailout; } else if (num_returned == 1) From nobody Mon Jun 19 20:47:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMJY6pkWz4fk5s; Mon, 19 Jun 2023 20:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlMJY59Dvz4RlG; Mon, 19 Jun 2023 20:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EASrKmf9GGTPQ4cIFdfFzuVGSSoaDHAssLGxgvmX0Fs=; b=QqM6Agpi4rpHOxR/3mj3QtPCX8wYNGrv4vypWpIrOQBfzPFvgdIL8yezvanW/Lg9DuBRoF fenC66kmDQ2MUH95Whm0ehIz9YGLPltaDt81IKSCouN59wTvPRXmdxMZ0rZwRxE/Ur0xck DrndfnCvBBYacKWrgL0HfHj9KqVWvyduPi26Mpz/0Gzt5ICJlumaO8i+vl3F0aAFic1E56 wC1N7bgI6/FGBuSXrdleps0mYvxCpGxNuL0NTk60nk39PWWgrSEV2oDfJJoP7TErWh+pOd otc2+fBj6T/DN06RIsRxYvv+/X4Vn8zux+CtSmtIIebbY4yCDpXM64adCmVbMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EASrKmf9GGTPQ4cIFdfFzuVGSSoaDHAssLGxgvmX0Fs=; b=bTZWzZw7XEy/9Zyu8yCkzWGFngun51SxNEvIqeyUsl5k1GPOtY5kiV3RIyjlH+PLrHT0L/ XKn0A4ZAQcjUm0qdp/a4L1lgnN2EaIYCj7pisS3JpVz0PK+vyD/W1ScYgp88dBUS252RMo seD2o8NTFnaz46Oq3GHSwWORH19a7HY8/bxrZLsC4l//Vy1hV8slfdR6G3OctSIQtFskj0 wEtN9+g3wiU8hP4GTwk7N8Lbq/5frnvbZHJJbe2gdITCFzo6pDs3NGHCUv9B8oLW/u7kPM RLcqkhM0ghkg07vNxDq95vECsGzhDzP0/UNGi3DFMoLz7WUAj50sBwxUHrxwrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687207629; a=rsa-sha256; cv=none; b=WoSmqEMT7h1eI1rhMCeJstQR8GTEOVa6gr6PvnPUjxIKuIoGxCOIG/b9G/bmVnUG5dhoo9 gsdwelbwFbN2teJ6pSUuZklGu4x4Sp47nhL0kPkX7Y1WmkP/qp7lsJv9cQXQ5PANusGTdx ZwdnDz00A6BmCcFiF2aRoiQk677g1ylaNyWnMnfJtoo+ypGJLDpmSO60cqn2HS0iDw4QaW +jPdVB8cOjlOCe2TqFgEGgSi94TGSgdM8rT0AfnSF5rkP/a9p1MKU5gxUqrnMvZ+OWoOi+ X6aH4wPXsKqlX3Xl9I6vnjU7KBU0iuP/VTNo01nqd5esQpji/HrlZFWB7UvYoQ== 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 4QlMJY48fwzXBp; Mon, 19 Jun 2023 20:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKl9JF095790; Mon, 19 Jun 2023 20:47:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKl9hx095789; Mon, 19 Jun 2023 20:47:09 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:47:09 GMT Message-Id: <202306192047.35JKl9hx095789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e8cdabb4e135 - main - camcontrol: In defects make -S actually imply 12-byte command List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8cdabb4e135852b1342f5622beb56e8a04914c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e8cdabb4e135852b1342f5622beb56e8a04914c1 commit e8cdabb4e135852b1342f5622beb56e8a04914c1 Author: Warner Losh AuthorDate: 2023-06-19 20:43:37 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:45:43 +0000 camcontrol: In defects make -S actually imply 12-byte command camcontrol(8) says that -S to start at a different offset implies that we're using the 12 byte command. But really, we're using the 10-byte command. Fix this by setting use_12byte for -S. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40526 --- sbin/camcontrol/camcontrol.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 45b769589da8..4856122a0c07 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -3895,6 +3895,7 @@ readdefects(struct cam_device *device, int argc, char **argv, warnx("invalid starting offset %s", optarg); goto defect_bailout; } + use_12byte = true; break; } case 'X': From nobody Mon Jun 19 20:47:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMJb0hlpz4fk65; Mon, 19 Jun 2023 20:47: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 4QlMJZ6PtTz4Rnj; Mon, 19 Jun 2023 20:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nNxVDosxheYMPnV7RRWOHjOMPQUDFIYDXpcSsfMTT/c=; b=LM1KsyarEpWqVkviWM7A8zcQUoytdGqgDwMglZj1yGWLOrRMtwFk/+9YC4UBIKE4umZV4o 9UDv76oaazbgyQRkN0l052anm2qu7kZuvXaMI/8ME0+pDiCq54FmmuFWw77bgHO0mZOkSW DT6Ppwdm/H2KJ5iDjCcqpRvk8A/AhBc5yhLoPipBnVxL861kIq5e9a1ga3DyhJ2mLm4mo5 0u1dHuBDi3eOPxPQuuZ1fIgAAqNGkpL3+tmV296bAYkZSBhTQyCH9YVdROHzxUOykGzgC0 J6bhjgLMccZBruuZwRjw1ysQTRsLjyKpWKpC+IsP0uY9yl/DhDrn7qsCGUXtXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nNxVDosxheYMPnV7RRWOHjOMPQUDFIYDXpcSsfMTT/c=; b=QzcYFDfVKMXhZm4HHOuLOYpQde35Kd+o0jDsY4ymZ24wiQn463cltZG7JB9CBXqnqEbFbM VfG+xZpIqaeW/LeXoSZZQYhR+s2AwGkHwYxfRxUiH6gaO964DD9kjI5xS/9me0VLGr2msC Y3RTvkWZj9U9E7BpvU+yhkfbvF8sWx+G9mkuN+TOmfAc+ZQg2wtL7t/DM3cLIIrZKKlQ7z 7+HXuSXB/wFPzpXtz0BpMyPVcvfWXNa+6CR8YvFHefqYwhT6fcGjjo3q3HjEcC/GcLOdbV qbDttnNvi9yKNXikdFUTtLV5FgncAxzsHLqzM6jm19zLOamXkSx0lhAnpg7UcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687207630; a=rsa-sha256; cv=none; b=HuUBHMPcvNi4tM19BDaT3rnlKHC3/KKHxzqByexAW2rEdKkO2gSegQMj5VcBAmLaO2cKut 3Ovogr6UB5isWj7LRZyVlYaIH4t5O6g4HQz2zh1fN2B4zwtmlJd0J6yK31jo0/XasdK5tk wu8+AhKyvn7P8/3ujqeZ7IOGpRNWEckKsdswAlzQ1KKLP0+dPksTz1zQP1hDzxVFpGMyFA JUut4ixtnu2XYOfvA93lM1qT/NKXahZN5Msk0Mg2x6D+CTiVCcGj6WADpL02Bjhg+lIVDL Iru3JK+/0ztzTcEPxgEAT9kxxDL0Xsz14Fs/psd0OILb3iGRPEy2rkN8L06wNw== 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 4QlMJZ59DwzXK7; Mon, 19 Jun 2023 20:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKlAe7095812; Mon, 19 Jun 2023 20:47:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKlAp4095811; Mon, 19 Jun 2023 20:47:10 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:47:10 GMT Message-Id: <202306192047.35JKlAp4095811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a960d3c07bd3 - main - cam: Remove duplicate definition for READ_DEFECT_DATA_10 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a960d3c07bd3fc4d3865f0a4750199418996d21e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a960d3c07bd3fc4d3865f0a4750199418996d21e commit a960d3c07bd3fc4d3865f0a4750199418996d21e Author: Warner Losh AuthorDate: 2023-06-19 20:43:45 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:45:43 +0000 cam: Remove duplicate definition for READ_DEFECT_DATA_10 This isn't needed by all devices and is only used by the da device (in camcontrol). All the other da specific da scsi opcodes are only in scsi_da.h. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40527 --- sys/cam/scsi/scsi_all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index 3272f23b172e..4087c7b01778 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -2104,7 +2104,6 @@ struct ata_pass_32 { #define WRITE_VERIFY_10 0x2E #define VERIFY_10 0x2F #define SYNCHRONIZE_CACHE 0x35 -#define READ_DEFECT_DATA_10 0x37 #define WRITE_BUFFER 0x3B #define READ_BUFFER 0x3C #define CHANGE_DEFINITION 0x40 From nobody Mon Jun 19 20:56:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMWX3zSnz4g01P; Mon, 19 Jun 2023 20:56: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 4QlMWX3Z5hz4Yn3; Mon, 19 Jun 2023 20:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687208200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfgZNIX0A2f49X94LlKA2VVhFmXskQ/EYvc4jSYIi1c=; b=pyhs6sBGfr2+853KAh1axO6OiP1OQEo8JPZnRb/ggk2vJKNpVhgY8Enk2ZeMO+VxwvJmJ5 lSak9A6TX+OI8ruiolifEtNZZQGdy4PCAvDzPvd3hVeSGJIzC8kwsaAj7LFSIkUM4a8R+d gQWJrSeTT7kxbRifJNDvT+YY20oeKPtDQ4pPw0l1Z0kxXhMUm6s01DjcbY94puFoLFd8by 7jz0hYv8123c2b3MTkRh5brYyyiOw2Xs9jXSc2EXP27z+vPjJw5506QJcKwr14wgxcDVlp 06ZNXOShAvf9bNJkgyu6VCJFSJibRMPShPy6CWhmYnwg6YKXo98DW5KVOP8bDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687208200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfgZNIX0A2f49X94LlKA2VVhFmXskQ/EYvc4jSYIi1c=; b=hD6RucjUISlK8I8u5U8RYJ86ZO0l8VZpfWTZF6bgsGVuCshY1s+hcPD3zkN08MRF0Nyl/y fXzq4+eKsBxeeS5qSlKkkeVqykm/5qucKkog0c8rnZpwOhRjWzHSambV5Ro3lQqSV49a94 75cvV70YkGtTK6G5GG9Wd3JZBVFqVoaVHppYCuTfL5NbcBGUk+rPh7zPOLPJ5bxPY+RrWq 03NShbARMMAbpd9lNv+hGjR7jGQCdlOTbv19KiJZt46CYgGFk8i1dPy/ce+XteUvnuOnb2 jgKpGU/V7mvmwkb9SGgwmJL269nqKUgm1CIEv0qN5TIHKF31GYidYVm/QpBKJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687208200; a=rsa-sha256; cv=none; b=qCDfRAi17VIiwJKq9893v9Yuh9KGPogC0p5wNcp0AMl4WbNxb8esaOCJBOoWKw+Hd20RDA kHA44sw2OljpAdtBPBKpI/V1x1XPjU3SHAX3/4sgwHIhNNyqPV4yhQpTbd/hty16feb0Hj /bGgk5sFAI+TmZDdm/a+tlKXIke8pWLxYa1Dyj5mk0IwRhUUhfmngQEqPZGcNV9mplX0sl K30Iy+cwXSirIe5FMtz5kpfQAQKIWEygH+fMM5mfSFCRfdFdIZ0I//tlj2Z/Zip2ySVFzh NRWThvItHM85He9oDGmnTy+7VW0TxTIaPRaNiZMnDk3Y4Vd12E3J3P+PliKToQ== 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 4QlMWX2fwqzXck; Mon, 19 Jun 2023 20:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKue6i011722; Mon, 19 Jun 2023 20:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKue79011721; Mon, 19 Jun 2023 20:56:40 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:56:40 GMT Message-Id: <202306192056.35JKue79011721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 90f05f684077 - main - camcontrol: Zone fix two warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90f05f68407735531108b45eb105f8088bbaa1a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=90f05f68407735531108b45eb105f8088bbaa1a5 commit 90f05f68407735531108b45eb105f8088bbaa1a5 Author: Warner Losh AuthorDate: 2023-06-19 20:51:07 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:51:07 +0000 camcontrol: Zone fix two warnings Remove a set but never used variable, and use the protocol variable for its intended purpose. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40528 --- sbin/camcontrol/zone.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sbin/camcontrol/zone.c b/sbin/camcontrol/zone.c index 3f7dfcec4f35..fed94cd967e1 100644 --- a/sbin/camcontrol/zone.c +++ b/sbin/camcontrol/zone.c @@ -138,7 +138,6 @@ zone_rz_print(uint8_t *data_ptr, uint32_t valid_len, int ata_format, struct scsi_report_zones_desc *desc = NULL; uint32_t hdr_len, len; uint64_t max_lba, next_lba = 0; - int more_data = 0; zone_print_status status = ZONE_PRINT_OK; char tmpstr[80]; int field_widths[ZONE_NUM_FIELDS]; @@ -168,7 +167,6 @@ zone_rz_print(uint8_t *data_ptr, uint32_t valid_len, int ata_format, } if (hdr_len > (valid_len + sizeof(*hdr))) { - more_data = 1; status = ZONE_PRINT_MORE_DATA; } @@ -592,7 +590,7 @@ restart_report: /*retry_count*/ retry_count, /*flags*/ CAM_DIR_NONE | CAM_DEV_QFRZDIS, /*tag_action*/ task_attr, - /*protocol*/ AP_PROTO_NON_DATA, + /*protocol*/ protocol, /*ata_flags*/ AP_FLAG_BYT_BLOK_BYTES | AP_FLAG_TLEN_NO_DATA, /*features*/ features, From nobody Mon Jun 19 20:56:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMWY5knWz4g06B; Mon, 19 Jun 2023 20:56: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 4QlMWY4pWMz4Z54; Mon, 19 Jun 2023 20:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687208201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hfJVt8WxjyOPXCPAQxjz1nq/S+Y7ZaURN2arg2xZjAM=; b=CBz84y3OD1YDn3XRIiwbjAgqBGHzodGQF27gVzUWUbehUdTFdG0xTCrWGp1K6alvyLXyOB H8zHAHRAjzZ+Gfar0YOzw43d1Fq2nMEa075VHS+d7WkaXSitowU0oovAWlouVOpek9lXHj b39eWEMkOW/7M5Pit+OmTbsq1lxJILjxHM35QD9hoUiPI7zE2JQ5cqTDdW86pxa51FavjH 1VmxI3Fnmyd7F2+CoHnIMZ5hToXVaUyISXgqDtYJNIvcxBjeG2iQDJugNZ6xUs0JYz5eX6 Y/RTJ6SlLxerWZJku7+wh61uJZl9HVAnu543metGGqNsVdD8tNrcRA+/IW2kyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687208201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hfJVt8WxjyOPXCPAQxjz1nq/S+Y7ZaURN2arg2xZjAM=; b=PmUzKFqsCHr8tw+vEebkQd7CEG1w9IY6h+tJdwprLB39/UQkdMq887XFJB/vhPOcctVQtO 9WqXWwsDxrvjBaeMTjezchkQ5OtOZYWTR1u/U0FDeVRMgQCzaiNkQMgdxMeD985fmKON2i yDc7335eweefNA92qCZxXU143rc249rl8c3OBVI26D1O1nH++r1L8WZwjIqJnx2odmBMr6 0GOyciQ2ZTvFcLFkD87h6IidCtojhZLEXEY9I2gn0aueRv1+LocCAU2CQ156uSQkoAqyjr jSIEgzVvzXNObcNrY6UxGzGb+/0gxJZZA5eNfcgbrmiaisOQ/u3PoE2ldtRfrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687208201; a=rsa-sha256; cv=none; b=nxLu/bUK3vcPweVvxRjfMGv6MAqTLtLa66cZqmuC81PGbA4Npq1coiiiSGCPb0rMTNwnn/ Oxts/ktsGi/cB5dSEXlN4oYn7fpHgDRFHH+N0CP4nYOGJdNdGp4IOEPrjKQAOFf+85Zsyb RhUxlFHzLpGsuSPw9Zfd827untt6yE4CaiYIVX4PnFzu7sTrAzrYjjer0SrgTBl+KaKIGd dQq0tpcxzCv6+u9sevda8G0HbWhpFrdAztDCkwGe6mFD7UqRQ0eRjIlxJ+ictU5CY/m1Sf 63NAapHk7LYD55MtCQ9h4FGzXMlvbV8ViUltBicZIWjjtrnqnuSUS/dhvn65Iw== 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 4QlMWY3rHKzX9T; Mon, 19 Jun 2023 20:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKufoE011742; Mon, 19 Jun 2023 20:56:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKufLx011741; Mon, 19 Jun 2023 20:56:41 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:56:41 GMT Message-Id: <202306192056.35JKufLx011741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6bd922e1540a - main - camcontrol: Include stdbool.h rather than relying on namespace pollution List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bd922e1540aaca1e258493f429b628110799c3b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd922e1540aaca1e258493f429b628110799c3b commit 6bd922e1540aaca1e258493f429b628110799c3b Author: Warner Losh AuthorDate: 2023-06-19 20:52:58 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:54:32 +0000 camcontrol: Include stdbool.h rather than relying on namespace pollution I have several environments, and at least one of them fails to build because bool is undefined. Since we use bool, always include stdbool.h rather than relying on any indirect definitions to pull it in. Sponsored by: Netflix --- sbin/camcontrol/camcontrol.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 4856122a0c07..fb567b6829a4 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include From nobody Tue Jun 20 00:23:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlS685TY2z4f06S; Tue, 20 Jun 2023 00:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlS683hfLz4Hfb; Tue, 20 Jun 2023 00:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZ83Q3vbsg1WOB+snuaRK643mnx3c0HIiGQW5n6cxn8=; b=b9V7E13C/fvLtXscq1goTTzZiOwCpz+/eHv/SBy50s+GCz6fCb58YYeobko75UbS+kQuJg JtvuBWIG3Ui/S+7gaKeyxKe1e0d6pd0f/S4sgyie4wboi4bpshK6pOObMibc61T9NBK95Q e/I7G+a/M+gDI6BwofopgASSsJZaDv0mzx0UckXJVqPrK4WPv5817IgpfuBRHTQbmk+Lxn QNN3A+KRhptkCADvUmpwrglWO+4C+x1lJJbDEB411eth/nWPu1AU9HpHZMIx0rKwUzEgb6 TH67kZ4NeLtAKgwMsqsU0B1NXZP9Ir2hoHmKblGPmVxuk8CkRBWaBAIg6u7BVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZ83Q3vbsg1WOB+snuaRK643mnx3c0HIiGQW5n6cxn8=; b=JeEi0hr5UUcJw8cPQtch3H4fPazdK6nBl177Jj3x7NJ09i3gZ+IU9rNILqNrJTxzlYvlyf KgjJJhng75MyFrJYI+XvmyOuW0oE1iJeH2FoG5U1h2E+Gl5ytasYE7jp+A984QSSCTK3Gi 7xsS74TtG1ZD42+fz8xaL/iEzCxgV0gJ1PC3ZWQ3Cw9lOQQmIVBZLyX3vToatBs8JUiiAW gx0VuzYTC+HPayvwf+IiJxnUwGPxn00LDc6OzKgsnc9QCxhY7XWCV4IN0GbQFPZoOvDPQI CqDpENtgOR+tIlkl+xjU7UoMP/HcCyXnGShn6a8xwRjbxvMk00/ttFZweye8ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687220608; a=rsa-sha256; cv=none; b=hk+aAMj9qvdPvznY2Bac9eKC1fl9A1KKp6HrIvlX8Q0lCSTKwCTm53BbTSYK2ASRGBPA7G Ix0/pnnyCW4URnW42URdDgewfAo9+IojcmnPaEYtnVjVU4SzMJYAm2JTuatJQo2dZQ2YKm ivqXginxFS31+QRURpnpNso8gffuQoGX621q4a2fKTwTQxRMeyyLG50rYKfpENFr9ZkICg psZyd2hrXjUGYf2iNtjOTH46zoQZMNKeum/OC9DX0g4CdtScBWmXzBcmXo/2S7b2zMIwFU 8b6D4Z/GWKhLbwbwNTDNPFUmlAfOSHaRNdR1jQI9BsYRrLRRfLzedaeAsHNyVA== 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 4QlS682n41zdfC; Tue, 20 Jun 2023 00:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K0NSPw057480; Tue, 20 Jun 2023 00:23:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K0NSlA057479; Tue, 20 Jun 2023 00:23:28 GMT (envelope-from git) Date: Tue, 20 Jun 2023 00:23:28 GMT Message-Id: <202306200023.35K0NSlA057479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: b908f6c45e02 - main - bsd.mkopt.mk: Add REQUIRED_OPTIONS list List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b908f6c45e0202deb86fc9bde1b07212924c05fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b908f6c45e0202deb86fc9bde1b07212924c05fc commit b908f6c45e0202deb86fc9bde1b07212924c05fc Author: Colin Percival AuthorDate: 2023-06-17 20:08:37 +0000 Commit: Colin Percival CommitDate: 2023-06-20 00:23:09 +0000 bsd.mkopt.mk: Add REQUIRED_OPTIONS list Options on this list will be forced to 'yes'. This is intended for use as a transitional measure when an option is ceasing to be optional, before all of the associated make logic is removed. Differential Revision: https://reviews.freebsd.org/D40590 --- share/mk/bsd.mkopt.mk | 10 ++++++++++ share/mk/src.opts.mk | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/share/mk/bsd.mkopt.mk b/share/mk/bsd.mkopt.mk index 3c6675b402cc..33eed9c8bce6 100644 --- a/share/mk/bsd.mkopt.mk +++ b/share/mk/bsd.mkopt.mk @@ -8,6 +8,8 @@ # "yes", unless WITHOUT_FOO is defined, in which case it is set to # "no". # +# For each option FOO in __REQUIRED_OPTIONS, MK_FOO is set to "yes". +# # For each option FOO in __DEFAULT_NO_OPTIONS, MK_FOO is set to "no", # unless WITH_FOO is defined, in which case it is set to "yes". # @@ -52,6 +54,14 @@ MK_${var}:= yes .endfor .undef __DEFAULT_YES_OPTIONS +# +# MK_* options which are always yes, typically as a transitional +# step towards removing the options entirely. +# +.for var in ${__REQUIRED_OPTIONS} +MK_${var}:= yes +.endfor + # # MK_* options which default to "no". # diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 7b67a55f34b4..8120e23cb28b 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -53,6 +53,9 @@ ____: # BROKEN was selected as the least imperfect one considered at the # time. Options are added to BROKEN_OPTIONS list on a per-arch basis. # At this time, there's no provision for mutually incompatible options. +# Options listed in 'REQUIRED_OPTIONS' will be hard-wired to 'yes'; this +# is intended as a transitional measure while options are in the process +# of being removed. __DEFAULT_YES_OPTIONS = \ ACCT \ @@ -213,6 +216,8 @@ __DEFAULT_NO_OPTIONS = \ SORT_THREADS \ ZONEINFO_LEAPSECONDS_SUPPORT \ +__REQUIRED_OPTIONS = \ + # LEFT/RIGHT. Left options which default to "yes" unless their corresponding # RIGHT option is disabled. __DEFAULT_DEPENDENT_OPTIONS= \ From nobody Tue Jun 20 00:23:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlS695dwGz4f096; Tue, 20 Jun 2023 00:23: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 4QlS694mrzz4HxQ; Tue, 20 Jun 2023 00:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDpT6L0ZIuLvP8TTEbNyhTgXu8Crch7eAY5eATQxv94=; b=hNc+eFkL0NPs4gHZgcORneWFxJ0aMon01ko8ey+strBNaUSuvQ7CZpu6bRdtlmB3vuvcox iaNRTkeXIyVci+bKn06ztnOmJzm2D38cJulvWLfvcxhLNLZVZz/UUx06jbd0WF+rL4w3Rq zxS6EBkiB1Esg0Ch7KeRZBeKn8JFAOAMT7f7FYT56cYdwkUSVf/wLDWVoNRYp4dELZOzN3 sQtVX93c4eCOD3NMCtj8qAGJOCwx7XWQYu528hAiuROURMl67UqMZmZstATzejbgCuAH9/ BkfI+6QpqXMFwPgoIVlyE6l5LjTPBHk2xOLsBSXRTLYUGmNtd9PavRT/Ll0GrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDpT6L0ZIuLvP8TTEbNyhTgXu8Crch7eAY5eATQxv94=; b=cz/tFdrlvMQKqGf0rZWM/CaJ7zrCg5V+VxIM653bRd2Mex9I0NL1e6qmw6CxfuSbOQuyhi OoQh1n5EswPX2ZvGWau00kH6819bEaMtf901OHKu/YG+202JFQoOmFFjYaz7C7a3OqE0of 8wUp/37eIqfvX0NKBxwMFeOi2Z0t8V8y1KS8eNkk9fFk8NrKAHLi+VMI+cG33a2SJD9Gwi mDQbt9dBkaLBOjo08cALvA2Pm/wUJ7ITbhJ1mfB+Al2h0vvtYo5C8XLaZAD0soT1V/Xugk 17vvuQZjtLJEndgogznRbVMBPQrLYW2uGtVDutZpKm1xWTO3uA9aCnkbQDvyUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687220609; a=rsa-sha256; cv=none; b=e0Wqcb1foRFRF9DBxipvQf6wuZufIfegQNQPZ3FC0hF4SgZj0WFxs3Mi8DfdXI9gVX8MGp ZvFRPM2UHWnDq3sC6t4CL1nFhOzYJSvdjPXwqfqxBW0gBruw3BypCQ+wfXJHjAzgSYrmrn /TxTqCJ76qqg4F6iXSvh663wQFjcWmHBym7Y/R8gjgBtUctmUvEgEp1s609c/909OPejNb UGJ1uH/A/lE8o+OPfCXZhM7qSueBLgVOdRpXee6b4/8He3TPq2CgW9mVtaNA6ePQHtdWJa 4MSW/vovPVQKXS53vshBiwgZTLPQH7pLu8DejL3WDzHkf1Lf8X1BtAMBrvSfQg== 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 4QlS693T6SzdBg; Tue, 20 Jun 2023 00:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K0NTtc057499; Tue, 20 Jun 2023 00:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K0NTMm057498; Tue, 20 Jun 2023 00:23:29 GMT (envelope-from git) Date: Tue, 20 Jun 2023 00:23:29 GMT Message-Id: <202306200023.35K0NTMm057498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: bce996791511 - main - options/makeman: Handle __REQUIRED_OPTIONS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bce9967915115e00271b01f1698bfca30a9be1cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bce9967915115e00271b01f1698bfca30a9be1cc commit bce9967915115e00271b01f1698bfca30a9be1cc Author: Colin Percival AuthorDate: 2023-06-18 00:01:52 +0000 Commit: Colin Percival CommitDate: 2023-06-20 00:23:09 +0000 options/makeman: Handle __REQUIRED_OPTIONS Teach the code which generates src.conf.5 about __REQUIRED_OPTIONS; without this change it gets confused and thinks that every option turns the required options on. Reviewed by: sjg, imp Differential Revision: https://reviews.freebsd.org/D40591 --- tools/build/options/makeman | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/build/options/makeman b/tools/build/options/makeman index 5a8b207b228a..68eeaf2a7a11 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -117,10 +117,17 @@ show() exit 1 ;; esac + requireds=`env -i make -f ${srcdir}/share/mk/src.opts.mk \ + -V '${__REQUIRED_OPTIONS:ts,}'` env -i ${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null \ SRCCONF=/dev/null | while read var _ val ; do opt=${var#MK_} + case ,${requireds}, in + *,${opt},*) + continue + ;; + esac case ${val} in yes) echo ${yes_prefix}_${opt} From nobody Tue Jun 20 00:23:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlS6B5sbQz4f0FT; Tue, 20 Jun 2023 00:23: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 4QlS6B5KNHz4J6y; Tue, 20 Jun 2023 00:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ccFGntROnIpqcjkJiyznxgCc/0cg1BJn0w52msgI+1g=; b=OIRQDq6T8I5IjTAX5GG4EX3g2Ag4n321Td2lyUFPq9AYd24KnmAaPoyq1G5e0YFlxMM51e 3ddG6nBF3LzAD60mUOJlAZihRN6KS+4MOUV45VpM5+oodPe8HPXLeftKtTckqtloVsiCEL idgINQbERkAEjwsGkpIUCkdgEOAczFDWbHiOUbesezYkrD6yMd6Pm+wPT4MvEHrSOxlZtd b5x83/4z6mDQbArQFVFQtsikOvB5W2VNKetsqu01uV2km39z1T7cdh6CyWcMcf4oebEGdP JIWJtd+uDuRzjf/U7EbLBYNgQzZkUEDH5CpEGqm5Iz3n94Js/HZgzEBfs5d31A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687220610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ccFGntROnIpqcjkJiyznxgCc/0cg1BJn0w52msgI+1g=; b=bYPJ5DttCX6LT5+rXwsJ9n4ofSUZZok7lve/X63svMDzwe+BC6wl8kZwvhlL7SgyoVIbSX XsSY1I/lBX791aedxgVNbaS0+cbG5mafqkBwcfT5q1m8WghesB//GzUJGsaih8U4DbqPIV /Utz94qw5Lh3k+ffErOXXFnV810VYXS/AD3O5XdhdEeTAIbpdqBkjBXSqIXIeLkvNpivmc o7osDuOVm87U3xBgS9vOQzlziIJuBD66qUp/92nJFfYXAgJTxykbOunOiPuD0eo7Ym2Q82 +BO3o8KHtDT52xrXs0vZ27UMT33HJAcqgzb+Dwmav8PZa2fvlzDhtNB0Dq15MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687220610; a=rsa-sha256; cv=none; b=js85ByUigWP3folSpsw+L6wNkhcSHQI3YyEVPQT55VMKCIy68tiFKsDfovFyjg3ss9ZahA /kgCCQ0WrJsF2cU9AWLnn+MgtXnuH728YhJPYdteb5353VEozLq9lAEKTazhocMUHGwNrq 5rm2AOB72EBHAntUrUCXAppEy1AKxK+URpCA62++PdyacY1j6EpqmM1Atxpya6sV5mQvP+ MvQq20kHiQnGBevooZcksSsOWauwMBmtW1/7Lztld1KrBtJWmbR2Qbkg/X+f2vQAWHC1hq qjDAKiSLdjVKwV6GiGRIJ3w1KRjdpsrMVcq/6/Mfd/TxFLF9lBKzAm+L5eck1A== 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 4QlS6B4FjSzdnH; Tue, 20 Jun 2023 00:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K0NUDS057518; Tue, 20 Jun 2023 00:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K0NUmI057517; Tue, 20 Jun 2023 00:23:30 GMT (envelope-from git) Date: Tue, 20 Jun 2023 00:23:30 GMT Message-Id: <202306200023.35K0NUmI057517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c24c117b9644 - main - Remove WITHOUT_{CAPSICUM,CASPER} options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c24c117b96445ecdbd4bf9856f88118b376296c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c24c117b96445ecdbd4bf9856f88118b376296c3 commit c24c117b96445ecdbd4bf9856f88118b376296c3 Author: Colin Percival AuthorDate: 2023-06-18 00:03:56 +0000 Commit: Colin Percival CommitDate: 2023-06-20 00:23:09 +0000 Remove WITHOUT_{CAPSICUM,CASPER} options At this point CAPSICUM and CASPER are merely forced on via the newly added __REQUIRED_OPTIONS list; after stable/14 branches I'll sweep the tree for MK_{CAPSICUM,CASPER}. This change will not be MFCed. Discussed on: freebsd-arch Differential Revision: https://reviews.freebsd.org/D40592 --- share/man/man5/src.conf.5 | 12 +----------- share/mk/src.opts.mk | 4 ++-- tools/build/options/WITHOUT_CAPSICUM | 2 -- tools/build/options/WITHOUT_CASPER | 2 -- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 08511661e328..815ffc62fc39 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd May 30, 2023 +.Dd June 17, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -260,19 +260,9 @@ Build some programs without optional bzip2 support. .It Va WITHOUT_CALENDAR Do not build .Xr calendar 1 . -.It Va WITHOUT_CAPSICUM -Do not build Capsicum support into system programs. -When set, it enforces these options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_CASPER -.El .It Va WITHOUT_CAROOT Do not add the trusted certificates from the Mozilla NSS bundle to base. -.It Va WITHOUT_CASPER -Do not build Casper program and related libraries. .It Va WITH_CCACHE_BUILD Use .Xr ccache 1 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 8120e23cb28b..3c17f9319619 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -76,9 +76,7 @@ __DEFAULT_YES_OPTIONS = \ BSNMP \ BZIP2 \ CALENDAR \ - CAPSICUM \ CAROOT \ - CASPER \ CCD \ CDDL \ CLANG \ @@ -217,6 +215,8 @@ __DEFAULT_NO_OPTIONS = \ ZONEINFO_LEAPSECONDS_SUPPORT \ __REQUIRED_OPTIONS = \ + CAPSICUM \ + CASPER # LEFT/RIGHT. Left options which default to "yes" unless their corresponding # RIGHT option is disabled. diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM deleted file mode 100644 index 9d0eb89e491d..000000000000 --- a/tools/build/options/WITHOUT_CAPSICUM +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Do not build Capsicum support into system programs. diff --git a/tools/build/options/WITHOUT_CASPER b/tools/build/options/WITHOUT_CASPER deleted file mode 100644 index 32bfa960d7d5..000000000000 --- a/tools/build/options/WITHOUT_CASPER +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Do not build Casper program and related libraries. From nobody Tue Jun 20 01:04:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlT220zYPz4g3rd; Tue, 20 Jun 2023 01:04:58 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlT216WvJz3jC5; Tue, 20 Jun 2023 01:04:57 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2b4745834f3so27921431fa.2; Mon, 19 Jun 2023 18:04:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687223095; x=1689815095; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gtGNbTeaE7Gzv/zYxUMcb3g/c/6X/1IggNk4Acp85k8=; b=ewvTxCbLjkmkTMdAt5SFNqOFbxETbnaKvuXoTZuujDzUbSBvOAkcZl3bfJle3OYjzP PN9xBheJOM4/13HAuT62UCal6of5bUXiO9SKfO0yK36WfXiSZAvPCUh2vSexxMI6215G lC8BA15VM3CZ2AAhQvJU7bAYLaxW0JSutHFdQpujtRzs5qWK0FVYUhMiT1Jdqt2FqBml ebK6XTpVEMRPiQ4mLjImeYxD5j0PlWL1LaFAGtRdoVRbNgHXlZMl9/FmHUFwtG607KJh /S/oLuh5jiPoAymVLAS7axcKez3mPU1rGpjlwj+t2b9qI6tDjHvl305Bt6/TNbHP4Tit 3d1w== X-Gm-Message-State: AC+VfDwyDIvMo/bNd/E21ThK+MsfT90oNZejnrPmht23/i1lS0gOOuYH agmHnCBgCAvFDsF2crYvnn8LbAhD16BleCc4+bDdFLYg X-Google-Smtp-Source: ACHHUZ6WjQFmJsNinyGGRQCK9U8UMXealAFf/ymNX5NaeQlTcHyA8No2n9PwwNDweJ6xGJkmYs4t8lQVohm6KjuTMts= X-Received: by 2002:a2e:9cd1:0:b0:2b4:6eb0:2a27 with SMTP id g17-20020a2e9cd1000000b002b46eb02a27mr3959602ljj.17.1687223095234; Mon, 19 Jun 2023 18:04:55 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202306200023.35K0NSlA057479@gitrepo.freebsd.org> In-Reply-To: <202306200023.35K0NSlA057479@gitrepo.freebsd.org> From: Ed Maste Date: Mon, 19 Jun 2023 21:04:43 -0400 Message-ID: Subject: Re: git: b908f6c45e02 - main - bsd.mkopt.mk: Add REQUIRED_OPTIONS list To: Colin Percival Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4QlT216WvJz3jC5 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Mon, 19 Jun 2023 at 20:23, Colin Percival wrote: > > The branch main has been updated by cperciva: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b908f6c45e0202deb86fc9bde1b07212924c05fc > > commit b908f6c45e0202deb86fc9bde1b07212924c05fc > Author: Colin Percival > AuthorDate: 2023-06-17 20:08:37 +0000 > Commit: Colin Percival > CommitDate: 2023-06-20 00:23:09 +0000 > > bsd.mkopt.mk: Add REQUIRED_OPTIONS list > > Options on this list will be forced to 'yes'. This is intended for use > as a transitional measure when an option is ceasing to be optional, > before all of the associated make logic is removed. Should we emit a warning when an option is disabled in src.conf but specified in REQUIRED_OPTIONS? e.g. warning: WITHOUT_CAPSICUM option ignored: it is no longer supported From nobody Tue Jun 20 01:18:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlTKW0xk1z4f8Gv for ; Tue, 20 Jun 2023 01:18:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlTKV05Zqz3qH9 for ; Tue, 20 Jun 2023 01:18:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-988c495f35fso178355366b.1 for ; Mon, 19 Jun 2023 18:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1687223900; x=1689815900; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=cf5LWpuN/1SK0jPjJ4gh/DgmM5Wy3i93mvPxsQZ0uvk=; b=PT3AwhU3z2zJT/18OlJPjadNjPip9D8wGSdeSRpirFZlNPcXv6rn6Y107PgOR2qOU3 dTmZJzNwHiUdbqlypTFQ2Q7Q+fX7EEdNKitm8gSjEhmNNQk1/7YUNFW31puxu8ZYc5Uz GozaB6G4hMU/7AEPxuxDdm26PZso5O68RiHg8Fv7xMs6JhX/tyrFiMeYUzJ1NxFPS4j2 96ZFzgSVnw6rMoWjg9F+NuaPPuhi5dTnBB76z/y49cOwpEBEuk1kxx0lPNjwdjhu/q6w 5nwml3dq6W9suNZqMgJkYU6W2naGMB4wxXRsS59E1dJK6JqXbltGoVCplLnh+ElMD3un yUMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687223900; x=1689815900; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cf5LWpuN/1SK0jPjJ4gh/DgmM5Wy3i93mvPxsQZ0uvk=; b=atN3eRzFNgyymqkfvOm+WfVCdtMX/tYQnNtXVvtCAxcnoNc354HyXK6DRLI0UmdR/T UXQ2Qs35U+ZdXNnfMq6wPxz4hE4TvfKHfNh37seGrrvGqTFii3s5F0OFDqoYorLkya3l wtnYQrlyi5Rv2ai8hFpHHKM/jyNWlz0Hhq2kFCa8cWMWxa8oHk42Rs0smyk0f2zu7/tL Pbb0whYknwvha3fT/wZ4gKV8Iv1iRehT6DcvR9ZI9UU7AC/vE+QCCkm8vicPOeG8rMzk FlOWcqs7UHIZwvKyuZ7JOHvl3QWgzn7ErenYramdNuaZDyeONZvfqP1+yxLNXBxt7ytE H6gw== X-Gm-Message-State: AC+VfDzSzhCA2lJXJjevcnXIg6HdewBcrUmHhZNcFG/Ukjq8M4tark6k qxrzwI0SK5xZNmh+veIbpgiV4h9etM4g79KDdHfe6ZMmvcUC8eNC X-Google-Smtp-Source: ACHHUZ70jhe1D7kFNSmQAr0LKbhNn4h0P/G16+oqQEBKi60yhNcmfJvVugj2Nw0Sfq/pFEvMRJ8KoKsS52C3zhPQC6c= X-Received: by 2002:a17:907:3605:b0:989:450:e56a with SMTP id bk5-20020a170907360500b009890450e56amr1185263ejc.76.1687223899682; Mon, 19 Jun 2023 18:18:19 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202306200023.35K0NSlA057479@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Mon, 19 Jun 2023 19:18:08 -0600 Message-ID: Subject: Re: git: b908f6c45e02 - main - bsd.mkopt.mk: Add REQUIRED_OPTIONS list To: Ed Maste Cc: Colin Percival , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000032883905fe856d7c" X-Rspamd-Queue-Id: 4QlTKV05Zqz3qH9 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --00000000000032883905fe856d7c Content-Type: text/plain; charset="UTF-8" On Mon, Jun 19, 2023, 7:04 PM Ed Maste wrote: > On Mon, 19 Jun 2023 at 20:23, Colin Percival wrote: > > > > The branch main has been updated by cperciva: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=b908f6c45e0202deb86fc9bde1b07212924c05fc > > > > commit b908f6c45e0202deb86fc9bde1b07212924c05fc > > Author: Colin Percival > > AuthorDate: 2023-06-17 20:08:37 +0000 > > Commit: Colin Percival > > CommitDate: 2023-06-20 00:23:09 +0000 > > > > bsd.mkopt.mk: Add REQUIRED_OPTIONS list > > > > Options on this list will be forced to 'yes'. This is intended for > use > > as a transitional measure when an option is ceasing to be optional, > > before all of the associated make logic is removed. > > Should we emit a warning when an option is disabled in src.conf but > specified in REQUIRED_OPTIONS? > > e.g. warning: WITHOUT_CAPSICUM option ignored: it is no longer supported > I asked for this in the review... I didn't approve the review because I was waiting for an answer to the request. Warner > --00000000000032883905fe856d7c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Jun 19, 2023, 7:04 PM Ed Maste <emaste@freebsd.org> wrote:
On Mon, 19 Jun 2023 at 20:23, Colin Percival <= cperciva@freebsd.org> wrote:
>
> The branch main has been updated by cperciva:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3Db908f6c45e0202deb86fc9bde1b072= 12924c05fc
>
> commit b908f6c45e0202deb86fc9bde1b07212924c05fc
> Author:=C2=A0 =C2=A0 =C2=A0Colin Percival <cperciva@FreeBSD.org>=
> AuthorDate: 2023-06-17 20:08:37 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Colin Percival <cperciva@FreeBSD.org>=
> CommitDate: 2023-06-20 00:23:09 +0000
>
>=C2=A0 =C2=A0 =C2=A0bsd.mkopt.mk: Add REQUIRED_OPTIONS list >
>=C2=A0 =C2=A0 =C2=A0Options on this list will be forced to 'yes'= ;.=C2=A0 This is intended for use
>=C2=A0 =C2=A0 =C2=A0as a transitional measure when an option is ceasing= to be optional,
>=C2=A0 =C2=A0 =C2=A0before all of the associated make logic is removed.=

Should we emit a warning when an option is disabled in src.conf but
specified in REQUIRED_OPTIONS?

e.g. warning: WITHOUT_CAPSICUM option ignored: it is no longer supported

I a= sked for this in the review... I didn't approve the review because I wa= s waiting for an answer to the request.=C2=A0

Warner=C2=A0
--00000000000032883905fe856d7c-- From nobody Tue Jun 20 03:14:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlWvr0qPNz4fct9 for ; Tue, 20 Jun 2023 03:14:48 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from mail.tarsnap.com (mail.tarsnap.com [54.86.246.204]) by mx1.freebsd.org (Postfix) with SMTP id 4QlWvq6G2fz3PH0 for ; Tue, 20 Jun 2023 03:14:47 +0000 (UTC) (envelope-from cperciva@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: (qmail 17865 invoked from network); 20 Jun 2023 03:14:46 -0000 Received: from unknown (HELO dell7390.daemonology.net) (127.0.0.1) by mail.tarsnap.com with SMTP; 20 Jun 2023 03:14:46 -0000 Received: (qmail 53329 invoked from network); 20 Jun 2023 03:14:45 -0000 Received: from unknown (HELO ?127.0.0.1?) (127.0.0.1) by localhost with SMTP; 20 Jun 2023 03:14:45 -0000 Message-ID: <60984493-01fd-d02d-496e-1c973cdda2f7@freebsd.org> Date: Mon, 19 Jun 2023 20:14:45 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: git: b908f6c45e02 - main - bsd.mkopt.mk: Add REQUIRED_OPTIONS list Content-Language: en-US To: Warner Losh , Ed Maste Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202306200023.35K0NSlA057479@gitrepo.freebsd.org> From: Colin Percival In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4QlWvq6G2fz3PH0 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.86.0.0/16, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 6/19/23 18:18, Warner Losh wrote: > On Mon, Jun 19, 2023, 7:04 PM Ed Maste > wrote: > On Mon, 19 Jun 2023 at 20:23, Colin Percival > wrote: > > bsd.mkopt.mk : Add REQUIRED_OPTIONS list > > > >     Options on this list will be forced to 'yes'.  This is intended for use > >     as a transitional measure when an option is ceasing to be optional, > >     before all of the associated make logic is removed. > > Should we emit a warning when an option is disabled in src.conf but > specified in REQUIRED_OPTIONS? > > e.g. warning: WITHOUT_CAPSICUM option ignored: it is no longer supported > > I asked for this in the review... I didn't approve the review because I was > waiting for an answer to the request. I'm happy to add such a warning, although I'm not sure how useful it would be (unless we add a 'sleep 60' afterwards perhaps?), but I don't see any such comments on the review... did phabricator eat it? -- Colin Percival FreeBSD Deputy Release Engineer & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Tue Jun 20 03:22:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlX4K57wfz4fpCS; Tue, 20 Jun 2023 03:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlX4K4fHzz3jRp; Tue, 20 Jun 2023 03:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687231329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMGVsT1bvhxyxzLoMnMnye6kxBneTtXl6A6rs2kM2qI=; b=Z5QM4tnsAfJ2eGYS3XLxPHVO24K4kG8VMjHsBcS/xUPw+E6DsrhKBxJP6/oYtf1rXZB60i eYKGMJDFKzjOEAzVO68zZuC1yMgqe1XXZetg59UoJOiP02fQl0zg8iCFs4NDTgm4Hp4G8Q Hx6qL+CvEzEWZ3cE+3eGB+5K+yej8WW6fWsCm5qgpCLu+R1jzq+sC1fSgreSpz1eXutCrs /FC8p+TYrZ66IopKTM1rI8wsMcxwzuJi1Qe8wtwYmUAl4lBg+T4tCMVNEepYbqGKPTShBc 9Rc5417AJithcGKo5A9zxz4MiBiQ/IfpdmktZLvfR3IJXYDV1Z0OgkDQ1Do4Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687231329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMGVsT1bvhxyxzLoMnMnye6kxBneTtXl6A6rs2kM2qI=; b=tcSJJ9Sx6KkFqhbtYp5P6EynS9pXZ7FcZv6uTfZ0aAFiJC1biTAKUWK0cGis0t1kFS+AgH Rg79sa6EjhbiQ8IPQdoN/dZpjJb9dKaClS7JR/cZe3+8vMBcJLwz4AK+5neWA0HqKHFsXE Ds33y4sX+j95cUN9psZqFTvv+8bMP9BpTWLK5ef7N4AZGcXmR8hJUJGsht4t2Cr/3g4p6W te2aEmM/dj9DlrVW9EtIsrjJyu0kwqRv2/tyEcfQ0CQKbgbQ5wh6BDrkh0USxuLo9TSDOe 5dWXwb89azuLabI/cY3H3rB4ZtqOuBnAsGVMj3SYrjsX6zsCdSEx+JqFEUYUMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687231329; a=rsa-sha256; cv=none; b=thZbHLZxJyEhxOAfteeH0GCWTGhAJRrzHGZuahamPzkgHTp+l0vTYSV/KNQHu7l52Gr3Xk 6+v6DfTnkB0ED0OIiB0iGthJSl0+AS7teP54Bd9adg5i45ElWwJ2Z75xKwpfXkgailNmIU aXaCCYE1htR1xLLtKC3YyCmr0ZAykgYuPqpJvcR1wcWHtmIQwZZ/6OtpltWsqeuIxJhtXU vDpfvg17NtL8v5LkINUf+7SDvBBL+3DS98bbl0lgpV8+1ZZgzcdoqGnwa8OzYhC40IuNXM WI6vsa8tbOnW/OCpICOoUXfl0AVgXiXEiluLOnlFr+hWx5Lc46LtU7hr/YKbJw== 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 4QlX4K3kVdzk4k; Tue, 20 Jun 2023 03:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K3M9pQ051234; Tue, 20 Jun 2023 03:22:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K3M9D1051233; Tue, 20 Jun 2023 03:22:09 GMT (envelope-from git) Date: Tue, 20 Jun 2023 03:22:09 GMT Message-Id: <202306200322.35K3M9D1051233@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2e65cfd3adbc - main - Restore dummy WITHOUT_{CAPSICUM,CASPER} descriptions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2e65cfd3adbc56df7bd86c507aae6730d941f391 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e65cfd3adbc56df7bd86c507aae6730d941f391 commit 2e65cfd3adbc56df7bd86c507aae6730d941f391 Author: Ed Maste AuthorDate: 2023-06-20 01:49:59 +0000 Commit: Ed Maste CommitDate: 2023-06-20 03:20:49 +0000 Restore dummy WITHOUT_{CAPSICUM,CASPER} descriptions The makeman CI job ensures that all options have description files. Bring the CI job back to green by adding back WITHOUT_CAPSICUM and WITHOUT_CASPER description files (that now state the assoicated options have no effect). Fixes: c24c117b9644 ("Remove WITHOUT_{CAPSICUM,CASPER} options") Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 6 +++++- tools/build/options/WITHOUT_CAPSICUM | 1 + tools/build/options/WITHOUT_CASPER | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 815ffc62fc39..869eccd03a49 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd June 17, 2023 +.Dd June 19, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -260,9 +260,13 @@ Build some programs without optional bzip2 support. .It Va WITHOUT_CALENDAR Do not build .Xr calendar 1 . +.It Va WITHOUT_CAPSICUM +This option has no effect. .It Va WITHOUT_CAROOT Do not add the trusted certificates from the Mozilla NSS bundle to base. +.It Va WITHOUT_CASPER +This option has no effect. .It Va WITH_CCACHE_BUILD Use .Xr ccache 1 diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM new file mode 100644 index 000000000000..19d821f6c981 --- /dev/null +++ b/tools/build/options/WITHOUT_CAPSICUM @@ -0,0 +1 @@ +This option has no effect. diff --git a/tools/build/options/WITHOUT_CASPER b/tools/build/options/WITHOUT_CASPER new file mode 100644 index 000000000000..19d821f6c981 --- /dev/null +++ b/tools/build/options/WITHOUT_CASPER @@ -0,0 +1 @@ +This option has no effect. From nobody Tue Jun 20 03:46:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlXcd1nf4z4f7Mh for ; Tue, 20 Jun 2023 03:46:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlXcd0BNfz3vnW for ; Tue, 20 Jun 2023 03:46:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-518b69d5b5dso5883177a12.1 for ; Mon, 19 Jun 2023 20:46:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1687232798; x=1689824798; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=JTVNtK58LTY+3VEHKARTXCM7hc41+uL3lEcuNnQyjek=; b=wbW53yGkknJUBkqyJzIWjRP+yz34vvCcq5znUZMZ/ce/jnJRtG6RyxY4WJ+GVdh1js Z3a2W8eXiJB0nyAXMT6j/duun5Q6otQ7ejc16UX6sqqhZJ/H/VNXvuJpsxJfTG2ToVqS pLi4+VvlYUdhhjwFPAUHx29kwRxPIT9bBCJC6cRW/+vvTs8oY9QAnangdngr2FAxV7VU fsA2NE4VogcMsovnLEM+mxnv2KdpjmM/WXbdACdHD8PSJLcYwqVoFqsNoqK+ax8XXlIe XoLEwbd4aC6ES/efcHjIEIYL34ErLhH6DJPS+o+NqrAfFeyhbrzgPk4GtOCb46s+mZAa f3FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687232798; x=1689824798; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JTVNtK58LTY+3VEHKARTXCM7hc41+uL3lEcuNnQyjek=; b=P0aDkrXwyoaqi9PNAms+dI7Pk06Rw7ksgJmZSnfOWcRDgBdeP9q/Cg4Ipfp4Ol99Ur nYarAHYXRPC0qHKVF1v89umutUlY93LXcv8J1JQO/WFvdbMU/VGEycBSkBMS9K0PKTT5 KVjguvdWx5yMbUqgbTinVklpFWU15U7wPSN3iIixkXZtGO9D4waVDL/UI2JWBe7wT3sY yDxGIgxqQc+vSdSkXuOVBziU/ce+P3hyZ2HYvJVfrfMNiKFRLkzdA+YfGPpKWMa0aRTG 8zxiLwNBwX/k0oGB1bcqcxkdxQjTK6/lwG7z2t6SLWVtxvNB3uHTfRnvTzi2HNHVaAnL 5svQ== X-Gm-Message-State: AC+VfDyEQtKyigSxeMPb6geT5+MRsHfE4t69c+yKUo0fjbxjnkj98xwv 5mneLpqwYwJMIvoHFfZ9Q6iPpOZ7D8zXiOG1VtNCLQ== X-Google-Smtp-Source: ACHHUZ5JeGuTm5l99GzAMjg4Yz2NUNIpdnk1XKm5p9VpB8IgSXMjNBswpOgW1PJHm42T1mhT7zPWen0XEEtskrKzM98= X-Received: by 2002:a05:6402:10c4:b0:514:9e91:f54 with SMTP id p4-20020a05640210c400b005149e910f54mr7083906edu.26.1687232797617; Mon, 19 Jun 2023 20:46:37 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202306200023.35K0NSlA057479@gitrepo.freebsd.org> <60984493-01fd-d02d-496e-1c973cdda2f7@freebsd.org> In-Reply-To: <60984493-01fd-d02d-496e-1c973cdda2f7@freebsd.org> From: Warner Losh Date: Mon, 19 Jun 2023 21:46:26 -0600 Message-ID: Subject: Re: git: b908f6c45e02 - main - bsd.mkopt.mk: Add REQUIRED_OPTIONS list To: Colin Percival Cc: Ed Maste , src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000008e42c305fe877f10" X-Rspamd-Queue-Id: 4QlXcd0BNfz3vnW X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000008e42c305fe877f10 Content-Type: text/plain; charset="UTF-8" On Mon, Jun 19, 2023, 9:14 PM Colin Percival wrote: > On 6/19/23 18:18, Warner Losh wrote: > > On Mon, Jun 19, 2023, 7:04 PM Ed Maste > > wrote: > > On Mon, 19 Jun 2023 at 20:23, Colin Percival > > wrote: > > > bsd.mkopt.mk : Add REQUIRED_OPTIONS list > > > > > > Options on this list will be forced to 'yes'. This is > intended for use > > > as a transitional measure when an option is ceasing to be > optional, > > > before all of the associated make logic is removed. > > > > Should we emit a warning when an option is disabled in src.conf but > > specified in REQUIRED_OPTIONS? > > > > e.g. warning: WITHOUT_CAPSICUM option ignored: it is no longer > supported > > > > I asked for this in the review... I didn't approve the review because I > was > > waiting for an answer to the request. > > I'm happy to add such a warning, although I'm not sure how useful it would > be > (unless we add a 'sleep 60' afterwards perhaps?), but I don't see any such > comments on the review... did phabricator eat it? > People will see it. No sleep needed. People read the logs. Maybe I was too subtle since we went down the does := work twice... Warner -- > Colin Percival > FreeBSD Deputy Release Engineer & EC2 platform maintainer > Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid > --0000000000008e42c305fe877f10 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Jun 19, 2023, 9:14 PM Colin Percival <cpe= rciva@freebsd.org> wrote:
On= 6/19/23 18:18, Warner Losh wrote:
> On Mon, Jun 19, 2023, 7:04 PM Ed Maste <emaste@freebsd.o= rg
> <mailto:emaste@freebsd.org>> wrote:
>=C2=A0 =C2=A0 =C2=A0On Mon, 19 Jun 2023 at 20:23, Colin Percival <cperciva@freebsd.org
>=C2=A0 =C2=A0 =C2=A0<mailto:cperciva@freebsd.org>= ;> wrote:
>=C2=A0 =C2=A0 =C2=A0 > bsd.mkopt.mk <http://bsd.mkopt.mk>: Add REQUIRED_OPTIONS list
>=C2=A0 =C2=A0 =C2=A0 >
>=C2=A0 =C2=A0 =C2=A0 >=C2=A0 =C2=A0 =C2=A0Options on this list will = be forced to 'yes'.=C2=A0 This is intended for use
>=C2=A0 =C2=A0 =C2=A0 >=C2=A0 =C2=A0 =C2=A0as a transitional measure = when an option is ceasing to be optional,
>=C2=A0 =C2=A0 =C2=A0 >=C2=A0 =C2=A0 =C2=A0before all of the associat= ed make logic is removed.
>
>=C2=A0 =C2=A0 =C2=A0Should we emit a warning when an option is disabled= in src.conf but
>=C2=A0 =C2=A0 =C2=A0specified in REQUIRED_OPTIONS?
>
>=C2=A0 =C2=A0 =C2=A0e.g. warning: WITHOUT_CAPSICUM option ignored: it i= s no longer supported
>
> I asked for this in the review... I didn't approve the review beca= use I was
> waiting for an answer to the request.

I'm happy to add such a warning, although I'm not sure how useful i= t would be
(unless we add a 'sleep 60' afterwards perhaps?), but I don't s= ee any such
comments on the review... did phabricator eat it?

People will see it. No sle= ep needed. People read the logs.

Maybe I was too subtle since we went down the does :=3D work twic= e...

Warner=C2=A0
<= div dir=3D"auto">
--
Colin Percival
FreeBSD Deputy Release Engineer & EC2 platform maintainer
Founder, Tarsnap | www.tarsnap.com | Online backups = for the truly paranoid
--0000000000008e42c305fe877f10-- From nobody Tue Jun 20 04:45:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlYwF4x1gz4gLbB for ; Tue, 20 Jun 2023 04:45:17 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from mail.tarsnap.com (mail.tarsnap.com [54.86.246.204]) by mx1.freebsd.org (Postfix) with SMTP id 4QlYwF3GxPz3Dlm for ; Tue, 20 Jun 2023 04:45:17 +0000 (UTC) (envelope-from cperciva@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: (qmail 20811 invoked from network); 20 Jun 2023 04:45:16 -0000 Received: from unknown (HELO dell7390.daemonology.net) (127.0.0.1) by mail.tarsnap.com with SMTP; 20 Jun 2023 04:45:16 -0000 Received: (qmail 54350 invoked from network); 20 Jun 2023 04:45:16 -0000 Received: from unknown (HELO ?127.0.0.1?) (127.0.0.1) by localhost with SMTP; 20 Jun 2023 04:45:16 -0000 Message-ID: Date: Mon, 19 Jun 2023 21:45:16 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: git: b908f6c45e02 - main - bsd.mkopt.mk: Add REQUIRED_OPTIONS list Content-Language: en-US To: Warner Losh Cc: Ed Maste , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202306200023.35K0NSlA057479@gitrepo.freebsd.org> <60984493-01fd-d02d-496e-1c973cdda2f7@freebsd.org> From: Colin Percival In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4QlYwF3GxPz3Dlm X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.86.0.0/16, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 6/19/23 20:46, Warner Losh wrote: > On Mon, Jun 19, 2023, 9:14 PM Colin Percival > wrote: > On 6/19/23 18:18, Warner Losh wrote: > > On Mon, Jun 19, 2023, 7:04 PM Ed Maste > > >> wrote: > >     On Mon, 19 Jun 2023 at 20:23, Colin Percival > >     >> wrote: > >      > bsd.mkopt.mk >: Add REQUIRED_OPTIONS list > >      > > >      >     Options on this list will be forced to 'yes'.  This is > intended for use > >      >     as a transitional measure when an option is ceasing to be > optional, > >      >     before all of the associated make logic is removed. > > > >     Should we emit a warning when an option is disabled in src.conf but > >     specified in REQUIRED_OPTIONS? > > > >     e.g. warning: WITHOUT_CAPSICUM option ignored: it is no longer > supported > > > > I asked for this in the review... I didn't approve the review because I > was > > waiting for an answer to the request. > > I'm happy to add such a warning, although I'm not sure how useful it would be > (unless we add a 'sleep 60' afterwards perhaps?), but I don't see any such > comments on the review... did phabricator eat it? > > > People will see it. No sleep needed. People read the logs. > > Maybe I was too subtle since we went down the does := work twice... D40613. -- Colin Percival FreeBSD Deputy Release Engineer & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Tue Jun 20 08:52:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlgPD6rnvz4gTH0; Tue, 20 Jun 2023 08:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlgPD5jbhz3xdp; Tue, 20 Jun 2023 08:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FEjO9iP16dpVfDrnmJz/Bb2nKnUHobWdbIkHoxFxs08=; b=kM1tzkJQOZUlgtNJdglGRY+L3Lwlhabs7escol2Cz5Hc6YTK4osJz0OALBzJBbk9LQwWq0 xBfCqjpEgezGs6S9ABgAKs+89vPNOQr/5YROl8yjXoVkzAP+HI3HWpsF2KPmvQKtuHXtkL C4CaN6aH6r9nXPjTWOt+LT0pBeDEuwqu72JCo9sU3ASMgC7G/1pYmY/iW2q3CsWPocsBl0 xLjSC/t2lX4x+94yx26yS23NdfI1ixYIrHVY6xBygv1sBZ1g17JZrX1voJobYpc7+HPBEM HnoihFZgd5xq08sXiMxxrGaLdnUKjpgegsajEv+54rfepaFluwR75fhnCGP51w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FEjO9iP16dpVfDrnmJz/Bb2nKnUHobWdbIkHoxFxs08=; b=IkmQyg5nj81swoQ1g5vbeBre1tTCMH1llOU6KycyTc8r5A71lB6tLBR5ivrNhds78SBgEc 2uN5RLAKI/r+UtC/eLrpMFeXle9vONs5nFKM3H98fslShR6AJU2p2w0xFZ8YfqydG3GlG3 F2a4JQUmWACxvE4Tg7Y5e6/aRMJB0OF7tVLrvPSmGoJTvIoN1XCWRhKpwIPJcfagnEcEdG eYdL02id3IfL0WY8AZAb/7sFvo+HMnfUCGFMuCC4ctnnxjTm88NdhnGbRUHV1y/+ropADv Wtuu8Ihi9aPwPo9SetNZkOz2k537KCFWGbeyiO2jpDY8e4TkPrSWaRKT4EJvRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687251136; a=rsa-sha256; cv=none; b=qCKtCWqe+DxVaXm+dh0cPZzd/0onji5T4JZIPaAfkFo3qUA4I2XPJvuYra8fvaiIzekAHQ 1kRf904CiVgIN9OUJCTYpK21bAqZ2MRrQJx/LUKURio2cCWjVyej7AYAghD10LzjWs5gXV Rl5KMmw3vmKDe/gBxhR/IrQsDBWU6HMpQooczvHfisb/BvNCZVawFMuP2HEHQaHBZa2C9X XSnvjPYuWRTC6Jr1nb7mGq+j/Fyb5P8bfx+SeBKHGe21HR+XRZpDYWGGESVBvtwf+DjxgG 8rFZD1rm90bUQ/W7DFuhOYGGkyFhubBLw5tovozvURmS3vP9mW/E62TAJok/3A== 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 4QlgPD4nPLzsjM; Tue, 20 Jun 2023 08:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K8qGGR094965; Tue, 20 Jun 2023 08:52:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K8qGwO094949; Tue, 20 Jun 2023 08:52:16 GMT (envelope-from git) Date: Tue, 20 Jun 2023 08:52:16 GMT Message-Id: <202306200852.35K8qGwO094949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 6632a0a4e3ab - main - bhyve: add helper to create a bootorder List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6632a0a4e3ab68b0e31b612e8aeca14de3fc8159 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6632a0a4e3ab68b0e31b612e8aeca14de3fc8159 commit 6632a0a4e3ab68b0e31b612e8aeca14de3fc8159 Author: Corvin Köhne AuthorDate: 2021-08-16 07:47:53 +0000 Commit: Corvin Köhne CommitDate: 2023-06-20 08:51:54 +0000 bhyve: add helper to create a bootorder Qemu's fwcfg allows to define a bootorder. Therefore, the hypervisor has to create a fwcfg item named bootorder, which has a newline seperated list of boot entries. Qemu's OVMF will pick up the bootorder and applies it. Add the moment, bhyve's OVMF doesn't support a custom bootorder by qemu's fwcfg. However, in the future bhyve will gain support for qemu's OVMF. Additonally, we can port relevant parts from qemu's to bhyve's OVMF implementation. Reviewed by: jhb, markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39284 --- usr.sbin/bhyve/pci_emul.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/pci_emul.h | 2 ++ 2 files changed, 78 insertions(+) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index cb92ea9edb09..ad6180c79470 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include "pci_irq.h" #include "pci_lpc.h" #include "pci_passthru.h" +#include "qemu_fwcfg.h" #define CONF1_ADDR_PORT 0x0cf8 #define CONF1_DATA_PORT 0x0cfc @@ -121,6 +122,14 @@ struct pci_bar_allocation { static TAILQ_HEAD(pci_bar_list, pci_bar_allocation) pci_bars = TAILQ_HEAD_INITIALIZER(pci_bars); +struct boot_device { + TAILQ_ENTRY(boot_device) boot_device_chain; + struct pci_devinst *pdi; + int bootindex; +}; +static TAILQ_HEAD(boot_list, boot_device) boot_devices = TAILQ_HEAD_INITIALIZER( + boot_devices); + #define PCI_EMUL_IOBASE 0x2000 #define PCI_EMUL_IOLIMIT 0x10000 @@ -955,6 +964,45 @@ pci_emul_alloc_rom(struct pci_devinst *const pdi, const uint64_t size, return (0); } +int +pci_emul_add_boot_device(struct pci_devinst *pi, int bootindex) +{ + struct boot_device *new_device, *device; + + /* don't permit a negative bootindex */ + if (bootindex < 0) { + errx(4, "Invalid bootindex %d for %s", bootindex, pi->pi_name); + } + + /* alloc new boot device */ + new_device = calloc(1, sizeof(struct boot_device)); + if (new_device == NULL) { + return (ENOMEM); + } + new_device->pdi = pi; + new_device->bootindex = bootindex; + + /* search for boot device with higher boot index */ + TAILQ_FOREACH(device, &boot_devices, boot_device_chain) { + if (device->bootindex == bootindex) { + errx(4, + "Could not set bootindex %d for %s. Bootindex already occupied by %s", + bootindex, pi->pi_name, device->pdi->pi_name); + } else if (device->bootindex > bootindex) { + break; + } + } + + /* add boot device to queue */ + if (device == NULL) { + TAILQ_INSERT_TAIL(&boot_devices, new_device, boot_device_chain); + } else { + TAILQ_INSERT_BEFORE(device, new_device, boot_device_chain); + } + + return (0); +} + #define CAP_START_OFFSET 0x40 static int pci_emul_add_capability(struct pci_devinst *pi, u_char *capdata, int caplen) @@ -1362,6 +1410,27 @@ pci_ecfg_base(void) return (PCI_EMUL_ECFG_BASE); } +static int +init_bootorder(void) +{ + struct boot_device *device; + FILE *fp; + char *bootorder; + size_t bootorder_len; + + if (TAILQ_EMPTY(&boot_devices)) + return (0); + + fp = open_memstream(&bootorder, &bootorder_len); + TAILQ_FOREACH(device, &boot_devices, boot_device_chain) { + fprintf(fp, "/pci@i0cf8/pci@%d,%d\n", + device->pdi->pi_slot, device->pdi->pi_func); + } + fclose(fp); + + return (qemu_fwcfg_add_file("bootorder", bootorder_len, bootorder)); +} + #define BUSIO_ROUNDUP 32 #define BUSMEM32_ROUNDUP (1024 * 1024) #define BUSMEM64_ROUNDUP (512 * 1024 * 1024) @@ -1391,6 +1460,8 @@ init_pci(struct vmctx *ctx) pci_emul_membase64 = roundup2(pci_emul_membase64, PCI_EMUL_MEMSIZE64); pci_emul_memlim64 = pci_emul_membase64 + PCI_EMUL_MEMSIZE64; + TAILQ_INIT(&boot_devices); + for (bus = 0; bus < MAXBUSES; bus++) { snprintf(node_name, sizeof(node_name), "pci.%d", bus); nvl = find_config_node(node_name); @@ -1498,6 +1569,11 @@ init_pci(struct vmctx *ctx) } lpc_pirq_routed(); + if ((error = init_bootorder()) != 0) { + warnx("%s: Unable to init bootorder", __func__); + return (error); + } + /* * The guest physical memory map looks like the following: * [0, lowmem) guest system memory diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h index d68920524398..945d32d7bdcd 100644 --- a/usr.sbin/bhyve/pci_emul.h +++ b/usr.sbin/bhyve/pci_emul.h @@ -234,6 +234,8 @@ int pci_emul_alloc_bar(struct pci_devinst *pdi, int idx, enum pcibar_type type, uint64_t size); int pci_emul_alloc_rom(struct pci_devinst *const pdi, const uint64_t size, void **const addr); +int pci_emul_add_boot_device(struct pci_devinst *const pi, + const int bootindex); int pci_emul_add_msicap(struct pci_devinst *pi, int msgnum); int pci_emul_add_pciecap(struct pci_devinst *pi, int pcie_device_type); void pci_emul_capwrite(struct pci_devinst *pi, int offset, int bytes, From nobody Tue Jun 20 08:52:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlgPG0VPqz4gTC4; Tue, 20 Jun 2023 08:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlgPF6Rnfz3xYv; Tue, 20 Jun 2023 08:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nybdomaM+cbF24QD/TnfdDe6w/Deyi7fvjYaOU31Re8=; b=K/HXjJG6Tog7iei2mXzarHxWTSlqThK/m+QCZNdM9BB/wOD4Uu3C7L8YeROwaa2cKcn81t NYOvj1kvW8D8rUNW6M41Yghim7dDhCGMH5ap3oskeRuETx9i2LOsl8k1F8dSRKCmRmyjhN tEnKPvI32bxXow5LLyGmSCWw05UnFjKpBHsrKqYcYrOTA9mmrF73fRmKaO9xY0TxXbnvPn rhnvvtpbAQUL9ygoYdjYD/Swk9M/w1rpixM5miV+7FasSw7by4vtESuvAkTRb8IEwW+nnH wPiYeFIwYVWBbz9dueLaSwLbaC5+U/b7FuIc7eioji2o9DjcPbHKMXTNia6PCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nybdomaM+cbF24QD/TnfdDe6w/Deyi7fvjYaOU31Re8=; b=AhBcsHH88FJ2OlzA/3H+MjhmIK/GKMaEtwMe6XTP/9sVZed1yXlKmZeX9nWOla7db6ISm3 25dp014omOzO61vihD9d7J76D6/TGxDX/ASySnxWlcgmwQ+UUsVUQnHjE5jVECDruJBTbj 9vT4IrfLvzrmWhXuUDDN0UV93c4Us19d7b30g40kTMUWNSqXbbja3y8CC3LkcHyxV+mJ3s 0yXyt2VXewP0BSW2pQaPf8LIcqurQoD/gwjH6jvTvWr5hFBUY2xNxVNX1iZSpLL8XEgIAC YE5iQLs7Dboy+iXt4CKklXdbCZ6400J/n3OGque7W6XoiRTI/QyEg9GXFcVamg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687251137; a=rsa-sha256; cv=none; b=DwlSUrxU43YePFF52L0IZaXQF1x460WrxvV2R7kNVASxT2fzZgvpTZfLPXfnphrO9Q1m6W ZZir48stmpFgD5C83I55q5sBthQQ6GxUXbdAQ4eXYXHtcArc2O9vbfjSAXrnqcIMvihuTJ oTGpIF658y1QN+zmHnDXd0+OMCaT/WUWW1wDP1+3GwFIsFmGMFQgKOuo5nF+Tt9+wJvj/O NAAbghRyhy25+THiXDGFMsIz0G+fz1SrO00m7EFXWq2HX5TNQT5B21CjKj6/knWOpGRg1A jncHqkAeHIZnFniPkiwy0pgC9CjSa4rqpIpgC/uMGB037Uf1TE25LBYUW0knxA== 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 4QlgPF5H68zsxG; Tue, 20 Jun 2023 08:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K8qHSU096376; Tue, 20 Jun 2023 08:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K8qHMN096353; Tue, 20 Jun 2023 08:52:17 GMT (envelope-from git) Date: Tue, 20 Jun 2023 08:52:17 GMT Message-Id: <202306200852.35K8qHMN096353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 480bef9481f0 - main - bhyve: add bootindex option for several devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 480bef9481f0c44b19ac4b2adb09f6c3191acd41 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=480bef9481f0c44b19ac4b2adb09f6c3191acd41 commit 480bef9481f0c44b19ac4b2adb09f6c3191acd41 Author: Corvin Köhne AuthorDate: 2021-08-16 07:50:15 +0000 Commit: Corvin Köhne CommitDate: 2023-06-20 08:51:58 +0000 bhyve: add bootindex option for several devices The bootindex option creates an entry in the "bootorder" fwcfg file. This file can be picked up by the guest firmware to determine the bootorder. Nevertheless, it's not guaranteed that the guest firmware uses the bootorder. At the moment, our OVMF ignores the bootorder. This will change in the future. If guest firmware supports the "bootorder" fwcfg file and no device uses the bootindex option, the boot order is determined by the firmware itself. If one or more devices specify a bootindex, the first bootable device with the lowest bootindex will be booted. It's not garanteed that devices without a bootindex will be recognized as bootable from the firmware in that case. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39285 --- usr.sbin/bhyve/bhyve.8 | 18 ++++++++++++++++++ usr.sbin/bhyve/block_if.c | 21 ++++++++++++++++++++- usr.sbin/bhyve/block_if.h | 2 ++ usr.sbin/bhyve/pci_ahci.c | 7 +++++++ usr.sbin/bhyve/pci_nvme.c | 8 ++++++++ usr.sbin/bhyve/pci_virtio_block.c | 5 +++++ usr.sbin/bhyve/pci_virtio_scsi.c | 9 +++++++++ 7 files changed, 69 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 479ab75be60f..4f6d771cb93d 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -494,6 +494,12 @@ if not explicitly specified. Disable emulation of guest trim requests via .Dv DIOCGDELETE requests. +.It Li bootindex= Ns Ar index +Add the device to the bootorder at +.Ar index . +A fwcfg file is used to specify the bootorder. +The guest firmware may ignore or doesn't support this fwcfg file. +In that case, this feature doesn't work as expected. .El .Pp SCSI device backends: @@ -511,6 +517,12 @@ are: .It Cm iid= Ns Ar IID Initiator ID to use when sending requests to specified CTL port. The default value is 0. +.It Li bootindex= Ns Ar index +Add the device to the bootorder at +.Ar index . +A fwcfg file is used to specify the bootorder. +The guest firmware may ignore or doesn't support this fwcfg file. +In that case, this feature doesn't work as expected. .El .Pp 9P device backends: @@ -608,6 +620,12 @@ Add .Ar romfile as option ROM to the PCI device. The ROM will be loaded by firmware and should be capable of initializing the device. +.It Li bootindex= Ns Ar index +Add the device to the bootorder at +.Ar index . +A fwcfg file is used to specify the bootorder. +The guest firmware may ignore or doesn't support this fwcfg file. +In that case, this feature doesn't work as expected. .El .Pp Guest memory must be wired using the diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c index 42c1b5c27293..62f8a9f21661 100644 --- a/usr.sbin/bhyve/block_if.c +++ b/usr.sbin/bhyve/block_if.c @@ -122,6 +122,7 @@ struct blockif_ctxt { TAILQ_HEAD(, blockif_elem) bc_pendq; TAILQ_HEAD(, blockif_elem) bc_busyq; struct blockif_elem bc_reqs[BLOCKIF_MAXREQ]; + int bc_bootindex; }; static pthread_once_t blockif_once = PTHREAD_ONCE_INIT; @@ -466,12 +467,22 @@ blockif_legacy_config(nvlist_t *nvl, const char *opts) return (pci_parse_legacy_config(nvl, cp + 1)); } +int +blockif_add_boot_device(struct pci_devinst *const pi, + struct blockif_ctxt *const bc) +{ + if (bc->bc_bootindex < 0) + return (0); + + return (pci_emul_add_boot_device(pi, bc->bc_bootindex)); +} + struct blockif_ctxt * blockif_open(nvlist_t *nvl, const char *ident) { char tname[MAXCOMLEN + 1]; char name[MAXPATHLEN]; - const char *path, *pssval, *ssval; + const char *path, *pssval, *ssval, *bootindex_val; char *cp; struct blockif_ctxt *bc; struct stat sbuf; @@ -480,6 +491,7 @@ blockif_open(nvlist_t *nvl, const char *ident) int extra, fd, i, sectsz; int ro, candelete, geom, ssopt, pssopt; int nodelete; + int bootindex; #ifndef WITHOUT_CAPSICUM cap_rights_t rights; @@ -493,6 +505,7 @@ blockif_open(nvlist_t *nvl, const char *ident) ssopt = 0; ro = 0; nodelete = 0; + bootindex = -1; if (get_config_bool_node_default(nvl, "nocache", false)) extra |= O_DIRECT; @@ -525,6 +538,11 @@ blockif_open(nvlist_t *nvl, const char *ident) } } + bootindex_val = get_config_value_node(nvl, "bootindex"); + if (bootindex_val != NULL) { + bootindex = atoi(bootindex_val); + } + path = get_config_value_node(nvl, "path"); if (path == NULL) { EPRINTLN("Missing \"path\" for block device."); @@ -644,6 +662,7 @@ blockif_open(nvlist_t *nvl, const char *ident) TAILQ_INIT(&bc->bc_freeq); TAILQ_INIT(&bc->bc_pendq); TAILQ_INIT(&bc->bc_busyq); + bc->bc_bootindex = bootindex; for (i = 0; i < BLOCKIF_MAXREQ; i++) { bc->bc_reqs[i].be_status = BST_FREE; TAILQ_INSERT_HEAD(&bc->bc_freeq, &bc->bc_reqs[i], be_link); diff --git a/usr.sbin/bhyve/block_if.h b/usr.sbin/bhyve/block_if.h index b36d0c367890..52ebd8634b8e 100644 --- a/usr.sbin/bhyve/block_if.h +++ b/usr.sbin/bhyve/block_if.h @@ -62,11 +62,13 @@ struct blockif_req { struct iovec br_iov[BLOCKIF_IOV_MAX]; }; +struct pci_devinst; struct blockif_ctxt; typedef void blockif_resize_cb(struct blockif_ctxt *, void *, size_t); int blockif_legacy_config(nvlist_t *nvl, const char *opts); +int blockif_add_boot_device(struct pci_devinst *const pi, struct blockif_ctxt *const bc); struct blockif_ctxt *blockif_open(nvlist_t *nvl, const char *ident); int blockif_register_resize_callback(struct blockif_ctxt *bc, blockif_resize_cb *cb, void *cb_arg); diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c index 2c36e1d5cbb9..a2731876bbea 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -2477,6 +2477,13 @@ pci_ahci_init(struct pci_devinst *pi, nvlist_t *nvl) ret = 1; goto open_fail; } + + ret = blockif_add_boot_device(pi, bctxt); + if (ret) { + sc->ports = p; + goto open_fail; + } + sc->port[p].bctx = bctxt; sc->port[p].pr_sc = sc; sc->port[p].port = p; diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index de5865220155..a18413a50367 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -3159,6 +3159,14 @@ pci_nvme_parse_config(struct pci_nvme_softc *sc, nvlist_t *nvl) sc->dataset_management = NVME_DATASET_MANAGEMENT_DISABLE; } + value = get_config_value_node(nvl, "bootindex"); + if (value != NULL) { + if (pci_emul_add_boot_device(sc->nsc_pi, atoi(value))) { + EPRINTLN("Invalid bootindex %d", atoi(value)); + return (-1); + } + } + value = get_config_value_node(nvl, "ram"); if (value != NULL) { uint64_t sz = strtoull(value, NULL, 10); diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c index 9fd6db41dba8..c8ec62a66793 100644 --- a/usr.sbin/bhyve/pci_virtio_block.c +++ b/usr.sbin/bhyve/pci_virtio_block.c @@ -471,6 +471,11 @@ pci_vtblk_init(struct pci_devinst *pi, nvlist_t *nvl) return (1); } + if (blockif_add_boot_device(pi, bctxt)) { + perror("Invalid boot device"); + return (1); + } + size = blockif_size(bctxt); sectsz = blockif_sectsz(bctxt); blockif_psectsz(bctxt, &sts, &sto); diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index 7d5409cff6a1..fa6cb3a48787 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -709,6 +709,15 @@ pci_vtscsi_init(struct pci_devinst *pi, nvlist_t *nvl) if (value != NULL) sc->vss_iid = strtoul(value, NULL, 10); + value = get_config_value_node(nvl, "bootindex"); + if (value != NULL) { + if (pci_emul_add_boot_device(pi, atoi(value))) { + EPRINTLN("Invalid bootindex %d", atoi(value)); + free(sc); + return (-1); + } + } + devname = get_config_value_node(nvl, "dev"); if (devname == NULL) devname = "/dev/cam/ctl"; From nobody Tue Jun 20 09:00:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlgbH632lz4dswM; Tue, 20 Jun 2023 09:00: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 4QlgbH5Z9qz42Sc; Tue, 20 Jun 2023 09:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GDNchUOC61XjT51hDlHesAHUnl0TQ4HEn7ww7UlNwKs=; b=PTknGcrH5L5PRO9XXfb1x36eNeAbLIDwRfaqbooz+yauK1nAKFKIcW0+dxCquqldCYuz76 jLreY2/wDdcJ+EEh3PVRxwt8hBGqZMUlrv1jk2YgwGsSo/Zt9YwNJzAM0HSl/WwZ1YY4Tm ZgEq9U6h5TtjO8ckhGtlOceMR+G4ohQFYGCqx6rgzYCVh4FmlMN7l3VqGas88IwbkaSSGs tCfZDtSM51WlGLLoBn0myMZsiOmYsvyzPHYLKzmzsZKfz7bjBsxww7LQtypdDOpyy60KpD NkZzmbYqqkAhfaJVry/V0T8rHy9MoA0k+PW8Ep1sxtRKIg/4Ku11vGqF4LOPow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GDNchUOC61XjT51hDlHesAHUnl0TQ4HEn7ww7UlNwKs=; b=sTdyWH18/8tQkBEbqJuFuk4mc+trYZnJ3/buzFYWSzSFiAK+yAKVmPounqJ4s1OyvOVR5O Vjd1Vzcbp2qDHVFI7HCro/7p0gItWwZQ7fU6hh5HzVa961jTwAOufjHD+Cryf4yp3Juj01 jj7JdwRa1+3diEKmmBLFvXz9WyIivFfubk9JlCoyFcFcdr3hKhXcHIymTTMFphM4ewanBj 1azhktqe1BclTe7nKFxYLCBsSYHG4t1CAHZ5G/H5hKytDdiBVNUgWl2pmafLe/fBYGjnaY BnYdPd/g3uudRtZTo6D4rluX8n2BgLhq4uXXGB+gjzYqHuE+E2w1FB68287tlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687251659; a=rsa-sha256; cv=none; b=dcU1dai7zCQ8izIWJJ/i2Im3NsZBs4Dah8imS44+0WjxmwUL/FnlIcfXil5X2EzfbY/AJ7 qBJE8plgNSyJhd0sx1hBgXbFcrlRYSPBEIxozMUfaE0I6J9yCsxDK/XqVFiL3/eOEolC8j efEIKXRL+sokOSPZDAeEIq1sxBIKO17XL/dkR34jQhRF03j0/gZgDFRozl2eQLTTMpzPkr oYU9Pj64BuUiTYX8EqXzsE7ZC0OIVxvlL9GEi2Z5m/Ik/6B1Gg67q7Q5DJDCOskVczuUnC XOYJf38MZJu7vA756cmLu4b2wyaI2UHE+48wsVCfwHW/BlEOlKC0+k7IwFmddQ== 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 4QlgbH4dXnzt13; Tue, 20 Jun 2023 09:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K90xoF009631; Tue, 20 Jun 2023 09:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K90xZD009630; Tue, 20 Jun 2023 09:00:59 GMT (envelope-from git) Date: Tue, 20 Jun 2023 09:00:59 GMT Message-Id: <202306200900.35K90xZD009630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 24a0fef9dc4f - main - bhyve: maintain RSDT and XSDT by basl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24a0fef9dc4f782174232a3e57d50602a0fbae21 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=24a0fef9dc4f782174232a3e57d50602a0fbae21 commit 24a0fef9dc4f782174232a3e57d50602a0fbae21 Author: Corvin Köhne AuthorDate: 2023-06-15 09:12:53 +0000 Commit: Corvin Köhne CommitDate: 2023-06-20 08:56:23 +0000 bhyve: maintain RSDT and XSDT by basl In a subsquent commit the TPM emulation will build it's own TPM2 table. This needs to be registered to the RSDT and XSDT. Instead of making the rsdt and xsdt variables global, we can simply add a helper to basl. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40559 --- usr.sbin/bhyve/acpi.c | 58 ++++++--------------------------------------------- usr.sbin/bhyve/basl.c | 54 +++++++++++++++++++++++++++++++++++++++++++++-- usr.sbin/bhyve/basl.h | 4 +++- 3 files changed, 61 insertions(+), 55 deletions(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index c8fc65cb3b6e..b89d34263dd5 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -91,9 +91,6 @@ static FILE *dsdt_fp; static int dsdt_indent_level; static int dsdt_error; -static struct basl_table *rsdt; -static struct basl_table *xsdt; - struct basl_fio { int fd; FILE *fp; @@ -532,10 +529,7 @@ build_fadt(struct vmctx *const ctx) BASL_EXEC(basl_table_add_pointer(table, ACPI_SIG_DSDT, offsetof(ACPI_TABLE_FADT, XDsdt), sizeof(fadt.XDsdt))); - BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_FADT, - ACPI_RSDT_ENTRY_SIZE)); - BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_FADT, - ACPI_XSDT_ENTRY_SIZE)); + BASL_EXEC(basl_table_register_to_rsdt(table)); return (0); } @@ -557,10 +551,7 @@ build_hpet(struct vmctx *const ctx) hpet.Flags = ACPI_HPET_PAGE_PROTECT4; BASL_EXEC(basl_table_append_content(table, &hpet, sizeof(hpet))); - BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_HPET, - ACPI_RSDT_ENTRY_SIZE)); - BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_HPET, - ACPI_XSDT_ENTRY_SIZE)); + BASL_EXEC(basl_table_register_to_rsdt(table)); return (0); } @@ -635,10 +626,7 @@ build_madt(struct vmctx *const ctx) BASL_EXEC(basl_table_append_bytes(table, &madt_lapic_nmi, sizeof(madt_lapic_nmi))); - BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_MADT, - ACPI_RSDT_ENTRY_SIZE)); - BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_MADT, - ACPI_XSDT_ENTRY_SIZE)); + BASL_EXEC(basl_table_register_to_rsdt(table)); return (0); } @@ -663,10 +651,7 @@ build_mcfg(struct vmctx *const ctx) BASL_EXEC(basl_table_append_bytes(table, &mcfg_allocation, sizeof(mcfg_allocation))); - BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_MCFG, - ACPI_RSDT_ENTRY_SIZE)); - BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_MCFG, - ACPI_XSDT_ENTRY_SIZE)); + BASL_EXEC(basl_table_register_to_rsdt(table)); return (0); } @@ -708,19 +693,6 @@ build_rsdp(struct vmctx *const ctx) return (0); } -static int -build_rsdt(struct vmctx *const ctx) -{ - BASL_EXEC( - basl_table_create(&rsdt, ctx, ACPI_SIG_RSDT, BASL_TABLE_ALIGNMENT)); - - /* Header */ - BASL_EXEC(basl_table_append_header(rsdt, ACPI_SIG_RSDT, 1, 1)); - /* Pointers (added by other build_XXX funcs) */ - - return (0); -} - static int build_spcr(struct vmctx *const ctx) { @@ -744,23 +716,7 @@ build_spcr(struct vmctx *const ctx) spcr.TerminalType = ACPI_SPCR_TERMINAL_TYPE_VT_UTF8; BASL_EXEC(basl_table_append_content(table, &spcr, sizeof(spcr))); - BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_SPCR, - ACPI_RSDT_ENTRY_SIZE)); - BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_SPCR, - ACPI_XSDT_ENTRY_SIZE)); - - return (0); -} - -static int -build_xsdt(struct vmctx *const ctx) -{ - BASL_EXEC( - basl_table_create(&xsdt, ctx, ACPI_SIG_XSDT, BASL_TABLE_ALIGNMENT)); - - /* Header */ - BASL_EXEC(basl_table_append_header(xsdt, ACPI_SIG_XSDT, 1, 1)); - /* Pointers (added by other build_XXX funcs) */ + BASL_EXEC(basl_table_register_to_rsdt(table)); return (0); } @@ -790,7 +746,7 @@ acpi_build(struct vmctx *ctx, int ncpu) if (getenv("BHYVE_ACPI_KEEPTMPS")) basl_keep_temps = 1; - BASL_EXEC(basl_init()); + BASL_EXEC(basl_init(ctx)); BASL_EXEC(basl_make_templates()); @@ -802,8 +758,6 @@ acpi_build(struct vmctx *ctx, int ncpu) * first table after XSDT. */ BASL_EXEC(build_rsdp(ctx)); - BASL_EXEC(build_rsdt(ctx)); - BASL_EXEC(build_xsdt(ctx)); BASL_EXEC(build_fadt(ctx)); BASL_EXEC(build_madt(ctx)); BASL_EXEC(build_hpet(ctx)); diff --git a/usr.sbin/bhyve/basl.c b/usr.sbin/bhyve/basl.c index 90cb608aecc6..8a4f2c4f311e 100644 --- a/usr.sbin/bhyve/basl.c +++ b/usr.sbin/bhyve/basl.c @@ -58,6 +58,8 @@ static STAILQ_HEAD(basl_table_list, basl_table) basl_tables = STAILQ_HEAD_INITIA basl_tables); static struct qemu_loader *basl_loader; +static struct basl_table *rsdt; +static struct basl_table *xsdt; static __inline uint64_t basl_le_dec(void *pp, size_t len) @@ -358,10 +360,41 @@ basl_finish(void) return (0); } +static int +basl_init_rsdt(struct vmctx *const ctx) +{ + BASL_EXEC( + basl_table_create(&rsdt, ctx, ACPI_SIG_RSDT, BASL_TABLE_ALIGNMENT)); + + /* Header */ + BASL_EXEC(basl_table_append_header(rsdt, ACPI_SIG_RSDT, 1, 1)); + /* Pointers (added by basl_table_register_to_rsdt) */ + + return (0); +} + +static int +basl_init_xsdt(struct vmctx *const ctx) +{ + BASL_EXEC( + basl_table_create(&xsdt, ctx, ACPI_SIG_XSDT, BASL_TABLE_ALIGNMENT)); + + /* Header */ + BASL_EXEC(basl_table_append_header(xsdt, ACPI_SIG_XSDT, 1, 1)); + /* Pointers (added by basl_table_register_to_rsdt) */ + + return (0); +} + int -basl_init(void) +basl_init(struct vmctx *const ctx) { - return (qemu_loader_create(&basl_loader, QEMU_FWCFG_FILE_TABLE_LOADER)); + BASL_EXEC(basl_init_rsdt(ctx)); + BASL_EXEC(basl_init_xsdt(ctx)); + BASL_EXEC( + qemu_loader_create(&basl_loader, QEMU_FWCFG_FILE_TABLE_LOADER)); + + return (0); } int @@ -627,3 +660,20 @@ basl_table_create(struct basl_table **const table, struct vmctx *ctx, return (0); } + +int +basl_table_register_to_rsdt(struct basl_table *table) +{ + const ACPI_TABLE_HEADER *header; + + assert(table != NULL); + + header = (const ACPI_TABLE_HEADER *)table->data; + + BASL_EXEC(basl_table_append_pointer(rsdt, header->Signature, + ACPI_RSDT_ENTRY_SIZE)); + BASL_EXEC(basl_table_append_pointer(xsdt, header->Signature, + ACPI_XSDT_ENTRY_SIZE)); + + return (0); +} diff --git a/usr.sbin/bhyve/basl.h b/usr.sbin/bhyve/basl.h index e12173b701a2..62502be22e13 100644 --- a/usr.sbin/bhyve/basl.h +++ b/usr.sbin/bhyve/basl.h @@ -67,7 +67,7 @@ void basl_fill_gas(ACPI_GENERIC_ADDRESS *gas, uint8_t space_id, uint8_t bit_width, uint8_t bit_offset, uint8_t access_width, uint64_t address); int basl_finish(void); -int basl_init(void); +int basl_init(struct vmctx *ctx); int basl_table_add_checksum(struct basl_table *const table, const uint32_t off, const uint32_t start, const uint32_t len); int basl_table_add_length(struct basl_table *const table, const uint32_t off, @@ -97,3 +97,5 @@ int basl_table_append_pointer(struct basl_table *table, const uint8_t src_signature[ACPI_NAMESEG_SIZE], uint8_t size); int basl_table_create(struct basl_table **table, struct vmctx *ctx, const uint8_t *name, uint32_t alignment); +/* Adds the table to RSDT and XSDT */ +int basl_table_register_to_rsdt(struct basl_table *table); From nobody Tue Jun 20 09:01:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlgbK02QSz4dshy; Tue, 20 Jun 2023 09:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlgbJ6J08z42mK; Tue, 20 Jun 2023 09:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sdatSd3ulUuWw2NSHn/AV4/34A35sawjfb65n85RBk4=; b=RLH/z16Q/ydbj0ZmU5WWUrOSF8tDsIxuDww0w9lRz8Z1aRSNgrMbPzmyAnvRMxA6tL1lSw sdHO35CFfcsmMG29ahqhoH1+QzoBSctwED9mlLxq5Qcech89mqruRKvf7uIfDvXCNx80Qq XyRmhK5SbbS9P8Z2Rd2tUKnHXwU7Hv8iS9BgktJ6WtOIZT+M0/VzCyB3qCvOEIQqWjE9TR UNvNAjTWrfnkmHl94pFD40IMgqIDAIAiyvcpq57Bu02LS2t6Yc/JmSoRMOjlM+k0c1ilWF N3rXDpyzslxi+hdWnhY49k70b10BkYNAvL1/stlEMWZb3bGzgLd4MlygihzTZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sdatSd3ulUuWw2NSHn/AV4/34A35sawjfb65n85RBk4=; b=VP9RJZd/DG/Uy31SymlH5qvhgB6UMyn0ENCmZMthEVHYGYp3yAeQEgRXmr46a8OnZyI0uJ CiHEMvK7WrjloGJkS1l99zeIvPnsPhonl0AFRtr+Y9Ev8Rf/hjrKzt9XCjXQUtki8mxpqn dJJZcY7EmRkm8cZNz3v8HVCfoQEWO6t+RlHBCArPt3i7pAuVjp4MMZY8EbMuIgn3C6OpPO YSMSNpIZq82PyPSzuhJYW/pQ+evNKS5C2ZLPRsDTnMHfr0h0Nj9vDvxIEVy3+76Oo6Tobq /kVMJd4rcyFrBly8qgE5TGS8w9f55PIUWT6+zwdPKN5SDc6YtiOXZyv2zE3rGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687251660; a=rsa-sha256; cv=none; b=gpeRaviiigg6C4j36I3T5CsK/l/jnjX6QjIzCKh7XIZmfEd6PL7KydVllNd9vyCc6qllLE fVHqjabJPT93XF6VAL7jeEooMdJRTPj4Ru4Ft803Ypxbxv8VYp1iSVPtQuVCbdPOyoxZSN m6hG00MhKlMpzAQ/PlLg6TythlUNyYyWtd+87Qv5Z2yi9OCIjSrwNOs1Ga5rrOiAHMhxL0 RteLS8TywYfqnLG2jar0iWUN2F5JG80LJl0/pwGA6vNd3oj+JOhCLxgxqeyW+2ZHvyFHF6 eUVM3oraGY7ZqyMEy7NrdZ34ogf7uVxOVN+2aY63WSid5S7jsiLPNoacdBtrPA== 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 4QlgbJ5JSSzsxr; Tue, 20 Jun 2023 09:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K9102g009658; Tue, 20 Jun 2023 09:01:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K910YE009657; Tue, 20 Jun 2023 09:01:00 GMT (envelope-from git) Date: Tue, 20 Jun 2023 09:01:00 GMT Message-Id: <202306200901.35K910YE009657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 5ea98d326830 - main - bhyve/tpm: build TPM2 table by tpm interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ea98d326830f25fdeb6fc6ef46a8bccb829b13c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea98d326830f25fdeb6fc6ef46a8bccb829b13c commit 5ea98d326830f25fdeb6fc6ef46a8bccb829b13c Author: Corvin Köhne AuthorDate: 2022-08-29 10:10:43 +0000 Commit: Corvin Köhne CommitDate: 2023-06-20 08:58:55 +0000 bhyve/tpm: build TPM2 table by tpm interface Each tpm has a device specific table. Which table a tpm uses depends on the tpm interface. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40457 --- usr.sbin/bhyve/tpm_device.c | 13 +++++++++++ usr.sbin/bhyve/tpm_intf.h | 4 +++- usr.sbin/bhyve/tpm_intf_crb.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/tpm_device.c b/usr.sbin/bhyve/tpm_device.c index e1db0bab1ee9..94e9f1ffdc27 100644 --- a/usr.sbin/bhyve/tpm_device.c +++ b/usr.sbin/bhyve/tpm_device.c @@ -35,9 +35,22 @@ struct tpm_device { void *intf_sc; }; +static int +tpm_build_acpi_table(const struct acpi_device *const dev) +{ + const struct tpm_device *const tpm = acpi_device_get_softc(dev); + + if (tpm->intf->build_acpi_table == NULL) { + return (0); + } + + return (tpm->intf->build_acpi_table(tpm->intf_sc, tpm->vm_ctx)); +} + static const struct acpi_device_emul tpm_acpi_device_emul = { .name = TPM_ACPI_DEVICE_NAME, .hid = TPM_ACPI_HARDWARE_ID, + .build_table = tpm_build_acpi_table, }; void diff --git a/usr.sbin/bhyve/tpm_intf.h b/usr.sbin/bhyve/tpm_intf.h index 7de7bc6d4435..3003d8fbd754 100644 --- a/usr.sbin/bhyve/tpm_intf.h +++ b/usr.sbin/bhyve/tpm_intf.h @@ -7,6 +7,8 @@ #pragma once +#include + #include "config.h" #include "tpm_device.h" @@ -30,6 +32,6 @@ struct tpm_intf { int (*init)(void **sc); void (*deinit)(void *sc); - int (*build_acpi_table)(void *sc); + int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx); }; #define TPM_INTF_SET(x) DATA_SET(tpm_intf_set, x) diff --git a/usr.sbin/bhyve/tpm_intf_crb.c b/usr.sbin/bhyve/tpm_intf_crb.c index 5fd640b2d5c9..b8ae33c5ec0a 100644 --- a/usr.sbin/bhyve/tpm_intf_crb.c +++ b/usr.sbin/bhyve/tpm_intf_crb.c @@ -31,12 +31,20 @@ #define TPM_CRB_ADDRESS 0xFED40000 #define TPM_CRB_REGS_SIZE 0x1000 +#define TPM_CRB_CONTROL_AREA_ADDRESS \ + (TPM_CRB_ADDRESS + offsetof(struct tpm_crb_regs, ctrl_req)) +#define TPM_CRB_CONTROL_AREA_SIZE TPM_CRB_REGS_SIZE + #define TPM_CRB_DATA_BUFFER_ADDRESS \ (TPM_CRB_ADDRESS + offsetof(struct tpm_crb_regs, data_buffer)) #define TPM_CRB_DATA_BUFFER_SIZE 0xF80 #define TPM_CRB_LOCALITIES_MAX 5 +#define TPM_CRB_LOG_AREA_MINIMUM_SIZE (64 * 1024) + +#define TPM_CRB_LOG_AREA_FWCFG_NAME "etc/tpm/log" + struct tpm_crb_regs { union tpm_crb_reg_loc_state { struct { @@ -156,6 +164,7 @@ static_assert(sizeof(struct tpm_crb_regs) == TPM_CRB_REGS_SIZE, } while (0) struct tpm_crb { + uint8_t tpm_log_area[TPM_CRB_LOG_AREA_MINIMUM_SIZE]; struct tpm_crb_regs regs; }; @@ -200,6 +209,13 @@ tpm_crb_init(void **sc) CRB_RSP_SIZE_WRITE(crb->regs, TPM_CRB_DATA_BUFFER_SIZE); CRB_RSP_ADDR_WRITE(crb->regs, TPM_CRB_DATA_BUFFER_ADDRESS); + error = qemu_fwcfg_add_file(TPM_CRB_LOG_AREA_FWCFG_NAME, + TPM_CRB_LOG_AREA_MINIMUM_SIZE, crb->tpm_log_area); + if (error) { + warnx("%s: failed to add fwcfg file", __func__); + goto err_out; + } + *sc = crb; return (0); @@ -224,9 +240,44 @@ tpm_crb_deinit(void *sc) free(crb); } +static int +tpm_crb_build_acpi_table(void *sc __unused, struct vmctx *vm_ctx) +{ + struct basl_table *table; + + BASL_EXEC(basl_table_create(&table, vm_ctx, ACPI_SIG_TPM2, + BASL_TABLE_ALIGNMENT)); + + /* Header */ + BASL_EXEC(basl_table_append_header(table, ACPI_SIG_TPM2, 4, 1)); + /* Platform Class */ + BASL_EXEC(basl_table_append_int(table, 0, 2)); + /* Reserved */ + BASL_EXEC(basl_table_append_int(table, 0, 2)); + /* Control Address */ + BASL_EXEC( + basl_table_append_int(table, TPM_CRB_CONTROL_AREA_ADDRESS, 8)); + /* Start Method == (7) Command Response Buffer */ + BASL_EXEC(basl_table_append_int(table, 7, 4)); + /* Start Method Specific Parameters */ + uint8_t parameters[12] = { 0 }; + BASL_EXEC(basl_table_append_bytes(table, parameters, 12)); + /* Log Area Minimum Length */ + BASL_EXEC( + basl_table_append_int(table, TPM_CRB_LOG_AREA_MINIMUM_SIZE, 4)); + /* Log Area Start Address */ + BASL_EXEC( + basl_table_append_fwcfg(table, TPM_CRB_LOG_AREA_FWCFG_NAME, 1, 8)); + + BASL_EXEC(basl_table_register_to_rsdt(table)); + + return (0); +} + static struct tpm_intf tpm_intf_crb = { .name = "crb", .init = tpm_crb_init, .deinit = tpm_crb_deinit, + .build_acpi_table = tpm_crb_build_acpi_table, }; TPM_INTF_SET(tpm_intf_crb); From nobody Tue Jun 20 09:01:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlgbL14kZz4dsnZ; Tue, 20 Jun 2023 09:01: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 4QlgbL0Yg6z42Vl; Tue, 20 Jun 2023 09:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYT1ZpmcqH3xksWQLM0NHvEIpauSvknru2qVxujWodE=; b=Gjc3LT+xbFNEoubocQVsxYRLqgQEiJfiFT7QBnSCO6algJAaKcK4nwdlHSs53yjwLXFBeQ XU8np5GNFe2tsXBcdFp0JPwxBLIIdPIqSaGO+9QsqeS9YVRjs1YOVyFVwvVG7MGHz7ZWLc zZ1nYXfJ2yMPrWxDZ/D6ShOmBujUKN0O8xU5qrUsM1fZoz0YQAHJ3XP4qqiEbYSA6pS2v8 7pMxuwRGmNcWVr/9G+vkJPGn3HrXMxH6alTEECb4JYgysT+I3iqPiJapiHC7CseJZvRY0v w28Usgl9InJFPFfP0rbaYyyS17U5SUwHgAwc6P8mzPJoBWGojbawNcTkfILHrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687251662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYT1ZpmcqH3xksWQLM0NHvEIpauSvknru2qVxujWodE=; b=PuLV32JhiynHsNtHtd9xeDwpzB60rujrHnJAvnsiTls5Y8vaFK5txxrgRkOs4wk2lpK/DW AjytZQDvO+gn8GCIWIZuZqWR9Q/cpGFZ4HV0pGRMz2aU/MWnDwBxHVTrHdKSJT7yyp09ay tmFgtuv6BehBWbtIS2I8pC6Qh+LUK4rGbeLtFqzg9Gi5jBh6dcrmlOTW04Yz/BUB/uJxbb IVZW7LCxaKUZh98HvUZBgbQK9jlBq4xjes2ib6wFW1DJLHEPN4/NuBdzSUG2sy/dEgUEU0 TJ5cLRKh1SUJHTCvBcI49kEUOxlRcrEpyTYnuC/60uCW13IuYPCLJO6Byru2Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687251662; a=rsa-sha256; cv=none; b=Yemu4TJNvB7M3g078u1pLfj+trgD4aHt1wsAnrPUwtLWNtkyneDcuBhD1DJnrc0juqkKMG Pnjb7zZrhyoTjd4nv9Sa527KuAZlf2fJ3IkJonAtH9jruHYivV4tL0kBBJ8jfN4JVgu3BC e2RroQNGmvljraXzORjgWQRS7MOWGDtIhrOHQgH7tlQtvcZxdFzzH42ej2Y8u+72Ov4K7k DPbhVh7CYEWHSt/hzdPHg+s8NEXLDFdlNzEh8nHg27c4pq5LuDTr4o0Npt7igAcN5pYc/u wsQVTQUaHd+abERIXtlbDJ5buk2MTonX1yZh8cuN0eM2NO2ISEIAIfuFQPUQyw== 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 4QlgbK6Tg0zst4; Tue, 20 Jun 2023 09:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K911QI009682; Tue, 20 Jun 2023 09:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K9118Y009681; Tue, 20 Jun 2023 09:01:01 GMT (envelope-from git) Date: Tue, 20 Jun 2023 09:01:01 GMT Message-Id: <202306200901.35K9118Y009681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 0daf5f02cfaf - main - bhyve/tpm: create crb thread for sending tpm commands List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0daf5f02cfaf08a7fad75d934bbea50242c98ab3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=0daf5f02cfaf08a7fad75d934bbea50242c98ab3 commit 0daf5f02cfaf08a7fad75d934bbea50242c98ab3 Author: Corvin Köhne AuthorDate: 2022-08-29 10:10:44 +0000 Commit: Corvin Köhne CommitDate: 2023-06-20 08:59:00 +0000 bhyve/tpm: create crb thread for sending tpm commands Commands send to a tpm are very slow. They can take up to several seconds for completion. For that reason, create a thread which issues the commands to the tpm device. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40458 --- usr.sbin/bhyve/tpm_device.c | 2 +- usr.sbin/bhyve/tpm_emul.h | 2 + usr.sbin/bhyve/tpm_intf.h | 3 +- usr.sbin/bhyve/tpm_intf_crb.c | 102 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 105 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bhyve/tpm_device.c b/usr.sbin/bhyve/tpm_device.c index 94e9f1ffdc27..3ff480d5e6bb 100644 --- a/usr.sbin/bhyve/tpm_device.c +++ b/usr.sbin/bhyve/tpm_device.c @@ -141,7 +141,7 @@ tpm_device_create(struct tpm_device **const new_dev, struct vmctx *const vm_ctx, } if (dev->intf->init) { - error = dev->intf->init(&dev->intf_sc); + error = dev->intf->init(&dev->intf_sc, dev->emul, dev->emul_sc); if (error) goto err_out; } diff --git a/usr.sbin/bhyve/tpm_emul.h b/usr.sbin/bhyve/tpm_emul.h index f75c0318d37e..24452c92d3b8 100644 --- a/usr.sbin/bhyve/tpm_emul.h +++ b/usr.sbin/bhyve/tpm_emul.h @@ -18,5 +18,7 @@ struct tpm_emul { int (*init)(void **sc, nvlist_t *nvl); void (*deinit)(void *sc); + int (*execute_cmd)(void *sc, void *cmd, uint32_t cmd_size, void *rsp, + uint32_t rsp_size); }; #define TPM_EMUL_SET(x) DATA_SET(tpm_emul_set, x) diff --git a/usr.sbin/bhyve/tpm_intf.h b/usr.sbin/bhyve/tpm_intf.h index 3003d8fbd754..020743c0c3f1 100644 --- a/usr.sbin/bhyve/tpm_intf.h +++ b/usr.sbin/bhyve/tpm_intf.h @@ -11,6 +11,7 @@ #include "config.h" #include "tpm_device.h" +#include "tpm_emul.h" #define TPM_INTF_TYPE_FIFO_PTP 0x0 #define TPM_INTF_TYPE_CRB 0x1 @@ -30,7 +31,7 @@ struct tpm_intf { const char *name; - int (*init)(void **sc); + int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc); void (*deinit)(void *sc); int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx); }; diff --git a/usr.sbin/bhyve/tpm_intf_crb.c b/usr.sbin/bhyve/tpm_intf_crb.c index b8ae33c5ec0a..a920eb5a67e6 100644 --- a/usr.sbin/bhyve/tpm_intf_crb.c +++ b/usr.sbin/bhyve/tpm_intf_crb.c @@ -26,6 +26,7 @@ #include "config.h" #include "mem.h" #include "qemu_fwcfg.h" +#include "tpm_device.h" #include "tpm_intf.h" #define TPM_CRB_ADDRESS 0xFED40000 @@ -45,6 +46,8 @@ #define TPM_CRB_LOG_AREA_FWCFG_NAME "etc/tpm/log" +#define TPM_CRB_INTF_NAME "crb" + struct tpm_crb_regs { union tpm_crb_reg_loc_state { struct { @@ -164,17 +167,82 @@ static_assert(sizeof(struct tpm_crb_regs) == TPM_CRB_REGS_SIZE, } while (0) struct tpm_crb { + struct tpm_emul *emul; + void *emul_sc; uint8_t tpm_log_area[TPM_CRB_LOG_AREA_MINIMUM_SIZE]; struct tpm_crb_regs regs; + pthread_t thread; + pthread_mutex_t mutex; + pthread_cond_t cond; + bool closing; }; +static void * +tpm_crb_thread(void *const arg) +{ + struct tpm_crb *const crb = arg; + + pthread_mutex_lock(&crb->mutex); + for (;;) { + pthread_cond_wait(&crb->cond, &crb->mutex); + + if (crb->closing) + break; + + const uint64_t cmd_addr = CRB_CMD_ADDR_READ(crb->regs); + const uint64_t rsp_addr = CRB_RSP_ADDR_READ(crb->regs); + const uint32_t cmd_size = CRB_CMD_SIZE_READ(crb->regs); + const uint32_t rsp_size = CRB_RSP_SIZE_READ(crb->regs); + + const uint64_t cmd_off = cmd_addr - TPM_CRB_DATA_BUFFER_ADDRESS; + const uint64_t rsp_off = rsp_addr - TPM_CRB_DATA_BUFFER_ADDRESS; + + if (cmd_off > TPM_CRB_DATA_BUFFER_SIZE || + cmd_off + cmd_size > TPM_CRB_DATA_BUFFER_SIZE || + rsp_off > TPM_CRB_DATA_BUFFER_SIZE || + rsp_off + rsp_size > TPM_CRB_DATA_BUFFER_SIZE) { + warnx( + "%s: invalid cmd [%16lx, %16lx] --> [%16lx, %16lx]\n\r", + __func__, cmd_addr, cmd_addr + cmd_size, rsp_addr, + rsp_addr + rsp_size); + break; + } + + /* + * The command response buffer interface uses a single buffer + * for sending a command to and receiving a response from the + * tpm. To avoid reading old data from the command buffer which + * might be a security issue, we zero out the command buffer + * before writing the response into it. The rsp_size parameter + * is controlled by the guest and it's not guaranteed that the + * response has a size of rsp_size (e.g. if the tpm returned an + * error, the response would have a different size than + * expected). For that reason, use a second buffer for the + * response. + */ + uint8_t rsp[TPM_CRB_DATA_BUFFER_SIZE] = { 0 }; + crb->emul->execute_cmd(crb->emul_sc, + &crb->regs.data_buffer[cmd_off], cmd_size, &rsp[rsp_off], + rsp_size); + + memset(crb->regs.data_buffer, 0, TPM_CRB_DATA_BUFFER_SIZE); + memcpy(&crb->regs.data_buffer[rsp_off], &rsp[rsp_off], rsp_size); + + crb->regs.ctrl_start.start = false; + } + pthread_mutex_unlock(&crb->mutex); + + return (NULL); +} + static int -tpm_crb_init(void **sc) +tpm_crb_init(void **sc, struct tpm_emul *emul, void *emul_sc) { struct tpm_crb *crb = NULL; int error; assert(sc != NULL); + assert(emul != NULL); crb = calloc(1, sizeof(struct tpm_crb)); if (crb == NULL) { @@ -185,6 +253,9 @@ tpm_crb_init(void **sc) memset(crb, 0, sizeof(*crb)); + crb->emul = emul; + crb->emul_sc = emul_sc; + crb->regs.loc_state.tpm_req_valid_sts = true; crb->regs.loc_state.tpm_established = true; @@ -216,6 +287,26 @@ tpm_crb_init(void **sc) goto err_out; } + error = pthread_mutex_init(&crb->mutex, NULL); + if (error) { + warnc(error, "%s: failed to init mutex", __func__); + goto err_out; + } + + error = pthread_cond_init(&crb->cond, NULL); + if (error) { + warnc(error, "%s: failed to init cond", __func__); + goto err_out; + } + + error = pthread_create(&crb->thread, NULL, tpm_crb_thread, crb); + if (error) { + warnx("%s: failed to create thread\n", __func__); + goto err_out; + } + + pthread_set_name_np(crb->thread, "tpm_intf_crb"); + *sc = crb; return (0); @@ -237,6 +328,13 @@ tpm_crb_deinit(void *sc) crb = sc; + crb->closing = true; + pthread_cond_signal(&crb->cond); + pthread_join(crb->thread, NULL); + + pthread_cond_destroy(&crb->cond); + pthread_mutex_destroy(&crb->mutex); + free(crb); } @@ -275,7 +373,7 @@ tpm_crb_build_acpi_table(void *sc __unused, struct vmctx *vm_ctx) } static struct tpm_intf tpm_intf_crb = { - .name = "crb", + .name = TPM_CRB_INTF_NAME, .init = tpm_crb_init, .deinit = tpm_crb_deinit, .build_acpi_table = tpm_crb_build_acpi_table, From nobody Tue Jun 20 09:46:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlhbL4dBVz4gH50; Tue, 20 Jun 2023 09:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlhbL45Mxz3DYm; Tue, 20 Jun 2023 09:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687254366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0WEh6ovXEVhppYKG+W6r8pJH/I/GOqFhjAApYmGJZYc=; b=hnqnLfJGYnzrXjrV9GuLijA+cFAQXxGfuvbE5Kmy/sJQlGXK3v2RkLzLZRHoQ+XsN1kkE+ y9Ol9Xzsr3wxdvTXxv9j7W6ksJ582mDvbv5qyJpV9K4n5nU052Z9luymhZfL5nNfkoINi+ DOpD96owzCu1NOSRKufggA3V90KQKGh8A7pWydPxTWjpg2JLVHrXna0rvSlP9LGSxrici7 MZ40MaJQThqXVvj08Vten5xnyWOPsu10G6hBMvACDsQYeFtYvdg7cRJdh6cTPqQoadjiR+ v2zjDA7MrFYTwdrghxOwzwKsYYPA0nk4Ei4T/H9Q5GMSUWXe01ujzMm/hy7osg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687254366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0WEh6ovXEVhppYKG+W6r8pJH/I/GOqFhjAApYmGJZYc=; b=R+WNO1B1L+f2zP4Kuhmpw7dYRFD4aeg2oiGjQGAsmA02/hZjk/XAFym+qRjLMV1KRfcseS qLX8IY1Jw8I9dqNc7SCsSHSXdxkE8tMy1FBZMElQY/0bhlClbNwxmlTWQiT8LO1w96n4Y3 htwgeiERK30X9uzZJEiQxpW0cLEydT6Z973K8rlXSTJlzd3oed3hiV29uKUrpkDJhB6vwQ 95TwxzXRNNLlbc1UkAjPj1QhiP3XZ4p91lA/KAbhKPvwOuJvN1Lph5DDzdCmj9gCLrXAqu K8SkZNR8wwR5bIlqSlQgKGXCEyO0cxf/f0yQHvd9rV+fuJX+JixzEKXD3T9wAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687254366; a=rsa-sha256; cv=none; b=Z0EEx/+OXKKeOW2fHDZFRncHEhkyUZDSoRA30CodDrnwVYBW52fb97x7w9hb87QBNmhbeS d/zObic4u8fV7qbH2BlN17qeY6UMSYODEA9igkTNIJZJFTXJcS//FZwu/Ma0V2jwUksFSN JjCYY3BAr7M81xc+8LbubJK7LTmC7V/96jg7nqEoqSyLhIxiqgev77nEURkeOR5kUZU6Aa bHxO9720DS0L8Q+15zJt+WiFgP7aRAyyi1WIFhfPBvXtqwmb9ts+/kn2aCQPLQSz95q879 1uqIdpePqg1M4Zhh0VapSHfh/zzdh8dTm/U+sXp5yc6dQZOKu6hLvuU2c4apOQ== 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 4QlhbL2m3gzvB5; Tue, 20 Jun 2023 09:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K9k6xl082565; Tue, 20 Jun 2023 09:46:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K9k6jp082564; Tue, 20 Jun 2023 09:46:06 GMT (envelope-from git) Date: Tue, 20 Jun 2023 09:46:06 GMT Message-Id: <202306200946.35K9k6jp082564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6983b986e194 - main - pf: allow defer timeout to be configured List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6983b986e194d409344c0d3b1540610648df4d25 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6983b986e194d409344c0d3b1540610648df4d25 commit 6983b986e194d409344c0d3b1540610648df4d25 Author: Kristof Provost AuthorDate: 2023-06-19 14:37:19 +0000 Commit: Kristof Provost CommitDate: 2023-06-20 09:20:26 +0000 pf: allow defer timeout to be configured Add the net.pfsync.defer_delay sysctl to allow the defer timeout (i.e. how long pf holds onto packets waiting for the peer to ack the new state) to be changed. This is intended to make testing of the defer code more robust, by allowing longer timeouts to mitigate scheduling/measurement jitter. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pfsync.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 67f986e6abd2..61f2dcba1767 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -281,6 +281,8 @@ struct pfsync_softc { #define PFSYNC_BUNLOCK(sc) mtx_unlock(&(sc)->sc_bulk_mtx) #define PFSYNC_BLOCK_ASSERT(sc) mtx_assert(&(sc)->sc_bulk_mtx, MA_OWNED) +#define PFSYNC_DEFER_TIMEOUT 20 + static const char pfsyncname[] = "pfsync"; static MALLOC_DEFINE(M_PFSYNC, pfsyncname, "pfsync(4) data"); VNET_DEFINE_STATIC(struct pfsync_softc *, pfsyncif) = NULL; @@ -293,6 +295,8 @@ VNET_DEFINE_STATIC(struct pfsyncstats, pfsyncstats); #define V_pfsyncstats VNET(pfsyncstats) VNET_DEFINE_STATIC(int, pfsync_carp_adj) = CARP_MAXSKEW; #define V_pfsync_carp_adj VNET(pfsync_carp_adj) +VNET_DEFINE_STATIC(unsigned int, pfsync_defer_tmo) = PFSYNC_DEFER_TIMEOUT; +#define V_pfsync_defer_tmo VNET(pfsync_defer_tmo) static void pfsync_timeout(void *); static void pfsync_push(struct pfsync_bucket *); @@ -317,6 +321,8 @@ SYSCTL_INT(_net_pfsync, OID_AUTO, carp_demotion_factor, CTLFLAG_VNET | CTLFLAG_R &VNET_NAME(pfsync_carp_adj), 0, "pfsync's CARP demotion factor adjustment"); SYSCTL_ULONG(_net_pfsync, OID_AUTO, pfsync_buckets, CTLFLAG_RDTUN, &pfsync_buckets, 0, "Number of pfsync hash buckets"); +SYSCTL_UINT(_net_pfsync, OID_AUTO, defer_delay, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(pfsync_defer_tmo), 0, "Deferred packet timeout (in ms)"); static int pfsync_clone_create(struct if_clone *, int, caddr_t); static void pfsync_clone_destroy(struct ifnet *); @@ -358,7 +364,6 @@ static struct pfsync_bucket *pfsync_get_bucket(struct pfsync_softc *, struct pf_kstate *); #define PFSYNC_MAX_BULKTRIES 12 -#define PFSYNC_DEFER_TIMEOUT ((20 * hz) / 1000) VNET_DEFINE(struct if_clone *, pfsync_cloner); #define V_pfsync_cloner VNET(pfsync_cloner) @@ -1882,7 +1887,8 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) TAILQ_INSERT_TAIL(&b->b_deferrals, pd, pd_entry); callout_init_mtx(&pd->pd_tmo, &b->b_mtx, CALLOUT_RETURNUNLOCKED); - callout_reset(&pd->pd_tmo, PFSYNC_DEFER_TIMEOUT, pfsync_defer_tmo, pd); + callout_reset(&pd->pd_tmo, (V_pfsync_defer_tmo * hz) / 1000, + pfsync_defer_tmo, pd); pfsync_push(b); PFSYNC_BUCKET_UNLOCK(b); From nobody Tue Jun 20 09:46:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlhbM5Whqz4gH7Q; Tue, 20 Jun 2023 09:46: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 4QlhbM4v1Kz3Dbk; Tue, 20 Jun 2023 09:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687254367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7y2m8VAt7HJq9zeyvEm1eD/JDLvAaxP8oOmpi/aQP/U=; b=ssjYlXNHY693v1ViFoC5Z0D1uIb+kYV31nLMemQUQj6FMfQFflbjRomoTSFkLt/b3Asmmp ialB/Mgsil3ORIAbAnxuW/MBiZoMUjSK9PcPTI7c00HTkVQksURnCsw9ikQWGEZ/BTqee+ gkX8e/miXQu6Wx1X49NM2/2rrCgVzpi0bYb4Dh+LJfya3mXPZwfNGvs2Hu8yjNVrKTavb1 PKTldngo8Tj2eNQF6Rggy2PdbIGgI+Bo+PLSs/sb1bnw+Uqmw+sKvF/YANeem+sgWB+x1R JAMq0TeUTtI4VjkVOOg/a674gTOIxmllnIhDxuGvwlQpT3J+cq8vYbzcZrhhMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687254367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7y2m8VAt7HJq9zeyvEm1eD/JDLvAaxP8oOmpi/aQP/U=; b=Ymgt+aOC6KZDY8PfxWcWG2qor7TLTBZ9ADJWusgUjra/mh/csXyNNNMqLhpoVLwdtCHWVE DYZjApg8L+gj37HGs+tXzlee2YAij8JWieR8weekcH7mx4gdioMcS4brXXZPIgKQt3Er4e Xia8pP3jus4UBTorzYyfVGDon9SphvmxctTxlqu1TTEpkj5acVKmifs9Pdmmsc9dCx2rF4 adY6YLjLZVvHiICNzcOibXXzW6bt/admVulqASHyUcZo8nDq41/uN+/ZsEB+huQ0043+dG 1Ko7Z3qYqIiYTH0qP1y0gZ1SAwQu8otiT9MWfM0n8+1ahi2luFBKfvpdb8v8EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687254367; a=rsa-sha256; cv=none; b=r8jxpYDlLKrZDZe+AFScGvzQ0qF6WYtZcQgxFmG4p9VuSfqSYuGtr80LLBvMRpEN+GkqIM nGhAK9oTq5WBY3D7jBkOYseDoxQk09ABzWYkL8KTFbqwshsClRechz+7Ekdy3u18Lh6Z3N zQIFKAQe7XVmm1MjZKyPGMtnymptOYWxQcVmoQ0+Rn/zrgebYWnJK4cuWLQ8WrxOA2GfRg jheKydIQx202PybkQ2oMfUDQTj5h3CSjqRrJ+JB9kR9184kGnpFqWmWOZ9y921+OXBCAY9 R6DBXdISru+RAR8dTckh4YlkiG+eKXVDB7lIQ6sGaMBnYkmXthEjZPoeLgrU1Q== 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 4QlhbM3NghztpM; Tue, 20 Jun 2023 09:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K9k7Ju082587; Tue, 20 Jun 2023 09:46:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K9k7i9082586; Tue, 20 Jun 2023 09:46:07 GMT (envelope-from git) Date: Tue, 20 Jun 2023 09:46:07 GMT Message-Id: <202306200946.35K9k7i9082586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f25ceb05af66 - main - pf tests: make pfsync:defer test more robust List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f25ceb05af666f22ac3bf14332a6a3ec679a3332 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f25ceb05af666f22ac3bf14332a6a3ec679a3332 commit f25ceb05af666f22ac3bf14332a6a3ec679a3332 Author: Kristof Provost AuthorDate: 2023-06-19 14:41:13 +0000 Commit: Kristof Provost CommitDate: 2023-06-20 09:38:11 +0000 pf tests: make pfsync:defer test more robust Set the defer timeout to 2.5 seconds, and only make sure that there's at least a second of delay between the pfsync packet and the ping packet. The intent is to allow the test to pass even when there's considerable jitter on the timing measurement (e.g. when the test runs in a VM, such as during the CI tests). Allow the test to run in CI. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/pfsync.sh | 7 +++---- tests/sys/netpfil/pf/pfsync_defer.py | 11 +++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index 8028ba9790ba..75788eed4bbe 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -125,10 +125,6 @@ defer_body() { pfsynct_init - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "Skip know failing test (likely related to https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260460)" - fi - epair_sync=$(vnet_mkepair) epair_in=$(vnet_mkepair) epair_out=$(vnet_mkepair) @@ -141,6 +137,9 @@ defer_body() jexec alcatraz arp -s 203.0.113.2 00:01:02:03:04:05 jexec alcatraz sysctl net.inet.ip.forwarding=1 + # Set a long defer delay + jexec alcatraz sysctl net.pfsync.defer_delay=2500 + jexec alcatraz ifconfig pfsync0 \ syncdev ${epair_sync}a \ maxupd 1 \ diff --git a/tests/sys/netpfil/pf/pfsync_defer.py b/tests/sys/netpfil/pf/pfsync_defer.py index c1d90d4483c4..0a258c8f27b3 100644 --- a/tests/sys/netpfil/pf/pfsync_defer.py +++ b/tests/sys/netpfil/pf/pfsync_defer.py @@ -119,13 +119,12 @@ def main(): if not got_ping: sys.exit(2) - if got_pfsync > got_ping: + # Deferred packets are delayed around 2.5s (unless the pfsync peer, which + # we don't have here, acks their state update earlier) + # Expect at least a second of delay, to be somewhat robust against + # scheduling-induced jitter. + if (sent_ping + 1) > got_ping: sys.exit(3) - # Deferred packets are delayed up to 20ms (unless the pfsync peer, which we - # don't have here, acks their state update earlier) - if (sent_ping + 0.020) > got_ping: - sys.exit(4) - if __name__ == '__main__': main() From nobody Tue Jun 20 09:52:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlhl43SGrz4gRF2; Tue, 20 Jun 2023 09:52: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 4Qlhl36R17z3JGW; Tue, 20 Jun 2023 09:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687254767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R15fueIe+/mW/Q+LChTkKSrcjKW2aaWKWJVx2bdHHjU=; b=Mz027IylFAnQwDtPafXxS3IbmVLiqMbtLk1ZXedN3RxOx9TiGVbJIG1gmLqWLNuG9+2J0C r+930e4dgrg9AFmTXvbppYw9oCmexfVitANStnnDDqJ492PVdaZNa2Kww3wjWQ0Z+p0Ovh ZG3SkZu9KnmIJOj78CFT+q0sQEnAhAF5Cb8s74ZsoQfalZWCvw2l9u1PT2p/k+Lh/u+1+s ULlDS9asGGQ0nitffVntkmUYTGM1l6QsRzvChYoftPXeO6eQ7DxfA8mdOEmxxwaVREa15g Hx3xDg8Q/kgwBZPqR7gpj9iajGnjb4ir8T8Qd+ETbPPbKfJhJcgInxeax+6ECg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687254767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R15fueIe+/mW/Q+LChTkKSrcjKW2aaWKWJVx2bdHHjU=; b=lCaEhDXwt6sAdRPhmuZBCMdnGf0SippQ7/GPaK1T9dR183pQ3vJ9h3lICBe6FsL40VYmut gZtx8/geblSE68wili1IBtVj0fg7nv8gEsHhKP4/Ise65H60Mr76GQehg8TdX+d0VUhEwV 1JgYl+pIeM60aTAhjxs0J8xljnVm2sbm6WJVGQmak2SASNDS/OziZyfg22s4Xi9bgjFQg+ XIFfE6V5zdKKoSBX3JTnxzemDYvpT5/k+SUjSpdGaThY7Cep8Jp9f0CSoJUHurKyGdfBnV T1JNWQtT/+fNX1znorQ74yzGlh4WxrRzon/ZJHLL3OUwdZToDXdKoxNoj7yAhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687254767; a=rsa-sha256; cv=none; b=S4MNDri5ZuPyN8LK8tf2YHR+graq7Gd7ovAupT0aDUNBxMAqhcFCXetu9/KfY+VKTHU0N0 TczZKyT9CSaF/xchrU38PmJDlkWWwV9sxnjlSxqu2yPf5vTp6NijEqHzXzoPF9Bxjj9whM wNKQE0D2M/d3LUoiVbac6IPfGwMC+Ivc8E3hlXAlH+7iJaUxzskXrm8RI+bjiZYe20+Ae/ 7j0TJ+BKQ3PU3tn67OD8IuiFO7/GgrSJjI9q+YE2lgfH4klUONgoJg2yj4+A5E8a4ex1WN jfhvZzLrlHsAk4w9jNJNCMIH73IODyRPz8BNkum/GCSyPEBY1ynULUcgPKLL8g== 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 4Qlhl35CQ5ztpx; Tue, 20 Jun 2023 09:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K9qlga098781; Tue, 20 Jun 2023 09:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K9qlOD098780; Tue, 20 Jun 2023 09:52:47 GMT (envelope-from git) Date: Tue, 20 Jun 2023 09:52:47 GMT Message-Id: <202306200952.35K9qlOD098780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 35c8063ab1de - main - bhyve: dos2unix List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35c8063ab1dec62bf9ff36c0f75d92c32f021462 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=35c8063ab1dec62bf9ff36c0f75d92c32f021462 commit 35c8063ab1dec62bf9ff36c0f75d92c32f021462 Author: Corvin Köhne AuthorDate: 2023-06-20 09:47:42 +0000 Commit: Corvin Köhne CommitDate: 2023-06-20 09:52:43 +0000 bhyve: dos2unix tpm_intf.h was incorrectly committed with dos line endings. Fixes: 0917f925b46e3142c4373d1591bf22014d0f338e ("bhyve: add basic CRB interface for TPM devices") MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG --- usr.sbin/bhyve/tpm_intf.h | 76 +++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/usr.sbin/bhyve/tpm_intf.h b/usr.sbin/bhyve/tpm_intf.h index 020743c0c3f1..0bfecf9206d4 100644 --- a/usr.sbin/bhyve/tpm_intf.h +++ b/usr.sbin/bhyve/tpm_intf.h @@ -1,38 +1,38 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG - * Author: Corvin Köhne - */ - -#pragma once - -#include - -#include "config.h" -#include "tpm_device.h" -#include "tpm_emul.h" - -#define TPM_INTF_TYPE_FIFO_PTP 0x0 -#define TPM_INTF_TYPE_CRB 0x1 -#define TPM_INTF_TYPE_FIFO_TIS 0xF - -#define TPM_INTF_VERSION_FIFO 0 -#define TPM_INTF_VERSION_CRB 1 - -#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_4 0 -#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_8 1 -#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_32 2 -#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_64 3 - -#define TPM_INTF_SELECTOR_FIFO 0 -#define TPM_INTF_SELECTOR_CRB 1 - -struct tpm_intf { - const char *name; - - int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc); - void (*deinit)(void *sc); - int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx); -}; -#define TPM_INTF_SET(x) DATA_SET(tpm_intf_set, x) +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG + * Author: Corvin Köhne + */ + +#pragma once + +#include + +#include "config.h" +#include "tpm_device.h" +#include "tpm_emul.h" + +#define TPM_INTF_TYPE_FIFO_PTP 0x0 +#define TPM_INTF_TYPE_CRB 0x1 +#define TPM_INTF_TYPE_FIFO_TIS 0xF + +#define TPM_INTF_VERSION_FIFO 0 +#define TPM_INTF_VERSION_CRB 1 + +#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_4 0 +#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_8 1 +#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_32 2 +#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_64 3 + +#define TPM_INTF_SELECTOR_FIFO 0 +#define TPM_INTF_SELECTOR_CRB 1 + +struct tpm_intf { + const char *name; + + int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc); + void (*deinit)(void *sc); + int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx); +}; +#define TPM_INTF_SET(x) DATA_SET(tpm_intf_set, x) From nobody Tue Jun 20 10:02:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlhy36zx0z4dy27; Tue, 20 Jun 2023 10:02: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 4Qlhy368ZBz3P06; Tue, 20 Jun 2023 10:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687255339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+EFmn6wRadOnqQszsc9YGplRWqxOi0PqBAQ0CTIQer8=; b=sSO0asqb4K8G5dxTPEWvFGG5AxmNtpmpIhSvrEC5GXuQhOt4/LYSqH5ZI3ULuDEuAvPuWI g9FgKwvuFUFzyhNRJjwdaN2JlC1aOuHkvHgzyCbzP206CF+p8CFVVJTYUi+S1TKP2IYhU6 lzWnjDXd1zvi9QD3Vpff6vTsiac675lTgvwH+YsRRvq8lTwETdqhx9H81d81oBwdmtZj81 BcC7XxmCzoiEjVak7J9mzacfNWyRR4IgubhmMVzw6yoiJxXqk4zoxXxQzXgTIttmbQSUc4 4tSkpwujmnAze0pCgdCjA+KWFCbHbSx8ZARHCQ1ia4/win4gzWJwbEw0H7yrLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687255339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+EFmn6wRadOnqQszsc9YGplRWqxOi0PqBAQ0CTIQer8=; b=R6ExddxUGqadkN7ntdjrY1wRTs/bHT5fDNIJHEmIK0wVKnCszk2Db1PrYHyu7by7VOMeVo x6z38qtAq5HHfbGcg+Haom7v2RAcpX+q18ElMJb1Kdl+9hpcEQHF53SJiV9KbzvVI0spID Vc7duhDclnASL+PjUl44wnuANjWOJBWMeW/3xT2zAhj4TztLi0acoTKnX0k5samqbozkMk wCKkGXWQDMCUj8iLAXo+x47EOJLXhO7TeDnkvqF+H7BhOxW7TPMkzF4x84+UtVl6zSb3g5 rkfpSFcyZDKYBT7jk+BX5aIEa8sXjJfcnOWBIQu4M5s8W4xVn6OS7GNQ7lUv1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687255339; a=rsa-sha256; cv=none; b=JbiwCqF5v+3b45sSET/ODgjA1F7rflnrhjFxD/LGj84/NyUQDSywNEw0XlV7BT/ihrFeZK nNZ0CvBgIMI38jCwYUIwWqpTEnSV5lIrl2fCU/k+fifZ+6IDQ4V2TgpXdISY8Z/wKWNvea +zMipnFlEjnhpE2hXjWmSENIKpdW97u1A/sgZRPCxw8+SQbAHQIvYn8Y4KQ/ZhA6pqEtvC 1anvw0suAtgCcGNbMW/rgkH86gbe3ucqz7wI8Abu1I+QOe30NTpZlz2GQs1FDxTTAMclh/ 8oADeJSfBrUst4S1PkxHxiqF99yExOhBcQn4e1DHklzQK8ozLaJp8MGyteqmTQ== 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 4Qlhy35DwGzvgN; Tue, 20 Jun 2023 10:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KA2JBg013251; Tue, 20 Jun 2023 10:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KA2JKu013250; Tue, 20 Jun 2023 10:02:19 GMT (envelope-from git) Date: Tue, 20 Jun 2023 10:02:19 GMT Message-Id: <202306201002.35KA2JKu013250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 91e03758ded5 - main - tarfs: Don't use IO_DIRECT when reading from tarball. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91e03758ded5dbaf7a5a6247c3eb61a07c95494d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=91e03758ded5dbaf7a5a6247c3eb61a07c95494d commit 91e03758ded5dbaf7a5a6247c3eb61a07c95494d Author: Dag-Erling Smørgrav AuthorDate: 2023-06-20 09:37:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-06-20 10:02:10 +0000 tarfs: Don't use IO_DIRECT when reading from tarball. Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40612 --- sys/fs/tarfs/tarfs_io.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index 58f3e7eab03f..a3d8df62d7df 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -125,8 +125,7 @@ tarfs_io_read(struct tarfs_mount *tmp, bool raw, struct uio *uiop) rl = vn_rangelock_rlock(tmp->vp, off, off + len); error = vn_lock(tmp->vp, LK_SHARED); if (error == 0) { - error = VOP_READ(tmp->vp, uiop, - IO_DIRECT|IO_NODELOCKED, + error = VOP_READ(tmp->vp, uiop, IO_NODELOCKED, uiop->uio_td->td_ucred); VOP_UNLOCK(tmp->vp); } @@ -426,8 +425,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) auio.uio_rw = UIO_READ; auio.uio_resid = aiov.iov_len; auio.uio_td = td; - error = VOP_READ(tmp->vp, &auio, - IO_DIRECT | IO_NODELOCKED, + error = VOP_READ(tmp->vp, &auio, IO_NODELOCKED, td->td_ucred); if (error != 0) goto fail; From nobody Tue Jun 20 11:21:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlkjc4hwCz4gKTN; Tue, 20 Jun 2023 11:21: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 4Qlkjc4Bl9z42ML; Tue, 20 Jun 2023 11:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687260100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJwWaeO8pGfhSjcBGS9ST4J9iP4gZb7JzqCMh9mDz3w=; b=CsoSz4rutxDeTmIdsIX5LA5cFf3AlN7kT1tFX4DZldEcHjE7Ms3/2lUC2lvnLHo9UECxUy Ay+drpsEOfqifQbSdD5xZ3a8ZD7uRxmXimBxb514lLGUHdNKHOBy6r+gsp+gnQN1Tvn1UO r0jVpUpY9sYlrRl3x1+Y/ckczfmeFktbMqPLon+ZsWSxsQeJHx293md+2tSEK7Li9GA/vD DTRyKr/RgOvVtCRuBnSt/FcwFq7TW0zYHazzseaZ2qi9tUQBumZAq5h/W0uL4dyzitvfvP xUwHfBVCznd0t6J5bnEK+SWjwhKdvmAYrP8u3/OObcb0kckc2QUAKgfLSgWBEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687260100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJwWaeO8pGfhSjcBGS9ST4J9iP4gZb7JzqCMh9mDz3w=; b=sYhX4xxIG7AXnMHRVUBnELij5xVFyH27YbRkfUdXOOJ9JtMrAKdcnYSIe8lnzICs1ptFf+ /CFqDWoj+EhnG4Yd5yB6474YLuEunK3hjeLRvjhOjJXeQGDMS5SAyMWfBGnLSKnW/G/7n2 7qP12kVX7etyVt2uK093GIqnUeB/Mye+Jw2gps4QkkSgVVgMk4tuv8pH+/U38Yv+r9+l7P iLAd64dr3MxN3rDctzG5J4mOqXYNbOc28JxPofQNRWpSumSlHo4rzQmvbQkk0Kj6BnofBl v4T2c2cZm512ubZSmYqZnxiWMKAskwP1nVlAAtZayW/tVl3XOsOCJr9OX4wfqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687260100; a=rsa-sha256; cv=none; b=pt6EHDkHhXaD1bpC/zlSKu5db3w4g+mqE4o8TABjzpNeW0/S6ekrI9+qLReJOCen1fRqZS s+cnhNuFUKSmn6yykObvJn1xjLXbnJ5OmKcywkNuAQ5MfCqdo76eQ/2q4+AXKysQPnmViS 96TneOm1cTTqD0eQrz2lKyxS7oykppYgIz836i7qHr/FEr3XZ7Vgp3+mxEPbeBjGQ4SR1g eNAj5JqMTMo2Se9p6udJnUWMPq90vjvq53hjyjv9RcYlHMZ/8q3YdgnrKJDW+kwqIfmiq6 jGZnQ4x6AwHQi5hNzA5On5Cfp5fJ656Qj4BI/afyALjX247Y4BLz40xlGxwGiQ== 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 4Qlkjc2zlyzxLS; Tue, 20 Jun 2023 11:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KBLeWY045014; Tue, 20 Jun 2023 11:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KBLeNI045013; Tue, 20 Jun 2023 11:21:40 GMT (envelope-from git) Date: Tue, 20 Jun 2023 11:21:40 GMT Message-Id: <202306201121.35KBLeNI045013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 476f61217b7b - main - pf: fix build without VIMAGE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 476f61217b7ba879f2d7bd2c297b4852d8b403f8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=476f61217b7ba879f2d7bd2c297b4852d8b403f8 commit 476f61217b7ba879f2d7bd2c297b4852d8b403f8 Author: Kristof Provost AuthorDate: 2023-06-20 11:20:11 +0000 Commit: Kristof Provost CommitDate: 2023-06-20 11:20:11 +0000 pf: fix build without VIMAGE Remove the name conflict between the pfsync_defer_tmo variable and function. This worked fine in kernels with VIMAGE (the default), but not in those without. Reported by: des@ Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pfsync.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 61f2dcba1767..2af0b57eba45 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -295,8 +295,8 @@ VNET_DEFINE_STATIC(struct pfsyncstats, pfsyncstats); #define V_pfsyncstats VNET(pfsyncstats) VNET_DEFINE_STATIC(int, pfsync_carp_adj) = CARP_MAXSKEW; #define V_pfsync_carp_adj VNET(pfsync_carp_adj) -VNET_DEFINE_STATIC(unsigned int, pfsync_defer_tmo) = PFSYNC_DEFER_TIMEOUT; -#define V_pfsync_defer_tmo VNET(pfsync_defer_tmo) +VNET_DEFINE_STATIC(unsigned int, pfsync_defer_timeout) = PFSYNC_DEFER_TIMEOUT; +#define V_pfsync_defer_timeout VNET(pfsync_defer_timeout) static void pfsync_timeout(void *); static void pfsync_push(struct pfsync_bucket *); @@ -322,7 +322,7 @@ SYSCTL_INT(_net_pfsync, OID_AUTO, carp_demotion_factor, CTLFLAG_VNET | CTLFLAG_R SYSCTL_ULONG(_net_pfsync, OID_AUTO, pfsync_buckets, CTLFLAG_RDTUN, &pfsync_buckets, 0, "Number of pfsync hash buckets"); SYSCTL_UINT(_net_pfsync, OID_AUTO, defer_delay, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(pfsync_defer_tmo), 0, "Deferred packet timeout (in ms)"); + &VNET_NAME(pfsync_defer_timeout), 0, "Deferred packet timeout (in ms)"); static int pfsync_clone_create(struct if_clone *, int, caddr_t); static void pfsync_clone_destroy(struct ifnet *); @@ -1887,7 +1887,7 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) TAILQ_INSERT_TAIL(&b->b_deferrals, pd, pd_entry); callout_init_mtx(&pd->pd_tmo, &b->b_mtx, CALLOUT_RETURNUNLOCKED); - callout_reset(&pd->pd_tmo, (V_pfsync_defer_tmo * hz) / 1000, + callout_reset(&pd->pd_tmo, (V_pfsync_defer_timeout * hz) / 1000, pfsync_defer_tmo, pd); pfsync_push(b); From nobody Tue Jun 20 12:33:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlmK05bFYz4fgCT; Tue, 20 Jun 2023 12:33:56 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlmJz4QsHz4FkK; Tue, 20 Jun 2023 12:33:55 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.208.179 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; dmarc=none Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2b479d53d48so30378451fa.1; Tue, 20 Jun 2023 05:33:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687264433; x=1689856433; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MkOeBld8ZHrp+Tuu/ED5kXTKQXkWzhtNG57bBt8PWTE=; b=YNmBzNL2ExFyn0zuAM63Ktp0dJ8Fh37zbZAJRdM52b4AKojpk/+NM71RND4zn+G2xK 5F0N3C73lAwhthae9RGkkC7CPrAptCOJdfyCZr/9VR/gIyo04Vk+tuJNhj47/0oFcdWf IEr9SCCHSq3xReVkISYOR/7AMuLsEzNRQ8Ss57drOwKthEDhjt2sNtieXUbSLzW+Ye5C 0vO712l+x6Z8jL585BGl3YOGbV9T2pXGhwQ7Nf9NXUK6h3PJsZcE2BIDM9jqm1YkqZQt ceLIdSMXQLgkJ9X8bjR6KHkAvHOxLgWe2kvctWDCyGFc8lmBZOlzH5LEevUqyQ0noPCP SBDA== X-Gm-Message-State: AC+VfDx8xdfUmkExg4tf2TachS2o3hFQ8PF/ZinuoGIQxqodmABVCcWy 5GLkAIgItTa89e4rQtWzv4lrMJkP8PnVdb7v8sL8nIIi5WA= X-Google-Smtp-Source: ACHHUZ41/Qz4ZAKvsjAnuI+x84VIOTRVq3VSs41ZJTZdE0uw8u5XOVowh09LyOnsIn0nB+PRGEFQ9XaDY/hY8fEB4hg= X-Received: by 2002:a2e:6a13:0:b0:2b4:5fdd:f581 with SMTP id f19-20020a2e6a13000000b002b45fddf581mr5895294ljc.47.1687264432647; Tue, 20 Jun 2023 05:33:52 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202306131816.35DIG90C004375@gitrepo.freebsd.org> In-Reply-To: <202306131816.35DIG90C004375@gitrepo.freebsd.org> From: Ed Maste Date: Tue, 20 Jun 2023 08:33:40 -0400 Message-ID: Subject: Re: git: 21850106fdda - main - libtacplus: Allow additional AV pairs to be configured. To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.93 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-0.997]; NEURAL_HAM_MEDIUM(-0.97)[-0.971]; NEURAL_HAM_LONG(-0.97)[-0.965]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.179:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.179:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[carpeddiem]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[freebsd.org]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4QlmJz4QsHz4FkK X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N On Tue, 13 Jun 2023 at 14:16, Dag-Erling Sm=C3=B8rgrav wr= ote: > > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D21850106fdda5269bc881f0e62= 839dff3d9edf47 > > commit 21850106fdda5269bc881f0e62839dff3d9edf47 > Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2023-06-13 16:04:22 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2023-06-13 16:08:08 +0000 > > libtacplus: Allow additional AV pairs to be configured. > > * Replace hand-rolled input tokenizer with openpam_readlinev() which = supports line continuations and has better quoting and escaping. > * Simplify string handling by merging struct clnt_str and struct srvr= _str into just struct tac_str. > * Each server entry in the configuration file can now have up to 255 = AV pairs which will be appended to the ones returned by the server in respo= nse to a successful authorization request. > > This allows nss_tacplus(8) to be used with servers which do not provi= de identity information beyond confirming the existence of the user. > > This adds a dependency on libpam, however libtacplus is currently onl= y used by pam_tacplus(8) (which is already always used with libpam) and the= very recently added nss_tacplus(8) (which is extremely niche). In the lon= ger term it might be a good idea to split this out into a separate library. > > MFC after: 1 week > Sponsored by: Klara, Inc. > Reviewed by: pauamma_gundo.com, markj > Differential Revision: https://reviews.freebsd.org/D40285 > Relnotes: yes Cirrus-CI build is failing on occasion, due to a race between libpam and libtacplus -- e.g.: --- libpam.so.6.full --- building shared library libpam.so.6 /usr/local/bin/clang15 -target x86_64-unknown-freebsd14.0 --sysroot=3D/usr/obj/tmp/cirrus-ci-build/amd64.amd64/tmp -B/var/empty -Wl,-zrelro --ld-path=3D/usr/local/bin/ld.lld15 -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings -Wl,--warn-shared-textrel -o libpam.so.6.full -Wl,-soname,libpam.so.6 openpam_asprintf.pico openpam_borrow_cred.pico openpam_check_owner_perms.pico openpam_configure.pico openpam_constants.pico openpam_dispatch.pico openpam_dynamic.pico openpam_features.pico openpam_findenv.pico openpam_free_data.pico openpam_free_envlist.pico openpam_get_feature.pico openpam_get_option.pico openpam_load.pico openpam_log.pico openpam_nullconv.pico openpam_readline.pico openpam_readlinev.pico openpam_readword.pico openpam_restore_cred.pico openpam_set_feature.pico openpam_set_option.pico openpam_straddch.pico openpam_strlcat.pico openpam_strlcpy.pico openpam_strlset.pico openpam_subst.pico openpam_ttyconv.pico openpam_vasprintf.pico pam_acct_mgmt.pico pam_authenticate.pico pam_chauthtok.pico pam_close_session.pico pam_end.pico pam_error.pico pam_get_authtok.pico pam_get_data.pico pam_get_item.pico pam_get_user.pico pam_getenv.pico pam_getenvlist.pico pam_info.pico pam_open_session.pico pam_prompt.pico pam_putenv.pico pam_set_data.pico pam_set_item.pico pam_setcred.pico pam_setenv.pico pam_start.pico pam_strerror.pico pam_verror.pico pam_vinfo.pico pam_vprompt.pico --- lib/libtacplus__L --- ld.lld: error: unable to find library -lpam clang-15: error: linker command failed with exit code 1 (use -v to see invocation) From nobody Tue Jun 20 14:09:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlpQt13d1z4gmkW; Tue, 20 Jun 2023 14:09: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 4QlpQt0Z60z3t3Q; Tue, 20 Jun 2023 14:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687270150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSgdAyBXaf94Ivaze0ZdZI/d/xIKySWlWP+JhLkwUGw=; b=e3RpZwdBju2maQ4wo9mRQh0Gd2ZhCSf/2kFrPtE5xZoygtDK5x4pTdbrNbGEA6n8RK0qLX KsJEXvjnlgYqL3nHkys8fDQut5+0xl150z1FHhY9E6IjjxPEVGCFrS/1i8gp2d9zKXjHQT k03gbEhD8gMSZ7TXpD+G2zFkiqHngBzhpU/2pSEuANfADbcgJqQws3gqC144nR/yPPaId8 io9WMYbLWmAlBNFnEPTK+kLMxfXg+tdP9oJPFHYqWwpPgCBWxsGD8DUQ5CzVkFuDwCF1Bv bEDofJdrwQihCTiCLc6+jccORv4M4dFj6DHR04YHWGHXKpQf/fsMQsIvYyVZ3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687270150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSgdAyBXaf94Ivaze0ZdZI/d/xIKySWlWP+JhLkwUGw=; b=Ga49yyAK/lThv1lKgqX220ZlvoE0nuWc8x/Rz3AU0GGAO1z8AtiB0WPniLtjzhD7fvNcnb YrOk2FpqxLMQAelhusLqygfhiqCjd2ZL08/7jWY8c59Vba91je/96YAUTE9x8TqjjlNPP/ v4eQOdH3elVi4sd5Pq4+NWBy6Y1xGX7em21NgrkuKvJv/pKr9c78mNteevWxGAqS6G8iCQ MMtATPJlvqqQUYKvckwm6k+TWWMBa1oa4qJ/DR71VzYWsYhetEeSzbhBP199vW69YeheWt tXGgbot05L627DQhiQXS8jeAN7r3Vdt4qMZj1cVp/6c9euzXFUVAW7F4Hhzl0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687270150; a=rsa-sha256; cv=none; b=TKmyZlyl9usYPsiSyuwrizEnMJ2Zk0XR2RIw4bi04kfjlhGTe3gIiRnPJtJOw20UZsOX6e 8yTUS6LaYD9a94AKFXMN95GtSGsJEl6Go5+DWHMfyZkfHZB57icl9ES4vY9MNQUovrAYP+ uNOsDvnJPSLF9NqlUf5mqOqVVsXTcAuYNpz+wgUJEihTmE8D4Hemq+jgpVz1WRDyo24FnI Qbvq+NyNQ9Cw2TivBnvL/45k8PZm2fzI1Bmu2X8xIyVbJ8r3NmzXr3NJ9fTgwrpeKUs8vw xJ0YWdLKLAx1HfosTsqCnojDnvp8GkLodcCjI+VeNInWtLRrfiGz1RspQjoatQ== 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 4QlpQs6gxLz12Sl; Tue, 20 Jun 2023 14:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KE99Bd014294; Tue, 20 Jun 2023 14:09:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KE99bR014293; Tue, 20 Jun 2023 14:09:09 GMT (envelope-from git) Date: Tue, 20 Jun 2023 14:09:09 GMT Message-Id: <202306201409.35KE99bR014293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Koichiro Iwao Subject: git: 9aca30d87804 - main - ifconfig.8: Document limitation of groupname List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9aca30d87804b9b9f646f9ef3ad5ae6af81fd40a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/src/commit/?id=9aca30d87804b9b9f646f9ef3ad5ae6af81fd40a commit 9aca30d87804b9b9f646f9ef3ad5ae6af81fd40a Author: Koichiro Iwao AuthorDate: 2023-06-20 10:14:39 +0000 Commit: Koichiro Iwao CommitDate: 2023-06-20 14:08:04 +0000 ifconfig.8: Document limitation of groupname Approved by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40645 --- sbin/ifconfig/ifconfig.8 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 13685eba4c39..6c51b8758b02 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd June 13, 2023 +.Dd June 20, 2023 .Dt IFCONFIG 8 .Os .Sh NAME @@ -509,6 +509,9 @@ This action does not automatically disable routes using the interface. .It Cm group Ar groupname Assign the interface to a .Dq group . +The +.Ar groupname +may not be longer than 15 characters and must not end in a digit. Any interface can be in multiple groups. .Pp Cloned interfaces are members of their interface family group by default. From nobody Tue Jun 20 14:35:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlq1m1Bp1z4g3Wc; Tue, 20 Jun 2023 14:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlq1m0KyWz474W; Tue, 20 Jun 2023 14:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687271756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+dZqVSf1BUmLxRzcC2EzfeiTpZnsYbMJ7Zl6EhciN8=; b=lhvkBIvt3m0U6CgITGENkAb1vXMwuBxgr5wYsggrygB0UYME1KB9Rt0RRjXruwYarEddwd cvYAaOPI4zWldat5jfw8rqt86CzemBnCj083KN0BQyi+j3SvDDuumoxxcAF01/JNPGQv0Y YMwZSTp/mtZ36RH4JLBSsvLpLOcQikizuTvgplUGK6rmqH/fe79Oph/bPLmRmHF1JHKkMx KpXB1LXsqkrkfMdMZxFeaEHF8aAD2ErQWllJDzLI/7Ra8bQB+O2xlcjbCMbptUFDcdGQ2e v0j8Ths59ZOSm0ipAKjgj4Xm4SD2fOl90zN1mnSkNW2+eIdQCNhH7KmcnbhlhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687271756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+dZqVSf1BUmLxRzcC2EzfeiTpZnsYbMJ7Zl6EhciN8=; b=px48cBNS7WCzDXSF1Sbrgexwn4hN+qItMMs0UizibEA5/444fZAM+0eRCPevlTWqj7zC4Q kD3NzVs4JsuRkiGUm+e3UnMEXXI8zhQPS+SVcISIRq4N/MkvclWfEmDtE2ennyNXQfvQ7W XD9bmOuFTEexkW+Iz/zkupFjtiT+rkQwwRvpWG3dzz2AAdM/NGWw4xq6XYuQ558fi6dCXk nd/7qulhVe5WLd7iZDCIbKp9XZ2Cps1iPt8fFYPLJvW75Jgm4PVKYpQdoWMk6bdESvxHB8 MC2HAx3SRlpU7J1TQATdrRf4bLbooyt5ACNz5dKomRsiFXIX4AKj17X5UT0C7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687271756; a=rsa-sha256; cv=none; b=nebfn4lCZmIPlpqXMzs6r9zgiz0vLw9LkpnRpJ54xf+7JHxabh/5mJXBvzy5B067CzLsMN zMmKFfi3Xe6rFvOT3QVB9PROgm3+czfrd8mFR2qkpm3K2nWAQc7yZPyVGNH+RScAHSzScf 8mcbn71yy1XUGq2ECmsAHx15gJhoDZWRJvVPlMeUs6xvLvbUkJLK1qqYQnnwUr1PHktwg9 Jvgw66mAC+Ou/CcedGex5FywOX6etPhKiJCVdVLYJ7fRIGioSb88sqNeKhRnr0w+bJs64G pDNJysTnWjYKnIZzIzB5ybEH3c8EzSGp2JGtoFWJR/+mHfZNue7lNCKu3d2VCw== 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 4Qlq1l6Xgxz12KC; Tue, 20 Jun 2023 14:35:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KEZtvD062485; Tue, 20 Jun 2023 14:35:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KEZtHN062484; Tue, 20 Jun 2023 14:35:55 GMT (envelope-from git) Date: Tue, 20 Jun 2023 14:35:55 GMT Message-Id: <202306201435.35KEZtHN062484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 3a1f834b5228 - main - pf: Add code to enable filtering for locally delivered packets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a1f834b5228986a7c14fd60da13cf2700e80996 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=3a1f834b5228986a7c14fd60da13cf2700e80996 commit 3a1f834b5228986a7c14fd60da13cf2700e80996 Author: Doug Rabson AuthorDate: 2023-06-20 13:01:58 +0000 Commit: Doug Rabson CommitDate: 2023-06-20 14:34:01 +0000 pf: Add code to enable filtering for locally delivered packets This is disabled by default since it potentially changes the behavior of existing filter rule sets. To enable this extra filter for packets being delivered locally, use: sysctl net.pf.filter_local=1 service pf restart PR: 268717 Reviewed-by: kp MFC-after: 2 weeks Differential Revision: https://reviews.freebsd.org/D40373 --- UPDATING | 12 ++++++++++++ sys/netpfil/pf/pf_ioctl.c | 20 ++++++++++++++++++++ tests/sys/netpfil/common/utils.subr | 3 +-- tests/sys/netpfil/pf/fragmentation_compat.sh | 3 ++- tests/sys/netpfil/pf/fragmentation_pass.sh | 3 ++- tests/sys/netpfil/pf/killstate.sh | 24 ++++++++++++++++-------- tests/sys/netpfil/pf/map_e.sh | 3 ++- tests/sys/netpfil/pf/pass_block.sh | 3 ++- tests/sys/netpfil/pf/pfsync.sh | 1 + tests/sys/netpfil/pf/route_to.sh | 3 ++- tests/sys/netpfil/pf/set_skip.sh | 2 +- tests/sys/netpfil/pf/table.sh | 6 ++++-- 12 files changed, 65 insertions(+), 18 deletions(-) diff --git a/UPDATING b/UPDATING index 1980411c1853..f4e13d97006d 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20230619: + To enable pf rdr rules for connections initiated from the host, pf + filter rules can be optionally enabled for packets delivered + locally. This can change the behavior of rules which match packets + delivered to lo0. To enable this feature: + + sysctl net.pf.filter_local=1 + service pf restart + + When enabled, its best to ensure that packets delivered locally are not + filtered, e.g. by adding a 'skip on lo' rule. + 20230613: Improvements to libtacplus(8) mean that tacplus.conf(5) now follows POSIX shell syntax rules. This may cause TACACS+ diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index e76a92fb7e7f..b78c30aa4b8c 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -195,6 +195,12 @@ static MALLOC_DEFINE(M_PFRULE, "pf_rule", "pf(4) rules"); #error PF_QNAME_SIZE must be equal to PF_TAG_NAME_SIZE #endif +VNET_DEFINE_STATIC(bool, pf_filter_local) = false; +#define V_pf_filter_local VNET(pf_filter_local) +SYSCTL_BOOL(_net_pf, OID_AUTO, filter_local, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(pf_filter_local), false, + "Enable filtering for packets delivered to local network stack"); + static void pf_init_tagset(struct pf_tagset *, unsigned int *, unsigned int); static void pf_cleanup_tagset(struct pf_tagset *); @@ -6682,6 +6688,13 @@ hook_pf(void) pla.pa_hook = V_pf_ip4_out_hook; ret = pfil_link(&pla); MPASS(ret == 0); + if (V_pf_filter_local) { + pla.pa_flags = PFIL_OUT | PFIL_HEADPTR | PFIL_HOOKPTR; + pla.pa_head = V_inet_local_pfil_head; + pla.pa_hook = V_pf_ip4_out_hook; + ret = pfil_link(&pla); + MPASS(ret == 0); + } #endif #ifdef INET6 pha.pa_type = PFIL_TYPE_IP6; @@ -6703,6 +6716,13 @@ hook_pf(void) pla.pa_hook = V_pf_ip6_out_hook; ret = pfil_link(&pla); MPASS(ret == 0); + if (V_pf_filter_local) { + pla.pa_flags = PFIL_OUT | PFIL_HEADPTR | PFIL_HOOKPTR; + pla.pa_head = V_inet6_local_pfil_head; + pla.pa_hook = V_pf_ip6_out_hook; + ret = pfil_link(&pla); + MPASS(ret == 0); + } #endif atomic_store_bool(&V_pf_pfil_hooked, true); diff --git a/tests/sys/netpfil/common/utils.subr b/tests/sys/netpfil/common/utils.subr index f4eec24618a7..e354f6638b87 100644 --- a/tests/sys/netpfil/common/utils.subr +++ b/tests/sys/netpfil/common/utils.subr @@ -55,11 +55,10 @@ firewall_config() jexec ${jname} ipfw -q -f flush jexec ${jname} /bin/sh $cwd/ipfw.rule elif [ ${fw} == "pf" ]; then + jexec ${jname} sysctl net.pf.filter_local=1 jexec ${jname} pfctl -e jexec ${jname} pfctl -F all jexec ${jname} pfctl -f $cwd/pf.rule - jexec ${jname} pfilctl link -o pf:default-out inet-local - jexec ${jname} pfilctl link -o pf:default-out6 inet6-local elif [ ${fw} == "ipf" ]; then jexec ${jname} ipf -E jexec ${jname} ipf -Fa -f $cwd/ipf.rule diff --git a/tests/sys/netpfil/pf/fragmentation_compat.sh b/tests/sys/netpfil/pf/fragmentation_compat.sh index a783755e4592..3e559a216b54 100644 --- a/tests/sys/netpfil/pf/fragmentation_compat.sh +++ b/tests/sys/netpfil/pf/fragmentation_compat.sh @@ -112,7 +112,8 @@ v6_body() "scrub fragment reassemble" \ "block in" \ "pass in inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ - "pass in inet6 proto icmp6 icmp6-type { echoreq, echorep }" + "pass in inet6 proto icmp6 icmp6-type { echoreq, echorep }" \ + "set skip on lo" # Host test atf_check -s exit:0 -o ignore \ diff --git a/tests/sys/netpfil/pf/fragmentation_pass.sh b/tests/sys/netpfil/pf/fragmentation_pass.sh index d257de730d2d..e2d28c307502 100644 --- a/tests/sys/netpfil/pf/fragmentation_pass.sh +++ b/tests/sys/netpfil/pf/fragmentation_pass.sh @@ -116,7 +116,8 @@ v6_body() "pass keep state" \ "block in" \ "pass in inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ - "pass in inet6 proto icmp6 icmp6-type { echoreq, echorep }" + "pass in inet6 proto icmp6 icmp6-type { echoreq, echorep }" \ + "set skip on lo" # Host test atf_check -s exit:0 -o ignore \ diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh index 4263938e26be..cd4eeee05a10 100644 --- a/tests/sys/netpfil/pf/killstate.sh +++ b/tests/sys/netpfil/pf/killstate.sh @@ -60,7 +60,8 @@ v4_body() jexec alcatraz pfctl -e pft_set_rules alcatraz "block all" \ - "pass in proto icmp" + "pass in proto icmp" \ + "set skip on lo" # Sanity check & establish state atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \ @@ -126,7 +127,8 @@ v6_body() jexec alcatraz pfctl -e pft_set_rules alcatraz "block all" \ - "pass in proto icmp6" + "pass in proto icmp6" \ + "set skip on lo" # Sanity check & establish state atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \ @@ -189,7 +191,8 @@ label_body() pft_set_rules alcatraz "block all" \ "pass in proto tcp label bar" \ - "pass in proto icmp label foo" + "pass in proto icmp label foo" \ + "set skip on lo" # Sanity check & establish state atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \ @@ -251,7 +254,8 @@ multilabel_body() jexec alcatraz pfctl -e pft_set_rules alcatraz "block all" \ - "pass in proto icmp label foo label bar" + "pass in proto icmp label foo label bar" \ + "set skip on lo" # Sanity check & establish state atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \ @@ -281,7 +285,8 @@ multilabel_body() fi pft_set_rules alcatraz "block all" \ - "pass in proto icmp label foo label bar" + "pass in proto icmp label foo label bar" \ + "set skip on lo" # Reestablish state atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \ @@ -329,7 +334,8 @@ gateway_body() jexec alcatraz pfctl -e pft_set_rules alcatraz "block all" \ - "pass in reply-to (${epair}b 192.0.2.1) proto icmp" + "pass in reply-to (${epair}b 192.0.2.1) proto icmp" \ + "set skip on lo" # Sanity check & establish state # Note: use pft_ping so we always use the same ID, so pf considers all @@ -469,7 +475,8 @@ interface_body() jexec alcatraz pfctl -e pft_set_rules alcatraz "block all" \ - "pass in proto icmp" + "pass in proto icmp" \ + "set skip on lo" # Sanity check & establish state atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \ @@ -525,7 +532,8 @@ id_body() pft_set_rules alcatraz "block all" \ "pass in proto tcp" \ - "pass in proto icmp" + "pass in proto icmp" \ + "set skip on lo" # Sanity check & establish state atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \ diff --git a/tests/sys/netpfil/pf/map_e.sh b/tests/sys/netpfil/pf/map_e.sh index ce0e567ae3c8..ea8ce33bf323 100644 --- a/tests/sys/netpfil/pf/map_e.sh +++ b/tests/sys/netpfil/pf/map_e.sh @@ -66,7 +66,8 @@ map_e_body() pft_set_rules echo "block return all" \ "pass in on ${epair_echo}b inet proto tcp from 198.51.100.1 port 19720:19723 to (${epair_echo}b) port 7" \ "pass in on ${epair_echo}b inet proto tcp from 198.51.100.1 port 36104:36107 to (${epair_echo}b) port 7" \ - "pass in on ${epair_echo}b inet proto tcp from 198.51.100.1 port 52488:52491 to (${epair_echo}b) port 7" + "pass in on ${epair_echo}b inet proto tcp from 198.51.100.1 port 52488:52491 to (${epair_echo}b) port 7" \ + "set skip on lo" i=0 while [ ${i} -lt ${NC_TRY_COUNT} ] diff --git a/tests/sys/netpfil/pf/pass_block.sh b/tests/sys/netpfil/pf/pass_block.sh index 0f034b23a730..2a226f5c9651 100644 --- a/tests/sys/netpfil/pf/pass_block.sh +++ b/tests/sys/netpfil/pf/pass_block.sh @@ -230,7 +230,8 @@ urpf_body() --replyif ${epair_one}a pft_set_rules alcatraz \ - "block quick from urpf-failed" + "block quick from urpf-failed" \ + "set skip on lo" jexec alcatraz pfctl -e # Correct source still works diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index 75788eed4bbe..1b61ec4f03a0 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -152,6 +152,7 @@ defer_body() route add -net 203.0.113.0/24 198.51.100.1 # Enable pf + jexec alcatraz sysctl net.pf.filter_local=0 jexec alcatraz pfctl -e pft_set_rules alcatraz \ "set skip on ${epair_sync}a" \ diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh index 203d0a944a5b..18e0e02db65e 100644 --- a/tests/sys/netpfil/pf/route_to.sh +++ b/tests/sys/netpfil/pf/route_to.sh @@ -230,7 +230,8 @@ multiwanlocal_body() "block in" \ "block out" \ "pass out quick route-to (${epair_cl_two}a 203.0.113.129) inet proto tcp from 203.0.113.128 to any port 7" \ - "pass out on ${epair_cl_one}a inet proto tcp from any to any port 7" + "pass out on ${epair_cl_one}a inet proto tcp from any to any port 7" \ + "set skip on lo" # This should work result=$(jexec client nc -N -w 1 192.0.2.2 7 | wc -c) diff --git a/tests/sys/netpfil/pf/set_skip.sh b/tests/sys/netpfil/pf/set_skip.sh index 9b3d655a6d1d..c666622e3d15 100644 --- a/tests/sys/netpfil/pf/set_skip.sh +++ b/tests/sys/netpfil/pf/set_skip.sh @@ -101,7 +101,7 @@ set_skip_dynamic_body() vnet_mkjail alcatraz jexec alcatraz pfctl -e pft_set_rules alcatraz "set skip on epair" \ - "block" + "block on ! lo" epair=$(vnet_mkepair) ifconfig ${epair}a 192.0.2.2/24 up diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 64dbd3a36201..b820d0c11e75 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -52,7 +52,8 @@ v4_counters_body() "table counters { 192.0.2.1 }" \ "block all" \ "pass in from to any" \ - "pass out from any to " + "pass out from any to " \ + "set skip on lo" atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 @@ -91,7 +92,8 @@ v6_counters_body() "table counters { 2001:db8:42::1 }" \ "block all" \ "pass in from to any" \ - "pass out from any to " + "pass out from any to " \ + "set skip on lo" atf_check -s exit:0 -o ignore ping -6 -c 3 2001:db8:42::2 From nobody Tue Jun 20 14:54:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlqQm6kkzz4gT4R; Tue, 20 Jun 2023 14:54: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 4QlqQm6JXlz4Llr; Tue, 20 Jun 2023 14:54:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687272848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLaLtXBx4RvBw34LcQYSoH2cnNflYkMVtBo+z+HCkgU=; b=GeWF28voEVSHRIY+aUtP31GEMyX9MOfsQCQmaJpCxXQftqyW8CR4f+gkQu9B8FeIc0kiZX hjiq5nd5pVf1Y+alIz+PKl9gG3etwE4BiVteOZc7xRQAYRSHbr3nZvAq72QnP9hgl6/Rhu M7M+gfh7wNfsXs1dwWMRig+GMGzd4JjrJ8r25CbDBQjIzM4ATvIoNi9NWPiUUOw9yrBBEn kl6nfjuSFVi0WL19t4SKLPzL8vMhC5aHEAieuWGoMnqYznlo/EqMemZF+jgaw2lKDnEHBB N1EJbEjgpoaS7hKKqcN58Iloui7VxvEAwnSkFVrwwhMNAp+qxeaUbsGbObbOXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687272848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLaLtXBx4RvBw34LcQYSoH2cnNflYkMVtBo+z+HCkgU=; b=j339SxanQfYnee1LDUGc45ONjrpnPmzn2ajq8+pJvjl7N9yHY+/jVZJJLNnE7s+qNK1a/i rBbIW3QHJxb7VrsO6O/XFo9ccPssIc6XxhAVxVpX3nbRbLYH86zWQ1lT3fg3EpUN5PMUId QMnHc0wk2vv8Hak2vd9VhJ8PPO5cc17bme4Nmm33fhCBWe6qhcdWUZ5UsZGj1Y3IouDEJh Pyq/X1hJpob2obRgQlZ1DV6YUKi7EHNzdKD9K4vVpvPVepOYx9MgcRe/mIc+MUVK2gDIl4 m/XKgZb6OJ/pekvHEPIqHeVvmD2ELbTbKmJb6Qw7n/K+Hus/LLC5Q7Cl8EeDgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687272848; a=rsa-sha256; cv=none; b=XtIaOel2BwzC//dXWrZyQvlE8Zwe+AwQl6KFnDn5zz8pNx4//p9leT//SNyn8tdRiqLv7k MiRDCv3d58TqLuwEy1sbGPcIFxu4szpbBgQT1OMqE6J4PYWeqDMWCdUlu17r0dL8VvPltJ U59+086UzCLq779ORh7ar+lzE0+cgfAL+4e82mivJD8cbaaQDgog5qnG2S4r2Py/rJrMMu X9OKzenA8JfYB/XIY8g9wFMUdW573NAeD0wDp3Q4vFzrB5WTWfQikfe10Ln1EjJoX/Iyfp LilHVfa0j0L7y2OhUMoKHscKhEg2BUm9NNPhB/S0lrMfBN8Ya6Suung6QyzlJQ== 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 4QlqQm5PdWz13TQ; Tue, 20 Jun 2023 14:54:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KEs8Dm095323; Tue, 20 Jun 2023 14:54:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KEs8LQ095322; Tue, 20 Jun 2023 14:54:08 GMT (envelope-from git) Date: Tue, 20 Jun 2023 14:54:08 GMT Message-Id: <202306201454.35KEs8LQ095322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 474d9290eb9e - main - ossl: Don't try to initialize the cipher for Chacha20+Poly1305. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 474d9290eb9e9f0e636c7f814d0d10ba5147149f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=474d9290eb9e9f0e636c7f814d0d10ba5147149f commit 474d9290eb9e9f0e636c7f814d0d10ba5147149f Author: John Baldwin AuthorDate: 2023-06-20 14:53:50 +0000 Commit: John Baldwin CommitDate: 2023-06-20 14:53:50 +0000 ossl: Don't try to initialize the cipher for Chacha20+Poly1305. Chacha20+Poly1305 doesn't use an ossl_cipher instance the way AES-GCM does, so ossl_lookup_cipher() failed causing ossl_newsession() to always fail for Chacha20+Poly1305 sessions. Reported by: gallatin (ktls_test fails with ossl.ko loaded) Fixes: 9a3444d91c70 ossl: Add a VAES-based AES-GCM implementation for amd64 Tested by: gallatin Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40580 --- sys/crypto/openssl/ossl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/crypto/openssl/ossl.c b/sys/crypto/openssl/ossl.c index 723d1a80543d..25897cae0dca 100644 --- a/sys/crypto/openssl/ossl.c +++ b/sys/crypto/openssl/ossl.c @@ -301,7 +301,8 @@ ossl_newsession(device_t dev, crypto_session_t cses, error = ossl_newsession_cipher(s, csp); break; case CSP_MODE_AEAD: - error = ossl_newsession_cipher(s, csp); + if (csp->csp_cipher_alg != CRYPTO_CHACHA20_POLY1305) + error = ossl_newsession_cipher(s, csp); break; default: __assert_unreachable(); From nobody Tue Jun 20 14:54:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlqR31K9Yz4gTPs; Tue, 20 Jun 2023 14:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlqR30sD5z4MLp; Tue, 20 Jun 2023 14:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687272863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIyJvAJOslTury1S2IvJDcK9+0mOrJuTQnma5COGZW8=; b=hU9gSsBGhse1OADslB2pYvzIVmhbhrA00kAX9Ya/RgdC8KP2gXvgoxla9welQno7ph/A7k OO6dhQlHVdHLb8P1cm8WCWSyBOyznEoiVlyPYndRhaIk6XBdkV4yezj1ooXE4lLB6bt7ap bcMBt3sfkRwJA72mZIMr6NZCzo5eRtzCDCgayNE/a7cQY0hWQUBynNZ1QxGe7rcHETWiqw gEPkSSNppE9SkI4QMKrJ+ffv79ADTJKSO6xqNf5SonwmZjXD2T+L+/vsbmMPFL5ePp9PXI yz0ZMDH+6RrLF9Vwrlsyjl3QSTMcw8AnFYC9tFAzkh6AxVcgzHmEz1Um/dS3+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687272863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIyJvAJOslTury1S2IvJDcK9+0mOrJuTQnma5COGZW8=; b=rN+vlnQDoxOtDnIantDwZZeyC4PgoqizH3+KD/H9W7Nq71pCPwWs6ncW6jRu8z8tIGK6x+ /kFWy3NqX0Ac9JSiF6t6Y6eyQNwapB2e82Tk52/VmR2hR05ZYFdduB7R5D+Im9V6AyYORn lUaEx/P//dCWf8pJCZX577fwLPkFW7iOUNw8vxULaxNVUP/BP00dYDuSX9iwMR0K32r/2+ 5QVhMN1R/DbV80bZfUqUliu0oFT+cDOMkkwlNlPXQbHKLLNBICF9GDWDzzR0C+DVk6WzmL 3u3k7b4/X49jpIAocmO66ycQ7+9OtmppRdcgDZLnCmpgdl3gJQOlZHQxmDshjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687272863; a=rsa-sha256; cv=none; b=TvqUXjiRd3cNhjovDzaXXZZaVy+8m1cFdXQBYXIlS6ybBCbCzV+1FyafbdYpSgtL8PM7f1 7Couj6LSTDuHNIRvCio+ynCxSThUo1iAA0K4Hy7QGaonYLxTazMhAv8eRwbT+8JwpPUIXw etnseac+RE0lEEnuTpBdsjvSJuFGNbceNqNX/jy3Lf3CJtkKDN9KjZ6jpMspClx7r5fidQ K4Rnor6lX4zciUJNNk544XyWwJvDbvM6vonrrm83WLxGpf7jB08H7dswGqtyVKmzMyy5jD 7KcrNPY0zf7td+UNTjYSy4vCJhBa0GngVyVIRP9VH7WGPR6rlu/WCgNig5AqLg== 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 4QlqR272zQz13Z8; Tue, 20 Jun 2023 14:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KEsMOb095453; Tue, 20 Jun 2023 14:54:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KEsMHY095451; Tue, 20 Jun 2023 14:54:22 GMT (envelope-from git) Date: Tue, 20 Jun 2023 14:54:22 GMT Message-Id: <202306201454.35KEsMHY095451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 7756232199ad - main - riscv: improve KTR_TRAP trace entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7756232199adf60343ae0b940e2b27fe363905bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7756232199adf60343ae0b940e2b27fe363905bc commit 7756232199adf60343ae0b940e2b27fe363905bc Author: Mitchell Horne AuthorDate: 2023-06-20 14:52:26 +0000 Commit: Mitchell Horne CommitDate: 2023-06-20 14:54:14 +0000 riscv: improve KTR_TRAP trace entries For more informative records of exceptions, include key details such as the exception code and stval register contents. Remove the curthread argument as it is redundant (saved with every ktr entry), and the trapframe as it is somewhat meaningless. Add a new KTR_TRAP trace record for interrupts. Reviewed by: markj, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40584 --- sys/riscv/riscv/intr_machdep.c | 3 +++ sys/riscv/riscv/trap.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/riscv/riscv/intr_machdep.c b/sys/riscv/riscv/intr_machdep.c index d84f4ea1cb91..1ee2c0984205 100644 --- a/sys/riscv/riscv/intr_machdep.c +++ b/sys/riscv/riscv/intr_machdep.c @@ -163,6 +163,9 @@ riscv_cpu_intr(struct trapframe *frame) active_irq = frame->tf_scause & SCAUSE_CODE; + CTR3(KTR_TRAP, "%s: irq=%d, umode=%d", __func__, active_irq, + TRAPF_USERMODE(frame)); + switch (active_irq) { case IRQ_SOFTWARE_USER: case IRQ_SOFTWARE_SUPERVISOR: diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index 11ecfa702054..ac481c313e15 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -291,8 +291,8 @@ do_trap_supervisor(struct trapframe *frame) return; #endif - CTR3(KTR_TRAP, "do_trap_supervisor: curthread: %p, sepc: %lx, frame: %p", - curthread, frame->tf_sepc, frame); + CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__, + exception, frame->tf_sepc, frame->tf_stval); switch (exception) { case SCAUSE_LOAD_ACCESS_FAULT: @@ -365,8 +365,8 @@ do_trap_user(struct trapframe *frame) } intr_enable(); - CTR3(KTR_TRAP, "do_trap_user: curthread: %p, sepc: %lx, frame: %p", - curthread, frame->tf_sepc, frame); + CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__, + exception, frame->tf_sepc, frame->tf_stval); switch (exception) { case SCAUSE_LOAD_ACCESS_FAULT: From nobody Tue Jun 20 15:57:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlrrW5dPbz4gndd; Tue, 20 Jun 2023 15:58:03 +0000 (UTC) (envelope-from matteo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlrrW4xgJz41dG; Tue, 20 Jun 2023 15:58:03 +0000 (UTC) (envelope-from matteo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687276683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CQixmJNLd8rbgZIyGDx/uHXcwovIMdtmZXblfwo6Dzo=; b=NpRN6DJesauvUbUhgEgVbm19BNVMRgfwfnXdjAKeZicIyfK7LR2Fr62ExzYS1ne04EPV1Y 3sagycCLePryGlMbYmhPzIJ2dRY/haXZlyIeDaFQEsQ5Xw6HfOkB2SGAq6iiRmchCkA2iI anE7kMHPnlz3B93lkpQzUwlbLDwhjRxjYLAHOe+NMxAYW50V0qtkEhUgXSLFyby+/uY+lU A2VWowsthH3+Xn3zxr1sHdSohN/C9/ydRrSE+yD1j3elUG9+b1fgnVEis+nA0CTNM9aciY C5n8XCwvHgM5r1c/mQLIn/Mttc8OspHQawGVtRk2tRSfMiOj3fpMAUeSSK2s0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687276683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CQixmJNLd8rbgZIyGDx/uHXcwovIMdtmZXblfwo6Dzo=; b=QHInsLWLl7YWmAs7B+Y/IRVzsUcsQqFPSo+BxIy2cCOyAYP77h4JmvfLysljhzzvrt2AGc AN4/cuzQO2v4GqPFuDyxR8zS8atFmVeZo2oTBef5FOmJ0bqJeqXC07p0kVDZnkAylufV6K 7Yw/Wz36wOTATi7PiFJ9cJrGZkM1J5KOSlStEuDaw/BUn7IAsqjHAsBHpJqi1NlC8WBHtY t9xD7qYl9a06CmuNvORx7xRTBvqvA9A5lgCAe/BgLMcg1Tx/v2OJaTxZPs79t18/77uP4O S4Y6M0H7vFPUuafEKy1xRnUeeqKD05GzdZGm4u/ykNU5Geidl/X9PiFJjdJVfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687276683; a=rsa-sha256; cv=none; b=irh4/G2T8VqlO/i1qB7ZdMCT6hN2tEwgwcz9cDBCIUy2/iJVCeo3enZjjT4QoQRdTJFcE4 qdiVL+T+d/XoD/YM6z/LV23QDMRy6eMP325bWSwtmIiiTX8RjRb34qFc8FMVzuDjUKBW2s sac1qivjGhd7BwstKRo0AdFE2MKNEYvh4bMFRFHk38H15cNVxLSYc2O+eOMAe8ojPqhL68 BWdTbtSCG9PWnViIjUddxriwVVTa40wgXSuGNuUwuGYrDBNgLuCmxJHnzwnodN4D+PuxN7 iO6Oc15zHxPNgcVr43cS6yD7d5kjSZEqpaFiAZwqOROJ5lWbGZAJIfHeY7QIMg== Received: from ubertino.local (unknown [73.4.221.34]) (using TLSv1.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) (Authenticated sender: matteo/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QlrrW2fkDz141f; Tue, 20 Jun 2023 15:58:03 +0000 (UTC) (envelope-from matteo@freebsd.org) Date: Tue, 20 Jun 2023 11:57:47 -0400 From: Matteo Riondato To: Doug Rabson , Kristof Provost Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3a1f834b5228 - main - pf: Add code to enable filtering for locally delivered packets Message-ID: X-PGP-Key: http://rionda.to/files/matteogpg.asc References: <202306201435.35KEZtHN062484@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="atpy5efsszlmg427" Content-Disposition: inline In-Reply-To: <202306201435.35KEZtHN062484@gitrepo.freebsd.org> X-ThisMailContainsUnwantedMimeParts: N --atpy5efsszlmg427 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2023-06-20 at 10:35 EDT, Doug Rabson wrote: >The branch main has been updated by dfr: > >URL: https://cgit.FreeBSD.org/src/commit/?id=3D3a1f834b5228986a7c14fd60da1= 3cf2700e80996 > >commit 3a1f834b5228986a7c14fd60da13cf2700e80996 >Author: Doug Rabson >AuthorDate: 2023-06-20 13:01:58 +0000 >Commit: Doug Rabson >CommitDate: 2023-06-20 14:34:01 +0000 > > pf: Add code to enable filtering for locally delivered packets > > This is disabled by default since it potentially changes the behavior = of > existing filter rule sets. To enable this extra filter for packets bei= ng > delivered locally, use: > > sysctl net.pf.filter_local=3D1 > service pf restart > > PR: 268717 > Reviewed-by: kp > MFC-after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D40373 >--- > UPDATING | 12 ++++++++++++ > sys/netpfil/pf/pf_ioctl.c | 20 ++++++++++++++++++++ > tests/sys/netpfil/common/utils.subr | 3 +-- > tests/sys/netpfil/pf/fragmentation_compat.sh | 3 ++- > tests/sys/netpfil/pf/fragmentation_pass.sh | 3 ++- > tests/sys/netpfil/pf/killstate.sh | 24 ++++++++++++++++-------- > tests/sys/netpfil/pf/map_e.sh | 3 ++- > tests/sys/netpfil/pf/pass_block.sh | 3 ++- > tests/sys/netpfil/pf/pfsync.sh | 1 + > tests/sys/netpfil/pf/route_to.sh | 3 ++- > tests/sys/netpfil/pf/set_skip.sh | 2 +- > tests/sys/netpfil/pf/table.sh | 6 ++++-- > 12 files changed, 65 insertions(+), 18 deletions(-) > >diff --git a/UPDATING b/UPDATING >index 1980411c1853..f4e13d97006d 100644 >--- a/UPDATING >+++ b/UPDATING >@@ -27,6 +27,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: > world, or to merely disable the most expensive debugging functionality > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > >+20230619: >+ To enable pf rdr rules for connections initiated from the host, pf >+ filter rules can be optionally enabled for packets delivered >+ locally. This can change the behavior of rules which match packets >+ delivered to lo0. To enable this feature: >+ >+ sysctl net.pf.filter_local=3D1 >+ service pf restart It seems a bit weird to suggest an action that is not permanent (does=20 not survive reboot). See proposed rewording below. >+ >+ When enabled, its best to ensure that packets delivered locally are not s/its/it is/ >+ filtered, e.g. by adding a 'skip on lo' rule. TBH, I find the phrasing a bit confusing: "to enable pf rdr rules for=20 connections =E2=80=A6, pf filter rules can *optionally* be enabled for pac= kets=20 delivered locally". That "optionally" makes it sound as if it is not=20 *required* to enable pf filter rules for packets delivered locally in=20 order to enable pf rdr rules for connections etc etc., but, given this=20 change, I assume it is. Perhaps a better phrasing (assuming I understand the feature) would be: "The new sysctl net.pf.filter_local controls whether PF filter rules are=20 enabled for packets originating from localhost and delivered locally. This feature can be useful for, e.g., enabling rdr rules for connections=20 initiated from localhost and redirected to a different port on=20 localhost. Setting the sysctl to 1 may change the behavior of rules=20 which match packets delivered to lo0, so it may be necessary to add=20 enable the "skip on lo" option." Note that "skip on" is not a rule, even if it is translated to a pair of=20 rules: it's part of the options, and requires "set" before it, per=20 pf.conf(5). Also, I'm assuming (and mention in the rewording) we are=20 talking about rdr rules for port remapping, not rdr rules that redirect=20 to other destinations, but please confirm or adjust. More generally, this new feature should likely also be documented=20 somewhere else (pf(4) ? pfctl(8)? pf.conf(5)?).=20 But apart from the above, I'm a little puzzled: does it mean that until=20 now (and continuing to do so, unless one sets the sysctl to 1), packets=20 originating locally and destined locally were not filtered by pf? I.e.,=20 that filtering rules on lo0 had no effect on incoming traffic from=20 localhost? Thanks, Matteo --atpy5efsszlmg427 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJHBAABCgAxFiEEa9uKZL0hP4E8Nl5vGwL9SVQlVQEFAmSRzGgTGGhrcHM6Ly9w Z3AubWl0LmVkdQAKCRAbAv1JVCVVAd/yD/98jK6+btKowzD4NlfP/QTksFfjWia1 s86lfjfk85NSSdG4Y0mcE5WvcPYD79p38UCK2f3wxfW5u+Wu8NifMVcTuntarw1u BIl31Rx7lzDi61R9cTZVn4VDFMX+65Ln69uOpwp+WNze8BNxogGiRO9h6lE5fiGd c0dfxB+50U/JqPHOFvTNRB+Z4cQHvUZhH3iOS2L47qRC0THhtM5+0zJMkD4OC8V+ qnjxusRxJ8EfLQ9GfcZ8Va4+riqiz0ZPwTgZUtGtyLzs1Y5muW127Np2zbkZi24P pZ4xCmWKI6NKlFV0aBGGmpQoWBnXoWtYRGvTqdZBN9sZBw9wb6FmA7l6bj/YLXOH mmB+UjGO9PJohGZ2FXbvNm3B3mCyZ8PJdgruW/v1Rike0+kdtfe2VpJbz8FJ/nft 7WLJEIUfhPSaey4QwAGLLvsnxe+n0Cbmf54k9++y5cWMCajzKKxcIvKCLJCs3baN pzPIktkUZPc0I6IRRXLXm7zxMTo5n2JC2mAuFerYXrGUsXSWL1mNdb+ZGk35V5TA 4IE9oFgvmBU1pY1BZHPjC+zdNI1MXhlMjXhCH8vLoWa2b9thcVD5DeZ5CbBLwK1M Q5s3vyh0+inVTxBk+Giu2h8C0oL33b1PbNes6kK8IP2k6yub1yCGiddPpvIIp7YP JZIT0cTnE7gK6g== =VFn6 -----END PGP SIGNATURE----- --atpy5efsszlmg427-- From nobody Tue Jun 20 16:29:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXT4qmvz4gJQd; Tue, 20 Jun 2023 16:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXT4NC1z4KMV; Tue, 20 Jun 2023 16:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SrOF+P8KQEarVx/FRsmnALmW0MO8mAFPuhqLF3GOeI=; b=bK4yiZR3qC620xTSfzcU3j4SvOXn+L34g/vz9leyv6VMFt4VXIFbGP5BlU5iDQze7iVL+b S3eRbUtb5Q/RcKpq3l6LKrM9M2UWfls0zS1+EyZEtOHi5o9NUlUuXjUC2lRZN2ZdBEZW91 qUsmyDiE32U1YJr7+9NsdUXdbYIPZQJMkpJArghz+bTanHp8XnJLU1oyIbHt5n553SWYWR zfZ9STci7HIx7fqbUPmJy/m6PJ4wsyaWdqjPTuFOaQQ/JIW87Tzml0xk88PSDIXAXE58Zn 2mo09hPXpgnClJqDV/Bm8tjK1yd1Tdl4lutUHdaqKH59EXb9YFpWl09dunquOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SrOF+P8KQEarVx/FRsmnALmW0MO8mAFPuhqLF3GOeI=; b=yAbr3Gr1nRsgOI/jDRWj1sUxDJ+OlCmPyusIpj/u9S7ftNBwnfSSX2Ks1W2rVbnSTGTEHr jXfMHFbV6xmAPDHc9Dr8F0bJnoayibjXC6OTGVMFGwd7A/CYEWXZ19C4fbcD1e/oCO/wSh BdOFgyrT9wBdpLZy2FvkPc1Zb12XegS3NPAyqCjHCMXSOsQEGLVu670BJHUJJjqwrrODzD vBIcirSdVYLWVHc8KNrvLYn8NqVh2jSv5z0DPfhcdro0TIjLnQbi1DYupMVIeQf2MRRpT4 LMwYn6ufb7WHqjZyJzgiP7lfVY1of43YRc9VNvYc/xGT3WxLemajfhTdlDjv7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278553; a=rsa-sha256; cv=none; b=G6URuQDSv6MXF0v9ymXKQWO5zSuWmWRREvDggweejtFsdId4hmygBxbUWrZHj3IQJ3IBMg fUGEL5bA2YVVRVRgNMJ7D9a3MJ6eFzL1nQ6EGUMe45JbSgrOo+7srJarJPds0qCJiL4UJM XDZPaDqzEVqy91uRGqh3flVZJq2Wv9cmU36bGSmXiUOE6gK07N11VWyNlxxnIedsNPDjLH e5un5BtsnvbF3WAnALDMpkpJP8de5wtJb0Qw8Gb5sTOGh426m+jcjdrSN98e6hPXaGsec6 P1RbsqLBsCM7Bh+RbDA87hhR+YBBgTRR0xg+axCwtIkeGvOTN/y2CxW1/RBcLg== 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 4QlsXT3SBBz15YH; Tue, 20 Jun 2023 16:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTDkS044993; Tue, 20 Jun 2023 16:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTDxK044992; Tue, 20 Jun 2023 16:29:13 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:13 GMT Message-Id: <202306201629.35KGTDxK044992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2e2a1c8ecf63 - main - libgssapi: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58 commit 2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 libgssapi: Remove set but unused variable. Reported by: GCC --- lib/libgssapi/gss_delete_sec_context.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libgssapi/gss_delete_sec_context.c b/lib/libgssapi/gss_delete_sec_context.c index 930f51399cce..b64e32c5dc2c 100644 --- a/lib/libgssapi/gss_delete_sec_context.c +++ b/lib/libgssapi/gss_delete_sec_context.c @@ -41,7 +41,6 @@ gss_delete_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle, gss_buffer_t output_token) { - OM_uint32 major_status; struct _gss_context *ctx = (struct _gss_context *) *context_handle; if (output_token) @@ -54,7 +53,7 @@ gss_delete_sec_context(OM_uint32 *minor_status, * otherwise fake an empty token. */ if (ctx->gc_ctx) { - major_status = ctx->gc_mech->gm_delete_sec_context( + (void) ctx->gc_mech->gm_delete_sec_context( minor_status, &ctx->gc_ctx, output_token); } free(ctx); From nobody Tue Jun 20 16:29:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXV6WBjz4gJT6; Tue, 20 Jun 2023 16:29: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 4QlsXV5GKHz4KHH; Tue, 20 Jun 2023 16:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=orXwlP+oeRFCRoMRaW0yKRg+Z/dXanAqYazIzgXHn0c=; b=dDuQO2UhMK2JZqIIEBMfhfOgcJfrcldh5EN4B/3ZUXLUXWE2jQpMM7supilhaL7nuq/ZQn zgQhSxvykV4BAPZ34JBLbgCBWmM9CcN+lKEne0cKsOAdCdjReljXZAqumvPdnr5rkf5M/X 3lFkXKIASrg+8rXI2Lx8rFAkp/2BWTYQFvI1W4dGyZkh+sX30Zw6yXDTJWkCa0DkKenrqW SxyQmebiKMGpncQGbtb9WYEZjUTYmnCRO18qeCMfqA4Vh9KVjEr6LazOmRSn5Ui9b/Aj2M LzkmqqaPakSwL4tekHs/JRQM0Sy1IbeV0qjRkuOCAURl3HjccrwF2iZPYWeS9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=orXwlP+oeRFCRoMRaW0yKRg+Z/dXanAqYazIzgXHn0c=; b=TnGYR1as4rOqs8nxXBwpikQcF07VFbRgX20U8V4n5OSixOC+sfGNAA8WomfQirmo4pll1e F374ZjY/T9veiH9KE4LpAs8jt6NkuHdXertJuxYGpPlOJCwRdN6yUPNOhbSMzJaAYs3GdL 5snTNuliCXZeIrDU1EbZi6ovGgVQCST0qfmL7mVeLrfQUCeC30zFtt6zGodbAQfomLSC63 Ps2DsPeFYzORo5niYR6zIhi2kdcL/19fu1pt6H+nP089eC2oACmp2ZiRgIfBWNSFrQb4P6 bfDEoH2/b7Tg6U7g8Vo0cSxq3SsoP4a0oiKzlSD4qwZvmsCajIFiOhEOlZLSbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278554; a=rsa-sha256; cv=none; b=Ayl/4g9PqPsHKrjHyz00/MxHe+J+3wJDkgrq5KxnwAeeItpMOfBA0jDAWgza6FB2qyMmtk /70m9h321NIB7DvRdj0SDBmmBbo2EoDph0O0doIWj24nAi1/68K40K0J2/g9xdApF+pHaI zNcZ7Gi2geYM9s2UiBAY6Agxj7eLxDSlmDOCzUkUDCphLVh+eSiQDz1xsXOANQ0+5kFMxZ t/rK+0kAnc198lqtnzqqugG+7Jd3M/Icjk0A1J0u7trCzvzVUTp8I0WsCUoPNnNxpPxdRH qlSZKBVOhOniVYaIcRNibkvfMCHolKOCbDCGRAleDs9vc5GBJEzindRvHMYLgg== 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 4QlsXV4K5zz15hx; Tue, 20 Jun 2023 16:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTEO9045018; Tue, 20 Jun 2023 16:29:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTEek045017; Tue, 20 Jun 2023 16:29:14 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:14 GMT Message-Id: <202306201629.35KGTEek045017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e6ef68530b7f - main - libkvm: Remove set but unused variable from ppc64mmu_hpt_init. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6ef68530b7f9417f0165a9bad714aee12dc1451 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e6ef68530b7f9417f0165a9bad714aee12dc1451 commit e6ef68530b7f9417f0165a9bad714aee12dc1451 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 libkvm: Remove set but unused variable from ppc64mmu_hpt_init. Reported by: GCC --- lib/libkvm/kvm_minidump_powerpc64_hpt.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libkvm/kvm_minidump_powerpc64_hpt.c b/lib/libkvm/kvm_minidump_powerpc64_hpt.c index baa2fd1ebc08..d13f8021a731 100644 --- a/lib/libkvm/kvm_minidump_powerpc64_hpt.c +++ b/lib/libkvm/kvm_minidump_powerpc64_hpt.c @@ -253,9 +253,6 @@ static int ppc64mmu_hpt_init(kvm_t *kd) { struct hpt_data *data; - struct minidumphdr *hdr; - - hdr = &kd->vmst->hdr; /* Alloc MMU data */ data = _kvm_malloc(kd, sizeof(*data)); From nobody Tue Jun 20 16:29:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXX02y5z4gJTJ; Tue, 20 Jun 2023 16:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXW6V2Xz4KQZ; Tue, 20 Jun 2023 16:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSrGG8IlBQjBg7Tcm1FP2rSSAR2ANJmAZoTyg+8UZW4=; b=uSexXqIcn2LeEvwZ1wPpCy/AYRk+bxt14RHmsXOg/YYgjCBxM6+NgSX63PHhzLnvgMPuvR 0r+k51uLuxfrd9FS/v694TZzgqa04B24Hq3EdWx1K2KVmCU+Z+f8FOILaHdo+jSCEtfDnI lvzH2TjK1+cR45rzQ7HNmHZZxBya9Hb5cTo3WucAnBCeLlYqyiuXzufDQ9FI6Ufwz1beVC SReO66siSIENunY+O+YVltMlHqx3SRk/pIpuSbsmfkGQQcjrPmFEJIVmFTpKPlCZ6tZCDN Dn8H9eGKTW4XwurFb5K9YmLQEsOiTb8vg58lRBBPc+WGSS3pjnNgkO8s9BaW7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSrGG8IlBQjBg7Tcm1FP2rSSAR2ANJmAZoTyg+8UZW4=; b=W8lWE88qpDT27vrP+fqXMOJGtZosmdIC8hWePQXR6AMoHKvg5jQTH4/CMqNhs8GJxlHI3A G0Po2NVxN8E7vpnDRPsOhjwWQylM4Mo8KmdBEJnzMoprucuIoRiJb2U9q9UCLJBLCF5N/s jEIdtHkMeIr8KVtPxfsCkOWtzPRdT7PJ37jDgQH+lMXWQIHX1EZjK4PCEJEPx/OwB/zwgx xJiHNNE7jHGTOYEhtjVld/uTdSdInrdtlszUyHgbh69MYiiTl8p3ijnQnwQiYP6xQAJT6g B/6WUEhbqa4nhoW9deLniUlVRJkejmYFri/5qKKbLlxaJrIS5E1i8rymcjpuRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278555; a=rsa-sha256; cv=none; b=NbqVqkJYoFGdzj3/yJQhqryb4Eyp42uweg2RsoFJymMUrMSWP2eUbAERBLfxfRyvSfXg9G /ye6logFQ3TqkjYlS/AqMEYDtiO9gJQJGU8HWoyBw91KfhNX5QTBU+oUc3lnZUmeGwkf+T d2Y+fis8aRSKrLcI8fcYylI8SlDc1pLZvWWRai3GZqxkK7ry9qs6DVPlLZxskxGq+QTINz wztqhWWLSrfr8XL3Y055lioz19cAnm6ZfttesN2wabeJb5oFjUe6t0F8C4j+n6i0Q5FZXt +BWqIEuZM82tWGrdLfuC7a2VDaX2UbC2R8tNBPut2m7P7ZxCVm1zT5RlUuD6kg== 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 4QlsXW5FWTz15YJ; Tue, 20 Jun 2023 16:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTFZc045039; Tue, 20 Jun 2023 16:29:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTF91045038; Tue, 20 Jun 2023 16:29:15 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:15 GMT Message-Id: <202306201629.35KGTF91045038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b07549f3c156 - main - lib9p: Remove set but unused sockets[] array from l9p_start_server. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b07549f3c15637af6064d2f52b572f239f5ba870 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b07549f3c15637af6064d2f52b572f239f5ba870 commit b07549f3c15637af6064d2f52b572f239f5ba870 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 lib9p: Remove set but unused sockets[] array from l9p_start_server. Reported by: GCC --- contrib/lib9p/transport/socket.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/lib9p/transport/socket.c b/contrib/lib9p/transport/socket.c index fbba97c135cd..a78d8a6bfbea 100644 --- a/contrib/lib9p/transport/socket.c +++ b/contrib/lib9p/transport/socket.c @@ -73,7 +73,6 @@ l9p_start_server(struct l9p_server *server, const char *host, const char *port) struct kevent kev[2]; struct kevent event[2]; int err, kq, i, val, evs, nsockets = 0; - int sockets[2]; memset(&hints, 0, sizeof(hints)); hints.ai_family = PF_UNSPEC; @@ -98,7 +97,6 @@ l9p_start_server(struct l9p_server *server, const char *host, const char *port) continue; } - sockets[nsockets] = s; EV_SET(&kev[nsockets++], s, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, 0); listen(s, 10); From nobody Tue Jun 20 16:29:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXY0p7cz4gJTQ; Tue, 20 Jun 2023 16:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXX6ynYz4Kh3; Tue, 20 Jun 2023 16:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ybRLtdxFNicLcYKotn0oznoryWvf2zOEgNLNeG5yno=; b=APvR7Y1v2HCjlCwafe7F/TqmgSq46Mvwp6hLEOoC1XiaQnF3ROCpChcD94X2B1uMePG2q7 yVLS673yiKuXFdZ+ayyQr4gedmtAqaGWz0diWSJti7A6Njb2wE9kVZLR2kKTqL5/NlXOVL M6KsLr6BWy+w+ORZjLfSSsvNJyk79K6zlBFlIfACVODRRPFJu84wZ/3C/za3n2EEj/UO4i ci1BEJ2u+CGIJWlnWc5XodeRjz1hNrrXuaqNtuzMzZU/h1Oz9hdYfTiPdtd3ixljY5/2DG QahnzpDkOXJtn3iWg3ID5YhzkBoTmOOa0GtxSKzWFVQemDgTKNdjnuVeQhGzSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ybRLtdxFNicLcYKotn0oznoryWvf2zOEgNLNeG5yno=; b=XDW1HLSW4FdqlSx9oxjKlcWBHic3oWkghsoR2XhjyppgCaf4EEY0qsAo+zkDdK2J4qh6az R+ahJtrQgHkyqtTOVOaGzIUh1rPZ+7t6dvaX3nGda5T0Mznu+ywUCMLEAymcNynrMLYcjI OJD2HlFLYDRb0KyFSbZXDr86dyOr/bKNYekWHQC9s6ptCgUxAaNTPYxJ2qzv8546XD3UBy fAiQVuNUYIe3TefUcXsfgtxa8LtRkIyUoa/Sz90l10ctPl3qOBCedSjKcK/cEm2a6XRKkf 2zxhol1hQn7oJyShv3S6JFWE7XtuP2JvWL171cch5h+y1gdAGcPGn8vm9TEoTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278557; a=rsa-sha256; cv=none; b=Kz13XfIYPGnpdUVtcwMEE47ewfFe/3m7K0QPZwCnn2zZwLAPd6ZoY5whws4A98gJVdAQ+X 1OqIL0hWoXMrEx7ro4/Uuh5ZbSx6XxZkaBeIj9hVsoEi5XXXeAR0649U3GvoX673D7mRW4 /7m+NBr7spHJy7bxSl7WlvjXHBZn/nsjc9G6ces5wFett8Mb/6r13lIYKJWgrTF3JfMBoq eADIQRMSVRAaw7Boh64+lDJxaOX+nWgWaI1VCtCBBui5J/99WrufbBTvUXFjPTi+UWuWKQ c1MYVWlcVL2/lwW+j5uZRvB9cWxn2G8XqWH8VEKUO9V7W0iyY0lgvqlfiKbeNg== 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 4QlsXX62zTz15sX; Tue, 20 Jun 2023 16:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTGqF045058; Tue, 20 Jun 2023 16:29:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTGKY045057; Tue, 20 Jun 2023 16:29:16 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:16 GMT Message-Id: <202306201629.35KGTGKY045057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 035dd78d30ba - main - libvgl: Remove set but unused andmask variable from VGLMouseInit. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 035dd78d30ba28a3dc15c05ec85ad10127165677 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=035dd78d30ba28a3dc15c05ec85ad10127165677 commit 035dd78d30ba28a3dc15c05ec85ad10127165677 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 libvgl: Remove set but unused andmask variable from VGLMouseInit. Reported by: GCC --- lib/libvgl/mouse.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/libvgl/mouse.c b/lib/libvgl/mouse.c index 010a1b7b9c52..fc7ba2399387 100644 --- a/lib/libvgl/mouse.c +++ b/lib/libvgl/mouse.c @@ -284,22 +284,19 @@ VGLMouseInit(int mode) { struct mouse_info mouseinfo; VGLBitmap *ormask; - int andmask, border, error, i, interior; + int border, error, i, interior; switch (VGLModeInfo.vi_mem_model) { case V_INFO_MM_PACKED: case V_INFO_MM_PLANAR: - andmask = 0x0f; border = 0x0f; interior = 0x04; break; case V_INFO_MM_VGAX: - andmask = 0x3f; border = 0x3f; interior = 0x24; break; default: - andmask = 0xff; border = BORDER; interior = INTERIOR; break; From nobody Tue Jun 20 16:29:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXZ1TXxz4gJNb; Tue, 20 Jun 2023 16:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXZ0p5zz4Ksp; Tue, 20 Jun 2023 16:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1iU/CMCCTRpow5tadaA9hwBSfMRHFfPNsvWuQIS49g=; b=h59m0g2xyW/qhWGjXt3Epj4Zl+3z9Adl0WmHmU5kR6w2nloH221oCf9Rv6bK/7vDcxS89P 9xah9xfQp6jwnucP5V6WiW2CNYGOjRbZ8Lk6ZT14NQ5MDyYdkydp+54FdBpdmzJev3YhLO zHvuGhA5cT8Tj/CrbU+80DifYcUaXognltxWSFURi9TaIgMewzbk1XcGvZb+wvxYNCOsEl Eses1Uw7R6cNG3f0utKN7DP2832bW16LaEDJDyrAlZ3hqn5FN52H8eZfFlk2agT5ahpUBh XfHSk0LX9XxFRivDnLGiW7NrNk9rbX4A9w625Ut0SqKJA4KssIzfYiF25Rmjdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1iU/CMCCTRpow5tadaA9hwBSfMRHFfPNsvWuQIS49g=; b=Y/lPNgdbTcGaN1AG4n92jOygK5aQ6AiKnam7MD0E+BrKiNUZRIue3Alq0YCT1QI29said0 9S5Q1rKzdNFuj1Fytz96lA93JiQI8hkgkpsIdUEcJZW+3zzRc/nq48Rd8j+RJEWBOKnQZ6 HlVrBngCEfbQ7tVVdahMIdQoKP8aLT9cWr8+g5q03jQQFfiN/bmGDaXVWprl5jeP+GJHJn KHPxZj/jDJFPuFuqWXUtHQzmzL0ZRqtEkHvPmzfTFq8UgNZv96nZMIZURvukLHA+aXnOd0 jwqa1XJ4ESTtLJqjwhrv6hZ4XycSrwDm6ScnNbV7RExciYRAKbMc+FOO3FPOdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278558; a=rsa-sha256; cv=none; b=aNSiM9VSWuMfcmbZSG8FydL2aipuq/WhDduiH4NkIoT1xEyalX+z4ylYB7rAbHkW6R0Orw H5s7AKoMHBtqfQIkIlR7N+/Bkrxfo4Q0U2a9w9gerQOjQP0ZUUeOdouW7EX1ikgIAmNWHm DeO7DijlZNFUcdUKitI2ZKrng/OdASP+PLfRRfHU+Gz7N9s+TspRsozvqS5XhBR/OykMlo xxVvNoDjUT2hWwXW8SwqL+M/y5U+2Ta8naXzW6XM77xFf8ZMUh2A72XMSjuNHW0TIkqz7m RTh1m5e7VGFhP4+NYi3ggZbwIrEvQ4fbUaLfppCM3e9BpjqB/OGlJWNJM4c39w== 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 4QlsXY6yZYz166P; Tue, 20 Jun 2023 16:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTHls045077; Tue, 20 Jun 2023 16:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTHdb045076; Tue, 20 Jun 2023 16:29:17 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:17 GMT Message-Id: <202306201629.35KGTHdb045076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1291d48f061e - main - mkuzip: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1291d48f061ef2e955da0f4806ee1ac527908c8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1291d48f061ef2e955da0f4806ee1ac527908c8c commit 1291d48f061ef2e955da0f4806ee1ac527908c8c Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 mkuzip: Remove set but unused variable. Reported by: GCC --- usr.bin/mkuzip/mkuzip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c index cfc5d54f53a4..7150a86f52b9 100644 --- a/usr.bin/mkuzip/mkuzip.c +++ b/usr.bin/mkuzip/mkuzip.c @@ -128,7 +128,6 @@ int main(int argc, char **argv) uint64_t offset, last_offset; struct cloop_header hdr; struct mkuz_conveyor *cvp; - void *c_ctx; struct mkuz_blk_info *chit; size_t ncpusz, ncpu, magiclen; double st, et; @@ -255,7 +254,7 @@ int main(int argc, char **argv) errx(1, "maximal compressed cluster size %zu greater than MAXPHYS %zu", cfs.cbound_blksz, (size_t)MAXPHYS); - c_ctx = cfs.handler->f_init(&comp_level); + cfs.handler->f_init(&comp_level); cfs.comp_level = comp_level; cfs.iname = argv[0]; From nobody Tue Jun 20 16:29:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXb2gTsz4gJJ9; Tue, 20 Jun 2023 16:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXb1jqRz4KrD; Tue, 20 Jun 2023 16:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNNBdPI/ptRu/DZPEpUUpjkgcB7xCnJoFpE9qGRVWrQ=; b=ViCag3v6AJONgbeCEo7dQWsgpMKegyguviRngX80I4QrSVBw4r07eBOSxLjw1WYJUKOJPs etoJ6E4SVoOBGTSrY47CsHKmWRP/QA9hZC1Ye/F6xGabSTqiD3qJdCTn1AvZvLTZtESf44 bSToYluZT07PzWGqWYQICVRJUtqRI/0Ob4jEfULOX5O68s+8DdjL/bE8vCUJ7y9cJW93mW wSgEWlFp7ZZ+tZ5mWql25aEQVwNS+sVWNA/4xCSVdja0jXja/V7IrIPVTMeNYojWIes2Uh cQCzgxVhJ63jU3hY75E64/vj+qSghstC362MTcmQdLWRkoF2tyAVWU5DKkT65g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNNBdPI/ptRu/DZPEpUUpjkgcB7xCnJoFpE9qGRVWrQ=; b=qc3x2s0fP3AEYyhuGkUFkQhSHQn6wFUKV+HKeZkodtOs7a2U1x+6ttxsbsAvWZ5T57n4+X zKwIKutEjVmkXnEGkXqKWczMaJ7XGztENHCpn1BrWT+NflOQ5zpbqAj10OMyXXVYmRh8vQ UGBlO4bwCyoDKA14munjsuCs4W+Af62rfT+QHBcFMNi3C0TajarsQSKKMFHEz1SUBGy21z sayDprL32vI7P17v9BOWrE6XRLdqYRM79goy4upkyghvScxR1Go6GPtOFBN851MbVaan2m 2jtt9JNdOuVoFapWTZc0nTamDFeHHzr4dGAtudGQZXm87lY4bgbFMZKW4Jv/fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278559; a=rsa-sha256; cv=none; b=f7UZwLlswny6BhvbHHGiTuahSNrRvowXKbzPAUJXHDyecTjc85J2h2qE+yAHK6nw+rX1mW b7spgxv9M9cHvw0613N8MOb/RNYimOtWNLj2m3hnW9NhJdf1RjEtk5Zijbzz6oHeJ+LiE4 Gns+nR/fKjBA9eFHkc+Tc8QKp5sjcMHrsuPR1Fghex8kjDn5TavnCwWAnaotCsQl0tBo3x aaB0x/f6SsPR7fux08b+CnxLITh0APFOM+xvOw+w2KKNDnmWr1cxWUymRzoRXSabdibh54 Nh2VZ73YXVOO9L35OkaP+OccdauaV+Dn+dFO0bwwx1ARSY4bzCQsXXpX/Wa/Zw== 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 4QlsXb0XmLz15n0; Tue, 20 Jun 2023 16:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTJur045097; Tue, 20 Jun 2023 16:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTJNL045096; Tue, 20 Jun 2023 16:29:19 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:19 GMT Message-Id: <202306201629.35KGTJNL045096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ee0299e5f300 - main - units: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee0299e5f300cbc2ab48c1fe44db0325b40d19a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ee0299e5f300cbc2ab48c1fe44db0325b40d19a3 commit ee0299e5f300cbc2ab48c1fe44db0325b40d19a3 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 units: Remove set but unused variable. Reported by: GCC --- usr.bin/units/units.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c index b222ade449df..88363e2e6c34 100644 --- a/usr.bin/units/units.c +++ b/usr.bin/units/units.c @@ -763,11 +763,9 @@ main(int argc, char **argv) EditLine *el; HistEvent ev; int inputsz; - char const * history_file; quiet = false; readfile = false; - history_file = NULL; outputformat = numfmt; quit = false; while ((optchar = getopt_long(argc, argv, "+ehf:o:qtvH:UV", longopts, NULL)) != -1) { @@ -783,7 +781,7 @@ main(int argc, char **argv) readunits(optarg); break; case 'H': - history_file = optarg; + /* Ignored, for compatibility with GNU units. */ break; case 'q': quiet = true; From nobody Tue Jun 20 16:29:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXc3XfRz4gJTl; Tue, 20 Jun 2023 16:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXc2QNHz4L0P; Tue, 20 Jun 2023 16:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IDy+tlh/vJP/PIVjOIbEqZqm9T+tCWV6shYfdfpwpnk=; b=fznmhgGR1Xw1OW43CIDPhGEKBdJdpyhf4wLX+vNoP2KIgE5qqzANp1/shqscJKwSe8E5l+ sa2X0tsjv48qkcooAiB9H9dH+Nm7d8KmDGdldOQCZ9KpXpdTmXKPSM/TAtgGo6ZcyJrRzz bqUbF/a+qsDgZMUjD8Z99vAe7Qjz3B5CU5pOD2uHSQPC7EVJTEfFaF3uquU6c5UzuFOf7I TA4cnkbkCIUJIYdS4LKsa6RBWI9yhSolDx1yFGvAReIeZv+zLEkT35Mlm5JrsaiT+1w3tj Rth9/3BmRCasJe26YEKJkCVg2HZ2luclIcbvP5EDTbreawlNf5oyC52P0kwRVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IDy+tlh/vJP/PIVjOIbEqZqm9T+tCWV6shYfdfpwpnk=; b=NpuJLT1Fgpi4xsYUiZ8H5VX/i97uFzFCdRuuHpJkDbFilNLnKn4KC/XLGpUMOa1a42ropC 6zSOUQTICYBzbhQSS202jJW0Y5X6YAHHk61qn90jXX0+F0UyfLGEfLzwBzvUhG+IWkiHKI LTSDz2WTl8MtfB5RioJ0vzuZxdr8FYeDJCKysqZkV93l1uVRMZ7xhxg4Bv6+lyTpWO/Chd jVcxCULBI9jDCtO+k+GtSmY1PC1nPWMWfR+iOp95hK6nDvXYA71MQbQl7oVHciP9+UKczH vKPHVnBUh7su65OUxIYxuG28H0Uqyjbg9UP3eZ7fQBGZFg0rJoHncBhcBMmeWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278560; a=rsa-sha256; cv=none; b=MdTcbMCDpS0yWEVI9IxKmdUxmtHpzxTyLxYADKQwLKFWKvBxUnOugAAsnI6whkOg1S6Nkx VkdLR8vZ4TTCX4oE8+oWgTKAde9IFN48Vn7XqyLA413v1Ky8v87C37kvzaKoO/c0dnjD6C dEWTQMJ8Y6dsbv4WqWTrIShBfhBvxFURgMJwkpjjlYhpTJH5JQMa40Mwjf7jtYRrMI46E1 74PZozJPTW7NIZBnQ+BXAbJpDVOTrTXweebciCsi3W1K/r/oke1s0p3ixg0tW4LRKYUMaK gQqILyVYSj0cq/yKfbWf9bDW5QXEe9gHdlYw9pjqueC4aIYUwJ/8RmH+3fzfuA== 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 4QlsXc1Wztz166Q; Tue, 20 Jun 2023 16:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTK51045121; Tue, 20 Jun 2023 16:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTKqN045120; Tue, 20 Jun 2023 16:29:20 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:20 GMT Message-Id: <202306201629.35KGTKqN045120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 96f286866dc1 - main - rpc.lockd: Remove set but unused variables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96f286866dc148ace05bea363fecf4fc3b1824f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=96f286866dc148ace05bea363fecf4fc3b1824f0 commit 96f286866dc148ace05bea363fecf4fc3b1824f0 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 rpc.lockd: Remove set but unused variables. Reported by: GCC --- usr.sbin/rpc.lockd/kern.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/usr.sbin/rpc.lockd/kern.c b/usr.sbin/rpc.lockd/kern.c index 08566a5b4658..b25ca828fa27 100644 --- a/usr.sbin/rpc.lockd/kern.c +++ b/usr.sbin/rpc.lockd/kern.c @@ -572,16 +572,11 @@ void show(LOCKD_MSG *mp) { static char hex[] = "0123456789abcdef"; - struct fid *fidp; - fsid_t *fsidp; size_t len; u_int8_t *p, *t, buf[NFS_SMALLFH*3+1]; syslog(LOG_DEBUG, "process ID: %lu\n", (long)mp->lm_msg_ident.pid); - fsidp = (fsid_t *)&mp->lm_fh; - fidp = (struct fid *)((u_int8_t *)&mp->lm_fh + sizeof(fsid_t)); - for (t = buf, p = (u_int8_t *)mp->lm_fh, len = mp->lm_fh_len; len > 0; ++p, --len) { From nobody Tue Jun 20 16:29:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXd55DJz4gJYg; Tue, 20 Jun 2023 16:29:21 +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 4QlsXd44Byz4L2Q; Tue, 20 Jun 2023 16:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WLbxN2yUOImnZu6BgW7hpf7Qi0yGfYPQ2OqrvGpXoo=; b=WZEnE+qz10KGFVWGOqkNPQ1lfcEi6J9IzX+E6Ogh2/RoUsk5LaNnNPHv+IK6DOkN6DmmtC nc7GTYPYcSDpjU4nxlaMTTT74ca1vhmSu4w86zaSfwdDSq/phyRuuX3vNclzZEw8RHmbwa HCDadXP9FiWxcuAqgcSQs1VfiqI6DzdvtVn5c+6yrs3OLgQ64Pklhj3alkPD3gIhfUkGEA Sea/+lVSetHxuHJcXMeVPZnCmmfP/8j1+6Mzz2QMxoeCz2OhSltX7RLCNW7nTMt/NACclg XbLg+eMsQQ6COrubgUiWdjNkRJSGajSSg7eb2YfAuD35lmjRxY0Kljo4Dq1+3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WLbxN2yUOImnZu6BgW7hpf7Qi0yGfYPQ2OqrvGpXoo=; b=dq8/l1UgDL34SmDyr8R8AaMcFb4EuviqQ8tkI407ST7/ics4sEp+AH9yxYZ3QNuj38RjIm obN2BS7Th2GiVoIrUoKjG+R4LvrW7SBdEHpu0wLsxVPB2ex4lcsrD+a/9/W4zGbYWXa+3g i2PEmxxSpwmCEPa18LnyVkgx+Mg0RvdXO0gGdG/abzEV+iVE2f0DOOzvf0jT/ZQBtXgspV 3EHCmYfmqgIVVV3JgLGERNz3g9TomPImJcgOGmOYf0LCE9k8+r+sA8G5iuAFpPHvSR49lQ nDzxrSU9+iTHILMxFES+HWnNKlephBY1OJGd6uCkRFQYyBQlv5Q0q1IVB9rBrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278561; a=rsa-sha256; cv=none; b=WeXC7cSboD+DLUAdnJT2dEdlhApZp9LX60U45iIzroZC3M9fK93Z5doKhesgRYB4Y9Xgiw kJ31TUPOS52tQAQygDaH2zQ1T2hV/u9B14KXr6JMNH2y53Rm/J9hCg+bYSh5cbu8GsBhZl sB6i5rYHWJIZ6n7j85r5WLXTuNKio1Em0K3b7++Gtk2L0n6Cj9Sd/JPxNf/K7KHuVycjEa jpeVr4NvfuXZxVySCAw51f5dz+N0z0DD4sSdFwGOet8cjVX+EzSFJ8yy2t/7dYMfDXhNWN N/ktAo9pafGJw1CTeBvVZ5HPlSOJ2Z2mqSu3WcdBOYOWMSAwmIlfLGhXvtDa0g== 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 4QlsXd2PYjz166R; Tue, 20 Jun 2023 16:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTLDr045142; Tue, 20 Jun 2023 16:29:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTLWd045141; Tue, 20 Jun 2023 16:29:21 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:21 GMT Message-Id: <202306201629.35KGTLWd045141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4bea944fe7ce - main - traceroute: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bea944fe7ce75430b845b43d0a76d6cbebf5f93 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4bea944fe7ce75430b845b43d0a76d6cbebf5f93 commit 4bea944fe7ce75430b845b43d0a76d6cbebf5f93 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 traceroute: Remove set but unused variable. Reported by: GCC --- contrib/traceroute/ifaddrlist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/traceroute/ifaddrlist.c b/contrib/traceroute/ifaddrlist.c index b1d41d3e23a8..f9a72b28d4a7 100644 --- a/contrib/traceroute/ifaddrlist.c +++ b/contrib/traceroute/ifaddrlist.c @@ -73,7 +73,7 @@ ifaddrlist(register struct ifaddrlist **ipaddrp, register char *errbuf) #ifdef HAVE_SOCKADDR_SA_LEN size_t n; #endif - register struct ifreq *ifrp, *ifend, *ifnext, *mp; + register struct ifreq *ifrp, *ifend, *ifnext; register struct sockaddr_in *sin; register struct ifaddrlist *al; struct ifconf ifc; @@ -106,7 +106,6 @@ ifaddrlist(register struct ifaddrlist **ipaddrp, register char *errbuf) ifend = (struct ifreq *)((char *)ibuf + ifc.ifc_len); al = ifaddrlist; - mp = NULL; nipaddr = 0; for (; ifrp < ifend; ifrp = ifnext) { #ifdef HAVE_SOCKADDR_SA_LEN From nobody Tue Jun 20 16:29:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXf5Pc8z4gJYq; Tue, 20 Jun 2023 16:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXf4627z4L1B; Tue, 20 Jun 2023 16:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFx5u49smH9SbgCaiDl1pfdQjkswFuYajjyguXkNSwk=; b=XFInzhfgLNcTEBzSsoosOUTdZZ0s/jW2P0N85wm3weFdm0FWbkqSeOPWmQfTnKwZ4G6wD7 M77K348XuZ/c0ucTNTZFVSzvuKYemH3bdrk2mH7ckcxRBWthEnXI/WorRSNXM49fHwNfrS 8QFn3O0W23rZynmDaywvnipZgODbYdWRnETniM40+4Tvkf6OQm05I9nupVom5ekWup0zTH ufHB3FtOAr3p+jS0mZVZ+TCy4bbF/uCTzUmWtmT5LXMjh71qaE1zxuw8kFGaG+i895925p 1c72ilIMX0S5R91iIHxUvdzorxV3346wGC8SJm6FY+3djEXO6xWJnzrNM9ZDXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFx5u49smH9SbgCaiDl1pfdQjkswFuYajjyguXkNSwk=; b=UVJwCpq4qHdBMmTxUBEF7YBSWVjHJxROHGp9VZsQjxNH4uhAAeL8GgpdJkibWmZol2ktXq q5z2rrotoQ2mi7mPCJeK5TBLHI8kqSUpFkc+ltXdluw5khS93faM9LvYyTtFCiW31dvoEx BdYaI9k5NK8hwgvCGOLHl+i35PpCWUzkPW1K4bfFSG1XRC208uXcn7S0RSMzDyK93BTn3s nLkiMwxJz4oPYYCH94sjy4KWDMrx2QmV8n+bCAzOMppbKKHjMHaB0IKcaseh/QdmmMRdvm k8i0QtLeZ2C0Pv3Nt7AHpe6zLCF/qB6TZSG3yUbJ+rcNv5hUyU7jeThbcktMxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278562; a=rsa-sha256; cv=none; b=O0VpJxx05ug8gXDlo0rmIGlTPsjEqzDYobHN1bh8qO7cEWE0hJ4hzgvnm2WJhz6DFiVA2b vNKZFGJk7uiVsiUdoONvDjhUyjUd9rgBvl+kXyg3v5jrTWZgPIxEArSIMTIuo0UX7bLkBS Ww5CgM26HXN2MhUbUVjnHB0NRFJ2w57OAiMnMvcAII6++psm6EycEn0YPAMS6/ENpDeQgA LE/bPcfYV6pfkmWbyxKOtD6e6/aKWTYgP6/3Jql9aN4Rh/pBaMddQIowJ5JuAno/cBNZ5Z CVOkENjYGZfZ1cJNg4wPzc6NHg7aRhd2L3WCpreEnC2ZY8j75VDZcLVcL1qHmA== 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 4QlsXf39sQz15n1; Tue, 20 Jun 2023 16:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTMBr045161; Tue, 20 Jun 2023 16:29:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTMoJ045160; Tue, 20 Jun 2023 16:29:22 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:22 GMT Message-Id: <202306201629.35KGTMoJ045160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 98f7dec5084e - main - mptable: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98f7dec5084e832648c0ff8a93820f644b01a73a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=98f7dec5084e832648c0ff8a93820f644b01a73a commit 98f7dec5084e832648c0ff8a93820f644b01a73a Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 mptable: Remove set but unused variable. Reported by: GCC --- usr.sbin/mptable/mptable.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c index f6d0630fb5d2..79bee8e1edd8 100644 --- a/usr.sbin/mptable/mptable.c +++ b/usr.sbin/mptable/mptable.c @@ -530,7 +530,6 @@ MPConfigTableHeader( u_int32_t pap ) { mpcth_t cth; int x; - int totalSize; int c; int oldtype, entrytype; u_int8_t *entry; @@ -574,8 +573,6 @@ MPConfigTableHeader( u_int32_t pap ) printf( " extended table length:\t%d\n", cth->extended_table_length ); printf( " extended table checksum:\t%d\n", cth->extended_table_checksum ); - totalSize = cth->base_table_length - sizeof( struct MPCTH ); - puts( SEP_LINE ); printf( "MP Config Base Table Entries:\n\n" ); From nobody Tue Jun 20 16:29:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXh35pXz4gJRg; Tue, 20 Jun 2023 16:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXg4s96z4L3R; Tue, 20 Jun 2023 16:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dOJhPAvcZZgvbHbdq+dWQ9dy0aZjxNlpc76F5isqem0=; b=iZTHlZyJx3opITh8dIH96FjKuV3039T25lDbruZHKBSO4yejJnqOPM1vBW+yt7HsF/vIKb a+s7xRF5PHvY7f78+IzrlOjBwcA8taxxV4EYujBmrEqz1kK7UgT5BNWevPLf8a1rUwy3GH LAeY1kImouY2w4NQNA2F0k3lkgncIkfAue9t7z0RxU6rAQHMKiKMDiOiw3iWM0Z9W9fndF r0NpFHcAn41o4IXni9yPkslQuYLO+L9k6QUZo7kXzmaBjI9NOF4BgwjYKjjziyXLuS4KSe xxvdjQK3JWFt8y++zKiazDqC7ZROwGkqI4b+ERwNfek9aNVDxrvFz4PhHolp1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dOJhPAvcZZgvbHbdq+dWQ9dy0aZjxNlpc76F5isqem0=; b=REhedqv+7WPPVDZwDgbsuv9v1MBzdabZyxvdbKGmLBXcscwCjQj2gg+jsqnqN1hU5CXN5W w8O5g6As99OjilSTVmVjCp3fcwJSg9ZmniNn6j/mrv0A0e3wPKYb7rnQjminRvR4zZ0/2R z1WK79xL3b1FFJASdt/neZ3AUl0fK7fU2ozgZVpgsjC20t6xFF6Eu9L7OWaYtlHsY7HX+h PWf0FVhHP2VPZ8fHENHODTUX+Kvq96LIWNjcl72AJ9FfQ7uK+qasXmDYOzrIgxsYaOTDEk 6UTq8TGDlXeV6wrSP6hpoDhaXGq+1RWTYpYHs9EzSXwB/hrfn9+chRbymPfViA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278563; a=rsa-sha256; cv=none; b=QKymAqNRFb+gDJLY1+8mAkxjDosWt9m9o/IFa+hBW40PT3jg6FIdbWVALOz8S1lNvOzW8K Lo6BU/H/T65NC+PhGNG8D0i1Sy1LI9dhoYgNraVUKPrnvNO/F9FrqxnqTwL7u9vZOV4ed2 m/CGZT19/Fa8feDKb7Rcdfme4xVLiXUQnaOMVmDCmKV0y2RS+lMtUfDyn48vDwZwgkg8jf AJFR519bujKcnwIvk2bg/MsK5HuydUVqfeq7TWuDlT5PfATDhs8OFZK6qvERAtQeudJ+gp qzz/rLP5H3CXanUxcEDoxvb3GfoRQRtbUThQ/+7Sq+mv42aIKmaFUHUik0yAiQ== 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 4QlsXg3nK7z15sY; Tue, 20 Jun 2023 16:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTNZc045180; Tue, 20 Jun 2023 16:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTNuh045179; Tue, 20 Jun 2023 16:29:23 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:23 GMT Message-Id: <202306201629.35KGTNuh045179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5f0bd2918061 - main - bluetooth/ath3kfw: Propagate return value from ath3k_load_fwfile. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f0bd29180616c726ed3ded5e746f23aaf8aabc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5f0bd29180616c726ed3ded5e746f23aaf8aabc4 commit 5f0bd29180616c726ed3ded5e746f23aaf8aabc4 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 bluetooth/ath3kfw: Propagate return value from ath3k_load_fwfile. The caller ignores the return value so this is a no-op, but ath3k_init_ar3012 returns the return values of its internal functions, so this is more consistent. Fix some misleading indentation while here. Reported by: GCC -Wunused-but-set-variable (1) --- usr.sbin/bluetooth/ath3kfw/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bluetooth/ath3kfw/main.c b/usr.sbin/bluetooth/ath3kfw/main.c index 6ca5206b1507..25dca398c902 100644 --- a/usr.sbin/bluetooth/ath3kfw/main.c +++ b/usr.sbin/bluetooth/ath3kfw/main.c @@ -155,7 +155,7 @@ ath3k_init_ar3012(libusb_device_handle *hdl, const char *fw_path) ret = ath3k_load_patch(hdl, fw_path); if (ret < 0) { ath3k_err("Loading patch file failed\n"); - return (ret); + return (ret); } ret = ath3k_load_syscfg(hdl, fw_path); @@ -199,7 +199,7 @@ ath3k_init_firmware(libusb_device_handle *hdl, const char *file_prefix) /* free it */ ath3k_fw_free(&fw); - return (0); + return (ret); } /* From nobody Tue Jun 20 16:29:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXj0bncz4gJP8; Tue, 20 Jun 2023 16:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXh6F56z4LBD; Tue, 20 Jun 2023 16:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CjPIA/eCNIFBTb8BAYpGHT0L6ONOAf4zwS26KoYffD8=; b=UKdjGB7Zx7AmU1jiCQQZc4SJN/9lCZ3VXYLwOC5SP4amJt/rDBWwoqrvVjeY+PiFQc+z1f yxMEg69opQsTH9cdSqk8pZaDhHwWR1gyyCNFl9ns6c3Ra0DCn2KEeyTtQmbPUXloO2Ioe/ WxtUF7jngN4a3WNjZzrKRut8aZeIT4Rb/vBxZ4F+vkvkc4WFiVeMTlw1P02rjSHinIn8JX RTDOELeLhTsVjzV6e4jQQhevKNt4ZvnTTvwOHIE+SP+j9YDqHqGAjardskmlb3Gfbklbg8 RI36aLjkgwYq8j7sIW1zRIQ/tpP2Mzhf8jJYIrGU7sQrSMamShrmN3D4SeVNDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CjPIA/eCNIFBTb8BAYpGHT0L6ONOAf4zwS26KoYffD8=; b=wvDwixDuHcZfbFyoN9UN4xjMt0banV3Hl9r7TJq6gKnc7mEnSOtw+iMnOZ9eVYFhUiFYoX P6RfppEbltEFg27LvVMZrl4HyMIf50pS3odNeKsxjvaYG2WeVnaf0Xwq7+LritUIzH7ZFo sVL66gH3IM6F+LXiI7QTaZsua+Vm4xqLJDnUGbFlShc4F5ue8t8D/EU6L6M1cwK7pQPG6z cI/EoxZQ/ytCuqtrSOBsR9bqS2aKP93+WMZB2u65fpUoCeH44r2Z5FD50dZXP4f9PfBmTP UrMYovi+LzhGqECSr9AF8bkN5KtAd7+Lok2no3asC6qgC1wum8eV3dMn1MdajQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278564; a=rsa-sha256; cv=none; b=Cf/xdUL48D51lZgdV7fi/E31ikYyB5WrovmZ3SEuJCqEDEGFfDgsXATUFrjQ4TpuiK/eDU AQOVj7PiDR0j3FUCtkvjlbKfpG9WsINE2odQhbctdH0Q19wTVtYOYcXp3fYXK29IwIOsrA QgYWrmMMOI5V5G9wpXwZm1OQnbyPoAKV0MylbC+gGbGCmhkgXXoyALY6L1oOryEOmvo/JY OqSmsszzlXQ77bbwURjnJbeWwa6CSmlXWaip17RgPwGQrXcZMZ9KxXY6YD0sOY4FPHxikb /3z2kL+gnTqjf3QyL0GbKn9B+XddN67w90Fb/Z3F4Qe5Yxhnm7mmoorRqYwXyw== 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 4QlsXh4kpCz166S; Tue, 20 Jun 2023 16:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTOBO045199; Tue, 20 Jun 2023 16:29:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTO1N045198; Tue, 20 Jun 2023 16:29:24 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:24 GMT Message-Id: <202306201629.35KGTO1N045198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9d7c4486e29b - main - bluetooth: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d7c4486e29b13ba0df0a56ce016cdc169b98550 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9d7c4486e29b13ba0df0a56ce016cdc169b98550 commit 9d7c4486e29b13ba0df0a56ce016cdc169b98550 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 bluetooth: Remove set but unused variable. Reported by: GCC --- usr.sbin/bluetooth/ath3kfw/ath3k_fw.c | 2 -- usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/usr.sbin/bluetooth/ath3kfw/ath3k_fw.c b/usr.sbin/bluetooth/ath3kfw/ath3k_fw.c index 2c480044c2d7..4aa1add64718 100644 --- a/usr.sbin/bluetooth/ath3kfw/ath3k_fw.c +++ b/usr.sbin/bluetooth/ath3kfw/ath3k_fw.c @@ -49,7 +49,6 @@ ath3k_fw_read(struct ath3k_firmware *fw, const char *fwname) struct stat sb; unsigned char *buf; ssize_t r; - int i; fd = open(fwname, O_RDONLY); if (fd < 0) { @@ -70,7 +69,6 @@ ath3k_fw_read(struct ath3k_firmware *fw, const char *fwname) return (0); } - i = 0; /* XXX handle partial reads */ r = read(fd, buf, sb.st_size); if (r < 0) { diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c b/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c index 5fe270c7f059..cdb84b44b0f4 100644 --- a/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c +++ b/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c @@ -50,7 +50,6 @@ iwmbt_fw_read(struct iwmbt_firmware *fw, const char *fwname) struct stat sb; unsigned char *buf; ssize_t r; - int i; fd = open(fwname, O_RDONLY); if (fd < 0) { @@ -71,7 +70,6 @@ iwmbt_fw_read(struct iwmbt_firmware *fw, const char *fwname) return (0); } - i = 0; /* XXX handle partial reads */ r = read(fd, buf, sb.st_size); if (r < 0) { From nobody Tue Jun 20 16:29:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXk0lP0z4gJcm; Tue, 20 Jun 2023 16:29: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 4QlsXj6gcDz4L85; Tue, 20 Jun 2023 16:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AqLfEevMR8VzYLv7vOBYqhIL8DbiAnnhw8wc4TFvwwg=; b=ZKNDtPGpdZkxLrMvB6d//OKWFLQ5XTcOrmn+b9RTCfbn1JosGt2x7iEF/prqopsVMkMaSE v7TnT0FqevMDK2QsOvEseUfM2I0857qSl8RivQfk8AeH5tpNqw+LR2TO2upIb2qFZRLR3E TY8D+WByxf2MJeRMB546dueLD/NqHsUBqDm4AD72oUqatZvG6q2VtcX04HH8dXCWJrP3AY qFSodnzzYgDoZKeYE1oL8JHcffQOfGXjH3xdVrWcOk4pN2cZZZTcyPUsuTXeFfkXbO3XWK fw4ls/nEtK+2JPi9IdYo7rf0VlEN8wS4XWWJpBlRRFRrbF9SJPApJjkuLL4GLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AqLfEevMR8VzYLv7vOBYqhIL8DbiAnnhw8wc4TFvwwg=; b=VhbXhpds7Fj+Jo4H2u9tfvYEaWI5xYpuQuq3042hQRp9dSdOBoY5YzKazdixn9tSjoY/+7 AD5/miyiymfqzSva3as9qOsc0ALs5aCyN74n2zLkK5LTI+2yL8deyeWdiNpzEL8C/eEc7l PCaQnyb31vyuKCCStdtN8slQPW7ByNcmqeuxernfswnVIPyTuwBtQRJez0hGMvtkHIeeze 2sEH91IxZRgysNPtZAfHWVUEtCLVlBVFiwl4U2UnqPqbyjYkeqV2XupKYAxv7Y8fnnXk/l KygY6vncDNmXkvD8lQOiAYH3VTGTATs7LENd4QzRcFIN7bew+ag5AXDX74v7Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278566; a=rsa-sha256; cv=none; b=b4dXcxaK9txHINnCJX5ZpFrly6bNn8zlthra0fntxzbiXW+mCmNKbCzGstf2HhaQspMrcQ +ZkBahBAosEdGL3wigjy3Kbs9/hEMX5ktjVD3ev1pZg630UfczVTdvVJPD3eGES/hi+zVC V8xSG9Ndt+YcxdVARKCZ4wM5pu1DAS24woIfSdF6qmbpZPuPwIxbSA1+GbzI3pllbMFzCm LHPkwvo8tYfhat7d8+kqTsFcpquPDRZPdD6yAzArhsx/+C+RjoevG+Et/8Yn6eK54t+te5 MU+gKRWEm61+UFTbHv0LEs2DRnCpV12zq4XaA2CBHPLja5Pzh5RMfLji/lbWIQ== 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 4QlsXj5kw3z166T; Tue, 20 Jun 2023 16:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTPAh045220; Tue, 20 Jun 2023 16:29:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTPup045219; Tue, 20 Jun 2023 16:29:25 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:25 GMT Message-Id: <202306201629.35KGTPup045219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c19644284212 - main - nscd: Remove set but unused variables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c19644284212e54a7e66bef4b6119fb9dcb14b20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c19644284212e54a7e66bef4b6119fb9dcb14b20 commit c19644284212e54a7e66bef4b6119fb9dcb14b20 Author: John Baldwin AuthorDate: 2023-06-20 16:28:59 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:28:59 +0000 nscd: Remove set but unused variables. Reported by: GCC --- usr.sbin/nscd/cacheplcs.c | 4 ---- usr.sbin/nscd/nscd.c | 5 ++--- usr.sbin/nscd/nscdcli.c | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/usr.sbin/nscd/cacheplcs.c b/usr.sbin/nscd/cacheplcs.c index 37cf765459a0..be71baa773ae 100644 --- a/usr.sbin/nscd/cacheplcs.c +++ b/usr.sbin/nscd/cacheplcs.c @@ -159,11 +159,9 @@ static struct cache_policy_item_ * cache_queue_policy_get_next_item(struct cache_policy_ *policy, struct cache_policy_item_ *item) { - struct cache_queue_policy_ *queue_policy; struct cache_queue_policy_item_ *queue_item; TRACE_IN(cache_queue_policy_get_next_item); - queue_policy = (struct cache_queue_policy_ *)policy; queue_item = (struct cache_queue_policy_item_ *)item; TRACE_OUT(cache_queue_policy_get_next_item); @@ -174,11 +172,9 @@ static struct cache_policy_item_ * cache_queue_policy_get_prev_item(struct cache_policy_ *policy, struct cache_policy_item_ *item) { - struct cache_queue_policy_ *queue_policy; struct cache_queue_policy_item_ *queue_item; TRACE_IN(cache_queue_policy_get_prev_item); - queue_policy = (struct cache_queue_policy_ *)policy; queue_item = (struct cache_queue_policy_item_ *)item; TRACE_OUT(cache_queue_policy_get_prev_item); diff --git a/usr.sbin/nscd/nscd.c b/usr.sbin/nscd/nscd.c index 3c3ebda565f6..8a569a2dc9ab 100644 --- a/usr.sbin/nscd/nscd.c +++ b/usr.sbin/nscd/nscd.c @@ -105,7 +105,6 @@ init_cache_(struct configuration *config) struct configuration_entry *config_entry; size_t size, i; - int res; TRACE_IN(init_cache_); @@ -120,14 +119,14 @@ init_cache_(struct configuration *config) * We should register common entries now - multipart entries * would be registered automatically during the queries. */ - res = register_cache_entry(retval, (struct cache_entry_params *) + register_cache_entry(retval, (struct cache_entry_params *) &config_entry->positive_cache_params); config_entry->positive_cache_entry = find_cache_entry(retval, config_entry->positive_cache_params.cep.entry_name); assert(config_entry->positive_cache_entry != INVALID_CACHE_ENTRY); - res = register_cache_entry(retval, (struct cache_entry_params *) + register_cache_entry(retval, (struct cache_entry_params *) &config_entry->negative_cache_params); config_entry->negative_cache_entry = find_cache_entry(retval, config_entry->negative_cache_params.cep.entry_name); diff --git a/usr.sbin/nscd/nscdcli.c b/usr.sbin/nscd/nscdcli.c index 326acfae7dea..f9aa1903ed74 100644 --- a/usr.sbin/nscd/nscdcli.c +++ b/usr.sbin/nscd/nscdcli.c @@ -139,7 +139,6 @@ send_credentials(struct nscd_connection_ *connection, int type) struct kevent eventlist; int nevents; ssize_t result; - int res; TRACE_IN(send_credentials); memset(&cmsg, 0, sizeof(cmsg)); @@ -158,7 +157,7 @@ send_credentials(struct nscd_connection_ *connection, int type) EV_SET(&eventlist, connection->sockfd, EVFILT_WRITE, EV_ADD, NOTE_LOWAT, sizeof(int), NULL); - res = kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL); + kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL); nevents = kevent(connection->write_queue, NULL, 0, &eventlist, 1, NULL); if ((nevents == 1) && (eventlist.filter == EVFILT_WRITE)) { From nobody Tue Jun 20 16:29:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXl1fVdz4gJFG; Tue, 20 Jun 2023 16:29: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 4QlsXl0br5z4LKn; Tue, 20 Jun 2023 16:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VuEE0ZjQhUqrHb5EIWC8jrPC2NLWBFwO+RDHAqqI3uQ=; b=WvdQdKFGEYU3DyCgvAFCv8c7XlC/p/rnHfRAgNTH82ttUgBm/cXWSpqWw+ZPhvR+FUd8T7 kLJdlowbKCi/gkQXR7vFh8uyT6jhBhSKgu4Hl2FwWZxRmCwVr2FTvwd6P1laZ3uNW5jG5A rconzU1dKHYoeNzNgN8DczIaBdnaUbrDK79aPJp8msZEI8jclP57ApLorZebT/1IuGu9M+ YwGn49NKHogjH2mLvGrNYU8bLT3KfdyqsMImlrgZknoCDm34jPxXpLu+/qxc4o2aEFuGQW YFR0e62bWwP5eXJzCy0PYCs5Wzg42EvXFPxI63Abv/MlwMa0dR5WNDm5kULwhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VuEE0ZjQhUqrHb5EIWC8jrPC2NLWBFwO+RDHAqqI3uQ=; b=Q+dy7HQkPYi1maXYymms+R2EVeqpSO58DILwIz58NmpzNkFxtFmhBp6B5PAn1zhSMAvol2 Qs9zIov9g7GmF1GYVWrVglFD+6qAOdXB8C+Vgtj/0njofBKLA2ZhdqRrmNAFdHX0zpJyx/ YwM0BJSI4nyiaXCoZGa9r3tKMHM398SnQY8Z/Y9vpjJDjNTu62+JMnVH540J0UzigrOgaE 5aznYSw0/8t/bD4ewOYoYdVjynvfIwBH/kURDNSe3n1hwh12nxbvCQu2Iz9v53BzltcV8c tMw5C2ke2+Bo2MPMgYbccJ7yacNsBMQreU7tb8/Rc2zpTdiTAYXPp/82JkiLiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278567; a=rsa-sha256; cv=none; b=Uzd6EUHTm1TrndYYjwoKtel/3I2rzDwaSSYHKDyhEZCXkPxHyzIaLy+eNtyKnzRMUeZqQl aSMmGrw2cBXOo9ROkHyRBUvP4tdRWgEQ/U3YpJwH4bXLRE0PNZODrDTTShCTnw9rYQojwG EQzK+CMZ3ST8QvVb6OCM59wjUav0p0d9k2M2nbGDtB84JSAVV89d0YSzP0OEy/1MuqrRex NlHE4exYMkHZj1XeGQ7VSGwhBcd4PoRhQfEVSeSkoqVV62ke3NZzFjJtY0k9qbNDoC5SBN 5U4vkhUrB0xS6juUO6pE0CWxfUd7vry3wUw20cYqLNAS7waQHzPh/3z8FhG2gA== 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 4QlsXk6ksHz15hy; Tue, 20 Jun 2023 16:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTQss045243; Tue, 20 Jun 2023 16:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTQ5m045242; Tue, 20 Jun 2023 16:29:26 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:26 GMT Message-Id: <202306201629.35KGTQ5m045242@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8457b7f426b0 - main - ypldap: Remove set but unused variables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8457b7f426b074a2eb93002fc9d2268690a3cf32 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8457b7f426b074a2eb93002fc9d2268690a3cf32 commit 8457b7f426b074a2eb93002fc9d2268690a3cf32 Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 ypldap: Remove set but unused variables. Some of these were reported by GCC, others reported by clang. --- usr.sbin/ypldap/entries.c | 5 ----- usr.sbin/ypldap/ldapclient.c | 4 ++-- usr.sbin/ypldap/yp.c | 3 --- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/usr.sbin/ypldap/entries.c b/usr.sbin/ypldap/entries.c index 1d57d5cd7b05..9176e9ba1862 100644 --- a/usr.sbin/ypldap/entries.c +++ b/usr.sbin/ypldap/entries.c @@ -40,7 +40,6 @@ void flatten_entries(struct env *env) { - size_t wrlen; size_t len; char *linep; char *endp; @@ -56,7 +55,6 @@ flatten_entries(struct env *env) * * An extra octet is alloced to make space for an additional NUL. */ - wrlen = env->sc_user_line_len; if ((linep = calloc(1, env->sc_user_line_len + 1)) == NULL) { /* * XXX: try allocating a smaller chunk of memory @@ -78,7 +76,6 @@ flatten_entries(struct env *env) free(ue->ue_line); ue->ue_line = endp; endp += len; - wrlen -= len; /* * To save memory strdup(3) the netid_line which originally used @@ -94,7 +91,6 @@ flatten_entries(struct env *env) env->sc_user_lines = linep; log_debug("done pushing users"); - wrlen = env->sc_group_line_len; if ((linep = calloc(1, env->sc_group_line_len + 1)) == NULL) { /* * XXX: try allocating a smaller chunk of memory @@ -115,7 +111,6 @@ flatten_entries(struct env *env) free(ge->ge_line); ge->ge_line = endp; endp += len; - wrlen -= len; } env->sc_group_lines = linep; log_debug("done pushing groups"); diff --git a/usr.sbin/ypldap/ldapclient.c b/usr.sbin/ypldap/ldapclient.c index 5f446a6f847e..fbd6fcd3dc65 100644 --- a/usr.sbin/ypldap/ldapclient.c +++ b/usr.sbin/ypldap/ldapclient.c @@ -346,7 +346,7 @@ client_shutdown(void) pid_t ldapclient(int pipe_main2client[2]) { - pid_t pid, dns_pid; + pid_t pid; int pipe_dns[2]; struct passwd *pw; struct event ev_sigint; @@ -371,7 +371,7 @@ ldapclient(int pipe_main2client[2]) if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_dns) == -1) fatal("socketpair"); - dns_pid = ypldap_dns(pipe_dns, pw); + ypldap_dns(pipe_dns, pw); close(pipe_dns[1]); #ifndef DEBUG diff --git a/usr.sbin/ypldap/yp.c b/usr.sbin/ypldap/yp.c index 0cbadc371c5e..cfaea38f76c4 100644 --- a/usr.sbin/ypldap/yp.c +++ b/usr.sbin/ypldap/yp.c @@ -268,9 +268,6 @@ yp_dispatch(struct svc_req *req, SVCXPRT *trans) int yp_check(struct svc_req *req) { - struct sockaddr_in *caller; - - caller = svc_getcaller(req->rq_xprt); /* * We might want to know who we allow here. */ From nobody Tue Jun 20 16:29:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXm2RwTz4gJfT; Tue, 20 Jun 2023 16:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXm1m3cz4L8v; Tue, 20 Jun 2023 16:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UYXQUGzKTIcWWgxj6HU+bzJE2RV1mXwtZvKJyfpICao=; b=Zf/yLZpi8D3Gp6HbUjUHCdLzpIJtVM6Lz0RELewKcTo5Ucmp2eA8OdAF6yZdJTbp3l/4nC OaYD9zVWwWV/FJSMbmKkmjrxCqqoeTCZckCnYfZfT8Znco0ctOfOX6isTS9B3NDrvMOsXP YJtLL+vttS8CUFzVmUJFZzXQHvlNXqEKF6OAYMmi8XZWRULqzsfSGgYLFFF1bCD3EnPii1 lUA+XXNzmNwIIvklMr86AWHxWxB4KybyZITWqVBV6vXSVaUEp0jixHUDsHsLiIQrl/wZ2Z DopK/8ScYdQbAZMGWyE03Mty3VzTjigYJvEZUjRdVGUSv4E0PwYYMK04kpxjHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UYXQUGzKTIcWWgxj6HU+bzJE2RV1mXwtZvKJyfpICao=; b=F7uAUPrmCPrxcHr6XtbDj+lWwW0XzCg6ypVPhIbHLGJlEpzTs5tK/ogGzbwzxtSqFN18Cp hFjo75Uux0mdp35TIrPhNldVAAhfU7hJCuFNELdDU48jBLos4fd+eacdzFYe1B1Ix+Y+LS EBmRSL7FFZLDVUik4Pl55S3H3dugjF7wtcZcaWA1pklBtN+itm+ypVmWaDTi7qksuD+M64 IRfPD/b016m2Z5+RJH242DvpTWu5WDlB0+Z3f1R0OetP0AWzPpGiU93C0+PCog915I+caT AahFpl6iEOse+nUDUOzZDHK9yCbLd+1Wn0NsuFoL3a7ASvguVuoomY3E+Z53qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278568; a=rsa-sha256; cv=none; b=VYyfgZERFCBgnUYa3jW6XZjzPnnIqlC5YnNEDSxC3b+guHWbjgSxKP35hKS/6JaRHdSL3Z dliEVyfP25r2ojTbBOC/92QTKGewBCISJ2nwZ5eDsKR6TNVm3XF/x6JPQU54TckNhFc7qW GG03G4ZI9eWQPV/TpLrTp6eIW13a2R3ovX1/KJzkeMnErv+5Ob45fgI1h2TNTFL2kM8T4E cqYxHpCfuM+DP20aBmRnW/Y+B8IOyXe7h4wzrQIjx3TL1EL0v8xsDk47JdzYQQJeL2vFOD zqYACnCrcqJLVmK2DVuEeF1ybW4TP4koCWhvNnzAuXpKJ3gPUkMhipAKrM/buQ== 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 4QlsXm0N1Zz15sZ; Tue, 20 Jun 2023 16:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTRYn045262; Tue, 20 Jun 2023 16:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTRWZ045261; Tue, 20 Jun 2023 16:29:27 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:27 GMT Message-Id: <202306201629.35KGTRWZ045261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: def653cd6c38 - main - ac: Remove set but not used variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: def653cd6c38e17ab7bac1b13d34dd7f5f584832 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=def653cd6c38e17ab7bac1b13d34dd7f5f584832 commit def653cd6c38e17ab7bac1b13d34dd7f5f584832 Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 ac: Remove set but not used variable. Reported by: clang --- usr.sbin/ac/ac.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index 1372b175f116..8d75c4ba1013 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -408,17 +408,15 @@ ac(const char *file) struct utmpx *usr, usht; struct tm *ltm; struct timeval prev_secs, ut_timecopy, secs, clock_shift, now; - int day, rfound; + int day; day = -1; timerclear(&prev_secs); /* Minimum acceptable date == 1970. */ timerclear(&secs); timerclear(&clock_shift); - rfound = 0; if (setutxdb(UTXDB_LOG, file) != 0) err(1, "%s", file); while ((usr = getutxent()) != NULL) { - rfound++; ut_timecopy = usr->ut_tv; /* Don't let the time run backwards. */ if (timercmp(&ut_timecopy, &prev_secs, <)) From nobody Tue Jun 20 16:29:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXp14wkz4gJFc; Tue, 20 Jun 2023 16:29: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 4QlsXn2KDFz4LGG; Tue, 20 Jun 2023 16:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PYuq4N4NK0SgISwtH+oB+UgEz37drR3OCVTyW86Z4Bw=; b=R1GA/qBVjTayprc9RXgtUXLZu53nwEiJyV8Pql38+5Lzkb0Sck+zrNAUF0CnXP4IOsgzYG j+cl5AkxOiPZ0Bojr9J92AFvnT/j8VEVnz9RB47P46kXlHJHNf+2uVi4amsk6qfew1pR29 9nKV9hTNU92CsbqsfB5zp4p6+HDUZiMZqjuubvm+/Ptr6P6kY6rdTpgQxdCQaZ0XLDSQG6 mmST0Nb40CbYyo1GpWO115nTn76uhYXDuIhyB2CZpY1nYMcFFwMQ66PWLPMSOZqsKp2ok8 Z/p8U6y6mEParXmFhm/Ie7HAv/PqA54WXK8JjpIzUFPaBYHOhWV3wTi0CmVGSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PYuq4N4NK0SgISwtH+oB+UgEz37drR3OCVTyW86Z4Bw=; b=OcugVERCDuvODjA+T78b+q8ASS91e1AJJxV3IM5BRf1xRp4+lesVmmaZcQP3Gb2Wm5um0g l/QCBxVYvGxlQgoLK/ryR9BB47OYjCiwXazB2ZAwRo2hPNUo2GGFkCoQimYvBJoZKNA0To C84AwDSZaDMwt6v1mKF31iBLDdcuhBum37t6Z8WXJSWJQODsyMNoj5bYaEku7kb1gpS5ax kHZwx52zYyz9euW/TRIP1GWeaKZh2O2RgQarbPCQU68cO/9BYHwOCHKKnkz9zIq3BBCmbH xfbO86KfDlyzRDA6mXtcglwyXr7iaJLsomUBOkCdOF3XIHgy6AjQhAA1f2NXjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278569; a=rsa-sha256; cv=none; b=KkiZ3ykyFyfoszZwMKglXuCofGx3t5Lbh9atvTdjTTf/cOnpfECC2+Obk9zUdlg+zgBgaW UAtYNWsJ8NaGoxMs2iYHcYo5inwJ3gctnCoVIC2kxNbi2a2ZFGYKXhFs1/ljAaTmtoX/uJ 2jdsnOotb+bc2kGtCHoF5cq1H/QWcBWL+shiWGiCavMabxQZU0hIvFdb12CN2+VzRwMKXe 9hk/HoiIJBxrM7pGLULmBK87+7ojdv5B7Ist0NtQEr6O/bhu6ylMsdg4UEfn2r4eM78NQ1 5hzB1J30tkX6fWb1I5QzKDOt1xRFIsWc42QtKduQApnjCkJQWY44VOJLl9XOmQ== 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 4QlsXn1QbJz166V; Tue, 20 Jun 2023 16:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTTtk045281; Tue, 20 Jun 2023 16:29:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTTnq045280; Tue, 20 Jun 2023 16:29:29 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:29 GMT Message-Id: <202306201629.35KGTTnq045280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1c3424b0d2e7 - main - rtld-elf: Remove set but unused variable on 32-bit arm. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c3424b0d2e719f9e88cbeac3fd0abbe0886b0f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1c3424b0d2e719f9e88cbeac3fd0abbe0886b0f0 commit 1c3424b0d2e719f9e88cbeac3fd0abbe0886b0f0 Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 rtld-elf: Remove set but unused variable on 32-bit arm. --- libexec/rtld-elf/arm/reloc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c index b85c8b1f4845..36e73b55aee1 100644 --- a/libexec/rtld-elf/arm/reloc.c +++ b/libexec/rtld-elf/arm/reloc.c @@ -91,7 +91,6 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase) const Elf_Rel *rel = NULL, *rellim; Elf_Addr relsz = 0; Elf_Addr *where; - uint32_t size; for (; dynp->d_tag != DT_NULL; dynp++) { switch (dynp->d_tag) { @@ -104,7 +103,6 @@ _rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase) } } rellim = (const Elf_Rel *)((const char *)rel + relsz); - size = (rellim - 1)->r_offset - rel->r_offset; for (; rel < rellim; rel++) { where = (Elf_Addr *)(relocbase + rel->r_offset); From nobody Tue Jun 20 16:29:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXp46Pfz4gJZt; Tue, 20 Jun 2023 16:29: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 4QlsXp3ZGcz4LGS; Tue, 20 Jun 2023 16:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xVat04webuHqMMx1QT2cy3i3bDPtpstHjkb3FgBX8Xo=; b=r0i4Y/1fD2LG1G5XIUbQdvlipEragkWkHVsI3DCc5kGOMa5Wh+du2istKGS6ZHO2uvbfqt 1KKVyjXNJLldBArQKfW1CXO4Hi3W5yV7PqxFUerq34bQHZe7Y6Q15POtspqPZUpec6iTBx WvOjYPCz5X3xrhxnMN0Hh6v5pNy7hPjDqtUOVEnwLVuso2rqPrQkrTGp5C7M0WKJ5cN2Ql r9R7dvoSQzMSSb78UJcRipPAxcz11AL3i4B5TecfV1a16M2EYDXM76ZPQhT6B9DVmdlysT jaMFtmTTnrtP3CS1gNI0AoYdW+s6O/1Jk5XxEERPsg73yYCp++xKhI/ivOp1OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xVat04webuHqMMx1QT2cy3i3bDPtpstHjkb3FgBX8Xo=; b=XkGP2yE8PGD1S3PVpMOr7Q++My6f5f14DIjCv5u75upHRZFa2ClroTtmpU9a/4tbqAVP6G qG4uNbcjz456qxbhvdQQZAUmuHTvwwiS/hcYcbandKHW787HDyFcGY4+lLlzA4JGrAwFuk TMFi0NeQWvigzmIDtqUlJps4RF4/XwjcMJD/Wom3rBJa+L4mlhgQP9qp3hjuEBvHaNzxYc AkVSpMBXkMnBFi5a65aLw4Z25FRrTI3i6pukJp3g82DmxlwzIc3gxgI4w4mwaRjBmUWdGV vHlTAF5SL9vOdreqMCsAZV5i/5e24W51l+27cTAuDElGLapx1sddC16wXoP8VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278570; a=rsa-sha256; cv=none; b=sunnjbi3B922UEFDtX/tPNF6AdLB73VWxIQjLikuqax2rJ9RzcQIcosusexr0x5NHZC9EY 8EyglHbCsRyhlTQ5mb5/BQbJQ3RjF6nMPtTMcV1cFquGbQP5x51HaRQzcRQjGruyq1u8UE dgOLABZXUl7QqPPYMStxSsCpWieS0EtKq14CkST77SqpZet19HZhC8fdzQYLDwp7YcaJp+ zrKC0/R8k1qgKcLSFk10aF5lC1ZkufWMOOhBuQvlHh1diAUGimdEL3DZH08f03H+7MF2qy +Cs/cYvXFYp5H6q/mC4GSNaAF3lr11AsAJEXytKAsDidFdUgASuGO6sP5H5Gfw== 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 4QlsXp2H4Gz15YK; Tue, 20 Jun 2023 16:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTUbx045300; Tue, 20 Jun 2023 16:29:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTUjB045299; Tue, 20 Jun 2023 16:29:30 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:30 GMT Message-Id: <202306201629.35KGTUjB045299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6dd202ce930c - main - unix_seqpacket_test: Consistently use datalen as length to send. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dd202ce930c6e77db4f4f2c5fe835a28d8c6a04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6dd202ce930c6e77db4f4f2c5fe835a28d8c6a04 commit 6dd202ce930c6e77db4f4f2c5fe835a28d8c6a04 Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 unix_seqpacket_test: Consistently use datalen as length to send. This matches the other tests in this file and quiets a set but unused warning from GCC. --- tests/sys/kern/unix_seqpacket_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/unix_seqpacket_test.c b/tests/sys/kern/unix_seqpacket_test.c index 6d50816b02ff..72be92ee398b 100644 --- a/tests/sys/kern/unix_seqpacket_test.c +++ b/tests/sys/kern/unix_seqpacket_test.c @@ -829,7 +829,7 @@ ATF_TC_BODY(shutdown_send_sigpipe, tc) ATF_CHECK_EQ(0, shutdown(s2, SHUT_RDWR)); ATF_REQUIRE(SIG_ERR != signal(SIGPIPE, shutdown_send_sigpipe_handler)); datalen = strlen(data) + 1; /* +1 for the null */ - (void)send(s2, data, sizeof(*data), MSG_EOR); + (void)send(s2, data, datalen, MSG_EOR); ATF_CHECK_EQ(1, got_sigpipe); close(s); close(s2); From nobody Tue Jun 20 16:29:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXq4YPrz4gJlP; Tue, 20 Jun 2023 16:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXq45PPz4LRL; Tue, 20 Jun 2023 16:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UlAtpG+7BVJ5rkTaTbw/Pic1hY4ttXw6gdxf6eTSoZ4=; b=sWGrjtUNGl5szw9x085K1kk1FEyY6s4u8unkH6AMpEve/I/kQlB1owrT8g6uVbsUzF2Ftu L+KPOBAh7ULHo6fWrR9w1rewPAHq3ezkX2HPNtmVlgIxByv/GEfxCq9+74cVoBBwYrrhBe ob0xXEroYcW4S3yCvMMm5Etuo+eC/S3XEbTORYd3FiLmQtJR6KieT0DtPFFDR7JdKuWelz i5VsLVWZ5IcNi0OAsfc4lT2RG1vhKdk/e9AYQmX4XJCfN0DfRXMgVb8U+qHmcheUjMDlUy ZF7m/M25USVPb8jEluuupy2p6Xq3QOPVKWkuv9y7xKxMEXkF9kPDEEQkWghwDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UlAtpG+7BVJ5rkTaTbw/Pic1hY4ttXw6gdxf6eTSoZ4=; b=KO/YsB9mRkZu9jPIRSzzUkniw5Li84r4Ov10CSxJ6o5TGGctU/QNLDc4ietF7OkXSBnL5R n1D8NT+fyKpgqgF/VULhNQRLZb0bKjR68tZEBxs9hVcVYAfIxv47zPGKsR8V8cOSpbnqwM utV0SRmJpM/FaeVudK21O/CsOMQ4x+5YqKghfftoew5eY5krI2MzGeJ6P0TfH6GSYKllYf 6/dJKjHct9d4ql1Q9Cbd/qNJbk/uWrb3HmeOJ8UlNbStJ29G8T8yCpV2TzJLbgOd9kUedV ves6vjI3ikbDnaefzTySjJgtev8haxF0dNw3G2yIDuWaDCUnos35Y6qXRGyS4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278571; a=rsa-sha256; cv=none; b=YBIzZa8muVIf8TB6JnOEkYDPRlt1wWINtc+xT7D6qQ2Kba5KAbtNJ7MW7JQc/Rz7BIXv+I 9cR+SF2wyENh4bxdPGzjCpVjybtEzlX7xjSFOO0tGhxa9yGWUumCjA7hn0ZOEafJe6c5/e zFNsjqaSK2EjiX8gtfTEvy3nsGRruJeURRnMUY6xzWxNDpbj0bzMoq1srjHxU0xloT+OTz fmoQSGfRPMr+FdyqYwBPhMNKMc7nAY1F3sTh312bqychHXQ2+u6M6ULmE2e//+e3TArexa 74NykiCXZm57zOHAsf7F0lgSmzRPE3GKu/cMnE6HUbo1KyBDgn73+P0ecqtCKw== 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 4QlsXq3BSpz15sb; Tue, 20 Jun 2023 16:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTV71045321; Tue, 20 Jun 2023 16:29:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTV3j045320; Tue, 20 Jun 2023 16:29:31 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:31 GMT Message-Id: <202306201629.35KGTV3j045320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c555dcddceec - main - libalias tests: Mark an unused variable with __unused. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c555dcddceec0c27242f9159755a43959853dc2f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c555dcddceec0c27242f9159755a43959853dc2f commit c555dcddceec0c27242f9159755a43959853dc2f Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 libalias tests: Mark an unused variable with __unused. It is not trivial to remove this set but unused variable since it assigned to inside of a macro body, so just mark it with __unused instead. --- tests/sys/netinet/libalias/2_natout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netinet/libalias/2_natout.c b/tests/sys/netinet/libalias/2_natout.c index 4dfffdc055e2..c6f5797b2db7 100644 --- a/tests/sys/netinet/libalias/2_natout.c +++ b/tests/sys/netinet/libalias/2_natout.c @@ -202,7 +202,7 @@ ATF_TC_BODY(6_cleartable, dummy) { struct libalias *la = LibAliasInit(NULL); struct ip *po, *pi; - struct udphdr *ui, *uo; + struct udphdr *ui __unused, *uo; uint16_t sport = 0x1234; uint16_t dport = 0x5678; uint16_t aport; From nobody Tue Jun 20 16:29:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXr70Nbz4gJrP; Tue, 20 Jun 2023 16:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlsXr5Vztz4LMV; Tue, 20 Jun 2023 16:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hFhFfhgHZuoDVBRs/RKVOJqTdsGAo54UphPQyCAtt+g=; b=ym91g0LL0iCI/z7XArg7/8XeEkfnjGsY/cwyJ4rHh2825r13WMnI9piuvWgpw+u8YGYnxS RgkAcbUgSh5hd1Gwv+9YKgKuztvK6itPmlY4ZEHpgybgdp1HQqd5THurhYbscApWy76SNj YoGmW59CV0pOVuBKt/PKp36WdURfLRaICmmaCRW8+PZ8XOKIwcH1rm446xHgH0lr2AxZTh 5EGY3AaLNRiI+k/7or4A3kMhRDhaELq3lmSzAzq2DoToQAX+9Xxz4ztFNJ1GN6HlHWCvcJ QVJfLiEKXc5FBs68nzmQWsW6Z5b+4th8f4mHD/u81yCaXwXAkm68XoEqwRh6xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hFhFfhgHZuoDVBRs/RKVOJqTdsGAo54UphPQyCAtt+g=; b=ubqKD99/zrlaaGuqbguY5w5CNqAbh2vdcG/Y7uS6FhwFjUlOrcBKdyStX8PZW8DHQxprl7 YOesBYx8AFYAAL7Qu9NRDI+eFADCmw15vCZp0KIqwLTAQUBOzP3td0EoB8NQiLjMp1xb0F z5QUYPFnr9s9qZLeCM6S5ZfmOH5gibB6LAV6b6ao+a7bW7uzmmSe9HwRdSnHFgtj74o8Yj FtSQX2otl+2sk8hfYlmkCSLK5eaEkofTgO4tWnk0fwf47kf06qof+UWxKNfpQ5ps18HYdW 7lM27P9tWGo3sph29//PqSiGOycctPS9EVEGHNOgT9QejRYaNUpXVMjGLxpg7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278572; a=rsa-sha256; cv=none; b=sNMnGnZ/G/zwpmTv/fDg/K6ojLG6Hk56dC5O6HIgbesEEkw7Z5xTC0BYq2y1gto4Oogx0a OS5CGpaRlL5WZfrgVtCsNu+94GOYK5cCJvcXHCPRJDDKdmOXxwqifaopRvfd3YsAyklGBP QiOXX7phdE+DtbNRDas4UAsLBZA8K437MlABGC66iGo/D2/TOSfAFACoLiRvIxZMeAft86 x5/dlj/KByNel1RJHVtCwDkj3uNowtI9zYlnonvGq8Vf8OTfCieS0i77tetpanMcwUsNG3 tegA5rNVZfvj0N/3DVTVrFRn+/sz309zKMT4iyM8hKvpI2CeM3CxpWnFSpWUqg== 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 4QlsXr4XR7z166W; Tue, 20 Jun 2023 16:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTWqC045344; Tue, 20 Jun 2023 16:29:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTWiJ045343; Tue, 20 Jun 2023 16:29:32 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:32 GMT Message-Id: <202306201629.35KGTWiJ045343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5edeed4360a7 - main - libgssapi: Remove a set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5edeed4360a7e492cbca71ae7d55120951f8fc53 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5edeed4360a7e492cbca71ae7d55120951f8fc53 commit 5edeed4360a7e492cbca71ae7d55120951f8fc53 Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 libgssapi: Remove a set but unused variable. Reported by: clang -Wunused-but-set-variable --- lib/libgssapi/gss_mech_switch.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libgssapi/gss_mech_switch.c b/lib/libgssapi/gss_mech_switch.c index df4b7a9b8ea5..ddecabb9d823 100644 --- a/lib/libgssapi/gss_mech_switch.c +++ b/lib/libgssapi/gss_mech_switch.c @@ -190,7 +190,6 @@ _gss_load_mech(void) char *p; char *name, *oid, *lib, *kobj; struct _gss_mech_switch *m; - int count; void *so; const char *(*prefix_fn)(void); @@ -208,7 +207,6 @@ _gss_load_mech(void) return; } - count = 0; while (fgets(buf, sizeof(buf), fp)) { if (*buf == '#') continue; @@ -290,7 +288,6 @@ _gss_load_mech(void) OPTSYM(pname_to_uid); SLIST_INSERT_HEAD(&_gss_mechs, m, gm_link); - count++; continue; bad: From nobody Tue Jun 20 16:29:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXt2llWz4gJbl; Tue, 20 Jun 2023 16:29: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 4QlsXs6nt0z4LZf; Tue, 20 Jun 2023 16:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pWCNnS3ZpU2ipXjwIRPHX8h+H6T/3S2qXYIU1KPsLaA=; b=hCb159q7XCXshcoWYy9nLZ3G+nYEQeV8ARfyv2iHNr9oaGS0VpSi3pU+AGVjRzzjaj1fr4 NZUQ72SfcsbBkJi2UAwzTQKzqodWexUPTauefYs0v9hwPU4xvO6bDv/cVXYXKlBablphf7 MQ3sWFaemMz4fgwca0lC8AYoe91lJQLJBsca6cdV9QokxxgmHIgnWNjegLMau0ie3va44V 8R/wfGlY1D4HlDIUsqFG7YJ49mreBe9YdzSCSwoVPTu74oTtDPOlWwMiN8+87UVaO5rmYu /pyIxFs86y+AJkPCHdvvATm5lzfG7QxJHx21U+UCnOgedyKJ5APDbpxKPc4/pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pWCNnS3ZpU2ipXjwIRPHX8h+H6T/3S2qXYIU1KPsLaA=; b=LF6aK5RAKhu1kRzoOUU0nMg8mG63HoHCyXsBKezBoWnG67NcZxSMV+Z7DFBQ+w8mxMPub+ AGxSa+WikvGq8FvzVqVjUhN3KYwbJuOWUF/P77ESd689YpN8CrLDs3XB3FqIVRKRDNxh2a DO8WjlEmEF1Om1sDD3PxXDmNNAwnhnTUN53oNEj5WRSqqA3WsbF5howyLGYFyvCXCCHTEo 5L4L69f5SHpSyuiti2nX47Uf+2D2kUau3rWw5R6yTtMM3jG8k6Akm/4hOTW7GRV9KpD5VY mRTjAXQeMfvC/BlP8Nadx1vtcteobW67DejpvEh7dE/l+MM4GkiZ2bSimNNtzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278574; a=rsa-sha256; cv=none; b=VHbXjQQd9JLncnufSHuOmAkOGaMPA8CfWw3p0A/dRYziA/Dj+wTPdg6r/dsfpYpxknXHij pH0yH/3ehkGz65uUrd4Q9cg8HEX0aXLhkK9nsxgD/QpIE6f1a5j53Y9r0W510Xp0ZH4EHV 0AFxKeK4GCGjBPKOyo6JbgMLX6Sr0YKzp9JG2iv65quPKb2eTHas36LNrbDoWlHIz0rbb6 e2QTe91aA1FZkFZ0JgW5UfsVzx7ojpfDb/OAgFHqx2Ld9QkJ6bKI9KgzLkgZIjAMLteTYM l+1e9JxGkfH7GpdMXf3HAOmqwB7Qn81Xh7VkuF9tIZqUkKhL3ORv27KdFXAdnA== 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 4QlsXs5dyWz166X; Tue, 20 Jun 2023 16:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTXJH045368; Tue, 20 Jun 2023 16:29:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTXi6045362; Tue, 20 Jun 2023 16:29:33 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:33 GMT Message-Id: <202306201629.35KGTXi6045362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e8f740fbc261 - main - diff: Fully comment out the jackpot variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8f740fbc261b953ea4f22b80846f55c54225710 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e8f740fbc261b953ea4f22b80846f55c54225710 commit e8f740fbc261b953ea4f22b80846f55c54225710 Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 diff: Fully comment out the jackpot variable. This fixes a set but unused warning. --- usr.bin/diff/diffreg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 971f640fa05f..d9b08aece64a 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -682,14 +682,14 @@ unravel(int p) static void check(FILE *f1, FILE *f2, int flags) { - int i, j, jackpot, c, d; + int i, j, /* jackpot, */ c, d; long ctold, ctnew; rewind(f1); rewind(f2); j = 1; ixold[0] = ixnew[0] = 0; - jackpot = 0; + /* jackpot = 0; */ ctold = ctnew = 0; for (i = 1; i <= len[0]; i++) { if (J[i] == 0) { @@ -759,7 +759,7 @@ check(FILE *f1, FILE *f2, int flags) } } if (chrtran(c) != chrtran(d)) { - jackpot++; + /* jackpot++; */ J[i] = 0; if (c != '\n' && c != EOF) ctold += skipline(f1); From nobody Tue Jun 20 16:29:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXv2vcbz4gJjB; Tue, 20 Jun 2023 16:29: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 4QlsXv0dnbz4LgC; Tue, 20 Jun 2023 16:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L3D9u6oY77bmvZO9B+xV0hYFwsKfOYepwukFP0dM8oo=; b=TOOck26Vv/bvPMwGjLTWR31/nON7QasZFtadT9LVVYO+QWoC3+ZIdS6pDrkQuogym+jMgO tJ5okd9sIcSK+V44AVetHKgRUUhSdTGdwGzh8x8IObiHTqh/G57qLGYkffyPE+NWWK/E2M CkCuLGpLrF19+xXo9RuZdNIBRlBj0OGgxCWyFiwO2llr266+LD6gLFthPmx2ZZfkTz3Shj X5iJEDDRIBdy83qB8nXHssyNTjQ/NqLOcnVbDzg6SYt39ySKlcpq1MPl74Mon2YVBveQgz lR3cgncMUdho3C1rnPPbIrX9Uh1Z6w6No1Rkpzvd1q9q6cXqhzD0FnW/fYnPug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L3D9u6oY77bmvZO9B+xV0hYFwsKfOYepwukFP0dM8oo=; b=Au8Nj26U2Gqdxoq2MUGsWBz3U4IVX5dOSlDIQw3EGxGbi8wzXGGG1C7trMw3utSibS+fjV DK8da1BiCC9AyIynWiLTy3IY57zC4+KVaEofyuyyDpIMT/gr8n96UzX5VXHeuF+T+YwGQg gEVMPi7Fq+aNz2MIsqLnMA9QOTnPb8gEUj2XF3lZqi2Z6Tabv+szIVf0hO+8prbV92imxN 6sbgVblRu/1qnouANqjggWGWt9opBiGH69PHNgfHKbCniwM92vBD1t+4dTkaI4FvhFMbDv xIWrpFKgJcka1RDQVWLJ0SyB2QP3gjpYRRL10t7chacVwm1dszJqZc9MtDymuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278575; a=rsa-sha256; cv=none; b=nKBYQNaH664wm0ex5HZ/nYm4IW6dFb4b1fuXc3GumJ3FJwU2w/paisy9RoHJMiNVVqavnt sqgsPluI/EAupwIKb1qYdQ1nZonjIFSDr7/Ifetrn0uIyjLyeqKc9K56t0zDJ0CGSVBWvt 3OQf290uIP8SDXqlQsTqVTZOtr7OiyQ2tVkh+epx6EjN5YaZpzjm8yWCFpMQgl6lDNXae5 +wfQzKREncGcK9QsuwM6l+pNDMTdfS/cpCcFnyvrJnwXMe8ZrRMG5dL3nYgJ1bDIHtsSSM EghShuQ7cqi0K+2lI8+pgXnDOCJuG3JWdixJ4lAINI23DKY8msqGuwQLLl8hlA== 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 4QlsXt6lMkz15qd; Tue, 20 Jun 2023 16:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTY6g045391; Tue, 20 Jun 2023 16:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTYGv045390; Tue, 20 Jun 2023 16:29:34 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:34 GMT Message-Id: <202306201629.35KGTYGv045390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 660d6c5c3d63 - main - procstat: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 660d6c5c3d639bdb0902b8ca6cb9b3b8d5b8ccd7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=660d6c5c3d639bdb0902b8ca6cb9b3b8d5b8ccd7 commit 660d6c5c3d639bdb0902b8ca6cb9b3b8d5b8ccd7 Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 procstat: Remove set but unused variable. --- usr.bin/procstat/procstat_files.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c index 01b09d54bccd..87995c7602a4 100644 --- a/usr.bin/procstat/procstat_files.c +++ b/usr.bin/procstat/procstat_files.c @@ -267,10 +267,9 @@ width_capability(cap_rights_t *rightsp) static void print_capability(cap_rights_t *rightsp, u_int capwidth) { - u_int count, i, width; + u_int count, i; count = 0; - width = 0; for (i = width_capability(rightsp); i < capwidth; i++) { if (i != 0) xo_emit(" "); @@ -282,9 +281,6 @@ print_capability(cap_rights_t *rightsp, u_int capwidth) if (cap_rights_is_set(rightsp, cap_desc[i].cd_right)) { xo_emit("{D:/%s}{l:capabilities/%s}", count ? "," : "", cap_desc[i].cd_desc); - width += strlen(cap_desc[i].cd_desc); - if (count) - width++; count++; } } From nobody Tue Jun 20 16:29:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXw2rXMz4gJjP; Tue, 20 Jun 2023 16:29: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 4QlsXw1dXCz4Ljt; Tue, 20 Jun 2023 16:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N7ltP23yYwLLg3jBPdPvm477MuHD//bRFy6TwL3v2G4=; b=Hpm/LeNfvlFfMb/Nzd7jRu3iVVEjQohxQVorUzY4mpp8zv1O64Q29aKMbdHFzwy2SjiTIQ ueeGebQR6sVpJtfd9atMKJVwMXFtZztPV41Z03JW4SpqSLyJdAjUrN1pjE0Mayx/VxRBuj X/VEFWxMtaLSSkN4TgcQ1eayqpz2gGGxm3eda7beuJYxySIXtimmvLjD14rnG3EX7V0XOC /IJWxQ+bDKJqDe8AgC6VT0f/lk7kJMJa5+pnPcR32N+vmkL6ee/ykz1VxMI+PeLucDiXMx Yc0AAC4ASvglA85I/GBCuCEu/e/Xizr/7pJhSVTy9ZqSo3Ji/c81WOKhPgd+1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N7ltP23yYwLLg3jBPdPvm477MuHD//bRFy6TwL3v2G4=; b=xdXhzVlkHmKTYeCL4ar7eVteHlgc1lYGD5DkCTw55noD69zdrlIRuI7yHJeDp/EGs1D6Ye c9HH97FNN7sTy91JOUtiAlTXJBtyuYO14PK/fXe5DD1RSNjvKrRPhu/zn8pEI/NdoJThur X4G3PgJ3AbbLtLAt+qJle3uMqGiaDcxbIuHBMly7nbcvGHBoflhp5R+qS/af7qz4cSGMBf 6CaGRu6eIBFVOWmKDMjhhO3MY7XkLYFnnuiwXS1LpVHM6zD98PvR5FSIei7wkeA1e7M/lR ZarGOt+dd5csgMbmxvfDR+BamSTJNbuUgFlIJuQJybyIAW7l4w7PLtPdaHbEMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278576; a=rsa-sha256; cv=none; b=W9dZIyz7GuKUM4NvS7YC2mhr1edWrwcl8pdFJXkcHONTeWwY4vXWUS4CT9UcRNsBDQuka4 WF1cQlNq2GTkNqGAednAzNU+CfTDWlLvAIVFaTI96DHzVsxBuTNkUDebXVFJD6nXj04gUZ cjSPNUfTt44S8oBAdZTIdanGzZG99YT6IXD0NqG4ztT6Pvhws+wI8f6n1vOD9o7/BkW2+z FriHxdpLW7H92DRl89MZBkcy8L02Ca02iKTb0EOEzoaVJxreDpHDW5N/wGwoheqOpakxuT iwMjSFNeUzgyzbeISNHtXAkE01dYFAMHs7p52vAg3ExIIyW/aj37uUi7VgXjKw== 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 4QlsXw0Y7Qz166Y; Tue, 20 Jun 2023 16:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTaGn045416; Tue, 20 Jun 2023 16:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTZS0045415; Tue, 20 Jun 2023 16:29:35 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:35 GMT Message-Id: <202306201629.35KGTZS0045415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 80badfcb70cf - main - iostat: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80badfcb70cf79560951f79245f765c444083e1f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=80badfcb70cf79560951f79245f765c444083e1f commit 80badfcb70cf79560951f79245f765c444083e1f Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 iostat: Remove set but unused variable. --- usr.sbin/iostat/iostat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c index 9140bf10ef07..7c4dcf16e0a5 100644 --- a/usr.sbin/iostat/iostat.c +++ b/usr.sbin/iostat/iostat.c @@ -179,7 +179,7 @@ int main(int argc, char **argv) { int c, i; - int tflag = 0, hflag = 0, cflag = 0, wflag = 0, nflag = 0; + int hflag = 0, cflag = 0, wflag = 0, nflag = 0; int count = 0, waittime = 0; char *memf = NULL, *nlistf = NULL; struct devstat_match *matches; @@ -239,7 +239,6 @@ main(int argc, char **argv) oflag++; break; case 't': - tflag++; if (devstat_buildmatch(optarg, &matches, &num_matches) != 0) errx(1, "%s", devstat_errbuf); From nobody Tue Jun 20 16:29:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlsXx4Lqlz4gJrq; Tue, 20 Jun 2023 16:29: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 4QlsXx2XBjz4Lq0; Tue, 20 Jun 2023 16:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YL7qBSNdYA24JE559kTstu+Sou9Y/mrqLze4D1tngi8=; b=Ec6EycWMaV8Isdt6tANpZdVvmHabRnSylFZ1tFtLL/F6RHRmaQa9h23t+SQub4OuKut7SE tZW8adZQiOxUIOG9VQvXETsoidD3NRaHdlRFEuS04vTjNf0a7EYvpuo461OCg78JhNGw2+ wWGzXB+p5p4/wcYS5IYefrSjjPnTOK9ZWwtKrGgCvsQIMN8XcNnFxPKRxPHjrcESIVY1yk Z1ooEseLMJMz5kR/JmBOPo0PZm5E0rLQtE6wDldKcq8BIeTovtCD8xQ2SMfkcKEs2BnjeR fcEecbHY+j+b6hN4B6vcALps/YQ3jqoqUkuUxIjw+qa5Ld+fCqsb99OTt9bBmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YL7qBSNdYA24JE559kTstu+Sou9Y/mrqLze4D1tngi8=; b=ra6k8ntLMtmOfbsqnOlWltDbzy19+iSV+V57PhfZepaC433NhLRqteT+XnkXtBICKyU83n 6AB8tWrs0XFW23VKdl2a6SnW6cxs9NuhA9I6O6zH/bpk17Day6dEmAP4OlnN2I7/iPj9uN JdQ1/sYhggvUFs9YsKovUOjPRe1qcuSkfboUHmB37Y9KnJVsoohcB5iWQ50RWd8gY5U4LI Cl8gRQ3PUKO0iXM3Zfdgv/Z0CwflPyNZrrirJdcPwSFJHdbNFtAZ3fsi10xXvIpuAwH44W HLtsGIZYrTUXb5JLvZnFRlOXHK17gs5vRnbhKEkFh4GP645VoYzk+T3eq1VvKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278577; a=rsa-sha256; cv=none; b=wI/p4yTXtOESUvY8ZZbSHP4KnP+/Ma+XP9eukc+SLv6NrnFLwx1YAWMX6vAABM59WqOg7t it+HfuQhxAUuwuV2apFqM1TMADReoo2eeRV1JD26YDOGhSSsVB4zJkFg7FEP1i/h+Z7yWx yEdpTr2uP9JgTcEUmubt8Ud365FlQd6PI1CDQNpV+J6xniWuOn7Ilg2ok1x00km+eeOyY/ EPx2ZD9xVuKWIqubPCvsK8p+NSv0wMfYWJ9D9U8jXSq4MLFvwDpxjvYgurme1KZsClmjXe P76iEgYDwyv1nf1FbhVsMvJ17SnNAXl8v3HZK35JlZSjL4VtzNbdZzqgh9udsw== 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 4QlsXx1G3Hz15j0; Tue, 20 Jun 2023 16:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGTbnO045445; Tue, 20 Jun 2023 16:29:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGTb8d045444; Tue, 20 Jun 2023 16:29:37 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:29:37 GMT Message-Id: <202306201629.35KGTb8d045444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: afb001df81b4 - main - bsnmpd snmp_bridge: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afb001df81b4f69a739ee0cead50f71309f03ebb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=afb001df81b4f69a739ee0cead50f71309f03ebb commit afb001df81b4f69a739ee0cead50f71309f03ebb Author: John Baldwin AuthorDate: 2023-06-20 16:29:00 +0000 Commit: John Baldwin CommitDate: 2023-06-20 16:29:00 +0000 bsnmpd snmp_bridge: Remove set but unused variable. --- usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c index f3140097c5ac..57402e6a2847 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c @@ -1223,7 +1223,7 @@ bridge_getinfo_bif_ports(struct bridge_if *bif) int bridge_update_memif(struct bridge_if *bif) { - int added, updated; + int updated; uint32_t i; int32_t buf_len; struct ifbreq *b_req_buf, *b_req; @@ -1234,7 +1234,7 @@ bridge_update_memif(struct bridge_if *bif) if ((buf_len = bridge_port_get_iflist(bif, &b_req_buf)) < 0) return (-1); - added = updated = 0; + updated = 0; #define BP_FOUND 0x01 for (i = 0; i < buf_len / sizeof(struct ifbreq); i++) { @@ -1249,7 +1249,6 @@ bridge_update_memif(struct bridge_if *bif) if ((bp = bridge_port_find(m_if->index, bif)) == NULL && (bp = bridge_new_port(m_if, bif)) != NULL) { bp->status = RowStatus_active; - added++; } if (bp != NULL) { From nobody Tue Jun 20 16:32:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlscb3RQwz4gMfr; Tue, 20 Jun 2023 16:32: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 4Qlscb2t21z3FsB; Tue, 20 Jun 2023 16:32:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBwB8rTRxM2yL7RoY7xxweuxiMTLeaavSRY7aO0b7a8=; b=PcbiwJBRi5JBkYAxAEM2haPJW04mqIvPnPvRSXPgLzHsmPzMqQdu+Z0NwHaVNRiroJSRx/ k09fkbxxzO7UVQewa9XdITstmCeO8vDMDKy/l2p4ckp14TZik21QjViTQHg7rrMQ7v/AHn H5f5gh3CBQIVqst4sVT+TikxvSkXZhNlLh3y+ueO9kEuelDvKLFz0R0GC9n8J6GJ64sNcx VCfKhu1F3ZWB1gZQPSX0xgu5Il6WL10KgAk9fwGa3LNh0v2JKpS1goT8gPnv/8Jnrc7/qq 1QW5Q2/vIiykFocCJNVUf1K2Ce2D5gFFGEd7UOWx2o/qYZhaRscUzVMGdbrkTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687278767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBwB8rTRxM2yL7RoY7xxweuxiMTLeaavSRY7aO0b7a8=; b=oUYNNo9xIJ3Yco4ZjXrIx0ioH1BDCLZ2NpNdQtrFra3UopecDS+j04+snnPZqvGJ3XMTqU affT/BFZpY8rxZC+o2VtpfZpW58xNNefEcfpWR7Kv9VubD3TRSfsqdLtDwvfvuX5E+ZNEV ei2jLyj2Ap8Aie1oiE+izBIXM1rV7mrnO8LHfJskJLeWkuCzR2skFE6DQmandKnhW25kG8 jbQm2XPtNEomCIwX0UPbPaHbp0b7z89Z3GB+RVioLLVlcn/EsEx+13B5TIjLipbvwSlJuH Jgz7y922BCBjvEHPjakP6SjDN8FobKCcANFClu1NUS2bcDBQedH0kGl8SY2L1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687278767; a=rsa-sha256; cv=none; b=JfyKda2ZmqKANt7+T2s8Cl27ScNgsfVKFOyhYX30FUxH0bEOo7AlIKUEGLjbvj+kNr0hfl PKpsRsSaGeWur7Ff7KABYuMvu22CSyUE+jT7/ThrRZ+XvI26a0zxEFHaRdlVx/OT3rhHze Syo2PlkS0foQu+Zf8Wc7wAohYrI9QAiFOCS1tkSfY6OOjNKDhzC1R7OrDUWvlPSmChRClx aNdplQVF2eVlNi6qbrzRaFe+OYwtjXkkoyEnagKLBU2A6Oh2d4LjvR6Yb+XcKPA9UrgA5S bBAUFLaQiUuaZYdrGcWQQ8pEhkw7lavfGwxIkAtgSu4YO4ki+MIHv4NvYiNgoQ== 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 4Qlscb1gQ2z16GH; Tue, 20 Jun 2023 16:32:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KGWlDG061007; Tue, 20 Jun 2023 16:32:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KGWl69061006; Tue, 20 Jun 2023 16:32:47 GMT (envelope-from git) Date: Tue, 20 Jun 2023 16:32:47 GMT Message-Id: <202306201632.35KGWl69061006@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 05963ea4d130 - main - radix_trie: eliminate iteration in keydiff List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05963ea4d130c39b332ae8b69414e8a894ca81e0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=05963ea4d130c39b332ae8b69414e8a894ca81e0 commit 05963ea4d130c39b332ae8b69414e8a894ca81e0 Author: Doug Moore AuthorDate: 2023-06-20 16:30:29 +0000 Commit: Doug Moore CommitDate: 2023-06-20 16:30:29 +0000 radix_trie: eliminate iteration in keydiff Use flsll(), instead of a loop, to find where two keys differ, and then arithmetic to transform that to a trie level. Approved by: alc, markj Differential Revision: https://reviews.freebsd.org/D40585 --- sys/kern/subr_pctrie.c | 14 ++++++++------ sys/vm/vm_radix.c | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index 9db7dd2b68c6..d4262e32be51 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include /* smr.h depends on struct thread. */ #include @@ -259,21 +260,22 @@ pctrie_addval(struct pctrie_node *node, uint64_t index, uint16_t clev, } /* - * Returns the slot where two keys differ. + * Returns the level where two keys differ. * It cannot accept 2 equal keys. */ static __inline uint16_t pctrie_keydiff(uint64_t index1, uint64_t index2) { - uint16_t clev; KASSERT(index1 != index2, ("%s: passing the same key value %jx", __func__, (uintmax_t)index1)); + CTASSERT(sizeof(long long) >= sizeof(uint64_t)); - index1 ^= index2; - for (clev = PCTRIE_LIMIT;; clev--) - if (pctrie_slot(index1, clev) != 0) - return (clev); + /* + * From the highest-order bit where the indexes differ, + * compute the highest level in the trie where they differ. + */ + return ((flsll(index1 ^ index2) - 1) / PCTRIE_WIDTH); } /* diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 908bc4ec0bd1..836c3652c2c1 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -285,21 +286,22 @@ vm_radix_addpage(struct vm_radix_node *rnode, vm_pindex_t index, uint16_t clev, } /* - * Returns the slot where two keys differ. + * Returns the level where two keys differ. * It cannot accept 2 equal keys. */ static __inline uint16_t vm_radix_keydiff(vm_pindex_t index1, vm_pindex_t index2) { - uint16_t clev; KASSERT(index1 != index2, ("%s: passing the same key value %jx", __func__, (uintmax_t)index1)); + CTASSERT(sizeof(long long) >= sizeof(vm_pindex_t)); - index1 ^= index2; - for (clev = VM_RADIX_LIMIT;; clev--) - if (vm_radix_slot(index1, clev) != 0) - return (clev); + /* + * From the highest-order bit where the indexes differ, + * compute the highest level in the trie where they differ. + */ + return ((flsll(index1 ^ index2) - 1) / VM_RADIX_WIDTH); } /* From nobody Tue Jun 20 19:39:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxlf0703z4gFmR; Tue, 20 Jun 2023 19:39: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 4Qlxld6Gmdz43nK; Tue, 20 Jun 2023 19:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5K3N+KhJQCO+Udv9BdGFLOKgWkM8L4w42P2KYrSaRYc=; b=JgMT5+zSqBpWBJd2/uHSFZS+wU5+R86Xovw1RVI8VzHgRKqEhCK29ArbFcvfB2o9Eva9aX 6q2Ss4D5xqFHzCFdUucECCU3HoHRtaGjNzC+WDWPcFoTddwPtV0x7ecSs+uQiEQsBuJgnB rsp2q+eZNaht10bvlxATGVQr4BzN/jJg8eVuOJBl9FNPjKQhyspG2/lLKJ2OXuaa5fNyms 8TmSgBOj+JKa0T6CNH7SzUA/fr5RGJZCyCf8kqczSiLR5MMKe/k+72VEF6WjPHRQUZxCAp xD3yTEyHK6O+6yoWT56+jnmQUNBtFQmGcyJ/8xhFx4tlMgAf6V80A5TOVq0/8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5K3N+KhJQCO+Udv9BdGFLOKgWkM8L4w42P2KYrSaRYc=; b=lvIEWVXewKvJBxx6cFxhyhQJ5TnI98N3svixUGqHHY6LN9OIVleT/apvvj57hRmp+WQaoY f73C6e8Bl+Z2M0wrLDq/1RiFjmi9Kus4ypEX3FQeY4QL0gYgvxx6UW9hZO32F4UYS1HsTc 4gFtOK7JGJkbcEIFKnJ/QpkM4qbwPakOjYRBV1Ji8UVf7KvRx1Ydtsp1dSRioSEWQl0Gqx XfjHMUrPqasprmUH0xkwSRY7mug6Rk5jqEQrPqow3s9nJVP4XIr0GjKoSSvBQGa2l0a/cB V45jOlewupQahPyIupQC5TwcuBEy+6LvZMfQMwPYuAP41EiP3fQf31OcX/8+zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289949; a=rsa-sha256; cv=none; b=luJnf4nHoEHJe+ZAf1MRr5GzI8CHfPf1p57kyL9CWBjqhxfixapv580+IEzTQjTFCXJTNI 0bAW6vweh3K7x1bG+oCCCkRKTX6RPcj1E2nWXEWziPO9ptOpMQJNnyJKW1/jrX3+w2Bjfd nTgiznUulmAidwHA5/gNlr5Fbnkxew8jeL9D+HUn1Jy8EOg8zdC0a8Tz9pCbPZjvl53FIB bBvR+bDpDwcx1GmvENTez+VV1V7DLENNBKXw3VmbIVlla+5a+O9Bw5WwLJ9Fe1nU9+2Kh/ lLmmjIWhudgkC6pfIV6k7+2VVcvvq7E/mJV/1qmDOgdtMc3ndi5d6liF3JXJpg== 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 4Qlxld5Lmgz1BR3; Tue, 20 Jun 2023 19:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJd9pc058301; Tue, 20 Jun 2023 19:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJd9YS058300; Tue, 20 Jun 2023 19:39:09 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:09 GMT Message-Id: <202306201939.35KJd9YS058300@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b488428efebd - main - pf/libevent: Consistently pass evsignal to sigaction. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b488428efebda411bad0d9d52c62aa38dfba05f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b488428efebda411bad0d9d52c62aa38dfba05f1 commit b488428efebda411bad0d9d52c62aa38dfba05f1 Author: John Baldwin AuthorDate: 2023-06-20 19:31:19 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:31:19 +0000 pf/libevent: Consistently pass evsignal to sigaction. This silences a set but unused warning from GCC. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D40649 --- contrib/pf/libevent/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pf/libevent/signal.c b/contrib/pf/libevent/signal.c index 71bcffcba5b3..240835b93a76 100644 --- a/contrib/pf/libevent/signal.c +++ b/contrib/pf/libevent/signal.c @@ -144,7 +144,7 @@ evsignal_del(struct event *ev) evsignal = EVENT_SIGNAL(ev); - return (sigaction(EVENT_SIGNAL(ev),(struct sigaction *)SIG_DFL, NULL)); + return (sigaction(evsignal, (struct sigaction *)SIG_DFL, NULL)); } static void From nobody Tue Jun 20 19:39:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxlg0qcyz4gFxG; Tue, 20 Jun 2023 19:39: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 4Qlxlg07Ydz43rJ; Tue, 20 Jun 2023 19:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUuqcVZ8mFIKS2NoUpc7nP55oinHK+bcsODIPZztvLc=; b=ortCggdeGAlLrZn3jwBRHEfr9jhIXFe0JLUNRxOyFq6IcVfDsKdMlmwWgt5PLPzxmoJmcN 8mhncBFeSc9hHYzr1Z004GKval1GLXXdT+SAKNcGwDffiDlC1M5XBVzFweG73vIzykQlyX TSE1YR/2TU/lGSLIQoJBljp+T4g/U941GrpeQaYYQFG9koOuS04Lb8CFaGt89vSqe8LTis PbYrN59sR6eE78YIUIDroklqNLmdSUzB5UUtJGH4fACPJ+pD0QAcjD70deRBjDsaft43HB C3qZEcDfYVJnhQLB5qi11OJuMbwJXHfIrqwxh5BM9S4I8Xjlo/ssDTEIeyVJMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUuqcVZ8mFIKS2NoUpc7nP55oinHK+bcsODIPZztvLc=; b=kkaHiAz13pxuCznTQ+7QrO11uL0y4f4q3CCGBNsufwBaWQ6WvlJ97/iiAhB9cOk6temQzH cDoIZYWfsSyokfaFSJiKvUFbXTeTlCC9T584a30JBmpGiklrFueeH4wOdis1Q0062xHcpy jjoUbfiOcuTs0rmby+YDo+RO544nINL5LMo0hLJoCx0hWbdFUnZ4jv4tuZoKb8/ntbJflC 5Gj3Jv7fbTnz1k/ygXqSf96cO3h5hHJeMcYr0eqxfubY/b84lgTTSf2MNDK+sQXG4bJkSC mYUbH0gtYcolMjeXj+T0S9pw6bU2YAz7aoTlyBCBrDiyQ+jaQr+ePY6QQPrF9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289951; a=rsa-sha256; cv=none; b=ezhL4hZ2I7LBHlapdXm8JzKfZF7XlORPNxyk8Q2jo/LGVI4sCV7hdPwUby/7Ks9j6wJbL3 I8W1V8LuZN+a+RLLUnyLim2iNwu/5E9pob7Jt4c+cpIWsaFh7WjEUa0wy7GZmle4yfuxdu X3WAvFKYTyABpm/aHySmHSKAkxQ/H3apLwWgN6BOoaJpkq4k4y/acnS3G5gm929L6VBDMU smLvkYsK95JscmusxAo6kOnOpZPe8sqs4bc9Q3YTyt6iMcVKA9xlH+6FvA7pAUM0xT4dww mPAZHw2RuCUbvMFpxEYjJ0eXHlSJ0AVeFCBDAlrA/qEMDfdF53G/k8Gbz1PLaA== 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 4Qlxlf6Fjsz1BdC; Tue, 20 Jun 2023 19:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJdAKn058327; Tue, 20 Jun 2023 19:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJdA7d058326; Tue, 20 Jun 2023 19:39:10 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:10 GMT Message-Id: <202306201939.35KJdA7d058326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8144db85fe76 - main - libpmc: Define a PMCLOG_SKIP32 helper macro to skip over a 32-bit field. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8144db85fe76264bd9bf9b56133ac5b4d4020835 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8144db85fe76264bd9bf9b56133ac5b4d4020835 commit 8144db85fe76264bd9bf9b56133ac5b4d4020835 Author: John Baldwin AuthorDate: 2023-06-20 19:31:43 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:31:43 +0000 libpmc: Define a PMCLOG_SKIP32 helper macro to skip over a 32-bit field. This replaces a set but unused noop variable with a more explicit macro. Reviewed by: jkoshy, mhorne Differential Revision: https://reviews.freebsd.org/D40651 --- lib/libpmc/pmclog.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c index 92bcb1c2b161..00ab84057be2 100644 --- a/lib/libpmc/pmclog.c +++ b/lib/libpmc/pmclog.c @@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$"); (* ((uint32_t *) &(PS)->ps_saved)) #define PMCLOG_INITIALIZE_READER(LE,A) LE = (uint32_t *) &(A) +#define PMCLOG_SKIP32(LE) (LE)++ #define PMCLOG_READ32(LE,V) do { \ (V) = *(LE)++; \ } while (0) @@ -257,7 +258,7 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, struct pmclog_ev *ev) { int evlen, pathlen; - uint32_t h, *le, npc, noop; + uint32_t h, *le, npc; enum pmclog_parser_state e; struct pmclog_parse_state *ps; struct pmclog_header *ph; @@ -340,13 +341,13 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, case PMCLOG_TYPE_MAP_IN: PMCLOG_GET_PATHLEN(pathlen,evlen,pmclog_map_in); PMCLOG_READ32(le,ev->pl_u.pl_mi.pl_pid); - PMCLOG_READ32(le,noop); + PMCLOG_SKIP32(le); PMCLOG_READADDR(le,ev->pl_u.pl_mi.pl_start); PMCLOG_READSTRING(le, ev->pl_u.pl_mi.pl_pathname, pathlen); break; case PMCLOG_TYPE_MAP_OUT: PMCLOG_READ32(le,ev->pl_u.pl_mo.pl_pid); - PMCLOG_READ32(le,noop); + PMCLOG_SKIP32(le); PMCLOG_READADDR(le,ev->pl_u.pl_mo.pl_start); PMCLOG_READADDR(le,ev->pl_u.pl_mo.pl_end); break; @@ -354,7 +355,7 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, PMCLOG_READ32(le,ev->pl_u.pl_a.pl_pmcid); PMCLOG_READ32(le,ev->pl_u.pl_a.pl_event); PMCLOG_READ32(le,ev->pl_u.pl_a.pl_flags); - PMCLOG_READ32(le,noop); + PMCLOG_SKIP32(le); PMCLOG_READ64(le,ev->pl_u.pl_a.pl_rate); /* @@ -385,7 +386,7 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, PMCLOG_READ32(le,ev->pl_u.pl_ad.pl_pmcid); PMCLOG_READ32(le,ev->pl_u.pl_ad.pl_event); PMCLOG_READ32(le,ev->pl_u.pl_ad.pl_flags); - PMCLOG_READ32(le,noop); + PMCLOG_SKIP32(le); PMCLOG_READSTRING(le,ev->pl_u.pl_ad.pl_evname,PMC_NAME_MAX); break; case PMCLOG_TYPE_PMCATTACH: @@ -431,7 +432,7 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, PMCLOG_READ32(le,ev->pl_u.pl_tc.pl_tid); PMCLOG_READ32(le,ev->pl_u.pl_tc.pl_pid); PMCLOG_READ32(le,ev->pl_u.pl_tc.pl_flags); - PMCLOG_READ32(le,noop); + PMCLOG_SKIP32(le); memcpy(ev->pl_u.pl_tc.pl_tdname, le, MAXCOMLEN+1); break; case PMCLOG_TYPE_THR_EXIT: From nobody Tue Jun 20 19:39:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxlh2HKvz4gFqC; Tue, 20 Jun 2023 19:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlxlh17MCz44Gq; Tue, 20 Jun 2023 19:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mu6Ri7HT9L8tV7EYKKRu/NUm4LmgFFSK7+GTGgiztps=; b=tSAmzvDn3G//o24maLDFfi+QqLcSs7Ats6d4UpMudNdEfDTSUku2/tbdp49oT/AbSzeL5Z cAXGuwSx5+61XTumjVrJWdY9zTaOAdb0/k1C0PfGBaaK6IRO+q9Vv//ybGA71Nk6UCJiSJ SiJGuC1AXiUUuRBvHP29XIlMlJ8ro4iZ89pLzd8aNg5U0iM2BHvJbganOGPj64bFCdFu4r eTBswGg8wen2z4LV8Wd/RNCV1C358ezT70b84M1uIStHTIutv/FNi0togPJT8moX8RSJe2 BUkALBurBhxOKP/+M/6oCdoxQefaAhOYG+rBfV0O8zm1+F7NrKYEZtjgCYz9nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mu6Ri7HT9L8tV7EYKKRu/NUm4LmgFFSK7+GTGgiztps=; b=hhk29AFl23MzLr8uquOWA/Zb4tHhD30EMTLcpsSOA2K99RWfH6c4Y9Zi3FlcK3w6SnzD3U pEFYiAlArq+2NOUvuL02PjqWLCNCwNc3zov3hpSRGIy/Jrt6waiKfMZXhXKitTbJ8wKUnL Vk7ML/cX3TXti8IXJ6LXHF4isXxZfeB8E0oJ+AkWWQluXY5BOYauiQAvCqfGV2IVhpfk9w 1AWvaQddIHF3jd6bHbUNncUG0k9Wr6KPdDpgAdnQTCIxFulxolAf6aW58y0ycXz1BA8mlE ns+9jCYNzKunYkxQKopUKn7QAoFAGZCdvZv6Ay8Rf5WpPBbfxsvirc5UjwOkYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289952; a=rsa-sha256; cv=none; b=fGFZQ8ANSEorM54Euc1AiQody2fwIr1NVz7VXL3i/QevowqEzwaX0Oc8GkW99jUqGdFwaO N9oeG9UHBqWGVKrp3IbjQxElS1b41VHnv5ADybqHahtDwuIYgoVCHu8C1mpeF2DvtXGqGy qmDNPh/KpfMQAyXRrpfTNes3vY66scCONL73rukCvcWJeIq82+PUZsfzxXJ+ICnt2HFI6l JhfLCOhb97AHJcWyORBonOvOxI05Vk3Ftzzhc3/ghLhw2xG2qwqjmR+YN0ME3uuPFHpD6K Nob+fWD42uEnGLfXVc4fEP/vkFDGByM+xpO6IaItwfcRqmeCjjaV1l80Qbt3dw== 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 4Qlxlh07knz1B68; Tue, 20 Jun 2023 19:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJdBHp058351; Tue, 20 Jun 2023 19:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJdBXi058350; Tue, 20 Jun 2023 19:39:11 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:11 GMT Message-Id: <202306201939.35KJdBXi058350@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9a55543f8eb5 - main - mt: Remove a set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a55543f8eb5d40120b06bf806d60efbc0ceee5b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9a55543f8eb5d40120b06bf806d60efbc0ceee5b commit 9a55543f8eb5d40120b06bf806d60efbc0ceee5b Author: John Baldwin AuthorDate: 2023-06-20 19:32:18 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:32:18 +0000 mt: Remove a set but unused variable. The variable is unused because the -v (verbose) flag to 'mt getdensity' is a no-op. Reported by: GCC Reviewed by: ken Differential Revision: https://reviews.freebsd.org/D40653 --- usr.bin/mt/mt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c index a053cdd92132..89b86a6c1d3b 100644 --- a/usr.bin/mt/mt.c +++ b/usr.bin/mt/mt.c @@ -1555,14 +1555,14 @@ mt_getdensity(int argc, char **argv, char *xml_str, struct mt_status_data *status_data) { int retval = 0; - int verbose = 0, xml_dump = 0; + int xml_dump = 0; struct mt_status_entry *density_root = NULL; int c; while ((c = getopt(argc, argv, "vx")) != -1) { switch (c) { case 'v': - verbose = 1; + /* Ignore. */ break; case 'x': xml_dump = 1; From nobody Tue Jun 20 19:39:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxlj3f5Dz4gFqJ; Tue, 20 Jun 2023 19:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlxlj1Z8hz44PF; Tue, 20 Jun 2023 19:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHwzwZTny2XNOgBAFCnyy6wxQurJn35u6Rq4a5feefE=; b=yINUq7lUiWIlqSeh0ID1847/5ybDFSW283Hgxyg0+pQJGsJwdpWrkV8CnBc5QQf/BJQHQR 4Kh/fThwiSQfHKJUOhb8hYFIy8BBfdwIwlUuFiGQgWOKVy8Hfb3E7vD7/4+vp2VElxPgJk 3Zgzek9Mjy04DyRp7N8M3Lu2fcC89rwO75vDHKlhQn1xJ14YIyV3aU5WGg0MvGu9Hz39Du biJBHX8gwMW1bolP0BExZR6zDUc732jkvOk5BiGrUtby9iIgVUoz8o17mOW12L1SnSOc8L hL2VTWZa5teuXXEcxAeAfTlj8kXejH21uAXXcbCEdYzj5Oe0OpDiGUFt/XdrSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHwzwZTny2XNOgBAFCnyy6wxQurJn35u6Rq4a5feefE=; b=SWVdgReRVhDMKRDk3nr3Lp7StuZBINVZCp+9gAYhfD5fkqmRcxacC4EOjv8/1GaDTbCqQ/ 8K9uRQPDKFCmJVIsO+MJ+jK7tsR/FNsMieB4kRAbU7LUOtlggJYTJraXpEV3TruNMpym2/ Y8p/V/1c+CWy1GDBa1m5/FWt78wXihXOtq+I040ORNApwX8JaYESQPedeK739DFSJJbQGX WE4u1ZkNxpMO2n2ZPDCrUTngEqe64AKd2DhzKmuiNlNflgtTgZ5wOpYJYoP9UoKEP5IT1v +MF0ZM7lRv/IUWPzcT8CVvhRTyM+Wlv34L3O5q38MmoWj/bwXGxljcoC52QWoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289953; a=rsa-sha256; cv=none; b=SJRCTdasXr36T916vm1qFgXdCvECy4FutL9jdt5a9TaQ3uG6XtNTNqjD5sJobUh0321ARf UPdrUJuLoWMqshLY/iFI5vSsv7aBZBprC4HWuw/MM/TVUhHLPObXL43+ldDnmBPBklCrTn 9b42ZOXuKM0y25NI78eZWBl+/fjCMkeriSFmqxA2ET260YzRER0WT/30CBKWct0Dhzu15O +AFwT5wY3Iu4RKoNbuq4ozwg0m7YU+U0QYNszq/R9BEXy1fxZyFbvHLL2y+MQrePo0uq4Y +M09mEpIs7L8XfZKqFt7zuHaqYwmfwtCmgOoQVohF/0UmAri6yBSgmt6tcGk2Q== 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 4Qlxlj0gpwz1BdD; Tue, 20 Jun 2023 19:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJdDw5058370; Tue, 20 Jun 2023 19:39:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJdC4n058369; Tue, 20 Jun 2023 19:39:12 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:12 GMT Message-Id: <202306201939.35KJdC4n058369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 52642de03bb1 - main - camdd: Remove set but unused variables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52642de03bb11f0356ff085c01cedc3ac38e7476 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=52642de03bb11f0356ff085c01cedc3ac38e7476 commit 52642de03bb11f0356ff085c01cedc3ac38e7476 Author: John Baldwin AuthorDate: 2023-06-20 19:32:57 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:32:57 +0000 camdd: Remove set but unused variables. Reported by: GCC Reviewed by: ken Differential Revision: https://reviews.freebsd.org/D40655 --- usr.sbin/camdd/camdd.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c index caf06ba9a596..f6c4baff763c 100644 --- a/usr.sbin/camdd/camdd.c +++ b/usr.sbin/camdd/camdd.c @@ -2748,12 +2748,9 @@ bailout: int camdd_get_next_lba_len(struct camdd_dev *dev, uint64_t *lba, ssize_t *len) { - struct camdd_dev_pass *pass_dev; uint32_t num_blocks; int retval = 0; - pass_dev = &dev->dev_spec.pass; - *lba = dev->next_io_pos_bytes / dev->sector_size; *len = dev->blocksize; num_blocks = *len / dev->sector_size; @@ -2810,15 +2807,11 @@ camdd_queue(struct camdd_dev *dev, struct camdd_buf *read_buf) { struct camdd_buf *buf = NULL; struct camdd_buf_data *data; - struct camdd_dev_pass *pass_dev; size_t new_len; struct camdd_buf_data *rb_data; int is_write = dev->write_dev; int eof_flush_needed = 0; int retval = 0; - int error; - - pass_dev = &dev->dev_spec.pass; /* * If we've gotten EOF or our partner has, we should not continue @@ -2839,7 +2832,7 @@ camdd_queue(struct camdd_dev *dev, struct camdd_buf *read_buf) if (is_write) { read_buf->status = CAMDD_STATUS_EOF; - error = camdd_complete_peer_buf(dev, read_buf); + camdd_complete_peer_buf(dev, read_buf); } goto bailout; } @@ -2908,7 +2901,7 @@ camdd_queue(struct camdd_dev *dev, struct camdd_buf *read_buf) if (len == 0) { dev->flags |= CAMDD_DEV_FLAG_EOF; - error = camdd_complete_peer_buf(dev, read_buf); + camdd_complete_peer_buf(dev, read_buf); goto bailout; } } From nobody Tue Jun 20 19:39:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxlk32tlz4gG1G; Tue, 20 Jun 2023 19:39: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 4Qlxlk29D0z44Pp; Tue, 20 Jun 2023 19:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pi+jt5c1dyWT1x0ue6OXAtd0hhlh6aeVA8kwSeFLdSQ=; b=YneZ8LYv7cfl115NJAXGmU/42b2jlRFwQSUmEZx47CrCP37XzWGnwU3VQXV4nH9X9df9N4 bzgk1WelOOTUdHVclSFW9nV5lodyve90UJVaxWG9S5fsGrXsw5DnFXQlWfE5RzkSSuZZ8Y qb51W+TP8cnvHJCqq67sKH6X5qKKwsVlBl0+9TsCbYkq/rPg60OzusujM0aWbHLavtAJq5 TI7WcNAGqTUf+g+YYIiTv9sVgzPsBi+VDHUP2KnsT0E/oOLCbtbVVFla1e+YkbzytY9bp8 JOeoHVY1D4hDLUYpmaU+AhSTuI0ahqO0gKL4D6fci1CZjJ2x/iyqO9HZil6flA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pi+jt5c1dyWT1x0ue6OXAtd0hhlh6aeVA8kwSeFLdSQ=; b=hA5pJPqPki6tvbOqcr3d384o+44OU2pLnG8vriUe/9gP2z2K4c0HhTv9WRpop6yVZQR13j fTQ3xWj7VQEnbnUIZENkOv1b9uqVgP78OTCdTzMqWnfYQKmvIFZjg+6VD4tLgnsUHfPbRb XkuKsW7Uup0R6b2mLWNMQrIuHzbZvajxfkbkLm1znJtidv8ewKee/CRSTZGwNINZnOYHW4 7+7HpsS/7kY6OWSo+kO8PzlBmIz30FTCoiGTA+wX5S1pitBDSjO+TPDHUTrhnzLgBS2yC9 H9ZAr0rZ3CT2ysoQuhlTvd9ldSsC9SrsRMIPFYI/WgwCDUw6Tlw64qq/2l4jkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289954; a=rsa-sha256; cv=none; b=XbdUZ4xcJUuFzNd4qbP2CRMeSe5TwMkyffyW7aPn4XhQa2lsSWifsFtf5AXQBXYUNgkA8L rx+At+kJ9yEHpDQ4w0hc5pwJwUON7qO0mckva4jp0JYJyIT7N2Z53wVrnW4bdAuHrkP/TX 4BxS3ZR+NZzw0LknhqL3oSTBc8xuCTDTgNAV5mwmMZ4kCjrma9fUNSHOedHhVgaL8jMbau nKVM/bn6OV2O4hYz8XxrjDJKfpV/csMYtBA5ikLyjLNhSu7fbsNJkwbaR1y0TjAiBcUasv bMXSpy/4YGOF3E5HT/LX1Qml5pCN9OytaXxzJyX/aW9InTRTJ9oUM9NzB3g/Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qlxlk1FbXz1BtK; Tue, 20 Jun 2023 19:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJdEF3058389; Tue, 20 Jun 2023 19:39:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJdEnA058388; Tue, 20 Jun 2023 19:39:14 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:14 GMT Message-Id: <202306201939.35KJdEnA058388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e65868ddd438 - main - acpidump: Remove set but unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e65868ddd4383eca7bfb1a180d1e87cd568df984 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e65868ddd4383eca7bfb1a180d1e87cd568df984 commit e65868ddd4383eca7bfb1a180d1e87cd568df984 Author: John Baldwin AuthorDate: 2023-06-20 19:33:37 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:33:37 +0000 acpidump: Remove set but unused variable. ACPICA's table dumper doesn't try to dump this subtable's contents either. Reported by: GCC Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40657 --- usr.sbin/acpi/acpidump/acpi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index a70d83ccbd41..1faff4a40877 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1583,7 +1583,6 @@ acpi_print_nfit(ACPI_NFIT_HEADER *nfit) ACPI_NFIT_SYSTEM_ADDRESS *sysaddr; ACPI_NFIT_MEMORY_MAP *mmap; ACPI_NFIT_INTERLEAVE *ileave; - ACPI_NFIT_SMBIOS *smbios; ACPI_NFIT_CONTROL_REGION *ctlreg; ACPI_NFIT_DATA_REGION *datareg; ACPI_NFIT_FLUSH_ADDRESS *fladdr; @@ -1661,7 +1660,6 @@ acpi_print_nfit(ACPI_NFIT_HEADER *nfit) } break; case ACPI_NFIT_TYPE_SMBIOS: - smbios = (ACPI_NFIT_SMBIOS *)nfit; /* XXX smbios->Data[x] output is not supported */ break; case ACPI_NFIT_TYPE_CONTROL_REGION: From nobody Tue Jun 20 19:39:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxll3gGRz4gFxZ; Tue, 20 Jun 2023 19:39: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 4Qlxll2zPtz44Z2; Tue, 20 Jun 2023 19:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0WqDB2q6dgCxoLV/2PHfvA3FreTtct9SVNzVEWHOa4=; b=WmIu0DmoEh4Vjumdn8exzXmHY81ExmVds5FDjoVhW/jz8Y8/WKet9QDPk7F5h3aeEwG1SZ LtCWYTc1nTkOHTEmncNmIN15CUpHoGtHXEBNocH3A/l5aM9tYQfZpVfHbiBfMaHE8fGoNj 0sJGZFNoMIG2gx7Fb3Njg3Mh6V3bQBw3UWmi1JULXehDLMzBo55wvDEIl19Ts3dEsJsJbd U6kjro0xp5m8i8EgXwjDh80CtAR2M8d+9zH2CAc99m0+gs+PyesCpW6neDSMNzKSO2Bl1k CHLouqOzY7UZXsgVzZURCTFHgYN9KBvnCT2oQekc2ohRWJR6p9MRzI2b7+Xytg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0WqDB2q6dgCxoLV/2PHfvA3FreTtct9SVNzVEWHOa4=; b=Qfz7PLiz1WmuCHZHNPDkTjtX4KK1ve06eNG46yo+Wxk84P3jkcynsChWhaBMHYIvyYW437 PkQUqIhPcN3a2V79/NnW+mumQwqt/D1harcPm1VGfC6gWQtZ6wNwImtoYk83Ixuxu0+btR M1tSymwoE03VkiJEyjZvZ8NsPrIOZgSgKiBFSpnR98W+MTepBzh7+4ZBLLxPpBFYWCPZv6 xCCLb/aPYtAMs9BCxL7HUXnLvNCISXsfRJq91W8m5FJ5qzlgb4+fxdY1RPceSyWNg0nUT8 +/2fZ5AUFqesNQrF39YJDJD/9ZjgbEK0dfdY/vbDr3OGDakakkQ0SGZTQoQeKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289955; a=rsa-sha256; cv=none; b=aKQWZZO4AYJMuxxHgSkM5aoKB8LGqzgaAMkL7iligdFvCEKr4fg+NaG2X+uTrvgpNa90nu ckIBS6BnfblHVjg39Ny0JdDlDWwouQPLpzVPQR7v8x5h7iOq0IJJ5/5ZZgUVbujXYMpWXf Srs3qHjwomA0UUL4M/ILk5QVA7jRF/ZRbiy5pxr3riopXQLLCF5fT0Pc2DX4Y/si58/UFb lq9aTC0PQpO4SxGII/Q2xRxov5x3FBMaySug6njgRKeuC9IU5fcEnFZbrzpfrivCpPZ+J4 D3T53OMEJ698mwFXM75v9hTwGE1l4swKsU1qLouLmGLkRBUMxm2ynBmQ4I17iA== 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 4Qlxll257yz1BdF; Tue, 20 Jun 2023 19:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJdFV8058410; Tue, 20 Jun 2023 19:39:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJdFcQ058409; Tue, 20 Jun 2023 19:39:15 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:15 GMT Message-Id: <202306201939.35KJdFcQ058409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 062de1c5df0b - main - tests/fusefs: Suppress false warning from GCC. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 062de1c5df0ba9b9e9b703e649a9b48faa44b198 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=062de1c5df0ba9b9e9b703e649a9b48faa44b198 commit 062de1c5df0ba9b9e9b703e649a9b48faa44b198 Author: John Baldwin AuthorDate: 2023-06-20 19:34:39 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:34:39 +0000 tests/fusefs: Suppress false warning from GCC. GCC complains that DNAME in the inval_entry_below_root test is not used, but EXPECT_LOOKUP() does pass DNAME to strcmp in an internal lambda function. Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D40661 --- tests/sys/fs/fusefs/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile index df3753967603..9938e5cf2a54 100644 --- a/tests/sys/fs/fusefs/Makefile +++ b/tests/sys/fs/fusefs/Makefile @@ -80,7 +80,9 @@ CXXWARNFLAGS.readdir.cc+= -Wno-cast-align .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 80000 CXXWARNFLAGS+= -Wno-class-memaccess .endif -# Supress warnings about deprecated implicit copy constructors in gtest. +# Suppress false warning about set but unused DNAME in inval_entry_below_root +CXXWARNFLAGS.gcc+= -Wno-unused-but-set-variable +# Suppress warnings about deprecated implicit copy constructors in gtest. CXXWARNFLAGS+= -Wno-deprecated-copy CXXFLAGS+= -I${SRCTOP}/tests CXXFLAGS+= -I${FUSEFS} From nobody Tue Jun 20 19:39:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxlm4k4Lz4gFl4; Tue, 20 Jun 2023 19:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlxlm44dMz44WP; Tue, 20 Jun 2023 19:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OwZqFcX9LtBJvY4Hiw+Sxkh6n9UF8Pgy8nKSaNyisnA=; b=RT9Cqew+c9ZWRhhNOy9lCGc3qtM3bvrOthiH3pBSq8YFYmOh13KQiRtZk6bYeTwk/5wbKc poST33NU8LJHQAK9EI5OgBLjCCJIkM7QPv2mGWN0LUf9sTjZuTKvhBW8KkcyI8SZHctkMS UmQVARQjmOS2NW4y7XK2DKXbkrfw1mhrUdC5wNUhac4Gdqg9yk3B5ayj3Se5xCpOOUvelT BFMKrjaiiPNFKuZCB7heH0Kkg7G8BCXRN5JSgx7ug6tjwwrzEsiXwvUwymmI8DYHSABUsm OckBE5dcQFQGfTBeggUmOPv2ybkc9u10DzKCPZ1KtYpUpnqsu5ee8dui7B8p8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OwZqFcX9LtBJvY4Hiw+Sxkh6n9UF8Pgy8nKSaNyisnA=; b=mmhL2eUeE+O+lgkBcYFvHb0wOVHDVwhihNC3ebxjCY305y6sXsJ7lcWLnjU8/TfxOV6yKz bm0UmUbP30KV2qbeQQvSVs+dxwpM60kC/Fy4RgcxuInw1GyE6odBCnaP21jIxn0Fk/IFmy NOIr+qsgVPko4g7wz/wix2DPCbuEFjKKt/w2nvHCj6/Lxts2r5dH/48/AhggGXuk1gUSTl FWAX7tP/ZNEUqYScU7idBcgtky1thc0YE0Q9n5ovUdKJZDajTqNh4k90MjBjcjnHkyFvB+ 4y35prgP7dKXd7S/uP5GkEahSgWeNOGSo15qwEy25N45TESXbXeSU0UN0Do5nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289956; a=rsa-sha256; cv=none; b=BFwB1yc6FxPggniQfk0IysTGDBUq72LyKfr0SuDpnF0uLmQhaVMPk7sUn4SNOw2Wgfe6mq t/gkfAmY/3wwG4WhMujMMNeWLYPFTu5YgNFc/gBqTGSjs9DuhUtXHaqK/htq8tsYrRdKVu u86MKtQQdbm3iVFPU9vP22rYrVIBfPdVve/7t+a6DyYEWFN9+Fd5UtAOtEUB9iXitwjpLb YAERL6gZoWqjqVAUePmzIsSszAy0xfKg7flvUI168YRnemtH6/raFane65Q0z67m4cX4N+ HT/TwTRSoYeyrcakvNwbNigspqFYOd8P70iIhgooaQykz7lX5Jx74nty1q/09Q== 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 4Qlxlm33pYz1BdG; Tue, 20 Jun 2023 19:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJdGtK058429; Tue, 20 Jun 2023 19:39:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJdGP3058428; Tue, 20 Jun 2023 19:39:16 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:16 GMT Message-Id: <202306201939.35KJdGP3058428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ad79b018dc00 - main - bsd.sys.mk: Add NO_WUNUSED_BUT_SET_VARIABLE helper variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad79b018dc00c2b64e65ebb5c8a14fafa0e99a3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ad79b018dc00c2b64e65ebb5c8a14fafa0e99a3e commit ad79b018dc00c2b64e65ebb5c8a14fafa0e99a3e Author: John Baldwin AuthorDate: 2023-06-20 19:36:15 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:36:15 +0000 bsd.sys.mk: Add NO_WUNUSED_BUT_SET_VARIABLE helper variable. This is already present in sys/conf/kern.mk and can be used to selectively disable -Wunused-but-set-variable. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40663 --- share/mk/bsd.sys.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index b4a417236c65..f3eb1fe99b2f 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -116,6 +116,9 @@ CWARNFLAGS.clang+= -Wno-array-bounds ${COMPILER_TYPE} == "gcc") CWARNFLAGS+= -Wno-misleading-indentation .endif # NO_WMISLEADING_INDENTATION +.if ${COMPILER_VERSION} >= 130000 +NO_WUNUSED_BUT_SET_VARIABLE= -Wno-unused-but-set-variable +.endif .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 140000 NO_WBITWISE_INSTEAD_OF_LOGICAL= -Wno-bitwise-instead-of-logical .endif @@ -124,6 +127,9 @@ NO_WARRAY_PARAMETER= -Wno-array-parameter NO_WSTRICT_PROTOTYPES= -Wno-strict-prototypes NO_WDEPRECATED_NON_PROTOTYPE=-Wno-deprecated-non-prototype .endif +.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 50200 +NO_WUNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable +.endif .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 100100 NO_WZERO_LENGTH_BOUNDS= -Wno-zero-length-bounds .endif From nobody Tue Jun 20 19:39:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxln6kvYz4gFhS; Tue, 20 Jun 2023 19:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlxln4y8Vz44cn; Tue, 20 Jun 2023 19:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZ0kXu0+617qCWFMExeGeHna+7GzSnvPnofaZR8nnkM=; b=WyddaVEP5I4r4j0rsu2RxmYgagmMxPBwNJqkqraJBkqJKBnvQezrPhHOghsnL8icOdfHR5 e5+tP/Xr+cMG0Vh1lbVs2HCRkSlYk0dOYstO6REmuDRfqaSzboW61RjwR3Y1NUt7Fg48ss +Bf/zAxHKDNv0NA/DCkc9hM2oYCMHaXcDlAzDFvlG6Mh1Emal1fwKC4lrhwQ/O0TGsYjSv lzUF5lelfdxz2TdgCpxQRiukbHIaQLXftvsshV7ByKmQGvHUWSN2JV4bRGgqZ+GqgllQZ8 FdK0PCnyZfFJld2t/y8QaJa2B8fdtXdbVTSJAOSPq3DXeTBLs2/ppE8OGdN+eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZ0kXu0+617qCWFMExeGeHna+7GzSnvPnofaZR8nnkM=; b=PgUajv8JEBjDmy7o8LW0KpCj/3G2kpb0e1YN4BpZCXJ64bYRLlXBS61WNbjq3PWhef3Aia zKxN0aeY2oUHmHv7DiRknqdneDrqe+XcFHr0cEsZVMasyDrKHZ0/CP6Sbd6acll+XELDMV V2iPGGfbgumhoWtqRH8PYEsBzrutwzoEboDdp0/ANoFI3x2Y/qxHyp3GVcLMqqYmb747Yf 1QmAB556K9dh1UCVmE6xJt2PvYFvXqB7ZjK6nNN8AkFYLplBBlqUxsvYjVEct3FWKlg1U0 NQPrnTJ+4WdAiiHgJb+Sn6Eu6a66fuJcBmgqF2OBWffa9A13ik+CTy9LvFv0oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289957; a=rsa-sha256; cv=none; b=XB2XkRlEI05W49yg4UYTtIIjdPIYhYoJHWN91gBEiz1MDU041T7SwA07a06SkDRcN3Xoly pvOL4Z9dBI9ht2rAGmhv2/wjEcc0hJuc7iFVxf7KB3lEtj68QIdEAJ3KHkm+vCE8XXctBP m5Zm5ifUD/MDwhXPn4LN4ZFO+SrdZvjUvQvPxMhZ4xhFVMT+F4WBP7Z4ahoBBoSNWx7eIC O+4kIsm6c4ejQmj2VnCxL/ovr3uZ7p7xqUhGD4p3EUaiL1+b4tGTTWnjGK4YJlTnofcxDe rP7GHrl6247Bcq+WY0x6YT/nPFrz2s3AqOT6cRy6S1KejUMN0moCEo0yMejanA== 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 4Qlxln44MHz1BR4; Tue, 20 Jun 2023 19:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJdHsb058454; Tue, 20 Jun 2023 19:39:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJdHmN058453; Tue, 20 Jun 2023 19:39:17 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:17 GMT Message-Id: <202306201939.35KJdHmN058453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f13a7fabfe76 - main - iasl: Disable -Wunused-but-set-variable for a couple of files. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f13a7fabfe7693f061e499a81e4560f33cafbb7d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f13a7fabfe7693f061e499a81e4560f33cafbb7d commit f13a7fabfe7693f061e499a81e4560f33cafbb7d Author: John Baldwin AuthorDate: 2023-06-20 19:36:43 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:36:43 +0000 iasl: Disable -Wunused-but-set-variable for a couple of files. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40669 --- usr.sbin/acpi/iasl/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile index 6b95cc1d7457..3a490962f216 100644 --- a/usr.sbin/acpi/iasl/Makefile +++ b/usr.sbin/acpi/iasl/Makefile @@ -81,6 +81,8 @@ WARNS?= 2 MAN= iasl.8 CFLAGS+= -DACPI_ASL_COMPILER -I. +CWARNFLAGS.aslrestype2s.c= ${NO_WUNUSED_BUT_SET_VARIABLE} +CWARNFLAGS.dmextern.c= ${NO_WUNUSED_BUT_SET_VARIABLE} LFLAGS= -i -s DLFLAGS=-i YFLAGS= -d From nobody Tue Jun 20 19:39:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxlp74gvz4gG3B; Tue, 20 Jun 2023 19:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlxlp6DjCz44X9; Tue, 20 Jun 2023 19:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2PcNziCcu+pIcEMz30brfj2fC6qXkiVPG8Ugoxroy8=; b=SWnYBOQArhHcHOP1lTqfnuYQ8M0KuzaL4MiZmVcd+Kl03+K1LJQBHwurSLnIMSpnWO17PJ QpfxR1PH8gp1sByoq+YsGaNvgw7m0FAinTSYQ1XkBmj2sCuFAwIbMdz4eilQuBuVEMXVEG tdzzXZaFrIHbsvNMS2tjpyaEF3skcri8cfd6VJZ3qiluse8NWEJdjMEvVcbEa+uriLR+7p 5TEzepFmjtf9dPdwgp6ic2XSX/xDszs9S86Ie8GZxwz1U6VmqSK9rwmEt+uPx1fav5XX59 W58blEnYvsnKT0ePE8kEjeHrP8sgmv6QztLUswqcgW1z5vVZAjTalvypYjVDhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2PcNziCcu+pIcEMz30brfj2fC6qXkiVPG8Ugoxroy8=; b=cgMZqxc8lcAGxh/nVGiz7mxYD8Z509TEhs7wU1Dyjpynl289UvmCIaXBVOnG8blY5N+hQ/ n1Qc0sX49tLgNEtBMZrLSNQIzZ578bSfJkdo3HkSLp2SzpL2/eYa05Ll5YwaqQcmpo39RH LWlz/lKvIX9vMvIxbVB9zRT3e1SY3oNoeCGOYhcI6aVyhS6FcKdxErgX+tuHXN1itQvj09 Tjpu8mPXAaA1plBpb79RD6bu1fbei62BHJAvypLeWX76V22Hd/aUmvZBRRFa7NZ7M/lVfg aX8NYwNCOnCo4c8+XL9FG73KlqM9jcfnfO5zgzeriQzBgaoKw+mwxlg7rnShkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289958; a=rsa-sha256; cv=none; b=CNCe+hgD8hjgtT5tLIv6sHUDkb76PRgZYwzBqBvSUQLDUKdIY+Ssep1sj7/srK+yTNtSdE SYjKaobt+n+iA/wEodh+9UJvfJ+JppHUzANY+DRG13yfmdNW7P3FD76GhR7f/PDPfmem6k Ov9PfMX6cz2xbsVuUHU/fJ7h3rKHBsT8uCzw3FAmPufzElJMbnjYQ/7oLXcN8B0z9BabDB Wycdqf8hLcfedJuFM1WIvE+O1eAKDyZ6EGoxQDx8a6MwPoYTtFLCicoJoLWMaeoKNfVSR1 Rv+Fhbr/lpIi3+s8Rwtl75+7ggvz3FKY46hVYx4gvHIGkmg3NO4AaMlIG1ITAg== 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 4Qlxlp5511z1BdH; Tue, 20 Jun 2023 19:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJdIC1058473; Tue, 20 Jun 2023 19:39:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJdIik058472; Tue, 20 Jun 2023 19:39:18 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:18 GMT Message-Id: <202306201939.35KJdIik058472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3456659866b6 - main - jail: Mute -Wunused-but-set-variable for yynerrs. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3456659866b6fffddbb43e0b7fd1e0bf67761d73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3456659866b6fffddbb43e0b7fd1e0bf67761d73 commit 3456659866b6fffddbb43e0b7fd1e0bf67761d73 Author: John Baldwin AuthorDate: 2023-06-20 19:38:20 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:38:20 +0000 jail: Mute -Wunused-but-set-variable for yynerrs. This is in the generated parser when using %pure-parser. y.tab.c:382:14: error: variable 'yynerrs' set but not used [-Werror,-Wunused-but-set-variable] int yynerrs; ^ Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40671 --- usr.sbin/jail/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile index de1e89e708f0..d5ec068ca48b 100644 --- a/usr.sbin/jail/Makefile +++ b/usr.sbin/jail/Makefile @@ -11,6 +11,7 @@ LIBADD= jail kvm util PACKAGE=jail NO_WMISSING_VARIABLE_DECLARATIONS= +CWARNFLAGS.jailparse.c= ${NO_WUNUSED_BUT_SET_VARIABLE} YFLAGS+=-v CFLAGS+=-I. -I${.CURDIR} From nobody Tue Jun 20 19:39:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlxlr0jQBz4gG3M; Tue, 20 Jun 2023 19:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlxlq6r4hz44tV; Tue, 20 Jun 2023 19:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=og+rFJA2etj5onoJcBMUW5ZKh+cL7d7o/V9N/h4CZ+Q=; b=XX2qgI8vMyAvO/MDr2NMcpyMSKYE3oWgCgPL4AyfQxRQeSJc3TAkXViLISyrdKaO6Jx+SY /o7jJvlshFJIaRu2Vy9nbmG3DssQqfyejMTCnrgM7+3eKCeSCMZjx6jq6Mz7bdqP4kr461 8b0KH2mrtd5lo61fRdJ3UZ97/3BiKYbRrWoYf72BDIIJu96//ZdJcqp/Iq0tesD1XpKkGf Ehn+tvmk01rviglz/3W6fyFqzWg5EFdnpjt/+ELS/EPrabzh5lHXIXm/TljRTl/W8Ys90u LcSo97dB0ni/425RqMm6FC3eetbbts/aVaw1UoiXRVVPhAdnUhwNtwsKEklZoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687289960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=og+rFJA2etj5onoJcBMUW5ZKh+cL7d7o/V9N/h4CZ+Q=; b=ZWUygiF/kgMYVeS4uV9ETv55Zu8NBydB4nXVKY4rJXPj0+U5NmnC0fxpRuUpQ9e1/0Cp3q GB/byb5GHtEwM3qr8uajOVU5eJAV8Pf/VslKX24Nc3d28OdXYZ/VM+PMWxq2Szj3BISJhP igm6vhKfmSpyuFHZeeEmFqYojxCW8jh6yWE2zluSBxgizAGsJY6T1awRo+bJmQDEmSG5cf JlJ3t9477LX80RdCAFL21+UIHMd1GC8PxKn4voemhMtubVFQKAsZAUBYfa2fh0DwbDbJ5b Un9beCeJzGMMmrDDYqmuDd0Kd3k7qrEl8AjtSwk0/VtFkAsNAqLy+me8bc/zmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687289960; a=rsa-sha256; cv=none; b=q4DveEV6/M5rhJ+H8m191ne89bocZeoBAoYBWEzqFHA/DzN7vlnoiMjuSYY6lY+ZvWO8IZ Y7SuantNdd+YkZlCxceQ1sYGvAILhgq0xQqjMHHc7NuK8oJnDJWqoRYLYJEnNxihdel3+h TXolTYt7FL7kkzWcCr07ETs422lHk31OYFNdq+mmkz0Teo0XRikjad6WgYJsUTgIcQQWlp kqid28VlYHtJlYgulOzMdVwO65ZRFfLAxc89vUTaanWDvqCPWjj/4euMrAHDNjBUudkOmF wufPrTjNCijKIUzUGeZfGlJfGOTFaAe3i6c8Z+o/YGbJxCrRTP7RtvWqIBZNTA== 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 4Qlxlq5ws3z1Br2; Tue, 20 Jun 2023 19:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KJdJMr058494; Tue, 20 Jun 2023 19:39:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KJdJux058493; Tue, 20 Jun 2023 19:39:19 GMT (envelope-from git) Date: Tue, 20 Jun 2023 19:39:19 GMT Message-Id: <202306201939.35KJdJux058493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 38efd4df23cf - main - rtld-elf: Mark tls_init_align __unused in free_tls for Variant I TLS. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38efd4df23cff3e5722e7fc9094276fcdcff1824 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=38efd4df23cff3e5722e7fc9094276fcdcff1824 commit 38efd4df23cff3e5722e7fc9094276fcdcff1824 Author: John Baldwin AuthorDate: 2023-06-20 19:38:48 +0000 Commit: John Baldwin CommitDate: 2023-06-20 19:38:48 +0000 rtld-elf: Mark tls_init_align __unused in free_tls for Variant I TLS. Some architectures (powerpc and RISC-V) always use 0 for the post TLS size in which case tls_init_align isn't used by calculate_tls_post_size. Use __unused to quiet the warning for these platforms. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40673 --- libexec/rtld-elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 173dcd4e9878..9a522bf721c5 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5309,7 +5309,7 @@ free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused) Elf_Addr *dtv; Elf_Addr tlsstart, tlsend; size_t post_size; - size_t dtvsize, i, tls_init_align; + size_t dtvsize, i, tls_init_align __unused; assert(tcbsize >= TLS_TCB_SIZE); tls_init_align = MAX(obj_main->tlsalign, 1); From nobody Tue Jun 20 20:44:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlzBq6vmrz4gcTH; Tue, 20 Jun 2023 20:44: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 4QlzBq6NSzz3mhb; Tue, 20 Jun 2023 20:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687293859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i9NbLosG0pSSa/hZ4vvb7TSdTu8nDAFWNliJeS/6kQs=; b=C2CVBlTiEpwY9zoCjlfhMNX527S2pzQGmQ4qU/kvgtxj/jTUQ+keb1FAZ467a0cSQDnnlD A52+5Ccv+SmjXlup714a47qnsfBOug/huuF6bQKO8gYd8M8noeGYd75CgHe64dBROUgGB2 xa/njrYgcD84xKMUV10oC5qRbDxBDnVa+6SrGDXI+QFYHXrXz7ti2OYn5m1TQN+cbnWFWP oKZgfGSPq5Wz7S8aHYu+NhkWAekar5ftVGd4ydFTSj/o4Mw+mz7Wn6pM2NZUKg1+3O2E0A VhkLodpX2DXT3Zlp3MLoVOwvHQciPqPlk3byj7P2hdAPS0jFbTgQxZHTZsPONw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687293859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i9NbLosG0pSSa/hZ4vvb7TSdTu8nDAFWNliJeS/6kQs=; b=wdYe8QdGpN7FnZ8GX19SmWrUV0XTjv+PZUj6D+33iHzmoBc0jExVsJxM376nsZjAKh5pdr GOrgPzC8vIxfFhCMj1kX60rVDNDsMnJOIbvLffez74wEjnZik/yB2zWbpgXjntj8QHVupC G0A7gdzqKMgxhBynOCNXMYWnAyucG4gsPw6guI2zmPn8ZFrARYHM9uzhOl2w3vQGxpCAE1 ehS++VX9iDmLlDT/ri0geNk30M+JC5WoLZgBMkUSqyh0oqiPMUjm5/gsv+r3Abc6Z7VN61 SF9EqfefusaiWz+YXzurjwJ32P/bIFaeqbzGM/I0KSyKc4sH2CXPsyyvJao2HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687293859; a=rsa-sha256; cv=none; b=e92wbiKC9XqRQgquNSx/bnFxI1Ad+fvwSp2aWq761M4qI+Ro6WQfoEP5D4m75+SbCqvMlW JqkL9vrI5ovYUTrFVcX0ilNR4C3XOPo0iX5NWS0wrGVRi5QNQRU+zeTcWAssvhsH5rqCl1 AkTesN/zPj+OMiVs1n/mLIWXHWGxDJ85lRRf5XLdbrRoIKjLDcbyqNhxbACPuYJsdP+qZS 5QX938EM1WmeQl9xOGPUtLKkCzLZH0jd9IBDQPlz0T0WXsKYgRkuibW3PPyaVJvtF3NeNZ ycW1/xulwK5cKi6NVtAfUcZzqI3F0rfomBVxbVxiwzUk3r+3C91T5kSNdixX8w== 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 4QlzBq5N0VzDny; Tue, 20 Jun 2023 20:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KKiJOV073485; Tue, 20 Jun 2023 20:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KKiJS8073484; Tue, 20 Jun 2023 20:44:19 GMT (envelope-from git) Date: Tue, 20 Jun 2023 20:44:19 GMT Message-Id: <202306202044.35KKiJS8073484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4bc148c30eff - main - bfe: add unmaintained / deprecation notice List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4bc148c30effe0fc1c21b6bbaee366f239353ac1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4bc148c30effe0fc1c21b6bbaee366f239353ac1 commit 4bc148c30effe0fc1c21b6bbaee366f239353ac1 Author: Ed Maste AuthorDate: 2023-06-20 12:44:22 +0000 Commit: Ed Maste CommitDate: 2023-06-20 20:42:34 +0000 bfe: add unmaintained / deprecation notice The bfe (Broadcom BCM4401 10/100 Ethernet) driver has known bugs and no active maintenance. There have been no changes other than sweeping tree changes, typo corrections etc. since 2008 a far as I can tell. Add a note in the man page so that users expectations are correctly set, and indicate that it may be removed in the future. I did not add a gone_in() call in the driver itself as there is no specific target version for removal, and this driver has evidence of recent use (dmesg, PRs). PR: 201947, 213751 Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40625 --- share/man/man4/bfe.4 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/share/man/man4/bfe.4 b/share/man/man4/bfe.4 index 307813b7ab4f..837eca404241 100644 --- a/share/man/man4/bfe.4 +++ b/share/man/man4/bfe.4 @@ -46,6 +46,13 @@ module at boot time, place the following line in .Bd -literal -offset indent if_bfe_load="YES" .Ed +.Sh DEPRECATION NOTICE +The +.Nm +driver is unmaintained and may be removed from +.Fx +in a future release. +.Fx . .Sh DESCRIPTION The .Nm From nobody Tue Jun 20 20:59:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlzWw2TG3z4flbG; Tue, 20 Jun 2023 20:59: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 4QlzWw1V6Zz3xSc; Tue, 20 Jun 2023 20:59:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687294748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjjGqWHjinSnYW2jVPZUuxhWOBczOq39ZVwNO6LpRM8=; b=JdHV1L6oVLcWVVwl8qjBIQbINfUXNYI8oWe11fSdSjNp9ub/7oaYyeEMr1mNCM2ihHS06+ MzcljArZPsnyOaVSCPj2oujMX31L/wWxR8oQUp8GKEOV3aQbmziexd/gpW4BAcrCW6NdtU 7ozmUdblH8Sc34znyvrrdVyVT0PBDhPpHDKEyB5PZ4g0jPKdJHArg71/UFAK/s404n3Ou9 yedNf4MewzSydnMGvmIXjf5jMma57wN9P5hq2YQkaAgPTvbMJuOJtZWOrLXze5pv9r+k+K H5nn6svKmjBsfNWfEc/srp364nCSxqwu2dxyiJMWFvrP/Lkve3t61OeBLeBZQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687294748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjjGqWHjinSnYW2jVPZUuxhWOBczOq39ZVwNO6LpRM8=; b=fpuTQOHLTah+J4YbV7lbsyDR4d9BW88MR7/Yd+nBXTZ394VNkDQ/93AGB5vleLu+4qV0e8 F4d/dip+4cI10eBOP6DxQVfcltpYotrCZweD7ExjoPz4LCLxXSCzdQh3g/bzB/fT3EaZMX qB6XUW5xxojO3blwbjFnMtmu7M7M4nhxeTTXp/V/4ekQZ4CSmt40tcis7CIa4ZYJIYIzMr wuwC8rFTfjQbvZAQAWfpij3D9Zhae9xl7THD+1akuOH1BhiVfuZztofS8VZGQhfuq6WS5I 87F/O2Y5SUuOFJ5w4xMLQGtKNDtAMHXyfuStdd2YOILfifX/Tb1cdZmNkVyR6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687294748; a=rsa-sha256; cv=none; b=XExqjyPH07iGN0fR1JLExa/rLlyCdTrfsyGr/hT+wH6kpi3q3nw3hAQKg0fXwc3JL2WDXz Q8v5+s7uWfKRiodPcbuYQTTo8bBD3JYARqzL6G2MPOLFxCWtJBm3o/i3u6x/WnXearqSOd +mUEeV7nk2DlzJt4xWUAYmyx98sYQalhd3MMjAxI33mNzemYA2MH0tJk2TW37FJPhU6VLV nScubVIrRQQ81fnWy6naytBIEl7FWwZyaY4BUDjKynmLbc25N0SujlpBsBMM5lvY8vOVvH 5GQ9AhGeZlPvSPPJjkJSk3NL13efDqIeyLwnZw8jbxMdbXfQhDSs38PWibwT5g== 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 4QlzWw0Z3xzDpq; Tue, 20 Jun 2023 20:59:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KKx77m090322; Tue, 20 Jun 2023 20:59:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KKx7Cn090321; Tue, 20 Jun 2023 20:59:07 GMT (envelope-from git) Date: Tue, 20 Jun 2023 20:59:07 GMT Message-Id: <202306202059.35KKx7Cn090321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 824b64a2f1a0 - main - Warn about nonfunctional WITHOUT options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 824b64a2f1a05bd1a6176719f2d4c1a2e16d6d08 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=824b64a2f1a05bd1a6176719f2d4c1a2e16d6d08 commit 824b64a2f1a05bd1a6176719f2d4c1a2e16d6d08 Author: Colin Percival AuthorDate: 2023-06-20 04:42:17 +0000 Commit: Colin Percival CommitDate: 2023-06-20 20:58:58 +0000 Warn about nonfunctional WITHOUT options Print a warning if we try to WITHOUT_ an option which is marked as "required" (and forced on). Suggested by: emaste, imp Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D40613 --- share/mk/bsd.mkopt.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/mk/bsd.mkopt.mk b/share/mk/bsd.mkopt.mk index 33eed9c8bce6..1a4433ea7024 100644 --- a/share/mk/bsd.mkopt.mk +++ b/share/mk/bsd.mkopt.mk @@ -59,6 +59,9 @@ MK_${var}:= yes # step towards removing the options entirely. # .for var in ${__REQUIRED_OPTIONS} +.if defined(WITHOUT_${var}) +.warning WITHOUT_${var} option ignored: it is no longer supported +.endif MK_${var}:= yes .endfor From nobody Tue Jun 20 21:04:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlzdg4hBjz4ftWD; Tue, 20 Jun 2023 21:04: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 4Qlzdg4FSvz421K; Tue, 20 Jun 2023 21:04:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687295047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OiLqvAZfWxdpzEd+fCFmZItFFDE2OsR7Sm/6W9lcIsc=; b=W+fXD3dQ4JFwWrolhnc3gKhRHktWxRjlKgRireOmhDp4B2tnROdwj9h78vjChJy8NgFWGp 5jCGg/zRsG4fnIuq4860XTq0O8bzAAaXT/Vn3XoGiuMBbPIfX2vfM00+8TS0fIwL2SX3sK Q70pvgCHeAtgUQR0tqAZsPqg30pgBPhp78bH5p3hb1iURvsddSvuIkXVr/+rbuhKm6NIdm cJPn1JoKAor3awxMVg+jjO8z2gMFt7xy/ma0WdUpuugJ6LbAvZBXKrCW9EBP0TxtLl/wQk m7YWmSneuUT6YZfvcj1fQiX5Wd4xy1vhjoh5OqKi/5F41avHgzvWmfOjHOkPKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687295047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OiLqvAZfWxdpzEd+fCFmZItFFDE2OsR7Sm/6W9lcIsc=; b=upDw4xNLw8f4SZUvd9jHwNiaik0yl1cZqIkzvRHMhXrlInrkBlMRhw84Lp08UacXZeYS/j mlqTrFiTYwpG8PfqxQDfR5KGJYUYgbnDJqMDOdQCyaJtazXRoxdN9VDlEcfHX2lF0rMGMh yoEF0HCfMT+4EndTwoHzLIIDF/OvlapPLyneSBx2i00vOAq34PwFc+4WzXhL4cBAh9Rzhd 1K1LiRBQNKIRIJcs817ozneyOYgH61lv7/Y3NEcBnZEL4oVi3mbmztFPRRJ+iv9Itap5cA Gjc5DrjBwdgi2PyUs5OECdJo7JLMo+Io3qFejIdzc/5UDGcHutHPyRzxZxDE4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687295047; a=rsa-sha256; cv=none; b=kx8P8/ufHWwxRy1MZTvELw6SeCaYR07KGF07dVDv0lINrVarGnObCo+dyNiq9N+bBr87Wz 4PAdhqGEmi86B7gHTDJzaV+K/up4Y4ai9IqqLRaPmzK9GB8D/gDQoKy66Mhjl/nwDV4KNP EzctfmFvoBSDyyV4o1GPwcEml8XH4V1kEl/XZUnHdZQS2+Ysb2vYwmLFeUHaZvUeEMHYZB 8sgvMAqtVuQeEUH6YOco37CEAultMdIHYdS6LB6DE5A9w9yyjNwDdcAI5yfBdyUfq16KNX sD+t8yRydm8fUbx6ELBTPMOyyNFC5CWd+7pl+9CWBLFmlY1AsFVgp16RXdAzAQ== 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 4Qlzdg3J4hzF6q; Tue, 20 Jun 2023 21:04:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KL476t007222; Tue, 20 Jun 2023 21:04:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KL47a4007221; Tue, 20 Jun 2023 21:04:07 GMT (envelope-from git) Date: Tue, 20 Jun 2023 21:04:07 GMT Message-Id: <202306202104.35KL47a4007221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4a0b57b0b4cb - main - fifolog: Trim some dead code and unused variables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a0b57b0b4cbf7eb848927cf3f493163c3e76142 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4a0b57b0b4cbf7eb848927cf3f493163c3e76142 commit 4a0b57b0b4cbf7eb848927cf3f493163c3e76142 Author: John Baldwin AuthorDate: 2023-06-20 21:03:35 +0000 Commit: John Baldwin CommitDate: 2023-06-20 21:03:35 +0000 fifolog: Trim some dead code and unused variables. The gmt_ptr and gmt variables are not used, so the call to gmtime can be removed entirely. In addition, there isn't a need to call localtime twice. Reported by: GCC -Wunused-but-set-variable Reviewed by: phk, emaste Differential Revision: https://reviews.freebsd.org/D40656 --- usr.sbin/fifolog/lib/getdate.y | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/usr.sbin/fifolog/lib/getdate.y b/usr.sbin/fifolog/lib/getdate.y index 8e63e8112993..57f3cb1d46fb 100644 --- a/usr.sbin/fifolog/lib/getdate.y +++ b/usr.sbin/fifolog/lib/getdate.y @@ -818,30 +818,18 @@ yylex(void) time_t get_date(char *p) { - struct tm *tm, gmt; + struct tm *tm; time_t Start; time_t tod; time_t nowtime; - struct tm *gmt_ptr; yyInput = p; (void)time (&nowtime); - gmt_ptr = gmtime (&nowtime); - if (gmt_ptr != NULL) - { - /* Make a copy, in case localtime modifies *tm (I think - that comment now applies to *gmt_ptr, but I am too - lazy to dig into how gmtime and locatime allocate the - structures they return pointers to). */ - gmt = *gmt_ptr; - } - if (! (tm = localtime (&nowtime))) return -1; - tm = localtime(&nowtime); yyYear = tm->tm_year + 1900; yyMonth = tm->tm_mon + 1; yyDay = tm->tm_mday; From nobody Tue Jun 20 21:26:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qm07B0tCMz4gScX; Tue, 20 Jun 2023 21:26: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 4Qm0792XNxz4Jh5; Tue, 20 Jun 2023 21:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687296373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gWsxGSIftF1DOmNuiDIWaEfwXSgoGiQZvpF07G/vqOw=; b=gSRtgeXJG5RnamozXMqP0COOsTKpoq0jeiTXNRv0fvRAZm+3hpkNAcIoVoTIxYqEEJDuht HLhXa6k4VNPLIRejTi+5Jk3YoRZ/BvSwOM/XcUe56nF2jrML26fgQ0ESvfwifXf+vC+Lnj H0Q6SdoNKbyk+wOk2J5qLvMjMGUEdaYJNpX2sRTPigWegGdIYeSuuxGtYNTG3G/oHLv6nx PU9IKwBxaSXQrKVLHOcg2KrXkiRrleaWkF64PmU1olKPf7oHlAuVhejQBihoKuJ84ph2L/ 1kHGihnoiEHIxMVdZn16pd7m5Hcu8lKZwBW/hsh0RePIwIH2YD7KL53LwIcv2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687296373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gWsxGSIftF1DOmNuiDIWaEfwXSgoGiQZvpF07G/vqOw=; b=toTaGdjHm2qS5RwDJh4f5Ki1tfi1YJlOuGmk91RXPbJ/1HVOVuK3+4siPePbAwLysKm4TX iagIyETPg4+rlV5O7wTO1ACvJNldm8PDSL272kztxMDabuuPsQC70sscLNW9fEZ+wO5wxz UFJbVNYFgu0sJWDT54FCL2G+8x8zWNX6D9p11EAO7qTC+PZgnK7WpgCkJ3R5NuN5v6JZPS DdJPhyt9R48v8fvvOStSEanmGR/ILY0bAN4fiyrgrh6HhLSyghsZpo/TDYa/ST3iV+HNu8 I1oNkxNZ7WE0lWeiv+xsNPG4Ak0KsgM+hBOMYhzUv9m3P971F3X3ccgnD3Xk8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687296373; a=rsa-sha256; cv=none; b=KlZo9PjlQQKtd1ilUw37imvpdNFtUfWMmFJpmUmcmioJ6FBisJN8SCD7ZU8eyuc1+XkHEP gdj21ZkhAkmc9xbtj2bShLoWdZSkUmJSVnBimtKbetLcFAcUJS4mLUVN79vS/M4ghypjeX YouMeT4hgC/w8XXWRZdB9X4Fk1Mv92c1H+k1wtwtVPLGNGH5TG4vdU7ls9vgvxlhQoQdqh xsF4k7TTc1HQku4yo3DWzIGMtn33cLXq3kAs34DfvTyfcWiMTq6cr/AUEFNmJivyDqsuab ktjH7owniEYZgTw+TDfek2Ul6uGDtQ6EJez24MtObaQLUcbZVZc2TuGEJbHYuA== 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 4Qm0791ZkLzFhM; Tue, 20 Jun 2023 21:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KLQDsW040316; Tue, 20 Jun 2023 21:26:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KLQDmt040315; Tue, 20 Jun 2023 21:26:13 GMT (envelope-from git) Date: Tue, 20 Jun 2023 21:26:13 GMT Message-Id: <202306202126.35KLQDmt040315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 7ea8d0279805 - main - Update various sys/netinet source files to conform with the style(9) guide on how to label FALLTHOUGH in switch statements. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ea8d02798055068682e80d8791556d3f81bda82 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=7ea8d02798055068682e80d8791556d3f81bda82 commit 7ea8d02798055068682e80d8791556d3f81bda82 Author: Richard Scheffenegger AuthorDate: 2023-06-20 21:23:01 +0000 Commit: Richard Scheffenegger CommitDate: 2023-06-20 21:23:19 +0000 Update various sys/netinet source files to conform with the style(9) guide on how to label FALLTHOUGH in switch statements. No functional chance. Reviewed By: tuexen, cc, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D40622 --- sys/netinet/libalias/alias_sctp.c | 2 +- sys/netinet/sctp_output.c | 2 +- sys/netinet/tcp_ecn.c | 8 ++++---- sys/netinet/tcp_log_buf.c | 2 +- sys/netinet/tcp_stacks/bbr.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netinet/libalias/alias_sctp.c b/sys/netinet/libalias/alias_sctp.c index da59694a4e16..4a9fb0214e2a 100644 --- a/sys/netinet/libalias/alias_sctp.c +++ b/sys/netinet/libalias/alias_sctp.c @@ -1952,7 +1952,7 @@ UP_process(struct libalias *la, int direction, struct sctp_nat_assoc *assoc, str RmGlobalIPAddresses(sm, assoc, direction); break; } - /* fall through to default */ + /* FALLTHROUGH */ default: sctp_ResetTimeOut(la,assoc, SN_U_T(la)); return (SN_NAT_PKT); /* forward packet */ diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index fdea88002194..5b4fbb28e089 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -5041,7 +5041,7 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt, break; case SCTP_HAS_NAT_SUPPORT: *nat_friendly = 1; - /* fall through */ + /* FALLTHROUGH */ case SCTP_PRSCTP_SUPPORTED: if (padded_size != sizeof(struct sctp_paramhdr)) { SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp/nat support %d\n", plen); diff --git a/sys/netinet/tcp_ecn.c b/sys/netinet/tcp_ecn.c index 579c0b407ae1..b0902ec31272 100644 --- a/sys/netinet/tcp_ecn.c +++ b/sys/netinet/tcp_ecn.c @@ -318,10 +318,10 @@ tcp_ecn_input_segment(struct tcpcb *tp, uint16_t thflags, int tlen, int pkts, in switch (tcp_ecn_get_ace(thflags)) { case 0b010: /* nonECT SYN or SYN,ACK */ - /* Fallthrough */ + /* FALLTHROUGH */ case 0b011: /* ECT1 SYN or SYN,ACK */ - /* Fallthrough */ + /* FALLTHROUGH */ case 0b100: /* ECT0 SYN or SYN,ACK */ tp->t_scep = 5; @@ -467,9 +467,9 @@ tcp_ecn_syncache_socket(struct tcpcb *tp, struct syncache *sc) tp->t_flags2 |= TF2_ECN_PERMIT; break; case SCF_ACE_N: - /* Fallthrough */ + /* FALLTHROUGH */ case SCF_ACE_0: - /* Fallthrough */ + /* FALLTHROUGH */ case SCF_ACE_1: tp->t_flags2 |= TF2_ACE_PERMIT; tp->t_scep = 5; diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index e0334c69b46f..be15c6735fca 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -1928,7 +1928,7 @@ tcp_log_state_change(struct tcpcb *tp, int state) case TCP_LOG_STATE_CLEAR: while ((log_entry = STAILQ_FIRST(&tp->t_logs)) != NULL) tcp_log_remove_log_head(tp, log_entry); - /* Fall through */ + /* FALLTHROUGH */ case TCP_LOG_STATE_OFF: tp->_t_logstate = TCP_LOG_STATE_OFF; diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 1e8053afc45c..d9952ba6bd14 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -13807,7 +13807,7 @@ nomore: } case EPERM: tp->t_softerror = error; - /* Fall through */ + /* FALLTHROUGH */ case EHOSTDOWN: case EHOSTUNREACH: case ENETDOWN: From nobody Tue Jun 20 21:54:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qm0lK1fHbz4fyGR; Tue, 20 Jun 2023 21:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qm0lK1CSRz3LYY; Tue, 20 Jun 2023 21:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687298045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rH7T4s8p1n6hWoS9CBAR3mO0zj0qWZLCnE6tYWbbH5I=; b=TlnaIIKdQaCsfRvKItd0safZgzjW+czTML5FCUQUOC09LNndyyOFa5HsmAs/8zo2bhmBN/ fZ0z2h621Nrn5iFB/Rlg1rvDGFynG2Hn+yoazWddoIDNE1NdEWx8cpHH/gx/yrCuek4aPp JozTG42MOJZ5fUt+7C850v3TSqfDwKN1S7njcF75emYUpLdgOC3nGPbM6gwp/+H52N7BJb SBRwd9VycuhgGvUFFcl4qnLOPAhPLk+5J/EYY5oIoo7lH85bMkKquJk50w/ZhdohPHJzED 4AB7GkELMJFwc9QSOoy0i8r8j4QowqAb8WWYIrSqiPj2uAw79WAvNp1xa8ew/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687298045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rH7T4s8p1n6hWoS9CBAR3mO0zj0qWZLCnE6tYWbbH5I=; b=a/GaeEcPQ64aelIgPqkyBJAmtVgzMVeuRpMlWfwtMw720q1cxowj93ynlrg43VpN3v/98s QH0ePSCDPCFd1ZpBNeQEFPls4oeV/cu/eB7tnj9b+ndUh6NIBkZWAU805l452PdB3Pxfx4 Hip0ElluBeZoWBfe4Ypjv4xLmZ/txj36k7vQjbJqIfh9S4XYWi5EgoMqor9+OjilSGYyYX 4CHglFhhhaebYsztb+q1x9zkEhpomAaiOl9UuyPGJbZtM5CwPm/6boZk64aHMCz2leGsmk E/QHw+jTJjGyBxT0x68o+wxfotk4baHZbe+5Nz+R4PXHjlBcNrOokmD+FSjIlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687298045; a=rsa-sha256; cv=none; b=GRRo0oDitC2xdw1zx3NB4lX08ufS/JkWRQY0J+he86/lzeDzPeVd4BAFa+l/BVIJn4H1Ns R15P1MTmpOvB4s+87MnzFOjElsZHnX1s/SY/mWnNKHJSq/n2KaVxqjGTtUyPmpKAP/wGfw CEDlafpxpeau8ra7+MyC/npJqZWRhqwaTQbYk055g3wJpHzykbkuQtIl7AeHnya5/DYpQM /7mUhgTx/i8Ldad3dMmHi84Ug1TeNmLB7JBtwJFlv7ek30ggF9hbnOdl9XB/aerU17NOWJ BsOvKI7u6zSZVQO6U2ooTZQmVAyP6apsL053hmpbK6pjWRWCooXPAc0Fnv13pw== 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 4Qm0lK0JSzzGdl; Tue, 20 Jun 2023 21:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KLs4Q5089191; Tue, 20 Jun 2023 21:54:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KLs4gB089190; Tue, 20 Jun 2023 21:54:04 GMT (envelope-from git) Date: Tue, 20 Jun 2023 21:54:04 GMT Message-Id: <202306202154.35KLs4gB089190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 04682968c3f7 - main - tcp: expose AccECN mode and TCP FastOpen (TFO) in TCPI List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04682968c3f7993cf9c07d091c9411d38fb5540b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=04682968c3f7993cf9c07d091c9411d38fb5540b commit 04682968c3f7993cf9c07d091c9411d38fb5540b Author: Richard Scheffenegger AuthorDate: 2023-06-20 21:27:11 +0000 Commit: Richard Scheffenegger CommitDate: 2023-06-20 21:48:56 +0000 tcp: expose AccECN mode and TCP FastOpen (TFO) in TCPI Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D40621 --- sys/netinet/tcp.h | 1 + sys/netinet/tcp_usrreq.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 3c3086eabaf4..dbafc96927b2 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -336,6 +336,7 @@ struct tcphdr { #define TCPI_OPT_ECN 0x08 #define TCPI_OPT_TOE 0x10 #define TCPI_OPT_TFO 0x20 +#define TCPI_OPT_ACE 0x40 /* Maximum length of log ID. */ #define TCP_LOG_ID_LEN 64 diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index a9aee98f1332..629b47f04142 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1556,8 +1556,20 @@ tcp_fill_info(struct tcpcb *tp, struct tcp_info *ti) ti->tcpi_snd_wscale = tp->snd_scale; ti->tcpi_rcv_wscale = tp->rcv_scale; } - if (tp->t_flags2 & (TF2_ECN_PERMIT | TF2_ACE_PERMIT)) - ti->tcpi_options |= TCPI_OPT_ECN; + switch (tp->t_flags2 & (TF2_ECN_PERMIT | TF2_ACE_PERMIT)) { + case TF2_ECN_PERMIT: + ti->tcpi_options |= TCPI_OPT_ECN; + break; + case TF2_ACE_PERMIT: + /* FALLTHROUGH */ + case TF2_ECN_PERMIT | TF2_ACE_PERMIT: + ti->tcpi_options |= TCPI_OPT_ACE; + break; + default: + break; + } + if (IS_FASTOPEN(tp->t_flags)) + ti->tcpi_options |= TCPI_OPT_TFO; ti->tcpi_rto = tp->t_rxtcur * tick; ti->tcpi_last_data_recv = ((uint32_t)ticks - tp->t_rcvtime) * tick; From nobody Tue Jun 20 21:56:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qm0p33KYkz4g26v; Tue, 20 Jun 2023 21:56:27 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qm0p26lTyz3NGZ; Tue, 20 Jun 2023 21:56:26 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x22d.google.com with SMTP id 5614622812f47-3a0457d6b77so196930b6e.0; Tue, 20 Jun 2023 14:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687298184; x=1689890184; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Elg8rC20gYDiErlEWWtuXYbwxhc0hljUX1kXnMrlWsE=; b=VMQhJwQ5E6ZOi23ovGnG+DoIKYjGCu25MMpW+zUpd+i1NdnKUB1BFtbvBeQ3YLbjX+ AtV/JlDzohm+Yyvt4yFR//JViE/L07TT9AWdNv7iF1QUiYAd7/ZNupMmVdlFXKjCJdCQ 6guAAczktHBDjP6BwIwDFqw93IC7MGo/VkaLtvwWSF8mHkHPOXwpiEItWSLepZGt6ZEx n81l1OYyYZaYe9wtIwLayeXtTzJU2W38+x6JRg77i52CZyOb+fFs0s8IEkkYM2TtvZGb dSktqbtBmZV2atEh0I0z1OoBB/h0WylCLjjaRT4M79BQpfWzXvxIKZRX8Q+cZtJ1QV3/ ArOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687298184; x=1689890184; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Elg8rC20gYDiErlEWWtuXYbwxhc0hljUX1kXnMrlWsE=; b=HWcmX7wqfsT6WN46QO563rCs9AGooYUoMXVmv+9BVMtMGcAL0xleLWIlpN7Mr/LCtE 4ugbu4dP2sx9vWPCj29GeOsYgviWOFdADKzT7srFBfyiOhSH74FcVznaIq0DUA1Do69n TnBEEvvaTpDSsMyJyvWV2x97YN6wWLlFgya6ulzE69cevrAIPzA/tQ4pW05EmVX+FQQU CQG+xwcFp3YjIv3MbjPigStBEgdOy84fSPKuRWae7PLtdW80PFTJ821jvJdsHHHLZPHk 2+BvjY1B976zAJ4iF5Dtuup9IWSTM8Kyrtd99JrlB0o8ekhhe8wowTew46Tu+XW0dG0s amKg== X-Gm-Message-State: AC+VfDyyAsbow3zYJd0Lz2+NorvZpDITfx4rXk0JUrQG9n6U6HWtKw5h AlkgFN87CX3CsBkUmvSuY+f8VWVdqi4x4LTjIBpXxMwlvIGTZIezUelnOA== X-Google-Smtp-Source: ACHHUZ5jQhWr3mSNjltYG1Xg+8w3qkGd4Brpvq47N0nKereSUvbsuSJxiFT+nZt6QMp72lnhpOKMCgPsDaCy3ETWtcY= X-Received: by 2002:a05:6808:1797:b0:39e:c9f0:8fde with SMTP id bg23-20020a056808179700b0039ec9f08fdemr6124178oib.19.1687298184512; Tue, 20 Jun 2023 14:56:24 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202306201629.35KGTDxK044992@gitrepo.freebsd.org> In-Reply-To: <202306201629.35KGTDxK044992@gitrepo.freebsd.org> From: Benjamin Kaduk Date: Tue, 20 Jun 2023 14:56:11 -0700 Message-ID: Subject: Re: git: 2e2a1c8ecf63 - main - libgssapi: Remove set but unused variable. To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000eb09cd05fe96b84f" X-Rspamd-Queue-Id: 4Qm0p26lTyz3NGZ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --000000000000eb09cd05fe96b84f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Jun 20, 2023 at 9:29=E2=80=AFAM John Baldwin wrot= e: > The branch main has been updated by jhb: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D2e2a1c8ecf639317f40cdb1c2a0c5b9= abe990e58 > > commit 2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58 > Author: John Baldwin > AuthorDate: 2023-06-20 16:28:59 +0000 > Commit: John Baldwin > CommitDate: 2023-06-20 16:28:59 +0000 > > libgssapi: Remove set but unused variable. > > Reported by: GCC > --- > lib/libgssapi/gss_delete_sec_context.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/lib/libgssapi/gss_delete_sec_context.c > b/lib/libgssapi/gss_delete_sec_context.c > index 930f51399cce..b64e32c5dc2c 100644 > --- a/lib/libgssapi/gss_delete_sec_context.c > +++ b/lib/libgssapi/gss_delete_sec_context.c > @@ -41,7 +41,6 @@ gss_delete_sec_context(OM_uint32 *minor_status, > gss_ctx_id_t *context_handle, > gss_buffer_t output_token) > { > - OM_uint32 major_status; > struct _gss_context *ctx =3D (struct _gss_context *) *context_han= dle; > > if (output_token) > @@ -54,7 +53,7 @@ gss_delete_sec_context(OM_uint32 *minor_status, > * otherwise fake an empty token. > */ > if (ctx->gc_ctx) { > - major_status =3D ctx->gc_mech->gm_delete_sec_cont= ext( > + (void) ctx->gc_mech->gm_delete_sec_context( > Looks like gcc was catching a latent bug here -- if we consult the corresponding heimdal implementation, major_status is initialized to GSS_S_COMPLETE but this assignment can override it, and the function itself returns major_status rather than a hardcoded GSS_S_COMPLETE. -Ben > minor_status, &ctx->gc_ctx, output_token)= ; > } > free(ctx); > > --000000000000eb09cd05fe96b84f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Tue, Jun 20, 2023 at 9:29=E2=80=AFAM J= ohn Baldwin <jhb@freebsd.org> = wrote:
The branch main has been updated by jhb:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58
commit 2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58
Author:=C2=A0 =C2=A0 =C2=A0John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-06-20 16:28:59 +0000
Commit:=C2=A0 =C2=A0 =C2=A0John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-06-20 16:28:59 +0000

=C2=A0 =C2=A0 libgssapi: Remove set but unused variable.

=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 GCC
---
=C2=A0lib/libgssapi/gss_delete_sec_context.c | 3 +--
=C2=A01 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/libgssapi/gss_delete_sec_context.c b/lib/libgssapi/gss_del= ete_sec_context.c
index 930f51399cce..b64e32c5dc2c 100644
--- a/lib/libgssapi/gss_delete_sec_context.c
+++ b/lib/libgssapi/gss_delete_sec_context.c
@@ -41,7 +41,6 @@ gss_delete_sec_context(OM_uint32 *minor_status,
=C2=A0 =C2=A0 =C2=A0gss_ctx_id_t *context_handle,
=C2=A0 =C2=A0 =C2=A0gss_buffer_t output_token)
=C2=A0{
-=C2=A0 =C2=A0 =C2=A0 =C2=A0OM_uint32 major_status;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 struct _gss_context *ctx =3D (struct _gss_conte= xt *) *context_handle;

=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (output_token)
@@ -54,7 +53,7 @@ gss_delete_sec_context(OM_uint32 *minor_status,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* otherwise f= ake an empty token.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (ctx->gc_ctx)= {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0major_status =3D ctx->gc_mech->gm_delete_sec_context(
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0(void) ctx->gc_mech->gm_delete_sec_context(

Looks like gcc was catching a latent bug h= ere -- if we consult the corresponding heimdal implementation, major_status= is initialized to GSS_S_COMPLETE but this assignment can override it, and = the function itself returns major_status rather than a hardcoded GSS_S_COMP= LETE.

-Ben

=C2=A0
=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 minor_status, &ctx->gc_ctx, output_token);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 free(ctx);

--000000000000eb09cd05fe96b84f-- From nobody Tue Jun 20 23:04:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qm2JC1Gf0z4gZ6L; Tue, 20 Jun 2023 23:04:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qm2JC0nvvz4MlC; Tue, 20 Jun 2023 23:04:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687302251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+J086pr9kV0lYsRKMeS+F8nEPQ1jmTZs1x7BVcFP5qQ=; b=bILGCUKs1bRVYy3r/e2Z98KtEKHz7ottTHw6+YBl60rr3MdOGHT2L3vMNx1VjavlOIoAQW cbTkqsaNarVsNhyr+elgwmCvsYQYnW+km+wcCYAdc8b2e4YqRwnzaKOfKpQpUJUMCtMpCj DODgVt+3QXJ2DE6iNzsbhfEaTRwmYtIiyfOSUqhb8os8qDyxvewFpJ7qpjki4MIszt2KuV 7c+qgbz51BOy4CWkui9okXcWVd9J6aKCQ5oRqvlY9vXtsIA9UQt8hHz4pmqa740nTNV9H9 Bm3QaJkWhh9PrKP4MTzCuoTadwU5K5uu4vjnbHj+4BOuJ+9yyFmk32cuQWuOyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687302251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+J086pr9kV0lYsRKMeS+F8nEPQ1jmTZs1x7BVcFP5qQ=; b=scCsPU8C5wyQe01Q8+CCOUqm/Zf61EP1c2jKv5dc4sAX52Z60rqOb/5ir2WpG9RkXmW8AL 76n23GT9xZt1ffyAy7HRdsMq3aXdFY71gj5FdamJEGzX0ld5ysTjyqdanrtorGccNBUu7f GgSvEUItVMTd67fD2VrpdfDUThE2cvkFD7WEoedHiK4DPpZ84BA0hWG+gkgd/cdChsx9bw rTO+quztzfmEVgzNMufSo4VZCtzD9RfItESfZPUHwN8pWOqL7Xwqg5cYw/QsUgItME47Al JDeXAWScXXTJI/4s+Hi5mf2MXjPfVDQNqYkDC13t8nL+47RV08xzRrbQmOSwog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687302251; a=rsa-sha256; cv=none; b=EHmvCeOadlZzbVtZAmvHJ4QC0yQ0tTr+sdAcxoC7ll1xDGp7YVKUhwFsbCVf1TGhiFT3bO ntTWuDg2sSqKKLGIwso4L4JgOM2A1RFyfWwqOkFd2gMU9XGuSRTBkqY7Mwb5yrvJCcNaxP xWNmE72c97SHdJvz3+4UbRmfGVbtW6KfwT5nkW+sHMwpOdC2fvpmtE+u1uWPCX/z1477Qk u1I67FgWuCKgP/r82g6RqK0tdbqgbpyHSH1btzNWGZ7AfaCPFnZ9QzlMIpR745raIBuHqA Yp2XH1I5mvnopU71SuAcB983wweLHc0+F1EtU4HPGDlQTgpgcE3Q+DPdJVRZMA== Received: from [IPV6:2601:648:8680:16b0:f598:bccf:55da:e3b9] (unknown [IPv6:2601:648:8680:16b0:f598:bccf:55da:e3b9]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Qm2JB3Kbsz1B7N; Tue, 20 Jun 2023 23:04:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <86f0e1af-22c6-8b98-fd07-7958094d09ec@FreeBSD.org> Date: Tue, 20 Jun 2023 16:04:08 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: git: 2e2a1c8ecf63 - main - libgssapi: Remove set but unused variable. Content-Language: en-US To: Benjamin Kaduk , Doug Rabson Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202306201629.35KGTDxK044992@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 6/20/23 2:56 PM, Benjamin Kaduk wrote: > On Tue, Jun 20, 2023 at 9:29 AM John Baldwin wrote: > >> The branch main has been updated by jhb: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58 >> >> commit 2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58 >> Author: John Baldwin >> AuthorDate: 2023-06-20 16:28:59 +0000 >> Commit: John Baldwin >> CommitDate: 2023-06-20 16:28:59 +0000 >> >> libgssapi: Remove set but unused variable. >> >> Reported by: GCC >> --- >> lib/libgssapi/gss_delete_sec_context.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/lib/libgssapi/gss_delete_sec_context.c >> b/lib/libgssapi/gss_delete_sec_context.c >> index 930f51399cce..b64e32c5dc2c 100644 >> --- a/lib/libgssapi/gss_delete_sec_context.c >> +++ b/lib/libgssapi/gss_delete_sec_context.c >> @@ -41,7 +41,6 @@ gss_delete_sec_context(OM_uint32 *minor_status, >> gss_ctx_id_t *context_handle, >> gss_buffer_t output_token) >> { >> - OM_uint32 major_status; >> struct _gss_context *ctx = (struct _gss_context *) *context_handle; >> >> if (output_token) >> @@ -54,7 +53,7 @@ gss_delete_sec_context(OM_uint32 *minor_status, >> * otherwise fake an empty token. >> */ >> if (ctx->gc_ctx) { >> - major_status = ctx->gc_mech->gm_delete_sec_context( >> + (void) ctx->gc_mech->gm_delete_sec_context( >> > > Looks like gcc was catching a latent bug here -- if we consult the > corresponding heimdal implementation, major_status is initialized to > GSS_S_COMPLETE but this assignment can override it, and the function itself > returns major_status rather than a hardcoded GSS_S_COMPLETE. I'd be more than happy to have this fixed correctly. I've cc'd the original author (Doug) to see what he thinks. -- John Baldwin From nobody Wed Jun 21 04:54:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmB415JBDz4gqVm; Wed, 21 Jun 2023 04:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmB414sJFz3CgW; Wed, 21 Jun 2023 04:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687323249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vY+qFL8GuPzyBxAQlUB/msPS06Qg7AZw0Q4grbzViE=; b=tYsUZGPdnF3tSSaVwfufL7aikNNhobutdQatrpjtjoWupRz1bfbq8hlzTifVnHg50YbYnX aM2DxYBYrcZoVhEVYmlzy0tqSux7Dnn1gzS1Wbu9EfTiY5CZ6taaSFwM4hbkUnU6PGwd02 0yC/X4ufO8LUwn/awJ8R8Dge8VgsSQCZ2zwihP9aK1/mnLLi+Lxw72QI4anQnxhkMe2+vK PZP5tFde1OG1GjJz7oBV0LohznT9AmyOHU2VHlmBD14h5JI2jQqt4cY/yvxJuUKoAYls3o sztwH9+2VYTw+PQZGNA+evwzPy31DFVnAhxxMREqRVclnRDwuZqHl2uSxyFeXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687323249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vY+qFL8GuPzyBxAQlUB/msPS06Qg7AZw0Q4grbzViE=; b=b/39/O3YzbGpIvOV+imGe0jpTrU36cPpkvxxBoPe01t/Ueo5wTGN3p0yPSs0b76OoJhg6f ads81702TKhjDx8S0d2OthUITCGMfN+EpYZHwhtI/3wfLxaG1yAQpfk8QOel7+f72bQQNL G7jeET3UQfpC6yZ4JFoA4Sji2fRyAlyBQYJLmPE3ynkaCYOB5VdwOkTC8vXpS8dBT21c0J qjGlywbaDXoerpFjotNB8XRe7142M2UZsEdLnL79Hd3IGOl4vYXTWx+0wtWWxc6snvoQyO xE/PdjriIZdj5CVAi3xgQuH+sDp2tIwfeWTsn1rfzv3i4XKAElWmnbSzVO4LZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687323249; a=rsa-sha256; cv=none; b=SW43Rn7bUsdsBGpUMU6vFaU/x9aMYecS32YT16XDdT0Jieiy51OIMUXW7UeXK8ym0LucQE 5JTtq9bOMiNHD4fGk0pfJSR/VLgMsf5oWHXu7Jk8ChWu7QCAIEGa+JoTcG80CdESkzknGr OxUgPSiFl924n8KgisiA1AOAg95TBqQnafMDCx2ZOTNPxn3sQREGZEx47UNSWMl13MbAoS Vbpamo8ekWiqe5Zo4r6i6+Y1BlbiOcgyw76tLOKByXnwm8IFeMT+4yLnarRHpWH4e8rDc5 7giB7c5CcUofivr+buLfkORfaCHnMf7HtsAweOmNENUW8yHRSaqEPDnCo16dZg== 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 4QmB413yWdzTB7; Wed, 21 Jun 2023 04:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L4s9kw080634; Wed, 21 Jun 2023 04:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L4s9cF080633; Wed, 21 Jun 2023 04:54:09 GMT (envelope-from git) Date: Wed, 21 Jun 2023 04:54:09 GMT Message-Id: <202306210454.35L4s9cF080633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 1efa7dbc0798 - main - vm_radix: drop unused function; use bool. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1efa7dbc0798ee883e4e5d7127161032186829e2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=1efa7dbc0798ee883e4e5d7127161032186829e2 commit 1efa7dbc0798ee883e4e5d7127161032186829e2 Author: Doug Moore AuthorDate: 2023-06-21 04:52:27 +0000 Commit: Doug Moore CommitDate: 2023-06-21 04:52:27 +0000 vm_radix: drop unused function; use bool. Replace boolean_t with bool in vm_radix.c. Drop the unused function vm_radix_is_singleton, which is unused and has no corresponding function in subr_pctrie.c. Reviewed by: alc Differential Revision: --- sys/vm/vm_radix.c | 21 +++------------------ sys/vm/vm_radix.h | 3 +-- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 836c3652c2c1..6848f0b2c30e 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -254,7 +254,7 @@ vm_radix_root_store(struct vm_radix *rtree, struct vm_radix_node *rnode, /* * Returns TRUE if the specified radix node is a leaf and FALSE otherwise. */ -static __inline boolean_t +static __inline bool vm_radix_isleaf(struct vm_radix_node *rnode) { @@ -308,7 +308,7 @@ vm_radix_keydiff(vm_pindex_t index1, vm_pindex_t index2) * Returns TRUE if it can be determined that key does not belong to the * specified rnode. Otherwise, returns FALSE. */ -static __inline boolean_t +static __inline bool vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t idx) { @@ -316,7 +316,7 @@ vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t idx) idx = vm_radix_trimkey(idx, rnode->rn_clev + 1); return (idx != rnode->rn_owner); } - return (FALSE); + return (false); } /* @@ -457,21 +457,6 @@ vm_radix_insert(struct vm_radix *rtree, vm_page_t page) return (0); } -/* - * Returns TRUE if the specified radix tree contains a single leaf and FALSE - * otherwise. - */ -boolean_t -vm_radix_is_singleton(struct vm_radix *rtree) -{ - struct vm_radix_node *rnode; - - rnode = vm_radix_root_load(rtree, LOCKED); - if (rnode == NULL) - return (FALSE); - return (vm_radix_isleaf(rnode)); -} - /* * Returns the value stored at the index. If the index is not present, * NULL is returned. diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h index f38956ef305e..b478cf4b734b 100644 --- a/sys/vm/vm_radix.h +++ b/sys/vm/vm_radix.h @@ -39,7 +39,6 @@ int vm_radix_insert(struct vm_radix *rtree, vm_page_t page); void vm_radix_wait(void); -boolean_t vm_radix_is_singleton(struct vm_radix *rtree); vm_page_t vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index); vm_page_t vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index); vm_page_t vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index); @@ -56,7 +55,7 @@ vm_radix_init(struct vm_radix *rtree) rtree->rt_root = 0; } -static __inline boolean_t +static __inline bool vm_radix_is_empty(struct vm_radix *rtree) { From nobody Wed Jun 21 05:24:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmBlS4c8nz4fwtG; Wed, 21 Jun 2023 05:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmBlS49lFz3MMm; Wed, 21 Jun 2023 05:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+9t4oC7bUcK83IehYMQlygd0Zd6Hv2ViffQRQGj7q0o=; b=ZK908aipbwgF/hnhjigZxZN+91AH5KUiODl8YsN15YRgMhgRkdBTyuQ/uMIaIS4wUWWPSU +qNENXGChAtbFAjkKrN9j1Zk+WrhtCfj1bbviI+uS+S2gWH5/zpQB4RuYHVT50PfKIIxR7 SyIi9blDJmQV+rmmEzoAiD+73ogJVQjPAMq5RSNSdmL7zZRnBj+++sxyiLEc4c9LG/c52F kzkqh3FG6SFKUR1HVdn26j4uEeHiu4S/MdWghfwQXocGvB12Dxqx2+gKubc3M1KgeU55fI tfq4muqGTsXqaVOZneGx1nNDRoJbK/xZO7GYCXumbPNBXroeDujdJn3ygTVx+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+9t4oC7bUcK83IehYMQlygd0Zd6Hv2ViffQRQGj7q0o=; b=rr3eTzPxtOTnGP/Xhcl6pJXnjFNEr9Vq6vQzAb5Z0e79f4QjhQ6qzeNreX+EA9D6ZrYaX5 XC24Xr9vzLra38FuvWqagCcSq8hcYBol4KQA8Y8eQXIGSPY++Xx02Ose3XSc18y2kVXk68 DphlHOgetlvFFn8GIFcAQE9jXqoxFWxIBLvWuZl8K3phWkIwfB55Ufz9cfmxsPUXAwjpox rQwo3iG7sAwZ+Q5jBFSPudlPRt7ag2yB2Oap4p71R35m0CsRG66vAPj2hxDcxTe44a32SM irASXEGnP5K27cgJOZTVyjgApIyhJNaw1EBgxTTcSYPsbi44Gjdq+0YFwx6DVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687325092; a=rsa-sha256; cv=none; b=mOno3hqgIlEhqEifLj8p/lDNkFIFA9nIz/zH4SmvIG6BVqP96Djfz45xAIpawNwZEF0ur/ LDf92ifO+MbFvs2cXAGj8oLQzN2c0qBLpd4lNUIa7zq2SV5bLNrDDSIVhqjIJHjMufDCwg rt1IlwPMA8dOFH1mEuig63J3g5O6UOaPSyiwviiBui5160m9ox1i7zcMtrGm8w+t5wWO2D AsAoEf0TLBeEPUfAtybtsOIBS1h0qoE818Me0f+52zeRhyNME8NizW2T4xEkQ41a9eWiAk aKEDV70z0mqpCRX+AtrIstx0NuOYsUTIU0UTp2khOkf1hNcpbYGGXdXQQ+PPNA== 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 4QmBlS3GyPzV9P; Wed, 21 Jun 2023 05:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L5OqRY031021; Wed, 21 Jun 2023 05:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5OqcE031020; Wed, 21 Jun 2023 05:24:52 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:24:52 GMT Message-Id: <202306210524.35L5OqcE031020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Tetlow Subject: git: 813847e49e35 - main - pam_krb5: Fix spoofing vulnerability List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 813847e49e35439ba5d7bf16034b0691312068a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=813847e49e35439ba5d7bf16034b0691312068a4 commit 813847e49e35439ba5d7bf16034b0691312068a4 Author: Cy Schubert AuthorDate: 2023-05-31 19:20:27 +0000 Commit: Gordon Tetlow CommitDate: 2023-06-21 05:19:47 +0000 pam_krb5: Fix spoofing vulnerability An adversary on the network can log in via ssh as any user by spoofing the KDC. When the machine has a keytab installed the keytab is used to verify the service ticket. However, without a keytab there is no way for pam_krb5 to verify the KDC's response and get a TGT with the password. If both the password _and_ the KDC are controlled by an adversary, the adversary can provide a password that the adversary's spoofed KDC will return a valid tgt for. Currently, without a keytab, pam_krb5 is vulnerable to this attack. Reported by: Taylor R Campbell via emaste@ Reviewed by: so Approved by: so Security: FreeBSD-SA-23:04.pam_krb5 Security: CVE-2023-3326 --- lib/libpam/modules/pam_krb5/pam_krb5.8 | 15 +++++ lib/libpam/modules/pam_krb5/pam_krb5.c | 104 +++++++++++++++++++++++++++------ 2 files changed, 102 insertions(+), 17 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.8 b/lib/libpam/modules/pam_krb5/pam_krb5.8 index d3617aec6e51..6abec508cc39 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.8 +++ b/lib/libpam/modules/pam_krb5/pam_krb5.8 @@ -108,6 +108,21 @@ and .Ql %p , to designate the current process ID; can be used in .Ar name . +.It Cm allow_kdc_spoof +Allow +.Nm +to succeed even if there is no host or service key available in a +keytab to authenticate the Kerberos KDC's ticket. +If there is no such key, for example on a host with no keytabs, +.Nm +will fail immediately without prompting the user. +.Pp +.Sy Warning : +If the host has not been configured with a keytab from the KDC, setting +this option makes it vulnerable to malicious KDCs, e.g. via DNS +flooding, because +.Nm +has no way to distinguish the legitimate KDC from a spoofed KDC. .It Cm no_user_check Do not verify if a user exists on the local system. This option implies the .Cm no_ccache diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 810573bed47e..3972479a581f 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -76,7 +76,12 @@ __FBSDID("$FreeBSD$"); #define COMPAT_HEIMDAL /* #define COMPAT_MIT */ -static int verify_krb_v5_tgt(krb5_context, krb5_ccache, char *, int); +static int verify_krb_v5_tgt_begin(krb5_context, char *, int, + const char **, krb5_principal *, char[static BUFSIZ]); +static int verify_krb_v5_tgt(krb5_context, krb5_ccache, char *, int, + const char *, krb5_principal, char[static BUFSIZ]); +static void verify_krb_v5_tgt_cleanup(krb5_context, int, + const char *, krb5_principal, char[static BUFSIZ]); static void cleanup_cache(pam_handle_t *, void *, int); static const char *compat_princ_component(krb5_context, krb5_principal, int); static void compat_free_data_contents(krb5_context, krb5_data *); @@ -92,6 +97,7 @@ static void compat_free_data_contents(krb5_context, krb5_data *); #define PAM_OPT_NO_USER_CHECK "no_user_check" #define PAM_OPT_REUSE_CCACHE "reuse_ccache" #define PAM_OPT_NO_USER_CHECK "no_user_check" +#define PAM_OPT_ALLOW_KDC_SPOOF "allow_kdc_spoof" #define PAM_LOG_KRB5_ERR(ctx, rv, fmt, ...) \ do { \ @@ -109,6 +115,10 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, { krb5_error_code krbret; krb5_context pam_context; + int debug; + const char *auth_service; + krb5_principal auth_princ; + char auth_phost[BUFSIZ]; krb5_creds creds; krb5_principal princ; krb5_ccache ccache; @@ -139,14 +149,37 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Got service: %s", (const char *)service); + if ((srvdup = strdup(service)) == NULL) { + retval = PAM_BUF_ERR; + goto cleanup6; + } + krbret = krb5_init_context(&pam_context); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - return (PAM_SERVICE_ERR); + retval = PAM_SERVICE_ERR; + goto cleanup5; } PAM_LOG("Context initialised"); + debug = openpam_get_option(pamh, PAM_OPT_DEBUG) ? 1 : 0; + krbret = verify_krb_v5_tgt_begin(pam_context, srvdup, debug, + &auth_service, &auth_princ, auth_phost); + if (krbret != 0) { /* failed to find key */ + /* Keytab or service key does not exist */ + /* + * Give up now because we can't authenticate the KDC + * with a keytab, unless the administrator asked to + * have the traditional behaviour of being vulnerable + * to spoofed KDCs. + */ + if (!openpam_get_option(pamh, PAM_OPT_ALLOW_KDC_SPOOF)) { + retval = PAM_SERVICE_ERR; + goto cleanup4; + } + } + krbret = krb5_cc_register(pam_context, &krb5_mcc_ops, FALSE); if (krbret != 0 && krbret != KRB5_CC_TYPE_EXISTS) { PAM_VERBOSE_ERROR("Kerberos 5 error"); @@ -292,13 +325,11 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Credentials stashed"); /* Verify them */ - if ((srvdup = strdup(service)) == NULL) { - retval = PAM_BUF_ERR; - goto cleanup; - } krbret = verify_krb_v5_tgt(pam_context, ccache, srvdup, - openpam_get_option(pamh, PAM_OPT_DEBUG) ? 1 : 0); + debug, + auth_service, auth_princ, auth_phost); free(srvdup); + srvdup = NULL; if (krbret == -1) { PAM_VERBOSE_ERROR("Kerberos 5 error"); krb5_cc_destroy(pam_context, ccache); @@ -349,8 +380,20 @@ cleanup3: PAM_LOG("Done cleanup3"); +cleanup4: + verify_krb_v5_tgt_cleanup(pam_context, debug, + auth_service, auth_princ, auth_phost); + PAM_LOG("Done cleanup4"); + +cleanup5: + if (srvdup != NULL) + free(srvdup); + PAM_LOG("Done cleanup5"); + +cleanup6: if (retval != PAM_SUCCESS) PAM_VERBOSE_ERROR("Kerberos 5 refuses you"); + PAM_LOG("Done cleanup6"); return (retval); } @@ -837,18 +880,18 @@ PAM_MODULE_ENTRY("pam_krb5"); */ /* ARGSUSED */ static int -verify_krb_v5_tgt(krb5_context context, krb5_ccache ccache, - char *pam_service, int debug) +verify_krb_v5_tgt_begin(krb5_context context, char *pam_service, int debug, + const char **servicep, krb5_principal *princp __unused, char phost[static BUFSIZ]) { krb5_error_code retval; krb5_principal princ; krb5_keyblock *keyblock; - krb5_data packet; - krb5_auth_context auth_context; - char phost[BUFSIZ]; const char *services[3], **service; - packet.data = 0; + *servicep = NULL; + + if (debug) + openlog("pam_krb5", LOG_PID, LOG_AUTHPRIV); /* If possible we want to try and verify the ticket we have * received against a keytab. We will try multiple service @@ -906,14 +949,30 @@ verify_krb_v5_tgt(krb5_context context, krb5_ccache ccache, krb5_free_error_message(context, msg); } retval = 0; - goto cleanup; } if (keyblock) krb5_free_keyblock(context, keyblock); + return (retval); +} + +static int +verify_krb_v5_tgt(krb5_context context, krb5_ccache ccache, + char *pam_service __unused, int debug, + const char *service, krb5_principal princ, char phost[static BUFSIZ]) +{ + krb5_error_code retval; + krb5_auth_context auth_context = NULL; + krb5_data packet; + + if (service == NULL) + return (0); /* uncertain, can't authenticate KDC */ + + packet.data = 0; + /* Talk to the kdc and construct the ticket. */ auth_context = NULL; - retval = krb5_mk_req(context, &auth_context, 0, *service, phost, + retval = krb5_mk_req(context, &auth_context, 0, service, phost, NULL, ccache, &packet); if (auth_context) { krb5_auth_con_free(context, auth_context); @@ -952,8 +1011,19 @@ verify_krb_v5_tgt(krb5_context context, krb5_ccache ccache, cleanup: if (packet.data) compat_free_data_contents(context, &packet); - krb5_free_principal(context, princ); - return retval; + return (retval); +} + +static void +verify_krb_v5_tgt_cleanup(krb5_context context, int debug, + const char *service, krb5_principal princ, char phost[static BUFSIZ] __unused) +{ + + if (service) + krb5_free_principal(context, princ); + if (debug) + closelog(); + } /* Free the memory for cache_name. Called by pam_end() */ From nobody Wed Jun 21 05:37:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmC2Q1fV2z4g0tp; Wed, 21 Jun 2023 05:37:50 +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 4QmC2Q1Bdtz3Qmr; Wed, 21 Jun 2023 05:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+5lESTAlPx0ZqIOL3rAq9QWwBKZFtALDbgu5Lc4zmCo=; b=rJBatbcPCamzMouIRH5Jdv72YZcEOTEdf2YAs7jQf9KpPf15MohMTCU2rWOvb4x86iSjp4 4lp6JbxrKVceK95vMU4CQwUzzqwASmPJyF6VDOaEmKwS2JCT+OPFj8wy/Ozwufehteqo71 Dj9zZNGLgyf7j84RRF+rl+cJqcxjQbHxCSm/d1wUjy9s2i+E18yNAYP4/Nc1+8ey3Za9Md ubzybFrRcaL/MZzBvFjajC2O2W+3UzInUIwEjvNXgwZ4y27/phmx4pZI1tXlI4kDMwQ+mn Qut4Y54Ld//zWqNa0eVRb3o/iRsGRgVmdcuje0krN6Vivyy/m9yb8aZjyZd6uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+5lESTAlPx0ZqIOL3rAq9QWwBKZFtALDbgu5Lc4zmCo=; b=q/tU3PZECniE1qCua3XjZjjnnxh5WG6hunFowDKeMx7j/vk9t8jvHPfpIhgwP3aJXnrEyQ O5nra1/E9vlWX/BHUGh6NM7wNgygo8Su9+/4vPSLpEhGn0fqIPDYtzrHzzqf1fiOcHZwZQ BY4shN2MuHVBo+1dyhugaTyJsHsaDH7xT038UQOJ5+hq08Lla9nbnn00tkN9BPNiq5sxSq epTVaBO7R8EHNkGceae+FCQCDPasWXvjeJ/COkMlamBnT5zgqYFt8cux/7n3lo8WZgrwGr MVzQuqg2QRl59xxLYu2TkKWyV6exK+wO8HMPXICtSq+aReMLauQsPyYPDWXNhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687325870; a=rsa-sha256; cv=none; b=NhEuVSeV2QtKY8C0H032+IrKghGGl6e/vF3ECHHiUNKeVXM1r/t+VXbwPDJoaQ4/SLX4H5 m6v86247wOUFRCoPevEYKmCWPVETu8PBt5pq0mn6bUHO/h9dyqKRsbOA4rRJdavTpbdpAy a8P+X3VGvN9xyZKCcyDcnvW2kcXUdOn47vpu9lvk0E2XtNSSdr4x16jM5gL4BK6HWU/R0h KHoNtfHNLat0MDLQmgSC0bQDpzTXRo9Ep6wMTRvNcFXF16Ap1kcascwATZOqrUoOhSJ32A pekphBNY0x+xi75BZsPCuwCgMs52ch9d+olYBGEkAfgiChHvBuLqRbyFfSybvg== 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 4QmC2Q08HnzVB0; Wed, 21 Jun 2023 05:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L5bnx5048312; Wed, 21 Jun 2023 05:37:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5bn3m048311; Wed, 21 Jun 2023 05:37:49 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:37:49 GMT Message-Id: <202306210537.35L5bn3m048311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5c6393451f58 - main - top(8): designate the sorted_state[] array as constant List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c6393451f58c4e6c92410ae66e28c899bfacdb9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5c6393451f58c4e6c92410ae66e28c899bfacdb9 commit 5c6393451f58c4e6c92410ae66e28c899bfacdb9 Author: Konstantin Belousov AuthorDate: 2023-06-19 13:49:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-21 05:36:33 +0000 top(8): designate the sorted_state[] array as constant Reviewed by: kevans Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40607 --- usr.bin/top/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index 2fbdb8551bb0..c11851ebce63 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1261,7 +1261,7 @@ compare_tid(const void *p1, const void *p2) * that reflects this ordering. */ -static int sorted_state[] = { +static const int sorted_state[] = { 0, /* not used */ 3, /* sleep */ 1, /* ABANDONED (WAIT) */ From nobody Wed Jun 21 05:37:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmC2R1SWYz4g1CH; Wed, 21 Jun 2023 05:37: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 4QmC2R0t6Tz3Qs3; Wed, 21 Jun 2023 05:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Inoc6kAtvG+gUQcD3e/8tdLrrc3pCoErJ8mk3ttqlRw=; b=I6tuUu/SYLcMIclT7/oKPe+RBelnvsuBpB8uRYIGO3w35k+r+bVjFqj6eh+WYyPFFkoW+S Tb9IYHc9QZ0B2LLXneRwsl/XwrHI5EkdmWJG/2SSbFS9FZkCaMnnKYjgV1TBh9P8WPNUve FOk265qmET3ZukKAWfoRO6LTAVkU42llWX7SVWiwoXbj9FJaqgUFPEHG88Q1YVrFXCOS9D vtpdqrr2Fpo/JVjXzVv52JCwSXrbJCFq6H5+IIadBOkV4eXP181/j/tPfPvBGvC0br79ml J+hLN2ORe/GzVb78O0HJ2We7Vjfee+/vJhttBhtbIeRhn9tgA2Ad59qxwWzKQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Inoc6kAtvG+gUQcD3e/8tdLrrc3pCoErJ8mk3ttqlRw=; b=KYfO056ofABqqXAy5AkgCSo3YU8Rp+LqTzMzo9mTZi/ETGVuULfcuoxp9Bs54izOIbCqII u8eBfL2SZSofUgOIfPDs7Y2MJc30nJciHqZv4Jqnz61/MCQFAB8rNLuO19pgjhOBnga3p4 PrEqzfGubRX4OZXh6oY3oO69RA7TL3qLRpG3Jr1P457LV+7e6XzEoFBhOiu6+Zee3mDmAt 8KOevIE/kHDoKLaxmEpaTx9UG60fKWis/1O48LcJ+xywYmRSbmoO/eUfZATA1Ax37Mwv9f vDBI9WEpin8hB5Q18UZhELjOEBBzGPosuW6oR/0nN/DCiVKvYUWesfXamHtdEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687325871; a=rsa-sha256; cv=none; b=rhKPDMyMg+IErFIuMrC5uk5659iLqPapRGGXRhXvpzcsaFQT9PMgFwOeVfy6mDllW+rJ+c 4354WTpu3whHkHAkS4tXdepJjFQTAJMnYyB6RDOclEwKVpBmNv4SfMHGs61b/6CMQUx+Z1 H4LrRYFyLhW5f4jNK59ODnkDUDxr+oCvn7Yk717++surupOBuol00Tff7cWrjnvbQdq4Gy 77nr0Yon5TAicU/19d9bqbDRsMo6WivpW+HxhHBSLQUMxf5/pIqSrE4FtAYr0AVhbUaGKR NSQPS7+6HZPHrFDwx/7SbcgBzXUTL1mo/zfkcewtI0UkusLam9Mbl+5jvtkusQ== 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 4QmC2Q75dbzVW0; Wed, 21 Jun 2023 05:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L5boTu048333; Wed, 21 Jun 2023 05:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5boZ0048332; Wed, 21 Jun 2023 05:37:50 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:37:50 GMT Message-Id: <202306210537.35L5boZ0048332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: bc2ac2585aa8 - main - top(8): use designated initializers for sorted_state[] List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc2ac2585aa89c110861972aeb243719ea5012b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bc2ac2585aa89c110861972aeb243719ea5012b8 commit bc2ac2585aa89c110861972aeb243719ea5012b8 Author: Konstantin Belousov AuthorDate: 2023-06-19 13:52:05 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-21 05:36:45 +0000 top(8): use designated initializers for sorted_state[] Also correct comments for individual state, duplicating the S* constants descriptions from sys/proc.h [*]. Reviewed by: kevans (previous version) Noted by: Mark Millard [*] Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40607 --- usr.bin/top/machine.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index c11851ebce63..033861d3f7fb 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1262,13 +1262,12 @@ compare_tid(const void *p1, const void *p2) */ static const int sorted_state[] = { - 0, /* not used */ - 3, /* sleep */ - 1, /* ABANDONED (WAIT) */ - 6, /* run */ - 5, /* start */ - 2, /* zombie */ - 4 /* stop */ + [SIDL] = 3, /* being created */ + [SRUN] = 1, /* running/runnable */ + [SSLEEP] = 6, /* sleeping */ + [SSTOP] = 5, /* stopped/suspended */ + [SZOMB] = 2, /* zombie */ + [SWAIT] = 4, /* intr */ }; From nobody Wed Jun 21 05:37:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmC2S2S9Zz4g16k; Wed, 21 Jun 2023 05:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmC2S22Nyz3Qqd; Wed, 21 Jun 2023 05:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDj2iEpFHyaX2kWF333YLU/5NvdTZ2tQ0hULWT8fRBQ=; b=sF6FYsG9oGn2dOXzRS3boou259L/eVtsRskuYOGnDEmtjTfQgLHrqhJlT4Xi3iVRK0FRxh z5+OYLj0LpcamAXiYu0Q9sR1UJBqv1UFuWE7+Esm/vU4b7fRbiY+rqy4wbKV2+uv7SYEY+ pQXE0XIVMPFxcVNXoDDYXRYB4hh+bv2DHj3+xo+zEueTqasWa1fXDX5331xjMepusgJsUk dpXgM2DwC3Y+nyMuk9W+SzwUOnYbDyFBytNfeNMkGnnxRHtgKf5kbnHjAx1/XajeQLx+zD yCavMtYtDR/AW6BGVi9n+EKQ+Lwutn9eoJHzz2w27g+jFa5mhuWhQJrugb6jBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDj2iEpFHyaX2kWF333YLU/5NvdTZ2tQ0hULWT8fRBQ=; b=uxGRYo8x+osaOL9r/+sGpgzzOLD9SpoihBnU3zh0lSz2rbKhfEXMQCUYwIeInxEAQz9+tw k2+NWUAyMeSPHxQN0BbcSVmcSph0wjthXxF5CR6Gi3rLO3WydmnLa5t5fUGfTRjxvvj2Qd 8NKc8S9K7Uod3FxFHnqD5isUl93572kH4dDc/IAFhsOxF/xadkzanJHwJOqBE1CpStFEKj xub8w1VjhqjumX4je0XooPadbui0Y9nWd5q38OZ7MQyK3hiy5TBsYB97Z+CPFIXRpWx6xP RDYZxW75/0g4CwJ9ifxOeuL4ybpHlhMwSOYelNM7BKCIegGgPixdCZB8z9BruQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687325872; a=rsa-sha256; cv=none; b=SNaGplJBm8vlhsnEs6NzmOx7/E60kJE3xddHrMeOh3fqHk+fNEczeQQ22DSXh/jsegKMpx B8sTDx4IZpjD9+cYePWrragyKZbc6unsPM2w57hEnk2iojNFAODT/rLVBgu19LLAzm7xzi oKJ8+lvLF9GvHcblr755dcEfIBP6Z+ARCT7SXV2kpKUKO/Z+nHlMuI7uqFQES8Ox0eECKh X8kVWtazUqwG1OpeUnOxtn+NY2p5elJoNZ4kI7+urI/gJc21dVYN3d7L8LwD+VKu7S3/oR TAuCseBF9iEqDqtowZGvpw7neVRS29Eo1WALn/gt6DVV+6JekAE47aXA+ylCUQ== 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 4QmC2S18gLzVW1; Wed, 21 Jun 2023 05:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L5bqxm048356; Wed, 21 Jun 2023 05:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5bqlX048355; Wed, 21 Jun 2023 05:37:52 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:37:52 GMT Message-Id: <202306210537.35L5bqlX048355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d636fc5bd1e2 - main - top(8): document the actual sort order for process sorting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d636fc5bd1e218d2eb4d017b93ee59f5db5c8507 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d636fc5bd1e218d2eb4d017b93ee59f5db5c8507 commit d636fc5bd1e218d2eb4d017b93ee59f5db5c8507 Author: Konstantin Belousov AuthorDate: 2023-06-19 15:57:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-21 05:37:24 +0000 top(8): document the actual sort order for process sorting Noted by: Mark Millard Reviewed by: kevans Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40607 --- usr.bin/top/machine.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index 033861d3f7fb..15788fe53443 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1256,9 +1256,9 @@ compare_tid(const void *p1, const void *p2) * distinct keys. The keys (in descending order of importance) are: * percent cpu, cpu ticks, state, resident set size, total virtual * memory usage. The process states are ordered as follows (from least - * to most important): WAIT, zombie, sleep, stop, start, run. The - * array declaration below maps a process state index into a number - * that reflects this ordering. + * to most important): run, zombie, idle, interrupt wait, stop, sleep. + * The array declaration below maps a process state index into a + * number that reflects this ordering. */ static const int sorted_state[] = { From nobody Wed Jun 21 05:37:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmC2T3glvz4g10C; Wed, 21 Jun 2023 05:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmC2T3D9Fz3Qr7; Wed, 21 Jun 2023 05:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndC3h1mTTlBpRUnuYc49puLojvbPyZXraXn5fkJ+Xy8=; b=VDx0Lz6RU/TzccRyzDoZePFGaoNFZ8YR0BlM6IGbqjfjZbyXbPWfeimCWejN31mvWzffCY GfYFY9Frt1gyC9CRiYPYIaRV1p0sUQP8IIo5OE5USoPGu9Idm2HgGVAY2gSfgiC9ZT3XDg 4piRvW8DZBAopEJPBWwZd0ikwYseKKnDyC80L5hHiL+hS9QB+3D9mo3UGP4rnOQ1kgu9vx qiUMCQbWjXZ2auWf8lKNk5m3RQ/ln7WTvBNN4Zz3TYoVm2ktIQIk4oe+KblndJT8p5GuTV AROx5MR5JFBe4bT7kCIt9HEiE454koCa8hLVqsPUpdaFVdAERKos8Kp/VAPO6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687325873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndC3h1mTTlBpRUnuYc49puLojvbPyZXraXn5fkJ+Xy8=; b=botUcB4LXDwCt5T8E7zToJXCGJWU8ltLfdgvn0SHC8hMIt1jW1K09lgmb6aEXdbF77Jfi3 ew7spFwi9byIudMblX+ZlHR0X4jisL9WuSgxm0EBAbiS2xYju7xqtt1DfQVmMMlT1KTBPS tiH869sMKfv7ygUrvDdioc3tkOzW830kkeLUagHBVEN0N/1bYWtWrQiE2c7Rv/sjLd1IZx dHLAzv9wxoWER/i3Q4wxUdi2Pb/OO6BIJgb84xjQ8qfHkj7wHOdSCOoDlCt9aUW6di20IE DeVG+slVKpqYEVPmaa6wHtpCt7Ejhj9MLT46EXPqq/j0b2GDAM6ay2022+3hGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687325873; a=rsa-sha256; cv=none; b=D/buykwhVkrrTkoKK//Az+CFowoyhSa7n1dY3t60WcDx/9xrT6jfaN+9ul0n0BQKrvEosH lxwMW4KkWOC+Dswtui5d0d0eWKfVB/fZrdq8XFo9paOCLI/SATiOzS0pdRqPWLckfdcUU5 S6DDoQ68SlepPuPSl7f/e4RCNalXNBQetiGwkcMppCEVvKqfuC6oj0TYsdw485Ora6JaDE PKZEnQp7RH6mVJDUT4+1q/nZ+ugtAKBj19PtP0igTc+KeUU9XN9KNK20TUifV77ZODo0Aw SpclM1jYpJU6bUMTq6AWMjvMozCSog4Zuob58qcIeDcAikGdiij3qZfacawywA== 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 4QmC2T270DzVW2; Wed, 21 Jun 2023 05:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L5brlN048380; Wed, 21 Jun 2023 05:37:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5brrG048379; Wed, 21 Jun 2023 05:37:53 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:37:53 GMT Message-Id: <202306210537.35L5brrG048379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6a5e6a50bd55 - main - top(8): add missed SLOCK state to the sorted_state[] List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a5e6a50bd55c3fb4933abe1edaad3a928700c42 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a5e6a50bd55c3fb4933abe1edaad3a928700c42 commit 6a5e6a50bd55c3fb4933abe1edaad3a928700c42 Author: Konstantin Belousov AuthorDate: 2023-06-19 16:00:15 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-21 05:37:25 +0000 top(8): add missed SLOCK state to the sorted_state[] Put it near/after the sleep state. Noted by: Mark Millard Reviewed by: kevans Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40607 --- usr.bin/top/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index 15788fe53443..1785db8b9dc4 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1267,7 +1267,7 @@ static const int sorted_state[] = { [SSLEEP] = 6, /* sleeping */ [SSTOP] = 5, /* stopped/suspended */ [SZOMB] = 2, /* zombie */ - [SWAIT] = 4, /* intr */ + [SLOCK] = 7, /* blocked on lock */ }; From nobody Wed Jun 21 05:44:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmCBS4fpsz4g1n3; Wed, 21 Jun 2023 05:44: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 4QmCBS45v9z3mkq; Wed, 21 Jun 2023 05:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Akr2hSyodrAYLPwgti8g6nB2uEJTYm9rcsWWBSY+Pp8=; b=wrJIPVM+D0B4h1jZmJrv7fL7/epdk1Ey/ili6lNo5dwmlKUcPsUNB8QEh5cq0zhwfpM2zz JezTWfaIJn6mWZl1IFwbVuRLrKPCpDBYvNSdiyHSZmiXj5Rm5NoJBKi/O48SNqGnfE4Bf/ BfF9ttAu8dNeSmcyN7r7Q7mpfg358XMTc89tGhWcg3jQUg10OmeFJkxlUFRQDuvlsgJo4i vMRagDZvqIgurFsUgfqDf/pQnhg4vYyX2veQzbpKCyDnR9xNNhXSgR9AdhEx0sNI2Ornt+ VSmOiJNihJbDsnpmN0HRKjLoCZJ6FR4UU34Xs7tyMvDgF0cGEDHhB/3wEB0fUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Akr2hSyodrAYLPwgti8g6nB2uEJTYm9rcsWWBSY+Pp8=; b=TGZt9AWpf+2yqzNdrlZXwMnl5X8BPYudMxRwr285bS+WrqoCyKC2M3MDT4uDWjcL/m+aK9 /wVcLZZzaZ/ZUiAulH1gNP0L2YCxNe4F8ToGIPxAo/PTSlkjjt/JuZxKME+ODI6/Jj/0B4 lu5431QM5QsAmy/nL8hqj2FPaqlQAjFpLaKa9OVC4I1IgTSaJUthebaJ1Juy1dDIwx37hJ EddTpFn6+gbAXyxPrwPbpKxLueUZ5brJrJB4517sRrtu3tkotGMWKWk1FfiB3adD3s5dUW aEEd7jRSQ3HVlFN6nHQd0PSqsLJ/Z2RHb1LrG1+vKJ7ujpWTtab+XMxFHLxSWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687326288; a=rsa-sha256; cv=none; b=S5nAIKVuvaN1Qplv514zfnucpoiU/yxNdikOXIIZlUi6RVoVQPSVXj6SCtvNVJbrK79T1w P1N4onGnchMaSE9bAI31agX0ITqTYncuk7sbRmKNQwQoCi/EObssVFK/yNxGjBT1O0idgK TUbwo7rXlw+T5e5QNhEkfSthDdF9k8M3vhjmRPba/4Gh015+FJKC1QfzTcX/qe+mchIJE+ AC4bbm/AP5alIRgjH/poTI+YbFIOmCZQlChO0jHkUKAmmSWIYfvsvb7VedXC4fTw6HZCl2 zG6CP6GLVTWs0SpMFzp5XmYdRQQLpu22xkuvrOEk+/nzUb1WQ4hahc6mAYbgqw== 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 4QmCBS3BrczVX9; Wed, 21 Jun 2023 05:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L5imiJ064758; Wed, 21 Jun 2023 05:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5imsh064757; Wed, 21 Jun 2023 05:44:48 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:44:48 GMT Message-Id: <202306210544.35L5imsh064757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5bd5470a2c97 - main - top(8): restore erronously removed SWAIT array element List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bd5470a2c975b8d3c841a68ac66bd0a3acdf966 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5bd5470a2c975b8d3c841a68ac66bd0a3acdf966 commit 5bd5470a2c975b8d3c841a68ac66bd0a3acdf966 Author: Konstantin Belousov AuthorDate: 2023-06-21 05:43:11 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-21 05:43:11 +0000 top(8): restore erronously removed SWAIT array element due to bad rebase. Noted by: kevans Sponsored by: The FreeBSD Foundation MFC after: 1 week Fixes: 6a5e6a50bd55c3fb4933abe1edaad3a928700c42ESC --- usr.bin/top/machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index 1785db8b9dc4..414b92560523 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1267,6 +1267,7 @@ static const int sorted_state[] = { [SSLEEP] = 6, /* sleeping */ [SSTOP] = 5, /* stopped/suspended */ [SZOMB] = 2, /* zombie */ + [SWAIT] = 4, /* intr */ [SLOCK] = 7, /* blocked on lock */ }; From nobody Wed Jun 21 07:05:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmDzK2LCgz4gjv4; Wed, 21 Jun 2023 07:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmDzK29zTz3l0N; Wed, 21 Jun 2023 07:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687331117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xhu61jlI4VzqqGZdkxrwH3Nx0QpVqWQ5EXu22SwrTQU=; b=omKeT4xJM22Aw4arIplnDikD0n/h0mcTQyXqw6jJw3vMuM+RyNq8cOqLihgFeGLns09r+M Y+DVWonr4icPCxo4K6jq14Td6utwBtEIu86YK0Pv9b4wHutp8XI7PypwsSzhIl02umU7fN TAO6Uh3ullyAMFfSxbst7ck05Yps1uUuhUQUjJdhzq9Cpua8gwMcabhsGbN3Ub/Nq6IXtR 0tQMPYZvY74Xt1HXN/o9vAgtL09Vci6wQoZOt3Lxy3D9ynMwftHl7IJcEzipXulPpRXrvJ XpH1qRivUMaazCMFVfFO+bdqpkyn71uasGXRdi9XicsT9obQlRJPhxoFJ99EKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687331117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xhu61jlI4VzqqGZdkxrwH3Nx0QpVqWQ5EXu22SwrTQU=; b=EE+QSKTjq8xqYo8Gox77DHQrYxmNY9W24ROpHGOwsTlMENEXTh11fy474OHwhr0qVV+wsv Sx4D+Df4n/nUGVncsWGRK/jlajiDw6EBXWp5zeX6QfZGIp9pkMAQ1776dxOCsK2Bo3GMXs 6I1w4S7R5ourDOpZBJC8MNL1zINuCeuIagUxVBnNptbW8wZQKiHI7Mo7dNVgh+dngvLXL+ NnCdbICZu270OcXYnTBbEISNBUWZqtA/3FcKBTJDSz/OtjCSUrxFrolqWg4xAEHHf/7P/P PjDXn2t7Yl6Hg+83O9kG+CcyiQTcopKMxd7mMejWVLV7PX6eXsXCnTGHtBptmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687331117; a=rsa-sha256; cv=none; b=yBe0wsFbqJq67Ra4Ep/oK2MZOYrgy0J499VcoX1mf/vt5j/rMRm2G8Z89HHt39Z0ZKqsMh d/t2t+88lJI4+QadmLxMgFtw9zggU7XC8ghE7rMuDhOeanYvr/reRi9XnSGYzB1Udu0Csq 6UO6AFEkAOz9IwD/mrv6x0D/9cM36+W4mG1RezFlmDcEKCLW1O4eo/AeDGWdliBcW+FI2D 8uUB+WG8RT7JTR+JhpIWID0w8MnEwjnqrTfy+XklfiaiHgX85JzurDulgMhmfdotEWPByw vHor13ZFP4WAHYsKBYrNqsS4P5OG+6HccrFwPF4XKJDFmtvxcyvb3o25GNKM3A== 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 4QmDzK1HBXzXH1; Wed, 21 Jun 2023 07:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L75H3X097862; Wed, 21 Jun 2023 07:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L75H3S097861; Wed, 21 Jun 2023 07:05:17 GMT (envelope-from git) Date: Wed, 21 Jun 2023 07:05:17 GMT Message-Id: <202306210705.35L75H3S097861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 1e8d0c6cf644 - main - Revert "bhyve: add command line parameter and parsing for migration" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e8d0c6cf644f4c2d6e85f8f370651f0ce46d0ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=1e8d0c6cf644f4c2d6e85f8f370651f0ce46d0ac commit 1e8d0c6cf644f4c2d6e85f8f370651f0ce46d0ac Author: Corvin Köhne AuthorDate: 2023-06-21 06:55:34 +0000 Commit: Corvin Köhne CommitDate: 2023-06-21 06:55:34 +0000 Revert "bhyve: add command line parameter and parsing for migration" Unfortunately, this feature didn't receive much feedback in the past. However, after committing this, some people came up and complain that this feature requires some more discussion before upstreaming it. Additionally, it wasn't a good idea to start this new feature by adding a new command line parameter as it fixes the user interface. This reverts commit c9fdd4f3cc18c03683de85318ba8d318f96b58c4. --- usr.sbin/bhyve/Makefile | 1 - usr.sbin/bhyve/bhyve.8 | 12 ------ usr.sbin/bhyve/bhyverun.c | 66 +++++++++-------------------- usr.sbin/bhyve/migration.c | 98 -------------------------------------------- usr.sbin/bhyve/migration.h | 27 ------------ usr.sbin/bhyve/snapshot.c | 35 ---------------- usr.sbin/bhyvectl/bhyvectl.8 | 19 --------- usr.sbin/bhyvectl/bhyvectl.c | 57 +------------------------- 8 files changed, 21 insertions(+), 294 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index d4909fb87b76..9b8a7274d793 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -88,7 +88,6 @@ SRCS= \ .if ${MK_BHYVE_SNAPSHOT} != "no" SRCS+= snapshot.c -SRCS+= migration.c .endif CFLAGS.kernemu_dev.c+= -I${SRCTOP}/sys/amd64 diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 4f6d771cb93d..110850350673 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -80,11 +80,6 @@ .Op Fl o Ar var Ns Cm = Ns Ar value .Op Fl p Ar vcpu Ns Cm \&: Ns Ar hostcpu .Op Fl r Ar file -.Oo Fl R -.Sm off -.Ar host Op Cm \&: Ar port -.Sm on -.Oc .Sm off .Oo Fl s\~ .Ar slot Cm \&, Ar emulation Op Cm \&, Ar conf @@ -281,13 +276,6 @@ and .Fl l options. The count of vCPUs and memory configuration are read from the snapshot. -.It Fl R Ar host Ns Op Cm \&: Ns Ar port -Receive migration from a source guest. -Await for a connection from -.Ar host -on the specified -.Ar port -and resume execution. The default migration port is 24983. .It Fl S Wire guest memory. .It Fl s Cm help diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 9eef1ea7225d..2feb78a0bdf0 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -98,9 +98,6 @@ __FBSDID("$FreeBSD$"); #include "kernemu_dev.h" #include "mem.h" #include "mevent.h" -#ifdef BHYVE_SNAPSHOT -#include "migration.h" -#endif #include "mptbl.h" #include "pci_emul.h" #include "pci_irq.h" @@ -234,7 +231,6 @@ usage(int code) " -p: pin 'vcpu' to 'hostcpu'\n" #ifdef BHYVE_SNAPSHOT " -r: path to checkpoint file\n" - " -R: the source vm host and port for migration\n" #endif " -S: guest memory cannot be swapped\n" " -s: PCI slot config\n" @@ -1082,11 +1078,7 @@ do_open(const char *vmname) exit(4); } } else { -#ifndef BHYVE_SNAPSHOT if (!romboot) { -#else - if (!romboot && !get_config_bool_default("is_migrated", false)) { -#endif /* * If the virtual machine was just created then a * bootrom must be configured to boot it. @@ -1231,11 +1223,9 @@ main(int argc, char *argv[]) const char *optstr, *value, *vmname; #ifdef BHYVE_SNAPSHOT char *restore_file; - char *migration_host; struct restore_state rstate; restore_file = NULL; - migration_host = NULL; #endif init_config(); @@ -1243,7 +1233,7 @@ main(int argc, char *argv[]) progname = basename(argv[0]); #ifdef BHYVE_SNAPSHOT - optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:r:R:"; + optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:r:"; #else optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:"; #endif @@ -1300,10 +1290,6 @@ main(int argc, char *argv[]) case 'r': restore_file = optarg; break; - case 'R': - migration_host = optarg; - set_config_bool("is_migrated", true); - break; #endif case 's': if (strncmp(optarg, "help", strlen(optarg)) == 0) { @@ -1520,51 +1506,38 @@ main(int argc, char *argv[]) spinup_vcpu(&vcpu_info[vcpuid], vcpuid == BSP); #ifdef BHYVE_SNAPSHOT - if (restore_file != NULL || migration_host != NULL) { - fprintf(stdout, "Pausing pci devs...\n"); + if (restore_file != NULL) { + fprintf(stdout, "Pausing pci devs...\r\n"); if (vm_pause_devices() != 0) { fprintf(stderr, "Failed to pause PCI device state.\n"); exit(1); } - if (restore_file != NULL) { - fprintf(stdout, "Restoring vm mem...\n"); - if (restore_vm_mem(ctx, &rstate) != 0) { - fprintf(stderr, - "Failed to restore VM memory.\n"); - exit(1); - } - - fprintf(stdout, "Restoring pci devs...\n"); - if (vm_restore_devices(&rstate) != 0) { - fprintf(stderr, - "Failed to restore PCI device state.\n"); - exit(1); - } + fprintf(stdout, "Restoring vm mem...\r\n"); + if (restore_vm_mem(ctx, &rstate) != 0) { + fprintf(stderr, "Failed to restore VM memory.\n"); + exit(1); + } - fprintf(stdout, "Restoring kernel structs...\n"); - if (vm_restore_kern_structs(ctx, &rstate) != 0) { - fprintf(stderr, - "Failed to restore kernel structs.\n"); - exit(1); - } + fprintf(stdout, "Restoring pci devs...\r\n"); + if (vm_restore_devices(&rstate) != 0) { + fprintf(stderr, "Failed to restore PCI device state.\n"); + exit(1); } - if (migration_host != NULL) { - fprintf(stdout, "Starting the migration process...\n"); - if (receive_vm_migration(ctx, migration_host) != 0) { - fprintf(stderr, "Failed to migrate the vm.\n"); - exit(1); - } + fprintf(stdout, "Restoring kernel structs...\r\n"); + if (vm_restore_kern_structs(ctx, &rstate) != 0) { + fprintf(stderr, "Failed to restore kernel structs.\n"); + exit(1); } - fprintf(stdout, "Resuming pci devs...\n"); + fprintf(stdout, "Resuming pci devs...\r\n"); if (vm_resume_devices() != 0) { fprintf(stderr, "Failed to resume PCI device state.\n"); exit(1); } } -#endif /* BHYVE_SNAPSHOT */ +#endif error = vm_get_register(bsp, VM_REG_GUEST_RIP, &rip); assert(error == 0); @@ -1632,9 +1605,8 @@ main(int argc, char *argv[]) #endif #ifdef BHYVE_SNAPSHOT - if (restore_file != NULL) + if (restore_file != NULL) { destroy_restore_state(&rstate); - if (restore_file != NULL || migration_host != NULL) { if (vm_restore_time(ctx) < 0) err(EX_OSERR, "Unable to restore time"); diff --git a/usr.sbin/bhyve/migration.c b/usr.sbin/bhyve/migration.c deleted file mode 100644 index daa67b370d47..000000000000 --- a/usr.sbin/bhyve/migration.c +++ /dev/null @@ -1,98 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2017-2020 Elena Mihailescu - * Copyright (c) 2017-2020 Darius Mihai - * Copyright (c) 2017-2020 Mihai Carabas - * - * The migration feature was developed under sponsorships - * from Matthew Grooms. - * - */ - -#include -#include -#include -#include -#include - -#include -#ifndef WITHOUT_CAPSICUM -#include -#include -#include -#include -#endif -#include -#include -#include -#include -#include -#include -#include - -#include "migration.h" -#include "pci_emul.h" -#include "snapshot.h" - - -#ifdef BHYVE_DEBUG -#define DPRINTF(FMT, ...) \ -({ \ - fprintf(stderr, "%s: " FMT "\n", __func__, ##__VA_ARGS__); \ - }) -#else -#define DPRINTF(FMT, ...) -#endif - -#define EPRINTF(FMT, ...) \ -({ \ - fprintf(stderr, "%s: " FMT "\n", __func__, ##__VA_ARGS__); \ - }) - -int -receive_vm_migration(struct vmctx *ctx, char *migration_data) -{ - struct migrate_req req; - size_t len; - char *hostname, *pos; - unsigned int port = DEFAULT_MIGRATION_PORT; - int rc; - - assert(ctx != NULL); - assert(migration_data != NULL); - - memset(req.host, 0, MAXHOSTNAMELEN); - hostname = strdup(migration_data); - - if ((pos = strchr(hostname, ':')) != NULL) { - *pos = '\0'; - pos = pos + 1; - - rc = sscanf(pos, "%u", &port); - - if (rc <= 0) { - EPRINTF("Could not parse the port"); - free(hostname); - return (EINVAL); - } - } - req.port = port; - - len = strlen(hostname); - if (len > MAXHOSTNAMELEN - 1) { - EPRINTF("Hostname length %lu bigger than maximum allowed %d", - len, MAXHOSTNAMELEN - 1); - free(hostname); - return (EINVAL); - } - - strlcpy(req.host, hostname, MAXHOSTNAMELEN); - - // rc = vm_recv_migrate_req(ctx, req); - rc = EOPNOTSUPP; - EPRINTF("Migration not implemented yet"); - - free(hostname); - return (rc); -} diff --git a/usr.sbin/bhyve/migration.h b/usr.sbin/bhyve/migration.h deleted file mode 100644 index b72a4aa3611f..000000000000 --- a/usr.sbin/bhyve/migration.h +++ /dev/null @@ -1,27 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2017-2020 Elena Mihailescu - * Copyright (c) 2017-2020 Darius Mihai - * Copyright (c) 2017-2020 Mihai Carabas - * - * The migration feature was developed under sponsorships - * from Matthew Grooms. - * - */ - -#pragma once - -#include -#include - -#define DEFAULT_MIGRATION_PORT 24983 - -struct vmctx; - -struct migrate_req { - char host[MAXHOSTNAMELEN]; - unsigned int port; -}; - -int receive_vm_migration(struct vmctx *ctx, char *migration_data); diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 31c5e76cecef..655f8299bf0e 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -85,7 +85,6 @@ __FBSDID("$FreeBSD$"); #include "ioapic.h" #include "mem.h" #include "mevent.h" -#include "migration.h" #include "mptbl.h" #include "pci_emul.h" #include "pci_irq.h" @@ -1400,40 +1399,6 @@ vm_do_checkpoint(struct vmctx *ctx, const nvlist_t *nvl) } IPC_COMMAND(ipc_cmd_set, checkpoint, vm_do_checkpoint); -static int -vm_do_migrate(struct vmctx __unused *ctx, const nvlist_t *nvl) -{ - size_t len; - struct migrate_req req; - - if (!nvlist_exists_string(nvl, "hostname") || - !nvlist_exists_number(nvl, "port")) - return (EINVAL); - - memset(&req, 0, sizeof(struct migrate_req)); - req.port = nvlist_get_number(nvl, "port"); - - len = strlen(nvlist_get_string(nvl, "hostname")); - if (len > MAXHOSTNAMELEN - 1) { - EPRINTLN("Hostname length %lu bigger than maximum allowed %d", - len, MAXHOSTNAMELEN - 1); - return (EINVAL); - } - - strlcpy(req.host, nvlist_get_string(nvl, "hostname"), MAXHOSTNAMELEN); - - printf("%s: IP address used for migration: %s;\n" - "Port used for migration: %d\n", - __func__, - req.host, - req.port); - - // return (vm_send_migrate_req(ctx, req, nvlist_get_bool(nvl, "live"))); - EPRINTLN("Migration operation not implemented yet\n"); - return (EOPNOTSUPP); -} -IPC_COMMAND(ipc_cmd_set, migrate, vm_do_migrate); - void init_snapshot(void) { diff --git a/usr.sbin/bhyvectl/bhyvectl.8 b/usr.sbin/bhyvectl/bhyvectl.8 index 9b917f14270e..636529a7a53b 100644 --- a/usr.sbin/bhyvectl/bhyvectl.8 +++ b/usr.sbin/bhyvectl/bhyvectl.8 @@ -41,11 +41,6 @@ .Op Fl -force-poweroff .Op Fl -checkpoint= Ns Ar .Op Fl -suspend= Ns Ar -.Oo -.Fl -migrate= Ns Ar host Ns Op Cm \&: Ns Ar port -| -.Fl -migrate-live= Ns Ar host Ns Op Cm \&: Ns Ar port -.Oc .Sh DESCRIPTION The .Nm @@ -90,20 +85,6 @@ Save a snapshot of a virtual machine similar to .Fl -checkpoint . The virtual machine will terminate after the snapshot has been saved. -.It Fl -migrate= Ns Ar host Ns Op Cm \&: Ns Ar port -Warm migrate the virtual machine to a -.Ar host -on the specified -.Ar port . -The default migration port is 24983. -The virtual machine will be destroyed after the migration finishes. -.It Fl -migrate-live= Ns Ar host Ns Op Cm \&: Ns Ar port -Live migrate the virtual machine to a -.Ar host -on the specified -.Ar port . -The default migration port is 24983. -The virtual machine will be destroyed after the migration finishes. .El .Sh EXIT STATUS .Ex -std diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 3c41938d0e18..f723ff1f2e82 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #ifdef BHYVE_SNAPSHOT #include "snapshot.h" -#include "migration.h" #endif #define MB (1UL << 20) @@ -88,7 +87,6 @@ usage(bool cpu_intel) " [--destroy]\n" #ifdef BHYVE_SNAPSHOT " [--checkpoint= | --suspend=]\n" - " [--migrate=[:] | --migrate-live=[:]]\n" #endif " [--get-all]\n" " [--get-stats]\n" @@ -301,7 +299,6 @@ static int run; static int get_cpu_topology; #ifdef BHYVE_SNAPSHOT static int vm_suspend_opt; -static int vm_migrate_live; #endif /* @@ -592,8 +589,6 @@ enum { #ifdef BHYVE_SNAPSHOT SET_CHECKPOINT_FILE, SET_SUSPEND_FILE, - MIGRATE_VM, - MIGRATE_VM_LIVE, #endif }; @@ -1461,8 +1456,6 @@ setup_options(bool cpu_intel) #ifdef BHYVE_SNAPSHOT { "checkpoint", REQ_ARG, 0, SET_CHECKPOINT_FILE}, { "suspend", REQ_ARG, 0, SET_SUSPEND_FILE}, - { "migrate", REQ_ARG, 0, MIGRATE_VM}, - { "migrate-live", REQ_ARG, 0, MIGRATE_VM_LIVE}, #endif }; @@ -1750,42 +1743,7 @@ snapshot_request(const char *vmname, char *file, bool suspend) return (send_message(vmname, nvl)); } - -static int -migration_request(const char *vmname, const char *migrate_vm, bool live) -{ - nvlist_t *nvl; - char *hostname, *pos; - int rc; - unsigned int port = DEFAULT_MIGRATION_PORT; - - hostname = strdup(migrate_vm); - - if ((pos = strchr(hostname, ':')) != NULL) { - *pos = '\0'; - pos = pos + 1; - - rc = sscanf(pos, "%u", &port); - - if (rc <= 0) { - fprintf(stderr, "Could not parse the port\n"); - free(hostname); - return (EINVAL); - } - } - - nvl = nvlist_create(0); - nvlist_add_string(nvl, "cmd", "migrate"); - nvlist_add_string(nvl, "hostname", hostname); - nvlist_add_number(nvl, "port", port); - nvlist_add_bool(nvl, "live", live); - - free(hostname); - - return (send_message(vmname, nvl)); -} - -#endif /* BHYVE_SNAPSHOT */ +#endif int main(int argc, char *argv[]) @@ -1805,7 +1763,7 @@ main(int argc, char *argv[]) struct tm tm; struct option *opts; #ifdef BHYVE_SNAPSHOT - char *checkpoint_file = NULL, *migrate_host = NULL; + char *checkpoint_file = NULL; #endif cpu_intel = cpu_vendor_intel(); @@ -1974,14 +1932,6 @@ main(int argc, char *argv[]) checkpoint_file = optarg; vm_suspend_opt = (ch == SET_SUSPEND_FILE); break; - case MIGRATE_VM: - case MIGRATE_VM_LIVE: - if (migrate_host != NULL) - usage(cpu_intel); - - migrate_host = optarg; - vm_migrate_live = (ch == MIGRATE_VM_LIVE); - break; #endif default: usage(cpu_intel); @@ -2464,9 +2414,6 @@ main(int argc, char *argv[]) #ifdef BHYVE_SNAPSHOT if (!error && checkpoint_file) error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt); - - if (!error && migrate_host) - error = migration_request(vmname, migrate_host, vm_migrate_live); #endif free (opts); From nobody Wed Jun 21 07:18:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmFGN6qdQz4gqXN; Wed, 21 Jun 2023 07:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmFGN3T7wz3p9q; Wed, 21 Jun 2023 07:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687331900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3XSWxunq+Ge57zh+fP4+FtRVjMigdZkXb7qaOFqlAxk=; b=ZhtDqqML4MGF+E3fYB1zUpnTOLn5AZXRXSH/CPk8hlvYspjd5J/cwhJmRDTMnoRXtazLaw 9tNdsRh5ngRJDFpK5qbxYFgjQ3JwNB2TdJXU6aLC7s6QoNuYCGmNyktA8EnvxAFFQUAuRb Cs5LJYe6o7uaYTR6qjJt0+TyB09N08jkvyItfnaqWuQl5Wn4QUW9asfVa19mZLOy7tkv03 URlXE5O/7eSgywOAqp8uwvQBx/SIXOnpWL9c2r0Go5RIdci7OYw4CaOPjSXAtUBssc4y6O OWbUKgo/k+kK8gAiqrx8OVfml1dQBiNR/iEu6G2hO5/K+k9A3m6cVlk7s9O6cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687331900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3XSWxunq+Ge57zh+fP4+FtRVjMigdZkXb7qaOFqlAxk=; b=ZEcHxJX0xrjWN0xaYFnwbVDVVPtuOlVY4hyXJtdbJJK5iONEKdDYT0hbYKUH8eoggsxmcc yRCgpDkvx4spAUcMgEhRkWNjMHJZ2MA5Fusg1fwo9gMfPVL3LncqxHtPXOWBid7Z8mzC3Q PN53pE715L1Le7X1pRk0VG5J0geDOaFOrYKWY6iG5bhZtug59PtppXEIgqRlmn+CcJfIZ7 je7LL3ezbOlGW6UeYtjUi7G2UvGqBH8AFlmVMRiFXTX9sqpEpHmr3AF7y0jomIzesom6Gw uwVDGF6oN8nt+z23chmkznIAwCqVCw1oZN8kiZS+uYeOoaVrujJIs6SOkKyDTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687331900; a=rsa-sha256; cv=none; b=rkwYBZVspabhGjurx/JRWqO+JwXIVBxkcYozItdtZHEVjLagkh10TvDvdbmXxMVzeVlJUV k914md+GpFdCc103DjzYo8z0nRUiH6g26gVjM4554TzCnoK76rsRjzs0qm/ucw4hUQs/du UNOF98POl9Ih82ooF8S3dbDaS65BVDWICn8KGwCKLq4ROe8Qrh6Pj8FgKbETnH5HAP01ch 8w00r7UVNzZ5aw9N+XDl9dQZAaEUeLXCw7/Ub0HoM5tN5OZbrVZC8FectSVIgjDYDbjY7s 1uILk1j2KwpjWJhr1FrSDo1fSEkoD3uN/ZM2BKiGn2dziSMC79P0ETl1whQdww== 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 4QmFGN0cFlzXyJ; Wed, 21 Jun 2023 07:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L7IKjU015190; Wed, 21 Jun 2023 07:18:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L7IKKE015189; Wed, 21 Jun 2023 07:18:20 GMT (envelope-from git) Date: Wed, 21 Jun 2023 07:18:20 GMT Message-Id: <202306210718.35L7IKKE015189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 133b132bc1b6 - main - sctp: fix man page for socket option controlling delayed acks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 133b132bc1b612abe591c8f54680c3da8491e194 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=133b132bc1b612abe591c8f54680c3da8491e194 commit 133b132bc1b612abe591c8f54680c3da8491e194 Author: Michael Tuexen AuthorDate: 2023-06-21 07:03:30 +0000 Commit: Michael Tuexen CommitDate: 2023-06-21 07:18:05 +0000 sctp: fix man page for socket option controlling delayed acks The SCTP_DELAYED_ACK_TIME socket option was replaced by the SCTP_DELAYED_SACK in the socket API specification in draft-ietf-tsvwg-sctpsocket-14. The code was updated in r170056, but the man page was not. PR: 272124 MFC after: 3 days --- share/man/man4/sctp.4 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/share/man/man4/sctp.4 b/share/man/man4/sctp.4 index 2c47c5b5dcd3..daac5638ee46 100644 --- a/share/man/man4/sctp.4 +++ b/share/man/man4/sctp.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 9, 2020 +.Dd June 21, 2023 .Dt SCTP 4 .Os .Sh NAME @@ -299,12 +299,13 @@ This option lets the caller set it to a smaller value. Note that while the user can change this value, if the P-MTU is smaller than the value set by the user, then the P-MTU value will override any user setting. -.It Dv SCTP_DELAYED_ACK_TIME +.It Dv SCTP_DELAYED_SACK This option lets the user both set and get the -delayed ack time (in milliseconds) that +delayed ack time (in milliseconds) and the ack frequency that .Tn SCTP is using. -The default is 200 milliseconds. +The default delayed ack time is 200 milliseconds and the default +ack frequency is 2. .It Dv SCTP_PARTIAL_DELIVERY_POINT .Tn SCTP at times may need to start delivery of a From nobody Wed Jun 21 09:10:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmHm33Lx3z4fkg0; Wed, 21 Jun 2023 09:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmHm32vB5z3FcB; Wed, 21 Jun 2023 09:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687338643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jmruN4Iz9OfcaYM426NTXT82KRuma2nKgR7Mm2KinCI=; b=Fg1+8LeK1PfDcTOJ+rRWz2Wnk6fIKDtrBzjePWkOmNQsEwRAxCwqQiRLGzXAn9dqWpZD9m Ig11aEk70Hrbl18KR24SrEfboIF+qZL3pG7xOhsImkZKfkN9zOuDGu1bTZNzpv5FyjMDQI 7xjVW7Ph38k9pPckl20P83F/FLgz1YjHiSEkeq2wp+yUR7UXmAY7sxaMGQrWzEfg4dMY0F aGB+ijzJZo7E7/o85XvpOgkl35OLSoYn4zfp1wnW4+JnCCdcKQUwrgneyRASHWvvYUOMNR 9G5tElYGRI+fbb+tE1qsmk7vfAIuiayInw0E5VzHsvqa5eGO7aQhJuk3dKvL3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687338643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jmruN4Iz9OfcaYM426NTXT82KRuma2nKgR7Mm2KinCI=; b=Ce729Ui2Di6gpt5xkqJB2j3N3Bhs3DgHvN+mid5uDBiPd7B1GY2AFRZOCq8FGaadFC3lGJ VgYbMwS5bkNO3yVXAqFntehGO8XbA+BSqsddmpBkKdhentdkBdXdUMxsoEZhKSbe1LObwf nmT9UIrq8zbDZmyvXVJ19DNvlDX3CCh76aauPOmETkEc/F1OXq/vSk4B+rW+KMdc/eFxR8 cvW4tXTNV5q/13BJYi9ZFZWx47W93USaViQFkyEsM1NgpHfuNVHfddBX1nlVNuebuMMTWR fF1ktiKWNtyvwtt53m+s7VR0FvmocJeiqJDCKD0MrIzwv6KV7OX8EaQTY6CXvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687338643; a=rsa-sha256; cv=none; b=FfXmdEtkgwx1Z9ieGHk2IWk8lEYn5m08xHk1rijbHElKMispUtgmrPiQbM304xVQTlR6G4 jAM63F2aH+bygWghdWJEk0R8zS106+o1Q8ApMiVX3c/yIyIIrlXkjt+WKPnbh3hzZheHsm vtu/VHAAm0mM89dOXSI4g2byT/2X8Wrjyjx6MG01oYTW32vdRf3cbdhoGXs8exrYJoRlop IdMFgJz/t6GJ1jdrllBFfxtfYK8cp64WUklldSDJiSt6PXHFXIxnDsGNHW9p+hfEodjmLK qrbY5zfGqmAj/UUqF+3huO7ZXZ5s9BGBbvQJh0NZse2Rs30fYxV56ixtaG6RtQ== 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 4QmHm31zVZzZdX; Wed, 21 Jun 2023 09:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L9AhD8005989; Wed, 21 Jun 2023 09:10:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L9AhdB005988; Wed, 21 Jun 2023 09:10:43 GMT (envelope-from git) Date: Wed, 21 Jun 2023 09:10:43 GMT Message-Id: <202306210910.35L9AhdB005988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 83c701af5340 - main - stress2: Added two syzkaller reproducers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83c701af5340d2aa0a665498ad5a54f025c74c4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=83c701af5340d2aa0a665498ad5a54f025c74c4c commit 83c701af5340d2aa0a665498ad5a54f025c74c4c Author: Peter Holm AuthorDate: 2023-06-21 09:10:13 +0000 Commit: Peter Holm CommitDate: 2023-06-21 09:10:13 +0000 stress2: Added two syzkaller reproducers --- tools/test/stress2/misc/all.exclude | 2 + tools/test/stress2/misc/syzkaller66.sh | 156 +++++++++++++++++++++++++++++++++ tools/test/stress2/misc/syzkaller67.sh | 99 +++++++++++++++++++++ 3 files changed, 257 insertions(+) diff --git a/tools/test/stress2/misc/all.exclude b/tools/test/stress2/misc/all.exclude index 36ff8790a4c8..2560b22149d5 100644 --- a/tools/test/stress2/misc/all.exclude +++ b/tools/test/stress2/misc/all.exclude @@ -69,6 +69,8 @@ syzkaller31.sh panic: Bad tailq NEXT(0xfffffe01a0899430->tqh_last) != NULL 2022 syzkaller55.sh panic: Counter goes negative 20220525 syzkaller59.sh Page fault 20220625 syzkaller65.sh panic: in_pcblookup_hash_locked: invalid local address 20230318 +syzkaller66.sh panic: in_pcbconnect: inp is already connected 20230621 +syzkaller67.sh panic: ASan: Invalid access, 8-byte read at ... 20230621 truss3.sh WiP 20200915 # Test not to run for other reasons: diff --git a/tools/test/stress2/misc/syzkaller66.sh b/tools/test/stress2/misc/syzkaller66.sh new file mode 100755 index 000000000000..8d1e9afe6f6c --- /dev/null +++ b/tools/test/stress2/misc/syzkaller66.sh @@ -0,0 +1,156 @@ +#!/bin/sh + +# panic: in_pcbconnect: inp is already connected +# cpuid = 2 +# time = 1687326262 +# KDB: stack backtrace: +# db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe016e604b60 +# vpanic() at vpanic+0x150/frame 0xfffffe016e604bb0 +# panic() at panic+0x43/frame 0xfffffe016e604c10 +# in_pcbconnect_setup() at in_pcbconnect_setup/frame 0xfffffe016e604c60 +# tcp_connect() at tcp_connect+0xa3/frame 0xfffffe016e604ca0 +# tcp_usr_connect() at tcp_usr_connect+0xf3/frame 0xfffffe016e604d10 +# soconnectat() at soconnectat+0xaf/frame 0xfffffe016e604d60 +# kern_connectat() at kern_connectat+0xe1/frame 0xfffffe016e604dc0 +# sys_connect() at sys_connect+0x75/frame 0xfffffe016e604e00 +# amd64_syscall() at amd64_syscall+0x157/frame 0xfffffe016e604f30 +# fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe016e604f30 +# --- syscall (0, FreeBSD ELF64, syscall), rip = 0x823c81a6a, rsp = 0x8210ed3c8, rbp = 0x8210ed3e0 --- +# KDB: enter: panic +# [ thread pid 46907 tid 100356 ] +# Stopped at kdb_enter+0x32: movq $0,0xddf693(%rip) +# db> x/s version +# version: FreeBSD 14.0-CURRENT #0 main-n263725-1efa7dbc0798e: Wed Jun 21 09:13:50 CEST 2023 +# pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO-KASAN\012 +# db> + +[ `uname -p` != "amd64" ] && exit 0 +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c < + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void kill_and_wait(int pid, int* status) +{ + kill(pid, SIGKILL); + while (waitpid(-1, status, 0) != pid) { + } +} + +static void sleep_ms(uint64_t ms) +{ + usleep(ms * 1000); +} + +static uint64_t current_time_ms(void) +{ + struct timespec ts; + if (clock_gettime(CLOCK_MONOTONIC, &ts)) + exit(1); + return (uint64_t)ts.tv_sec * 1000 + (uint64_t)ts.tv_nsec / 1000000; +} + +static void execute_one(void); + +#define WAIT_FLAGS 0 + +static void loop(void) +{ + int iter __unused = 0; + for (;; iter++) { + int pid = fork(); + if (pid < 0) + exit(1); + if (pid == 0) { + execute_one(); + exit(0); + } + int status = 0; + uint64_t start = current_time_ms(); + for (;;) { + if (waitpid(-1, &status, WNOHANG | WAIT_FLAGS) == pid) + break; + sleep_ms(1); + if (current_time_ms() - start < 5000) + continue; + kill_and_wait(pid, &status); + break; + } + } +} + +uint64_t r[2] = {0xffffffffffffffff, 0xffffffffffffffff}; + +void execute_one(void) +{ + intptr_t res = 0; + res = syscall(SYS_socket, 2ul, 1ul, 0); + if (res != -1) + r[0] = res; + *(uint8_t*)0x200001c0 = 0x10; + *(uint8_t*)0x200001c1 = 2; + *(uint16_t*)0x200001c2 = htobe16(0x4e22); + *(uint32_t*)0x200001c4 = htobe32(0x7f000001); + memset((void*)0x200001c8, 0, 8); + syscall(SYS_bind, r[0], 0x200001c0ul, 0x10ul); + syscall(SYS_listen, r[0], 0); + res = syscall(SYS_socket, 2ul, 1ul, 0); + if (res != -1) + r[1] = res; + *(uint8_t*)0x200000c0 = 0x10; + *(uint8_t*)0x200000c1 = 2; + *(uint16_t*)0x200000c2 = htobe16(0x4e22); + *(uint32_t*)0x200000c4 = htobe32(0x7f000001); + memset((void*)0x200000c8, 0, 8); + syscall(SYS_connect, r[1], 0x200000c0ul, 0x10ul); + *(uint64_t*)0x20002580 = 0; + *(uint32_t*)0x20002588 = 0; + *(uint64_t*)0x20002590 = 0; + *(uint64_t*)0x20002598 = 0; + *(uint64_t*)0x200025a0 = 0; + *(uint64_t*)0x200025a8 = 0; + *(uint32_t*)0x200025b0 = 0; + syscall(SYS_sendmsg, r[1], 0x20002580ul, 0x20104ul); + syscall(SYS_shutdown, r[1], 1ul); + *(uint8_t*)0x200000c0 = 0x10; + *(uint8_t*)0x200000c1 = 2; + *(uint16_t*)0x200000c2 = htobe16(0x4e22); + *(uint32_t*)0x200000c4 = htobe32(0x7f000001); + memset((void*)0x200000c8, 0, 8); + syscall(SYS_connect, r[1], 0x200000c0ul, 0x10ul); +} +int main(void) +{ + syscall(SYS_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x1012ul, -1, 0ul); + loop(); + return 0; +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c || exit 1 + +(cd /tmp; timeout 2m ./$prog) + +rm -rf /tmp/$prog /tmp/$prog.c /tmp/syzkaller.* +exit 0 diff --git a/tools/test/stress2/misc/syzkaller67.sh b/tools/test/stress2/misc/syzkaller67.sh new file mode 100755 index 000000000000..d5dc340442ae --- /dev/null +++ b/tools/test/stress2/misc/syzkaller67.sh @@ -0,0 +1,99 @@ +#!/bin/sh + +# panic: ASan: Invalid access, 8-byte read at 0xfffffe01fece46f8, StackMiddle(f2) +# cpuid = 4 +# time = 1687335671 +# KDB: stack backtrace: +# db_trace_self_wrapper() at db_trace_self_wrapper+0xa5/frame 0xfffffe01fece42f0 +# kdb_backtrace() at kdb_backtrace+0xc7/frame 0xfffffe01fece4450 +# vpanic() at vpanic+0x1d7/frame 0xfffffe01fece4510 +# panic() at panic+0xb5/frame 0xfffffe01fece45e0 +# kasan_report() at kasan_report+0xdc/frame 0xfffffe01fece46b0 +# __cap_rights_is_set() at __cap_rights_is_set+0x186/frame 0xfffffe01fece47d0 +# fget_fcntl() at fget_fcntl+0xd7/frame 0xfffffe01fece48d0 +# kern_fcntl() at kern_fcntl+0x602/frame 0xfffffe01fece4c10 +# kern_fcntl_freebsd() at kern_fcntl_freebsd+0x244/frame 0xfffffe01fece4d30 +# ia32_syscall() at ia32_syscall+0x32a/frame 0xfffffe01fece4f30 +# int0x80_syscall_common() at int0x80_syscall_common+0x9c/frame 0xffffdb38 +# KDB: enter: panic +# [ thread pid 4224 tid 100231 ] +# Stopped at kdb_enter+0x34: movq $0,0x1e3f7c1(%rip) +# db> x/s version +# version: FreeBSD 14.0-CURRENT #0 main-n263725-1efa7dbc0798e: Wed Jun 21 09:13:50 CEST 2023 +# pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO-KASAN +# db> + +uname -p | grep -Eq "amd64|i386" || exit 0 +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c < +#include +#include +#include +#include +#include +#include +#include +#include +#include + +uint64_t r[5] = {0x0, 0x0, 0x0, 0x0, 0x0}; + +int main(void) +{ + syscall(SYS_mmap, 0x10000000, 0x1000000, 7, 0x1012, -1, 0); + intptr_t res = 0; + syscall(SYS_munmap, 0x10ffa000, 0x3000); + syscall(SYS_mmap, 0x10ffd000, 0x1000, 4, 0x1010, -1, 0); + syscall(SYS_mmap, 0x10ffc000, 0x1000, 0, 0x1010, -1, 0); + syscall(SYS_mmap, 0x10ffc000, 0x1000, 0, 0x1010, -1, 0); + syscall(SYS_mprotect, 0x10ffe000, 0x2000, 7); + syscall(SYS_mprotect, 0x10ffd000, 0x3000, 0); + syscall(SYS_fork); + res = syscall(SYS_fork); + if (res != -1) + r[0] = res; + syscall(SYS_fork); + res = syscall(SYS_fork); + if (res != -1) + r[1] = res; + syscall(SYS_sigqueue, (intptr_t)r[1], 0x2b, 0); + res = syscall(SYS_fork); + if (res != -1) + r[2] = res; + syscall(SYS_sigqueue, (intptr_t)r[2], 0x2b, 0); + syscall(SYS_vfork); + syscall(SYS_fcntl, -1, 5, 0); + syscall(SYS_sigqueue, 0, 0x2b, 0); + syscall(SYS_getpgrp, (intptr_t)r[0]); + syscall(SYS_fork); + res = syscall(SYS_fork); + if (res != -1) + r[3] = res; + syscall(SYS_sigqueue, (intptr_t)r[3], 0x2b, 0); + syscall(SYS_getpid); + syscall(SYS_mmap, 0x10ffc000, 0x1000, 3, 0x10, -1, 7); + syscall(SYS_mmap, 0x10ffc000, 0x1000, 3, 0x10, -1, 7); + res = syscall(SYS_fork); + if (res != -1) + r[4] = res; + syscall(SYS_sigqueue, (intptr_t)r[4], 0xc, 0); + return 0; +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 -m32 /tmp/$prog.c || exit 1 + +(cd /tmp; timeout 2m ./$prog) + +rm -rf /tmp/$prog /tmp/$prog.c /tmp/syzkaller.* +exit 0 From nobody Wed Jun 21 10:25:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmKQF5Y8yz4gbN4; Wed, 21 Jun 2023 10:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmKQF53hsz3rQf; Wed, 21 Jun 2023 10:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687343125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgBedy3pK+cLjPukqAd9nqRHFsF8qikERhHSUqJEaKM=; b=lBbxnpyoLvPlDifNKo7x+6HFy2fHbHLFPZkJzgpT+iO2tdF0+bBaY1yTLSkyAu+lWTJQFS JWEol0d8HpiJXhxzsrAA4zpQaGtUi3sOAsptF+0XvV7w/+WnC/4ubKw3rw0uqg8vbwVBs5 Dja2O+BirqN2etO6bd4zy8x9DPls+g+z2SUz+oPWv2GfZwwBTQHeX88Ej7YdWR+59hR3Fi HtUolaU8Sws1KcuZyIibxqsfiDzJyyFp83xdO5BQySrrTL6gq1gi+nCWXglzN6gyBEWNRw cyaFjvTpFpipoOMucHtY5SCjfhJ3Evsjh/Li8vpdlWqx4dsRD/Afkj4dACk6Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687343125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgBedy3pK+cLjPukqAd9nqRHFsF8qikERhHSUqJEaKM=; b=l8MkWKMpoL71zdpYw7VGBEUMM9F+KUwHvs0aEuPjzHTZ3J/UlYXXPWGwfSQzLtuPnmnB4S vwo/8LtbbGpvhhPY/YYH9KGe5OVVT4X8SFzyajCTo99EvAaXqX+ERmvIF9oVNvjfPTYar/ QeWO/ZVFywNMLTiUU9Aq5DVHrZUWjrMNV787jq3BVx16qPLJoWKhzDLTYzwcf9lfKSE4Wi VfNAh+ETeUlKup4AAEeCWqyf5x1R3KGYZV/EcDoxChZdomTnF+rgC4U03cTN2N6zOoMUz0 E49ehxvZj3XYZhT2Qn5vSqUjKuHCPzVZdjHpxP5bTj2zmmCr66jV9m/hT5PCBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687343125; a=rsa-sha256; cv=none; b=xDnP++0AKhSUZ+uey/yQeFJ5Mf1r8xfZTW3I5tSyr3tfSSqePz1bJnGGhS2XYgkyex6CTs sQnbjpH6oCtXHUnIYEk5JbKBGsQw3od3ZTtcohVSG/SelLFQIf0p4s88nVrp3rYJ6FSVxS 2oMEfwIVSZ5+aBmig6qV8nZ6tbi2+a3LQ6WTw/6GVXk6RPBtLdPyNRLhEvS8Bq3iZvFsG1 Q2he8n/alxnqoHZW8CMyEO49JJXVoFPmCuy5LajX9152JeUUdgrEpnhxgz9A/z/KMHMEOm FqzSmTEmXMqsuRmTkZ7Gua5arnfPX7vpyfuasO+a9vRdq3fvfv+wXtPxXelhaw== 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 4QmKQF41fQzdDr; Wed, 21 Jun 2023 10:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LAPPdJ026979; Wed, 21 Jun 2023 10:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LAPP5V026978; Wed, 21 Jun 2023 10:25:25 GMT (envelope-from git) Date: Wed, 21 Jun 2023 10:25:25 GMT Message-Id: <202306211025.35LAPP5V026978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 17050a2b5b07 - main - Hyper-V: vmbus: Prevent load/store reordering when access ring buffer index List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17050a2b5b07160635aaa80b9aa4df4de500b090 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=17050a2b5b07160635aaa80b9aa4df4de500b090 commit 17050a2b5b07160635aaa80b9aa4df4de500b090 Author: Wei Hu AuthorDate: 2023-06-21 09:31:46 +0000 Commit: Wei Hu CommitDate: 2023-06-21 10:10:49 +0000 Hyper-V: vmbus: Prevent load/store reordering when access ring buffer index When running VM on ARM64 Hyper-V, we have seen netvsc/hn driver hit assert on reading duplicated network completion packets over vmbus channel or one of the tx channels stalls completely. This seems to caused by processor reordering the instructions when vmbus driver reading or updating its channel ring buffer indexes. Fix this by using load acquire and store release instructions to enforce the order of these memory accesses. PR: 271764 Reported by: Souradeep Chakrabarti Reviewed by: Souradeep Chakrabarti Tested by: whu Sponsored by: Microsoft --- sys/dev/hyperv/vmbus/vmbus_br.c | 31 +++++++++++++++++-------------- sys/dev/hyperv/vmbus/vmbus_brvar.h | 6 ++++-- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus_br.c b/sys/dev/hyperv/vmbus/vmbus_br.c index 7311f87fd596..c3771f2607b9 100644 --- a/sys/dev/hyperv/vmbus/vmbus_br.c +++ b/sys/dev/hyperv/vmbus/vmbus_br.c @@ -142,8 +142,8 @@ vmbus_rxbr_avail(const struct vmbus_rxbr *rbr) uint32_t rindex, windex; /* Get snapshot */ - rindex = rbr->rxbr_rindex; - windex = rbr->rxbr_windex; + rindex = atomic_load_acq_32(&rbr->rxbr_rindex); + windex = atomic_load_acq_32(&rbr->rxbr_windex); return (rbr->rxbr_dsize - VMBUS_BR_WAVAIL(rindex, windex, rbr->rxbr_dsize)); @@ -289,7 +289,7 @@ vmbus_txbr_need_signal(const struct vmbus_txbr *tbr, uint32_t old_windex) * This is the only case we need to signal when the * ring transitions from being empty to non-empty. */ - if (old_windex == tbr->txbr_rindex) + if (old_windex == atomic_load_acq_32(&tbr->txbr_rindex)) return (TRUE); return (FALSE); @@ -301,8 +301,8 @@ vmbus_txbr_avail(const struct vmbus_txbr *tbr) uint32_t rindex, windex; /* Get snapshot */ - rindex = tbr->txbr_rindex; - windex = tbr->txbr_windex; + rindex = atomic_load_acq_32(&tbr->txbr_rindex); + windex = atomic_load_acq_32(&tbr->txbr_windex); return VMBUS_BR_WAVAIL(rindex, windex, tbr->txbr_dsize); } @@ -427,7 +427,7 @@ vmbus_txbr_write_call(struct vmbus_txbr *tbr, * is copied. */ __compiler_membar(); - tbr->txbr_windex = windex; + atomic_store_rel_32(&tbr->txbr_windex, windex); mtx_unlock_spin(&tbr->txbr_lock); @@ -471,7 +471,7 @@ vmbus_txbr_write(struct vmbus_txbr *tbr, const struct iovec iov[], int iovlen, } /* Save br_windex for later use */ - old_windex = tbr->txbr_windex; + old_windex = atomic_load_acq_32(&tbr->txbr_windex); /* * Copy the scattered channel packet to the TX bufring. @@ -494,7 +494,7 @@ vmbus_txbr_write(struct vmbus_txbr *tbr, const struct iovec iov[], int iovlen, * is copied. */ __compiler_membar(); - tbr->txbr_windex = windex; + atomic_store_rel_32(&tbr->txbr_windex, windex); mtx_unlock_spin(&tbr->txbr_lock); @@ -557,7 +557,8 @@ vmbus_rxbr_peek(struct vmbus_rxbr *rbr, void *data, int dlen) mtx_unlock_spin(&rbr->rxbr_lock); return (EAGAIN); } - vmbus_rxbr_copyfrom(rbr, rbr->rxbr_rindex, data, dlen); + vmbus_rxbr_copyfrom(rbr, + atomic_load_acq_32(&rbr->rxbr_rindex), data, dlen); mtx_unlock_spin(&rbr->rxbr_lock); @@ -622,10 +623,11 @@ vmbus_rxbr_idxadv_peek(struct vmbus_rxbr *rbr, void *data, int dlen, rindex = VMBUS_BR_IDXINC(rbr->rxbr_rindex, idx_adv + sizeof(uint64_t), br_dsize); __compiler_membar(); - rbr->rxbr_rindex = rindex; + atomic_store_rel_32(&rbr->rxbr_rindex, rindex); } - vmbus_rxbr_copyfrom(rbr, rbr->rxbr_rindex, data, dlen); + vmbus_rxbr_copyfrom(rbr, + atomic_load_acq_32(&rbr->rxbr_rindex), data, dlen); mtx_unlock_spin(&rbr->rxbr_lock); @@ -667,7 +669,7 @@ vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, rindex = VMBUS_BR_IDXINC(rbr->rxbr_rindex, idx_adv + sizeof(uint64_t), br_dsize); __compiler_membar(); - rbr->rxbr_rindex = rindex; + atomic_store_rel_32(&rbr->rxbr_rindex, rindex); mtx_unlock_spin(&rbr->rxbr_lock); @@ -700,7 +702,8 @@ vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) /* * Copy channel packet from RX bufring. */ - rindex = VMBUS_BR_IDXINC(rbr->rxbr_rindex, skip, br_dsize); + rindex = VMBUS_BR_IDXINC(atomic_load_acq_32(&rbr->rxbr_rindex), + skip, br_dsize); rindex = vmbus_rxbr_copyfrom(rbr, rindex, data, dlen); /* @@ -712,7 +715,7 @@ vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) * Update the read index _after_ the channel packet is fetched. */ __compiler_membar(); - rbr->rxbr_rindex = rindex; + atomic_store_rel_32(&rbr->rxbr_rindex, rindex); mtx_unlock_spin(&rbr->rxbr_lock); diff --git a/sys/dev/hyperv/vmbus/vmbus_brvar.h b/sys/dev/hyperv/vmbus/vmbus_brvar.h index 95bf4338ff1c..0edcc61ae5e1 100644 --- a/sys/dev/hyperv/vmbus/vmbus_brvar.h +++ b/sys/dev/hyperv/vmbus/vmbus_brvar.h @@ -99,14 +99,16 @@ static __inline bool vmbus_txbr_empty(const struct vmbus_txbr *tbr) { - return (tbr->txbr_windex == tbr->txbr_rindex ? true : false); + return (atomic_load_acq_32(&tbr->txbr_windex) == + atomic_load_acq_32(&tbr->txbr_rindex) ? true : false); } static __inline bool vmbus_rxbr_empty(const struct vmbus_rxbr *rbr) { - return (rbr->rxbr_windex == rbr->rxbr_rindex ? true : false); + return (atomic_load_acq_32(&rbr->rxbr_windex) == + atomic_load_acq_32(&rbr->rxbr_rindex) ? true : false); } static __inline int From nobody Wed Jun 21 12:22:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmN1531Hsz4gGmb; Wed, 21 Jun 2023 12:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmN152M7qz3v2b; Wed, 21 Jun 2023 12:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687350137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gByh6RXiYHwctmXxtrnPFmOaV+JKsdT6Z30ohs1N78w=; b=oFDNXZnLnzPxVnFOCU2b81RJ/S2CuP47pfSphZZE7qRQxi/mkuMXSG573VySyrynV2aZJT dPKqUacG33sBwE5keiFzDy8/wNuzJlpQyDgYXz4J8YSzHMKfASm5Xjyoz6dbsoXKqaFz2u atQJXssjkH4Ii8Bmj25o9p+TsfL8h2qAZfE4xBZaCrpigWVrmXki11E2Q8PjC9Po7KlpBO 1Z57UgMEQSXZLaHc9Qv3r1/Cn7Oraefya84hn0GPg+9j7dltDYnyaCwVbvKuGY2VikB1+/ lkKOKOvvNMXBAbNEAk4LqBAvKbGkJZTBTrkVZ1du4lHDFiAo2eNwgLd7Ws5aaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687350137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gByh6RXiYHwctmXxtrnPFmOaV+JKsdT6Z30ohs1N78w=; b=TqGNufgqEGRE6KkjXSA+EF0fp5l4uIMTlkxIzOGyz3Ur50HZpmy3KAcrac5hcbNyLa9p8Q YLQoLj9r4CW7EszXKAn9C8il0wMKBExzVhFCjbZvQMCkEC+WRmDjjhc2LZfc3XXQJluXVg h5rszLaevo3Xf4PXRUebdTkzLP4xuVXlB/gzWW1tT9A2Em0GUchQ+xxqS1IO85LHwlJ/aE TZTkr3yOfJd5I38CrWY58IF/fFHXaL7vyVHA4ooudzrqLUsLmqa6hcdE99dUf3Q4nwEq7v OTHl7+kk7nOtOCBG+Sa4oEth9n2Np+jiCkJityRQ624KK+fsfM5Oit1r9W9WOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687350137; a=rsa-sha256; cv=none; b=tcc7IQuSXoS/AMkOEdCoITw8+f2QGux6jFmov/e0WrQjkPeaqXvonsviQklM5ZIund4AAC y7oJg55V99SFpe5Y9oBejfLVP8gUwPkmsF1aHaNTStqVEOwT7hyFUn7TVSi3frIK1rSejM LG06jFjLS+IuUQAKEFvCVW/MBSY5JdpXMOmeyeatCY2lXxO91PGOy+DrbBP4fZLv2tcu1f hPbGbh4E4fRaerpXZa3BY4Yfj5w2+cIrbqOL2XLGiKtbWG1WZN0uXSi3Up42R6/HRLLXpa Gmj/O0gEqiRUmop9iyyUtE4l9sIKXKjLxXREqlb7u+t9bJ6eyCACl1lhxCJR1A== 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 4QmN151RqCzhK2; Wed, 21 Jun 2023 12:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LCMHmn025949; Wed, 21 Jun 2023 12:22:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LCMH7a025948; Wed, 21 Jun 2023 12:22:17 GMT (envelope-from git) Date: Wed, 21 Jun 2023 12:22:17 GMT Message-Id: <202306211222.35LCMH7a025948@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 3a1bfe881a24 - main - arm64: Enable the Hyper-V keyboard driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a1bfe881a24a76ff8d6406476461924a027ea8a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3a1bfe881a24a76ff8d6406476461924a027ea8a commit 3a1bfe881a24a76ff8d6406476461924a027ea8a Author: Andrew Turner AuthorDate: 2023-06-14 12:56:36 +0000 Commit: Andrew Turner CommitDate: 2023-06-21 12:17:40 +0000 arm64: Enable the Hyper-V keyboard driver Tested on Hyper-V on a Windows Dev Kit 2023 Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D40533 --- sys/conf/files.arm64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index da71606a4b84..f3cfab68538a 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -267,6 +267,8 @@ dev/hyperv/utilities/vmbus_heartbeat.c optional hyperv acpi dev/hyperv/utilities/vmbus_ic.c optional hyperv acpi dev/hyperv/utilities/vmbus_shutdown.c optional hyperv acpi dev/hyperv/utilities/hv_kvp.c optional hyperv acpi +dev/hyperv/input/hv_kbd.c optional hyperv acpi +dev/hyperv/input/hv_kbdc.c optional hyperv acpi dev/hyperv/netvsc/hn_nvs.c optional hyperv acpi dev/hyperv/netvsc/hn_rndis.c optional hyperv acpi dev/hyperv/netvsc/if_hn.c optional hyperv acpi From nobody Wed Jun 21 15:27:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmS7F6gL2z4g3SW; Wed, 21 Jun 2023 15:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmS7F69wHz3vrn; Wed, 21 Jun 2023 15:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687361273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=giE6C4zIXFt2W7QSVhBAXEZH0dX0zoJRFfhhqCRmovY=; b=bT5F+Bz2zT4i+Rw2xOpwx8Yv22kjLV97NSVX60/nT7lltRwQEblYMECTQetqwC+mJyLXa6 zzAUlfJ6S4yFVN2DZEfZ7CPY0g/MGOIzroN8TrOORURDW4P4R1ANJkBhMv054dggu7LrU6 XOFUTyhFJj6/8dETuGEqFnwTaJmjDh+2LeHEUdUu/ED1LBhafGhbYa0SIWgEeD7Kr0c6cl 5zq9L4Lq8E1MJoMP/jCeSFF/2AyCZJpF1/Y3eTUrJ5cQzeBhpl84cfN490pbri1j2k4Miw 7LpMxt26zzQIMN0XFKsnCVARaBDLYxYZmNiIgMH3tcQg5y43G7B3AIjn1EEg3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687361273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=giE6C4zIXFt2W7QSVhBAXEZH0dX0zoJRFfhhqCRmovY=; b=grKk10SiFNAFrA0OombYVh8XjlMrPTHc8qS+S13ZkOQOQ86SO8C87V001t/2IszE15XLmD ngfU8BiEqlX6HE9whnsUXJBhpCHlyAM0psns/vr835j/0XXxLZt1B1pXXwMoHsAEMwkSkX mY/iTq/e8UCZ8IqtRJX76xsPjUhcEmEAMhZ7pbYPkdWphYSM+i2uwHASjXvw18Twl2tFFm f6pfTB1Wrjruv4CeewQXd+Uh6uylDhWJkL6449CvDnQn94FCCZuJgqKT/Zj9w2oeqn1gbu 7t3Q0XNJbivYWUBbWiodsVKRhkgHw4G4Phiy3S66rFOATcq0sNLIDKCT8gHpxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687361273; a=rsa-sha256; cv=none; b=j9fXsgQT3rq8xD/zq0pTXkVAe4tIAAgj1cHwGjXytOHpHQ5+Y/JKrRYwgecAqBquRkkBeo OxgNnQ8+LkzvYqfYfbKBMlKSHwI6nU0Up8f6kAs4LvRTgH/n1B/30ALrFUlNNdId9Pw73v ewFjZrpUkNWKE+DUh4IvvcnPOASiY4nuXNPoqqxez//bas2FX1zKwDA6iXu1H51yVEyPBH g2JExQ8UGqXX2Zwq+0hIvCLp3nqPkQdqUP0LoOzvHZE9iRketHqScCpaxyVt+omEaMcyuD ezH/oK5wLo1bQvBiEcx0CkSsDKIYivxnrtuUGlSLOEgkldlL/9Ffion28DsE7g== 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 4QmS7F5GJ0zlqq; Wed, 21 Jun 2023 15:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LFRre5023751; Wed, 21 Jun 2023 15:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LFRrDs023750; Wed, 21 Jun 2023 15:27:53 GMT (envelope-from git) Date: Wed, 21 Jun 2023 15:27:53 GMT Message-Id: <202306211527.35LFRrDs023750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1723e7f33ae3 - main - cap_net.3: fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1723e7f33ae39c65867c7aba53ae88da8f9d85bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1723e7f33ae39c65867c7aba53ae88da8f9d85bd commit 1723e7f33ae39c65867c7aba53ae88da8f9d85bd Author: Shawn Webb AuthorDate: 2023-06-21 00:47:19 +0000 Commit: Ed Maste CommitDate: 2023-06-21 15:26:34 +0000 cap_net.3: fix typo Signed-off-by: Shawn Webb --- lib/libcasper/services/cap_net/cap_net.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_net/cap_net.3 b/lib/libcasper/services/cap_net/cap_net.3 index e64038a48330..34066a8f808b 100644 --- a/lib/libcasper/services/cap_net/cap_net.3 +++ b/lib/libcasper/services/cap_net/cap_net.3 @@ -130,7 +130,7 @@ CAPNET_DEPRECATED_NAME2ADDR name resolution is allowed with CAPNET_BIND bind syscall is allowed CAPNET_CONNECT connect syscall is allowed CAPNET_CONNECTDNS connect syscall is allowed to the values - returned from privies call to + returned from previous call to the cap_getaddrinfo or cap_gethostbyname .Ed .Pp From nobody Wed Jun 21 15:48:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmSbH4Tr8z4gCml; Wed, 21 Jun 2023 15:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmSbH3ywfz43pD; Wed, 21 Jun 2023 15:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687362523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PawlSA0cqpEq3CqCVUk8akzN5RtxLiAihI+5n0RDyUw=; b=vnwVSooJtAwOX9L28D2SZzo2za+BqYHnBY5x1+NuKBpiKCuql6QucaptJ3nAVSXCHu64aY 1HQ6hmwGKhdF+8W3BLBzp4sDPLfxdJ5kcGbjN+YqFqqRd79VvwkosoFKMHfUkCMuT12Une KhoeQt7l0RaEPGotAW/5mvdsR82Ly9gEALGMQ1INCUrepWL2c3ZlfprmmDQt0C3W6h8sd0 yyuJyBymBN20DgWo9QNvOgMKLrE3S5fggyQwPEv1G5tl4RWDvwpiIx9xssP2jJSX5ljRep TBWR++XlDFO5hmDIwPJEZiMCLk+2o0RCh5fESq71fb/lk34ckaa9CKtz/VEHUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687362523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PawlSA0cqpEq3CqCVUk8akzN5RtxLiAihI+5n0RDyUw=; b=Qbk3EcG3QWc0Y3ZUc0BlOxdEA50SzoA9lzcCNuvAflXWs5+oyJvUSscQM0OsG77y7vDxdq ZrDewvIKRjA4Hm7JNPz+Ygj3CYaapcMqwqZO9MbTO4Tt5Q9NWOUU8ZJ8XG5qdAUVmycvrY 8lUuB5wkrjT4FbD3EoUbfaedEmGhnFLzaTCyupdhOtWcCkN2awF/EktU6anPRZzs+JAw1l 8Z61gGBIAgP4OJ34b0sLGK7vUMoKBtAKbsWcomp/diBrVk0KCgQuSfBo4VwK6IGXeN9Q9j /IIl93C1tkhjmXAGtcac5EIdA3r7tch3nM/h7hcg+iHeU53RNCuXGEQUS9Y2tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687362523; a=rsa-sha256; cv=none; b=r+fS1znIHikQ3KUqEYmqFCCdYfWrDLbbQy0p9PnRErZ0ksNA357ZvA0q/yCMk1zduq20fi 534vX4yJzmaZU1G1Vld3UyrmmGzXRPCuS9v5i6+jd/O9xM6Jl9CJBGpeVDFSL+a2KcEh29 5AfrkplbKHZKS15jfvX8PEBswf4yfgEtUwfSgG1p8iJIXL/X33nUeWj+MFXyHoXxLYhY1f uvUAA/qYC5bAOJJv6A/btdVR8s+lnJk8gAKbd1xeQF0iODSyTorfU+tL2etaKLI+q85SNh DVRE+xHOjXs91GSWrifUJfXbqz468dbn1JsrueWUmMEhJ/Bm3JACHqe/AnAzZw== 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 4QmSbH2vCXzmxw; Wed, 21 Jun 2023 15:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LFmhPR056095; Wed, 21 Jun 2023 15:48:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LFmhQU056094; Wed, 21 Jun 2023 15:48:43 GMT (envelope-from git) Date: Wed, 21 Jun 2023 15:48:43 GMT Message-Id: <202306211548.35LFmhQU056094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e5c7aa5c703e - main - arm64: print '0x' before hex values List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5c7aa5c703e268a80331be3a587449995563770 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e5c7aa5c703e268a80331be3a587449995563770 commit e5c7aa5c703e268a80331be3a587449995563770 Author: Christos Margiolis AuthorDate: 2023-06-21 15:47:06 +0000 Commit: Christos Margiolis CommitDate: 2023-06-21 15:47:06 +0000 arm64: print '0x' before hex values Not making it explicit that we're printing values in hex can be misleading when the number doesn't contain hex-only symbols (a-f). A good example of this is print_gp_register(), where we print "(func + offset)"; if the offset doesn't contain a-f symbols, it's not immediately clear if that value is in decimal or hex. Using '%#' instead of '0x%' also isn't a better option, it doesn't print '0x' if the value is 0, and it also messes up column alignment. Reviewed by: imp, markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40583 --- sys/arm64/arm64/trap.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 9b1b73aeb55d..7b5c7bc61fd3 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -213,7 +213,7 @@ align_abort(struct thread *td, struct trapframe *frame, uint64_t esr, if (!lower) { print_registers(frame); print_gp_register("far", far); - printf(" esr: %16lx\n", esr); + printf(" esr: 0x%.16lx\n", esr); panic("Misaligned access from kernel space!"); } @@ -328,7 +328,7 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, if (td->td_md.md_spinlock_count != 0) { print_registers(frame); print_gp_register("far", far); - printf(" esr: %.16lx\n", esr); + printf(" esr: 0x%.16lx\n", esr); panic("data abort with spinlock held (spinlock count %d != 0)", td->td_md.md_spinlock_count); } @@ -337,7 +337,7 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, WARN_GIANTOK, NULL, "Kernel page fault") != 0) { print_registers(frame); print_gp_register("far", far); - printf(" esr: %16lx\n", esr); + printf(" esr: 0x%.16lx\n", esr); panic("data abort in critical section or under mutex"); } @@ -378,7 +378,7 @@ bad_far: printf("Fatal data abort:\n"); print_registers(frame); print_gp_register("far", far); - printf(" esr: %16lx\n", esr); + printf(" esr: 0x%.16lx\n", esr); #ifdef KDB if (debugger_on_trap) { @@ -390,7 +390,7 @@ bad_far: return; } #endif - panic("vm_fault failed: %lx error %d", + panic("vm_fault failed: 0x%lx error %d", frame->tf_elr, error); } } @@ -409,14 +409,14 @@ print_gp_register(const char *name, uint64_t value) db_expr_t offset; #endif - printf(" %s: %16lx", name, value); + printf(" %s: 0x%.16lx", name, value); #if defined(DDB) /* If this looks like a kernel address try to find the symbol */ if (value >= VM_MIN_KERNEL_ADDRESS) { sym = db_search_symbol(value, DB_STGY_ANY, &offset); if (sym != C_DB_SYM_NULL) { db_symbol_values(sym, &sym_name, &sym_value); - printf(" (%s + %lx)", sym_name, offset); + printf(" (%s + 0x%lx)", sym_name, offset); } } #endif @@ -434,10 +434,10 @@ print_registers(struct trapframe *frame) reg); print_gp_register(name, frame->tf_x[reg]); } - printf(" sp: %16lx\n", frame->tf_sp); + printf(" sp: 0x%.16lx\n", frame->tf_sp); print_gp_register(" lr", frame->tf_lr); print_gp_register("elr", frame->tf_elr); - printf("spsr: %16lx\n", frame->tf_spsr); + printf("spsr: 0x%.16lx\n", frame->tf_spsr); } #ifdef VFP @@ -485,8 +485,8 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) #endif CTR4(KTR_TRAP, - "do_el1_sync: curthread: %p, esr %lx, elr: %lx, frame: %p", td, - esr, frame->tf_elr, frame); + "do_el1_sync: curthread: %p, esr 0x%lx, elr: 0x%lx, frame: %p", + td, esr, frame->tf_elr, frame); /* * Enable debug exceptions if we aren't already handling one. They will @@ -506,7 +506,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) #endif { print_registers(frame); - printf(" esr: %16lx\n", esr); + printf(" esr: 0x%.16lx\n", esr); panic("VFP exception in the kernel"); } break; @@ -519,8 +519,8 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) } else { print_registers(frame); print_gp_register("far", far); - printf(" esr: %16lx\n", esr); - panic("Unhandled EL1 %s abort: %x", + printf(" esr: 0x%.16lx\n", esr); + panic("Unhandled EL1 %s abort: 0x%x", exception == EXCP_INSN_ABORT ? "instruction" : "data", dfsc); } @@ -564,7 +564,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) default: print_registers(frame); print_gp_register("far", far); - panic("Unknown kernel exception %x esr_el1 %lx", exception, + panic("Unknown kernel exception 0x%x esr_el1 0x%lx", exception, esr); } } @@ -579,7 +579,7 @@ do_el0_sync(struct thread *td, struct trapframe *frame) /* Check we have a sane environment when entering from userland */ KASSERT((uintptr_t)get_pcpu() >= VM_MIN_KERNEL_ADDRESS, - ("Invalid pcpu address from userland: %p (tpidr %lx)", + ("Invalid pcpu address from userland: %p (tpidr 0x%lx)", get_pcpu(), READ_SPECIALREG(tpidr_el1))); kasan_mark(frame, sizeof(*frame), sizeof(*frame), 0); @@ -599,8 +599,8 @@ do_el0_sync(struct thread *td, struct trapframe *frame) intr_enable(); CTR4(KTR_TRAP, - "do_el0_sync: curthread: %p, esr %lx, elr: %lx, frame: %p", td, esr, - frame->tf_elr, frame); + "do_el0_sync: curthread: %p, esr 0x%lx, elr: 0x%lx, frame: %p", + td, esr, frame->tf_elr, frame); switch (exception) { case EXCP_FP_SIMD: @@ -637,8 +637,8 @@ do_el0_sync(struct thread *td, struct trapframe *frame) else { print_registers(frame); print_gp_register("far", far); - printf(" esr: %16lx\n", esr); - panic("Unhandled EL0 %s abort: %x", + printf(" esr: 0x%.16lx\n", esr); + panic("Unhandled EL0 %s abort: 0x%x", exception == EXCP_INSN_ABORT_L ? "instruction" : "data", dfsc); } @@ -730,7 +730,7 @@ do_serror(struct trapframe *frame) print_registers(frame); print_gp_register("far", far); - printf(" esr: %16lx\n", esr); + printf(" esr: 0x%.16lx\n", esr); panic("Unhandled System Error"); } @@ -745,6 +745,6 @@ unhandled_exception(struct trapframe *frame) print_registers(frame); print_gp_register("far", far); - printf(" esr: %16lx\n", esr); + printf(" esr: 0x%.16lx\n", esr); panic("Unhandled exception"); } From nobody Wed Jun 21 18:35:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmXHk4yVdz4gFJt; Wed, 21 Jun 2023 18:35: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 4QmXHk4Mx5z3GqC; Wed, 21 Jun 2023 18:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687372530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RPS5ot6CTkMtJxJJsTaJyYPJc/JvlS4KIXXbZOv8Beo=; b=nyYi7g+O2z2Qs78Fhniv9lfauhQfaJ4iPtwYlxr0uw5UFLxSDpIw+5eFOcXe+sU7HtiZkF MuQXgFjN4ILJJg6L8bGeEH9YxO8Ef5LPi3q/frcP2Y4j0v6oGxbli6Kq4YA+jTe/btnfdI kzQL0m5JM4+s1rNYvCODRATDWxlEbKIFAsUTFPe+4ozPqvcqJpFkVYmBVy1cLZ+nrt23Bi c4Xas7UHthRANebzC/qtLtdcY2QumjXxTA2i+FzYxU7yRdKnfc8PVattM6xJ025znT9dQj Ixl7vyl0M5z6pPTtaOCHlggmVn+owt/Ak7TL2B846t+jjIiVtaPGEmbin/bK4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687372530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RPS5ot6CTkMtJxJJsTaJyYPJc/JvlS4KIXXbZOv8Beo=; b=OAhok5wjX+v3W68OxeZXeUT28OyvmZ7/UdnuMARdBDZW9RM4XtpmmC5Ru6J7gwlzfSMn1r mReF+Z9uy50Kjf00DQO9uVMrjiZdGy3VhDQvgzoFkg1zCFJwxwnyhr/25FrLXdeWBGE0i1 h6PqRV14G5639bPokIIyWg8Gla+yvoHXRNEuyWDMs7q0PT8eHNF5m+r5+rAQ80LStwESPs LMXb9U/SV3KR8Aji+mOIAuL8HK3jMbmYUmwKt4jzB6FFmaMXoTAluHvG25doxLl1I5xxq/ siZk6RoSxschOkQ7i0SvDD5veAQOofW6f0j4i4vMvaedozOMt9P0Le7aSAGhEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687372530; a=rsa-sha256; cv=none; b=fwNKxA/Js5c4J4SKvDF/Q4Se0kEgtGpHNuuC39br5ejxOfpkrpBROifIm9D/ohxdu9wjRu OoNhSP3U/67FehIswGDfHF5rp/rV+6bHqHEYr+IqBrC2WAtZ4y7gZjUOlVke4WI1EMzF4V JPbguxZPnPhGJ+lGc4H+FvZyNiXUmqTbGua5mBLOQSFLo2DNfZHUeTCI7TmBb1LV6CboDB YvjaTYr4p2Tu6eyWYzXX4/YPQbxukY2uZxQ8kccnHD1QTV+Jovvyg93qZ6U/4S3XTZJ/Ez CaDTcKCdyCUK9pc00P/m3bE4y7bcHOPE7PcNuTgJo5z/ZxWJyg5ne1Dcg1illg== 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 4QmXHk1w2fzs53; Wed, 21 Jun 2023 18:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LIZTsi036614; Wed, 21 Jun 2023 18:35:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LIZTja036613; Wed, 21 Jun 2023 18:35:29 GMT (envelope-from git) Date: Wed, 21 Jun 2023 18:35:29 GMT Message-Id: <202306211835.35LIZTja036613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 586164cc0951 - main - dev/pci: simplify PCI VPD access functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 586164cc095105f82ffd87997c3aa78f5e21a90c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=586164cc095105f82ffd87997c3aa78f5e21a90c commit 586164cc095105f82ffd87997c3aa78f5e21a90c Author: Stefan Eßer AuthorDate: 2023-06-21 17:36:39 +0000 Commit: Stefan Eßer CommitDate: 2023-06-21 17:36:39 +0000 dev/pci: simplify PCI VPD access functions This update contains a rewrite of the VPD parser based on the definition of the structure of the VPD data (ident, R/O resource data, optional R/W data, end tag). The parser it replaces was based on a state machine, with the tags and the parsed data controlling the state changes. The flexibility of this parser is actually not required, and it has caused kernel panics when operating on malformed data. Analysis of the VPD code to make it more robust lead me to believe that it was easier to write a "strict" parser than to restrict the flexible state machine to detect and reject non-well-formed data. A number of restrictions had already been added, but they make the state machine ever more complex and harder to understand. This updated parser has been verified to return identical parsed data as the current implementation for the example VPD data given in the PCI standard and in some actual PCIe VPD data. It is strict in the sense that it detects and rejects any deviation from a well-formed VPD structure. PR: 272018 Approved by: kib MFC after: 4 weeks Differential Revision: https://reviews.freebsd.org/D34268 --- sys/dev/pci/pci.c | 551 ++++++++++++++++++++++++++---------------------------- 1 file changed, 263 insertions(+), 288 deletions(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 24348ecf14eb..cbdfb3acec70 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1063,6 +1063,7 @@ struct vpd_readstate { uint8_t cksum; }; +/* return 0 and one byte in *data if no read error, -1 else */ static int vpd_nextbyte(struct vpd_readstate *vrs, uint8_t *data) { @@ -1071,7 +1072,7 @@ vpd_nextbyte(struct vpd_readstate *vrs, uint8_t *data) if (vrs->bytesinval == 0) { if (pci_read_vpd_reg(vrs->pcib, vrs->cfg, vrs->off, ®)) - return (ENXIO); + return (-1); vrs->val = le32toh(reg); vrs->off += 4; byte = vrs->val & 0xff; @@ -1087,303 +1088,284 @@ vpd_nextbyte(struct vpd_readstate *vrs, uint8_t *data) return (0); } +/* return 0 on match, -1 and "unget" byte on no match */ +static int +vpd_expectbyte(struct vpd_readstate *vrs, uint8_t expected) +{ + uint8_t data; + + if (vpd_nextbyte(vrs, &data) != 0) + return (-1); + + if (data == expected) + return (0); + + vrs->cksum -= data; + vrs->val = (vrs->val << 8) + data; + vrs->bytesinval++; + return (-1); +} + +/* return size if tag matches, -1 on no match, -2 on read error */ +static int +vpd_read_tag_size(struct vpd_readstate *vrs, uint8_t vpd_tag) +{ + uint8_t byte1, byte2; + + if (vpd_expectbyte(vrs, vpd_tag) != 0) + return (-1); + + if ((vpd_tag & 0x80) == 0) + return (vpd_tag & 0x07); + + if (vpd_nextbyte(vrs, &byte1) != 0) + return (-2); + if (vpd_nextbyte(vrs, &byte2) != 0) + return (-2); + + return ((byte2 << 8) + byte1); +} + +/* (re)allocate buffer in multiples of 8 elements */ +static void* +alloc_buffer(void* buffer, size_t element_size, int needed) +{ + int alloc, new_alloc; + + alloc = roundup2(needed, 8); + new_alloc = roundup2(needed + 1, 8); + if (alloc != new_alloc) { + buffer = reallocf(buffer, + new_alloc * element_size, M_DEVBUF, M_WAITOK | M_ZERO); + } + + return (buffer); +} + +/* read VPD keyword and return element size, return -1 on read error */ +static int +vpd_read_elem_head(struct vpd_readstate *vrs, char keyword[2]) +{ + uint8_t data; + + if (vpd_nextbyte(vrs, &keyword[0]) != 0) + return (-1); + if (vpd_nextbyte(vrs, &keyword[1]) != 0) + return (-1); + if (vpd_nextbyte(vrs, &data) != 0) + return (-1); + + return (data); +} + +/* read VPD data element of given size into allocated buffer */ +static char * +vpd_read_value(struct vpd_readstate *vrs, int size) +{ + int i; + char char1; + char *value; + + value = malloc(size + 1, M_DEVBUF, M_WAITOK); + for (i = 0; i < size; i++) { + if (vpd_nextbyte(vrs, &char1) != 0) { + free(value, M_DEVBUF); + return (NULL); + } + value[i] = char1; + } + value[size] = '\0'; + + return (value); +} + +/* read VPD into *keyword and *value, return length of data element */ +static int +vpd_read_elem_data(struct vpd_readstate *vrs, char keyword[2], char **value, int maxlen) +{ + int len; + + len = vpd_read_elem_head(vrs, keyword); + if (len > maxlen) + return (-1); + *value = vpd_read_value(vrs, len); + + return (len); +} + +/* subtract all data following first byte from checksum of RV element */ static void -pci_read_vpd(device_t pcib, pcicfgregs *cfg) +vpd_fixup_cksum(struct vpd_readstate *vrs, char *rvstring, int len) { - struct vpd_readstate vrs; - int state; - int name; - int remain; int i; - int alloc, off; /* alloc/off for RO/W arrays */ - int cksumvalid; - int dflen; - int firstrecord; - uint8_t byte; - uint8_t byte2; + uint8_t fixup; - /* init vpd reader */ - vrs.bytesinval = 0; - vrs.off = 0; - vrs.pcib = pcib; - vrs.cfg = cfg; - vrs.cksum = 0; + fixup = 0; + for (i = 1; i < len; i++) + fixup += rvstring[i]; + vrs->cksum -= fixup; +} - state = 0; - name = remain = i = 0; /* shut up stupid gcc */ - alloc = off = 0; /* shut up stupid gcc */ - dflen = 0; /* shut up stupid gcc */ - cksumvalid = -1; - firstrecord = 1; - while (state >= 0) { - if (vpd_nextbyte(&vrs, &byte)) { - pci_printf(cfg, "VPD read timed out\n"); - state = -2; - break; +/* fetch one read-only element and return size of heading + data */ +static size_t +next_vpd_ro_elem(struct vpd_readstate *vrs, int maxsize) +{ + struct pcicfg_vpd *vpd; + pcicfgregs *cfg; + struct vpd_readonly *vpd_ros; + int len; + + cfg = vrs->cfg; + vpd = &cfg->vpd; + + if (maxsize < 3) + return (-1); + vpd->vpd_ros = alloc_buffer(vpd->vpd_ros, sizeof(*vpd->vpd_ros), vpd->vpd_rocnt); + vpd_ros = &vpd->vpd_ros[vpd->vpd_rocnt]; + maxsize -= 3; + len = vpd_read_elem_data(vrs, vpd_ros->keyword, &vpd_ros->value, maxsize); + if (vpd_ros->value == NULL) + return (-1); + vpd_ros->len = len; + if (vpd_ros->keyword[0] == 'R' && vpd_ros->keyword[1] == 'V') { + vpd_fixup_cksum(vrs, vpd_ros->value, len); + if (vrs->cksum != 0) { + pci_printf(cfg, + "invalid VPD checksum %#hhx\n", vrs->cksum); + return (-1); } -#if 0 - pci_printf(cfg, "vpd: val: %#x, off: %d, bytesinval: %d, byte: " - "%#hhx, state: %d, remain: %d, name: %#x, i: %d\n", vrs.val, - vrs.off, vrs.bytesinval, byte, state, remain, name, i); -#endif - switch (state) { - case 0: /* item name */ - if (byte & 0x80) { - if (vpd_nextbyte(&vrs, &byte2)) { - state = -2; - break; - } - remain = byte2; - if (vpd_nextbyte(&vrs, &byte2)) { - state = -2; - break; - } - remain |= byte2 << 8; - name = byte & 0x7f; - } else { - remain = byte & 0x7; - name = (byte >> 3) & 0xf; - } - if (firstrecord) { - if (name != 0x2) { - pci_printf(cfg, "VPD data does not " \ - "start with ident (%#x)\n", name); - state = -2; - break; - } - firstrecord = 0; - } - if (vrs.off + remain - vrs.bytesinval > 0x8000) { - pci_printf(cfg, - "VPD data overflow, remain %#x\n", remain); - state = -1; - break; - } - switch (name) { - case 0x2: /* String */ - if (cfg->vpd.vpd_ident != NULL) { - pci_printf(cfg, - "duplicate VPD ident record\n"); - state = -2; - break; - } - if (remain > 255) { - pci_printf(cfg, - "VPD ident length %d exceeds 255\n", - remain); - state = -2; - break; - } - cfg->vpd.vpd_ident = malloc(remain + 1, - M_DEVBUF, M_WAITOK); - i = 0; - state = 1; - break; - case 0xf: /* End */ - state = -1; - break; - case 0x10: /* VPD-R */ - alloc = 8; - off = 0; - cfg->vpd.vpd_ros = malloc(alloc * - sizeof(*cfg->vpd.vpd_ros), M_DEVBUF, - M_WAITOK | M_ZERO); - state = 2; - break; - case 0x11: /* VPD-W */ - alloc = 8; - off = 0; - cfg->vpd.vpd_w = malloc(alloc * - sizeof(*cfg->vpd.vpd_w), M_DEVBUF, - M_WAITOK | M_ZERO); - state = 5; - break; - default: /* Invalid data, abort */ - pci_printf(cfg, "invalid VPD name: %#x\n", name); - state = -2; - break; - } - break; + } + vpd->vpd_rocnt++; - case 1: /* Identifier String */ - cfg->vpd.vpd_ident[i++] = byte; - remain--; - if (remain == 0) { - cfg->vpd.vpd_ident[i] = '\0'; - state = 0; - } - break; + return (len + 3); +} - case 2: /* VPD-R Keyword Header */ - if (off == alloc) { - cfg->vpd.vpd_ros = reallocf(cfg->vpd.vpd_ros, - (alloc *= 2) * sizeof(*cfg->vpd.vpd_ros), - M_DEVBUF, M_WAITOK | M_ZERO); - } - cfg->vpd.vpd_ros[off].keyword[0] = byte; - if (vpd_nextbyte(&vrs, &byte2)) { - state = -2; - break; - } - cfg->vpd.vpd_ros[off].keyword[1] = byte2; - if (vpd_nextbyte(&vrs, &byte2)) { - state = -2; - break; - } - cfg->vpd.vpd_ros[off].len = dflen = byte2; - if (dflen == 0 && - strncmp(cfg->vpd.vpd_ros[off].keyword, "RV", - 2) == 0) { - /* - * if this happens, we can't trust the rest - * of the VPD. - */ - pci_printf(cfg, "invalid VPD RV record"); - cksumvalid = 0; - state = -1; - break; - } else if (dflen == 0) { - cfg->vpd.vpd_ros[off].value = malloc(1 * - sizeof(*cfg->vpd.vpd_ros[off].value), - M_DEVBUF, M_WAITOK); - cfg->vpd.vpd_ros[off].value[0] = '\x00'; - } else - cfg->vpd.vpd_ros[off].value = malloc( - (dflen + 1) * - sizeof(*cfg->vpd.vpd_ros[off].value), - M_DEVBUF, M_WAITOK); - remain -= 3; - i = 0; - /* keep in sync w/ state 3's transitions */ - if (dflen == 0 && remain == 0) - state = 0; - else if (dflen == 0) - state = 2; - else - state = 3; - break; +/* fetch one writable element and return size of heading + data */ +static size_t +next_vpd_rw_elem(struct vpd_readstate *vrs, int maxsize) +{ + struct pcicfg_vpd *vpd; + pcicfgregs *cfg; + struct vpd_write *vpd_w; + int len; - case 3: /* VPD-R Keyword Value */ - cfg->vpd.vpd_ros[off].value[i++] = byte; - if (strncmp(cfg->vpd.vpd_ros[off].keyword, - "RV", 2) == 0 && cksumvalid == -1) { - if (vrs.cksum == 0) - cksumvalid = 1; - else { - if (bootverbose) - pci_printf(cfg, - "bad VPD cksum, remain %hhu\n", - vrs.cksum); - cksumvalid = 0; - state = -1; - break; - } - } - dflen--; - remain--; - /* keep in sync w/ state 2's transitions */ - if (dflen == 0) - cfg->vpd.vpd_ros[off++].value[i++] = '\0'; - if (dflen == 0 && remain == 0) { - cfg->vpd.vpd_rocnt = off; - cfg->vpd.vpd_ros = reallocf(cfg->vpd.vpd_ros, - off * sizeof(*cfg->vpd.vpd_ros), - M_DEVBUF, M_WAITOK | M_ZERO); - state = 0; - } else if (dflen == 0) - state = 2; - break; + cfg = vrs->cfg; + vpd = &cfg->vpd; - case 4: - remain--; - if (remain == 0) - state = 0; - break; + if (maxsize < 3) + return (-1); + vpd->vpd_w = alloc_buffer(vpd->vpd_w, sizeof(*vpd->vpd_w), vpd->vpd_wcnt); + if (vpd->vpd_w == NULL) { + pci_printf(cfg, "out of memory"); + return (-1); + } + vpd_w = &vpd->vpd_w[vpd->vpd_wcnt]; + maxsize -= 3; + vpd_w->start = vrs->off + 3 - vrs->bytesinval; + len = vpd_read_elem_data(vrs, vpd_w->keyword, &vpd_w->value, maxsize); + if (vpd_w->value == NULL) + return (-1); + vpd_w->len = len; + vpd->vpd_wcnt++; - case 5: /* VPD-W Keyword Header */ - if (off == alloc) { - cfg->vpd.vpd_w = reallocf(cfg->vpd.vpd_w, - (alloc *= 2) * sizeof(*cfg->vpd.vpd_w), - M_DEVBUF, M_WAITOK | M_ZERO); - } - cfg->vpd.vpd_w[off].keyword[0] = byte; - if (vpd_nextbyte(&vrs, &byte2)) { - state = -2; - break; - } - cfg->vpd.vpd_w[off].keyword[1] = byte2; - if (vpd_nextbyte(&vrs, &byte2)) { - state = -2; - break; - } - cfg->vpd.vpd_w[off].len = dflen = byte2; - cfg->vpd.vpd_w[off].start = vrs.off - vrs.bytesinval; - cfg->vpd.vpd_w[off].value = malloc((dflen + 1) * - sizeof(*cfg->vpd.vpd_w[off].value), - M_DEVBUF, M_WAITOK); - remain -= 3; - i = 0; - /* keep in sync w/ state 6's transitions */ - if (dflen == 0 && remain == 0) - state = 0; - else if (dflen == 0) - state = 5; - else - state = 6; - break; + return (len + 3); +} - case 6: /* VPD-W Keyword Value */ - cfg->vpd.vpd_w[off].value[i++] = byte; - dflen--; - remain--; - /* keep in sync w/ state 5's transitions */ - if (dflen == 0) - cfg->vpd.vpd_w[off++].value[i++] = '\0'; - if (dflen == 0 && remain == 0) { - cfg->vpd.vpd_wcnt = off; - cfg->vpd.vpd_w = reallocf(cfg->vpd.vpd_w, - off * sizeof(*cfg->vpd.vpd_w), - M_DEVBUF, M_WAITOK | M_ZERO); - state = 0; - } else if (dflen == 0) - state = 5; - break; +/* free all memory allocated for VPD data */ +static void +vpd_free(struct pcicfg_vpd *vpd) +{ + int i; - default: - pci_printf(cfg, "invalid state: %d\n", state); - state = -1; - break; - } + free(vpd->vpd_ident, M_DEVBUF); + for (i = 0; i < vpd->vpd_rocnt; i++) + free(vpd->vpd_ros[i].value, M_DEVBUF); + free(vpd->vpd_ros, M_DEVBUF); + vpd->vpd_rocnt = 0; + for (i = 0; i < vpd->vpd_wcnt; i++) + free(vpd->vpd_w[i].value, M_DEVBUF); + free(vpd->vpd_w, M_DEVBUF); + vpd->vpd_wcnt = 0; +} - if (cfg->vpd.vpd_ident == NULL || cfg->vpd.vpd_ident[0] == '\0') { - pci_printf(cfg, "no valid vpd ident found\n"); - state = -2; - } +#define VPD_TAG_END ((0x0f << 3) | 0) /* small tag, len == 0 */ +#define VPD_TAG_IDENT (0x02 | 0x80) /* large tag */ +#define VPD_TAG_RO (0x10 | 0x80) /* large tag */ +#define VPD_TAG_RW (0x11 | 0x80) /* large tag */ + +static int +pci_parse_vpd(device_t pcib, pcicfgregs *cfg) +{ + struct vpd_readstate vrs; + int cksumvalid; + int size, elem_size; + + /* init vpd reader */ + vrs.bytesinval = 0; + vrs.off = 0; + vrs.pcib = pcib; + vrs.cfg = cfg; + vrs.cksum = 0; + + /* read VPD ident element - mandatory */ + size = vpd_read_tag_size(&vrs, VPD_TAG_IDENT); + if (size <= 0) { + pci_printf(cfg, "no VPD ident found\n"); + return (0); + } + cfg->vpd.vpd_ident = vpd_read_value(&vrs, size); + if (cfg->vpd.vpd_ident == NULL) { + pci_printf(cfg, "error accessing VPD ident data\n"); + return (0); } - if (cksumvalid <= 0 || state < -1) { - /* read-only data bad, clean up */ - if (cfg->vpd.vpd_ros != NULL) { - for (off = 0; cfg->vpd.vpd_ros[off].value; off++) - free(cfg->vpd.vpd_ros[off].value, M_DEVBUF); - free(cfg->vpd.vpd_ros, M_DEVBUF); - cfg->vpd.vpd_ros = NULL; - } + /* read VPD RO elements - mandatory */ + size = vpd_read_tag_size(&vrs, VPD_TAG_RO); + if (size <= 0) { + pci_printf(cfg, "no read-only VPD data found\n"); + return (0); } - if (state < -1) { - /* I/O error, clean up */ - pci_printf(cfg, "failed to read VPD data.\n"); - if (cfg->vpd.vpd_ident != NULL) { - free(cfg->vpd.vpd_ident, M_DEVBUF); - cfg->vpd.vpd_ident = NULL; + while (size > 0) { + elem_size = next_vpd_ro_elem(&vrs, size); + if (elem_size < 0) { + pci_printf(cfg, "error accessing read-only VPD data\n"); + return (-1); } - if (cfg->vpd.vpd_w != NULL) { - for (off = 0; cfg->vpd.vpd_w[off].value; off++) - free(cfg->vpd.vpd_w[off].value, M_DEVBUF); - free(cfg->vpd.vpd_w, M_DEVBUF); - cfg->vpd.vpd_w = NULL; + size -= elem_size; + } + cksumvalid = (vrs.cksum == 0); + if (!cksumvalid) + return (-1); + + /* read VPD RW elements - optional */ + size = vpd_read_tag_size(&vrs, VPD_TAG_RW); + if (size == -2) + return (-1); + while (size > 0) { + elem_size = next_vpd_rw_elem(&vrs, size); + if (elem_size < 0) { + pci_printf(cfg, "error accessing writeable VPD data\n"); + return (-1); } + size -= elem_size; } + + /* read empty END tag - mandatory */ + size = vpd_read_tag_size(&vrs, VPD_TAG_END); + if (size != 0) { + pci_printf(cfg, "No valid VPD end tag found\n"); + } + return (0); +} + +static void +pci_read_vpd(device_t pcib, pcicfgregs *cfg) +{ + int status; + + status = pci_parse_vpd(pcib, cfg); + if (status < 0) + vpd_free(&cfg->vpd); cfg->vpd.vpd_cached = 1; #undef REG #undef WREG @@ -2777,19 +2759,12 @@ pci_freecfg(struct pci_devinfo *dinfo) { struct devlist *devlist_head; struct pci_map *pm, *next; - int i; devlist_head = &pci_devq; - if (dinfo->cfg.vpd.vpd_reg) { - free(dinfo->cfg.vpd.vpd_ident, M_DEVBUF); - for (i = 0; i < dinfo->cfg.vpd.vpd_rocnt; i++) - free(dinfo->cfg.vpd.vpd_ros[i].value, M_DEVBUF); - free(dinfo->cfg.vpd.vpd_ros, M_DEVBUF); - for (i = 0; i < dinfo->cfg.vpd.vpd_wcnt; i++) - free(dinfo->cfg.vpd.vpd_w[i].value, M_DEVBUF); - free(dinfo->cfg.vpd.vpd_w, M_DEVBUF); - } + if (dinfo->cfg.vpd.vpd_reg) + vpd_free(&dinfo->cfg.vpd); + STAILQ_FOREACH_SAFE(pm, &dinfo->cfg.maps, pm_link, next) { free(pm, M_DEVBUF); } From nobody Wed Jun 21 18:41:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmXQ86chXz4gN1y; Wed, 21 Jun 2023 18:41: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 4QmXQ864Sqz3LbW; Wed, 21 Jun 2023 18:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687372864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKjO5Q62kNK4fIivYV7fa8XJAZ/2EuBpCx8YBM/b2Os=; b=wNp7IYK3rzgn2Ja+8Bi51mQIl9tenNdrPojt/SdwfSYxwkI4XJloJ/3hFz/3ntvKowpjsz VybMTdHZQ+dtXnX8lsBk3A5HFcrpCHVkbEXvQK4sIzuFSUePPmpjuYGTUw7DcLE+zDhsLf wwLzZWctAMR4ctWuo2WsSwuE8VCuVR6hG7A9TI7JNuCNhe+sXSWpEVPTb3YZXP15R9Bs46 ykhVbRIAXTxV/tphlKX6lBXLmiFb1F3S1fKEQqZ/hB1f9g7RaEbhJrMnqJxS1dGFtWeMqE 3efMxD1SDPbWE6gOXOizT/lzpiCPDnEOysrN+3WseDXtbHUK89pPfMJVgLWk9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687372864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKjO5Q62kNK4fIivYV7fa8XJAZ/2EuBpCx8YBM/b2Os=; b=EchDM6oP0shO4w7QaJgbfsmNf2d54LxPD44zfqlkg2BkcFrYfYn2PoeNo+WP1YAjpp+X5J 8wMjwFHWjhi8bcyAvYjVZBxx37Qb4rzjLjbKklDTbQabR0xSZT6EuHJcyZ48nCVm5PyAZM Pj37u7Rdr9YRdn5YT0+U3nbY2tvUE0fOPk/OAd89TAn1PYmKWydCmfefFMJJl6nxSszzht vWWRCZKgjelwfkyikXFKsGfLwonDspYsRWMQ2y1SQ3gn3di2O1icjYMGN+JduplUEj5Lvp pD4zBDQSF1rvjZw4D0fOZ9fynbImtIw2k5/JwmAXo4GhYqLvxUO2UbX1vJTCAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687372864; a=rsa-sha256; cv=none; b=JPkpG02TEZa8VyZ0IHK7V/s/5UIyxGHKwuIXsmKtZjXRQAhgmH+G4eanGgZ2kmZCnhwDX1 HEAql/W14jxa09WWPb0nk4CKXe2BZSXPN2hwovaqLdS2THPI2lcwrARn9bT26W2kIydk5f LpIl49XHbeC9W7D6Z054XcqeudBoKMGdLzKJVYtFNzwnZkiBAKt7G4SHjtwqrsbOtk0uhG iEFR+s6kplgVdPzLCEHox3DK7eco1ZUr3LlPe5PpbJTaT5LEpEsTXpbE1Sn/lDNDpnWPp8 OXZsuZh/XC1kih6N5Yji+Zr8WJTvLWV03G8j8766PgNJVIVnPe+fJq63l+X9AA== 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 4QmXQ85BhNzs5H; Wed, 21 Jun 2023 18:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LIf4DI048349; Wed, 21 Jun 2023 18:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LIf4i1048348; Wed, 21 Jun 2023 18:41:04 GMT (envelope-from git) Date: Wed, 21 Jun 2023 18:41:04 GMT Message-Id: <202306211841.35LIf4i1048348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 712079d38106 - main - unix: Fix uipc_peeraddr() to handle self-connected sockets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 712079d3810617ba7a28e959f5536b1ee06e30e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=712079d3810617ba7a28e959f5536b1ee06e30e1 commit 712079d3810617ba7a28e959f5536b1ee06e30e1 Author: Mark Johnston AuthorDate: 2023-06-21 18:20:16 +0000 Commit: Mark Johnston CommitDate: 2023-06-21 18:38:26 +0000 unix: Fix uipc_peeraddr() to handle self-connected sockets Reported by: syzbot+c2da2dbae5fe006556bc@syzkaller.appspotmail.com Reported by: syzbot+b4d6b093b1d78bfa859b@syzkaller.appspotmail.com Fixes: e8f6e5b2d969 ("unix: Fix locking in uipc_peeraddr()") MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/kern/uipc_usrreq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index bd7a2cca245f..100891cfef68 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -890,16 +890,16 @@ uipc_peeraddr(struct socket *so, struct sockaddr **nam) unp2 = unp_pcb_lock_peer(unp); if (unp2 != NULL) { if (unp2->unp_addr != NULL) - sa = (struct sockaddr *) unp2->unp_addr; + sa = (struct sockaddr *)unp2->unp_addr; else sa = &sun_noname; bcopy(sa, *nam, sa->sa_len); - UNP_PCB_UNLOCK(unp2); + unp_pcb_unlock_pair(unp, unp2); } else { sa = &sun_noname; bcopy(sa, *nam, sa->sa_len); + UNP_PCB_UNLOCK(unp); } - UNP_PCB_UNLOCK(unp); return (0); } From nobody Wed Jun 21 18:41:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmXQB1rn2z4gN7F; Wed, 21 Jun 2023 18:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmXQB0W3lz3LT1; Wed, 21 Jun 2023 18:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687372866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ULt9YH/joqgHqfW/jqbiN0onPyCJJeq/xo7uaYu12UY=; b=EjEKoVyvSdvI94uHzlYNJOopADN+eJuTKOPUC5flCc6IL7yHJTjwmIuWX6ztFVFe0UYjj2 0o0eOtiCt/mCGMoipr3/FFPuigLyNqAr0Zma9tScJEpICGoiZ4F5k+f29BV9xtizhqv9e+ g+KDAwegKCuaedy/O28xKmfMnx7q1M30sfftsQDXQ7/1LrfJ9niMu7l1gAVAudg/ztkejh 9CnU0yPmw8KSZXs4IkLNBHNI3l90f/ptcWINVfxYhECHXa3l1puqlrCT6+AXxYlzIrhU61 SWpZ6LQxEgVt+kVSU096pkUklQvR6xDbzqce09HINhsaN3xmV8Cp6dFDGK8fSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687372866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ULt9YH/joqgHqfW/jqbiN0onPyCJJeq/xo7uaYu12UY=; b=cy8iVV1+nBnPfov/vwDTCJsKwy5X+Sug6iEszH5LPLayC+/NYk/mw5RtWFjEv19GGXBmFG ycvz6XJsP4MyA49Me2bVzwvyHu35J2oewLJaGgJNevSFnh30Pk2WSXBw597vf2QCb6UJ8F Lu8HCPjVCTh6IgnP1sNtgR0EtYYw06WgNCPVOzeVz1WWav/nGqJUfAxQcGdkDW5UHVGSu/ I1NxzHCVGAXP2Wd5gj7IOUgr7nmcGKhA1TThV/njtweS5U+wJVMpNo3H4ayqu5abNkPsQ0 C1zvTLjpsec4XddqDydgsA3PT4uU5ZIx9QAxBrVChdX5Lz22JovUjlsUaCbn1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687372866; a=rsa-sha256; cv=none; b=CJqcW93C490Stx9m9Vx+y/supDtDfFbmB5k1PImS+SlkrfU0BaaGDFVeUYdtCgY88I35K4 H0/hIZl142CgJuUSWLqwjMNYFOTA9zzYM3olbDhVHjK2ciJoVrzRoYUUYEl1gsSDTDJyiB JeYU26OwJy4emtXJxW3lMP8iZZvaj14qv4A8+uJzU/XoyXewNge4mlOpwg8ahRYWzIun7+ aJAjeGz09iQZd6qEIsPCuKglBYr1k/vfxPU0Jgg7Ua6j6a4ka07geJeDY+TNWauFZA0OAN 2NO6gc/H+GfIcwLL5Rlplhol1WD+fnTIPTg02s9VfWaHFSFFlBGoCgghskIYWw== 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 4QmXQ95szXzsKb; Wed, 21 Jun 2023 18:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LIf5mp048368; Wed, 21 Jun 2023 18:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LIf5ga048367; Wed, 21 Jun 2023 18:41:05 GMT (envelope-from git) Date: Wed, 21 Jun 2023 18:41:05 GMT Message-Id: <202306211841.35LIf5ga048367@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 383d51d59236 - main - unix tests: Add a regression test for getpeername(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 383d51d592369f92b836f77abf8f118ab4e44ff1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=383d51d592369f92b836f77abf8f118ab4e44ff1 commit 383d51d592369f92b836f77abf8f118ab4e44ff1 Author: Mark Johnston AuthorDate: 2023-06-21 18:33:52 +0000 Commit: Mark Johnston CommitDate: 2023-06-21 18:39:36 +0000 unix tests: Add a regression test for getpeername(2) Ensure that it works as expected when applied to a self-connected socket. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- tests/sys/kern/unix_dgram.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/tests/sys/kern/unix_dgram.c b/tests/sys/kern/unix_dgram.c index 93669a30d4c5..9df0d4ca7168 100644 --- a/tests/sys/kern/unix_dgram.c +++ b/tests/sys/kern/unix_dgram.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -363,12 +364,39 @@ ATF_TC_BODY(event, tc) test42(fd[0]); } -ATF_TP_ADD_TCS(tp) +ATF_TC_WITHOUT_HEAD(selfgetpeername); +ATF_TC_BODY(selfgetpeername, tc) { + struct sockaddr_un sun; + const char *name; + socklen_t len; + int sd; + + name = "selfgetpeername"; + + sd = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(sd != -1); + + memset(&sun, 0, sizeof(sun)); + sun.sun_len = sizeof(sun); + sun.sun_family = AF_UNIX; + snprintf(sun.sun_path, sizeof(sun.sun_path), "%s", name); + ATF_REQUIRE(bind(sd, (struct sockaddr *)&sun, sizeof(sun)) == 0); + ATF_REQUIRE(connect(sd, (struct sockaddr *)&sun, sizeof(sun)) == 0); + + len = sizeof(sun); + ATF_REQUIRE(getpeername(sd, (struct sockaddr *)&sun, &len) == 0); + ATF_REQUIRE(strcmp(sun.sun_path, name) == 0); + ATF_REQUIRE(close(sd) == 0); +} + +ATF_TP_ADD_TCS(tp) +{ ATF_TP_ADD_TC(tp, basic); ATF_TP_ADD_TC(tp, one2many); ATF_TP_ADD_TC(tp, event); + ATF_TP_ADD_TC(tp, selfgetpeername); return (atf_no_error()); } From nobody Wed Jun 21 20:52:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmbL30t8lz4g335; Wed, 21 Jun 2023 20:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmbL30SRSz40hy; Wed, 21 Jun 2023 20:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687380763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dXUEYF4gwhrsTeGdVZXi71hcJVLNJEeWyBZOZjci3AA=; b=iXzPu0xrIXbwjrRfJRBoHhbb3hldnxD8if+9yplgmX2cxPX+qghlJoqJClaLiUsjGB8jgu FcXvm0IrODXXX/cmg294NWRpZVwT9w7glMGeUJItp7pUMruPcsjEuE1OCixHamf3PslRWZ hQfj/uJbouY+bnrC4ChrVWQ2UI6n/v+lK98aAnSXqM8WD0SlEJjlirlpCb4qvJfpQE+VBS FpsdEEAKvUXZ1Z3jOdnjEM3yBsW8ABlLzE+t6vVve3KG3/q2rOG3t9Of1qbx317MY6EVDh K9GkBnvK3IGry/pUqFKELuT2JcuQlGemlgGsnbm/x7iiuk4AcnwpCfyoV1MpTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687380763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dXUEYF4gwhrsTeGdVZXi71hcJVLNJEeWyBZOZjci3AA=; b=TQ6gJahXR8/1dDM2O246G4OxtqoxIzUclEiuX3u6DdflbPm9/4/6tUD5K+CMzt99GLdZQz TaraWeF8v1+sXs0ZKlFZBDtJ7Vqh6dgiFp+DMiSNKCyKqpZnvj7ea9P/NTVn7cmY80W1C+ d7iiOQP6LSUU/e5OKtJltrk+4owlySH7YNZzs+s47l+/GiakfSEAOC4wSvS7d9enQCMSWM ILOuYlVE7mFwmZgaeESJXmUGzPSDi5OR94Kp/ormn2d6+6a/ndAg0YwQiUPy3go9V7TKjT 6ZTIG5YVjwoBUWKPhGdcaPz8zhnhvBHdE15DYrs38vaJQc1h1X2ltf3NRLOmBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687380763; a=rsa-sha256; cv=none; b=ADiigNXVyBIHogCrgRaZGxYRAsvuRlRMCQmdkYrGdtMfBIAvJGsGDeIweYte4DNo2RqEgH lOr4iPPx4/vi3S6PVMJK8A6zEUVsHeHDNvBB/s6+rzsyhFCfoz7z5XKAO71xWBG0LoRbcb o+H9QXKEMj8l/YpFnqAOzb9FTyX4akBYNnMPA5aHDy1bJFwWsq+sTcBASkyqcoG0Jo2x/6 KUBdxVmHtJ6cIpnAs3TWkP1eeIg2wHPhICU/LgRxP5Zrp6D46YZDC2lCqoZFYOSuy4z2fh AVC6w3FDfDNnSU5rPorbD5G9GksI2JXK7zmGBKJUzDV33RzzkV7QFqerw0re0g== 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 4QmbL26fyRzwjZ; Wed, 21 Jun 2023 20:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LKqg5U066379; Wed, 21 Jun 2023 20:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LKqgeF066378; Wed, 21 Jun 2023 20:52:42 GMT (envelope-from git) Date: Wed, 21 Jun 2023 20:52:42 GMT Message-Id: <202306212052.35LKqgeF066378@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 0fb0711dba76 - main - tcp: fix TCP MD5 digest computation for TCP over UDP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fb0711dba76a32a2202d2f41d64aa1247b5e51d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0fb0711dba76a32a2202d2f41d64aa1247b5e51d commit 0fb0711dba76a32a2202d2f41d64aa1247b5e51d Author: Michael Tuexen AuthorDate: 2023-06-21 20:48:12 +0000 Commit: Michael Tuexen CommitDate: 2023-06-21 20:48:12 +0000 tcp: fix TCP MD5 digest computation for TCP over UDP Skip the UDP header for the computation. This is similar to skipping IPv6 extension headers. Reviewed by: cc, rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D40596 --- sys/netipsec/xform_tcp.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/netipsec/xform_tcp.c b/sys/netipsec/xform_tcp.c index 42c63813e63c..28e547637450 100644 --- a/sys/netipsec/xform_tcp.c +++ b/sys/netipsec/xform_tcp.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -136,15 +137,20 @@ ip_pseudo_compute(struct mbuf *m, MD5_CTX *ctx) { struct ippseudo ipp; struct ip *ip; + int hdr_len; ip = mtod(m, struct ip *); ipp.ippseudo_src.s_addr = ip->ip_src.s_addr; ipp.ippseudo_dst.s_addr = ip->ip_dst.s_addr; ipp.ippseudo_p = IPPROTO_TCP; ipp.ippseudo_pad = 0; - ipp.ippseudo_len = htons(m->m_pkthdr.len - (ip->ip_hl << 2)); + hdr_len = ip->ip_hl << 2; + if (ip->ip_p == IPPROTO_UDP) + /* TCP over UDP */ + hdr_len += sizeof(struct udphdr); + ipp.ippseudo_len = htons(m->m_pkthdr.len - hdr_len); MD5Update(ctx, (char *)&ipp, sizeof(ipp)); - return (ip->ip_hl << 2); + return (hdr_len); } #endif @@ -158,14 +164,20 @@ ip6_pseudo_compute(struct mbuf *m, MD5_CTX *ctx) uint32_t nxt; } ip6p __aligned(4); struct ip6_hdr *ip6; + int hdr_len; ip6 = mtod(m, struct ip6_hdr *); ip6p.src = ip6->ip6_src; ip6p.dst = ip6->ip6_dst; - ip6p.len = htonl(m->m_pkthdr.len - sizeof(*ip6)); /* XXX: ext headers */ + hdr_len = sizeof(struct ip6_hdr); + if (ip6->ip6_nxt == IPPROTO_UDP) + /* TCP over UDP */ + hdr_len += sizeof(struct udphdr); + /* XXX: ext headers */ + ip6p.len = htonl(m->m_pkthdr.len - hdr_len); ip6p.nxt = htonl(IPPROTO_TCP); MD5Update(ctx, (char *)&ip6p, sizeof(ip6p)); - return (sizeof(*ip6)); + return (hdr_len); } #endif From nobody Wed Jun 21 20:57:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmbRg2bmbz4g7Gt; Wed, 21 Jun 2023 20:57: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 4QmbRg29s1z42ZN; Wed, 21 Jun 2023 20:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sIIYhDDt+XUT1fOxrwP6d3WF6qQl5Q2hu+DBGkztm9s=; b=GTtCAAKKNtfA+rvow67S5QS5ikyc5wYvILK8qdaG88VFL960IQz0jpmV/LobhJpVwZpoqG bG3U2EUPsL60dvHbCtt+TaPRkk6t8fNxYF3seya0f55zBOOAa/bIF2asuOx2gwHC5i301h zUjmEpbR3IIJ9IhxaAkmG0RcttycCyBMk2Fm+Zb0+LyNJawlXxgzLSNmf7wcoP+mxTZhrP iaTYhk/vL+zO/Z2O74Oid+uQiEHSHGRfh+7fTQtmi3rPehuVN6r0qd7e47pZrPHvFa8Cqj lZgZo9VOjg86cWh8LbHzoPpSVo7VFI5/ij+faaRYYDH27j9uBUSYUT4ImC+pIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sIIYhDDt+XUT1fOxrwP6d3WF6qQl5Q2hu+DBGkztm9s=; b=uFCP5K3pGLVAN8eO/Syj+oSC11/7sevSgK1j8qAuFRelRqB31W3RSMCWjjEz2aCE1Bt+zm QRotLmSHxASz3lno7GLuF4jhvkkye697pbiR5pEv5fbx07R8Ir0JFdJHnrWYOlDw6SimUh mPCnjQyLeAbbYGcZ0TxcrGvJWScZm6r7qNkmamXveno6ascMteuRyt4nD5eiwqrYE6zC7K SP+/LZq4ArryCSBWMUIs5gzeaeaof85qjrTe2JlInKk9HH6yImfAW6FAVmk8oC+66oJJjk mQFAkOBBP3roBPheAQksFvuWnlgkIMkAGwCSfojcfvtRSp9n3oj1tdtR/xbW8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687381055; a=rsa-sha256; cv=none; b=UU0PGTxwVom2Xz2VyF6lCPd41RQsnmXwOYBUdQzZas4L88ig72vD1riH7iYXsZxVCQzrZs j82hR5//MAqc9NMeaky5mrktsAZn9z6lEQGylDxRlMV52WznzvhpjViOvgLYbgPtt3077b ZpKMcQtBmtgn1yRvVYtJFZqU/ESHlLTs+dlIV6+5n/P4KQxzCvX3lzF+rS1hS1A2IaAX6h WJlyB1erv16PzvjZ/NRv74fQn+e4b/6yKYE9U8rPfeRDO+/61OUdAVoLHxeBwp7dUMRI60 y1L1M28/Db3ny0aejFLN62tfFHb38R7OBYsJyl/Vub0pjZ8telErzuTvAOCBXw== 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 4QmbRg1GjnzwPL; Wed, 21 Jun 2023 20:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LKvZX1067097; Wed, 21 Jun 2023 20:57:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LKvZMJ067096; Wed, 21 Jun 2023 20:57:35 GMT (envelope-from git) Date: Wed, 21 Jun 2023 20:57:35 GMT Message-Id: <202306212057.35LKvZMJ067096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 02b885b09d1e - main - tcp: fix TCP MD5 computation for the BBR and RACK stack List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02b885b09d1e90574162a1442b9ede06cef2b13a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=02b885b09d1e90574162a1442b9ede06cef2b13a commit 02b885b09d1e90574162a1442b9ede06cef2b13a Author: Michael Tuexen AuthorDate: 2023-06-21 20:54:33 +0000 Commit: Michael Tuexen CommitDate: 2023-06-21 20:54:33 +0000 tcp: fix TCP MD5 computation for the BBR and RACK stack PR: 253096 Reviewed by: cc, rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D40597 --- sys/netinet/tcp_stacks/bbr.c | 10 +++---- sys/netinet/tcp_stacks/rack.c | 66 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index d9952ba6bd14..1bc20de9e503 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -13377,6 +13377,11 @@ send: * the pointer in case of a stack switch. */ tp->snd_up = tp->snd_una; + /* + * Put TCP length in extended header, and then checksum extended + * header and data. + */ + m->m_pkthdr.len = hdrlen + len; /* in6_cksum() need this */ #if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) if (to.to_flags & TOF_SIGNATURE) { @@ -13396,11 +13401,6 @@ send: } #endif - /* - * Put TCP length in extended header, and then checksum extended - * header and data. - */ - m->m_pkthdr.len = hdrlen + len; /* in6_cksum() need this */ #ifdef INET6 if (isipv6) { /* diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index c4d4923fb592..59dd113c03d5 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -18747,6 +18747,11 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma to.to_tsecr = tp->ts_recent; to.to_flags = TOF_TS; } +#if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) + /* TCP-MD5 (RFC2385). */ + if (tp->t_flags & TF_SIGNATURE) + to.to_flags |= TOF_SIGNATURE; +#endif optlen = tcp_addoptions(&to, opt); hdrlen += optlen; udp = rack->r_ctl.fsb.udp; @@ -18906,6 +18911,24 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma } tcp_set_flags(th, flags); m->m_pkthdr.len = hdrlen + len; /* in6_cksum() need this */ +#if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) + if (to.to_flags & TOF_SIGNATURE) { + /* + * Calculate MD5 signature and put it into the place + * determined before. + * NOTE: since TCP options buffer doesn't point into + * mbuf's data, calculate offset and use it. + */ + if (!TCPMD5_ENABLED() || TCPMD5_OUTPUT(m, th, + (u_char *)(th + 1) + (to.to_signature - opt)) != 0) { + /* + * Do not send segment if the calculation of MD5 + * digest has failed. + */ + goto failed; + } + } +#endif #ifdef INET6 if (rack->r_is_v6) { if (tp->t_port) { @@ -19312,6 +19335,11 @@ rack_fast_output(struct tcpcb *tp, struct tcp_rack *rack, uint64_t ts_val, to.to_tsecr = tp->ts_recent; to.to_flags = TOF_TS; } +#if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) + /* TCP-MD5 (RFC2385). */ + if (tp->t_flags & TF_SIGNATURE) + to.to_flags |= TOF_SIGNATURE; +#endif optlen = tcp_addoptions(&to, opt); hdrlen += optlen; udp = rack->r_ctl.fsb.udp; @@ -19451,6 +19479,24 @@ again: } tcp_set_flags(th, flags); m->m_pkthdr.len = hdrlen + len; /* in6_cksum() need this */ +#if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) + if (to.to_flags & TOF_SIGNATURE) { + /* + * Calculate MD5 signature and put it into the place + * determined before. + * NOTE: since TCP options buffer doesn't point into + * mbuf's data, calculate offset and use it. + */ + if (!TCPMD5_ENABLED() || TCPMD5_OUTPUT(m, th, + (u_char *)(th + 1) + (to.to_signature - opt)) != 0) { + /* + * Do not send segment if the calculation of MD5 + * digest has failed. + */ + goto failed; + } + } +#endif #ifdef INET6 if (rack->r_is_v6) { if (tp->t_port) { @@ -21337,7 +21383,7 @@ send: /* TCP-MD5 (RFC2385). */ if (tp->t_flags & TF_SIGNATURE) to.to_flags |= TOF_SIGNATURE; -#endif /* TCP_SIGNATURE */ +#endif /* Processing the options. */ hdrlen += optlen = tcp_addoptions(&to, opt); @@ -21831,6 +21877,15 @@ send: if (udp) udp = (struct udphdr *)(cpto + ((uint8_t *)rack->r_ctl.fsb.udp - rack->r_ctl.fsb.tcp_ip_hdr)); } + if (optlen) { + bcopy(opt, th + 1, optlen); + th->th_off = (sizeof(struct tcphdr) + optlen) >> 2; + } + /* + * Put TCP length in extended header, and then checksum extended + * header and data. + */ + m->m_pkthdr.len = hdrlen + len; /* in6_cksum() need this */ #if defined(IPSEC_SUPPORT) || defined(TCP_SIGNATURE) if (to.to_flags & TOF_SIGNATURE) { /* @@ -21849,15 +21904,6 @@ send: } } #endif - if (optlen) { - bcopy(opt, th + 1, optlen); - th->th_off = (sizeof(struct tcphdr) + optlen) >> 2; - } - /* - * Put TCP length in extended header, and then checksum extended - * header and data. - */ - m->m_pkthdr.len = hdrlen + len; /* in6_cksum() need this */ #ifdef INET6 if (isipv6) { /* From nobody Wed Jun 21 21:00:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmbWM1WJ5z4g9tK; Wed, 21 Jun 2023 21:00: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 4QmbWM15QRz43sb; Wed, 21 Jun 2023 21:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oxlrAfvtncNwS+kzRbZsk3g3ZeYp7tg04zK5Own7wfA=; b=fwsZVlkkByhJohdILzHfzGSN2K6mpETZS5UZquj9UFqJEE7oBYubNYZlNOzMNEbhyt3urS xeZUHVlCrJvaEo3Y8MJCZaEZOk7/pbhbC/7y+FMvl26J32D0iOryLBJ9y9//SsXtK6pghn ah0AUGNQB7BI1E+V9Up9bATmRbR9trY9sLJnrf54B4sQLm1eEbqsge0DXFWdrA8HwqW/W3 tVRot4csIoh7Qwh56COdArWpfJiGbjiSGr8G6VXDVpw2m4He5e2oPjuoZN9mov/1sQ3NAN 38EdocWfiTh52hViKFEZ/jHNANJ+D208WL3HoZrTBc8RZWsih0ABFKm6Q8YtBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oxlrAfvtncNwS+kzRbZsk3g3ZeYp7tg04zK5Own7wfA=; b=RARAyuMlmpmVK4SLOqdkdy9lXUer/mQPiUtWHS9MpHzBf5BEAt7bVuoJzNwsvGUiM3BiIY tplD20Cu6qE6eUT9shZNado+WVeAvn5VsxZK06V2JE/UvgDzT9NO7JSFRO/BdUxnn+jIa+ /MFEVBB6LVzRSIUN6fCKxzHbEzrTVXQ4/6K4f1zeRsv9cgjNaMtjpuVM3x1d1+86+4lbXt lvNBgy5Fv3OGkeLBs04G7YEQCuBwxvEee22uhL1oBo/VUxztncI6CvpxYvGKJn5IoYZLqP AhdJfk6CZUR+3OGvWNQwdzv3XVsabVZgsEVPT8XclJsRVKbQRsFHmf6k/VRw9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687381247; a=rsa-sha256; cv=none; b=AkjFe8YdecMC0YD1Mh5aoZTSXlW2Z/BeoVyyxIOR/s9wrbnklh7F/cqQmspOdHguzRoN+z 0inn5fdDi3rbAy9c0hSzfngrxHMS7XJ7jMHoMMQlnMmmiySHHMVBBA+MGrESB7OKg+ogCp jpYgUitdHZCTVDjBkGrH2O2jeXVHLbaQY1sUtwi6iG5KRcoJJ3Vanu6/m+DFRRtV3l5lfM PNVpOKzqARF6fSKuolAhboow/5L9jjhGvkJu76aAssjWi7739FWpcElpM7nm8tY87p9p+Q j0Q9StWmJnXKFoEIfhuoRVOf5No7VAOf+JkD8m+36QotJZJwxPAvoQ2SBmccWA== 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 4QmbWM09dBzwm4; Wed, 21 Jun 2023 21:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LL0kT9077136; Wed, 21 Jun 2023 21:00:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LL0ksF077135; Wed, 21 Jun 2023 21:00:46 GMT (envelope-from git) Date: Wed, 21 Jun 2023 21:00:46 GMT Message-Id: <202306212100.35LL0ksF077135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 47b32f8f93b4 - main - m4: Support long options. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47b32f8f93b46ce2c7fe3973c331a40096b529da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=47b32f8f93b46ce2c7fe3973c331a40096b529da commit 47b32f8f93b46ce2c7fe3973c331a40096b529da Author: Dag-Erling Smørgrav AuthorDate: 2023-06-21 20:58:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-06-21 20:59:03 +0000 m4: Support long options. The option names are identical to those of the equivalent options in GNU m4, except of course for --gnu which does not exist in GNU m4. While here, make the argument to -d / --debug optional, with the same default behavior as in GNU m4, and document it properly. Sponsored by: Klara, Inc. Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D40694 --- usr.bin/m4/m4.1 | 41 ++++++++++++++++++++++++++--------------- usr.bin/m4/main.c | 20 ++++++++++++++++++-- 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 index 83f124dd3dfc..838348cb78af 100644 --- a/usr.bin/m4/m4.1 +++ b/usr.bin/m4/m4.1 @@ -33,7 +33,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 8, 2021 +.Dd June 21, 2023 .Dt M4 1 .Os .Sh NAME @@ -47,7 +47,7 @@ .Fl D Ar name Op No = Ar value .Sm on .Oc -.Op Fl d Ar flags +.Op Fl d Oo Oo +- Oc Ns Ar flags Oc .Op Fl I Ar dirname .Op Fl o Ar filename .Op Fl t Ar macro @@ -98,15 +98,14 @@ recognized as special when not followed by an open parenthesis. .Pp The options are as follows: .Bl -tag -width Ds -.It Fl D Ns Ar name Ns Op = Ns Ar value +.It Fl D Ns Ar name Ns Oo = Ns Ar value Oc , Fl -define Ns = Ns Ar name Ns Oo = Ns Ar value Oc Define the symbol .Ar name to have some value (or .Dv NULL ) . -.It Fl d Ar "flags" -Set trace flags. -.Ar flags -may hold the following: +.It Fl d Oo Oo +|- Oc Ns Ar flags Oc , Fl -debug Ns = Ns Oo Oo +|- Oc Ns Ar flags Oc +Set or unset trace flags. +The trace flags are as follows: .Bl -tag -width Ds .It Ar a print macro arguments. @@ -128,9 +127,21 @@ number macro expansions. turn on all options. .El .Pp +If +.Qq + +or +.Qq - +is used, the specified flags are added to or removed from the set of +active trace flags, respectively; otherwise, the specified flags +replace the set of active trace flags. +.Pp +Specifying this option without an argument is equivalent to specifying +it with the argument +.Qq aeq . +.Pp By default, trace is set to .Qq eq . -.It Fl E +.It Fl E , Fl -fatal-warnings Set warnings to be fatal. When a single .Fl E @@ -145,7 +156,7 @@ first warning and .Nm will exit with a non-zero exit status. This behaviour matches GNU-m4 1.4.9 and later. -.It Fl g +.It Fl g , Fl -gnu Activate GNU-m4 compatibility mode. In this mode, translit handles simple character ranges (e.g., a-z), regular expressions mimic emacs behavior, @@ -155,27 +166,27 @@ empty names for macro definitions are allowed, and eval understands .Sq 0rbase:value numbers. -.It Fl I Ar "dirname" +.It Fl I Ar dirname , Fl -include Ns = Ns Ar dirname Add directory .Ar dirname to the include path. -.It Fl o Ar filename +.It Fl o Ar filename , Fl -error-output Ns = Ns Ar filename Send trace output to .Ar filename . -.It Fl P +.It Fl P , Fl -prefix-builtins Prefix all built-in macros with .Sq m4_ . For example, instead of writing .Ic define , use .Ic m4_define . -.It Fl s +.It Fl s , Fl -synclines Output line synchronization directives, suitable for .Xr cpp 1 . -.It Fl t Ar macro +.It Fl t Ar macro , Fl -trace Ns = Ns Ar macro Turn tracing on for .Ar macro . -.It Fl "U" Ns Ar "name" +.It Fl U Ns Ar name , Fl -undefine Ns = Ns Ar name Undefine the symbol .Ar name . .El diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c index 292dc5eb3f76..b3cfb5b03304 100644 --- a/usr.bin/m4/main.c +++ b/usr.bin/m4/main.c @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -60,6 +61,21 @@ __FBSDID("$FreeBSD$"); #include "extern.h" #include "pathnames.h" +static const char *shortopts = "+D:d::EgI:o:Pst:U:"; +static const struct option longopts[] = { + { "define", required_argument, NULL, 'D' }, + { "debug", optional_argument, NULL, 'd' }, + { "fatal-warnings", no_argument, NULL, 'E' }, + { "gnu", no_argument, NULL, 'g' }, + { "include", required_argument, NULL, 'I' }, + { "error-output", required_argument, NULL, 'o' }, + { "prefix-builtins", no_argument, NULL, 'P' }, + { "synclines", no_argument, NULL, 's' }, + { "trace", required_argument, NULL, 't' }, + { "undefine", required_argument, NULL, 'U' }, + { NULL, 0, NULL, 0 }, +}; + stae *mstack; /* stack of m4 machine */ char *sstack; /* shadow stack, for string space extension */ static size_t STACKMAX; /* current maximum size of stack */ @@ -188,7 +204,7 @@ main(int argc, char *argv[]) outfile = NULL; resizedivs(MAXOUT); - while ((c = getopt(argc, argv, "gst:d:D:EU:o:I:P")) != -1) + while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) switch(c) { case 'D': /* define something..*/ @@ -218,7 +234,7 @@ main(int argc, char *argv[]) mimic_gnu = 1; break; case 'd': - set_trace_flags(optarg); + set_trace_flags(optarg ? optarg : "aeq"); break; case 's': synch_lines = 1; From nobody Wed Jun 21 21:00:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmbWN3LZkz4g9tT; Wed, 21 Jun 2023 21:00: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 4QmbWN1nyDz43ql; Wed, 21 Jun 2023 21:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jCl/AKFAXJPfJvZXzzlhz1a+h3WDZEgk7lsajD1q+Lg=; b=TdpAm7HjFEgJJn3YZbZlQU+2a6XQb/f/j2LcPOg55MNByUxuQa0TMX7pzAsl2F5jMYHh+W apVbrBWrPu6SkLxUj0WKKQdKN9A04+Rs5oYnc7gHOtu1dVVRagSCDr0C7lQgzneqC7JT8v WRtcC2gum13mebiqD3jt//2MqN9/YHLHSKrJLgMTIktVG6Mu9CgTOuVSsdcAzIONp1wchC durOh6VWUzlvVcBrmLoDS1wXlxCioM/qGybsQUZZUKWqf1wzvy8oUgBXVVbAO9wCW73Y48 JzzgaD6madA9OpFnp2re/3PlROu1ASgJUMgQg5aj8hCO6+PEzziaf5DeYetriw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jCl/AKFAXJPfJvZXzzlhz1a+h3WDZEgk7lsajD1q+Lg=; b=i7sOymfyroCpfBEamYS1wBUT30Pze9P2YgiU866Do2S/EcQk90MTCPqwgpL/nngK3QEZvT Uqot/0rQo9CJx2VwR3wl71IYPisBoW41CjgrsXsUAdAIEY5OuLBeEwqKM2bbofekGCsgKA bWWnQgpfL8wzh20Cl/MU/IY9TxTD5/p2yct9LYbcs8YvRpOB9Uuh7nRrMXZOR6/sJCbTl7 vrydKTU7XCyUFWGbHguYUi1o2doxBndd47U07N7+ufSfBcQOpnalDrFD1h8DEzk7qBSEu0 0NYMb+k85UVqTUHg8hBiytZDSw1ueOm4/oxrdGzpnJ0TgqfxtP0ZYuv2muf7ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687381248; a=rsa-sha256; cv=none; b=Keo4xwB93RpsdrPPmck3JVzwij5b0aMOBABcJL/TaKlJdw2B27Z5JeGLhhkiLC2qPkCYq7 awb5tZi2U6iEcxAtXhuVf/j506+8q5SZOnWe9Rz2v+M82meebWtIRAkOH3vyTVR0E2kF70 m//1k5vNrX++NHlp4ArfVjIXy/eS1+RYR9Qu3ZFWUNgLe6au4nmIUCm0rdIvGENMujVnVX GT+L9HWyiHeQLoYWteYLDdetlD5rG8zFT6gmz0ONW/EyFeVO73z2aAQjl9n7V0kr4P0IWp /yUJt9SBicFBk09ji1+XcSPpryCB+GdL19sUiE8aJfLOKgKZiGsFiFihSk2Gqg== 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 4QmbWN0fvzzwxl; Wed, 21 Jun 2023 21:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LL0mZT077160; Wed, 21 Jun 2023 21:00:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LL0lJj077159; Wed, 21 Jun 2023 21:00:47 GMT (envelope-from git) Date: Wed, 21 Jun 2023 21:00:47 GMT Message-Id: <202306212100.35LL0lJj077159@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 6c9ed64c94f1 - main - m4: Add -G option which reverses -g. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c9ed64c94f192eda8c8b5e9e2b92ff93da36de2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6c9ed64c94f192eda8c8b5e9e2b92ff93da36de2 commit 6c9ed64c94f192eda8c8b5e9e2b92ff93da36de2 Author: Dag-Erling Smørgrav AuthorDate: 2023-06-21 20:58:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-06-21 20:59:03 +0000 m4: Add -G option which reverses -g. This matches GNU m4's -G / --traditional option, and although BSD m4 in non-GNU mode is not exactly identical to GNU mode in traditional mode, it's close enough. Sponsored by: Klara, Inc. Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D40697 --- usr.bin/m4/m4.1 | 10 +++++++--- usr.bin/m4/main.c | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 index 838348cb78af..e234cf201213 100644 --- a/usr.bin/m4/m4.1 +++ b/usr.bin/m4/m4.1 @@ -41,7 +41,7 @@ .Nd macro language processor .Sh SYNOPSIS .Nm -.Op Fl EgPs +.Op Fl EGgPs .Oo .Sm off .Fl D Ar name Op No = Ar value @@ -156,8 +156,12 @@ first warning and .Nm will exit with a non-zero exit status. This behaviour matches GNU-m4 1.4.9 and later. +.It Fl G , Fl -traditional +Disable GNU compatibility mode (see +.Fl g +below). .It Fl g , Fl -gnu -Activate GNU-m4 compatibility mode. +Enable GNU compatibility mode. In this mode, translit handles simple character ranges (e.g., a-z), regular expressions mimic emacs behavior, multiple m4wrap calls are handled as a stack, @@ -485,7 +489,7 @@ utility is compliant with the specification. .Pp The flags -.Op Fl dEgIPot +.Op Fl dEGgIPot and the macros .Ic builtin , .Ic esyscmd , diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c index b3cfb5b03304..f776ca8594e4 100644 --- a/usr.bin/m4/main.c +++ b/usr.bin/m4/main.c @@ -61,11 +61,12 @@ __FBSDID("$FreeBSD$"); #include "extern.h" #include "pathnames.h" -static const char *shortopts = "+D:d::EgI:o:Pst:U:"; +static const char *shortopts = "+D:d::EGgI:o:Pst:U:"; static const struct option longopts[] = { { "define", required_argument, NULL, 'D' }, { "debug", optional_argument, NULL, 'd' }, { "fatal-warnings", no_argument, NULL, 'E' }, + { "traditional", no_argument, NULL, 'G' }, { "gnu", no_argument, NULL, 'g' }, { "include", required_argument, NULL, 'I' }, { "error-output", required_argument, NULL, 'o' }, @@ -230,6 +231,9 @@ main(int argc, char *argv[]) case 'U': /* undefine... */ macro_popdef(optarg); break; + case 'G': + mimic_gnu = 0; + break; case 'g': mimic_gnu = 1; break; From nobody Wed Jun 21 21:00:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmbWP4Db7z4g9tV; Wed, 21 Jun 2023 21:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmbWP21D8z443h; Wed, 21 Jun 2023 21:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a8seioXfo+ztefvaf0djOOAK3wlmZ8erjjUMWxgZ1Fs=; b=sO/TI6HyPrfDRmVEhmUEGr9grsxUUWwxsafqYTwUkocZyo/E+X4bqKSdNWxvvrDTfAqHIN wTh8I/N/HNjrM5qjx3RIMcblHW6l3jlLuINghg9INZwzA1xQjdPW8vQfyeJEVQ6nQwWHSz MnLwJrCHo/mAuqiRRCZpmLt3A4EgGz3EncqSlo2P++RC+dcQN3LJnraCLhfVMqkoKqJ6oQ 8K/IMgiPIsgOvBeXjtRzAfNTR4PYRwu9w3I+pfzbZ2Hu097t6y0f+sCAf8LR8R3QO3HWK3 luwPnr6HxkbQ+iHAS5mlgSLdcWE5Faz9JVcfsyUpO0jlz38/u96wh80glyjrQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a8seioXfo+ztefvaf0djOOAK3wlmZ8erjjUMWxgZ1Fs=; b=o3LGL/YSuTC4Y/ueI2mNqnBSQ3B2OQuqSAhWCbWrndrnaYdI0YrAudumXS4nqLWs2aLV2H z/OA9GzDs1YMn681r3Az2w0dPR/bwbzG5ipzD1kO4byTW7aEfbUffsbk1vgLspXtQ6dRWF Y/ME0BNePFdKcZs0zooyBVUR88IpQVyvw6LZeBS7zw5pFcLMgazlEAdxdaX0FC/Gy32bpA NglgqWE/P/1SWZEDI3d0/gaa63OQAkBku2e1LmfOOYbVbNs6JzvGvvlfAGXHu/+iwF1Uhi s6J8GxjFxccfDSd9oU+4KrYK1G2lRvsUzGPdJ/okQTpGcRf5I+vEvrWoZOX4Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687381249; a=rsa-sha256; cv=none; b=nfTYH1+h9wlcaaNxfXImx7tF+92qOH/uzVrf7qjxDF3bmI4Uk2HoMO/hk115pe5t37vyxp SxPjFZcwdrkWEcRXfsmoPCxFfPwR3TL28rzqRRryDlswb8GvnKf+MJpXsSX4dcxGc8moG3 42BZt2TW57NjKqHMAi0tMlQj+4KcIBl6hn76YJjEzDno2LweM+pmIyN4VoxFnd9ldDT50p uZYa6mGu1L4sfrUh2zaPF4tkpu11b9JyszZKIrE+6W/1PsjKEXJBvfUYbTnUw+Cvu+BTsF Z1iOYoD7C1vJ0mGoNH08Lr2yNlQ/m4f4P5aQzbBvuHWIge5E5i7IX64r0qUaWw== 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 4QmbWP140Dzwxm; Wed, 21 Jun 2023 21:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LL0nMQ078139; Wed, 21 Jun 2023 21:00:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LL0njM078138; Wed, 21 Jun 2023 21:00:49 GMT (envelope-from git) Date: Wed, 21 Jun 2023 21:00:49 GMT Message-Id: <202306212100.35LL0njM078138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: db4c5b8a05bb - main - m4: Miscellaneous man page fixes. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db4c5b8a05bbd54a00dad145a91902d71c1f92a1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=db4c5b8a05bbd54a00dad145a91902d71c1f92a1 commit db4c5b8a05bbd54a00dad145a91902d71c1f92a1 Author: Dag-Erling Smørgrav AuthorDate: 2023-06-21 20:58:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-06-21 20:59:03 +0000 m4: Miscellaneous man page fixes. Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40701 --- usr.bin/m4/m4.1 | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 index e234cf201213..a4a6e759a258 100644 --- a/usr.bin/m4/m4.1 +++ b/usr.bin/m4/m4.1 @@ -155,19 +155,28 @@ flags are specified, execution will halt upon issuing the first warning and .Nm will exit with a non-zero exit status. -This behaviour matches GNU-m4 1.4.9 and later. +This behaviour matches GNU m4 1.4.9 and later. .It Fl G , Fl -traditional Disable GNU compatibility mode (see .Fl g below). .It Fl g , Fl -gnu Enable GNU compatibility mode. -In this mode, translit handles simple character -ranges (e.g., a-z), regular expressions mimic emacs behavior, -multiple m4wrap calls are handled as a stack, +In this mode, +.Ic translit +handles simple character ranges (e.g., +.Sq a-z ) , +regular expressions mimic Emacs behavior, +multiple +.Ic m4wrap +calls are handled as a stack, the number of diversions is unlimited, empty names for macro definitions are allowed, -and eval understands +.Ic undivert +can be used to include files, +and +.Ic eval +understands .Sq 0rbase:value numbers. .It Fl I Ar dirname , Fl -include Ns = Ns Ar dirname From nobody Wed Jun 21 21:00:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmbWQ4HQZz4g9tZ; Wed, 21 Jun 2023 21:00:50 +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 4QmbWQ36fCz4444; Wed, 21 Jun 2023 21:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DhsHfTNlkoEBDH3IeoAu25dMnOsNpmekfvm9qWCAkKQ=; b=AKpR+mS4GqsH8F3SLUnTu85Pj6K3g8lYllyqJLta7KBOTJvlz4hS7AINN6yNa/bphnCo7w SJw4g73Zswk7v3/0b+2ArcO6gZugrIPTcLoBELGfIsRLCHeZh0aefUPwrSZTEuypGpA2Dn rgXcY2uXkXFYVRGvfGZW86fPlS1i82PPmIZ6+jybkfbg+Ldqce1WZBTsemGi3xQsAyN4Ng A834thxleyQGz1itNLfX7LWOkRQPWO8kvnpJOhK1oA+D60w5modzJZ+C6fuONT8dcRgNpM OZmRj8rEwqiIfXr/Nz8RktbG5DKMqBrleY+N/Zg80MhDkoWnajC4d3S4XQplCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687381250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DhsHfTNlkoEBDH3IeoAu25dMnOsNpmekfvm9qWCAkKQ=; b=qFr1yiquw74r30qdb8XqK/3gzBdF/DlPe7+wr75ItTTu6QCQL7Z/20PHRnIKQY3Rgd6xs9 OiZNQsLNu7pSA8kSrOU3YeMUiVI/BU1J2YyWZKG5ki8X1ZZWZIofW8Xs/6M4Vcxn5kQ2zp KOFohzf4Mrq2LQIhPqzYjqc1cVvIxTTUCOfDaJjY0vTvQbS1Ur8HFDu+iCpICIuqy9lbBA DKEaBYsOSJKSPCt6A4yZ9g96efXvnIC8wKLgC3uVMD929mQJibUp9qWC+4sY4ul2iVEH+e Qyne/mBJ7RUg9G2sw25WSMZZnGCEjBksS/ahRkeFfucDrOIg8l/W8hzq0A6a/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687381250; a=rsa-sha256; cv=none; b=MiBa8n+Jd2cZgX420/Ou1QA52I/7RIbmd6xOD31J/RGoD86MOFvYrw7wi6ueltg6x7rpYh tFfHcrZFJ7nM53WLCUU0GEGIynGPKOaGI+InMqR/y2cZ7sz4Zi8qGxNaqoBJWHS4eYlaPc EBnw/meWpNr4aG+nRz5yJ8MukmctorRS4qStqEjpc0H7UJGTCJBltqJXLqtjaH5JZHZk2s gkcYjI3hX6UV2vr7jymY05dL2qnQYXEp/BszyeIdcNnWXnj1RUzrD8PDDGuRpLtTVJAc32 ua8K905naENNX7cgJufSasI/yjUUYfl8TLVUEmgdJOTpRz47epFu97d2oHupjg== 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 4QmbWQ2DvDzwm5; Wed, 21 Jun 2023 21:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LL0o69078163; Wed, 21 Jun 2023 21:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LL0oGA078162; Wed, 21 Jun 2023 21:00:50 GMT (envelope-from git) Date: Wed, 21 Jun 2023 21:00:50 GMT Message-Id: <202306212100.35LL0oGA078162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: bd9049eeff45 - main - Fix prebuild race between libpam and libtacplus. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd9049eeff458fc7ee256a891ba285519c6ce550 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bd9049eeff458fc7ee256a891ba285519c6ce550 commit bd9049eeff458fc7ee256a891ba285519c6ce550 Author: Dag-Erling Smørgrav AuthorDate: 2023-06-21 20:58:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-06-21 20:59:03 +0000 Fix prebuild race between libpam and libtacplus. Fixes: 21850106fdda MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, emaste Differential Revision: https://reviews.freebsd.org/D40702 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 09267b8f69c2..68b1a22c1365 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3051,7 +3051,7 @@ _generic_libs+= ${_DIR} .endif .endfor -lib/libtacplus__L: lib/libmd__L +lib/libtacplus__L: lib/libmd__L lib/libpam/libpam__L .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem From nobody Wed Jun 21 23:52:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmgL32MVyz4gp8N; Wed, 21 Jun 2023 23:52: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 4QmgL30XRlz3H28; Wed, 21 Jun 2023 23:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687391579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jc2kEsKFhpSACzqVv1F+VhFdoyCxVPOwer14wFmb7Qc=; b=j1ENpPK+bVMqhxUkXPgUKmk8nqKt4EVmj9BzJ+/V6yXv4kgE0iPNovz/knLWujCzzB0bmg DYl1JzFdczkGVWmZBH3Sbb3PU9/0zqoVPehpJA44c8ZDtAR85v+zCo/Bbi1ZUJGc00UD/H 2nrGhUIf7t4u61ijphCVBddhg4G7ROaa7HqSqup6c0wlyz/vfSEm0ijdtS0QEK0y/FBAgm 8NmTJKsIQVUvBOJLIITUMZRziljcjsYvJ6/x7dnnIK6DkLDBFYxPw8M/dSWPzvUC6d141q oafET0plPumsqsNP8AF+uF6YnbL9+z0D8gBIZc+DbBofXy4Y8oTnfkfpRNOtZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687391579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jc2kEsKFhpSACzqVv1F+VhFdoyCxVPOwer14wFmb7Qc=; b=SJPjUcvynDCmakKdJs8ns38UbgZ/7Sb8ffdeBDKt+baYAqWgd1yKtGXiZGqetPoVV96JF4 pkrJWhrIJgN6CJB+Cp5kd9lXXdz9AXkZG0ktCSOMRVsLXNqdwzKiptyGjzwEKbFnPcL9KI XupzQIeh7hC1kSJuqvmvWkFQpDuBF0Q1l2r6w0oki2fev634tLNS9ZYN5bEgylycG1QbIp ZpbCy8jywPwcsGxXOpgVjHNtfy22sUk9D4pl5Mkq5MG4Q7m4lNTC2HtIEpQLiNtGvAxDPe cZf8Cn9KVVGocAgGUlPDTkuMNApUcmV4cFiD1SzPAQIOw5Ah3c1iS5P8hOU1ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687391579; a=rsa-sha256; cv=none; b=sKkyZH+dyg0uupi7Eb+BYgWre6YE0DEI8M3AzBSmS7X1MD8IYi77aDg//7KnZcFmakIo81 AWiADropjWr3L9PY/1r5Nkxh4+GbkyNwIBqtE2PilDri0yzqam3dYNMrK84A08TFRkqbfa RQFX25kC8fyXlXCqQMIRDqJH7zMK+JT6lSRSlYt0pxGw7fYgpcG7cB7xuD+W9AOmcEMd6C IWxSJY9lGHnIroko7Ge9CMvxCTp8NSnjQUREIFdCSyxkHo3DKzO2WVfQ4aWmeOuEYXVWIY yEBVSK5W0Syt39OhIjerMhFrIZoTeZxVcIvWwQIzHrp41GsffwSjaGRQyOBwaw== 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 4QmgL26ds4z11x9; Wed, 21 Jun 2023 23:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LNqwTC063083; Wed, 21 Jun 2023 23:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LNqw55063082; Wed, 21 Jun 2023 23:52:58 GMT (envelope-from git) Date: Wed, 21 Jun 2023 23:52:58 GMT Message-Id: <202306212352.35LNqw55063082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: b95d2237af40 - main - le(4): deprecate and mark for removal before 15.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b95d2237af403049d48c23229aa8bace3594970e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b95d2237af403049d48c23229aa8bace3594970e commit b95d2237af403049d48c23229aa8bace3594970e Author: Brooks Davis AuthorDate: 2023-06-21 23:50:12 +0000 Commit: Brooks Davis CommitDate: 2023-06-21 23:52:12 +0000 le(4): deprecate and mark for removal before 15.0 We kept le(4) in the pre-12.0 purge because it was needed for Qemu/MIPS (virtio networking didn't work) but the MIPS port has been removed. Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D40683 --- share/man/man4/le.4 | 8 +++++++- sys/dev/le/lance.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/share/man/man4/le.4 b/share/man/man4/le.4 index 2c7f9cc3e55e..58a6826bb03f 100644 --- a/share/man/man4/le.4 +++ b/share/man/man4/le.4 @@ -36,7 +36,7 @@ .\" from: @(#)le.4 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd December 26, 2020 +.Dd June 21, 2023 .Dt LE 4 .Os .Sh NAME @@ -64,6 +64,12 @@ numbers have to be specified in .Cd hint.le.0.port="0x280" .Cd hint.le.0.irq="10" .Cd hint.le.0.drq="0" +.Sh DEPRECATION NOTICE +The +.Nm +driver may not be present in +.Fx 15.0 +and later. .Sh DESCRIPTION The .Nm diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c index c10ebb074e65..9b8a39086371 100644 --- a/sys/dev/le/lance.c +++ b/sys/dev/le/lance.c @@ -199,6 +199,8 @@ lance_attach(struct lance_softc *sc) if_setifheaderlen(ifp, sizeof(struct ether_vlan_header)); if_setcapabilitiesbit(ifp, IFCAP_VLAN_MTU, 0); if_setcapenablebit(ifp, IFCAP_VLAN_MTU, 0); + + gone_in(15, "le: 10/100 NIC no longer needed for Qemu/MIPS"); } void From nobody Thu Jun 22 05:00:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qmp8t17yxz4fnFW; Thu, 22 Jun 2023 05:00:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qmp8t0gplz4Zlt; Thu, 22 Jun 2023 05:00:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687410030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=esy/aE+B6R/vB92rLJByeuTfYKeBR6disV9ud4C3Qec=; b=xbGt2C+yQCUhumVKAAePjmBssY+dRhszkERmKAJEZ5F+fNXZXEySRnDC7JgdMR7l81cCS1 YTrc1NVQHk0UXEdGs7Xl3664KYdxKDyX9yGtQvth2zlIIX3vvhmAA5jeUUwBBqJsgzrXqO 1FOhNg2VH+CPuJbJKiNXMiiRblB6BCQYXi/kWJMoY4IPjdXOiWiXFDmP25jBQbiFGdLdkw rs1q2gk0pkZ+OalROrZ1eTmf2IO5VdKfAJbS7VOHdR00tNEimWaJkKca3fiF5r8Hp5UFot tPbLWnAm77Ahl5Xdhuot8xkIyPP/laseuLTs5rs3SjXMSiYMPoMcTOhLhUOyDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687410030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=esy/aE+B6R/vB92rLJByeuTfYKeBR6disV9ud4C3Qec=; b=wEnnMsT1npDeos3oFJJlp1fY94RiY0PE+WesRWP2qaGWplcXJ+W0PFaQotJEwjTsiCtGtM u/6cOG4gISm56HuFiIU65LhKoKGgd2XNs/s0O3c/QFqSuZPrNPL8SS9gmkyUncS3L8LrxI pqTxBG6A4yDQHS6jSyz+EHSEnmspmjKJ1JKrdobLYyn0etYuK/Iq/QC6oqtml/NXKoG4r8 LiE4UIF6w46AA9XOLyWSYkf29WogdhAuFOv0yJeSuDDr+urnUajl+02OcATVVXoz/WWLbK JqLydP38ASmUQfBAvmy2JIZI11KrEbP/uYLW9OLbGxbDWefYdIyFoKyFnFpHog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687410030; a=rsa-sha256; cv=none; b=TUTt99Y9vjwA8wnAPaoJGPMipfuYii4aLxVE14gUxdB63ivTIJOi9zJbS6wLWQx2Ra0IWq QsFj07DERetVqXsgLKs7kUNGmgp1MEaYw8xySQHpq5EwaltBiislrnR+E6mVGDcCDJdROn kAteaJX+AOwodx9MVXVoXacvbHtswqjiSbwpLNcPgyIhHYfz2qmJ3NtBo3EpY/pnXSJUEj 1LHZ24vSzOw7NALSnQaHL/YRoh+zb14A7yAtWF1QHWdKbygJ1mx5dng066WCELyUINqXsC 3HVsmUf/7eCbFJSQnCWB0S25QkVuo6l9XH236EoFP6p0RNUOGv3bZfjxSylyVQ== 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 4Qmp8s6pvXz19DV; Thu, 22 Jun 2023 05:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35M50TIx069027; Thu, 22 Jun 2023 05:00:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35M50TNA069026; Thu, 22 Jun 2023 05:00:29 GMT (envelope-from git) Date: Thu, 22 Jun 2023 05:00:29 GMT Message-Id: <202306220500.35M50TNA069026@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 781624ca2d05 - main - getfacl: free `acl` in print_acl error path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 781624ca2d054430052c828ba8d2c2eaf2d733e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=781624ca2d054430052c828ba8d2c2eaf2d733e7 commit 781624ca2d054430052c828ba8d2c2eaf2d733e7 Author: Kyle Evans AuthorDate: 2023-06-22 04:58:33 +0000 Commit: Kyle Evans CommitDate: 2023-06-22 04:58:33 +0000 getfacl: free `acl` in print_acl error path Sponsored by: Klara, Inc. --- bin/getfacl/getfacl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c index ecdc73f74fbc..a077cb8780b8 100644 --- a/bin/getfacl/getfacl.c +++ b/bin/getfacl/getfacl.c @@ -157,6 +157,7 @@ print_acl(char *path, acl_type_t type, int hflag, int iflag, int nflag, acl_text = acl_to_text_np(acl, 0, flags); if (!acl_text) { warn("%s: acl_to_text_np() failed", path); + (void)acl_free(acl); return(-1); } From nobody Thu Jun 22 21:10:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnChW2d4xz4gfHN; Thu, 22 Jun 2023 21:10: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 4QnChW2Qhfz481C; Thu, 22 Jun 2023 21:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CBF60gmZsZwXtt0ElenZ2/nwo4S8kxEefAqNbhuGrL4=; b=Fbq/jAoe/HC1HymyQ5ze7dP9qBkuKe24CmU7ENfykjHxtPV/7j/A2Oknu9NbdSgyR57pau A+wyeSPE5zLhZbTmddOZqMeuCMFKRU3kn/piojx3Tn8VURKOZ7vQfUiJZSwyzB9st/uD6A spjsAR/uMZveIdSskpxt4WGx+Zh9Y9/h3TV1Crfeqy7jd22NEyfWMZKyMPh8ESP3sS/3NF v6VE7a7usOl9foCwnHDNVbO4hd29ef97EoYqArwRCdt9OTV7ro+jh7lfK8gl5L8uZOqWcZ 0WLeCw6ZntURaQ1AeL3mpRzdODZR9/4VYkjZX6RYcgE2VnEWy4KizOL3Tv5kcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CBF60gmZsZwXtt0ElenZ2/nwo4S8kxEefAqNbhuGrL4=; b=dTghhTAMWevxh4nPM+jgYqnHWYHbyRQ2L4aRZcPi+OidsM/hXKBljEo2qiEFZ1sniYeXdj HKVqduvdo3y7S/P31hog9qEsDxdtg6syBBwOxciMnSiGJpDpn44DbEtZV2kciUIeNLnEYr uWpvFRh1trlhPCnmCVZp+8H7fRJligyVDhIewAcQ2wzsjKbGSCrLGlj/wbevIYEIn/rQpT 4VeL4cFn3xwQB9sguKanYVpXR6PjPsecm2+CXL/Rk8YgfrM3MpC3Wh2zjTBccyrbc16nkh 43eJcRJcPJRVQnWSCg02zzv0rEtNqBHVau0IGEVGo+EvR/AsLap9485gYDvIeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468251; a=rsa-sha256; cv=none; b=M5usdqSVNj2cYwKwBZsgmxV6oCDiRJP6UHMoPTZJPjrt40wEV4ucb+4hzQbC3wflX69yu9 VS9PzKcpFIlGyl37VhTepEK4OpppuTHaW6yMSszvyKthLk9sFFJyrM2H0A5qz7TfQTkYUo DsJHGqz/HTYzA9ceD4xgZAHYyG/uzSkIGxez+Kq/VBBDME45BLyW94uqCWSuhVYmvsmz8d Qyg69Fmn9BMl/NfR/h1LvYmd2c+5iYO10999FRoVal6mt9tH3T3vQVPT6b2Bwz3mcx7cxh zVbh0u9o7SHKnrUI73zS76DJMLMqajJoxKDb6PariRO0lh0cZvp8hSaNF+IeWw== 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 4QnChW1WxLzdrB; Thu, 22 Jun 2023 21:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLApe5066067; Thu, 22 Jun 2023 21:10:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLAg6u066059; Thu, 22 Jun 2023 21:10:42 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:10:42 GMT Message-Id: <202306222110.35MLAg6u066059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: bdd1243df58e - main - Merge llvm-project main llvmorg-16-init-18548-gb0daacf58f41 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bdd1243df58e60e85101c09001d9812a789b6bc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bdd1243df58e60e85101c09001d9812a789b6bc4 commit bdd1243df58e60e85101c09001d9812a789b6bc4 Merge: 781624ca2d05 e3b557809604 Author: Dimitry Andric AuthorDate: 2023-04-14 21:41:27 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:20:56 +0000 Merge llvm-project main llvmorg-16-init-18548-gb0daacf58f41 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16-init-18548-gb0daacf58f41. PR: 271047 MFC after: 1 month ObsoleteFiles.inc | 329 + contrib/llvm-project/FREEBSD-Xlist | 52 +- .../clang/include/clang-c/CXDiagnostic.h | 379 + .../llvm-project/clang/include/clang-c/CXFile.h | 83 + .../clang/include/clang-c/CXSourceLocation.h | 286 + .../clang/include/clang-c/Documentation.h | 64 + contrib/llvm-project/clang/include/clang-c/Index.h | 812 +- .../clang/include/clang/APINotes/Types.h | 107 +- .../clang/include/clang/ARCMigrate/ARCMTActions.h | 2 +- .../llvm-project/clang/include/clang/AST/APValue.h | 2 +- .../clang/include/clang/AST/ASTConcept.h | 13 + .../clang/include/clang/AST/ASTConsumer.h | 2 +- .../clang/include/clang/AST/ASTContext.h | 144 +- .../clang/include/clang/AST/ASTDumper.h | 1 + .../clang/include/clang/AST/ASTImporter.h | 14 +- .../include/clang/AST/ASTImporterSharedState.h | 5 +- .../clang/include/clang/AST/ASTNodeTraverser.h | 33 +- .../include/clang/AST/ASTStructuralEquivalence.h | 4 +- .../clang/include/clang/AST/ASTTypeTraits.h | 15 +- .../clang/include/clang/AST/ASTUnresolvedSet.h | 7 +- .../clang/include/clang/AST/AbstractBasicReader.h | 15 +- .../clang/include/clang/AST/AbstractBasicWriter.h | 17 +- .../llvm-project/clang/include/clang/AST/Attr.h | 35 +- .../clang/include/clang/AST/CanonicalType.h | 3 +- .../clang/include/clang/AST/CharUnits.h | 9 +- .../clang/include/clang/AST/CommentSema.h | 2 +- .../clang/include/clang/AST/ComparisonCategories.h | 4 +- .../clang/include/clang/AST/ComputeDependence.h | 2 + .../llvm-project/clang/include/clang/AST/Decl.h | 192 +- .../clang/include/clang/AST/DeclBase.h | 37 +- .../llvm-project/clang/include/clang/AST/DeclCXX.h | 84 +- .../clang/include/clang/AST/DeclFriend.h | 10 +- .../clang/include/clang/AST/DeclObjC.h | 68 +- .../clang/include/clang/AST/DeclOpenMP.h | 12 +- .../clang/include/clang/AST/DeclTemplate.h | 150 +- .../clang/include/clang/AST/DeclarationName.h | 2 +- .../llvm-project/clang/include/clang/AST/Expr.h | 47 +- .../llvm-project/clang/include/clang/AST/ExprCXX.h | 359 +- .../clang/include/clang/AST/ExprConcepts.h | 125 +- .../clang/include/clang/AST/ExprObjC.h | 17 +- .../clang/include/clang/AST/ExprOpenMP.h | 4 +- .../clang/include/clang/AST/ExternalASTMerger.h | 2 +- .../clang/include/clang/AST/ExternalASTSource.h | 4 +- .../clang/include/clang/AST/FormatString.h | 19 +- .../clang/include/clang/AST/JSONNodeDumper.h | 7 +- .../clang/include/clang/AST/LambdaCapture.h | 8 +- .../llvm-project/clang/include/clang/AST/Mangle.h | 20 +- .../llvm-project/clang/include/clang/AST/NSAPI.h | 16 +- .../clang/include/clang/AST/ODRDiagsEmitter.h | 203 + .../llvm-project/clang/include/clang/AST/ODRHash.h | 14 +- .../clang/include/clang/AST/OpenMPClause.h | 1221 +- .../clang/include/clang/AST/ParentMapContext.h | 2 +- .../clang/include/clang/AST/PrettyPrinter.h | 6 +- .../clang/include/clang/AST/PropertiesBase.td | 63 +- .../clang/include/clang/AST/RecursiveASTVisitor.h | 106 +- .../llvm-project/clang/include/clang/AST/Stmt.h | 30 +- .../clang/include/clang/AST/StmtOpenMP.h | 76 +- .../clang/include/clang/AST/TemplateBase.h | 46 +- .../clang/include/clang/AST/TemplateName.h | 102 +- .../clang/include/clang/AST/TextNodeDumper.h | 4 + .../llvm-project/clang/include/clang/AST/Type.h | 419 +- .../llvm-project/clang/include/clang/AST/TypeLoc.h | 81 +- .../clang/include/clang/AST/TypeProperties.td | 66 +- .../include/clang/ASTMatchers/ASTMatchFinder.h | 9 +- .../clang/include/clang/ASTMatchers/ASTMatchers.h | 59 +- .../clang/ASTMatchers/ASTMatchersInternal.h | 92 +- .../include/clang/ASTMatchers/Dynamic/Parser.h | 16 +- .../include/clang/ASTMatchers/Dynamic/Registry.h | 6 +- .../clang/ASTMatchers/Dynamic/VariantValue.h | 12 +- .../clang/Analysis/Analyses/PostOrderCFGView.h | 10 +- .../clang/Analysis/Analyses/ThreadSafetyCommon.h | 13 +- .../clang/Analysis/Analyses/ThreadSafetyTIL.h | 20 +- .../clang/Analysis/Analyses/ThreadSafetyTraverse.h | 5 +- .../clang/Analysis/Analyses/ThreadSafetyUtil.h | 4 +- .../clang/Analysis/Analyses/UnsafeBufferUsage.h | 48 + .../Analysis/Analyses/UnsafeBufferUsageGadgets.def | 35 + .../clang/include/clang/Analysis/AnyCall.h | 17 +- .../clang/include/clang/Analysis/BodyFarm.h | 4 +- .../clang/include/clang/Analysis/CFG.h | 29 +- .../clang/include/clang/Analysis/CloneDetection.h | 2 +- .../include/clang/Analysis/ConstructionContext.h | 2 +- .../clang/Analysis/FlowSensitive/CFGMatchSwitch.h | 98 + .../Analysis/FlowSensitive/ControlFlowContext.h | 20 +- .../Analysis/FlowSensitive/DataflowAnalysis.h | 138 +- .../FlowSensitive/DataflowAnalysisContext.h | 86 +- .../Analysis/FlowSensitive/DataflowEnvironment.h | 143 +- .../clang/Analysis/FlowSensitive/DataflowLattice.h | 2 + .../clang/Analysis/FlowSensitive/DataflowValues.h | 2 +- .../clang/Analysis/FlowSensitive/DebugSupport.h | 8 +- .../clang/Analysis/FlowSensitive/MatchSwitch.h | 90 +- .../FlowSensitive/Models/ChromiumCheckModel.h | 2 +- .../Models/UncheckedOptionalAccessModel.h | 35 +- .../clang/Analysis/FlowSensitive/NoopAnalysis.h | 4 +- .../include/clang/Analysis/FlowSensitive/Solver.h | 8 +- .../clang/Analysis/FlowSensitive/StorageLocation.h | 3 + .../clang/Analysis/FlowSensitive/Transfer.h | 10 +- .../FlowSensitive/TypeErasedDataflowAnalysis.h | 79 +- .../include/clang/Analysis/FlowSensitive/Value.h | 29 +- .../include/clang/Analysis/MacroExpansionContext.h | 12 +- .../clang/include/clang/Analysis/PathDiagnostic.h | 6 +- .../clang/include/clang/Analysis/ProgramPoint.h | 13 +- .../include/clang/Analysis/RetainSummaryManager.h | 18 +- .../clang/include/clang/Basic/AddressSpaces.h | 3 + .../llvm-project/clang/include/clang/Basic/Attr.td | 234 +- .../clang/include/clang/Basic/AttrDocs.td | 232 +- .../clang/include/clang/Basic/BuiltinHeaders.def | 43 + .../clang/include/clang/Basic/Builtins.def | 1118 +- .../clang/include/clang/Basic/Builtins.h | 42 +- .../clang/include/clang/Basic/BuiltinsAArch64.def | 324 +- .../clang/Basic/BuiltinsAArch64NeonSVEBridge.def | 72 +- .../clang/include/clang/Basic/BuiltinsAMDGPU.def | 46 +- .../clang/include/clang/Basic/BuiltinsARM.def | 222 +- .../clang/include/clang/Basic/BuiltinsHexagon.def | 16 +- .../include/clang/Basic/BuiltinsHexagonDep.def | 37 + .../clang/Basic/BuiltinsHexagonMapCustomDep.def | 4 + .../include/clang/Basic/BuiltinsLoongArch.def | 61 + .../clang/include/clang/Basic/BuiltinsNVPTX.def | 24 +- .../clang/include/clang/Basic/BuiltinsPPC.def | 10 +- .../clang/include/clang/Basic/BuiltinsRISCV.def | 67 +- .../clang/include/clang/Basic/BuiltinsSVE.def | 1 + .../clang/include/clang/Basic/BuiltinsVE.def | 2 +- .../include/clang/Basic/BuiltinsWebAssembly.def | 21 +- .../clang/include/clang/Basic/BuiltinsX86.def | 169 +- .../clang/include/clang/Basic/BuiltinsX86_64.def | 34 +- .../clang/include/clang/Basic/CLWarnings.h | 4 +- .../clang/include/clang/Basic/CodeGenOptions.def | 30 +- .../clang/include/clang/Basic/CodeGenOptions.h | 35 +- .../llvm-project/clang/include/clang/Basic/Cuda.h | 8 +- .../include/clang/Basic/CustomizableOptional.h | 280 + .../clang/include/clang/Basic/DarwinSDKInfo.h | 39 +- .../clang/include/clang/Basic/DeclNodes.td | 4 +- .../clang/include/clang/Basic/Diagnostic.h | 27 +- .../clang/include/clang/Basic/Diagnostic.td | 4 +- .../include/clang/Basic/DiagnosticASTKinds.td | 414 +- .../include/clang/Basic/DiagnosticCommonKinds.td | 37 +- .../include/clang/Basic/DiagnosticDriverKinds.td | 70 +- .../clang/include/clang/Basic/DiagnosticError.h | 5 +- .../include/clang/Basic/DiagnosticFrontendKinds.td | 29 +- .../clang/include/clang/Basic/DiagnosticGroups.td | 53 +- .../clang/include/clang/Basic/DiagnosticIDs.h | 5 +- .../include/clang/Basic/DiagnosticLexKinds.td | 17 +- .../clang/include/clang/Basic/DiagnosticOptions.h | 6 +- .../include/clang/Basic/DiagnosticParseKinds.td | 74 +- .../include/clang/Basic/DiagnosticSemaKinds.td | 350 +- .../clang/Basic/DiagnosticSerializationKinds.td | 292 - .../clang/include/clang/Basic/DirectoryEntry.h | 75 +- .../clang/include/clang/Basic/FPOptions.def | 1 + .../clang/include/clang/Basic/Features.def | 1 + .../clang/include/clang/Basic/FileEntry.h | 106 +- .../clang/include/clang/Basic/FileManager.h | 18 +- .../include/clang/Basic/FileSystemStatCache.h | 3 +- .../clang/include/clang/Basic/HLSLRuntime.h | 66 + .../clang/include/clang/Basic/HeaderInclude.h | 73 + .../clang/include/clang/Basic/IdentifierTable.h | 9 +- .../clang/include/clang/Basic/JsonSupport.h | 12 +- .../llvm-project/clang/include/clang/Basic/LLVM.h | 6 +- .../clang/include/clang/Basic/LangOptions.def | 17 +- .../clang/include/clang/Basic/LangOptions.h | 44 +- .../clang/include/clang/Basic/LangStandards.def | 2 +- .../clang/include/clang/Basic/Module.h | 38 +- .../clang/include/clang/Basic/OpenCLExtensions.def | 6 - .../clang/include/clang/Basic/OpenMPKinds.def | 39 + .../clang/include/clang/Basic/OpenMPKinds.h | 53 +- .../clang/include/clang/Basic/OperatorKinds.def | 4 +- .../clang/include/clang/Basic/PartialDiagnostic.h | 4 +- .../clang/include/clang/Basic/ProfileList.h | 25 +- .../clang/include/clang/Basic/Sanitizers.def | 3 + .../llvm-project/clang/include/clang/Basic/Sarif.h | 85 +- .../clang/include/clang/Basic/SourceLocation.h | 6 + .../clang/include/clang/Basic/SourceManager.h | 143 +- .../clang/include/clang/Basic/Specifiers.h | 57 +- .../clang/include/clang/Basic/StmtNodes.td | 2 + .../clang/include/clang/Basic/SyncScope.h | 4 +- .../clang/include/clang/Basic/TargetBuiltins.h | 11 + .../clang/include/clang/Basic/TargetID.h | 21 +- .../clang/include/clang/Basic/TargetInfo.h | 134 +- .../clang/include/clang/Basic/TargetOptions.h | 3 + .../clang/include/clang/Basic/TokenKinds.def | 71 +- .../include/clang/Basic/TransformTypeTraits.def | 29 + .../clang/include/clang/Basic/TypeTraits.h | 4 + .../clang/include/clang/Basic/arm_fp16.td | 2 +- .../clang/include/clang/Basic/arm_neon.td | 97 +- .../clang/include/clang/Basic/arm_neon_incl.td | 1 + .../clang/include/clang/Basic/arm_sve.td | 172 +- .../clang/include/clang/Basic/riscv_vector.td | 973 +- .../clang/include/clang/CodeGen/CGFunctionInfo.h | 4 +- .../include/clang/CrossTU/CrossTranslationUnit.h | 10 +- .../clang/include/clang/Driver/Action.h | 43 +- .../clang/include/clang/Driver/Compilation.h | 9 +- .../clang/include/clang/Driver/Distro.h | 3 +- .../clang/include/clang/Driver/Driver.h | 53 +- .../llvm-project/clang/include/clang/Driver/Job.h | 25 +- .../clang/include/clang/Driver/OffloadBundler.h | 89 + .../clang/include/clang/Driver/Options.td | 567 +- .../clang/include/clang/Driver/SanitizerArgs.h | 3 +- .../clang/include/clang/Driver/ToolChain.h | 50 +- .../clang/include/clang/Driver/Types.def | 6 +- .../clang/include/clang/Driver/Types.h | 3 + .../clang/include/clang/ExtractAPI/API.h | 429 +- .../include/clang/ExtractAPI/APIIgnoresList.h | 74 + .../include/clang/ExtractAPI/AvailabilityInfo.h | 57 +- .../clang/ExtractAPI/DeclarationFragments.h | 16 +- .../include/clang/ExtractAPI/ExtractAPIVisitor.h | 88 + .../include/clang/ExtractAPI/FrontendActions.h | 4 + .../ExtractAPI/Serialization/SerializerBase.h | 11 +- .../Serialization/SymbolGraphSerializer.h | 57 +- .../clang/include/clang/Format/Format.h | 2368 +- .../clang/include/clang/Frontend/ASTUnit.h | 11 +- .../include/clang/Frontend/CommandLineSourceLoc.h | 9 +- .../include/clang/Frontend/CompilerInstance.h | 6 +- .../include/clang/Frontend/CompilerInvocation.h | 21 +- .../clang/Frontend/DependencyOutputOptions.h | 10 +- .../clang/include/clang/Frontend/FrontendActions.h | 13 - .../clang/include/clang/Frontend/FrontendOptions.h | 24 +- .../clang/include/clang/Frontend/SARIFDiagnostic.h | 74 + .../clang/Frontend/SARIFDiagnosticPrinter.h | 76 + .../SerializablePathCollection.h | 1 - .../clang/Lex/DependencyDirectivesScanner.h | 5 +- .../clang/include/clang/Lex/DirectoryLookup.h | 17 +- .../clang/include/clang/Lex/HeaderMap.h | 21 +- .../clang/include/clang/Lex/HeaderSearch.h | 33 +- .../llvm-project/clang/include/clang/Lex/Lexer.h | 14 +- .../clang/include/clang/Lex/MacroInfo.h | 9 +- .../clang/include/clang/Lex/ModuleLoader.h | 5 + .../clang/include/clang/Lex/ModuleMap.h | 47 +- .../clang/include/clang/Lex/PPCallbacks.h | 38 +- .../clang/include/clang/Lex/PreprocessingRecord.h | 17 +- .../clang/include/clang/Lex/Preprocessor.h | 95 +- .../clang/include/clang/Lex/PreprocessorOptions.h | 6 +- .../llvm-project/clang/include/clang/Lex/Token.h | 9 + .../clang/include/clang/Parse/Parser.h | 246 +- .../include/clang/Parse/RAIIObjectsForParser.h | 13 + .../include/clang/Sema/CodeCompleteConsumer.h | 34 +- .../clang/include/clang/Sema/DeclSpec.h | 65 +- .../clang/include/clang/Sema/DelayedDiagnostic.h | 4 +- .../include/clang/Sema/HLSLExternalSemaSource.h | 16 +- .../clang/include/clang/Sema/Initialization.h | 12 +- .../llvm-project/clang/include/clang/Sema/Lookup.h | 4 +- .../clang/Sema/MultiplexExternalSemaSource.h | 17 +- .../clang/include/clang/Sema/Overload.h | 42 +- .../clang/include/clang/Sema/ParsedAttr.h | 29 +- .../include/clang/Sema/RISCVIntrinsicManager.h | 1 - .../llvm-project/clang/include/clang/Sema/Scope.h | 23 +- .../clang/include/clang/Sema/ScopeInfo.h | 34 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 965 +- .../clang/include/clang/Sema/SemaConcept.h | 8 +- .../clang/include/clang/Sema/SemaInternal.h | 4 +- .../clang/include/clang/Sema/SemaLambda.h | 5 +- .../clang/include/clang/Sema/Template.h | 95 +- .../clang/include/clang/Sema/TemplateDeduction.h | 38 +- .../include/clang/Serialization/ASTBitCodes.h | 26 +- .../clang/include/clang/Serialization/ASTReader.h | 103 +- .../include/clang/Serialization/ASTRecordReader.h | 2 +- .../clang/include/clang/Serialization/ASTWriter.h | 49 +- .../clang/Serialization/InMemoryModuleCache.h | 1 - .../clang/include/clang/Serialization/ModuleFile.h | 20 +- .../include/clang/Serialization/ModuleManager.h | 5 +- .../clang/Serialization/SourceLocationEncoding.h | 2 +- .../clang/StaticAnalyzer/Checkers/Checkers.td | 6 +- .../clang/StaticAnalyzer/Checkers/LocalCheckers.h | 27 - .../clang/StaticAnalyzer/Checkers/SValExplainer.h | 21 +- .../include/clang/StaticAnalyzer/Checkers/Taint.h | 36 +- .../clang/StaticAnalyzer/Core/AnalyzerOptions.def | 5 +- .../clang/StaticAnalyzer/Core/AnalyzerOptions.h | 5 +- .../StaticAnalyzer/Core/BugReporter/BugReporter.h | 22 +- .../Core/BugReporter/BugReporterVisitors.h | 11 +- .../clang/StaticAnalyzer/Core/CheckerManager.h | 2 +- .../Core/PathSensitive/BasicValueFactory.h | 12 +- .../Core/PathSensitive/CallDescription.h | 27 +- .../StaticAnalyzer/Core/PathSensitive/CallEvent.h | 33 +- .../Core/PathSensitive/CheckerContext.h | 19 +- .../Core/PathSensitive/CheckerHelpers.h | 11 +- .../Core/PathSensitive/ConstraintManager.h | 8 +- .../StaticAnalyzer/Core/PathSensitive/CoreEngine.h | 8 +- .../Core/PathSensitive/DynamicType.h | 1 - .../Core/PathSensitive/ExplodedGraph.h | 4 +- .../StaticAnalyzer/Core/PathSensitive/ExprEngine.h | 86 +- .../Core/PathSensitive/FunctionSummary.h | 7 +- .../StaticAnalyzer/Core/PathSensitive/MemRegion.h | 16 +- .../Core/PathSensitive/ProgramState.h | 76 +- .../Core/PathSensitive/SMTConstraintManager.h | 11 +- .../StaticAnalyzer/Core/PathSensitive/SMTConv.h | 4 +- .../Core/PathSensitive/SValBuilder.h | 12 +- .../StaticAnalyzer/Core/PathSensitive/SVals.h | 11 +- .../StaticAnalyzer/Core/PathSensitive/Store.h | 15 +- .../Core/PathSensitive/SymbolManager.h | 18 +- .../include/clang/Support/RISCVVIntrinsicUtils.h | 170 +- .../clang/include/clang/Testing/TestAST.h | 5 + .../clang/include/clang/Tooling/ASTDiff/ASTDiff.h | 5 +- .../clang/include/clang/Tooling/AllTUsExecution.h | 3 +- .../clang/include/clang/Tooling/Core/Replacement.h | 17 +- .../DependencyScanningFilesystem.h | 21 +- .../DependencyScanning/DependencyScanningService.h | 15 +- .../DependencyScanning/DependencyScanningTool.h | 95 +- .../DependencyScanning/DependencyScanningWorker.h | 52 +- .../DependencyScanning/ModuleDepCollector.h | 115 +- .../clang/Tooling/Inclusions/HeaderAnalysis.h | 46 + .../clang/Tooling/Inclusions/HeaderIncludes.h | 37 +- .../clang/Tooling/Inclusions/StandardLibrary.h | 14 +- .../clang/Tooling/Refactoring/ASTSelection.h | 11 +- .../clang/Tooling/Refactoring/Extract/Extract.h | 12 +- .../Tooling/Refactoring/RefactoringActionRule.h | 1 - .../Refactoring/RefactoringActionRulesInternal.h | 12 +- .../Tooling/Refactoring/RefactoringOptionVisitor.h | 6 +- .../clang/Tooling/Refactoring/RefactoringOptions.h | 5 +- .../Tooling/Refactoring/Rename/SymbolOccurrences.h | 2 +- .../include/clang/Tooling/StandaloneExecution.h | 3 +- .../clang/include/clang/Tooling/Syntax/Tokens.h | 9 +- .../clang/include/clang/Tooling/Syntax/Tree.h | 2 +- .../clang/include/clang/Tooling/Tooling.h | 2 +- .../clang/Tooling/Transformer/RewriteRule.h | 9 +- .../include/clang/Tooling/Transformer/SourceCode.h | 52 +- .../clang/Tooling/Transformer/SourceCodeBuilders.h | 19 +- .../clang/Tooling/Transformer/Transformer.h | 43 +- .../clang/include/clang/module.modulemap | 5 +- .../clang/lib/APINotes/APINotesYAMLCompiler.cpp | 76 +- .../clang/lib/ARCMigrate/ARCMTActions.cpp | 4 +- .../llvm-project/clang/lib/ARCMigrate/Internals.h | 6 +- .../llvm-project/clang/lib/ARCMigrate/ObjCMT.cpp | 18 +- .../clang/lib/ARCMigrate/TransGCAttrs.cpp | 4 +- .../lib/ARCMigrate/TransRetainReleaseDealloc.cpp | 2 +- .../clang/lib/ARCMigrate/TransformActions.cpp | 2 +- contrib/llvm-project/clang/lib/AST/APValue.cpp | 10 +- contrib/llvm-project/clang/lib/AST/ASTConcept.cpp | 72 +- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 1683 +- .../llvm-project/clang/lib/AST/ASTDiagnostic.cpp | 39 +- contrib/llvm-project/clang/lib/AST/ASTDumper.cpp | 55 +- contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 496 +- .../clang/lib/AST/ASTStructuralEquivalence.cpp | 159 +- .../llvm-project/clang/lib/AST/AttrDocTable.cpp | 2 +- contrib/llvm-project/clang/lib/AST/AttrImpl.cpp | 41 +- .../llvm-project/clang/lib/AST/CXXInheritance.cpp | 1 - contrib/llvm-project/clang/lib/AST/Comment.cpp | 6 +- .../clang/lib/AST/CommentCommandTraits.cpp | 8 +- .../llvm-project/clang/lib/AST/CommentLexer.cpp | 2 +- .../llvm-project/clang/lib/AST/CommentParser.cpp | 31 +- contrib/llvm-project/clang/lib/AST/CommentSema.cpp | 6 +- .../clang/lib/AST/ComparisonCategories.cpp | 5 +- .../clang/lib/AST/ComputeDependence.cpp | 20 +- contrib/llvm-project/clang/lib/AST/Decl.cpp | 258 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 47 +- contrib/llvm-project/clang/lib/AST/DeclCXX.cpp | 188 +- contrib/llvm-project/clang/lib/AST/DeclObjC.cpp | 100 +- contrib/llvm-project/clang/lib/AST/DeclOpenMP.cpp | 2 +- contrib/llvm-project/clang/lib/AST/DeclPrinter.cpp | 35 +- .../llvm-project/clang/lib/AST/DeclTemplate.cpp | 191 +- .../llvm-project/clang/lib/AST/DeclarationName.cpp | 12 +- contrib/llvm-project/clang/lib/AST/Expr.cpp | 101 +- contrib/llvm-project/clang/lib/AST/ExprCXX.cpp | 148 +- .../clang/lib/AST/ExprClassification.cpp | 10 +- .../llvm-project/clang/lib/AST/ExprConcepts.cpp | 77 +- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 688 +- .../clang/lib/AST/ExternalASTSource.cpp | 6 +- .../llvm-project/clang/lib/AST/FormatString.cpp | 134 +- .../llvm-project/clang/lib/AST/Interp/Boolean.h | 27 +- .../clang/lib/AST/Interp/ByteCodeEmitter.cpp | 135 +- .../clang/lib/AST/Interp/ByteCodeEmitter.h | 4 +- .../clang/lib/AST/Interp/ByteCodeExprGen.cpp | 1138 +- .../clang/lib/AST/Interp/ByteCodeExprGen.h | 171 +- .../clang/lib/AST/Interp/ByteCodeGenError.h | 12 +- .../clang/lib/AST/Interp/ByteCodeStmtGen.cpp | 203 +- .../clang/lib/AST/Interp/ByteCodeStmtGen.h | 16 +- .../llvm-project/clang/lib/AST/Interp/Context.cpp | 39 +- .../llvm-project/clang/lib/AST/Interp/Context.h | 6 +- .../clang/lib/AST/Interp/Descriptor.cpp | 93 +- .../llvm-project/clang/lib/AST/Interp/Descriptor.h | 92 +- .../llvm-project/clang/lib/AST/Interp/Disasm.cpp | 28 +- .../clang/lib/AST/Interp/EvalEmitter.cpp | 29 +- .../clang/lib/AST/Interp/EvalEmitter.h | 12 +- .../llvm-project/clang/lib/AST/Interp/Function.cpp | 15 +- .../llvm-project/clang/lib/AST/Interp/Function.h | 74 +- .../llvm-project/clang/lib/AST/Interp/Integral.h | 126 +- .../llvm-project/clang/lib/AST/Interp/Interp.cpp | 93 +- contrib/llvm-project/clang/lib/AST/Interp/Interp.h | 547 +- .../clang/lib/AST/Interp/InterpBlock.h | 53 +- .../clang/lib/AST/Interp/InterpFrame.cpp | 90 +- .../clang/lib/AST/Interp/InterpFrame.h | 42 +- .../clang/lib/AST/Interp/InterpStack.cpp | 2 +- .../clang/lib/AST/Interp/InterpStack.h | 67 +- .../clang/lib/AST/Interp/InterpState.h | 3 +- .../llvm-project/clang/lib/AST/Interp/Opcodes.td | 118 +- .../llvm-project/clang/lib/AST/Interp/Pointer.cpp | 26 +- .../llvm-project/clang/lib/AST/Interp/Pointer.h | 49 +- .../llvm-project/clang/lib/AST/Interp/PrimType.cpp | 4 +- .../llvm-project/clang/lib/AST/Interp/PrimType.h | 14 +- .../llvm-project/clang/lib/AST/Interp/Program.cpp | 123 +- .../llvm-project/clang/lib/AST/Interp/Program.h | 54 +- contrib/llvm-project/clang/lib/AST/Interp/Record.h | 22 +- .../llvm-project/clang/lib/AST/Interp/Source.cpp | 4 +- contrib/llvm-project/clang/lib/AST/Interp/Source.h | 16 +- contrib/llvm-project/clang/lib/AST/Interp/State.h | 5 + .../llvm-project/clang/lib/AST/ItaniumCXXABI.cpp | 17 +- .../llvm-project/clang/lib/AST/ItaniumMangle.cpp | 101 +- .../llvm-project/clang/lib/AST/JSONNodeDumper.cpp | 40 +- contrib/llvm-project/clang/lib/AST/Linkage.h | 8 +- contrib/llvm-project/clang/lib/AST/Mangle.cpp | 8 +- .../llvm-project/clang/lib/AST/MicrosoftCXXABI.cpp | 4 +- .../llvm-project/clang/lib/AST/MicrosoftMangle.cpp | 51 +- contrib/llvm-project/clang/lib/AST/NSAPI.cpp | 25 +- .../clang/lib/AST/NestedNameSpecifier.cpp | 4 +- .../llvm-project/clang/lib/AST/ODRDiagsEmitter.cpp | 2206 + contrib/llvm-project/clang/lib/AST/ODRHash.cpp | 186 +- contrib/llvm-project/clang/lib/AST/OSLog.cpp | 11 +- .../llvm-project/clang/lib/AST/OpenMPClause.cpp | 109 +- contrib/llvm-project/clang/lib/AST/ParentMap.cpp | 4 +- .../clang/lib/AST/ParentMapContext.cpp | 23 +- .../clang/lib/AST/PrintfFormatString.cpp | 37 +- .../llvm-project/clang/lib/AST/QualTypeNames.cpp | 23 +- .../clang/lib/AST/RecordLayoutBuilder.cpp | 69 +- .../clang/lib/AST/ScanfFormatString.cpp | 8 +- contrib/llvm-project/clang/lib/AST/Stmt.cpp | 11 +- contrib/llvm-project/clang/lib/AST/StmtOpenMP.cpp | 21 +- contrib/llvm-project/clang/lib/AST/StmtPrinter.cpp | 24 +- contrib/llvm-project/clang/lib/AST/StmtProfile.cpp | 28 +- .../llvm-project/clang/lib/AST/TemplateBase.cpp | 32 +- .../llvm-project/clang/lib/AST/TemplateName.cpp | 65 +- .../llvm-project/clang/lib/AST/TextNodeDumper.cpp | 36 +- contrib/llvm-project/clang/lib/AST/Type.cpp | 276 +- contrib/llvm-project/clang/lib/AST/TypeLoc.cpp | 40 +- contrib/llvm-project/clang/lib/AST/TypePrinter.cpp | 294 +- .../llvm-project/clang/lib/AST/VTableBuilder.cpp | 5 +- .../clang/lib/ASTMatchers/ASTMatchFinder.cpp | 14 +- .../clang/lib/ASTMatchers/ASTMatchersInternal.cpp | 17 +- .../clang/lib/ASTMatchers/Dynamic/Marshallers.cpp | 61 +- .../clang/lib/ASTMatchers/Dynamic/Marshallers.h | 74 +- .../clang/lib/ASTMatchers/Dynamic/Parser.cpp | 23 +- .../clang/lib/ASTMatchers/Dynamic/Registry.cpp | 14 +- .../clang/lib/ASTMatchers/Dynamic/VariantValue.cpp | 33 +- .../clang/lib/Analysis/AnalysisDeclContext.cpp | 9 +- .../llvm-project/clang/lib/Analysis/BodyFarm.cpp | 13 +- contrib/llvm-project/clang/lib/Analysis/CFG.cpp | 210 +- .../llvm-project/clang/lib/Analysis/CFGStmtMap.cpp | 3 +- .../clang/lib/Analysis/CalledOnceCheck.cpp | 60 +- .../llvm-project/clang/lib/Analysis/Consumed.cpp | 6 +- .../Analysis/FlowSensitive/ControlFlowContext.cpp | 8 +- .../FlowSensitive/DataflowAnalysisContext.cpp | 58 +- .../Analysis/FlowSensitive/DataflowEnvironment.cpp | 472 +- .../lib/Analysis/FlowSensitive/DebugSupport.cpp | 35 +- .../FlowSensitive/Models/ChromiumCheckModel.cpp | 6 +- .../Models/UncheckedOptionalAccessModel.cpp | 367 +- .../clang/lib/Analysis/FlowSensitive/Transfer.cpp | 288 +- .../FlowSensitive/TypeErasedDataflowAnalysis.cpp | 340 +- .../clang/lib/Analysis/FlowSensitive/Value.cpp | 56 + .../FlowSensitive/WatchedLiteralsSolver.cpp | 5 + .../llvm-project/clang/lib/Analysis/IssueHash.cpp | 5 +- .../clang/lib/Analysis/LiveVariables.cpp | 3 +- .../clang/lib/Analysis/MacroExpansionContext.cpp | 15 +- .../clang/lib/Analysis/PathDiagnostic.cpp | 72 +- .../clang/lib/Analysis/ReachableCode.cpp | 17 +- .../clang/lib/Analysis/RetainSummaryManager.cpp | 39 +- .../clang/lib/Analysis/ThreadSafety.cpp | 231 +- .../clang/lib/Analysis/ThreadSafetyCommon.cpp | 48 +- .../clang/lib/Analysis/UninitializedValues.cpp | 23 +- .../clang/lib/Analysis/UnsafeBufferUsage.cpp | 695 + .../llvm-project/clang/lib/Basic/Attributes.cpp | 1 - .../clang/lib/Basic/BuiltinTargetFeatures.h | 2 +- contrib/llvm-project/clang/lib/Basic/Builtins.cpp | 95 +- .../llvm-project/clang/lib/Basic/CLWarnings.cpp | 3 +- contrib/llvm-project/clang/lib/Basic/Cuda.cpp | 153 +- .../llvm-project/clang/lib/Basic/DarwinSDKInfo.cpp | 40 +- .../llvm-project/clang/lib/Basic/DiagnosticIDs.cpp | 17 +- .../clang/lib/Basic/DiagnosticOptions.cpp | 2 +- .../llvm-project/clang/lib/Basic/FileManager.cpp | 40 +- .../clang/lib/Basic/IdentifierTable.cpp | 217 +- .../llvm-project/clang/lib/Basic/LangStandards.cpp | 14 +- contrib/llvm-project/clang/lib/Basic/Module.cpp | 28 +- .../llvm-project/clang/lib/Basic/OpenMPKinds.cpp | 96 +- .../llvm-project/clang/lib/Basic/ProfileList.cpp | 58 +- .../clang/lib/Basic/SanitizerSpecialCaseList.cpp | 2 +- .../llvm-project/clang/lib/Basic/Sanitizers.cpp | 2 +- contrib/llvm-project/clang/lib/Basic/Sarif.cpp | 65 +- .../clang/lib/Basic/SourceLocation.cpp | 8 +- .../llvm-project/clang/lib/Basic/SourceManager.cpp | 373 +- contrib/llvm-project/clang/lib/Basic/Stack.cpp | 1 - contrib/llvm-project/clang/lib/Basic/TargetID.cpp | 42 +- .../llvm-project/clang/lib/Basic/TargetInfo.cpp | 94 +- contrib/llvm-project/clang/lib/Basic/Targets.cpp | 22 +- .../clang/lib/Basic/Targets/AArch64.cpp | 668 +- .../llvm-project/clang/lib/Basic/Targets/AArch64.h | 107 +- .../clang/lib/Basic/Targets/AMDGPU.cpp | 99 +- .../llvm-project/clang/lib/Basic/Targets/AMDGPU.h | 28 +- contrib/llvm-project/clang/lib/Basic/Targets/ARC.h | 8 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 57 +- contrib/llvm-project/clang/lib/Basic/Targets/ARM.h | 6 +- .../llvm-project/clang/lib/Basic/Targets/AVR.cpp | 746 +- contrib/llvm-project/clang/lib/Basic/Targets/AVR.h | 14 +- .../llvm-project/clang/lib/Basic/Targets/BPF.cpp | 8 +- contrib/llvm-project/clang/lib/Basic/Targets/BPF.h | 7 +- .../llvm-project/clang/lib/Basic/Targets/CSKY.cpp | 4 +- .../llvm-project/clang/lib/Basic/Targets/DirectX.h | 15 +- .../clang/lib/Basic/Targets/Hexagon.cpp | 32 +- .../llvm-project/clang/lib/Basic/Targets/Hexagon.h | 1 - .../llvm-project/clang/lib/Basic/Targets/Lanai.cpp | 4 +- .../llvm-project/clang/lib/Basic/Targets/Lanai.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/Le64.h | 6 +- .../clang/lib/Basic/Targets/LoongArch.cpp | 217 + .../clang/lib/Basic/Targets/LoongArch.h | 136 + .../llvm-project/clang/lib/Basic/Targets/M68k.cpp | 17 +- .../llvm-project/clang/lib/Basic/Targets/M68k.h | 3 +- .../clang/lib/Basic/Targets/MSP430.cpp | 2 +- .../llvm-project/clang/lib/Basic/Targets/MSP430.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/Mips.cpp | 24 +- .../llvm-project/clang/lib/Basic/Targets/Mips.h | 7 +- .../llvm-project/clang/lib/Basic/Targets/NVPTX.cpp | 53 +- .../llvm-project/clang/lib/Basic/Targets/NVPTX.h | 19 +- .../clang/lib/Basic/Targets/OSTargets.cpp | 132 +- .../clang/lib/Basic/Targets/OSTargets.h | 60 +- .../llvm-project/clang/lib/Basic/Targets/PNaCl.cpp | 6 +- .../llvm-project/clang/lib/Basic/Targets/PNaCl.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/PPC.cpp | 17 +- contrib/llvm-project/clang/lib/Basic/Targets/PPC.h | 5 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 110 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.h | 22 +- .../llvm-project/clang/lib/Basic/Targets/SPIR.h | 19 +- .../llvm-project/clang/lib/Basic/Targets/Sparc.cpp | 4 +- .../llvm-project/clang/lib/Basic/Targets/Sparc.h | 2 +- .../clang/lib/Basic/Targets/SystemZ.cpp | 16 +- .../llvm-project/clang/lib/Basic/Targets/SystemZ.h | 24 +- contrib/llvm-project/clang/lib/Basic/Targets/TCE.h | 11 +- .../llvm-project/clang/lib/Basic/Targets/VE.cpp | 13 +- contrib/llvm-project/clang/lib/Basic/Targets/VE.h | 5 +- .../clang/lib/Basic/Targets/WebAssembly.cpp | 26 +- .../clang/lib/Basic/Targets/WebAssembly.h | 5 +- .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 151 +- contrib/llvm-project/clang/lib/Basic/Targets/X86.h | 30 +- .../llvm-project/clang/lib/Basic/Targets/XCore.cpp | 10 +- .../llvm-project/clang/lib/Basic/Targets/XCore.h | 5 +- .../llvm-project/clang/lib/Basic/TypeTraits.cpp | 14 + contrib/llvm-project/clang/lib/CodeGen/ABIInfo.h | 46 +- .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 249 +- .../llvm-project/clang/lib/CodeGen/CGAtomic.cpp | 40 +- .../llvm-project/clang/lib/CodeGen/CGBlocks.cpp | 22 +- .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 1789 +- .../llvm-project/clang/lib/CodeGen/CGCUDANV.cpp | 71 +- .../llvm-project/clang/lib/CodeGen/CGCUDARuntime.h | 2 +- contrib/llvm-project/clang/lib/CodeGen/CGCXXABI.h | 12 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 251 +- contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 94 +- .../llvm-project/clang/lib/CodeGen/CGCleanup.cpp | 10 +- .../llvm-project/clang/lib/CodeGen/CGCoroutine.cpp | 20 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp | 381 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.h | 29 +- contrib/llvm-project/clang/lib/CodeGen/CGDecl.cpp | 14 +- .../llvm-project/clang/lib/CodeGen/CGDeclCXX.cpp | 89 +- .../llvm-project/clang/lib/CodeGen/CGException.cpp | 17 +- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 195 +- .../llvm-project/clang/lib/CodeGen/CGExprAgg.cpp | 108 +- .../llvm-project/clang/lib/CodeGen/CGExprCXX.cpp | 2 +- .../clang/lib/CodeGen/CGExprComplex.cpp | 257 +- .../clang/lib/CodeGen/CGExprConstant.cpp | 60 +- .../clang/lib/CodeGen/CGExprScalar.cpp | 316 +- .../clang/lib/CodeGen/CGGPUBuiltin.cpp | 2 +- .../clang/lib/CodeGen/CGHLSLRuntime.cpp | 413 +- .../llvm-project/clang/lib/CodeGen/CGHLSLRuntime.h | 67 + .../llvm-project/clang/lib/CodeGen/CGLoopInfo.cpp | 17 +- contrib/llvm-project/clang/lib/CodeGen/CGObjC.cpp | 172 +- .../llvm-project/clang/lib/CodeGen/CGObjCGNU.cpp | 17 +- .../llvm-project/clang/lib/CodeGen/CGObjCMac.cpp | 56 +- .../clang/lib/CodeGen/CGObjCRuntime.cpp | 28 +- .../clang/lib/CodeGen/CGOpenMPRuntime.cpp | 1695 +- .../clang/lib/CodeGen/CGOpenMPRuntime.h | 319 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp | 431 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.h | 31 +- .../clang/lib/CodeGen/CGRecordLayoutBuilder.cpp | 2 +- contrib/llvm-project/clang/lib/CodeGen/CGStmt.cpp | 57 +- .../clang/lib/CodeGen/CGStmtOpenMP.cpp | 244 +- contrib/llvm-project/clang/lib/CodeGen/CGVTT.cpp | 2 +- .../llvm-project/clang/lib/CodeGen/CGVTables.cpp | 58 +- contrib/llvm-project/clang/lib/CodeGen/CGVTables.h | 7 + .../clang/lib/CodeGen/CodeGenAction.cpp | 41 +- .../clang/lib/CodeGen/CodeGenFunction.cpp | 185 +- .../clang/lib/CodeGen/CodeGenFunction.h | 64 +- .../clang/lib/CodeGen/CodeGenModule.cpp | 498 +- .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 54 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.cpp | 13 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.h | 7 +- .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 2 +- .../clang/lib/CodeGen/CodeGenTypeCache.h | 3 + .../clang/lib/CodeGen/CodeGenTypes.cpp | 28 +- .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 3 +- .../clang/lib/CodeGen/ConstantEmitter.h | 3 + .../clang/lib/CodeGen/ConstantInitBuilder.cpp | 11 +- .../clang/lib/CodeGen/CoverageMappingGen.cpp | 84 +- .../clang/lib/CodeGen/ItaniumCXXABI.cpp | 201 +- .../clang/lib/CodeGen/MacroPPCallbacks.cpp | 4 +- .../clang/lib/CodeGen/MacroPPCallbacks.h | 2 +- .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 89 +- .../clang/lib/CodeGen/ModuleBuilder.cpp | 1 + .../CodeGen/ObjectFilePCHContainerOperations.cpp | 4 +- .../llvm-project/clang/lib/CodeGen/PatternInit.cpp | 4 +- .../clang/lib/CodeGen/SanitizerMetadata.cpp | 2 +- .../clang/lib/CodeGen/SwiftCallingConv.cpp | 36 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.cpp | 1036 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.h | 13 + .../clang/lib/CodeGen/VarBypassDetector.cpp | 2 +- .../clang/lib/CrossTU/CrossTranslationUnit.cpp | 14 +- .../lib/DirectoryWatcher/DirectoryScanner.cpp | 5 +- .../clang/lib/DirectoryWatcher/DirectoryScanner.h | 5 +- .../linux/DirectoryWatcher-linux.cpp | 5 +- .../DirectoryWatcher/mac/DirectoryWatcher-mac.cpp | 2 +- contrib/llvm-project/clang/lib/Driver/Action.cpp | 37 +- .../llvm-project/clang/lib/Driver/Compilation.cpp | 13 +- contrib/llvm-project/clang/lib/Driver/Distro.cpp | 1 + contrib/llvm-project/clang/lib/Driver/Driver.cpp | 1199 +- .../clang/lib/Driver/DriverOptions.cpp | 39 +- contrib/llvm-project/clang/lib/Driver/Job.cpp | 31 +- .../clang/lib/Driver/OffloadBundler.cpp | 1283 + .../clang/lib/Driver/SanitizerArgs.cpp | 129 +- .../llvm-project/clang/lib/Driver/ToolChain.cpp | 111 +- .../clang/lib/Driver/ToolChains/AIX.cpp | 100 + .../llvm-project/clang/lib/Driver/ToolChains/AIX.h | 4 + .../clang/lib/Driver/ToolChains/AMDGPU.cpp | 229 +- .../clang/lib/Driver/ToolChains/AMDGPU.h | 18 +- .../clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp | 281 +- .../clang/lib/Driver/ToolChains/AMDGPUOpenMP.h | 49 +- .../clang/lib/Driver/ToolChains/AVR.cpp | 81 +- .../llvm-project/clang/lib/Driver/ToolChains/AVR.h | 4 +- .../clang/lib/Driver/ToolChains/Arch/AArch64.cpp | 79 +- .../clang/lib/Driver/ToolChains/Arch/ARM.cpp | 26 +- .../clang/lib/Driver/ToolChains/Arch/CSKY.cpp | 15 +- .../clang/lib/Driver/ToolChains/Arch/CSKY.h | 6 +- .../clang/lib/Driver/ToolChains/Arch/LoongArch.cpp | 115 + .../clang/lib/Driver/ToolChains/Arch/LoongArch.h | 31 + .../clang/lib/Driver/ToolChains/Arch/Mips.cpp | 4 +- .../clang/lib/Driver/ToolChains/Arch/PPC.cpp | 62 +- .../clang/lib/Driver/ToolChains/Arch/PPC.h | 3 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 63 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.h | 2 + .../clang/lib/Driver/ToolChains/Arch/Sparc.cpp | 53 +- .../clang/lib/Driver/ToolChains/Arch/VE.cpp | 1 - .../clang/lib/Driver/ToolChains/Arch/X86.cpp | 6 +- .../clang/lib/Driver/ToolChains/BareMetal.cpp | 64 +- .../clang/lib/Driver/ToolChains/BareMetal.h | 23 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 942 +- .../clang/lib/Driver/ToolChains/Clang.h | 15 +- .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 617 +- .../clang/lib/Driver/ToolChains/CommonArgs.h | 26 +- .../clang/lib/Driver/ToolChains/CrossWindows.cpp | 5 +- .../clang/lib/Driver/ToolChains/CrossWindows.h | 3 +- .../clang/lib/Driver/ToolChains/Cuda.cpp | 359 +- .../clang/lib/Driver/ToolChains/Cuda.h | 129 +- .../clang/lib/Driver/ToolChains/Darwin.cpp | 363 +- .../clang/lib/Driver/ToolChains/Darwin.h | 22 +- .../clang/lib/Driver/ToolChains/Flang.cpp | 202 +- .../clang/lib/Driver/ToolChains/Flang.h | 23 +- .../clang/lib/Driver/ToolChains/FreeBSD.cpp | 40 +- .../clang/lib/Driver/ToolChains/FreeBSD.h | 6 +- .../clang/lib/Driver/ToolChains/Fuchsia.cpp | 6 +- .../clang/lib/Driver/ToolChains/Fuchsia.h | 5 +- .../clang/lib/Driver/ToolChains/Gnu.cpp | 96 +- .../llvm-project/clang/lib/Driver/ToolChains/Gnu.h | 9 +- .../clang/lib/Driver/ToolChains/HIPAMD.cpp | 27 +- .../clang/lib/Driver/ToolChains/HIPAMD.h | 2 +- .../clang/lib/Driver/ToolChains/HIPSPV.cpp | 6 +- .../clang/lib/Driver/ToolChains/HIPSPV.h | 2 +- .../clang/lib/Driver/ToolChains/HLSL.cpp | 45 +- .../clang/lib/Driver/ToolChains/HLSL.h | 3 +- .../clang/lib/Driver/ToolChains/Hexagon.cpp | 27 +- .../clang/lib/Driver/ToolChains/Hexagon.h | 4 +- .../clang/lib/Driver/ToolChains/Linux.cpp | 67 +- .../clang/lib/Driver/ToolChains/Linux.h | 2 + .../clang/lib/Driver/ToolChains/MSP430.cpp | 2 +- .../clang/lib/Driver/ToolChains/MSVC.cpp | 15 +- .../clang/lib/Driver/ToolChains/MSVC.h | 5 +- .../clang/lib/Driver/ToolChains/MinGW.cpp | 157 +- .../clang/lib/Driver/ToolChains/MinGW.h | 10 +- .../clang/lib/Driver/ToolChains/Myriad.cpp | 2 +- .../clang/lib/Driver/ToolChains/NetBSD.cpp | 35 + .../clang/lib/Driver/ToolChains/NetBSD.h | 8 +- .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 15 +- .../clang/lib/Driver/ToolChains/OpenBSD.h | 3 +- .../clang/lib/Driver/ToolChains/PPCLinux.cpp | 22 +- .../clang/lib/Driver/ToolChains/PPCLinux.h | 2 + .../clang/lib/Driver/ToolChains/PS4CPU.cpp | 43 + .../clang/lib/Driver/ToolChains/ROCm.h | 12 +- .../clang/lib/Driver/ToolChains/Solaris.cpp | 2 + .../clang/lib/Driver/ToolChains/WebAssembly.cpp | 4 +- contrib/llvm-project/clang/lib/Driver/Types.cpp | 129 +- contrib/llvm-project/clang/lib/Driver/XRayArgs.cpp | 3 +- .../clang/lib/Edit/RewriteObjCFoundationAPI.cpp | 19 +- contrib/llvm-project/clang/lib/ExtractAPI/API.cpp | 225 +- .../clang/lib/ExtractAPI/APIIgnoresList.cpp | 53 + .../clang/lib/ExtractAPI/AvailabilityInfo.cpp | 50 + .../clang/lib/ExtractAPI/DeclarationFragments.cpp | 34 +- .../clang/lib/ExtractAPI/ExtractAPIConsumer.cpp | 612 +- .../clang/lib/ExtractAPI/ExtractAPIVisitor.cpp | 560 + .../Serialization/SymbolGraphSerializer.cpp | 379 +- .../ExtractAPI/TypedefUnderlyingTypeResolver.cpp | 7 +- .../lib/ExtractAPI/TypedefUnderlyingTypeResolver.h | 2 + .../clang/lib/Format/BreakableToken.cpp | 8 +- .../clang/lib/Format/ContinuationIndenter.cpp | 95 +- .../clang/lib/Format/ContinuationIndenter.h | 9 +- .../clang/lib/Format/DefinitionBlockSeparator.cpp | 6 +- contrib/llvm-project/clang/lib/Format/Format.cpp | 1294 +- .../llvm-project/clang/lib/Format/FormatToken.cpp | 3 +- .../llvm-project/clang/lib/Format/FormatToken.h | 92 +- .../clang/lib/Format/FormatTokenLexer.cpp | 184 +- .../clang/lib/Format/FormatTokenLexer.h | 7 + .../lib/Format/IntegerLiteralSeparatorFixer.cpp | 199 + .../lib/Format/IntegerLiteralSeparatorFixer.h | 38 + .../clang/lib/Format/MacroCallReconstructor.cpp | 23 +- .../clang/lib/Format/QualifierAlignmentFixer.cpp | 4 +- .../clang/lib/Format/TokenAnalyzer.cpp | 6 +- .../llvm-project/clang/lib/Format/TokenAnalyzer.h | 3 +- .../clang/lib/Format/TokenAnnotator.cpp | 430 +- .../llvm-project/clang/lib/Format/TokenAnnotator.h | 15 + .../clang/lib/Format/UnwrappedLineFormatter.cpp | 50 +- .../clang/lib/Format/UnwrappedLineFormatter.h | 2 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 598 +- .../clang/lib/Format/UnwrappedLineParser.h | 30 +- .../clang/lib/Format/UsingDeclarationsSorter.cpp | 57 +- .../clang/lib/Format/WhitespaceManager.cpp | 57 +- .../clang/lib/Format/WhitespaceManager.h | 2 +- .../llvm-project/clang/lib/Frontend/ASTUnit.cpp | 49 +- .../clang/lib/Frontend/ChainedIncludesSource.cpp | 39 +- .../clang/lib/Frontend/CompilerInstance.cpp | 98 +- .../clang/lib/Frontend/CompilerInvocation.cpp | 311 +- .../clang/lib/Frontend/DependencyFile.cpp | 30 +- .../clang/lib/Frontend/DependencyGraph.cpp | 16 +- .../clang/lib/Frontend/DiagnosticRenderer.cpp | 5 +- .../clang/lib/Frontend/FrontendAction.cpp | 57 +- .../clang/lib/Frontend/FrontendActions.cpp | 104 +- .../clang/lib/Frontend/FrontendOptions.cpp | 1 + .../clang/lib/Frontend/HeaderIncludeGen.cpp | 137 +- .../clang/lib/Frontend/InitPreprocessor.cpp | 64 +- .../lib/Frontend/ModuleDependencyCollector.cpp | 15 +- .../clang/lib/Frontend/PrecompiledPreamble.cpp | 4 +- .../clang/lib/Frontend/PrintPreprocessedOutput.cpp | 16 +- .../lib/Frontend/Rewrite/InclusionRewriter.cpp | 48 +- .../lib/Frontend/Rewrite/RewriteModernObjC.cpp | 10 +- .../clang/lib/Frontend/SARIFDiagnostic.cpp | 225 + .../clang/lib/Frontend/SARIFDiagnosticPrinter.cpp | 83 + .../lib/Frontend/SerializedDiagnosticReader.cpp | 8 +- .../clang/lib/Frontend/TextDiagnostic.cpp | 11 +- .../lib/Frontend/VerifyDiagnosticConsumer.cpp | 2 +- .../lib/FrontendTool/ExecuteCompilerInvocation.cpp | 2 - .../lib/Headers/__clang_cuda_texture_intrinsics.h | 2 + .../lib/Headers/__clang_hip_libdevice_declares.h | 5 + .../clang/lib/Headers/__clang_hip_math.h | 23 +- .../lib/Headers/__clang_hip_runtime_wrapper.h | 1 + .../clang/lib/Headers/__clang_hip_stdlib.h | 43 + contrib/llvm-project/clang/lib/Headers/altivec.h | 28 +- .../llvm-project/clang/lib/Headers/amxfp16intrin.h | 58 + contrib/llvm-project/clang/lib/Headers/amxintrin.h | 32 + contrib/llvm-project/clang/lib/Headers/arm_acle.h | 151 +- .../clang/lib/Headers/arm_neon_sve_bridge.h | 2 - .../clang/lib/Headers/avx512bf16intrin.h | 33 +- .../llvm-project/clang/lib/Headers/avx512fintrin.h | 4 +- .../clang/lib/Headers/avx512fp16intrin.h | 15 +- .../clang/lib/Headers/avx512ifmavlintrin.h | 40 +- .../clang/lib/Headers/avx512vlbf16intrin.h | 69 +- .../clang/lib/Headers/avx512vlbwintrin.h | 352 + .../clang/lib/Headers/avx512vlfp16intrin.h | 3 + .../llvm-project/clang/lib/Headers/avxifmaintrin.h | 177 + contrib/llvm-project/clang/lib/Headers/avxintrin.h | 14 +- .../clang/lib/Headers/avxneconvertintrin.h | 484 + .../clang/lib/Headers/avxvnniint8intrin.h | 471 + .../clang/lib/Headers/cmpccxaddintrin.h | 70 + contrib/llvm-project/clang/lib/Headers/cpuid.h | 12 +- .../clang/lib/Headers/cuda_wrappers/cmath | 90 + contrib/llvm-project/clang/lib/Headers/emmintrin.h | 12 +- contrib/llvm-project/clang/lib/Headers/float.h | 27 +- .../llvm-project/clang/lib/Headers/gfniintrin.h | 12 +- .../clang/lib/Headers/hlsl/hlsl_basic_types.h | 3 + .../clang/lib/Headers/hlsl/hlsl_intrinsics.h | 208 + contrib/llvm-project/clang/lib/Headers/immintrin.h | 48 +- .../llvm-project/clang/lib/Headers/larchintrin.h | 234 + contrib/llvm-project/clang/lib/Headers/limits.h | 5 +- .../llvm-project/clang/lib/Headers/opencl-c-base.h | 19 + contrib/llvm-project/clang/lib/Headers/opencl-c.h | 320 +- .../clang/lib/Headers/openmp_wrappers/stdlib.h | 29 + .../clang/lib/Headers/ppc_wrappers/emmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/mm_malloc.h | 2 +- .../clang/lib/Headers/ppc_wrappers/mmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/pmmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/smmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/tmmintrin.h | 4 +- .../clang/lib/Headers/ppc_wrappers/xmmintrin.h | 4 +- .../llvm-project/clang/lib/Headers/prfchiintrin.h | 61 + .../llvm-project/clang/lib/Headers/raointintrin.h | 203 + contrib/llvm-project/clang/lib/Headers/smmintrin.h | 2 +- contrib/llvm-project/clang/lib/Headers/stdarg.h | 30 +- contrib/llvm-project/clang/lib/Headers/stdatomic.h | 9 +- contrib/llvm-project/clang/lib/Headers/stdbool.h | 4 +- contrib/llvm-project/clang/lib/Headers/stddef.h | 9 +- contrib/llvm-project/clang/lib/Headers/stdint.h | 198 +- .../llvm-project/clang/lib/Headers/stdnoreturn.h | 2 +- contrib/llvm-project/clang/lib/Headers/unwind.h | 3 +- contrib/llvm-project/clang/lib/Headers/velintrin.h | 2 +- .../llvm-project/clang/lib/Headers/x86gprintrin.h | 26 +- contrib/llvm-project/clang/lib/Headers/xmmintrin.h | 3 +- .../clang/lib/Index/FileIndexRecord.cpp | 12 +- contrib/llvm-project/clang/lib/Index/IndexBody.cpp | 2 +- .../llvm-project/clang/lib/Index/IndexingContext.h | 14 +- .../llvm-project/clang/lib/Index/USRGeneration.cpp | 148 +- .../clang/lib/Interpreter/IncrementalExecutor.cpp | 6 + .../clang/lib/Interpreter/IncrementalExecutor.h | 1 + .../clang/lib/Interpreter/IncrementalParser.cpp | 18 +- .../clang/lib/Interpreter/Interpreter.cpp | 26 +- .../clang/lib/Lex/DependencyDirectivesScanner.cpp | 94 +- contrib/llvm-project/clang/lib/Lex/HeaderMap.cpp | 21 +- .../llvm-project/clang/lib/Lex/HeaderSearch.cpp | 220 +- .../clang/lib/Lex/InitHeaderSearch.cpp | 146 +- contrib/llvm-project/clang/lib/Lex/Lexer.cpp | 283 +- .../llvm-project/clang/lib/Lex/LiteralSupport.cpp | 36 +- contrib/llvm-project/clang/lib/Lex/MacroArgs.cpp | 6 +- contrib/llvm-project/clang/lib/Lex/MacroInfo.cpp | 12 +- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 192 +- contrib/llvm-project/clang/lib/Lex/PPCallbacks.cpp | 5 +- .../llvm-project/clang/lib/Lex/PPDirectives.cpp | 119 +- .../llvm-project/clang/lib/Lex/PPExpressions.cpp | 2 +- .../llvm-project/clang/lib/Lex/PPLexerChange.cpp | 7 +- .../clang/lib/Lex/PPMacroExpansion.cpp | 89 +- contrib/llvm-project/clang/lib/Lex/Pragma.cpp | 33 +- .../clang/lib/Lex/PreprocessingRecord.cpp | 23 +- .../llvm-project/clang/lib/Lex/Preprocessor.cpp | 98 +- .../clang/lib/Lex/TokenConcatenation.cpp | 2 +- contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp | 114 +- .../llvm-project/clang/lib/Lex/UnicodeCharSets.h | 305 +- contrib/llvm-project/clang/lib/Parse/ParseAST.cpp | 14 +- .../clang/lib/Parse/ParseCXXInlineMethods.cpp | 13 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 414 +- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 253 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 166 +- .../llvm-project/clang/lib/Parse/ParseExprCXX.cpp | 198 +- contrib/llvm-project/clang/lib/Parse/ParseHLSL.cpp | 168 +- contrib/llvm-project/clang/lib/Parse/ParseInit.cpp | 4 +- contrib/llvm-project/clang/lib/Parse/ParseObjc.cpp | 91 +- .../llvm-project/clang/lib/Parse/ParseOpenMP.cpp | 491 +- .../llvm-project/clang/lib/Parse/ParsePragma.cpp | 108 +- contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp | 134 +- .../llvm-project/clang/lib/Parse/ParseTemplate.cpp | 55 +- .../clang/lib/Parse/ParseTentative.cpp | 183 +- contrib/llvm-project/clang/lib/Parse/Parser.cpp | 161 +- .../llvm-project/clang/lib/Rewrite/HTMLRewrite.cpp | 4 +- .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 108 +- .../clang/lib/Sema/CodeCompleteConsumer.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/DeclSpec.cpp | 25 +- .../clang/lib/Sema/HLSLExternalSemaSource.cpp | 425 +- .../clang/lib/Sema/IdentifierResolver.cpp | 8 +- .../clang/lib/Sema/JumpDiagnostics.cpp | 2 +- .../clang/lib/Sema/MultiplexExternalSemaSource.cpp | 24 +- .../llvm-project/clang/lib/Sema/OpenCLBuiltins.td | 1 + contrib/llvm-project/clang/lib/Sema/ParsedAttr.cpp | 4 +- contrib/llvm-project/clang/lib/Sema/Scope.cpp | 9 +- contrib/llvm-project/clang/lib/Sema/ScopeInfo.cpp | 9 +- contrib/llvm-project/clang/lib/Sema/Sema.cpp | 135 +- contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp | 2 + contrib/llvm-project/clang/lib/Sema/SemaAttr.cpp | 24 +- .../clang/lib/Sema/SemaAvailability.cpp | 31 +- contrib/llvm-project/clang/lib/Sema/SemaCUDA.cpp | 18 +- .../clang/lib/Sema/SemaCXXScopeSpec.cpp | 7 +- contrib/llvm-project/clang/lib/Sema/SemaCast.cpp | 86 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 938 +- .../clang/lib/Sema/SemaCodeComplete.cpp | 161 +- .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 692 +- .../llvm-project/clang/lib/Sema/SemaCoroutine.cpp | 244 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 1145 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 454 +- .../llvm-project/clang/lib/Sema/SemaDeclCXX.cpp | 804 +- .../llvm-project/clang/lib/Sema/SemaDeclObjC.cpp | 108 +- .../clang/lib/Sema/SemaExceptionSpec.cpp | 5 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 1126 +- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 399 +- .../llvm-project/clang/lib/Sema/SemaExprMember.cpp | 29 +- .../llvm-project/clang/lib/Sema/SemaExprObjC.cpp | 114 +- .../llvm-project/clang/lib/Sema/SemaFixItUtils.cpp | 6 +- contrib/llvm-project/clang/lib/Sema/SemaHLSL.cpp | 34 + contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 394 +- contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp | 222 +- contrib/llvm-project/clang/lib/Sema/SemaLookup.cpp | 111 +- contrib/llvm-project/clang/lib/Sema/SemaModule.cpp | 115 +- .../clang/lib/Sema/SemaObjCProperty.cpp | 19 +- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 916 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 601 +- .../clang/lib/Sema/SemaPseudoObject.cpp | 10 +- .../clang/lib/Sema/SemaRISCVVectorLookup.cpp | 106 +- contrib/llvm-project/clang/lib/Sema/SemaStmt.cpp | 166 +- .../llvm-project/clang/lib/Sema/SemaStmtAsm.cpp | 31 +- .../llvm-project/clang/lib/Sema/SemaStmtAttr.cpp | 51 +- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 1253 +- .../clang/lib/Sema/SemaTemplateDeduction.cpp | 1170 +- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 1000 +- .../clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 406 +- .../clang/lib/Sema/SemaTemplateVariadic.cpp | 286 +- contrib/llvm-project/clang/lib/Sema/SemaType.cpp | 704 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 729 +- .../llvm-project/clang/lib/Sema/TypeLocBuilder.cpp | 29 +- .../llvm-project/clang/lib/Sema/TypeLocBuilder.h | 12 +- .../llvm-project/clang/lib/Sema/UsedDeclVisitor.h | 17 + .../clang/lib/Serialization/ASTCommon.cpp | 7 +- .../clang/lib/Serialization/ASTReader.cpp | 2217 +- .../clang/lib/Serialization/ASTReaderDecl.cpp | 386 +- .../clang/lib/Serialization/ASTReaderStmt.cpp | 88 +- .../clang/lib/Serialization/ASTWriter.cpp | 500 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 181 +- .../clang/lib/Serialization/ASTWriterStmt.cpp | 63 +- .../clang/lib/Serialization/ModuleManager.cpp | 21 +- .../Checkers/AnalyzerStatsChecker.cpp | 5 +- .../Checkers/ArrayBoundCheckerV2.cpp | 9 +- .../Checkers/BasicObjCFoundationChecks.cpp | 46 +- .../Checkers/BlockInCriticalSectionChecker.cpp | 22 +- .../Checkers/BoolAssignmentChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/CStringChecker.cpp | 211 +- .../StaticAnalyzer/Checkers/CastValueChecker.cpp | 4 +- .../StaticAnalyzer/Checkers/CheckObjCDealloc.cpp | 7 +- .../lib/StaticAnalyzer/Checkers/ChrootChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/ContainerModeling.cpp | 28 +- .../StaticAnalyzer/Checkers/DeadStoresChecker.cpp | 35 +- .../Checkers/DebugContainerModeling.cpp | 4 +- .../Checkers/DebugIteratorModeling.cpp | 6 +- .../lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp | 3 +- .../Checkers/DynamicTypePropagation.cpp | 5 +- .../Checkers/EnumCastOutOfRangeChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/ErrnoChecker.cpp | 11 +- .../lib/StaticAnalyzer/Checkers/ErrnoModeling.cpp | 76 +- .../lib/StaticAnalyzer/Checkers/ErrnoModeling.h | 62 +- .../StaticAnalyzer/Checkers/ErrnoTesterChecker.cpp | 13 +- .../Checkers/ExprInspectionChecker.cpp | 72 +- .../Checkers/FuchsiaHandleChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/GTestChecker.cpp | 3 +- .../Checkers/GenericTaintChecker.cpp | 315 +- .../Checkers/IvarInvalidationChecker.cpp | 3 +- .../Checkers/LocalizationChecker.cpp | 5 +- .../lib/StaticAnalyzer/Checkers/MIGChecker.cpp | 5 +- .../Checkers/MacOSKeychainAPIChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/MallocChecker.cpp | 270 +- .../Checkers/MallocOverflowSecurityChecker.cpp | 38 +- .../Checkers/MismatchedIteratorChecker.cpp | 6 +- .../Checkers/MmapWriteExecChecker.cpp | 2 +- .../lib/StaticAnalyzer/Checkers/MoveChecker.cpp | 12 +- .../lib/StaticAnalyzer/Checkers/NSErrorChecker.cpp | 5 +- .../Checkers/NoReturnFunctionChecker.cpp | 8 +- .../Checkers/NonNullParamChecker.cpp | 4 +- .../Checkers/NonnullGlobalConstantsChecker.cpp | 21 +- .../StaticAnalyzer/Checkers/NullabilityChecker.cpp | 136 +- .../Checkers/NumberObjectConversionChecker.cpp | 21 +- .../Checkers/ObjCContainersASTChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/PthreadLockChecker.cpp | 76 +- .../RetainCountChecker/RetainCountChecker.cpp | 17 +- .../RetainCountChecker/RetainCountDiagnostics.cpp | 38 +- .../StaticAnalyzer/Checkers/ReturnValueChecker.cpp | 14 +- .../Checkers/SimpleStreamChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/SmartPtrModeling.cpp | 14 +- .../Checkers/StackAddrEscapeChecker.cpp | 16 +- .../Checkers/StdLibraryFunctionsChecker.cpp | 635 +- .../lib/StaticAnalyzer/Checkers/StreamChecker.cpp | 241 +- .../clang/lib/StaticAnalyzer/Checkers/Taint.cpp | 3 +- .../Checkers/TestAfterDivZeroChecker.cpp | 5 +- .../StaticAnalyzer/Checkers/UndefBranchChecker.cpp | 3 +- .../Checkers/UndefCapturedBlockVarChecker.cpp | 5 +- .../Checkers/UndefinedAssignmentChecker.cpp | 2 +- .../Checkers/UndefinedNewArraySizeChecker.cpp | 80 + .../UninitializedObject/UninitializedPointee.cpp | 17 +- .../lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp | 6 +- .../Checkers/UnreachableCodeChecker.cpp | 7 +- .../lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/ValistChecker.cpp | 41 +- .../lib/StaticAnalyzer/Checkers/VforkChecker.cpp | 5 +- .../StaticAnalyzer/Checkers/WebKit/ASTUtils.cpp | 5 +- .../Checkers/WebKit/NoUncountedMembersChecker.cpp | 9 +- .../Checkers/WebKit/PtrTypesSemantics.cpp | 49 +- .../Checkers/WebKit/PtrTypesSemantics.h | 21 +- .../WebKit/RefCntblBaseVirtualDtorChecker.cpp | 4 +- .../Checkers/WebKit/UncountedCallArgsChecker.cpp | 3 +- .../WebKit/UncountedLambdaCapturesChecker.cpp | 13 +- .../Checkers/WebKit/UncountedLocalVarsChecker.cpp | 3 +- .../clang/lib/StaticAnalyzer/Checkers/Yaml.h | 11 +- *** 125165 LINES SKIPPED *** From nobody Thu Jun 22 21:10:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnChg5wp3z4gdxK; Thu, 22 Jun 2023 21:10: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 4QnChg451mz48st; Thu, 22 Jun 2023 21:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56rrgNFtyuOfJmzh4xdA3jwVSc82aKc4RWX/AxzNdmc=; b=qibQc2GDY2IA+c52hO1VTFRIrr8lH/Ap3pmjlchBXsqcgUylPHmkILL0dYfBsU26yM6tgY hrc9V7xx2fkTb8m+v1KlnySBsvKzdYhkdLKuGG98woqtiMU2B6ArYgneY6BuI+wn0eVWQJ hnkyNQX0mzzJZKIRSyLubV6FI0TSioj0krxmdsopJnLAKgBYhAZ/khStwhNR2EcrBXOmXP 2xiE80ZmXqBph60DiW0HEVAMCi1A/nLVqMnxFCHL89uxiXTVdFUjPc4qhkapKbgNyCoSHR GE23ettU0ed/AazVQzNU9PiG+/+lm7SnJiYi1x0tc/YdPfw7DDGVX1alznNRcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56rrgNFtyuOfJmzh4xdA3jwVSc82aKc4RWX/AxzNdmc=; b=i5nvCJK/Yc82VMKyY5jQqGFX421YmgumkS0URz0ncte0hRkzZb4MiIFsRAo/S5oHoQ7DhL 84Jz3xTa/1tJbnctgl0aaHEdpfK+N/ylkh/lfncu4g5pXNrUke8lBoy4KJm0+40lYKdW6S aT+fqAXOrQqBp37778QZCeGk9PYfj3o1mrPasMLPiFuAz9C1APKJIzh7Dpbp9tS2xnQXpa hWPH3OS5s4qwwI5VwIqfUR2xtdQrqdm5DNl6RADuHNqiN9n3vURFffHaKYXheVCJefrD4N rEQjalnUSOt+2ZKFVP9g5djv2MXUvrrVQfERre083JF0pn5EoUj3bW5lwZhY7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468259; a=rsa-sha256; cv=none; b=Ir41b84qg2A6FZhFoIX8rLAi8Y8DtWXMK2tUsjRNG5c6TUmXE1sR6mEKep2dxko+XE50fo ZKSlNCFj0ED7+nDHnQ4kNNIyPSlbDamuw3UK7y1Qnphpvhh3VWbW28Z0y7L3NTnAXVjHVM 0xjmop8X7U0c0ZXHaotpNlEvV2OuQ5AlRS/KX0mvSHDAfeJg8ro3qZ6rGzrZBj6An+xacz slyEF7D9m9LqwnZsUtX0xC0FRZSz2Xi+ymArlHp/dk08F68z5g6a95CEQ1SpS1Tvr0tvP1 0gB+BsYpsWsBi0ApKjyHnN9RrzwWfeNxQ/upN9EmUYaVz5ctsDtKvSgzVf7C+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 4QnChg2BPGzdbp; Thu, 22 Jun 2023 21:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLAxHX066102; Thu, 22 Jun 2023 21:10:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLAujF066098; Thu, 22 Jun 2023 21:10:56 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:10:56 GMT Message-Id: <202306222110.35MLAujF066098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1ac55f4cb000 - main - Merge llvm-project release/16.x llvmorg-16.0.1-0-gcd89023f7979 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1ac55f4cb0001fed92329746c730aa9a947c09a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1ac55f4cb0001fed92329746c730aa9a947c09a5 commit 1ac55f4cb0001fed92329746c730aa9a947c09a5 Merge: bdd1243df58e 8a37c71e9d88 Author: Dimitry Andric AuthorDate: 2023-04-17 17:14:23 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:20 +0000 Merge llvm-project release/16.x llvmorg-16.0.1-0-gcd89023f7979 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.1-0-gcd89023f7979 (aka 16.0.1 release). PR: 271047 MFC after: 1 month contrib/llvm-project/clang/include/clang-c/Index.h | 2 +- .../include/clang/Basic/DiagnosticParseKinds.td | 7 +- .../include/clang/Basic/DiagnosticSemaKinds.td | 5 +- .../clang/include/clang/Basic/arm_sve.td | 41 +- .../clang/include/clang/Basic/riscv_vector.td | 102 +- .../clang/include/clang/Driver/Options.td | 2 + .../clang/include/clang/Format/Format.h | 39 +- .../clang/include/clang/Lex/Preprocessor.h | 184 +- .../clang/include/clang/Sema/DeclSpec.h | 10 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 38 +- .../clang/include/clang/Sema/SemaInternal.h | 4 +- .../StaticAnalyzer/Core/PathSensitive/SMTConv.h | 4 +- .../include/clang/Support/RISCVVIntrinsicUtils.h | 46 +- .../DependencyScanning/DependencyScanningService.h | 6 +- .../DependencyScanning/DependencyScanningTool.h | 27 +- .../DependencyScanning/DependencyScanningWorker.h | 6 +- .../DependencyScanning/ModuleDepCollector.h | 29 +- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 2 +- contrib/llvm-project/clang/lib/AST/Type.cpp | 12 +- .../clang/lib/Basic/Targets/AArch64.cpp | 6 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 3 +- contrib/llvm-project/clang/lib/Basic/Targets/PPC.h | 8 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 4 +- .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 8 +- contrib/llvm-project/clang/lib/CodeGen/CGCXXABI.h | 5 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 4 +- .../llvm-project/clang/lib/CodeGen/CGExprCXX.cpp | 11 +- .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 21 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.cpp | 98 +- contrib/llvm-project/clang/lib/Driver/Driver.cpp | 4 +- .../clang/lib/Driver/SanitizerArgs.cpp | 4 +- .../clang/lib/Driver/ToolChains/Arch/PPC.cpp | 93 +- .../clang/lib/Driver/ToolChains/Arch/PPC.h | 2 + .../clang/lib/Driver/ToolChains/Clang.cpp | 11 +- .../clang/lib/Driver/ToolChains/Cuda.cpp | 15 +- .../clang/lib/Driver/ToolChains/FreeBSD.cpp | 71 +- .../clang/lib/Driver/ToolChains/FreeBSD.h | 14 +- .../clang/lib/Driver/ToolChains/Fuchsia.cpp | 2 +- .../clang/lib/Driver/ToolChains/MinGW.cpp | 10 + contrib/llvm-project/clang/lib/Format/Format.cpp | 8 +- .../lib/Format/IntegerLiteralSeparatorFixer.cpp | 56 +- .../lib/Format/IntegerLiteralSeparatorFixer.h | 3 +- .../clang/lib/Format/QualifierAlignmentFixer.cpp | 5 +- .../clang/lib/Format/TokenAnnotator.cpp | 3 + .../clang/lib/Format/UnwrappedLineParser.cpp | 31 +- .../clang/lib/Frontend/CompilerInstance.cpp | 9 +- contrib/llvm-project/clang/lib/Headers/immintrin.h | 4 +- contrib/llvm-project/clang/lib/Headers/smmintrin.h | 2 +- .../clang/lib/Lex/PPMacroExpansion.cpp | 37 +- .../llvm-project/clang/lib/Lex/Preprocessor.cpp | 44 +- contrib/llvm-project/clang/lib/Lex/TokenLexer.cpp | 12 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 11 +- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 5 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 8 - contrib/llvm-project/clang/lib/Sema/SemaAttr.cpp | 17 - .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 27 +- .../llvm-project/clang/lib/Sema/SemaCoroutine.cpp | 4 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 34 +- .../llvm-project/clang/lib/Sema/SemaDeclCXX.cpp | 3 +- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 10 +- contrib/llvm-project/clang/lib/Sema/SemaModule.cpp | 13 +- .../clang/lib/Sema/SemaRISCVVectorLookup.cpp | 5 +- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 11 +- .../clang/lib/Sema/SemaTemplateDeduction.cpp | 7 +- .../clang/lib/Sema/SemaTemplateVariadic.cpp | 234 ++- contrib/llvm-project/clang/lib/Sema/SemaType.cpp | 6 - .../llvm-project/clang/lib/Sema/TreeTransform.h | 3 +- .../Checkers/ReturnPointerRangeChecker.cpp | 4 + .../clang/lib/StaticAnalyzer/Core/BugReporter.cpp | 2 +- .../StaticAnalyzer/Core/RangeConstraintManager.cpp | 13 +- .../clang/lib/StaticAnalyzer/Core/RegionStore.cpp | 8 +- .../clang/lib/Support/RISCVVIntrinsicUtils.cpp | 90 +- .../DependencyScanning/DependencyScanningTool.cpp | 150 +- .../DependencyScanningWorker.cpp | 4 +- .../DependencyScanning/ModuleDepCollector.cpp | 33 +- .../clang/utils/TableGen/RISCVVEmitter.cpp | 5 +- .../compiler-rt/lib/builtins/cpu_model.c | 3 + .../sanitizer_common/sanitizer_linux_libcdep.cpp | 1 + .../sanitizer_common/sanitizer_symbolizer_win.cpp | 2 - .../include/__algorithm/ranges_binary_search.h | 4 +- .../llvm-project/libcxx/include/__algorithm/sort.h | 578 ++---- contrib/llvm-project/libcxx/include/__config | 38 +- .../libcxx/include/__expected/expected.h | 7 +- .../libcxx/include/__format/concepts.h | 5 +- .../libcxx/include/__format/format_functions.h | 8 +- .../include/__format/formatter_floating_point.h | 3 +- .../libcxx/include/__functional/function.h | 38 +- .../libcxx/include/__functional/hash.h | 4 + .../libcxx/include/__memory/construct_at.h | 10 + .../libcxx/include/__memory/shared_ptr.h | 218 ++- .../include/__memory/uninitialized_algorithms.h | 34 +- .../__memory_resource/polymorphic_allocator.h | 2 +- .../libcxx/include/__ranges/elements_view.h | 118 +- .../libcxx/include/__ranges/filter_view.h | 50 +- .../libcxx/include/__ranges/iota_view.h | 432 ++--- .../libcxx/include/__ranges/istream_view.h | 26 +- .../libcxx/include/__ranges/join_view.h | 96 +- .../libcxx/include/__ranges/split_view.h | 52 +- .../libcxx/include/__ranges/take_while_view.h | 30 +- .../libcxx/include/__ranges/transform_view.h | 127 +- .../libcxx/include/__type_traits/add_pointer.h | 4 +- .../libcxx/include/__type_traits/remove_pointer.h | 4 +- .../libcxx/include/__utility/exception_guard.h | 47 +- contrib/llvm-project/libcxx/include/any | 10 +- .../libcxx/include/module.modulemap.in | 16 +- .../llvm-project/libcxx/include/source_location | 6 +- contrib/llvm-project/libcxx/include/version | 4 +- .../libunwind/include/libunwind.modulemap | 3 + contrib/llvm-project/libunwind/include/unwind.h | 4 +- .../libunwind/src/DwarfInstructions.hpp | 3 +- .../libunwind/src/UnwindRegistersRestore.S | 18 + .../libunwind/src/UnwindRegistersSave.S | 11 + contrib/llvm-project/lld/COFF/MinGW.cpp | 3 + contrib/llvm-project/lld/ELF/Arch/RISCV.cpp | 6 +- contrib/llvm-project/lld/ELF/ICF.cpp | 10 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 10 +- contrib/llvm-project/lld/ELF/SymbolTable.cpp | 4 +- contrib/llvm-project/lld/docs/ReleaseNotes.rst | 17 + .../Plugins/Language/CPlusPlus/Coroutines.cpp | 164 +- .../source/Plugins/Language/CPlusPlus/Coroutines.h | 7 +- .../Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 143 +- .../NativeRegisterContextFreeBSD_mips64.cpp | 4 +- .../NativeRegisterContextFreeBSD_powerpc.cpp | 4 +- .../llvm/include/llvm/Analysis/ScalarEvolution.h | 11 +- .../llvm/DebugInfo/LogicalView/Core/LVElement.h | 1 - .../llvm/DebugInfo/LogicalView/Core/LVStringPool.h | 7 - .../llvm/DebugInfo/LogicalView/Core/LVSupport.h | 4 + .../llvm/include/llvm/Debuginfod/Debuginfod.h | 6 +- .../llvm/include/llvm/IR/IntrinsicsAArch64.td | 31 + .../llvm/ProfileData/Coverage/CoverageMapping.h | 16 +- .../ProfileData/Coverage/CoverageMappingReader.h | 3 +- .../llvm/include/llvm/Support/ExitCodes.h | 6 +- .../llvm/include/llvm/Support/RISCVISAInfo.h | 6 + .../llvm/include/llvm/Support/Signals.h | 11 +- .../include/llvm/TargetParser/RISCVTargetParser.h | 5 + .../llvm/include/llvm/TargetParser/Triple.h | 8 + .../llvm/include/llvm/Transforms/IPO/OpenMPOpt.h | 12 + .../llvm/lib/Analysis/LazyValueInfo.cpp | 13 +- .../llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 + .../llvm-project/llvm/lib/CodeGen/IfConversion.cpp | 9 + .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 13 +- .../llvm/lib/CodeGen/TargetLoweringBase.cpp | 4 +- .../lib/DebugInfo/LogicalView/Core/LVSupport.cpp | 6 + .../llvm/lib/DebugInfo/Symbolize/Symbolize.cpp | 27 +- .../llvm/lib/Debuginfod/Debuginfod.cpp | 19 +- .../lib/ExecutionEngine/JITLink/ELF_aarch64.cpp | 1 + .../llvm/lib/ExecutionEngine/Orc/Layer.cpp | 4 + contrib/llvm-project/llvm/lib/IR/AutoUpgrade.cpp | 35 + contrib/llvm-project/llvm/lib/IR/Verifier.cpp | 6 - .../llvm-project/llvm/lib/Object/ELFObjectFile.cpp | 7 +- .../llvm/lib/Passes/PassBuilderPipelines.cpp | 14 +- .../llvm-project/llvm/lib/Passes/PassRegistry.def | 1 + .../lib/ProfileData/Coverage/CoverageMapping.cpp | 110 +- .../ProfileData/Coverage/CoverageMappingReader.cpp | 19 +- .../lib/Support/BLAKE3/blake3_avx2_x86-64_unix.S | 2 + .../BLAKE3/blake3_avx2_x86-64_windows_gnu.S | 2 + .../BLAKE3/blake3_avx2_x86-64_windows_msvc.asm | 12 +- .../lib/Support/BLAKE3/blake3_avx512_x86-64_unix.S | 2 + .../BLAKE3/blake3_avx512_x86-64_windows_gnu.S | 2 + .../BLAKE3/blake3_avx512_x86-64_windows_msvc.asm | 36 +- .../llvm/lib/Support/BLAKE3/blake3_impl.h | 10 +- .../lib/Support/BLAKE3/blake3_sse2_x86-64_unix.S | 2 + .../BLAKE3/blake3_sse2_x86-64_windows_gnu.S | 2 + .../BLAKE3/blake3_sse2_x86-64_windows_msvc.asm | 36 +- .../lib/Support/BLAKE3/blake3_sse41_x86-64_unix.S | 2 + .../BLAKE3/blake3_sse41_x86-64_windows_gnu.S | 2 + .../BLAKE3/blake3_sse41_x86-64_windows_msvc.asm | 36 +- .../llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h | 41 + contrib/llvm-project/llvm/lib/Support/Parallel.cpp | 8 +- .../llvm-project/llvm/lib/Support/RISCVISAInfo.cpp | 63 + .../llvm-project/llvm/lib/Support/Windows/Path.inc | 2 - .../llvm/lib/Support/Windows/Signals.inc | 23 +- contrib/llvm-project/llvm/lib/Support/Z3Solver.cpp | 2 +- .../llvm-project/llvm/lib/Support/raw_ostream.cpp | 12 +- .../llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td | 14 +- .../llvm/lib/Target/AArch64/SVEInstrFormats.td | 52 +- .../llvm/lib/Target/ARM/ARMFrameLowering.cpp | 28 + .../llvm-project/llvm/lib/Target/BPF/BTFDebug.cpp | 46 +- .../llvm-project/llvm/lib/Target/BPF/BTFDebug.h | 3 + .../Target/Hexagon/AsmParser/HexagonAsmParser.cpp | 2 +- .../llvm/lib/Target/PowerPC/PPCTargetMachine.cpp | 3 +- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp | 10 + .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 22 + .../llvm/lib/Target/RISCV/RISCVISelLowering.h | 4 + .../llvm/lib/Target/RISCV/RISCVSExtWRemoval.cpp | 5 +- .../llvm/lib/Target/RISCV/RISCVSubtarget.cpp | 3 + .../llvm/lib/Target/RISCV/RISCVSubtarget.h | 2 + .../Target/Sparc/MCTargetDesc/SparcInstPrinter.cpp | 2 + .../llvm/lib/Target/Sparc/SparcInstrInfo.cpp | 121 +- .../llvm/lib/Target/Sparc/SparcInstrInfo.h | 9 + .../llvm/lib/Target/Sparc/SparcInstrInfo.td | 9 +- .../llvm/lib/Target/Sparc/SparcTargetMachine.cpp | 7 + contrib/llvm-project/llvm/lib/Target/X86/X86.td | 3 +- .../llvm/lib/Target/X86/X86CallingConv.td | 4 +- .../llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 5 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 101 +- .../llvm/lib/Target/X86/X86ISelLowering.h | 6 + .../llvm/lib/Target/X86/X86InstrCompiler.td | 6 +- .../llvm/lib/Target/X86/X86InstrFPStack.td | 15 + .../llvm/lib/Target/X86/X86InstrSSE.td | 17 + .../llvm/lib/Target/X86/X86PfmCounters.td | 15 +- .../llvm/lib/Target/X86/X86ScheduleZnver4.td | 1957 ++++++++++++++++++++ .../llvm/lib/TargetParser/ARMTargetParser.cpp | 2 +- .../llvm/lib/TargetParser/RISCVTargetParser.cpp | 6 + .../llvm/lib/Transforms/IPO/Attributor.cpp | 22 +- .../lib/Transforms/IPO/AttributorAttributes.cpp | 32 +- .../llvm/lib/Transforms/IPO/OpenMPOpt.cpp | 79 +- .../Transforms/InstCombine/InstCombineCompares.cpp | 16 +- .../llvm/lib/Transforms/Utils/Local.cpp | 3 +- .../lib/Transforms/Vectorize/LoopVectorize.cpp | 15 +- .../llvm/tools/llvm-cov/CodeCoverage.cpp | 32 +- .../llvm/tools/llvm-objdump/ObjdumpOpts.td | 4 +- .../llvm/tools/llvm-objdump/llvm-objdump.cpp | 4 +- .../llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp | 8 +- contrib/llvm-project/openmp/runtime/src/kmp_os.h | 2 +- .../openmp/runtime/src/kmp_runtime.cpp | 6 +- .../openmp/runtime/src/kmp_safe_c_api.h | 2 + .../llvm-project/openmp/runtime/src/kmp_str.cpp | 8 +- .../llvm-project/openmp/runtime/src/z_Linux_asm.S | 5 +- 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 | 9 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- usr.bin/clang/llvm-cov/Makefile | 1 + 227 files changed, 5335 insertions(+), 2401 deletions(-) diff --cc contrib/llvm-project/clang/include/clang/Format/Format.h index 72efd3be1cc7,7a313460d888..7a313460d888 mode 100755,100644..100755 --- a/contrib/llvm-project/clang/include/clang/Format/Format.h +++ b/contrib/llvm-project/clang/include/clang/Format/Format.h diff --cc contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp index 4d4b2482d046,a92bbde113fc..a92bbde113fc mode 100755,100644..100755 --- a/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp diff --cc contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_avx2_x86-64_unix.S index 1da950cb4f7d,69fc0936d73c..e05d3c5a99db --- a/contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_avx2_x86-64_unix.S +++ b/contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_avx2_x86-64_unix.S @@@ -1,6 -1,8 +1,8 @@@ #if defined(__x86_64__) + #include "llvm_blake3_prefix.h" + -#if defined(__ELF__) && defined(__linux__) +#if defined(__ELF__) && (defined(__linux__) || defined(__FreeBSD__)) .section .note.GNU-stack,"",%progbits #endif diff --cc contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_avx512_x86-64_unix.S index df92148fd46c,f04a135dd1bc..a7931e81035e --- a/contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_avx512_x86-64_unix.S +++ b/contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_avx512_x86-64_unix.S @@@ -1,6 -1,8 +1,8 @@@ #if defined(__x86_64__) + #include "llvm_blake3_prefix.h" + -#if defined(__ELF__) && defined(__linux__) +#if defined(__ELF__) && (defined(__linux__) || defined(__FreeBSD__)) .section .note.GNU-stack,"",%progbits #endif diff --cc contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_sse2_x86-64_unix.S index e058faf0df2f,9a4f5eb7318b..765cd31754b9 --- a/contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_sse2_x86-64_unix.S +++ b/contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_sse2_x86-64_unix.S @@@ -1,6 -1,8 +1,8 @@@ #if defined(__x86_64__) + #include "llvm_blake3_prefix.h" + -#if defined(__ELF__) && defined(__linux__) +#if defined(__ELF__) && (defined(__linux__) || defined(__FreeBSD__)) .section .note.GNU-stack,"",%progbits #endif diff --cc contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_sse41_x86-64_unix.S index 2f75acf2bbce,1be4ed744426..70cc27452ede --- a/contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_sse41_x86-64_unix.S +++ b/contrib/llvm-project/llvm/lib/Support/BLAKE3/blake3_sse41_x86-64_unix.S @@@ -1,6 -1,8 +1,8 @@@ #if defined(__x86_64__) + #include "llvm_blake3_prefix.h" + -#if defined(__ELF__) && defined(__linux__) +#if defined(__ELF__) && (defined(__linux__) || defined(__FreeBSD__)) .section .note.GNU-stack,"",%progbits #endif diff --cc contrib/llvm-project/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h index 000000000000,3cee3691e4cf..3cee3691e4cf mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h +++ b/contrib/llvm-project/llvm/lib/Support/BLAKE3/llvm_blake3_prefix.h diff --cc contrib/llvm-project/llvm/lib/Target/X86/X86ScheduleZnver4.td index 000000000000,c3f08998419f..c3f08998419f mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86ScheduleZnver4.td +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86ScheduleZnver4.td diff --cc lib/clang/include/VCSVersion.inc index 5a44e0b5022a,000000000000..17a4e9fbc6bc mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,10 -1,0 +1,10 @@@ +// $FreeBSD$ + - #define LLVM_REVISION "llvmorg-16-init-18548-gb0daacf58f41" ++#define LLVM_REVISION "llvmorg-16.0.1-0-gcd89023f7979" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-16-init-18548-gb0daacf58f41" ++#define CLANG_REVISION "llvmorg-16.0.1-0-gcd89023f7979" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-16-init-18548-gb0daacf58f41" ++#define LLDB_REVISION "llvmorg-16.0.1-0-gcd89023f7979" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 441152e63123,000000000000..7b3afbcccb01 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,10 -1,0 +1,10 @@@ +/* $FreeBSD$ */ + - #define CLANG_VERSION 16.0.0 - #define CLANG_VERSION_STRING "16.0.0" ++#define CLANG_VERSION 16.0.1 ++#define CLANG_VERSION_STRING "16.0.1" +#define CLANG_VERSION_MAJOR 16 +#define CLANG_VERSION_MAJOR_STRING "16" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 0 ++#define CLANG_VERSION_PATCHLEVEL 1 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index a68bf58c1b14,000000000000..b5cd91c34032 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1400006 + - #define LLD_VERSION_STRING "16.0.0 (FreeBSD llvmorg-16-init-18548-gb0daacf58f41-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "16.0.1 (FreeBSD llvmorg-16.0.1-0-gcd89023f7979-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 97d5d5c781f5,000000000000..7060f0d93cbc mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 16.0.0git - #define LLDB_VERSION_STRING "16.0.0git" ++#define LLDB_VERSION 16.0.1 ++#define LLDB_VERSION_STRING "16.0.1" +#define LLDB_VERSION_MAJOR 16 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 0 ++#define LLDB_VERSION_PATCH 1 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 4f156ca5669e,000000000000..46ac23cf47a1 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,385 -1,0 +1,380 @@@ +/* $FreeBSD$ */ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + - /* Define to 1 if you have the `lseek64' function. */ - #if defined(__linux__) - #define HAVE_LSEEK64 1 - #endif - +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 16.0.0git" ++#define PACKAGE_STRING "LLVM 16.0.1" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "16.0.0git" ++#define PACKAGE_VERSION "16.0.1" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index e2f8a396bf24,000000000000..640003331a8e mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,132 -1,0 +1,132 @@@ +/* $FreeBSD$ */ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 16 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 0 ++#define LLVM_VERSION_PATCH 1 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "16.0.0git" ++#define LLVM_VERSION_STRING "16.0.1" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 5733d7c225dc,000000000000..5194bb986dc0 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,3 -1,0 +1,3 @@@ +/* $FreeBSD$ */ - #define LLVM_REVISION "llvmorg-16-init-18548-gb0daacf58f41" ++#define LLVM_REVISION "llvmorg-16.0.1-0-gcd89023f7979" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc usr.bin/clang/llvm-cov/Makefile index d5754223ca0e,000000000000..9c6cafab0561 mode 100644,000000..100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@@ -1,25 -1,0 +1,26 @@@ +# $FreeBSD$ + +.include + +PROG_CXX= llvm-cov +LINKS= ${BINDIR}/llvm-cov ${BINDIR}/gcov +MLINKS= llvm-cov.1 gcov.1 + +SRCDIR= llvm/tools/llvm-cov +SRCS+= CodeCoverage.cpp +SRCS+= CoverageExporterJson.cpp +SRCS+= CoverageExporterLcov.cpp +SRCS+= CoverageFilters.cpp +SRCS+= CoverageReport.cpp +SRCS+= CoverageSummaryInfo.cpp +SRCS+= SourceCoverageView.cpp +SRCS+= SourceCoverageViewHTML.cpp +SRCS+= SourceCoverageViewText.cpp +SRCS+= TestingSupport.cpp +SRCS+= gcov.cpp +SRCS+= llvm-cov.cpp + +LIBADD+= z ++LIBADD+= zstd + +.include "../llvm.prog.mk" From nobody Thu Jun 22 21:11:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnChj2c0Dz4gfP3; Thu, 22 Jun 2023 21:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnChh5LRfz48mJ; Thu, 22 Jun 2023 21:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sb5jxQ26Kiy/iBVyb8eD5kTqlj1zCzbr8htWciC9WHg=; b=j68XqvH613AH8DMXW5jFfUXEzb1e61RhRyUUfpozOZq4BJRE8AHy4234VHqBE7NeiM53BM tA69adZbYHMcCTnS0MS8F4rK40ur7KSvrRvUDXWgs46uUHyEqEqROuXX9gZUljeHpNJ0Zh 1i/cui3/KWcZNRnpi8RWYqP6DGTUGiOk6gBsCLFx3u4IPNEtko+LWsP1n59o9bQ1GcLDGa M/yEgwXkq/w3opy0CEitNDI5IPbXGyWq1R0628QlTuK2w4BwmSSimL4ZtvZQGqIfpo/Lj0 g3xGpoNhX1/zinN30s7cqTeRueWHgs5oac6htEqANgMuZkRse889DcE7jIf25Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sb5jxQ26Kiy/iBVyb8eD5kTqlj1zCzbr8htWciC9WHg=; b=nQk0QhkJbuUMEqL7kPxT/kB6rEO3JTxTcsUgstelqoh59j6RSwO0WEwMEpPPVmHpvtw7Sg OOg1gdAyrNU6on/7ZiR8ksbLbW6dsWj5KM1fGEqZDrlK/08aTK4ByvomgL7HIVEt8Ay3/m +WX6pgl6g/hNf752h0BJCLAvQgGqks3LvC9vSpInj4INjs5SPmJkk6lukqJ6xQLaXCnXpg ei1iv9LZHTW24MvOtCDL7EThkHnqMk3fN+eTYY/MTLDeI2yozGK+lq/pdkCOo1kr9kgJKi DSvpam00MggpPtVsiqo9082yjexEZWjIRU9qc3p0VvrusLnT8ioXaGGr+pasMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468260; a=rsa-sha256; cv=none; b=g67i22n7G6VOMFeNaiLuLDVrHDr/bIwWe3QXF8UPmDAy3bWk+uWzRLdZ46oyW7JkP5ul/I 6Z8YrtDqpWFQxKt7YzbKugTpERstrT2OJByycpqZxEkK8SUZzzesSqnMOEFeJYYC9t1k3/ SLAFZlvgmEzkiC/YFaTSo4o+a5AKiZP5Zp4aa2Xy65pmuvR+ny0yUnwvSEc53r8wYaUplJ BURohnz7WfbGxK6ysFAjVyMt23bGSUNLMh/hNNpw8lrz5CHdKgDq6LOV2P83M9Vv28hJI3 LUDzT8NqnapuUKkJk90gk7U50OsljlYgngE/MFX7+GkAMgTQ0xSgRfR/sDHEoQ== 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 4QnChh3861zdrH; Thu, 22 Jun 2023 21:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLB0JN066140; Thu, 22 Jun 2023 21:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLB0Iv066139; Thu, 22 Jun 2023 21:11:00 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:00 GMT Message-Id: <202306222111.35MLB0Iv066139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 482e0fcdf745 - main - Merge commit 16949c5c48ab from llvm-project (by Dimitry Andric): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 482e0fcdf745981f2c2b12311405fe93563cefc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=482e0fcdf745981f2c2b12311405fe93563cefc4 commit 482e0fcdf745981f2c2b12311405fe93563cefc4 Author: Dimitry Andric AuthorDate: 2023-04-20 19:21:37 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:25 +0000 Merge commit 16949c5c48ab from llvm-project (by Dimitry Andric): [compiler-rt] Include system headers before optionally defining HWCAP macros In https://reviews.llvm.org/D141285 the optional definitions of `HWCAP` macros were moved to before their usage. However, they were also moved to before the inclusion of system headers which can optionally define them. If any of those system headers then actually defined any of the `HWCAP` macros, it would result in a redefinition error. Move the system header includes to just before the optional definitions, to avoid this problem. Reviewed By: ilinpv Differential Revision: https://reviews.llvm.org/D148819 PR: 271047 MFC after: 1 month --- .../compiler-rt/lib/builtins/cpu_model.c | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c b/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c index f5ad530c7e88..f2dcd974008c 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c +++ b/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c @@ -839,6 +839,25 @@ int CONSTRUCTOR_ATTRIBUTE __cpu_indicator_init(void) { } #elif defined(__aarch64__) +// LSE support detection for out-of-line atomics +// using HWCAP and Auxiliary vector +_Bool __aarch64_have_lse_atomics + __attribute__((visibility("hidden"), nocommon)); + +#if defined(__has_include) +#if __has_include() +#include +#if __has_include() +#include + +#if defined(__ANDROID__) +#include +#include +#elif defined(__Fuchsia__) +#include +#include +#endif + #ifndef AT_HWCAP #define AT_HWCAP 16 #endif @@ -1009,25 +1028,6 @@ int CONSTRUCTOR_ATTRIBUTE __cpu_indicator_init(void) { #define HWCAP2_SVE_EBF16 (1UL << 33) #endif -// LSE support detection for out-of-line atomics -// using HWCAP and Auxiliary vector -_Bool __aarch64_have_lse_atomics - __attribute__((visibility("hidden"), nocommon)); - -#if defined(__has_include) -#if __has_include() -#include -#if __has_include() -#include - -#if defined(__ANDROID__) -#include -#include -#elif defined(__Fuchsia__) -#include -#include -#endif - // Detect Exynos 9810 CPU #define IF_EXYNOS9810 \ char arch[PROP_VALUE_MAX]; \ From nobody Thu Jun 22 21:11:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnChk3FsBz4gfQn; Thu, 22 Jun 2023 21:11: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 4QnChj71hLz492H; Thu, 22 Jun 2023 21:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nog5EjSuIbnrTBfo9gcgX1cuqS782tBSYfOz5bodxW0=; b=j3v65GG1u/zF1OmVARJNl9yNEdzaMV8SdL87dj1JKPb6yWm9JY8J/WHxl3Yk7YToBBvnbk BNx4Z82LnpqhN8BVWxJmnQwrIGSJNPFKGN0MOWR8/xW5XHzUDEmbz/n8/TZGRNLUsEgzwT UVLxxgOo4QQUUCr/Pjqhjr9X6ueLGURolCj8fnpPpuZEGecagx6PNDKuPcdV2hKfzhyYTb 8MJwBWLEKmCgYl3mTwhuDg/XKsbxbt+ZoLldxk3NBELrM0+xL2x3M6QsTAd5/NH69ohmsA xvZIOKT1Wi86ZHt+bI8yq75MPfLh4WUX2Ow4GgjxToyuG9s4yC+JFfo20nhrNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nog5EjSuIbnrTBfo9gcgX1cuqS782tBSYfOz5bodxW0=; b=AVk1KeksKIL1LkupIzmeiOVq4Qs8ev1QMKjBcg+JN23ozYrVlHZdfskGLhMzxb1mo8CBVY 5MYCbePkte19xJswNRK0n/4OuckLB6ZTBg6aHcSQCSrARZkwjlodceliFykiv8qp4CLzfy Ej4dh5tM3uuyTsnYvi8psRmo584fxHcuVuiAQ5q24qDfVIo+UbiBrR+thHS0vFolJ3+PHY pcHkBSKeFCvjyLoAjCJjTW/POVCXAuQUnvztTqGW7wbfjx2bEUVfY+y3XFKMTZzbhrnvof J6PaA+GmGLs1Adt5knMi9UZbS5gHy2rIwrYOph8jfF4b4CeYaDFFqA4MH7b0Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468262; a=rsa-sha256; cv=none; b=TXDNeKt/vCUPQKppBCpF2pLV9tg5KmizD+wYYuo0WzlrGyWF7VKksurd1MadqPGsSzNev4 1buMowfY9HQHtGXgS67F2OQIOBY9q/0WBae3jIZgIhEdPdyxl52sARGjJyTQoE99zoU+Bh CcOhc4BfEwCM3bBKQqBvJJ9X7jI/N9Qbw9hnY4Z83V/07AaxLTKiy1tOcq6EOEbHFNj+cB HLdpSXwdFzF9c94lDsYylcZ2A+ahrzr15cQ69QMZ1p8dQL8TbwqITFRdO0Rweu/bz7CSGH tZwd2MAhol3KICMaH2iUWbCN3z1srL92Ca6ieMDJbPunmNwQpAdIGujQQgjbhg== 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 4QnChj4FPlzdpr; Thu, 22 Jun 2023 21:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLB1da066164; Thu, 22 Jun 2023 21:11:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLB1tg066163; Thu, 22 Jun 2023 21:11:01 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:01 GMT Message-Id: <202306222111.35MLB1tg066163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1ac57eed9509 - main - Merge commit db492316399a from llvm-project (by Dimitry Andric): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1ac57eed95099f4d9da2ecab6000ad66d05c1018 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1ac57eed95099f4d9da2ecab6000ad66d05c1018 commit 1ac57eed95099f4d9da2ecab6000ad66d05c1018 Author: Dimitry Andric AuthorDate: 2023-04-20 19:22:59 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:26 +0000 Merge commit db492316399a from llvm-project (by Dimitry Andric): [clang][BFloat] Avoid redefining bfloat16_t in arm_neon.h As of https://reviews.llvm.org/D79708, clang-tblgen generates `arm_neon.h`, `arm_sve.h` and `arm_bf16.h`, and all those generated files will contain a typedef of `bfloat16_t`. However, `arm_neon.h` and `arm_sve.h` include `arm_bf16.h` immediately before their own typedef: #include typedef __bf16 bfloat16_t; With a recent version of clang (I used 16.0.1) this results in warnings: /usr/lib/clang/16/include/arm_neon.h:38:16: error: redefinition of typedef 'bfloat16_t' is a C11 feature [-Werror,-Wtypedef-redefinition] Since `arm_bf16.h` is very likely supposed to be the one true place where `bfloat16_t` is defined, I propose to delete the duplicate typedefs from the generated `arm_neon.h` and `arm_sve.h`. Reviewed By: sdesmalen, simonbutcher Differential Revision: https://reviews.llvm.org/D148822 PR: 271047 MFC after: 1 month --- contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp | 1 - contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp b/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp index 8f46b08b1366..08f2344f5d0a 100644 --- a/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp +++ b/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp @@ -2353,7 +2353,6 @@ void NeonEmitter::run(raw_ostream &OS) { OS << "#include \n\n"; OS << "#include \n"; - OS << "typedef __bf16 bfloat16_t;\n"; // Emit NEON-specific scalar typedefs. OS << "typedef float float32_t;\n"; diff --git a/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp b/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp index a577c10e3c64..bca61e703020 100644 --- a/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp +++ b/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp @@ -1103,7 +1103,6 @@ void SVEEmitter::createHeader(raw_ostream &OS) { OS << "typedef __SVBFloat16_t svbfloat16_t;\n"; OS << "#include \n"; - OS << "typedef __bf16 bfloat16_t;\n"; OS << "typedef __SVFloat32_t svfloat32_t;\n"; OS << "typedef __SVFloat64_t svfloat64_t;\n"; From nobody Thu Jun 22 21:11:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnChs5KGnz4gfJd; Thu, 22 Jun 2023 21:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnChs2xNZz49Tq; Thu, 22 Jun 2023 21:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6E4DsngDdHgjorDKlxdT5PxLjzvM84tGvFn+GTgtKe4=; b=aTYSa2VftHbACCpOc6+va+sL1FOLFAQ3YL69iRH4vDjxyn0f9XCXi6INsxjW/b/DOl6KNB pMDox3ND8Whfpwq+bmR7gwfuADyvSVXF4TVO1Q6pIGPnfX3jOILNNzRBYbq4+KIzkU2mk2 VRPa+GbBUs4KhwSdHKUG4PL7Y4ZL00O6UFGk841kGOJYdcbSHLhXzZTf8/0PzzA2gYTUc4 2JBS1zzVVV0whl3TdFAOzrVkPEGT+jNW2aPv0VSrNwVhAuPrIpdnKzNJf2h84f+KA3pXND Huv6mNKM4QVuL32Zz5zwbgtFOGTgSovxBHIj5pWHWUq1TEpXPrs+mXiuqtISew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6E4DsngDdHgjorDKlxdT5PxLjzvM84tGvFn+GTgtKe4=; b=HIsS46MVUb3DUg+giMvHB1FS1ffjTbuLxaqfhz/cH2BCI4UhLixQMmMB+TPhQiqmWoNPVi KF0YAV7Qj0JXUlXA5pa/RGsf4MCYjkY4VokXKgRr43nrpXSgs+6ken2ISXx5m1+00lfA74 cgQWqSkUZWTkO/IruHmbsxq3bAlCjmGzR13coUyW9XP+nNnLPN/TQprGX4IDBWGjVxDsR7 CYxr5P7YU08s6qT39etnP49DAmuM8/BEKnzA79FpANoWRtMyrJlxBLomM4hhL8IeQPY6l8 C9/c7KO8M1mhNqyY5kc+VnpmMwu97iHQvbRik7kD3+kUtlMu2TUGzd2rTks5Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468269; a=rsa-sha256; cv=none; b=pqHfSuYapj3Sb+cz+FmBpWQzuksahlqE6VT2D/Xi7H/8TVbdBlx/XTf0yilLWW6QskB2OE r6LVYmpmz9+CvkIK/iDb0UO6yj5e5hpioSq8lQo51veqFP5vc67MAFboccKsMpdwEszM+z 3lspl57erVsob79m/bk9QMXpFL7haXuKyPj2fr93dAfKTvzxSkTt1Jy5LuCNtFdPC563/2 Yp/3fQTOm0rChbH3b9Qkj4hFM2RwxvjD+Xu+rvSc9CF/8WsW+SU/tA+LFZ2BwYFigsB8Sx OCvrR25WzIIZCz802ZC7kukxzIJneED35KFFOKPt9ABOviFFaXO8ygCoHJ0Dpg== 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 4QnChs1YZrzf5P; Thu, 22 Jun 2023 21:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLB9Dm066193; Thu, 22 Jun 2023 21:11:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLB6Bi066189; Thu, 22 Jun 2023 21:11:06 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:06 GMT Message-Id: <202306222111.35MLB6Bi066189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 9e7101a856ad - main - Merge llvm-project release/16.x llvmorg-16.0.2-0-g18ddebe1a1a9 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9e7101a856ad738879b0bde099bfb2ba08b7995c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9e7101a856ad738879b0bde099bfb2ba08b7995c commit 9e7101a856ad738879b0bde099bfb2ba08b7995c Merge: 1ac57eed9509 86321b98854d Author: Dimitry Andric AuthorDate: 2023-04-22 17:27:13 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:28 +0000 Merge llvm-project release/16.x llvmorg-16.0.2-0-g18ddebe1a1a9 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.2-0-g18ddebe1a1a9 (aka 16.0.2 release). PR: 271047 MFC after: 1 month contrib/llvm-project/clang/lib/Format/Format.cpp | 10 +- .../clang/lib/Format/TokenAnnotator.cpp | 9 +- .../compiler-rt/lib/asan/asan_interceptors.cpp | 47 ++++-- .../compiler-rt/lib/asan/asan_internal.h | 2 +- .../compiler-rt/lib/asan/asan_linux.cpp | 158 +++++++++++---------- contrib/llvm-project/libcxx/include/__config | 2 +- .../libunwind/src/UnwindRegistersRestore.S | 4 +- .../llvm/TargetParser/AArch64TargetParser.h | 2 +- .../llvm/lib/CodeGen/StackProtector.cpp | 21 ++- .../llvm-project/llvm/lib/Support/raw_ostream.cpp | 7 + .../llvm/lib/Transforms/Scalar/SROA.cpp | 6 +- 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 +- 18 files changed, 166 insertions(+), 132 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 17a4e9fbc6bc,000000000000..420881e41de4 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,10 -1,0 +1,10 @@@ +// $FreeBSD$ + - #define LLVM_REVISION "llvmorg-16.0.1-0-gcd89023f7979" ++#define LLVM_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-16.0.1-0-gcd89023f7979" ++#define CLANG_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-16.0.1-0-gcd89023f7979" ++#define LLDB_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 7b3afbcccb01,000000000000..c6154e17ec22 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,10 -1,0 +1,10 @@@ +/* $FreeBSD$ */ + - #define CLANG_VERSION 16.0.1 - #define CLANG_VERSION_STRING "16.0.1" ++#define CLANG_VERSION 16.0.2 ++#define CLANG_VERSION_STRING "16.0.2" +#define CLANG_VERSION_MAJOR 16 +#define CLANG_VERSION_MAJOR_STRING "16" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 1 ++#define CLANG_VERSION_PATCHLEVEL 2 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index b5cd91c34032,000000000000..4e2cc44c9364 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1400006 + - #define LLD_VERSION_STRING "16.0.1 (FreeBSD llvmorg-16.0.1-0-gcd89023f7979-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "16.0.2 (FreeBSD llvmorg-16.0.2-0-g18ddebe1a1a9-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 7060f0d93cbc,000000000000..dab8cdb281fa mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 16.0.1 - #define LLDB_VERSION_STRING "16.0.1" ++#define LLDB_VERSION 16.0.2 ++#define LLDB_VERSION_STRING "16.0.2" +#define LLDB_VERSION_MAJOR 16 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 1 ++#define LLDB_VERSION_PATCH 2 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 46ac23cf47a1,000000000000..93cb4b9dd9dc mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,380 -1,0 +1,380 @@@ +/* $FreeBSD$ */ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 16.0.1" ++#define PACKAGE_STRING "LLVM 16.0.2" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "16.0.1" ++#define PACKAGE_VERSION "16.0.2" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 640003331a8e,000000000000..b5b415db51c4 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,132 -1,0 +1,132 @@@ +/* $FreeBSD$ */ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 16 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 1 ++#define LLVM_VERSION_PATCH 2 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "16.0.1" ++#define LLVM_VERSION_STRING "16.0.2" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 5194bb986dc0,000000000000..760d4e828e07 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,3 -1,0 +1,3 @@@ +/* $FreeBSD$ */ - #define LLVM_REVISION "llvmorg-16.0.1-0-gcd89023f7979" ++#define LLVM_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Thu Jun 22 21:11:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnCht5sc2z4gfFS; Thu, 22 Jun 2023 21:11: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 4QnCht4KwFz49Ch; Thu, 22 Jun 2023 21:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eykqSpyZ6y7oyJ7gNqyiwFi+rNO4KRnj0kQmrn9jL9A=; b=Vc/wrloYMZmRH7XVX/CxgiRnZSP/CVIBDqsku/LGG4M9nZXpnaLqRg7aLs/zKzBp9wp/A3 /LzWcVyrhNzh8my2d+qoadmkmgeSIhne8W0kRpYWpoaEMeDxnBU7Dt+hFhnIOG2xbp7PVt xSgEnAyxB2qZf3dFkucR8DCPlZw4/NjiVhP88eXIewH6JN61/M3QSAORq3DDXXlUdIX1CR e9oT1COlBJTcU2h8fdVF6g6bY7hkeNQT5cdGzfnzADA4+dWLPAtTpV8KYYDAOFV8mG7lfm KFl69dyxURHnPAsW3y21IoHZrkEVCWHP+MD8Vf86qo+kNp09yT17tAMQbYwuRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eykqSpyZ6y7oyJ7gNqyiwFi+rNO4KRnj0kQmrn9jL9A=; b=xrkOBPsKuJ6EsAbQw8IjSmDkI+RrYhuD9jWhI0C2R22/AAUgArCKD8tVe8U4VBY//PsbOU MlpdZsP15bEfOC0hb60N+O/ACoRchCFcdXEM30eWmaG7f1VMCy8y3JeV4XuHTcpA8XKn8+ mJg+e5Oed4YRmJGjeNuIM8Gp1MLEeg1IZn5b4Qbr9yeg1VFqbTERs97iNxGaZ6vvuoJCbA xJaHOt9QqQIPSCE/CQxtwBlWFiFyWoLHl/Bqhw2ANlH5Iy4lVg82oyshcXaHPFRmRESLac YHB/hBriFnGw3SzftNyWn/Ca6VRpW2jqXgY0gyujvrXGq2k/KSx9XIAc3yIhDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468270; a=rsa-sha256; cv=none; b=nZSK7HdFnZga50nOQP1thIUkS8L2t20c7PjYSfScXBQ63QfwxFt8fqF5BENSBCzJR+PamS ShZIoHm0F4PHT5UsDHL/hjUOSRX/yoxDm0cJOVeQXSC2CHfKM1T/7ReQZvW5qfPfhuCS0l Lv0+hud8cTPSGPvTJ1GP1kohLDxE/MWxd2JuCyAV/UuWRKt44wfmI+6bdEiWvUC6gpfasC Hff4l7UbuXgA/g3+QtZF3Wp7gIazPb/QMbzEHI3/M001ksGCqUZz1g9vcMZqBqiVFafXoI cXtiRh0fSZsKKejGDo9Ub0QnlAqQVicmr3dHXzpfSn7C/+puc2zPBVkkAME5kw== 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 4QnCht2bqRzf5Q; Thu, 22 Jun 2023 21:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLBAY1066212; Thu, 22 Jun 2023 21:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLBAqB066211; Thu, 22 Jun 2023 21:11:10 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:10 GMT Message-Id: <202306222111.35MLBAqB066211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: c3450ad127e9 - main - clang: re-downgrade implicit int/function declarations to warning only List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c3450ad127e94d3fa67ae337310e59c002f51bfc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c3450ad127e94d3fa67ae337310e59c002f51bfc commit c3450ad127e94d3fa67ae337310e59c002f51bfc Author: Dimitry Andric AuthorDate: 2023-04-25 19:24:04 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:33 +0000 clang: re-downgrade implicit int/function declarations to warning only This reapplies upstream commit c0141f3c300f by Aaron Ballman: Downgrade implicit int and implicit function declaration to warning only The changes in Clang 15.0.0 which enabled these diagnostics as a warning which defaulted to an error caused disruption for people working on distributions such as Gentoo. There was an explicit request to downgrade these to be warning-only in Clang 15.0.1 with the expectation that Clang 16 will default the diagnostics to an error. See https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 for more details on the discussion. See https://reviews.llvm.org/D133800 for the public review of these changes. As noted in the upstream discussion, there are many programs that fail to configure or build correctly, if these warnings are turned into errors by default. Note that most affected programs in ports are relatively old, and are unlikely to be fixed by actually adjusting their declarations, but by compiling with -std=gnu89, which downgrades the errors back to warning again. Lots of tedious work for very little gain. --- .../llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td index bfe582d8252f..31a27558bca4 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -419,7 +419,7 @@ def warn_implicit_function_decl : Warning< InGroup, DefaultIgnore; def ext_implicit_function_decl_c99 : ExtWarn< "call to undeclared function %0; ISO C99 and later do not support implicit " - "function declarations">, InGroup, DefaultError; + "function declarations">, InGroup; def note_function_suggestion : Note<"did you mean %0?">; def err_ellipsis_first_param : Error< @@ -709,7 +709,7 @@ def ext_implicit_lib_function_decl : ExtWarn< def ext_implicit_lib_function_decl_c99 : ExtWarn< "call to undeclared library function '%0' with type %1; ISO C99 and later " "do not support implicit function declarations">, - InGroup, DefaultError; + InGroup; def note_include_header_or_declare : Note< "include the header <%0> or explicitly provide a declaration for '%1'">; def note_previous_builtin_declaration : Note<"%0 is a builtin with type %1">; @@ -4390,7 +4390,7 @@ def err_ident_list_in_fn_declaration : Error< "a parameter list without types is only allowed in a function definition">; def ext_param_not_declared : ExtWarn< "parameter %0 was not declared, defaults to 'int'; ISO C99 and later do not " - "support implicit int">, InGroup, DefaultError; + "support implicit int">, InGroup; def err_param_default_argument : Error< "C does not support default arguments">; def err_param_default_argument_redefinition : Error< @@ -10104,7 +10104,7 @@ def warn_receiver_forward_class : Warning< def note_method_sent_forward_class : Note<"method %0 is used for the forward class">; def ext_missing_type_specifier : ExtWarn< "type specifier missing, defaults to 'int'; ISO C99 and later do not support " - "implicit int">, InGroup, DefaultError; + "implicit int">, InGroup; def err_missing_type_specifier : Error< "a type specifier is required for all declarations">; def err_decimal_unsupported : Error< From nobody Thu Jun 22 21:11:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnCj22WmZz4gflv; Thu, 22 Jun 2023 21:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnCj21SSdz49km; Thu, 22 Jun 2023 21:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/f7hrusqW2JmHsa3CKMedoQfb9mV1CmgcJDALN9sxdo=; b=K0g711+BvviH3EpOzIdDqp3vYDct+fqyW1BNTkZGYbUVc/y6QUYEPwE5dvJ6PpysKoRCHn hMvjUZzcLHJRDhJVuepntl2hw7qqMsX8jLtKoZEnD/55jr6+XUlmRePKb5cmY1Oby72F9H zL8EfmbzaKK7L1/hwrZB35PsUgJBwC9iYLBe7tTDJzjUdn9vgMO7h0GZfyu/T1nsexY/s2 LR7d79NuQUMOTWlC4B0D50V4+EydoWpzR6mFojYM4iuKb0uDwEbl7m7s1/lIfQmdaS2O58 7HUAlS7R4RHoPe1e63rNbyg2ScW6aLizQUoAVvC8SvvLMeiEyNciHvYPSV6xDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/f7hrusqW2JmHsa3CKMedoQfb9mV1CmgcJDALN9sxdo=; b=w27J1lIcWuwTCcm/ImD2msdTHqxxb3dOEeTDrXiav/9vuQa/MXyRWZndAoWYk1RKvdYtI/ 6tz1c8/Z89eqA7m7tuZ0O2jWuuBErCbZoLtGmoXJxbvPlL78MOJi+IpHVxt1vTjF6jTDaK bRwi0vJ0/aDE2YnrQAeUu2lPNm2h2MJpTRz8uIbexP4UtLIenzqYRks0CUcE//kNBPDil5 NW4mDe077V1JdA0ClgQ9UMiQO+ZrgfH4iOmN0NBokHM2HXZSdmHARlAPiZNiKp+9tXyGk0 dQJqHE4L6e24bcqQGQPbYW2BG61joA/L17RoTTRmc5yYD3Fn0Y4mGA1VOMpTjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468278; a=rsa-sha256; cv=none; b=GmUeGHiC2/a1dkkoq/V+XkVxXUPTSVqLmWFVe1dQ4liVbsVJyExtCRP8iijRh2QaVZq5va 8p6sudJpAu/DZM7dFb6Cnjyg5IsQLgeuqq5A/gHey/IGU6ZpEQgOGmzza7PTFXTev4zsVo DRZol5/Ajz79h3iEE7ZLA4Fx79sYtHOFPfw0xdDpph1IpFQZMnH4nli2k7Ei+vY76AL8/B r0jXsmyqrBq+f2LzFWq9Cb1TCn+coLgSrmMUqNfYuejx6JH+duEFHnccWoZMHGQgVyqnPF Ni+fXb5oWCkP2lIBoZp6yMUm0QAddJp9CPe+22uUGJLMTSvj8lon9ZDgVWUg5Q== 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 4QnCj20XXhzf5S; Thu, 22 Jun 2023 21:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLBIP5066247; Thu, 22 Jun 2023 21:11:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLBF8j066243; Thu, 22 Jun 2023 21:11:15 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:15 GMT Message-Id: <202306222111.35MLBF8j066243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: cbe9438cfe07 - main - Merge llvm-project release/16.x llvmorg-16.0.3-0-gda3cd333bea5 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cbe9438cfe07adfbcdeafe8e363614f83b03a055 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cbe9438cfe07adfbcdeafe8e363614f83b03a055 commit cbe9438cfe07adfbcdeafe8e363614f83b03a055 Merge: c3450ad127e9 727e049ae598 Author: Dimitry Andric AuthorDate: 2023-05-05 17:37:33 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:35 +0000 Merge llvm-project release/16.x llvmorg-16.0.3-0-gda3cd333bea5 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.3-0-gda3cd333bea5 (aka 16.0.3 release). PR: 271047 MFC after: 1 month contrib/llvm-project/clang/lib/AST/Expr.cpp | 4 +++ .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 7 ++++ contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 7 ++-- .../llvm-project/clang/lib/Sema/TreeTransform.h | 22 +++++------- contrib/llvm-project/libcxx/include/__config | 2 +- contrib/llvm-project/lld/COFF/Driver.cpp | 8 ++++- contrib/llvm-project/lld/COFF/Options.td | 3 ++ .../lldb/source/Host/posix/MainLoopPosix.cpp | 9 +++-- .../llvm/lib/CodeGen/MachineLateInstrsCleanup.cpp | 3 +- .../InstCombine/InstCombineMulDivRem.cpp | 41 ++++++++++++++-------- .../llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 10 ++++-- 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 +- 18 files changed, 93 insertions(+), 53 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 420881e41de4,000000000000..466b5ce7ecfd mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,10 -1,0 +1,10 @@@ +// $FreeBSD$ + - #define LLVM_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" ++#define LLVM_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" ++#define CLANG_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" ++#define LLDB_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index c6154e17ec22,000000000000..13d7baf64730 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,10 -1,0 +1,10 @@@ +/* $FreeBSD$ */ + - #define CLANG_VERSION 16.0.2 - #define CLANG_VERSION_STRING "16.0.2" ++#define CLANG_VERSION 16.0.3 ++#define CLANG_VERSION_STRING "16.0.3" +#define CLANG_VERSION_MAJOR 16 +#define CLANG_VERSION_MAJOR_STRING "16" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 2 ++#define CLANG_VERSION_PATCHLEVEL 3 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index 4e2cc44c9364,000000000000..8f4dd4a4b559 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1400006 + - #define LLD_VERSION_STRING "16.0.2 (FreeBSD llvmorg-16.0.2-0-g18ddebe1a1a9-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "16.0.3 (FreeBSD llvmorg-16.0.3-0-gda3cd333bea5-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index dab8cdb281fa,000000000000..4434036b81e2 mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 16.0.2 - #define LLDB_VERSION_STRING "16.0.2" ++#define LLDB_VERSION 16.0.3 ++#define LLDB_VERSION_STRING "16.0.3" +#define LLDB_VERSION_MAJOR 16 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 2 ++#define LLDB_VERSION_PATCH 3 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 93cb4b9dd9dc,000000000000..57914743328d mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,380 -1,0 +1,380 @@@ +/* $FreeBSD$ */ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 16.0.2" ++#define PACKAGE_STRING "LLVM 16.0.3" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "16.0.2" ++#define PACKAGE_VERSION "16.0.3" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index b5b415db51c4,000000000000..3932cfc4d1c3 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,132 -1,0 +1,132 @@@ +/* $FreeBSD$ */ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 16 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 2 ++#define LLVM_VERSION_PATCH 3 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "16.0.2" ++#define LLVM_VERSION_STRING "16.0.3" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 760d4e828e07,000000000000..4fa56888d33c mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,3 -1,0 +1,3 @@@ +/* $FreeBSD$ */ - #define LLVM_REVISION "llvmorg-16.0.2-0-g18ddebe1a1a9" ++#define LLVM_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Thu Jun 22 21:11:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnCjB0Y6vz4gfSx; Thu, 22 Jun 2023 21:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnCjB0GM1z4CdD; Thu, 22 Jun 2023 21:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3GV00snRVlLDcmkHnNLiBlAdTdg4SuX44zikj1WtFc=; b=GCpjgo3/XPVe2TMBov+r26fJgpe5LypBkF8ZUxO+Bj67weYMZvlQ33VE+gmpB71AVM9nql 2fnGMevbIgZ0/mrhOWHk5iesu0KBEN/E/JgQOJfdMLlGAIwTIp0kzWb12ve5pAaNVFmSl0 A3wTr236mKahVZ3y3lx/aD310RTySHCn/fGJ+w5+yzpvuZasr+ezR4xMAHZv7E0t5v7ust ACh1HyxhmonYxFveX95xuCvGr0uUBacSNbsQbMKOS29GbUb1T4oh9+xUOvxdPXe98Mgkse IzlffhLDTEkyscjgGk8C9Sd4GFGF61TkO6UBIe/353Haroo06Fp79XntMc0jtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3GV00snRVlLDcmkHnNLiBlAdTdg4SuX44zikj1WtFc=; b=clQ13yz/DbJzyV94Yyy1mFEBa6SrxFlW8JruG7zVTsyDTwTfOdyxLIXQTjsQbYmHe7MWIC ZyWD4tgbJzJz7Apgmgp/ZgpY3RFuGvurmeB99SP4QYg5sQiu4hoguTT3mhORupJb64tBOs XrksaBoWhaf0Zlh72KJeTJcSJrN0bUlZO1TnzaGEWEGcnu84KiDfCP3WAySB4zT603H48E XMSoghZtWPStl5XISd/XBo1ZuHJYqIG0f0JNHRv8oDzpBxWoQZMSOGc1unjIUpuaRhcqpp lR+KwuVpPnYEHOPVM88mLoZGbkTbyujraPmyfnfY1CNZc/MpomHDIWDp/YnKAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468286; a=rsa-sha256; cv=none; b=Mf2lcSj0ggvozFH6AD+a6PFFUHajvZ/x6rfWvUDIdtwLPHU9NtTG0TqG2frBbVTtzbmefP F4gv8ltuzoCv0VHdGezNiW/qLuAdJtUXxFdSl5A64ucyAQVueaSmppbUyONcs01HN5UbtK mTVPzZGWdyXl40xywZgQLB8moP4azFH4nTpC1wrsd0JcrZ9ZZ39S8Nzzjfitz+AJkA9ncM kxpxIpU75JE9ox87GoGREf3e5wg/USBgsIb8GabXK2P9kD33Ew+Lcgd5+TYCwyQLQ3R1nE Be8jK/ber5zp8KPOW8GxB5GRplZis74pY9Z1OXmxOcAtHQYfIW/GPxtqLmBMSA== 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 4QnCj96T6fzdhy; Thu, 22 Jun 2023 21:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLBPTk066282; Thu, 22 Jun 2023 21:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLBNmX066275; Thu, 22 Jun 2023 21:11:23 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:23 GMT Message-Id: <202306222111.35MLBNmX066275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: a324c34037ef - main - Merge llvm-project release/16.x llvmorg-16.0.4-0-gae42196bc493 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a324c34037ef2e1101962fca4ad0c021253288e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a324c34037ef2e1101962fca4ad0c021253288e1 commit a324c34037ef2e1101962fca4ad0c021253288e1 Merge: cbe9438cfe07 791701a7dc62 Author: Dimitry Andric AuthorDate: 2023-05-22 17:29:55 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:43 +0000 Merge llvm-project release/16.x llvmorg-16.0.4-0-gae42196bc493 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.4-0-gae42196bc493 (aka 16.0.4 release). PR: 271047 MFC after: 1 month contrib/llvm-project/clang/lib/AST/TypePrinter.cpp | 2 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 2 +- .../clang/lib/Driver/ToolChains/MSVC.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 16 +- contrib/llvm-project/libcxx/include/__config | 2 +- .../lib/CodeGen/SelectionDAG/TargetLowering.cpp | 9 +- .../lib/Target/SystemZ/SystemZISelLowering.cpp | 6 +- .../llvm/lib/Target/X86/X86FrameLowering.cpp | 14 +- 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 +- usr.bin/clang/bugpoint/bugpoint.1 | 39 +- usr.bin/clang/clang/clang.1 | 116 ++- usr.bin/clang/llc/llc.1 | 15 +- usr.bin/clang/lli/lli.1 | 11 +- usr.bin/clang/llvm-ar/llvm-ar.1 | 73 +- usr.bin/clang/llvm-ar/llvm-ranlib.1 | 11 +- usr.bin/clang/llvm-as/llvm-as.1 | 5 +- usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1 | 25 +- usr.bin/clang/llvm-cov/llvm-cov.1 | 143 +++- usr.bin/clang/llvm-cxxfilt/llvm-cxxfilt.1 | 10 +- usr.bin/clang/llvm-diff/llvm-diff.1 | 5 +- usr.bin/clang/llvm-dis/llvm-dis.1 | 5 +- usr.bin/clang/llvm-dwarfdump/llvm-dwarfdump.1 | 19 +- usr.bin/clang/llvm-dwarfutil/llvm-dwarfutil.1 | 10 +- usr.bin/clang/llvm-extract/llvm-extract.1 | 7 +- usr.bin/clang/llvm-link/llvm-link.1 | 7 +- usr.bin/clang/llvm-mca/llvm-mca.1 | 326 +++++++- usr.bin/clang/llvm-nm/llvm-nm.1 | 89 ++- usr.bin/clang/llvm-objcopy/llvm-objcopy.1 | 73 +- usr.bin/clang/llvm-objdump/llvm-objdump.1 | 125 ++- usr.bin/clang/llvm-pdbutil/llvm-pdbutil.1 | 9 +- usr.bin/clang/llvm-profdata/llvm-profdata.1 | 134 ++-- usr.bin/clang/llvm-readobj/llvm-readelf.1 | 59 +- usr.bin/clang/llvm-readobj/llvm-readobj.1 | 88 +- usr.bin/clang/llvm-size/llvm-size.1 | 14 +- usr.bin/clang/llvm-strings/llvm-strings.1 | 14 +- usr.bin/clang/llvm-symbolizer/llvm-addr2line.1 | 5 +- usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1 | 214 ++++- usr.bin/clang/llvm-tblgen/Makefile | 1 + usr.bin/clang/llvm-tblgen/llvm-tblgen.1 | 888 --------------------- usr.bin/clang/opt/opt.1 | 45 +- 46 files changed, 1266 insertions(+), 1402 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 466b5ce7ecfd,000000000000..514717a358fc mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,10 -1,0 +1,10 @@@ +// $FreeBSD$ + - #define LLVM_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" ++#define LLVM_REVISION "llvmorg-16.0.4-0-gae42196bc493" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" ++#define CLANG_REVISION "llvmorg-16.0.4-0-gae42196bc493" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" ++#define LLDB_REVISION "llvmorg-16.0.4-0-gae42196bc493" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 13d7baf64730,000000000000..301f49bfd08c mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,10 -1,0 +1,10 @@@ +/* $FreeBSD$ */ + - #define CLANG_VERSION 16.0.3 - #define CLANG_VERSION_STRING "16.0.3" ++#define CLANG_VERSION 16.0.4 ++#define CLANG_VERSION_STRING "16.0.4" +#define CLANG_VERSION_MAJOR 16 +#define CLANG_VERSION_MAJOR_STRING "16" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 3 ++#define CLANG_VERSION_PATCHLEVEL 4 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index 8f4dd4a4b559,000000000000..61598755e168 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1400006 + - #define LLD_VERSION_STRING "16.0.3 (FreeBSD llvmorg-16.0.3-0-gda3cd333bea5-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "16.0.4 (FreeBSD llvmorg-16.0.4-0-gae42196bc493-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 4434036b81e2,000000000000..cdc1a2c63f72 mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 16.0.3 - #define LLDB_VERSION_STRING "16.0.3" ++#define LLDB_VERSION 16.0.4 ++#define LLDB_VERSION_STRING "16.0.4" +#define LLDB_VERSION_MAJOR 16 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 3 ++#define LLDB_VERSION_PATCH 4 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 57914743328d,000000000000..105378ec0dcd mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,380 -1,0 +1,380 @@@ +/* $FreeBSD$ */ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 16.0.3" ++#define PACKAGE_STRING "LLVM 16.0.4" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "16.0.3" ++#define PACKAGE_VERSION "16.0.4" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 3932cfc4d1c3,000000000000..956e14142365 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,132 -1,0 +1,132 @@@ +/* $FreeBSD$ */ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 16 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 3 ++#define LLVM_VERSION_PATCH 4 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "16.0.3" ++#define LLVM_VERSION_STRING "16.0.4" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 4fa56888d33c,000000000000..ca9915b70f68 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,3 -1,0 +1,3 @@@ +/* $FreeBSD$ */ - #define LLVM_REVISION "llvmorg-16.0.3-0-gda3cd333bea5" ++#define LLVM_REVISION "llvmorg-16.0.4-0-gae42196bc493" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc usr.bin/clang/bugpoint/bugpoint.1 index 97b227ea82d1,000000000000..efbecd28e178 mode 100644,000000..100644 --- a/usr.bin/clang/bugpoint/bugpoint.1 +++ b/usr.bin/clang/bugpoint/bugpoint.1 @@@ -1,309 -1,0 +1,308 @@@ - .\" $FreeBSD$ +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. - .TH "BUGPOINT" "1" "2021-06-07" "12" "LLVM" ++.TH "BUGPOINT" "1" "2023-05-24" "16" "LLVM" +.SH NAME +bugpoint \- automatic test case reduction tool +.SH SYNOPSIS +.sp +\fBbugpoint\fP [\fIoptions\fP] [\fIinput LLVM ll/bc files\fP] [\fILLVM passes\fP] \fB\-\-args\fP +\fIprogram arguments\fP +.SH DESCRIPTION +.sp +\fBbugpoint\fP narrows down the source of problems in LLVM tools and passes. It +can be used to debug three types of failures: optimizer crashes, miscompilations +by optimizers, or bad native code generation (including problems in the static +and JIT compilers). It aims to reduce large test cases to small, useful ones. +For more information on the design and inner workings of \fBbugpoint\fP, as well as - advice for using bugpoint, see /Bugpoint in the LLVM ++advice for using bugpoint, see \fI\%LLVM bugpoint tool: design and usage\fP in the LLVM +distribution. +.SH OPTIONS +.sp +\fB\-\-additional\-so\fP \fIlibrary\fP +.INDENT 0.0 +.INDENT 3.5 +Load the dynamic shared object \fIlibrary\fP into the test program whenever it is +run. This is useful if you are debugging programs which depend on non\-LLVM +libraries (such as the X or curses libraries) to run. +.UNINDENT +.UNINDENT +.sp +\fB\-\-append\-exit\-code\fP=\fI{true,false}\fP +.INDENT 0.0 +.INDENT 3.5 +Append the test programs exit code to the output file so that a change in exit +code is considered a test failure. Defaults to false. +.UNINDENT +.UNINDENT +.sp +\fB\-\-args\fP \fIprogram args\fP +.INDENT 0.0 +.INDENT 3.5 +Pass all arguments specified after \fB\-\-args\fP to the test program whenever it runs. - Note that if any of the \fIprogram args\fP start with a "\fB\-\fP", you should use: ++Note that if any of the \fIprogram args\fP start with a \(dq\fB\-\fP\(dq, you should use: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +bugpoint [bugpoint args] \-\-args \-\- [program args] +.ft P +.fi +.UNINDENT +.UNINDENT +.sp - The "\fB\-\-\fP" right after the \fB\-\-args\fP option tells \fBbugpoint\fP to consider - any options starting with "\fB\-\fP" to be part of the \fB\-\-args\fP option, not as ++The \(dq\fB\-\-\fP\(dq right after the \fB\-\-args\fP option tells \fBbugpoint\fP to consider ++any options starting with \(dq\fB\-\fP\(dq to be part of the \fB\-\-args\fP option, not as +options to \fBbugpoint\fP itself. +.UNINDENT +.UNINDENT +.sp +\fB\-\-tool\-args\fP \fItool args\fP +.INDENT 0.0 +.INDENT 3.5 +Pass all arguments specified after \fB\-\-tool\-args\fP to the LLVM tool under test +(\fBllc\fP, \fBlli\fP, etc.) whenever it runs. You should use this option in the +following way: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +bugpoint [bugpoint args] \-\-tool\-args \-\- [tool args] +.ft P +.fi +.UNINDENT +.UNINDENT +.sp - The "\fB\-\-\fP" right after the \fB\-\-tool\-args\fP option tells \fBbugpoint\fP to - consider any options starting with "\fB\-\fP" to be part of the \fB\-\-tool\-args\fP ++The \(dq\fB\-\-\fP\(dq right after the \fB\-\-tool\-args\fP option tells \fBbugpoint\fP to ++consider any options starting with \(dq\fB\-\fP\(dq to be part of the \fB\-\-tool\-args\fP +option, not as options to \fBbugpoint\fP itself. (See \fB\-\-args\fP, above.) +.UNINDENT +.UNINDENT +.sp +\fB\-\-safe\-tool\-args\fP \fItool args\fP +.INDENT 0.0 +.INDENT 3.5 - Pass all arguments specified after \fB\-\-safe\-tool\-args\fP to the "safe" execution ++Pass all arguments specified after \fB\-\-safe\-tool\-args\fP to the \(dqsafe\(dq execution +tool. +.UNINDENT +.UNINDENT +.sp +\fB\-\-gcc\-tool\-args\fP \fIgcc tool args\fP +.INDENT 0.0 +.INDENT 3.5 +Pass all arguments specified after \fB\-\-gcc\-tool\-args\fP to the invocation of +\fBgcc\fP\&. +.UNINDENT +.UNINDENT +.sp +\fB\-\-opt\-args\fP \fIopt args\fP +.INDENT 0.0 +.INDENT 3.5 +Pass all arguments specified after \fB\-\-opt\-args\fP to the invocation of \fBopt\fP\&. +.UNINDENT +.UNINDENT +.sp +\fB\-\-disable\-{dce,simplifycfg}\fP +.INDENT 0.0 +.INDENT 3.5 +Do not run the specified passes to clean up and reduce the size of the test +program. By default, \fBbugpoint\fP uses these passes internally when attempting to +reduce test programs. If you\(aqre trying to find a bug in one of these passes, +\fBbugpoint\fP may crash. +.UNINDENT +.UNINDENT +.sp +\fB\-\-enable\-valgrind\fP +.INDENT 0.0 +.INDENT 3.5 +Use valgrind to find faults in the optimization phase. This will allow +bugpoint to find otherwise asymptomatic problems caused by memory +mis\-management. +.UNINDENT +.UNINDENT +.sp +\fB\-find\-bugs\fP +.INDENT 0.0 +.INDENT 3.5 +Continually randomize the specified passes and run them on the test program +until a bug is found or the user kills \fBbugpoint\fP\&. +.UNINDENT +.UNINDENT +.sp +\fB\-help\fP +.INDENT 0.0 +.INDENT 3.5 +Print a summary of command line options. +.UNINDENT +.UNINDENT +.sp +\fB\-\-input\fP \fIfilename\fP +.INDENT 0.0 +.INDENT 3.5 +Open \fIfilename\fP and redirect the standard input of the test program, whenever +it runs, to come from that file. +.UNINDENT +.UNINDENT +.sp +\fB\-\-load\fP \fIplugin\fP +.INDENT 0.0 +.INDENT 3.5 +Load the dynamic object \fIplugin\fP into \fBbugpoint\fP itself. This object should +register new optimization passes. Once loaded, the object will add new command +line options to enable various optimizations. To see the new complete list of +optimizations, use the \fB\-help\fP and \fB\-\-load\fP options together; for example: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +bugpoint \-\-load myNewPass.so \-help +.ft P +.fi +.UNINDENT +.UNINDENT +.UNINDENT +.UNINDENT +.sp +\fB\-\-mlimit\fP \fImegabytes\fP +.INDENT 0.0 +.INDENT 3.5 +Specifies an upper limit on memory usage of the optimization and codegen. Set +to zero to disable the limit. +.UNINDENT +.UNINDENT +.sp +\fB\-\-output\fP \fIfilename\fP +.INDENT 0.0 +.INDENT 3.5 +Whenever the test program produces output on its standard output stream, it - should match the contents of \fIfilename\fP (the "reference output"). If you ++should match the contents of \fIfilename\fP (the \(dqreference output\(dq). If you +do not use this option, \fBbugpoint\fP will attempt to generate a reference output - by compiling the program with the "safe" backend and running it. ++by compiling the program with the \(dqsafe\(dq backend and running it. +.UNINDENT +.UNINDENT +.sp +\fB\-\-run\-{int,jit,llc,custom}\fP +.INDENT 0.0 +.INDENT 3.5 +Whenever the test program is compiled, \fBbugpoint\fP should generate code for it +using the specified code generator. These options allow you to choose the +interpreter, the JIT compiler, the static native code compiler, or a +custom command (see \fB\-\-exec\-command\fP) respectively. +.UNINDENT +.UNINDENT +.sp +\fB\-\-safe\-{llc,custom}\fP +.INDENT 0.0 +.INDENT 3.5 +When debugging a code generator, \fBbugpoint\fP should use the specified code - generator as the "safe" code generator. This is a known\-good code generator - used to generate the "reference output" if it has not been provided, and to ++generator as the \(dqsafe\(dq code generator. This is a known\-good code generator ++used to generate the \(dqreference output\(dq if it has not been provided, and to +compile portions of the program that as they are excluded from the testcase. +These options allow you to choose the +static native code compiler, or a custom command, (see \fB\-\-exec\-command\fP) +respectively. The interpreter and the JIT backends cannot currently - be used as the "safe" backends. ++be used as the \(dqsafe\(dq backends. +.UNINDENT +.UNINDENT +.sp +\fB\-\-exec\-command\fP \fIcommand\fP +.INDENT 0.0 +.INDENT 3.5 +This option defines the command to use with the \fB\-\-run\-custom\fP and +\fB\-\-safe\-custom\fP options to execute the bitcode testcase. This can +be useful for cross\-compilation. +.UNINDENT +.UNINDENT +.sp +\fB\-\-compile\-command\fP \fIcommand\fP +.INDENT 0.0 +.INDENT 3.5 +This option defines the command to use with the \fB\-\-compile\-custom\fP +option to compile the bitcode testcase. The command should exit with a - failure exit code if the file is "interesting" and should exit with a ++failure exit code if the file is \(dqinteresting\(dq and should exit with a +success exit code (i.e. 0) otherwise (this is the same as if it crashed on - "interesting" inputs). ++\(dqinteresting\(dq inputs). +.sp +This can be useful for +testing compiler output without running any link or execute stages. To +generate a reduced unit test, you may add CHECK directives to the +testcase and pass the name of an executable compile\-command script in this form: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +#!/bin/sh - llc "$@" ++llc \(dq$@\(dq +not FileCheck [bugpoint input file].ll < bugpoint\-test\-program.s +.ft P +.fi +.UNINDENT +.UNINDENT +.sp - This script will "fail" as long as FileCheck passes. So the result ++This script will \(dqfail\(dq as long as FileCheck passes. So the result +will be the minimum bitcode that passes FileCheck. +.UNINDENT +.UNINDENT +.sp +\fB\-\-safe\-path\fP \fIpath\fP +.INDENT 0.0 +.INDENT 3.5 +This option defines the path to the command to execute with the +\fB\-\-safe\-{int,jit,llc,custom}\fP +option. +.UNINDENT +.UNINDENT +.sp +\fB\-\-verbose\-errors\fP=\fI{true,false}\fP +.INDENT 0.0 +.INDENT 3.5 - The default behavior of bugpoint is to print "" when it finds a reduced ++The default behavior of bugpoint is to print \(dq\(dq when it finds a reduced +test that crashes compilation. This flag prints the output of the crashing +program to stderr. This is useful to make sure it is the same error being +tracked down and not a different error that happens to crash the compiler as +well. Defaults to false. *** 11307 LINES SKIPPED *** From nobody Thu Jun 22 21:11:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnCjL1RlZz4gfwb; Thu, 22 Jun 2023 21:11: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 4QnCjL02NTz4CWh; Thu, 22 Jun 2023 21:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2pPirLW50gMXLvbretW4XazBp3f6n3zt1hrO4mAZ3NA=; b=N1dRqVO7Mu3UYVqZ2K3g0almCmjPCgYjHORauEsuwTF+mz+klNrdT0a8mHsap32+AVFxh4 VuHgoW9pTesALXkTfifT1LArM0BfMSY4ehSwhpumUV8OyV2pq+3jChS2l9qxBKUS2jfd2f Arh/z861MpJLyN/yugTQ2l/w2eGPOWVKPsLbvfUsPtkYO7jlN4PCPaa3qzeCWyhcZBT+zL qfjRK31+Q3jNZbSwj11ZOYUCRe8wT27RBYRF1/pOthb0gsO5azoPN1oaQcUyD4YD20Wf+u XQMjFMUTl82cc5Y8j8KrodfRoomJOjcmDlhwmmME4opEd6l67eTmERqmEns7GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2pPirLW50gMXLvbretW4XazBp3f6n3zt1hrO4mAZ3NA=; b=dYZeDXlAXe6lWqFHDRjlRIurahUjyJc4OCNX5InKkRXufenCxkBV+WjuWJR8dZEy+YYMCi kmn5yR0uvVKNG/SmLBFzWDvCCOndVGl77C5y9I6EfZYnqUsDLNzPDz2Ndt20R8d8DHap5n XZIotpJd9AnJ5JfXDo6W9FJ8jcMAdiRg8nrtrDG+wTqR9itLe+wRKCh1PtihjAalK1GUK/ 6Rn8rL/TfCE2JTMLAlZvyJCGhNsPAeGfnHUerSbzE8zTiBvd2zY7tSDvYc6rH6mEnOTD78 6CfzN2qAozGhlf78xhRZTxrXQ3CDLazDpWERZbHgZ1Ia3Tw59Hd0YTovPCs3qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468294; a=rsa-sha256; cv=none; b=FJBDRtX1uRP5R8Iwg6RiYmFrtg+UMw/e1/FkiiicyuHr4UNjUr9U1m6CXXNAEDNQ2KxSSi I8t4rx/NTJzggROJjcGMsEAiGYbT201yuTMn7qHxSoCZwZ7boiHwORGI9UM8VdI7GEOkmC 2DQ3BxqyggVCUxBMB2ozi++IZLIBSYkJqWxL0yH5z9NvCaOu+1nEfoUtSoXm6hYJ0Bh8+p VsnDk4wA6tYSS2mFWo9/BMlscvaefMcO6AcX8bltuELU6MOlzOlQoa0SbzsjREJJlggDfe rccfWiga9O5RsNcG/2da+ccUTOE9xEtrVlFxPpnO4XhUZnj828Jaz7DQuG013A== 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 4QnCjK5XSwzf7s; Thu, 22 Jun 2023 21:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLBXPb067309; Thu, 22 Jun 2023 21:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLBVMk067307; Thu, 22 Jun 2023 21:11:31 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:31 GMT Message-Id: <202306222111.35MLBVMk067307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 2efbaac7a07f - main - Merge llvm-project release/16.x llvmorg-16.0.5-0-g185b81e034ba List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2efbaac7a07fff163640a67873b3ac250794ec3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2efbaac7a07fff163640a67873b3ac250794ec3f commit 2efbaac7a07fff163640a67873b3ac250794ec3f Merge: a324c34037ef 3b922bd9516f Author: Dimitry Andric AuthorDate: 2023-06-04 19:01:35 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:50 +0000 Merge llvm-project release/16.x llvmorg-16.0.5-0-g185b81e034ba This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.5-0-g185b81e034ba (aka 16.0.5 release). PR: 271047 MFC after: 1 month .../clang/include/clang/AST/ExprConcepts.h | 8 + .../include/clang/Basic/DiagnosticSemaKinds.td | 3 +- .../clang/include/clang/Sema/Initialization.h | 18 +- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 3 +- .../llvm-project/clang/lib/AST/ExprConcepts.cpp | 19 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 1 + .../lib/Format/IntegerLiteralSeparatorFixer.cpp | 6 +- contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp | 3 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 335 ++++++++++++--------- contrib/llvm-project/libcxx/include/__config | 2 +- contrib/llvm-project/lld/docs/WebAssembly.rst | 33 ++ .../llvm/include/llvm/Analysis/AliasAnalysis.h | 9 + .../llvm/include/llvm/Analysis/TargetLibraryInfo.h | 12 +- .../lib/Target/Hexagon/HexagonISelLowering.cpp | 7 +- .../llvm/lib/Target/Hexagon/HexagonPatterns.td | 24 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 27 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 21 ++ .../llvm-project/llvm/tools/llvm-mca/llvm-mca.cpp | 19 +- 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 +- 26 files changed, 397 insertions(+), 185 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 514717a358fc,000000000000..1daa9c25ab45 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,10 -1,0 +1,10 @@@ +// $FreeBSD$ + - #define LLVM_REVISION "llvmorg-16.0.4-0-gae42196bc493" ++#define LLVM_REVISION "llvmorg-16.0.5-0-g185b81e034ba" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-16.0.4-0-gae42196bc493" ++#define CLANG_REVISION "llvmorg-16.0.5-0-g185b81e034ba" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-16.0.4-0-gae42196bc493" ++#define LLDB_REVISION "llvmorg-16.0.5-0-g185b81e034ba" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 301f49bfd08c,000000000000..e99bc8fb4f95 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,10 -1,0 +1,10 @@@ +/* $FreeBSD$ */ + - #define CLANG_VERSION 16.0.4 - #define CLANG_VERSION_STRING "16.0.4" ++#define CLANG_VERSION 16.0.5 ++#define CLANG_VERSION_STRING "16.0.5" +#define CLANG_VERSION_MAJOR 16 +#define CLANG_VERSION_MAJOR_STRING "16" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 4 ++#define CLANG_VERSION_PATCHLEVEL 5 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index 61598755e168,000000000000..f6061c3e6784 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1400006 + - #define LLD_VERSION_STRING "16.0.4 (FreeBSD llvmorg-16.0.4-0-gae42196bc493-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "16.0.5 (FreeBSD llvmorg-16.0.5-0-g185b81e034ba-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index cdc1a2c63f72,000000000000..982e4714b182 mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 16.0.4 - #define LLDB_VERSION_STRING "16.0.4" ++#define LLDB_VERSION 16.0.5 ++#define LLDB_VERSION_STRING "16.0.5" +#define LLDB_VERSION_MAJOR 16 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 4 ++#define LLDB_VERSION_PATCH 5 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 105378ec0dcd,000000000000..d97252910e45 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,380 -1,0 +1,380 @@@ +/* $FreeBSD$ */ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 16.0.4" ++#define PACKAGE_STRING "LLVM 16.0.5" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "16.0.4" ++#define PACKAGE_VERSION "16.0.5" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 956e14142365,000000000000..82d246c949f0 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,132 -1,0 +1,132 @@@ +/* $FreeBSD$ */ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 16 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 0 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 4 ++#define LLVM_VERSION_PATCH 5 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "16.0.4" ++#define LLVM_VERSION_STRING "16.0.5" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite instead of libtensorflow */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if the xar_open() function is supported on this platform. */ +#if defined(__APPLE__) +#define LLVM_HAVE_LIBXAR 1 +#endif + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index ca9915b70f68,000000000000..95353f30f7ec mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,3 -1,0 +1,3 @@@ +/* $FreeBSD$ */ - #define LLVM_REVISION "llvmorg-16.0.4-0-gae42196bc493" ++#define LLVM_REVISION "llvmorg-16.0.5-0-g185b81e034ba" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Thu Jun 22 21:11:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnCjM2FzCz4gfhg; Thu, 22 Jun 2023 21:11: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 4QnCjM0CnSz4CsQ; Thu, 22 Jun 2023 21:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KjcAFdZqb7ELcqHLZZpkObOKPTPYZm8eSsxsy00j6Y=; b=eGO8MwbGLZuZTLG4z5rYPmBixG6fAo3/oAuQWJyef2MPVGDfQl+FmZaZtBcTmqtuD6hp/L dF4a56Nchk3To5P8VOp9YQ5glaJetOChFqY5i8PoStUzaaawCBBIAk3w678HQHKQjlJOrL Zj8l7XkveZA9Q+ayh36Oqv9jYkWuOjU6UWOrIB8yZslpN1mSdUM4WN+FzHivB8lMyp6x8R Qx2D3+31uFi9pKWNyXtan860eFg5jCQYG2iLuY6Peo/ajJRr+JhYaN3O7NOagpQ1cea8PX d2riI2exrVQWOPcW23BOAF/2C7Me8adB2vZMj9JPLisoGRrun+1bgcCVmkhtFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KjcAFdZqb7ELcqHLZZpkObOKPTPYZm8eSsxsy00j6Y=; b=xDdtbP3zZXh2Oxe/tI4Lok86O4TAtvA49QFMQaigdnAB0TOj0Tu5RY+b6b7U/HmHZ83fvu OFIszpvQNWDqJoH40yTKuKC2pu4/3k9cQ9jmj3/ITPeqFwfR/pYZ7Llqd9B0zv3Vv1Fyv+ yoQ79p7TUL7W2OPPS5uJZNn5rZNUMrInMqRV4PkAGu7eB5j3KRPLg+2R+PibcsGYUilYxh EZaHVDdemOlqvnhC3uPT8xN520fppvbSSa7ppf32faCM+5nfyaxps8tVwt9zi6Ep7A8iLJ +buUrGa+ZQ9FeNGeWO5pzNeesunj9/DLdke4aFoBVO2xVn030Cy7u4K5ERYEGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468295; a=rsa-sha256; cv=none; b=PsNvMk3tqL7GaIUXDykNJFpJXBlaiaIKJQ/p1YC4+KsjQUeHTrkAT2i8F4KHb0GjGYH1n7 0XjKIaToOXf2KxUwGdhSobOunl7I6O97UwaE54wSivK2PjKo493YBch4mpAXUnmfaMgZj0 3IhdJsBZeaJklRXCrugctkS9uoil/Jr5tqfVUdd3bgw+c0TzR6R/WZS/06DC/AF+Daj9tK 0nzPWzq53NG6CAyWg2ISIY6/+24KiAurPmqXSJCTz8pzmmxWDPy7eORkhSjXiWGcOI3GAG FQ3CIzP4smzQeInZR6PB0/IcsjDG6lDBPqkm8ae0yKf8AVaxlaP8BbWX0yDYHA== 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 4QnCjL6M1Szdx9; Thu, 22 Jun 2023 21:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLBYPD067328; Thu, 22 Jun 2023 21:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLBYJ3067327; Thu, 22 Jun 2023 21:11:34 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:34 GMT Message-Id: <202306222111.35MLBYJ3067327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: cf24393421ca - main - Merge commit 69d42eef4bec from llvm-project (by Dimitry Andric): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cf24393421ca807899c599a53ddc5dcedb7c71dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cf24393421ca807899c599a53ddc5dcedb7c71dc commit cf24393421ca807899c599a53ddc5dcedb7c71dc Author: Dimitry Andric AuthorDate: 2023-06-14 18:49:59 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:54 +0000 Merge commit 69d42eef4bec from llvm-project (by Dimitry Andric): [Clang] Show type in enum out of range diagnostic When the diagnostic for an out of range enum value is printed, it currently does not show the actual enum type in question, for example: v8/src/base/bit-field.h:43:29: error: integer value 7 is outside the valid range of values [0, 3] for this enumeration type [-Wenum-constexpr-conversion] static constexpr T kMax = static_cast(kNumValues - 1); ^ This can make it cumbersome to find the cause for the problem. Add the enum type to the diagnostic message, to make it easier. Reviewed By: aaron.ballman Differential Revision: https://reviews.llvm.org/D152788 PR: 271047 MFC after: 1 month --- .../llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td | 4 ++-- contrib/llvm-project/clang/lib/AST/ExprConstant.cpp | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td index 28120d13fd9e..4e2e0bd3079c 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td +++ b/contrib/llvm-project/clang/include/clang/Basic/DiagnosticASTKinds.td @@ -393,8 +393,8 @@ def warn_fixedpoint_constant_overflow : Warning< "overflow in expression; result is %0 with type %1">, InGroup>; def warn_constexpr_unscoped_enum_out_of_range : Warning< - "integer value %0 is outside the valid range of values [%1, %2] for this " - "enumeration type">, DefaultError, InGroup>; + "integer value %0 is outside the valid range of values [%1, %2] for the " + "enumeration type %3">, DefaultError, InGroup>; // This is a temporary diagnostic, and shall be removed once our // implementation is complete, and like the preceding constexpr notes belongs diff --git a/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp b/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp index 464104139cb2..db6c07d4ab7f 100644 --- a/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp +++ b/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp @@ -13682,12 +13682,13 @@ bool IntExprEvaluator::VisitCastExpr(const CastExpr *E) { Info.Ctx.getDiagnostics().Report( E->getExprLoc(), diag::warn_constexpr_unscoped_enum_out_of_range) << llvm::toString(Result.getInt(), 10) << Min.getSExtValue() - << Max.getSExtValue(); + << Max.getSExtValue() << ED; else if (!ED->getNumNegativeBits() && ConstexprVar && Max.ult(Result.getInt().getZExtValue())) - Info.Ctx.getDiagnostics().Report(E->getExprLoc(), - diag::warn_constexpr_unscoped_enum_out_of_range) - << llvm::toString(Result.getInt(),10) << Min.getZExtValue() << Max.getZExtValue(); + Info.Ctx.getDiagnostics().Report( + E->getExprLoc(), diag::warn_constexpr_unscoped_enum_out_of_range) + << llvm::toString(Result.getInt(), 10) << Min.getZExtValue() + << Max.getZExtValue() << ED; } } From nobody Thu Jun 22 21:11:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnCjX0bSzz4gfrJ; Thu, 22 Jun 2023 21:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnCjW60D0z4D6t; Thu, 22 Jun 2023 21:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=88drjRFUImNbFshgJm+fAOXncdkP6x7O7hm5iBFsLKw=; b=s0XLZ11GfEdrC7R8Du+rGrrE0yoBV21oZEqhnAYFPVS46XpHede0q8aAo/v56DQbxN9Lxc 87MHjFY/7wyURRIgvIvh6SLn0bDcKMn6+rf9SBgiWOI/rsq6cxIChMIEC36xHi6qaYz/ud e9/7CkpoORfr/f0j1tr/MKnAxmvB3a0+FSblvDofgXE3LlgT+/Wdg1WDH9FJH89N1xlDA2 BvWp/i7MrCB3X1yhXKOIw0GOLBjkdg5Af6bMTq8u3Pl1/f31ZVVqBfhZGbakwV46FsCNjh 9uRS1df2P+UjSwlmsVxW47SRCHVKpnEu8tOqcGOY7+Lv9xWQreIR/SI85EEAgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=88drjRFUImNbFshgJm+fAOXncdkP6x7O7hm5iBFsLKw=; b=sSvvG9W1sD7vJngdYY4uqR6qG2CFz4c2gdby4pKi99eT2sKKwkiax775FB+KfNU5VplEIb mAgySRb59FF+0y6AGsHm+JvN6rrVt/RfgaFrFPenOg1xkqwBsAJD7/YUyQ7+yzF4BFmPY9 PsUmuWOiVqXrEzojE1RCCwQDM7+Vk5MbAT2dopalEY3Z1C6FYuFk9IgmWXODTklL+vsA0U FX7kRxfi6cCCNwnclysbBOwQqlLIqP1clyIi3rSWpWCKiNTNU+Eiv6iixCO2uMxiTQAwOv ioP1cMhHDje1Jv5Yk+Mzq9uhxChXR4/d9c9GJ6ZolNLnKPFiY01VfMS5Kjv9Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468303; a=rsa-sha256; cv=none; b=Ysb3itcnUcY1eaXHgbYibXPyVvq2aSSO5DYEtNBbV1BxS8HUUNcZSeNc6cvlx20VfhEIXi 2ulUqIKn9/i4L28WZNaFGBTq5gR3F2iGgZGqrd01jbZSYHcM4RBupSJh/W7cP0WCmBLXux Ue1SSbl+lzN4/r2alhl33JBEZ1vsVPraShkgAQeGT5zA0Lc8zdG0Ubdwh4DOskFwbUEjyc 2l9zdDI0ufzZ19XEQIUpHk3/el/MOcbbIOEU7poLka0al6BJ2lZJrDwz/vRTpt6txDvqMN hUATS4/T8ymFmhCBA6aHG+/5lzhVPIJtQAYpH9ih+ZjHf/1N99k97kNEGDUE1w== 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 4QnCjW55V0zdrT; Thu, 22 Jun 2023 21:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLBhNU067370; Thu, 22 Jun 2023 21:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLBeMn067359; Thu, 22 Jun 2023 21:11:40 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:40 GMT Message-Id: <202306222111.35MLBeMn067359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: e048f78b2143 - main - Merge llvm-project release/16.x llvmorg-16.0.6-0-g7cbf1a259152 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e048f78b21438144bab781f2ba9ee33a2aae6772 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e048f78b21438144bab781f2ba9ee33a2aae6772 commit e048f78b21438144bab781f2ba9ee33a2aae6772 Merge: cf24393421ca 23e196feed9f Author: Dimitry Andric AuthorDate: 2023-06-22 17:47:54 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:59 +0000 Merge llvm-project release/16.x llvmorg-16.0.6-0-g7cbf1a259152 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-16.0.6-0-g7cbf1a259152 (aka 16.0.6 release). PR: 271047 MFC after: 1 month contrib/llvm-project/libcxx/include/__config | 2 +- lib/clang/freebsd_cc_version.h | 2 - lib/clang/include/Plugins/Plugins.def | 1 - lib/clang/include/VCSVersion.inc | 8 +- lib/clang/include/clang/Basic/Version.inc | 8 +- lib/clang/include/clang/Config/config.h | 1 - lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Host/Config.h | 1 - lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/AsmParsers.def | 2 - lib/clang/include/llvm/Config/AsmPrinters.def | 2 - lib/clang/include/llvm/Config/Disassemblers.def | 2 - lib/clang/include/llvm/Config/TargetMCAs.def | 2 - lib/clang/include/llvm/Config/Targets.def | 2 - lib/clang/include/llvm/Config/abi-breaking.h | 1 - lib/clang/include/llvm/Config/config.h | 5 +- lib/clang/include/llvm/Config/llvm-config.h | 5 +- lib/clang/include/llvm/Support/Extension.def | 1 - lib/clang/include/llvm/Support/VCSRevision.h | 3 +- lib/clang/liblldb/LLDBWrapLua.cpp | 82074 +++++++++++----------- lib/clang/llvm.pre.mk | 1 - 21 files changed, 41074 insertions(+), 41057 deletions(-) diff --cc lib/clang/freebsd_cc_version.h index 6b094f383083,000000000000..82830fe2baee mode 100644,000000..100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@@ -1,3 -1,0 +1,1 @@@ - /* $FreeBSD$ */ - +#define FREEBSD_CC_VERSION 1400005 diff --cc lib/clang/include/Plugins/Plugins.def index 55ff6eae7c07,000000000000..a1224b71fc75 mode 100644,000000..100644 --- a/lib/clang/include/Plugins/Plugins.def +++ b/lib/clang/include/Plugins/Plugins.def @@@ -1,80 -1,0 +1,79 @@@ - // $FreeBSD$ +/*===- lldb/source/Plugin/Plugins.def ---------------------------*- C++ -*-===*\ +|* *| +|* Part of the LLVM Project, under the Apache License v2.0 with LLVM *| +|* Exceptions. *| +|* See https://llvm.org/LICENSE.txt for license information. *| +|* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception *| +|* *| +|*===----------------------------------------------------------------------===*| +|* *| +|* This file enumerates all of the plugins supported by this build of LLDB. *| +|* Clients of this file should define the LLDB_PLUGIN macro to be a *| +|* function-like macro with a single parameter (the name of the plugin) *| +|* including this file will then enumerate all of the plugins. Script *| +|* interpreter plugins can be enumerated separately by defining *| +|* LLDB_SCRIPT_PLUGIN in which case they are not part of LLDB_PLUGIN. *| +|* *| +|* *| +|* The set of plugins supported by LLDB is generated at configuration *| +|* time, at which point this header is generated. Do not modify this *| +|* header directly. *| +|* *| +\*===----------------------------------------------------------------------===*/ + +#ifndef LLDB_PLUGIN +# error Please define the macro LLDB_PLUGIN(PluginName) +#endif + +#ifndef LLDB_SCRIPT_PLUGIN +#define LLDB_SCRIPT_PLUGIN(p) LLDB_PLUGIN(p) +#endif + +LLDB_PLUGIN(ABIAArch64) +LLDB_PLUGIN(ABIARM) +LLDB_PLUGIN(ABIMips) +LLDB_PLUGIN(ABIPowerPC) +LLDB_PLUGIN(ABIX86) +LLDB_PLUGIN(ArchitectureArm) +LLDB_PLUGIN(ArchitectureMips) +LLDB_PLUGIN(ArchitecturePPC64) +LLDB_PLUGIN(ArchitectureAArch64) +LLDB_PLUGIN(DisassemblerLLVMC) +LLDB_PLUGIN(DynamicLoaderPosixDYLD) +LLDB_PLUGIN(DynamicLoaderStatic) +LLDB_PLUGIN(InstructionARM) +LLDB_PLUGIN(InstructionARM64) +LLDB_PLUGIN(InstructionMIPS) +LLDB_PLUGIN(InstructionMIPS64) +LLDB_PLUGIN(InstructionPPC64) +LLDB_PLUGIN(InstructionRISCV) +LLDB_PLUGIN(InstrumentationRuntimeASan) +LLDB_PLUGIN(InstrumentationRuntimeMainThreadChecker) +LLDB_PLUGIN(InstrumentationRuntimeTSan) +LLDB_PLUGIN(InstrumentationRuntimeUBSan) +LLDB_PLUGIN(JITLoaderGDB) +LLDB_PLUGIN(CPlusPlusLanguage) +LLDB_PLUGIN(CXXItaniumABI) +LLDB_PLUGIN(MemoryHistoryASan) +LLDB_PLUGIN(ObjectContainerBSDArchive) +LLDB_PLUGIN(ObjectFileBreakpad) +LLDB_PLUGIN(ObjectFileELF) +LLDB_PLUGIN(ObjectFileJIT) +LLDB_PLUGIN(PlatformFreeBSD) +LLDB_PLUGIN(PlatformGDB) +LLDB_PLUGIN(ScriptedProcess) +LLDB_PLUGIN(ProcessElfCore) +LLDB_PLUGIN(ProcessFreeBSDKernel) +LLDB_SCRIPT_PLUGIN(ScriptInterpreterNone) +LLDB_SCRIPT_PLUGIN(ScriptInterpreterLua) +LLDB_PLUGIN(SymbolFileBreakpad) +LLDB_PLUGIN(SymbolFileDWARF) +LLDB_PLUGIN(SymbolFileSymtab) +LLDB_PLUGIN(SymbolVendorELF) +LLDB_PLUGIN(TypeSystemClang) +LLDB_PLUGIN(UnwindAssemblyInstEmulation) +LLDB_PLUGIN(UnwindAssemblyX86) +LLDB_PLUGIN(ProcessGDBRemote) + +#undef LLDB_PLUGIN +#undef LLDB_SCRIPT_PLUGIN diff --cc lib/clang/include/VCSVersion.inc index 1daa9c25ab45,000000000000..598871260c01 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,10 -1,0 +1,8 @@@ - // $FreeBSD$ - - #define LLVM_REVISION "llvmorg-16.0.5-0-g185b81e034ba" ++#define LLVM_REVISION "llvmorg-16.0.6-0-g7cbf1a259152" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-16.0.5-0-g185b81e034ba" ++#define CLANG_REVISION "llvmorg-16.0.6-0-g7cbf1a259152" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-16.0.5-0-g185b81e034ba" ++#define LLDB_REVISION "llvmorg-16.0.6-0-g7cbf1a259152" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index e99bc8fb4f95,000000000000..d5aa1ce51f33 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,10 -1,0 +1,8 @@@ - /* $FreeBSD$ */ - - #define CLANG_VERSION 16.0.5 - #define CLANG_VERSION_STRING "16.0.5" ++#define CLANG_VERSION 16.0.6 ++#define CLANG_VERSION_STRING "16.0.6" +#define CLANG_VERSION_MAJOR 16 +#define CLANG_VERSION_MAJOR_STRING "16" +#define CLANG_VERSION_MINOR 0 - #define CLANG_VERSION_PATCHLEVEL 5 ++#define CLANG_VERSION_PATCHLEVEL 6 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/clang/Config/config.h index 0cd1e12a4108,000000000000..b2c85aa23d19 mode 100644,000000..100644 --- a/lib/clang/include/clang/Config/config.h +++ b/lib/clang/include/clang/Config/config.h @@@ -1,81 -1,0 +1,80 @@@ - /* $FreeBSD$ */ +/* This generated file is for internal use. Do not include it from headers. */ + +#ifdef CLANG_CONFIG_H +#error config.h can only be included once +#else +#define CLANG_CONFIG_H + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Default to -fPIE and -pie on Linux. */ +#define CLANG_DEFAULT_PIE_ON_LINUX 1 + +/* Default linker to use. */ +#define CLANG_DEFAULT_LINKER "" + +/* Default C++ stdlib to use. */ +#define CLANG_DEFAULT_CXX_STDLIB "" + +/* Default runtime library to use. */ +#define CLANG_DEFAULT_RTLIB "" + +/* Default unwind library to use. */ +#define CLANG_DEFAULT_UNWINDLIB "" + +/* Default objcopy to use */ +#define CLANG_DEFAULT_OBJCOPY "objcopy" + +/* Default OpenMP runtime used by -fopenmp. */ +#define CLANG_DEFAULT_OPENMP_RUNTIME "libomp" + +/* Default architecture for SystemZ. */ +#define CLANG_SYSTEMZ_DEFAULT_ARCH "z10" + +/* Multilib basename for libdir. */ +#define CLANG_INSTALL_LIBDIR_BASENAME "lib" + +/* Relative directory for resource files */ +#define CLANG_RESOURCE_DIR "" + +/* Directories clang will search for headers */ +#define C_INCLUDE_DIRS "" + +/* Directories clang will search for configuration files */ +/* #undef CLANG_CONFIG_FILE_SYSTEM_DIR */ +/* #undef CLANG_CONFIG_FILE_USER_DIR */ + +/* Default to all compiler invocations for --sysroot=. */ +/* #undef DEFAULT_SYSROOT */ + +/* Directory where gcc is installed. */ +#define GCC_INSTALL_PREFIX "" + +/* Define if we have libxml2 */ +/* #undef CLANG_HAVE_LIBXML */ + +/* Define if we have sys/resource.h (rlimits) */ +#define CLANG_HAVE_RLIMITS 1 + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* pass --build-id to ld */ +/* #undef ENABLE_LINKER_BUILD_ID */ + +/* enable x86 relax relocations by default */ +#define ENABLE_X86_RELAX_RELOCATIONS 1 + +/* Enable IEEE binary128 as default long double format on PowerPC Linux. */ +#define PPC_LINUX_DEFAULT_IEEELONGDOUBLE 0 + +/* Enable each functionality of modules */ +/* #undef CLANG_ENABLE_ARCMT */ +/* #undef CLANG_ENABLE_OBJC_REWRITER */ +/* #undef CLANG_ENABLE_STATIC_ANALYZER */ + +/* Spawn a new process clang.exe for the CC1 tool invocation, when necessary */ +#define CLANG_SPAWN_CC1 0 + +#endif diff --cc lib/clang/include/lld/Common/Version.inc index f6061c3e6784,000000000000..20810f686dad mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1400006 + - #define LLD_VERSION_STRING "16.0.5 (FreeBSD llvmorg-16.0.5-0-g185b81e034ba-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "16.0.6 (FreeBSD llvmorg-16.0.6-0-g7cbf1a259152-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Host/Config.h index 0e855b6b09c6,000000000000..8f6bdf58790e mode 100644,000000..100644 --- a/lib/clang/include/lldb/Host/Config.h +++ b/lib/clang/include/lldb/Host/Config.h @@@ -1,59 -1,0 +1,58 @@@ - // $FreeBSD$ +//===-- Config.h -----------------------------------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef LLDB_HOST_CONFIG_H +#define LLDB_HOST_CONFIG_H + +#define LLDB_EDITLINE_USE_WCHAR 1 + +#define LLDB_HAVE_EL_RFUNC_T 1 + +#define HAVE_SYS_EVENT_H 1 + +#define HAVE_PPOLL 1 + +#define HAVE_PTSNAME_R 1 + +#define HAVE_PROCESS_VM_READV 0 + +#define HAVE_NR_PROCESS_VM_READV 0 + +#ifndef HAVE_LIBCOMPRESSION +/* #undef HAVE_LIBCOMPRESSION */ +#endif + +#define LLDB_ENABLE_POSIX 1 + +#define LLDB_ENABLE_TERMIOS 1 + +#define LLDB_ENABLE_LZMA 1 + +#define LLDB_ENABLE_CURSES 1 + +#define CURSES_HAVE_NCURSES_CURSES_H 0 + +#define LLDB_ENABLE_LIBEDIT 1 + +#define LLDB_ENABLE_LIBXML2 0 + +#define LLDB_ENABLE_LUA 1 + +#define LLDB_ENABLE_PYTHON 0 + +#define LLDB_ENABLE_FBSDVMCORE 0 + +#define LLDB_EMBED_PYTHON_HOME 0 + +/* #undef LLDB_PYTHON_HOME */ + +#define LLDB_INSTALL_LIBDIR_BASENAME "lib" + +/* #undef LLDB_GLOBAL_INIT_DIRECTORY */ + +#endif // #ifndef LLDB_HOST_CONFIG_H diff --cc lib/clang/include/lldb/Version/Version.inc index 982e4714b182,000000000000..99f8a8e09dea mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 16.0.5 - #define LLDB_VERSION_STRING "16.0.5" ++#define LLDB_VERSION 16.0.6 ++#define LLDB_VERSION_STRING "16.0.6" +#define LLDB_VERSION_MAJOR 16 +#define LLDB_VERSION_MINOR 0 - #define LLDB_VERSION_PATCH 5 ++#define LLDB_VERSION_PATCH 6 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/AsmParsers.def index d0924c0914f3,000000000000..e37ea136a87b mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/AsmParsers.def +++ b/lib/clang/include/llvm/Config/AsmParsers.def @@@ -1,32 -1,0 +1,30 @@@ - /* $FreeBSD$ */ - +#ifndef LLVM_ASM_PARSER +# error Please define the macro LLVM_ASM_PARSER(TargetName) +#endif + +#ifdef LLVM_TARGET_ENABLE_AARCH64 +LLVM_ASM_PARSER(AArch64) +#endif +#ifdef LLVM_TARGET_ENABLE_ARM +LLVM_ASM_PARSER(ARM) +#endif +#ifdef LLVM_TARGET_ENABLE_BPF +LLVM_ASM_PARSER(BPF) +#endif +#ifdef LLVM_TARGET_ENABLE_MIPS +LLVM_ASM_PARSER(Mips) +#endif +#ifdef LLVM_TARGET_ENABLE_POWERPC +LLVM_ASM_PARSER(PowerPC) +#endif +#ifdef LLVM_TARGET_ENABLE_RISCV +LLVM_ASM_PARSER(RISCV) +#endif +#ifdef LLVM_TARGET_ENABLE_SPARC +LLVM_ASM_PARSER(Sparc) +#endif +#ifdef LLVM_TARGET_ENABLE_X86 +LLVM_ASM_PARSER(X86) +#endif + +#undef LLVM_ASM_PARSER diff --cc lib/clang/include/llvm/Config/AsmPrinters.def index 2a335aa93b42,000000000000..819a52bc29e2 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/AsmPrinters.def +++ b/lib/clang/include/llvm/Config/AsmPrinters.def @@@ -1,32 -1,0 +1,30 @@@ - /* $FreeBSD$ */ - +#ifndef LLVM_ASM_PRINTER +# error Please define the macro LLVM_ASM_PRINTER(TargetName) +#endif + +#ifdef LLVM_TARGET_ENABLE_AARCH64 +LLVM_ASM_PRINTER(AArch64) +#endif +#ifdef LLVM_TARGET_ENABLE_ARM +LLVM_ASM_PRINTER(ARM) +#endif +#ifdef LLVM_TARGET_ENABLE_BPF +LLVM_ASM_PRINTER(BPF) +#endif +#ifdef LLVM_TARGET_ENABLE_MIPS +LLVM_ASM_PRINTER(Mips) +#endif +#ifdef LLVM_TARGET_ENABLE_POWERPC +LLVM_ASM_PRINTER(PowerPC) +#endif +#ifdef LLVM_TARGET_ENABLE_RISCV +LLVM_ASM_PRINTER(RISCV) +#endif +#ifdef LLVM_TARGET_ENABLE_SPARC +LLVM_ASM_PRINTER(Sparc) +#endif +#ifdef LLVM_TARGET_ENABLE_X86 +LLVM_ASM_PRINTER(X86) +#endif + +#undef LLVM_ASM_PRINTER diff --cc lib/clang/include/llvm/Config/Disassemblers.def index 756ff37b4bf8,000000000000..90ab73d82294 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/Disassemblers.def +++ b/lib/clang/include/llvm/Config/Disassemblers.def @@@ -1,32 -1,0 +1,30 @@@ - /* $FreeBSD$ */ - +#ifndef LLVM_DISASSEMBLER +# error Please define the macro LLVM_DISASSEMBLER(TargetName) +#endif + +#ifdef LLVM_TARGET_ENABLE_AARCH64 +LLVM_DISASSEMBLER(AArch64) +#endif +#ifdef LLVM_TARGET_ENABLE_ARM +LLVM_DISASSEMBLER(ARM) +#endif +#ifdef LLVM_TARGET_ENABLE_BPF +LLVM_DISASSEMBLER(BPF) +#endif +#ifdef LLVM_TARGET_ENABLE_MIPS +LLVM_DISASSEMBLER(Mips) +#endif +#ifdef LLVM_TARGET_ENABLE_POWERPC +LLVM_DISASSEMBLER(PowerPC) +#endif +#ifdef LLVM_TARGET_ENABLE_RISCV +LLVM_DISASSEMBLER(RISCV) +#endif +#ifdef LLVM_TARGET_ENABLE_SPARC +LLVM_DISASSEMBLER(Sparc) +#endif +#ifdef LLVM_TARGET_ENABLE_X86 +LLVM_DISASSEMBLER(X86) +#endif + +#undef LLVM_DISASSEMBLER diff --cc lib/clang/include/llvm/Config/TargetMCAs.def index be6edaf3dd69,000000000000..e7d4e60c0098 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/TargetMCAs.def +++ b/lib/clang/include/llvm/Config/TargetMCAs.def @@@ -1,14 -1,0 +1,12 @@@ - /* $FreeBSD$ */ - +#ifndef LLVM_TARGETMCA +# error Please define the macro LLVM_TARGETMCA(TargetName) +#endif + +#ifdef LLVM_TARGET_ENABLE_RISCV +LLVM_TARGETMCA(RISCV) +#endif +#ifdef LLVM_TARGET_ENABLE_X86 +LLVM_TARGETMCA(X86) +#endif + +#undef LLVM_TARGETMCA diff --cc lib/clang/include/llvm/Config/Targets.def index b6cb6fee9dce,000000000000..a9a64ccd4202 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/Targets.def +++ b/lib/clang/include/llvm/Config/Targets.def @@@ -1,32 -1,0 +1,30 @@@ - /* $FreeBSD$ */ - +#ifndef LLVM_TARGET +# error Please define the macro LLVM_TARGET(TargetName) +#endif + +#ifdef LLVM_TARGET_ENABLE_AARCH64 +LLVM_TARGET(AArch64) +#endif +#ifdef LLVM_TARGET_ENABLE_ARM +LLVM_TARGET(ARM) +#endif +#ifdef LLVM_TARGET_ENABLE_BPF +LLVM_TARGET(BPF) +#endif +#ifdef LLVM_TARGET_ENABLE_MIPS +LLVM_TARGET(Mips) +#endif +#ifdef LLVM_TARGET_ENABLE_POWERPC +LLVM_TARGET(PowerPC) +#endif +#ifdef LLVM_TARGET_ENABLE_RISCV +LLVM_TARGET(RISCV) +#endif +#ifdef LLVM_TARGET_ENABLE_SPARC +LLVM_TARGET(Sparc) +#endif +#ifdef LLVM_TARGET_ENABLE_X86 +LLVM_TARGET(X86) +#endif + +#undef LLVM_TARGET diff --cc lib/clang/include/llvm/Config/abi-breaking.h index 1254d6218db3,000000000000..eb90be1fe37b mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/abi-breaking.h +++ b/lib/clang/include/llvm/Config/abi-breaking.h @@@ -1,63 -1,0 +1,62 @@@ - /* $FreeBSD$ */ +/*===------- llvm/Config/abi-breaking.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file controls the C++ ABI break introduced in LLVM public header. */ + +#ifndef LLVM_ABI_BREAKING_CHECKS_H +#define LLVM_ABI_BREAKING_CHECKS_H + +/* Define to enable checks that alter the LLVM C++ ABI */ +#define LLVM_ENABLE_ABI_BREAKING_CHECKS 1 + +/* Define to enable reverse iteration of unordered llvm containers */ +#define LLVM_ENABLE_REVERSE_ITERATION 0 + +/* Allow selectively disabling link-time mismatch checking so that header-only + ADT content from LLVM can be used without linking libSupport. */ +#if !defined(LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING) || !LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING + +// ABI_BREAKING_CHECKS protection: provides link-time failure when clients build +// mismatch with LLVM +#if defined(_MSC_VER) +// Use pragma with MSVC +#define LLVM_XSTR(s) LLVM_STR(s) +#define LLVM_STR(s) #s +#pragma detect_mismatch("LLVM_ENABLE_ABI_BREAKING_CHECKS", LLVM_XSTR(LLVM_ENABLE_ABI_BREAKING_CHECKS)) +#undef LLVM_XSTR +#undef LLVM_STR +#elif defined(_WIN32) || defined(__CYGWIN__) // Win32 w/o #pragma detect_mismatch +// FIXME: Implement checks without weak. +#elif defined(__cplusplus) +#if !(defined(_AIX) && defined(__GNUC__) && !defined(__clang__)) +#define LLVM_HIDDEN_VISIBILITY __attribute__ ((visibility("hidden"))) +#else +// GCC on AIX does not support visibility attributes. Symbols are not +// exported by default on AIX. +#define LLVM_HIDDEN_VISIBILITY +#endif +namespace llvm { +#if LLVM_ENABLE_ABI_BREAKING_CHECKS +extern int EnableABIBreakingChecks; +LLVM_HIDDEN_VISIBILITY +__attribute__((weak)) int *VerifyEnableABIBreakingChecks = + &EnableABIBreakingChecks; +#else +extern int DisableABIBreakingChecks; +LLVM_HIDDEN_VISIBILITY +__attribute__((weak)) int *VerifyDisableABIBreakingChecks = + &DisableABIBreakingChecks; +#endif +} +#undef LLVM_HIDDEN_VISIBILITY +#endif // _MSC_VER + +#endif // LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING + +#endif diff --cc lib/clang/include/llvm/Config/config.h index d97252910e45,000000000000..78af3cbddcd1 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,380 -1,0 +1,379 @@@ - /* $FreeBSD$ */ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 16.0.5" ++#define PACKAGE_STRING "LLVM 16.0.6" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "16.0.5" ++#define PACKAGE_VERSION "16.0.6" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 82d246c949f0,000000000000..cdf493029a3a mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h *** 116408 LINES SKIPPED *** From nobody Thu Jun 22 21:11:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnCjY1gl5z4gfxC; Thu, 22 Jun 2023 21:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnCjX6s8Mz4DQr; Thu, 22 Jun 2023 21:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OeZ8Ab1O3HDg2dYDBRxOqHSIc7sy7cqFn2Drk+oo7E=; b=rArQ2XyKxbHQqK0UEbk+YBUhtLDqPhdKPaCt+zqzMTBEB84/VIHmR8dMNLZllcJO3KLOzp 1SVOZz66wHEwxhxhDCG7vsxUJLUz2CdHze1LfszQH7qrnvcC8isX7ga3a5rT4u1qsccpgA jE2SQF54DZQh3emOEImW6kXP/bQR5XMsHhuS7K5IUeU/shqXXPiaNRaz+ffCQsN8dQXDSE 8LQzybpLv4dRV6i+OEIxUftK8NhAAjw2xJKKGljAnK7epqf7LB6nqBeyfo78PcXbmkXGgp IiIkA1fEyG70v8cew+zLh53jbKWoK0FheQ2d7cKmz6h9NJ1YBpJw9lQTZRFdWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OeZ8Ab1O3HDg2dYDBRxOqHSIc7sy7cqFn2Drk+oo7E=; b=Jwwr/CO2oi7rd07IdV2lipC52UxMqChK1DAFrn9HzCrlp08qITWsXNFxbW4iEfMr0dTJiz CZsz0RRoZM8onCZ6iN1M52LZAew5gUzwDvtmt8ZQXSf3Xy/7yVWBbJ7IhtZx9eT3BG2J/D 5iwO0ONfT/JOGOUxQ+7fOdawmS7ckzbgHaYU7+4l7GJI4W2tAeuJe27Tgweww/2gKyiM/b gNXJFKPbpRIvYSpQfSE1JQAp2R8je9odoeTesPnJtow1NaIRUirSpkuyIB3Pr76aNCPxHJ stdAD7u8aHflY4RvXAEzBUILeHZrzdR0pFmK84V940dmvemvrD3UzM4uu84WYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468305; a=rsa-sha256; cv=none; b=VasggtdRLQQOVcGTKhHhHImkz6qmo+78gqV8MlItKOA/pI4d2W8nnGuingBbBMoqtXgVMn CZxTtKXvrzAPXSpeYl0OlV2+ljYKUdYuv7ZQBVIYvpLXMrKYF6fE/MSihjI5Z8SEoBiWfc UXzRJRTf5n8uAMkeF3XLB11jD1BIIOUOBn1bhEejwDXHusD7NsBNCzMLyARx91oKaVlC6P IGt6KaMLb/P/vzXYdMEeqSPz1fyTC+4STdiG/XhTW0hnKUO6DXOTt8P6ThlQx7gB5417mB E5rXtR/y3JgXKZWgLwAFf8Z29bwQ1zwaDFvRagkOkU4qcKu6ViTQZ2mU6SmGVw== 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 4QnCjX5tfdzf5Y; Thu, 22 Jun 2023 21:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MLBit5067464; Thu, 22 Jun 2023 21:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLBi3P067452; Thu, 22 Jun 2023 21:11:44 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:44 GMT Message-Id: <202306222111.35MLBi3P067452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: a681cba16d89 - main - Bump __FreeBSD_version for llvm 16.0.6 merge List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a681cba16d8967651a2146385ce44a2bfeb1c4c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a681cba16d8967651a2146385ce44a2bfeb1c4c3 commit a681cba16d8967651a2146385ce44a2bfeb1c4c3 Author: Dimitry Andric AuthorDate: 2023-06-22 18:24:04 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:25:05 +0000 Bump __FreeBSD_version for llvm 16.0.6 merge PR: 271047 MFC after: 1 month --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index d3577411e998..0cc9ec0c8733 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400090 +#define __FreeBSD_version 1400091 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Fri Jun 23 00:26:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnJ2d265Pz4gVGm; Fri, 23 Jun 2023 00:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnJ2d1hr8z3PZk; Fri, 23 Jun 2023 00:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687480009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9UnmDy0q3YeJVIDg3uvaKqGo1IaVLl1gHbFQfoAUds=; b=q6LmOGy5eBm0wQXQZTGkVHzVepjkWtYCa9UaE2b3wL2AN9cy8M91aBcjDsO7ZEMPyPla0f RHujvb+hmRDKC+58G80BlCTm+qQhDMPAUBDp8cWxeSdd4V0xeismNxjf6jsxgoYw9/R4Iv 8w6ENtlgnW4ElqGn4NlLpvzJDNvyYD3nzda0yrz7ZJbYCrYmScr7LJSQCXa03zp5zekjvg KOMCOcqgm+9EtBiHUhjFGfg8pSmCT4oSEBM9YYp23k5wVt4I+/6TQu9/NbuhYN2qyUuDOZ L0syPWdUekYyvygQ1VVgr3U8+NLS7VelW2sJWjKIjsJElWNmdZCvSsSgeFwt7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687480009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9UnmDy0q3YeJVIDg3uvaKqGo1IaVLl1gHbFQfoAUds=; b=as8v4YlZf6QL+4GvutpuuiwQ7fCcA7VwICWgDFGuv0VYBlo2ch+A7HBFGBOSsffNLAQHiw 7g1FTWaSA+qy2A0q3+y0eLYYtdrjD6nq3andnS6YS8reI634eIvkr4rkfyqZLmWgYbLisa EZhWmgcOIasOW2z49fq0eOnLkOOPHy4rkd6Fn9C+8BOCC9WL2RSiO4YoTdjipUucvs9GE4 9kL9MB/aNq7cMWrc4+bHu9FZsB+wZK4oCKdDknB78ImDmfq/nQJJolBD0SC+cACMX8PBOj cDWX/QyQJAQIQ8RPUCy/prb2n/0GH+gS19/iJjhsQKJ8rpEl/ax6BhvbZvbqJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687480009; a=rsa-sha256; cv=none; b=yaTSCmpFeKlyacJXY1dMxlbrLkn9rOaKuK9l+IO+BU+rjGP2E42moAtYcnWYlaM1OTTIKG sqUr8sJTmhTb707JEJHQAKiLYCclzgKq8Xd/pndRH4OIrgaFLhUc0l3e4t4BroSgqdajam dP7yepJkyKoQCvTlMkcZgoQFKres3OyJ/VA+8jz+dsbY0S6o8eu9cVZxtCAdt1Bgd9Tjow 2KAvDxPVtxkhsl4S6QoSNNatvpHvge9iPoHdGrnJ7tZtDIXa34yO6794K7+ohSZ2NWQ3br y0LCKGgyIG15Yx+OosAKHi+Xj6nWjxsXHW9xS3zWspfnhFt+NtuWon3BaaqBAA== 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 4QnJ2d0g1MzjjV; Fri, 23 Jun 2023 00:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35N0QmBd085953; Fri, 23 Jun 2023 00:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35N0QmsJ085952; Fri, 23 Jun 2023 00:26:48 GMT (envelope-from git) Date: Fri, 23 Jun 2023 00:26:48 GMT Message-Id: <202306230026.35N0QmsJ085952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 171f1c1b4f0e - main - Cirrus-CI: use llvm16 job by default and make llvm15 manual List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 171f1c1b4f0e9ec5b77a2dabdd4fcbf9baaa02df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=171f1c1b4f0e9ec5b77a2dabdd4fcbf9baaa02df commit 171f1c1b4f0e9ec5b77a2dabdd4fcbf9baaa02df Author: Ed Maste AuthorDate: 2023-06-22 23:20:34 +0000 Commit: Ed Maste CommitDate: 2023-06-23 00:26:34 +0000 Cirrus-CI: use llvm16 job by default and make llvm15 manual With commit e048f78b2143 the default tool chain is Clang/LLVM 16, so follow along in the llvm pkg used by Cirrus-CI. MFC after: 1 month Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 12f77ed71b1b..860cb29445fe 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -16,14 +16,14 @@ env: task: matrix: - name: amd64-llvm15 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 TOOLCHAIN: llvm15 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm16 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' - trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 From nobody Fri Jun 23 03:32:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnN8v3Kb8z4gDXD; Fri, 23 Jun 2023 03:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnN8v2tnpz3x68; Fri, 23 Jun 2023 03:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687491151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHOI0XyAg0MEyU9BglrUtatAhApG87gkxBs5VD79Jow=; b=r1g4bxDM1n/s+16oIPPsdMtOR2xohwm/XHqlzN0g7SoadBJ+TadQP24UIXZRXU9KSXqaYn WuTkGjXXrpBSrdwkUX0OJZEf3/8INruQjtIfA+ycFPbDgCQxuo7j7zKVDc/iHraITpZukj B+KevruWFSuga4wX3Z1BGKLXeGCsizE7t8CL/Fw0gx6XkHk+uiKfPLLDUgO7hFhkFiGUvT MrGq8ViQfXo3xGZQhYbEnWicFR0gaPp8YAbzz0dPzRYkrdSbhcx/hpkKFDPx2kCHKd1DU2 mL8iVi0S9rtbBXOJ2hy2Mio7v1WGRyWhqx6/5J2lSMerz7OKFtE/aSMWGwf8gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687491151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHOI0XyAg0MEyU9BglrUtatAhApG87gkxBs5VD79Jow=; b=PdZ4QMufj/DgaE1CruYbxrhLMmNawZtXjn2R1qffCKm8mkuUVDGS1Vd6jmpWa10nrYZeHG 8LV/UvLy1jJJu+gxnVc50of5wEmiTeAJO/oewR5mQ8w5kAZ6UtEsJ82/q2jTheUmtkr1Ec +0YfHHFBfku/nHxJK/vUQK/ZRYypaoVPBOeMGOAuumeWsBq3oKDdunwAHgbIUfAwYURkqB 1CC2w9thyujAejEgf5/lTDnM/LuE4QdeymJh5avsAaP7l4u6JRUK5XTJzXeKo1nmEJ3oB4 8PuXGmbEzn1mkm694RocdG5UIFVHKbQ3Jj0AFg/75a7jvh/bCdYX+GOCKYZO2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687491151; a=rsa-sha256; cv=none; b=xuy0nqpAACq5B16qa4u7uweBKi2CfmoWvTEuXPe5uiLlx2hMVuFnV5jcvlH74zSIY50C7Q wnBaQMU8Zi0LEvsE+fSxvE5jhEAmiwLUoviUCTdVfGtsR71an3AfYAGNROxQBLCExOrd/h HKEam45LcNQQ4PQ63P9VFtlttOycAV0TinNVgfARrN5ZhXhFUI+jyd6VQspJzH5YsiZ0Q/ 5Yf2M7uIAlDPyMSRj1FPvc33VJYCe3LX58BMzwUOxVmdYB/sehanmRK+BfymYuHV5eaE54 HlUK+kiP1l378ZUcYXEbEM75V6+WX1fyPObWS6IMkCLTQ1Ol5kKLWZbPclTXaA== 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 4QnN8v1ypJzpdF; Fri, 23 Jun 2023 03:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35N3WVQk099345; Fri, 23 Jun 2023 03:32:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35N3WVRW099344; Fri, 23 Jun 2023 03:32:31 GMT (envelope-from git) Date: Fri, 23 Jun 2023 03:32:31 GMT Message-Id: <202306230332.35N3WVRW099344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 39ae24e3bf1c - main - bug: efi_print_global only checks for the first 5 letters of "Driver" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39ae24e3bf1c8e7d053d0249a6bc88f65eff6de1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=39ae24e3bf1c8e7d053d0249a6bc88f65eff6de1 commit 39ae24e3bf1c8e7d053d0249a6bc88f65eff6de1 Author: Alfonso Gregory AuthorDate: 2023-05-08 21:48:50 +0000 Commit: Kyle Evans CommitDate: 2023-06-23 03:31:58 +0000 bug: efi_print_global only checks for the first 5 letters of "Driver" As a result, it is only really checking for the word Drive, making "Drive" appended to anything else considered for efi env. Reviewed by: imp, kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/738 --- stand/efi/libefi/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/libefi/env.c b/stand/efi/libefi/env.c index 77e232343040..1d70e78e2a64 100644 --- a/stand/efi/libefi/env.c +++ b/stand/efi/libefi/env.c @@ -537,7 +537,7 @@ efi_print_global(const CHAR16 *varnamearg, uint8_t *data, UINTN datasz) goto done; } if (strncmp("Boot", var, 4) == 0 || - strncmp("Driver", var, 5) == 0 || + strncmp("Driver", var, 6) == 0 || strncmp("SysPrep", var, 7) == 0 || strncmp("OsRecovery", var, 10) == 0) { UINT16 filepathlistlen; From nobody Fri Jun 23 05:49:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnRBm4tcCz4gVK2; Fri, 23 Jun 2023 05:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnRBm4S8Wz3gyD; Fri, 23 Jun 2023 05:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687499360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=949iFFeIVWhVXwyCi4d0eKMVS1qjxiUiXGPXgSsM4KM=; b=KUp/qQMDxqEnSjn4Ejsg8YQQ0ZdaiSaD6bQR7t31HLSldb2iD2cMh/c47r3gsNx1SZ0WKC THXWn0sJHAdK6+xHQxhmw3EaSImU0Fbj+harqKu4VRwfOG+6a004eenhnE9rMmbexCyjtw 9kkZjVmE3LdV6t3A1Z/PQy1VikXYpjBgU2rz5rACbmovy49ZCV9LFoKk0TF9n19AQRD0AU 7swaRyMwgxsrHkmIkVI5zWVSbF8a5kLeyIEEzYYagO9NQ8HAtdWA3bZ7DC43Wxo0Pz5Zwa WLnZSynEvhXQ6PkLFk/NUOiY7K7QCQ5oBjGdoSmgyZDy/GTTVuIcko8SL2sQfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687499360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=949iFFeIVWhVXwyCi4d0eKMVS1qjxiUiXGPXgSsM4KM=; b=TfLljmHc8GOI9TkX6HRudPLXeIxAHbtiVE05HFdTUz8kj7j0VLStRaU9i2M9qZ9CQFIe9F q4Uh9GtUIuQG870v9KQu1iVRE2t3Z30hPoc2tuGx3+0vMkUivKSmp6eC0zy9VmlISSVtkt Ks5L8kU/gNYX4NruKH+M1akoPUZ9+8qu6xTxpiX/R7Y+rgawUUbh6IlPWWUCEA38juxuhc XbOr4SbHSQeDV6CMHk2W28C2R55oEwq9AZE+b/qW39dr6AgTN628P1KR4VJc/8uh1lxzwr BEQVFGZYyJBjH1zpxP5+RZ5N2aRD04TP/dvOkZOTkym8p7VJbdDPTBcIUxxq7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687499360; a=rsa-sha256; cv=none; b=T9X+y1nvVh8rB373qiJpzJdv4VLlp49bdLrZExKOfQa5c/3DGnm/3WBanPd1VNKmPJa1pA POUac5eUhbCCsGpe1tZrZ0NPPRlwA1kjb8YgNxgzDeCI1/M2i4JL1FASyH8vAUNqV5XFFp GyS0Ejadl6aylgIM0HS7efOExqviizfVE6Q3X0ZggC5pap+JM8IaM+WbDOsAlbBAwVmphE 50616K8pFXrTE5UZJr0oK6wSq6IVSyLIaRu2WSCLxEsimIRJg+q+mLQbezHFM6W+Gj1m6D Q20I5RCa3aE26PxugdzI9/AEbwdWcqQ7YI3LXrelqoMsrsGkfh0KiLzkx/qDIw== 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 4QnRBm3TtVzssM; Fri, 23 Jun 2023 05:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35N5nKBI015129; Fri, 23 Jun 2023 05:49:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35N5nKfP015128; Fri, 23 Jun 2023 05:49:20 GMT (envelope-from git) Date: Fri, 23 Jun 2023 05:49:20 GMT Message-Id: <202306230549.35N5nKfP015128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Benedict Reuschling Subject: git: 764464af4968 - main - Fix spelling of "behavior" to be consistent with the rest of the file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 764464af49688e74fd6d803df0404ca4726dd460 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=764464af49688e74fd6d803df0404ca4726dd460 commit 764464af49688e74fd6d803df0404ca4726dd460 Author: Benedict Reuschling AuthorDate: 2023-06-23 05:48:01 +0000 Commit: Benedict Reuschling CommitDate: 2023-06-23 05:48:01 +0000 Fix spelling of "behavior" to be consistent with the rest of the file --- usr.bin/m4/m4.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 index a4a6e759a258..ffc60af22d30 100644 --- a/usr.bin/m4/m4.1 +++ b/usr.bin/m4/m4.1 @@ -155,7 +155,7 @@ flags are specified, execution will halt upon issuing the first warning and .Nm will exit with a non-zero exit status. -This behaviour matches GNU m4 1.4.9 and later. +This behavior matches GNU m4 1.4.9 and later. .It Fl G , Fl -traditional Disable GNU compatibility mode (see .Fl g From nobody Fri Jun 23 11:16:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnZSP0Jqfz4hCjD; Fri, 23 Jun 2023 11:16:37 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnZSN4zwTz3y4V; Fri, 23 Jun 2023 11:16:36 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id CeWPqA1yK6NwhCemJqIj1z; Fri, 23 Jun 2023 11:16:35 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id CemHqTF2VHFsOCemIq3Eel; Fri, 23 Jun 2023 11:16:35 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=64957f13 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=2rERiYCbjv9jq0iF:21 a=kj9zAlcOel0A:10 a=of4jigFt-DYA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=lE3EteVO8VwMmfSl8rkA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 a=ZuDNveg_dSIiQeQtYO2A:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 2E5EC2BC5; Fri, 23 Jun 2023 04:16:33 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 0444B244; Fri, 23 Jun 2023 04:16:33 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Benedict Reuschling cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 764464af4968 - main - Fix spelling of "behavior" to be consistent with the rest of the file In-reply-to: <202306230549.35N5nKfP015128@gitrepo.freebsd.org> References: <202306230549.35N5nKfP015128@gitrepo.freebsd.org> Comments: In-reply-to Benedict Reuschling message dated "Fri, 23 Jun 2023 05:49:20 +0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 23 Jun 2023 04:16:32 -0700 Message-Id: <20230623111633.0444B244@slippy.cwsent.com> X-CMAE-Envelope: MS4xfOs1zI0fT79Q9/1eS5N8LPpS0RHqFXnObUispkQXcxE9Qix5jZ1SRSSesMA6k/WliJykHvxB4CdDLRMX99pLDrDhPP6Hj9sPqTUyGrWtRyzyzmUbyUPj NxmRsoRv67px4RNOY8W1PrfWEqIpW6fXpq2/l6FgzHcPHGcv2HssOOzDkA9/exttSBEBW2Jlc1aTFFCla1rbaJfEc6s3Y7DtMVcPEZpc9YxyeRYshhaofQyL jqxXNYU8Vxr+bXMZDf+EL9tUZuCsbk8di8bhaNR/7mT0wnJULRNq+mOhrlWrfuAoi7y5DxzjbFPY5wH1yS9SYnKcBpwbJvFaDS6GCu0Vggo= X-Rspamd-Queue-Id: 4QnZSN4zwTz3y4V X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <202306230549.35N5nKfP015128@gitrepo.freebsd.org>, Benedict Reuschli ng writes: > The branch main has been updated by bcr: > > URL: https://cgit.FreeBSD.org/src/commit/?id=764464af49688e74fd6d803df0404ca4 > 726dd460 > > commit 764464af49688e74fd6d803df0404ca4726dd460 > Author: Benedict Reuschling > AuthorDate: 2023-06-23 05:48:01 +0000 > Commit: Benedict Reuschling > CommitDate: 2023-06-23 05:48:01 +0000 > > Fix spelling of "behavior" to be consistent with the rest of the file Fix? > --- > usr.bin/m4/m4.1 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 > index a4a6e759a258..ffc60af22d30 100644 > --- a/usr.bin/m4/m4.1 > +++ b/usr.bin/m4/m4.1 > @@ -155,7 +155,7 @@ flags are specified, execution will halt upon issuing the > first warning and > .Nm > will exit with a non-zero exit status. > -This behaviour matches GNU m4 1.4.9 and later. UK and Canadian spelling. > +This behavior matches GNU m4 1.4.9 and later. American spelling. > .It Fl G , Fl -traditional > Disable GNU compatibility mode (see > .Fl g > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri Jun 23 11:28:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnZjm4zsBz4hG2H; Fri, 23 Jun 2023 11:28:12 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnZjl4Px2z417R; Fri, 23 Jun 2023 11:28:11 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 3.97.99.33) smtp.mailfrom=cy.schubert@cschubert.com; dmarc=none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id CaYKq9sta6NwhCexWqIjYV; Fri, 23 Jun 2023 11:28:10 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id CexVqSvPT3fOSCexWqDmXP; Fri, 23 Jun 2023 11:28:10 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=649581ca a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=2rERiYCbjv9jq0iF:21 a=kj9zAlcOel0A:10 a=of4jigFt-DYA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=PMnDSUpnG2AgJK9DJ3kA:9 a=CjuIK1q_8ugA:10 a=QonRMeiMdREA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 a=ZuDNveg_dSIiQeQtYO2A:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E54232BD6; Fri, 23 Jun 2023 04:28:08 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id BCB16391; Fri, 23 Jun 2023 04:28:08 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Benedict Reuschling , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 764464af4968 - main - Fix spelling of "behavior" to be consistent with the rest of the file In-reply-to: <20230623111633.0444B244@slippy.cwsent.com> References: <202306230549.35N5nKfP015128@gitrepo.freebsd.org> <20230623111633.0444B244@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Fri, 23 Jun 2023 04:16:32 -0700." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 23 Jun 2023 04:28:08 -0700 Message-Id: <20230623112808.BCB16391@slippy.cwsent.com> X-CMAE-Envelope: MS4xfOxLs9Ho2sN++wT/rMBR8fzt3w8APkgSWvZUP4eOLXLtCMs4ehAkqCIXDuBFaEkLgTSXxJPDKIz3WyzkpW0KymW2ie2bhbhOLq/y8s5ViAFuftT11EWH TdXId7Kc7Eiz1ffMhuhk/coRULVuAD7VGnJJH8KsNdId/btiIBsF2j8paYOfc/hExRDY7g5GVGckkHPgRInpNT4mrwF1W1sc2TfJ9ArpEfGX856nMBJViesU jyosYuGwUfwTdhr6kki13nfkUPKnUuiwmP2QU8I3VLhHx9kIJxf9jUhKV2JSsn/dtlWzOiw5nt2qm1WEKriQOcZSiNMkCJEtVR2PfM0+ws0= X-Spamd-Result: default: False [-1.63 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; NEURAL_HAM_SHORT(-0.93)[-0.934]; MV_CASE(0.50)[]; RCVD_IN_DNSWL_LOW(-0.10)[3.97.99.33:from]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; R_SPF_NA(0.00)[no SPF record]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; REPLYTO_EQ_FROM(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[cschubert.com]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com] X-Rspamd-Queue-Id: 4QnZjl4Px2z417R X-Spamd-Bar: - X-ThisMailContainsUnwantedMimeParts: N Basically, I'm asking for a policy decision. In message <20230623111633.0444B244@slippy.cwsent.com>, Cy Schubert writes: > In message <202306230549.35N5nKfP015128@gitrepo.freebsd.org>, Benedict > Reuschli > ng writes: > > The branch main has been updated by bcr: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=764464af49688e74fd6d803df0404c > a4 > > 726dd460 > > > > commit 764464af49688e74fd6d803df0404ca4726dd460 > > Author: Benedict Reuschling > > AuthorDate: 2023-06-23 05:48:01 +0000 > > Commit: Benedict Reuschling > > CommitDate: 2023-06-23 05:48:01 +0000 > > > > Fix spelling of "behavior" to be consistent with the rest of the file > > Fix? > > > --- > > usr.bin/m4/m4.1 | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 > > index a4a6e759a258..ffc60af22d30 100644 > > --- a/usr.bin/m4/m4.1 > > +++ b/usr.bin/m4/m4.1 > > @@ -155,7 +155,7 @@ flags are specified, execution will halt upon issuing t > he > > first warning and > > .Nm > > will exit with a non-zero exit status. > > -This behaviour matches GNU m4 1.4.9 and later. > > UK and Canadian spelling. > > > +This behavior matches GNU m4 1.4.9 and later. > > American spelling. > > > .It Fl G , Fl -traditional > > Disable GNU compatibility mode (see > > .Fl g > > > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=0 > > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri Jun 23 11:54:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnbJt1gpRz4g8tV; Fri, 23 Jun 2023 11:55:10 +0000 (UTC) (envelope-from garyj@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "Telekom Security ServerID OV Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnbJs52Wtz44YG; Fri, 23 Jun 2023 11:55:09 +0000 (UTC) (envelope-from garyj@gmx.de) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1687521304; x=1688126104; i=garyj@gmx.de; bh=yRKp2SnYbkhxy0kYXRgPDbO/02iL58HWBRFPn3nlxCQ=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References:Reply- To; b=Dufy28zm+C59HVpMm5/on43OU4gY+BMOFbMQrqM7SKRkxJAW6kG99MyqsBnD3i3xMFor8hq KlViGrKhflQ0kuYwvrhLhTCLl6jSVNSSlA+jmrYuK7B1W22kdNzhazKQXJ8ekuM3avVKEezDQ IASxvA0DaOS+R+J7C5sVz3UhI/W8ZtYr1FuTZhMWqlUtdy2uRk88D3NhWRT5KOo0W2/4+zBev fEwqgp2AmrnUZIWN9glvtX9oKHt3Avmhn9hS20kHj0BcqlQwfO7vVjD0x0cGpwi4rEqKIn/4D hKE59v7983iW/6+KvqJHnV26NIOPokr7zhPZGZvBmKuJThYriQFA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from ernst.home ([91.59.234.81]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MYeR1-1qZ41L0WWp-00VeCv; Fri, 23 Jun 2023 13:55:04 +0200 Date: Fri, 23 Jun 2023 11:54:48 +0000 From: Gary Jennejohn To: Cy Schubert Cc: Benedict Reuschling , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 764464af4968 - main - Fix spelling of "behavior" to be consistent with the rest of the file Message-ID: <20230623135448.7d0d4304@ernst.home> In-Reply-To: <20230623112808.BCB16391@slippy.cwsent.com> References: <202306230549.35N5nKfP015128@gitrepo.freebsd.org> <20230623111633.0444B244@slippy.cwsent.com> <20230623112808.BCB16391@slippy.cwsent.com> Reply-To: garyj@gmx.de X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:YmCJiR75nJq6AhIgKz7eijFjL2n3Oli0CcXbYsfnfvkEMwOvck2 ZsZstSHlQRFWGczfiAZTl28wB3uJbA2s41xw8M1f+qs6SpXpjvmR7mQu1AsieRXF0tmxXja SE0T0iVBmVpaKqM1yaLZBWP6qf+cfVDljrU3M1VJRkq8c6sA3FgBnnGfRBjBzih2gH5XQZ0 5ulk7ZHxL3oubunQKZhJg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:n3dcdjCvmPo=;1XoqRtpDGZR99TidOpuDZqHOAuC ECfSpD5wwPe6i9FoSnCL88sHzA4X6Vt4VeMxRIMEkZf4bpt+UxyPmVLWKlNgo3eEdv4uLONzX buG/WYc2Oi61vDZD9JQYCuHKfPJw3g4fO8QqUVXSOsbzGZO1RI6vPDuPHU/UMaCh6ssneLNr5 XZslHE7K4JT9IWHshelZ+Pjd9P1TjjHt6Ah/ORKrDeMRT4R/kHeyKTxqwTNeQMCFm9PZcngwL 5wU60u4sgQOMd3gxXigg0YsitoS3MC2JkYs725Md68Ew4m7moy8flFgZ4vby/NgRStb3krszx YeajtPKW4dQEeW/se2qljAhMv5wQ7I3WDCQi5/za1uDAuSsQIM5xyGa3vYYz9EF0Fjq6EYlcW ZqkY15dYM+HR74z+R2bbcv3LIOSVsJAScOuAcfYgUMfylTA8YS14O8N3U61m4jhqnuONPtDlZ dcgbGL/668hXfuGSuqTImIw9LUEo8D5B4OQWi3ZQYfX8+2QgSxGvAglahyB48APu0hxjcPmvX s1VpxxZUZf6N3+vYxjV3rA/P7h6CU80uA+IX2IieRBfnGalrbIlnWgWm/DigysBTeSOhEJ1m8 1ZBOEQt3b/A9rXYH8J2TCGrvdJ897J+ZNHvKzYvoRdBWq6s+v5wQM7LoBqWExGzGZL85///q5 5Sr/iNN0ve2wGzQMcbd0nSaF2akU6mt+AcKk353rG4Z+rJ8Y164ZNPQoXdcy14UOExECFq6L+ miuJsNWw1Lf6aQI5b+wvEGObIXhjIxMAB3ydIm8gVPZj9/1evjTSBebCK7tnrAkz5hmygMkdN Z0s65cz8HcY7OjxzLTEBn9gholjz2UKR7n/nPReDpVvEVyanpbdVYOApA0yfQLkiMU579jncF 5zbcPMR5q00+e1EU63ckQfs6c9ZVHteEGkAaWv9xKYgNlYzpFFflihaijZ9yEgRfMIk4w9Fmc 6No5Im4ohWGjIi/b49gM4xl7Xlk= X-Rspamd-Queue-Id: 4QnbJs52Wtz44YG X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, 23 Jun 2023 04:28:08 -0700 Cy Schubert wrote: > Basically, I'm asking for a policy decision. > This is the text which was present prior to this change: This behaviour matches GNU m4 1.4.9 and later. regular expressions mimic Emacs behavior, So, what's right? Change behaviour to behavior to match the second entry? Or change "Emacs behavior" to "Emacs behaviour" to match the first entry? Either solution could be contentious. So, perhaps a policy decision is needed. > In message <20230623111633.0444B244@slippy.cwsent.com>, Cy Schubert writ= es: > > In message <202306230549.35N5nKfP015128@gitrepo.freebsd.org>, Benedict > > Reuschli > > ng writes: > > > The branch main has been updated by bcr: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D764464af49688e74fd6d8= 03df0404c > > a4 > > > 726dd460 > > > > > > commit 764464af49688e74fd6d803df0404ca4726dd460 > > > Author: Benedict Reuschling > > > AuthorDate: 2023-06-23 05:48:01 +0000 > > > Commit: Benedict Reuschling > > > CommitDate: 2023-06-23 05:48:01 +0000 > > > > > > Fix spelling of "behavior" to be consistent with the rest of the= file > > > > Fix? > > > > > --- > > > usr.bin/m4/m4.1 | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 > > > index a4a6e759a258..ffc60af22d30 100644 > > > --- a/usr.bin/m4/m4.1 > > > +++ b/usr.bin/m4/m4.1 > > > @@ -155,7 +155,7 @@ flags are specified, execution will halt upon is= suing t > > he > > > first warning and > > > .Nm > > > will exit with a non-zero exit status. > > > -This behaviour matches GNU m4 1.4.9 and later. > > > > UK and Canadian spelling. > > > > > +This behavior matches GNU m4 1.4.9 and later. > > > > American spelling. > > > > > .It Fl G , Fl -traditional > > > Disable GNU compatibility mode (see > > > .Fl g > > > > > > > > > -- > > Cheers, > > Cy Schubert > > FreeBSD UNIX: Web: https://FreeBSD.org > > NTP: Web: https://nwtime.org > > > > e^(i*pi)+1=3D0 > > > > > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > =2D- Gary Jennejohn From nobody Fri Jun 23 12:59:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qncl66bXGz4gmS9; Fri, 23 Jun 2023 12:59:30 +0000 (UTC) (envelope-from bcr@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qncl668j1z4Lg6; Fri, 23 Jun 2023 12:59:30 +0000 (UTC) (envelope-from bcr@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687525170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=w+BVu6HuZNxW9nUNmEit25/U6G4PKzLAgp8MNYVdapM=; b=UKoySn2MBoDN0B+gQO9QDnK4UXHI0vo6w3W4/DOYmvA7hgvaddEf/Sa9z50icuC93QUx18 wd3wQDg5CC1Ox7u9igIIwQYEcVqGyb+IKeZIqloYnSwQMiNWtGG62ElphN/TbUz0apJZ+f F46089uRM4EsMCb/Mtrg2f+VoyjNh65pN6O49OaRr+HYK0dyKwiSAAYpEhCsPJ3XH/vpK1 2VurqkuZj1KfRrhh4yY83w3NIV7gj6ymL1vekCWZikbejKLDjjlUiEIk5eeWStT4FL+Le2 9dEc6Vp0ZzEk48OgAISdhbiq0z5hPzVwF53eVNAoJvYBoM9UXZQkCzzJ6mN5UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687525170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=w+BVu6HuZNxW9nUNmEit25/U6G4PKzLAgp8MNYVdapM=; b=L9k6Ct4pR9yf0BqlQVCEx2Fdv/gVTUz9+pUSShczjlaNrL4Nm8CaEBB40AVGafPH9d9uhA SGbZowJCWppzyyOF573gUWXFUzdOrEJq0ZSRV7Ku94M5PkXkkj89O9Cm6bZSDbJ3DJR3U5 Igacbu86eR9MsJ0M7eoQ7Db153Arn1lQnXyYWAnai1FX8mf2NyECUhC/JPI4pfdZ4wNATP G8mY4bULv4aS71YmRiDZR8ymrVpHRxhcF37pUex1FHrEoeMZk9s/bazjOHFdBWnuv22y/V kLf+hxnM4bfL7zZ5yS9lPdXOi7V+oLsdFoxWN2ubo0kqcDZX8wU6XaLLC97qfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687525170; a=rsa-sha256; cv=none; b=K41yAPBTRGvzNwuOt1Nm0UGprUCut7722x95CROf5Z5tx9Ut9YcDe6E9x40/B+WWBzrxrv R13E/g7EBO748a52M5LOpeBscDtgUbZZgOmznGUILI2zBQJLd4np92j+084JgjXvPrwf2M nn/BznJ9oIyYY84ubRuHiqtnlZ1bCSybBYVBAWvQ5RvmL1Ixe6kQ5F2WQLo6BZ3dSeq142 jlPZWLvpkcBxSEHKHXWb5wiqXgwzRkET0BKpQFmJKruiuDK9xL8EIh2YNg5NwcvonCJiml cVcI1GdN1yPihCexElCGQ0T+0wOozaUXgRLAQ8Zo9rQyQtOul5a/TYbUG2cB1w== Received: from [IPV6:2001:67c:2184:400:dd0f:5dfe:6be5:7948] (unknown [IPv6:2001:67c:2184:400:dd0f:5dfe:6be5:7948]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bcr/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Qncl56cNMzS2t; Fri, 23 Jun 2023 12:59:29 +0000 (UTC) (envelope-from bcr@freebsd.org) Content-Type: multipart/alternative; boundary="------------bYg6HsiSvcrONc0ZzBlvIVCZ" Message-ID: <803f2a91-95c3-459b-eb86-a3565c1975be@freebsd.org> Date: Fri, 23 Jun 2023 14:59:28 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [SPAM - SPF violation] Re: git: 764464af4968 - main - Fix spelling of "behavior" to be consistent with the rest of the file To: garyj@gmx.de, Cy Schubert Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202306230549.35N5nKfP015128@gitrepo.freebsd.org> <20230623111633.0444B244@slippy.cwsent.com> <20230623112808.BCB16391@slippy.cwsent.com> <20230623135448.7d0d4304@ernst.home> Content-Language: en-US From: Benedict Reuschling In-Reply-To: <20230623135448.7d0d4304@ernst.home> X-ThisMailContainsUnwantedMimeParts: N This is a multi-part message in MIME format. --------------bYg6HsiSvcrONc0ZzBlvIVCZ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, OK, "fix" may sound not right, depending on which version you learned. "Use consistent spelling" may be a better phrase. In section 12.2 Guidelines of the FDP Primer: https://docs.freebsd.org/en/books/fdp-primer/writing-style/#writing-style-guidelines it states that: [...] "Use American English Spelling" We agreed to use American English because of the fact that FreeBSD originated in the US. This applies also to man pages and there are many commits by fellow (doc) committers that follow this. So the policy decision is already there, but may not have been stat Regards, Benedict On 23.06.23 13:54, Gary Jennejohn wrote: > On Fri, 23 Jun 2023 04:28:08 -0700 > Cy Schubert wrote: > >> Basically, I'm asking for a policy decision. >> > This is the text which was present prior to this change: > > This behaviour matches GNU m4 1.4.9 and later. > regular expressions mimic Emacs behavior, > > So, what's right? Change behaviour to behavior to match the second entry? > Or change "Emacs behavior" to "Emacs behaviour" to match the first entry? > > Either solution could be contentious. > > So, perhaps a policy decision is needed. > >> In message<20230623111633.0444B244@slippy.cwsent.com>, Cy Schubert writes: >>> In message<202306230549.35N5nKfP015128@gitrepo.freebsd.org>, Benedict >>> Reuschli >>> ng writes: >>>> The branch main has been updated by bcr: >>>> >>>> URL:https://cgit.FreeBSD.org/src/commit/?id=764464af49688e74fd6d803df0404c >>> a4 >>>> 726dd460 >>>> >>>> commit 764464af49688e74fd6d803df0404ca4726dd460 >>>> Author: Benedict Reuschling >>>> AuthorDate: 2023-06-23 05:48:01 +0000 >>>> Commit: Benedict Reuschling >>>> CommitDate: 2023-06-23 05:48:01 +0000 >>>> >>>> Fix spelling of "behavior" to be consistent with the rest of the file >>> Fix? >>> >>>> --- >>>> usr.bin/m4/m4.1 | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 >>>> index a4a6e759a258..ffc60af22d30 100644 >>>> --- a/usr.bin/m4/m4.1 >>>> +++ b/usr.bin/m4/m4.1 >>>> @@ -155,7 +155,7 @@ flags are specified, execution will halt upon issuing t >>> he >>>> first warning and >>>> .Nm >>>> will exit with a non-zero exit status. >>>> -This behaviour matches GNU m4 1.4.9 and later. >>> UK and Canadian spelling. >>> >>>> +This behavior matches GNU m4 1.4.9 and later. >>> American spelling. >>> >>>> .It Fl G , Fl -traditional >>>> Disable GNU compatibility mode (see >>>> .Fl g >>>> >>> >>> -- >>> Cheers, >>> Cy Schubert >>> FreeBSD UNIX: Web:https://FreeBSD.org >>> NTP: Web:https://nwtime.org >>> >>> e^(i*pi)+1=0 >>> >>> >> >> -- >> Cheers, >> Cy Schubert >> FreeBSD UNIX: Web:https://FreeBSD.org >> NTP: Web:https://nwtime.org >> >> e^(i*pi)+1=0 >> >> >> > > -- > Gary Jennejohn > --------------bYg6HsiSvcrONc0ZzBlvIVCZ Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit

Hi,

OK, "fix" may sound not right, depending on which version you learned. "Use consistent spelling" may be a better phrase.

In section 12.2 Guidelines of the FDP Primer:

    https://docs.freebsd.org/en/books/fdp-primer/writing-style/#writing-style-guidelines

it states that:

[...]
"Use American English Spelling"

We agreed to use American English because of the fact that FreeBSD originated in the US.

This applies also to man pages and there are many commits by fellow (doc) committers that follow this.
So the policy decision is already there, but may not have been stat

Regards,
Benedict

On 23.06.23 13:54, Gary Jennejohn wrote:
On Fri, 23 Jun 2023 04:28:08 -0700
Cy Schubert <Cy.Schubert@cschubert.com> wrote:


Basically, I'm asking for a policy decision.


This is the text which was present prior to this change:

This behaviour matches GNU m4 1.4.9 and later.
regular expressions mimic Emacs behavior,

So, what's right?  Change behaviour to behavior to match the second entry?
Or change "Emacs behavior" to "Emacs behaviour" to match the first entry?

Either solution could be contentious.

So, perhaps a policy decision is needed.


In message <20230623111633.0444B244@slippy.cwsent.com>, Cy Schubert writes:

In message <202306230549.35N5nKfP015128@gitrepo.freebsd.org>, Benedict
Reuschli
ng writes:

The branch main has been updated by bcr:

URL: https://cgit.FreeBSD.org/src/commit/?id=764464af49688e74fd6d803df0404c

a4

726dd460

commit 764464af49688e74fd6d803df0404ca4726dd460
Author:     Benedict Reuschling <bcr@FreeBSD.org>
AuthorDate: 2023-06-23 05:48:01 +0000
Commit:     Benedict Reuschling <bcr@FreeBSD.org>
CommitDate: 2023-06-23 05:48:01 +0000

    Fix spelling of "behavior" to be consistent with the rest of the file

Fix?


---
 usr.bin/m4/m4.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index a4a6e759a258..ffc60af22d30 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -155,7 +155,7 @@ flags are specified, execution will halt upon issuing t

he

 first warning and
 .Nm
 will exit with a non-zero exit status.
-This behaviour matches GNU m4 1.4.9 and later.

UK and Canadian spelling.


+This behavior matches GNU m4 1.4.9 and later.

American spelling.


 .It Fl G , Fl -traditional
 Disable GNU compatibility mode (see
 .Fl g



--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy@nwtime.org>    Web:  https://nwtime.org

			e^(i*pi)+1=0




--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy@nwtime.org>    Web:  https://nwtime.org

			e^(i*pi)+1=0





--
Gary Jennejohn
--------------bYg6HsiSvcrONc0ZzBlvIVCZ-- From nobody Fri Jun 23 15:09:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QngdZ5x9Hz4gjgs; Fri, 23 Jun 2023 15:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QngdZ5FBPz3PTx; Fri, 23 Jun 2023 15:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WH77SUZNGdIy6NiTGnue/kg5lPfrP0/Fi4LvGUzaI2c=; b=l3xe6sTaPyOzH5sqoTzXDjWgDVycXpGbPTlyW8PMm7lG6s4rXYsq9xYxsH6SB7+825FfsT OSo9pNamw2hbmJX1RLrQdJk3pZajLQJwZU8pq5D6U/yD23IoL+B03OIKFzTdpTLfp55CgY fuu4R3uOqOl3oTOK4R7LGYO1E5dY9Oako6iv8BfEDSQ1IR92c1Y0/oZyMxBcczqz1PzIpx mDdoiqdA1wj86GHAxRQytCq8IkrPe/4Qbs2/vWaC8kcZhzzJKTFIg0VCN54JHT7wGxuMT+ FPRuEj9aFuAxPu+X5FIymoOjBFmirgpMZOHYoCW5QTAgbYS2SBesS/0aAuLBCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WH77SUZNGdIy6NiTGnue/kg5lPfrP0/Fi4LvGUzaI2c=; b=wRNQYxVwfHmR/TfkKMh/oj2+N1591wbMuzaOieBlY6hwv6zrSyJMm10qgYk9Fszr3094xX foIux9ITVWiSUfFg5hb1GMq56xNDLLkuw7fILWfHxf/aQQ/3CeR8sFRz84CjJTKt9WcaiU DLGug1dR1/Ks63DnTs+pxe+iIm7xz1oSBPk+0Nz3Ihjvr9ferQrcP3elUhMiiVNIOovUBK /mXN9QLQVNEg6IO6nqZghOjZG2wKHoEqV287eY3p5jW92aEgP3G/Qxu6SPub1jct03iuZJ SGmcUsVHaW59AnKt2VtwKBuIswT3hT5eBTvzHr1vye6FSQoCYV0NGNBCidTiVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687532994; a=rsa-sha256; cv=none; b=WSVLUMQwCBNmKBOohhzcKmm265ZuUXTFjjzU8NZ+WsWMdp1I28iHdOW2bqIjmV9HfI42k6 ZcVNwvnHjn99Xp4/kOwsnKAPZdByDMcTKiryg5VdClA9yuqKu8tMTft6QkZly9C/FIp3z0 ekut5pBi+1ApchPSprntcew/dU6pP1KjCshhOd/3d5/f22cxMWDVD7u0usI5Sk5EEL3Nnr 3z5ddHAHgDvD5Jzi2Y6/iBmWYO2cn5fkK2LGQQjW1UZ1c+s7yyXSyOWwTmQf8rQLO26A+Q 4lmNdWOVe++Gbt5ZapVptADsT/1yMyafu9korq9LoSSu1n16PSoM/n0AxdMD0g== 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 4QngdZ4GZfz18CM; Fri, 23 Jun 2023 15:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NF9s3C037727; Fri, 23 Jun 2023 15:09:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NF9sAk037726; Fri, 23 Jun 2023 15:09:54 GMT (envelope-from git) Date: Fri, 23 Jun 2023 15:09:54 GMT Message-Id: <202306231509.35NF9sAk037726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fc915f1be145 - main - pseudofs: Fix a potential out-of-bounds access in pfs_lookup() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc915f1be145a52c53f6f1c37525043216e32bb8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fc915f1be145a52c53f6f1c37525043216e32bb8 commit fc915f1be145a52c53f6f1c37525043216e32bb8 Author: Mark Johnston AuthorDate: 2023-06-23 13:54:39 +0000 Commit: Mark Johnston CommitDate: 2023-06-23 13:54:39 +0000 pseudofs: Fix a potential out-of-bounds access in pfs_lookup() pseudofs nodes store their name in a flexible array member, so the node allocation is sized using the length of the name, including a nul terminator. pfs_lookup() scans a directory of nodes, comparing names to find a match. The comparison was incorrect and assumed that all node names were at least as long as the name being looked up, which of course isn't true. I believe the bug is mostly harmless since it cannot result in false positive or negative matches from the lookup, but it triggers a KASAN check. Reported by: pho Reviewed by: kib, Olivier Certner MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40692 --- sys/fs/pseudofs/pseudofs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 53e4c2b6b85c..bf423f0ad4db 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -537,8 +537,8 @@ pfs_lookup(struct vop_cachedlookup_args *va) for (pn = pd->pn_nodes; pn != NULL; pn = pn->pn_next) if (pn->pn_type == pfstype_procdir) pdn = pn; - else if (pn->pn_name[namelen] == '\0' && - bcmp(pname, pn->pn_name, namelen) == 0) { + else if (strncmp(pname, pn->pn_name, namelen) == 0 && + pn->pn_name[namelen] == '\0') { pfs_unlock(pd); goto got_pnode; } From nobody Fri Jun 23 15:09:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qngdb6sCfz4gjfG; Fri, 23 Jun 2023 15:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qngdb624zz3PY6; Fri, 23 Jun 2023 15:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4CEOKnh1qSqa4E5E6G7+lTDRiy7y7BlQsu7Gj/rDWIA=; b=lPrmSpsr3ehJTmJA0UfHKlMYLChBcuDxztt8ZxoMWXcoN3mgPP4FrWgqql0PSsPPXebiMa 6YdFL1CXOVQ/Ug0fR530qErIt0BMHh0b4FmHOJSx7JmbLDlZCgSwYCpWkersG8OIlxrHGg /5rww2EU6HV5M2k8ngxKhlC7kFfZ8XtTfr/aA6mOOZBD3fbZNTmrMxFq5PJ4fOnoxuokH8 X1HndIguug1k3O8DRD6vqlVbUX0gQ7SMCilFPJlN9u2z221cN9nGq1lE++RITTkoVX/ToG uyDa/NnEMQE6FX5nqkYZ0TvYMHlZojXxjPyR/ByzRJMhA56zWXo0MRMjm5S3RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4CEOKnh1qSqa4E5E6G7+lTDRiy7y7BlQsu7Gj/rDWIA=; b=aHbD7+vYGM1L23s26KGLLxNCmy3AHauRMwyK7nhh5H4ePoViAbkTQoW7GimtAdpU0OCxW0 LFfAZlJLxRbvLYOxscm3Pr8KMap37ZFGI3omc4bNXSNbWRSlSkwgPElblWsr+BWXe38uai fC1CyyexHTtogiPbSoq+41bEtdAKJ3HlL3JIC0416sG9kflpMx/ank9zVzViG71rDlGjeF m4GUDQlVe0jqRllYZ8cSAqnar+wU5DkdzsKUwG1Lgq6Gb2AK8/XcwhblJx/VxN7P7Y+Jqj 6bF8RLiwsx70pOlNAI16paT4co/MwZKWYVQSxw2e8ki3dP/aAj4O5oq44LROKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687532995; a=rsa-sha256; cv=none; b=fIO2MdQ+M2wDXES9sQGu3YzVEb3CNN/kyG00vWaXOvg1e8koYpGIt9awaHqcYmExZl2Ip5 nsq+PrCMZcQDGSGfYY+YUu1M0jjVATukMO56WuGoUuWnowbv2mGz/wzahydH9OmlQAufDZ ofb8AXtQmUax+ezotZtXy8aCWdLF9PmwwoJflVpc64azgdqg29o3b9OBHPtF3iCwWpUwBs C6jz8YZ28Sg4jk04s4RIrvL9Gbd+RojropIQM7cLneT6TK15dcjCskUBoaABV3ybD1yXbi HRhSsf09aGftD/BxWQfVdjwMGwQlmkvaiUa/x1IJoPrr7QTP33FQVsUPHYFqxA== 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 4Qngdb57Zvz17vq; Fri, 23 Jun 2023 15:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NF9tgd037746; Fri, 23 Jun 2023 15:09:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NF9t5v037745; Fri, 23 Jun 2023 15:09:55 GMT (envelope-from git) Date: Fri, 23 Jun 2023 15:09:55 GMT Message-Id: <202306231509.35NF9t5v037745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6775ef4188b4 - main - netinet6: Implement in6_cksum_partial() using m_apply() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6775ef4188b4d4c023e76ebd2b71fa8c2c7e7cd2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6775ef4188b4d4c023e76ebd2b71fa8c2c7e7cd2 commit 6775ef4188b4d4c023e76ebd2b71fa8c2c7e7cd2 Author: Mark Johnston AuthorDate: 2023-06-23 13:55:43 +0000 Commit: Mark Johnston CommitDate: 2023-06-23 13:55:43 +0000 netinet6: Implement in6_cksum_partial() using m_apply() This ensures that in6_cksum_partial() can be applied to unmapped mbufs, which can happen at least when icmp6_reflect() quotes a packet. The basic idea is to restructure in6_cksum_partial() to operate on one mbuf at a time. If the buffer length is odd or unaligned, an extra residual byte may be returned, to be incorporated into the checksum when processing the next buffer. PR: 268400 Reviewed by: cy MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40598 --- sys/netinet6/in6.h | 6 +- sys/netinet6/in6_cksum.c | 300 +++++++++++++++++++++-------------------------- 2 files changed, 139 insertions(+), 167 deletions(-) diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 41fe07fe093d..c15b2485964a 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -659,10 +659,10 @@ struct ip6_mtuinfo { struct cmsghdr; struct ip6_hdr; +int in6_cksum(struct mbuf *, uint8_t, uint32_t, uint32_t); +int in6_cksum_partial(struct mbuf *, uint8_t, uint32_t, uint32_t, uint32_t); int in6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t); -int in6_cksum(struct mbuf *, u_int8_t, u_int32_t, u_int32_t); -int in6_cksum_partial(struct mbuf *, u_int8_t, u_int32_t, u_int32_t, - u_int32_t); + int in6_localaddr(struct in6_addr *); int in6_localip(struct in6_addr *); bool in6_localip_fib(struct in6_addr *, uint16_t); diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c index c4624b90b6a1..a93db45eb968 100644 --- a/sys/netinet6/in6_cksum.c +++ b/sys/netinet6/in6_cksum.c @@ -82,6 +82,16 @@ __FBSDID("$FreeBSD$"); #define ADDCARRY(x) (x > 65535 ? x -= 65535 : x) #define REDUCE {l_util.l = sum; sum = l_util.s[0] + l_util.s[1]; (void)ADDCARRY(sum);} +union l_util { + uint16_t s[2]; + uint32_t l; +}; + +union s_util { + uint8_t c[2]; + uint16_t s; +}; + static int _in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum) { @@ -131,17 +141,115 @@ _in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum) int in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum) { + union l_util l_util; int sum; - union { - u_int16_t s[2]; - u_int32_t l; - } l_util; sum = _in6_cksum_pseudo(ip6, len, nxt, csum); REDUCE; return (sum); } +static int +in6_cksumdata(void *data, int *lenp, uint8_t *residp, int rlen) +{ + union l_util l_util; + union s_util s_util; + uint16_t *w; + int len, sum; + bool byte_swapped; + + KASSERT(*lenp >= 0, ("%s: negative len %d", __func__, *lenp)); + KASSERT(rlen == 0 || rlen == 1, ("%s: rlen %d", __func__, rlen)); + + len = *lenp; + sum = 0; + + if (len == 0) { + len = rlen; + goto out; + } + + byte_swapped = false; + w = data; + + /* + * Do we have a residual byte left over from the previous buffer? + */ + if (rlen == 1) { + s_util.c[0] = *residp; + s_util.c[1] = *(uint8_t *)w; + sum += s_util.s; + w = (uint16_t *)((uint8_t *)w + 1); + len--; + rlen = 0; + } + + /* + * Force to even boundary. + */ + if ((1 & (uintptr_t)w) && len > 0) { + REDUCE; + sum <<= 8; + s_util.c[0] = *(uint8_t *)w; + w = (uint16_t *)((uint8_t *)w + 1); + len--; + byte_swapped = true; + } + + /* + * Unroll the loop to make overhead from branches &c small. + */ + while ((len -= 32) >= 0) { + sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; + sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; + sum += w[8]; sum += w[9]; sum += w[10]; sum += w[11]; + sum += w[12]; sum += w[13]; sum += w[14]; sum += w[15]; + w += 16; + } + len += 32; + while ((len -= 8) >= 0) { + sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; + w += 4; + } + len += 8; + if (len == 0 && !byte_swapped) + goto out; + REDUCE; + while ((len -= 2) >= 0) { + sum += *w++; + } + if (byte_swapped) { + REDUCE; + sum <<= 8; + if (len == -1) { + s_util.c[1] = *(uint8_t *)w; + sum += s_util.s; + } else /* len == -2 */ + *residp = s_util.c[0]; + len++; + } else if (len == -1) + *residp = *(uint8_t *)w; +out: + *lenp = len & 1; + return (sum); +} + +struct in6_cksum_partial_arg { + int sum; + int rlen; + uint8_t resid; +}; + +static int +in6_cksum_partial_one(void *_arg, void *data, u_int len) +{ + struct in6_cksum_partial_arg *arg = _arg; + + arg->sum += in6_cksumdata(data, &len, &arg->resid, arg->rlen); + arg->rlen = len; + return (0); +} + /* * m MUST contain a contiguous IP6 header. * off is an offset where TCP/UDP/ICMP6 header starts. @@ -150,33 +258,29 @@ in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum) * cov is the number of bytes to be taken into account for the checksum */ int -in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off, - u_int32_t len, u_int32_t cov) +in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, + uint32_t cov) { + struct in6_cksum_partial_arg arg; + union l_util l_util; + union s_util s_util; struct ip6_hdr *ip6; - u_int16_t *w, scope; - int byte_swapped, mlen; + uint16_t *w, scope; int sum; union { - u_int16_t phs[4]; + uint16_t phs[4]; struct { - u_int32_t ph_len; - u_int8_t ph_zero[3]; - u_int8_t ph_nxt; + uint32_t ph_len; + uint8_t ph_zero[3]; + uint8_t ph_nxt; } __packed ph; } uph; - union { - u_int8_t c[2]; - u_int16_t s; - } s_util; - union { - u_int16_t s[2]; - u_int32_t l; - } l_util; /* Sanity check. */ KASSERT(m->m_pkthdr.len >= off + len, ("%s: mbuf len (%d) < off(%d)+" "len(%d)", __func__, m->m_pkthdr.len, off, len)); + KASSERT(m->m_len >= sizeof(*ip6), + ("%s: mbuf len %d < sizeof(ip6)", __func__, m->m_len)); /* * First create IP6 pseudo header and calculate a summary. @@ -193,7 +297,7 @@ in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off, /* IPv6 source address. */ scope = in6_getscope(&ip6->ip6_src); - w = (u_int16_t *)&ip6->ip6_src; + w = (uint16_t *)&ip6->ip6_src; sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; if (scope != 0) @@ -201,158 +305,26 @@ in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off, /* IPv6 destination address. */ scope = in6_getscope(&ip6->ip6_dst); - w = (u_int16_t *)&ip6->ip6_dst; + w = (uint16_t *)&ip6->ip6_dst; sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; if (scope != 0) sum -= scope; /* - * Secondly calculate a summary of the first mbuf excluding offset. + * Loop over the rest of the mbuf chain and compute the rest of the + * checksum. m_apply() handles unmapped mbufs. */ - while (off > 0) { - if (m->m_len <= off) - off -= m->m_len; - else - break; - m = m->m_next; - } - w = (u_int16_t *)(mtod(m, u_char *) + off); - mlen = m->m_len - off; - if (cov < mlen) - mlen = cov; - cov -= mlen; - /* - * Force to even boundary. - */ - if ((1 & (long)w) && (mlen > 0)) { - REDUCE; - sum <<= 8; - s_util.c[0] = *(u_char *)w; - w = (u_int16_t *)((char *)w + 1); - mlen--; - byte_swapped = 1; - } else - byte_swapped = 0; + arg.sum = sum; + arg.rlen = 0; + (void)m_apply(m, off, cov, in6_cksum_partial_one, &arg); + sum = arg.sum; /* - * Unroll the loop to make overhead from - * branches &c small. + * Handle a residual byte. */ - while ((mlen -= 32) >= 0) { - sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; - sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; - sum += w[8]; sum += w[9]; sum += w[10]; sum += w[11]; - sum += w[12]; sum += w[13]; sum += w[14]; sum += w[15]; - w += 16; - } - mlen += 32; - while ((mlen -= 8) >= 0) { - sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; - w += 4; - } - mlen += 8; - if (mlen == 0 && byte_swapped == 0) - goto next; - REDUCE; - while ((mlen -= 2) >= 0) { - sum += *w++; - } - if (byte_swapped) { - REDUCE; - sum <<= 8; - byte_swapped = 0; - if (mlen == -1) { - s_util.c[1] = *(char *)w; - sum += s_util.s; - mlen = 0; - } else - mlen = -1; - } else if (mlen == -1) - s_util.c[0] = *(char *)w; - next: - m = m->m_next; - - /* - * Lastly calculate a summary of the rest of mbufs. - */ - - for (;m && cov; m = m->m_next) { - if (m->m_len == 0) - continue; - w = mtod(m, u_int16_t *); - if (mlen == -1) { - /* - * The first byte of this mbuf is the continuation - * of a word spanning between this mbuf and the - * last mbuf. - * - * s_util.c[0] is already saved when scanning previous - * mbuf. - */ - s_util.c[1] = *(char *)w; - sum += s_util.s; - w = (u_int16_t *)((char *)w + 1); - mlen = m->m_len - 1; - cov--; - } else - mlen = m->m_len; - if (cov < mlen) - mlen = cov; - cov -= mlen; - /* - * Force to even boundary. - */ - if ((1 & (long) w) && (mlen > 0)) { - REDUCE; - sum <<= 8; - s_util.c[0] = *(u_char *)w; - w = (u_int16_t *)((char *)w + 1); - mlen--; - byte_swapped = 1; - } - /* - * Unroll the loop to make overhead from - * branches &c small. - */ - while ((mlen -= 32) >= 0) { - sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; - sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; - sum += w[8]; sum += w[9]; sum += w[10]; sum += w[11]; - sum += w[12]; sum += w[13]; sum += w[14]; sum += w[15]; - w += 16; - } - mlen += 32; - while ((mlen -= 8) >= 0) { - sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; - w += 4; - } - mlen += 8; - if (mlen == 0 && byte_swapped == 0) - continue; - REDUCE; - while ((mlen -= 2) >= 0) { - sum += *w++; - } - if (byte_swapped) { - REDUCE; - sum <<= 8; - byte_swapped = 0; - if (mlen == -1) { - s_util.c[1] = *(char *)w; - sum += s_util.s; - mlen = 0; - } else - mlen = -1; - } else if (mlen == -1) - s_util.c[0] = *(char *)w; - } - if (cov) - panic("in6_cksum: out of data"); - if (mlen == -1) { - /* The last mbuf has odd # of bytes. Follow the - standard (the odd byte may be shifted left by 8 bits - or not as determined by endian-ness of the machine) */ + if (arg.rlen == 1) { + s_util.c[0] = arg.resid; s_util.c[1] = 0; sum += s_util.s; } @@ -361,7 +333,7 @@ in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off, } int -in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len) +in6_cksum(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len) { return (in6_cksum_partial(m, nxt, off, len, len)); } From nobody Fri Jun 23 15:09:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qngdd0Mg3z4gjjX; Fri, 23 Jun 2023 15:09: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 4Qngdc71Xrz3Pgy; Fri, 23 Jun 2023 15:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Fsj1oBtsFzUzes5QdPSlYeBV80V4ut5Ecc9jHAmHMg=; b=W3Z6uqaVFBUx9+xwLXcV1kJnLDPf7Dh+lgENG6hF+uan8elSTrZNJgY7mPFB3B2B4WSyEc 7ThjlOCnca/rEw6y04rMayHmemK+ZuXjeUtFBNeu0Ytm4a+c9wmZ5EzVx8ZxGN6bs0QASB X9j7vhdH5pEnoTkIZBfe4+95buYy1YAm6Rxn38Evr4YvYMtgGuC4VbuFOM1cZ1kD1qU37I KIPCoXUviLJH/+4yRmuRRHhgxQm2ZFjs3FH9eCW0bmijWsnIPPCXk7AmMiPexruZQ9TOV8 ySoUJ4+JsChHYOBmYBYaVoBZaEygp6IKBvNef17CowITZIBkx/iHfFd/VjfDcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Fsj1oBtsFzUzes5QdPSlYeBV80V4ut5Ecc9jHAmHMg=; b=rs18IN8abstdhAQEspzM7hFE9Xt2ynK8NelVnd6G02miehh7DmiL+Lf0/cg8hOj+euejqv 6OGlY7/Vd1LiED2GnQQeMlHtC/YtlIWlS/3Dqsc0x9VuAf0MvbYzUBnnGdYIs+ukYILMUt CX12BhTXxQpkV06TDfie3Qolsb+kogFLEOLj92OkQQgn+D47G/0Nl16F/IYqKYSKw265FA V2XEuTjV8/0hcpwqvHbw08SEbYQ447+UECyHvCtJiGN01dQQF6Fgbogwid6spqJUiUZLUd yiGfKBUXtX1drIu80rEQZRN6ACpJLlMvUegwBTMV4g0E7xJjyK57ja2CeUMhqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687532997; a=rsa-sha256; cv=none; b=hNm3wLsUM6Wq7nyk/j/kX6/VyFOwTyGU/ttFGOEr7OgE6qyOVvsV+jVDPCB7GJfqyyzrOk 8QsXZFEkrdu//St6D+EQnB5ABhaL205ZTMcKitWqHRwTbOuZGf0i9Owewsv0HzOUqIjlEm a1cDqT88HRpy/GToUQ8yqDFE1tWEGiHtGbVPJH2+ZQiuzOUqCRWXww5hb/cAccFVV7rDCL XFbjzzxvlobAl7DrzV8eUX0Js9QUEYyD2kz85wLlttv3x0Ev79vV4M/VhKMpQ6VMkMbZnN 1eRt65EIFodob+NcW/qR2yWStY4TkdVdy5VHqQApuuchKcDU3iXLyazIXWv2xA== 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 4Qngdc66Pqz17vr; Fri, 23 Jun 2023 15:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NF9uqH037772; Fri, 23 Jun 2023 15:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NF9uhx037771; Fri, 23 Jun 2023 15:09:56 GMT (envelope-from git) Date: Fri, 23 Jun 2023 15:09:56 GMT Message-Id: <202306231509.35NF9uhx037771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: de0a2eb2ef86 - main - tcp: Disallow connecting a disconnected socket List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de0a2eb2ef86f6c41157529b827da06f47190e8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=de0a2eb2ef86f6c41157529b827da06f47190e8c commit de0a2eb2ef86f6c41157529b827da06f47190e8c Author: Mark Johnston AuthorDate: 2023-06-23 13:59:52 +0000 Commit: Mark Johnston CommitDate: 2023-06-23 14:00:52 +0000 tcp: Disallow connecting a disconnected socket Currently nothing prevents tcp_usr_connect() from attempting to connect when the socket has been disconnected. At the moment, doing so triggers an assertion in in_pcbconnect() because inp_faddr is not unspecified. I believe this may have been caught in the past by TIMEWAIT checks, but those are now removed. Check for additional socket states in tcp_connect(). Reported by: syzbot+f0f7871ec5397602b446@syzkaller.appspotmail.com Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40579 --- sys/netinet/tcp_usrreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 629b47f04142..cd2263245b56 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1464,7 +1464,8 @@ tcp_connect(struct tcpcb *tp, struct sockaddr_in *sin, struct thread *td) INP_WLOCK_ASSERT(inp); if (__predict_false((so->so_state & - (SS_ISCONNECTING | SS_ISCONNECTED)) != 0)) + (SS_ISCONNECTING | SS_ISCONNECTED | SS_ISDISCONNECTING | + SS_ISDISCONNECTED)) != 0)) return (EISCONN); INP_HASH_WLOCK(&V_tcbinfo); From nobody Fri Jun 23 15:09:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qngdf2f25z4gjjc; Fri, 23 Jun 2023 15:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qngdf0mpGz3PSv; Fri, 23 Jun 2023 15:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++XdEPWaEVifEXInwWc/VASPFl97314laiNJvX4h1YM=; b=Km+vN5Y1lkTSv17h0AMPqWYSqf2V2MulICFN3w4TCea7kBVlYnsSgQL+PLu5eeAJKnO+6X DUI9Ftmet0D9rBMK1ek+4utOyKoXnhK8CG0FERXbF9IulNhPyU7KSuEszG5S5h1+7v39Fy WWYfmW+vXhp3qCxO4Jxx+xjojZHMWiiHoRhalwiCGI9oz4/b7w44CURswReJ2Iwf540DzG cWWoBvhWqgCMIPd6Xn7I6/PgKVmhEGFSh2VSpsfqczDha0y5qa9/GIdmzzM+nFpif5YVUI Nneb6AayVuZj8bkWzn6uvCueHWrasZ6TkWucZuaejqRUDKfTfTIn2FZUZd70mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687532998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++XdEPWaEVifEXInwWc/VASPFl97314laiNJvX4h1YM=; b=nmLHBrgKFYKpC2PRcHpLBO+BXDUyoHkH5vvO+1P+huJ90UWj23zv+IE47TJ1ZUJVFY9FDL nFgFLbHBtD4Ec6ALyM4QWOzjON9P3INYMX2Rp9rJCbSR29+WVSNw4ZHtIKhsg0MJ/j685R xCp5Of6q2ghw7SlG1mWSVJYfKtZQZ/hUU0I1LeLGLxFNuCYCVMtwQbSKw5EXYox68+mn8y J+Bhzqq5hRqVSLqKZVnjko1UP17l4ymI968f8tBzhcCLCWe8BAYSa6QzmQP3gzQFFTiUrg NO5r5DPYMDRP1exqfeG0Hby9IGEQ+U+iNOeSaQB+QM/NSLPvoEWQP8PS4DL16w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687532998; a=rsa-sha256; cv=none; b=h264MN2P3xTslmXRZlfHSTBQm2ji7T1wnR0JH/vS0pr6hjr5O7fLOSCFYBdbWDuKmzuclH 9zgGn1s5ysMOctVA77moyo9BpCJ4gq6uS6+0uFp1NxMJSVe55geOPK12jIynGDMTLeIJdg joHYj0np6wPr3jv/39Yvp6h0rAIy9a9u3+yEyBopXWnZ5TWRO8uyavxfYzoOCgZwsgtwQY q6n9E+oekGahuqo1n5rvw5WoF1NgB/rccEId3zCOnmkaoB9wxHoZpgQP/RAUEV9Q+UZKjQ yJPSSiGB11Hh5eM1qGOK3ULUQOj+EHqpp+8iwf1726puczt8sAMWlVVsYnFcmA== 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 4Qngdd70Kkz18QZ; Fri, 23 Jun 2023 15:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NF9vaZ037791; Fri, 23 Jun 2023 15:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NF9vmI037790; Fri, 23 Jun 2023 15:09:57 GMT (envelope-from git) Date: Fri, 23 Jun 2023 15:09:57 GMT Message-Id: <202306231509.35NF9vmI037790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b1c66bc44af0 - main - netinet tests: Add a test which connects a disconnected socket List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1c66bc44af099174afb9840c7db011a5bd0225d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b1c66bc44af099174afb9840c7db011a5bd0225d commit b1c66bc44af099174afb9840c7db011a5bd0225d Author: Mark Johnston AuthorDate: 2023-06-23 14:06:13 +0000 Commit: Mark Johnston CommitDate: 2023-06-23 14:06:13 +0000 netinet tests: Add a test which connects a disconnected socket MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- tests/sys/netinet/socket_afinet.c | 47 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index c3b672a18602..482f767dd094 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -28,9 +28,9 @@ #include __FBSDID("$FreeBSD$"); -#include #include #include +#include #include #include @@ -228,14 +228,57 @@ ATF_TC_BODY(socket_afinet_poll_rdhup, tc) close(ss); } -ATF_TP_ADD_TCS(tp) +ATF_TC_WITHOUT_HEAD(socket_afinet_stream_reconnect); +ATF_TC_BODY(socket_afinet_stream_reconnect, tc) { + struct sockaddr_in sin; + int ss, cs, rc; + + /* + * Make sure that an attempt to connect(2) a connected or disconnected + * stream socket fails with EISCONN. + */ + /* Server setup. */ + ss = socket(PF_INET, SOCK_STREAM, 0); + ATF_CHECK(ss >= 0); + bzero(&sin, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_port = htons(6666); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + rc = bind(ss, (struct sockaddr *)&sin, sizeof(sin)); + ATF_CHECK_EQ(0, rc); + rc = listen(ss, 1); + ATF_CHECK_EQ(0, rc); + + /* Client connects, shuts down. */ + cs = socket(PF_INET, SOCK_STREAM, 0); + ATF_CHECK(cs >= 0); + rc = connect(cs, (struct sockaddr *)&sin, sizeof(sin)); + ATF_CHECK_EQ(0, rc); + rc = shutdown(cs, SHUT_RDWR); + ATF_CHECK_EQ(0, rc); + + /* A subsequent connect(2) fails with EISCONN. */ + rc = connect(cs, (struct sockaddr *)&sin, sizeof(sin)); + ATF_CHECK_EQ(-1, rc); + ATF_CHECK_EQ(errno, EISCONN); + + rc = close(cs); + ATF_CHECK_EQ(0, rc); + rc = close(ss); + ATF_CHECK_EQ(0, rc); +} + +ATF_TP_ADD_TCS(tp) +{ ATF_TP_ADD_TC(tp, socket_afinet); ATF_TP_ADD_TC(tp, socket_afinet_bind_zero); ATF_TP_ADD_TC(tp, socket_afinet_bind_ok); ATF_TP_ADD_TC(tp, socket_afinet_poll_no_rdhup); ATF_TP_ADD_TC(tp, socket_afinet_poll_rdhup); + ATF_TP_ADD_TC(tp, socket_afinet_stream_reconnect); return atf_no_error(); } From nobody Fri Jun 23 15:38:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnhH71PG3z4gwtf; Fri, 23 Jun 2023 15:38:59 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnhH61wtrz3lM0; Fri, 23 Jun 2023 15:38:58 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6687446eaccso585499b3a.3; Fri, 23 Jun 2023 08:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687534736; x=1690126736; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:from:to:cc:subject:date:message-id :reply-to; bh=AnZitmzRc4FUzj0WNqwlHpGQYz2YGOBO7OSKjSnMucY=; b=qf9YdLd4CUzXR9/+R2ZvhZzWEEKa7p4xgs+IOgzUu8iYs4vYtKyJf6pqm+IkHzOMKD 6E3axKktwbDVcrGj/lzo2RDff+FJuNqzOJaJ6IcbTB+4Hl/cBgjRgwBir2v5RvkilGme ce5wknECcgpwXQ72a3PnOhNhCVgf/1Hc2aqz0NR7q5VKHfMUJ8zEDHgiIGm8JXKVgAbe lz0fsKDkQSORB+JXJgqLIen/uU8PDBob+xqBNCN2+8ueNsGiErtEFmTSYqzrB+ICBB0f tbpPe2sw0OFMJBhe7DYjRgIIg/aJBj8pVnDNybJVIpD2ZnBmTLsTcP9+H3WbzsNGhiWZ DecQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687534736; x=1690126736; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AnZitmzRc4FUzj0WNqwlHpGQYz2YGOBO7OSKjSnMucY=; b=WuE+azTGqOQvjyux7xVQPTZvIS2HOh4IIiRh8Ky758wS36bUTn1m9p7gtB6/JDZl1g JYeMWtZuPl2JkdnFojK0RFCIIZy/GJqoD+SFB4Z7th3ux/dFE6cYhC/ZBKP4bNuVuDJT BtoflgwYRxrd2yUePM/XiVCjqlNJIeTGH2u+Xa35CckmvLaTpgfpOqaqvQEsIkhuenOp tUnNNhUwR+jYACmCEmATnHeTsP0yWP4fH0u7kCHsCnLz7jsHRqccdqk6gtBPWtnCgAzP B67JhX4ieYHw0IvoPnyjrU5ZVqt/fT3FWAtfZCnPS11BnWX0uCzP1rS7yoPRL54KpoZw DiSw== X-Gm-Message-State: AC+VfDxYy/+hlw/MfWNDgsFrN1ONXOIhU87z91vy+ONPnfBjr5e/opAy ntSc7tPgvy1EUTONvvdmZeKpsY4L+gs= X-Google-Smtp-Source: ACHHUZ5gyBeEf0HWdvT7GJKP0jFMEv/nGdpCX6xr/zhrHHsh5maoNQqCdwqqeHajEdX8OWcKvo7sfw== X-Received: by 2002:a05:6a20:3caa:b0:121:4f94:654 with SMTP id b42-20020a056a203caa00b001214f940654mr20375101pzj.25.1687534735713; Fri, 23 Jun 2023 08:38:55 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id v8-20020a62a508000000b0066a4e561beesm3649244pfm.173.2023.06.23.08.38.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 Jun 2023 08:38:55 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Enji Cooper List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (1.0) Subject: Re: git: fc915f1be145 - main - pseudofs: Fix a potential out-of-bounds access in pfs_lookup() Date: Fri, 23 Jun 2023 08:38:44 -0700 Message-Id: <0BAC85B7-6A67-4F6E-87B8-97ABD2FF7075@gmail.com> References: <202306231509.35NF9sAk037726@gitrepo.freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <202306231509.35NF9sAk037726@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: iPhone Mail (20F75) X-Rspamd-Queue-Id: 4QnhH61wtrz3lM0 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > On Jun 23, 2023, at 08:09, Mark Johnston wrote: >=20 > =EF=BB=BFThe branch main has been updated by markj: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dfc915f1be145a52c53f6f1c3752= 5043216e32bb8 >=20 > commit fc915f1be145a52c53f6f1c37525043216e32bb8 > Author: Mark Johnston > AuthorDate: 2023-06-23 13:54:39 +0000 > Commit: Mark Johnston > CommitDate: 2023-06-23 13:54:39 +0000 >=20 > pseudofs: Fix a potential out-of-bounds access in pfs_lookup() >=20 > pseudofs nodes store their name in a flexible array member, so the node= > allocation is sized using the length of the name, including a nul > terminator. pfs_lookup() scans a directory of nodes, comparing names t= o > find a match. The comparison was incorrect and assumed that all node > names were at least as long as the name being looked up, which of cours= e > isn't true. >=20 > I believe the bug is mostly harmless since it cannot result in false > positive or negative matches from the lookup, but it triggers a KASAN > check. >=20 > Reported by: pho > Reviewed by: kib, Olivier Certner > MFC after: 2 weeks > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D40692 > --- > sys/fs/pseudofs/pseudofs_vnops.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_v= nops.c > index 53e4c2b6b85c..bf423f0ad4db 100644 > --- a/sys/fs/pseudofs/pseudofs_vnops.c > +++ b/sys/fs/pseudofs/pseudofs_vnops.c > @@ -537,8 +537,8 @@ pfs_lookup(struct vop_cachedlookup_args *va) > for (pn =3D pd->pn_nodes; pn !=3D NULL; pn =3D pn->pn_next) > if (pn->pn_type =3D=3D pfstype_procdir) > pdn =3D pn; > - else if (pn->pn_name[namelen] =3D=3D '\0' && > - bcmp(pname, pn->pn_name, namelen) =3D=3D 0) { > + else if (strncmp(pname, pn->pn_name, namelen) =3D=3D 0 && > + pn->pn_name[namelen] =3D=3D '\0') { > pfs_unlock(pd); > goto got_pnode; > } Naive question: should this be an && conditional or an || conditional? If th= e former, could this be simplified by using a direct NUL char equality check= instead of using strncmp? Thanks! -Enji= From nobody Fri Jun 23 15:56:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnhgB5cX3z4h9q7; Fri, 23 Jun 2023 15:56:22 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnhgB15Z6z3s6Y; Fri, 23 Jun 2023 15:56:22 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-630066deb1dso7040936d6.3; Fri, 23 Jun 2023 08:56:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687535781; x=1690127781; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=Z8CwAC52BNxqoHlvatFK3KTTTVBkt105pThXVgOr7j4=; b=jSmC8x6Xgb2lvq4uGNQcCjjhtnBRaLlcIpyKB2qCrHlezClSZJi+efxEQcQkF375e0 iZ8beCWXzjiYtRf7ks/ExN9LqLY0WDymHsSRGmTmwvAZVPeSPkjzbij9TjrOVXwmy+KN g3+rOwh5G1p/BcQGCiYL+T5t4itlfVwrCz/auEliR9AhUlEJbDkXF0Y+7h4vCCBF9MEd xAwImkO/wVBmUNkZfU7rcrwUnYKzvXK/gczRrGP5dqM39Z9TwDAMlN0uWhiaqnC/9lTN ln0WkdifeneaDl9Zs9CJjXUTEvOZBxIn4+penh6ECjRgB7D/896izkjbXZmi5AJ++6+S /u2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687535781; x=1690127781; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z8CwAC52BNxqoHlvatFK3KTTTVBkt105pThXVgOr7j4=; b=lvEeUXeyy63EqWdpWTlq3uvZNV3OH0ulz55q7FM0DGkDlHVCuoZM5L2cIrBEDL5s1P i36jdD3uMMzzXKCJmgvbayZXEjUgXBYRLAmy4OddZ63fx3DXloup919MHJJYL08854uV Jlxe3PWzXzf2dnJUFm6rHSiWVEptdAEN9RN4ownhQ3xYE48y2eHThCgeqzR0OmEBqEjo nbXnB6EOVlYj7eEi0ADcIRDs3mX7bwPEwXxFq7EtA4f+whkRC3dBuizXWPMld4bIHAh2 ObBsOz/O8StdMN36nmkQOB3shDQXEbsMhQhICK58+5ygMOruI7UmIXiZqRcnK+c8VnXN hKcw== X-Gm-Message-State: AC+VfDy4tLxwN+5kPbGyfFawTRfoD2OKukPcMKHWy1MP2/h7wDGq3NCg ItbVRFevZqR34md9v21gqOvBpeWCb7k= X-Google-Smtp-Source: ACHHUZ4zbzA1sBYtI60ACQDXYmcbnYRTJbl4N43da1HrN2Jr3CNWIAjR58bi5lwB9DWMfS8A8meNBg== X-Received: by 2002:a05:6214:1303:b0:626:2bf5:d532 with SMTP id pn3-20020a056214130300b006262bf5d532mr31159418qvb.14.1687535781232; Fri, 23 Jun 2023 08:56:21 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id a15-20020a0ce38f000000b00626195bdbbdsm5152861qvl.132.2023.06.23.08.56.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 08:56:20 -0700 (PDT) Date: Fri, 23 Jun 2023 11:56:18 -0400 From: Mark Johnston To: Enji Cooper Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fc915f1be145 - main - pseudofs: Fix a potential out-of-bounds access in pfs_lookup() Message-ID: References: <202306231509.35NF9sAk037726@gitrepo.freebsd.org> <0BAC85B7-6A67-4F6E-87B8-97ABD2FF7075@gmail.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0BAC85B7-6A67-4F6E-87B8-97ABD2FF7075@gmail.com> X-Rspamd-Queue-Id: 4QnhgB15Z6z3s6Y X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, Jun 23, 2023 at 08:38:44AM -0700, Enji Cooper wrote: > > > On Jun 23, 2023, at 08:09, Mark Johnston wrote: > > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=fc915f1be145a52c53f6f1c37525043216e32bb8 > > > > commit fc915f1be145a52c53f6f1c37525043216e32bb8 > > Author: Mark Johnston > > AuthorDate: 2023-06-23 13:54:39 +0000 > > Commit: Mark Johnston > > CommitDate: 2023-06-23 13:54:39 +0000 > > > > pseudofs: Fix a potential out-of-bounds access in pfs_lookup() > > > > pseudofs nodes store their name in a flexible array member, so the node > > allocation is sized using the length of the name, including a nul > > terminator. pfs_lookup() scans a directory of nodes, comparing names to > > find a match. The comparison was incorrect and assumed that all node > > names were at least as long as the name being looked up, which of course > > isn't true. > > > > I believe the bug is mostly harmless since it cannot result in false > > positive or negative matches from the lookup, but it triggers a KASAN > > check. > > > > Reported by: pho > > Reviewed by: kib, Olivier Certner > > MFC after: 2 weeks > > Sponsored by: The FreeBSD Foundation > > Differential Revision: https://reviews.freebsd.org/D40692 > > --- > > sys/fs/pseudofs/pseudofs_vnops.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c > > index 53e4c2b6b85c..bf423f0ad4db 100644 > > --- a/sys/fs/pseudofs/pseudofs_vnops.c > > +++ b/sys/fs/pseudofs/pseudofs_vnops.c > > @@ -537,8 +537,8 @@ pfs_lookup(struct vop_cachedlookup_args *va) > > for (pn = pd->pn_nodes; pn != NULL; pn = pn->pn_next) > > if (pn->pn_type == pfstype_procdir) > > pdn = pn; > > - else if (pn->pn_name[namelen] == '\0' && > > - bcmp(pname, pn->pn_name, namelen) == 0) { > > + else if (strncmp(pname, pn->pn_name, namelen) == 0 && > > + pn->pn_name[namelen] == '\0') { > > pfs_unlock(pd); > > goto got_pnode; > > } > > Naive question: should this be an && conditional or an || conditional? It should be &&. Using || here would reintroduce the original bug. If strncmp(pname, pn->pn_name, namelen) == 0, then strlen(pn->pn_name) >= namelen, and pn->pn_name is nul-terminated, so it is safe to check pn->pn_name[namelen] == '\0'. > If the former, could this be simplified by using a direct NUL char equality check instead of using strncmp? I'm not sure what you mean by this. This code is simply checking whether pname and pn->pn_name are the same string, without assuming that pname is nul-terminated. From nobody Fri Jun 23 16:41:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnjgZ3xf5z4ggbd; Fri, 23 Jun 2023 16:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnjgZ3WLXz48vc; Fri, 23 Jun 2023 16:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687538506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NKhZrWkaXzln5bJV2yA3ubBYDnnbA+aJt8TVKQUZoPE=; b=gbrwP5xUaIXQsJyS2sC+aC1s9+/t3Bs/HmZsxiZ1EsmgxIO0F7op9TWGU4b5SSz1Fdtptm csU/IrqcUcDsF4aouHiILUq2284lH31dlun+tLitKEFu1O2s4GQq8yhjyfACfgMvHxIHSg cnpntZV+c0HmcI/mq5tfhnRM8a4YIbZ3NWZ5fm4EsMPeA66QLUoUTgIoRxJkbeLGD0bX2g zP2kp20YYdv4lJkxwT0qbP5JeMQa08A9nqLmQam5xwpGcvHC+NBgUmRr60X7M24VUjImZ2 XOBKO6+IoxzeXS+/b+vF4/9oJbPM5ZbVvmD3/idzegtoxdJdOo+JGlg2V3xAbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687538506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NKhZrWkaXzln5bJV2yA3ubBYDnnbA+aJt8TVKQUZoPE=; b=LsOq3iT3fnonjni7+oEyN4mwZeo60qZJXM0RIOwbgKT9zvEF6ZecOwK8Jz2YgcN/7ojUL4 OxzKBflz5MHgHwqORSe2Tppkxd47WEjqYQlPcL2/J9e8wz7oNAV6XmVu684h0z3YCJOuap J4xx1hQg7Ba5nrNg5jIwSB9SO6hCUWOHBDWozL7gXvLQMCaEzqmPtOkG6Yzg23GdCPW5r6 b4IbAp2TdeTu1FtYHEPCKUPz+kjRMBXAvnNV4/+oav2XLm0mwkeM6gyT/TDHP6qfJMDPWB DbdR110wwYvM6KeAv0u/+1BHDDSQMPU+pgg2oUWimrgNJuQ9RLD4Pk+ohTEaDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687538506; a=rsa-sha256; cv=none; b=w7giUH6NOtLacVpOBXRXuq3nMTeNMEqt6xsVqK8vxLXR16wAtr16CHbqX35uk+0zRW0/60 cD8R9q4fSP7qUKYhYMCQcAFkh+GbQIhaLHZQUQRB/Lq0tg5LJstRiUxfpTkT0Qh204peq3 3QmblOnNynGU0g8cG6ehuWICbJJFMpWN+xM2JVUJ32PDENEcixqRNDEkBDB9u23VFVZwEQ RqWCv/rqrekQSxF7ZfrYm9sOey9noiB/BQJoIc3HWYqhnQ9d5WKLQdUoh//PLhEv2HqrHk I5awj0sMALfVCaIkSoDSXeYcd5z7yNIHTJzeSf5La+Wp2ma9zC6VnIfLTgtrEA== 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 4QnjgZ2YyPz1BYk; Fri, 23 Jun 2023 16:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NGfk9v098430; Fri, 23 Jun 2023 16:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NGfkGf098429; Fri, 23 Jun 2023 16:41:46 GMT (envelope-from git) Date: Fri, 23 Jun 2023 16:41:46 GMT Message-Id: <202306231641.35NGfkGf098429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c3e58ace3145 - main - arm64 iommu: Fix build without INVARIANTS. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3e58ace314561fd382fe27e567c9181ccc836d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c3e58ace314561fd382fe27e567c9181ccc836d9 commit c3e58ace314561fd382fe27e567c9181ccc836d9 Author: John Baldwin AuthorDate: 2023-06-23 16:33:41 +0000 Commit: John Baldwin CommitDate: 2023-06-23 16:41:26 +0000 arm64 iommu: Fix build without INVARIANTS. Obtained from: CheriBSD Sponsored by: DARPA --- sys/arm64/iommu/iommu_pmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/iommu/iommu_pmap.c b/sys/arm64/iommu/iommu_pmap.c index 1c45579835c7..8c4379bcdade 100644 --- a/sys/arm64/iommu/iommu_pmap.c +++ b/sys/arm64/iommu/iommu_pmap.c @@ -414,7 +414,9 @@ smmu_pmap_pinit(struct smmu_pmap *pmap) pmap->sp_l0_paddr = VM_PAGE_TO_PHYS(m); pmap->sp_l0 = (pd_entry_t *)PHYS_TO_DMAP(pmap->sp_l0_paddr); +#ifdef INVARIANTS pmap->sp_resident_count = 0; +#endif mtx_init(&pmap->sp_mtx, "smmu pmap", NULL, MTX_DEF); return (1); From nobody Fri Jun 23 17:01:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qnk611BCXz4h2dC; Fri, 23 Jun 2023 17:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qnk610lDJz4JMf; Fri, 23 Jun 2023 17:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687539673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eGLbarIMk8u5WLAWSs4uS1lsga5vwlpV51yPtY0tDG0=; b=TZU6dC/e310p2Tj1rI2yFfbMXdh6tvEJkTS75PNdNNsLosh0aDoeyWOpLXu3YuIYM7GeeM 5RDaZgIAzn4fukSyQqpCnsBLvzvWeXnsP23XCubiBBMpa4vxQmEljvCmq1VJvDfTCjJ4eu 1OIGfeKlF2gSmY29Kzf9jl5ZiSGC8q8LKlfkPZnxuiCVnJU7mPNruB3a5wyGHvcYor59vP i+YmX7RCLvuJ7zJS3vVHCS4q2sB+Q7W8uIxcPJL/0ALY5Zj5jFNrdxMUkYLdW/0YUstjHD nNbWbFSP1Mp8+Tgz/i5cBk3Tggj91bNLxYwRbp46NxGhT/g916618oSmMGqGQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687539673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eGLbarIMk8u5WLAWSs4uS1lsga5vwlpV51yPtY0tDG0=; b=PASlvaGHLFamQFEDZT5zHvlFLD9pe/YyQme2arAsCe6xkMSR+tRWgg3UVMWHiAnOkRS5td RQgMcTAp3B4VmR6qxCmdZhP2NtSbjFID9wyMQPKMs6M2gKopwAce6ENs/yJBWXtvCDdhvp 7c/HyzZtH75+Re8a8Ox56X6lEeeH2v/TwOjjkPh+D6Ul5/zfDQpw350iXH3L+IFfg5HqG0 /Wtq3n9non9LxGLXVe5Z9860YIKOrTG9VdBYxPSyVfeyjH8VSFG6f0X+hJbKUiVAptqLhQ Hwu61abeI/7UrT4uprojWiAvVtHuMGFOvAMCyBq7jUiSoHANqhGGwvmDXIqrxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687539673; a=rsa-sha256; cv=none; b=bganJZAWMT4J24o0CLX/5afbiucm8RHcZMpY8iYpK8SmC/aiDtC3zs8eS75BYnzvZok4ae +YogIOJfrwBl0NsQo8w3P91+OqwQjrbpTbTx10SthSO9LhIrDH4tcSUiNgh0duu3ML/C5u tambn3fmtPw5iQuxXh53xjbRBehg/LUhCCVPWtgiXb1AsnCacFxBeu6p7/e9sZpNO3tAxb e75vWnbQvV7yqW+4D1e/NQKNQwLjRi8pQpvitDKKgQSCJnRF1sG5YF9YsrAOus8FkSIY9x WawggDyYB927M01bBO7i4DbBHHZxtcnkVakhVESOPwWXmVhSouQz1NJ5oUEf7Q== 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 4Qnk606wYyz1BR6; Fri, 23 Jun 2023 17:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NH1CrF029139; Fri, 23 Jun 2023 17:01:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NH1CJT029138; Fri, 23 Jun 2023 17:01:12 GMT (envelope-from git) Date: Fri, 23 Jun 2023 17:01:12 GMT Message-Id: <202306231701.35NH1CJT029138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: ad9f4e6351fb - main - wg: fix MOD_LOAD to fail properly if cookie_init() fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad9f4e6351fb23ee81bc940638d20af3ca7c278d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ad9f4e6351fb23ee81bc940638d20af3ca7c278d commit ad9f4e6351fb23ee81bc940638d20af3ca7c278d Author: Kyle Evans AuthorDate: 2023-06-23 16:41:07 +0000 Commit: Kyle Evans CommitDate: 2023-06-23 16:55:00 +0000 wg: fix MOD_LOAD to fail properly if cookie_init() fails Previously we'd jump to the `free_crypto` label, but never set `ret` to a failure value -- it would retain success from the call just prior. Set ret up properly. This is part of D40708, but not the main point of the change. --- sys/dev/wg/if_wg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index d2403792cec8..77aed2621c9a 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2996,7 +2996,8 @@ wg_module_init(void) ret = crypto_init(); if (ret != 0) goto free_zone; - if (cookie_init() != 0) + ret = cookie_init(); + if (ret != 0) goto free_crypto; wg_osd_jail_slot = osd_jail_register(NULL, methods); From nobody Fri Jun 23 17:01:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qnk6222Nmz4h2QR; Fri, 23 Jun 2023 17:01: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 4Qnk621dMfz4JWJ; Fri, 23 Jun 2023 17:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687539674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0hOtFWZtAwP30OW5xitV2QSbH5Ho7NfZZG+McfYIAo=; b=lO10m6K0e8xxs7oB0s+vKFF94uEMX5/6Y8WJbDzyNF6JmkEmI8YjSlHfNSirWDUrhbygsL MViz7f8YoS9rW7o+VL9dAbUr2HZyAwrnLw6u+1U4z/sKJJrvxRWAaCa12ZuAtQMeeJ2NNj fVTMjfwZS0wqMZZRnMFN7AUd6Tnj5GCcLt0GPvq0hNglP93UwmH6WY8cjxsY+U0RZUFGWM 1h3nzixSidY4tIgNcJjRw9ZAGJgxN5WPhp9m7ivntnDx55tFnQvwxuEYhW39oBy9MPy0I7 wlmlUAdlFE0gYWOl5YQHqsVqnxjw+zyv4GEz0u1OU1P9lVjcpdZKoJUiy3e6uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687539674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0hOtFWZtAwP30OW5xitV2QSbH5Ho7NfZZG+McfYIAo=; b=PKGu0+Hzmx5UmDeN8HRYwd71osxiMZismrU6gMmWeJMCLKJliaMA4L0rRcr17FRFly6X0d JvZJt25OdTge3q/CZEcEG+SHrcuZf2NmSH8B58ElxUuE2RzNFsPdFB6vsByeE5lPEBsAVZ Wq7GObF3ymPB1Ihzcmy32W5+9V417jgDxjdW1IBxWeTpGBDI4QN+PrKG8I1NiqjcC+8YSX nzggIYTwACN7hNJGE9V6OXjc/KsGV18fZRDDSsuudWgtTSXvZMGlmfEjdt8BIFdARvuRD5 Oyhi01Ln2l+uX0rAi7nUH0TYtfTeS00K8m+MTVpcrl9td6Z8EQx4tKcOut896A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687539674; a=rsa-sha256; cv=none; b=G2ivm/WjJfxZqxEePA5PwShFkaKFQOYLH720VtGNw9YVPPGJwUh7twzZB3xwW6BdE9i7IC HnowBIhRYdPfhWm9WJxSwVJEZdsR73oWASuh4h0DNmc9n+a6eWJ5NtYJhkSYvRJhBVbwPr og7tcpar6M1TL9Fc2OVcNN0MtuvmEY9TaHuKJfaETueBdUhjycB4ScQR21LxiWn1DsQ+Ea QSdcYE/Ok2+Nfb8HF7N3RMuXRMP6X6XKH6mQhmrK/krcDsxhJPdVHAIEMrwMe1nagY+Noh iCXiOM247dzOVyg9V57eE3HW6LOGtV+PaEk7R5XKeb300X7Px2PCgT78fVdhPw== 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 4Qnk620jrrz1BpS; Fri, 23 Jun 2023 17:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NH1EBw029164; Fri, 23 Jun 2023 17:01:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NH1Edb029163; Fri, 23 Jun 2023 17:01:14 GMT (envelope-from git) Date: Fri, 23 Jun 2023 17:01:14 GMT Message-Id: <202306231701.35NH1Edb029163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: b08ee10c0646 - main - wg: fix a number of issues with module load failure handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b08ee10c0646e683cd03c9e28f537d9a7ba306af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b08ee10c0646e683cd03c9e28f537d9a7ba306af commit b08ee10c0646e683cd03c9e28f537d9a7ba306af Author: Kyle Evans AuthorDate: 2023-06-21 18:56:58 +0000 Commit: Kyle Evans CommitDate: 2023-06-23 17:00:09 +0000 wg: fix a number of issues with module load failure handling If MOD_LOAD fails, then MOD_UNLOAD will be called to unwind module state, but wg_module_init() will have already deinitialized everything it needs to in a manner that renders it unsafe to call MOD_UNLOAD after (e.g., freed zone not reset to NULL, wg_osd_jail_slot not reset to 0). Let's simply stop trying to handle freeing everything in wg_module_init() to simplify it; let the subsequent MOD_UNLOAD deal with it, and let's make that robust against partially-constructed state. jhb@ notes that MOD_UNLOAD being called if MOD_LOAD fails is kind of an anomaly that doesn't match other paradigms in the kernel; e.g., if device_attach() fails, we don't invoke device_detach(). It's likely that a future commit will revert this and instead stop calling MOD_UNLOAD if MOD_LOAD fails, expecting modules to clean up after themselves in MOD_LOAD upon failure. Some other modules already do this and may see similar problems to the wg module (see: carp). The proper fix is decidedly a bit too invasive to do this close to 14 branching, and it requires auditing all kmods (base + ports) for potential leaks. PR: 272089 Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D40708 --- sys/dev/wg/if_wg.c | 28 +++++++++------------------- sys/dev/wg/wg_cookie.c | 9 ++++++++- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 77aed2621c9a..4a21afe82eb5 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2984,39 +2984,27 @@ static inline bool wg_run_selftests(void) { return true; } static int wg_module_init(void) { - int ret = ENOMEM; - + int ret; osd_method_t methods[PR_MAXMETHOD] = { [PR_METHOD_REMOVE] = wg_prison_remove, }; if ((wg_packet_zone = uma_zcreate("wg packet", sizeof(struct wg_packet), NULL, NULL, NULL, NULL, 0, 0)) == NULL) - goto free_none; + return (ENOMEM); ret = crypto_init(); if (ret != 0) - goto free_zone; + return (ret); ret = cookie_init(); if (ret != 0) - goto free_crypto; + return (ret); wg_osd_jail_slot = osd_jail_register(NULL, methods); - ret = ENOTRECOVERABLE; if (!wg_run_selftests()) - goto free_all; + return (ENOTRECOVERABLE); return (0); - -free_all: - osd_jail_deregister(wg_osd_jail_slot); - cookie_deinit(); -free_crypto: - crypto_deinit(); -free_zone: - uma_zdestroy(wg_packet_zone); -free_none: - return (ret); } static void @@ -3034,10 +3022,12 @@ wg_module_deinit(void) VNET_LIST_RUNLOCK(); NET_EPOCH_WAIT(); MPASS(LIST_EMPTY(&wg_list)); - osd_jail_deregister(wg_osd_jail_slot); + if (wg_osd_jail_slot != 0) + osd_jail_deregister(wg_osd_jail_slot); cookie_deinit(); crypto_deinit(); - uma_zdestroy(wg_packet_zone); + if (wg_packet_zone != NULL) + uma_zdestroy(wg_packet_zone); } static int diff --git a/sys/dev/wg/wg_cookie.c b/sys/dev/wg/wg_cookie.c index 16fa5d7fb52d..6ff9325c6613 100644 --- a/sys/dev/wg/wg_cookie.c +++ b/sys/dev/wg/wg_cookie.c @@ -55,6 +55,7 @@ struct ratelimit { struct callout rl_gc; LIST_HEAD(, ratelimit_entry) rl_table[RATELIMIT_SIZE]; size_t rl_table_num; + bool rl_initialized; }; static void precompute_key(uint8_t *, @@ -102,7 +103,8 @@ cookie_deinit(void) #ifdef INET6 ratelimit_deinit(&ratelimit_v6); #endif - uma_zdestroy(ratelimit_zone); + if (ratelimit_zone != NULL) + uma_zdestroy(ratelimit_zone); } void @@ -350,16 +352,21 @@ ratelimit_init(struct ratelimit *rl) for (i = 0; i < RATELIMIT_SIZE; i++) LIST_INIT(&rl->rl_table[i]); rl->rl_table_num = 0; + rl->rl_initialized = true; } static void ratelimit_deinit(struct ratelimit *rl) { + if (!rl->rl_initialized) + return; mtx_lock(&rl->rl_mtx); callout_stop(&rl->rl_gc); ratelimit_gc(rl, true); mtx_unlock(&rl->rl_mtx); mtx_destroy(&rl->rl_mtx); + + rl->rl_initialized = false; } static void From nobody Fri Jun 23 18:49:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnmWH4cRYz4gX9v; Fri, 23 Jun 2023 18:49:47 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnmWG3t3Mz44D1; Fri, 23 Jun 2023 18:49:46 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-6687096c6ddso615191b3a.0; Fri, 23 Jun 2023 11:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687546184; x=1690138184; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=/g4d/Ebmthdu8EYYhFsdNKR80HRLGYjmpAJCUqEbiEk=; b=DLBNwbzD1S3MRsa4doLy6FMKNO5AGT7w1tybL2+R+1aSTteE47Gd1Llxst0KygwDKV Mp8j7cIo/VB1F0D6X2MIihOI1SgSuCGsQhA1UqDD3Cw4c1azE8uBC87PTAxTveLH7iPS +jXqOmbsIlaTjqdVtuyw2i+PWOIhyY377amAAOnDgKUoxcqjuK8bhpoApqGcA+RfOP+5 8GL8A/EMthUeMqZ+h0QG7fhqO1wuzTYh9rnZ7BlRmSLkczzXLDASgyJwmIKnt9WVAJu5 t9FnVchYVaT0F5zz+OazsaYTT/T+iVBiGjU0ylffCcC9RrCOlwU1UFGy0a3OD39aYPWG zf0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687546184; x=1690138184; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/g4d/Ebmthdu8EYYhFsdNKR80HRLGYjmpAJCUqEbiEk=; b=LtJ7sKbgwajSAAibAKQIl2NN2bCzQzy6t58dl6mYNKkpaYiGefEVUwog/sjPOwct4d CDYRxxtxDPdjl9Vmxn7wQt3aBzG+TNEFx0Rr2XDtB+TR7qonrq4DV50pFBOSUWKO/bGo s3/Z8scYaAclJ6u1fix1pKwBWQoncTAFWJto7g/Kc6WFf8Peg7tjM4BouCozobfYkJVH AW/Tie45IFwqpCq+Zln7pD31e0VsRvOY1NmX6B1iK0PsCcrgz218EPSmXxFMHyPqDlWO ajsiHkIlLydzV3sQXyoVc/EcuCXgXBPEKKlfaYthpTTPwhMa3EIAsZGnlJ35nhyfWLgg RPYQ== X-Gm-Message-State: AC+VfDy3X+WOB+4dNXkAaRGEx1akDkM9mklgzFuE9mSA7JXZLEQuFbkW UfK2/l5oI86rkrZWWvF606zcp64JE7s= X-Google-Smtp-Source: ACHHUZ6HlAof8g5zMcRkK7ysimvKVGF1TLPxvhgb8IwxeUrt5wntknJ9JBAqrmiBdJBe82KCGcR59Q== X-Received: by 2002:a05:6a20:2590:b0:119:87f9:3b04 with SMTP id k16-20020a056a20259000b0011987f93b04mr19419523pzd.6.1687546184212; Fri, 23 Jun 2023 11:49:44 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id s1-20020a170902a50100b001b3fb2f0296sm6931262plq.120.2023.06.23.11.49.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2023 11:49:43 -0700 (PDT) From: Enji Cooper Message-Id: Content-Type: multipart/signed; boundary="Apple-Mail=_F9A75F62-F1BB-43C2-8C19-EBC79BAE7801"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.3\)) Subject: Re: git: fc915f1be145 - main - pseudofs: Fix a potential out-of-bounds access in pfs_lookup() Date: Fri, 23 Jun 2023 11:49:42 -0700 In-Reply-To: Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org To: Mark Johnston References: <202306231509.35NF9sAk037726@gitrepo.freebsd.org> <0BAC85B7-6A67-4F6E-87B8-97ABD2FF7075@gmail.com> X-Mailer: Apple Mail (2.3696.120.41.1.3) X-Rspamd-Queue-Id: 4QnmWG3t3Mz44D1 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_F9A75F62-F1BB-43C2-8C19-EBC79BAE7801 Content-Type: multipart/alternative; boundary="Apple-Mail=_D51E7714-1DA8-491A-844D-DF0846B5FC1D" --Apple-Mail=_D51E7714-1DA8-491A-844D-DF0846B5FC1D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 23, 2023, at 8:56 AM, Mark Johnston wrote: =E2=80=A6 >> Naive question: should this be an && conditional or an || = conditional? >=20 > It should be &&. Using || here would reintroduce the original bug. > If strncmp(pname, pn->pn_name, namelen) =3D=3D 0, then > strlen(pn->pn_name) >=3D namelen, and pn->pn_name is nul-terminated, = so it > is safe to check pn->pn_name[namelen] =3D=3D '\0'. >=20 >> If the former, could this be simplified by using a direct NUL char = equality check instead of using strncmp? >=20 > I'm not sure what you mean by this. This code is simply checking > whether pname and pn->pn_name are the same string, without assuming = that > pname is nul-terminated. I completely misread the conditional when I sent out my email. = After you pointed out the obvious part dealing with namelen, it = doesn=E2=80=99t make sense for the conditionals to exist by themselves. Thanks for the explanation :)! -Enji --Apple-Mail=_D51E7714-1DA8-491A-844D-DF0846B5FC1D Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8
On = Jun 23, 2023, at 8:56 AM, Mark Johnston <markj@FreeBSD.org> = wrote:

=E2=80=A6
Naive = question: should this be an && conditional or an || = conditional?

It should be &&.  Using || here would = reintroduce the original bug.
If strncmp(pname, pn->pn_name, namelen) =3D=3D 0, = then
strlen(pn->pn_name) >=3D namelen, and pn->pn_name is = nul-terminated, so it
is safe to check pn->pn_name[namelen] =3D=3D = '\0'.

If = the former, could this be simplified by using a direct NUL char equality = check instead of using strncmp?

I'm not sure what you mean by = this.  This code is simply checking
whether pname and pn->pn_name are the same string, without = assuming that
pname is = nul-terminated.

= I completely misread the conditional when I sent out my email. = After you pointed out the obvious part dealing with namelen, it = doesn=E2=80=99t make sense for the conditionals to exist by = themselves.
Thanks for the explanation = :)!
-Enji
= --Apple-Mail=_D51E7714-1DA8-491A-844D-DF0846B5FC1D-- --Apple-Mail=_F9A75F62-F1BB-43C2-8C19-EBC79BAE7801 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEtvtxN6kOllEF3nmX5JFNMZeDGN4FAmSV6UYACgkQ5JFNMZeD GN50Bg/+PM8qBKLJFGqnq9CpweSVddfEAjDYZ7R9ETaxddyytqqEkW11GR3aUDNy N8lmy5ux59y6l2pMeCutJ0I6vCRX+taXqZEwOPohlEMtX2bYw/om1vQBc92JVmdu XcVyng8l09ZnYZy/dJsiAG9/tMW5qn7DLkX0aYQcvKTzn/3z32tpyWUBxe7wVZ8X gWKkztSp/wvNGyoqLn9EIiMLBPweZzpKq6PIhmfKFsvxBPuPFhNUcpQ3LKAxmEIO 248lG7GNqDmy/e0uD7IY0B1jEdIkFdv3k9CcjZkSRyfLa+8+hHvy1ZdWOEnAoV5W LIJPsdWgZq5A0cCsgRmTFGzOmubgnXOI8yRikpJpSI/hUHIHysAat4dGwCJml28M 7/B1CHZ0IzS9HNWslA5pe8d3xpAT+5n+EF4wFIfYb/wpH/7dnW34xWaaiP8J9s1I CiWg2V99pUzhVBBjzqmj3EM9K7RQAyf6OUdMDvy+RLLASeOmvMNlcdLdt7IWcW7l 6FTBN5vPlhyvXfiDvX//5Rnhd0j1ZKuGZmX8OD80IbDRK6R5tky/bfx9ZD0U087V QBaFNSAyWK9kl8xRo7f1ilCmBDeMM4e/r4Dlq7HBOWhnJR+USfXRpv6WsBec46he bjzxGWmBnryDFL9xU+3pELy5rklwTQY7BsoB0/bpV17vB59Nbr0= =aJ/Z -----END PGP SIGNATURE----- --Apple-Mail=_F9A75F62-F1BB-43C2-8C19-EBC79BAE7801-- From nobody Fri Jun 23 23:19:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QntW81m15z4g6Dl; Fri, 23 Jun 2023 23:20: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 4QntW81Rwwz3R2V; Fri, 23 Jun 2023 23:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbvTMjiyTPsJ6FwfOKPGmlq7eUejijzssux6ThNDVxk=; b=YFRngLlNiGeumt1sVHxIqELv7IhZwy0Qr0kbN9Z1ZkEZJoDhuRYIfBkoG6tGJebN3T3QqF o8LQ6JqDvcIZ+okp/8S5qrVcJhp1/gSs8OZV7SvxSMMxbAuRU1u1GllC57biCQdByRV3S5 xNRWcYKRtP19+I8mnI64cOzTW6eUWXe5icwxzhF/qX2frdcCC447MzG6qv6Ox5bnv/L84q qcU7ak1DtiR3lwNcZUEefA9lLnNYJwqkDKjwpYHN78v7up2TfMfRmpbUC/SPNsjbEEZov5 D9trQ2BWSn74CkDierWo91E+rX3EpYrhcnyZmztd6yVmGIv03mXqEAniLoQSQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbvTMjiyTPsJ6FwfOKPGmlq7eUejijzssux6ThNDVxk=; b=cCu/ZHbYPlMuHQKKEM6s3GpOJUXIL7RvFE+Tr1fYe1p3EpsAl7bOOvFYTQJ+rfoI/ZITTX DjMeC81YOx9MiBwSDbZ0xuZneV4zn49NSQwDIb5HXbEfw1nG9LcgqpfJqrWig/nC1P3SvZ lsgk+wlEdgvP1rb5lcndtS3nmJjk5lMSI7EifVD24uTJn1jpi/M1WmiUk4jpCH3nJfRz+T DgqKynhmjMp+t7ybh/q0WiGvBBe2NhrNNGHPPtDqt9I9QimvhZQydsTiH9Q6H8OlBal9Kk XMFXvz0/21qbdjsA+X/0KJe83YaViW9bQCsZxLc+N2QOmU7oaWTi8xMulpUt6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687562404; a=rsa-sha256; cv=none; b=Qn6CFFIBesqjH6OUS3qOT5F6PCxv03T1YYfk53niRzFlZJWmRFgggLaAGnyaem5oDHINK3 qAHQjxl6l11mMWWE5JhfCU0t6DC5QEUr5sYjLWoa2o/XwIMurYYZQgUy7qPEfDNTcdAaiD 0zFWj9D3tQqtFL/n6clTudHlQaQcXtTnmqCQ08YSdIZFiZwrXMeoqipIwpXMVD4UfTqfEZ z/yYZ+pNHBLWoOH9qietqJK8JPHTJX9YsR3uSNj6SCPdWPIcrJUCqwyHT6ccySOwweGwbI wMDneuTrDDiQoehBaqHBqwmzFUSjleXw/A/e56kelLeMsx70sPNSXoH0iPbjjw== 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 4QntW80P6qzNBh; Fri, 23 Jun 2023 23:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NNK3M9046701; Fri, 23 Jun 2023 23:20:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NNJsPv044302; Fri, 23 Jun 2023 23:19:54 GMT (envelope-from git) Date: Fri, 23 Jun 2023 23:19:54 GMT Message-Id: <202306232319.35NNJsPv044302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b077aed33b7b - main - Merge OpenSSL 3.0.9 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b077aed33b7b6aefca7b17ddb250cf521f938613 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b077aed33b7b6aefca7b17ddb250cf521f938613 commit b077aed33b7b6aefca7b17ddb250cf521f938613 Merge: b08ee10c0646 b84c4564effd Author: Pierre Pronchery AuthorDate: 2023-06-23 22:53:35 +0000 Commit: Ed Maste CommitDate: 2023-06-23 22:53:36 +0000 Merge OpenSSL 3.0.9 Migrate to OpenSSL 3.0 in advance of FreeBSD 14.0. OpenSSL 1.1.1 (the version we were previously using) will be EOL as of 2023-09-11. Most of the base system has already been updated for a seamless switch to OpenSSL 3.0. For many components we've added `-DOPENSSL_API_COMPAT=0x10100000L` to CFLAGS to specify the API version, which avoids deprecation warnings from OpenSSL 3.0. Changes have also been made to avoid OpenSSL APIs that were already deprecated in OpenSSL 1.1.1. The process of updating to contemporary APIs can continue after this merge. Additional changes are still required for libarchive and Kerberos- related libraries or tools; workarounds will immediately follow this commit. Fixes are in progress in the upstream projects and will be incorporated when those are next updated. There are some performance regressions in benchmarks (certain tests in `openssl speed`) and in some OpenSSL consumers in ports (e.g. haproxy). Investigation will continue for these. Netflix's testing showed no functional regression and a rather small, albeit statistically significant, increase in CPU consumption with OpenSSL 3.0. Thanks to ngie@ and des@ for updating base system components, to antoine@ and bofh@ for ports exp-runs and port fixes/workarounds, and to Netflix and everyone who tested prior to commit or contributed to this update in other ways. PR: 271615 PR: 271656 [exp-run] Relnotes: Yes Sponsored by: The FreeBSD Foundation ObsoleteFiles.inc | 48 + crypto/openssl/ACKNOWLEDGEMENTS | 2 - crypto/openssl/ACKNOWLEDGEMENTS.md | 6 + crypto/openssl/AUTHORS | 42 - crypto/openssl/AUTHORS.md | 51 + crypto/openssl/CHANGES | 13962 ------------- crypto/openssl/CHANGES.md | 19832 +++++++++++++++++++ crypto/openssl/CONTRIBUTING | 72 - crypto/openssl/CONTRIBUTING.md | 94 + crypto/openssl/Configure | 2198 +- crypto/openssl/FAQ | 2 - crypto/openssl/FAQ.md | 6 + crypto/openssl/HACKING.md | 33 + crypto/openssl/INSTALL | 1298 -- crypto/openssl/INSTALL.md | 1817 ++ crypto/openssl/LICENSE | 125 - crypto/openssl/LICENSE.txt | 177 + crypto/openssl/NEWS | 1054 - crypto/openssl/NEWS.md | 1603 ++ crypto/openssl/NOTES-ANDROID.md | 90 + crypto/openssl/NOTES-DJGPP.md | 46 + crypto/openssl/NOTES-NONSTOP.md | 259 + crypto/openssl/NOTES-PERL.md | 127 + crypto/openssl/{NOTES.UNIX => NOTES-UNIX.md} | 66 +- crypto/openssl/NOTES-VALGRIND.md | 72 + crypto/openssl/NOTES-VMS.md | 132 + crypto/openssl/NOTES-WINDOWS.md | 265 + crypto/openssl/NOTES.PERL | 119 - crypto/openssl/README | 93 - crypto/openssl/README-ENGINES.md | 316 + crypto/openssl/README-FIPS.md | 86 + crypto/openssl/README-PROVIDERS.md | 145 + crypto/openssl/README.ENGINE | 287 - crypto/openssl/README.FIPS | 1 - crypto/openssl/README.md | 224 + crypto/openssl/SUPPORT.md | 93 + crypto/openssl/VERSION.dat | 7 + crypto/openssl/apps/CA.pl.in | 134 +- crypto/openssl/apps/{asn1pars.c => asn1parse.c} | 27 +- crypto/openssl/apps/build.info | 147 +- crypto/openssl/apps/ca.c | 502 +- crypto/openssl/apps/ciphers.c | 66 +- crypto/openssl/apps/cmp.c | 3083 +++ crypto/openssl/apps/cms.c | 685 +- crypto/openssl/apps/crl.c | 134 +- crypto/openssl/apps/{crl2p7.c => crl2pkcs7.c} | 26 +- crypto/openssl/apps/dgst.c | 309 +- crypto/openssl/apps/dh1024.pem | 10 - crypto/openssl/apps/dh2048.pem | 14 - crypto/openssl/apps/dh4096.pem | 19 - crypto/openssl/apps/dhparam.c | 432 +- crypto/openssl/apps/dsa.c | 219 +- crypto/openssl/apps/dsaparam.c | 211 +- crypto/openssl/apps/ec.c | 266 +- crypto/openssl/apps/ecparam.c | 476 +- crypto/openssl/apps/enc.c | 245 +- crypto/openssl/apps/engine.c | 27 +- crypto/openssl/apps/errstr.c | 23 +- crypto/openssl/apps/fipsinstall.c | 590 + crypto/openssl/apps/gendsa.c | 103 +- crypto/openssl/apps/genpkey.c | 206 +- crypto/openssl/apps/genrsa.c | 173 +- .../openssl/apps/include/__DECC_INCLUDE_EPILOGUE.H | 22 + .../openssl/apps/include/__DECC_INCLUDE_PROLOGUE.H | 26 + crypto/openssl/apps/include/app_libctx.h | 20 + crypto/openssl/apps/include/app_params.h | 14 + crypto/openssl/apps/include/apps.h | 348 + crypto/openssl/apps/include/apps_ui.h | 29 + crypto/openssl/apps/include/cmp_mock_srv.h | 35 + crypto/openssl/apps/include/ec_common.h | 23 + crypto/openssl/apps/include/engine_loader.h | 21 + crypto/openssl/apps/include/fmt.h | 45 + crypto/openssl/apps/include/function.h | 44 + crypto/openssl/apps/include/http_server.h | 125 + crypto/openssl/apps/include/names.h | 17 + crypto/openssl/apps/{apps.h => include/opt.h} | 421 +- crypto/openssl/apps/include/platform.h | 32 + crypto/openssl/apps/{ => include}/s_apps.h | 43 +- crypto/openssl/apps/include/vms_term_sock.h | 31 + crypto/openssl/apps/info.c | 104 + crypto/openssl/apps/insta.ca.crt | Bin 0 -> 916 bytes crypto/openssl/apps/kdf.c | 211 + crypto/openssl/apps/lib/app_libctx.c | 48 + crypto/openssl/apps/lib/app_params.c | 132 + crypto/openssl/apps/lib/app_provider.c | 92 + crypto/openssl/apps/{ => lib}/app_rand.c | 43 +- crypto/openssl/apps/lib/app_x509.c | 137 + crypto/openssl/apps/{ => lib}/apps.c | 2343 ++- crypto/openssl/apps/lib/apps_ui.c | 223 + crypto/openssl/apps/lib/build.info | 23 + crypto/openssl/apps/lib/cmp_mock_srv.c | 452 + crypto/openssl/apps/lib/columns.c | 27 + crypto/openssl/apps/lib/engine.c | 193 + crypto/openssl/apps/lib/engine_loader.c | 203 + crypto/openssl/apps/lib/fmt.c | 15 + crypto/openssl/apps/lib/http_server.c | 533 + crypto/openssl/apps/lib/names.c | 45 + crypto/openssl/apps/{ => lib}/opt.c | 586 +- crypto/openssl/apps/{ => lib}/s_cb.c | 271 +- crypto/openssl/apps/{ => lib}/s_socket.c | 112 +- crypto/openssl/apps/lib/tlssrp_depr.c | 231 + crypto/openssl/apps/lib/vms_decc_argv.c | 72 + crypto/openssl/apps/lib/vms_term_sock.c | 591 + crypto/openssl/apps/lib/win32_init.c | 307 + crypto/openssl/apps/list.c | 1706 ++ crypto/openssl/apps/mac.c | 237 + crypto/openssl/apps/nseq.c | 30 +- crypto/openssl/apps/ocsp.c | 915 +- crypto/openssl/apps/openssl.c | 766 +- crypto/openssl/apps/openssl.cnf | 154 +- crypto/openssl/apps/passwd.c | 80 +- crypto/openssl/apps/pkcs12.c | 493 +- crypto/openssl/apps/pkcs7.c | 46 +- crypto/openssl/apps/pkcs8.c | 82 +- crypto/openssl/apps/pkey.c | 195 +- crypto/openssl/apps/pkeyparam.c | 62 +- crypto/openssl/apps/pkeyutl.c | 439 +- crypto/openssl/apps/prime.c | 43 +- crypto/openssl/apps/progs.c | 397 + crypto/openssl/apps/progs.h | 413 +- crypto/openssl/apps/progs.pl | 285 +- crypto/openssl/apps/rand.c | 42 +- crypto/openssl/apps/rehash.c | 68 +- crypto/openssl/apps/req.c | 1003 +- crypto/openssl/apps/rsa.c | 322 +- crypto/openssl/apps/rsautl.c | 126 +- crypto/openssl/apps/s_client.c | 806 +- crypto/openssl/apps/s_server.c | 920 +- crypto/openssl/apps/s_time.c | 142 +- crypto/openssl/apps/sess_id.c | 19 +- crypto/openssl/apps/smime.c | 186 +- crypto/openssl/apps/speed.c | 3502 ++-- crypto/openssl/apps/spkac.c | 59 +- crypto/openssl/apps/srp.c | 55 +- crypto/openssl/apps/storeutl.c | 113 +- crypto/openssl/apps/testdsa.h | 51 +- crypto/openssl/apps/testrsa.h | 2 +- crypto/openssl/apps/timeouts.h | 2 +- crypto/openssl/apps/ts.c | 195 +- crypto/openssl/apps/tsget.in | 56 +- crypto/openssl/apps/verify.c | 179 +- crypto/openssl/apps/version.c | 137 +- crypto/openssl/apps/x509.c | 1179 +- crypto/openssl/appveyor.yml | 54 +- crypto/openssl/build.info | 155 +- crypto/openssl/config | 944 +- crypto/openssl/configdata.pm.in | 487 + crypto/openssl/crypto/LPdir_unix.c | 7 +- crypto/openssl/crypto/README-sparse_array.md | 156 + crypto/openssl/crypto/aes/aes_cbc.c | 11 +- crypto/openssl/crypto/aes/aes_cfb.c | 10 +- crypto/openssl/crypto/aes/aes_core.c | 304 +- crypto/openssl/crypto/aes/aes_ecb.c | 10 +- crypto/openssl/crypto/aes/aes_ige.c | 21 +- crypto/openssl/crypto/aes/aes_local.h | 6 +- crypto/openssl/crypto/aes/aes_misc.c | 12 +- crypto/openssl/crypto/aes/aes_ofb.c | 10 +- crypto/openssl/crypto/aes/aes_wrap.c | 10 +- crypto/openssl/crypto/aes/aes_x86core.c | 2 +- crypto/openssl/crypto/aes/asm/aes-586.pl | 2998 +++ crypto/openssl/crypto/aes/asm/aes-armv4.pl | 17 +- crypto/openssl/crypto/aes/asm/aes-c64xplus.pl | 5 +- crypto/openssl/crypto/aes/asm/aes-ia64.S | 4 +- crypto/openssl/crypto/aes/asm/aes-mips.pl | 150 +- crypto/openssl/crypto/aes/asm/aes-parisc.pl | 11 +- crypto/openssl/crypto/aes/asm/aes-ppc.pl | 10 +- crypto/openssl/crypto/aes/asm/aes-s390x.pl | 10 +- crypto/openssl/crypto/aes/asm/aes-sparcv9.pl | 14 +- crypto/openssl/crypto/aes/asm/aes-x86_64.pl | 2927 +++ crypto/openssl/crypto/aes/asm/aesfx-sparcv9.pl | 12 +- crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl | 96 +- crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl | 12 +- .../openssl/crypto/aes/asm/aesni-sha256-x86_64.pl | 12 +- crypto/openssl/crypto/aes/asm/aesni-x86.pl | 6 +- crypto/openssl/crypto/aes/asm/aesni-x86_64.pl | 23 +- crypto/openssl/crypto/aes/asm/aesp8-ppc.pl | 10 +- crypto/openssl/crypto/aes/asm/aest4-sparcv9.pl | 12 +- crypto/openssl/crypto/aes/asm/aesv8-armx.pl | 3143 ++- crypto/openssl/crypto/aes/asm/bsaes-armv7.pl | 53 +- crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl | 3243 +++ crypto/openssl/crypto/aes/asm/vpaes-armv8.pl | 288 +- crypto/openssl/crypto/aes/asm/vpaes-ppc.pl | 10 +- crypto/openssl/crypto/aes/asm/vpaes-x86.pl | 6 +- crypto/openssl/crypto/aes/asm/vpaes-x86_64.pl | 17 +- crypto/openssl/crypto/aes/build.info | 152 +- crypto/openssl/crypto/aria/aria.c | 34 +- crypto/openssl/crypto/arm64cpuid.pl | 18 +- crypto/openssl/crypto/arm_arch.h | 49 +- crypto/openssl/crypto/armcap.c | 51 +- crypto/openssl/crypto/armv4cpuid.pl | 14 +- crypto/openssl/crypto/asn1/a_bitstr.c | 12 +- crypto/openssl/crypto/asn1/a_d2i_fp.c | 73 +- crypto/openssl/crypto/asn1/a_digest.c | 53 +- crypto/openssl/crypto/asn1/a_dup.c | 47 +- crypto/openssl/crypto/asn1/a_gentm.c | 16 +- crypto/openssl/crypto/asn1/a_i2d_fp.c | 38 +- crypto/openssl/crypto/asn1/a_int.c | 71 +- crypto/openssl/crypto/asn1/a_mbstr.c | 49 +- crypto/openssl/crypto/asn1/a_object.c | 51 +- crypto/openssl/crypto/asn1/a_octet.c | 2 +- crypto/openssl/crypto/asn1/a_print.c | 2 +- crypto/openssl/crypto/asn1/a_sign.c | 156 +- crypto/openssl/crypto/asn1/a_strex.c | 10 +- crypto/openssl/crypto/asn1/a_strnid.c | 13 +- crypto/openssl/crypto/asn1/a_time.c | 85 +- crypto/openssl/crypto/asn1/a_type.c | 6 +- crypto/openssl/crypto/asn1/a_utctm.c | 19 +- crypto/openssl/crypto/asn1/a_utf8.c | 77 +- crypto/openssl/crypto/asn1/a_verify.c | 160 +- crypto/openssl/crypto/asn1/ameth_lib.c | 86 +- crypto/openssl/crypto/asn1/asn1_err.c | 154 +- crypto/openssl/crypto/asn1/asn1_gen.c | 75 +- crypto/openssl/crypto/asn1/asn1_item_list.c | 7 +- crypto/openssl/crypto/asn1/asn1_item_list.h | 13 +- crypto/openssl/crypto/asn1/asn1_lib.c | 125 +- crypto/openssl/crypto/asn1/asn1_local.h | 77 +- .../crypto/asn1/{asn1_par.c => asn1_parse.c} | 81 +- crypto/openssl/crypto/asn1/asn_mime.c | 187 +- crypto/openssl/crypto/asn1/asn_moid.c | 10 +- crypto/openssl/crypto/asn1/asn_mstbl.c | 18 +- crypto/openssl/crypto/asn1/asn_pack.c | 14 +- crypto/openssl/crypto/asn1/bio_asn1.c | 12 +- crypto/openssl/crypto/asn1/bio_ndef.c | 22 +- crypto/openssl/crypto/asn1/build.info | 17 +- crypto/openssl/crypto/asn1/charmap.h | 4 +- crypto/openssl/crypto/asn1/charmap.pl | 7 +- crypto/openssl/crypto/asn1/d2i_param.c | 65 + crypto/openssl/crypto/asn1/d2i_pr.c | 203 +- crypto/openssl/crypto/asn1/d2i_pu.c | 49 +- crypto/openssl/crypto/asn1/evp_asn1.c | 122 +- crypto/openssl/crypto/asn1/f_int.c | 13 +- crypto/openssl/crypto/asn1/f_string.c | 13 +- crypto/openssl/crypto/asn1/i2d_evp.c | 149 + crypto/openssl/crypto/asn1/i2d_pr.c | 33 - crypto/openssl/crypto/asn1/i2d_pu.c | 38 - crypto/openssl/crypto/asn1/n_pkey.c | 48 +- crypto/openssl/crypto/asn1/nsseq.c | 2 +- crypto/openssl/crypto/asn1/p5_pbe.c | 43 +- crypto/openssl/crypto/asn1/p5_pbev2.c | 71 +- crypto/openssl/crypto/asn1/p5_scrypt.c | 74 +- crypto/openssl/crypto/asn1/p8_pkey.c | 15 +- crypto/openssl/crypto/asn1/standard_methods.h | 50 +- crypto/openssl/crypto/asn1/t_bitst.c | 2 +- crypto/openssl/crypto/asn1/t_pkey.c | 2 +- crypto/openssl/crypto/asn1/t_spki.c | 4 +- crypto/openssl/crypto/asn1/tasn_dec.c | 341 +- crypto/openssl/crypto/asn1/tasn_enc.c | 165 +- crypto/openssl/crypto/asn1/tasn_fre.c | 54 +- crypto/openssl/crypto/asn1/tasn_new.c | 97 +- crypto/openssl/crypto/asn1/tasn_prn.c | 58 +- crypto/openssl/crypto/asn1/tasn_scn.c | 6 +- crypto/openssl/crypto/asn1/tasn_typ.c | 6 +- crypto/openssl/crypto/asn1/tasn_utl.c | 123 +- crypto/openssl/crypto/asn1/tbl_standard.h | 7 +- crypto/openssl/crypto/asn1/x_algor.c | 80 +- crypto/openssl/crypto/asn1/x_bignum.c | 12 +- crypto/openssl/crypto/asn1/x_info.c | 6 +- crypto/openssl/crypto/asn1/x_int64.c | 48 +- crypto/openssl/crypto/asn1/x_long.c | 25 +- crypto/openssl/crypto/asn1/x_pkey.c | 6 +- crypto/openssl/crypto/asn1/x_sig.c | 2 +- crypto/openssl/crypto/asn1/x_spki.c | 2 +- crypto/openssl/crypto/asn1/x_val.c | 2 +- crypto/openssl/crypto/asn1_dsa.c | 252 + crypto/openssl/crypto/async/arch/async_null.c | 2 +- crypto/openssl/crypto/async/arch/async_null.h | 2 +- crypto/openssl/crypto/async/arch/async_posix.c | 6 +- crypto/openssl/crypto/async/arch/async_posix.h | 37 +- crypto/openssl/crypto/async/arch/async_win.h | 14 +- crypto/openssl/crypto/async/async.c | 78 +- crypto/openssl/crypto/async/async_err.c | 24 +- crypto/openssl/crypto/async/async_local.h | 8 +- crypto/openssl/crypto/async/async_wait.c | 41 +- crypto/openssl/crypto/bf/asm/bf-586.pl | 5 +- crypto/openssl/crypto/bf/bf_cfb64.c | 10 +- crypto/openssl/crypto/bf/bf_ecb.c | 10 +- crypto/openssl/crypto/bf/bf_enc.c | 10 +- crypto/openssl/crypto/bf/bf_local.h | 2 +- crypto/openssl/crypto/bf/bf_ofb64.c | 10 +- crypto/openssl/crypto/bf/bf_pi.h | 2 +- crypto/openssl/crypto/bf/bf_skey.c | 10 +- crypto/openssl/crypto/bf/build.info | 28 +- crypto/openssl/crypto/bio/bf_buff.c | 31 +- crypto/openssl/crypto/bio/bf_lbuf.c | 27 +- crypto/openssl/crypto/bio/bf_nbio.c | 17 +- crypto/openssl/crypto/bio/bf_null.c | 15 +- crypto/openssl/{apps => crypto/bio}/bf_prefix.c | 108 +- crypto/openssl/crypto/bio/bf_readbuff.c | 288 + crypto/openssl/crypto/bio/{b_addr.c => bio_addr.c} | 83 +- crypto/openssl/crypto/bio/bio_cb.c | 74 +- crypto/openssl/crypto/bio/{b_dump.c => bio_dump.c} | 35 +- crypto/openssl/crypto/bio/bio_err.c | 75 +- crypto/openssl/crypto/bio/bio_lib.c | 372 +- crypto/openssl/crypto/bio/bio_local.h | 13 +- crypto/openssl/crypto/bio/bio_meth.c | 8 +- .../openssl/crypto/bio/{b_print.c => bio_print.c} | 25 +- crypto/openssl/crypto/bio/{b_sock.c => bio_sock.c} | 102 +- .../openssl/crypto/bio/{b_sock2.c => bio_sock2.c} | 81 +- crypto/openssl/crypto/bio/bss_acpt.c | 51 +- crypto/openssl/crypto/bio/bss_bio.c | 28 +- crypto/openssl/crypto/bio/bss_conn.c | 72 +- crypto/openssl/crypto/bio/bss_core.c | 194 + crypto/openssl/crypto/bio/bss_dgram.c | 155 +- crypto/openssl/crypto/bio/bss_fd.c | 10 +- crypto/openssl/crypto/bio/bss_file.c | 90 +- crypto/openssl/crypto/bio/bss_log.c | 9 +- crypto/openssl/crypto/bio/bss_mem.c | 45 +- crypto/openssl/crypto/bio/bss_null.c | 6 +- crypto/openssl/crypto/bio/bss_sock.c | 6 +- crypto/openssl/crypto/bio/build.info | 20 +- crypto/openssl/crypto/bio/ossl_core_bio.c | 124 + crypto/openssl/crypto/blake2/blake2_local.h | 90 - crypto/openssl/crypto/blake2/build.info | 3 - crypto/openssl/crypto/blake2/m_blake2b.c | 59 - crypto/openssl/crypto/blake2/m_blake2s.c | 59 - crypto/openssl/crypto/bn/README.pod | 2 +- crypto/openssl/crypto/bn/asm/armv4-gf2m.pl | 27 +- crypto/openssl/crypto/bn/asm/armv4-mont.pl | 31 +- crypto/openssl/crypto/bn/asm/armv8-mont.pl | 410 +- crypto/openssl/crypto/bn/asm/bn-586.pl | 5 +- crypto/openssl/crypto/bn/asm/bn-c64xplus.asm | 5 +- crypto/openssl/crypto/bn/asm/c64xplus-gf2m.pl | 5 +- crypto/openssl/crypto/bn/asm/co-586.pl | 5 +- crypto/openssl/crypto/bn/asm/ia64-mont.pl | 5 +- crypto/openssl/crypto/bn/asm/ia64.S | 7 +- crypto/openssl/crypto/bn/asm/mips-mont.pl | 13 +- crypto/openssl/crypto/bn/asm/mips.pl | 14 +- crypto/openssl/crypto/bn/asm/parisc-mont.pl | 10 +- crypto/openssl/crypto/bn/asm/ppc-mont.pl | 10 +- crypto/openssl/crypto/bn/asm/ppc.pl | 10 +- crypto/openssl/crypto/bn/asm/ppc64-mont-fixed.pl | 0 crypto/openssl/crypto/bn/asm/ppc64-mont.pl | 10 +- crypto/openssl/crypto/bn/asm/rsaz-avx2.pl | 12 +- crypto/openssl/crypto/bn/asm/rsaz-avx512.pl | 754 + crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl | 12 +- crypto/openssl/crypto/bn/asm/s390x-gf2m.pl | 10 +- crypto/openssl/crypto/bn/asm/s390x-mont.pl | 10 +- crypto/openssl/crypto/bn/asm/s390x.S | 2 +- crypto/openssl/crypto/bn/asm/sparct4-mont.pl | 12 +- crypto/openssl/crypto/bn/asm/sparcv8.S | 2 +- crypto/openssl/crypto/bn/asm/sparcv8plus.S | 4 +- crypto/openssl/crypto/bn/asm/sparcv9-gf2m.pl | 12 +- crypto/openssl/crypto/bn/asm/sparcv9-mont.pl | 12 +- crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl | 15 +- crypto/openssl/crypto/bn/asm/via-mont.pl | 5 +- crypto/openssl/crypto/bn/asm/vis3-mont.pl | 12 +- crypto/openssl/crypto/bn/asm/x86-gf2m.pl | 5 +- crypto/openssl/crypto/bn/asm/x86-mont.pl | 5 +- crypto/openssl/crypto/bn/asm/x86_64-gcc.c | 5 +- crypto/openssl/crypto/bn/asm/x86_64-gf2m.pl | 12 +- crypto/openssl/crypto/bn/asm/x86_64-mont.pl | 12 +- crypto/openssl/crypto/bn/asm/x86_64-mont5.pl | 12 +- crypto/openssl/crypto/bn/bn_add.c | 6 +- crypto/openssl/crypto/bn/bn_asm.c | 2 +- crypto/openssl/crypto/bn/bn_blind.c | 16 +- crypto/openssl/crypto/bn/bn_const.c | 424 +- crypto/openssl/crypto/bn/bn_conv.c | 291 + crypto/openssl/crypto/bn/bn_ctx.c | 133 +- crypto/openssl/crypto/bn/bn_depr.c | 21 +- crypto/openssl/crypto/bn/bn_dh.c | 1402 +- crypto/openssl/crypto/bn/bn_div.c | 10 +- crypto/openssl/crypto/bn/bn_err.c | 76 +- crypto/openssl/crypto/bn/bn_exp.c | 108 +- crypto/openssl/crypto/bn/bn_exp2.c | 4 +- crypto/openssl/crypto/bn/bn_gcd.c | 8 +- crypto/openssl/crypto/bn/bn_gf2m.c | 89 +- crypto/openssl/crypto/bn/bn_intern.c | 22 +- crypto/openssl/crypto/bn/bn_kron.c | 2 +- crypto/openssl/crypto/bn/bn_lib.c | 36 +- crypto/openssl/crypto/bn/bn_local.h | 74 +- crypto/openssl/crypto/bn/bn_mod.c | 16 +- crypto/openssl/crypto/bn/bn_mont.c | 15 +- crypto/openssl/crypto/bn/bn_mpi.c | 6 +- crypto/openssl/crypto/bn/bn_mul.c | 2 +- crypto/openssl/crypto/bn/bn_nist.c | 149 +- crypto/openssl/crypto/bn/bn_ppc.c | 38 + crypto/openssl/crypto/bn/bn_prime.c | 445 +- crypto/openssl/crypto/bn/bn_prime.h | 4 +- crypto/openssl/crypto/bn/bn_prime.pl | 7 +- crypto/openssl/crypto/bn/bn_print.c | 281 +- crypto/openssl/crypto/bn/bn_rand.c | 121 +- crypto/openssl/crypto/bn/bn_recp.c | 8 +- crypto/openssl/crypto/bn/bn_rsa_fips186_4.c | 367 + crypto/openssl/crypto/bn/bn_shift.c | 8 +- crypto/openssl/crypto/bn/bn_sparc.c | 77 + crypto/openssl/crypto/bn/bn_sqr.c | 2 +- crypto/openssl/crypto/bn/bn_sqrt.c | 21 +- crypto/openssl/crypto/bn/bn_srp.c | 24 +- crypto/openssl/crypto/bn/bn_word.c | 2 +- crypto/openssl/crypto/bn/bn_x931p.c | 22 +- crypto/openssl/crypto/bn/build.info | 195 +- crypto/openssl/crypto/bn/rsaz_exp.c | 2 +- crypto/openssl/crypto/bn/rsaz_exp.h | 21 +- crypto/openssl/crypto/bn/rsaz_exp_x2.c | 575 + crypto/openssl/crypto/bsearch.c | 44 + crypto/openssl/crypto/buffer/buf_err.c | 18 +- crypto/openssl/crypto/buffer/buffer.c | 14 +- crypto/openssl/crypto/buffer/build.info | 1 + crypto/openssl/crypto/build.info | 143 +- crypto/openssl/crypto/c64xpluscpuid.pl | 2 +- crypto/openssl/crypto/camellia/asm/cmll-x86.pl | 5 +- crypto/openssl/crypto/camellia/asm/cmll-x86_64.pl | 13 +- .../openssl/crypto/camellia/asm/cmllt4-sparcv9.pl | 12 +- crypto/openssl/crypto/camellia/build.info | 32 +- crypto/openssl/crypto/camellia/camellia.c | 16 +- crypto/openssl/crypto/camellia/cmll_cbc.c | 10 +- crypto/openssl/crypto/camellia/cmll_cfb.c | 10 +- crypto/openssl/crypto/camellia/cmll_ctr.c | 10 +- crypto/openssl/crypto/camellia/cmll_ecb.c | 10 +- crypto/openssl/crypto/camellia/cmll_local.h | 2 +- crypto/openssl/crypto/camellia/cmll_misc.c | 10 +- crypto/openssl/crypto/camellia/cmll_ofb.c | 10 +- crypto/openssl/crypto/cast/asm/cast-586.pl | 5 +- crypto/openssl/crypto/cast/build.info | 29 +- crypto/openssl/crypto/cast/c_cfb64.c | 10 +- crypto/openssl/crypto/cast/c_ecb.c | 10 +- crypto/openssl/crypto/cast/c_enc.c | 10 +- crypto/openssl/crypto/cast/c_ofb64.c | 10 +- crypto/openssl/crypto/cast/c_skey.c | 10 +- crypto/openssl/crypto/cast/cast_local.h | 2 +- crypto/openssl/crypto/cast/cast_s.h | 2 +- crypto/openssl/crypto/chacha/asm/chacha-armv4.pl | 25 +- crypto/openssl/crypto/chacha/asm/chacha-armv8.pl | 590 +- .../openssl/crypto/chacha/asm/chacha-c64xplus.pl | 5 +- crypto/openssl/crypto/chacha/asm/chacha-ia64.pl | 291 + crypto/openssl/crypto/chacha/asm/chacha-ppc.pl | 10 +- crypto/openssl/crypto/chacha/asm/chacha-s390x.pl | 1258 +- crypto/openssl/crypto/chacha/asm/chacha-x86.pl | 5 +- crypto/openssl/crypto/chacha/asm/chacha-x86_64.pl | 12 +- crypto/openssl/crypto/chacha/build.info | 50 +- crypto/openssl/crypto/chacha/chacha_enc.c | 12 +- crypto/openssl/crypto/chacha/chacha_ppc.c | 35 + crypto/openssl/crypto/cmac/build.info | 6 +- crypto/openssl/crypto/cmac/cm_ameth.c | 51 - crypto/openssl/crypto/cmac/cm_pmeth.c | 161 - crypto/openssl/crypto/cmac/cmac.c | 44 +- crypto/openssl/crypto/cmp/build.info | 4 + crypto/openssl/crypto/cmp/cmp_asn.c | 459 + crypto/openssl/crypto/cmp/cmp_client.c | 918 + crypto/openssl/crypto/cmp/cmp_ctx.c | 1173 ++ crypto/openssl/crypto/cmp/cmp_err.c | 181 + crypto/openssl/crypto/cmp/cmp_hdr.c | 369 + crypto/openssl/crypto/cmp/cmp_http.c | 106 + crypto/openssl/crypto/cmp/cmp_local.h | 933 + crypto/openssl/crypto/cmp/cmp_msg.c | 1180 ++ crypto/openssl/crypto/cmp/cmp_protect.c | 334 + crypto/openssl/crypto/cmp/cmp_server.c | 665 + crypto/openssl/crypto/cmp/cmp_status.c | 314 + crypto/openssl/crypto/cmp/cmp_util.c | 286 + crypto/openssl/crypto/cmp/cmp_vfy.c | 855 + crypto/openssl/crypto/cms/build.info | 2 +- crypto/openssl/crypto/cms/cms_asn1.c | 16 +- crypto/openssl/crypto/cms/cms_att.c | 11 +- crypto/openssl/crypto/cms/cms_cd.c | 23 +- crypto/openssl/crypto/cms/cms_dd.c | 33 +- crypto/openssl/crypto/cms/cms_dh.c | 343 + crypto/openssl/crypto/cms/cms_ec.c | 417 + crypto/openssl/crypto/cms/cms_enc.c | 138 +- crypto/openssl/crypto/cms/cms_env.c | 744 +- crypto/openssl/crypto/cms/cms_err.c | 181 +- crypto/openssl/crypto/cms/cms_ess.c | 188 +- crypto/openssl/crypto/cms/cms_io.c | 55 +- crypto/openssl/crypto/cms/cms_kari.c | 213 +- crypto/openssl/crypto/cms/cms_lib.c | 314 +- crypto/openssl/crypto/cms/cms_local.h | 173 +- crypto/openssl/crypto/cms/cms_pwri.c | 117 +- crypto/openssl/crypto/cms/cms_rsa.c | 264 + crypto/openssl/crypto/cms/cms_sd.c | 381 +- crypto/openssl/crypto/cms/cms_smime.c | 441 +- crypto/openssl/crypto/comp/c_zlib.c | 131 +- crypto/openssl/crypto/comp/comp_err.c | 31 +- crypto/openssl/crypto/comp/comp_lib.c | 6 +- crypto/openssl/crypto/comp/comp_local.h | 2 +- crypto/openssl/crypto/conf/conf_api.c | 80 +- crypto/openssl/crypto/conf/conf_def.c | 239 +- crypto/openssl/crypto/conf/conf_def.h | 12 +- crypto/openssl/crypto/conf/conf_err.c | 45 +- crypto/openssl/crypto/conf/conf_lib.c | 94 +- crypto/openssl/crypto/conf/conf_local.h | 8 +- crypto/openssl/crypto/conf/conf_mall.c | 13 +- crypto/openssl/crypto/conf/conf_mod.c | 280 +- crypto/openssl/crypto/conf/conf_sap.c | 22 +- crypto/openssl/crypto/conf/conf_ssl.c | 31 +- crypto/openssl/crypto/conf/keysets.pl | 13 +- crypto/openssl/crypto/context.c | 510 + crypto/openssl/crypto/core_algorithm.c | 199 + crypto/openssl/crypto/core_fetch.c | 171 + crypto/openssl/crypto/core_namemap.c | 531 + crypto/openssl/crypto/cpt_err.c | 89 +- crypto/openssl/crypto/cpuid.c | 214 + crypto/openssl/crypto/crmf/build.info | 2 + crypto/openssl/crypto/crmf/crmf_asn.c | 235 + crypto/openssl/crypto/crmf/crmf_err.c | 74 + crypto/openssl/crypto/crmf/crmf_lib.c | 715 + crypto/openssl/crypto/crmf/crmf_local.h | 385 + crypto/openssl/crypto/crmf/crmf_pbm.c | 233 + crypto/openssl/crypto/cryptlib.c | 213 +- crypto/openssl/crypto/ct/ct_b64.c | 38 +- crypto/openssl/crypto/ct/ct_err.c | 61 +- crypto/openssl/crypto/ct/ct_local.h | 19 +- crypto/openssl/crypto/ct/ct_log.c | 96 +- crypto/openssl/crypto/ct/ct_oct.c | 48 +- crypto/openssl/crypto/ct/ct_policy.c | 25 +- crypto/openssl/crypto/ct/ct_prn.c | 4 +- crypto/openssl/crypto/ct/ct_sct.c | 26 +- crypto/openssl/crypto/ct/ct_sct_ctx.c | 43 +- crypto/openssl/crypto/ct/ct_vfy.c | 17 +- crypto/openssl/crypto/ct/ct_x509v3.c | 6 +- crypto/openssl/crypto/ctype.c | 51 +- crypto/openssl/crypto/cversion.c | 44 +- crypto/openssl/crypto/der_writer.c | 199 + crypto/openssl/crypto/des/asm/crypt586.pl | 5 +- crypto/openssl/crypto/des/asm/des-586.pl | 5 +- crypto/openssl/crypto/des/asm/des_enc.m4 | 6 +- crypto/openssl/crypto/des/asm/desboth.pl | 2 +- crypto/openssl/crypto/des/asm/dest4-sparcv9.pl | 12 +- crypto/openssl/crypto/des/build.info | 56 +- crypto/openssl/crypto/des/cbc_cksm.c | 10 +- crypto/openssl/crypto/des/cbc_enc.c | 10 +- crypto/openssl/crypto/des/cfb64ede.c | 10 +- crypto/openssl/crypto/des/cfb64enc.c | 10 +- crypto/openssl/crypto/des/cfb_enc.c | 10 +- crypto/openssl/crypto/des/des_enc.c | 10 +- crypto/openssl/crypto/des/des_local.h | 2 +- crypto/openssl/crypto/des/ecb3_enc.c | 10 +- crypto/openssl/crypto/des/ecb_enc.c | 10 +- crypto/openssl/crypto/des/fcrypt.c | 14 +- crypto/openssl/crypto/des/fcrypt_b.c | 10 +- crypto/openssl/crypto/des/ncbc_enc.c | 2 +- crypto/openssl/crypto/des/ofb64ede.c | 10 +- crypto/openssl/crypto/des/ofb64enc.c | 10 +- crypto/openssl/crypto/des/ofb_enc.c | 10 +- crypto/openssl/crypto/des/pcbc_enc.c | 10 +- crypto/openssl/crypto/des/qud_cksm.c | 11 +- crypto/openssl/crypto/des/rand_key.c | 10 +- crypto/openssl/crypto/des/set_key.c | 64 +- crypto/openssl/crypto/des/spr.h | 2 +- crypto/openssl/crypto/des/str2key.c | 10 +- crypto/openssl/crypto/des/xcbc_enc.c | 10 +- crypto/openssl/crypto/dh/build.info | 16 +- crypto/openssl/crypto/dh/dh1024.pem | 5 - crypto/openssl/crypto/dh/dh192.pem | 3 - crypto/openssl/crypto/dh/dh2048.pem | 16 - crypto/openssl/crypto/dh/dh4096.pem | 14 - crypto/openssl/crypto/dh/dh512.pem | 4 - crypto/openssl/crypto/dh/dh_ameth.c | 715 +- crypto/openssl/crypto/dh/dh_asn1.c | 95 +- crypto/openssl/crypto/dh/dh_backend.c | 250 + crypto/openssl/crypto/dh/dh_check.c | 233 +- crypto/openssl/crypto/dh/dh_depr.c | 22 +- crypto/openssl/crypto/dh/dh_err.c | 58 +- crypto/openssl/crypto/dh/dh_gen.c | 136 +- crypto/openssl/crypto/dh/dh_group_params.c | 99 + crypto/openssl/crypto/dh/dh_kdf.c | 181 +- crypto/openssl/crypto/dh/dh_key.c | 398 +- crypto/openssl/crypto/dh/dh_lib.c | 151 +- crypto/openssl/crypto/dh/dh_local.h | 27 +- crypto/openssl/crypto/dh/dh_meth.c | 16 +- crypto/openssl/crypto/dh/dh_pmeth.c | 225 +- crypto/openssl/crypto/dh/dh_prn.c | 12 +- crypto/openssl/crypto/dh/dh_rfc5114.c | 18 +- crypto/openssl/crypto/dh/dh_rfc7919.c | 74 - crypto/openssl/crypto/dllmain.c | 2 +- crypto/openssl/crypto/dsa/build.info | 13 +- crypto/openssl/crypto/dsa/dsa_ameth.c | 342 +- crypto/openssl/crypto/dsa/dsa_asn1.c | 127 +- crypto/openssl/crypto/dsa/dsa_backend.c | 195 + crypto/openssl/crypto/dsa/dsa_check.c | 95 + crypto/openssl/crypto/dsa/dsa_depr.c | 31 +- crypto/openssl/crypto/dsa/dsa_err.c | 55 +- crypto/openssl/crypto/dsa/dsa_gen.c | 629 +- crypto/openssl/crypto/dsa/dsa_key.c | 150 +- crypto/openssl/crypto/dsa/dsa_lib.c | 356 +- crypto/openssl/crypto/dsa/dsa_local.h | 27 +- crypto/openssl/crypto/dsa/dsa_meth.c | 20 +- crypto/openssl/crypto/dsa/dsa_ossl.c | 165 +- crypto/openssl/crypto/dsa/dsa_pmeth.c | 94 +- crypto/openssl/crypto/dsa/dsa_prn.c | 12 +- crypto/openssl/crypto/dsa/dsa_sign.c | 193 +- crypto/openssl/crypto/dsa/dsa_vrf.c | 10 +- crypto/openssl/crypto/dso/dso_dl.c | 46 +- crypto/openssl/crypto/dso/dso_dlfcn.c | 38 +- crypto/openssl/crypto/dso/dso_err.c | 52 +- crypto/openssl/crypto/dso/dso_lib.c | 84 +- crypto/openssl/crypto/dso/dso_local.h | 2 +- crypto/openssl/crypto/dso/dso_openssl.c | 4 +- crypto/openssl/crypto/ebcdic.c | 2 +- crypto/openssl/crypto/ec/asm/ecp_nistp521-ppc64.pl | 436 + crypto/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl | 18 +- crypto/openssl/crypto/ec/asm/ecp_nistz256-armv8.pl | 19 +- crypto/openssl/crypto/ec/asm/ecp_nistz256-ppc64.pl | 13 +- .../openssl/crypto/ec/asm/ecp_nistz256-sparcv9.pl | 12 +- crypto/openssl/crypto/ec/asm/ecp_nistz256-x86.pl | 5 +- .../openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl | 14 +- crypto/openssl/crypto/ec/asm/x25519-ppc64.pl | 11 +- crypto/openssl/crypto/ec/asm/x25519-x86_64.pl | 12 +- crypto/openssl/crypto/ec/build.info | 129 +- crypto/openssl/crypto/ec/curve25519.c | 129 +- .../crypto/ec/curve448/arch_32/arch_intrinsics.h | 2 +- crypto/openssl/crypto/ec/curve448/arch_32/f_impl.h | 2 +- .../ec/curve448/arch_32/{f_impl.c => f_impl32.c} | 16 +- .../crypto/ec/curve448/arch_64/arch_intrinsics.h | 27 + crypto/openssl/crypto/ec/curve448/arch_64/f_impl.h | 58 + .../openssl/crypto/ec/curve448/arch_64/f_impl64.c | 210 + crypto/openssl/crypto/ec/curve448/curve448.c | 95 +- crypto/openssl/crypto/ec/curve448/curve448_local.h | 36 +- .../openssl/crypto/ec/curve448/curve448_tables.c | 8 +- crypto/openssl/crypto/ec/curve448/curve448utils.h | 10 +- crypto/openssl/crypto/ec/curve448/ed448.h | 92 +- crypto/openssl/crypto/ec/curve448/eddsa.c | 268 +- crypto/openssl/crypto/ec/curve448/f_generic.c | 6 +- crypto/openssl/crypto/ec/curve448/field.h | 13 +- crypto/openssl/crypto/ec/curve448/point_448.h | 71 +- crypto/openssl/crypto/ec/curve448/scalar.c | 51 +- crypto/openssl/crypto/ec/curve448/word.h | 15 +- crypto/openssl/crypto/ec/ec2_oct.c | 103 +- crypto/openssl/crypto/ec/ec2_smpl.c | 262 +- crypto/openssl/crypto/ec/ec_ameth.c | 775 +- crypto/openssl/crypto/ec/ec_asn1.c | 428 +- crypto/openssl/crypto/ec/ec_backend.c | 842 + crypto/openssl/crypto/ec/ec_check.c | 62 +- crypto/openssl/crypto/ec/ec_curve.c | 300 +- crypto/openssl/crypto/ec/ec_cvt.c | 19 +- crypto/openssl/crypto/ec/ec_deprecated.c | 78 + crypto/openssl/crypto/ec/ec_err.c | 317 +- crypto/openssl/crypto/ec/ec_key.c | 541 +- crypto/openssl/crypto/ec/ec_kmeth.c | 57 +- crypto/openssl/crypto/ec/ec_lib.c | 776 +- crypto/openssl/crypto/ec/ec_local.h | 562 +- crypto/openssl/crypto/ec/ec_mult.c | 144 +- crypto/openssl/crypto/ec/ec_oct.c | 54 +- crypto/openssl/crypto/ec/ec_pmeth.c | 115 +- crypto/openssl/crypto/ec/ec_print.c | 102 +- crypto/openssl/crypto/ec/ecdh_kdf.c | 92 +- crypto/openssl/crypto/ec/ecdh_ossl.c | 58 +- crypto/openssl/crypto/ec/ecdsa_ossl.c | 178 +- crypto/openssl/crypto/ec/ecdsa_sign.c | 16 +- crypto/openssl/crypto/ec/ecdsa_vrf.c | 12 +- crypto/openssl/crypto/ec/eck_prn.c | 59 +- crypto/openssl/crypto/ec/ecp_mont.c | 161 +- crypto/openssl/crypto/ec/ecp_nist.c | 120 +- crypto/openssl/crypto/ec/ecp_nistp224.c | 264 +- crypto/openssl/crypto/ec/ecp_nistp256.c | 290 +- crypto/openssl/crypto/ec/ecp_nistp521.c | 319 +- crypto/openssl/crypto/ec/ecp_nistputil.c | 33 +- crypto/openssl/crypto/ec/ecp_nistz256.c | 132 +- crypto/openssl/crypto/ec/ecp_nistz256_table.c | 2 +- crypto/openssl/crypto/ec/ecp_oct.c | 92 +- crypto/openssl/crypto/ec/ecp_ppc.c | 34 + crypto/openssl/crypto/ec/ecp_s390x_nistp.c | 400 + crypto/openssl/crypto/ec/ecp_smpl.c | 281 +- crypto/openssl/crypto/ec/ecx_backend.c | 260 + crypto/openssl/crypto/ec/ecx_backend.h | 20 + crypto/openssl/crypto/ec/ecx_key.c | 98 + crypto/openssl/crypto/ec/ecx_meth.c | 951 +- crypto/openssl/crypto/ec/ecx_s390x.c | 217 + crypto/openssl/crypto/encode_decode/build.info | 5 + crypto/openssl/crypto/encode_decode/decoder_err.c | 36 + crypto/openssl/crypto/encode_decode/decoder_lib.c | 999 + crypto/openssl/crypto/encode_decode/decoder_meth.c | 701 + crypto/openssl/crypto/encode_decode/decoder_pkey.c | 462 + crypto/openssl/crypto/encode_decode/encoder_err.c | 36 + crypto/openssl/crypto/encode_decode/encoder_lib.c | 674 + .../openssl/crypto/encode_decode/encoder_local.h | 164 + crypto/openssl/crypto/encode_decode/encoder_meth.c | 700 + crypto/openssl/crypto/encode_decode/encoder_pkey.c | 379 + crypto/openssl/crypto/engine/{README => README.md} | 27 +- crypto/openssl/crypto/engine/build.info | 3 - crypto/openssl/crypto/engine/eng_all.c | 8 +- crypto/openssl/crypto/engine/eng_cnf.c | 47 +- crypto/openssl/crypto/engine/eng_ctrl.c | 55 +- crypto/openssl/crypto/engine/eng_dyn.c | 76 +- crypto/openssl/crypto/engine/eng_err.c | 86 +- crypto/openssl/crypto/engine/eng_fat.c | 16 +- crypto/openssl/crypto/engine/eng_init.c | 30 +- crypto/openssl/crypto/engine/eng_lib.c | 23 +- crypto/openssl/crypto/engine/eng_list.c | 86 +- crypto/openssl/crypto/engine/eng_local.h | 53 +- crypto/openssl/crypto/engine/eng_openssl.c | 56 +- crypto/openssl/crypto/engine/eng_pkey.c | 66 +- crypto/openssl/crypto/engine/eng_rdrand.c | 22 +- crypto/openssl/crypto/engine/eng_table.c | 85 +- crypto/openssl/crypto/engine/tb_asnmth.c | 24 +- crypto/openssl/crypto/engine/tb_cipher.c | 12 +- crypto/openssl/crypto/engine/tb_dh.c | 10 +- crypto/openssl/crypto/engine/tb_digest.c | 12 +- crypto/openssl/crypto/engine/tb_dsa.c | 10 +- crypto/openssl/crypto/engine/tb_eckey.c | 10 +- crypto/openssl/crypto/engine/tb_pkmeth.c | 13 +- crypto/openssl/crypto/engine/tb_rand.c | 10 +- crypto/openssl/crypto/engine/tb_rsa.c | 10 +- crypto/openssl/crypto/err/README | 44 - crypto/openssl/crypto/err/README.md | 55 + crypto/openssl/crypto/err/build.info | 2 +- crypto/openssl/crypto/err/err.c | 577 +- crypto/openssl/crypto/err/err_all.c | 144 +- crypto/openssl/crypto/err/err_all_legacy.c | 106 + crypto/openssl/crypto/err/err_blocks.c | 117 + crypto/openssl/crypto/err/err_local.h | 94 + crypto/openssl/crypto/err/err_prn.c | 165 +- crypto/openssl/crypto/err/openssl.txt | 2254 +-- crypto/openssl/crypto/ess/build.info | 3 + crypto/openssl/crypto/ess/ess_asn1.c | 58 + crypto/openssl/crypto/ess/ess_err.c | 48 + crypto/openssl/crypto/ess/ess_lib.c | 315 + crypto/openssl/crypto/evp/asymcipher.c | 552 + crypto/openssl/crypto/evp/bio_b64.c | 17 +- crypto/openssl/crypto/evp/bio_enc.c | 50 +- crypto/openssl/crypto/evp/bio_md.c | 23 +- crypto/openssl/crypto/evp/bio_ok.c | 55 +- crypto/openssl/crypto/evp/build.info | 72 +- crypto/openssl/crypto/evp/c_allc.c | 5 +- crypto/openssl/crypto/evp/c_alld.c | 2 +- crypto/openssl/crypto/evp/cmeth_lib.c | 64 +- crypto/openssl/crypto/evp/ctrl_params_translate.c | 2866 +++ crypto/openssl/crypto/evp/dh_ctrl.c | 346 + crypto/openssl/crypto/evp/dh_support.c | 63 + crypto/openssl/crypto/evp/digest.c | 901 +- crypto/openssl/crypto/evp/dsa_ctrl.c | 132 + crypto/openssl/crypto/evp/e_aes.c | 1320 +- crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c | 49 +- crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c | 49 +- crypto/openssl/crypto/evp/e_aria.c | 152 +- crypto/openssl/crypto/evp/e_bf.c | 17 +- crypto/openssl/crypto/evp/e_camellia.c | 171 +- crypto/openssl/crypto/evp/e_cast.c | 17 +- crypto/openssl/crypto/evp/e_chacha20_poly1305.c | 29 +- crypto/openssl/crypto/evp/e_des.c | 64 +- crypto/openssl/crypto/evp/e_des3.c | 107 +- crypto/openssl/crypto/evp/e_idea.c | 16 +- crypto/openssl/crypto/evp/e_null.c | 5 +- crypto/openssl/crypto/evp/e_old.c | 57 +- crypto/openssl/crypto/evp/e_rc2.c | 27 +- crypto/openssl/crypto/evp/e_rc4.c | 18 +- crypto/openssl/crypto/evp/e_rc4_hmac_md5.c | 25 +- crypto/openssl/crypto/evp/e_rc5.c | 22 +- crypto/openssl/crypto/evp/e_seed.c | 28 +- crypto/openssl/crypto/evp/e_sm4.c | 34 +- crypto/openssl/crypto/evp/e_xcbc_d.c | 20 +- crypto/openssl/crypto/evp/ec_ctrl.c | 302 + crypto/openssl/crypto/evp/ec_support.c | 188 + crypto/openssl/crypto/evp/encode.c | 8 +- crypto/openssl/crypto/evp/evp_cnf.c | 38 +- crypto/openssl/crypto/evp/evp_enc.c | 1230 +- crypto/openssl/crypto/evp/evp_err.c | 235 +- crypto/openssl/crypto/evp/evp_fetch.c | 690 + crypto/openssl/crypto/evp/evp_key.c | 14 +- crypto/openssl/crypto/evp/evp_lib.c | 883 +- crypto/openssl/crypto/evp/evp_local.h | 316 +- crypto/openssl/crypto/evp/evp_pbe.c | 154 +- crypto/openssl/crypto/evp/evp_pkey.c | 147 +- crypto/openssl/crypto/evp/evp_rand.c | 682 + crypto/openssl/crypto/evp/evp_utils.c | 81 + crypto/openssl/crypto/evp/exchange.c | 597 + crypto/openssl/crypto/evp/kdf_lib.c | 184 + crypto/openssl/crypto/evp/kdf_meth.c | 232 + crypto/openssl/crypto/evp/kem.c | 482 + crypto/openssl/crypto/evp/keymgmt_lib.c | 589 + crypto/openssl/crypto/evp/keymgmt_meth.c | 496 + crypto/openssl/crypto/evp/legacy_blake2.c | 48 + crypto/openssl/crypto/evp/legacy_md2.c | 34 + crypto/openssl/crypto/evp/legacy_md4.c | 34 + crypto/openssl/crypto/evp/legacy_md5.c | 34 + crypto/openssl/crypto/evp/legacy_md5_sha1.c | 41 + crypto/openssl/crypto/evp/legacy_mdc2.c | 35 + crypto/openssl/crypto/evp/legacy_meth.h | 40 + crypto/openssl/crypto/evp/legacy_ripemd.c | 35 + crypto/openssl/crypto/evp/legacy_sha.c | 228 + crypto/openssl/crypto/evp/legacy_wp.c | 35 + crypto/openssl/crypto/evp/m_md2.c | 56 - crypto/openssl/crypto/evp/m_md4.c | 55 - crypto/openssl/crypto/evp/m_md5.c | 55 - crypto/openssl/crypto/evp/m_mdc2.c | 55 - crypto/openssl/crypto/evp/m_null.c | 5 +- crypto/openssl/crypto/evp/m_ripemd.c | 55 - crypto/openssl/crypto/evp/m_sha1.c | 297 - crypto/openssl/crypto/evp/m_sha3.c | 409 - crypto/openssl/crypto/evp/m_sigver.c | 523 +- crypto/openssl/crypto/evp/m_wp.c | 54 - crypto/openssl/crypto/evp/mac_lib.c | 303 + crypto/openssl/crypto/evp/mac_meth.c | 246 + crypto/openssl/crypto/evp/names.c | 88 +- crypto/openssl/crypto/evp/p5_crpt.c | 93 +- crypto/openssl/crypto/evp/p5_crpt2.c | 285 +- crypto/openssl/crypto/evp/p_dec.c | 24 +- crypto/openssl/crypto/evp/p_enc.c | 25 +- crypto/openssl/crypto/evp/p_legacy.c | 91 + crypto/openssl/crypto/evp/p_lib.c | 2467 ++- crypto/openssl/crypto/evp/p_open.c | 53 +- crypto/openssl/crypto/evp/p_seal.c | 44 +- crypto/openssl/crypto/evp/p_sign.c | 24 +- crypto/openssl/crypto/evp/p_verify.c | 22 +- crypto/openssl/crypto/evp/pbe_scrypt.c | 273 +- crypto/openssl/crypto/evp/pmeth_check.c | 193 + crypto/openssl/crypto/evp/pmeth_fn.c | 297 - crypto/openssl/crypto/evp/pmeth_gn.c | 444 +- crypto/openssl/crypto/evp/pmeth_lib.c | 1582 +- crypto/openssl/crypto/evp/signature.c | 748 + crypto/openssl/crypto/ex_data.c | 293 +- crypto/openssl/crypto/ffc/build.info | 8 + crypto/openssl/crypto/ffc/ffc_backend.c | 130 + crypto/openssl/crypto/ffc/ffc_dh.c | 173 + crypto/openssl/crypto/ffc/ffc_key_generate.c | 60 + crypto/openssl/crypto/ffc/ffc_key_validate.c | 130 + crypto/openssl/crypto/ffc/ffc_params.c | 324 + crypto/openssl/crypto/ffc/ffc_params_generate.c | 1057 + crypto/openssl/crypto/ffc/ffc_params_validate.c | 187 + crypto/openssl/crypto/getenv.c | 76 +- crypto/openssl/crypto/hmac/build.info | 7 +- crypto/openssl/crypto/hmac/hm_ameth.c | 128 - crypto/openssl/crypto/hmac/hm_pmeth.c | 212 - crypto/openssl/crypto/hmac/hmac.c | 78 +- crypto/openssl/crypto/hmac/hmac_local.h | 2 +- crypto/openssl/crypto/http/build.info | 2 + crypto/openssl/crypto/http/http_client.c | 1427 ++ crypto/openssl/crypto/http/http_err.c | 82 + crypto/openssl/crypto/http/http_lib.c | 285 + crypto/openssl/crypto/ia64cpuid.S | 2 +- crypto/openssl/crypto/idea/build.info | 11 +- crypto/openssl/crypto/idea/i_cbc.c | 11 +- crypto/openssl/crypto/idea/i_cfb64.c | 16 +- crypto/openssl/crypto/idea/i_ecb.c | 11 +- crypto/openssl/crypto/idea/i_ofb64.c | 16 +- crypto/openssl/crypto/idea/i_skey.c | 11 +- crypto/openssl/crypto/idea/idea_local.h | 2 +- crypto/openssl/crypto/info.c | 207 + crypto/openssl/crypto/init.c | 562 +- crypto/openssl/crypto/initthread.c | 467 + crypto/openssl/crypto/kdf/build.info | 3 +- crypto/openssl/crypto/kdf/hkdf.c | 352 - crypto/openssl/crypto/kdf/kdf_err.c | 56 +- crypto/openssl/crypto/kdf/scrypt.c | 266 - crypto/openssl/crypto/kdf/tls1_prf.c | 278 - crypto/openssl/crypto/lhash/build.info | 2 + crypto/openssl/crypto/lhash/lh_stats.c | 30 +- crypto/openssl/crypto/lhash/lhash.c | 46 +- crypto/openssl/crypto/lhash/lhash_local.h | 17 +- crypto/openssl/crypto/md2/build.info | 10 +- crypto/openssl/crypto/md2/md2_dgst.c | 10 +- crypto/openssl/crypto/md2/md2_one.c | 10 +- crypto/openssl/crypto/md4/build.info | 10 +- crypto/openssl/crypto/md4/md4_dgst.c | 10 +- crypto/openssl/crypto/md4/md4_local.h | 2 +- crypto/openssl/crypto/md4/md4_one.c | 10 +- crypto/openssl/crypto/md5/asm/md5-586.pl | 10 +- crypto/openssl/crypto/md5/asm/md5-sparcv9.pl | 23 +- crypto/openssl/crypto/md5/asm/md5-x86_64.pl | 28 +- crypto/openssl/crypto/md5/build.info | 41 +- crypto/openssl/crypto/md5/md5_dgst.c | 10 +- crypto/openssl/crypto/md5/md5_local.h | 10 +- crypto/openssl/crypto/md5/md5_one.c | 10 +- .../crypto/{evp/m_md5_sha1.c => md5/md5_sha1.c} | 70 +- crypto/openssl/crypto/mdc2/build.info | 10 +- crypto/openssl/crypto/mdc2/mdc2_one.c | 10 +- crypto/openssl/crypto/mdc2/mdc2dgst.c | 10 +- crypto/openssl/crypto/mem.c | 208 +- crypto/openssl/crypto/mem_clr.c | 2 +- crypto/openssl/crypto/mem_dbg.c | 670 - crypto/openssl/crypto/mem_sec.c | 199 +- crypto/openssl/crypto/mips_arch.h | 4 +- .../openssl/crypto/modes/asm/aes-gcm-armv8_64.pl | 6097 ++++++ .../openssl/crypto/modes/asm/aesni-gcm-x86_64.pl | 12 +- crypto/openssl/crypto/modes/asm/ghash-armv4.pl | 17 +- crypto/openssl/crypto/modes/asm/ghash-c64xplus.pl | 5 +- crypto/openssl/crypto/modes/asm/ghash-ia64.pl | 2 +- crypto/openssl/crypto/modes/asm/ghash-parisc.pl | 11 +- crypto/openssl/crypto/modes/asm/ghash-s390x.pl | 10 +- crypto/openssl/crypto/modes/asm/ghash-sparcv9.pl | 12 +- crypto/openssl/crypto/modes/asm/ghash-x86.pl | 5 +- crypto/openssl/crypto/modes/asm/ghash-x86_64.pl | 18 +- crypto/openssl/crypto/modes/asm/ghashp8-ppc.pl | 11 +- crypto/openssl/crypto/modes/asm/ghashv8-armx.pl | 38 +- crypto/openssl/crypto/modes/build.info | 96 +- crypto/openssl/crypto/modes/cbc128.c | 6 +- crypto/openssl/crypto/modes/ccm128.c | 6 +- crypto/openssl/crypto/modes/cfb128.c | 13 +- crypto/openssl/crypto/modes/ctr128.c | 22 +- crypto/openssl/crypto/modes/cts128.c | 6 +- crypto/openssl/crypto/modes/gcm128.c | 136 +- crypto/openssl/crypto/modes/ocb128.c | 10 +- crypto/openssl/crypto/modes/ofb128.c | 13 +- crypto/openssl/crypto/modes/siv128.c | 393 + crypto/openssl/crypto/modes/wrap128.c | 2 +- crypto/openssl/crypto/modes/xts128.c | 18 +- crypto/openssl/crypto/o_dir.c | 2 +- crypto/openssl/crypto/o_fips.c | 24 - crypto/openssl/crypto/o_fopen.c | 6 +- crypto/openssl/crypto/o_init.c | 2 +- crypto/openssl/crypto/o_str.c | 219 +- crypto/openssl/crypto/o_time.c | 2 +- crypto/openssl/crypto/objects/README | 44 - crypto/openssl/crypto/objects/README.md | 43 + crypto/openssl/crypto/objects/o_names.c | 59 +- crypto/openssl/crypto/objects/obj_compat.h | 54 + crypto/openssl/crypto/objects/obj_dat.c | 160 +- crypto/openssl/crypto/objects/obj_dat.h | 345 +- crypto/openssl/crypto/objects/obj_dat.pl | 6 +- crypto/openssl/crypto/objects/obj_err.c | 26 +- crypto/openssl/crypto/objects/obj_lib.c | 8 +- crypto/openssl/crypto/objects/obj_local.h | 2 +- crypto/openssl/crypto/objects/obj_mac.num | 77 +- crypto/openssl/crypto/objects/obj_xref.c | 6 +- crypto/openssl/crypto/objects/obj_xref.h | 8 +- crypto/openssl/crypto/objects/obj_xref.txt | 4 +- crypto/openssl/crypto/objects/objects.pl | 15 +- crypto/openssl/crypto/objects/objects.txt | 101 +- crypto/openssl/crypto/objects/objxref.pl | 7 +- crypto/openssl/crypto/ocsp/build.info | 2 +- crypto/openssl/crypto/ocsp/ocsp_asn.c | 2 +- crypto/openssl/crypto/ocsp/ocsp_cl.c | 118 +- crypto/openssl/crypto/ocsp/ocsp_err.c | 56 +- crypto/openssl/crypto/ocsp/ocsp_ext.c | 10 +- crypto/openssl/crypto/ocsp/ocsp_ht.c | 502 - crypto/openssl/crypto/ocsp/ocsp_http.c | 68 + crypto/openssl/crypto/ocsp/ocsp_lib.c | 123 +- crypto/openssl/crypto/ocsp/ocsp_local.h | 52 +- crypto/openssl/crypto/ocsp/ocsp_prn.c | 4 +- crypto/openssl/crypto/ocsp/ocsp_srv.c | 101 +- crypto/openssl/crypto/ocsp/ocsp_vfy.c | 395 +- crypto/openssl/crypto/ocsp/v3_ocsp.c | 42 +- crypto/openssl/{ssl => crypto}/packet.c | 122 +- crypto/openssl/crypto/param_build.c | 389 + crypto/openssl/crypto/param_build_set.c | 121 + crypto/openssl/crypto/params.c | 1299 ++ crypto/openssl/crypto/params_dup.c | 235 + crypto/openssl/crypto/params_from_text.c | 230 + crypto/openssl/crypto/pariscid.pl | 11 +- crypto/openssl/crypto/passphrase.c | 353 + crypto/openssl/crypto/pem/pem_all.c | 94 +- crypto/openssl/crypto/pem/pem_err.c | 74 +- crypto/openssl/crypto/pem/pem_info.c | 182 +- crypto/openssl/crypto/pem/pem_lib.c | 150 +- crypto/openssl/crypto/pem/pem_local.h | 167 + crypto/openssl/crypto/pem/pem_oth.c | 6 +- crypto/openssl/crypto/pem/pem_pk8.c | 221 +- crypto/openssl/crypto/pem/pem_pkey.c | 447 +- crypto/openssl/crypto/pem/pem_sign.c | 11 +- crypto/openssl/crypto/pem/pem_x509.c | 2 +- crypto/openssl/crypto/pem/pem_xaux.c | 2 +- crypto/openssl/crypto/pem/pvkfmt.c | 659 +- *** 594793 LINES SKIPPED *** From nobody Fri Jun 23 23:20:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QntW94bd8z4g664; Fri, 23 Jun 2023 23:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QntW91KBmz3Qy0; Fri, 23 Jun 2023 23:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ayAdrK4y1nfMaC5pVOSkcLYQ+EPiy0xtNFsJae/QaLQ=; b=XkKoISorS4Oiv8BS6mBw7irlog7fH72m7G6hlD9X85HqmNr2p2MocbkE1chuTN8bozSe/r XKI7jx4OFadkWEGWDg7QialehT3Isb2PG0JEBLfTlaCyCW+YSyA2ea/zyoEJdFwa6DyO6W mUNQ4F71Cz8sRFArHw26aZl0QimDRKYBWZae7MHCFfXxJNvKnV/J0EScD9KyOnlWjmSV8F We9Gr+t68ztIlrMaxYN3nfTxB+ETDJEgCl/K021a1FSRGoXoj6IzT9US/eCMvIyh6cGGJD dkXgk8NjfCzZteYIATIeTDovoWvK7M5j+S/H5sN77wDadNMi3nsYBHsIM1DapA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ayAdrK4y1nfMaC5pVOSkcLYQ+EPiy0xtNFsJae/QaLQ=; b=Mqm985K3GKx8ZpPRUbKrtH2mrSKOzcXFo7+n7ingpj9jwMBaQkOL0piLH935jB9Ex0y0iW 8oe8k/OZrhQgxvHsUBzDzrM/DeeQG/nCsZqjMX84Rhv1iX706tyIvp30fcb5eyh11NZk8K S3dwhNU45XNJwLsXr5Lem5+m7G79hYk4FLNItgMbgOcxR/9KylXpQ01eUmdQhsn4eISZwP xoVoSdG9gs3888hyy0Sln5C4Hau5+V4D/afq340WSZbo1zGd3kJpHntbjc/b/EMBRDJvRG RjjnOIUQh2ot6deO7KJH8EAA/HIdfAurQiiH3pGuLnXWxJiEwlq/giH6QYipDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687562405; a=rsa-sha256; cv=none; b=dt3MZ8eU83P2JA2hJ58vY3HxuqLYmUhvZ4qdFoJs45McuNbuErJ7Zq7+bsbG6IiHWRN8wO rD+WjWEbp+5jyNRvZEXiZLP4Ihg30haP1wpYOVuhuS4I0e1aPOgznAK+4oIzcpmepdgEG9 EwnlRrpcFcnjsI1yVn7R+Zb9xVXbLS0PcWj0nkHf+rmjlPdSBmT1Cd2S0BWUJZmnJfxa8X o7uKYBEI2TdJ8miVNFYAxysjJs5BdHmj5lZpK59IkbjXnkbaP/4xXOqDUbIuBOIHFwNxsc wVckmin+LmcTm1mZkfiNBHWnS8K622tqTrEAkExWNyf5WuyFfH6d3dOeqbbGLQ== 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 4QntW90QFHzNrL; Fri, 23 Jun 2023 23:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NNK4fv046949; Fri, 23 Jun 2023 23:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NNK4C3046947; Fri, 23 Jun 2023 23:20:04 GMT (envelope-from git) Date: Fri, 23 Jun 2023 23:20:04 GMT Message-Id: <202306232320.35NNK4C3046947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5abd4d378e38 - main - kerberos: Request the OpenSSL 1.1 API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5abd4d378e3807f44686b8087f00cd438ec602ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5abd4d378e3807f44686b8087f00cd438ec602ce commit 5abd4d378e3807f44686b8087f00cd438ec602ce Author: Pierre Pronchery AuthorDate: 2023-05-25 06:25:18 +0000 Commit: Ed Maste CommitDate: 2023-06-23 22:53:36 +0000 kerberos: Request the OpenSSL 1.1 API This is needed to build with OpenSSL 3.0; a future update should switch to using native OpenSSL 3 APIs. Sponsored by: The FreeBSD Foundation --- kerberos5/lib/libgssapi_krb5/Makefile | 1 + kerberos5/lib/libgssapi_ntlm/Makefile | 1 + kerberos5/lib/libheimntlm/Makefile | 1 + kerberos5/lib/libhx509/Makefile | 1 + kerberos5/lib/libkdc/Makefile | 1 + kerberos5/lib/libkrb5/Makefile | 1 + kerberos5/usr.bin/hxtool/Makefile | 1 + 7 files changed, 7 insertions(+) diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile index 3d50b002d9c9..06dbe2dd8174 100644 --- a/kerberos5/lib/libgssapi_krb5/Makefile +++ b/kerberos5/lib/libgssapi_krb5/Makefile @@ -83,6 +83,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/roken CFLAGS+=-I${SRCTOP}/contrib/com_err CFLAGS+=-I. +CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L .include diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile index a6860d54add9..9a56bb23fe30 100644 --- a/kerberos5/lib/libgssapi_ntlm/Makefile +++ b/kerberos5/lib/libgssapi_ntlm/Makefile @@ -44,6 +44,7 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/ntlm CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/ntlm +CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L .include diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile index 03f37a6ad71d..51031196b38e 100644 --- a/kerberos5/lib/libheimntlm/Makefile +++ b/kerberos5/lib/libheimntlm/Makefile @@ -9,6 +9,7 @@ SRCS= ntlm.c ntlm_err.c ntlm_err.h INCS= heimntlm.h heimntlm-protos.h ntlm_err.h CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken \ -I${SRCTOP}/contrib/com_err +CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map MAN= ntlm_buf.3 \ diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile index a17216d254a6..c27602162455 100644 --- a/kerberos5/lib/libhx509/Makefile +++ b/kerberos5/lib/libhx509/Makefile @@ -216,6 +216,7 @@ CFLAGS+=-I${KRB5DIR}/lib/wind CFLAGS+=-I${KRB5DIR}/lib/roken CFLAGS+=-I${SRCTOP}/contrib/com_err CFLAGS+=-I. +CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L GEN_OCSP= \ asn1_OCSPBasicOCSPResponse.x \ diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile index e98967d0c3d1..cc8ecb9d8387 100644 --- a/kerberos5/lib/libkdc/Makefile +++ b/kerberos5/lib/libkdc/Makefile @@ -32,6 +32,7 @@ CFLAGS+= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/hdb \ -I${KRB5DIR}/kdc \ -I${SRCTOP}/contrib/com_err +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L .include diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index 2f3304dc4e7d..6706bd7f5b74 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -626,6 +626,7 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/base \ -I${SRCTOP}/contrib/com_err \ -I. +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L .include diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile index cbae762b3091..325af21399eb 100644 --- a/kerberos5/usr.bin/hxtool/Makefile +++ b/kerberos5/usr.bin/hxtool/Makefile @@ -10,6 +10,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/sl \ -I${SRCTOP}/contrib/com_err \ -I. +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD= hx509 roken asn1 crypto sl vers edit SRCS= hxtool.c hxtool-commands.c hxtool-commands.h From nobody Fri Jun 23 23:20:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QntWB4NX5z4g68X; Fri, 23 Jun 2023 23:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QntWB2jm9z3R0D; Fri, 23 Jun 2023 23:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rspRtAbsyC1b7Hd5YYnRg8k+AIjcZGA7iFyKyghFLaM=; b=xuYW8aIAhULfIrx8TJjRnIdn12YaBm8Gylywyj/Dnp+mLlcdterLLOtSsmh442OCJNdzdi fMFVGPF+B2Hb5fFBUr96Nj6FD7SsHPqjiElaIQPPIYQqEoq/YTeMhbCiRYfNo5f8pxJeg6 yjl2z5Rjglrj32zNX190Sb7BLeTpiaRZu02nEHA8Q4sGv+l/gUiWp8XfRob3MHvUfUhVjb hgVRxnrDj8nKlXLpvslIAuluZ8elszL/GmwdYlQ06TvUZKoiF1SxVsmilZBtvBjMC3k9Gu ClkJfVTDhkNeoTaAO7Hg2657B17ru3h/piuknLqIlvUyn+UTZlNPD+clSjYOCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rspRtAbsyC1b7Hd5YYnRg8k+AIjcZGA7iFyKyghFLaM=; b=YifpqVtwY4DongZz3ZjadsKTzOZhE0ECwOJi0YCuWA3e00GpiHwJRydUlN9KeNRjrxYPJP 35j2HhehDjZQ+pXqdMD4T9V4N5xgJTjAv8idMj9sYr2Og4uKmBm+/qetgNdrnD8od9zyb2 t2qg1tCICskf42VIa8eoi28qRl+kou7f4p03DEg50glCaMePDXYjobElgbLEUi2LxOuHvA in3DGcz9W3JAnl0l0gP8WP4D6kvDI3XNw8x5iVAdJrgmwf1mKUN/D7ojuk9fxsJHXbV/o0 +6AFFEUgzpU9fE2jVImTCCCz1MKS5mhKYEpUjShGzaUuckVZg6tSi8HejsmJ/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687562406; a=rsa-sha256; cv=none; b=KYCy6hFP38ZdYIKSh8p76mgd3K0WcSRJc2osYZdJ83pOrossEoik/c02fD3nf9OkVTONuM NlAt6opOr/4o8DLyAvrZmH9dFfPDYiNmm9Janxqb/k5MvWVLaClplcY69BGSwWnwre+3kC fAYeYw6VjeHlvN+F6Bkqb7/o/TQRYYQdbbyZtnLTVCOWYp2uQMFk2qGSKMmivyRfqP1zhP oHPIUCB1B9y0co3v9yvSKTF/wDjXrqz92gbWSQjlAEPyKEVkg9qHvKYhfCBRlgQUlVoe9p sVpRrEj0odPq8SkixtzmN+XUsAzrFzsgSXl39M4uUKFyFGM+Ckhis0KNOUNm6Q== 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 4QntWB0hJdzN12; Fri, 23 Jun 2023 23:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NNK6xe047205; Fri, 23 Jun 2023 23:20:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NNK6Hq047202; Fri, 23 Jun 2023 23:20:06 GMT (envelope-from git) Date: Fri, 23 Jun 2023 23:20:06 GMT Message-Id: <202306232320.35NNK6Hq047202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e23d45187b28 - main - libarchive: Avoid a build failure with OpenSSL 3.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e23d45187b287ee7a5c49c8b993daa9e6bb3ad97 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e23d45187b287ee7a5c49c8b993daa9e6bb3ad97 commit e23d45187b287ee7a5c49c8b993daa9e6bb3ad97 Author: Pierre Pronchery AuthorDate: 2023-06-01 18:17:10 +0000 Commit: Ed Maste CommitDate: 2023-06-23 22:53:36 +0000 libarchive: Avoid a build failure with OpenSSL 3.0 This is a minimal workaround; a proper fix will come via a future update from upstream. Sponsored by: The FreeBSD Foundation --- contrib/libarchive/libarchive/archive_hmac.c | 2 +- lib/libarchive/Makefile.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/libarchive/libarchive/archive_hmac.c b/contrib/libarchive/libarchive/archive_hmac.c index 012fe1596211..0914f38e3670 100644 --- a/contrib/libarchive/libarchive/archive_hmac.c +++ b/contrib/libarchive/libarchive/archive_hmac.c @@ -238,7 +238,7 @@ __hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len) if (*ctx == NULL) return -1; EVP_MAC_free(mac); - params[0] = OSSL_PARAM_construct_utf8_string("digest", "SHA1", 0); + params[0] = OSSL_PARAM_construct_utf8_string("digest", (char *)"SHA1", 0); params[1] = OSSL_PARAM_construct_end(); EVP_MAC_init(*ctx, key, key_len, params); #else diff --git a/lib/libarchive/Makefile.inc b/lib/libarchive/Makefile.inc index a03f87d7b6c3..3740beddc70f 100644 --- a/lib/libarchive/Makefile.inc +++ b/lib/libarchive/Makefile.inc @@ -12,6 +12,7 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" CFLAGS+= -DWITH_OPENSSL CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD+= crypto +CFLAGS.archive_hmac.c+=-Wno-error=cast-qual .else LIBADD+= md .endif From nobody Fri Jun 23 23:50:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qnv9v6yT2z4gfFk; Fri, 23 Jun 2023 23:50: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 4Qnv9v6VXsz3tYG; Fri, 23 Jun 2023 23:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687564211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0mmMTXpprts4lFKWUg8Woss2kUWoxaoTUrUUIvXl/DE=; b=u2rsiDRvc6vcMsJVJMP8DPWKSl8MAWYmtJTA60xnxmn63wE2iOpHHWlNY/lseJ5a9vGR2U 98IOM8Dkah/tuoQByUYmrgLMd8D/k+CJEypJC3wDb1CPAH3hyn1JjmXj03hT7Vi3YzwrMi zkuHUng8lz1Nf8Zl18y8B3+y3PwC9Z8LS0RWOEqTxJO+hmyNXqnkkgoAzWkq1vZC39jIed UvoFpkOVqwRZXSW4TmZRZmWKlGsYY2DAZON8dtypgYJCIH86ASz3azkojWkovaskLQ95T/ nMUkGIRZVlHTqHYseLvPP42WsdFtQwzODP0zlmMfqayqIVcc5agiMTXGum2zqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687564211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0mmMTXpprts4lFKWUg8Woss2kUWoxaoTUrUUIvXl/DE=; b=pNraUJthxQw4hdFmPf1fP8B7TfqQ0D8xuAivRQjFrB2tfjoHq3ClSVqfwCrgN/ZGAgASR6 zRn1gEfsXB/4AcCWzVfHLg8mdw6IMQFuK+eA1B6wbZORzBmTu7dZdnmEjbnPFDwrYdW8xL ZJOrRc4Q5RRmjEFev+megEHd69BkZUiieV3wMvYMDzlJ7rSW8yAoF/Y6ZmnAvt70S7nUVJ tdnoKsNzPzL9+gss16ex7eehqGWugeZMsx4M3Lt7QLJozE8S+ETQomoTckZgu7kqixU5nr sga4q+8s5xpB7c3Rp/b/2NmKzQA+2N4IOnLh5bcVJ7teleqP1Zph4fKlle+blg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687564211; a=rsa-sha256; cv=none; b=tP1tIS/pA67MENxbrZzMt0oo2Iqwi9y1AFGsfC8uAhsAa0YhEUhdSNfLBQoNRY0DCPjTHn C0QxYvDcePSkpGDaUPwwzTyTxvdsGmXu14I1s1ssDxkWUjJGklecd8S0q+gZ+Vr0csnNZW AnS7VGPZusq7GtaNfch5hGJZKZaWniN5LnYpBkZvs606sQ5eIYt+itpfdkX8xU5yBrHki3 3moY1Yd986Q6ssvt+j6K5uOfbZXGJCtS/c/OZ/8OaVM0p6XaLPw1r69MevZKOKBxCfq3hp mURkmzFxmXppiTyHCvAUKlXtuz7mWHftvNBMitBc5qteoZs8rBUWWJ7RpWV5PA== 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 4Qnv9v5bS9zPbF; Fri, 23 Jun 2023 23:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NNoBd0098697; Fri, 23 Jun 2023 23:50:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NNoBgZ098690; Fri, 23 Jun 2023 23:50:11 GMT (envelope-from git) Date: Fri, 23 Jun 2023 23:50:11 GMT Message-Id: <202306232350.35NNoBgZ098690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: e8efee297c6d - main - radix_trie: avoid reloading radix node List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8efee297c6db8b1adfa7e5a10cd5a340564cb7b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=e8efee297c6db8b1adfa7e5a10cd5a340564cb7b commit e8efee297c6db8b1adfa7e5a10cd5a340564cb7b Author: Doug Moore AuthorDate: 2023-06-23 23:47:23 +0000 Commit: Doug Moore CommitDate: 2023-06-23 23:47:23 +0000 radix_trie: avoid reloading radix node In the vm_radix:remove loop that searches for the last child, load that child once, without loading it again after the search is over. Change KASSERTS from index check to NULL node check. Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D40721 --- sys/kern/subr_pctrie.c | 2 +- sys/vm/vm_radix.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index d4262e32be51..043c31ad9501 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -749,7 +749,7 @@ pctrie_remove(struct pctrie *ptree, uint64_t index, pctrie_free_t freefn) if (tmp != NULL) break; } - KASSERT(i != PCTRIE_COUNT, + KASSERT(tmp != NULL, ("%s: invalid node configuration", __func__)); if (parent == NULL) pctrie_root_store(ptree, tmp, PCTRIE_LOCKED); diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 6848f0b2c30e..cc932a6cc80d 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -773,13 +773,14 @@ vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) rnode->rn_count--; if (rnode->rn_count > 1) return (m); - for (i = 0; i < VM_RADIX_COUNT; i++) - if (vm_radix_node_load(&rnode->rn_child[i], - LOCKED) != NULL) + for (i = 0; i < VM_RADIX_COUNT; i++) { + tmp = vm_radix_node_load(&rnode->rn_child[i], + LOCKED); + if (tmp != NULL) break; - KASSERT(i != VM_RADIX_COUNT, + } + KASSERT(tmp != NULL, ("%s: invalid node configuration", __func__)); - tmp = vm_radix_node_load(&rnode->rn_child[i], LOCKED); if (parent == NULL) vm_radix_root_store(rtree, tmp, LOCKED); else { From nobody Sat Jun 24 01:45:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qnxkl4lgnz4hJxv; Sat, 24 Jun 2023 01:45: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 4Qnxkl4FCHz3hXh; Sat, 24 Jun 2023 01:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687571119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfA2Xf6915SukldxUjZfB3uIT9i98InStohRLsJNmgs=; b=OzAy7GwuqCZStvJZNhiizRMJVZwd+1bSGBBjvxnEZ7Ve9a7MEgxvAS5jQdfsZ5MIJX44G4 uv/LMoiJnTzkCKbMyQCgsrjuifEXMlVb+LeBohew2Hpmhy0B+IW88++VW5O5ABP32qdeFI D6Ug5rFWxkapaWgl5FPZp/YmxTqhcZDQkMvBLYbBtyvwktGdERzxfk5d5cES5DPFtU7Ly8 0fLuDuH6WwMt3Nnm6cIrniiPsiwDDnzVEDoNxwPmF+pkWfHuh5PDmiZnZf7Hllgq+Sx6np 13olwsMybHYndrXQ9ybbieZXscYqyXhiMoyKHGTsPFHYIw2lTj3DyMOIlKuKZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687571119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfA2Xf6915SukldxUjZfB3uIT9i98InStohRLsJNmgs=; b=xCbSZj5SorIGPZV5yzOfwuiTX66d85NYZSWrCQu4WvwMHbB+q8qhOBn2W8U77QpLNQ1J/b KQAV7nwMaVzm3MlsLax8k9sblMqyyKM/ZYHmMlo0ddOcC9LgMeNCBcvOnTsTbctvWXDqSl nO9oNFij8k/qlT5vxxvbaDP8VxdTRA481rjhH2uqSciHqsQH4UV2Rkh+WDfEfhRrZBfRdz QWhrocCGhkhdXL87eKGN6E7CHXtqUl6wEHQ/6UugyU9Q7XgYMq0GBaUm9WOSxchZraD3qC xNiEq20SiJ3Vr5scb8I+h7MehxdPzWP4vaUzvCXO4S0U4RTodx0kGTOY+W80wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687571119; a=rsa-sha256; cv=none; b=G3g7XwOJ5UFQVZkvCG9MwrgC96xTQxOTCmP/ZofFy8xdixjd2pa+02nOHNDiYPdxLzM1mk Gsvzd7a/fUBwVXuR6xsm8vTe0GRR1B2Zfs7i6KsBStt733Covp3qkKKbCq0busBY1/rveY 5ClfyfYi5gKlIHBlnbgnOm06vNJE7JvWhsrymv/n8sJTEtI99lz7hdGsDsAb7v3faBG6gA /KLkhCqvBAJto7XIIdt/NWfB/lI33/mUqhleLu0FDjs3Xy43ZoGOFvirlOnbKMnI9UIocj khuIVNQf3a+RYtqTxv/+H+P9LapMQZIKkHKNNfpeZfyjq9nwCl6GYwtejHlT4w== 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 4Qnxkl3JkzzS1b; Sat, 24 Jun 2023 01:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35O1jJwI090069; Sat, 24 Jun 2023 01:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35O1jJaD090068; Sat, 24 Jun 2023 01:45:19 GMT (envelope-from git) Date: Sat, 24 Jun 2023 01:45:19 GMT Message-Id: <202306240145.35O1jJaD090068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: bc1027a77851 - main - libfetch: remove all old OpenSSL support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc1027a7785166fde9c2a3b48e6e70d198377d4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=bc1027a7785166fde9c2a3b48e6e70d198377d4b commit bc1027a7785166fde9c2a3b48e6e70d198377d4b Author: Enji Cooper AuthorDate: 2023-06-22 03:53:54 +0000 Commit: Enji Cooper CommitDate: 2023-06-24 08:45:02 +0000 libfetch: remove all old OpenSSL support This change removes pre-OpenSSL 1.1 supporting code and removes/adjusted preprocessor conditionals which were tautilogically true as FreeBSD main has shipped with OpenSSL 1.1+ for some time. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40711 --- lib/libfetch/common.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index f2122d7f45c9..8f3f1c5db30f 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -950,24 +950,8 @@ fetch_ssl_verify_altname(STACK_OF(GENERAL_NAME) *altnames, const char *ns; for (i = 0; i < sk_GENERAL_NAME_num(altnames); ++i) { -#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * This is a workaround, since the following line causes - * alignment issues in clang: - * name = sk_GENERAL_NAME_value(altnames, i); - * OpenSSL explicitly warns not to use those macros - * directly, but there isn't much choice (and there - * shouldn't be any ill side effects) - */ - name = (GENERAL_NAME *)SKM_sk_value(void, altnames, i); -#else name = sk_GENERAL_NAME_value(altnames, i); -#endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L - ns = (const char *)ASN1_STRING_data(name->d.ia5); -#else ns = (const char *)ASN1_STRING_get0_data(name->d.ia5); -#endif nslen = (size_t)ASN1_STRING_length(name->d.ia5); if (name->type == GEN_DNS && ip == NULL && @@ -1204,16 +1188,6 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) X509_NAME *name; char *str; -#if OPENSSL_VERSION_NUMBER < 0x10100000L - /* Init the SSL library and context */ - if (!SSL_library_init()){ - fprintf(stderr, "SSL library init failed\n"); - return (-1); - } - - SSL_load_error_strings(); -#endif - conn->ssl_meth = SSLv23_client_method(); conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth); SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY); @@ -1231,7 +1205,7 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) } SSL_set_fd(conn->ssl, conn->sd); -#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) +#if !defined(OPENSSL_NO_TLSEXT) if (!SSL_set_tlsext_host_name(conn->ssl, __DECONST(struct url *, URL)->host)) { fprintf(stderr, From nobody Sat Jun 24 02:17:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnyRJ5f7gz4gYjD; Sat, 24 Jun 2023 02:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnyRJ55NYz3sr8; Sat, 24 Jun 2023 02:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687573020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2UxiIb3OVRv1Pw1EDk2bnCQyXC8p0qNzbPXArke2Hw=; b=IG6jA2AIuHFMmpmtUKS2gtZ9GX/GTCauuYWADu7sHQYreZzxbLSFfUhvFo07xxGt6Z11N8 uOVt2sIo8g7A3cD8FcO7xRIdUAbKIvxT0EiOO1WF/sfDceclYK7ud7kwRK/YBLpVVsUw0v 0DrmYUIWwJQTM85I1QVXgBSpz+uibbEv58IIZwsvB4Rtx8Gf4rKzFIAZ13Cz8h4E5e1YZZ Kku+eYg4i3HiLtndYv4FxSB/v+oew5fojAU+qMQCK6nl6gonfFVs5l0CBCUaqURTPt5b/q 1LRqkXiMpqfJ6YN5F6o4k36T+Uv/kpcnzSZdjKzviZGAy37l2gxcXUkXH39DIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687573020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2UxiIb3OVRv1Pw1EDk2bnCQyXC8p0qNzbPXArke2Hw=; b=qJTCrhSp1G/ecQtRJv0SZMDgiJAvz6YLbOd1G1aYebANOXA3DNwcjDYs7o3qxd6j85kkHw abGubVMBf5am/GyJ4puHoBdUTpKFp4fy9Wnz0QFg5RSFhUFB6aW6o6QxU7pe/uh8P843Qn qgTa1ovPibE9+MawM1M+aqpwG/etrxtjdny7T98tcprHd/offxthQUzHBSjX9mKKr5KG9q DEva/fjb5xfJgGXeDD0LJ48pRaoWT+xDUyfrhJzug1lqhVichT5MfpNeN7RXRWG7L02ZYY dXadyPt5Kuno4hCRb2hrD4CHcGWIjzloCyot8RvaSNoQi+qorlVQvakkqzbkvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687573020; a=rsa-sha256; cv=none; b=KfBUMJKWnrDZ+OSNIQ1XTJkht5ZPiYag8HwLYUwdVlv0sW/E7p4okAbcAH7GevScAPpCAb ZCvbBbjUNBimeYkpBqeRI6s51an6fXoryFuIkYcSPLEn6ikjm9q+CtTUDrxDGyWwDNtPmG wVWjPNjWX4zIwDkqpaUjakbrqkYDHBNe8WRXijCyCPfXTGMtr7EkjZ+uSdJ0dXmuTeVYV6 SElnRlBSQEbnmiw5motB+UxKG0cC3Lqs6HsvbgY7L007mfR7MnI6qSgP85oCwhVLrLgux9 jMCMUzWWrXCL8B0WWvBA3/heGBIqNqKBfH+d9tHw2WyVhD78l3Skt3vgERpYzg== 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 4QnyRJ42sGzSmv; Sat, 24 Jun 2023 02:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35O2H00R040480; Sat, 24 Jun 2023 02:17:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35O2H0AI040479; Sat, 24 Jun 2023 02:17:00 GMT (envelope-from git) Date: Sat, 24 Jun 2023 02:17:00 GMT Message-Id: <202306240217.35O2H0AI040479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9ead001d5b42 - main - Bump __FreeBSD_version for OpenSSL 3.0 update List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9ead001d5b42ef9cba04757c9e7ee74c06037139 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9ead001d5b42ef9cba04757c9e7ee74c06037139 commit 9ead001d5b42ef9cba04757c9e7ee74c06037139 Author: Ed Maste AuthorDate: 2023-06-24 02:15:39 +0000 Commit: Ed Maste CommitDate: 2023-06-24 02:16:34 +0000 Bump __FreeBSD_version for OpenSSL 3.0 update Reported by: bofh Sponsored by: The FreeBSD Foundation --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 0cc9ec0c8733..904eb9825b92 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400091 +#define __FreeBSD_version 1400092 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sat Jun 24 02:56:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnzKR6dMLz4hCBV; Sat, 24 Jun 2023 02:56:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnzKR6B2Kz47GL; Sat, 24 Jun 2023 02:56:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687575419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5+fyoAzmDmHUavZyRlmMHaAlaSA0/D6dKODV6sSLFrE=; b=RiyI9LGpioLVRWu7fAwBLm1nUneGfV55UHBxU5B50Yedq65Xho8dK/cwMoBeD95K7ylGaL eO/ke3PuxDft6pw/3cVp3R2LUG9Ax1u0kTnCxaLVqlD/v/kMl88SW1N2ZIhZ1Ex0RwQBK1 ixfyBZRo9vdl12uhGBBPaMTC7kP0lEriPD9V6VJOlLNm3W2bvYJUBX4NQhw27dtFsgqFi7 mCLa9uF6d3DfP3eeY0UB9CQ1Dhh+++Daewr5JYz52QOovQZ4IJFKO8103A49vONkFqb8N2 uYqK8tPEpav36n3kSo1GKCtHuiSJnd2FeMJKw+qJw9revuKH9ai85z3eEp1Jng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687575419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5+fyoAzmDmHUavZyRlmMHaAlaSA0/D6dKODV6sSLFrE=; b=ZMFSajTtvuub7s7Kik3vSC/O+BD1YmIxTFLwUk+WNGNUudgOjiA8rN9k7tGZzvQcqlrcih wXGaleXyc/pxKn3fsaqq//sy2roEH9pCRbKBLakoADb5MLDkUQHftN0/KZXsDY0jWDZ6Il jMpzpmrIJcPzlrBjU08AEYmA28HReD/oPVc6vTmYGiLUfNLi+vi23s6HzMpeHbCyeumasX QCxqNXGj5VgVCEFu2VmxqwgBdvSLA30wqtDW1h9JLbKn0G6cgwTwCYMiCaoWRh69eKIJvT Lu7rjA1bFhv80UunwJtoLUysVeZX2v6y4vSxUUKFgYYGb9CGOqpZb7whptNr3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687575419; a=rsa-sha256; cv=none; b=I4kI3YrqrCcyIB61ZAZIMHyJyxEeKz0eQFx3W8YGB331epirwhtex3e7/TF5kTeo2X1kLU AY9599UNhLZtjQ0OfxqaU29E+vpMm7Zc8r6NscnTpkHnRklvCTeacO9vNjhGFma3tx8r6U rPui2Jbu6CeJwpNTqTC+Qlh5ROGSYqxEmW13+iJz0NpZ0gELoIAh5mB7EmPrvaBePok8bQ LOxy27dn+vQ5b1vjiDS67hFGlIokzdeKDzSI6yW1q62UuL6bosu+cDV8u0qGRjBLOUFxVJ 6+/OGWlzkHFSu+ShYo4IM2IjkpsPZ7300NBy2wMSSc71ZefY5SiOVjR2PbuPSg== Received: from [IPV6:2601:648:8680:16b0:957a:317a:2f77:b456] (unknown [IPv6:2601:648:8680:16b0:957a:317a:2f77:b456]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QnzKR1L0Bzjl6; Sat, 24 Jun 2023 02:56:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Fri, 23 Jun 2023 19:56:57 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: git: b077aed33b7b - main - Merge OpenSSL 3.0.9 Content-Language: en-US To: Ed Maste , Pierre Pronchery References: <202306232319.35NNJsPv044302@gitrepo.freebsd.org> From: John Baldwin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org In-Reply-To: <202306232319.35NNJsPv044302@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 6/23/23 4:19 PM, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b077aed33b7b6aefca7b17ddb250cf521f938613 > > commit b077aed33b7b6aefca7b17ddb250cf521f938613 > Merge: b08ee10c0646 b84c4564effd > Author: Pierre Pronchery > AuthorDate: 2023-06-23 22:53:35 +0000 > Commit: Ed Maste > CommitDate: 2023-06-23 22:53:36 +0000 > > Merge OpenSSL 3.0.9 > > Migrate to OpenSSL 3.0 in advance of FreeBSD 14.0. OpenSSL 1.1.1 (the > version we were previously using) will be EOL as of 2023-09-11. Thanks to everyone who has worked on this project! -- John Baldwin From nobody Sat Jun 24 03:14:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qnzj854y8z4hJ8V; Sat, 24 Jun 2023 03:14: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 4Qnzj84TDdz4CMK; Sat, 24 Jun 2023 03:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687576444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oV1cTfi4dtzMVeALPc8RdMAtbis2shdHeMcLObVr3z4=; b=gYdqqriKQHiRCwMG4O2aZYlawT3S4uh8Fdy9FnHwR30A50rm7I3lQFMd9klMfMO23oV5iw qnDUBHKhao/U/xWwpoycCwuM/rUoTExKU3/il8Jgt8NHguXFDxoVk11bq/6/0ngFYlXlQw +SXskmOW0xJd1YymxIRzevgg6pshmwdOa6sa53YRPeXlGqfwoDkw++SQo0xw3XEsr/lUL5 qyy/sWZHSAX8HXSn/9+nWkULyS7yxLBnXhVjXPgujr835gdzgSX/aU6ssEZLGA8zob5Dap ACpwwBBY1njb3cOIGbVKZkhacnaCXbtwKcySN5iG2fCsPJGNt7Kl2MOd7UQDtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687576444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oV1cTfi4dtzMVeALPc8RdMAtbis2shdHeMcLObVr3z4=; b=XamNgetlzPYnNWysz13Fl7B/vgQ6AHhqVmM38JF10aS+EIwg40bze0OrhLToUF1rVlb4Jb WG5Qm0zMx0EH4BFFN8+uQ3hdNrbGB8itSCdTzubqqi29vicqdgL5EBSCxUJDc4bghP1YTu /RkIc6GQtDFnH2AMWesifLJImnCqE925HY1+TuSDCHk5PkuLEFjIA2RJuVjvLeObQVC0XC k+R3mnULhp+am4pModaI1ouaboWAUSgC+5pO9B9J4oykyfq6hHMKwKVCNkWN6qzuLZMi9l G5+CZp94zcue1gfoDWutmZ9Dkzu8dsSXHIYJtZ5UpIRddlkgGSI2lI8y/tP4uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687576444; a=rsa-sha256; cv=none; b=SP7cRFjAuQDiTvkY4OAntu3xGpVPcpS5KcDi2zW7YTCU+/28hug2lGbblvxGumXFRtyGWK 4T+pnTLLnTWx+lSyGqAxF64O0dzRzHH6fqMHyeYHfnXAaPt3BWpGzl8Kv7t99smgoxDqH9 JoCJB8O5uzOnKe7n4izaSSUnu5eptYQ4Px3DWjiNjtLOYsOExbUmIRBQQwD77rwEbJ3UIu HP1CUGP5AN2/sg9Y9sV1ind7suX6nMr+9/Cp2uazvb8+uApz/sRwUIrop9QnspRd0K+qeQ ch/IE7kLcev4YKHNAcEGBQzvpus6CMVGdB0HWIDJHYx9pJFWQO7iSOOMgANVFQ== 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 4Qnzj83XszzVCT; Sat, 24 Jun 2023 03:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35O3E4wv040884; Sat, 24 Jun 2023 03:14:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35O3E4F9040883; Sat, 24 Jun 2023 03:14:04 GMT (envelope-from git) Date: Sat, 24 Jun 2023 03:14:04 GMT Message-Id: <202306240314.35O3E4F9040883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 6f6446b33064 - main - Do not expose architecture specific symbols List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f6446b33064f099e7c20c6465116a91bdf0e141 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=6f6446b33064f099e7c20c6465116a91bdf0e141 commit 6f6446b33064f099e7c20c6465116a91bdf0e141 Author: Enji Cooper AuthorDate: 2023-06-24 09:13:31 +0000 Commit: Enji Cooper CommitDate: 2023-06-24 10:13:45 +0000 Do not expose architecture specific symbols The following methods have existed since 1.0.2, however, they are deprecated and are not available on all architectures. - EC_GFp_nistp224_method - EC_GFp_nistp256_method - EC_GFp_nistp521_method Do not expose them via libcrypto. Discussed with: emaste --- secure/lib/libcrypto/Version.map | 3 --- 1 file changed, 3 deletions(-) diff --git a/secure/lib/libcrypto/Version.map b/secure/lib/libcrypto/Version.map index 44668072ca63..421819324961 100644 --- a/secure/lib/libcrypto/Version.map +++ b/secure/lib/libcrypto/Version.map @@ -1084,9 +1084,6 @@ OPENSSL_1_1_0 { EC_GF2m_simple_method; EC_GFp_mont_method; EC_GFp_nist_method; - EC_GFp_nistp224_method; - EC_GFp_nistp256_method; - EC_GFp_nistp521_method; EC_GFp_simple_method; EC_GROUP_check; EC_GROUP_check_discriminant; From nobody Sat Jun 24 05:23:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qp2Zb3PNrz4hKbX; Sat, 24 Jun 2023 05:23: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 4Qp2Zb2kkSz3PwP; Sat, 24 Jun 2023 05:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687584215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ltRgHQGO6X+YycW2xGtHWhrakoDBA0pSqQXLOss5r8=; b=JCkZOQaeNBwOqerqq/8XUW90A8Tmez2f2Ydh2mL7WJK7v4d4H1gd67DSloTUJ/vu7So9Bw qLiel0y7uFALxZ5EWnzxqxqeMtFyn1CLn6P7w064ilDLv6H0Y/WlzTQ4qc2ieLvE+clY1U 3pcX7xnSkoPtrytmy7Od5CxwZkQxy9qLszLBdrHbFotvb5QhV8zgzVudue1hZ82w6D2ooi xbkH5uTa0qyRsrrpYWp2kodxrZFplBSzfvdSCvVOEjD23IeJtrU41WrFDLlMuHQGyJpm3r SUMTR7qc53W7gJcRx0jWg9IfUJF4CQeODziI2eg1yh5Um91FKOLZJ51NdZx+Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687584215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ltRgHQGO6X+YycW2xGtHWhrakoDBA0pSqQXLOss5r8=; b=gjKEgg/FkciZTjiF2QqxBisj1AUAfPeReQotZKcyo70hgX9CSG1y2gTeNR420kMQJzLZHB jmFz97R7hgM8TzTMq7+PYb0SuBGV09pwdiF5Z5a+StO4k+xN2luqlqA+QDJ5doPXqDYn1S no7w+BjCtdJnFLQSYz7JPwMUB0R/Nk0kSitGrh/4L/ODN5TJBpIkGF41wcw3PwFx2x2/vM 4enXwkwPJp2SbOqVwP4KCdk83wMd3RWJOwskXhc3nqUavlxy1oQwOuYpOl0UzMpu3BrSKp Eor2KagyCz7aM1iyJ0ibNQ5CuFufxzfbzJwGhp3DiMwqBS4Mn3mZc+0Ky7DeVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687584215; a=rsa-sha256; cv=none; b=rEsDY3ehG1zpdkgZgqQn3MA+A8JgjDer7bkfR/MqoHqTB7tOfGrDVXW3wIhgzdfcjT3fPv RHG+o/0yU9OTJbNy5JdYswRbGt5CauGgYDiq/5b5UPAZKy+tJy2Vk2KLSqgmf+FCa698jq Z0KLDVl5ZXX2hWYOIohMjwuDAoUPOMvMwj0Wb35DyJgIuEFdkLNLNdK4+7CxuTzLeC6USJ gzYv2jFWCq6w54emv8Mt+EdtoXL9AY2Bh0QPPpKTUb8nT4y1gtgBWVl+M6+/xV1MnldPIM 2tRFmOOb5/xIqTl3Vg6JJtIEawY/0hr+muXv20WuYDTixRCAcMssy/eNgsz+bQ== 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 4Qp2Zb1p0FzZ8H; Sat, 24 Jun 2023 05:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35O5NZ8v055791; Sat, 24 Jun 2023 05:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35O5NZw9055790; Sat, 24 Jun 2023 05:23:35 GMT (envelope-from git) Date: Sat, 24 Jun 2023 05:23:35 GMT Message-Id: <202306240523.35O5NZw9055790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 59833b089e78 - main - arm64: improve KTR_TRAP trace entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59833b089e78463a561706fc03777249766aea01 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=59833b089e78463a561706fc03777249766aea01 commit 59833b089e78463a561706fc03777249766aea01 Author: Christos Margiolis AuthorDate: 2023-06-24 05:23:14 +0000 Commit: Christos Margiolis CommitDate: 2023-06-24 05:23:14 +0000 arm64: improve KTR_TRAP trace entries Follow-up of 7756232199ad ("riscv: improve KTR_TRAP trace entries"). Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40696 --- sys/arm64/arm64/trap.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 7b5c7bc61fd3..8d51c73a15c9 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -484,9 +484,8 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) return; #endif - CTR4(KTR_TRAP, - "do_el1_sync: curthread: %p, esr 0x%lx, elr: 0x%lx, frame: %p", - td, esr, frame->tf_elr, frame); + CTR4(KTR_TRAP, "%s: exception=%lu, elr=0x%lx, esr=0x%lx", + __func__, exception, frame->tf_elr, esr); /* * Enable debug exceptions if we aren't already handling one. They will @@ -598,9 +597,8 @@ do_el0_sync(struct thread *td, struct trapframe *frame) } intr_enable(); - CTR4(KTR_TRAP, - "do_el0_sync: curthread: %p, esr 0x%lx, elr: 0x%lx, frame: %p", - td, esr, frame->tf_elr, frame); + CTR4(KTR_TRAP, "%s: exception=%lu, elr=0x%lx, esr=0x%lx", + __func__, exception, frame->tf_elr, esr); switch (exception) { case EXCP_FP_SIMD: From nobody Sat Jun 24 06:42:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qp4L14MhBz4hSGP; Sat, 24 Jun 2023 06:42:49 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [IPv6:2001:1640:5::8:31]) (using TLSv1.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 mx1.freebsd.org (Postfix) with ESMTPS id 4Qp4L11FBhz4BrS; Sat, 24 Jun 2023 06:42:49 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [85.220.129.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id 7BC0C10A32EF; Sat, 24 Jun 2023 08:42:40 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id ABB3B105C626; Sat, 24 Jun 2023 08:42:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1687588958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d86LD2wcXze2YV5biNcjhKv8YQ1UsRgIsyk1g0W47eY=; b=U0o9VmEh73d+mmrOgwSn1lxz4OpNvZDjf6PChC4Q2Y+j95RGk0Mop1vRVZrCIJ/zXG3gAe z0B9yHAF4jC4YuTCwcqwR73DWEg7SrLFJsHeRLTr0vt7urUarkB/bPrbZfnnmm+T1G5y1w MuTspevJ2ZAHZ6HBHBsAdRspv0et6aK9OIXG0J08aZR++76R9+MMEajS+Qs9giAVKeV07I iPGs74X4nZfD/1YDxFrARh8m7xjkmQgK9sLWLSCuJqJUQhh+0Zeo5MiL7tvSzhCKEj5LWh NuAJHKF75cd2csSLcMZ4gd1h9aYFW3xXei9v9BdhB6hQOYWvYIZ2dLQEjluTvQ== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-183-065-213.77.183.pool.telefonica.de [77.183.65.213]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 24293105ED92; Sat, 24 Jun 2023 08:42:38 +0200 (CEST) Date: Sat, 24 Jun 2023 08:42:10 +0200 From: FreeBSD User To: John Baldwin Cc: Ed Maste , Pierre Pronchery , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b077aed33b7b - main - Merge OpenSSL 3.0.9 Message-ID: <20230624084237.1f5a5da3@thor.intern.walstatt.dynvpn.de> In-Reply-To: References: <202306232319.35NNJsPv044302@gitrepo.freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: 5f9e4c X-Rspamd-UID: e2e7a1 X-Rspamd-Queue-Id: 4Qp4L11FBhz4BrS X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Am Fri, 23 Jun 2023 19:56:57 -0700 John Baldwin schrieb: > On 6/23/23 4:19 PM, Ed Maste wrote: > > The branch main has been updated by emaste: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=b077aed33b7b6aefca7b17ddb250cf521f938613 > > > > commit b077aed33b7b6aefca7b17ddb250cf521f938613 > > Merge: b08ee10c0646 b84c4564effd > > Author: Pierre Pronchery > > AuthorDate: 2023-06-23 22:53:35 +0000 > > Commit: Ed Maste > > CommitDate: 2023-06-23 22:53:36 +0000 > > > > Merge OpenSSL 3.0.9 > > > > Migrate to OpenSSL 3.0 in advance of FreeBSD 14.0. OpenSSL 1.1.1 (the > > version we were previously using) will be EOL as of 2023-09-11. > > Thanks to everyone who has worked on this project! > + 1 -- O. Hartmann From nobody Sat Jun 24 10:58:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpB0p2wRHz4h9bx; Sat, 24 Jun 2023 10:58:18 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp052.goneo.de [85.220.129.60]) (using TLSv1.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 mx1.freebsd.org (Postfix) with ESMTPS id 4QpB0p0xMFz3n6w; Sat, 24 Jun 2023 10:58:18 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 4F31A10A32CA; Sat, 24 Jun 2023 12:58:09 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 68C2410246A5; Sat, 24 Jun 2023 12:58:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1687604287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iVoNsdtnHa30AvoYI6tAa8lZIOJNC/T9pXcKVsKrxko=; b=Gr7qTfCVi34qpzKBSTvZVt8rTpnLzhIDSeC7Cq1unnioy7UCGtOC1isZ4j8/ADKF/MK1kC nB7fjPcx6hRVjuz0ee6PcaLrliPTTSr4etNTbyUsgPOvuDxB77q3ZqHYtcVUfRgvt6NXvo gMOep5a4D/u15Ja/wS+pGzDUScT1OUgSWjITVZB4sun10gKEXHv5h5J8pQ7lUwn3FaF+kl UIKPKO+AqeV/3Z9YTEXbqlo36vjIrLpGdE86VZYOmwjxKTaIYmMFnhE3UpUmgX2cmneR+b 8u1gXapyaoG5vGZ2pcj6A0a0Jr9Rctxy+E7RPyDHH1vsL33zjFUx/YiKfaSIhw== Received: from hermann (dynamic-077-183-065-213.77.183.pool.telefonica.de [77.183.65.213]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 229F21056B02; Sat, 24 Jun 2023 12:58:07 +0200 (CEST) Date: Sat, 24 Jun 2023 12:58:03 +0200 From: FreeBSD User To: Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b077aed33b7b - main - Merge OpenSSL 3.0.9 Message-ID: <20230624125803.05861d58@hermann> In-Reply-To: <202306232319.35NNJsPv044302@gitrepo.freebsd.org> References: <202306232319.35NNJsPv044302@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: 0f9fc4 X-Rspamd-UID: 9b4068 X-Rspamd-Queue-Id: 4QpB0p0xMFz3n6w X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, 23 Jun 2023 23:19:54 GMT Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b077aed33b7b6aefca7b17ddb250cf521f938613 > > commit b077aed33b7b6aefca7b17ddb250cf521f938613 > Merge: b08ee10c0646 b84c4564effd > Author: Pierre Pronchery > AuthorDate: 2023-06-23 22:53:35 +0000 > Commit: Ed Maste > CommitDate: 2023-06-23 22:53:36 +0000 > The commit has spooky side effects. After the merge of llvm16 and after this merge, openssl 3, I did a full make cleanworld make buildworld buildkernel And after finishing, installkernel/installworld. After two reboots I did als the VERY DANGEROUS THING make delete-old/-libs This harms a working CURRENT seriously in a way I can not grasp the reason why. The CURRENT host is running OpenLDAP net/openldap26-server and -client. Also port nss-pam-ldap. Rebuilding those ports net/openldap26-client net/openldap26-server (without libssl.so.111) is all right, running slapd fails. net/nss-pam-ldapd-sasl will fail to build with an obscure error described below with ftp/curl. went smooth in the first attempt, but havoc followed immediately. slapd rejected to startup. No error, no reason given, rc.conf switch to debug/verbosity doesn't reveal anything. No console message. But this is a side effect of something I guess. With a backup of /lib/libssl.so.111 replaced, everything went to normal for slapd. ftp/curl fails due to missing libssl.so.111 and so git will fail (/etc/libmap.conf is no solution). The spooky observation occurs when trying to compile ftp/curl (with no libssl.so.111 replacemnet installed): portmaster ftp/curl will fail complaining that openldap26-client is requested, but openldap-client is installed. In make.conf I've defined DEFAULT_VERSIONS+=openldap=26/WANT_OPENLDAP_VER=26 which worked so far for a couple of months now. Same error with security/sudo. Having libssl.so.111 in place makes those spooky thing go away. From nobody Sat Jun 24 11:32:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpBmN2lfpz4gXb1; Sat, 24 Jun 2023 11:32:36 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (using TLSv1.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 ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QpBmL4zpWz44Rr; Sat, 24 Jun 2023 11:32:34 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=m6CVajUg; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 94.130.200.20 as permitted sender) smtp.mailfrom=herbert@gojira.at; dmarc=none Date: Sat, 24 Jun 2023 13:32:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1687606347; bh=LkB2VoPV+QmCEnqH4c+7wvzCs4mj7+i3/bGmTcfFAKw=; h=Date:Message-ID:From:To:Subject:MIME-Version:Content-Type; b=m6CVajUgwum5ZGv2qSy6tpG7T3TH4CpspINbYLnpdliS4IQykcRXRq37SXtYIuYjL Bfd6cgTwfpOByAZ4zklwuOHftTxL2YkRVxARp/5t8+lOHJdH/irWTS1vaDtZdQhiuL BVVWf4onYvZ8VkOx/DtYjvNNC0qubJpUPPWLPmLFJi7lGYbQUhVJ+/R/6HApyKIHl9 Zd7QF8CrO30/BDa+VCq+CU2XyGa462w/9XQENiBCtyOWTepnQj1zUebyHmr2O8Ta+M 5YYmhiHnYuwBEXL/MWQeBvEml/nZEAmC49dX2YNW8g2b78MJZ1dkS3oZ06Y1woLU7p xpgwQENlhngdQ== Message-ID: <87o7l514g5.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b077aed33b7b - main - Merge OpenSSL 3.0.9 In-Reply-To: <20230624125803.05861d58@hermann> References: <202306232319.35NNJsPv044302@gitrepo.freebsd.org> <20230624125803.05861d58@hermann> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/30.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.45 / 15.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-0.99)[-0.990]; NEURAL_HAM_SHORT(-0.96)[-0.963]; R_SPF_ALLOW(-0.20)[+ip4:94.130.200.20]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; BLOCKLISTDE_FAIL(0.00)[94.130.200.20:server fail]; DMARC_NA(0.00)[gojira.at]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[gojira.at:+]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE] X-Rspamd-Queue-Id: 4QpBmL4zpWz44Rr X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N On Sat, 24 Jun 2023 12:58:03 +0200, FreeBSD User wrote: > > On Fri, 23 Jun 2023 23:19:54 GMT Ed Maste wrote: > > > The branch main has been updated by emaste: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=b077aed33b7b6aefca7b17ddb250cf521f938613 > > > > commit b077aed33b7b6aefca7b17ddb250cf521f938613 > > Merge: b08ee10c0646 b84c4564effd > > Author: Pierre Pronchery > > AuthorDate: 2023-06-23 22:53:35 +0000 > > Commit: Ed Maste > > CommitDate: 2023-06-23 22:53:36 +0000 > > > > The commit has spooky side effects. > > After the merge of llvm16 and after this merge, openssl 3, I did a full > > make cleanworld > make buildworld buildkernel > > And after finishing, installkernel/installworld. After two reboots I did als the VERY > DANGEROUS THING > > make delete-old/-libs > > This harms a working CURRENT seriously in a way I can not grasp the reason why. > > The CURRENT host is running OpenLDAP net/openldap26-server and -client. Also port > nss-pam-ldap. Rebuilding those ports > > net/openldap26-client > net/openldap26-server > > (without libssl.so.111) is all right, running slapd fails. > > net/nss-pam-ldapd-sasl > > will fail to build with an obscure error described below with ftp/curl. > > > went smooth in the first attempt, but havoc followed > immediately. > > slapd rejected to startup. No error, no reason given, rc.conf switch to debug/verbosity > doesn't reveal anything. No console message. But this is a side effect of something I > guess. With a backup of /lib/libssl.so.111 replaced, everything went to normal for slapd. > > ftp/curl fails due to missing libssl.so.111 and so git will fail (/etc/libmap.conf is no > solution). > > The spooky observation occurs when trying to compile ftp/curl (with no libssl.so.111 > replacemnet installed): > > portmaster ftp/curl > > will fail complaining that openldap26-client is requested, but openldap-client is > installed. In make.conf I've defined DEFAULT_VERSIONS+=openldap=26/WANT_OPENLDAP_VER=26 ^^^^^^^^^^^^^^^^^^^^^^^ What's this? Typo or copy&paste error? 1. You don't need DEFAULT_VERSIONS+=openldap=26. In Mk/bsd.default-versions.mk we have: # Possible value: 24, 25, 26 OPENLDAP_DEFAULT?= 26 Openldap26 (2.6.x) is already default version 2. Don't set WANT_OPENLDAP_VER=26 in /etc/make.conf. See the following comment in Mk/bsd.port.mk: 327 # Note: the distinction between the USE_* and WANT_* variables, and the 328 # WITH_* and WITHOUT_* variables, are that the former are restricted to 329 # usage inside the ports framework, and the latter are reserved for user- 330 # settable options. (Setting USE_* in /etc/make.conf is always wrong). 3. Use pkg_libchk from ports-mgmt/bsdadminscripts2 after running 'make delete-old-libs'. You have to rebuild some ports (using openssl from base). There is a warning: "Please be sure no application still uses those libraries, else you can not start such an application". Why do you actually run CURRENT? -- Herbert From nobody Sat Jun 24 12:15:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpCjW31L1z4hKZ9; Sat, 24 Jun 2023 12:15: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 4QpCjW2bVSz4PRT; Sat, 24 Jun 2023 12:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687608911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lwiV6y+usJK+eBqQMGxOv0fd/bTRpycwvcnH561MNxQ=; b=jPUcATQxio/DUIHKZ280NHcriYMZYy8sENDkgLp4waT1A9NR/MVodbL1V9V7v39z2nxHXS w0OlFuyriUt+GCb0GprueUBbmk/7NqYPhbxrOQ6AOnsGPazJIAYt6pVU6UW5B523McfTeU OxyaMcFqALjO1NMhWMHX5ykq8BVTocVkfkBTHPW2hXcgcPzYBGR8zczRNnMyKIHIGz72Y9 CfhZWOm9vLVsWnFunNDhBn/G37bcUt2Dx3pCGvqPA884OUpgega6fClywpcNQKg7fqoeqi 8febFmp8CBdRH1CPS9YSO48TIEBLlyl4wY+KUU8IppzKgy76zu8pGnRuXz3JWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687608911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lwiV6y+usJK+eBqQMGxOv0fd/bTRpycwvcnH561MNxQ=; b=uHaUt8V9l/F3RPnDWV71sNktjAbr+IGB/qNgqOIHRXOQZIg54iAMcw/XvDAQTJ/q96Akag r1lxkZPdqwb9Taywww0DnLOMSNEPkPC88JEbrqpMTfCM6XwnXnW0zBE7H4EN+U1XRY4Nel vjkeO8kqXQRml9cbwgQHG4mD02MMMDNeRrXricm9L3G6PBiRK6+N59hBdIexHb9RJBKe+C lKxyi2+QIa3tFP45+N5JOjwKzb72Q/+oL6npfxXrHJmzpJA34WHoh8eHyHJ9vvxdc/hvm+ YVMUxv7o2of4S8kKew6z2e4S9Mz9gpGFWw7HEskSG1rxw4lbPRSa4wfQ1MlWAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687608911; a=rsa-sha256; cv=none; b=FM2x3aKAu4DMKWtMNk4XYelD//4eGObfZ6qbw4pbtGCrQiaEWWL/YrPKYGzRVT68Hw5Emr RVl9j66j6qoAttlEBbJLPO9LG+jc6zSgpLvi1XvbvS2bwzbSc2NSBf/zIyHXVwifKdNCDt 85AQ2emVQXbQk2DAuqZoLOwN+CiO6td9jKriCivsCB2VYVdMMo6fZRKa3cLKwl4ZDIgqYg ALD5JXnxoQvxm1G8fqk/QpK9qxdRvuF5iT8Tae+oF9lQJUzOWm7M1mQ/yqfGIIB92korpZ xNFhdodjr7DYr/248m7jm1Z7CV4k+sXQFKBevdcnxIalU9yUxiFgQeUlx4RexA== 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 4QpCjW1dm4zlgP; Sat, 24 Jun 2023 12:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35OCFB5N031697; Sat, 24 Jun 2023 12:15:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OCFB8E031696; Sat, 24 Jun 2023 12:15:11 GMT (envelope-from git) Date: Sat, 24 Jun 2023 12:15:11 GMT Message-Id: <202306241215.35OCFB8E031696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 564c5314f6d9 - main - UPDATING: Add OpenSSL 3.0 update List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 564c5314f6d9aa2b20ebd437b86fe441e967ada1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=564c5314f6d9aa2b20ebd437b86fe441e967ada1 commit 564c5314f6d9aa2b20ebd437b86fe441e967ada1 Author: Ed Maste AuthorDate: 2023-06-24 12:13:19 +0000 Commit: Ed Maste CommitDate: 2023-06-24 12:14:58 +0000 UPDATING: Add OpenSSL 3.0 update --- UPDATING | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UPDATING b/UPDATING index f4e13d97006d..002e30ce2835 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20230623: + OpenSSL has been updated to version 3.0, including changes throughout + the base system. It is important to rebuild third-party software + after upgrading. + 20230619: To enable pf rdr rules for connections initiated from the host, pf filter rules can be optionally enabled for packets delivered From nobody Sat Jun 24 19:08:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpNtR1kX7z4hbQl; Sat, 24 Jun 2023 19:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QpNtR1HdPz4KxL; Sat, 24 Jun 2023 19:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687633711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3qJMnZhOnVgNegz17W+266QRUBzDjp1+EtOQZ7l0RL8=; b=ukBe00RouAearNKKt9YbEpXzhHdanULbmkk24RRPQVxEXUBATJlss9MseHoHRs7WVOHZne wZhwkGI/X+6LXMAQ2rPlwtcvoq7vZnkM7U3pAxMxrSnM7OTxvoGWmmXauAmk8s8o2h2EZR S4I6Ia9MvGsPXG/1cV1iXNAwy52/JikVpFzXY4+1dGmkO0KrMyTfHK9BnOKP7K80tmPn0r IRZxHNMGm+jdcziP6/Q2oFKUHIBVXokDwHyG8xf/7nh1uoc23cqTysl9iXkGRaQId8Ywrd oflMFNopEyAPxsdA7y8qgowcm8GLFom35/fsHKbyNWkUadTvdwJhaOh2nSNUSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687633711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3qJMnZhOnVgNegz17W+266QRUBzDjp1+EtOQZ7l0RL8=; b=waHSt6KMKF55f6ZpF6Jjv+N6L7fFzEeZ17R+sg/VXToodtLmQNoQ8Mu0CsETCPIEXbOAmF cQpGTT3UroG6QyDNv2cRFRiLyetlWNcK+5h/H0IUXqb8VXBJc1fOxirWZGla6bADS4WlRR JIPDAES6R2GpiOHhjlLXJFGfCrAxMZNXrWRQwp3rx1mIhtZvC9zZWt/A2rLx/xgxyBPFXD T4LMogzrdc0UsdkPxWtuYvjaVFIJB0OKI/2pxDzm/DJWyg8LNo6XrFfwnCyY/ji3teIZ/E 6LtfA/rnh25zSIwc7hgJgxyLXVQdHwx4RiRcwWWdP2yzw4d8sd0Iw5qnpFtBhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687633711; a=rsa-sha256; cv=none; b=CkthCmZGMeCpAgj1tEHC3VDDl2bFecJNT9QOtasjvphe8OhogGybYF9edL5I6zjWmjlgUw bvst7xGzhphA4OMW4AtPijwEp6N7FKRY0X0bYQ+jTsYI6PDzR+sp93JzN5i2RkNoCrLDAr jnlCqiZwye80Zucfcd1K8E1+13ePXoeT1zu39MIHwNkhp1qhKBDj1StZi9XEoO716p+qWT WJ9GomVPlCqQanMlW9vI0ExJukrKVmFfhoB/8GB9/cmFNbTsC/TfdGuMYQcNslsqKsy+rg jrUCDlpmLWVNMX7te0NhpZtdD47lVXkUrA1mchrDFqGgFPDaq0kG1QIleUBS0w== 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 4QpNtR0MfXzxYW; Sat, 24 Jun 2023 19:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35OJ8UwE009065; Sat, 24 Jun 2023 19:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OJ8UjT009064; Sat, 24 Jun 2023 19:08:30 GMT (envelope-from git) Date: Sat, 24 Jun 2023 19:08:30 GMT Message-Id: <202306241908.35OJ8UjT009064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 0d2f98c2f092 - main - amd64 pmap: Tidy up pmap_promote_pde() calls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d2f98c2f0928a8ee8446c3e5e0e4fb93f1dd9c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=0d2f98c2f0928a8ee8446c3e5e0e4fb93f1dd9c5 commit 0d2f98c2f0928a8ee8446c3e5e0e4fb93f1dd9c5 Author: Alan Cox AuthorDate: 2023-06-17 17:18:33 +0000 Commit: Alan Cox CommitDate: 2023-06-24 18:09:04 +0000 amd64 pmap: Tidy up pmap_promote_pde() calls Since pmap_ps_enabled() is true by default, check it inside of pmap_promote_pde() instead of at every call site. Modify pmap_promote_pde() to return true if the promotion succeeded and false otherwise. Use this return value in a couple places. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D40744 --- sys/amd64/amd64/pmap.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 3cb02a4f9daa..3215a7f8d559 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -436,7 +436,7 @@ pt_entry_t pg_nx; static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "VM/pmap parameters"); -static int pg_ps_enabled = 1; +static int __read_frequently pg_ps_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &pg_ps_enabled, 0, "Are large page mappings enabled?"); @@ -1318,7 +1318,7 @@ static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static vm_page_t pmap_large_map_getptp_unlocked(void); static vm_paddr_t pmap_large_map_kextract(vm_offset_t va); #if VM_NRESERVLEVEL > 0 -static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, +static bool pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, vm_page_t mpte, struct rwlock **lockp); #endif static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, @@ -6856,7 +6856,7 @@ pmap_pde_ept_executable(pmap_t pmap, pd_entry_t pde) * aligned, contiguous physical memory and (2) the 4KB page mappings must have * identical characteristics. */ -static void +static bool pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, vm_page_t mpte, struct rwlock **lockp) { @@ -6865,6 +6865,10 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, vm_page_t mpte, pt_entry_t allpte_PG_A, PG_A, PG_G, PG_M, PG_PKU_MASK, PG_RW, PG_V; int PG_PTE_CACHE; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + if (!pmap_ps_enabled(pmap)) + return (false); + PG_A = pmap_accessed_bit(pmap); PG_G = pmap_global_bit(pmap); PG_M = pmap_modified_bit(pmap); @@ -6873,8 +6877,6 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, vm_page_t mpte, PG_PKU_MASK = pmap_pku_mask_bit(pmap); PG_PTE_CACHE = pmap_cache_mask(pmap, 0); - PMAP_LOCK_ASSERT(pmap, MA_OWNED); - /* * Examine the first PTE in the specified PTP. Abort if this PTE is * ineligible for promotion due to hardware errata, invalid, or does @@ -6883,12 +6885,12 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, vm_page_t mpte, firstpte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); newpde = *firstpte; if (!pmap_allow_2m_x_page(pmap, pmap_pde_ept_executable(pmap, newpde))) - return; + return (false); if ((newpde & ((PG_FRAME & PDRMASK) | PG_V)) != PG_V) { counter_u64_add(pmap_pde_p_failures, 1); CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); - return; + return (false); } /* @@ -6933,7 +6935,7 @@ setpde: counter_u64_add(pmap_pde_p_failures, 1); CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); - return; + return (false); } setpte: if ((oldpte & (PG_M | PG_RW)) == PG_RW) { @@ -6952,7 +6954,7 @@ setpte: counter_u64_add(pmap_pde_p_failures, 1); CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); - return; + return (false); } allpte_PG_A &= oldpte; pa -= PAGE_SIZE; @@ -6993,7 +6995,7 @@ setpte: CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx in pmap %p", va, pmap); - return; + return (false); } /* @@ -7018,6 +7020,7 @@ setpte: counter_u64_add(pmap_pde_promotions, 1); CTR2(KTR_PMAP, "pmap_promote_pde: success for va %#lx" " in pmap %p", va, pmap); + return (true); } #endif /* VM_NRESERVLEVEL > 0 */ @@ -7391,10 +7394,9 @@ unchanged: * populated, then attempt promotion. */ if ((mpte == NULL || mpte->ref_count == NPTEPG) && - pmap_ps_enabled(pmap) && (m->flags & PG_FICTITIOUS) == 0 && vm_reserv_level_iffullpop(m) == 0) - pmap_promote_pde(pmap, pde, va, mpte, &lock); + (void)pmap_promote_pde(pmap, pde, va, mpte, &lock); #endif rv = KERN_SUCCESS; @@ -7782,18 +7784,17 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, * attempt promotion. */ if ((mpte == NULL || mpte->ref_count == NPTEPG) && - pmap_ps_enabled(pmap) && (m->flags & PG_FICTITIOUS) == 0 && vm_reserv_level_iffullpop(m) == 0) { if (pde == NULL) pde = pmap_pde(pmap, va); - pmap_promote_pde(pmap, pde, va, mpte, lockp); /* * If promotion succeeds, then the next call to this function * should not be given the unmapped PTP as a hint. */ - mpte = NULL; + if (pmap_promote_pde(pmap, pde, va, mpte, lockp)) + mpte = NULL; } #endif @@ -10359,10 +10360,9 @@ pmap_emulate_accessed_dirty(pmap_t pmap, vm_offset_t va, int ftype) m = PHYS_TO_VM_PAGE(*pte & PG_FRAME); if ((mpte == NULL || mpte->ref_count == NPTEPG) && - pmap_ps_enabled(pmap) && (m->flags & PG_FICTITIOUS) == 0 && - vm_reserv_level_iffullpop(m) == 0) { - pmap_promote_pde(pmap, pde, va, mpte, &lock); + vm_reserv_level_iffullpop(m) == 0 && + pmap_promote_pde(pmap, pde, va, mpte, &lock)) { #ifdef INVARIANTS atomic_add_long(&ad_emulation_superpage_promotions, 1); #endif From nobody Sat Jun 24 19:30:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpPMX0h47z4gWHC; Sat, 24 Jun 2023 19:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QpPMX0CDpz3HG2; Sat, 24 Jun 2023 19:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687635016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ttj+4mm4LqVQMGWLz/g/rb4+n245hhQSGVYo+BGgdTY=; b=EYdxXDAS+8DEiV3nPWETta57jUSZJzRHU+4WUuktcBbC56WbckB39JbCBHPG57R02v3fHW Wg09bDz4D580yNlWp28/e+vmp4gEvnjrcMQ0wB8v8VpZzLPcGh/poCXb9WumIEYmqA+ksL wfu/3n06KWU3akFm/q0r6SKg+i+sdq5JS2J58jf1WGzOkvprF6Zfmmw7/b21QeUfsPlHNU yOSN98JaCO5osMnVTCUAMiNHyc+UDP89DhTfeEj5L8lvai7Bcm1Y0fTu67HlZ50QsTWxGS jdNCLFdbNeKzdJLHGEEsFqjw34jz7ftpihHKSacucTv6k/0BXyRjWC00Ae0Cdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687635016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ttj+4mm4LqVQMGWLz/g/rb4+n245hhQSGVYo+BGgdTY=; b=t6RMC6WyQq8/DPQmk7cl/2lhTN4DbpSSLaaKwfads5VSEPgAnSP0VF2NLBtkwU9/lKA/J9 +ZUWGuJMHR4vPcjnSVfY4lDEBsfBvKEDLXb2qxhL61dJ2qWs3E4IxhaUBZ3V1UbpmfEpxM 2rke8SUvG3kygw79R7RFHM5Uiqdj1eX8uvWkbsuCq8sf2E01sjS0sO8807BYb4/ggx20am 7HuraJ/t7cOL8Lz1usOTHGNmI/BqRp/73UIGmJV+UNPBdcc/hUeA/fIePmqCtzDfgVnETx x9eF1seczcIFx1/DGzlrSQ+UMj/mksdCnEpyIFcoSJ1OiHmsgq80I+8a169QNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687635016; a=rsa-sha256; cv=none; b=ySeyw1h+t1JlI2RO1WcvzkZ3l8Ob+gaPsLsxuENV+jpKewE4LXphbzja5h6l6BPu9vVKO6 WxVViTD8lyQEPvBZH/trrpZJtA3/xl4v7XpK88Zg8xWIt/AFXsnsftRu/4E8S7hTMHja84 jxK0AwgA5u5X7AGtpgSsXh3T0TWmB4c12ONI4J8wZFGiis1eHYWG5rWQYS1v+QuNp3joxd 7Cy6QotWiM6rfjtwPfRWV6S358qRInPhWHVhWXLpXF6Jz20ASZOwymVRAU9PNdI08BExL0 qzY1mE7aVIWvNTelro3w0W0QVTWI+SP6Lkrr132KgFs/dSzYyLOT7CS1MZo6bQ== 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 4QpPMW6PQwzyLW; Sat, 24 Jun 2023 19:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35OJUF1G049749; Sat, 24 Jun 2023 19:30:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OJUFcO049743; Sat, 24 Jun 2023 19:30:15 GMT (envelope-from git) Date: Sat, 24 Jun 2023 19:30:15 GMT Message-Id: <202306241930.35OJUFcO049743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 17e97d41e7a1 - main - hwpmc: add 'flags' local to pmc_op_do_pmcallocate() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 17e97d41e7a1ffc21459d593064e21c5549bd233 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=17e97d41e7a1ffc21459d593064e21c5549bd233 commit 17e97d41e7a1ffc21459d593064e21c5549bd233 Author: Mitchell Horne AuthorDate: 2023-06-19 18:54:31 +0000 Commit: Mitchell Horne CommitDate: 2023-06-24 19:29:59 +0000 hwpmc: add 'flags' local to pmc_op_do_pmcallocate() Similar to the other allocation parameters. No functional change. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/dev/hwpmc/hwpmc_mod.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 781a2c116a40..593e64cbb88b 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -3296,13 +3296,14 @@ pmc_do_op_pmcallocate(struct thread *td, struct pmc_op_pmcallocate *pa) struct pmc_hw *phw; enum pmc_mode mode; enum pmc_class class; - uint32_t caps; + uint32_t caps, flags; u_int cpu; int adjri, n; int error; class = pa->pm_class; caps = pa->pm_caps; + flags = pa->pm_flags; mode = pa->pm_mode; cpu = pa->pm_cpu; @@ -3349,23 +3350,23 @@ pmc_do_op_pmcallocate(struct thread *td, struct pmc_op_pmcallocate *pa) /* * Look for valid values for 'pm_flags'. */ - if ((pa->pm_flags & ~(PMC_F_DESCENDANTS | PMC_F_LOG_PROCCSW | + if ((flags & ~(PMC_F_DESCENDANTS | PMC_F_LOG_PROCCSW | PMC_F_LOG_PROCEXIT | PMC_F_CALLCHAIN | PMC_F_USERCALLCHAIN)) != 0) return (EINVAL); /* PMC_F_USERCALLCHAIN is only valid with PMC_F_CALLCHAIN. */ - if ((pa->pm_flags & (PMC_F_CALLCHAIN | PMC_F_USERCALLCHAIN)) == + if ((flags & (PMC_F_CALLCHAIN | PMC_F_USERCALLCHAIN)) == PMC_F_USERCALLCHAIN) return (EINVAL); /* PMC_F_USERCALLCHAIN is only valid for sampling mode. */ - if ((pa->pm_flags & PMC_F_USERCALLCHAIN) != 0 && mode != PMC_MODE_TS && + if ((flags & PMC_F_USERCALLCHAIN) != 0 && mode != PMC_MODE_TS && mode != PMC_MODE_SS) return (EINVAL); /* Process logging options are not allowed for system PMCs. */ if (PMC_IS_SYSTEM_MODE(mode) && - (pa->pm_flags & (PMC_F_LOG_PROCCSW | PMC_F_LOG_PROCEXIT)) != 0) + (flags & (PMC_F_LOG_PROCCSW | PMC_F_LOG_PROCEXIT)) != 0) return (EINVAL); /* @@ -3391,7 +3392,7 @@ pmc_do_op_pmcallocate(struct thread *td, struct pmc_op_pmcallocate *pa) pmc->pm_event = pa->pm_ev; pmc->pm_state = PMC_STATE_FREE; pmc->pm_caps = caps; - pmc->pm_flags = pa->pm_flags; + pmc->pm_flags = flags; /* XXX set lower bound on sampling for process counters */ if (PMC_IS_SAMPLING_MODE(mode)) { From nobody Sat Jun 24 19:30:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpPMY1y9zz4gWFV; Sat, 24 Jun 2023 19:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QpPMY12yqz3HGR; Sat, 24 Jun 2023 19:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687635017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Nu40sAKiy7vHzFD8EVmfutDfjULPLTpMFi7F2z/WkA=; b=VOKxD1nPtqGdxzV9h23bYCpf4hV5OnIXZ2ViaqZuCWdM30w/OVRrz3jgfOBJYezh1OMZED VBCFwkic2pMoAipX57BXb4jGv5R6/C8bTfNpI9uBw2naeSy/4Ns5hBB/vHX+NRqIpCKi9F q/PiCkSRNby8vQd4p0gvbL8+H84yGqFB6C40ImQQoGk9s45Yd1E2otUwHKdCURX4fkaKs7 vdhW415SPW1M0LvwLK8mofAvxGvOT2FpFOC735JH+Fd0H4cGrHez6m6LE2IVPk9bwLNQhT uAdET0NVYZS0IU2NebwlbK3iAjXtACLio5xvzjVkECbdbemC/PeoYifgYD99xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687635017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Nu40sAKiy7vHzFD8EVmfutDfjULPLTpMFi7F2z/WkA=; b=sMTcPCUzwGS2reEXOPb6EPXYA6DN7it3bQTyK5TUTFy+fmNi+l8uilBeSOAeoNvYeyS//V QkC/S11bCV6yRJim6CXTcp1cOESXYVg17tyHr9wxpbT2r1uH6OPbUKvSh9zvuh+y2zhGdD JXe2p6MzacyMoVBPecVjNMEBkKjQ9gKrCaFNc9lZYJjNeA0abcqjU4dNMQoFing35C7nYb Xl/t+UbeafivIfLsRcQHP7YjoUvBJpsIFn001bz1qyvXI2FYwFW3x5lhr5OApdMdk5uXv1 rtxIN1fEV59NWkDeZ7EIopnqLbv+LHY2DzHMSKfr1hexlDPB0efhrVGaKFZc0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687635017; a=rsa-sha256; cv=none; b=KZDTQpVqPGJgD5/TUMizq9gCN2yaAH2fjS1SlHl/EOeepG+1x8otTKVMY8Z7i+HeubfI5c lCPNTFpDOTsvC22ZSplb8GDuet1V3JyRdomI5L+bzRNlfVjDeSRfhLQaWb8lDYT/Ev109j CYt22rjCKhQhb3UHQxA1gPA2rLivtJR4VC2YD9qISphrYvqbx5f0nEsJ6y+a8dlR7Kwvkd bE2idnIuNFnT57fhAeATNKZK4PDgabdRHarkM2EYDng5RHZTdIWFLypaPbC/ReOStFiWfZ VFISwtut/cFcpaV/XgwtOVHvDR8ZXkPgtxFwFFUI69aSvgeoWCKAvBD93EuKpw== 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 4QpPMX6zs2zyTD; Sat, 24 Jun 2023 19:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35OJUGqT050353; Sat, 24 Jun 2023 19:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OJUGAh050344; Sat, 24 Jun 2023 19:30:16 GMT (envelope-from git) Date: Sat, 24 Jun 2023 19:30:16 GMT Message-Id: <202306241930.35OJUGAh050344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: ba84e87055de - main - pmc: clean up remaining Pentium man page references List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ba84e87055de71452291e229f8087d612999da40 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ba84e87055de71452291e229f8087d612999da40 commit ba84e87055de71452291e229f8087d612999da40 Author: Mitchell Horne AuthorDate: 2023-06-24 17:09:00 +0000 Commit: Mitchell Horne CommitDate: 2023-06-24 19:30:00 +0000 pmc: clean up remaining Pentium man page references These have been removed. Fixes: d78896e46f1d ("pmc(3): remove Pentium-related man pages...") MFC after: 3 days Sponsored by: The FreeBSD Foundation --- lib/libpmc/pmc.cmn-600.3 | 3 --- lib/libpmc/pmc.dmc-620.3 | 3 --- tools/build/mk/OptionalObsoleteFiles.inc | 3 --- 3 files changed, 9 deletions(-) diff --git a/lib/libpmc/pmc.cmn-600.3 b/lib/libpmc/pmc.cmn-600.3 index 55a0b5fba88b..7abfdef22111 100644 --- a/lib/libpmc/pmc.cmn-600.3 +++ b/lib/libpmc/pmc.cmn-600.3 @@ -564,9 +564,6 @@ Average latency to form a TX TLP .Xr pmc.iaf 3 , .Xr pmc.k7 3 , .Xr pmc.k8 3 , -.Xr pmc.p4 3 , -.Xr pmc.p5 3 , -.Xr pmc.p6 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.dmc-620.3 b/lib/libpmc/pmc.dmc-620.3 index 606d92f7b8ea..568ff3fab6f0 100644 --- a/lib/libpmc/pmc.dmc-620.3 +++ b/lib/libpmc/pmc.dmc-620.3 @@ -132,9 +132,6 @@ The following PMC events are available: .Xr pmc.iaf 3 , .Xr pmc.k7 3 , .Xr pmc.k8 3 , -.Xr pmc.p4 3 , -.Xr pmc.p5 3 , -.Xr pmc.p6 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index becc360f3e2e..2d03822ffaaf 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6805,9 +6805,6 @@ OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz -OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz -OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz -OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz OLD_FILES+=usr/share/man/man3/pmc.sandybridge.3.gz OLD_FILES+=usr/share/man/man3/pmc.sandybridgeuc.3.gz OLD_FILES+=usr/share/man/man3/pmc.sandybridgexeon.3.gz From nobody Sat Jun 24 20:02:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpQ4X6nzNz4h6h7; Sat, 24 Jun 2023 20:02:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QpQ4X6Gy3z3lt5; Sat, 24 Jun 2023 20:02:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687636940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rNsr97JSoZvJoke+uWyXvXeqhBp5y4QKFJGf492SLw=; b=ZpzAfm0/sUf3cMhZaw0G9RvVBW3gDscCCRT9Ojx78xfAmjhsLqk2XVdxEGbCJESCCBQVTY +dPWBALEtljwLkjmhik3utyc2cjWA+a/UM7QSG8F1JYB+qNx2geeryTw112zJXXIHx0MBS lvlkGqRcaoDxOHsrSs6imVR9momhPWwPNS52uZEMH0k3+FdhUWG73m518QoR5nNwSoHZ9s ybTZlj8omu/0sHAPbf/WMsa1r30UrOwnGtzJhGE7cAuaTszBakJA8Nyzm2qKiDj084Jx2V 7CX7u6VL4iYTV6h25Iz/i9qg1OUDenJuUkNGVLTpFtAiMZmAjGEuFXY+RWW27w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687636940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rNsr97JSoZvJoke+uWyXvXeqhBp5y4QKFJGf492SLw=; b=D3oYXJ5ETe4MQSNUQVCFl8kFpsOioHdoW+6vN8AqvM7Iau4RDpjbxyI45BYdbVLSUwaqBi LXbx2F3LbcjMB7RiQozvE0ua+y8GfcZawaomJSiqEzWWBHbo4YvjRckW06Vm2RgfI7JHN4 uh28vsZxFolVpHNVkRoXJFsB2lide1qM09odN8fpJxTPLHbjhq7Ckyybs1zIB8SJtvr1z8 /sTEfXER2PignMLgeDBfrCNzj89rrrM5gil6hUBF7xhmZF8txw4IGZzZA7LyEkvqLG5ClC hWUcpl03WQBnW863RUtKgprt/4QHhyL28XvzvsblnXhfrDCe28MVdpbTcRRlvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687636940; a=rsa-sha256; cv=none; b=PK0LPpnYioEXNHvuReqUBQUBnciV3/cprkycexg8SfynGor0BVoRWCpWv6nfJgGmzv8Qiy 4TGaeofdWFO0NXG9GX+OWxMBpvrYOWrB0npPjHpueTNrFnjPQHDU6F4SRpzHJWy0b/2zqO pV5Z64Y9TP16BV5H80KNJDZ7A+7tA7jt0eK0oTC6Ji5NDgWpVzcKyt/5Vz1wkDDyIpJYUX B/UjJQy1SZXTdcpxSEm88FmvN+GtRUevzaCbKULcBFaza4XKEnCi/KZZzStTNaYrFaWvdh apiews/inB6QOo0nAvH+CDMoKAJQSglJccM31c8V9DqkXacLhHE1XauxVgB0yQ== 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 4QpQ4X5NhRz10MG; Sat, 24 Jun 2023 20:02:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35OK2Knh006717; Sat, 24 Jun 2023 20:02:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OK2K0w006716; Sat, 24 Jun 2023 20:02:20 GMT (envelope-from git) Date: Sat, 24 Jun 2023 20:02:20 GMT Message-Id: <202306242002.35OK2K0w006716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 5581cf903fda - main - share/mk/bsd.cpu.mk: drop -mno-powerpc64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5581cf903fdaddfbe37331e7d02ab9d2284830d3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=5581cf903fdaddfbe37331e7d02ab9d2284830d3 commit 5581cf903fdaddfbe37331e7d02ab9d2284830d3 Author: Piotr Kubaj AuthorDate: 2023-06-24 20:01:47 +0000 Commit: Piotr Kubaj CommitDate: 2023-06-24 20:01:47 +0000 share/mk/bsd.cpu.mk: drop -mno-powerpc64 Clang doesn't have -mno-powerpc64. Differential revision: https://reviews.freebsd.org/D40589 Approved by: jhibbits --- share/mk/bsd.cpu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index e47ee30d2ce6..e1b78083d095 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -129,7 +129,7 @@ _CPUCFLAGS = -mcpu=${CPUTYPE} . if ${CPUTYPE} == "e500" _CPUCFLAGS = -Wa,-me500 -msoft-float . else -_CPUCFLAGS = -mcpu=${CPUTYPE} -mno-powerpc64 +_CPUCFLAGS = -mcpu=${CPUTYPE} . endif . elif ${MACHINE_ARCH:Mpowerpc64*} != "" _CPUCFLAGS = -mcpu=${CPUTYPE} From nobody Sat Jun 24 23:48:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpW6349Z1z4hGT0; Sat, 24 Jun 2023 23:48: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 4QpW633mR2z4JpX; Sat, 24 Jun 2023 23:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687650539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N1HN/SZnbG1s3pxTLbf3GbccZZ8GeWFVcTrySJtmF0U=; b=vlOWZHBIxAlpXm3+SvR9VvggP5SgU86VL+NZWT0uS8pQXcfxLX1pi9/QqfmGEaeEhWI3cL ZV1OGTj+mp4bownSndOnN/N9CSJjU27fJWoPbX8RLQ/WO4xsxuxQzJtUWB7tPVCBV4iun4 aIxm5L/Mg/84A42svDYOTbHxe51Z5iEcR4bIoHt5BEd7wgZ0f7XepajAnpEks94fTFqDbN A/LmLd2vLOhp8lcupOs1fujdAqRSoOiXUPgOof8h/B8dDzVlfTBC3cJYKE/Vu/U1laTGxH p79L4PiVkxpov6gX96FD9zBNB3HhFXCzTyOipPpCd0xsuyuOoLaRtkS46ufpJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687650539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N1HN/SZnbG1s3pxTLbf3GbccZZ8GeWFVcTrySJtmF0U=; b=XgjqbSe52+JQZsS22Nr1H/x8CCBlv6Sf32qhnD2ba+g+mGpoY+OacKRboYrUYdQgKkVGl6 8U35+KFbnV+NdMHIU8vBr1QX+obiWSYEJLWNRLW5C7vibP5kKz2TMWqZKMIMmKSWtvdVuq twuPr6e7GBfCHygCnFFGuAf6TwUvJOoLl6NuH9kOVeSVE3gzDWHuABqkVCKWBLi2uDVyrV ZkdZVf6eVKD7JWfvyp5yG/bZcKIwgXZVzETUgssLe2x+02Hfwj/sW2S+K9cq49pVsqdIRy CkwOuFDlhPxcdTzhtC3c12IZaHuZUKOim5w6V0GbO8cHb0imSlf1IwrmMMR7uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687650539; a=rsa-sha256; cv=none; b=ylA+embVQ/zZMqnGiWtnWuiq5VjbfLzWM46sVJUAlhtx0DOMFuGiF1zRBpr/Oz3bn5J8Wm bnnzYGZPzzsmJSWDtzqoeyiVio7N7+wEKU17a12uGHSV68yZFTLDAo6o1Vs9XlBw4ltC9K Bo+//JM1+G4Wg8oQLdBRFxpI8MBna24XnaCarCqAjFhcG6ksmf7Zywy4evaFgBcYlWY6Mq x30jeDcpYt/OVMq6EE6H460a/ZyDspb2iVdeTV9gTRn07CA/dtTRxND2TcE624/dYxAthP vqTzGKYMFiscl/o0K5gn8rKTcUgVVXhacZoHVX6ktjmz2HrgsbO9Lz9Cah1pGQ== 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 4QpW632Z30z15Wp; Sat, 24 Jun 2023 23:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35ONmx5U070124; Sat, 24 Jun 2023 23:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35ONmxgh070123; Sat, 24 Jun 2023 23:48:59 GMT (envelope-from git) Date: Sat, 24 Jun 2023 23:48:59 GMT Message-Id: <202306242348.35ONmxgh070123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 229d643c4dd5 - main - depend-cleanup: apply big hammer for OpenSSL 3.0 update List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 229d643c4dd5c1a1695e5de48fab0524132f5deb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=229d643c4dd5c1a1695e5de48fab0524132f5deb commit 229d643c4dd5c1a1695e5de48fab0524132f5deb Author: Ed Maste AuthorDate: 2023-06-24 18:12:06 +0000 Commit: Ed Maste CommitDate: 2023-06-24 23:46:09 +0000 depend-cleanup: apply big hammer for OpenSSL 3.0 update If we find an object corresponding to a source file that existed in OpenSSL 1.1.1 but not in 3.0 just remove all of the OpenSSL objdirs. Reviewed by: dhw Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40750 --- tools/build/depend-cleanup.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index f047553c377f..7b851873f288 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -115,3 +115,12 @@ clean_dep usr.sbin/config mkoptions c # 20230401 54579376c05e kqueue1 from syscall to C wrapper clean_dep lib/libc kqueue1 S + +# 20230623 b077aed33b7b OpenSSL 3.0 update +if [ -f "$OBJTOP"/secure/lib/libcrypto/aria.o ]; then + echo "Removing old OpenSSL 1.1.1 tree" + rm -rf "$OBJTOP"/secure/lib/libcrypto \ + "$OBJTOP"/secure/lib/libssl \ + "$OBJTOP"/obj-lib32/secure/lib/libcrypto \ + "$OBJTOP"/obj-lib32/secure/lib/libssl +fi