From nobody Sun Feb 26 00:00: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 4PPP0L41Mcz3v2tn; Sun, 26 Feb 2023 00:00: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 4PPP0L3Nyyz3DJF; Sun, 26 Feb 2023 00:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677369634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fJc5tMhLhRukMGVsjQ51Dhmm4N2BH2KkNCFL+AleTQ=; b=fOZrvZ1yMnYi4zKT96k34OeKbS+mwvhWzR1bdAUW/9l2nNjeG73uSqZjE9gKcwnDIWmhma HFLkH7DJjgtNdnc01b37pF/c0//gYhAsWs04d9ZT6Nm1fzRPvGkuX3HizBU1nMQI/emVYL 1wibefnKJc6PL/cSGnBfGP927nlppvggeD8emKV4ZCO5fi2bFS0uEE24lVFrxDX+zWztSJ 2vHoL42RNVYs6jUafhmosb4SmZrk8bYZwB1oizquk4r2jKwCCtoD4nDSgaY80jhSH57Ygf Ow1qhKylFDGyxr9M9LLVYmYaaOJ6w9+n7pDlGbG+eVT5YVm2gex49JM+UA9Csw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677369634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fJc5tMhLhRukMGVsjQ51Dhmm4N2BH2KkNCFL+AleTQ=; b=P7Q8SsxwhULQ847N6q8BWCAX0zuXsVCFBnwDWv2ReO86FHtj4wwz8QgqKOi5TR9fK+Hesk pCQS4nB/RjDo5B4GFVMxbVVcWmM+pnVfYl2E/IDgyiRVncrHBITXBbwjRHHWX1xgRLxW+p txSCTMXElo0fit6O7Q+7aJJC+w1nA3t/5o2iQQbvR5YYzP2wMZ4quO2TJ/mNsBdQT0cGxr 5xfruMiD2zuBaFLkLU16fDEQTBIfreWVI6Lf8fHYX54ewEkzGwze+CC+ZZrDs13NenZnMU lNay/2TpknsUaGrzQS51gi3WHv11jbbI5gOOa0EhStIYZGWk3OFyVtVF+6r+KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677369634; a=rsa-sha256; cv=none; b=CEB6NyO1eJqbDMnU0ZfnUZboB/MvHX/pJVi61zHOPZfJBSGrIdLVCExA1Fj2cKGu6NI5ew QxrXiSFkR9yXka52RgyQlzuD4l2ZvG5fQpgCO/gXwbiys7Sn+72SH/zbYoeljRTLA3PL9k jtaguA54Q8bMFsTEE7tx+tT4LJXvMtz1nnVK4S7ttA50X4X+qD7s0fA/etpexqPvgJVZaB 91kbuB2oGLkGYUe6lss3Ipp2Tn16j/aQ+dvlt6cQZ+0LAjukvRJDBkejPTdq7PV+YHkCLl ktZiOUkYtJipg71CnHpaBdy6Bmp5YBR0pKNqmez0D0M544vPz3a+ZkDB+t06yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPP0L2TKDzP1P; Sun, 26 Feb 2023 00:00: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 31Q00Ywv081773; Sun, 26 Feb 2023 00:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q00Y7K081772; Sun, 26 Feb 2023 00:00:34 GMT (envelope-from git) Date: Sun, 26 Feb 2023 00:00:34 GMT Message-Id: <202302260000.31Q00Y7K081772@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: 429ba161fbe7 - main - powerpc: fix warning: a function declaration without a prototype is deprecated in all versions of C 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: 429ba161fbe7db72bf9faa3c4eee8e61a7642aba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=429ba161fbe7db72bf9faa3c4eee8e61a7642aba commit 429ba161fbe7db72bf9faa3c4eee8e61a7642aba Author: Piotr Kubaj AuthorDate: 2023-02-25 23:34:27 +0000 Commit: Piotr Kubaj CommitDate: 2023-02-26 00:00:19 +0000 powerpc: fix warning: a function declaration without a prototype is deprecated in all versions of C Reviewers: #powerpc Approved by: alfredo Subscribers: imp, jhibbits Differential Revision: https://reviews.freebsd.org/D38787 --- sys/powerpc/aim/mp_cpudep.c | 2 +- sys/powerpc/ofw/ofw_machdep.c | 4 ++-- sys/powerpc/powerpc/cpu.c | 2 +- sys/powerpc/powerpc/fpu.c | 2 +- sys/powerpc/powerpc/platform.c | 10 +++++----- sys/powerpc/powerpc/pmap_dispatch.c | 2 +- sys/powerpc/ps3/mmu_ps3.c | 2 +- sys/powerpc/pseries/mmu_phyp.c | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/powerpc/aim/mp_cpudep.c b/sys/powerpc/aim/mp_cpudep.c index cb3856cc4bf0..a91778fa09b7 100644 --- a/sys/powerpc/aim/mp_cpudep.c +++ b/sys/powerpc/aim/mp_cpudep.c @@ -306,7 +306,7 @@ cpudep_save_config(void *dummy) } void -cpudep_ap_setup() +cpudep_ap_setup(void) { #ifndef __powerpc64__ register_t reg; diff --git a/sys/powerpc/ofw/ofw_machdep.c b/sys/powerpc/ofw/ofw_machdep.c index 805d19cc2b42..24b89f9dd00d 100644 --- a/sys/powerpc/ofw/ofw_machdep.c +++ b/sys/powerpc/ofw/ofw_machdep.c @@ -598,7 +598,7 @@ OF_initial_setup(void *fdt_ptr, void *junk, int (*openfirm)(void *)) } boolean_t -OF_bootstrap() +OF_bootstrap(void) { boolean_t status = FALSE; int err = 0; @@ -809,7 +809,7 @@ openfirmware(void *args) } void -OF_reboot() +OF_reboot(void) { struct { cell_t name; diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index 300a738f796d..5e267c37a7db 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -267,7 +267,7 @@ SYSCTL_PROC(_hw, OID_AUTO, altivec, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, * so they can be used during platform and MMU bringup. */ void -cpu_feature_setup() +cpu_feature_setup(void) { u_int pvr; uint16_t vers; diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c index 45a77235bd52..f384425b583a 100644 --- a/sys/powerpc/powerpc/fpu.c +++ b/sys/powerpc/powerpc/fpu.c @@ -213,7 +213,7 @@ save_fpu_nodrop(struct thread *td) * Clear Floating-Point Status and Control Register */ void -cleanup_fpscr() +cleanup_fpscr(void) { register_t msr; diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c index 6f8f0361d11f..7993911a7c80 100644 --- a/sys/powerpc/powerpc/platform.c +++ b/sys/powerpc/powerpc/platform.c @@ -247,7 +247,7 @@ platform_real_maxaddr(void) } const char * -installed_platform() +installed_platform(void) { return (plat_def_impl->name); } @@ -262,7 +262,7 @@ platform_timebase_freq(struct cpuref *cpu) * Put the current CPU, as last step in suspend, to sleep */ void -platform_sleep() +platform_sleep(void) { PLATFORM_SLEEP(plat_obj); } @@ -292,7 +292,7 @@ platform_smp_start_cpu(struct pcpu *cpu) } void -platform_smp_ap_init() +platform_smp_ap_init(void) { PLATFORM_SMP_AP_INIT(plat_obj); } @@ -321,7 +321,7 @@ platform_node_numa_domain(phandle_t node) * Reset back to firmware. */ void -cpu_reset() +cpu_reset(void) { PLATFORM_RESET(plat_obj); } @@ -339,7 +339,7 @@ void platform_smp_timebase_sync(u_long tb, int ap) SET_DECLARE(platform_set, platform_def_t); void -platform_probe_and_attach() +platform_probe_and_attach(void) { platform_def_t **platpp, *platp; int prio, best_prio; diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c index a0caddb9e012..42ff7a6de304 100644 --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -224,7 +224,7 @@ pmap_mmu_install(char *name, int prio) /* MMU "pre-bootstrap" init, used to install extra resolvers, etc. */ void -pmap_mmu_init() +pmap_mmu_init(void) { if (mmu_obj->funcs->install != NULL) (mmu_obj->funcs->install)(); diff --git a/sys/powerpc/ps3/mmu_ps3.c b/sys/powerpc/ps3/mmu_ps3.c index c21faccf631c..b60e6775be30 100644 --- a/sys/powerpc/ps3/mmu_ps3.c +++ b/sys/powerpc/ps3/mmu_ps3.c @@ -91,7 +91,7 @@ MMU_DEF_INHERIT(ps3_mmu, "mmu_ps3", mps3_methods, oea64_mmu); static struct mtx mps3_table_lock; static void -mps3_install() +mps3_install(void) { moea64_ops = &mps3_funcs; moea64_install(); diff --git a/sys/powerpc/pseries/mmu_phyp.c b/sys/powerpc/pseries/mmu_phyp.c index 67d0b5821f4f..3e32b3cb8a83 100644 --- a/sys/powerpc/pseries/mmu_phyp.c +++ b/sys/powerpc/pseries/mmu_phyp.c @@ -124,7 +124,7 @@ SYSINIT(kvmbugwarn2, SI_SUB_LAST, SI_ORDER_THIRD + 1, print_kvm_bug_warning, NULL); static void -mphyp_install() +mphyp_install(void) { char buf[8]; uint32_t prop[2]; From nobody Sun Feb 26 05:37: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 4PPXSY3xMyz3rv3H; Sun, 26 Feb 2023 05:37: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 4PPXSY3Tpvz41Zd; Sun, 26 Feb 2023 05:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677389821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yhNNgudy6i7jP7inghEjQcQN4EFD44ZEFyGizA3pGnw=; b=liL/lFvndBbP366P+6mbRES3S5j+oLifPAFOfFI1Ioa6FJJsB6dvHLy4mVIwvg6FVLD4T0 LM+wo0engJYchfmvoJQXjCt7WT73nGyP4VdCh1SVjex4HOK8wugGixT/mzyNbb62r2QK7i tYkIgAIdsTm+zl9Fc2ijr+FT8X8Yw07sZXeeSgDmKwkZEDHFkcGYybAvKFI/I/IGZeSaCD v2WOxM39SsuJboi43KTOlZm30m9TMDXH+tHzk7zDXXA8JuISMXRnuq2nMBMkGkOwGfIGse QXcNoySry6rVrCl5Hv+J47dsBX5fW3FjuFqyIGmqIxzme0s3aLzLwEPb6WFoRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677389821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yhNNgudy6i7jP7inghEjQcQN4EFD44ZEFyGizA3pGnw=; b=sqURRZ1j42JLONIxzOrLMg/aYCnUkl0GHipO3adMNTgSg6WawBc03VkKq6JP32lEN+y89n Dpv3jVeQXb6jfdlLTg6F/1Wp9GUrKtItjI6q2HMrF6AtDqq2iu2UuhhsZxEPNWEjaewiV2 X5WVrWBL5fyJ0sKjHFHqA0Pc2Xs8ge1URThX18Tkl/uNowZikYXoHzNKdKmNjZrKsqpUht ENM0E6/0YJ4YKsf02r4Q6WkM4vlry1AubQPInPAJKJmjYxpQdMacsH+/f/+SNwzkLDmddQ yQxhNu1bzmpogxUcGATEoe7JvefwRRE/CGhhzcMxZu6Np9VhU+1mgLtuMawulw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677389821; a=rsa-sha256; cv=none; b=g0o+U2YcvgKPaoBaW5yKv/rirALxogigc/gxZjbZq7LKjIg1Yz1/840NuNXj8ARkzJRRh/ +KrjV/yvO3PD+oN0ksm4FbUvKmU2MWfszfMJWjDsGaZpBoggaTR9hh0kHe43Eppcx9+O7W KKO8wrK8Nc9UbLtgrTCywPhcuxn1Omj86SdtcIVX47PO5lDeKwP3eOHcn7tAjmOenvEPI3 567mFgntx96q52K2t5gvsJzov0ybz6t106vwXz7nEPxpv0eftzaICXG2AW51Z8o/k2X0xF plxdddTuNddQ9KI+Nw2Cn9tmjsFiMpRUD2cXHJNbSf11m+LQtDDWNlAVDDNANw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPXSY2XFLzYP8; Sun, 26 Feb 2023 05:37: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 31Q5b10t023269; Sun, 26 Feb 2023 05:37:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q5b1NY023268; Sun, 26 Feb 2023 05:37:01 GMT (envelope-from git) Date: Sun, 26 Feb 2023 05:37:01 GMT Message-Id: <202302260537.31Q5b1NY023268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f8e1aa85fed0 - main - ctf: Remove unused function prototype for getpname() 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8e1aa85fed08d5f689cb36d65a76d191f6500dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f8e1aa85fed08d5f689cb36d65a76d191f6500dd commit f8e1aa85fed08d5f689cb36d65a76d191f6500dd Author: Zhenlei Huang AuthorDate: 2023-02-26 04:18:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-26 04:18:25 +0000 ctf: Remove unused function prototype for getpname() This function prototype should have been removed along with the implementation. Fixes: 3dd552426409 ctfdump: Use getprogname() MFC after: 1 day --- cddl/contrib/opensolaris/tools/ctf/common/utils.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.h b/cddl/contrib/opensolaris/tools/ctf/common/utils.h index 99378bb4f251..6918bdab89aa 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.h +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.h @@ -42,8 +42,6 @@ extern "C" { extern void vdie(const char *, va_list); extern void die(const char *, ...); -extern const char *getpname(void); - #ifdef __cplusplus } #endif From nobody Sun Feb 26 13:16: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 4PPkfB70W5z3tZd0; Sun, 26 Feb 2023 13:16: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 4PPkfB6K2Rz3MrP; Sun, 26 Feb 2023 13:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677417362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNFdXbxU3vX5HCTLzPZuS2uXL27vriNKFjEB23QSJNY=; b=dDSBN/A1uP1QizOSESErTO6RdfPQ/JxvO4eAUbLg5L8BomDUqbMh7aJKUeIYJJ+uuda4od w2Rfb/BEa7vG9C2U/0nSc0IChMVw1CYhyWVBFD5BTpylKeftrlIYk65tNbRzDEG2SDpyb0 4EXwRvTzwptnJQuiLBqnBOohUhGTWly/tpiGBiFHqoK/UU9BkyfK3p509EGChPFXEfcNQN SxK9Bfvmd980ilT+Yz4OWruTn6aXEGS/kT5Spiw2fJB0pXsyb47YTKL2ITmIKo9j1LqCS5 V6RSvadEEi5HjLDF1AjJNwcHibF2I46rD9IdyIe4/qEx1/ElVTrKrIbVXa7mZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677417362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNFdXbxU3vX5HCTLzPZuS2uXL27vriNKFjEB23QSJNY=; b=YBBfCAAzpoMRYGB3TDpk70+EkiB/nInb6PSW5DPgc8CJKNCW/4WKKFZM8gQhwt60mcVNsC bxR1bkByrhvqF27QRireMMpH38kayrFhPbtiH6jgdZZwpYKRPqEhpBNJn8F4+I3RgMRVup emqa4uPhc2+epVMAVif4q/7XlSmMA/wLO7KlTncY/YHuoyA0oO8Nk0X36ZDNtn7rQxw9QA j29zC7FBegk2vwGklHJIWYw3if6e7CY2WxtoY8Dw/6iIEAZ7cY3mDzNKx3I6Xd5tCD4tV+ 9rNBLv5t3BIcedXG7UIqqCXtixACpEkyvFTEWxnXzPR9M5GzIwOKbMSh8QWv1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677417362; a=rsa-sha256; cv=none; b=renddYW29vVRbhiKwwnV9SdfxvAh9K+ZQp2pSz3eDHYF6hTn+jWBsMYMXob3ydwptpOcA3 VgIEVGD3tmysot7tLDOVKDUQlqaphHbUS+s/CNR/+SpXCYhdOAAOPzag+X7hN8+lnBf/y3 LZ0CxwTBnID7InmmI6kyL8SeLYYXaq8JDGZc6IBsg4T9NFcbHy0p/wdqeKq6MQ4Pe7N5Mn J1MRorMmcp3LhXTjB98LgI5/S6tFFa3hOAGOdlHQJQNiHhnjUSvT8Cz7+KImNyLFLqd0wO SNIEIbS0WNIwPeHpNp+sJUbllcqghqpTVmaTBJviXdicjgb7ZbCRr2eXA+EW2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPkfB5F0wzmnq; Sun, 26 Feb 2023 13:16: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 31QDG2Dj077523; Sun, 26 Feb 2023 13:16:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QDG2s0077522; Sun, 26 Feb 2023 13:16:02 GMT (envelope-from git) Date: Sun, 26 Feb 2023 13:16:02 GMT Message-Id: <202302261316.31QDG2s0077522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: b06338167d64 - main - route.8: Add information about ROUTE_MPATH and FIB_ALGO 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: b06338167d64507e79e003500002e22fbe583832 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b06338167d64507e79e003500002e22fbe583832 commit b06338167d64507e79e003500002e22fbe583832 Author: Gordon Bergling AuthorDate: 2023-02-26 13:15:34 +0000 Commit: Gordon Bergling CommitDate: 2023-02-26 13:15:34 +0000 route.8: Add information about ROUTE_MPATH and FIB_ALGO Since the kernel options ROUTE_MPATH and FIB_ALGO are enabled per default for a while, it's good to have some user facing documetation about the general functionality of multipath routing and fib lookup algorithms. Reviewed by: pauamma, Jose Luis Duran MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D38783 --- sbin/route/route.8 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/sbin/route/route.8 b/sbin/route/route.8 index 161189e7a9d8..c893ae5ab4b3 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -28,7 +28,7 @@ .\" @(#)route.8 8.3 (Berkeley) 3/19/94 .\" $FreeBSD$ .\" -.Dd December 15, 2021 +.Dd February 26, 2023 .Dt ROUTE 8 .Os .Sh NAME @@ -405,6 +405,60 @@ and .Dv RTM_CHANGE . As such, only the super-user may modify the routing tables. +.Pp +.Fx provides support for scalable multipath routing. +It is activated by default, but can be turned off by setting the +.Va net.route.multipath +.Xr sysctl 8 +MIB to 0. +.Pp +There are multiple route lookup algorithms available. +They can be configured by setting +.Va net.route.algo.inet.algo +for IPv4 and +.Va net.route.algo.inet6.algo +for IPv6 +.Xr sysctl 8 +MIBs. +.Pp +A list of available algorithms can be obtained by accessing the +following +.Xr sysctl 8 +MIBs +.Va net.route.algo.inet.algo_list +for IPv4 and +.Va net.route.algo.inet6.algo_list +for IPv6. +.Pp +The following algorithms are available: +.Bl -tag -width radix_lockless +.It radix +Base system radix backend. +.It bsearch +Lockless binary search in a special IP array, tailored for a small FIB +with <16 routes. +This algorithm is only available for IPv4. +.It radix_lockless +Lockless immutable radix, re-created on every rtable change, +tailored for a small FIB with <1000 routes. +.It dpdk_lpm +DPDK DIR24-8-based lookups, lockless datastructure, optimized +for a large FIB. +In order to use the dpdk_lpm algorithm one or both of the +following kernel modules must be loaded via +.Xr loader.conf 5 : +.Bl -tag -width dpdk_lpm6.ko -compact +.It dpdk_lpm4.ko +DPDK implementation for IPv4. +.It dpdk_lpm6.ko +DPDK implementation for IPv6. +.El +.El +.Pp +The algorithms are selected automatically based on the size of the routing +table of the system. +They can be changed, but not every algorithm performs best for every +FIB size. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES @@ -484,6 +538,7 @@ The next-hop gateway should be reachable through a different route. .Xr netstat 1 , .Xr netintro 4 , .Xr route 4 , +.Xr loader.conf 5 , .Xr arp 8 , .Xr routed 8 .Sh HISTORY From nobody Sun Feb 26 13:34: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 4PPl392kn0z3tbnf; Sun, 26 Feb 2023 13:34: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 4PPl392Dtwz3Q6t; Sun, 26 Feb 2023 13:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677418453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YtiaYYP+mCqA32cK8gTy+48ZEpxCT/Y05ExF/JMqp+E=; b=MER5g2DVJ5eGnCwpaXFs1muzxnDV6j3qeqIia4rrBk15T/bSICfBphPdnalqJJJUT/iwz0 r4uXNC448fIssVNHoOFiggsuiMBikSDGzgNnDSDjAu8X0E6lRoT9l1qg8wejbVU8HrF0LM W19TomuxDER8ZzKcY9//dGP1QwN8eGSjaGXOF3ftzi0BZldPPbdt6oNh3rz4VLDv7eDoG6 8c1MnHCtlm+KofMHR14pClg+iqS9pLKAY6RbQIJI7vD9DQqqgFYL653VcddjX2K3SvPBHA 6fK4B6L5MW75WLpNQ5lCX+hXALyfUFZy4Qsk3Hug0nlAi9+/YRskYNT2lDOY3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677418453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YtiaYYP+mCqA32cK8gTy+48ZEpxCT/Y05ExF/JMqp+E=; b=xPyLVTZrRWXucnUby5o2qVi4+BY6u1rd2J0rFs7MH9VyqnVv4vbU5nOm663KdMB8xTTzzy 3Oh3e69hz461wbudOEamcz779kHnE7esps8U3VPIf6zKsMC5C6eQJ7BplpUbCbr9HzoHso sjxkLu8lD3o1yLX4gm9LG/vf9wbk5e/2APd3ttQ8E/fCGs4wpGRk0RvuTRNs+blbRmTRgu xS8HjNON4axSzBYoZi7lGtPc7bV67hfLu5cudcUGE7ANgpaorAJGME3cksaLDX6r5Kgzbk uWGf7/PfuSojMBRD4sehnw2RWjWcKA0xPWEdxqAQ1bI+b2yPgPohDnWLUiErsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677418453; a=rsa-sha256; cv=none; b=Quzp7c6h0qdtD3BZmOheHWCB+hbwoC45BvzzDj3TMf99OnqPt+xSZJZ/humSmzYwELuRpx K5DUukV4AazNqikLQvKp/VORryR0eFdvzE1JdGazhK8lUebAHsrVNtALeVmZvLoBnRaBJZ jAQ4STD2gEObnJLS6508PaUSqDBq0lVfX6lG0zB3wv/QgxmmZsYizUMrfS6CAwRgwHR9bP /k6NdqQVLf11wzQb3H0xEliSb7P/y1xcEDyfC7Wx09kIEPCjF9D6BJ3dYF+8KzMplo/4ft 14GSQuil73RLGAoIDPWQarN/DCOi5sJylF3wQs2pzppGKuTVLnD9dwsuSIiDig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPl391KT1zn3h; Sun, 26 Feb 2023 13:34: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 31QDYD3O010039; Sun, 26 Feb 2023 13:34:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QDYDHU010038; Sun, 26 Feb 2023 13:34:13 GMT (envelope-from git) Date: Sun, 26 Feb 2023 13:34:13 GMT Message-Id: <202302261334.31QDYDHU010038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 6dbfbe6e11a0 - main - route.8: Fix mandoc 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dbfbe6e11a04f6e2ae893dbf46b059ab49eb517 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6dbfbe6e11a04f6e2ae893dbf46b059ab49eb517 commit 6dbfbe6e11a04f6e2ae893dbf46b059ab49eb517 Author: Gordon Bergling AuthorDate: 2023-02-26 13:33:58 +0000 Commit: Gordon Bergling CommitDate: 2023-02-26 13:33:58 +0000 route.8: Fix mandoc warnings - skipping end of block that is not open: Oc - no blank before trailing delimiter - remove useless TN macros - remove commented out reference for esis(4) MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D38783 --- sbin/route/route.8 | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sbin/route/route.8 b/sbin/route/route.8 index c893ae5ab4b3..5b6e13281447 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -134,7 +134,7 @@ The flush command has the syntax: .Bd -ragged -offset indent -compact .Nm .Op Fl n -.Cm flush Oc Oo Ar family Oc Op Fl fib Ar number +.Cm flush Oo Ar family Oc Op Fl fib Ar number .Ed .Pp If the @@ -228,10 +228,10 @@ is interpreted as .Fl host Li 128.32.0.130 ; .Fl net Li 128.32 is interpreted as -.Li 128.32.0.0; +.Li 128.32.0.0 ; .Fl net Li 128.32.130 is interpreted as -.Li 128.32.130.0; +.Li 128.32.130.0 ; and .Li 192.168.64/20 is interpreted as @@ -265,9 +265,7 @@ if the local or remote addresses change. The optional .Fl netmask modifier is intended -to achieve the effect of an -.Tn OSI -.Tn ESIS +to achieve the effect of an OSI ESIS redirect with the netmask option, or to manually add subnet routes with netmasks different from that of the implied network interface @@ -378,9 +376,7 @@ In a or .Cm add command where the destination and gateway are not sufficient to specify -the route (as in the -.Tn ISO -case where several interfaces may have the +the route (as in the ISO case where several interfaces may have the same address), the .Fl ifp or @@ -534,7 +530,6 @@ same route as the one being changed. The next-hop gateway should be reachable through a different route. .El .Sh SEE ALSO -.\".Xr esis 4 , .Xr netstat 1 , .Xr netintro 4 , .Xr route 4 , From nobody Sun Feb 26 13:42: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 4PPlF54CSqz3tcGv; Sun, 26 Feb 2023 13:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PPlF53g9Qz3R46; Sun, 26 Feb 2023 13:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677418969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Zn40rxbh2CHaYlqeFPi8IqY56AK2tnsgTYaQgk+nzI=; b=Wg46gXUTozV4AU27tftpUCX/MbTxJR3WpEQva0QUgHMdc5X0NK65egp/GGAol3tgPSsB9j pVaefFm6Y/8BpYo+is1czTm3QNDBA9ETnG6OKTzy5CSzXigBUVfiNLDOK5CZvW516Tu9W3 iz/pDAF8KdnpZqVcGa99qaJMYHLKl9pxNxsHeInyH/P7lZr191ACmQStqmNeqbG3PQkvgt j6p24iL97t60E4frr695Qc2znXEQKKPJgK8TNvnykwx4u5cGV8S16XAvb/bG3uceunUIuw uz2kzXx/pkTXoHwOKGJYtnWZ2j3SZ6oS4BoyrqOZsHsMpZupYcjvHfO2mtkakg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677418969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Zn40rxbh2CHaYlqeFPi8IqY56AK2tnsgTYaQgk+nzI=; b=lf1B6d/EX5rHQf8GD7LwAg0906Ui9HdDTgEoGVztoYCqYwqd0qZqHlvBV2G4vvJgDS0dvc NSy+g5+2EYyuPIoUvMzrc68BQp6lqn24qMQvvmDsPnNQ2/4pxm49g578ccCGewQUXzRxvL 7acExdrKoehr4CS04cXHXgUJS/dyE1Yx00+Fcml0HGn2BOk2PANLXl0shzmp8hVYoVfx2W RHqKq06FQJUD5iF5lDBt5MvlouONWDEf2YyorHBDAI83H8ewxY1as3Fv1c1GL0nP5/Btr3 pH98WglTnS6srLmcjzIS7WirBPuxIsX1mo2bp5mLyzj+chc3GTYGJlFLJw9zvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677418969; a=rsa-sha256; cv=none; b=osNSyC+TmidgPX7Hni3augvAL7CQxuwzr2pJpcW+RrefBL/z1whxLm/CLbGhTya2tMlmZS T2o+D3ZKaWVc6Bb30NGFuSLKekPw0ehpXoQvKaSrhT5ChSbIpX+oPylmu6u1+Q6uDaCzXX RgW74/eQLrLq/uSPCuNWhgZo1LRCO9mYD1KjLJqF6/3C+/KIzffBLjAv03h345zrDKZesB H3MR++EIbwWKTR+CvjmJB9zFp3zrT1CXb0rsetTrBTiv1sNXdwWhyQ3pjsjjW5Jsi/9G6I g8qTdcq1Po9pykcsy30S8a/EZnMqvAFTcdb54vcKkYuIskhR88cnP2KlWZDLZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPlF52kvdznNH; Sun, 26 Feb 2023 13:42: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 31QDgnR3026132; Sun, 26 Feb 2023 13:42:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QDgndp026131; Sun, 26 Feb 2023 13:42:49 GMT (envelope-from git) Date: Sun, 26 Feb 2023 13:42:49 GMT Message-Id: <202302261342.31QDgndp026131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: a55b5a9aed39 - main - linprocfs(4): Fixup process size in the /proc/pid/stat 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a55b5a9aed3981fcec205e246436991d138c78a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a55b5a9aed3981fcec205e246436991d138c78a2 commit a55b5a9aed3981fcec205e246436991d138c78a2 Author: Dmitry Chagin AuthorDate: 2023-02-26 13:42:22 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-26 13:42:22 +0000 linprocfs(4): Fixup process size in the /proc/pid/stat file According to the Linux sources the kernel exposes a proces virtual memory size via proc filesystem into the three files - stat, status and statm. This is the struct mm->total_vm value adjusted to the corresponding units - bytes, kilobytes and pages. The fix is based on a fernape@ analysis. PR: 265937 Reported by: Ray Bellis MFC after: 3 days --- sys/compat/linprocfs/linprocfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 83b00dc0d7c2..d57c546eb637 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1023,7 +1023,7 @@ linprocfs_doprocstat(PFS_FILL_ARGS) PS_ADD("0", "%d", 0); /* removed field */ PS_ADD("itrealvalue", "%d", 0); /* XXX */ PS_ADD("starttime", "%lu", TV2J(&kp.ki_start) - TV2J(&boottime)); - PS_ADD("vsize", "%ju", P2K((uintmax_t)kp.ki_size)); + PS_ADD("vsize", "%ju", (uintmax_t)kp.ki_size); PS_ADD("rss", "%ju", (uintmax_t)kp.ki_rssize); PS_ADD("rlim", "%lu", kp.ki_rusage.ru_maxrss); PS_ADD("startcode", "%ju", (uintmax_t)startcode); From nobody Sun Feb 26 13:45: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 4PPlHd5NNFz3tcKM; Sun, 26 Feb 2023 13:45: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 4PPlHd4kYhz3RLw; Sun, 26 Feb 2023 13:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677419101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzKAQzZ3oTCZadhBy3w2eHjmyHdSEcYQwjNsmyJWt8o=; b=e1k064gNqkJpFdivznjbm7sziWio/1ljoaE2SBzEz2X18/Yy3ctpogS1leQHxqoJRnhvFW lDuXB0n7hJunv9/sTKwU6WFd0LvbNrhEmDOebszccrIIYdRtHjRYR/v4ld3It75H30KK8X +9XoSOA5UJtwcgBXLghMwH3Aa4/AONdnyk7YBobwTZOBX4XMVM15+c5qpMymgbuZ0ybIKz 2fR0o/2W9FcdF+7MoAQopHZEbBdnbeygpx2T10pYeeaFHgEVjrfIyxknoJqAINAC3HafHh a70KYDlZ1L84FPKszXfL3LUQl8ifdjCofLoBV7I+bGP9ce2po0xsLbrNEfv/LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677419101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzKAQzZ3oTCZadhBy3w2eHjmyHdSEcYQwjNsmyJWt8o=; b=Cv+XfQ0zf9/MVLLJ3StzG9lqd8q88A2mlvKL3nLP2SGZgr6u3UWVIbnDa+TrD5cn1P6x92 tA/VsNGb59HliIkA3WT/p/LWK1TiIhQ5BelQIvaFrM8jaZMno9xREU95aR8KyNttm8Xokf LbjIUcwrbN5LYZIvmzRgP/gskYKkZ7wuVRqcFOKd3bMUic0xrvB9WR8JZCvBaXdWzNJreI sm4vyDouXmq6XjUdE4DdZcaVrpeb0QIhJ8CMYrOQnPlHXti1yyVf7pNVhvPD30AG0aTFt0 62QCVlm7ODCg5l3M7oy3PTvtviYFG6qOVCC3TzEXaoQE+eFzgmVVPV97PQZavw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677419101; a=rsa-sha256; cv=none; b=lkoQC3bpPKBg+4z5Jzu8NmBobyNxG0cNyUGnrZuyKdMeitJYEncAhrYIYTzrkRFdNA+wm3 hM3wcUEF6OZ9Lp1zoP3kZhavGMQyBm50Egz02Jo0YeH2F8rhiuc7jvV6Q93RTvArdDSj3m kypCUaDfjR2P2ReZfFjOVfbjRl7NVQiLna4aIHchecVtwlZziiCYSYof3vq23NfvRzErXl XWz7PBO/fNp7poiEsbGvCOetw93drPVjpj+tArgyfp+8JJvj8idi02wJBSv6/1AGmN/pCj mXbAh3V45uI4W73x0oH60akFo/BqJbWhv7/EDIANUhSsOgVao7//AzrCdCNqMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPlHd3mxlznLs; Sun, 26 Feb 2023 13:45: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 31QDj1eo026595; Sun, 26 Feb 2023 13:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QDj1Jq026594; Sun, 26 Feb 2023 13:45:01 GMT (envelope-from git) Date: Sun, 26 Feb 2023 13:45:01 GMT Message-Id: <202302261345.31QDj1Jq026594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 5ff7fb76cbae - main - nfs: patch up MNT_LAZY on sync 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ff7fb76cbaea42348b63d23089e9e0549b19cbd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5ff7fb76cbaea42348b63d23089e9e0549b19cbd commit 5ff7fb76cbaea42348b63d23089e9e0549b19cbd Author: Mateusz Guzik AuthorDate: 2023-02-24 19:18:11 +0000 Commit: Mateusz Guzik CommitDate: 2023-02-26 13:44:56 +0000 nfs: patch up MNT_LAZY on sync It is a de facto noop, just make it less costly. Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D38763 --- sys/fs/nfsclient/nfs_clvfsops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 7635835ef0e0..efc92f6e7e19 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -1918,14 +1918,16 @@ nfs_sync(struct mount *mp, int waitfor) } MNT_IUNLOCK(mp); + if (waitfor == MNT_LAZY) + return (0); + /* * Force stale buffer cache information to be flushed. */ loop: MNT_VNODE_FOREACH_ALL(vp, mp, mvp) { /* XXX Racy bv_cnt check. */ - if (NFSVOPISLOCKED(vp) || vp->v_bufobj.bo_dirty.bv_cnt == 0 || - waitfor == MNT_LAZY) { + if (NFSVOPISLOCKED(vp) || vp->v_bufobj.bo_dirty.bv_cnt == 0) { VI_UNLOCK(vp); continue; } From nobody Sun Feb 26 14:57: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 4PPmtn1B1jz3tgyP; Sun, 26 Feb 2023 14:57: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 4PPmtn0mTVz3mvc; Sun, 26 Feb 2023 14:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677423425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WTlN+V6GZcyR8EUjr+ur9RYxCCljWL5NR29I9VqML64=; b=Rq9uD74O/mLmrZl2zjN9wnFg7ATKg5YJFwimsAPh3lXu1RECnFETFTEbzVp/U+V47FH9Qa qpB6O1mt/HIox9yptT6lMtb/58+ugE7KTMTg1ylh3yaVWKfbsQEt16XowW+oXcVxQGLm8A N644tXxHY5Li/eG3HUlW9Ev+iNzqapJxaZRZDvZcASl7FpgTqX6tEcYzbrd49KFWpezr5r mBcX+5CejfC5odXx7VibekvkgIVzK+6oPm5jpHK0mQAhR3xV4+OCW2GzBNirkmM6b4QI23 xCXHoPE9sdlS0cgOxY+5fggazMr1i4ilDmFZERY3qeKpOOC4D47KCU2wnHw4iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677423425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WTlN+V6GZcyR8EUjr+ur9RYxCCljWL5NR29I9VqML64=; b=w3IwXW+zAqXzT+AnzOG/YlHWmS1TOHJxH6PnSwrgTmjc5tsMDq+MAV2COfrOnsl9bI76YA EmvF7K+iewANtWqNwSk0DIsOEuskTWqoROuFS84tXajg/5tKsviYlGxrHf3RJJjH9k1aTY O6GYOsb6SxDAwZyb9+LH/SNoumJXg6YHxHPfEx0GlKA4j8tgbDjthHk/wm8EGcVRWo2J8h zGbJGJiMCAYIXwXL3np21MnyKXmoF2dgOg17iyY48mmsjZ+FmnaAH/SEd2cdQS/S+j87nC wyAny30LNMDbrPmaRNho/XraFXBZCK2Y9x5s/Gf1ZH+5z5TgEmVZw5If2vnKiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677423425; a=rsa-sha256; cv=none; b=PlxBNtHju2C9zgOFAxYMe8POEuVknbJu0OvrUNEnF84tpVIzIs3Y4ZrNnUeqSF92QWYXeG WBQO0/rQruJ4NnJ4cGKk/PnWj3OTxONqmNWwm9PW9J5E5brlynZbgggjoVSItpwNj2CrLQ qQEwH0Z9qg0yunFzzMGAbPXFhzjGLKqTvXf7LB01DbVyE3zbbeRclY8WJWhT1beltqI3b1 81iXatvkRWm5WmjekZxvTWB8YqdLsZENIngEXfTp+vyPL6JjmjxclznPOJKJm/1qn9XNIb Qi72F3V3rvvdA8i9noBZjr4cnbnPWxfIFfXEqT8roi9nhuA2VCCPT+C2Ho0xig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPmtm6wQyzp6M; Sun, 26 Feb 2023 14:57: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 31QEv4tP041537; Sun, 26 Feb 2023 14:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QEv4Hd041536; Sun, 26 Feb 2023 14:57:04 GMT (envelope-from git) Date: Sun, 26 Feb 2023 14:57:04 GMT Message-Id: <202302261457.31QEv4Hd041536@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: ab80f0b21fbb - main - Ensure .inc files are regenerated when llvm/clang tblgen binaries change 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: ab80f0b21fbb9c44d40e6f7a99090188f4ed2f71 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ab80f0b21fbb9c44d40e6f7a99090188f4ed2f71 commit ab80f0b21fbb9c44d40e6f7a99090188f4ed2f71 Author: Dimitry Andric AuthorDate: 2023-02-25 15:25:57 +0000 Commit: Dimitry Andric CommitDate: 2023-02-26 14:56:07 +0000 Ensure .inc files are regenerated when llvm/clang tblgen binaries change When doing a fully incremental build (with WITHOUT_CLEAN enabled), from a commit before llvm 15 was merged (3264f6b88fce), to a commit after that, a number of .inc files were not regenerated. This could lead to unexpected compilation errors when these .inc files were included from llvm-project sources, similar to: In file included from /usr/src/contrib/llvm-project/clang/lib/CodeGen/CGBuiltin.cpp:8268: /usr/obj/usr/src/amd64.amd64/lib/clang/libclang/clang/Basic/arm_mve_builtin_cg.inc:279:18: error: no matching constructor for initialization of 'clang::CodeGen::Address' Address Val2 = Address(Val1, CharUnits::fromQuantity(2)); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Work around this by making the .inc files dependent on the tblgen binary used for generating them. E.g., we can relatively safely assume that if the binary gets updated, the .inc files must also be updated. (Although this is not 100% optimal, the gain by complicating things even more is probaby not worth the effort.) MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38770 --- lib/clang/clang.pre.mk | 1 + lib/clang/headers/Makefile | 2 ++ lib/clang/libclang/Makefile | 22 +++++++++++++++------- lib/clang/liblldb/Makefile | 3 +++ lib/clang/libllvm/Makefile | 2 ++ lib/clang/llvm.pre.mk | 1 + usr.bin/clang/lld/Makefile | 2 ++ usr.bin/clang/lldb-server/Makefile | 2 ++ usr.bin/clang/lldb/Makefile | 2 ++ usr.bin/clang/llvm-cxxfilt/Makefile | 2 ++ usr.bin/clang/llvm-dwarfutil/Makefile | 2 ++ usr.bin/clang/llvm-nm/Makefile | 2 ++ usr.bin/clang/llvm-objcopy/Makefile | 2 ++ usr.bin/clang/llvm-objdump/Makefile | 2 ++ usr.bin/clang/llvm-readobj/Makefile | 2 ++ usr.bin/clang/llvm-size/Makefile | 2 ++ usr.bin/clang/llvm-strings/Makefile | 2 ++ usr.bin/clang/llvm-symbolizer/Makefile | 2 ++ 18 files changed, 48 insertions(+), 7 deletions(-) diff --git a/lib/clang/clang.pre.mk b/lib/clang/clang.pre.mk index 520a9300e6ce..9ef401645f14 100644 --- a/lib/clang/clang.pre.mk +++ b/lib/clang/clang.pre.mk @@ -5,3 +5,4 @@ CLANG_SRCS= ${LLVM_BASE}/clang CLANG_TBLGEN?= clang-tblgen +CLANG_TBLGEN_BIN!= which ${CLANG_TBLGEN} diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index 4e5a08e9fed2..df53b7dc7ea0 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -214,6 +214,8 @@ riscv_${hdr:H}.h: ${CLANG_SRCS}/include/clang/Basic/riscv_${hdr:H}.td GENINCS+= riscv_${hdr:H}.h .endfor +${GENINCS}: ${CLANG_TBLGEN_BIN} + CLEANFILES= ${GENINCS} ${GENINCS:C/$/.d/} .include diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 7181da12a065..ac85db06ed58 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1037,13 +1037,6 @@ clang/Basic/riscv_vector_builtin_sema.inc: \ -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/riscv_vector.td TGHDRS+= clang/Basic/riscv_vector_builtin_sema.inc -clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${CLANG_SRCS}/include/clang/Driver/Options.td -TGHDRS+= clang/Driver/Options.inc - clang/Parse/AttrParserStringSwitches.inc: \ ${CLANG_SRCS}/include/clang/Basic/Attr.td ${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \ @@ -1121,10 +1114,25 @@ OpenCLBuiltins.inc: ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td TGHDRS+= OpenCLBuiltins.inc +${TGHDRS}: ${CLANG_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} +clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td + ${LLVM_TBLGEN} -gen-opt-parser-defs \ + -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ + -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ + ${CLANG_SRCS}/include/clang/Driver/Options.td +LTGHDRS+= clang/Driver/Options.inc + +${LTGHDRS}: ${LLVM_TBLGEN_BIN} + +DEPENDFILES+= ${LTGHDRS:C/$/.d/} +DPSRCS+= ${LTGHDRS} +CLEANFILES+= ${LTGHDRS} ${LTGHDRS:C/$/.d/} + .include "../clang.build.mk" INTERNALLIB= diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index e5590ff1e536..1a1494fd2bfb 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -701,6 +701,7 @@ SRCS+= Utility/XcodeSDK.cpp SRCS+= Version/Version.cpp LLDB_TBLGEN?= lldb-tblgen +LLDB_TBLGEN_BIN!= which ${LLDB_TBLGEN} CommandOptions.inc: ${LLDB_SRCS}/source/Commands/Options.td ${LLDB_TBLGEN} -gen-lldb-option-defs \ @@ -728,6 +729,8 @@ ${path:T}PropertiesEnum.inc: ${LLDB_SRCS}/source/${path}Properties.td TGHDRS+= ${path:T}PropertiesEnum.inc .endfor +${TGHDRS}: ${LLDB_TBLGEN_BIN} + DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index a031f0fdd706..1cfd75f509c0 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -2128,6 +2128,8 @@ TGHDRS+= X86GenRegisterInfo.inc TGHDRS+= X86GenSubtargetInfo.inc .endif # MK_LLVM_TARGET_X86 +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/lib/clang/llvm.pre.mk b/lib/clang/llvm.pre.mk index 774d7d47ea37..92124a7bf092 100644 --- a/lib/clang/llvm.pre.mk +++ b/lib/clang/llvm.pre.mk @@ -5,3 +5,4 @@ LLVM_BASE= ${SRCTOP}/contrib/llvm-project LLVM_SRCS= ${LLVM_BASE}/llvm LLVM_TBLGEN?= llvm-tblgen +LLVM_TBLGEN_BIN!= which ${LLVM_TBLGEN} diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index aed22a7ae847..150f74b90984 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -95,6 +95,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 532c2aa2047a..b11fbfbbef33 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -37,6 +37,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 0637b8844cad..b6486756d882 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -30,6 +30,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index 0036fbe6cf8d..0ce39d66f0f5 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -21,6 +21,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile index a436acf0e197..6dd9bd2d5259 100644 --- a/usr.bin/clang/llvm-dwarfutil/Makefile +++ b/usr.bin/clang/llvm-dwarfutil/Makefile @@ -18,6 +18,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 0df48744632d..d3099e5a75be 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -19,6 +19,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 20f5f191b766..5cdbf5e32d2d 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -23,6 +23,8 @@ ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index c20bc172528f..b4286ffec623 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -26,6 +26,8 @@ ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index 4b547d81c583..8926eb03bdbf 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -30,6 +30,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index 20bd5de61192..f39e5db6f872 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -19,6 +19,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-strings/Makefile b/usr.bin/clang/llvm-strings/Makefile index 1438aa847997..253766ba084d 100644 --- a/usr.bin/clang/llvm-strings/Makefile +++ b/usr.bin/clang/llvm-strings/Makefile @@ -17,6 +17,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index c4677169f912..ae417356df6b 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -20,6 +20,8 @@ ${INCFILE}: ${TDFILE} -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} +${TGHDRS}: ${LLVM_TBLGEN_BIN} + DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} From nobody Sun Feb 26 16:24: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 4PPpqz3g24z3tm9C; Sun, 26 Feb 2023 16:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PPpqz33t2z3t54; Sun, 26 Feb 2023 16:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677428687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjroK1wPnTpHFLNYfB6wYLd6kHLaZ6KpBRoop9JFkjk=; b=Tpy0eua83oEbQDz7+uSi8ZaaUxo3SejlF+BQxLBMSXv/JnFZ3H+T+N4WpJHOv4W+ZlSONf a0uJfOYvbebKhCZGsqgZhyNcLL4KKA3IznvVAEW6jtpDuUmL0I6poLaYZtPWmjYL7Omrqb d/7E9piAD068Fun/QmStigzYkZaejBUi+zapJzhgt74Y552DwfMXD9E4OvifP7IfNoCe0g rhCm3oD8B3xruGYAJdq73yXOjg0/RWXxcyJ1eWL/tYb8A9E8mwtwVIBVF47snBBkVNgEmA YE7iNTgQf2i2gwJHFn+0D0xlix/im+RXNrXm40vTo9U+Wh5APm5W3Yov3XQTNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677428687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjroK1wPnTpHFLNYfB6wYLd6kHLaZ6KpBRoop9JFkjk=; b=eTqbRfFdrnw+mgT6o+QSLM/2MyMdoe1JVTr8E5QVq43kTJnlDLA+qA4ss8JhDyegdXcHep pEwWPU1SojLMrT5S80JEGX0EXib8hOvSXcCDrg3qtp2gPVu+60BwtL0W9eYp62e3HyyZlB spUK/WZZezQAHYmlbxtue9UbBtkatkNeOt/7QfqZAzJqgzqeutme7Wu3VClk0Cd+vnRqQw z5B312Bk6Q+BYNPNc7HYctdMS1t/O31OjhCOiVDgzd+i+NhXquGwEqOqANwAkqncy9jL3c izUESRgr5eIe/6N6XSQqTBDSzrJUgxD4jiuwftNEhp7Zo+4gq0qnfIMJPW2mTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677428687; a=rsa-sha256; cv=none; b=rlocnE85cM7BAEvBMbYbMTR8HsQjMlWQNBjNJqVc/U2sDcXQlbZU9zC3qPH/iRbXTyhk6x 0uyZpVpdwLoW1D+NoUsjOFrjwGhHQxmTk8f4Oj0i4+Rj/1zDCy7L1WXSDSIWBCleMWqEZE C78UfzAPEaK9dgd27obNwAfL/4TCkeonnn2CaZRZqGkIVAGDwj1DRQFOgc9XBZRAbNEQ+n yWdanbYEuVfdEU8Woyu9qUksukilmNgPnynwiqoKDfJDahfl6hYzaUcIcTOiv0XrvW7uXW ueUp6qeRS0dYmWoMVhShKKAgo4IUij/NY8tlxxcDsYKTWcWclxCg/abDQHUa1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPpqz1tFczs75; Sun, 26 Feb 2023 16:24: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 31QGOl7u089369; Sun, 26 Feb 2023 16:24:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QGOl8I089368; Sun, 26 Feb 2023 16:24:47 GMT (envelope-from git) Date: Sun, 26 Feb 2023 16:24:47 GMT Message-Id: <202302261624.31QGOl8I089368@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: b8bb73ab724b - main - pseudofs: Fix LOR in VOP_READDIR. 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: b8bb73ab724b19063481dba089c3dc9a8e1926b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b8bb73ab724b19063481dba089c3dc9a8e1926b1 commit b8bb73ab724b19063481dba089c3dc9a8e1926b1 Author: Dag-Erling Smørgrav AuthorDate: 2023-02-26 15:30:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-26 15:30:53 +0000 pseudofs: Fix LOR in VOP_READDIR. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D20862 --- sys/fs/pseudofs/pseudofs_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index eae4c1c71ab9..f4e27b469213 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -897,8 +897,8 @@ pfs_readdir(struct vop_readdir_args *va) if (!pfs_visible_proc(curthread, pd, proc)) { _PRELE(proc); PROC_UNLOCK(proc); - sx_sunlock(&allproc_lock); pfs_unlock(pd); + sx_sunlock(&allproc_lock); PFS_RETURN (ENOENT); } } From nobody Sun Feb 26 16:30: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 4PPpyS6w6Wz3tmLT; Sun, 26 Feb 2023 16:30:24 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oa1-x2f.google.com (mail-oa1-x2f.google.com [IPv6:2001:4860:4864:20::2f]) (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 4PPpyS4413z3v14; Sun, 26 Feb 2023 16:30:24 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-17227cba608so5215419fac.3; Sun, 26 Feb 2023 08:30:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=P4tv2lgMb3yHCBEE5A8OvsJ2MtLEgyHSSJ/RRAyPk50=; b=ceb9qdc7h5FfmG/hUdavd4bPDQfwT9Gw7+c3UIWCj9oWv5LfdUKZpqy8SBxdTtiahX m52n0GjICTKSCogYcuv39eBe5Yrh8QnECIJm4rDxXds2LIkeZpYuZH1e8hMxZGyFBaHj 0npLIimgVdddTRB8BvfQyJLuzinSHa5+/RFnzFL/uaYIDunp75TvK0ToQroSbbCKH3Ob W1P+rN9p6OQHkpLKNvBlnxpPadS89ZOqnZ3vCMsBmKmmFmKS+qh2Vz9v3r8m+FLwfb8e Hl9S0sYPqpGoPYcSco0RnUXkZJjcT82RG6wvFWBGxmkjmeRHr3hrQ3yT7EQOO3ve3ksN 1how== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P4tv2lgMb3yHCBEE5A8OvsJ2MtLEgyHSSJ/RRAyPk50=; b=1lsCtHjYz+/3cCfBBdKOuM+zBGC13T7rds3sehPENf8Or/PNvowRpckBtREUm47nMs 3dp0s7KiFIZoodZ0q5ofOseDfrv4I3bVQGmkqBFW9P6HlB3nq+g+TrW2zBjCJeNvgQrd SmCW993qng0P6d8UhroLF1KHALVASzcOfYFE9ItOt7YzFohJSaSvPshkrouEdp6DOaid ZSSB6R2ia0ejeouqpiesUzhyai7vbxlEftwmAo3AqM4yROzg8Fzj/XCShLDN6pakbc+Z uutCK2LLSxn78BVSw7IYOyNuNakBqjsQf48megMj7/FwafIrQ6d8i3/5tQzqr/1QrBwe HHEA== X-Gm-Message-State: AO0yUKUVGZo05kftgTEaBMaXresaSfNqcKYyDW60YL2AFrJG+UDN5O9o y5k5dn5xBCyqDhejBdQnf732UHEp/BjhJ57sVagYKzUs X-Google-Smtp-Source: AK7set/x1UN0KabKZGAEZBlpxwnntS8Kc7nXvr8ggQIv2yrKKQ56KYx+44NdSJ/KRnw736TBBXTPoCSlVEm7DL0sjE8= X-Received: by 2002:a05:6870:1b09:b0:16e:919d:7974 with SMTP id hl9-20020a0568701b0900b0016e919d7974mr2146443oab.5.1677429023560; Sun, 26 Feb 2023 08:30:23 -0800 (PST) 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 Received: by 2002:ac9:4304:0:b0:4c1:4768:8c59 with HTTP; Sun, 26 Feb 2023 08:30:22 -0800 (PST) In-Reply-To: <202302261624.31QGOl8I089368@gitrepo.freebsd.org> References: <202302261624.31QGOl8I089368@gitrepo.freebsd.org> From: Mateusz Guzik Date: Sun, 26 Feb 2023 17:30:22 +0100 Message-ID: Subject: Re: git: b8bb73ab724b - main - pseudofs: Fix LOR in VOP_READDIR. 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-Rspamd-Queue-Id: 4PPpyS4413z3v14 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 2/26/23, Dag-Erling Sm=C3=B8rgrav wrote: > The branch main has been updated by des: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Db8bb73ab724b19063481dba089c3dc9= a8e1926b1 > > commit b8bb73ab724b19063481dba089c3dc9a8e1926b1 > Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2023-02-26 15:30:53 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2023-02-26 15:30:53 +0000 > > pseudofs: Fix LOR in VOP_READDIR. > > MFC after: 3 days > Differential Revision: https://reviews.freebsd.org/D20862 > --- > sys/fs/pseudofs/pseudofs_vnops.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sys/fs/pseudofs/pseudofs_vnops.c > b/sys/fs/pseudofs/pseudofs_vnops.c > index eae4c1c71ab9..f4e27b469213 100644 > --- a/sys/fs/pseudofs/pseudofs_vnops.c > +++ b/sys/fs/pseudofs/pseudofs_vnops.c > @@ -897,8 +897,8 @@ pfs_readdir(struct vop_readdir_args *va) > if (!pfs_visible_proc(curthread, pd, proc)) { > _PRELE(proc); > PROC_UNLOCK(proc); > - sx_sunlock(&allproc_lock); > pfs_unlock(pd); > + sx_sunlock(&allproc_lock); > PFS_RETURN (ENOENT); > } > } > this does not fix any LORs. it is legal to *unlock* in any order. --=20 Mateusz Guzik From nobody Sun Feb 26 18:14:39 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 4PPsH502Qlz3tsM7; Sun, 26 Feb 2023 18:14:57 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_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 4PPsH42x61z45dx; Sun, 26 Feb 2023 18:14:56 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 31QIEeS5057685 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 26 Feb 2023 20:14:43 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 31QIEeS5057685 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 31QIEeHY057684; Sun, 26 Feb 2023 20:14:40 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 26 Feb 2023 20:14:39 +0200 From: Konstantin Belousov To: Mateusz Guzik Cc: Dag-Erling =?utf-8?B?U23DuHJncmF2?= , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b8bb73ab724b - main - pseudofs: Fix LOR in VOP_READDIR. Message-ID: References: <202302261624.31QGOl8I089368@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=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4PPsH42x61z45dx X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Sun, Feb 26, 2023 at 05:30:22PM +0100, Mateusz Guzik wrote: > On 2/26/23, Dag-Erling Smørgrav wrote: > > The branch main has been updated by des: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=b8bb73ab724b19063481dba089c3dc9a8e1926b1 > > > > commit b8bb73ab724b19063481dba089c3dc9a8e1926b1 > > Author: Dag-Erling Smørgrav > > AuthorDate: 2023-02-26 15:30:53 +0000 > > Commit: Dag-Erling Smørgrav > > CommitDate: 2023-02-26 15:30:53 +0000 > > > > pseudofs: Fix LOR in VOP_READDIR. > > > > MFC after: 3 days > > Differential Revision: https://reviews.freebsd.org/D20862 > > --- > > sys/fs/pseudofs/pseudofs_vnops.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/sys/fs/pseudofs/pseudofs_vnops.c > > b/sys/fs/pseudofs/pseudofs_vnops.c > > index eae4c1c71ab9..f4e27b469213 100644 > > --- a/sys/fs/pseudofs/pseudofs_vnops.c > > +++ b/sys/fs/pseudofs/pseudofs_vnops.c > > @@ -897,8 +897,8 @@ pfs_readdir(struct vop_readdir_args *va) > > if (!pfs_visible_proc(curthread, pd, proc)) { > > _PRELE(proc); > > PROC_UNLOCK(proc); > > - sx_sunlock(&allproc_lock); > > pfs_unlock(pd); > > + sx_sunlock(&allproc_lock); > > PFS_RETURN (ENOENT); > > } > > } > > > > this does not fix any LORs. it is legal to *unlock* in any order. To be pedantic: it is true that unlock of normal locks is correct in any order. There are exceptions for spinlocks. This is, of course, not relevant for the commit starting the thread. From nobody Sun Feb 26 22:39: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 4PPz886lY1z3v9Z1; Sun, 26 Feb 2023 22: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 4PPz886FqXz4XP2; Sun, 26 Feb 2023 22:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677451160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oc/BuNWPptAyp1IGAu3GehKM7usIYfJIEwelYiBgY84=; b=Me1qnByIgIWtyprCHJ+KjKo4/GasBvgpd+kQmdAIJ++jWEawU2mLt/ikhVhsdS1Rfw5nUO KYX3DKCBL5TjWlRDf3yvyOf7SXVhRNry86Atcz/z6CB7+NuBOESJrFG9nfL+SduIj3QcCS 0SN0+tyuDncNmmFY3JULhCT663Cd12DASXm/ypbiVsVg7PYBwmA+llXKEu3aDzJ+mm2eVy 74WfxamEYv6I3xEHw5iku464H6ZwxOUtl0MTx0lz+QTTSw9rYdXLeCE2sLThcWRimD8TM3 MOT/e3Q9LBu/PrpbSdHd/14CqL4QS2qA2QTX6xHsyi/u9ZCG7b3HN6gtk5otUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677451160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oc/BuNWPptAyp1IGAu3GehKM7usIYfJIEwelYiBgY84=; b=xB+oPeGwi4Vp6XHBfVcUzQXVRWUBhD8VSYYd2LrIs1o3yPKep+XtHbEvWWLsqnhAgp3/id NztS6NHNDf5OSmlgDWRkp70orCWe8J/C8tRSTNDfgzpS/nnftxFrZXQqGOalHQoXSlBoL5 SYeshdYBWUYIV2Ub+JR19XpvOYzrQzrvJ6vHbmtxdkJz9ZrIlbSYaHqOlfLPl3P9ipD1Me Z9GRNHl9Y3yVRLd8pGCeTnuRNb05uvcqKiA91lJQcjgO/E6GTECjxObaUF+n19CCfBz6vU PZXrrzBOFgC4k3EDbu1RMoChGCfkj2zPuDLtbxJVPbRMB7u3qZ5h9SO7VbvVHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677451160; a=rsa-sha256; cv=none; b=cHvpKFn4RHCPwRIAXigwIuvRqf6kGJ2Dl9IOZL8BFuGyDPbnSAidEiv1eB2C4qMBDAZbUm ES8RDEZjMNRMZIk/RsayPdckPWY8IrSITeZH3DbCmKVCjGEyucw8xsJhdtFcbTdrnd5/MS jyBgzSUYl7jP0kZ6+hTOKZwNH8Yyxx4jbP3t+8z2WhvUu6giTO/WOyGyhn0/TJY8s1x/jM A38Bc0yvj2KisdrWWos+jNRed6pYlm/JbIi9zYwV7KozJa+hTHghO4MxMKNfrEBQd7DB1Z 4yqnGBeqz4pnJtyZhs0weTWnh4kl8hA96o/AJEKKEYP6BIK61NJ2+e8RR1llxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPz8855ngz12tb; Sun, 26 Feb 2023 22:39: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 31QMdKqO096349; Sun, 26 Feb 2023 22:39:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QMdKgL096348; Sun, 26 Feb 2023 22:39:20 GMT (envelope-from git) Date: Sun, 26 Feb 2023 22:39:20 GMT Message-Id: <202302262239.31QMdKgL096348@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: e552cac3d7d9 - main - powerpc64*: port mlx5, OFED, KTLS and krping 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: e552cac3d7d999ac0fd6779fd7a3d216779075da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=e552cac3d7d999ac0fd6779fd7a3d216779075da commit e552cac3d7d999ac0fd6779fd7a3d216779075da Author: Piotr Kubaj AuthorDate: 2023-02-25 21:09:41 +0000 Commit: Piotr Kubaj CommitDate: 2023-02-26 22:38:33 +0000 powerpc64*: port mlx5, OFED, KTLS and krping Summary: This review ports mlx5 driver, kernel's OFED stack (userland is already enabled), KTLS and krping to powerpc64 and powerpc64le. krping requires a small change since it uses assembly for amd64 / i386. NOTE: On powerpc64le RDMA works fine in the userspace with libmlx5, but on powerpc64 it does not. The problem is that contrib/ofed/libmlx5/doorbell.h checks for SIZEOF_LONG but this macro exists on neither powerpc64* nor amd64. Thus, the file silently goes to the fallback function written for 32-bit architectures. It works fine on little-endian architectures, but causes a hard fail on big-endian. It's possible it may also cause some runtime issues on little-endian. Thus, on powerpc64 I verified that RDMA works with krping. Reviewers: #powerpc, hselasky Subscribers: bdrewery, imp, emaste, jhibbits Differential Revision: https://reviews.freebsd.org/D38786 --- share/mk/src.opts.mk | 4 ++-- sys/conf/kern.opts.mk | 3 ++- sys/contrib/rdma/krping/krping.c | 4 ++++ sys/modules/Makefile | 13 +++++++++++++ sys/powerpc/conf/GENERIC64 | 10 ++++++++++ sys/powerpc/conf/GENERIC64LE | 10 ++++++++++ 6 files changed, 41 insertions(+), 3 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index fe2159cd4f5e..8008a94ae329 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -318,8 +318,8 @@ BROKEN_OPTIONS+=LOADER_UBOOT BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA .endif -# Kernel TLS is enabled by default on amd64 and aarch64 -.if ${__T} == "aarch64" || ${__T} == "amd64" +# Kernel TLS is enabled by default on amd64, aarch64 and powerpc64* +.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != "" __DEFAULT_YES_OPTIONS+=OPENSSL_KTLS .else __DEFAULT_NO_OPTIONS+=OPENSSL_KTLS diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 5cda70156394..93edc1b6e63f 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -84,7 +84,8 @@ BROKEN_OPTIONS+= ZFS # Things that don't work because the kernel doesn't have the support # for them. -.if ${MACHINE} != "i386" && ${MACHINE} != "amd64" +.if ${MACHINE} != "i386" && ${MACHINE} != "amd64" && \ + ${MACHINE_ARCH:Mpowerpc64*} == "" BROKEN_OPTIONS+= OFED .endif diff --git a/sys/contrib/rdma/krping/krping.c b/sys/contrib/rdma/krping/krping.c index 182e5f111028..98f129597464 100644 --- a/sys/contrib/rdma/krping/krping.c +++ b/sys/contrib/rdma/krping/krping.c @@ -69,9 +69,13 @@ MODULE_DEPEND(krping, linuxkpi, 1, 1, 1); static __inline uint64_t get_cycles(void) { +#if defined(__amd64__) || defined(__i386__) uint32_t low, high; __asm __volatile("rdtsc" : "=a" (low), "=d" (high)); return (low | ((u_int64_t)high << 32)); +#elif defined(__powerpc64__) + return __builtin_readcyclecounter(); +#endif } typedef uint64_t cycles_t; diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9c2664460067..4397c7beb56e 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -843,8 +843,21 @@ _nvme= nvme .if ${MACHINE_ARCH:Mpowerpc64*} != "" _ipmi= ipmi _ixl= ixl +_mlx5= mlx5 _nvram= opal_nvram +.if ${MK_OFED} != "no" || defined(ALL_MODULES) +_ibcore= ibcore +_ipoib= ipoib +_iser= iser +_mlx5ib= mlx5ib +_rdma= rdma +.endif +.if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \ + defined(ALL_MODULES) +_mlx5en= mlx5en +.endif .endif + .if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe" # Don't build powermac_nvram for powerpcspe, it's never supported. _nvram+= powermac_nvram diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index ab36e2032203..6c40b031bee6 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -49,6 +49,7 @@ options TCP_BLACKBOX # Enhanced TCP event logging options TCP_HHOOK # hhook(9) framework for TCP options TCP_RFC7413 # TCP Fast Open options SCTP_SUPPORT # Allow kldload of SCTP +options KERN_TLS # TLS transmit & receive offload options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -128,6 +129,8 @@ device pci options PCI_HP # PCI-Express native HotPlug device agp +options COMPAT_LINUXKPI + # ATA controllers device ahci # AHCI-compatible SATA controllers device ata # Legacy ATA/SATA controllers @@ -189,6 +192,12 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558) device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 +# Nvidia/Mellanox Connect-X 4 and later, Ethernet only +# mlx5ib requires ibcore infra and is not included by default +device mlx5 # Base driver +device mlxfw # Firmware update +device mlx5en # Ethernet driver + # Pseudo devices. device crypto # core crypto support device loop # Network loopback @@ -199,6 +208,7 @@ device md # Memory "disks" device ofwd # Open Firmware disks device gif # IPv6 and IPv4 tunneling device firmware # firmware assist module +device xz # lzma decompression # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index ffb43628d2b1..99d1975442f7 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -46,6 +46,7 @@ options TCP_BLACKBOX # Enhanced TCP event logging options TCP_HHOOK # hhook(9) framework for TCP options TCP_RFC7413 # TCP Fast Open options SCTP_SUPPORT # Allow kldload of SCTP +options KERN_TLS # TLS transmit & receive offload options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -123,6 +124,8 @@ device pci options PCI_HP # PCI-Express native HotPlug device agp +options COMPAT_LINUXKPI + # ATA controllers device ahci # AHCI-compatible SATA controllers device ata # Legacy ATA/SATA controllers @@ -184,6 +187,12 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558) device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 +# Nvidia/Mellanox Connect-X 4 and later, Ethernet only +# mlx5ib requires ibcore infra and is not included by default +device mlx5 # Base driver +device mlxfw # Firmware update +device mlx5en # Ethernet driver + # Pseudo devices. device crypto # core crypto support device loop # Network loopback @@ -194,6 +203,7 @@ device md # Memory "disks" device ofwd # Open Firmware disks device gif # IPv6 and IPv4 tunneling device firmware # firmware assist module +device xz # lzma decompression # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! From nobody Mon Feb 27 03:33: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 4PQ5gm1XTyz3tFwL for ; Mon, 27 Feb 2023 03:33:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (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 4PQ5gl5RrFz3P31 for ; Mon, 27 Feb 2023 03:33:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=dmwaaxry; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::52f) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ed1-x52f.google.com with SMTP id f13so20246081edz.6 for ; Sun, 26 Feb 2023 19:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=QnYUdSbTLNSpQZ7UXdHIpEDLfYp6CtiRnYffJ4rDCn0=; b=dmwaaxry2vJoilclfxW3Q5PQB8mk970V95exn9KOJYU8zA/mX6df3sc6xLLq8tzOg3 W3ekaZziVdVsQGxn4S/534nEdSaIt9wur+H1pDjftlFpuvD9Dr2tsekakPSTHDVckkkF oOQvF1fgaUzH94ZEAxYXwzziuqrcjtAIOvrQ2dy8lwN0ypQOqc+vNbE4YvI7OHaLqIpl uvCOeQFR750Y/0rali2ukEi6aGRZg0TcY1bEaHAtjpkG+CVMGIqMt6b3NYje8tj6mEPe dxIyImQQs/e/X+s6NRaR34P9CxmRI+LzzFhvV1IIqh7aclfxZVNdvENES122Fy/jEC+C DCAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=QnYUdSbTLNSpQZ7UXdHIpEDLfYp6CtiRnYffJ4rDCn0=; b=xVDWqrFb3JW1jr+8sGWgbADUlGuG6eOBCliBaq+ajdHta0iOqszarJ8vUGqgajk8QX bMOyXA0YHHeVNC2CPRyasK9xQtQ4200koQr9FdOZuOmGzC70ClpRVdU8atqZAsiToUID alvFgNqZUX1fODatF/CHbJUJaOqPHPJRsy2OQG1QI7pj8AI/0dd9avm/QtVreIM1qjyE p/b+mX/awRz+Ci3ioPTtUA4pjigyjiW/6ZRySq28ZHuL9zkiyNi0GsgQKV/DNO7Yyxcv rOlgQPTf20+D8FLvXYeX5jLBG+NeNVSOuBSz8+KsSzYW3qeTO/gE9ftJVvsz09IdlfXP dOHw== X-Gm-Message-State: AO0yUKW0hp8w2BFbZJVgp5K8iljtry7xzR/Bwo6Sspk6U5i7A3BGTX2Q QC5JOI7+1qojkZD72p3D/ZrIKPxFXPfUdr+gjLiN9JLLWrYFLg== X-Google-Smtp-Source: AK7set9qcXk5GZyxLnVxaU6ddxDIF9W5YePf+585QMghg1pd+DHwTLQHM0MmJXfE+wD2jZZpJSA5suWxNdIvHk2vDPU= X-Received: by 2002:a17:906:4ecb:b0:895:58be:964 with SMTP id i11-20020a1709064ecb00b0089558be0964mr15411123ejv.2.1677468817644; Sun, 26 Feb 2023 19:33:37 -0800 (PST) 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: <66452C86-02AA-4604-B65C-5E32EEBAFCC3.ref@yahoo.com> <66452C86-02AA-4604-B65C-5E32EEBAFCC3@yahoo.com> In-Reply-To: <66452C86-02AA-4604-B65C-5E32EEBAFCC3@yahoo.com> From: Warner Losh Date: Sun, 26 Feb 2023 20:33:31 -0700 Message-ID: Subject: Re: git: c51978f4b2f0 - main - kbd: add KBD_DELAY1 and KBD_DELAY2 To: Mark Millard Cc: imp@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000ff705805f5a624ac" X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; FREEMAIL_TO(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; R_SPF_NA(0.00)[no SPF record]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52f:from]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4PQ5gl5RrFz3P31 X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N --000000000000ff705805f5a624ac Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Feb 25, 2023 at 10:03=E2=80=AFAM Mark Millard w= rote: > Warner Losh wrote on > Date: Sat, 25 Feb 2023 06:26:00 UTC : > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dc51978f4b2f080c80ddc891c24b151d= 35acb8ba4 > > > > commit c51978f4b2f080c80ddc891c24b151d35acb8ba4 > > Author: Michael Paepcke > > AuthorDate: 2023-02-18 09:11:37 +0000 > > Commit: Warner Losh > > CommitDate: 2023-02-25 06:19:05 +0000 > > > > kbd: add KBD_DELAY1 and KBD_DELAY2 > > > > Allow to configure KBD_DELAY* via KERNCONF for user-land less > embedded > > and security appliances > > > > Reviewed by: imp (folded) > > Pull Request: https://github.com/freebsd/freebsd-src/pull/649 > > --- > > sys/conf/options | 3 ++- > > sys/dev/kbd/kbd.c | 4 ++-- > > sys/dev/kbd/kbdreg.h | 8 ++++++-- > > 3 files changed, 10 insertions(+), 5 deletions(-) > > > > diff --git a/sys/conf/options b/sys/conf/options > > index 7855a2f3f20e..42529a90a54e 100644 > > --- a/sys/conf/options > > +++ b/sys/conf/options > > @@ -803,8 +803,9 @@ KBD_INSTALL_CDEV opt_kbd.h > > KBD_MAXRETRY opt_kbd.h > > KBD_MAXWAIT opt_kbd.h > > KBD_RESETDELAY opt_kbd.h > > +KBD_DELAY1 opt_kbd.h > > +KBD_DELAY2 opt_kbd.h > > KBDIO_DEBUG opt_kbd.h > > - > > KBDMUX_DFLT_KEYMAP opt_kbdmux.h > > > > # options for the Atheros driver > > diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c > > index 205d76639e0f..ebc779de4073 100644 > > --- a/sys/dev/kbd/kbd.c > > +++ b/sys/dev/kbd/kbd.c > > @@ -143,8 +143,8 @@ kbd_init_struct(keyboard_t *kbd, char *name, int > type, int unit, int config, > > kbd->kb_accentmap =3D NULL; > > kbd->kb_fkeytab =3D NULL; > > kbd->kb_fkeytab_size =3D 0; > > - kbd->kb_delay1 =3D KB_DELAY1; /* these values are advisory on= ly > */ > > - kbd->kb_delay2 =3D KB_DELAY2; > > + kbd->kb_delay1 =3D KBD_DELAY1; /* these values are advisory on= ly > */ > > + kbd->kb_delay2 =3D KBD_DELAY2; > > kbd->kb_count =3D 0L; > > bzero(kbd->kb_lastact, sizeof(kbd->kb_lastact)); > > } > > diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h > > index 15b7e5183f35..2839e259420d 100644 > > --- a/sys/dev/kbd/kbdreg.h > > +++ b/sys/dev/kbd/kbdreg.h > > @@ -151,8 +151,12 @@ struct keyboard { > > void *kb_data; /* the driver's private data */ > > int kb_delay1; > > int kb_delay2; > > -#define KB_DELAY1 500 > > -#define KB_DELAY2 100 > > +#ifndef KBD_DELAY1 > > +#define KBD_DELAY1 500 > > +#endif > > +#ifndef KBD_DELAY2 > > +#define KBD_DELAY2 100 > > +#endif > > [Just reporting Ximalas's Discord note.] > > So opt_kbd.h must be included before kbdreg.h in > order to avoid: macro redefined in opt_kbd.h ? > > Should something force the right order? > If we include them in the wrong order, then the compiler will complain, and that's likely sufficient. I'll double check NOTES to make sure that the values there are different than the defaults. Warner > > unsigned long kb_count; /* # of processed key strokes */ > > u_char kb_lastact[NUM_KEYS/2]; > > struct cdev *kb_dev; > > =3D=3D=3D > Mark Millard > marklmi at yahoo.com > > --000000000000ff705805f5a624ac Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Feb 25, 2023 at 10:03=E2=80= =AFAM Mark Millard <marklmi@yahoo.c= om> wrote:
https://= cgit.FreeBSD.org/src/commit/?id=3Dc51978f4b2f080c80ddc891c24b151d35acb8ba4<= /a>
>
> commit c51978f4b2f080c80ddc891c24b151d35acb8ba4
> Author:=C2=A0 =C2=A0 =C2=A0Michael Paepcke <git@paepcke.de>
> AuthorDate: 2023-02-18 09:11:37 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-02-25 06:19:05 +0000
>
>=C2=A0 =C2=A0 =C2=A0kbd: add KBD_DELAY1 and KBD_DELAY2
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Allow to configure KBD_DELAY* via KERNCONF for user= -land less embedded
>=C2=A0 =C2=A0 =C2=A0and security appliances
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Reviewed by: imp (folded)
>=C2=A0 =C2=A0 =C2=A0Pull Request: https://github.= com/freebsd/freebsd-src/pull/649
> ---
>=C2=A0 sys/conf/options=C2=A0 =C2=A0 =C2=A0| 3 ++-
>=C2=A0 sys/dev/kbd/kbd.c=C2=A0 =C2=A0 | 4 ++--
>=C2=A0 sys/dev/kbd/kbdreg.h | 8 ++++++--
>=C2=A0 3 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/sys/conf/options b/sys/conf/options
> index 7855a2f3f20e..42529a90a54e 100644
> --- a/sys/conf/options
> +++ b/sys/conf/options
> @@ -803,8 +803,9 @@ KBD_INSTALL_CDEV=C2=A0 opt_kbd.h
>=C2=A0 KBD_MAXRETRY=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_kbd.h
>=C2=A0 KBD_MAXWAIT=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 opt_kbd.h
>=C2=A0 KBD_RESETDELAY=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0opt_kbd.h
> +KBD_DELAY1=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_kbd.h
> +KBD_DELAY2=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_kbd.h
>=C2=A0 KBDIO_DEBUG=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 opt_kbd.h
> -
>=C2=A0 KBDMUX_DFLT_KEYMAP=C2=A0 =C2=A0opt_kbdmux.h
>=C2=A0
>=C2=A0 # options for the Atheros driver
> diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
> index 205d76639e0f..ebc779de4073 100644
> --- a/sys/dev/kbd/kbd.c
> +++ b/sys/dev/kbd/kbd.c
> @@ -143,8 +143,8 @@ kbd_init_struct(keyboard_t *kbd, char *name, int t= ype, int unit, int config,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0kbd->kb_accentmap =3D NULL;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0kbd->kb_fkeytab =3D NULL;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0kbd->kb_fkeytab_size =3D 0;
> -=C2=A0 =C2=A0 =C2=A0kbd->kb_delay1 =3D KB_DELAY1;=C2=A0 =C2=A0 =C2= =A0/* these values are advisory only */
> -=C2=A0 =C2=A0 =C2=A0kbd->kb_delay2 =3D KB_DELAY2;
> +=C2=A0 =C2=A0 =C2=A0kbd->kb_delay1 =3D KBD_DELAY1;=C2=A0 =C2=A0 /*= these values are advisory only */
> +=C2=A0 =C2=A0 =C2=A0kbd->kb_delay2 =3D KBD_DELAY2;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0kbd->kb_count =3D 0L;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0bzero(kbd->kb_lastact, sizeof(kbd->kb_= lastact));
>=C2=A0 }
> diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
> index 15b7e5183f35..2839e259420d 100644
> --- a/sys/dev/kbd/kbdreg.h
> +++ b/sys/dev/kbd/kbdreg.h
> @@ -151,8 +151,12 @@ struct keyboard {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0void=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 *kb_data;=C2=A0 =C2=A0 =C2=A0 =C2=A0/* the driver's private data */=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0kb_delay1;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0kb_delay2;
> -#define KB_DELAY1=C2=A0 =C2=A0 500
> -#define KB_DELAY2=C2=A0 =C2=A0 100
> +#ifndef KBD_DELAY1
> +#define KBD_DELAY1=C2=A0 =C2=A0500
> +#endif
> +#ifndef KBD_DELAY2
> +#define KBD_DELAY2=C2=A0 =C2=A0100
> +#endif

[Just reporting Ximalas's Discord note.]

So opt_kbd.h must be included before kbdreg.h in
order to avoid: macro redefined in opt_kbd.h ?

Should something force the right order?

If we include them in the wrong order, then the compiler will complain,
and that's likely sufficient. I'll double check NOTES to ma= ke sure that the
values there are different than the defaults.

Warner
=C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0unsigned long=C2=A0 =C2=A0kb_count;=C2=A0 = =C2=A0 =C2=A0 =C2=A0/* # of processed key strokes */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0u_char=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 kb_= lastact[NUM_KEYS/2];
>=C2=A0 =C2=A0 =C2=A0 =C2=A0struct cdev *kb_dev;

=3D=3D=3D
Mark Millard
marklmi at yahoo.com

--000000000000ff705805f5a624ac-- From nobody Mon Feb 27 03:50: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 4PQ63N5b5dz3tGvn; Mon, 27 Feb 2023 03:50: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 4PQ63N3GpYz3Q5H; Mon, 27 Feb 2023 03:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677469840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IJ6iKijSYQVaV2hcXdMRtaqUWMSmzfYq397HIls98uY=; b=j8PKfvSSbVUVnstOtQbo52N/MHSqgGeRIbgVhkGXn266U5TMpRvonZnKpy9v+LlG5jf6yy skY5Om4PwcMbgA6VkqgVYXVfI4FNKtIlyxnkHcyZ5slr4pI0NsQWClPWEkMAWK4PG6Syv/ 85Tg3bZQiYHOKad7YTwRi9s8MkrFQnTaszChXy4ubhSKYtIf3RHi5aWrpBuJ6pUt+8j8H8 /tf4fr3b+Tvl3zxc+wxxG25hsn42hg92vYoJ81cUDUph/2Rre3HYbfs7LW7ntjMSwuJvof /idg09cj7taQ8yGRU0dPsPw5G2mGvQIqkZIwyzAKZ2X8rnyGiVoZ3vcQx9CunQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677469840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IJ6iKijSYQVaV2hcXdMRtaqUWMSmzfYq397HIls98uY=; b=nCO+q4XzI9b1VgEH9ptoHVeNfmUfTzqHhxv7Rn9PHrRMX0Fi+LbhNYEDZmNbGdRmRt0DqN b74Q7wValR5gbM1nf/uscJnwp9OcxrxQ/30emp2Omm9EcihEZbvExqzuFfpBNju4McPjLR +Y+tCduJLpMaMMiUbCez0XP2MmMYhaGgA43eX332lurdQ88Wtv7p1QGsLIsUMHgPRonR7z dh8AFCltq7OdGBknpMdnJql2d0uNJPAW9qJYirefnzn7/QCX/dPzA5gGFpQ+XhIE0tJw6H QMhHh8mZTyrReM79CiASHgNz6Psr1ihVWarvdAHUo8+boTaeeXMUQM4lW7Q5xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677469840; a=rsa-sha256; cv=none; b=gqyfRVsJFtcS7RMkgIkvujxZNqrSlv+sMsF74e05U++yhWa1EWHK4qKakUR/4ErUxlX/7A mLl46Kcid8Qmx+pd3+KxqECIQ4Yq18nfJmNjEzlC6SB1HOQNHUqctJ62KJ6wUXjvptBcD9 xQhJiDF1ugRAHleBj880PdST+kBg2tpadBQiMndzXCrPm0SoZYzf/hHGb6DlgwbD9I1JY8 NUTmao+SSsroL0yUgvupBk6pcVho4s7k0kwdz/RxvOX2tE5HGjRgupsFwG05OfF98gbhAn /Q2fkrsDk3AgqCOcCgd2/G9atB+0VtvfGstTHsQfeDc8/h2LvxGyPSOxyg0J2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQ63N2Mvhz1BJW; Mon, 27 Feb 2023 03:50: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 31R3oei9014601; Mon, 27 Feb 2023 03:50:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31R3oeaB014600; Mon, 27 Feb 2023 03:50:40 GMT (envelope-from git) Date: Mon, 27 Feb 2023 03:50:40 GMT Message-Id: <202302270350.31R3oeaB014600@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: a4b92fefd250 - main - kbd: Tweaks to KBD_DELAY[12] 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: a4b92fefd2507140be6b4298bc3c2ba59d7b48b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a4b92fefd2507140be6b4298bc3c2ba59d7b48b2 commit a4b92fefd2507140be6b4298bc3c2ba59d7b48b2 Author: Warner Losh AuthorDate: 2023-02-27 03:48:07 +0000 Commit: Warner Losh CommitDate: 2023-02-27 03:49:32 +0000 kbd: Tweaks to KBD_DELAY[12] Make sure NOTES has a different value than the defaults, and properly document the default values in atkbdc(4) and bump .Dd Sponsored by: Netflix --- share/man/man4/atkbdc.4 | 6 ++++-- sys/conf/NOTES | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4 index cddc49969232..eccdd6027343 100644 --- a/share/man/man4/atkbdc.4 +++ b/share/man/man4/atkbdc.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 9, 1999 +.Dd February 26, 2023 .Dt ATKBDC 4 .Os .Sh NAME @@ -35,6 +35,8 @@ .Sh SYNOPSIS .Cd "options KBD_RESETDELAY=N" .Cd "options KBD_MAXWAIT=N" +.Cd "options KBD_DELAY1=N" +.Cd "options KBD_DELAY2=N" .Cd "options KBDIO_DEBUG=N" .Cd "device atkbdc" .Pp @@ -96,7 +98,7 @@ DELAY1 sets the intitial key repeat delay to The default value is 500ms. DELAY2 sets the key repeat delay to .Fa Y . -The default value is 200ms. +The default value is 100ms. .It Em KBDIO_DEBUG=N Sets the debug level to .Fa N . diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 6d79905967aa..4de38aeb4e94 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1496,8 +1496,8 @@ options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap options KBD_INSTALL_CDEV # install a CDEV entry in /dev # Define keyboard latency (try 200/15 for a snappy interactive console) -options KBD_DELAY1=500 # define initial key delay -options KBD_DELAY2=100 # define key delay +options KBD_DELAY1=200 # define initial key delay +options KBD_DELAY2=15 # define key delay device kbdmux # keyboard multiplexer options KBDMUX_DFLT_KEYMAP # specify the built-in keymap From nobody Mon Feb 27 04:12: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 4PQ6Y51PLHz3tHph for ; Mon, 27 Feb 2023 04:12:57 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic309-22.consmr.mail.gq1.yahoo.com (sonic309-22.consmr.mail.gq1.yahoo.com [98.137.65.148]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQ6Y45mhgz3hGR for ; Mon, 27 Feb 2023 04:12:56 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677471174; bh=r1jUaI93SovfoSQJ5etBqcCtghA+v5xHDX+LrcxiHb4=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=TFguXvF8FdtqHQMTHXz10aSHRiwqE0ZB3GdBCPlNpZom2g5DAm74yzoVR9Y6Vi0cR3YlAGT49xwtKStw8mwY0QppqLxGngko4gYYc/jYSpxiZt/5vQq3WDrNfr0eeuaDEAx2zThT3EFSoFaLlG4vfMm/VGCVJyIElnAQp75oTrO3Gap4wGtyzGjBtT/rO9j0C8fGTBTAxndX4Og8m0u7pbLlsK8hywZH+0UtJ1gwXfT3zDcZxp8cEmNBgjgOuGf8p3qTwLMK+4+cw7En6UKEUDkhfz/1VEgho93xbgzZhbUD4BBGHUQkKR9qk/x008WsYyj7h8eSWzgdJkgpwAFOrA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677471174; bh=zTCT7JdClfY2Jw2Y0udAHKINXvwoAfJ36w2A0FXiM1G=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=SK/siJAvWFVvyldb/Pwc7rRfigTvduGLKA25SMYe3FohdRV+gd3MryFqe4aMXJCDQhSZgvUhcDSj7wl9cxo4yBzxhR8B/PLMrvNDXqNL7JNB8NIgf0QJPs53YCd2H/edulf+N85oozxYHpypkhpepXfJ2BDFwsC9qXcrHW/GDuDicRg22YBZnoeQYE6b4Mrk1bZ4JiEJrxeIA+8+xhDfjm2OG0nA5fWMR0SFi0u0UmOdyvWxDxwH6pampbE590wnzySsHOjfp9XoJs1UAuT1kWT09txrKCxQUW5FSg7SFzV7i4SmAjBnox02HOBCEwqGfsDfijq2s98ntmiR+ldO7Q== X-YMail-OSG: pYzs79kVM1k_LkTMXh4yZuKgQ1h0_iGSbaYNmB1QZglAogezbTzKDid675vnh3A QxaV281y7rcO0raEOrZhQzeG63Zt1E_tCypVAKsRBzaIK.lhtvRm31re1.PM86GqjjeWG0Jz_2k8 1DayJPBs19M1Lcb8tzbcKiwNl4zDAKdNBO5qZYEXUlsT5mC80JVDmLhO4xAJZ2.wm.VoQSW54LTX Hw0NKzx52ZnA1AXc9pKYenzzK1GqqaLNcyG4pMPPuWskn5m4xONv9uDohNZ08uQJTZ1kT4da_uBT U0T.nhh6Yh_HnpH8Ff4JmYEGBBP7pp7oJvibP_f0bwyykpjx252ymB5Z6OcPBq1yoR3tK6LxD.cl 6Yhc_qihNGw_SdInaTsWlKr4v8ovMoS2ddwlPJUFRxpbPW9248B8TuICNlnM_GIotxsg5.ZO8i0p UtHqkD_svoSvXoU5F6yb4kuDOVzdb7BL.RKunLdr7UT2aoCDcdCBdFTni7ee5eS.NbgIzi6UgAsK 9CDy7s2Bhe_VJ3slWT5YbFfL5xOjMDzSmZRFj1Q5kVC0_fYMxiY8POMX08RvAajSBWu055l7VFU4 G2F4S_cFLyJRItiTAaotpG0RyWWR1FicfFVHMef33CVTUBQaz638uAGL1nWVE4BX5C_lVj13CQXE xM0Njpu9ViKohPIb9JIwHigUAje1bulvLQPDEh.o.E4q743q_7hDiF92RBJTtMoOUsW4iTkuZcYo JxDxkz5gDyrQDhoNxeMtW0bSu7wxtGYlFreSGN.P..Db6KiUJOFF8GdT4XWrw8fesm7RsYZWZ7Wr 8QtyCNrL.Pk5pevHzdTMSDqkEYHK3NCsjx.YOB9B3N8OJ7MTIaPIekyy8n0YCDr0ZbuOb8b0YhFx eeOVlvIs5NBEPQbyRb.RNTmQ_8BWRS.3y52LZBDshnw4SCFkXiGvS2jtxtLbnPtno43J.5G3eDLq aFnd3ERuBqpPLUGCAgzSnoiInkcKoP86qHjcTz__R38iCWpaQO_YXaRSBMQmusOmTcUnKFhy3eKM YAR0R_kxCAh6ZJUCDV1PWU8ZfJevZY6cCLJRuT_wbL3hipK0pJrvzxkM1GJTfNy.Zf8Re_gq4fXk r3qdzt5FG20W.aXQtehnRclPsUTkbs.y2R.8kAEmAbQUcVnRCNpaFVUaQCUWyfTxunXaYDAom6HM gsQ.RaYjNGEvl4YMbf5dRy8gG12Gtli4znLjwIFrXJLYZfdo9MPRCnTQAwRjtxv99Zn_7vHwzX7m tEriLpJToEnnFDYfGiKMAYjE0aWPuhfeEnIW6qyvEpQRCQFafSXsjIPVeEKbQUZcn68pEnRx52Vt n39kksmWCQdt9Flc3susTbcXJdAEaCy5PoeyZ0Gud_m2afST1SIuXOTc_bn4Vi2WM3qMra8fOOeu yPgAeIzIRD52Gv1HWkvLhd6sZkjOnPK46Ay_FM7WdPuzEzelDh_MmXX.OFPtYKrac3bSlLuTgdSt K9McILTWIMULPg2GR254BPHsf3KScnYrqrd.5hagwipDLduNgmsDFku2eNBbSAr1oXBeSQjlVsU0 fucuglVMd.aTbfhKyejDzinZk8UYC_Sew9lT5P31d2zDk6QUp4tvf_ifv3RO0N647XIrmgAqLmi. GMiIoBNGFUUs338Swb2FCUuTcv6uITzIRjlkbCCiF8YVaofm6XKGdwBp_b3JnA.jsqBpxcpz7Ocd lDS94EPC7b2CS6059dtCB6xRi42.6iXyFGdnbfchNJHTzJhvnX9z1PPpLfXiO9kXLk8MzaB1VOVu j5EzedVsjIztxH3HlP6D3WyIFq0PWlv3DM34uFh.fDS9nXi0qpcWa2kuaTPE8cIXYJD06n8DZ8HB 1tda4eXpsf0.xzUz0kjcmZBKXO.kOnhrCjgUTNmDN0NVAaiofq83aU56uSyEIDwNQ1U0eyOkilv. 2UieKK8wLU_V90ouIy7e8d1oKv8vfZbAhdsY6zUNVdri1b695wE_feGWgIh5QEOQZcpuVb4KYFjx WOAP9xJwZxJEhT9k.aBDDyyvOV69nlGzNcfBzkbaAew9bmvM3d0J7vKzbDbxD_j4S6i.KhyOVFDY zsvigq5J5S75HjP0dMuWauHlRvqqacypql1dwedIkaczmuwgTQOef8wboH6enwyswirM2ZS1kxlE HIAvKxc.Ev9EvZVya.catoC7_q6DCwx_sMjhu6i.YhQ.9gYvUikU_88hRRklk9GYEIOotQtOlqbQ Pme6CH3yLw3hWnoikGPNAhADaZfOIRTW0PW8RC48XzPWt4nUHs2GxvZ.foJSEXL5AN8FSjGQ0Cqu Vquo- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.gq1.yahoo.com with HTTP; Mon, 27 Feb 2023 04:12:54 +0000 Received: by hermes--production-bf1-57c96c66f6-97q92 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 45e13a01e5d1acfb5175c12ad474b365; Mon, 27 Feb 2023 04:12:48 +0000 (UTC) Content-Type: text/plain; charset=utf-8 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 \(3731.400.51.1.1\)) Subject: Re: git: c51978f4b2f0 - main - kbd: add KBD_DELAY1 and KBD_DELAY2 From: Mark Millard In-Reply-To: Date: Sun, 26 Feb 2023 20:12:36 -0800 Cc: imp@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <5BEC0410-DBAA-4CBF-8BDB-5C317AD2A094@yahoo.com> References: <66452C86-02AA-4604-B65C-5E32EEBAFCC3.ref@yahoo.com> <66452C86-02AA-4604-B65C-5E32EEBAFCC3@yahoo.com> To: Warner Losh X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PQ6Y45mhgz3hGR X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Feb 26, 2023, at 19:33, Warner Losh wrote: > On Sat, Feb 25, 2023 at 10:03=E2=80=AFAM Mark Millard = wrote: > Warner Losh wrote on > Date: Sat, 25 Feb 2023 06:26:00 UTC : >=20 > > The branch main has been updated by imp: > >=20 > > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc51978f4b2f080c80ddc891c24b151d3= 5acb8ba4 > >=20 > > commit c51978f4b2f080c80ddc891c24b151d35acb8ba4 > > Author: Michael Paepcke > > AuthorDate: 2023-02-18 09:11:37 +0000 > > Commit: Warner Losh > > CommitDate: 2023-02-25 06:19:05 +0000 > >=20 > > kbd: add KBD_DELAY1 and KBD_DELAY2 > > =20 > > Allow to configure KBD_DELAY* via KERNCONF for user-land less = embedded > > and security appliances > > =20 > > Reviewed by: imp (folded) > > Pull Request: https://github.com/freebsd/freebsd-src/pull/649 > > --- > > sys/conf/options | 3 ++- > > sys/dev/kbd/kbd.c | 4 ++-- > > sys/dev/kbd/kbdreg.h | 8 ++++++-- > > 3 files changed, 10 insertions(+), 5 deletions(-) > >=20 > > diff --git a/sys/conf/options b/sys/conf/options > > index 7855a2f3f20e..42529a90a54e 100644 > > --- a/sys/conf/options > > +++ b/sys/conf/options > > @@ -803,8 +803,9 @@ KBD_INSTALL_CDEV opt_kbd.h > > KBD_MAXRETRY opt_kbd.h > > KBD_MAXWAIT opt_kbd.h > > KBD_RESETDELAY opt_kbd.h > > +KBD_DELAY1 opt_kbd.h > > +KBD_DELAY2 opt_kbd.h > > KBDIO_DEBUG opt_kbd.h > > - > > KBDMUX_DFLT_KEYMAP opt_kbdmux.h > > =20 > > # options for the Atheros driver > > diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c > > index 205d76639e0f..ebc779de4073 100644 > > --- a/sys/dev/kbd/kbd.c > > +++ b/sys/dev/kbd/kbd.c > > @@ -143,8 +143,8 @@ kbd_init_struct(keyboard_t *kbd, char *name, int = type, int unit, int config, > > kbd->kb_accentmap =3D NULL; > > kbd->kb_fkeytab =3D NULL; > > kbd->kb_fkeytab_size =3D 0; > > - kbd->kb_delay1 =3D KB_DELAY1; /* these values are advisory = only */ > > - kbd->kb_delay2 =3D KB_DELAY2; > > + kbd->kb_delay1 =3D KBD_DELAY1; /* these values are advisory = only */ > > + kbd->kb_delay2 =3D KBD_DELAY2; > > kbd->kb_count =3D 0L; > > bzero(kbd->kb_lastact, sizeof(kbd->kb_lastact)); > > } > > diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h > > index 15b7e5183f35..2839e259420d 100644 > > --- a/sys/dev/kbd/kbdreg.h > > +++ b/sys/dev/kbd/kbdreg.h > > @@ -151,8 +151,12 @@ struct keyboard { > > void *kb_data; /* the driver's private data = */ > > int kb_delay1; > > int kb_delay2; > > -#define KB_DELAY1 500 > > -#define KB_DELAY2 100 > > +#ifndef KBD_DELAY1 > > +#define KBD_DELAY1 500 > > +#endif > > +#ifndef KBD_DELAY2 > > +#define KBD_DELAY2 100 > > +#endif >=20 > [Just reporting Ximalas's Discord note.] >=20 > So opt_kbd.h must be included before kbdreg.h in > order to avoid: macro redefined in opt_kbd.h ? >=20 > Should something force the right order? >=20 > If we include them in the wrong order, then the compiler will = complain, > and that's likely sufficient. I'll double check NOTES to make sure = that the > values there are different than the defaults. The report on Discord (Kernel) was that the attempted use resulted in: --- psm.o --- In file included from /usr/src/sys/dev/atkbdc/psm.c:100: In file included from /usr/src/sys/dev/atkbdc/atkbdcreg.h:39: ./opt_kbd.h:1:9: error: 'KBD_DELAY1' macro redefined = [-Werror,-Wmacro-redefined] #define KBD_DELAY1 200 ^ /usr/src/sys/dev/kbd/kbdreg.h:155:9: note: previous definition is here #define KBD_DELAY1 500 ^ In file included from /usr/src/sys/dev/atkbdc/psm.c:100: In file included from /usr/src/sys/dev/atkbdc/atkbdcreg.h:39: ./opt_kbd.h:3:9: error: 'KBD_DELAY2' macro redefined = [-Werror,-Wmacro-redefined] #define KBD_DELAY2 15 ^ /usr/src/sys/dev/kbd/kbdreg.h:158:9: note: previous definition is here #define KBD_DELAY2 100 ^ 2 errors generated. *** [psm.o] Error code 1 The reported workaround was: diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index a308cc81cd3a..86560f7bc2dd 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include "opt_isa.h" +#include "opt_kbd.h" #include "opt_psm.h" #include "opt_evdev.h" > Warner > > unsigned long kb_count; /* # of processed key strokes = */ > > u_char kb_lastact[NUM_KEYS/2]; > > struct cdev *kb_dev; =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Mon Feb 27 10:57: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 4PQHX92R4wz3txgq; Mon, 27 Feb 2023 10:57: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 4PQHX91mc7z4HQC; Mon, 27 Feb 2023 10:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677495465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JyMpBdDtrpYX4azGtWswKVitvrpZJ8DmjdlglXy93+I=; b=gbGHsXZoaan+iA1CXgBA1qClq/XRLPLHz0oODpAvLiIYUxMaGq/KbvT1ZU2+aG9sqcx1fk tjWnyJLTXTUkDGrbrPde4LNiwtM0wjZEW7cJ76vca644ahkLrxFe8Oss85+4nkmzFcXlix YO2Oj2iiHDa/w9nBHn8CqsxRwpSUX1b6jyWrFEvgENlYkDoMP9Wc3OPcZjrjR/Mo8Ia7oM ZYiJMPj6zCdG7zxw8JArFU4pVyIH6jMlqZ0cIOxoDeVWx80IOeAbxgm6ZfA5KAp9nW7Q0h FqxqKfXjQwR9fHFmOgAlO6rvveHWXrPpyG2LBOoG0ACiolo4TqGRYfJBSpYkPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677495465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JyMpBdDtrpYX4azGtWswKVitvrpZJ8DmjdlglXy93+I=; b=YQGeoF9wD31MVi8iBrmgQa2F7eHkufRBHm/gtfyuhb5bvHispxSUU89rOo/j1OxFKXE7uY Kv8uvpAW/ZZzLDYDKXdV9kWUUk/0jmJ5aa+p98gWUnbuURqwHTzMkfC7M2C6QwEzxVFI+t QUPxhQKOxOJ5BTNloAHE7FyOY5qt7jep+5kvWl0D7XbMy9a3Av7oZUk3hMbiDBHV8l3tN0 5U/phtJwnb5itqXeyOLn29OoNfxLjPOyTiduWPgp7fUr0EOi3qTY5Owr39vN8FKA9Qy4aY 5hqN2DgSEbHW4b/LrFfaVzxcCYm6VZkepZFAcaz4xDVILVRQ2LMBG0cElg+hkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677495465; a=rsa-sha256; cv=none; b=o/Ex9wYkEczp/D/GypIuwX7M5nYa6crXQoLlWqGFmWWrV0JFG7YhH0Y563PSZlaFlR0szV N2Hmx4RAkktsqDW6ewVhI0jq22uA7ep+VJP0jlDdPHnmba7NNoxW5Y8JX73t4qamHHIueN xIZ/9U/+l9Y3j0do9APNXdWEZeakUdJynvLJwPkIRF4a0vE2F0LMQx2BAnmchHUBPIJLKr s8J6P3nR7yifMPSMi6mBP6tvnFDogtbxNq3zKnaPdH/DLqD7COYWaLUiNj1iQwwulbTDcr 2tp3LlKMzQ7h8I6eyHihzejX6OXlH+om7h+kvEkxzZDClxuWQYbj5EYqIISoYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQHX90J28zNrh; Mon, 27 Feb 2023 10:57: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 31RAviLB008738; Mon, 27 Feb 2023 10:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RAviHY008737; Mon, 27 Feb 2023 10:57:44 GMT (envelope-from git) Date: Mon, 27 Feb 2023 10:57:44 GMT Message-Id: <202302271057.31RAviHY008737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 28a5d88f7091 - main - netlink: make the maximum allowed netlink socket buffer runtime tunable. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28a5d88f7091d1fc72f4f1bd8562d3c8b15883f5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=28a5d88f7091d1fc72f4f1bd8562d3c8b15883f5 commit 28a5d88f7091d1fc72f4f1bd8562d3c8b15883f5 Author: Alexander V. Chernikov AuthorDate: 2023-02-27 10:44:54 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-27 10:48:31 +0000 netlink: make the maximum allowed netlink socket buffer runtime tunable. Dumping large routng tables (>1M paths with multipath) require the socket buffer which is larger than the currently defined limit. Allow the limit to be set in runtime, similar to kern.ipc.maxsockbuf. Reported by: Marek Zarychta MFC after: 1 day --- share/man/man4/netlink.4 | 6 ++++++ sys/netlink/netlink_domain.c | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/share/man/man4/netlink.4 b/share/man/man4/netlink.4 index fdcc823b01a6..ece4892f481e 100644 --- a/share/man/man4/netlink.4 +++ b/share/man/man4/netlink.4 @@ -280,6 +280,12 @@ Default receive buffer for the netlink socket. Note that the socket recvspace has to be least as long as the longest message that can be received from this socket. .El +.Bl -tag -width indent +.It Va net.netlink.nl_maxsockbuf +Maximum receive buffer for the netlink socket that can be set via +.Dv SO_RCVBUF +socket option. +.El .Sh DEBUGGING Netlink implements per-functional-unit debugging, with different severities controllable via the diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 5f9120f14308..01023f7244b6 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -77,6 +77,11 @@ SYSCTL_ULONG(_net_netlink, OID_AUTO, recvspace, CTLFLAG_RW, &nl_recvspace, 0, extern u_long sb_max_adj; static u_long nl_maxsockbuf = 512 * 1024 * 1024; /* 512M, XXX: init based on physmem */ +static int sysctl_handle_nl_maxsockbuf(SYSCTL_HANDLER_ARGS); +SYSCTL_OID(_net_netlink, OID_AUTO, nl_maxsockbuf, + CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE, &nl_maxsockbuf, 0, + sysctl_handle_nl_maxsockbuf, "LU", + "Maximum Netlink socket buffer size"); uint32_t nlp_get_pid(const struct nlpcb *nlp) @@ -675,6 +680,22 @@ nl_ctloutput(struct socket *so, struct sockopt *sopt) return (error); } +static int +sysctl_handle_nl_maxsockbuf(SYSCTL_HANDLER_ARGS) +{ + int error = 0; + u_long tmp_maxsockbuf = nl_maxsockbuf; + + error = sysctl_handle_long(oidp, &tmp_maxsockbuf, arg2, req); + if (error || !req->newptr) + return (error); + if (tmp_maxsockbuf < MSIZE + MCLBYTES) + return (EINVAL); + nl_maxsockbuf = tmp_maxsockbuf; + + return (0); +} + static int nl_setsbopt(struct socket *so, struct sockopt *sopt) { From nobody Mon Feb 27 14:40: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 4PQNTW2bVtz3vBlw; Mon, 27 Feb 2023 14:40: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 4PQNTW28H2z3HyY; Mon, 27 Feb 2023 14:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677508847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WKGbx8WJHa1ApDVOwwzXIECyosouAYyihdWF2M7tUAM=; b=uQe6npwkdiQWwZJCYMkREez5Q332SdMtfp9mkftWWCiKzX1o6+ubNP/SvRczzi6I9iJyEo XSP/PT2TgprLQFusf5XvRtQ0zlIt0f6DjEVr4kPN8qFqA5hl/mAVHqmjgqh+L6DIPEvWvQ Q9L5eyS3FLFgsy5HuEJegHPgh/Sr3+w60FvpSoD1OjjgC3roglQwlC5IJAfLdPTo63V+VP YgxrmPK2JryDjiyjnb8v3AXUxHuYCda2Aelwj0A1Q/aXBrj0Gw1sdB2j6/ZfwpwYXr+sX2 XTckFja7h9KK1bhegy1weGqbyLHRRGkhhvwDDQGsMSZhfeanNlhldHx2ml8SrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677508847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WKGbx8WJHa1ApDVOwwzXIECyosouAYyihdWF2M7tUAM=; b=I28ZeKQ4MQW4mT9zqXY37Z6dUPvk6WGazMxkaJN9Sy0eL+siufn6cx8dr8274kL93R/b9E kSLQlsBtIr1qRasTMSp2F3InoG/er4JXK2KahAINz18q2zDCoqOPJqZEfzX/QwD9XujYPN 1NE0Oa0t+xrXReBP6FaK9ot2b126vZFHhVabhSbIYdw11+WYm/D+uj2mHdDzmUVN4GGNo9 TCK3l2Ym0l0bl1p8fFikjGLOw/as+Ddmvi2CrTKHGZgBYLngEx/aszQFb8RJHfz8SvYwkE o/qX4Eukl8HwpKNidKLyqttMl4DQzYg3cJqANm6EAbSJA4vL8N8LF46EmBjb+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677508847; a=rsa-sha256; cv=none; b=ouAesTZCl0YB9JYFypVoBh8UoMr0i7v/nOG3bc8HG8EGmsJJ/ipv9Oy/B7jxlB+10WWz+p 9vRiSk3MB4QM+smTqmzxyZoujy/9qJ4RjySwx3mxsveL+uO4e+HGIK831mz8wWLfqaJXN1 lYnH85pjH2OWyMOUA9VRbWHJjnPJ2v3lKDOA0kXTTVXNPk5Lj0GGXOu4QONP9a/yohbE6D 6D25QKKOHqAG/3ytBBILv0Yt0JCph6EwVQF7tz9NizKVvFpswl1yCKY9UrTDyadE0Pt2o/ oF18JVrEKq2ZixHIyvWT7Zj4ocgHFjpkGvRw+Q2yefqICQXT721dJvS6eNhavw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQNTW1BkkzVMr; Mon, 27 Feb 2023 14:40: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 31REels2080059; Mon, 27 Feb 2023 14:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31REelGN080058; Mon, 27 Feb 2023 14:40:47 GMT (envelope-from git) Date: Mon, 27 Feb 2023 14:40:47 GMT Message-Id: <202302271440.31REelGN080058@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: cd29688e8ec5 - main - kbdreg.h: include opt_kbd.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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd29688e8ec55a45cda1a5620dfc9b3ba297c0c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cd29688e8ec55a45cda1a5620dfc9b3ba297c0c1 commit cd29688e8ec55a45cda1a5620dfc9b3ba297c0c1 Author: Warner Losh AuthorDate: 2023-02-27 14:27:45 +0000 Commit: Warner Losh CommitDate: 2023-02-27 14:37:32 +0000 kbdreg.h: include opt_kbd.h This is a kernel-only file, so it's safe to include opt_kbd.h. However, add #ifdef _KERNEL guards to emphasize that. And also move the include of opt_kbd.h in atkbdcreg.h to inside the kernel guards. Nothing outside the kernel in tree uses the rest of that file, but I'm less comfortable moving the #ifdef _KERNEL to the top of that file. Sponsored by: Netflix --- sys/dev/atkbdc/atkbdcreg.h | 4 ++-- sys/dev/kbd/kbdreg.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h index 956861b657d6..c0bfbf27a880 100644 --- a/sys/dev/atkbdc/atkbdcreg.h +++ b/sys/dev/atkbdc/atkbdcreg.h @@ -36,8 +36,6 @@ #ifndef _DEV_ATKBDC_ATKBDCREG_H_ #define _DEV_ATKBDC_ATKBDCREG_H_ -#include "opt_kbd.h" /* Structures depend on the value if KBDIO_DEBUG */ - /* constants */ /* I/O ports */ @@ -145,6 +143,8 @@ #ifdef _KERNEL +#include "opt_kbd.h" /* Structures depend on the value if KBDIO_DEBUG */ + #define ATKBDC_DRIVER_NAME "atkbdc" /* diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h index 2839e259420d..822af48c932b 100644 --- a/sys/dev/kbd/kbdreg.h +++ b/sys/dev/kbd/kbdreg.h @@ -31,6 +31,10 @@ #ifndef _DEV_KBD_KBDREG_H_ #define _DEV_KBD_KBDREG_H_ +#ifdef _KERNEL + +#include "opt_kbd.h" /* KBD_DELAY* */ + /* forward declarations */ typedef struct keyboard keyboard_t; struct keymap; @@ -411,4 +415,5 @@ int genkbd_commonioctl(keyboard_t *kbd, u_long cmd, caddr_t arg); int genkbd_keyaction(keyboard_t *kbd, int keycode, int up, int *shiftstate, int *accents); +#endif #endif /* !_DEV_KBD_KBDREG_H_ */ From nobody Mon Feb 27 14:42: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 4PQNWR3rtgz3vByg for ; Mon, 27 Feb 2023 14:42:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (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 4PQNWR25jvz3JmY for ; Mon, 27 Feb 2023 14:42:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x530.google.com with SMTP id cy6so26800520edb.5 for ; Mon, 27 Feb 2023 06:42:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=7HI4jaWh5b/aoZjhnZn4zU/oTRjO1gfasaiTRhnQdPc=; b=uDOCjpv5c70eFetMiD+FXGn76eHY+SJgj5WjUClIv1+0swUOuVsQaPwT0fUKYHihSi rGwe0XHSuAuefcUE5XyQqyTjj+aCEOSnLMJIMNmgk5F/4YqyfeJPOYCljdygmlDZOZ9+ wF0L7HTzAvpQTsh7+0boJubGdx/lG0nMFmIc8wF4M5DynU8oOU/+e+h1f/VN4KX3ObFa uXnpFtUBrErirTGiclynVXiwuXk3iCiwMLEV4RsYBUrHeRKpkpXIZvuc+4HKkhpjuxXn HmuVguSSjDwIaeXTc90gDvjBBsGAREmFE6eyvkNG37wfJD/6qbhmfysrKG6mzZQqV8Rx sCYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=7HI4jaWh5b/aoZjhnZn4zU/oTRjO1gfasaiTRhnQdPc=; b=rC6+Rm4zg83AKSewwByetu+ylEEhbZQRwjPlfGQ4SZKfvQpLbWJwi9cETYZI7t5vqt 1I/EYiRPbcmTIGiLG255t3H0SM+82QrKIntaDvgGmnVCIRpQhjpnfwLjApvto0+khBeu +EnVeCgpTVFHhlPuetvWL9CWT37KAWJg5+5GWc7wfJ9KnY9qAIbOm92pkrbXZ+vHjK5c rgyrOmz6qli3Ja1PffSYmAllJnFus9okejzrLUXkMOauxnHYbmb2p9wWFGLX9wtaQFFB +cILegFIic1f80+g24zU6WEyT4d0ZZyK7AMNICTATJ0hGTYgc7Q0f0qQjDrcZLjnS1B0 aEZg== X-Gm-Message-State: AO0yUKXtSRnnreZPGseNz5l/A5I3+jdUHZz2WkOw2udK5e1Rvn1D+32B qPkubLLeJGqXFkEvuxYQpB6hQILVzhbmxcyM0QZOD7871X8mNA== X-Google-Smtp-Source: AK7set9lY/RoZyW9MFSOL2bn616ZyzBu8y3cNms5ndMnVM8fLtY9P8XMiqXb3s/s2oYAOZNUzWnCtn8d3TN5WISQUkk= X-Received: by 2002:a05:6402:2811:b0:4af:70a5:5674 with SMTP id h17-20020a056402281100b004af70a55674mr6607383ede.0.1677508945931; Mon, 27 Feb 2023 06:42:25 -0800 (PST) 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: <66452C86-02AA-4604-B65C-5E32EEBAFCC3.ref@yahoo.com> <66452C86-02AA-4604-B65C-5E32EEBAFCC3@yahoo.com> <5BEC0410-DBAA-4CBF-8BDB-5C317AD2A094@yahoo.com> In-Reply-To: <5BEC0410-DBAA-4CBF-8BDB-5C317AD2A094@yahoo.com> From: Warner Losh Date: Mon, 27 Feb 2023 07:42:20 -0700 Message-ID: Subject: Re: git: c51978f4b2f0 - main - kbd: add KBD_DELAY1 and KBD_DELAY2 To: Mark Millard Cc: imp@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000d47e1905f5af7c88" X-Rspamd-Queue-Id: 4PQNWR25jvz3JmY 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 --000000000000d47e1905f5af7c88 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Feb 26, 2023 at 9:12=E2=80=AFPM Mark Millard wr= ote: > On Feb 26, 2023, at 19:33, Warner Losh wrote: > > > On Sat, Feb 25, 2023 at 10:03=E2=80=AFAM Mark Millard wrote: > > Warner Losh wrote on > > Date: Sat, 25 Feb 2023 06:26:00 UTC : > > > > > The branch main has been updated by imp: > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dc51978f4b2f080c80ddc891c24b151d= 35acb8ba4 > > > > > > commit c51978f4b2f080c80ddc891c24b151d35acb8ba4 > > > Author: Michael Paepcke > > > AuthorDate: 2023-02-18 09:11:37 +0000 > > > Commit: Warner Losh > > > CommitDate: 2023-02-25 06:19:05 +0000 > > > > > > kbd: add KBD_DELAY1 and KBD_DELAY2 > > > > > > Allow to configure KBD_DELAY* via KERNCONF for user-land less > embedded > > > and security appliances > > > > > > Reviewed by: imp (folded) > > > Pull Request: https://github.com/freebsd/freebsd-src/pull/649 > > > --- > > > sys/conf/options | 3 ++- > > > sys/dev/kbd/kbd.c | 4 ++-- > > > sys/dev/kbd/kbdreg.h | 8 ++++++-- > > > 3 files changed, 10 insertions(+), 5 deletions(-) > > > > > > diff --git a/sys/conf/options b/sys/conf/options > > > index 7855a2f3f20e..42529a90a54e 100644 > > > --- a/sys/conf/options > > > +++ b/sys/conf/options > > > @@ -803,8 +803,9 @@ KBD_INSTALL_CDEV opt_kbd.h > > > KBD_MAXRETRY opt_kbd.h > > > KBD_MAXWAIT opt_kbd.h > > > KBD_RESETDELAY opt_kbd.h > > > +KBD_DELAY1 opt_kbd.h > > > +KBD_DELAY2 opt_kbd.h > > > KBDIO_DEBUG opt_kbd.h > > > - > > > KBDMUX_DFLT_KEYMAP opt_kbdmux.h > > > > > > # options for the Atheros driver > > > diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c > > > index 205d76639e0f..ebc779de4073 100644 > > > --- a/sys/dev/kbd/kbd.c > > > +++ b/sys/dev/kbd/kbd.c > > > @@ -143,8 +143,8 @@ kbd_init_struct(keyboard_t *kbd, char *name, int > type, int unit, int config, > > > kbd->kb_accentmap =3D NULL; > > > kbd->kb_fkeytab =3D NULL; > > > kbd->kb_fkeytab_size =3D 0; > > > - kbd->kb_delay1 =3D KB_DELAY1; /* these values are advisory > only */ > > > - kbd->kb_delay2 =3D KB_DELAY2; > > > + kbd->kb_delay1 =3D KBD_DELAY1; /* these values are advisory > only */ > > > + kbd->kb_delay2 =3D KBD_DELAY2; > > > kbd->kb_count =3D 0L; > > > bzero(kbd->kb_lastact, sizeof(kbd->kb_lastact)); > > > } > > > diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h > > > index 15b7e5183f35..2839e259420d 100644 > > > --- a/sys/dev/kbd/kbdreg.h > > > +++ b/sys/dev/kbd/kbdreg.h > > > @@ -151,8 +151,12 @@ struct keyboard { > > > void *kb_data; /* the driver's private data */ > > > int kb_delay1; > > > int kb_delay2; > > > -#define KB_DELAY1 500 > > > -#define KB_DELAY2 100 > > > +#ifndef KBD_DELAY1 > > > +#define KBD_DELAY1 500 > > > +#endif > > > +#ifndef KBD_DELAY2 > > > +#define KBD_DELAY2 100 > > > +#endif > > > > [Just reporting Ximalas's Discord note.] > > > > So opt_kbd.h must be included before kbdreg.h in > > order to avoid: macro redefined in opt_kbd.h ? > > > > Should something force the right order? > > > > If we include them in the wrong order, then the compiler will complain, > > and that's likely sufficient. I'll double check NOTES to make sure that > the > > values there are different than the defaults. > > The report on Discord (Kernel) was that the attempted use > resulted in: > > --- psm.o --- > In file included from /usr/src/sys/dev/atkbdc/psm.c:100: > In file included from /usr/src/sys/dev/atkbdc/atkbdcreg.h:39: > ./opt_kbd.h:1:9: error: 'KBD_DELAY1' macro redefined > [-Werror,-Wmacro-redefined] > #define KBD_DELAY1 200 > ^ > /usr/src/sys/dev/kbd/kbdreg.h:155:9: note: previous definition is here > #define KBD_DELAY1 500 > ^ > In file included from /usr/src/sys/dev/atkbdc/psm.c:100: > In file included from /usr/src/sys/dev/atkbdc/atkbdcreg.h:39: > ./opt_kbd.h:3:9: error: 'KBD_DELAY2' macro redefined > [-Werror,-Wmacro-redefined] > #define KBD_DELAY2 15 > ^ > /usr/src/sys/dev/kbd/kbdreg.h:158:9: note: previous definition is here > #define KBD_DELAY2 100 > ^ > 2 errors generated. > *** [psm.o] Error code 1 > > > The reported workaround was: > > diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c > index a308cc81cd3a..86560f7bc2dd 100644 > --- a/sys/dev/atkbdc/psm.c > +++ b/sys/dev/atkbdc/psm.c > @@ -62,6 +62,7 @@ > __FBSDID("$FreeBSD$"); > > #include "opt_isa.h" > +#include "opt_kbd.h" > #include "opt_psm.h" > #include "opt_evdev.h" > That works around it. We include opt_kbd.h from atkbdcreg.h, which is a bit odd (but it's a kernel-only, so I moved it). And kbdreg.h is also kernel only, so I added it there instead. That's likely safer and I should likely have listened a bit better when you asked about it before... And not committed to LINT from machine A when I test compiled it on machine B by mistake . Warner > > Warner > > > unsigned long kb_count; /* # of processed key strokes = */ > > > u_char kb_lastact[NUM_KEYS/2]; > > > struct cdev *kb_dev; > > > > =3D=3D=3D > Mark Millard > marklmi at yahoo.com > > --000000000000d47e1905f5af7c88 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sun, Feb 26, 2023 at 9:12=E2=80=AF= PM Mark Millard <marklmi@yahoo.com<= /a>> wrote:
O= n Feb 26, 2023, at 19:33, Warner Losh <imp@bsdimp.com> wrote:

> On Sat, Feb 25, 2023 at 10:03=E2=80=AFAM Mark Millard <marklmi@yahoo.com> wrote:=
> Warner Losh <imp_at_FreeBSD.org> wrote on
> Date: Sat, 25 Feb 2023 06:26:00 UTC :
>
> > The branch main has been updated by imp:
> >
> > URL: htt= ps://cgit.FreeBSD.org/src/commit/?id=3Dc51978f4b2f080c80ddc891c24b151d35acb= 8ba4
> >
> > commit c51978f4b2f080c80ddc891c24b151d35acb8ba4
> > Author:=C2=A0 =C2=A0 =C2=A0Michael Paepcke <git@paepcke.de>
> > AuthorDate: 2023-02-18 09:11:37 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org> > > CommitDate: 2023-02-25 06:19:05 +0000
> >
> >=C2=A0 =C2=A0 =C2=A0kbd: add KBD_DELAY1 and KBD_DELAY2
> >=C2=A0 =C2=A0 =C2=A0
> >=C2=A0 =C2=A0 =C2=A0Allow to configure KBD_DELAY* via KERNCONF for= user-land less embedded
> >=C2=A0 =C2=A0 =C2=A0and security appliances
> >=C2=A0 =C2=A0 =C2=A0
> >=C2=A0 =C2=A0 =C2=A0Reviewed by: imp (folded)
> >=C2=A0 =C2=A0 =C2=A0Pull Request: https://gi= thub.com/freebsd/freebsd-src/pull/649
> > ---
> >=C2=A0 sys/conf/options=C2=A0 =C2=A0 =C2=A0| 3 ++-
> >=C2=A0 sys/dev/kbd/kbd.c=C2=A0 =C2=A0 | 4 ++--
> >=C2=A0 sys/dev/kbd/kbdreg.h | 8 ++++++--
> >=C2=A0 3 files changed, 10 insertions(+), 5 deletions(-)
> >
> > diff --git a/sys/conf/options b/sys/conf/options
> > index 7855a2f3f20e..42529a90a54e 100644
> > --- a/sys/conf/options
> > +++ b/sys/conf/options
> > @@ -803,8 +803,9 @@ KBD_INSTALL_CDEV=C2=A0 opt_kbd.h
> >=C2=A0 KBD_MAXRETRY=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_kbd.h
> >=C2=A0 KBD_MAXWAIT=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 opt_kbd.h
> >=C2=A0 KBD_RESETDELAY=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0opt_kbd.h
> > +KBD_DELAY1=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_kbd.h
> > +KBD_DELAY2=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_kbd.h
> >=C2=A0 KBDIO_DEBUG=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 opt_kbd.h
> > -
> >=C2=A0 KBDMUX_DFLT_KEYMAP=C2=A0 =C2=A0opt_kbdmux.h
> >=C2=A0
> >=C2=A0 # options for the Atheros driver
> > diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
> > index 205d76639e0f..ebc779de4073 100644
> > --- a/sys/dev/kbd/kbd.c
> > +++ b/sys/dev/kbd/kbd.c
> > @@ -143,8 +143,8 @@ kbd_init_struct(keyboard_t *kbd, char *name, = int type, int unit, int config,
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0kbd->kb_accentmap =3D NULL;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0kbd->kb_fkeytab =3D NULL;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0kbd->kb_fkeytab_size =3D 0;
> > -=C2=A0 =C2=A0 =C2=A0kbd->kb_delay1 =3D KB_DELAY1;=C2=A0 =C2= =A0 =C2=A0/* these values are advisory only */
> > -=C2=A0 =C2=A0 =C2=A0kbd->kb_delay2 =3D KB_DELAY2;
> > +=C2=A0 =C2=A0 =C2=A0kbd->kb_delay1 =3D KBD_DELAY1;=C2=A0 =C2= =A0 /* these values are advisory only */
> > +=C2=A0 =C2=A0 =C2=A0kbd->kb_delay2 =3D KBD_DELAY2;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0kbd->kb_count =3D 0L;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0bzero(kbd->kb_lastact, sizeof(kbd-&g= t;kb_lastact));
> >=C2=A0 }
> > diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
> > index 15b7e5183f35..2839e259420d 100644
> > --- a/sys/dev/kbd/kbdreg.h
> > +++ b/sys/dev/kbd/kbdreg.h
> > @@ -151,8 +151,12 @@ struct keyboard {
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0void=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 *kb_data;=C2=A0 =C2=A0 =C2=A0 =C2=A0/* the driver's private data= */
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0kb_delay1;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0kb_delay2;
> > -#define KB_DELAY1=C2=A0 =C2=A0 500
> > -#define KB_DELAY2=C2=A0 =C2=A0 100
> > +#ifndef KBD_DELAY1
> > +#define KBD_DELAY1=C2=A0 =C2=A0500
> > +#endif
> > +#ifndef KBD_DELAY2
> > +#define KBD_DELAY2=C2=A0 =C2=A0100
> > +#endif
>
> [Just reporting Ximalas's Discord note.]
>
> So opt_kbd.h must be included before kbdreg.h in
> order to avoid: macro redefined in opt_kbd.h ?
>
> Should something force the right order?
>
> If we include them in the wrong order, then the compiler will complain= ,
> and that's likely sufficient. I'll double check NOTES to make = sure that the
> values there are different than the defaults.

The report on Discord (Kernel) was that the attempted use
resulted in:

--- psm.o ---
In file included from /usr/src/sys/dev/atkbdc/psm.c:100:
In file included from /usr/src/sys/dev/atkbdc/atkbdcreg.h:39:
./opt_kbd.h:1:9: error: 'KBD_DELAY1' macro redefined [-Werror,-Wmac= ro-redefined]
#define KBD_DELAY1 200
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
/usr/src/sys/dev/kbd/kbdreg.h:155:9: note: previous definition is here
#define KBD_DELAY1=C2=A0 =C2=A0 =C2=A0 500
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
In file included from /usr/src/sys/dev/atkbdc/psm.c:100:
In file included from /usr/src/sys/dev/atkbdc/atkbdcreg.h:39:
./opt_kbd.h:3:9: error: 'KBD_DELAY2' macro redefined [-Werror,-Wmac= ro-redefined]
#define KBD_DELAY2 15
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
/usr/src/sys/dev/kbd/kbdreg.h:158:9: note: previous definition is here
#define KBD_DELAY2=C2=A0 =C2=A0 =C2=A0 100
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
2 errors generated.
*** [psm.o] Error code 1


The reported workaround was:

diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index a308cc81cd3a..86560f7bc2dd 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -62,6 +62,7 @@
__FBSDID("$FreeBSD$");

#include "opt_isa.h"
+#include "opt_kbd.h"
#include "opt_psm.h"
#include "opt_evdev.h"

That w= orks around it. We include opt_kbd.h from atkbdcreg.h, which is a bit odd (= but it's a kernel-only,
so I moved it). And kbdreg.h is also = kernel only, so I added it there instead. That's likely safer and
=
I should likely have listened a bit better when you asked about it bef= ore...=C2=A0 And not committed to LINT
from machine A when I test= compiled it on machine B by mistake <doh>.

<= div>Warner
=C2=A0
> Warner
>=C2=A0 >=C2=A0 =C2=A0 =C2=A0 =C2=A0unsigned long=C2=A0 =C2=A0kb_coun= t;=C2=A0 =C2=A0 =C2=A0 =C2=A0/* # of processed key strokes */
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0u_char=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 kb_lastact[NUM_KEYS/2];
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0struct cdev *kb_dev;



=3D=3D=3D
Mark Millard
marklmi at yahoo.com

--000000000000d47e1905f5af7c88-- From nobody Mon Feb 27 15:03: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 4PQNzz6CmGz3vD4n; Mon, 27 Feb 2023 15: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 4PQNzz5kJBz3KvD; Mon, 27 Feb 2023 15: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=1677510223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R5xrnrNw0/EkWK910uIIXGzselM8niCacxqNAAC3UA0=; b=BeeyPej9Vq7NYHdUbYHL2k/9Qpa5i0B5jevgPHIa/WbbGfG4sIovjx/0V6EphwuqFS7JMv /8rMaNak2wgzSYJWwQGAYnk1h0VyKub27jGZYkcTxUd2LoJ2FsNVnLqevS/TSbNy4UhJ4j Jr4jgw8LfrO2HKInoq6rIN6x5oBJBKLWcdIyO0q6UsPZMm+v+yUkjoAJcvh1+tpdrvc9NH eDnIWL1lHkNEW0PGnJ3qW30zmSDWLFk0w6eJE6cB6RkGIiVIga1MMHsvsXyy4tGmqpvNau zPValDrBYFl6FeD06gLcQAnPmZQhD6b3QKFod2n29UiBGtdfAz51L6AqeE6qwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677510223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R5xrnrNw0/EkWK910uIIXGzselM8niCacxqNAAC3UA0=; b=Jzt+YUCpi9Low8BMXebAe94N6SjPJpY2VOUEmsmQG8wOevmUJLhEa6U5zuSs9cMgkRBfsJ /USPtnrX+iNcbB7LykmtKTHAr2+wJi+2AFEdrEIHUyduyxTLJmpIUwPN2XqW6KqlF0fzo7 C1diOK6bXQPCs07c5MNKxsgCJc1Pgt53/gCDjVYbYbKiL8IgYNVzl3slkv2/04Gv1CqeaI MTfNpAeGe/LhSH63L3azLFe6prXOztqke4UNUS9lefXAnoSNNcp6QMocY2EiXI1mBYjXwy nXDqUxipS4wBb+e9EgjEeWsU+To8kqua57gvqJrsV4JQ9qzjPMzz7wvm0x7kdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677510223; a=rsa-sha256; cv=none; b=cSu8hWJD5W0lqii/xyBwuiKacmipb8JO7Y96iVaHAGvbnHdzP4WpmAD/Ni62RjQjpasVdn GXQiTQO/sd9GkdbFfLlrs6JUZsYGvLh39Sih6Wr8fTMzYPh5Nx0P3umf6oc/JLaDp75KdK Ef4efmEq+egSY9YvCUvXGghzKv+WBbCT/Nlo1m26LCTT5ALUkT5X4uj047LvnBBFBnCTT6 WV7vQQZ60vaaBBf9+l/CF2YunDcvkr0ZBustdG3dY9lj8eAgBlNhWdvWJWB4GgdtMguSTo eMRLU2AFSw81s/x+voh8uvAx+uQuAxmxcrZPLmdGCfF7wHghjoC4YMFIgyVEZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQNzz4pxpzVyq; Mon, 27 Feb 2023 15: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 31RF3htx019974; Mon, 27 Feb 2023 15:03:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RF3hDa019973; Mon, 27 Feb 2023 15:03:43 GMT (envelope-from git) Date: Mon, 27 Feb 2023 15:03:43 GMT Message-Id: <202302271503.31RF3hDa019973@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: 2d71406a6ff3 - main - dtrace_kinst.4: mention dtrace -l -P kinst, give a more complete example 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: 2d71406a6ff31b2b8873c236d7b2b1186e2bffb4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2d71406a6ff31b2b8873c236d7b2b1186e2bffb4 commit 2d71406a6ff31b2b8873c236d7b2b1186e2bffb4 Author: Christos Margiolis AuthorDate: 2023-02-27 14:44:13 +0000 Commit: Mark Johnston CommitDate: 2023-02-27 15:03:10 +0000 dtrace_kinst.4: mention dtrace -l -P kinst, give a more complete example Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38801 --- share/man/man4/dtrace_kinst.4 | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/share/man/man4/dtrace_kinst.4 b/share/man/man4/dtrace_kinst.4 index 48253add6855..0987ba493e55 100644 --- a/share/man/man4/dtrace_kinst.4 +++ b/share/man/man4/dtrace_kinst.4 @@ -24,37 +24,38 @@ .\" .\" $FreeBSD$ .\" -.Dd October 01, 2022 +.Dd February 27, 2023 .Dt DTRACE_KINST 4 .Os .Sh NAME .Nm dtrace_kinst -.Nd a DTrace provider for tracing arbitrary instructions in a given kernel -function. +.Nd a DTrace provider for tracing arbitrary instructions in a given kernel function .Sh SYNOPSIS kinst::: .Sh DESCRIPTION -.Pp The DTrace .Nm kinst provider allows the user to trace any instruction in a given kernel function. corresponds to the function to be traced, and is the offset to the specific instruction, and can be obtained from the function's -disassembly using -.Xr kgdb 1 . +disassembly using kgdb from the gdb package. .Pp .Nm kinst creates probes on-demand, meaning it searches for and parses the function's instructions each time .Xr dtrace 1 -is run, and not at module load time. This is in contrast to FBT's load-time -parsing, since +is run, and not at module load time. +This is in contrast to FBT's load-time parsing, since .Nm kinst can potentially create thousands of probes for just a single function, instead of up to two (entry and return) in the case of FBT. +A result of this is that +.Cm dtrace -l -P kinst +will not match any probes. +.Sh IMPLEMENTATION NOTES +The provider is currently implemented only for amd64. .Sh EXAMPLES -.Pp -Find the offset to the third instruction in +Find the offset corresponding to the third instruction in .Fn vm_fault and trace it: .Bd -literal -offset indent @@ -66,6 +67,12 @@ Dump of assembler code for function vm_fault: 0xffffffff80876df4 <+4>: 41 57 push %r15 # dtrace -n 'kinst::vm_fault:4' + 2 81500 vm_fault:4 + 2 81500 vm_fault:4 + 2 81500 vm_fault:4 + 2 81500 vm_fault:4 + 0 81500 vm_fault:4 + ... .Ed .Pp Trace all instructions in @@ -73,11 +80,8 @@ Trace all instructions in .Bd -literal -offset indent # dtrace -n 'kinst::amd64_syscall:' .Ed -.Sh IMPLEMENTATION NOTES -The provider is currently implemented only for amd64. .Sh SEE ALSO -.Xr dtrace 1 , -.Xr kgdb 1 +.Xr dtrace 1 .Sh HISTORY The .Nm kinst From nobody Mon Feb 27 15:03: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 4PQP01221cz3vDDF; Mon, 27 Feb 2023 15:03: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 4PQP006ZLQz3L1H; Mon, 27 Feb 2023 15:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677510224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NszezxFtt7owVDff+bNSJlx5fNOnjp53KuFopdTKpFc=; b=lcLozjwWxn7DXye5wwJ5OrHBdbbOYjinmV/kdNlCKXS6PMoaygMxobYJKGXo07R1EfYPxI +fuOPQZop56s4kSVTsirS9DZWkISHGwovWcOJ/V+9t8fB6MGhvM3MPkEDGko849iJ1rDqx a1tmnE1Cg+hSo8ZPgYOqPfabq7bgbC+8VXJawdfzswPBMDW1dPUjXBGKdfeVmpd2X4TsPE JrBRYHqmP5Eo9/aiPgG8GuwyOLTD8makJEYk6fOPRiYZsw0GHtHQgATXjcYmwS7Uvu4Q1v 1Xay/xIbPXPokAeGut5ytI5y2kku5QymMn1gTJZwwJ47XWtEOecLDH99U5YJ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677510224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NszezxFtt7owVDff+bNSJlx5fNOnjp53KuFopdTKpFc=; b=Ay3wUp71SzJjivTwAxQd6xdMB/QuqPjnb65VEeOUGFaK1GH5gMYhkozPjW38O7VPPzxfXg kmHaEOJHTBVYxOIGmb7+nhw/e9rdk3AZyH4wXhl4t96yhZV/9EqCbHhmVVIrPB4TcGU7sd Pwn/wOnCJE2uq03r/UaPefQuEIovyle1Q0gtyRLP7vCyS5dglyT0SVf43wfRxIkZkiSQPj 1D9g/B8TgFyJk0achsD1800veQ/TCGXu9MBEy97u0YIdjzVbVqq4dj6h/d4KFGR6ehtrCz Qar1JRzkG3qtypjX9uf6cGU2kwGseg+9clJ/3TjPtyLdiwydvP5aPZK94Jc5eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677510224; a=rsa-sha256; cv=none; b=r7CupYuGgM6xuE+TtNcXJLScHtHGQtv8NAdi2fMpwPoMQf90wpkSnto6KcNmtmQsrjgipO mtTywWXWCFa+DKPvAC3uDt/b6AwgKyYIYwNqaQvS/8lL/GU8+EdLdyPsJU/BJJv7KEX8LU MIyY8ZY2z6rC6HH4LqXDbbgWU1fihBO6HOj7/S38IKgRw0sWskIt8gPIDADrcT8B8pRuJi +sL7cWD/38FW/O22x5iP/tUrxApFgJ1g/mNwDqDTTVUR1b+FFN/TXrQyWC5rp9ZQtBa9CX VJIIC+XQVtDnlK+T8v/pRJmuu+fVXgFMJd4vmLlVMcGbmYJf6MMhZuVINpm87w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQP005RvBzW1Y; Mon, 27 Feb 2023 15:03: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 31RF3i7H019993; Mon, 27 Feb 2023 15:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RF3ihX019992; Mon, 27 Feb 2023 15:03:44 GMT (envelope-from git) Date: Mon, 27 Feb 2023 15:03:44 GMT Message-Id: <202302271503.31RF3ihX019992@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: b9199d152f3d - main - librss: Remove rss_sock_set_bindmulti() 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: b9199d152f3d61f93c21d63e3c85a5863f9d71e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9199d152f3d61f93c21d63e3c85a5863f9d71e9 commit b9199d152f3d61f93c21d63e3c85a5863f9d71e9 Author: Mark Johnston AuthorDate: 2023-02-27 14:50:25 +0000 Commit: Mark Johnston CommitDate: 2023-02-27 15:03:11 +0000 librss: Remove rss_sock_set_bindmulti() In preparation for the removal of the IP(V6)_BINDMULTI option. PR: 261398 (exp-run) Reviewed by: glebius Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38574 --- lib/librss/librss.3 | 12 ------------ lib/librss/librss.c | 22 ---------------------- lib/librss/librss.h | 8 -------- 3 files changed, 42 deletions(-) diff --git a/lib/librss/librss.3 b/lib/librss/librss.3 index 5e52482db5ed..302d431b6c28 100644 --- a/lib/librss/librss.3 +++ b/lib/librss/librss.3 @@ -23,8 +23,6 @@ .Ft int .Fn rss_set_bucket_rebalance_cb "rss_bucket_rebalance_cb_t *cb" "void *cbdata" .Ft int -.Fn rss_sock_set_bindmulti "int fd" "int af" "int val" -.Ft int .Fn rss_sock_set_rss_bucket "int fd" "int af" "int rss_bucket" .Ft int .Fn rss_sock_set_recvrss "int fd" "int af" "int val" @@ -102,16 +100,6 @@ Once RSS setup is completed, .Fn rss_config_free is called to free the RSS configuration structure. .Pp -To make a -.Vt bind -socket RSS aware, the -.Fn rss_sock_set_bindmulti -function is used to enable or disable per-RSS bucket -behaviour. -The socket filedescriptor, address family and enable flag -.Vt val -are passed in. -.Pp If .Vt val is set to 1, the socket can be placed in an RSS bucket and will only accept diff --git a/lib/librss/librss.c b/lib/librss/librss.c index f8e16c27a4a1..4125e94305e2 100644 --- a/lib/librss/librss.c +++ b/lib/librss/librss.c @@ -46,28 +46,6 @@ __FBSDID("$FreeBSD$"); #include "librss.h" -int -rss_sock_set_bindmulti(int fd, int af, int val) -{ - int opt; - socklen_t optlen; - int retval; - - /* Set bindmulti */ - opt = val; - optlen = sizeof(opt); - retval = setsockopt(fd, - af == AF_INET ? IPPROTO_IP : IPPROTO_IPV6, - af == AF_INET ? IP_BINDMULTI : IPV6_BINDMULTI, - &opt, - optlen); - if (retval < 0) { - warn("%s: setsockopt(IP_BINDMULTI)", __func__); - return (-1); - } - return (0); -} - int rss_sock_set_rss_bucket(int fd, int af, int rss_bucket) { diff --git a/lib/librss/librss.h b/lib/librss/librss.h index d0d03df9d5ea..134ae28811a2 100644 --- a/lib/librss/librss.h +++ b/lib/librss/librss.h @@ -46,14 +46,6 @@ typedef enum { typedef void rss_bucket_rebalance_cb_t(void *arg); -/* - * Enable/disable whether to allow for multiple bind()s to the - * given PCB entry. - * - * This must be done before bind(). - */ -extern int rss_sock_set_bindmulti(int fd, int af, int val); - /* * Set the RSS bucket for the given file descriptor. * From nobody Mon Feb 27 15:03: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 4PQP021Dzkz3vDNn; Mon, 27 Feb 2023 15:03: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 4PQP020Tncz3Kvw; Mon, 27 Feb 2023 15:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677510226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gWeB+eSMmZEEkxfmCS2tf+KdyFODiLBKOgKC90SKh9A=; b=eBGUjm5Y5vOSrWQUZgZt2A04BhfLhRMJddhrm5FZnaPfgfRb4WQoFkQ7+SuW2yFLKPel+f mbD/ZMAm026fbCmKI0DhvoqzGkAGeDXrIn6z/l4JbiE7qf94err0UziXROftTVSy6rzFk4 3lyzpmLxNA8zZSSB8CZZbOvu8VgmmtzUaVk2MhTf4LDWW2eswrvVCm5o12Z1iPaZ5XoWFY 3Y4zGmuPTM3r2VqMmDQCFGrfIWKvIeBjdvUePfzWMD2T5Sc0vIeN1sTVkc3H9E7qllBVKM 7wzCyHE2hkBoemRSrDD2N0lojmRtq9Xh7q/JD7FnRvu9QnFu/8yPp1mQXSePfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677510226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gWeB+eSMmZEEkxfmCS2tf+KdyFODiLBKOgKC90SKh9A=; b=vGmph7+U3I3XJ9ZnHTcgRhui6pE8uIjeoHL9J+ern2H0C26QpfIkLQuHX25QF2gtY8RFS/ cL1iJAYrIrloSRiBjtuA8AZolTV+Im8+dj36ICxmZ8eYIu6FBcD38U0cPgft0kLLSKnNK7 R20eAGAySiIBe7jabt2rrsKBn3Qdz3lqYKWRVX2gG6vorIFLsVT2PIqqGiZMNsljDJLco+ Y403l8dMceSiy0nCemF01G9drxslqmz1AFg1kh+2naR2srqWEpEDUkh7poluCHORN/K36U o2SSwfPkBOuOHkFv3ygFUXwk6k0IgFCkFrfD1XmAGF5TFXTaGfNd7sBRZd87ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677510226; a=rsa-sha256; cv=none; b=tW67V/zYVVbCYA+RFISLu7YJlHeTT0D8YvBau+0FSo/0hiGM+kDlm37A8Vx3INqfgPY8Gc PtuEHx+wSekC0A0gDyH7aoo8rF1NIjZ1D3cKy79v3R17MPo1W28uwpMu58PsuWRAKbiRnK FSn/xknjXlJuN2OvM+gyvv7s+Frr2MAKVs/9i79Qau7AGxF5OO/KJuxMS27tA+hxIhRSiC iN5k/8cJoFipm3sQAoLWJSJSyyDMpE06aAxoyEtOV4eJeT/gt/SV6NTvBIbO8nxoY7ZVcB zhtIC/Bq9754Uumyz842EiXaCn0pppepVWDVjnpZ/Kry3C2RWi3YEVautJ0rEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQP016fqnzW6Y; Mon, 27 Feb 2023 15:03: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 31RF3jUi020012; Mon, 27 Feb 2023 15:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RF3j3Q020011; Mon, 27 Feb 2023 15:03:45 GMT (envelope-from git) Date: Mon, 27 Feb 2023 15:03:45 GMT Message-Id: <202302271503.31RF3j3Q020011@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: 3aff4ccdd714 - main - netinet: Remove IP(V6)_BINDMULTI 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: 3aff4ccdd714105db340d68f1a2aea2f46e99122 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3aff4ccdd714105db340d68f1a2aea2f46e99122 commit 3aff4ccdd714105db340d68f1a2aea2f46e99122 Author: Mark Johnston AuthorDate: 2023-02-27 14:52:28 +0000 Commit: Mark Johnston CommitDate: 2023-02-27 15:03:11 +0000 netinet: Remove IP(V6)_BINDMULTI This option was added in commit 0a100a6f1ee5 but was never completed. In particular, there is no logic to map flowids to different listening sockets, so it accomplishes basically the same thing as SO_REUSEPORT. Meanwhile, we've since added SO_REUSEPORT_LB, which at least tries to balance among listening sockets using a hash of the 4-tuple and some optional NUMA policy. The option was never documented or completed, and an exp-run revealed nothing using it in the ports tree. Moreover, it complicates the already very complicated in_pcbbind_setup(), and the checking in in_pcbbind_check_bindmulti() is insufficient. So, let's remove it. PR: 261398 (exp-run) Reviewed by: glebius Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38574 --- sys/netinet/in.h | 1 - sys/netinet/in_pcb.c | 47 ++--------------------------------------------- sys/netinet/in_pcb.h | 4 ---- sys/netinet/ip_output.c | 8 -------- sys/netinet6/in6.h | 1 - sys/netinet6/in6_pcb.c | 18 ++---------------- sys/netinet6/ip6_output.c | 9 --------- 7 files changed, 4 insertions(+), 84 deletions(-) diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 44d64190ed01..99809b3ebaa4 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -463,7 +463,6 @@ VNET_DECLARE(uint32_t, in_loopback_mask); /* unused; was IP_FAITH */ #define IP_ONESBCAST 23 /* bool: send all-ones broadcast */ #define IP_BINDANY 24 /* bool: allow bind to any address */ -#define IP_BINDMULTI 25 /* bool: allow multiple listeners on a tuple */ #define IP_RSS_LISTEN_BUCKET 26 /* int; set RSS listen bucket */ #define IP_ORIGDSTADDR 27 /* bool: receive IP dst addr/port w/dgram */ #define IP_RECVORIGDSTADDR IP_ORIGDSTADDR diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index a23c89fe8033..ce95ece8f5f2 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -860,36 +860,6 @@ inp_so_options(const struct inpcb *inp) } #endif /* INET || INET6 */ -/* - * Check if a new BINDMULTI socket is allowed to be created. - * - * ni points to the new inp. - * oi points to the existing inp. - * - * This checks whether the existing inp also has BINDMULTI and - * whether the credentials match. - */ -int -in_pcbbind_check_bindmulti(const struct inpcb *ni, const struct inpcb *oi) -{ - /* Check permissions match */ - if ((ni->inp_flags2 & INP_BINDMULTI) && - (ni->inp_cred->cr_uid != - oi->inp_cred->cr_uid)) - return (0); - - /* Check the existing inp has BINDMULTI set */ - if ((ni->inp_flags2 & INP_BINDMULTI) && - ((oi->inp_flags2 & INP_BINDMULTI) == 0)) - return (0); - - /* - * We're okay - either INP_BINDMULTI isn't set on ni, or - * it is and it matches the checks. - */ - return (1); -} - #ifdef INET /* * Set up a bind operation on a PCB, performing port allocation @@ -993,8 +963,7 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, * XXX * This entire block sorely needs a rewrite. */ - if (t && - ((inp->inp_flags2 & INP_BINDMULTI) == 0) && + if (t != NULL && (so->so_type != SOCK_STREAM || ntohl(t->inp_faddr.s_addr) == INADDR_ANY) && (ntohl(sin->sin_addr.s_addr) != INADDR_ANY || @@ -1004,20 +973,10 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) return (EADDRINUSE); - - /* - * If the socket is a BINDMULTI socket, then - * the credentials need to match and the - * original socket also has to have been bound - * with BINDMULTI. - */ - if (t && (! in_pcbbind_check_bindmulti(inp, t))) - return (EADDRINUSE); } t = in_pcblookup_local(pcbinfo, sin->sin_addr, lport, lookupflags, cred); - if (t && ((inp->inp_flags2 & INP_BINDMULTI) == 0) && - (reuseport & inp_so_options(t)) == 0 && + if (t != NULL && (reuseport & inp_so_options(t)) == 0 && (reuseport_lb & inp_so_options(t)) == 0) { #ifdef INET6 if (ntohl(sin->sin_addr.s_addr) != @@ -1028,8 +987,6 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, (t->inp_vflag & INP_IPV6PROTO) == 0) #endif return (EADDRINUSE); - if (t && (! in_pcbbind_check_bindmulti(inp, t))) - return (EADDRINUSE); } } } diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index f15fd0db4dfb..9ab9ed87528e 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -669,7 +669,6 @@ int inp_so_options(const struct inpcb *inp); #define INP_REUSEPORT 0x00000008 /* SO_REUSEPORT option is set */ /* 0x00000010 */ #define INP_REUSEADDR 0x00000020 /* SO_REUSEADDR option is set */ -#define INP_BINDMULTI 0x00000040 /* IP_BINDMULTI option is set */ #define INP_RSS_BUCKET_SET 0x00000080 /* IP_RSS_LISTEN_BUCKET is set */ #define INP_RECVFLOWID 0x00000100 /* populate recv datagram with flow info */ #define INP_RECVRSSBUCKETID 0x00000200 /* populate recv datagram with bucket id */ @@ -734,9 +733,6 @@ void in_pcbinfo_destroy(struct inpcbinfo *); void in_pcbstorage_init(void *); void in_pcbstorage_destroy(void *); -int in_pcbbind_check_bindmulti(const struct inpcb *ni, - const struct inpcb *oi); - void in_pcbpurgeif0(struct inpcbinfo *, struct ifnet *); int in_pcballoc(struct socket *, struct inpcbinfo *); int in_pcbbind(struct inpcb *, struct sockaddr_in *, struct ucred *); diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index e62935b247da..13ba15050769 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1166,7 +1166,6 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) break; } /* FALLTHROUGH */ - case IP_BINDMULTI: #ifdef RSS case IP_RSS_LISTEN_BUCKET: #endif @@ -1262,9 +1261,6 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) case IP_RECVTOS: OPTSET(INP_RECVTOS); break; - case IP_BINDMULTI: - OPTSET2(INP_BINDMULTI, optval); - break; case IP_RECVFLOWID: OPTSET2(INP_RECVFLOWID, optval); break; @@ -1416,7 +1412,6 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) case IP_DONTFRAG: case IP_BINDANY: case IP_RECVTOS: - case IP_BINDMULTI: case IP_FLOWID: case IP_FLOWTYPE: case IP_RECVFLOWID: @@ -1509,9 +1504,6 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) optval = OPTBIT2(INP_RECVRSSBUCKETID); break; #endif - case IP_BINDMULTI: - optval = OPTBIT2(INP_BINDMULTI); - break; case IP_VLAN_PCP: if (OPTBIT2(INP_2PCP_SET)) { optval = (inp->inp_flags2 & diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index f9823fa97d03..23a31010d081 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -484,7 +484,6 @@ struct route_in6 { #define IPV6_BINDANY 64 /* bool: allow bind to any address */ -#define IPV6_BINDMULTI 65 /* bool; allow multibind to same addr/port */ #define IPV6_RSS_LISTEN_BUCKET 66 /* int; set RSS listen bucket */ #define IPV6_FLOWID 67 /* int; flowid of given socket */ #define IPV6_FLOWTYPE 68 /* int; flowtype of given socket */ diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 92a1ea840af2..8b1f97f322ef 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -249,8 +249,7 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred) t = in6_pcblookup_local(pcbinfo, &sin6->sin6_addr, lport, INPLOOKUP_WILDCARD, cred); - if (t && - ((inp->inp_flags2 & INP_BINDMULTI) == 0) && + if (t != NULL && (so->so_type != SOCK_STREAM || IN6_IS_ADDR_UNSPECIFIED(&t->in6p_faddr)) && (!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr) || @@ -261,15 +260,6 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred) t->inp_cred->cr_uid)) return (EADDRINUSE); - /* - * If the socket is a BINDMULTI socket, then - * the credentials need to match and the - * original socket also has to have been bound - * with BINDMULTI. - */ - if (t && (! in_pcbbind_check_bindmulti(inp, t))) - return (EADDRINUSE); - #ifdef INET if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 && IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { @@ -279,17 +269,13 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred) t = in_pcblookup_local(pcbinfo, sin.sin_addr, lport, INPLOOKUP_WILDCARD, cred); - if (t && - ((inp->inp_flags2 & INP_BINDMULTI) == 0) && + if (t != NULL && (so->so_type != SOCK_STREAM || ntohl(t->inp_faddr.s_addr) == INADDR_ANY) && (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) return (EADDRINUSE); - - if (t && (! in_pcbbind_check_bindmulti(inp, t))) - return (EADDRINUSE); } #endif } diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index bce5ed846227..01c6ba5b41d4 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1752,7 +1752,6 @@ ip6_ctloutput(struct socket *so, struct sockopt *sopt) case IPV6_AUTOFLOWLABEL: case IPV6_ORIGDSTADDR: case IPV6_BINDANY: - case IPV6_BINDMULTI: #ifdef RSS case IPV6_RSS_LISTEN_BUCKET: #endif @@ -1933,10 +1932,6 @@ do { \ case IPV6_BINDANY: OPTSET(INP_BINDANY); break; - - case IPV6_BINDMULTI: - OPTSET2(INP_BINDMULTI, optval); - break; #ifdef RSS case IPV6_RSS_LISTEN_BUCKET: if ((optval >= 0) && @@ -2195,7 +2190,6 @@ do { \ case IPV6_RSSBUCKETID: case IPV6_RECVRSSBUCKETID: #endif - case IPV6_BINDMULTI: case IPV6_VLAN_PCP: switch (optname) { case IPV6_RECVHOPOPTS: @@ -2290,9 +2284,6 @@ do { \ break; #endif - case IPV6_BINDMULTI: - optval = OPTBIT2(INP_BINDMULTI); - break; case IPV6_VLAN_PCP: if (OPTBIT2(INP_2PCP_SET)) { From nobody Mon Feb 27 15:41: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 4PQPr70DJjz3vGh1; Mon, 27 Feb 2023 15:41: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 4PQPr66rXWz3PqT; Mon, 27 Feb 2023 15:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677512519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDjIHEeM/qxs3jbFZn4SeP6iA5YNn9ZaW+VrbYJCZZI=; b=p6EDOZrqFxUF9pK1U4gnFcf87zzOCjwrevplFN8mUX6JCax5QRNf3rPAt230O9xpzLNFsk tXySODSKz7O4vVKFtPJBSwGSQsgTBeUq96hkABAlN/TIHUjZXVftIvePn7pjSdMWrF3L3k 7K4Gfi8MXOd8bBfa0ca6x0wawSAXxEuwUa3o4TVMgQWH+JVpzsvSbN3K3Dw+1+HjTEn2Xf FGYGZsir1QblZPrWXe2yLRde1aRnvpYF6w1H8zFDugo5f+4tSkiJsg/KMRYp07Z8j09NC3 1iFr3du6Ppe1NOdC14QnthMZL205Lx9Z1a0tCRxfq6ZLqiyFNz2xtayv+oHYqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677512519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDjIHEeM/qxs3jbFZn4SeP6iA5YNn9ZaW+VrbYJCZZI=; b=nddJWe8NhPml29i1fhk9K5g6pma8DZA6ZLCWNkZnteRXjb6bZETLVySgsGI4QZNW86wPOO lvTmIXyjKvOvx0wX2EEMZnnvA+fh7qal2RHMj6SOzz1goGK1XJWdFzJ0Ucj9WGrnmWjDzp fCvFXKFX12O3P8noIkoA4KF+ix+Azy3pq33BaCW6VGZz5OWlrP38/8yecREGBm2L7xuyaz WDpxqeYTA36KCU/nVqz6ZWJxxAXqo4aLqXZJW8XfZjDMyBJ4N9IH1Y4GUz9L4kIVQ2+glS bCmZXuouillLLv4glXmURrEd0+zHyErs9zufdT+rUJC0vrgHenhMnVpAJO5SlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677512519; a=rsa-sha256; cv=none; b=MnB1Ppty2HNVhd14arqGvwHjVqe2WcOx8fxcjG6iDLXjgSgh8dwI61SnRrH/8dy67a8i1M ICfFRAkDZLOpvanoBfTSghKaW0bKQheapynHB2UP6mHMx817R80Ha8S6136Qvf2jhBh0Ja pSlu0cOZ+vKYGJnA1VNamvcfx1c00I9Aauq9l4NoxjYen9PbtZi7LupQSXDNY0HcLqDz/y qfljTE2SPXnUQ21WZ9Xb0s+OytY6uSk/KFaqfjdMMcCK2f/MFXl3Mr1rEAugQjDa7/EP86 xwN3uNuWVvIyqPRkPq9QMOYH8gqNDmP4F1j/5aRR/K9qYXBmPR0wkYa2vWwquA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQPr65vHLzWWj; Mon, 27 Feb 2023 15:41: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 31RFfwxY081471; Mon, 27 Feb 2023 15:41:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RFfwAm081470; Mon, 27 Feb 2023 15:41:58 GMT (envelope-from git) Date: Mon, 27 Feb 2023 15:41:58 GMT Message-Id: <202302271541.31RFfwAm081470@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: 6e9b4e3e0d4e - main - man 3 daemon: remove double negation 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: 6e9b4e3e0d4eb230586844c25bacb0620496c73b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6e9b4e3e0d4eb230586844c25bacb0620496c73b commit 6e9b4e3e0d4eb230586844c25bacb0620496c73b Author: Ihor Antonov AuthorDate: 2023-02-27 15:37:41 +0000 Commit: Warner Losh CommitDate: 2023-02-27 15:40:08 +0000 man 3 daemon: remove double negation Rephrase double negated sentences to improve readability OpenBSD has done the same in the past to their man 3 daemon Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/671 --- lib/libc/gen/daemon.3 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/gen/daemon.3 b/lib/libc/gen/daemon.3 index f4129fc47144..bc346e022d4f 100644 --- a/lib/libc/gen/daemon.3 +++ b/lib/libc/gen/daemon.3 @@ -28,7 +28,7 @@ .\" @(#)daemon.3 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd December 23, 2017 +.Dd February 27, 2023 .Dt DAEMON 3 .Os .Sh NAME @@ -48,18 +48,18 @@ The function is for programs wishing to detach themselves from the controlling terminal and run in the background as system daemons. .Pp -Unless the argument +If the argument .Fa nochdir -is non-zero, +is zero, .Fn daemon changes the current working directory to the root .Pq Pa / . .Pp -Unless the argument +If the argument .Fa noclose -is non-zero, +is zero, .Fn daemon -will redirect standard input, standard output, and standard error to +redirects standard input, standard output, and standard error to .Pa /dev/null . .Pp The From nobody Mon Feb 27 16:43: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 4PQRCN5FcWz3vKq0; Mon, 27 Feb 2023 16:43: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 4PQRCN4mcyz3nhh; Mon, 27 Feb 2023 16:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677516224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VuwDRWvuG1FOQKbxAEyP3F2Q41DBJhHGvlxBjHJVWHo=; b=pMgYG80dZ4BH4vsWVOgY6LyWedU1375UsUy1URnwbdnfxLKIAklESmlN/PKnJG2s81iT9+ YZlTxdEu+87yV9ruEfb2+ihfnYxkgVKB3oJsHpxiWVIh2VPIMHi2NXCFt8jkIg4NAI7xK+ MXGr5UxjIwTudFZUHxIaXmt7wx3wkvNKm/oIRnJEEeLNbIe3nH/23EG/gWqcfUlkW1T7kM dzaJz9M4MQHd7PhiTO1ob890HqjVeykfbQC+WkioFa0f1y+D6/cA0yR2mtmRiu+1zouijj VsO3UYfVmpIhexezhI7ncDeX5a5I+JU5aGOfjNGI0VebRWb8ZfGx0/7TDxWVuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677516224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VuwDRWvuG1FOQKbxAEyP3F2Q41DBJhHGvlxBjHJVWHo=; b=Z9UhWfnnVbLQmoL8wFpqr3tVo7x2+oGfHeWaa/VE2PngZEVQV/pHIbzAyzkdW9snE9vZYf ESWdaeSBbXwc0Tvia51us6nVbLpWGvz+pVCR2e0Hr07jOoQOxwM/yTmuQhYlT7SjzF6chk vtFI6mbwjGgceDzCqWcCMeWZ7GzH/owOe7pKJKopKaydvyzxMCasG7ebBvjo4vwwbOxmVp rxaxdb+RMkr6FL/djmLwJYygBjXK998pYLF3b3meGYTqdUmTWpjrVCFzq5SjjPPBmI2GML UlC821RY+4X5IAMc1+/bpUsmPXNIvaNu0L+vmKVhyXzCrIHLOd69XhOrC8ApSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677516224; a=rsa-sha256; cv=none; b=I8qaEVzuale2awYnqj6yCuxkJPZ2r+eOKDh1JZfSBB79pIPrpKyekq+0HtdNDYBnv2eq7O gidI4yb3gvjAbJknLHVweWwINHaECauxBkysxoSB9Kde1aJrAXnaQ0z1jdD5iv9AQnPypf KSue+OSa6R4YuIBG6OnXu+pHLW4+Sw5syl0M8/CLCMzVNHVo1UiUyHIV2mYB7gtxv2H8Qn uzsrPcRbt2zKmovuDRIrIyjYcQMLWvjKXAEWlco0ZMtiKofywcLg51Jc8PJX5srV86uzVI a2Z1f5kSTRfVTEx3UaHQHC/dDZ9uKNNIkhUwpVLhNZ2DPHKaN3UC2aQXXluyvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQRCN3rYHzYj2; Mon, 27 Feb 2023 16:43: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 31RGhiXU084480; Mon, 27 Feb 2023 16:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RGhiPX084479; Mon, 27 Feb 2023 16:43:44 GMT (envelope-from git) Date: Mon, 27 Feb 2023 16:43:44 GMT Message-Id: <202302271643.31RGhiPX084479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: de7a6b6fd04e - main - date.1: Examples: Use syntax that is also compatible with csh 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de7a6b6fd04ee686364883a817a4b707e3567d27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=de7a6b6fd04ee686364883a817a4b707e3567d27 commit de7a6b6fd04ee686364883a817a4b707e3567d27 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-02-27 16:34:00 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-02-27 16:37:28 +0000 date.1: Examples: Use syntax that is also compatible with csh MFC after: 1 month Sponsored by: Klara Inc. --- bin/date/date.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index 53a5d441099f..582b8bc6cd09 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -32,7 +32,7 @@ .\" @(#)date.1 8.3 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd July 28, 2022 +.Dd February 27, 2023 .Dt DATE 1 .Os .Sh NAME @@ -516,7 +516,7 @@ will display .Pp Finally the command: .Pp -.Dl "date -j -f ""%a %b %d %T %Z %Y"" ""`LC_ALL=C date`"" ""+%s""" +.Dl "date -j -f ""%a %b %d %T %Z %Y"" ""`env LC_ALL=C date`"" ""+%s""" .Pp can be used to parse the output from .Nm From nobody Mon Feb 27 17:19: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 4PQS186jZGz3vNCd; Mon, 27 Feb 2023 17:19: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 4PQS186Drnz3qtL; Mon, 27 Feb 2023 17:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677518396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INJK32/mYCtqSQrm3G7PY6R1Fq3QCxZ8CH7I5bAsGWI=; b=Bk8uu9Le+wT4Iuk6bIrERcig8tGtdCYsh/5g9jKx0JYroZ8HIfCMGPZk9foUNhO8WjdiRt mdEIvpVKp9iTNYAOgv0/eZ1cVH4nVcrHnRc7HhpRYgKqN7JGnAqgty3sCe3Gpv/LbHOy0D kz+Kaxrdgro2cWHgA55gF4oVtgB1lr3AH4cAGrphy33+6bwwNX/O+lJsHV+Ds0smZC+fel Djbuij9MIT+c/7v4ErBv4kXVZsPs5EWCeSHO0L/NeDT1bA6Pb2gdH3U+SgLEyIBhihc0pN EU8vvD3jj3I9ynsOVfKAnb/QpLES22zMB9LZSYf86rzfvEvNvforDbxH+Sby3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677518396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INJK32/mYCtqSQrm3G7PY6R1Fq3QCxZ8CH7I5bAsGWI=; b=r7HdLUbg59ekoHVuZwiYlCS1P92LxdZ4Jg8RaNJT17U2wWsnoYzfOUyuQfcdFbaxCLJilj Yz5BRiQktQ/VWJYr2UD7LGcBw46kKi4TgCjSC1P6Cp7ionfobDztW9WdSZDR1oS0avwb42 odKY/eQ0gdWWwWqQxGby7TFJGqPOz0STPS2xD1FxPznBi1AcW0FWftNamidI50HfFojS4g z1EisqKtOG3tX1+V3r5785vr3ggc6Eut/iOh9aZx4hmk06jtTSpK6l6R6RiHlk0WY/zEf5 cDqq+ykMvhbA4KcoMbbuLRrMTAOLzja1KjnAkOXuppdNmci5x4ePCoMoWpc6RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677518396; a=rsa-sha256; cv=none; b=jX8Ne0n+tDFY8HdNbV5qxGdhyFg6Ip3xX8w44mZlxQmLCNZ/sealPhrrheI3Q2UClqjWHM NQg0nCPJlSQGMJT9Xltzmpm7G3CJ3E2c/r0/iz0CGMa7lIqtxYoocvynhTzA3m8M4s/tgO mX3uTL89VIW6yyJEHx12LC2TOQoyXcc+Td8TwO0f99CdulNWN64GvSmK5Pjv9XWtIEi9s2 NEB1cDesde72uquM6mIsA1sUGserhbFQZJUBqEXg5gkdkdaJvUSeCuaS9yU9qT9ZRJpHHb 1gX9/HfXy4KfuVztD/CFRxmTg93U++n/jtMtZpHgJLQZjg633VpP7i2k1cBH+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQS1858F2zYhC; Mon, 27 Feb 2023 17:19: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 31RHJu5R035013; Mon, 27 Feb 2023 17:19:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RHJueI035012; Mon, 27 Feb 2023 17:19:56 GMT (envelope-from git) Date: Mon, 27 Feb 2023 17:19:56 GMT Message-Id: <202302271719.31RHJueI035012@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: cbf64e2dd59c - main - nanobsd: Better NANO_OBJ if NANO_LAYOUT is set 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: cbf64e2dd59c3579c49acbc52659eaa1ddceb557 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf64e2dd59c3579c49acbc52659eaa1ddceb557 commit cbf64e2dd59c3579c49acbc52659eaa1ddceb557 Author: Warner Losh AuthorDate: 2023-02-08 23:19:49 +0000 Commit: Warner Losh CommitDate: 2023-02-27 17:18:59 +0000 nanobsd: Better NANO_OBJ if NANO_LAYOUT is set If NANO_LAYOUT is set, then use /usr/obj/nanobsd.${NANO_NAME}.${NANO_LAYOUT} instead of the current /usr/obj/nanobsd.${NANO_NAME} to allow multiple layouts to be built w/o errors due to the time-skew that creates. PR: 269366 Suggested by: Eugene Grosbein Sponsored by: Netflix --- tools/tools/nanobsd/defaults.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 45d9fe44c650..cd1e89a0c859 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -885,7 +885,7 @@ export_var ( ) { # Don't wawnt a subshell # Call this function to set defaults _after_ parsing options. # dont want a subshell otherwise variable setting is thrown away. set_defaults_and_export ( ) { - : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}} + : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT:+.${NANO_LAYOUT}} : ${MAKEOBJDIRPREFIX:=${NANO_OBJ}} : ${NANO_DISKIMGDIR:=${NANO_OBJ}} : ${NANO_WORLDDIR:=${NANO_OBJ}/_.w} From nobody Mon Feb 27 17:19: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 4PQS1B0TBbz3vNMP; Mon, 27 Feb 2023 17:19: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 4PQS1974Kwz3qx6; Mon, 27 Feb 2023 17:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677518398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=olLkRUKJc9M/XggEi2ZjqrBWNHdjOytTasbE/EDJ3ws=; b=B0dHQ2ze3SkmPsCPqKTyAWHN7kTZ173BwWsZhYKZIhI8gHQHvBwXPihYk15LwPzg7+f6MC yrW7g0fpsmH1/Zah92XXiyL0hNqXTpm1WI4KV8E+Um0u3GD9m0y53b9S1HNHjRcU/2YdZH VPsX2NizpOErAMvK80lPQ8WcwYtrbjBxCvHDVhpE9vEDukBcQFLsFr1rpyhR94F7DKRUWw +TxiZPjfs0V7yQkZydw1n93JDZGr3iqqywipm8MEswgUdNtM9QQPQRQgfrgWwlc3v0dBmE x6HHUgK7eeHrJqJFj9i5wPFDfYttdnsN1HrafTb5QSVlPysVIKaO9HzBtKHcyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677518398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=olLkRUKJc9M/XggEi2ZjqrBWNHdjOytTasbE/EDJ3ws=; b=Z+b9kQWjuuD0lDvZIjU8+/X3UC4Zw7g4Y77mFt5ToHNFMejxlIbUKKeoXXPRPwlNB4mE6r 0kYOhroJByMRhzfj4qJBijCYD4yB1DDn57WT7r4BrtX3K/mGSvDkmzmjRGbvrSib8Kxy15 3eXeV/c0aMDzo3i1B0eHiGJXGVtfyXiwMhwKXXvppG+5rfabrDzGUr557+N1pXx1b7XT4K SQbWUXUP/8EKM/A87FJhukgF71aBqhwN975ct+2pTk4SbfHXK5dAN5ftfCpZBO6ZiVO8Kh kjYODVh0WXAhZNjzuh4We9o47iWYO7XrWh2Q2fmxo6IygCN5/WrGqgI9lT+t2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677518398; a=rsa-sha256; cv=none; b=dnQC+ZwKcOGOsBwbNHhflSbNlXYl5aaxd7dHNwLgeXWO29cacSVlX3KeAZmMD+mUzMJqKb ye4xGzlhcl7k/M4w4No7ge4QUY9N6UXUVBXRH6akEU5JLIsmu1c4jMBLaPd1noNsi2oRe7 kDnN4RtxiMb75qhx793GidygDCM44m3O2/qSXrGXiGj0Cz5GaoOYVAm8R1CzKkiTJ01bOq +M7IbAW783XJu2Xq5o9stmXpgs2K3n6YJDIiTldhUo39UykQ7y3qc4HXc/LV7PSRKWTazh 8JbVsF7L4/ZjYrgcthYxAs7BKGniL8MbhniB2D+txXy+bXtDssOl/97BMph2Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQS195v1dzZ9M; Mon, 27 Feb 2023 17:19: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 31RHJvmY035032; Mon, 27 Feb 2023 17:19:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RHJvup035031; Mon, 27 Feb 2023 17:19:57 GMT (envelope-from git) Date: Mon, 27 Feb 2023 17:19:57 GMT Message-Id: <202302271719.31RHJvup035031@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: 55f35c5398ff - main - Use 'mixed' links for 'hard' links by default. 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: 55f35c5398ffec5835c2f014a7787465997a221e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=55f35c5398ffec5835c2f014a7787465997a221e commit 55f35c5398ffec5835c2f014a7787465997a221e Author: Warner Losh AuthorDate: 2023-02-08 21:20:46 +0000 Commit: Warner Losh CommitDate: 2023-02-27 17:19:00 +0000 Use 'mixed' links for 'hard' links by default. emaste suggested this in https://github.com/freebsd/freebsd-src/pull/133 and it works. It will do the right thing by default, and handle the weird cases 133 was trying to fix. --- share/mk/bsd.own.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index a4a407ac8b6a..81d91d330541 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -248,7 +248,7 @@ _LINKMODE?= ${LINKMODE:U${NOBINMODE}} _SYMLINKOWN?= ${SYMLINKOWN:U${BINOWN}} _SYMLINKGRP?= ${SYMLINKGRP:U${BINGRP}} _SYMLINKMODE?= ${SYMLINKMODE:U755} -HRDLINK?= -l h -o ${_LINKOWN} -g ${_LINKGRP} -m ${_LINKMODE} +HRDLINK?= -l mr -o ${_LINKOWN} -g ${_LINKGRP} -m ${_LINKMODE} MANHRDLINK?= -l h -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} SYMLINK?= -l s -o ${_SYMLINKOWN} -g ${_SYMLINKGRP} -m ${_SYMLINKMODE} LSYMLINK?= -l s -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} From nobody Mon Feb 27 18:43: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 4PQTsT2sH6z3vT02; Mon, 27 Feb 2023 18:43: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 4PQTsT1gyxz43Rt; Mon, 27 Feb 2023 18:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677523405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vmgvQfIfHBSp8G0hw+89odbWGsvRAv9M7Ij1YjgdCNo=; b=TCDlRnZvukMpupleocUkT508J55YNSy7RLca0p3ukBOakjxUC7WNARf3egda/XnauHwT9L 3o72PVK0c8mMeL35WuvqRGa8UXZYwLw1eRjRuJdZSgoRJxftVQ5XIkmKpGVc0VGbR52IPt R0Ssw3zqbX31j4UZoJAy7YhgzEPsDnG+GsOR5txSa+iSSX24XiU4fva0EllseQ/Cj0ZbIr kFzRw/m8SoNNe/Nxl/c58nhZFQgou2IwVjXDNlLA3yZzm9AtTwHKMXOIq4eVEP45zbDn4i ZNtgIfLnrPC0LWdLg+QwU2m1CAsobMUrsRzuPTsS52O1P+dXZAqSoC8I/AFYmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677523405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vmgvQfIfHBSp8G0hw+89odbWGsvRAv9M7Ij1YjgdCNo=; b=tbkioi2GYP7rVG5dobD9S4GkcT/JQGpHnLUhgpAFxMNzjtg6TEtKFV81fVHHRECCKnHcSr pbDwOJvolrZmLQaif5CNTCb46C7seTd9Vn/wrpSyYWF2y4VOZ+ohndHKO8V1jPBAz6n12S F7bMUqeJRjxyLvMLZkGQbLdcLcurbdg4aatvE9ZLlQ+hZ3sarRujNaNiosZXwStCJyeE73 U7yVwoCcGz+AD94B12Wohe5Mekq+mK2t4HPOJ6hooExnMrAjsARMBQwex4Xkj8xmrC8DGA RDBidZ+wxcwHf17Ylj1/K+hf2zF4K1umQjNa8ZE93GtSwfe9bBKW3WrLUi62zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677523405; a=rsa-sha256; cv=none; b=jgDVa4wFVwhtN+Rb66DICo11UqofRmBLNg2nYAzTrhz8qsZnrplO0ikSWjjRHbo+Mwm6nD Dz8xig3HG99OVionNqXwSu5W9EoJyOPKDYrIQCN1G2WhaO+A5BI7twa3d2uPvaG4wMfymA aNBPmnoCogSXWphXTRsd5tEWydWxcsq/7EuGuDzNdfvbRJehsMpv67t0gGPsmXEdE0K9I9 s6UxfZkrKq8RTQINqqaxU3lgW1Z4GJklZiRLcSugcDCGNPU+0N2n1yBEHrSjdZb9dYuss3 RNROgDiq4oEURGHRDg01IDXrpZ9J0CMosDsxdwJ6rslhdiGNDdcS+AQszxe7Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQTsT0lr3zccN; Mon, 27 Feb 2023 18:43: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 31RIhPeg083716; Mon, 27 Feb 2023 18:43:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RIhPwP083715; Mon, 27 Feb 2023 18:43:25 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:43:25 GMT Message-Id: <202302271843.31RIhPwP083715@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: 538c66eabda5 - main - netmap: Fix compiler warnings in tools 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: 538c66eabda55afccebc25fb66548115e5ed8151 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=538c66eabda55afccebc25fb66548115e5ed8151 commit 538c66eabda55afccebc25fb66548115e5ed8151 Author: Mark Johnston AuthorDate: 2023-02-27 18:41:58 +0000 Commit: Mark Johnston CommitDate: 2023-02-27 18:41:58 +0000 netmap: Fix compiler warnings in tools - Remove write-only variables, or hide them in cases where their use is conditional or commented out. - Check for errors from cmd_apply() in nmreplay. - Use ANSI C definitions. Reviewed by: vmaffione MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38752 --- tools/tools/netmap/lb.c | 5 ++--- tools/tools/netmap/nmreplay.c | 2 ++ tools/tools/netmap/pkt-gen.c | 12 +++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/tools/netmap/lb.c b/tools/tools/netmap/lb.c index 778360d9ed6a..66d7aab8f6e1 100644 --- a/tools/tools/netmap/lb.c +++ b/tools/tools/netmap/lb.c @@ -388,7 +388,8 @@ static void sigint_h(int sig) signal(SIGINT, SIG_DFL); } -static void usage() +static void +usage(void) { printf("usage: lb [options]\n"); printf("where options are:\n"); @@ -617,7 +618,6 @@ int main(int argc, char **argv) int ch; uint32_t i; int rv; - unsigned int iter = 0; int poll_timeout = 10; /* default */ glob_arg.ifname[0] = '\0'; @@ -897,7 +897,6 @@ run: while (!do_abort) { u_int polli = 0; - iter++; for (i = 0; i < npipes; ++i) { struct netmap_ring *ring = ports[i].ring; diff --git a/tools/tools/netmap/nmreplay.c b/tools/tools/netmap/nmreplay.c index e0a9e2146119..390877677403 100644 --- a/tools/tools/netmap/nmreplay.c +++ b/tools/tools/netmap/nmreplay.c @@ -1249,6 +1249,8 @@ main(int argc, char **argv) err += cmd_apply(delay_cfg, d[i], qs, &qs->c_delay); err += cmd_apply(bw_cfg, b[i], qs, &qs->c_bw); err += cmd_apply(loss_cfg, l[i], qs, &qs->c_loss); + if (err != 0) + exit(1); } pthread_create(&bp[0].cons_tid, NULL, nmreplay_main, (void*)&bp[0]); diff --git a/tools/tools/netmap/pkt-gen.c b/tools/tools/netmap/pkt-gen.c index c6cf78ad85ee..b06fef05579d 100644 --- a/tools/tools/netmap/pkt-gen.c +++ b/tools/tools/netmap/pkt-gen.c @@ -1306,7 +1306,7 @@ ping_body(void *data) struct targ *targ = (struct targ *) data; struct pollfd pfd = { .fd = targ->fd, .events = POLLIN }; struct netmap_if *nifp = targ->nmd->nifp; - int i, m, rx = 0; + int i, m; void *frame; int size; struct timespec ts, now, last_print; @@ -1399,7 +1399,9 @@ ping_body(void *data) } #endif /* BUSYWAIT */ /* see what we got back */ - rx = 0; +#ifdef BUSYWAIT + int rx = 0; +#endif for (i = targ->nmd->first_rx_ring; i <= targ->nmd->last_rx_ring; i++) { ring = NETMAP_RXRING(nifp, i); @@ -1434,7 +1436,9 @@ ping_body(void *data) buckets[pos]++; /* now store it in a bucket */ ring->head = ring->cur = nm_ring_next(ring, ring->head); +#ifdef BUSYWAIT rx++; +#endif } } //D("tx %d rx %d", sent, rx); @@ -1502,7 +1506,7 @@ pong_body(void *data) struct pollfd pfd = { .fd = targ->fd, .events = POLLIN }; struct netmap_if *nifp = targ->nmd->nifp; struct netmap_ring *txring, *rxring; - int i, rx = 0; + int i; uint64_t sent = 0, n = targ->g->npackets; if (targ->g->nthreads > 1) { @@ -1544,7 +1548,6 @@ pong_body(void *data) src = NETMAP_BUF(rxring, slot->buf_idx); //D("got pkt %p of size %d", src, slot->len); rxring->head = rxring->cur = nm_ring_next(rxring, head); - rx++; if (txavail == 0) continue; dst = NETMAP_BUF(txring, @@ -1579,7 +1582,6 @@ pong_body(void *data) #ifdef BUSYWAIT ioctl(pfd.fd, NIOCTXSYNC, NULL); #endif - //D("tx %d rx %d", sent, rx); } targ->completed = 1; From nobody Mon Feb 27 19:26: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 4PQVqc605yz3vW71; Mon, 27 Feb 2023 19:26: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 4PQVqc5S9Fz49bY; Mon, 27 Feb 2023 19:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677526012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOqAwYqlIvEqwfxxtft2ylhRqsUERtqml4/lpvjFPQE=; b=dz3YHhE0ApZ3q8cymBl39/iQ6D+2B0fHQEKQ27td7xJ4IhraFbLlRAcqn8d9goJK80BB0E rWFHFjsh4gg2Emhq8aCfF5vrQbF4JuZAHehNtwc90o1OVB4CPAiDQF8kuj43WZPsQvUOcl T0jWS4bPhKKDO0w8XpBKqjAaZMUJNS2xhupap1IjNGchq+ku/csB7Tl0zN/RJkOhc6pWHp ECztumOM5M8qPjIsR+hb9ESIAgYGnVgz1pGMtFzIZMyWFKzD1ibHE3nGXSNrM1vS+ZN86B JPhhvUkNYKhTkonsrTCIU2GAxPuoY46Km2vMVkrwKtd6qybaclhNhB093P2uFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677526012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOqAwYqlIvEqwfxxtft2ylhRqsUERtqml4/lpvjFPQE=; b=Z5kpJcPfTLyFZoSrp3k1WDsSzETiiC7RT4PPuiKomKuEN2t0mGSRgxHa+VacI2T1iOuCuz 2wm2Qb8C6cdNs+83GebWtGFpilnx+cE//mN/mq418T3E8W84Eq0vY1t04D40hWgbPDG6tK F5O3C3NldCtczFOT93B8WiFYYJ1ns85QGOWHpbBvQmZW82hzHaRlI6smXt9Lgyh8NwiOZ4 QC/xFIunvPJI/psq0OhoaP5VsCWWDFE1cFDNRKqtPJO/pf60AqOsMSEY0sCZoomTdJoqry +6Zn+gHB+sodQIS28LVjgzYSESRvM0DXMGFAWIAeZHOIPfVpswVSmqhltOXbPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677526012; a=rsa-sha256; cv=none; b=Cq0KQBWxifatjH/1rVqNilBatemkqkqnMArT0SkoZNqfh51WjGBhB7GOHfw2iy0dSYO0nW yXIZmRCeFb/vrDOTVNGJBPmpHHDBMxQYIJSOG+UBi+1eAadP50uKhs1fFM3EtmDsJz8lf0 qNO/HzB5LLU4Ca2w54q7JUsMse99Pbjd7vF7B4LpJbcNl6GpVWI4QB1TQFf8WCqHKum4Jc SICP87pMH5b6pG2sZUote7q0SMxQWUagVCh7s9N8q83DkD/l5PsoK85zo2LpmNPrZIs/rB NlIUFrSJ32wgsrgC/8lFKEYBPFF/fITwa923nKtW6Dvwt+TAH0oo19sUyPPADQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQVqc4WfkzdF1; Mon, 27 Feb 2023 19:26: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 31RJQqlT050348; Mon, 27 Feb 2023 19:26:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RJQq2G050347; Mon, 27 Feb 2023 19:26:52 GMT (envelope-from git) Date: Mon, 27 Feb 2023 19:26:52 GMT Message-Id: <202302271926.31RJQq2G050347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d8c70d6dfb65 - main - nanobsd: 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8c70d6dfb65218dd3272b34512083621d3ed46d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d8c70d6dfb65218dd3272b34512083621d3ed46d commit d8c70d6dfb65218dd3272b34512083621d3ed46d Author: Gleb Smirnoff AuthorDate: 2023-02-27 19:26:18 +0000 Commit: Gleb Smirnoff CommitDate: 2023-02-27 19:26:18 +0000 nanobsd: fix typo Fixes: cbf64e2dd59c3579c49acbc52659eaa1ddceb557 --- tools/tools/nanobsd/defaults.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index cd1e89a0c859..59d0b3917411 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -885,7 +885,7 @@ export_var ( ) { # Don't wawnt a subshell # Call this function to set defaults _after_ parsing options. # dont want a subshell otherwise variable setting is thrown away. set_defaults_and_export ( ) { - : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT:+.${NANO_LAYOUT}} + : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT}:+.${NANO_LAYOUT}} : ${MAKEOBJDIRPREFIX:=${NANO_OBJ}} : ${NANO_DISKIMGDIR:=${NANO_OBJ}} : ${NANO_WORLDDIR:=${NANO_OBJ}/_.w} From nobody Mon Feb 27 20:40: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 4PQXSL4LBBz3t6fv; Mon, 27 Feb 2023 20:40:18 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (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 4PQXSK6YKMz4MFB; Mon, 27 Feb 2023 20:40:17 +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.171 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; dmarc=none Received: by mail-lj1-f171.google.com with SMTP id h3so7815828lja.12; Mon, 27 Feb 2023 12:40:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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=qN2o8VnvRaDsszbEVwOGxG2c+mkXp9EPRg7ucNpRdus=; b=LnakfB/WvtIUjuGHEh/cw7oB5ZktrbJ4E1LXIPdnHhlG+7by+nQCHAK/FtAHdfs3JH IT+oIP+flxtAJdfz0QMNpU3yymIHR4u6b0Rs4bdRl3Dgdjq+xr/ZoVh3uLGSBXFdtx6u Yv6pwlIZHrmQb+SadvKOPSmnBv/RQKChbkAM7Typmo+94SesoR8mMUxsqAiQ6x6Qvv0t 89A58HS7YcKuWU89dvVUeKTwMyPdXI1v6MBazFmKymCI59k9y5VUEkFh9R34dRnhWqi4 /wPo6+Ht3YkUpb4NyV1Krn5minUx6JxtiiZ2CMCIdYpD1jtugORb4vLEgF20SDi2S1t8 gAeg== X-Gm-Message-State: AO0yUKW4XNjgfD0VDA66MpLy5pAVJrSy+RpkuFtW8yQOR5KoyOJwf743 rleuOw4iReK62hmoykNPQStO5YO9wuwumAVqqwjT4nLK X-Google-Smtp-Source: AK7set/ubcBH/QX5ezczc32aMO5gmrx6wShKl+1aVIc0wjFdSbqvf7QoN/GKArwWWhSBq9CWRX8xEDLqqXa+wZHT1+o= X-Received: by 2002:a2e:bc16:0:b0:295:acea:5875 with SMTP id b22-20020a2ebc16000000b00295acea5875mr402964ljf.2.1677530415323; Mon, 27 Feb 2023 12:40:15 -0800 (PST) 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: <202302241821.31OIL4ux075893@gitrepo.freebsd.org> <20230224205001.Fbn1A%steffen@sdaoden.eu> <20230225012736.PT3cH%steffen@sdaoden.eu> <20230225222952.t3oH3%steffen@sdaoden.eu> In-Reply-To: <20230225222952.t3oH3%steffen@sdaoden.eu> From: Ed Maste Date: Mon, 27 Feb 2023 15:40:05 -0500 Message-ID: Subject: Re: git: 2c709ee70ade - main - libc: handle zero alignment in memalign() To: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-2.98 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.979]; 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]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.171:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.171:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_TLS_LAST(0.00)[]; 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]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[freebsd.org]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4PQXSK6YKMz4MFB X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N On Sat, 25 Feb 2023 at 17:29, Steffen Nurpmeso wrote: > > Ed Maste wrote in > : > |On Fri, 24 Feb 2023 at 20:27, Steffen Nurpmeso wrote: > |> Me too. 'Was just thinking of allocators which give back valid > |> but inaccessible memory for 0 bytes so that each access would > |> fault. > | > |The size is not (necessarily) zero though. The alignment requested is. > > I personally would fail EINVAL for 0: something really must be > bogus if you reqest an alignment of 0. The standard says > > Upon successful completion, posix_memalign( ) shall return zero; This is not posix_memalign, this is memalign which is provided for glibc compatibility (and which accepts align == 0). This came up only because Valgrind's tests triggered this case. From nobody Mon Feb 27 20:51: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 4PQXjL68Hjz3t7SF; Mon, 27 Feb 2023 20:51:34 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (using TLSv1.3 with cipher TLS_AES_256_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 4PQXjL2QYTz4Q19; Mon, 27 Feb 2023 20:51:34 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none Date: Mon, 27 Feb 2023 21:51:25 +0100 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2c709ee70ade - main - libc: handle zero alignment in memalign() Message-ID: <20230227205125.wT7DI%steffen@sdaoden.eu> In-Reply-To: References: <202302241821.31OIL4ux075893@gitrepo.freebsd.org> <20230224205001.Fbn1A%steffen@sdaoden.eu> <20230225012736.PT3cH%steffen@sdaoden.eu> <20230225222952.t3oH3%steffen@sdaoden.eu> Mail-Followup-To: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org User-Agent: s-nail v14.9.24-430-g6a13fd0a75 OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. X-Rspamd-Queue-Id: 4PQXjL2QYTz4Q19 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N 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 Ed Maste wrote in : |On Sat, 25 Feb 2023 at 17:29, Steffen Nurpmeso wrote: |> Ed Maste wrote in |> : |>|On Fri, 24 Feb 2023 at 20:27, Steffen Nurpmeso \ |>|wrote: |>|> Me too. 'Was just thinking of allocators which give back valid |>|> but inaccessible memory for 0 bytes so that each access would |>|> fault. |>| |>|The size is not (necessarily) zero though. The alignment requested is. |> |> I personally would fail EINVAL for 0: something really must be |> bogus if you reqest an alignment of 0. The standard says |> |> Upon successful completion, posix_memalign( ) shall return zero; | |This is not posix_memalign, this is memalign which is provided for |glibc compatibility (and which accepts align == 0). This came up only |because Valgrind's tests triggered this case. This is what happens when one mutilates the email quote context. --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) From nobody Mon Feb 27 22:12: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 4PQZVV6hDBz3tDSj; Mon, 27 Feb 2023 22:12: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 4PQZVV3cNvz3QWZ; Mon, 27 Feb 2023 22:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NKCTdyHMybvLfldt48HbbyexCtoN5kDQmQwrwIjY+c=; b=S0ds4HxcYWu0uL/IdvWBBSTU7M18Z3XzKKCVFjJs6ZMYWUs4Gc3o6ALajJyod2eHlzXj2D 0BB5QK8yspJo3ddo9n8aKQFvGTrKEJ1Dix9LKeE6l9uEXoAdptApfFLLk1MuSW/7RHAhof 1eowi7IxlcMILX34GdCpzpMIEgS8ZM9qsbOhkQceNszdOb8NcQ434hXaP5nb9Py911iBJ6 Kvm8hSFL0Gc/zZ0CaOFBIW/ro9JRqyuWSYuIo5Yx0xELQmfl1KVm8TzknIMb+KuA9U57tU DFq/nkCkpSSYvFXa7EfTueh71KuD/5uD5odeXyKupiMthRfldNOPAjo3iiHhpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NKCTdyHMybvLfldt48HbbyexCtoN5kDQmQwrwIjY+c=; b=NdnYl7CaRlODsBgRM6+yJcKNg7dK7SlpyaXw43V+z63xhrggLEu8i7cJwlb6sL8vXfwTHn +dawvNXR8PYJSxpeTIFeLxCPFuzYdXKrvxrGBvqyJMr2oqTZYWFCmLpJciJMbi58Z+povR Hq0JHIxKKay1Za3ismjHoaMM3Qh2vaFCweql6wKuAGEoGVIFhTp4aQ2dCHYWkTrlVO6My0 FFQc38deW99uijPi10dIfe0ptPKDeFerF8pOQChYTPA/1L3u1FlZ1yz+jKDzCs9x7BUZZe yZNzle8ZjvmkyGywxaA7l+9kgr/CIzenmm1ro3FPmQkMY5S+b0fCd6hi29+KSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677535938; a=rsa-sha256; cv=none; b=iAiq7DI3yt863+l4Jq0FN/F/H2uYUmrLoWSKUuvUqTxTfZ7H7RgDhSX6lO3I85VCWKBsZ/ wyK26wMH7DjFLuJ0fUPDlOS1OIFZsWjX0cmIiwAeVYRIw11ICsPvO4hGDsmSdxG/6934lK 4TmG1uD1G9F0UZY/jyAHjL2O1431pkERz2kKjI8jnSp14qqc5eASXB0Q4JVRJODBHejrTE wv3O3PH3vpPZuDgSu1KKoSEIOyAjV1umsSs2Da9/C+pInKlKSaMZTV3OM2RrAs6IM8/tPh cFg/lqNzS5wMDjufY2it1zgnaRIFc4wlbWvftLCc2Fxc6NK7TfVQj4C/4woBrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQZVV2k3lzjXg; Mon, 27 Feb 2023 22:12: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 31RMCIis028777; Mon, 27 Feb 2023 22:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMCILE028776; Mon, 27 Feb 2023 22:12:18 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:12:18 GMT Message-Id: <202302272212.31RMCILE028776@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: cb2a028b152b - main - pps: Load timecounter once in pps_capture() 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: cb2a028b152b09c1dc49d40d8031d27ce34b1585 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cb2a028b152b09c1dc49d40d8031d27ce34b1585 commit cb2a028b152b09c1dc49d40d8031d27ce34b1585 Author: Sebastian Huber AuthorDate: 2023-02-27 21:49:09 +0000 Commit: Warner Losh CommitDate: 2023-02-27 22:10:54 +0000 pps: Load timecounter once in pps_capture() This ensures that the timecounter and the tc_get_timecount handler belong together. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/604 --- sys/kern/kern_tc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 37287df4d1fd..20520adc0aba 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1761,6 +1761,7 @@ void pps_capture(struct pps_state *pps) { struct timehands *th; + struct timecounter *tc; KASSERT(pps != NULL, ("NULL pps pointer in pps_capture")); th = timehands; @@ -1769,7 +1770,8 @@ pps_capture(struct pps_state *pps) #ifdef FFCLOCK pps->capffth = fftimehands; #endif - pps->capcount = th->th_counter->tc_get_timecount(th->th_counter); + tc = th->th_counter; + pps->capcount = tc->tc_get_timecount(tc); atomic_thread_fence_acq(); if (pps->capgen != th->th_generation) pps->capgen = 0; From nobody Mon Feb 27 22:12: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 4PQZVW5DJHz3tDYb; Mon, 27 Feb 2023 22:12: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 4PQZVW4VyXz3QWg; Mon, 27 Feb 2023 22:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=grPO3u8G+83O0ZJ8tzphq2TUVqCYQKqnA6//RQbAcyk=; b=ovdC6sxVaA3KaklpeidtR5i4Mu/iwid0p4NJZb8ZzpcqlvYCT9aijFpnlygSPW/x/fUa7g upn4Bd85kr8MymPUQYNY7VanKc57/7EHDv1Vn0/48V4Xxwt1zF4yCZYDlSm0QCAslPPjpT q7hz1sC9VErasVPbyfx6f9wSVkDG2Wwg8CFvIYLUUnv4S4/yekSc+S/2vyacQP3H/DHRh6 66PT3xfo2R0OqW7vMTF6OsGEIEG92Z8pPN9v/hBC4r3t5pful6UOUgWz8KEZ/ZWwYDnsCk ceF42ICDjOIKdbHNUuiugBsXntL8zC3Fis4jRZgUVnp2lhqIcYcnqlLqSu35bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=grPO3u8G+83O0ZJ8tzphq2TUVqCYQKqnA6//RQbAcyk=; b=m3WY32btdR0YcaZ4cIDXBULeUxQiz3iEFaIy8lUXchlPiIwxQl8QiWECl70kONNJqPGOFI BALvaLnl8MqRB4pkZAzAhbRbaOmftqBCac0nJNuejxdD4v11W9LUNcAO9lTsWFYQ01uxgY XXhVAUevLU1XVicf2AiLZoFvvUeN3FUW4OJk4/yrFYrBkh9FxVo/B0Vx3DrlDmepwicOCu d1PoDxjsYq3egNVHnq3Ik6HiX/wAN87PfOOke0txsgQXOmh0DLBM4Din3NDP46KBm6BT+O LrmTPCW4ygz6glS7JViYvEK8cqohXY9dqhtU/8YRZjN5Wba5TD9YlI6PAjNmBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677535939; a=rsa-sha256; cv=none; b=X+GRbr+BDWS7gPG3+65oW8+DYbQ7Rsb/5z1kPSPVGgwdkue5EyH0li9xvHMQaWXz/SikGL diimXJqiyfObyq/PHA1anKxEUhAxDqFRmr/ViXNyucW3ykohUAnsRxInkFsjYPOlVYZ3jw s1XR6z+Dhjwq4Rh2Vhx6Vi8Lzv2/WMeUwDTHup4brM/AK2RR7hsNjUWK6N5HRL610FgwzG 5LT0cdhSGMOHbRgMMUnrtwNFx29+C2r2abzQKd7UKtNBP+bD8HNbEnPwi6TeGXOznnniIL 9zRL4TYwoIOg5wYHoY4l9NvnCDog5CaUFArKXbHHRm8kkOcttTwdWOxEsrvDqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQZVW3c2szjXh; Mon, 27 Feb 2023 22:12: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 31RMCJEa028800; Mon, 27 Feb 2023 22:12:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMCJx0028799; Mon, 27 Feb 2023 22:12:19 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:12:19 GMT Message-Id: <202302272212.31RMCJx0028799@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: fd88f4e190bc - main - pps: Simplify capture and event processing 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: fd88f4e190bc0a56f8d30179900553ce12d1c0d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd88f4e190bc0a56f8d30179900553ce12d1c0d7 commit fd88f4e190bc0a56f8d30179900553ce12d1c0d7 Author: Sebastian Huber AuthorDate: 2023-02-27 21:49:09 +0000 Commit: Warner Losh CommitDate: 2023-02-27 22:10:55 +0000 pps: Simplify capture and event processing Use local variables for the captured timehand and timecounter in pps_event(). This fixes a potential issue in the nsec preparation for hardpps(). Here the timecounter was accessed through the captured timehand after the generation was checked. Make a snapshot of the relevent timehand values early in pps_event(). Check the timehand generation only once during the capture and event processing. Use atomic_thread_fence_acq() similar to the other readers. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/604 --- sys/kern/kern_tc.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 20520adc0aba..b466fd4399e4 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1772,14 +1772,14 @@ pps_capture(struct pps_state *pps) #endif tc = th->th_counter; pps->capcount = tc->tc_get_timecount(tc); - atomic_thread_fence_acq(); - if (pps->capgen != th->th_generation) - pps->capgen = 0; } void pps_event(struct pps_state *pps, int event) { + struct timehands *capth; + struct timecounter *captc; + uint64_t capth_scale; struct bintime bt; struct timespec ts, *tsp, *osp; u_int tcount, *pcount; @@ -1798,9 +1798,17 @@ pps_event(struct pps_state *pps, int event) /* Nothing to do if not currently set to capture this event type. */ if ((event & pps->ppsparam.mode) == 0) return; + + /* Make a snapshot of the captured timehand */ + capth = pps->capth; + captc = capth->th_counter; + capth_scale = capth->th_scale; + tcount = capth->th_offset_count; + bt = capth->th_bintime; + /* If the timecounter was wound up underneath us, bail out. */ - if (pps->capgen == 0 || pps->capgen != - atomic_load_acq_int(&pps->capth->th_generation)) + atomic_thread_fence_acq(); + if (pps->capgen == 0 || pps->capgen != capth->th_generation) return; /* Things would be easier with arrays. */ @@ -1838,25 +1846,19 @@ pps_event(struct pps_state *pps, int event) * If the timecounter changed, we cannot compare the count values, so * we have to drop the rest of the PPS-stuff until the next event. */ - if (pps->ppstc != pps->capth->th_counter) { - pps->ppstc = pps->capth->th_counter; + if (__predict_false(pps->ppstc != captc)) { + pps->ppstc = captc; *pcount = pps->capcount; pps->ppscount[2] = pps->capcount; return; } /* Convert the count to a timespec. */ - tcount = pps->capcount - pps->capth->th_offset_count; - tcount &= pps->capth->th_counter->tc_counter_mask; - bt = pps->capth->th_bintime; - bintime_addx(&bt, pps->capth->th_scale * tcount); + tcount = pps->capcount - tcount; + tcount &= captc->tc_counter_mask; + bintime_addx(&bt, capth_scale * tcount); bintime2timespec(&bt, &ts); - /* If the timecounter was wound up underneath us, bail out. */ - atomic_thread_fence_acq(); - if (pps->capgen != pps->capth->th_generation) - return; - *pcount = pps->capcount; (*pseq)++; *tsp = ts; @@ -1890,9 +1892,9 @@ pps_event(struct pps_state *pps, int event) */ tcount = pps->capcount - pps->ppscount[2]; pps->ppscount[2] = pps->capcount; - tcount &= pps->capth->th_counter->tc_counter_mask; + tcount &= captc->tc_counter_mask; scale = (uint64_t)1 << 63; - scale /= pps->capth->th_counter->tc_frequency; + scale /= captc->tc_frequency; scale *= 2; bt.sec = 0; bt.frac = 0; From nobody Mon Feb 27 22:12: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 4PQZVX5wv6z3tDhl; Mon, 27 Feb 2023 22:12: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 4PQZVX5N6Rz3QG9; Mon, 27 Feb 2023 22:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOQ+2nfA8dQ8X4lUrt7vl+Orp+zL1ILp9SZh+gs837w=; b=GztOiDfR1S9XF+pJkPoc6LJeEMvP0p9CU6BUE5z1tS5LEzDyogDEs0rQzKRmHyNrSUfjeT zZ6M3vqVDFgtWnNWHy/K8++u9KftUh8h0KNGob7ROzKSoVzp/0KHs+NL9PvpSC2WY1w23+ OecGPWglqf+a1Fux7YfMNBoanmWryXsBbNTw1w0Gd/nYf84q97M/yM7FOuaztxsFg6LRTD asXkPNSYgnesyH2mQQpApKvmv8oh/v4kN7ioVhR4koVDW30EGw2/fdbix097YsTZjeHW8F tFqBohjYzC5AaTFs/mTdzl6mnNKUfyuj+31bC0GfEf9o4NL8fjdACRPOFrmyVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOQ+2nfA8dQ8X4lUrt7vl+Orp+zL1ILp9SZh+gs837w=; b=fBvHhFgIOI9GjWvxdAkll1OgYk3aTlad2a96ZBZdL38VekMNI972+F0ovMnRsgT2+Z4kui gv6bKwXBTmneYMI7CAjsPxhTA1yvunOA21ffygtFGp9ekzDJ7SD1nzSiSHKtEfkDhWYO7L 5prQijvp3Jvu2vCPC0SAToXe/SklGeILjarkNXnVFFTgumNHmkE5q/zRmyIn+sXC6Tcjwo 27hln5zlMMhrKuTVaZsWeESippUlRceOk+yqgyVpaC6n95yZsEW2Zsg5xUbfPB5NQ9Wul6 DKEKXUm80utj5GPvpNgWo6DJ/VWq6L4rJCbnYB8w/Ic8k6rKYS+vqPvybigjWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677535940; a=rsa-sha256; cv=none; b=m+KdzFUKFWPdcGYEfcIaEsMllstLfMRgZN1pQP7eNl64536aOiDdx5P7LwklVfhuadtpxl waNqw/usroLuo/XJCztbt6+AFQ3oO7n8mKWUbXasnBWj6kCTd+aUDKGC5dK0MD2YgnGlxF ZXElKWghjYlbBldEGpOB0GFoebqJCVCK7PZHWJzOTCE104U5ilM9UqmSJTt/0ZA7SRk0/7 +TfYKEJ2H0pGXbzrYd2vLD7yLCVVszleP+OeOgAqhrkE1sueWoAnjiY1OM6cWQAFYqywoZ xOvfuvCXA3PgXVF79OAq71EDZJ+ZRr5LjNxmL57VZ1XsJerDPvU+KK8Hw7v54A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQZVX4THHzj25; Mon, 27 Feb 2023 22:12: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 31RMCKdX028819; Mon, 27 Feb 2023 22:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMCK9e028818; Mon, 27 Feb 2023 22:12:20 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:12:20 GMT Message-Id: <202302272212.31RMCK9e028818@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: 0448501f2b1a - main - pps: Move pcount assignment in pps_event() 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: 0448501f2b1a2c89be4042817939645ec6fddfd8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0448501f2b1a2c89be4042817939645ec6fddfd8 commit 0448501f2b1a2c89be4042817939645ec6fddfd8 Author: Sebastian Huber AuthorDate: 2023-02-27 21:49:09 +0000 Commit: Warner Losh CommitDate: 2023-02-27 22:10:55 +0000 pps: Move pcount assignment in pps_event() Move the pseq increment. This makes it possible to reuse registers earlier. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/604 --- sys/kern/kern_tc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index b466fd4399e4..b625726123af 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1842,25 +1842,25 @@ pps_event(struct pps_state *pps, int event) #endif } + *pcount = pps->capcount; + /* * If the timecounter changed, we cannot compare the count values, so * we have to drop the rest of the PPS-stuff until the next event. */ if (__predict_false(pps->ppstc != captc)) { pps->ppstc = captc; - *pcount = pps->capcount; pps->ppscount[2] = pps->capcount; return; } + (*pseq)++; + /* Convert the count to a timespec. */ tcount = pps->capcount - tcount; tcount &= captc->tc_counter_mask; bintime_addx(&bt, capth_scale * tcount); bintime2timespec(&bt, &ts); - - *pcount = pps->capcount; - (*pseq)++; *tsp = ts; if (foff) { From nobody Mon Feb 27 22:12: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 4PQZVZ00zLz3tDyb; Mon, 27 Feb 2023 22:12: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 4PQZVY6HRKz3QGc; Mon, 27 Feb 2023 22:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VByvLWRu5uyICeOVyybLEB5fXgw4kWjXtEsDVm9j98=; b=f1u59Z6Ru019lg/9KSO3FxxoW4L7oAzyKi+3FI38CYUq5ksqz0roV9wNswIH7L9xbPLATL tbahNGy9T2WbQMjF1Nq6ND7pbo4jrZxdulCVCbv+okmBA4CwFxdIEQ9A9xad68d6wiZQJO VDRtTVzvSSr6rLIABwCoxlcyBZmAl+WOyIBuvUc2u9dNuyCpoSU9RrI7fcMHdauecxX7qe ieCFizDgnWzwHKurUh8hww23ZQQdQnHsNCQW4UORdiZYmztCjCiu8KgJxskGZi7xHy5PxR 3A/NL7KU5HAj2YDbjyk0nYezgru3naVjKG0bC3QIQlQ09RE2Q1uN0QHhDQ29Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VByvLWRu5uyICeOVyybLEB5fXgw4kWjXtEsDVm9j98=; b=T2uzMNgsOLc3y9jB0RJPidQUmMqcWk1tWDI03ejH/tJIMzU3epoS8ua+5L8hW82mdsJGGX qCkfwEcy7E6FXplRz8Pfp4Q2Fgg93CkGcM8EMxs3wcqbjtQgXyjg3jm3MmYzcyfkJErM0e z/8tcGvK0n+5KM13YrKH9ytBATV13RfxERdM/yZoPcVK3cqo4/D9k8vPrOScQQWuAhWUZP e7s56f2IZN1Ofu3RFFwB2j8QG8byjxNwUUntivCcg5NiUfOlyQcNnZCOz7eMaaT5r/Ph9a YGrtDqoX9sdz1dl0xawAosGwPvx4k9Nhf+swW3G3xICZudyFQqOIGiluOfyTYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677535941; a=rsa-sha256; cv=none; b=SX+QTwHTdA7p0ERLp0natxoks6pc29P66m8q3NRQ5iwylM4oX9siqCfpKvOQjwQy2RZy2a JTwABHW7kAZIBttLFEEQe4du3yee6JSVFjqj+5k3/CXlz4mMJ1gTe6Y8Hx2Z1kwb9xYkIV eAMdkGpJa5Feu2ORwlWtVMmxIxC89nSybkEKd89EvMVDQTw2IQoUX1VS+MYPqahGWPRlyA 0abFyLJ8dTpnOJkbtKzKgtXurRJJD9T0xse3OAXVcrIDG1KbL/DUqXnDg0pUjPcK9sRzln CHmueTNzi+DLgpq00Y60g+K5mx6d2SxDNiaxUUW0yfecmRTfEhUWqL9eqQuwyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQZVY5NBHzjXk; Mon, 27 Feb 2023 22:12: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 31RMCLqO028838; Mon, 27 Feb 2023 22:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMCL3G028837; Mon, 27 Feb 2023 22:12:21 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:12:21 GMT Message-Id: <202302272212.31RMCL3G028837@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: 8a142484d4c1 - main - pps: Directly assign the timestamps in pps_event() 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: 8a142484d4c1d64b00a10e79fb4eb8b9f8d6c68d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8a142484d4c1d64b00a10e79fb4eb8b9f8d6c68d commit 8a142484d4c1d64b00a10e79fb4eb8b9f8d6c68d Author: Sebastian Huber AuthorDate: 2023-02-27 21:49:09 +0000 Commit: Warner Losh CommitDate: 2023-02-27 22:10:55 +0000 pps: Directly assign the timestamps in pps_event() Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/604 --- sys/kern/kern_tc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index b625726123af..be564e4347f8 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1860,8 +1860,7 @@ pps_event(struct pps_state *pps, int event) tcount = pps->capcount - tcount; tcount &= captc->tc_counter_mask; bintime_addx(&bt, capth_scale * tcount); - bintime2timespec(&bt, &ts); - *tsp = ts; + bintime2timespec(&bt, tsp); if (foff) { timespecadd(tsp, osp, tsp); @@ -1876,9 +1875,8 @@ pps_event(struct pps_state *pps, int event) bt = pps->capffth->tick_time; ffclock_convert_delta(tcount, pps->capffth->cest.period, &bt); bintime_add(&bt, &pps->capffth->tick_time); - bintime2timespec(&bt, &ts); (*pseq_ffc)++; - *tsp_ffc = ts; + bintime2timespec(&bt, tsp_ffc); #endif #ifdef PPS_SYNC From nobody Mon Feb 27 22:12: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 4PQZVb39v1z3tDYr; Mon, 27 Feb 2023 22:12: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 4PQZVb0J3gz3Qps; Mon, 27 Feb 2023 22:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fDWwRlMuf+UkRR2mk0J0xl7Ed9LFp5sr8YsgHAHgLrU=; b=gTSLpGq/HBLOQgYXdZq5+yLikzgbmkUsV/UGmllqqz8ky6UsO9tuHpywWvSXB2cw+hYFzF QRfxptS3Jjau5tDF3pXYNpukfgUnDUx7MWe6FicSbWnigMW1k1GEgINsVAjjkWS0L5AmKn PDwJ3Tbvk20B4FaFy6orn77SalkTTG2EufTrNkwKEQ3ueJSGRUeqTXVkLz1Gnfp9y4dwPi Vt+9uOpCSAx3ihyeTw02AGdrvu4F5BivZQcO/2TaqT9FcAXOunmMfh7QvyftKfukqRn1K9 9lMGbOPVVfdMcPYaw5/e3FyKbInT+PuNFRPSnkqcgkXlK0SE49M3CMHsfr+pTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fDWwRlMuf+UkRR2mk0J0xl7Ed9LFp5sr8YsgHAHgLrU=; b=qxa2l+ttJrP+PYRXhAqEi38ssD9VCR7lhVe8kBCUI66Ygx3I7EMdJk7hiphsc4eb5bkcGl Nu5c3eKCReO9A67PPyps1sezcALErK7FDDelYzplseBJ4KqThHnfyAmnTj0MpsX1iNU+9S nrttCeLgwdEkyibl9SMhPsM06NTQqlQ16K7cixfU86HsuGjYd5H3kvDagtkaFrGSrT/Mb1 aWKLNnc0+B5YvbjCBgFX41aq8+GJl/4B5qC2kMt6r5fvzYi+WOWYkUeYIVAhmnISyybxMi QSLo0wDdUVTaHFsSvcrPocclbuGRVnAF7RDntng4SYYzTBRwmZHbBOCx6+hPug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677535943; a=rsa-sha256; cv=none; b=N0lw31q2aa3zNcpRahmTYZvYn1Ccn2+I7WsGA20r6eZtcWJOFdcS4L+LTAKjue8Yq9NGTy oe17VRYhTS4cUoq9CEAjzKPrYkbe+krK505HWIqSTZLkErK+PDmibN/emuWRzZWqCwMZzl SZtyeE0VeT5CuqfxqjNd4BtSVUmmFpLBc8vyQwx7QOaGleVyIwrBXa/GJN3xZwU48E6IgU SbnDRe0ConLe8DijAzip+6KJmUPcuVyQqYgnGsYF1F3DpOdqZEMEuTgHZbgpuu9pZBaU9P mQ/TCYwRvgsDUV3rPgI8V0ZhGATHKe1pUK4gmUpwFCeXXo52ZzpETto7A6zCYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQZVZ6J2tzjS5; Mon, 27 Feb 2023 22:12: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 31RMCMKq028857; Mon, 27 Feb 2023 22:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMCMBg028856; Mon, 27 Feb 2023 22:12:22 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:12:22 GMT Message-Id: <202302272212.31RMCMBg028856@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: 1e48d9d336c0 - main - pps: Simplify the nsec calculation in pps_event() 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: 1e48d9d336c042a44edc0f66d35b72655f68f258 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1e48d9d336c042a44edc0f66d35b72655f68f258 commit 1e48d9d336c042a44edc0f66d35b72655f68f258 Author: Sebastian Huber AuthorDate: 2023-02-27 21:49:09 +0000 Commit: Warner Losh CommitDate: 2023-02-27 22:10:55 +0000 pps: Simplify the nsec calculation in pps_event() Let A be the current calculation of the frequency accumulator (pps_fcount) update in pps_event() scale = (uint64_t)1 << 63; scale /= captc->tc_frequency; scale *= 2; bt.sec = 0; bt.frac = 0; bintime_addx(&bt, scale * tcount); bintime2timespec(&bt, &ts); hardpps(tsp, ts.tv_nsec + 1000000000 * ts.tv_sec); and hardpps(..., delta_nsec): u_nsec = delta_nsec; if (u_nsec > (NANOSECOND >> 1)) u_nsec -= NANOSECOND; else if (u_nsec < -(NANOSECOND >> 1)) u_nsec += NANOSECOND; pps_fcount += u_nsec; This change introduces a new calculation which is slightly simpler and more straight forward. Name it B. Consider the following sample values with a tcount of 2000000100 and a tc_frequency of 2000000000 (2GHz). For A, the scale is 9223372036. Then scale * tcount is 18446744994337203600 which is larger than UINT64_MAX (= 18446744073709551615). The result is 920627651984 == 18446744994337203600 % UINT64_MAX. Since all operands are unsigned the result is well defined through modulo arithmetic. The result of bintime2timespec(&bt, &ts) is 49. This is equal to the correct result 1000000049 % NANOSECOND. In hardpps(), both conditional statements are not executed and pps_fcount is incremented by 49. For the new calculation B, we have 1000000000 * tcount is 2000000100000000000 which is less than UINT64_MAX. This yields after the division with tc_frequency the correct result of 1000000050 for delta_nsec. In hardpps(), the first conditional statement is executed and pps_fcount is incremented by 50. This shows that both methods yield roughly the same results. However, method B is easier to understand and requires fewer conditional statements. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/604 --- sys/kern/kern_ntptime.c | 12 +++--------- sys/kern/kern_tc.c | 16 ++++++---------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index b632cecdfadb..815a26182096 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -771,16 +771,10 @@ hardpps(struct timespec *tsp, long delta_nsec) pps_tf[0].tv_nsec = u_nsec; /* - * Compute the difference between the current and previous - * counter values. If the difference exceeds 0.5 s, assume it - * has wrapped around, so correct 1.0 s. + * Update the frequency accumulator using the difference between the + * current and previous PPS event measured directly by the timecounter. */ - u_nsec = delta_nsec; - if (u_nsec > (NANOSECOND >> 1)) - u_nsec -= NANOSECOND; - else if (u_nsec < -(NANOSECOND >> 1)) - u_nsec += NANOSECOND; - pps_fcount += u_nsec; + pps_fcount += delta_nsec - NANOSECOND; if (v_nsec > MAXFREQ || v_nsec < -MAXFREQ) goto out; time_status &= ~STA_PPSJITTER; diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index be564e4347f8..0dc233896baa 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1781,7 +1781,7 @@ pps_event(struct pps_state *pps, int event) struct timecounter *captc; uint64_t capth_scale; struct bintime bt; - struct timespec ts, *tsp, *osp; + struct timespec *tsp, *osp; u_int tcount, *pcount; int foff; pps_seq_t *pseq; @@ -1881,7 +1881,7 @@ pps_event(struct pps_state *pps, int event) #ifdef PPS_SYNC if (fhard) { - uint64_t scale; + uint64_t delta_nsec; /* * Feed the NTP PLL/FLL. @@ -1891,14 +1891,10 @@ pps_event(struct pps_state *pps, int event) tcount = pps->capcount - pps->ppscount[2]; pps->ppscount[2] = pps->capcount; tcount &= captc->tc_counter_mask; - scale = (uint64_t)1 << 63; - scale /= captc->tc_frequency; - scale *= 2; - bt.sec = 0; - bt.frac = 0; - bintime_addx(&bt, scale * tcount); - bintime2timespec(&bt, &ts); - hardpps(tsp, ts.tv_nsec + 1000000000 * ts.tv_sec); + delta_nsec = 1000000000; + delta_nsec *= tcount; + delta_nsec /= captc->tc_frequency; + hardpps(tsp, (long)delta_nsec); } #endif From nobody Mon Feb 27 22:12: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 4PQZVc3gc6z3tDyf; Mon, 27 Feb 2023 22:12: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 4PQZVc0mVzz3Qn9; Mon, 27 Feb 2023 22:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33n5rkkzTzERa10GyYIgQskqMSCmTiMNML+Mjs4dzos=; b=Iy/wNd65MtiVpswMpngML7bvZ9QG+ANgc5Qp2kHJpwD85yUYs3NdqhdM801D/WJDWGVqRp EeMrorgWHRLMagRPoXZNXU/KaTEOA/4rPwoQhihT+ZcZAwjTQcgKbjWEWQw4D5usqsejUj Vl4QOqwHTf+8eG9xxflAyMxvHWbW53atc0q6G0x0lITkqn73oi5EKHegGwvWThKXVOetn7 Fz4z8T5Oe3p/SIRCjzhXy04XG1GFP+pQvYh0Z/+IVXGYD3/Hd+h4jKDj9meLCzyH3lzaVZ 9tfk/V+qATb4Jwbj4253LZ4tZPix8del3gmYmXyqk+2PMCvOKJxDZtQdarzO6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33n5rkkzTzERa10GyYIgQskqMSCmTiMNML+Mjs4dzos=; b=an1kngNw7hbnY7g5dLOYbpuPkQ0iY7VaOEDrycNu+vWxnWMGzIfbEtl/u0RT75BghJhgI4 gW0FS/dvxhB1cPtDdRUY5kw4AKO27kF6b4svH1WeVAzlNyeDiEcijmFSprkXc/lzY0Z6KL h4tWUezAEUuDg8n13dEp0tRjcxrcmJvtgdmxQBmxtiB1qmWor9bXwX4QKARyhUYW8iRiWe lYSNLvuzoZ4mBvJKZ8V9LcAdkipL2ZlJWE+g6EnhTEXfYe5KT1tKvFxegETS3r/aO9n28n TQEahKjV7o0vgoHOHN1SEdJbJefpMyevduqFtHc9PdXpb+ZoMh6I9mJ6eppRZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677535944; a=rsa-sha256; cv=none; b=hcj8Z5Q52dE2N+HV6KmoPCKUTSfgZ4GoBStRLmAzF7/gy/5em6MfA2GSkf89nmxHnkPRID LWnyS2553dnpCuWp1w4aM5FBlw0HjO1mL09N/ob96+eThKBjGKFh7283qbCKEoM+wkL7qI fJ+ZLXm7HNlu0khLvQedUbLkxZl0fOnMEBFsBsc9Uh77kFLTidlxSsozYu+12LVt9O49DK dqSuipyiOt1NRy3I4l34tLAwboxIF3nK3CQxcAYa7kSoiJwoBlpNLGSuPnRs1Z2qQhG3iA d8O2FB64Q2Ly5t1C4jM2gttnkmDn5egk++TWGfwkupouI0XRApzJy/SZkLu8Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQZVb6ymGzjVB; Mon, 27 Feb 2023 22:12: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 31RMCN9v028876; Mon, 27 Feb 2023 22:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMCNGU028875; Mon, 27 Feb 2023 22:12:23 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:12:23 GMT Message-Id: <202302272212.31RMCNGU028875@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: 28ed159f2669 - main - pps: Round to closest integer in pps_event() 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: 28ed159f2669b8d401ca95bf5c6e9ff06a997ef9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=28ed159f2669b8d401ca95bf5c6e9ff06a997ef9 commit 28ed159f2669b8d401ca95bf5c6e9ff06a997ef9 Author: Sebastian Huber AuthorDate: 2023-02-27 21:49:10 +0000 Commit: Warner Losh CommitDate: 2023-02-27 22:10:55 +0000 pps: Round to closest integer in pps_event() The comment above bintime2timespec() says: When converting between timestamps on parallel timescales of differing resolutions it is historical and scientific practice to round down. However, the delta_nsec value is a time difference and not a timestamp. Also the rounding errors accumulate in the frequency accumulator, see hardpps(). So, rounding to the closest integer is probably slightly better. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/604 --- sys/kern/kern_tc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 0dc233896baa..e4b3d5e80529 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1882,6 +1882,7 @@ pps_event(struct pps_state *pps, int event) #ifdef PPS_SYNC if (fhard) { uint64_t delta_nsec; + uint64_t freq; /* * Feed the NTP PLL/FLL. @@ -1893,7 +1894,8 @@ pps_event(struct pps_state *pps, int event) tcount &= captc->tc_counter_mask; delta_nsec = 1000000000; delta_nsec *= tcount; - delta_nsec /= captc->tc_frequency; + freq = captc->tc_frequency; + delta_nsec = (delta_nsec + freq / 2) / freq; hardpps(tsp, (long)delta_nsec); } #endif From nobody Mon Feb 27 22:56: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 4PQbT44WFLz3tHQN; Mon, 27 Feb 2023 22:56: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 4PQbT441TGz3sPy; Mon, 27 Feb 2023 22:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677538568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vo+pb2Ot62uvcep2WxaZAaL4iYXasHKTXpL7CfzirTM=; b=H0ghBHZwN4OXV24EuhxuhfUSPDDfUnRxKTTH0FaaYV1Bp+fwfmjQFBWhdNFJZ2sr2kCKxK D2JaTqUh0lDGZtrzMEg80F142LOa2BjpfrzgFhXMKjqnuvq0mKty9sWVpDgiBileF6g+yL va7LXhqhwQeQcBULlQ04Jym/IO9kZeqVAb180eK1ufhNmCJCVjSsTBcLU2tvCSylkE+7Fg zQUU3HP0DkkymTxqFSlXZmKAGXkjm09nrT4PwPzkQcV0RlTViem4OIHJGS2hqxcxk0ROYz uEn2PHfnJEDJscI4B6ZE7F4T5FNAQM/u4zWhz9elK5QTPMisY2LvjKRVP+dlmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677538568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vo+pb2Ot62uvcep2WxaZAaL4iYXasHKTXpL7CfzirTM=; b=Ltdkr2xBWFUVYssrpEXnuRGXVGWjYGtGGcLNjs5EoexN9p+LRhNeup7dCkN4uqrKDqNwr2 dwi7GW1BfeA8N+4NUD/aFrtTn/nyeLB04mQbvsK05XCaqmhVctNtJN6faFrsGLteMWYhdA jNT/emQBqExWZtuY1iuI0+7r7bTScGtQ8wYGB7B/aafnSjQKqdC7qUd8YkbweOnYgDkLyq fg8ICZP3XmeeK7Em38I4yEI0nJJyHEDgEaUEMJQUXxd5/eWWU2KyTBM32gg3Se+kQenkQL 4Jgpsd1LN1c+yPDQal1Cf/GdqonSTIRMR5NGqRVtN0hlhnWbNB90bB2ifWvCpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677538568; a=rsa-sha256; cv=none; b=aPYyKmsAFFeN0azpdRvACOdXG0EKyJe7lvjDP4VWr7m+mB5MF2o2Vv4FmRKCWlK5NLQZjh 1KmuQLLYOU5u7tfDEEbwB7RFFNF4VCCs6Tzp6OsF8Tw7V8KzDD93YzcZIBcfsBKghiPQpm mvDHZLOJTAA0p3RAjPBCuRn/wx/olvSfHPVEQmNoHU+/netJV6Gw7qbkOiLSyaDWIerZWb aOtkJLUZALobDtmY/Tm6c9Da4rBS7G5dWISgQwOV242VLtqaB8iYvwCKEBdy4j6ueApFup VJOqYKfETEii6TRPQzOTOs96pT08gwxoF9fYneihDHkEM0Sf1tTraA0GfcHoMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQbT435D9zklr; Mon, 27 Feb 2023 22:56: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 31RMu8eh094613; Mon, 27 Feb 2023 22:56:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMu8LD094612; Mon, 27 Feb 2023 22:56:08 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:56:08 GMT Message-Id: <202302272256.31RMu8LD094612@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: 55747938b5c4 - main - if_re: Generate an address if there is none in the EEPROM 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: 55747938b5c4c913f742fd03189f0c660ced7bef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=55747938b5c4c913f742fd03189f0c660ced7bef commit 55747938b5c4c913f742fd03189f0c660ced7bef Author: Evgeni Golov AuthorDate: 2023-02-27 22:50:56 +0000 Commit: Warner Losh CommitDate: 2023-02-27 22:51:27 +0000 if_re: Generate an address if there is none in the EEPROM There exists hardware that has no ethernet address burned into the EEPROM. Loading if_re on such a HW brings the device up with '00:00:00:00:00:00' as the address, and that doesn't get you too far in a real network. PR: 262406 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/670 Signed-off-by: Evgeni Golov Differential Revision: https://reviews.freebsd.org/D34485 --- sys/dev/re/if_re.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index aaf3860fcc48..734760898e55 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -1674,6 +1674,11 @@ re_attach(device_t dev) goto fail; } + /* If address was not found, create one based on the hostid and name. */ + if (ETHER_IS_ZERO(eaddr)) { + ether_gen_addr(ifp, (struct ether_addr *)eaddr); + } + /* * Call MI attach routine. */ From nobody Mon Feb 27 23:10: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 4PQbnM13GVz3tJ3n; Mon, 27 Feb 2023 23:10: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 4PQbnM0RpPz3v7d; Mon, 27 Feb 2023 23:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677539415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aHBFiVvL+PR0/o86KJ9KFsZdK99i4Jz1K7hyMPj92pY=; b=LoRqOe4e7pSJ+QdGN82Wq8EWyBA42TiLTzzGNfCr4FMWpZYojwi9bD8eA83bAkQDRTiBYu DlvthN2/6sJDuoMhczqYP7wQq9rtgvVp5avGvYGC5Sy0DafT4Ri6aVKIVsYdVLK5wRsEkb jzenBdtmeZcUcAfn8UNgHH2TdYHImmS/Jkp0/v0DhYwoYo2/bDKim1SqfK2j/38/tDLZmK s13eD3Hr4nX2FnYqt7kSoAzlwn5fD7vTykH3H+yiavv9FQAmqGXRnc+oZzC2EMhfTM4hjI NcRBv/bZtmHfONRLJxMfA0shkMK4vomzIggFndZEzk9dDkdKrIsJp1RzvDbUcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677539415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aHBFiVvL+PR0/o86KJ9KFsZdK99i4Jz1K7hyMPj92pY=; b=Na8WiRp5La9qsFMJ6KyeZyURD8oTdlaq4xAvhZbA2c/orZ1gCS8Y/EXWRf6va99GSwvfkA mAx0xvpD6wmFgwCLYe91tpY3K/ASlXBXNqqXSjuxX2JnuZo+veyGkMkr5VNgnRp/NBPE6H C3IYb8i2h7M0LlMWLu3o9GBLDrlImrdsGKnDO0SrjRFaaNjf19ENKeIvYky0+Ssmo6ipt4 Jiu9cQSXvCAFI+baNGolO6PaCEjG4EyLvTlNs4c27Vwhi6zcKfZ5ESf1tP89pNY6Rg+0Oe bDcJRnENvCDFplPx6Ze9GPTy6IjcEgJoGeUNGZmxtP2O3kwQVa7h2NL0PVW+8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677539415; a=rsa-sha256; cv=none; b=eY3TyC+kMjgBPkDOPCJTovtKqRhLdTkpH3hWg9g20yO/68ztzEYCZsKvQpF5AaoY1NupOi 8u+szzabvZMaBzVKpH6ahAWidf4W3mwddJkizqotCzxL52HhXhrgNYeEPZizA50cLbi42T 6x18ya06PknoJfbVxNz62i8SQf9U/38wX6FdpjiVYdA2VjqaAAPfez2GjY3iDtXHjUqzZi 83DDgB3B6VKuZjoCmSa9UBK1Lm+f40twgL3SSHYMyc1mEJYo8RfHmeeyPob1SQqmHG3sLt SwHYQExC/Tas6RU+1ya3W06SB37/ty4ezFikBWTQfPB6ijW3HkGs9ORut7M8ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQbnL6Wfxzkkl; Mon, 27 Feb 2023 23:10: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 31RNAE1Z019511; Mon, 27 Feb 2023 23:10:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RNAEmm019505; Mon, 27 Feb 2023 23:10:14 GMT (envelope-from git) Date: Mon, 27 Feb 2023 23:10:14 GMT Message-Id: <202302272310.31RNAEmm019505@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: 9630e237abcf - main - report full error string on SSL_connect() failure 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: 9630e237abcf255e3b2cff88248fb15ffaf3e778 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9630e237abcf255e3b2cff88248fb15ffaf3e778 commit 9630e237abcf255e3b2cff88248fb15ffaf3e778 Author: Vladimir Kotal AuthorDate: 2023-02-27 23:07:27 +0000 Commit: Warner Losh CommitDate: 2023-02-27 23:07:30 +0000 report full error string on SSL_connect() failure Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/575 --- usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c index caa3b5266e48..b473d642c257 100644 --- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c +++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c @@ -680,8 +680,8 @@ rpctls_connect(SSL_CTX *ctx, int s, char *certname, u_int certlen, X509 **certp) ret = SSL_connect(ssl); if (ret != 1) { rpctls_verbose_out("rpctls_connect: " - "SSL_connect failed %d\n", - ret); + "SSL_connect failed %d: %s\n", + ret, ERR_error_string(ERR_get_error(), NULL)); SSL_free(ssl); return (NULL); } From nobody Mon Feb 27 23:35: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 4PQcL46PWsz3tKj1; Mon, 27 Feb 2023 23:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQcL45cdCz3xj0; Mon, 27 Feb 2023 23:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677540908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=guVZs2zfVU+7Gt20TC/cS9ml6JNKSkK3vgL+fbKQh7k=; b=eIVUsdRUjjtUmARpaonBT8H+/8HBQAChuvrheXf1wWDW+S4RvrSsfgMVnmi8l7nPo+QfSo BgWFynzmaCW1dxtbd65/gbNYjXPyr8rofTtTwtll3/K4nuog5v3d1SZU9qo52Glgl8UVAF 3cmqGoxnXu3uharXvwKSS9FYEf5v1eovsuozM9myPKHg9QjO91ue744UkchY/3pqeEb2O3 8DTrRjjYTyZtJ/0xoZ3J+rix9iu7GijU2ZSbQFkqKuXfkMfPZS4hlM314y3h1NVKISHOpx 7g1iqniHgCdtK4+C8pteL8GzIPPnhB0hRq5kSYeenq83f3mW+EYvtO2bBbKP3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677540908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=guVZs2zfVU+7Gt20TC/cS9ml6JNKSkK3vgL+fbKQh7k=; b=FrPaqVWtWpLuCJMmDTXJRjJ/q5IH1zIzL5FxnBK7cE851VD5OYmLnLDjPePE/UrExKeP3x Ia8rxMMlkNxQpC+duHKp9X0V62rm5qi5rbR6cletIgDjLz8UB3P74XdO1NarNHUsUjXuBx 3kvidyNgpSpfZ+/EE3CHhziqWihZudUdGvQjdW1ZwAs3pKjqAIq05K2die8WKkx8mPDNHE 11jigyCZMgcVTaK++GAlo0LApwF20alGHGeI4yy4s7XCeOQYAFEU8dRpR7lBl0AEKwoiGW +1KXUEVPrkyc+5w7KJojjVKwKXctKZ5NjH90pW8OgsYfbdl4FqCQJKGzeKqDPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677540908; a=rsa-sha256; cv=none; b=JBJZUN/VN8zkQO3d4/fqK+39WAJTKJo+UaFjGv+Ty7ATVVmy87FVCbU7Mo59TZLzd88nUS 9g83eLotg4qfvcyzTRw21qIOnhdFM4ww4IsoDVbs3dLgEE/ZiubKKtntQ7pBDH3PACO/Sa jye0ulm7oIkqZpEBYo36C0hZUhoXakxQwvZJKcxiY8z8LukSpfZoAFPlP/4YNXmCFWt8ud JWFEeC2srlEodLFjhOC1DFaLCMxX4oh0OHSFSSD/97UdvlzJOeYqYE+BsKLGt8xr1zUm/w ezBoVXaLsZrqGSjI2mnlOLmFCwu8FheRlRAaI/+3Zk+QkAlz7+adzRiK/A7C/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 4PQcL44g42zlDW; Mon, 27 Feb 2023 23:35: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 31RNZ86F060097; Mon, 27 Feb 2023 23:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RNZ8UT060096; Mon, 27 Feb 2023 23:35:08 GMT (envelope-from git) Date: Mon, 27 Feb 2023 23:35:08 GMT Message-Id: <202302272335.31RNZ8UT060096@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: 68160fbd1f1f - main - stand: Minor cleanup 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: 68160fbd1f1f727173932ae6189ca7b5f7ebe68c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=68160fbd1f1f727173932ae6189ca7b5f7ebe68c commit 68160fbd1f1f727173932ae6189ca7b5f7ebe68c Author: Alfonso AuthorDate: 2023-02-27 23:19:54 +0000 Commit: Warner Losh CommitDate: 2023-02-27 23:26:49 +0000 stand: Minor cleanup Replace a cast '0' for a null pointers with NULL Replace a 'goto loop' with a do-while loop in ufs and ext2fs. Cast cp pointer to uintptr_t to test to see if it's aligned rather than long. [ minor tweaks based on my & hps' review, reworded commit message ] Reviewed by: imp, hps Pull Request: https://github.com/freebsd/freebsd-src/pull/547 --- stand/libsa/ext2fs.c | 26 ++++++++++++++------------ stand/libsa/in_cksum.c | 2 +- stand/libsa/ufs.c | 23 ++++++++++++----------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/stand/libsa/ext2fs.c b/stand/libsa/ext2fs.c index 3e91d9fd516f..043da159f0ee 100644 --- a/stand/libsa/ext2fs.c +++ b/stand/libsa/ext2fs.c @@ -796,10 +796,11 @@ ext2fs_close(struct open_file *f) struct file *fp = (struct file *)f->f_fsdata; int level; - f->f_fsdata = (void *)0; - if (fp == (struct file *)0) + if (fp == NULL) return (0); + f->f_fsdata = NULL; + for (level = 0; level < EXT2_NIADDR; level++) { if (fp->f_blk[level]) free(fp->f_blk[level]); @@ -891,16 +892,17 @@ ext2fs_readdir(struct open_file *f, struct dirent *d) /* * assume that a directory entry will not be split across blocks */ -again: - if (fp->f_seekp >= fp->f_di.di_size) - return (ENOENT); - error = buf_read_file(f, &buf, &buf_size); - if (error) - return (error); - ed = (struct ext2dirent *)buf; - fp->f_seekp += ed->d_reclen; - if (ed->d_ino == (ino_t)0) - goto again; + + do { + if (fp->f_seekp >= fp->f_di.di_size) + return (ENOENT); + error = buf_read_file(f, &buf, &buf_size); + if (error) + return (error); + ed = (struct ext2dirent *)buf; + fp->f_seekp += ed->d_reclen; + } while (ed->d_ino == (ino_t)0); + d->d_type = EXTFTODT(ed->d_type); strncpy(d->d_name, ed->d_name, ed->d_namlen); d->d_name[ed->d_namlen] = '\0'; diff --git a/stand/libsa/in_cksum.c b/stand/libsa/in_cksum.c index 2f8c448fc0eb..590a304271d0 100644 --- a/stand/libsa/in_cksum.c +++ b/stand/libsa/in_cksum.c @@ -61,7 +61,7 @@ in_cksum(void *p, int len) sum += v + *cp++; len--; } - if (((long)cp & 1) == 0) { + if (((uintptr_t)cp & 1) == 0) { while ((len -= 2) >= 0) { sum += *(u_short *)cp; cp += 2; diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index 769fe9120ee6..cb4c7ca6453c 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -409,7 +409,7 @@ buf_read_file(struct open_file *f, char **buf_p, size_t *size_p) block_size = sblksize(fs, DIP(fp, di_size), file_block); if (file_block != fp->f_buf_blkno) { - if (fp->f_buf == (char *)0) + if (fp->f_buf == NULL) fp->f_buf = malloc(fs->fs_bsize); rc = block_map(f, file_block, &disk_block); @@ -888,16 +888,17 @@ ufs_readdir(struct open_file *f, struct dirent *d) /* * assume that a directory entry will not be split across blocks */ -again: - if (fp->f_seekp >= DIP(fp, di_size)) - return (ENOENT); - error = buf_read_file(f, &buf, &buf_size); - if (error) - return (error); - dp = (struct direct *)buf; - fp->f_seekp += dp->d_reclen; - if (dp->d_ino == (ino_t)0) - goto again; + + do { + if (fp->f_seekp >= DIP(fp, di_size)) + return (ENOENT); + error = buf_read_file(f, &buf, &buf_size); + if (error) + return (error); + dp = (struct direct *)buf; + fp->f_seekp += dp->d_reclen; + } while (dp->d_ino == (ino_t)0); + d->d_type = dp->d_type; strcpy(d->d_name, dp->d_name); return (0); From nobody Mon Feb 27 23:51: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 4PQchr6pFZz3tb3T for ; Mon, 27 Feb 2023 23:51:24 +0000 (UTC) (envelope-from pstef@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQchr5gdZz42k1; Mon, 27 Feb 2023 23:51:24 +0000 (UTC) (envelope-from pstef@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677541884; 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=EVN9BzaP5i2WtaBUTq/J3HNO9hq4xG4M9Jw+yOHKIDA=; b=FL6PeObwhaTQUX3dL058ESXFuUkzhWgZ5Cwq3Kze5YwGI1Z9DUZ2r3b8eIo3tuRuvTd/6K Vgnnbq1Xn1OcHjilCUlRIXyWoSS4bNjykoSZeisl+Vm3oRyR6Pra/BIaMHF9qCynfEWaln Nsr6QUz+1BcoywaVGOCH1N+gUhoDOtdJpdcMYKFug2pybIgkyqtcBRssvO+cVFiMpcVbCw d+xJ6rnPl4ZkuRUXocLrHOKuiIwalP5t6Xo4vvTRLG91r51iEkSy8MahFKnawBO43mpWpF r5j+zMxYnZ0rNeYKizf+P+9SH9fzwgnNskfB8seGv8A94NCWJR/f/2HWVMiKdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677541884; 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=EVN9BzaP5i2WtaBUTq/J3HNO9hq4xG4M9Jw+yOHKIDA=; b=p16yaxr6RttC7jco4Er/RgMf4OUNGCOZ2rZg/IV57xnSfiL75LtI3B5LDbUm4BrSe6qjHG +mxFjiFiBJMR7zJqdm7egwKEGW7YHubb6JLABurs22jWslk7GieL7iyuyGBQmRU00NPbwy eOsY8MJA9q/gx0ykp0vQhj0YA6rQ/62ZEAdhUgYM7H7/H11YmDRbHKbN8kZhGoUN8wzN7A gtRRZRLEJSbGFmC9k+TzZad0JRLbwZm6awWTtuZwz5a+7Sww0AqxGCzA9Wq56j4dbbm05q OxPzdUDFpfCnB5h/UZ+WGoZY3nASM4YaKQF3TDcv1FBosyFVDbJ1dDACpLAf2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677541884; a=rsa-sha256; cv=none; b=PKTPkssF1uE35hDgt23ZKDHw6LoNAOYZ4RPvpvZPTlpgNhKFInByyVd9V6ZxQw4xcpxcxp Vp2Bcm7z8IKYhwnriyfWkYSlRylExLLqL5vJqseRyKKSOqRMt3NmWnSPVafX6taU2qEDH1 h5dlmAkONg4YNC561MANKMimmWY0B9jEQRttXmES37Nq97vuz/kDv1Cdj6OEZ8uICRRAUO TnaZgIGe4ut8hu7p2/ZWcPxfnfXCTzsWEX3rIHmfAUKJuWFLoJyiovdNebLRMLSXZh3cL2 fmpniS23ep9DW2wXKc7D+tQQOzXpLtztffEmNzzzB4p1Z1T3ogOueQaN3eZdPQ== Received: by freefall.freebsd.org (Postfix, from userid 1403) id A9A8C57CC; Mon, 27 Feb 2023 23:51:24 +0000 (UTC) Date: Mon, 27 Feb 2023 23:51:24 +0000 From: "Piotr P. Stefaniak" To: Xin LI Cc: dev-commits-src-main@freebsd.org Subject: Re: git: 39e8c2a29a86 - main - cleanvar: Be more careful when cleaning up /var. Message-ID: References: <202302130457.31D4v8Hh067792@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; format=flowed Content-Disposition: inline In-Reply-To: <202302130457.31D4v8Hh067792@gitrepo.freebsd.org> X-ThisMailContainsUnwantedMimeParts: N On 2023-02-13 04:57:08, Xin LI wrote: > cleanvar: Be more careful when cleaning up /var. > > The cleanvar script uses find -delete to remove stale files under /var, > which could lead to unwanted removal of files in some unusual scenarios. > For example, when a mounted fdescfs(5) is present under /var/run/samba/fd, > find(1) could descend into a directory that is out of /var/run and remove > files that should not be removed. > > To mitigate this, modify the script to use find -x, which restricts the > find scope to one file system only instead of descending into mounted > file systems. >@@ -31,15 +31,15 @@ cleanvar_start() > { > if [ -d /var/run -a ! -f /var/run/clean_var ]; then > # Skip over logging sockets >- find /var/run \( -type f -or -type s ! -name log -and ! -name logpriv \) -delete >+ find -x /var/run \( -type f -or -type s ! -name log -and ! -name logpriv \) -delete > >/var/run/clean_var > fi Do we want to assume that /var/run is never a symlink? If not, we probably want to use find -xH here. Piotr From nobody Mon Feb 27 23:58: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 4PQcrn2hS8z3tbLr; Mon, 27 Feb 2023 23:58: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 4PQcrn2B8kz42jV; Mon, 27 Feb 2023 23:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677542297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xK4reU/7sEXCv6nNeCvMNTO1rrEoVx3NXk9m/Xgo1CM=; b=Le2SYJPcm15e/8N+FtL62J5cLKItCYkVuI399TkYHxHIaURY5GcxdKO2fUUqEWmYs1hM2f fNWfH+Jygg2HedAHxV7rMZxa+dLkB0XhtLb3fQBl/yBXMLqe5gf/eaJByCx8HIRdhIhP+K 2Q1lCNIXdu5zePfHFFvh76D5j0Yjht1v4pJdVG+JTCrYZkp5osSNKSbBCPYL6AdDp77NIh yzpHpTs8twrQ0/aKD7WzZjO1pA8V+l1c7SSgMC/CqMhSAhbwD5+2LX2OHYEyAPAoX+tuR5 ObMQL1ElQDY3wpCBn2cxwzWCo6DI1qQL5gqoCqoUptBIsm6RmVbOT734zZtl2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677542297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xK4reU/7sEXCv6nNeCvMNTO1rrEoVx3NXk9m/Xgo1CM=; b=EFTME3bTE0PI/O0IP6ykYDj324WnQsrbOBVdszNLMRoMLiRVvWbmXn85ZpIY+tUuZY4emp Ux/Xin3S4UqhHGXlbnpIQrPnLMpzC5Nnvf5MVlUNPiyz+l7cD2rPIr+XcMlBy7NOgKVVxn wSQiZNC2zeqCbR6XEAGDT1eFoWiaQwLxsb5xkE2dV75MmuYBrpeP1s/W5KcpnJIdBj+VY9 yR0Xm7dtJW4nnjpCqZcV9PnLTFgACxWPQWv//tcgbhakRtKSiHF6NytD/Pz5tq4rcZn0Ei E1eLEf/B0BSKTwqo/99rJY4hjVB972iScaiAhbOZe+1n91WP0ZPrfwP/AD7+kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677542297; a=rsa-sha256; cv=none; b=MX0S6+JRlZc5Z9s6A4etXLsDuY8cSu9ZscxKTqdZPLG9f45Jqp2T/TifkRkixg0qYtCjkc TalfKIg0UKy7h7hubSP4sGRBqrWwQMttm5ZKEi71L5EUKS0t5QsyCYqcj01mGY6rTXHyuk hlWzxdaox59MZvbQ5RWB/6LiBHY022GhityahyuY0vj+5vABT5kWSCHUKquuf08j/xGq65 tAItR+5oBv9/nOL8ZjMSYTn9c2udFtuTe2FzIk/yY8wo/TkCMySb49RkAiUifHYQBzJnLE 7wSTTOsAljnPT5A9CMcjMvhwDWB6O9+Pd6Dj0jYL8+WCud9aFXLbl261sAFTuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQcrn1FZCzlRq; Mon, 27 Feb 2023 23:58: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 31RNwHam093123; Mon, 27 Feb 2023 23:58:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RNwHfm093122; Mon, 27 Feb 2023 23:58:17 GMT (envelope-from git) Date: Mon, 27 Feb 2023 23:58:17 GMT Message-Id: <202302272358.31RNwHfm093122@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: 81ef45eda46b - main - CONTRIBUTING.md: Add in for github pull requests 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: 81ef45eda46b5c3f724c76ec8ace99757cad07fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=81ef45eda46b5c3f724c76ec8ace99757cad07fb commit 81ef45eda46b5c3f724c76ec8ace99757cad07fb Author: Warner Losh AuthorDate: 2023-02-25 15:24:00 +0000 Commit: Warner Losh CommitDate: 2023-02-27 23:58:05 +0000 CONTRIBUTING.md: Add in for github pull requests Create a slightly longer version of the inforamtion available in the handbook in the file that Github displays for more information about contributing. Sponsored by: Netflix --- CONTRIBUTING.md | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000000..45f058dfd1d3 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,110 @@ +# Contribution Guidelines for GitHub + +## General Contributions to FreeBSD + +Please read the guidelines in [Contributing to FreeBSD](https://docs.freebsd.org/en/articles/contributing/) +for all the ways you can contribute to the project, how the project is organized, +how to build different parts of the project, etc. The +[developer's handbook](https://docs.freebsd.org/en/books/developers-handbook/) +is another useful resource. + +## GitHub Pull Requests + +Presently, GitHub 'freebsd-src' repository is one of the publish-only services +for the FreeBSD 'src' repository the project uses to promote collaboration and +contribution. Pull requests that need little developer time, are generally +small, and have limited scope should be submitted. Do not submit pull request +that are a problem reports, works in progress, changes that are controversial +and need discussion, changes require specialize review, or are security related. + +A pull request will be considered if: + +* It is ready or nearly ready to be committed. A committer should be able to land the pull request with less than 10 minutes of additional work. +* It passes all the GitHub CI jobs. +* You can respond to feedback quickly. +* It touches fewer than about 10 files and the changes are less than about 200 lines. Changes larger than this may be OK, or you may be asked to submit multiple pull requests of a more manageable size. +* Each logical change is a separate commit within the pull request. Commit messages for each change should follow the [commit log message guide](https://docs.freebsd.org/en/articles/committers-guide/#commit-log-message). +* All commits have your name and valid email address as you would like to see them in the FreeBSD repository as the author. Fake github.com addresses cannot be used. +* The scope of the pull request should not change during review. If the review suggests changes that expand the scope, please create an independent pull request. +* Fixup commits should be squashed with the commit they are fixing. Each commit in your branch should be suitable for FreeBSD's repository. +* Commits should include one or more `Signed-off-by:` lines with full name and email address certifying https://developercertificate.org/[Developer Certificate of Origin]. +* The commits follow FreeBSD's style guide. See [Style](#Style). +* The commits should not introduce trailing white space. + +When updating your pull request, please rebase with a forced push rather than a +merge commit. + +More complex changes may be submitted as pull requests, but they may be closed +if they are too large, too unwieldy, become inactive, need further discussion in +the community, or need extensive revision. Please avoid creating large, +wide-ranging cleanup patches: they are too large and lack the focus needed for a +good review. Misdirected patches may be redirected to a more appropriate forum +for the patch to be resolved. + +Please make sure that your submissions compile and work before submitting. If +you need feedback, a pull request might not be the right place (it may just be +summarily closed if there are too many obvious mistakes). + +If you want to cleanup style or older coding conventions in preparation for some +other commit, please go ahead and prepare those patches. However, please avoid just +cleaning up to make it cleaner, unless there's a clear advantage to doing +so. While the project strives to have a uniform coding style, our style offers a +range of choices making some 'cleanups' ambiguous at best. Also, some files have +their own consistent style that deviates from style(9). Style changes take +volunteer time to process, but that time can be quite limited, so please be +respectful. + +The current theory for pull requests on GitHub is to facilitate inclusion in the +project. The guidelines are streamlined for quick decisions about each pull +request. Unless explicitly stated, rejection here as "not ready" or "too large" +does not mean the project is uninterested in the work, it just means the +submission does not meet the limited scope for pull requests accepted +here. Sometimes it is easier to review a GihHub pull request than to do the +review in Phabricator, so that's also allowed. + +## Style + +Avoid adding trailing newlines and whitespace. These slow down the integration +process and are a distraction. `git diff` will highlight them in red, as will +the Files Changed tab in the pull request. + +For C programs, see [style(9)](https://man.freebsd.org/cgi/man.cgi?query=style&sektion=9) +for details. You can use [Clang format](https://clang.llvm.org/docs/ClangFormat.html) +with the top level .clang-format file if you are unsure. The +[git clang-format](https://github.com/llvm-mirror/clang/blob/master/tools/clang-format/git-clang-format) +command can help minimize churn by only formatting the areas nearby the changes. While +not perfect, using these tools will maximize your chances of not having style +comments on your pull requests. + +For Makefiles changes, see +[style.Makefile(5)](https://man.freebsd.org/cgi/man.cgi?query=style.Makefile&sektion=5) +for details. FreeBSD's base system uses the in-tree make, not GNU Make, so +[make(1)](https://man.freebsd.org/cgi/man.cgi?query=make&sektion=1) is another useful +resource. + +The project uses mdoc for all its man pages. Changes should pass `mandoc -Tlint` and igor (install the latter with `pkg install igor`). +Please be sure to observe the one-sentence-per-line rule so manual pages properly render. Any semantic changes to the manual pages should bump the date. +[style.mdoc(5)](https://man.freebsd.org/cgi/man.cgi?query=style.mdoc&sektion=5) has the all details. + +For [Lua](https://www.lua.org), please see +[style.lua(9)](https://man.freebsd.org/cgi/man.cgi?query=style.lua&sektion=9) +for details. Lua is used for the boot loader and a few scripts in the base system. + +For shell scripts, avoid using bash. The system shell (/bin/sh) is preferred. +Shell scripts in the base system cannot use bash or bash extensions +not present in FreeBSD's [shell](https://man.freebsd.org/cgi/man.cgi?query=sh&sektion=1). + +## Signed-off-by + +Other projects use Signed-off-by to create a paper trail for contributions they +receive. The Developer Certificate of Origin is an attestation that the person +making the contribution can do it under the current license of the file. Other +projects that have 'delegated' hierarchies also use it when maintainers +integrate these patches and submit them upstream. + +Right now, pull requests on GitHub are an experimental feature. We strongly +suggest that people add this line. It creates a paper trail for infrequent +contributors. Also, developers that are landing a pull request will use a +Signed-off-by line to set the author for the commit. + +These lines are easy to add with `git commit -s`. From nobody Tue Feb 28 00:20: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 4PQdLY6l40z3tcln; Tue, 28 Feb 2023 00:20: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 4PQdLY6Jm9z45sB; Tue, 28 Feb 2023 00:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677543637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IVtVYNUWPdBjQtCLVUaRA4Iyhm8vVTkcAtG4t5V6Wq0=; b=kZYCQ8hiNdA9l8YiQGXy+rseTXSRDY2qvcE7/QXhG7A8F7LIQ76h6uKv4Mlqp3aPiaOrR+ FyAq70Xv6PWdz9I3l+2Ei+8ycr8kYPOe55zgdJfItfj35cOrRI+IROopcJ0hOPFs584xaC sUIdNfPFAGZb/8IowB5zt7riq2CQxQW3xPerh0XUEkj2hw+MjQm/L0Fvl710kW3i3hNxSA y5FrD2btVMgsVYWQxSBC2sJnI5Ln8UixEJwNeAFatSo9PDIO6oMYCHg6xB5k1R6vfd00/O mS+Ik2ha0R1KETtDGHWntHkp6Uv6e7I5Iof2XF0rJy5Vz47EeSdytjvi21QATw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677543637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IVtVYNUWPdBjQtCLVUaRA4Iyhm8vVTkcAtG4t5V6Wq0=; b=eUtqaymaO3kCT0pp5kkrvpchWeURpC23B7ET0oDEj9gwVigzTSmaYW7i/XgMUmUpewOErv ugnfRBP0cTdcQ7dPIqYfw6S6bg7+D12g1+Vo2JUcRDKiJnIze44yNfIUSaDXnpVglICgtn 9tjbaiaPi5QHjp5XSJ5V32tE94v21LjOTvrARuMahOPsQiJhY3MYdUnIUXpqyvLKXBhvtN hR57u9NqSQcoLnLksTvsviyunk1R2bdPq3AOR55rIUCK2Uq869AqevrKstPTgmWEwUTPgb k889GJ3ojRWTblts/OnTZ980e9sf2/o6sanId/I5FoFv21btSK9FbPVQVbi/dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677543637; a=rsa-sha256; cv=none; b=W4hoIUqZDU80dTQpJdiqzThspsaotHHxyxcy1clf0WRbW1aHYTccH1hsZkXB2W6ce5RDoD nlJLgc4IwDsGD38ya6WdUiWuw9jgogJr5W9p14bG/H9HONAhAfzQ3S1871PbW7kOCJukKz FEq7fbStB7xIUjN0FlP4qbUnqMI/m7p5nSZFzZZS3k89DAEYIPL0kqkKM43S5KKEK6tlA1 QzjidLTyGb9LZcxIMiOl8HvQ6ZFIEkcafxi9d9SuKfBL2wMNncsa4eC1/6aMG5o+q5E25W 2Bw3DhTBcYbDMHz38gxeND2EPeh+ST7dMl2/XbbqSjnX2hi0W9avUqvaG148LQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQdLY5NCbzmLn; Tue, 28 Feb 2023 00:20: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 31S0KbKj035770; Tue, 28 Feb 2023 00:20:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S0KbfB035769; Tue, 28 Feb 2023 00:20:37 GMT (envelope-from git) Date: Tue, 28 Feb 2023 00:20:37 GMT Message-Id: <202302280020.31S0KbfB035769@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: 873c13f9f7f0 - main - CONTRIBUTING.md: Suggest PR and Differential Revision lines 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: 873c13f9f7f0145644ba78de38ed403f0a2005df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=873c13f9f7f0145644ba78de38ed403f0a2005df commit 873c13f9f7f0145644ba78de38ed403f0a2005df Author: Warner Losh AuthorDate: 2023-02-28 00:19:25 +0000 Commit: Warner Losh CommitDate: 2023-02-28 00:19:25 +0000 CONTRIBUTING.md: Suggest PR and Differential Revision lines When there's an open PR and/or a Differential Revision, people evaluating the pull request will want to look at them. Suggest that the submitter include this information to make it easier to process. Sponsored by: Netflix --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 45f058dfd1d3..f5ae3e8fccc9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,6 +30,8 @@ A pull request will be considered if: * Commits should include one or more `Signed-off-by:` lines with full name and email address certifying https://developercertificate.org/[Developer Certificate of Origin]. * The commits follow FreeBSD's style guide. See [Style](#Style). * The commits should not introduce trailing white space. +* If the commmit fixes a bug, please add 'PR: ' to the comment message. +* If there's a code review in phabricator, please include a link as a 'Differential Revision: ' line. When updating your pull request, please rebase with a forced push rather than a merge commit. From nobody Tue Feb 28 02:37: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 4PQhNR0nfwz3tmm6; Tue, 28 Feb 2023 02:37: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 4PQhNR0Kh0z4MNM; Tue, 28 Feb 2023 02:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677551847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LV8IYqXgGuADOcFK5a1Djt72QgbuiydhAijzjg5xlnE=; b=p9/14glA2SpRTxvXn3ci0sAR1VvtCsPbFYhx8fB/Q8MYx0xMWUDH1fT7nuS11xqw5zVGZv xs3WQZ81ZCf2R6j40N8oyIB7PU0Q//9P3UpcrzV9TPulgrNoi43Qh/MFc7ClxQnoVE2lwz xq8LxQ81G6TucJoDBDEFewgxjXjFDeWL7NnbPl0RUAouA31ew3pg+GMc3pNmTCpQcjzN4/ n8cTEXr5O4uhk9YB6H/9X7rlSubG7TKCiyhOjMn9Hyi+9N6u4mXi255xS7OdaIxzii/diO Aq6wig9mrm5X/sLh8OXWq88OlImcnZOeQKQx88TvtJ+BqjLt8K7GomLMXwrEWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677551847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LV8IYqXgGuADOcFK5a1Djt72QgbuiydhAijzjg5xlnE=; b=MdDrZKNRmbJqNCGyDH4tUI3wNdav9CX/mXEhyMJxYX7YtEzyisXD/6gGSlewe+1OIZ2Cgc 9qMNgqzjBsZTVlPObXheZVMzgqHH6+OUa6flWjRhxAqIdWvqzX2xHSdKU8Rp3hnxa/JgwH Ngech/slobsTXxtQjAONHn8XUMBOV2QDXoMZgobeCIXqeBMKztRqcDqj+WttO2AmoJMsy3 yvb+c34vwvb8r1laxL3a9h6qm6lcfZUYeEoIX69R4bgOuwdEf5riqvX0VN3oHC6K3rykzx XnM0QEbAR/Nygdix3fRGhhqTBEGlU2riuw2gPdSzMAcZMpW9BhupcZYBdZ17vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677551847; a=rsa-sha256; cv=none; b=ajUJxXkg2w/IqHJuQYI4JueIr1uLKimMtICVA6S5AqkPMtPxCc8YaFq1wmyLNIBd963yl4 fk6R8Y1ZdSZ9Ql+UiwJXXuYxPaH4sbM0ZiSgTfHXfTfFnUgu90ooN+Gg5/b6B2SpAVK0e0 sr413i0+b1Aklm0AjUaQC657n+CfIcr4jvtY5BgH5iB7T8bYwOLasGkWVZhEC9Kit5OzsQ mMqqFUP3NZax+8sLw8oRiG4dH7+ddt4Kraab6rPj44NXv0a257L1lUdbzTCIAAqtQWEBo7 k4cXfAHefo19at9VgaLAZYuyVS8gSYU5aY3J1PhbqI5pxm+5qOZ7i1Nti62LwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQhNQ6NRpzqNY; Tue, 28 Feb 2023 02:37: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 31S2bQPP056791; Tue, 28 Feb 2023 02:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S2bQ1F056790; Tue, 28 Feb 2023 02:37:26 GMT (envelope-from git) Date: Tue, 28 Feb 2023 02:37:26 GMT Message-Id: <202302280237.31S2bQ1F056790@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: 05e2e803ebe8 - main - CONTRIBUTING.md: correct developer certificate of origin link markup 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: 05e2e803ebe8e791754bae6333e70e096bde47e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=05e2e803ebe8e791754bae6333e70e096bde47e7 commit 05e2e803ebe8e791754bae6333e70e096bde47e7 Author: Ed Maste AuthorDate: 2023-02-28 02:34:49 +0000 Commit: Ed Maste CommitDate: 2023-02-28 02:36:29 +0000 CONTRIBUTING.md: correct developer certificate of origin link markup Sponsored by: The FreeBSD Foundation --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f5ae3e8fccc9..ad221be66afc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ A pull request will be considered if: * All commits have your name and valid email address as you would like to see them in the FreeBSD repository as the author. Fake github.com addresses cannot be used. * The scope of the pull request should not change during review. If the review suggests changes that expand the scope, please create an independent pull request. * Fixup commits should be squashed with the commit they are fixing. Each commit in your branch should be suitable for FreeBSD's repository. -* Commits should include one or more `Signed-off-by:` lines with full name and email address certifying https://developercertificate.org/[Developer Certificate of Origin]. +* Commits should include one or more `Signed-off-by:` lines with full name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). * The commits follow FreeBSD's style guide. See [Style](#Style). * The commits should not introduce trailing white space. * If the commmit fixes a bug, please add 'PR: ' to the comment message. From nobody Tue Feb 28 06: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 4PQnBR5xP4z3v2M8 for ; Tue, 28 Feb 2023 06:14:07 +0000 (UTC) (envelope-from delphij@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 4PQnBR5SLMz3Fdd; Tue, 28 Feb 2023 06:14:07 +0000 (UTC) (envelope-from delphij@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677564847; 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=zAcph2860fJcvNhS01orJIB2JOQGtwEx0dKV5fRHJq0=; b=HO+3DP6YJQhgt39TQyOhQVq2YYV//4jJM7NQRx0UbLucTf/+RKITJewyrxfAJRUJoKyINf yPvATO2cXf3IgvO3+tAWkuRL3M36wg6Sm0RyDpBYjfAaOzxBM0MktVXNQEbOIvT8MAM0qf erDkmoVtV/Jw2e/VZYjmEZSnGvwNACvOijyftfqtFVr5rw5wpmKF4bluC3QwLLweWpTe/s p70BJdwjckjWs+VItRfgmVoO4NqTXu1luy3Or3fYQ3lKIJugrsIoSQNBXH7948gc7P/PxZ 0C5NDfqa1Ta+3wCIEkWCFZBVsRwkKVSJHnsBKDmhSX9TDYielM8oG8Zyo2l1qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677564847; 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=zAcph2860fJcvNhS01orJIB2JOQGtwEx0dKV5fRHJq0=; b=AVJH4T+yyoAhNqwc5TrrS6knDgrU68CKaSuG2x70Ptlt1QiD2g4A5kNQrdWzF0vo9aFlkc bF6fMyLmI9fG4/sXgzML3GRs9YxZtImP1x5ZwbMoVVISkQCtqtSayBJJWTdxPeTRmrO7ZO fgI9R4SihQhQaifpHIxEsDlv7XPYautncL1fflq2Jl4uv6w/l4yEh2Tri8CuJMlaW8kU9K cguozhUPvMkts/dlNRBqeiIuxzCVPdNjlZLnyxVL6j1vN4gaFYMH9u3+LcISEmmOuIJ64t w0Q77IWK6uBUU4gdiU1/AFuw0VLItinDc1RUnDryf9+z36B5m9TrdLL1APkXvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677564847; a=rsa-sha256; cv=none; b=H9VXeUSBSfpJWsio29JSPldWwz0Me+IS7jhhtJUfeeKYWmhJeJo+5qTiwEKgxOa9ITegTa jmmoLI5NgTLRiFpn5rkK/8rqcm+OBiAVdK+Ct4EhrB4c6CFDLWWWWMDO9VHWkBGQdoRX/0 +IAOj6t0FVHUK0cWdz7SD4/7jwodiY0xVjk7YQXCXKNYn6f73RqUaAq5BoS2S8ewpdb5UY dWoVw+VHJa3ubeax7LanLb6q4TLDdrRevlcLo8l/DZiMkKiDgLfQ33JITrRkY9K1RGkRgg NVI2Mf/QbBNUrN0d/PpK24LmhVoi0EawkaM2FXEQSA/AAaZCWfPO7OmOIMvjbQ== Received: from odin.corp.delphij.net (c-141-193-140-175.rev.sailinternet.net [141.193.140.175]) (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: delphij/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PQnBR2PGvzQ8f; Tue, 28 Feb 2023 06:14:07 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Message-ID: Date: Mon, 27 Feb 2023 22:14:04 -0800 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: Thunderbird Subject: Re: git: 39e8c2a29a86 - main - cleanvar: Be more careful when cleaning up /var. Content-Language: en-US To: "Piotr P. Stefaniak" Cc: dev-commits-src-main@freebsd.org References: <202302130457.31D4v8Hh067792@gitrepo.freebsd.org> From: Xin Li Organization: The FreeBSD Project In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 2023-02-27 3:51 PM, Piotr P. Stefaniak wrote: > On 2023-02-13 04:57:08, Xin LI wrote: >>    cleanvar: Be more careful when cleaning up /var. >> >>    The cleanvar script uses find -delete to remove stale files under >> /var, >>    which could lead to unwanted removal of files in some unusual >> scenarios. >>    For example, when a mounted fdescfs(5) is present under >> /var/run/samba/fd, >>    find(1) could descend into a directory that is out of /var/run and >> remove >>    files that should not be removed. >> >>    To mitigate this, modify the script to use find -x, which restricts >> the >>    find scope to one file system only instead of descending into mounted >>    file systems. > >> @@ -31,15 +31,15 @@ cleanvar_start() >> { >>     if [ -d /var/run -a ! -f /var/run/clean_var ]; then >>         # Skip over logging sockets >> -        find /var/run \( -type f -or -type s ! -name log -and ! -name >> logpriv \) -delete >> +        find -x /var/run \( -type f -or -type s ! -name log -and ! >> -name logpriv \) -delete >>         >/var/run/clean_var >>     fi > > Do we want to assume that /var/run is never a symlink? If not, we > probably want to use find -xH here. No, I don't think it's safe to follow symlinks. If it's desirable to follow /var/run itself, perhaps this should be changed to "/var/run/". From nobody Tue Feb 28 08:16: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 4PQqv641pwz3v8mZ for ; Tue, 28 Feb 2023 08:16:02 +0000 (UTC) (envelope-from pstef@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQqv63V56z3NVx; Tue, 28 Feb 2023 08:16:02 +0000 (UTC) (envelope-from pstef@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677572162; 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=5XsffHlLSREJsHofYZaNA0zlo4wwKPBxkzrhdDikg54=; b=jbEcMjjeQXoXVb7v3D1vVhHJLwppnCQYktzvn795SSPMIRpM6YZjp9Q1f/y3ZDVpBWHjJ6 8lMldWeP7o3c4mlYU3dp1o/OsCSxHZy7DGXhQbNuBIqxSZDNLuCBVWcM55NU0TP+p54BXE 7KmTz5taTtiSflkFN2KFb0GxOpMQb5b3gEiWu3F9HnpRFsty60TdU7TQ8TeJC0yPo21sS/ k6XlgWZd29QVcWD2L1PW8ugNJuoYJxpl6RzVr3WzXpFQj7GZkXh9Gs6wEkIF7lo4QdGaeL mc5JNa4BWgzfzhshqC9taDAUlbEKscRWsjbLgs6UzZMPQVzdPzR/4rCydn0crA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677572162; 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=5XsffHlLSREJsHofYZaNA0zlo4wwKPBxkzrhdDikg54=; b=MKqCVARUP/S7FP6XojCGtMM8LSXyTb5nkwv4cnYfd14Qa7dgpNYgaumxOiRWd5Nll9OBp/ 7eZ8Ef4jmjK2NNkPljcvcg1bYDrKlKGyeGHNhhtyI1ZxHr0mU8ebB9H9m+/qc/6hb1/YMN N0Yz2+J3//6ZAWSc4ZgSMgED0+wBCGcNccWdSJKVtkdn3gx4I4rgOGMYEddYAxu+FzKCrN kxbbF+IITWbX8NXGdcN5Jj3iO4KfyHRWmc9AupZX8IjRW8GhXh/J+ozkFHX/CFQisxCBLV i1l32kgLioJhzQwal3WZjPHAzh30aMhV4tSPe6yQUJBeyz+ojtyJJrgWxxn0eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677572162; a=rsa-sha256; cv=none; b=R6Yx+yIUC0mVcOulTNW4haLHztQ9bA7IQMQ7JRPpjyYs1oToC3EahaewFaI7hEM0Gu2KO+ 2FisQi3a7BUCsQozK5P5wvyRgBCuCpDj7x3FtkieoqyAlOZj1NfBa0PnWwfDbXi1kj7NEM ZveL/4YMCrPS5+QVnN6M5zmrrzmjsrUiq4SHdULaGYdnINwKz/aUpt/ybimEPMKTY0q4DN REXCzbPvqcDnKd+DKZbCfq8Zdgjxoc0J+hq37efeY3U1pyJfCcVJoN7/xJaaz4Huo/yEI0 X8ngyWARCZX/F/r+8/jTDp14FUG/a63r6K+mmUhihLJQJkJdGQfUW3H/XIFHaw== Received: by freefall.freebsd.org (Postfix, from userid 1403) id 561356870; Tue, 28 Feb 2023 08:16:02 +0000 (UTC) Date: Tue, 28 Feb 2023 08:16:02 +0000 From: "Piotr P. Stefaniak" To: Xin Li Cc: dev-commits-src-main@freebsd.org Subject: Re: git: 39e8c2a29a86 - main - cleanvar: Be more careful when cleaning up /var. Message-ID: References: <202302130457.31D4v8Hh067792@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; format=flowed Content-Disposition: inline In-Reply-To: X-ThisMailContainsUnwantedMimeParts: N On 2023-02-27 22:14:04, Xin Li wrote: >On 2023-02-27 3:51 PM, Piotr P. Stefaniak wrote: >> Do we want to assume that /var/run is never a symlink? If not, we >> probably want to use find -xH here. > >No, I don't think it's safe to follow symlinks. I'd like to stress that my suggestion was to add -H, not -L. >If it's desirable to follow /var/run itself, perhaps this should be >changed to "/var/run/". It seems to me that that would effectively do the same, at least in this case. Piotr From nobody Tue Feb 28 08:49: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 4PQrdV6XGpz3vBSG; Tue, 28 Feb 2023 08:49: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 4PQrdV5yWPz3kF4; Tue, 28 Feb 2023 08:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677574158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ACO1BbCSSxHUfDYEg70V9Jk9EycH0m5X+9R2tP4C87U=; b=O4z3cglbxR3mv98low0sNWwBpeX+sFVPhqBmCHL3Eq2ka6k1ZsvVMHH483xaHKsN1gkM7x 4Qmxrh1E+jpkkkHKuwfWJdYCaKea/5tuMkuvk9x98PyCMt1NSApAG+WTDUvDrGugCjTzYL lSYQY4F0DaQD46iiD6PEpD7+M32v81sJ3t5B89Of2F6nYtAlphwyp44oOLvruqamBXssbo 8dP7FPD/MeMltTpDYjRhRvhlfpJw2GtGHbDsKpu1yGUUBPyauwKfzrmYBLehkSWu6qCwp7 MulNI7C7Mc2VzImf3vktr/C2YypbKR2PY+QzGq/unwbr5qct4hVQnKCRps91uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677574158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ACO1BbCSSxHUfDYEg70V9Jk9EycH0m5X+9R2tP4C87U=; b=yLols2Nn4dm8N69CcKXh/ziYnfYuDzsdDsoKyF+aNulDAt520xOIpZ+x1Z1c6peu6QhUyj RAtYBuEJlnx7hONr1uW9ywwHRLRD4yzmkY7bcM4bsF/uTsKcJ7nDlTWLBm+M2VzeY/IPBB 1m2c8OzodzqntHndx8p9OX1hLOdoD6YkCKSIyEl9qi0+F16iwe3Y334EmRzLWyKu7bDgW/ ke9DwtRfykOQMnxmQRGW9j4O1I6hHvHVjNnqev3fgI/jdSqeV6vx5qjJp1nbXr7yHftJeI JfZF75arPXQUl1wJkvQR0KwG2/khmxctUDWLGdbYY+E/fLDoLqAyqJ4/7SW39g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677574158; a=rsa-sha256; cv=none; b=DhQC3VXodNi/72f5Yy+oh4qIIH5I6/Led7wrk8LvBAMtxZB9RjDEjGiXLjUHXxRQ6LSPCG /srvNZKVGdc7kcSR/ykIoFzR6a7PtI5ag+p4Nh28MB5Pasty+cAnZ1B4dWHlaLhKZXoe0Q 1Ma5/dR3q/Q6bszXgnxB5cfJLoSua6jjDDkFH/L1DHxEa6rJoABIOar2NsxAMqY5gt5P3h S1A2iPGKAWqiUoIZe6xCS6S0rSZSa9XRFmGCLABd7r7wZy+5yPwthGHNEQ4VoXJxSIHPPT YJkqs3BsKWYhd2mJqiXohD7KA894Ft3fg/KZQN0sJlZ5qEiS0ccAK0kVc0NCng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQrdV53tVz11VV; Tue, 28 Feb 2023 08:49: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 31S8nIfd065650; Tue, 28 Feb 2023 08:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S8nIig065649; Tue, 28 Feb 2023 08:49:18 GMT (envelope-from git) Date: Tue, 28 Feb 2023 08:49:18 GMT Message-Id: <202302280849.31S8nIig065649@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: b45f09ac5756 - main - periodic: switch lockf to silent operation. 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: b45f09ac57567de5c99a98941e5e06ecd5074871 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=b45f09ac57567de5c99a98941e5e06ecd5074871 commit b45f09ac57567de5c99a98941e5e06ecd5074871 Author: Alexander Leidinger AuthorDate: 2023-02-28 08:38:42 +0000 Commit: Alexander Leidinger CommitDate: 2023-02-28 08:38:42 +0000 periodic: switch lockf to silent operation. This fixes duplicate mails (one from cron, one from periodic) when a periodic run is not finished bfore the next one starts. The man page states that the intended use case is cron, and the error handling of the lockf invocation handles this case explicitely, as such no error message for the "interactive" use was considered. --- usr.sbin/periodic/periodic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh index 26413c4ab51e..cdbd1b3b57fb 100644 --- a/usr.sbin/periodic/periodic.sh +++ b/usr.sbin/periodic/periodic.sh @@ -53,7 +53,7 @@ if [ $1 != "LOCKED" ]; then ret=0 for arg; do lockfile=/var/run/periodic.${arg##*/}.lock - lockf -t 0 "${lockfile}" /bin/sh $0 LOCKED "$arg" + lockf -s -t 0 "${lockfile}" /bin/sh $0 LOCKED "$arg" case $? in 0) ;; 73) #EX_CANTCREATE From nobody Tue Feb 28 10:21: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 4PQtgK51Nfz3vH3p; Tue, 28 Feb 2023 10:21: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 4PQtgK4Kckz3t6Y; Tue, 28 Feb 2023 10:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7PnRWSD2EwTzEj3Nd5ECNKfbcDDYcoljREAQMXoDyY=; b=qkXxVWCBAotm8lsHCVfvpq8gOPZMwnv5oiJ1M8rVksYBh9WD4GPD1nm1IrcX50Ie0jhx/+ j0hgE8KH69gclhBXfFO6ZqJRgoA/FX+a4h11EQM+7GF1wkIysHkcXtKWU6Fpky52NNbeYR zjCv7o6chskvCAAPh/j9QrrEjqYMce36vKCrfMEPjfXXnCg3Yuvb8l6LRbo7DznmMXPkzy wlhE988nJAho8MowppDmu3tgKSMNhrBORvye94Qr+Z9rBlhH3H+bicy/CNnTAtw+nT3k3M txOU7jlFaGQNebL5aJ6nip/4acSPcz7U8lkuT9XGdDQGaS9wVOVIFh/feWdJ0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7PnRWSD2EwTzEj3Nd5ECNKfbcDDYcoljREAQMXoDyY=; b=QjR4WkKZ8ZhIxQkmm2XKHDSbLPFnCTR86mA6TVU/XupZ72/A6plu9tbeSYTAr+RBmUMPZ6 nxxIIWAXo7ZQ8IekTOQM+CYMbzAlyFELJyHlflhn4Z2D+HT9orRyxp9LacP4Bz51b9w5Up J8S0p8ZePC+0qoPoRACuBK3GRoMcqa37zF1wzJ1EzRi86YrINWGWUTXmD1TcvllQ3zM1Ge zQ+KHHeNtgtrYpBgvjgth6qqMlY8VRMzH8Fw9Mdno2tYrUGcNuvyS9vUpspNm4h61ynOGr ickZbtTOw1U5AB7SoPvFtzt8Ld8OIuDoUPVJYgy7VCXOBp60+YQauNOEYqEPuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579661; a=rsa-sha256; cv=none; b=rZkrYzh5K6j1Hv44HAadfYVVXDf5BcmYZ/SjUDrWZud5oA8MGIwfdFPUrs9LWpZMbpj8bu fETZGpRRQgOZAkcRU7dhXzzM+nzPgjC0IxVf8x1nHgq06LRmXzMn6CLvBuYeH6DFroQF5E ySf9AZNawNASyGrM1X/1hRUbwlBjP/MKm3XU/z85ktqMLPbI9Sxr6SU1SlNKDeF1M341Ho hTD2Nn4hSLeV6HeTmqTBHsueA9jfgHXu1LrjdAQLOKNKS+SoYOKxX+rWygsbnpXZNCAJ/v CeHfXLvJPtOVWOa6rBcDsPPSPXA0W+MW3V+SIURZNSNmlYe56S2QYS74uFm8+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 4PQtgK3NYjz135x; Tue, 28 Feb 2023 10:21: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 31SAL12W023175; Tue, 28 Feb 2023 10:21:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAL148023174; Tue, 28 Feb 2023 10:21:01 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:21:01 GMT Message-Id: <202302281021.31SAL148023174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 500f82d6c32e - main - jail: Use flexible array member within struct prison_ip 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 500f82d6c32edf8d5a3934c5fa3d4875045c4c49 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=500f82d6c32edf8d5a3934c5fa3d4875045c4c49 commit 500f82d6c32edf8d5a3934c5fa3d4875045c4c49 Author: Zhenlei Huang AuthorDate: 2023-02-28 10:01:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-28 10:20:06 +0000 jail: Use flexible array member within struct prison_ip Current implementation utilize off-by-one struct prison_ip to access the IPv[46] addresses. It is error prone and hence comes the regression fix 21ad3e27fabc and ddbf879d79d4. Use flexible array member so that compiler will catch such errors and it will also be easier to review. No functional change intended. Reviewed by: melifaro, glebius Differential Revision: https://reviews.freebsd.org/D37874 --- sys/kern/kern_jail.c | 102 +++++++++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 44 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index b89c576b76ca..ba4fa6ea2ce4 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -576,16 +576,30 @@ struct prison_ip { struct epoch_context ctx; uint32_t ips; #ifdef FUTURE_C + /* + * XXX Variable-length automatic arrays in union may be + * supported in future C. + */ union { + char pr_ip[]; struct in_addr pr_ip4[]; struct in6_addr pr_ip6[]; }; #else /* No future C :( */ -#define PR_IP(pip, i) ((const char *)((pip) + 1) + pr_families[af].size * (i)) -#define PR_IPD(pip, i) ((char *)((pip) + 1) + pr_families[af].size * (i)) + char pr_ip[]; #endif }; +static char * +PR_IP(struct prison_ip *pip, const pr_family_t af, int idx) +{ + MPASS(pip); + MPASS(af < PR_FAMILY_MAX); + MPASS(idx >= 0 && idx < pip->ips); + + return (pip->pr_ip + pr_families[af].size * idx); +} + static struct prison_ip * prison_ip_alloc(const pr_family_t af, uint32_t cnt, int flags) { @@ -610,7 +624,7 @@ prison_ip_copyin(const pr_family_t af, void *op, uint32_t cnt) struct prison_ip *pip; pip = prison_ip_alloc(af, cnt, M_WAITOK); - bcopy(op, pip + 1, cnt * size); + bcopy(op, pip->pr_ip, cnt * size); /* * IP addresses are all sorted but ip[0] to preserve * the primary IP address as given from userland. @@ -620,21 +634,20 @@ prison_ip_copyin(const pr_family_t af, void *op, uint32_t cnt) * address to connect from. */ if (cnt > 1) - qsort((char *)(pip + 1) + size, cnt - 1, size, - pr_families[af].cmp); + qsort(pip->pr_ip + size, cnt - 1, size, pr_families[af].cmp); /* * Check for duplicate addresses and do some simple * zero and broadcast checks. If users give other bogus * addresses it is their problem. */ for (int i = 0; i < cnt; i++) { - if (!pr_families[af].valid(PR_IP(pip, i))) { + if (!pr_families[af].valid(PR_IP(pip, af, i))) { free(pip, M_PRISON); return (NULL); } if (i + 1 < cnt && - (cmp(PR_IP(pip, 0), PR_IP(pip, i + 1)) == 0 || - cmp(PR_IP(pip, i), PR_IP(pip, i + 1)) == 0)) { + (cmp(PR_IP(pip, af, 0), PR_IP(pip, af, i + 1)) == 0 || + cmp(PR_IP(pip, af, i), PR_IP(pip, af, i + 1)) == 0)) { free(pip, M_PRISON); return (NULL); } @@ -654,7 +667,7 @@ prison_ip_dup(struct prison *ppr, struct prison *pr, const pr_family_t af) if (ppr->pr_addrs[af] != NULL) { pr->pr_addrs[af] = prison_ip_alloc(af, ppr->pr_addrs[af]->ips, M_WAITOK); - bcopy(ppr->pr_addrs[af] + 1, pr->pr_addrs[af] + 1, + bcopy(ppr->pr_addrs[af]->pr_ip, pr->pr_addrs[af]->pr_ip, pr->pr_addrs[af]->ips * pr_families[af].size); } } @@ -666,8 +679,8 @@ prison_ip_dup(struct prison *ppr, struct prison *pr, const pr_family_t af) * kern_jail_set() helper. */ static bool -prison_ip_parent_match(const struct prison_ip *ppip, - const struct prison_ip *pip, const pr_family_t af) +prison_ip_parent_match(struct prison_ip *ppip, struct prison_ip *pip, + const pr_family_t af) { prison_addr_cmp_t *const cmp = pr_families[af].cmp; int i, j; @@ -676,7 +689,7 @@ prison_ip_parent_match(const struct prison_ip *ppip, return (false); for (i = 0; i < ppip->ips; i++) - if (cmp(PR_IP(pip, 0), PR_IP(ppip, i)) == 0) + if (cmp(PR_IP(pip, af, 0), PR_IP(ppip, af, i)) == 0) break; if (i == ppip->ips) @@ -685,11 +698,12 @@ prison_ip_parent_match(const struct prison_ip *ppip, if (pip->ips > 1) { for (i = j = 1; i < pip->ips; i++) { - if (cmp(PR_IP(pip, i), PR_IP(ppip, 0)) == 0) + if (cmp(PR_IP(pip, af, i), PR_IP(ppip, af, 0)) == 0) /* Equals to parent primary address. */ continue; for (; j < ppip->ips; j++) - if (cmp(PR_IP(pip, i), PR_IP(ppip, j)) == 0) + if (cmp(PR_IP(pip, af, i), + PR_IP(ppip, af, j)) == 0) break; if (j == ppip->ips) break; @@ -709,7 +723,7 @@ prison_ip_parent_match(const struct prison_ip *ppip, */ static bool prison_ip_conflict_check(const struct prison *ppr, const struct prison *pr, - const struct prison_ip *pip, pr_family_t af) + struct prison_ip *pip, pr_family_t af) { const struct prison *tppr, *tpr; int descend; @@ -737,7 +751,7 @@ prison_ip_conflict_check(const struct prison *ppr, const struct prison *pr, (pip->ips == 1 && tpr->pr_addrs[af]->ips == 1)) continue; for (int i = 0; i < pip->ips; i++) - if (prison_ip_check(tpr, af, PR_IP(pip, i)) == 0) + if (prison_ip_check(tpr, af, PR_IP(pip, af, i)) == 0) return (false); } @@ -784,8 +798,8 @@ static bool prison_ip_restrict(struct prison *pr, const pr_family_t af, struct prison_ip **newp) { - const struct prison_ip *ppip = pr->pr_parent->pr_addrs[af]; - const struct prison_ip *pip = pr->pr_addrs[af]; + struct prison_ip *ppip = pr->pr_parent->pr_addrs[af]; + struct prison_ip *pip = pr->pr_addrs[af]; int (*const cmp)(const void *, const void *) = pr_families[af].cmp; const size_t size = pr_families[af].size; struct prison_ip *new = newp != NULL ? *newp : NULL; @@ -814,7 +828,7 @@ prison_ip_restrict(struct prison *pr, const pr_family_t af, } /* This has no user settings, so just copy the parent's list. */ MPASS(new->ips == ppip->ips); - bcopy(ppip + 1, new + 1, ppip->ips * size); + bcopy(ppip->pr_ip, new->pr_ip, ppip->ips * size); prison_ip_set(pr, af, new); if (newp != NULL) *newp = NULL; /* Used */ @@ -832,30 +846,33 @@ prison_ip_restrict(struct prison *pr, const pr_family_t af, } for (int pi = 0; pi < ppip->ips; pi++) - if (cmp(PR_IP(pip, 0), PR_IP(ppip, pi)) == 0) { + if (cmp(PR_IP(pip, af, 0), PR_IP(ppip, af, pi)) == 0) { /* Found our primary address in parent. */ - bcopy(PR_IP(pip, i), PR_IPD(new, ips), size); + bcopy(PR_IP(pip, af, i), PR_IP(new, af, ips), + size); i++; ips++; break; } for (int pi = 1; i < pip->ips; ) { /* Check against primary, which is unsorted. */ - if (cmp(PR_IP(pip, i), PR_IP(ppip, 0)) == 0) { + if (cmp(PR_IP(pip, af, i), PR_IP(ppip, af, 0)) == 0) { /* Matches parent's primary address. */ - bcopy(PR_IP(pip, i), PR_IPD(new, ips), size); + bcopy(PR_IP(pip, af, i), PR_IP(new, af, ips), + size); i++; ips++; continue; } /* The rest are sorted. */ switch (pi >= ppip->ips ? -1 : - cmp(PR_IP(pip, i), PR_IP(ppip, pi))) { + cmp(PR_IP(pip, af, i), PR_IP(ppip, af, pi))) { case -1: i++; break; case 0: - bcopy(PR_IP(pip, i), PR_IPD(new, ips), size); + bcopy(PR_IP(pip, af, i), PR_IP(new, af, ips), + size); i++; pi++; ips++; @@ -890,7 +907,7 @@ prison_ip_check(const struct prison *pr, const pr_family_t af, const void *addr) { int (*const cmp)(const void *, const void *) = pr_families[af].cmp; - const struct prison_ip *pip; + struct prison_ip *pip; int i, a, z, d; MPASS(mtx_owned(&pr->pr_mtx) || @@ -902,7 +919,7 @@ prison_ip_check(const struct prison *pr, const pr_family_t af, return (EAFNOSUPPORT); /* Check the primary IP. */ - if (cmp(PR_IP(pip, 0), addr) == 0) + if (cmp(PR_IP(pip, af, 0), addr) == 0) return (0); /* @@ -912,7 +929,7 @@ prison_ip_check(const struct prison *pr, const pr_family_t af, z = pip->ips - 2; while (a <= z) { i = (a + z) / 2; - d = cmp(PR_IP(pip, i + 1), addr); + d = cmp(PR_IP(pip, af, i + 1), addr); if (d > 0) z = i - 1; else if (d < 0) @@ -937,7 +954,7 @@ prison_ip_get0(const struct prison *pr, const pr_family_t af) mtx_assert(&pr->pr_mtx, MA_OWNED); MPASS(pip); - return (pip + 1); + return (pip->pr_ip); } u_int @@ -2372,14 +2389,14 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) if (error != 0 && error != ENOENT) goto done; #ifdef INET - error = vfs_setopt_part(opts, "ip4.addr", pr->pr_addrs[PR_INET] + 1, + error = vfs_setopt_part(opts, "ip4.addr", pr->pr_addrs[PR_INET]->pr_ip, pr->pr_addrs[PR_INET] ? pr->pr_addrs[PR_INET]->ips * pr_families[PR_INET].size : 0 ); if (error != 0 && error != ENOENT) goto done; #endif #ifdef INET6 - error = vfs_setopt_part(opts, "ip6.addr", pr->pr_addrs[PR_INET6] + 1, + error = vfs_setopt_part(opts, "ip6.addr", pr->pr_addrs[PR_INET6]->pr_ip, pr->pr_addrs[PR_INET6] ? pr->pr_addrs[PR_INET6]->ips * pr_families[PR_INET6].size : 0 ); if (error != 0 && error != ENOENT) @@ -4194,7 +4211,7 @@ prison_ip_copyout(struct prison *pr, const pr_family_t af, void **out, int *len) mtx_lock(&pr->pr_mtx); goto again; } - bcopy(pr->pr_addrs[af] + 1, *out, pr->pr_addrs[af]->ips * size); + bcopy(pr->pr_addrs[af]->pr_ip, *out, pr->pr_addrs[af]->ips * size); } } #endif @@ -4869,6 +4886,7 @@ db_show_prison(struct prison *pr) struct jailsys_flags *jsf; #if defined(INET) || defined(INET6) int ii; + struct prison_ip *pip; #endif unsigned f; #ifdef INET @@ -4928,28 +4946,24 @@ db_show_prison(struct prison *pr) db_printf(" host.hostuuid = %s\n", pr->pr_hostuuid); db_printf(" host.hostid = %lu\n", pr->pr_hostid); #ifdef INET - if (pr->pr_addrs[PR_INET] != NULL) { - pr_family_t af = PR_INET; - - db_printf(" ip4s = %d\n", pr->pr_addrs[af]->ips); - for (ii = 0; ii < pr->pr_addrs[af]->ips; ii++) + if ((pip = pr->pr_addrs[PR_INET]) != NULL) { + db_printf(" ip4s = %d\n", pip->ips); + for (ii = 0; ii < pip->ips; ii++) db_printf(" %s %s\n", ii == 0 ? "ip4.addr =" : " ", inet_ntoa_r( - *(const struct in_addr *)PR_IP(pr->pr_addrs[af], ii), + *(const struct in_addr *)PR_IP(pip, PR_INET, ii), ip4buf)); } #endif #ifdef INET6 - if (pr->pr_addrs[PR_INET6] != NULL) { - pr_family_t af = PR_INET6; - - db_printf(" ip6s = %d\n", pr->pr_addrs[af]->ips); - for (ii = 0; ii < pr->pr_addrs[af]->ips; ii++) + if ((pip = pr->pr_addrs[PR_INET6]) != NULL) { + db_printf(" ip6s = %d\n", pip->ips); + for (ii = 0; ii < pip->ips; ii++) db_printf(" %s %s\n", ii == 0 ? "ip6.addr =" : " ", ip6_sprintf(ip6buf, - (const struct in6_addr *)PR_IP(pr->pr_addrs[af], ii))); + (const struct in6_addr *)PR_IP(pip, PR_INET6, ii))); } #endif } From nobody Tue Feb 28 10:21: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 4PQtgL6Jzfz3vH1V; Tue, 28 Feb 2023 10:21: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 4PQtgL5QgNz3t75; Tue, 28 Feb 2023 10:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mevw0nQGtD4ZLzE7qjPCzTZeFOEgDTsTwG7/7rKdgf0=; b=O6FxjFSZft8ySrwhPidQ/lwfAbVNuGcqHtZPF9u97xx8kRav8GvllvwK792rytr8uML8cA D9Ifxn/khn66kn3zsHGtgA1gtsJ4vfQcK934uNKrb89NxIVmv3W6IE+QLWUa/kB+nmNbZ7 cdswhF7x8JIXjltnKE7Irta24onsczQjpWQwKNWVJ1lVFuu2jeTjFJmRnHmeSn8lh6vC0C ET6uTCnOWa1fvZfEUhpvWKRqCKQkXaFzFRvZ+IlRlTqPlmzoktBgzNQsRAhOaOnWU+zzIN EjTUHZ7a/R1A0dnAC4TzKPFp1RWnKrHhnutKg59WH1Mvf8NB5vnz6kZACrKhJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mevw0nQGtD4ZLzE7qjPCzTZeFOEgDTsTwG7/7rKdgf0=; b=InnUEdKw7xUrSjWAQxt2AwJUvdt//gv3o87MSi9p6QG72r7aEjzpSflEcKUc9LD1j+Fq2D OZ82Ldfk0FO8f5nTZ+bfGFR/0kvg6XWZaMDVN2NxKYJnuip7fQ7/eLa0dq28X835WVV6xX 1ftiy6Vxa4a7h0427w/d1Zlqar+6ZfUDugR+rwUymrtgRauMDdngYfBLqPtbiTX4nVgfnA upbV3Z6EjD8PXftuQRGJ6mNpIoTveY1CvX1t1EAdW9tVqf0b+ETRFJ6Iaxc7atXbE7STR6 r1vXRDXh96/7uI8mt3qx5KVDtKd9hYKYScbhh9I2WTxYpi8k0Xyn0epLtIMSeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579662; a=rsa-sha256; cv=none; b=MMY3uN6ai+eSPrLTkhFVhELN0TQgCeaFZ1ylYvn8vRRR55KssBo2XOUy032H98ufX8889P tVNJXg/n6gg5fcYwKS7m8Xt5JcBODQ4qH33OEpTjJ9DbYOG14phbd9cCHHmK5/CyBgOzyg TZZjoJUouvszxHmHjNGn3C/+aU4pMsWS0+jgKGt2whJAb24j3znWuNLRKQ4PBdWfY6nf4i PdOsoeO2hijQOE7HPqS8Z+uoQxnroXP+5iHfYnfm9NunY4rehs4kSaO8bYqJ2r35jGMYeL B+mSSqDG9bvoSU0lG7+RQ/OZwXFznLC/kd/MiC0DGkiaj6w43WSDF3H1f3G0oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQtgL48Mrz13jy; Tue, 28 Feb 2023 10:21: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 31SAL2M3023194; Tue, 28 Feb 2023 10:21:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAL2F8023193; Tue, 28 Feb 2023 10:21:02 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:21:02 GMT Message-Id: <202302281021.31SAL2F8023193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 2c33b456ff24 - main - jail: Improve readability 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c33b456ff24d04d83690327a777d21a6a0a0a33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2c33b456ff24d04d83690327a777d21a6a0a0a33 commit 2c33b456ff24d04d83690327a777d21a6a0a0a33 Author: Zhenlei Huang AuthorDate: 2023-02-28 10:14:07 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-28 10:20:07 +0000 jail: Improve readability No functional change intended. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D37890 --- sys/kern/kern_jail.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index ba4fa6ea2ce4..41bd5cdca620 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -634,7 +634,7 @@ prison_ip_copyin(const pr_family_t af, void *op, uint32_t cnt) * address to connect from. */ if (cnt > 1) - qsort(pip->pr_ip + size, cnt - 1, size, pr_families[af].cmp); + qsort(PR_IP(pip, af, 1), cnt - 1, size, cmp); /* * Check for duplicate addresses and do some simple * zero and broadcast checks. If users give other bogus @@ -663,12 +663,13 @@ prison_ip_copyin(const pr_family_t af, void *op, uint32_t cnt) static void prison_ip_dup(struct prison *ppr, struct prison *pr, const pr_family_t af) { + const struct prison_ip *ppip = ppr->pr_addrs[af]; + struct prison_ip *pip; - if (ppr->pr_addrs[af] != NULL) { - pr->pr_addrs[af] = prison_ip_alloc(af, - ppr->pr_addrs[af]->ips, M_WAITOK); - bcopy(ppr->pr_addrs[af]->pr_ip, pr->pr_addrs[af]->pr_ip, - pr->pr_addrs[af]->ips * pr_families[af].size); + if (ppip != NULL) { + pip = prison_ip_alloc(af, ppip->ips, M_WAITOK); + bcopy(ppip->pr_ip, pip->pr_ip, pip->ips * pr_families[af].size); + pr->pr_addrs[af] = pip; } } @@ -4199,19 +4200,20 @@ static SYSCTL_NODE(_security, OID_AUTO, jail, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, static void prison_ip_copyout(struct prison *pr, const pr_family_t af, void **out, int *len) { + const struct prison_ip *pip; const size_t size = pr_families[af].size; again: mtx_assert(&pr->pr_mtx, MA_OWNED); - if (pr->pr_addrs[af] != NULL) { - if (*len < pr->pr_addrs[af]->ips) { - *len = pr->pr_addrs[af]->ips; + if ((pip = pr->pr_addrs[af]) != NULL) { + if (*len < pip->ips) { + *len = pip->ips; mtx_unlock(&pr->pr_mtx); *out = realloc(*out, *len * size, M_TEMP, M_WAITOK); mtx_lock(&pr->pr_mtx); goto again; } - bcopy(pr->pr_addrs[af]->pr_ip, *out, pr->pr_addrs[af]->ips * size); + bcopy(pip->pr_ip, *out, pip->ips * size); } } #endif From nobody Tue Feb 28 12:38: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 4PQxk44Cg6z3vQ2X; Tue, 28 Feb 2023 12:38: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 4PQxk43fp7z43k9; Tue, 28 Feb 2023 12:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yAcy0y/xxsM42PpwjEL22mJ3ddRhLXOoxuOWRo+uptM=; b=ykdHdeXfBJ+PHxS1O+rxVeAu4XCyTaBLuwlVeYCEghC7kukQNb7FhAB3F8vBGk3tSdKIQq q4cTqTXByfNCyHDGx5tIKyZrtqFxNCsEE3clZjfQc2/4ScGti5mCXURpY/Nc7Z/hmWz+PF e87hDLCbH5tlFEJrk3IRtMTzpSeLe8tE61fSjEm8SXmBSjTPwxGc54Z+IVY11eXtyJqKJO B6GV3TMzpCD6OReb8lp6TTQDCO2CndkEocwqZM/8zF5QZcZLbtdxlMidJJfUmIkljAKZ0e 1gMZFWiYPOxRyV8py2ZF1JDcntF3glzS5XkDcNPhCQhqHfP6A8tqbTm30eCFxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yAcy0y/xxsM42PpwjEL22mJ3ddRhLXOoxuOWRo+uptM=; b=oElXSvZe70SgrUF59DliFRs3oi2Ved6R6rdUFwwx6sbF4Xi524oK3g8smaQgDJZfcC/V/I lzHncF6NDqQswavHviId5bxEIZ90gXDn0PxSPAIhXeP9/J+8rUNvDfdnvSGu8knxPqx9Az 5uCD4h/kWd8AxPoBhAZnpBoGN54JZFklYCMZhV4X7sWs054Vxv4mX/c1xXX/dH1vP9ALxY ZiLoRYdmdSVpsYzkXwabEkNPGcXcdPczGYhx8rzUamwAX8rqCkH+Oo2jw9El6HtLC6W7hn KkGL/5lK40rr1ExV1BMAdr8nqBnC7dyzUaoTKY5w0VB53NIOX0b0Y8HwduDjuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677587916; a=rsa-sha256; cv=none; b=cliv5BTIwM50A1zR/wtLCe0kpo2OibpoN9SncF+05nMZc0XCylRoaAQl1xkOlNtkf4I3Az N9rOVmSAPA77pTdJam4vLpmQf/19DEIopvbNQp9vBh7DZEoP0RkdtieMN8GdFJnPqa4CmG omoUnO3TOhZC1G0pRn4aiFP/WI4U3E8V6p+12cf6+cXQUHf9SzJpL/GIgz5CTNxBAqVFMa ewp8yx6sMhBl7AbM8SfQzjWyZolR0owZOerwmrKrUdMJmH1Czsg2FkBwLkqHlOwya32KkL Rz2ChBcJudc2dGHjw8R3xeO4v/absBZY3tp+tGjpkseSevep+e4Vc9c86+HCfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQxk42kl8z16dH; Tue, 28 Feb 2023 12:38: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 31SCcarS043002; Tue, 28 Feb 2023 12:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SCcaI6043001; Tue, 28 Feb 2023 12:38:36 GMT (envelope-from git) Date: Tue, 28 Feb 2023 12:38:36 GMT Message-Id: <202302281238.31SCcaI6043001@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: 3ef46195ac37 - main - bhyve: add helper to add fwcfg items 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: 3ef46195ac37111ab247cfabed735d3ee5e7f5b5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=3ef46195ac37111ab247cfabed735d3ee5e7f5b5 commit 3ef46195ac37111ab247cfabed735d3ee5e7f5b5 Author: Corvin Köhne AuthorDate: 2021-08-11 08:01:19 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 12:37:03 +0000 bhyve: add helper to add fwcfg items This helper makes it easier to add multiple fwcfg items. You can pass an index and some data to the helper. The helper adds these information to the fwcfg emulation so that the guest reads the given data on the specified index. Reviewed by: MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38334 --- usr.sbin/bhyve/qemu_fwcfg.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 13e21daca7ff..8cb71b819956 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -130,6 +130,31 @@ qemu_fwcfg_data_port_handler(struct vmctx *const ctx __unused, const int in, return (0); } +static int +qemu_fwcfg_add_item(const uint16_t architecture, const uint16_t index, + const uint32_t size, void *const data) +{ + /* truncate architecture and index to their desired size */ + const uint16_t arch = architecture & QEMU_FWCFG_ARCHITECTURE_MASK; + const uint16_t idx = index & QEMU_FWCFG_INDEX_MASK; + + /* get pointer to item specified by selector */ + struct qemu_fwcfg_item *const fwcfg_item = &fwcfg_sc.items[arch][idx]; + + /* check if item is already used */ + if (fwcfg_item->data != NULL) { + warnx("%s: qemu fwcfg item exists (architecture %s index 0x%x)", + __func__, arch ? "specific" : "generic", idx); + return (-1); + } + + /* save data of the item */ + fwcfg_item->size = size; + fwcfg_item->data = data; + + return (0); +} + static int qemu_fwcfg_register_port(const char *const name, const int port, const int size, const int flags, const inout_func_t handler) From nobody Tue Feb 28 12:38: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 4PQxk55S1qz3vPlr; Tue, 28 Feb 2023 12:38: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 4PQxk54ghpz43PL; Tue, 28 Feb 2023 12:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxgfRPNumn749qLyiYpF6n3MIs0DZbCoLCIOfv0ppuM=; b=pJ2knXCIk/Grc6XJhTaPu9b3rUq7/2sPOKU8OlqBiqYxy8liUnCD9k+D7FrxnrXErO8349 sM39Ru3YJG6HBHll5iwXDp+dZiHZDatp61HwYCJAErVMn5FyqWpZQlK6Qi70jeyM+9RI+A aPvtaLC4KBRv5DwiqQZVk9kZ6wHuZRXqpaRybUTPIqY1NJLusvA2tqYP3wUjr3lg+Jt3Sg XeFlvZtkI/I8h53YfSbbEj8Yc0+U8zV+D2tjp15EmmqKnDETOHSLJuCtNdXdIvuGrxgHzY HX8eILIw7Af5ZoD4zWKiQm6R02Aa2/XE/R8BOnaR9o75gInO+FHXU5z8SXeLWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxgfRPNumn749qLyiYpF6n3MIs0DZbCoLCIOfv0ppuM=; b=q4j6sGyZNetLAd+KCSjFGszir2LcJCi4ucFOGCs68C9+geJqEccJStvFXGUOfV7uIgdXHM E5UFNR8X5qUTr98tbSO7R5XIfMtxUHnhSRfZl4xCbAWTzMnrOIkMrDp/V9cNSu/U+y345F YHh3pYyFAeSsShTzo4lVvjnW9FtC5mQm6x8IQbs/YQnAN8i4htPi+Ap06I69HWfb29WjAl N16XyzodPwcjRFYxBuNiMq9o+PoWD9V0Krmtl3K4VZ1c2d8+i0rOlPOlK81bMM/VHryUqX OEbOapSXB5glGXzYaXfP/3wrQLU31p/GS4yrf4cpW9kMPBjsBpHQjIvu4Ie91A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677587917; a=rsa-sha256; cv=none; b=VXM2SAdWc+2xbwCrF0cX0MKyWaBlz1U7uLobw7blAZ6h+wldJFyJfeAPqg+/3eeR5qLIyD 0L9kwGIkO2QBLgSETvQR2Ld/5VU1kaYetGYWSr7lfEu6RicxkjLzMJnfBqG87dQjF7QD6Z NpmcgmDmwdYnLrtVgSt5O0i662x9m6G2ErW4ps/i5rKQE48uQ69qIKZDMx+2tJl5H6qBZa 84ED178uSmUhUzx9UkuRC5WrpPFhgi6VrmqdocTrhjxGnRfTeHUVsXFnc16ivMgcDVdhSz GqzmUqhZajxe2us+qVPadyb3fueB7Q7lBicguGcxiOILZmsSwOhfhxbZrr+BYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQxk53fn4z16gv; Tue, 28 Feb 2023 12:38: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 31SCcbuK043026; Tue, 28 Feb 2023 12:38:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SCcbHx043025; Tue, 28 Feb 2023 12:38:37 GMT (envelope-from git) Date: Tue, 28 Feb 2023 12:38:37 GMT Message-Id: <202302281238.31SCcbHx043025@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: 34f804e547e7 - main - bhyve: add common fwcfg items 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: 34f804e547e7c3b10b12f5450ff2e0a771000daf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=34f804e547e7c3b10b12f5450ff2e0a771000daf commit 34f804e547e7c3b10b12f5450ff2e0a771000daf Author: Corvin Köhne AuthorDate: 2021-08-11 08:02:57 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 12:37:12 +0000 bhyve: add common fwcfg items Qemu defines some common fwcfg items. We don't need to support all of them. Only a subset needs to be present for fwcfg to work properly. - signature The signature is used by the guest to check if qemu's fwcfg is available or not. - id The id is used by the guest to check which features are supported by the fwcfg implementation of the hypervisor. - file_dir The file dir reports all fwcfg items which don't have a fixed index. These are mostly user defined fwcfg items. Reviewed by: MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38335 --- usr.sbin/bhyve/qemu_fwcfg.c | 99 +++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/qemu_fwcfg.h | 1 + 2 files changed, 100 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 8cb71b819956..e1a67fd0d8ef 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -6,6 +6,7 @@ */ #include +#include #include @@ -38,6 +39,12 @@ #define QEMU_FWCFG_ARCHITECTURE_GENERIC 0 #define QEMU_FWCFG_ARCHITECTURE_SPECIFIC 1 +#define QEMU_FWCFG_INDEX_SIGNATURE 0x00 +#define QEMU_FWCFG_INDEX_ID 0x01 +#define QEMU_FWCFG_INDEX_FILE_DIR 0x19 + +#define QEMU_FWCFG_MIN_FILES 10 + #pragma pack(1) union qemu_fwcfg_selector { @@ -49,6 +56,28 @@ union qemu_fwcfg_selector { uint16_t bits; }; +struct qemu_fwcfg_signature { + uint8_t signature[4]; +}; + +struct qemu_fwcfg_id { + uint32_t interface : 1; /* always set */ + uint32_t DMA : 1; + uint32_t reserved : 30; +}; + +struct qemu_fwcfg_file { + uint32_t be_size; + uint16_t be_selector; + uint16_t reserved; + uint8_t name[QEMU_FWCFG_MAX_NAME]; +}; + +struct qemu_fwcfg_directory { + uint32_t be_count; + struct qemu_fwcfg_file files[0]; +}; + #pragma pack() struct qemu_fwcfg_softc { @@ -155,6 +184,62 @@ qemu_fwcfg_add_item(const uint16_t architecture, const uint16_t index, return (0); } +static int +qemu_fwcfg_add_item_file_dir(void) +{ + const size_t size = sizeof(struct qemu_fwcfg_directory) + + QEMU_FWCFG_MIN_FILES * sizeof(struct qemu_fwcfg_file); + struct qemu_fwcfg_directory *const fwcfg_directory = calloc(1, size); + if (fwcfg_directory == NULL) { + return (ENOMEM); + } + + fwcfg_sc.directory = fwcfg_directory; + + return (qemu_fwcfg_add_item(QEMU_FWCFG_ARCHITECTURE_GENERIC, + QEMU_FWCFG_INDEX_FILE_DIR, sizeof(struct qemu_fwcfg_directory), + (uint8_t *)fwcfg_sc.directory)); +} + +static int +qemu_fwcfg_add_item_id(void) +{ + struct qemu_fwcfg_id *const fwcfg_id = calloc(1, + sizeof(struct qemu_fwcfg_id)); + if (fwcfg_id == NULL) { + return (ENOMEM); + } + + fwcfg_id->interface = 1; + fwcfg_id->DMA = 0; + + uint32_t *const le_fwcfg_id_ptr = (uint32_t *)fwcfg_id; + *le_fwcfg_id_ptr = htole32(*le_fwcfg_id_ptr); + + return (qemu_fwcfg_add_item(QEMU_FWCFG_ARCHITECTURE_GENERIC, + QEMU_FWCFG_INDEX_ID, sizeof(struct qemu_fwcfg_id), + (uint8_t *)fwcfg_id)); +} + +static int +qemu_fwcfg_add_item_signature(void) +{ + struct qemu_fwcfg_signature *const fwcfg_signature = calloc(1, + sizeof(struct qemu_fwcfg_signature)); + if (fwcfg_signature == NULL) { + return (ENOMEM); + } + + fwcfg_signature->signature[0] = 'Q'; + fwcfg_signature->signature[1] = 'E'; + fwcfg_signature->signature[2] = 'M'; + fwcfg_signature->signature[3] = 'U'; + + return (qemu_fwcfg_add_item(QEMU_FWCFG_ARCHITECTURE_GENERIC, + QEMU_FWCFG_INDEX_SIGNATURE, sizeof(struct qemu_fwcfg_signature), + (uint8_t *)fwcfg_signature)); +} + static int qemu_fwcfg_register_port(const char *const name, const int port, const int size, const int flags, const inout_func_t handler) @@ -209,6 +294,20 @@ qemu_fwcfg_init(struct vmctx *const ctx) goto done; } + /* add common fwcfg items */ + if ((error = qemu_fwcfg_add_item_signature()) != 0) { + warnx("%s: Unable to add signature item", __func__); + goto done; + } + if ((error = qemu_fwcfg_add_item_id()) != 0) { + warnx("%s: Unable to add id item", __func__); + goto done; + } + if ((error = qemu_fwcfg_add_item_file_dir()) != 0) { + warnx("%s: Unable to add file_dir item", __func__); + goto done; + } + done: if (error) { acpi_device_destroy(fwcfg_sc.acpi_dev); diff --git a/usr.sbin/bhyve/qemu_fwcfg.h b/usr.sbin/bhyve/qemu_fwcfg.h index 58ef5ed3c6bf..b5454fa9977d 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.h +++ b/usr.sbin/bhyve/qemu_fwcfg.h @@ -11,6 +11,7 @@ #define QEMU_FWCFG_MAX_ARCHS 0x2 #define QEMU_FWCFG_MAX_ENTRIES 0x4000 +#define QEMU_FWCFG_MAX_NAME 56 struct qemu_fwcfg_item { uint32_t size; From nobody Tue Feb 28 12:38:38 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 4PQxk66S7Bz3vPls; Tue, 28 Feb 2023 12:38: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 4PQxk65bSjz43vK; Tue, 28 Feb 2023 12:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SEmaIyNO4l3tEoa7ZVpBaLdXcy6Mw8hJXsg0ubnn4Yo=; b=wtAzazHQEXOzTwJ4aYoGgsuqH+FG2Qa0YVSS+d7TZkH5N/LxkxToLRdOia6WcrHUNCZmI4 uWSChDtmZPrnbAmoq20M3hitrvVkV0I3ATyVtNJrBdI58PJn2pK+Q/Vqw3RSPrbTQUXxdK BNLT6dMB4kE+KMtVK4yhxjzQ3BCm51tM0hBsJELpYfFQoqp7e8Q3QZljRbvcuIfwxB0m2T EVJf6D0p++sBsVQ/67q04RMjpOtBMfxwuLOIuu/TOPiQneZSnX616j1Y4itId+7p/VSyVn 9yr8qo4+VK/9IbNOwHpSNVloG4lF9DxSZ5AlbiYDVt7MlONDJhW3st7+zsCg6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SEmaIyNO4l3tEoa7ZVpBaLdXcy6Mw8hJXsg0ubnn4Yo=; b=cullla1RadsuYC+SJeY3Z5U7cmEH+meY21Vcj0O7QQzSswqBy02UR9Jigj33z7z/448HS/ gU3NaXXym3rZFVGDoj/wEWXSGKMrgO7LPH0sME6Czip5S/3f197+El0pZmYp48jV9bn/NO NGbBqAfKOg1bcYhA98HDo8MhN4x3rW4DFJLakm7PZaIEeANEoWypIPL5R1YPfEYNJe415I qYG/tl/WDNsf01TU3IzRkFrIqRZxM7vTZcywZCH9N6FMM15+bMuvMUEoMP3YZIJwwh0YYG RwydqnmashMVd/9Glv22RlYkRNBPmyTvJA76TI5vWqgwqADCJJTfIkl984XsXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677587918; a=rsa-sha256; cv=none; b=ovxgoP2BgjZwu9h9ds6G/zfySst/9ujSdSqqT60+ONRWkCj4lXGIQc4ZDGRJITb1fnraEr xOhjNNLnwf4x6+pZcCyCHEyS2/d4IhZr/duEmNpVdPo9uvngnhMTHGqOzwt1zQugKfCiEv Fpmy+N5wLB0VAEUHS29iCdUL+UOs+OWNTYUVENuXEBdjH24OO7kmJtDoML8Y7nLGp5cJun gOEF6ZqXrbDn319qz7ANDOIFRcELG7/k9kJyuRv4fbFBZ7BJ8TzhCoWof5jQ67wg7eABIn zzG0ZyxiYEroBCOmHuPOBGhdRnBqJii01fpSGRV7EMctX09sJN2uF4MeHCkRvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQxk64b9Nz16kb; Tue, 28 Feb 2023 12:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31SCcc14043050; Tue, 28 Feb 2023 12:38:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SCccX7043049; Tue, 28 Feb 2023 12:38:38 GMT (envelope-from git) Date: Tue, 28 Feb 2023 12:38:38 GMT Message-Id: <202302281238.31SCccX7043049@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: 281b496f22d1 - main - vmm: fix restore of TSC offset 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: 281b496f22d1d666b2ef1e54985432627ec434a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=281b496f22d1d666b2ef1e54985432627ec434a4 commit 281b496f22d1d666b2ef1e54985432627ec434a4 Author: Vitaliy Gusev AuthorDate: 2023-02-28 11:16:35 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 12:37:44 +0000 vmm: fix restore of TSC offset After suspend/resume Ubuntu 20.04 and 22.04 installer can hang if tsc-early clocksource has a big skew. Reviewed by: corvink, jhb Fixes: a7db532e3a6f83067b342f569b56076d011f8a1e ("vmm: Simplify saving of absolute TSC values in snapshots.") MFC after: 2 weeks Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38474 --- sys/amd64/vmm/vmm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 9f5fc124f4ff..794ec5ab6597 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -2859,6 +2859,8 @@ vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta) */ tsc = now + vcpu->tsc_offset; SNAPSHOT_VAR_OR_LEAVE(tsc, meta, ret, done); + if (meta->op == VM_SNAPSHOT_RESTORE) + vcpu->tsc_offset = tsc; } done: From nobody Tue Feb 28 12:38:39 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 4PQxk80by3z3vPwy; Tue, 28 Feb 2023 12:38: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 4PQxk76RfFz43y4; Tue, 28 Feb 2023 12:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSkzwBEbH7JhL2GMhqEFbCiu64SnoGYDFrbmUV7QfTI=; b=N7+R0ibYHY5q667CZA7ooY3sb5mAMy2zw7jlQJQqdSoDNd+MTizJszdLrbQyZisFo5Dxsb hdw8bbnesX8nCLi7iE1bIljQUkFgkMCsO1T+SMInCn0AiZWZx+RkZ73yjeKhoi613p9Xzy BUuwL9u4HcBIH5x7Bf0kCIAu3ZcDSycBi8SyUDA/M8Xk/bNe2zoiD5fRPeq4C4baldr5nm 3Sl/oGubaN39fdCOJOhuud2FjeICiRU3rLHw8Kq2PACPvQYlYnvRbsykWW5UfM1KDSqauv LKraVPP7fhm/9zHIhaqCbu9yQbBJcWbr586mDQ9XLColMC6uG0bAN/1n9bLIUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSkzwBEbH7JhL2GMhqEFbCiu64SnoGYDFrbmUV7QfTI=; b=ACt665CBPO5XIsT0RDDLoQZHDshDm5x/ZdxV7x+JG3Nt3uAxsJaQIXI7Z0IEpHq5zrd++A sjwjj1r5WownN1ZZkA1+5AWDPGU2WuxPNi71RkA6AwhqMJfmNFxnsoHEn1UFq098wRYjPf urQW4n4iga8rpHJO6vBB7wBQ2jWfIwiO2wLo2XrAan7m/uLAV7vPfIpeww6TTVUNYUReHH BydXxbbr5r9AKJfRV2igQIylhFefbxVNvmrDKYCwcBqbjXX6JPb3KP1JVGL73DMZ0Cys7i GZyPMT6D/HbwGMPd2zVCxpEyiJBzZMWroICSPs1K7pzLjuq/Zw8AUa0cWDZM3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677587919; a=rsa-sha256; cv=none; b=QmylFEKr+GoCIn+m9iO2oI9kYeOYhk1VRjhGeA3dG/d3DbRWI8hB+/F3zEzYJbQO9C683m oZflerLYV0uxrr7nzbRB2UDaYJIJda+fgWl2GgJmPJ2Bq86yz0TKhF2ZpZzzjE6JJP45Wh rUVx16gSeGv59qHfVS2mUb1phTGX4Cra7FVkYDhpH16Er7avByfAJVFUa28qcGxBZEhT3E kqf7R2eX8zrGKbnWkHq9YVO4Y6AHe+lHy21hyHhnFkMeXst/VSp8xcF9HaZkHxraSWeNVX nWlNte9iOJg+JL+eQXWv+7WIHDTNWO3l6L8NtG1I1Z+k1rNiZtUoY52nU2hx1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQxk75YDLz16gw; Tue, 28 Feb 2023 12:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31SCcdMT043075; Tue, 28 Feb 2023 12:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SCcdF0043074; Tue, 28 Feb 2023 12:38:39 GMT (envelope-from git) Date: Tue, 28 Feb 2023 12:38:39 GMT Message-Id: <202302281238.31SCcdF0043074@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: 8104fc31a234 - main - bhyve: fix 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: 8104fc31a234bad1ba68910f66876395fc58ebdc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=8104fc31a234bad1ba68910f66876395fc58ebdc commit 8104fc31a234bad1ba68910f66876395fc58ebdc Author: Vitaliy Gusev AuthorDate: 2023-02-28 10:32:49 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 12:37:53 +0000 bhyve: fix restore of kernel structs vmx_snapshot() and svm_snapshot() do not save any data and error occurs at resume: Restoring kernel structs... vm_restore_kern_struct: Kernel struct size was 0 for: vmx Failed to restore kernel structs. Reviewed by: corvink, markj Fixes: 39ec056e6dbd89e26ee21d2928dbd37335de0ebc ("vmm: Rework snapshotting of CPU-specific per-vCPU data.") MFC after: 2 weeks Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38476 --- sys/amd64/include/vmm.h | 2 -- sys/amd64/include/vmm_snapshot.h | 3 +-- sys/amd64/vmm/amd/svm.c | 10 ---------- sys/amd64/vmm/intel/vmx.c | 7 ------- sys/amd64/vmm/vmm.c | 4 ---- usr.sbin/bhyve/snapshot.c | 1 - 6 files changed, 1 insertion(+), 26 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index bd6510b92527..4d6242a8134d 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -184,7 +184,6 @@ typedef struct vmspace * (*vmi_vmspace_alloc)(vm_offset_t min, vm_offset_t max); typedef void (*vmi_vmspace_free)(struct vmspace *vmspace); typedef struct vlapic * (*vmi_vlapic_init)(void *vcpui); typedef void (*vmi_vlapic_cleanup)(struct vlapic *vlapic); -typedef int (*vmi_snapshot_t)(void *vmi, struct vm_snapshot_meta *meta); typedef int (*vmi_snapshot_vcpu_t)(void *vcpui, struct vm_snapshot_meta *meta); typedef int (*vmi_restore_tsc_t)(void *vcpui, uint64_t now); @@ -210,7 +209,6 @@ struct vmm_ops { vmi_vlapic_cleanup vlapic_cleanup; /* checkpoint operations */ - vmi_snapshot_t snapshot; vmi_snapshot_vcpu_t vcpu_snapshot; vmi_restore_tsc_t restore_tsc; }; diff --git a/sys/amd64/include/vmm_snapshot.h b/sys/amd64/include/vmm_snapshot.h index d08f980e7988..c4d7fc4d4371 100644 --- a/sys/amd64/include/vmm_snapshot.h +++ b/sys/amd64/include/vmm_snapshot.h @@ -47,8 +47,7 @@ struct vmctx; enum snapshot_req { - STRUCT_VMX, - STRUCT_VIOAPIC, + STRUCT_VIOAPIC = 1, STRUCT_VM, STRUCT_VLAPIC, VM_MEM, diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index ee1154ef85b6..d995b68ebdc6 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -2415,15 +2415,6 @@ svm_vlapic_cleanup(struct vlapic *vlapic) } #ifdef BHYVE_SNAPSHOT -static int -svm_snapshot(void *vmi, struct vm_snapshot_meta *meta) -{ - if (meta->op == VM_SNAPSHOT_RESTORE) - flush_by_asid(); - - return (0); -} - static int svm_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta) { @@ -2656,7 +2647,6 @@ const struct vmm_ops vmm_ops_amd = { .vlapic_init = svm_vlapic_init, .vlapic_cleanup = svm_vlapic_cleanup, #ifdef BHYVE_SNAPSHOT - .snapshot = svm_snapshot, .vcpu_snapshot = svm_vcpu_snapshot, .restore_tsc = svm_restore_tsc, #endif diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index fa94c707001c..91406f0614ce 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -4093,12 +4093,6 @@ vmx_vlapic_cleanup(struct vlapic *vlapic) } #ifdef BHYVE_SNAPSHOT -static int -vmx_snapshot(void *vmi, struct vm_snapshot_meta *meta) -{ - return (0); -} - static int vmx_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta) { @@ -4254,7 +4248,6 @@ const struct vmm_ops vmm_ops_intel = { .vlapic_init = vmx_vlapic_init, .vlapic_cleanup = vmx_vlapic_cleanup, #ifdef BHYVE_SNAPSHOT - .snapshot = vmx_snapshot, .vcpu_snapshot = vmx_vcpu_snapshot, .restore_tsc = vmx_restore_tsc, #endif diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 794ec5ab6597..36a129e8ec8f 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -254,7 +254,6 @@ DEFINE_VMMOPS_IFUNC(void, vmspace_free, (struct vmspace *vmspace)) DEFINE_VMMOPS_IFUNC(struct vlapic *, vlapic_init, (void *vcpui)) DEFINE_VMMOPS_IFUNC(void, vlapic_cleanup, (struct vlapic *vlapic)) #ifdef BHYVE_SNAPSHOT -DEFINE_VMMOPS_IFUNC(int, snapshot, (void *vmi, struct vm_snapshot_meta *meta)) DEFINE_VMMOPS_IFUNC(int, vcpu_snapshot, (void *vcpui, struct vm_snapshot_meta *meta)) DEFINE_VMMOPS_IFUNC(int, restore_tsc, (void *vcpui, uint64_t now)) @@ -2917,9 +2916,6 @@ vm_snapshot_req(struct vm *vm, struct vm_snapshot_meta *meta) int ret = 0; switch (meta->dev_req) { - case STRUCT_VMX: - ret = vmmops_snapshot(vm->cookie, meta); - break; case STRUCT_VMCX: ret = vm_snapshot_vcpu(vm, meta); break; diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 0c9e32abd326..6143f6f3a489 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -155,7 +155,6 @@ static const struct vm_snapshot_dev_info snapshot_devs[] = { static const struct vm_snapshot_kern_info snapshot_kern_structs[] = { { "vhpet", STRUCT_VHPET }, { "vm", STRUCT_VM }, - { "vmx", STRUCT_VMX }, { "vioapic", STRUCT_VIOAPIC }, { "vlapic", STRUCT_VLAPIC }, { "vmcx", STRUCT_VMCX }, From nobody Tue Feb 28 12:38: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 4PQxk91MbBz3vPx1; Tue, 28 Feb 2023 12:38: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 4PQxk86mkBz442T; Tue, 28 Feb 2023 12:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQkxFSKs5lEoCtTSOy1iQ11sKLwjijRpW2IqZ3c77VI=; b=p+jcxh9l/17knpDt/A5OiY7SMF7PHwlvXkOakWeI14M8ZuTIT6yjAeqwvTzetBX+/EqURR D2SZ+LKu6lyA0g12gIMYAMyRmfdKulJcrAb7qmUMjnUcxXy4F9y0x7fCZJEdLvKtpkKeum OWAE/Y6/1GwjfP6wJdcv2Z/8T3P+lgUoQbcjE1nbnJ1J7lFNIWwM59RJzb98q3dlJRnjDi YSj9zilwrRVEKU7jWkmSZCUpSjqlSfxyOQQ82/JxyZdq/qEM1nFmcnUmrWB8vB1+rScY2+ 21VAb/m6l75WxXY5usnyLDna1rZGYbtVcr5IOpYftZvMrOLuLlAbEToN3Bpf7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQkxFSKs5lEoCtTSOy1iQ11sKLwjijRpW2IqZ3c77VI=; b=ekcVMhH3ic2efEW8YennvNaIG9FMJuDze/zqM/HJp/HGCPdwtH0glYdX6zr5BdibfTh4eL pjO/j4GF0aRBVrTJgiB1La7cLd2v0h3kWGcWgPb8vPqecfjD8TvDVZzYVUexPb+4Ng/BRX GHaUYZM/6L6InbJNw30lnh+aJSf+vo3T+gBH6m0/g6D6PkRyISbgAtryGhdvIVhaEY+d05 KwRyCI35kablvk3XXo098rSiGx0cASsZl73DpRf8YrXQ6411XIgl55i2vdk3aDZEDa22px eFnfSTIxiB81me4Z1yHkM9VlHzdYG4k6toWigueUd96ugWqQdmbF67xqF8GAVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677587920; a=rsa-sha256; cv=none; b=KzQF8yW0DofgWenGJ1+AO9qYedmr+BJkIcOWeXy1fbG+ynchk0Jdry0Z4k54Eo2LAz/h8s mgNCR85O7R+a6LcrMkvFl3/g23ZewkiDS+BjtzC+wItSylxk4BZgKb8hAGaXdtv3FemD2C 0qkKvzImfdnR4jMsxkFC7+D7WkWz6OIr/rFnphNuN3s18TM0jDkYAWbo2DOu75CVbJR7Y+ TctF7IYSuTfzNsrZr6idx4OsJQqTp+z4eboYsO+pQSLfQFmp2wbm+8un5CrHuWRLIlzLF9 p2RRHwLWPbBvLxqqRKBXa6lfkbZuqKGouSu3Il8T98EGpkRGZdUxZ3yK7V0ptg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQxk85tmxz16dJ; Tue, 28 Feb 2023 12:38: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 31SCcesi043106; Tue, 28 Feb 2023 12:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SCce3V043105; Tue, 28 Feb 2023 12:38:40 GMT (envelope-from git) Date: Tue, 28 Feb 2023 12:38:40 GMT Message-Id: <202302281238.31SCce3V043105@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: 9ff3e8b7f090 - main - bhyve: fix resume for vms with guest_ncpus > 1 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: 9ff3e8b7f09034202ad1f24f4fbbe52cf7f56117 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=9ff3e8b7f09034202ad1f24f4fbbe52cf7f56117 commit 9ff3e8b7f09034202ad1f24f4fbbe52cf7f56117 Author: Vitaliy Gusev AuthorDate: 2023-02-28 10:28:40 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 12:37:58 +0000 bhyve: fix resume for vms with guest_ncpus > 1 This error occurs because vm->vcpu[1] has not been allocated yet when vm_snapshot_vm() is called. To fix this, move spinup_vcpu() before restore code. Reviewed by: corvink, markj MFC after: 2 weeks Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38477 --- usr.sbin/bhyve/bhyverun.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index caa284a8dd63..3ff83f55474b 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -552,7 +552,7 @@ fbsdrun_start_thread(void *param) } static void -fbsdrun_addcpu(struct vmctx *ctx, int newcpu, bool suspend) +fbsdrun_addcpu(struct vmctx *ctx, int newcpu) { int error; @@ -562,8 +562,7 @@ fbsdrun_addcpu(struct vmctx *ctx, int newcpu, bool suspend) CPU_SET_ATOMIC(newcpu, &cpumask); - if (suspend) - vm_suspend_cpu(ctx, newcpu); + vm_suspend_cpu(ctx, newcpu); mt_vmm_info[newcpu].mt_ctx = ctx; mt_vmm_info[newcpu].mt_vcpu = newcpu; @@ -1138,7 +1137,7 @@ do_open(const char *vmname) } static void -spinup_vcpu(struct vmctx *ctx, int vcpu, bool suspend) +spinup_vcpu(struct vmctx *ctx, int vcpu) { int error; @@ -1154,7 +1153,7 @@ spinup_vcpu(struct vmctx *ctx, int vcpu, bool suspend) assert(error == 0); } - fbsdrun_addcpu(ctx, vcpu, suspend); + fbsdrun_addcpu(ctx, vcpu); } static bool @@ -1488,6 +1487,16 @@ main(int argc, char *argv[]) assert(error == 0); } + /* Allocate per-VCPU resources. */ + mt_vmm_info = calloc(guest_ncpus, sizeof(*mt_vmm_info)); + + /* + * Add all vCPUs. + */ + for (int vcpu = 0; vcpu < guest_ncpus; vcpu++) { + spinup_vcpu(ctx, vcpu); + } + #ifdef BHYVE_SNAPSHOT if (restore_file != NULL) { fprintf(stdout, "Pausing pci devs...\r\n"); @@ -1564,9 +1573,6 @@ main(int argc, char *argv[]) #endif #ifdef BHYVE_SNAPSHOT - if (restore_file != NULL) - destroy_restore_state(&rstate); - /* initialize mutex/cond variables */ init_snapshot(); @@ -1576,24 +1582,18 @@ main(int argc, char *argv[]) if (init_checkpoint_thread(ctx) < 0) printf("Failed to start checkpoint thread!\r\n"); - if (restore_file != NULL) + if (restore_file != NULL) { + destroy_restore_state(&rstate); vm_restore_time(ctx); -#endif - - /* Allocate per-VCPU resources. */ - mt_vmm_info = calloc(guest_ncpus, sizeof(*mt_vmm_info)); - /* - * Add all vCPUs. - */ - for (int vcpu = 0; vcpu < guest_ncpus; vcpu++) { - bool suspend = (vcpu != BSP); -#ifdef BHYVE_SNAPSHOT - if (restore_file != NULL) - suspend = false; -#endif - spinup_vcpu(ctx, vcpu, suspend); + for (int i = 0; i < guest_ncpus; i++) { + if (i == BSP) + continue; + vm_resume_cpu(ctx, i); + } } +#endif + vm_resume_cpu(ctx, BSP); /* * Head off to the main event dispatch loop From nobody Tue Feb 28 13:32: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 4PQyvy35rkz3vSZL; Tue, 28 Feb 2023 13:32: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 4PQyvy2hqQz4D4H; Tue, 28 Feb 2023 13:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNkyatuBrlGVa3+9Jou+ohm+ZiG5SfonnIgEYRciwOc=; b=mZ4Ren/hZv3qrsgteVboikjODilhC3qBoORlML305OQYrkMWFBCqBQN6SHnKLy0Hnm2nhB TLFr7tWrx2n1PZID2a6Q5Xgje1+lX94hZjB3kyvKTLzcGPIWm5UoleKBLzPAGhBfiqk9h3 MCYBiBmQgAdRk0x0bIsd92jGKCM2mKcHv9bU63z+ZZzHwkP+NdXRD3uMI9iPMTi9/HRSfy onb0RJy0YqDis/4Hlvpjv5c8uaQY7Dm+aqlYsRgiRehVyej+AzOjA4nmZFqQQGOZ5r1Jq7 0TNU9mek+83RJz+EMEHdySBCOr9YYMAWeJTxuaW6JfrZJFTjMy7uDvLy9XoYFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNkyatuBrlGVa3+9Jou+ohm+ZiG5SfonnIgEYRciwOc=; b=TcI6H3ngAqVFrIzLjsqVHpPY6zSx+ldIM3ulhTc58lpAuPbL4MeFVgo9dcQGP1DUTPGyV0 zRVpSqUoyLesnLQG9BrwHDpv5q5qR4U0eVMU5m1L17a7OupdbjDcD8UDtFykPyGL52mRac F4NJc8HVYLN9ZBWu5kDrfGez9GwFbKrdNSdB71GYa2ZojW/uSpWsR5LttH509ozg3dJFk/ NHX7HB/XB+1UvggWgQjlxrXnHECioihdGGaktiUp2jEifAhdcwqXqVqWlqJSs59WrPZGTg e69kcVL//K5g8Q9tK7zFErmBelh6/iWOZIeUOU03EvB6hMGoH8hZFQzzxO4yKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677591134; a=rsa-sha256; cv=none; b=JMFk58kd2GzRtlF/SG0UrSn1q3MFBeV0ghlOatdBEc7+pauOuywQ4VQSwK/Rrl6OvTpDpU Fiq1Z2DLQ5lid7vqwSf30SAPbEGZVXpr5O6SMg9KizJ6yY6/fdzsOAIygoMk6mqdLb4xtZ rjkfJZjmObS3rDdR76aqCUMbBlN2H+F+hCDor1bKfnn4lB8cPeKhBDOc/eWxRPwYY8ZNXI HMoqoBszHRphEIK46yqJUTuPHCLICuvFeBYm0kzFlfCBSuk3qA/JC9V2q9uS54aA86pCWV nI7qZXHH1qJ3xQ2AEaYBtgfI2PZORS1D0OYIk46B197RYHX7B3OW9Bm5qZ2xEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQyvy1m8xz18ZW; Tue, 28 Feb 2023 13:32: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 31SDWECG040361; Tue, 28 Feb 2023 13:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDWDif040360; Tue, 28 Feb 2023 13:32:13 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:32:13 GMT Message-Id: <202302281332.31SDWDif040360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 7bba9d9473c0 - main - sqlite3: Vendor import of sqlite3 3.41.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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bba9d9473c00cec825495543198768fe387ebf4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7bba9d9473c00cec825495543198768fe387ebf4 commit 7bba9d9473c00cec825495543198768fe387ebf4 Merge: 9ff3e8b7f090 615bd3eb2a22 Author: Cy Schubert AuthorDate: 2023-02-28 13:28:07 +0000 Commit: Cy Schubert CommitDate: 2023-02-28 13:28:07 +0000 sqlite3: Vendor import of sqlite3 3.41.0 Release notes at https://www.sqlite.org/releaselog/3_41_0.html. Obtained from: https://www.sqlite.org/2023/sqlite-autoconf-3410000.tar.gz MFC after: 2 weeks Merge commit '615bd3eb2a2225e83e14d5b2a82649430889483c' into temp_merge contrib/sqlite3/Makefile.msc | 1 + contrib/sqlite3/configure | 20 +- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/shell.c | 2188 ++++++++++++---- contrib/sqlite3/sqlite3.c | 4091 ++++++++++++++++++++---------- contrib/sqlite3/sqlite3.h | 238 +- contrib/sqlite3/sqlite3ext.h | 4 + contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 18 +- contrib/sqlite3/tea/configure.ac | 2 +- contrib/sqlite3/tea/generic/tclsqlite3.c | 3 + 11 files changed, 4643 insertions(+), 1926 deletions(-) From nobody Tue Feb 28 13:46: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 4PQzDl25cPz3vT4N; Tue, 28 Feb 2023 13:46: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 4PQzDl1bWfz4G5c; Tue, 28 Feb 2023 13:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bKYR4tUtwSwKWFk8U4MTyucdqgBXVrHOk6IJ9UCuwM=; b=YBW+ZLHLmarYeaSPFGwJCeWDzpDr3xFAezIDbt91PBgmE8p4Yw4NqADHmAu7abFYuz1ByP WvFkA+uwqVaEWv9zYJzxfjqn1fStjg35DnKBTGFl3CnulBAqhlrMQSnoAvuof+bsY329mn rSElO53VAAWVhO1lqroLcHqA5reiOS1zQbqAwgWGTvq8hsXoeeVF+6YJPD/qbS/8IwCD3p 7y5b2osaLKs0jzOTqJRZoq8sXI0sDUjwiGUFgoD6LFz0I4hu/DeYvDzu0S3eayfRDc7h1X G8HC655C5ANKG0h2Xx4Ji+pWn3efeV8gTL7KQs0LrJeK7PFD6y97QNF98hKL8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bKYR4tUtwSwKWFk8U4MTyucdqgBXVrHOk6IJ9UCuwM=; b=VZkn+1HNEutKvy531wdakuz7riH4pmlqm/Jym7SZyKm23WFfVV0NWrCJ9v3Jg0fbxlC0DQ EtEYeVkMFs1PcDC4eCe51bc4LgMkVA+ltylEmy72y/bzOhYtiqTt4kDEpwNj1rpwDfbhOt 0pxatrlJ2blq8JbWlWo4JUuOLP+6fGi0nMQ7SDVPZhoONdzIwCc86XiuFIXUL23r9KTDtC Ecj6LwEoDPGZ1A2sZdI5/wTKtIN5wTlf6CWMvvN4QNp/JIR0j08tjAoql+v8jKaqF7DVDn cs9dgcsFa2hCTD7LT7SRzSXcvxZSpLpNfcZKJtEXXGaS8kD2Wg+D+C5rocSMsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677592007; a=rsa-sha256; cv=none; b=efrZMO9MGaF10tz0RGEJOw9TMa9Jn5fF7X3ZerhFqjhRkOZouOzvB16vbqIAOkgVbZIyYQ 870xzJDMsiyqBYfSIT9fl8jYvkC1xQ6PkwCCWkAZFW+vauuuIRmd97LiPi94CxIk2p43bp gFnRQY2zjkWJCxFHUofpzHGogS+eMITHuD7Y9LnqScejFff+oAXfdTjL/FQ1Xtz5rXfAu9 05Ah/Pz+LVKNK0XY4F79OFGNEePqjWappLZRH9drHoXn615ZAsh5QwZTQMrFX+Looe2N81 78uq7Pkn4y1AW7Q2FvGmV0A6eiGuwfTw4UQql3itAHLBnfJDd/semaEhwGWdBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQzDl0XzNz18MW; Tue, 28 Feb 2023 13:46: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 31SDkkfv057691; Tue, 28 Feb 2023 13:46:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDkkw9057690; Tue, 28 Feb 2023 13:46:46 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:46:46 GMT Message-Id: <202302281346.31SDkkw9057690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: b1723f48d8cd - main - usbdevs: Remove duplicate APC 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1723f48d8cdc9ac6fc3fc256b779b3c07827c0b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b1723f48d8cdc9ac6fc3fc256b779b3c07827c0b commit b1723f48d8cdc9ac6fc3fc256b779b3c07827c0b Author: Cy Schubert AuthorDate: 2023-02-21 21:08:08 +0000 Commit: Cy Schubert CommitDate: 2023-02-28 13:46:00 +0000 usbdevs: Remove duplicate APC entries MFC after: 1 week --- sys/dev/usb/usbdevs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 23fa56d4e338..5a369cdb9df4 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1104,9 +1104,6 @@ product AMBIT NTL_250 0x6098 NTL 250 cable modem /* Apacer products */ product APACER HT202 0xb113 USB 2.0 Flash Drive -/* American Power Conversion products */ -product APC UPS 0x0002 Uninterruptible Power Supply - /* Amigo Technology products */ product AMIGO RT2870_1 0x9031 RT2870 product AMIGO RT2870_2 0x9041 RT2870 @@ -1136,9 +1133,6 @@ product ANYDATA ADU_500A 0x6502 CDMA 2000 EV-DO USB Modem /* AOX, Inc. products */ product AOX USB101 0x0008 Ethernet -/* American Power Conversion products */ -product APC UPS 0x0002 Uninterruptible Power Supply - /* Apple Computer products */ product APPLE DUMMY 0x0000 Dummy product product APPLE IMAC_KBD 0x0201 USB iMac Keyboard From nobody Tue Feb 28 13:46: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 4PQzDm4DD2z3vTcp; Tue, 28 Feb 2023 13:46: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 4PQzDm1bJ0z4GBb; Tue, 28 Feb 2023 13:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LGsofJZNNbD3xzv7oTjAGHn+7zl4RlalFX0FFArDbso=; b=k+POYPyDhlKzdfD7Qeci3jWDHwrB9EX5R2JPKKtMUVwplxMsrus3MmnhhRJ4FkEj/SpZQD DcZXpGDwqNK7jGH3jKs6Ifqj8ZPhXdj1y2SMQHaTVFxS6WNkopXwKaSCEW0GWU4sXVD2iC aP/wx9gwG80W2NyZnb7LiPeF09omqXQgu9tD5QJ3klxPQTinzx0PkwaWoILaWo+Vn9OoLJ A1Zogg8Jhr0zLO0V1Fu0eIwpiwwgPsO+6y7XmNJ4pTbhz7+SoZDWh/v17jp04b5B2RmBfk GW7RncFWfDgB33KKBKbUxHgBq/atGiTmDGsxpRu6/1YyPtSmQ/NoqcXUu+K7BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LGsofJZNNbD3xzv7oTjAGHn+7zl4RlalFX0FFArDbso=; b=bzRmapIilu8Hkb27rZzhjsakGrNKCtYf7BdIfdpWitt31Pm7l0Ay0FwdMy/jBuoOnGie8f OCDfCq6QE6cNiFu7p5FmsMeq0qWyNvbALl3WeG/YqYMx/fiOB/wi74z/rvnvDZ9tAF4WiW 1mHxZcTepqth4Y3DLJjHelvyCN1oFL5b+vE4Z2J97hNEpU9DOXlJqCR5S/L8d6fro1FCni 4Tm6CPs2Qlr9BhBRssl+b044UGMkmVhUxFnmdd5s8JOu3TFwpLPyn+ZPgsiFVqluAgqWIF xCA3hnqaWddoRcCuftIxRaNojFEovWvc8IiQDr4WNWBobphDgoiHBgKLg+Mkew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677592008; a=rsa-sha256; cv=none; b=QyL7CXhH3MWwvAppFT2eHcDvSGltmHXzI79vrf+Avla5cPhSk64mxdVBmeI3qqfZHcgfKs JQnWvynzOwOjNiluUyrlfYZOgxqF8RA2b6Q8M4+/CkqpbuK8kUHJ4PSYYaKi+BghfXefDJ 6MG9s+8zKG674lPOU99sf6Cc/0z87iKrC3PEXRjnJbjCkDh8WinXFQzULGN9vquC7upIVT k9utBA8udGHdGgvrn+b+av6qyDlrqxOQMszzAJzP3nL9IFTsuiI85dEhsvYgAFGlME2P6K bRZsplBPSbmWLAkbRIa/oBqnxVGEVJ9eLXWIWkkxgmwBJhCtsrl/INW0C1JEfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQzDm0hmTz18MX; Tue, 28 Feb 2023 13:46: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 31SDkmWw057711; Tue, 28 Feb 2023 13:46:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDkmBN057710; Tue, 28 Feb 2023 13:46:48 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:46:48 GMT Message-Id: <202302281346.31SDkmBN057710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 6f295aab8093 - main - usbdevs: Add APC Smart-UPS1000 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f295aab8093e291d2166325e4627321953268c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6f295aab8093e291d2166325e4627321953268c8 commit 6f295aab8093e291d2166325e4627321953268c8 Author: Cy Schubert AuthorDate: 2023-02-21 21:10:35 +0000 Commit: Cy Schubert CommitDate: 2023-02-28 13:46:00 +0000 usbdevs: Add APC Smart-UPS1000 MFC after: 1 week --- sys/dev/usb/usbdevs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 5a369cdb9df4..637b49d5e399 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1097,6 +1097,9 @@ product AMOI H02 0x0802 H02 3G modem /* American Power Conversion products */ product APC UPS 0x0002 Uninterruptible Power Supply +/* American Power Conversion products */ +product APC UPS1000 0x0003 Uninterruptible Power Supply + /* Ambit Microsystems products */ product AMBIT WLAN 0x0302 WLAN product AMBIT NTL_250 0x6098 NTL 250 cable modem From nobody Tue Feb 28 13:46: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 4PQzDn3z16z3vTcq; Tue, 28 Feb 2023 13:46: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 4PQzDn2lDqz4G1j; Tue, 28 Feb 2023 13:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsgXI20b1kYD5eLhI+Bx49Y4SM8kIrE0Cqbg8OZjq2I=; b=q+sz1Riih08kYoT3T0tHKKb9Fm+KAfzc9zn9iGJJqp3YicahbIG/MV/dquAzva+Lyg1yk4 R5+Bca2bhL9CpjevT69oiIXUvK+VG9QJsKU78kc4lNeVekMKqaRCK/9/hOlm2q4bJ5XK+h dwgf/xxqc9xPvSRwva2Jz/qDxCWo2xuQOgk8H8U0JTtSHXuePsxTaza9DZUc31jUDDqpI1 m/w9eplsiUrt5jagplvMJQML8hZNJ4WKxGRUXNF5YWHc6LsVPzBn9KJiIRUsxfVT30E5Gy 7ZwlRlXlZGN3t5lRQ+Wc+heuR1wMMqVJ9l3yA0/TvGpin5ZdggyuPK7yqg9eIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsgXI20b1kYD5eLhI+Bx49Y4SM8kIrE0Cqbg8OZjq2I=; b=fr+u7239ETt6j63nvCC/fNQbSTavpDUXojUfJMGkxufYJIMfu+EdfaRhMCkXjRw6PcRo9p DkN9eo7VugpcqESp/RFN2YSRCjxF/87L52+RN3ayS7QsTwDMdwOpbg/id6WWc4lP4q7eRL IhzTYHYyEvtN0iyXqn2b1d3y6F9bHNBIBvvP6y7LgVPhnsL0u/5fCY50rnb99GEDFDe80c qD1XK5tM0FaSGGbYuy+QnX8my8UmODR4jcLrzn3dBZno0u70mbpzrfZhF26JoOCiuEstqk 1nqp1cTRP29s0QCkmcxHlLjI8HxsyI1EKajl+KBj+ocJDmckMcxertoaRnEHrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677592009; a=rsa-sha256; cv=none; b=M+iXy3OQRkmaUvwWPj3u+oNY2nYdJ0r3feBMSqw7YfvFZoNzSex6Ju5WQHG00+8/g1mNKW 2FRPYVXZdpknwfCja7Rph30qWZRkATwsOr3mqQ0PEB6fIaPfipYR+noo7BWCLy5n63HxJe A1qVzchBWCDjpseHeYu9OClvbAlP05WskANtcjbJ3JkPgXYRlHVlRpSNbnqMgyCS3ypp0b 33idvE/gioqBsi7+JWW+ThtzcJhCNpewu5CivJGmO9702z0Ophv/VV6lIO8H/l0JZLe72V uhUkNdjVmj3oDCa2vtnys3ZY7qnut+1IzQEqQQ1T3agJv6SmUzupbQd6AhcYmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQzDn1sc5z18vy; Tue, 28 Feb 2023 13:46: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 31SDkn1H057736; Tue, 28 Feb 2023 13:46:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDknJZ057735; Tue, 28 Feb 2023 13:46:49 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:46:49 GMT Message-Id: <202302281346.31SDknJZ057735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 8866ea619a1f - main - usb: Add HID_IGNORE quirk for APC Smart-UPS1000 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8866ea619a1f91616ba7e002a3ad10dfb10148c9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8866ea619a1f91616ba7e002a3ad10dfb10148c9 commit 8866ea619a1f91616ba7e002a3ad10dfb10148c9 Author: Cy Schubert AuthorDate: 2023-02-22 02:38:16 +0000 Commit: Cy Schubert CommitDate: 2023-02-28 13:46:00 +0000 usb: Add HID_IGNORE quirk for APC Smart-UPS1000 Without the HID_IGNORE quirk enabled it will appear to be a uhid device. PR: 269729 MFC after: 1 week --- sys/dev/usb/quirk/usb_quirk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 6e45e5a2b043..5dcdeb584788 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -112,6 +112,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(XEROX, WCM15, 0x0000, 0xffff, UQ_BROKEN_BIDIR), /* Devices which should be ignored by uhid */ USB_QUIRK(APC, UPS, 0x0000, 0xffff, UQ_HID_IGNORE), + USB_QUIRK(APC, UPS1000, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(BELKIN, F6H375USB, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(BELKIN, F6C550AVR, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(BELKIN, F6C1250TWRK, 0x0000, 0xffff, UQ_HID_IGNORE), From nobody Tue Feb 28 13:56: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 4PQzRh1C36z3vV3k; Tue, 28 Feb 2023 13:56: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 4PQzRg3wVLz4HCh; Tue, 28 Feb 2023 13:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dKUQeDKgXTPlbDWXpnevkbKHc7v1C6RuhK5XJkJNCxo=; b=jISmlCsy4WbLLlQS00PajCNUKSMqAffHAw07ySr3BR3THp4u1ZqYR4T2mUCDDEH/XdxYKT 3CSHNn2Zf+pt95kdl+QtLswgfJNXn6/Ej/TvrnehhMamG1hLqrC/vZkJOlQTVPO2nnATTS uBirGJOP2zZWvWEOO5spMMdaUBWxl2JnzCqmm+1U317qgVVqEbu4AQQLiL+Z1P1EQ2aZir 1ADr7qXSBzpCfiaFLHlL2L5osCB83wgA+xx37GFpdSSQkrZ3fKCxt97ybtZwPilpUHzlXI xhuheXHmj9oTnE2AND3aCoEgObJzomO2DR1rsEcW2oeJ1rPArUmXQONU4hCLhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dKUQeDKgXTPlbDWXpnevkbKHc7v1C6RuhK5XJkJNCxo=; b=TQFOl0oi4BAXXSJ/9QdGPeGNga5d6gbVxhzju05HFzlGO5lCcH4aSmLRQFmXKrfrxqirHa GQdR6ysbdvgxlr5WeiO3ksS4sccfBAgP+9OKbP3GZ9PW3SuDtFYVdC/qw6FnmItJJAHtqU Ek72m/hjnowCRdT01ncMZ8n3DwC/qdJ14sflnKCi3gG1WHFtbCSu5JY48npgNZG5Z7xogR QwF5wIl36S4wfpKWYToRuoi4EByQOqyaMNfWrFQwrvUbc+EH7q52rxp1N9NXw/HFbr59nY DywuyGpZglcrtx5TmEH6Qw39PdN+DogLCXE96tTMFvy6GqNPKFD5xHb00F3rZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677592575; a=rsa-sha256; cv=none; b=tfyMXejMlcu9dt2db8lKc/DUqBX7kqPcKkgziSwDruEUUsKcgejtoWtia2sWoC9o7xhpAs dOvxyjUci8i2X7l4rjIqSHH3rLmSi8pTfcgNQq7QjA/5VLUzwrxW3XvwWL6p6A7nadQnFb fUK0xwjTZtDOVKaUBZ2RfuolcyO1UC5TzCmL3I5Ane5CTFBZhGDXxNAp8S6lH57labsira 8qjO1mL4hiZXuOuipZedjfDnyHFHAQvmoylyJg/whSvjPoyPjV1bNN5KwXO34YoJlulLbH n0LiPMJyakcvH1BLSWQxqDGeloSQH7CN7Hf0F2JKvriKf5aU66ao11lguhOgYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQzRg2zDSz18j3; Tue, 28 Feb 2023 13:56: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 31SDuFIL073487; Tue, 28 Feb 2023 13:56:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDuFTV073486; Tue, 28 Feb 2023 13:56:15 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:56:15 GMT Message-Id: <202302281356.31SDuFTV073486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: eef9f9900f11 - main - growfs_fstab startup script: set dumpdev to AUTO 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eef9f9900f118b5efcabbd5864e7b8b993d09922 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=eef9f9900f118b5efcabbd5864e7b8b993d09922 commit eef9f9900f118b5efcabbd5864e7b8b993d09922 Author: Mike Karels AuthorDate: 2023-02-28 13:55:35 +0000 Commit: Mike Karels CommitDate: 2023-02-28 13:55:35 +0000 growfs_fstab startup script: set dumpdev to AUTO The growfs_fstab script has been testing dumpdev, and if it is AUTO, enables dumps on the newly-added swap device for the initial boot. However, dumpdev defaults to AUTO on main, but NO on stable/13 and release branches. On the other hand, bsdinstall adds dumpdev="AUTO" by default (controlled by a menu item). bsdinstall is not used when booting an SD card or other disk image. Adopt the default from bsdinstall, and set dumpdev to AUTO in /etc/rc.conf in the growfs_fstab script if a swap partition has been added, along with the explanatory comment added by bsdinstall. Differential Revision: https://reviews.freebsd.org/D38751 --- libexec/rc/rc.d/growfs_fstab | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libexec/rc/rc.d/growfs_fstab b/libexec/rc/rc.d/growfs_fstab index 8ad34f452ce0..c51f0dd6f3de 100755 --- a/libexec/rc/rc.d/growfs_fstab +++ b/libexec/rc/rc.d/growfs_fstab @@ -51,14 +51,9 @@ growfs_fstab_start() ' < /etc/fstab then printf "/dev/label/growfs_swap\tnone\t\tswap\tsw\t\t0\t0\n" >>/etc/fstab - - case "$dumpdev" in - [Aa][Uu][Tt][Oo]) - dumpon $dumpon_flags /dev/label/growfs_swap - ;; - *) - ;; - esac + printf '# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable\n' >>/etc/rc.conf + printf 'dumpdev="AUTO"\n' >>/etc/rc.conf + dumpon $dumpon_flags /dev/label/growfs_swap fi fi } From nobody Tue Feb 28 16:10: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 4PR2QS2XS4z3tdCn; Tue, 28 Feb 2023 16:10: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 4PR2QS1smLz3Fcv; Tue, 28 Feb 2023 16:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677600624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CaTxlEl3EQlQpPf2FK50h/UlPlRsuOqp4WiM/zAftUc=; b=hl76o0oxAR5pNcUvk+Q1y44hnl08569ie3XVkaV4wplG1A8zW1jYQHxX3b02NdUXCDvCGY gPgvyyMvGIA/XGf+IucdIzYoAOwv4zmGOFjLhkNRWUpdW4CDGD12efn/tOEJsZnfodzBs6 MIUl6J1kg40NPu/HK8YDtBvhGId5BY0M9Uc9mYrVFs+KIOIHjbDMpC85l/ZHX5QDhDmOO2 AS4qslAYHrHfKOfLYeF7RaiHEtAwQK/BCPF+5h8DQf/PBBG4dk2lgQg0tKzpTkPBQr7bWT C+zdSVjms0uwSZZdTOScOYpSl0A2+fUZpMgkurBCqJPfa2bT+p9ltVU4uVxJMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677600624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CaTxlEl3EQlQpPf2FK50h/UlPlRsuOqp4WiM/zAftUc=; b=H3TDJQ6hv77NrCDLhgYIeQP4onbWtXnD6jkV+K1PyvP3CQXThXEQtbk9c3+ai9drrwzjn9 QEVnzTf3vJL1x0HXhCkEVapPwGnoPBJa+9YhtcrBNvdgwPcoYadzbKtBfrZOTjlXiGurcH A/1UiobFz8Ir31Rsrd9M1RXHUHFKFF9O6sbANnnRdJcoPMagAh0tlcVnn0mkPKq9wY1dDW 4twqws2VNFOrD6Z7iny96QWaO0Io63faeRVMlV9R2pIlWwOjQkepgD+lzDB0/nmUF3Uamb 7WGw0NMdeJnH4x8QbK4HUiC59BjQ6StIg7HnxuQLryzosLgtRyOSTbUDZJDTfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677600624; a=rsa-sha256; cv=none; b=FcoLtm4N9DfgdUMkdyNVSol6CBKHSh/j8YuIKOtTtTT+drv/WbsHQ6H6hRsbHDU72D/v/4 TsXcM0C5bWJww7Qy2QogfPy7ucDwJvS1IClpWqyQii5mDvHZpkih6pptd5i4law1PQjRvJ CXhZraOx0ZiMgRDETdFs+q/NxZT0q0Tbc/Eyejp27Eg19QUy0uWrfgkhwDJPZdhksvDC6k k4qc2V2oQug3JPT9hqZJ8RW3SoArb6ceYUOyGac1Fhe6yr9Fgis2ed9Sq8df+/TXqL2rVl Sg2RizeW/7MquA0hn0r4nI9qm+Jg3Fd5rZVGg18pJAQeSkXJnx5pCNb4p1kFuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR2QS0pslz1DHK; Tue, 28 Feb 2023 16:10: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 31SGANoS096423; Tue, 28 Feb 2023 16:10:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SGANW3096422; Tue, 28 Feb 2023 16:10:23 GMT (envelope-from git) Date: Tue, 28 Feb 2023 16:10:23 GMT Message-Id: <202302281610.31SGANW3096422@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: 092a543ec3d2 - main - dtrace_kinst.4: Demonstrate usage of the "regs" 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 092a543ec3d276e48da09538ae29c736fdce4631 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=092a543ec3d276e48da09538ae29c736fdce4631 commit 092a543ec3d276e48da09538ae29c736fdce4631 Author: Mark Johnston AuthorDate: 2023-02-28 16:09:26 +0000 Commit: Mark Johnston CommitDate: 2023-02-28 16:10:04 +0000 dtrace_kinst.4: Demonstrate usage of the "regs" variable Suggested by: Mina Galić Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D38823 --- share/man/man4/dtrace_kinst.4 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man4/dtrace_kinst.4 b/share/man/man4/dtrace_kinst.4 index 0987ba493e55..349cb1aab1dd 100644 --- a/share/man/man4/dtrace_kinst.4 +++ b/share/man/man4/dtrace_kinst.4 @@ -57,7 +57,7 @@ The provider is currently implemented only for amd64. .Sh EXAMPLES Find the offset corresponding to the third instruction in .Fn vm_fault -and trace it: +and trace it, printing the contents of the RSI register: .Bd -literal -offset indent # kgdb (kgdb) disas /r vm_fault @@ -66,12 +66,12 @@ Dump of assembler code for function vm_fault: 0xffffffff80876df1 <+1>: 48 89 e5 mov %rsp,%rbp 0xffffffff80876df4 <+4>: 41 57 push %r15 -# dtrace -n 'kinst::vm_fault:4' - 2 81500 vm_fault:4 - 2 81500 vm_fault:4 - 2 81500 vm_fault:4 - 2 81500 vm_fault:4 - 0 81500 vm_fault:4 +# dtrace -n 'kinst::vm_fault:4 {printf("%#x", regs[R_RSI]);}' + 2 81500 vm_fault:4 0x827c56000 + 2 81500 vm_fault:4 0x827878000 + 2 81500 vm_fault:4 0x1fab9bef0000 + 2 81500 vm_fault:4 0xe16cf749000 + 0 81500 vm_fault:4 0x13587c366000 ... .Ed .Pp From nobody Tue Feb 28 16:39: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 4PR34V38KXz3tfTS; Tue, 28 Feb 2023 16:39: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 4PR34V0YFSz3KbP; Tue, 28 Feb 2023 16:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677602394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gVOl0YtQyMfidh+pnwMwelDY29q/+NLedTSPaHL42uI=; b=sojSX1n3c3X5uwLMon+Uh+CGR/puvFS1wbKEylHOLL6IG3ShWkmoMpsdbLXhpj2J2AlZuX jE5ERZOMXHiPxG6PF1zvM51bwU2UAP5V+MDPSWJiFZIhhR4ZNZRJNV36qSflxpKQNX5nm5 3viNbWhkvec49P7DxTQlZRA6XswrFi89wj6EXY0+urM8+CarCVur3HO63S7BGJiOP/rK4y 713V9HIYP8lP6FxptF4vq+Dem96EAOj3KsIv3mJH5hbKqlGGSB+k0Hl2J0ZMqpnTNG2U9x q1pPftgECzokY95bIU3DP/Bp8bOS8W7j5pX8IUrUaWfAmkQuLrndKjyrPpfo4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677602394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gVOl0YtQyMfidh+pnwMwelDY29q/+NLedTSPaHL42uI=; b=XWq4xUCfM8XekGPv6hmPeHJyMrk8eMc6MWmlehCNu9FmBIMETJrVUBK8jVDZa8hv4YeXnn BI1laPxC+Cyvel3nUnkU6gBwCDqfJ5MKnR9OUULiLHZHTTw3aWYs2v7st4KAjHmyYYsTNF 9vtf8oua0Qa3QlTL9AHqQTQypEkHD8yqS5L2t6ldjOA+xkb7enSkS9dWeTecZNPGuiyLPM z3uY4j8Ysy1YNn0ezi/XO9o7ffAeYksQw68AOQ/XgBYe3pJrE73GM5/J6DrEeAK1LVHePS yMSzkNUPksHyTvyOgBqa/jVRE5z/iB63Exoi2Yhr9Xi4QT0/LQyNmiJ/CvFIfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677602394; a=rsa-sha256; cv=none; b=Gkm7ht6c8C6wQqpUbznVn/SlbYY8gx6ibrmH+fohXFuMgw0c4kcHBJfJ5r03T1YQrUvWR9 sovB7lIoZ8nRwot5OA9GB4smmU02LFLk6ge2tNUxEYwkYnOGTv8WKoHGT3t/11N+ABr5tm ugEwfN+6mrscNO10xJlU6ipPYqIHFuIypcKuWN2TheUTvIYK5IO+4SiGSilL3l1ykdOq+8 HgKfOI8+gWvM/B1qs52qauqeTcHbPIECwhUE+CnUDytbebpJsoMdqBGp1kSiW0up6oM6cA OoStzqsgsmwBKqngRom66wG85QArRM7FxOr4kDL4wyyWZDuZRWXXmuvwecBYHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR34T6jw9z1Dq4; Tue, 28 Feb 2023 16:39: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 31SGdrCb036666; Tue, 28 Feb 2023 16:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SGdrnX036665; Tue, 28 Feb 2023 16:39:53 GMT (envelope-from git) Date: Tue, 28 Feb 2023 16:39:53 GMT Message-Id: <202302281639.31SGdrnX036665@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: 0f994a19e216 - main - rc.conf(5): describe what unbound(8) does 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: 0f994a19e21678a975784ccc17fcc4a1805dd2b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0f994a19e21678a975784ccc17fcc4a1805dd2b1 commit 0f994a19e21678a975784ccc17fcc4a1805dd2b1 Author: Tom Hukins AuthorDate: 2023-02-28 16:18:06 +0000 Commit: Warner Losh CommitDate: 2023-02-28 16:36:17 +0000 rc.conf(5): describe what unbound(8) does Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/650 --- libexec/rc/rc.conf | 2 +- share/man/man5/rc.conf.5 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index f4d8bc179678..9bb7cf2f3cc1 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -316,7 +316,7 @@ ggated_enable="NO" # Run the ggate daemon (YES/NO). ggated_config="/etc/gg.exports" # ggated(8) exports file. ggated_flags="" # Extra parameters like which port to bind to. ctld_enable="NO" # CAM Target Layer / iSCSI target daemon. -local_unbound_enable="NO" # Local caching resolver +local_unbound_enable="NO" # Local caching DNS resolver local_unbound_tls="NO" # Use DNS over TLS blacklistd_enable="NO" # Run blacklistd daemon (YES/NO). blacklistd_flags="" # Optional flags for blacklistd(8). diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 0080e5f8d075..31f084138029 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 17, 2023 +.Dd February 28, 2023 .Dt RC.CONF 5 .Os .Sh NAME @@ -2348,7 +2348,7 @@ If set to .Dq Li YES , run the .Xr unbound 8 -daemon as a local caching resolver. +daemon as a local caching DNS resolver. .It Va kdc_enable .Pq Vt bool Set to From nobody Tue Feb 28 16:39: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 4PR34X0VDlz3tfYx; Tue, 28 Feb 2023 16:39: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 4PR34W1qqCz3KlF; Tue, 28 Feb 2023 16:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677602395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=324e0eGj56Uz8pOh21NkELkpw2TgiNZaM5pq+kia6MY=; b=Pm64lCWnlioOVnIUDP8JL+PQHw9zftjGUCy95wCBbKjsKq1Ox2BTU/mZ/nAvlp/j6v0Twx MrgX6U1c09AAE5DkeL/1b2r9Xg/E18tWHoh1fJl8O/V9rhsdxfFkLQBMp0qJaoz7Mim6D5 sBnhEMJv1Bak6dtM1JcMXn1xt9RC1DZhGxsJsyH6rfASo+CKikjcNn47PGByJGz025Jg5N wm0jCandiV/AhG3NASMng5PPMXEkuxGDpsNKK6tZTSNDKfjNyirrzDjx8HdbfX/ih5xozz hMTK5Kz6bXUA4CTFaxJ+c8ZsxP98nTic818pYwb6gW2F2zoRT1clGDryMYvrcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677602395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=324e0eGj56Uz8pOh21NkELkpw2TgiNZaM5pq+kia6MY=; b=NvYK/hu5uMA6aNxhf9bUfzdi43b2TLVncQtLM5VeC6ca7UNb3WIYF/n25lI/VehAxLHuul 2k0JfjF93r3Fs32WzDB2z14xBr9D2sDKsc6Jlq9rQs3OwOiYJ/YG9COahEEQBFRohqXLi+ SAjsfOcrs+lbaL1dWnGAg4AaUzTPJ84ceLlNuFhb5F4bsIRc9G+r7mgZyzBsr31qMwP3XI jEN05nVkWzUUABVL1M3KfMq7Lg8/D4gj/wPEl2pa5TpRQbwqurHf4bVSLNmTVen46YLA9f vKfVWc6krZV5QWwMoRUWSNno9x49GGPM9nfmWWvv1tloc5t2ui21VhvGsxsk8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677602395; a=rsa-sha256; cv=none; b=beissNP/Q25aX4N+Whowk6GWfesrBMqnT21SkJDJryjhY/hjVP6QqPZRYIx1ALnIh4YwKJ jlkCr1B+3yDM/8n1evVqerJFS7kcHmfWUTyxidxweFraFoq+FoTOrFKVAIGeYWEXU5xIKl BrqaUR6sWhqlYD0VOJU9YhZkfKMP2QUTeXpDS2lILnWFvpHwtd0imqWY+kEKFkyOntLJ0V iiXlQqg5l1SlHReIrJDO9cLndAuuNxVcwJW6AdBXntgvl4Px6Mntoo4Gj6lBVC69EUU6M1 TL/kszF7Ygo8+lDb13FioDhDziCwLEdb3ThAdUZCgzi/T+yaR+YCq27wDTsxKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR34W0jFlz1Dvk; Tue, 28 Feb 2023 16:39: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 31SGdtAh036685; Tue, 28 Feb 2023 16:39:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SGdtYr036684; Tue, 28 Feb 2023 16:39:55 GMT (envelope-from git) Date: Tue, 28 Feb 2023 16:39:55 GMT Message-Id: <202302281639.31SGdtYr036684@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: b8c44def536c - main - rc.conf(5): document nscd_enable 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: b8c44def536c5f0abb1a167d8c7a23cde2604756 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b8c44def536c5f0abb1a167d8c7a23cde2604756 commit b8c44def536c5f0abb1a167d8c7a23cde2604756 Author: Tom Hukins AuthorDate: 2023-02-28 16:18:06 +0000 Commit: Warner Losh CommitDate: 2023-02-28 16:36:25 +0000 rc.conf(5): document nscd_enable Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/650 --- share/man/man5/rc.conf.5 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 31f084138029..db1dfd3b6b81 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -2349,6 +2349,23 @@ If set to run the .Xr unbound 8 daemon as a local caching DNS resolver. +.It Va nscd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start the +.Xr nscd 8 +caching daemon for the +.Nm nsswitch +subsystem. +.It Va nscd_flags +.Pq Vt str +If +.Va nscd_enable +is set to +.Dq Li YES , +these flags are passed to +.Xr nscd 8 . .It Va kdc_enable .Pq Vt bool Set to From nobody Tue Feb 28 16:39: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 4PR34X5mKnz3tfh9; Tue, 28 Feb 2023 16:39: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 4PR34X2Qkjz3KrQ; Tue, 28 Feb 2023 16:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677602396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zavv8zMqWLP93bB/Mna7HwISXwU3UXysL0MOS7y646s=; b=t6eMFYgOUcc9/Pgk2r671T80EUojyuGkLImYJwhzcIyh0WtzKMS4bgzcbZLjNKP+nLMdoP iYZyRkXpNdOD1eYxWsc3PjpJucfXUNmGtGOdpeoDe/yMb80tMmX0nhlJ7SygMtPITot50o ebidQ/sR2f9DqrHe/L049i43pA+yARpsE5lee6zBvdTnt0TahAWz9NRjPp08HrhCUeIgVZ nl2G+acg2R8AWbeSBItx/cI9XQJtvO+mvsdj887qo/SiN7PjG35//avX7PdisRLlDgFkV2 hfZL84k60SGuZYHsfci00az8r85GIS6/Q3ln6fPk468ILIabhc9mxDqC1zMoOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677602396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zavv8zMqWLP93bB/Mna7HwISXwU3UXysL0MOS7y646s=; b=DzATxN6aQt2uqRgoe2LfT7N+pJxltn0o0WoMABSZVI0+VX5swV1ucdFt8TWOI/zkS9y8Ja j+Hli2CYrrNJO4SxGX3J4UgUlK4FV1hKYp3CWqAnd0icl+j+fCsmLJuxdbQr9LOcYpPps5 oYrCybd9azcTLDR0sv5gN70sV9FfigXgR9f0Bzja43CK24Vxk2y5nRaSZ5G9C1Eq15KoUd THQ+zUDi4sOMjt47PVmZwlxwSqjbLFm1RilzOovKT4IRtjt9yoQPks+QawJvWX6bWvIEp4 lW4y+jfBSQV1kuotQHpc9BiAQLm8vYP3wOMFoaI3SoS5CjWS4ALSxl0Y02CS1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677602396; a=rsa-sha256; cv=none; b=vuufBVJugu5V8vbdnLkHUSu53NGfqdbZblBk2/1RgnGPrkbJDOsN68muE1awv62/QXFxrs OV+Qv+GIjoWNt7Mmkp4nxyDPiPDO1Kgz6IzbDG/DGBkHEsW11Q/rLdCjMH/uR4rvt2wmI+ VkARkiMg4z0gNDDwtRGGMWdoq8xfuRk/Qg92cDpQZs+aw9adF0crYGHcasjDJMgOxRVo7L UOCrxHII8R1KOGo07ORtfmL+yO3JY/yNWziZ+TnGqXsLzLTnQzFQQ/dk8GoGHlvkv2ODZD 9TlTldJS25Iz/vi9dCci/Pv4NRFchC5Au5jlzP2/XtwGR2EaVpRMbmKO8UTdaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR34X1FSWz1DXM; Tue, 28 Feb 2023 16:39: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 31SGdufi036709; Tue, 28 Feb 2023 16:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SGdu7E036707; Tue, 28 Feb 2023 16:39:56 GMT (envelope-from git) Date: Tue, 28 Feb 2023 16:39:56 GMT Message-Id: <202302281639.31SGdu7E036707@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: ce95864fbad8 - main - rc.conf(5): Style issues 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: ce95864fbad87b53f17c625d3b72318764446f00 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ce95864fbad87b53f17c625d3b72318764446f00 commit ce95864fbad87b53f17c625d3b72318764446f00 Author: Warner Losh AuthorDate: 2023-02-28 16:28:30 +0000 Commit: Warner Losh CommitDate: 2023-02-28 16:36:28 +0000 rc.conf(5): Style issues Fix mandoc -Tlint style issues * Use Pa instead of Va for .conf element (mdoc warned the Va was unused, and its the wrong markup anyway) * Drop useless Va and use Va instead of Ar when referring to variables in the jail file * One sentence, one line * drop xr to info(1). That makes no sense, and intro(1) seems unhelpful. This leaves two warnings: gdb(1) xref not found (but we add a parenthetical about the package) and a false positive about a trailing period that is being mistaken for a 'full stop' when it is really just a character in a filename. Sponsored by: Netflix --- share/man/man5/rc.conf.5 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index db1dfd3b6b81..7d1cdfc61966 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -482,7 +482,8 @@ In some cases it may be undesirable to save at shutdown. When set to "NO" .Pa /var/run -is loaded at reboot but not saved at shutdown. Typically in this scenario +is loaded at reboot but not saved at shutdown. +Typically in this scenario a .Pa service .Pa var_run @@ -494,7 +495,8 @@ directory structure once, to be reload during all subsequent reboots. .Pq Vt str Where to save the .Pa /var/run -mtree. The default location is +mtree. +The default location is .Pa /var/db/mtree/BSD.var-run.mtree . .It Va local_startup .Pq Vt str @@ -768,7 +770,8 @@ Destination server port for receiving netflow data .Pa 9995 ) . .It Va ipfw_netflow_version .Pq Vt int -Do not set for using version 5 of the netflow protocol, set it to 9 for using version 9. +Do not set for using version 5 of the netflow protocol, set it to 9 for using +version 9. .It Va ipfw_netflow_fib .Pq Vt int Only match packet in FIB @@ -3959,11 +3962,11 @@ The configuration filename used by utility. The default value is .Pa /etc/jail.conf . -.Pa /etc/jail. Ns Ao Ar jname Ac Ns Va .conf +.Pa /etc/jail. Ns Ao Va jname Ac Ns Pa .conf and -.Pa /etc/jail.conf.d/ Ns Ao Ar jname Ac Ns Va .conf +.Pa /etc/jail.conf.d/ Ns Ao Va jname Ac Ns Pa .conf will also be used if -.Va Ao Ar jname Ac Va +.Ao Va jname Ac is set in .Va jail_list . .It Va jail_parallel_start @@ -4898,7 +4901,6 @@ these are the flags to pass to the .Sh SEE ALSO .Xr chmod 1 , .Xr gdb 1 Pq Pa ports/devel/gdb , -.Xr info 1 , .Xr kbdcontrol 1 , .Xr limits 1 , .Xr protect 1 , From nobody Tue Feb 28 16:58: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 4PR3Tx54dlz3tgb0; Tue, 28 Feb 2023 16:58: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 4PR3Tx4YRMz3Mtp; Tue, 28 Feb 2023 16:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677603509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8FL0ato1mifR0rfdS3WsQDweuJqKCwOFvyTGmFS4v3U=; b=IZy0eIOyV0+T8DeEzaBXJeiW95UCsHC7iJGri/J4bcHyvNOnXuy9Nzqd9lFSvtE14Cyc2A ro+1vxUiPp/qwqKTdMgFfL8FGgvwdwZcfRF/XsHYDq+X7HE4DhbYZfugWpRQZDBotVJe8p FtUSCh8JtUiTkM9A6YWQk+ixuN9oUjYvMiPyeN2zRFcJBog6BAqsfHd5DzsaAVFv/er1Fj zuILlM+Y1kAW0wuLqLj8js8t36gFBGSgatlbrCY3MElzm8RCONr5ZnJgYt31utc0idroMd bbsHagZVMmuKBEYJeuY2TXm5TMTI2ipSLEoGFnmKEof0OuwU90AbQri1eEm9qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677603509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8FL0ato1mifR0rfdS3WsQDweuJqKCwOFvyTGmFS4v3U=; b=dhVzFpBNeikMjk4I2Hkqk5bE+sU5YeIkjUYEPW4rXvz9M46fbd1Be39OFoNu3yLqLkxVfg 2FKkvETdTjweWaucXxDZYJuR8fIU6pbNBCfPG4VCGIwI/7PXUne32eQK9oP2eDn91XW14P WzvOH8/ANSlpmj8g7aqcCY+qsvXlUBozNJki87KiTTB88KlJicNFBWvIeZJW6oaC2bZOBC bSshmVigH3GAicy+MZ3TRw+pZaAAPkOXeUtYkMaErOHDSuO1PtSO8+3PmWaMQKyKRclq56 vZrLMv20JNVDSDYdJ4U58/gLt8gk2NYybgn8oyulHTjXSrcdRDAPXt2F6GLjJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677603509; a=rsa-sha256; cv=none; b=i23kc5H801dd1PrGjONM7XvL0X28l6OP2wOEds0FG4RxL82bMNTaMbiK13WIbpqynzFOiU ONyT2qw1Uj4/Iy4IRAWE3S18ROGSqmIU7GEYaR5aLRttRi+lScHV165SlhhqoBjI8+iEvy 1I1Zr8XegYfcNT34IxPzOmUrOBusb+nzHToeAYYo5n0Kp/lWGb/HaMXWS9qZoB6fdfEDHD Ya4O0RzyggsdY4I3oxqf2BNOyRgvwf/msvWINwIuPzQCP6NMrWKKYwInwjqg1sbraROV0b 5Mo2sPeJ/5tu3wV9PuUCqxOS0ketbr1pln4JEpEis9atQonKzx609N8PEpwY+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR3Tx3VrRz1DxS; Tue, 28 Feb 2023 16:58: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 31SGwT0I069377; Tue, 28 Feb 2023 16:58:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SGwTxp069376; Tue, 28 Feb 2023 16:58:29 GMT (envelope-from git) Date: Tue, 28 Feb 2023 16:58:29 GMT Message-Id: <202302281658.31SGwTxp069376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 5f7bea295283 - main - iflib: fix regression with new pfil(9) KPI 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f7bea2952830ae60d4b65dafdc8411ac9d991f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7bea2952830ae60d4b65dafdc8411ac9d991f0 commit 5f7bea2952830ae60d4b65dafdc8411ac9d991f0 Author: Gleb Smirnoff AuthorDate: 2023-02-28 16:56:20 +0000 Commit: Gleb Smirnoff CommitDate: 2023-02-28 16:56:20 +0000 iflib: fix regression with new pfil(9) KPI Do not pass the pointer to our valid mbuf to pfil(9). Pass an uninitialized one only. This was unsafe with the old KPI, too, but for some reason didn't fail. Fixes: caf32b260ad46b17a4c1a8ce6383e37ac489f023 --- sys/net/iflib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 39f3ccea4317..807ada5eb754 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2713,7 +2713,6 @@ rxd_frag_to_sd(iflib_rxq_t rxq, if_rxd_frag_t irf, bool unload, if_rxsd_t sd, cidx = irf->irf_idx; fl = &rxq->ifr_fl[flid]; sd->ifsd_fl = fl; - m = fl->ifl_sds.ifsd_m[cidx]; sd->ifsd_cl = &fl->ifl_sds.ifsd_cl[cidx]; fl->ifl_credits--; #if MEMORY_LOGGING @@ -2754,12 +2753,14 @@ rxd_frag_to_sd(iflib_rxq_t rxq, if_rxd_frag_t irf, bool unload, if_rxsd_t sd, * Filter said it was OK, so receive like * normal */ + m = fl->ifl_sds.ifsd_m[cidx]; fl->ifl_sds.ifsd_m[cidx] = NULL; break; default: MPASS(0); } } else { + m = fl->ifl_sds.ifsd_m[cidx]; fl->ifl_sds.ifsd_m[cidx] = NULL; if (pf_rv != NULL) *pf_rv = PFIL_PASS; From nobody Tue Feb 28 17:00: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 4PR3XK2b0Vz3tgMB; Tue, 28 Feb 2023 17:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PR3XK27tWz3NLX; Tue, 28 Feb 2023 17:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677603633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qf5JoL61/mfx9XR/E39Sv3w1pZcvK6clpI31JM5J244=; b=JePpB4XZL5/J9sz+xfmTbKi7i7qc3HZShMaTCaKeyZ6hj/kDOtOkIQgQfdewD3pgpovQda yDToIiIEK5UxkyP0AlhAMO7tE6A3yVLxjT274Ied/jQ57upcWawBLYwdUzt4D2zEx5bP/n lVX4Y+s5v42G3inMo+zlzL3a7ZElu+UJn33GwSiIxyObE66V8PGx2txuav12/iRTZjo2Fo +SCvXIiyEjlJfVVxiBNgbI3v5wblSZMMzZhx5WtuiFaGovKi+ySQcgbCyOzD8ofBbmLbzz pGnYpkLURgrCFuehCPjHAwa0gUjANaMoBP8yYIEFjyOFIFhzoLLVBzcp9EZI8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677603633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qf5JoL61/mfx9XR/E39Sv3w1pZcvK6clpI31JM5J244=; b=E8SpxcadjREGmHHlTwF/KW2aIBT91NKXSkMKYGAC1kh+J/921pzPIUETuinK01n+39Zsz/ JzDEcMNYb2nJHSqCyTd5Owy39pxqDpsa3KPyeVevY5eG84gBHCbuQeirD5ZXM4FWt+/tqJ mM8a0VhGWK4vw+IDUZOn0TjfLLZNs0tVK2mF2a4iF6bnFhx9cbSUiiJs78kfb0rwaOzpfr hTURQ3FXf8CTutSAt8Li14ssZUDmB9Qsvr/CMFRelKqeoq35SCkIQrUj8C0D0lLYcSMHeo HSaZ4TJiK6HiV5rtsstJ4XlpWFMAw0strEuwaW0Gw9826Tl4J7jz7W1DiQamBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677603633; a=rsa-sha256; cv=none; b=ag2nCAhNl26Sk1C7zAMzO8ocsQcm5tLeJk/cB/77pGp2Tw4dCuc/5YktpzdU00cG0lpmBW lYXkRlAwx8q1XRrc4s1y/2Xj4Gt1+T3mRkBDzpxtRL9dInKnP/Hi1MmPvRub6Im3o3jR37 aP+E/GTapdYY8+a8E+oIxh2FgMti4pHghZODALi22JGmW1kPyryouW/EQ6FoDYPaqdIHsB MVMAWXZ9YJz1X2BxbkGRfYUqdl66yYJm+SmIarcBaHyvpJkymU5UHWwQgu31//NiACeIXN NuHeISoaqJSHYCmV+GPauDuVFFNAHZmg6/wjHEDWxYh6eyV6hNWOg4rnbg6u3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR3XK1CxVz1DrZ; Tue, 28 Feb 2023 17:00: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 31SH0X2J079186; Tue, 28 Feb 2023 17:00:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SH0XgV079185; Tue, 28 Feb 2023 17:00:33 GMT (envelope-from git) Date: Tue, 28 Feb 2023 17:00:33 GMT Message-Id: <202302281700.31SH0XgV079185@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: 9ab40bc40d4a - main - 310.accounting: Verify process accounting is active before log rotation. 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: 9ab40bc40d4a07e1a9f3622a7779312ca2466b55 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9ab40bc40d4a07e1a9f3622a7779312ca2466b55 commit 9ab40bc40d4a07e1a9f3622a7779312ca2466b55 Author: John Grafton AuthorDate: 2023-02-28 16:49:40 +0000 Commit: Warner Losh CommitDate: 2023-02-28 16:59:34 +0000 310.accounting: Verify process accounting is active before log rotation. This corrects a bug in which the daily periodic script '310.accounting' attempts to rotate logs via /etc/rc.d/accounting by calling onerotate_logs function. The rotate logs function turns accounting back on regardless of what acccounting_enable is set to in /etc/rc.conf. This is due to checkyesno always returning YES since rotate logs is called with the 'one' prefix. In effect, accounting will always be turned back on once a day even if it is disabled and stopped by hand. The fix was simple, just check if accounting is before rotating logs and if it is, don't attempt the rotate. PR: 267464 Reviewed by: imp, hps (lgtm, not approval), Mina Galić Pull Request: https://github.com/freebsd/freebsd-src/pull/648 Differential Revision: https://reviews.freebsd.org/D37434 --- usr.sbin/periodic/etc/daily/310.accounting | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/periodic/etc/daily/310.accounting b/usr.sbin/periodic/etc/daily/310.accounting index b0dd786447eb..8eeed16f0516 100755 --- a/usr.sbin/periodic/etc/daily/310.accounting +++ b/usr.sbin/periodic/etc/daily/310.accounting @@ -18,6 +18,11 @@ case "$daily_accounting_enable" in echo '$daily_accounting_enable is set but /var/account/acct' \ "doesn't exist" rc=2 + elif [ $(sysctl -n kern.acct_configured) -eq 0 ] + then + echo '$daily_accounting_enable is set but' \ + 'process accounting is not active' + rc=2 elif [ -z "$daily_accounting_save" ] then echo '$daily_accounting_enable is set but ' \ From nobody Tue Feb 28 18:07: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 4PR51H5LRGz3tlC1; Tue, 28 Feb 2023 18:07: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 4PR51H55mmz3jgr; Tue, 28 Feb 2023 18:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677607635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QAZJrBa+k0XQQglymvv4SE30a6twvBIM16wEh/Ydsnc=; b=do68FuaG+VQghhTJ7RV7Bl2SwT0VBMSypShxAvJuhLI1IO6077YqEK+W2aTnfO9SZRiXy5 LEZH/1/ZCa4U5aG8kbkXEsoDuyK96pBQWpTDEXSudxHNfLsQH6O8zlTqX7NEZhwaxQZm60 ElUeXY0g5oVVtneaPDtFst8ZqVu2y9agTecP+gr+9UoqkIe7EY4LQKRFnTKBf3VBgSoZ0N 3xb7N0mc1jKYUs/qQ4OPVmWMUfnsKe8wWD9lR+Pb1VexoSO9AN4OhygHWBDwXB72raalMz rmABKMudslJgZ76UNj5pU9UVraUzxr2EX89Dzae7qRwyEhTf3oWqFjrSjaTzSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677607635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QAZJrBa+k0XQQglymvv4SE30a6twvBIM16wEh/Ydsnc=; b=M9f+Iz+BY7Ry5xQIdIk3ZjniWwW+LNQVLz/UQCYmidRXwLnPfvG8pQksq0TfW/DsmntKtp t6W4buaxC2i3RjHmAFLq5nZN+p0y72TnKQrbBcvidYLBK6GJIix02/vFL17MkIW391kzjJ EqNT1fPsaxrpXZLCdSkBMBD/y0fVL2sOsC61llFyfBoYna+DT6FoxO/8sdlJvIX9MztWre y9gzH/GnDM7cX7Z1fFyVkCvmnrmYJ0sR1cUPZ0WNH4Hgnf1rUVpFd8AduAH1Il8CNYGIU9 1SFt+JfonudMxqVHmTHf/RBqC/xeEWl2K+DihGIoz1s9jzEW2zxBI+niCKowsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677607635; a=rsa-sha256; cv=none; b=wE3RHf5wzTrMlxSUncfF9ufxOk+pSf9yG4jnfwGRiQD6PE2gkNZXvW7IMZ++dCjTOTKzFs KAQQVWdl5UwajGce38RaivrmDGR5SIplxKy33OCrS5L07/0Ux4A5Xyh3b2+pmzOD5qIh6n 3b8MQFgYorEn4R3K8k+pXRXp18cQX3rkvy0l/PZevQoCMRp7L5Yrc1tcdvSFhUSV2f2mOz lYpXs9G1KvpI/YeyhCFFJPGAQzTQapup1VntjHP30L+uvMdKJC2oyaWcMlVUrHY5lsT2ra J75QJUc9iRV9lV7+ycJMlZ61LkOhB+qbgI+4A+5Caqhf/EaCk8taAsrTVhw7zQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR51H47qsz1H9x; Tue, 28 Feb 2023 18:07: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 31SI7F2e085055; Tue, 28 Feb 2023 18:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SI7FYq085054; Tue, 28 Feb 2023 18:07:15 GMT (envelope-from git) Date: Tue, 28 Feb 2023 18:07:15 GMT Message-Id: <202302281807.31SI7FYq085054@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: 1b10e191f341 - main - superio,ftgpio: Add support for Fintek F81865 GPIO 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: 1b10e191f341111fad7be32ead11484dfd09b800 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1b10e191f341111fad7be32ead11484dfd09b800 commit 1b10e191f341111fad7be32ead11484dfd09b800 Author: Stéphane Rochoy AuthorDate: 2023-02-28 17:16:46 +0000 Commit: Warner Losh CommitDate: 2023-02-28 17:17:53 +0000 superio,ftgpio: Add support for Fintek F81865 GPIO Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/674 Differential Revision: https://reviews.freebsd.org/D37893 --- share/man/man4/Makefile | 2 + share/man/man4/ftgpio.4 | 56 ++++ share/man/man4/superio.4 | 10 +- sys/conf/files.amd64 | 1 + sys/dev/ftgpio/ftgpio.c | 610 ++++++++++++++++++++++++++++++++++++++++++++ sys/dev/superio/superio.c | 11 +- sys/modules/Makefile | 2 + sys/modules/ftgpio/Makefile | 8 + 8 files changed, 697 insertions(+), 3 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 897c72d43baf..91c43c87a9bf 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -159,6 +159,7 @@ MAN= aac.4 \ ffclock.4 \ filemon.4 \ firewire.4 \ + ${_ftgpio.4} \ ${_ftwd.4} \ full.4 \ fwe.4 \ @@ -802,6 +803,7 @@ _chvgpio.4= chvgpio.4 _coretemp.4= coretemp.4 _cpuctl.4= cpuctl.4 _dpms.4= dpms.4 +_ftgpio.4= ftgpio.4 _ftwd.4= ftwd.4 _hpt27xx.4= hpt27xx.4 _hptiop.4= hptiop.4 diff --git a/share/man/man4/ftgpio.4 b/share/man/man4/ftgpio.4 new file mode 100644 index 000000000000..5c58af8c6833 --- /dev/null +++ b/share/man/man4/ftgpio.4 @@ -0,0 +1,56 @@ +.\" Copyright (c) 2022, Stormshield +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd December 28, 2022 +.Dt FTGPIO 4 +.Os +.Sh NAME +.Nm ftgpio +.Nd GPIO Controller on Fintek Super I/O", +.Sh SYNOPSIS +.Cd "device ftgpio" +.Cd "device gpio" +.Cd "device gpioled" +.Sh DESCRIPTION +The +.Nm +is a driver for the GPIO controller found on Fintek Super I/O chips. +.Sh SEE ALSO +.Xr gpio 3 , +.Xr gpio 4 , +.Xr gpioled 4 , +.Xr gpioctl 8 +.Xr superio 4 , +.Sh HISTORY +The +.Nm +manual page first appeared in +.Fx 14.0 . +.Sh AUTHORS +The +.Nm +driver was partially written by +.An Stéphane Rochoy Aq Mt stéphane.rochoy@stormshield.eu . diff --git a/share/man/man4/superio.4 b/share/man/man4/superio.4 index e242875e3b09..8a5a4239b345 100644 --- a/share/man/man4/superio.4 +++ b/share/man/man4/superio.4 @@ -101,7 +101,15 @@ controllers and a bus driver for supported devices in those controllers. The .Nm driver supports a multitude of Super I/O controllers produced by Nuvoton, -formerly known as Winbond, and ITE. +formerly known as Winbond, and ITE. As well as some produced by Fintek, namely: + +.Bl -bullet -compact +.It +F81803 +.It +F81865 +.El + .Sh SEE ALSO .Xr superio 9 .Sh HISTORY diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index ff5138104bf4..d93cd1461936 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -127,6 +127,7 @@ dev/enic/vnic_dev.c optional enic dev/enic/vnic_intr.c optional enic dev/enic/vnic_rq.c optional enic dev/enic/vnic_wq.c optional enic +dev/ftgpio/ftgpio.c optional ftgpio superio dev/hyperv/vmbus/amd64/hyperv_machdep.c optional hyperv dev/hyperv/vmbus/amd64/vmbus_vector.S optional hyperv dev/iavf/if_iavf_iflib.c optional iavf pci \ diff --git a/sys/dev/ftgpio/ftgpio.c b/sys/dev/ftgpio/ftgpio.c new file mode 100644 index 000000000000..874f6e832949 --- /dev/null +++ b/sys/dev/ftgpio/ftgpio.c @@ -0,0 +1,610 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2016-2023 Stormshield + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include "gpio_if.h" + +#define GPIO_LOCK_INIT(_sc) mtx_init(&(_sc)->mtx, \ + device_get_nameunit(dev), NULL, MTX_DEF) +#define GPIO_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->mtx) +#define GPIO_LOCK(_sc) mtx_lock(&(_sc)->mtx) +#define GPIO_UNLOCK(_sc) mtx_unlock(&(_sc)->mtx) +#define GPIO_ASSERT_LOCKED(_sc) mtx_assert(&(_sc)->mtx, MA_OWNED) +#define GPIO_ASSERT_UNLOCKED(_sc) mtx_assert(&(_sc)->mtx, MA_NOTOWNED) + +/* Global register set */ +#define GPIO4_ENABLE 0x28 +#define GPIO3_ENABLE 0x29 +#define FULL_UR5_UR6 0x2A +#define GPIO1_ENABLE 0x2B +#define GPIO2_ENABLE 0x2C + +/* Logical Device Numbers. */ +#define FTGPIO_LDN_GPIO 0x06 + +#define FTGPIO_MAX_GROUP 6 +#define FTGPIO_MAX_PIN 52 + +#define FTGPIO_IS_VALID_PIN(_p) ((_p) >= 0 && (_p) <= FTGPIO_MAX_PIN) +#define FTGPIO_PIN_GETINDEX(_p) ((_p) & 7) +#define FTGPIO_PIN_GETGROUP(_p) ((_p) >> 3) + +#define FTGPIO_GPIO_CAPS (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT | GPIO_PIN_INVIN | \ + GPIO_PIN_INVOUT | GPIO_PIN_OPENDRAIN | GPIO_PIN_PUSHPULL) + +#define GET_BIT(_v, _b) (((_v) >> (_b)) & 1) + +#define FTGPIO_VERBOSE_PRINTF(dev, ...) \ + do { \ + if (__predict_false(bootverbose)) \ + device_printf(dev, __VA_ARGS__); \ + } while (0) + +/* + * Note that the values are important. + * They match actual register offsets. + * See p71 and p72 of F81865's datasheet. + */ +#define REG_OUTPUT_ENABLE 0 /* Not for GPIO0 */ +#define REG_OUTPUT_DATA 1 +#define REG_PIN_STATUS 2 +#define REG_DRIVE_ENABLE 3 +#define REG_MODE_SELECT_1 4 /* Only for GPIO0 */ +#define REG_MODE_SELECT_2 5 /* Only for GPIO0 */ +#define REG_PULSE_WIDTH_SELECT_1 6 /* Only for GPIO0 */ +#define REG_PULSE_WIDTH_SELECT_2 7 /* Only for GPIO0 */ +#define REG_INTERRUPT_ENABLE 8 /* Only for GPIO0 */ +#define REG_INTERRUPT_STATUS 9 /* Only for GPIO0 */ + +struct ftgpio_device { + uint16_t devid; + const char *descr; +} ftgpio_devices[] = { + { + .devid = 0x0704, + .descr = "GPIO Controller on Fintek Super I/O", + }, +}; + +struct ftgpio_softc { + device_t dev; + device_t busdev; + struct mtx mtx; + struct gpio_pin pins[FTGPIO_MAX_PIN + 1]; +}; + +static uint8_t +ftgpio_group_get_ioreg(struct ftgpio_softc *sc, uint8_t reg, unsigned group) +{ + uint8_t ioreg; + + KASSERT((group == 0 && REG_OUTPUT_DATA <= reg && reg <= REG_INTERRUPT_STATUS) || \ + (group >= 1 && reg <= REG_DRIVE_ENABLE), + ("%s: invalid register %u for group %u", __func__, reg, group)); + ioreg = (((0xf - group) << 4) + reg); + return (ioreg); +} + +static uint8_t +ftgpio_group_get_output(struct ftgpio_softc *sc, unsigned group) +{ + uint8_t ioreg, val; + + ioreg = ftgpio_group_get_ioreg(sc, REG_OUTPUT_DATA, group); + val = superio_read(sc->dev, ioreg); + FTGPIO_VERBOSE_PRINTF(sc->dev, "group GPIO%u output is 0x%x (ioreg=0x%x)\n", + group, val, ioreg); + return (val); +} + +static void +ftgpio_group_set_output(struct ftgpio_softc *sc, unsigned group, uint8_t group_value) +{ + uint8_t ioreg; + + ioreg = ftgpio_group_get_ioreg(sc, REG_OUTPUT_DATA, group); + superio_write(sc->dev, ioreg, group_value); + FTGPIO_VERBOSE_PRINTF(sc->dev, "set group GPIO%u output to 0x%x (ioreg=0x%x)\n", + group, group_value, ioreg); +} + +static uint8_t +ftgpio_group_get_status(struct ftgpio_softc *sc, unsigned group) +{ + uint8_t ioreg; + + ioreg = ftgpio_group_get_ioreg(sc, REG_PIN_STATUS, group); + return (superio_read(sc->dev, ioreg)); +} + +static void +ftgpio_pin_write(struct ftgpio_softc *sc, uint32_t pin_num, bool pin_value) +{ + uint32_t pin_flags; + uint8_t val; + unsigned group, index; + + GPIO_ASSERT_LOCKED(sc); + index = FTGPIO_PIN_GETINDEX(pin_num); + group = FTGPIO_PIN_GETGROUP(pin_num); + pin_flags = sc->pins[pin_num].gp_flags; + if ((pin_flags & (GPIO_PIN_OUTPUT)) == 0) { + FTGPIO_VERBOSE_PRINTF(sc->dev, "pin %u is not configured for output\n", + pin_num, group, index); + return; + } + + FTGPIO_VERBOSE_PRINTF(sc->dev, "set pin %u to %s\n", + pin_num, group, index, (pin_value ? "on" : "off")); + + val = ftgpio_group_get_output(sc, group); + if (!pin_value != !(pin_flags & GPIO_PIN_INVOUT)) + val |= (1 << index); + else + val &= ~(1 << index); + ftgpio_group_set_output(sc, group, val); +} + +static bool +ftgpio_pin_read(struct ftgpio_softc *sc, uint32_t pin_num) +{ + uint32_t pin_flags; + unsigned group, index; + uint8_t val; + bool pin_value; + + GPIO_ASSERT_LOCKED(sc); + group = FTGPIO_PIN_GETGROUP(pin_num); + index = FTGPIO_PIN_GETINDEX(pin_num); + pin_flags = sc->pins[pin_num].gp_flags; + if ((pin_flags & (GPIO_PIN_OUTPUT | GPIO_PIN_INPUT)) == 0) { + FTGPIO_VERBOSE_PRINTF(sc->dev, "pin %u is not configured for input or output\n", + pin_num, group, index); + return (false); + } + + if (pin_flags & GPIO_PIN_OUTPUT) + val = ftgpio_group_get_output(sc, group); + else + val = ftgpio_group_get_status(sc, group); + pin_value = GET_BIT(val, index); + + if (((pin_flags & (GPIO_PIN_OUTPUT|GPIO_PIN_INVOUT)) == (GPIO_PIN_OUTPUT|GPIO_PIN_INVOUT)) || + ((pin_flags & (GPIO_PIN_INPUT |GPIO_PIN_INVIN )) == (GPIO_PIN_INPUT |GPIO_PIN_INVIN))) + pin_value = !pin_value; + FTGPIO_VERBOSE_PRINTF(sc->dev, "pin %u is %s\n", + pin_num, group, index, (pin_value ? "on" : "off")); + + return (pin_value); +} + +static void +ftgpio_pin_set_drive(struct ftgpio_softc *sc, uint32_t pin_num, bool pin_drive) +{ + unsigned group, index; + uint8_t group_drive, ioreg; + + index = FTGPIO_PIN_GETINDEX(pin_num); + group = FTGPIO_PIN_GETGROUP(pin_num); + ioreg = ftgpio_group_get_ioreg(sc, REG_DRIVE_ENABLE, group); + group_drive = superio_read(sc->dev, ioreg); + FTGPIO_VERBOSE_PRINTF(sc->dev, "group GPIO%u drive is 0x%x (ioreg=0x%x)\n", + group, group_drive, ioreg); + + if (pin_drive) + group_drive |= (1 << index); /* push pull */ + else + group_drive &= ~(1 << index); /* open drain */ + superio_write(sc->dev, ioreg, group_drive); +} + +static bool +ftgpio_pin_is_pushpull(struct ftgpio_softc *sc, uint32_t pin_num) +{ + unsigned group, index; + uint8_t group_drive, ioreg; + bool is_pushpull; + + index = FTGPIO_PIN_GETINDEX(pin_num); + group = FTGPIO_PIN_GETGROUP(pin_num); + + ioreg = ftgpio_group_get_ioreg(sc, REG_DRIVE_ENABLE, group); + group_drive = superio_read(sc->dev, ioreg); + FTGPIO_VERBOSE_PRINTF(sc->dev, "group GPIO%u drive is 0x%x (ioreg=0x%x)\n", + group, group_drive, ioreg); + + is_pushpull = group_drive & (1 << index); + FTGPIO_VERBOSE_PRINTF(sc->dev, "pin %u drive is %s\n", + pin_num, group, index, (is_pushpull ? "pushpull" : "opendrain")); + + return (is_pushpull); +} + +static void +ftgpio_pin_set_io(struct ftgpio_softc *sc, uint32_t pin_num, bool pin_io) +{ + unsigned group, index; + uint8_t group_io, ioreg; + + index = FTGPIO_PIN_GETINDEX(pin_num); + group = FTGPIO_PIN_GETGROUP(pin_num); + FTGPIO_VERBOSE_PRINTF(sc->dev, "set pin %u io to %s\n", + pin_num, group, index, (pin_io ? "output" : "input")); + + ioreg = ftgpio_group_get_ioreg(sc, REG_OUTPUT_ENABLE, group); + group_io = superio_read(sc->dev, ioreg); + FTGPIO_VERBOSE_PRINTF(sc->dev, "group GPIO%u io is 0x%x (ioreg=0x%x)\n", + group, group_io, ioreg); + if (pin_io) + group_io |= (1 << index); /* output */ + else + group_io &= ~(1 << index); /* input */ + superio_write(sc->dev, ioreg, group_io); + FTGPIO_VERBOSE_PRINTF(sc->dev, "set group GPIO%u io to 0x%x (ioreg=0x%x)\n", + group, group_io, ioreg); +} + +static bool +ftgpio_pin_is_output(struct ftgpio_softc *sc, uint32_t pin_num) +{ + unsigned group, index; + uint8_t group_io, ioreg; + bool is_output; + + index = FTGPIO_PIN_GETINDEX(pin_num); + group = FTGPIO_PIN_GETGROUP(pin_num); + + ioreg = ftgpio_group_get_ioreg(sc, REG_OUTPUT_ENABLE, group); + group_io = superio_read(sc->dev, ioreg); + FTGPIO_VERBOSE_PRINTF(sc->dev, "group GPIO%u io is 0x%x (ioreg=0x%x)\n", + group, group_io, ioreg); + + is_output = group_io & (1 << index); + FTGPIO_VERBOSE_PRINTF(sc->dev, "pin %u io is %s\n", + pin_num, group, index, (is_output ? "output" : "input")); + return (is_output); +} + +static int +ftgpio_pin_setflags(struct ftgpio_softc *sc, uint32_t pin_num, uint32_t pin_flags) +{ + /* check flags consistency */ + if ((pin_flags & (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)) == + (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)) + return (EINVAL); + + if ((pin_flags & (GPIO_PIN_OPENDRAIN | GPIO_PIN_PUSHPULL)) == + (GPIO_PIN_OPENDRAIN | GPIO_PIN_PUSHPULL)) + return (EINVAL); + + if (pin_flags & GPIO_PIN_OPENDRAIN) + ftgpio_pin_set_drive(sc, pin_num, 0 /* open drain */); + else if (pin_flags & GPIO_PIN_PUSHPULL) + ftgpio_pin_set_drive(sc, pin_num, 1 /* push pull */); + + if (pin_flags & GPIO_PIN_INPUT) + ftgpio_pin_set_io(sc, pin_num, 0 /* input */); + else if (pin_flags & GPIO_PIN_OUTPUT) + ftgpio_pin_set_io(sc, pin_num, 1 /* output */); + + sc->pins[pin_num].gp_flags = pin_flags; + + return (0); +} + +static int +ftgpio_probe(device_t dev) +{ + uint16_t devid; + int i; + + if (superio_vendor(dev) != SUPERIO_VENDOR_FINTEK) + return (ENXIO); + if (superio_get_type(dev) != SUPERIO_DEV_GPIO) + return (ENXIO); + + /* + * There are several GPIO devices, we attach only to one of them + * and use the rest without attaching. + */ + if (superio_get_ldn(dev) != FTGPIO_LDN_GPIO) + return (ENXIO); + + devid = superio_devid(dev); + for (i = 0; i < nitems(ftgpio_devices); i++) { + if (devid == ftgpio_devices[i].devid) { + device_set_desc(dev, ftgpio_devices[i].descr); + return (BUS_PROBE_DEFAULT); + } + } + return (ENXIO); +} + +static int +ftgpio_attach(device_t dev) +{ + struct ftgpio_softc *sc; + int i; + + sc = device_get_softc(dev); + sc->dev = dev; + + GPIO_LOCK_INIT(sc); + GPIO_LOCK(sc); + + for (i = 0; i <= FTGPIO_MAX_PIN; i++) { + struct gpio_pin *pin; + + pin = &sc->pins[i]; + pin->gp_pin = i; + pin->gp_caps = FTGPIO_GPIO_CAPS; + pin->gp_flags = 0; + + if (ftgpio_pin_is_output(sc, i)) + pin->gp_flags |= GPIO_PIN_OUTPUT; + else + pin->gp_flags |= GPIO_PIN_INPUT; + + if (ftgpio_pin_is_pushpull(sc, i)) + pin->gp_flags |= GPIO_PIN_PUSHPULL; + else + pin->gp_flags |= GPIO_PIN_OPENDRAIN; + + snprintf(pin->gp_name, GPIOMAXNAME, "GPIO%u%u", + FTGPIO_PIN_GETGROUP(i), FTGPIO_PIN_GETINDEX(i)); + } + + /* Enable all groups */ + superio_write(sc->dev, GPIO1_ENABLE, 0xFF); + superio_write(sc->dev, GPIO2_ENABLE, 0xFF); + superio_write(sc->dev, GPIO3_ENABLE, 0xFF); + superio_write(sc->dev, GPIO4_ENABLE, 0xFF); + superio_write(sc->dev, FULL_UR5_UR6, 0x0A); + FTGPIO_VERBOSE_PRINTF(sc->dev, "groups GPIO1..GPIO6 enabled\n"); + + GPIO_UNLOCK(sc); + sc->busdev = gpiobus_attach_bus(dev); + if (sc->busdev == NULL) { + GPIO_LOCK_DESTROY(sc); + return (ENXIO); + } + + return (0); +} + +static int +ftgpio_detach(device_t dev) +{ + struct ftgpio_softc *sc; + + sc = device_get_softc(dev); + gpiobus_detach_bus(dev); + GPIO_ASSERT_UNLOCKED(sc); + GPIO_LOCK_DESTROY(sc); + + return (0); +} + +static device_t +ftgpio_gpio_get_bus(device_t dev) +{ + struct ftgpio_softc *sc; + + sc = device_get_softc(dev); + + return (sc->busdev); +} + +static int +ftgpio_gpio_pin_max(device_t dev, int *npins) +{ + *npins = FTGPIO_MAX_PIN; + return (0); +} + +static int +ftgpio_gpio_pin_set(device_t dev, uint32_t pin_num, uint32_t pin_value) +{ + struct ftgpio_softc *sc; + + if (!FTGPIO_IS_VALID_PIN(pin_num)) + return (EINVAL); + + sc = device_get_softc(dev); + GPIO_LOCK(sc); + if ((sc->pins[pin_num].gp_flags & GPIO_PIN_OUTPUT) == 0) { + GPIO_UNLOCK(sc); + return (EINVAL); + } + ftgpio_pin_write(sc, pin_num, pin_value); + GPIO_UNLOCK(sc); + + return (0); +} + +static int +ftgpio_gpio_pin_get(device_t dev, uint32_t pin_num, uint32_t *pin_value) +{ + struct ftgpio_softc *sc; + + if (!FTGPIO_IS_VALID_PIN(pin_num)) + return (EINVAL); + + if (pin_value == NULL) + return (EINVAL); + + sc = device_get_softc(dev); + GPIO_LOCK(sc); + *pin_value = ftgpio_pin_read(sc, pin_num); + GPIO_UNLOCK(sc); + + return (0); +} + +static int +ftgpio_gpio_pin_toggle(device_t dev, uint32_t pin_num) +{ + struct ftgpio_softc *sc; + bool pin_value; + + if (!FTGPIO_IS_VALID_PIN(pin_num)) + return (EINVAL); + + sc = device_get_softc(dev); + GPIO_LOCK(sc); + pin_value = ftgpio_pin_read(sc, pin_num); + ftgpio_pin_write(sc, pin_num, !pin_value); + GPIO_UNLOCK(sc); + + return (0); +} + +static int +ftgpio_gpio_pin_getname(device_t dev, uint32_t pin_num, char *pin_name) +{ + struct ftgpio_softc *sc; + + if (pin_name == NULL) + return (EINVAL); + + if (!FTGPIO_IS_VALID_PIN(pin_num)) + return (EINVAL); + + sc = device_get_softc(dev); + strlcpy(pin_name, sc->pins[pin_num].gp_name, GPIOMAXNAME); + + return (0); +} + +static int +ftgpio_gpio_pin_getcaps(device_t dev, uint32_t pin_num, uint32_t *pin_caps) +{ + struct ftgpio_softc *sc; + + if (pin_caps == NULL) + return (EINVAL); + + if (!FTGPIO_IS_VALID_PIN(pin_num)) + return (EINVAL); + + sc = device_get_softc(dev); + *pin_caps = sc->pins[pin_num].gp_caps; + + return (0); +} + +static int +ftgpio_gpio_pin_getflags(device_t dev, uint32_t pin_num, uint32_t *pin_flags) +{ + struct ftgpio_softc *sc; + + if (pin_flags == NULL) + return (EINVAL); + + if (!FTGPIO_IS_VALID_PIN(pin_num)) + return (EINVAL); + + sc = device_get_softc(dev); + *pin_flags = sc->pins[pin_num].gp_flags; + + return (0); +} + +static int +ftgpio_gpio_pin_setflags(device_t dev, uint32_t pin_num, uint32_t pin_flags) +{ + struct ftgpio_softc *sc; + int ret; + + if (!FTGPIO_IS_VALID_PIN(pin_num)) { + FTGPIO_VERBOSE_PRINTF(dev, "invalid pin number: %u\n", pin_num); + return (EINVAL); + } + + sc = device_get_softc(dev); + + /* Check for unwanted flags. */ + if ((pin_flags & sc->pins[pin_num].gp_caps) != pin_flags) { + FTGPIO_VERBOSE_PRINTF(dev, "invalid pin flags 0x%x, vs caps 0x%x\n", + pin_flags, sc->pins[pin_num].gp_caps); + return (EINVAL); + } + + GPIO_LOCK(sc); + ret = ftgpio_pin_setflags(sc, pin_num, pin_flags); + GPIO_UNLOCK(sc); + + return (ret); +} + +static device_method_t ftgpio_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, ftgpio_probe), + DEVMETHOD(device_attach, ftgpio_attach), + DEVMETHOD(device_detach, ftgpio_detach), + + /* GPIO */ + DEVMETHOD(gpio_get_bus, ftgpio_gpio_get_bus), + DEVMETHOD(gpio_pin_max, ftgpio_gpio_pin_max), + DEVMETHOD(gpio_pin_set, ftgpio_gpio_pin_set), + DEVMETHOD(gpio_pin_get, ftgpio_gpio_pin_get), + DEVMETHOD(gpio_pin_toggle, ftgpio_gpio_pin_toggle), + DEVMETHOD(gpio_pin_getname, ftgpio_gpio_pin_getname), + DEVMETHOD(gpio_pin_getcaps, ftgpio_gpio_pin_getcaps), + DEVMETHOD(gpio_pin_getflags, ftgpio_gpio_pin_getflags), + DEVMETHOD(gpio_pin_setflags, ftgpio_gpio_pin_setflags), + + DEVMETHOD_END +}; + +static driver_t ftgpio_driver = { + "gpio", + ftgpio_methods, + sizeof(struct ftgpio_softc) +}; + +DRIVER_MODULE(ftgpio, superio, ftgpio_driver, NULL, NULL); +MODULE_DEPEND(ftgpio, gpiobus, 1, 1, 1); +MODULE_DEPEND(ftgpio, superio, 1, 1, 1); +MODULE_VERSION(ftgpio, 1); diff --git a/sys/dev/superio/superio.c b/sys/dev/superio/superio.c index 6c7df002f198..37b8d24dd375 100644 --- a/sys/dev/superio/superio.c +++ b/sys/dev/superio/superio.c @@ -283,6 +283,7 @@ const struct sio_device nct5104_devices[] = { }; const struct sio_device fintek_devices[] = { + { .ldn = 6, .type = SUPERIO_DEV_GPIO }, { .ldn = 7, .type = SUPERIO_DEV_WDT }, { .type = SUPERIO_DEV_NONE }, }; @@ -441,6 +442,11 @@ static const struct { .descr = "Fintek F81803", .devices = fintek_devices, }, + { + .vendor = SUPERIO_VENDOR_FINTEK, .devid = 0x0704, + .descr = "Fintek F81865", + .devices = fintek_devices, + }, { 0, 0 } }; @@ -550,8 +556,9 @@ superio_detect(device_t dev, bool claim, struct siosc *sc) sc->revid = revid; KASSERT(sc->vendor == SUPERIO_VENDOR_ITE || - sc->vendor == SUPERIO_VENDOR_NUVOTON, - ("Only ITE and Nuvoton SuperIO-s are supported")); + sc->vendor == SUPERIO_VENDOR_NUVOTON || + sc->vendor == SUPERIO_VENDOR_FINTEK, + ("Only ITE, Nuvoton and Fintek SuperIO-s are supported")); sc->ldn_reg = 0x07; sc->enable_reg = 0x30; sc->current_ldn = 0xff; /* no device should have this */ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 4397c7beb56e..4aa4a26e6d17 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -122,6 +122,7 @@ SUBDIR= \ firewire \ firmware \ flash \ + ${_ftgpio} \ ${_ftwd} \ fusefs \ ${_fxp} \ @@ -681,6 +682,7 @@ _cpufreq= cpufreq _dpms= dpms _em= em _et= et +_ftgpio= ftgpio _ftwd= ftwd _exca= exca _igc= igc diff --git a/sys/modules/ftgpio/Makefile b/sys/modules/ftgpio/Makefile new file mode 100644 index 000000000000..bf9b5f0d762b --- /dev/null +++ b/sys/modules/ftgpio/Makefile @@ -0,0 +1,8 @@ +# $FreeBSD$ + +.PATH: ${SRCTOP}/sys/dev/ftgpio +KMOD= ftgpio +SRCS= ftgpio.c +SRCS+= device_if.h bus_if.h isa_if.h gpio_if.h opt_platform.h + +.include From nobody Tue Feb 28 18:22: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 4PR5MM5mcmz3tmSQ; Tue, 28 Feb 2023 18:22:55 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) (using TLSv1.3 with cipher TLS_AES_256_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 4PR5MM3gyfz3kdj; Tue, 28 Feb 2023 18:22:55 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 96FFA320027A; Tue, 28 Feb 2023 13:22:52 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Tue, 28 Feb 2023 13:22:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1677608571; x= 1677694971; bh=N8jzHeSowGeiKD4Yy0c/4OSjDsTUXuE/mOUdgy1uGLg=; b=C ugUNpcvcKoJOoy2VzIk3D37FsIHvWNz86Kwr2p0yYS8RmBvwxzRssBVfAkgdeNBd +F3xwJdyodcy9Mqwb1ZZjJlosvbaY8FYqPkVvnSmuG8UE8iYePPiO+AX8U063EGE Flkz1+OLtvTnWamFHqICv6ingg5fjSsPbBtxmQDz4zCS8+1zpzAyj0YxO4yfqwiK Zz8H1vjtgXZlzSxW12y0bBtGN2fkbRIb5zKkeetNY6MnH1lFy2E6XEIbIdbzz3k6 wUqOD3TuTpUk0V9PeaBKBRQpUzyIwCqRtGX3UeOUki0kucJDY4t8geRIuv3cvkq3 j2RRTeUw2XD12mx4rvB+g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1677608571; x=1677694971; bh=N 8jzHeSowGeiKD4Yy0c/4OSjDsTUXuE/mOUdgy1uGLg=; b=Y6mnRh4/NnrUsIJsF nuVul4kNqKqpJ2K6T7C5LU9txatvO8jyy8jRM0nM0VPOanOGaTqnyTehEUGNakcT ENVee7OhUobq8ynJQeWFnQMi3AJtWCJ/Fy1A6NpX4z5zMeQxSvkqZaV2zEbpje0f XF9d6YLi/GIoAe1IxFoFszZqJEOmDfH/jq7mCZsA91+FSlrLijbLUM9Ll7N2qXgS E6nyz4N24GObyPUa6i8ApZYZxsVP9K4qtUzfeDH2XUogAdxhPx7ZAlop6MEUiY8B 0LcJvi+j6tKA3BASGL+PLh/nEiPiY4wcaTErRp3Sq80oiuOmWCJmE+u5iOWdyHc4 9yjjw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudelfedggeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefkffggfgfuvfhfhfgjtgfgsehtje ertddtfeejnecuhfhrohhmpegjuhhrihcuoeihuhhrihesrggvthgvrhhnrdhorhhgqeen ucggtffrrghtthgvrhhnpedvheevgedvveeljeekkeeuhfdtvefgjedttddtueevffdtle ehhffhgeffiefhteenucffohhmrghinhepfhhrvggvsghsugdrohhrghdptghonhhfrdhp rgdprghnugdrphgrnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhephihurhhisegrvghtvghrnhdrohhrgh X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 28 Feb 2023 13:22:50 -0500 (EST) Message-ID: <16dd73a9-c85f-2eb9-283d-4a728534d276@aetern.org> Date: Tue, 28 Feb 2023 19:22:48 +0100 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 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: git: ce95864fbad8 - main - rc.conf(5): Style issues Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202302281639.31SGdu7E036707@gitrepo.freebsd.org> From: Yuri In-Reply-To: <202302281639.31SGdu7E036707@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4PR5MM3gyfz3kdj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ce95864fbad87b53f17c625d3b72318764446f00 > > commit ce95864fbad87b53f17c625d3b72318764446f00 > Author: Warner Losh > AuthorDate: 2023-02-28 16:28:30 +0000 > Commit: Warner Losh > CommitDate: 2023-02-28 16:36:28 +0000 > > rc.conf(5): Style issues > > Fix mandoc -Tlint style issues > * Use Pa instead of Va for .conf element (mdoc warned the Va was unused, and its the > wrong markup anyway) > * Drop useless Va and use Va instead of Ar when referring to variables in the jail file > * One sentence, one line > * drop xr to info(1). That makes no sense, and intro(1) seems unhelpful. > > This leaves two warnings: gdb(1) xref not found (but we add a > parenthetical about the package) and a false positive about > a trailing period that is being mistaken for a 'full stop' > when it is really just a character in a filename. You can escape it like below to get rid of the warning: diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 7d1cdfc61966..0f3553922ab3 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -3962,7 +3962,7 @@ The configuration filename used by utility. The default value is .Pa /etc/jail.conf . -.Pa /etc/jail. Ns Ao Va jname Ac Ns Pa .conf +.Pa /etc/jail\&. Ns Ao Va jname Ac Ns Pa .conf and .Pa /etc/jail.conf.d/ Ns Ao Va jname Ac Ns Pa .conf will also be used if From nobody Tue Feb 28 18: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 4PR5QF5fgSz3tmlj; Tue, 28 Feb 2023 18: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 4PR5QF4mJtz3l9v; Tue, 28 Feb 2023 18: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=1677608725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIXPBNSsBq2VCet2dSGBlgFHThLuGTb0TeiCCTMvQfI=; b=SbKXc4AFvyTspSxVLVdVgrdAeGQIFtmMkOyNAxNugvU83e4rCazL5noF+z8CFor8ZSRMD2 BtqQnT6WlqsWZsi/88lvrwdHASXSaA1e5utjci8aetqyGMgklktWsL/ktPnm5mGIlBVifs HCcRUJ8oPtqsnGDFqDnXc9nwlTskWqjTrwS1P+jCGUFxdqRnWNAFPhIziR72RnfjHX4K88 c9svXyeHquR6l5EUBrL4TacZue0QQ5Li4Go4i7Y2+gYB+/GmlbF1N9dL8KYVcMcg2J98aG 3E+hTkala8HVMob0MI09NDmoSMZMeMxzy6T6aPamlBXqKqHjwtnlYzZ4i5mrmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677608725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UIXPBNSsBq2VCet2dSGBlgFHThLuGTb0TeiCCTMvQfI=; b=Z3Zo5RqCkVgWR3tKUNMPOlBvfuWFc4QnCIYVCtcmloBFLvpB+n7GT2DTFZMKjXgqRyUBe9 AC4seuROzVfnU/Rouh2Xn/ab2mpaxA/sBZeCtwh6LwR4CIyZwASxGCBfoAfQAxP8p7tLGd CZVxCycstRzkzzsteHUKz7uF5a4a57yvUyk70vD742W9WOkRstabWu/IqEAnXWZNkzPn/D xqc9upd6wDwKbDZI7p1+/Yr81ruafD6bymr9L2DPQlulw+YLa5zKx17SxxZk0KLHBXroJb XkUQveTocnwHytI0mWIzr84e/wmTsznOqJw0ieRPMqIUnAS65/H7AvP1jxFwJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677608725; a=rsa-sha256; cv=none; b=A8a8DW0ujYSNtXgndEJJNY8XzUaOZBf6E/j+OkSLbchbkIqy/pKFkN+p6bbLh+iVTQ58kW ViECvZU+hbfs0wHteslM8I3GcmqULGfXu7WqsuZqvnx2Mrptz12CQ/dVhX9E3qqgODFzI6 etv4Tq6eczyB6ACfCUtF3rixfuNbbdBPDjuIEq7ItCFdwaY9k9RmhFk2iz5rzKxz+ndua+ tI2FZ7j3O52DUirSBiZGJbADVnllZxirU6SWGlzz/nInBFSEAAV3g6XpYgo9tEzF7pi/tL W9IQ/6IkMf4cwPd3H8fb+0nwSoyfQrDhBBMlWSab0LfaGqeXXQjvCOC37eAPAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR5QF3pJrz1H9V; Tue, 28 Feb 2023 18: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 31SIPPwu016524; Tue, 28 Feb 2023 18: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 31SIPPe5016523; Tue, 28 Feb 2023 18:25:25 GMT (envelope-from git) Date: Tue, 28 Feb 2023 18:25:25 GMT Message-Id: <202302281825.31SIPPe5016523@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: af23369a6dea - main - github: Create pull request template 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: af23369a6deaaeb612ab266eb88b8bb8d560c322 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=af23369a6deaaeb612ab266eb88b8bb8d560c322 commit af23369a6deaaeb612ab266eb88b8bb8d560c322 Author: Warner Losh AuthorDate: 2023-02-28 18:23:53 +0000 Commit: Warner Losh CommitDate: 2023-02-28 18:23:53 +0000 github: Create pull request template Just to see how this looks. Will likely need to iterate. --- .github/PULL_REQUEST_TEMPLATE/pull_request_template.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100755 index 000000000000..5c56b8fd3e0c --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -0,0 +1,16 @@ +Please include this information, either here or in your commit messges for the +pull request, as appropriate (or delete the line if there's nothing relevant. + +PR: +Reported by: +Reviewed by: +Tested by: +Approved by: +Obtained from: +Fixes: +MFC after: +Relnotes: +Security: +Sponsored by: +Pull Request: /pull/###> +Differential Revision: From nobody Tue Feb 28 18:33: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 4PR5bL4hHfz3tmgn; Tue, 28 Feb 2023 18:33: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 4PR5bL3wrCz3lgm; Tue, 28 Feb 2023 18:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677609198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoUK42RzkPhpKVY9PoRO65Zq9DGs9b4PB/LLi7PLz+Q=; b=MVavUn8001LeAZjmCqTao1RtIZLWwbePWBBJioFijmnW5S16DStyU6I08Bn4AQWT0ryckF NTWHCn+C6gpAfp/Kl+ShhtQTGhfU0qtwQ235JhU6Z7LhIBAln6AP0T1jbQSKHQuXe7g/BA KC76DEeAGhFUrIEfDkfsCxGWgHqaVHs0mkJ04f4XYSTYMvK1azXIGRxivSkAkF4Fa6Q2bK uh8gKqTarL20aNm64InsfXT2p6mRufpfUyXBxacORWdSINOnskUCnLwkKAEkOJ+Dt9rErC T1bB1qEF8voIqaLDZ1pEVfNdLaUnGtr/RkFYFI4CkiW6P1nz96NlISP/4P+TVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677609198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoUK42RzkPhpKVY9PoRO65Zq9DGs9b4PB/LLi7PLz+Q=; b=wVrOus6Y3+wUcO78Jc7pbnchT+ueWDs41Cje15k1PHRJoql/iWf6b9Aqg/BTsyAiT797eZ TQNu8xqfzcPKG9Q4+9e2ZV/Kc1b8dsoWsZCLp5mk+tz6DdPdl5zJQOhjwIBuBd+2/nHQ2r chAyCSXNkiYX9srg+JgJpyMvfdxJuTqmYnZUqQwbBl9g2a71+X9Wxd9fqOsW1WG/M00zOu 77ZZsRuQy0CuOJ6GV+TQrgbqxgot+MrN+5ILLKiTHCOp3thcqPkbVza0Jb+9wnJEbwtBJ6 2ucMqID0JbVASyZZpjVbf1dlfgKrBB3j8zftMfRL4/s5GP5Z4MI5CagNVSvMrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677609198; a=rsa-sha256; cv=none; b=WIRWP51StrsVIFnpTa4JKNQyUXhlTJWRMcsPHJFVSoQ6Hflg9bxKM/mosMtG3iTn27xOCQ FbUSGusMpGOhxkUuj5ydIOv9WeoaB4qGi9glihxcv+Ve6c1NYyu7iKuYuNCYaHxtezkdHs M5x3F2QOUmW3lq/15+PBoO900hxlrQNPAbdBXga5q3qXJejp/fRuik97YBZWNFQ0MHIO7B GQTpr2Sm26j9HKiHxEVn6sNfKtw9nVHVIgsufKmxMHYM001RupPLnrYFNOxkPcBq7br0tl CN1U4NjESHYQei0wQcqFv4c2yhs5QP2EMc+A+oT3qrrjQEgYEpc1DXLN2Vh2yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR5bL2ylTz1HFr; Tue, 28 Feb 2023 18:33: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 31SIXIdl032426; Tue, 28 Feb 2023 18:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SIXIhY032425; Tue, 28 Feb 2023 18:33:18 GMT (envelope-from git) Date: Tue, 28 Feb 2023 18:33:18 GMT Message-Id: <202302281833.31SIXIhY032425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 9f83fca88643 - main - MAINTAINERS+GitHub: Reflect ipfilter was moved from contrib to netpfil 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f83fca88643a1fddcaffccd39115a0b48305c6f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9f83fca88643a1fddcaffccd39115a0b48305c6f commit 9f83fca88643a1fddcaffccd39115a0b48305c6f Author: Cy Schubert AuthorDate: 2023-02-28 15:42:47 +0000 Commit: Cy Schubert CommitDate: 2023-02-28 18:33:03 +0000 MAINTAINERS+GitHub: Reflect ipfilter was moved from contrib to netpfil Reflect the fact that ipfilter was moved from contrib to netpfil on December 20, 2021 by 3b9b51fe464e. And that ipfilter userland was moved from contrib to sbin/ipf by 41edb306f056 that same day. --- .github/CODEOWNERS | 4 ++-- MAINTAINERS | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 441774e12449..0d9aed6b5f3b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -35,7 +35,7 @@ /contrib/atf @ngie-eign /contrib/capsicum-test @ngie-eign /contrib/googletest @ngie-eign -/contrib/ipfilter @cschuber +/sbin/ipf @cschuber /contrib/libcxxrt @DimitryAndric @emaste /contrib/llvm-project @DimitryAndric /contrib/llvm-project/libunwind @DimitryAndric @emaste @bsdjhb @@ -69,7 +69,7 @@ /sys/arm64/rockchip @evadot /sys/compat/linprocfs/ @dag-erling /sys/compat/linuxkpi @hselasky -/sys/contrib/ipfilter @cschuber +/sys/netpfil/ipfilter @cschuber /sys/crypto/openssl/ @juikim /sys/dev/drm2 @bsdimp /sys/dev/iscsi/ @trasz diff --git a/MAINTAINERS b/MAINTAINERS index 4bcc352b1fc1..936c6ada9532 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -40,7 +40,7 @@ ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org contrib/atf ngie,#test Pre-commit review requested. contrib/capsicum-test ngie,#capsicum,#test Pre-commit review requested. contrib/googletest ngie,#test Pre-commit review requested. -contrib/ipfilter cy Pre-commit review requested. +sbin/ipf cy Pre-commit review requested. contrib/libcxxrt dim,emaste Pre-commit review preferred. contrib/llvm-project/compiler-rt dim Pre-commit review preferred. contrib/llvm-project/libcxx dim Pre-commit review preferred. @@ -103,7 +103,7 @@ sys/compat/linuxkpi hselasky If in doubt, ask. (to avoid drm graphics drivers impact) sys/contrib/dev/ice erj Pre-commit phabricator review requested. -sys/contrib/ipfilter cy Pre-commit review requested. +sys/netpfil/ipfilter cy Pre-commit review requested. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. sys/dev/ixl erj Pre-commit phabricator review requested. From nobody Tue Feb 28 18:55: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 4PR65C2S6Nz3tnrN; Tue, 28 Feb 2023 18:55:43 +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 4PR65C1vJPz3pG5; Tue, 28 Feb 2023 18:55:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677610543; 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=Zfpn0iqGvx4N2lhVoAQ5Zi+x+f+6Nw5yKYVxyESpqPQ=; b=IuX6VuxK6sbJJIKQdpkyvZHCqWgOcgvDjDmymP2aSuxo+y/wW/9iwRqwgdP2pdE0JpVT7q uMafhTjMzSpKp87xi+w++ZthQ/o5a9+xXLswXTz9tEInQINza0XJ7w9tesDnajeD0/kUA2 v7PUe+0OE1rpmTMLtzQBHDgVI+DfvYUWHwdf3fcYK5Oty8vVQqf8WJR2Hw1NQbANn5qjs4 0J8swON+Zb9iIzwLPSu1XwMo/gqbvKhsxBM0OYJYHARfIjVF4qFH2CNN4CzxnCTgbHMhC2 hYpsH2v1zetYq5N8QFSBDDq6SYdoNVMzgkfPObauS6I0N2cPmBm4Sdsy4VWJXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677610543; 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=Zfpn0iqGvx4N2lhVoAQ5Zi+x+f+6Nw5yKYVxyESpqPQ=; b=Z6+MoK17eM02KHyHoTa8q+xMm9qrZAPIIJztN3eu7R1ZgUyR6lJ3vHZX+2wvT3ecDIpyIa wIRU4pYdcz/z/Drc648pXSPbUPkt8trVPSnmM2RkpBZ+QEvvogzouoV2F4Fhq7xVgHRYLa RjcQNrHJvGBAqiQeSU8s/XkFcBGS1w5ZoH0XEm414eED22eGXnhdhKcJbE4U8V2pOGql1Y D//jaNQLlLZ+OkDdaMRyNjGqo9c5AutMbPflm+AOoaE51hZ7WGX3/Fk4mwdJJTm4PgX0c2 gJsoXpJ5sXKbpXK4mwv2ryAAlDHOh0gfj3wX28babu9s7DxZjL1hg3H6IHPOXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677610543; a=rsa-sha256; cv=none; b=XSYK5Mv20J8N5icHWuTRl/XTfbssTJW7qfz6fL7+dLFGPfRAAoEm+6Uw2r/furyr8zWeWN NhyemxbFzAHkcsZThB0Uu8xydD22yIAFeEFr0J1bAzJA950oFhdC+prif53ULLAflIiE2+ qSw4cFsXBee+zaL8uK/gZvAk5DQ+gb/d0+wN2Ht3TxfA4jxjbY9Ivl/wHWobjmahZY+M97 jAMw0O83Aqd6QRILG47tKvxDX/tn6zSEZCPUv9nhso7CVd2psVHEffzi7+ZXPr+vwbqT6B jBLu+0z5kOHnzphCg0ViM/tUIroTctsKDbUMXwjzFtRHWKKSmTvK1WMU68s8qQ== Received: from [IPV6:2601:648:8680:16b0:a594:db9f:33a9:7aa1] (unknown [IPv6:2601:648:8680:16b0:a594:db9f:33a9:7aa1]) (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 4PR65B3W0rzfXD; Tue, 28 Feb 2023 18:55:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <8ceb993e-1589-fd24-1786-4438acb9a07f@FreeBSD.org> Date: Tue, 28 Feb 2023 10:55:41 -0800 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.8.0 Subject: Re: git: 68912701700c - main - ffs_suspend.c: clean up includes Content-Language: en-US To: Konstantin Belousov , Mateusz Guzik , markj@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202212292056.2BTKuOIu047460@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 1/3/23 3:53 AM, Konstantin Belousov wrote: > On Mon, Jan 02, 2023 at 06:29:57PM +0100, Mateusz Guzik wrote: >> On 12/29/22, Konstantin Belousov wrote: >>> The branch main has been updated by kib: >>> >>> URL: >>> https://cgit.FreeBSD.org/src/commit/?id=68912701700ca3230f3e2d4b7858a038f884a327 >>> >>> commit 68912701700ca3230f3e2d4b7858a038f884a327 >>> Author: Konstantin Belousov >>> AuthorDate: 2022-12-28 18:17:53 +0000 >>> Commit: Konstantin Belousov >>> CommitDate: 2022-12-29 20:55:39 +0000 >>> >>> ffs_suspend.c: clean up includes >>> >>> Order includes alphabetically. >>> Remove unneeded sys/param.h, it is already included by sys/systm.h. >>> >>> Reviewed by: mckusick >>> Sponsored by: The FreeBSD Foundation >>> MFC after: 1 week >>> Differential revision: https://reviews.freebsd.org/D37896 >>> --- >>> sys/ufs/ffs/ffs_suspend.c | 7 +++---- >>> 1 file changed, 3 insertions(+), 4 deletions(-) >>> >>> diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c >>> index d13097109758..e7c976b6e921 100644 >>> --- a/sys/ufs/ffs/ffs_suspend.c >>> +++ b/sys/ufs/ffs/ffs_suspend.c >>> @@ -33,15 +33,14 @@ >>> #include >>> __FBSDID("$FreeBSD$"); >>> >>> -#include >>> #include >>> #include >>> -#include >>> -#include >>> -#include >>> #include >>> +#include >>> #include >>> +#include >>> #include >>> +#include >>> >>> #include >>> >>> >> >> tinderbox fails the KCSAN et al kernels: >> >> In file included from /usr/src/sys/ufs/ffs/ffs_suspend.c:36: >> In file included from /usr/src/sys/sys/systm.h:44: >> In file included from ./machine/atomic.h:73: >> /usr/src/sys/sys/atomic_san.h:117:24: error: unknown type name 'uint8_t' >> ATOMIC_SAN_FUNCS(char, uint8_t); >> ^ >> it bisects to this commit >> > So the problem is that sys/systm.h includes machine/atomic.h which always > had the pre-requisite sys/types.h, and this is documented in atomic(9). > But sys/atomic_san.h uses C89 types in prototypes, not just macros, and > this breaks for real. > > I can > 1. Just add sys/types.h to ufs_suspend.c (I prefer not) > 2. Add sys/types.h to sys/atomic_san.h. > 3. Add sys/types.h to sys/systm.h. > > IMO #2 is not the best solution, since it pollutes systm.h only sometimes, > when the right kernel options are used. I would prefer #3, it seems, but > want to ensure that there is a consensus about the addition to sys/systm.h. FYI, I got a different ream of breakages downstream in CheriBSD due to this commit removing param.h as well. I also only ever recalled Bruce telling me to do either or first (and only one of them). I don't recall any special rules for . CheriBSD has a local diff that tries to sort headers in systm.h which is why we get larger breakage: --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -41,13 +41,22 @@ #define _SYS_SYSTM_H_ #include -#include -#include #include #include #include #include /* for people using printf mainly */ +#include +#include I think if we want to be self-contained we should swap for . I think moving the includes down would also be more consistent with style(9) as well. -- John Baldwin From nobody Tue Feb 28 19:48: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 4PR7Fy5xQvz3trsd; Tue, 28 Feb 2023 19:48:22 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PR7Fy41YBz3t3b; Tue, 28 Feb 2023 19:48:22 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.16.1/8.16.1) with ESMTP id 31SJmFcg084561; Tue, 28 Feb 2023 13:48:15 -0600 (CST) (envelope-from mike@karels.net) Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id VtqELH9a/mNPSgEAs/W3XQ (envelope-from ); Tue, 28 Feb 2023 13:48:15 -0600 From: Mike Karels To: John Baldwin Cc: Konstantin Belousov , Mateusz Guzik , markj@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 68912701700c - main - ffs_suspend.c: clean up includes Date: Tue, 28 Feb 2023 13:48:14 -0600 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <8ceb993e-1589-fd24-1786-4438acb9a07f@FreeBSD.org> References: <202212292056.2BTKuOIu047460@gitrepo.freebsd.org> <8ceb993e-1589-fd24-1786-4438acb9a07f@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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PR7Fy41YBz3t3b X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 28 Feb 2023, at 12:55, John Baldwin wrote: > On 1/3/23 3:53 AM, Konstantin Belousov wrote: >> On Mon, Jan 02, 2023 at 06:29:57PM +0100, Mateusz Guzik wrote: >>> On 12/29/22, Konstantin Belousov wrote: >>>> The branch main has been updated by kib: >>>> >>>> URL: >>>> https://cgit.FreeBSD.org/src/commit/?id=3D68912701700ca3230f3e2d4b78= 58a038f884a327 >>>> >>>> commit 68912701700ca3230f3e2d4b7858a038f884a327 >>>> Author: Konstantin Belousov >>>> AuthorDate: 2022-12-28 18:17:53 +0000 >>>> Commit: Konstantin Belousov >>>> CommitDate: 2022-12-29 20:55:39 +0000 >>>> >>>> ffs_suspend.c: clean up includes >>>> >>>> Order includes alphabetically. >>>> Remove unneeded sys/param.h, it is already included by sys/syst= m.h. >>>> >>>> Reviewed by: mckusick >>>> Sponsored by: The FreeBSD Foundation >>>> MFC after: 1 week >>>> Differential revision: https://reviews.freebsd.org/D37896 >>>> --- >>>> sys/ufs/ffs/ffs_suspend.c | 7 +++---- >>>> 1 file changed, 3 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c >>>> index d13097109758..e7c976b6e921 100644 >>>> --- a/sys/ufs/ffs/ffs_suspend.c >>>> +++ b/sys/ufs/ffs/ffs_suspend.c >>>> @@ -33,15 +33,14 @@ >>>> #include >>>> __FBSDID("$FreeBSD$"); >>>> >>>> -#include >>>> #include >>>> #include >>>> -#include >>>> -#include >>>> -#include >>>> #include >>>> +#include >>>> #include >>>> +#include >>>> #include >>>> +#include >>>> >>>> #include >>>> >>>> >>> >>> tinderbox fails the KCSAN et al kernels: >>> >>> In file included from /usr/src/sys/ufs/ffs/ffs_suspend.c:36: >>> In file included from /usr/src/sys/sys/systm.h:44: >>> In file included from ./machine/atomic.h:73: >>> /usr/src/sys/sys/atomic_san.h:117:24: error: unknown type name 'uint8= _t' >>> ATOMIC_SAN_FUNCS(char, uint8_t); >>> ^ >>> it bisects to this commit >>> >> So the problem is that sys/systm.h includes machine/atomic.h which alw= ays >> had the pre-requisite sys/types.h, and this is documented in atomic(9)= =2E >> But sys/atomic_san.h uses C89 types in prototypes, not just macros, an= d >> this breaks for real. >> >> I can >> 1. Just add sys/types.h to ufs_suspend.c (I prefer not) >> 2. Add sys/types.h to sys/atomic_san.h. >> 3. Add sys/types.h to sys/systm.h. >> >> IMO #2 is not the best solution, since it pollutes systm.h only someti= mes, >> when the right kernel options are used. I would prefer #3, it seems, = but >> want to ensure that there is a consensus about the addition to sys/sys= tm.h. > > FYI, I got a different ream of breakages downstream in CheriBSD due to = this > commit removing param.h as well. I also only ever recalled Bruce telli= ng me > to do either or first (and only one of them= ). > I don't recall any special rules for . > > CheriBSD has a local diff that tries to sort headers in systm.h which i= s why > we get larger breakage: > > --- a/sys/sys/systm.h > +++ b/sys/sys/systm.h > @@ -41,13 +41,22 @@ > #define _SYS_SYSTM_H_ > #include > -#include > -#include > #include > #include > #include > #include /* for people using printf main= ly */ > +#include > +#include > > I think if we want to be self-contained we should swap > for . I think moving the includes down would = also be > more consistent with style(9) as well. I prefer retaining or to be the first include= in kernel files, as has long been traditional. systm.h didn=E2=80=99t originally i= nclude param.h, and param.h isn=E2=80=99t anywhere near the top of systm.h. I=E2=80=99m = sure it was just added to unbreak some file that didn=E2=80=99t include param.h when a dependenc= y on MAXCPU crept in. It looks like 15 or more headers in sys/ include ; syst= m.h is not really special in that regard. Finally, style(9) documents use of ei= ther or first, then if needed. Mike From nobody Tue Feb 28 20:16: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 4PR7tH2dfmz3tsbW; Tue, 28 Feb 2023 20:16: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 4PR7tH1zH6z3vgK; Tue, 28 Feb 2023 20:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677615383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxNr3l2dAhu7p5U2LIXimXfc8WvWbT9YYUH9JMdJe5I=; b=OloD25yC/7o0P7T9v8VAIHul2y0Fya69pDdIi8/R1It+uTmgb/+F4+tSSyMroCxEvMvcTU 4OyIR2Jl/LZKPAALvfl9eN1P09n0PJsByE95WEjwEivBgzQqDqrOxMOxCtj+FPpOe+hY9G +b9e5eqQ0Kq3wMafOpdN1Yqj4LRvHgB4gJ8mOIuHPGF4x/qyEECzOS2HDLtaUm12l7UAms MC9O6zyCXDkTxhddgOiRrz5D282YsuUn9E9gDD2VtGi4Rh1P30fcV1//6Oh+/aWWFfZkKi OSqeXshnuUGykfIBTw1/1ikbP1d/r7tQQk7+KR3NvDPRoWhmeyrtlfKr3eSO3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677615383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxNr3l2dAhu7p5U2LIXimXfc8WvWbT9YYUH9JMdJe5I=; b=EHGxzdKzrzSV0j2ym9NaORakc/W+CL+CJCSOcZXFwgS/GHiD9Y82u4O+jQO9DnC3VehSqd Ys7Jezgm6t1vT0kGoWbgVAKvorOVFPvIqFF2fCchR8ow8GgMBHgxuKrGq88cXvyO4r9iPN kK2Q9raJ8rStZm+quon0gFvH5/uvIsA5YADszjPtwH6vIG1y767mKpkSDfFaBlHqMoZv8K lKnpTtv699vDFVBvg3wkb75DzwH/Cx/v3CkL/0JuTC5QbtNMF+or7qs48cg6Rb8Xux2jka 69qisQu8S7lWA6z/3ZLByjokWuRUp53dZcKpKe/D1LFmPID1eDePpsDgZlDcYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677615383; a=rsa-sha256; cv=none; b=b4hXBxb55U9HRRlM5qxV24qbM3kYuTw72cwxMQmAO+RLnJ9yjJ3elTtBOlG6giRf+hgzEI TagfTLoWGMmNTlLLwl9yxe9JruXNXjvB5+zpvvqcHZOF3jTtsCUS2unKC08d4oIoWugOP8 dDV/2nM48ZtUnwXxzikbfRV1nGrCL8cOacujJsMs4cFkCra0eydMXNYTwspJCmaluV04VM Z8JwlRqx7G4ollIgKejfjNgJkue32BrtyXxwYq0nKiJuAk+am6DFBJjJJKfri4ZPj3ow44 6RiIdhqzKDIQj5BYPnTQDun4gRB2IAl5IXw1nbDtpgfKBj2/K+a2U8FIFNs8Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR7tH138xz1LMr; Tue, 28 Feb 2023 20:16: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 31SKGN4e097614; Tue, 28 Feb 2023 20:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SKGNog097613; Tue, 28 Feb 2023 20:16:23 GMT (envelope-from git) Date: Tue, 28 Feb 2023 20:16:23 GMT Message-Id: <202302282016.31SKGNog097613@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: 399a5655e6ed - main - tcp: Make TCP PCAP buffer properly configurable. 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: 399a5655e6edf69a63f1c37e66fdad19dcfdb5cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=399a5655e6edf69a63f1c37e66fdad19dcfdb5cf commit 399a5655e6edf69a63f1c37e66fdad19dcfdb5cf Author: Richard Scheffenegger AuthorDate: 2023-02-28 18:57:30 +0000 Commit: Richard Scheffenegger CommitDate: 2023-02-28 19:12:11 +0000 tcp: Make TCP PCAP buffer properly configurable. Reviewed By: tuexen, cc, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D38824 --- sys/netinet/tcp_usrreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index f17285664ce5..d0a929c57c7b 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2320,7 +2320,8 @@ unlock_and_done: INP_WLOCK_RECHECK(inp); if (optval >= 0) - tcp_pcap_set_sock_max(TCP_PCAP_OUT ? + tcp_pcap_set_sock_max( + (sopt->sopt_name == TCP_PCAP_OUT) ? &(tp->t_outpkts) : &(tp->t_inpkts), optval); else @@ -2561,7 +2562,8 @@ unhold: #ifdef TCPPCAP case TCP_PCAP_OUT: case TCP_PCAP_IN: - optval = tcp_pcap_get_sock_max(TCP_PCAP_OUT ? + optval = tcp_pcap_get_sock_max( + (sopt->sopt_name == TCP_PCAP_OUT) ? &(tp->t_outpkts) : &(tp->t_inpkts)); INP_WUNLOCK(inp); error = sooptcopyout(sopt, &optval, sizeof optval); From nobody Tue Feb 28 21:05: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 4PR8yw72YCz3twxn; Tue, 28 Feb 2023 21:05: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 4PR8yw6GPnz41FM; Tue, 28 Feb 2023 21:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677618328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KY+9NC42Xac+xAYaL6c34hom0mLnjXboZqnyUxDw6rk=; b=izYY6ITz1YOBxUieuVZMgCNBoc4hsOagC+18xazawwbfbm2vhdzQiAT8sDsmw9WpnyNmRQ 3Oq4rgvq4eM91o4JLXdHQ0Gks/SNpCGD15geImum/oSk1+hK9Rbi2by6H9gpiEEvP+PbWW clkKdQ0KKuhqg/NoWSY6qSdgwrlo2Lj/lcdcIpg81mSsDcrIFXi6LKx3/Zxgq2VANhaBCd gUTKCDPHMhwKBr4klJMy472l2iUfC0JRxJXJ3RSHYqijAqQP+N3iwItXRSKnZ/UgwZ2wBW qoJWt12ZWTuGXX52ZVn0mFxJ7+5JhCWM+WH3SLFis86HJ3urWKGR2IoYEfNUTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677618328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KY+9NC42Xac+xAYaL6c34hom0mLnjXboZqnyUxDw6rk=; b=KHlIxFvKLwd8Te7pOnmxj5p/Q/r2M2p9N05RzBY937XEK5HHffIo7jQjwdjni8rF62bXkj 9SiJR1wh2bmfyqNWqvUDHuWtwmuhG+GiZEeNSaV3X9bpxTiYT+Bu91Sx/GBUzu/plAqLgJ wAdUIHHJ+X/Jt5Hb7hhNTXZGmixgp+o37vkHcZicwcX3hjyxP55JGCYNnywyjF8ec3i0yJ ukClC5OEpeXMoWBhO3W2nOvpn1jpndbvtdk+CRWR0DPTxyg5VYaVbfrSPPTi7QM9CmZIpZ oE2udt5GHYtFMvhQ80F1HAh5a2TV10W+dhhfUGwT3Pm8VDWkb4KlP5WCFprXMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677618328; a=rsa-sha256; cv=none; b=bAjmctAuKyKJGIObx6aeoKp1XdxsTD7sXu+qagGp0c/AWvnn/HGO4CrbaDKwAppNTYU/YD oyHOjFD4AmM2IBdvqqqKHYQkImwqgLBSXW8Z5P9ZicnXDL2QdktE5BPF+5N+mdxbw83/LE CeVVrNj1geZV2leYL+aryDMhCQQRLh+0QbD69+2h77ARLfuh/KJ5qS2kRqikVUCQl61X4n LYp+oIchwSm5sO9FUIvFmAA6Btm49WrpKgOCT/ywRDFHyxyjO79CPcmlzvVBek0kR35gBn tYlnmK9/K7zpWfKkVbnhXRRWOQkgRRURWGHkdmkYnK80riuQ3dDPJlrTcFI0bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR8yw5HZTz1MMx; Tue, 28 Feb 2023 21:05: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 31SL5SCX080590; Tue, 28 Feb 2023 21:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SL5SHN080589; Tue, 28 Feb 2023 21:05:28 GMT (envelope-from git) Date: Tue, 28 Feb 2023 21:05:28 GMT Message-Id: <202302282105.31SL5SHN080589@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: d1d0ae97ca88 - main - librss: Remove rss_socket_set_rss_bucket() 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: d1d0ae97ca8837306b2a791829566787d1ac723f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d1d0ae97ca8837306b2a791829566787d1ac723f commit d1d0ae97ca8837306b2a791829566787d1ac723f Author: Mark Johnston AuthorDate: 2023-02-28 20:57:11 +0000 Commit: Mark Johnston CommitDate: 2023-02-28 20:57:11 +0000 librss: Remove rss_socket_set_rss_bucket() In preparation for the removal of the IP_RSS_LISTEN_BUCKET socket option. PR: 261398 (exp-run) Reviewed by: glebius Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38821 --- lib/librss/librss.3 | 9 --------- lib/librss/librss.c | 32 -------------------------------- lib/librss/librss.h | 7 ------- 3 files changed, 48 deletions(-) diff --git a/lib/librss/librss.3 b/lib/librss/librss.3 index 302d431b6c28..469132027b26 100644 --- a/lib/librss/librss.3 +++ b/lib/librss/librss.3 @@ -23,8 +23,6 @@ .Ft int .Fn rss_set_bucket_rebalance_cb "rss_bucket_rebalance_cb_t *cb" "void *cbdata" .Ft int -.Fn rss_sock_set_rss_bucket "int fd" "int af" "int rss_bucket" -.Ft int .Fn rss_sock_set_recvrss "int fd" "int af" "int val" .Sh DESCRIPTION The @@ -110,13 +108,6 @@ datagrams/connections that are not initially consumed by a PCB aware socket. .Pp The -.Fn rss_sock_set_rss_bucket -function configures the RSS bucket which a socket belongs in. -Note that TCP sockets created by -.Xr accept 2 -will automatically be assigned to the RSS bucket. -.Pp -The .Fn rss_sock_set_recvrss function enables or disables receiving RSS related information as socket options in. diff --git a/lib/librss/librss.c b/lib/librss/librss.c index 4125e94305e2..fcaac4cc7366 100644 --- a/lib/librss/librss.c +++ b/lib/librss/librss.c @@ -46,38 +46,6 @@ __FBSDID("$FreeBSD$"); #include "librss.h" -int -rss_sock_set_rss_bucket(int fd, int af, int rss_bucket) -{ - int opt; - socklen_t optlen; - int retval; - int f, p; - - switch (af) { - case AF_INET: - p = IPPROTO_IP; - f = IP_RSS_LISTEN_BUCKET; - break; - case AF_INET6: - p = IPPROTO_IPV6; - f = IPV6_RSS_LISTEN_BUCKET; - break; - default: - return (-1); - } - - /* Set RSS bucket */ - opt = rss_bucket; - optlen = sizeof(opt); - retval = setsockopt(fd, p, f, &opt, optlen); - if (retval < 0) { - warn("%s: setsockopt(IP_RSS_LISTEN_BUCKET)", __func__); - return (-1); - } - return (0); -} - int rss_sock_set_recvrss(int fd, int af, int val) { diff --git a/lib/librss/librss.h b/lib/librss/librss.h index 134ae28811a2..c90bff86ae50 100644 --- a/lib/librss/librss.h +++ b/lib/librss/librss.h @@ -46,13 +46,6 @@ typedef enum { typedef void rss_bucket_rebalance_cb_t(void *arg); -/* - * Set the RSS bucket for the given file descriptor. - * - * This must be done before bind(). - */ -extern int rss_sock_set_rss_bucket(int fd, int af, int rss_bucket); - /* * Enable or disable receiving RSS/flowid information on * received UDP frames. From nobody Tue Feb 28 21:05: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 4PR8yy0Pjnz3twVS; Tue, 28 Feb 2023 21:05: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 4PR8yx72QDz41Yh; Tue, 28 Feb 2023 21:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677618330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bS4YchWq8IonHOF5JJKjcB7CM6bGQ/cdNufWG/kwuhg=; b=S8CKmi7vUTwi9P9oYZdftaeAaS51PxqW/s7Mw4pjIWSKuuEIdvcMYnvrx4Ljl8wJCQCdtg Jtg9zSgCSP/vWjhAEOVenD99nkIuYYgGp0I7jzUz865FUBgnTRxTwKDsqs7011Xw7U5cSw igHkQikD+9VvlBdHPpiyC53RJKhrEvod7rrvMiyC7eyjqwD+D3oP84j5UztXKzTTc5dLWw RpV0LZ0FqzBTkmCXxZheOYrbaJt4D6XyoHhlY9yJYxP2911dGq8mD3+qbKqz2TlabWqbN/ SR3bMW7UR9WZpyxWII+zO+nXdjrAFsjv01sKb9PLT9h/GZ9iUq+HH32WhwZUTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677618330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bS4YchWq8IonHOF5JJKjcB7CM6bGQ/cdNufWG/kwuhg=; b=OM9lB9ciEE1aJQObRpAqwk8BQCkZ554M88VrF3AljMljIshxRb6Zj9iURjpajFAHezhv+q /8Nc2Um156lpzJiRrrk4FUYWTBWcW5n7cTfps44TQpC121nbuAixe9AZBwtR/09Y0ayYrm D3cMkvlECBwzy+tSmHY03FnoNEg6GYc+SRZqdIKgZC5e7tyA0MJPxsA/TiFUoPwwi/0U1j zGVCrBye1KRsSdJXBBNnRk5lcfmOMMP3zwDIfnNRsIjO/QaiCvxF0A4QDQNgBT4uEbTVxf gXa4HEMf8rdABTRozpVcElpapNG47v06JhVs+x/2IDAE8IYIessvFQPllIcH4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677618330; a=rsa-sha256; cv=none; b=AkuY/F+UZ/NoZsMpCHQ4Yiu+3ObHwQ51uA465a6Re8e7C0e7Cy9oOcp9iCURzKnGOxxCn2 TstAA69o/c+bIGPBmyUOX7FcwhM4jtzUnpSngfHwCDe3gaGsQzST7yVlwUxozJf4OdOJaN vFOP/xCcgUwH41x0QbnJOf9n35VB9MVlddQoMLQHbRi1ZDgVrkTPquYp79sFr/XdYvMmVQ wyVQsQScMXrOA1F0E5XBYdq63nBh6VZmEsmpOUu5B4E2qp/o/AR53mSH1tsGJJFxmImAGM lVRn4uQypjmaMpC8lIS+qLB0hGi9LCCNlzI/y4vWfJolalo4rlPCA7BQxva1ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR8yx67ntz1MQm; Tue, 28 Feb 2023 21:05: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 31SL5TO2080609; Tue, 28 Feb 2023 21:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SL5TEl080608; Tue, 28 Feb 2023 21:05:29 GMT (envelope-from git) Date: Tue, 28 Feb 2023 21:05:29 GMT Message-Id: <202302282105.31SL5TEl080608@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: 317fa5169d35 - main - netinet: Remove the IP(V6)_RSS_LISTEN_BUCKET socket option 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: 317fa5169d35c508a05c520a764630252adebea8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=317fa5169d35c508a05c520a764630252adebea8 commit 317fa5169d35c508a05c520a764630252adebea8 Author: Mark Johnston AuthorDate: 2023-02-28 20:57:21 +0000 Commit: Mark Johnston CommitDate: 2023-02-28 20:57:21 +0000 netinet: Remove the IP(V6)_RSS_LISTEN_BUCKET socket option It has no effect, and an exp-run revealed that it is not in use. PR: 261398 (exp-run) Reviewed by: mjg, glebius Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38822 --- sys/netinet/in.h | 3 ++- sys/netinet/in_pcb.c | 1 - sys/netinet/in_pcb.h | 6 +++--- sys/netinet/ip_output.c | 14 +------------- sys/netinet6/in6.h | 4 ++-- sys/netinet6/ip6_output.c | 16 ---------------- 6 files changed, 8 insertions(+), 36 deletions(-) diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 99809b3ebaa4..0106f55e1f1a 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -463,7 +463,8 @@ VNET_DECLARE(uint32_t, in_loopback_mask); /* unused; was IP_FAITH */ #define IP_ONESBCAST 23 /* bool: send all-ones broadcast */ #define IP_BINDANY 24 /* bool: allow bind to any address */ -#define IP_RSS_LISTEN_BUCKET 26 /* int; set RSS listen bucket */ + /* unused; was IP_BIND_MULTI */ + /* unused; was IP_RSS_LISTEN_BUCKET */ #define IP_ORIGDSTADDR 27 /* bool: receive IP dst addr/port w/dgram */ #define IP_RECVORIGDSTADDR IP_ORIGDSTADDR diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index ce95ece8f5f2..5768979f21e0 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2645,7 +2645,6 @@ in_pcbtoxinpcb(const struct inpcb *inp, struct xinpcb *xi) xi->inp_flowtype = inp->inp_flowtype; xi->inp_flags = inp->inp_flags; xi->inp_flags2 = inp->inp_flags2; - xi->inp_rss_listen_bucket = inp->inp_rss_listen_bucket; xi->in6p_cksum = inp->in6p_cksum; xi->in6p_hops = inp->in6p_hops; xi->inp_ip_tos = inp->inp_ip_tos; diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 9ab9ed87528e..f8a2a311cf4e 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -263,7 +263,6 @@ struct inpcb { uint32_t inp_flowid; /* (x) flow id / queue id */ struct m_snd_tag *inp_snd_tag; /* (i) send tag for outgoing mbufs */ uint32_t inp_flowtype; /* (x) M_HASHTYPE value */ - uint32_t inp_rss_listen_bucket; /* (x) overridden RSS listen bucket */ /* Local and foreign ports, local and foreign addr. */ struct in_conninfo inp_inc; /* (i) list for PCB's local port */ @@ -347,7 +346,7 @@ struct xinpcb { uint32_t inp_flowtype; /* (s) */ int32_t inp_flags; /* (s,p) */ int32_t inp_flags2; /* (s) */ - int32_t inp_rss_listen_bucket; /* (n) */ + uint32_t inp_unused; int32_t in6p_cksum; /* (n) */ int32_t inp_spare32[4]; uint16_t in6p_hops; /* (n) */ @@ -669,7 +668,8 @@ int inp_so_options(const struct inpcb *inp); #define INP_REUSEPORT 0x00000008 /* SO_REUSEPORT option is set */ /* 0x00000010 */ #define INP_REUSEADDR 0x00000020 /* SO_REUSEADDR option is set */ -#define INP_RSS_BUCKET_SET 0x00000080 /* IP_RSS_LISTEN_BUCKET is set */ +/* 0x00000040 */ +/* 0x00000080 */ #define INP_RECVFLOWID 0x00000100 /* populate recv datagram with flow info */ #define INP_RECVRSSBUCKETID 0x00000200 /* populate recv datagram with bucket id */ #define INP_RATE_LIMIT_CHANGED 0x00000400 /* rate limit needs attention */ diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 13ba15050769..ceae756affa3 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1166,9 +1166,6 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) break; } /* FALLTHROUGH */ -#ifdef RSS - case IP_RSS_LISTEN_BUCKET: -#endif case IP_TOS: case IP_TTL: case IP_MINTTL: @@ -1264,16 +1261,7 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) case IP_RECVFLOWID: OPTSET2(INP_RECVFLOWID, optval); break; -#ifdef RSS - case IP_RSS_LISTEN_BUCKET: - if ((optval >= 0) && - (optval < rss_getnumbuckets())) { - inp->inp_rss_listen_bucket = optval; - OPTSET2(INP_RSS_BUCKET_SET, 1); - } else { - error = EINVAL; - } - break; +#ifdef RSS case IP_RECVRSSBUCKETID: OPTSET2(INP_RECVRSSBUCKETID, optval); break; diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 23a31010d081..41fe07fe093d 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -483,8 +483,8 @@ struct route_in6 { */ #define IPV6_BINDANY 64 /* bool: allow bind to any address */ - -#define IPV6_RSS_LISTEN_BUCKET 66 /* int; set RSS listen bucket */ + /* unused; was IPV6_BIND_MULTI */ + /* unused; was IPV6_RSS_LISTEN_BUCKET */ #define IPV6_FLOWID 67 /* int; flowid of given socket */ #define IPV6_FLOWTYPE 68 /* int; flowtype of given socket */ #define IPV6_RSSBUCKETID 69 /* int; RSS bucket ID of given socket */ diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 01c6ba5b41d4..59ac04842854 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1752,9 +1752,6 @@ ip6_ctloutput(struct socket *so, struct sockopt *sopt) case IPV6_AUTOFLOWLABEL: case IPV6_ORIGDSTADDR: case IPV6_BINDANY: -#ifdef RSS - case IPV6_RSS_LISTEN_BUCKET: -#endif case IPV6_VLAN_PCP: if (optname == IPV6_BINDANY && td != NULL) { error = priv_check(td, @@ -1932,19 +1929,6 @@ do { \ case IPV6_BINDANY: OPTSET(INP_BINDANY); break; -#ifdef RSS - case IPV6_RSS_LISTEN_BUCKET: - if ((optval >= 0) && - (optval < rss_getnumbuckets())) { - INP_WLOCK(inp); - inp->inp_rss_listen_bucket = optval; - OPTSET2_N(INP_RSS_BUCKET_SET, 1); - INP_WUNLOCK(inp); - } else { - error = EINVAL; - } - break; -#endif case IPV6_VLAN_PCP: if ((optval >= -1) && (optval <= (INP_2PCP_MASK >> INP_2PCP_SHIFT))) { From nobody Tue Feb 28 21:39: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 4PR9kT21Yjz3txsq; Tue, 28 Feb 2023 21:39: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 4PR9kT1YBHz44Lm; Tue, 28 Feb 2023 21:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677620385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Yy8OtUbOuiyEvJ22NODESSRLegVX2ACgF6OHE+y+iE=; b=uG5ddAhvneBluU8JnyR9s3c83oivaMeuK+aN68x7uNCyytOiyr0TmVY64cQVmLJ/tZa9Hi g8h5P6rpBnk2x09fv9XoTFmP3HRYxtpuAsiasJl/Q7I3eNGzrj0hVoIziXC/x7vcuSOwiy w7Qd7uEvjAH812w63WiGJ/lXPCgEcpvhJla4olQQi3/KCionjQHB4cNe61PMGK9K0skPcj wuEcpkfFkpMUfPUcIqv9xSi57nYbMn/blGNc7Nd11mRHUz1neLQLnyERaJPf3NcysOwCBw 5iO9CT4JcOFmdRH8SndHbu+h0MAtyzBMAqU54C5yUDjPWQJamTbp451P5bOBQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677620385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Yy8OtUbOuiyEvJ22NODESSRLegVX2ACgF6OHE+y+iE=; b=JndwsY4N6y3e5bze3nX1Dp3HELBZF+G2aCD6KaHK+TFjoJvXWlZfJWbXQzoUaNshPgt4u2 bL5jBCLcqCjH6Jgj6k9a2g6r2T/6vhWgQGJj0V5/1hqJHj+ldMs3Ii0RnXsvfFzXpOq36U SplK8Iu7PyD/7L95P4JKO4BLA5DSwfjfNtkZj4VuJkKUMzXPGZG7Snp3D+or0ldV4m3pbx DenrgcJfcgXmHp4Y1tI43XoMTFWe5pLdEY3qY6J73d4ZvPCXKkDbW7AXyvXT6BNxAopnHe JT+z2TqPH9UtIDrPwPRtG0mWHng/R5QikmmI9CuEK3bdUhBDP09CopIgSqMpbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677620385; a=rsa-sha256; cv=none; b=UmsppVDlVH87FjZp5kGUcNfxC6DKttPs2+wUoE8MV10rg4J3+yZeOxFbxpwXd/3VKiug88 w4hHkgtbpVM3YbRAzmQXzKwboPuTnxVH0pjIDVjDS1ocIbz4qEbP52pxWnWnMPfKsZsSst IXD50C1p3xiNyxwHINdbiHQZKNASx5NZczBSgU7HkPb4feHJ1dGCLLQYBago9n1SEYRWOM qYc80Ko8irFHeNY5FKPNxTLVXc3UnTkm9IWqxWDBP04mBcs1zcp4dVc9DIOIgXTZPzQ0oW nMQTIACrAvBZYQEPF+CSuFPJL8ztZZor2yAWczZqniDeePXnHxdSjqDqmXhLbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR9kT0g4Hz1NNv; Tue, 28 Feb 2023 21:39: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 31SLdiMb029786; Tue, 28 Feb 2023 21:39:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SLdiHR029785; Tue, 28 Feb 2023 21:39:44 GMT (envelope-from git) Date: Tue, 28 Feb 2023 21:39:44 GMT Message-Id: <202302282139.31SLdiHR029785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 996606792ff9 - main - Add deprecation notice to the gbde(8) program, scheduled to be removed in FreeBSD 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: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 996606792ff9cfb2a115b6c6ee3d456afa5047f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=996606792ff9cfb2a115b6c6ee3d456afa5047f3 commit 996606792ff9cfb2a115b6c6ee3d456afa5047f3 Author: Poul-Henning Kamp AuthorDate: 2023-02-28 21:39:06 +0000 Commit: Poul-Henning Kamp CommitDate: 2023-02-28 21:39:06 +0000 Add deprecation notice to the gbde(8) program, scheduled to be removed in FreeBSD 15.0. --- sbin/gbde/gbde.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c index 421242c38c80..8f4c2b1fce53 100644 --- a/sbin/gbde/gbde.c +++ b/sbin/gbde/gbde.c @@ -737,6 +737,11 @@ main(int argc, char **argv) struct g_bde_key *gl; struct g_bde_softc sc; + fprintf(stderr, "GBDE disk-encryption is deprecated,\n"); + fprintf(stderr, "and will be removed in FreeBSD 15.0\n"); + fprintf(stderr, "(continuing in 5 seconds)\n"); + sleep(5); + if (argc < 3) usage(); From nobody Tue Feb 28 22:17: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 4PRBYZ3Q1Xz3v1hQ; Tue, 28 Feb 2023 22:17: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 4PRBYZ2t74z481H; Tue, 28 Feb 2023 22:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677622626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9kY6sVQVOVLYhP16QJNYJsPmnEi9/7E/Z9wd7vVCq7w=; b=OEnOwomooDEPqPLfsGGQ9mPI0aTntuh9TtlLgZgFyrgpRzbKNUhibaTeEdO13L3nycYA7A hUQsSGHrB50N1+BQYyiTB+mA3mZW2l3mQwfYYQVIIrP5Rzf+qvNL6mPF0vZwaDcdQbzyRF ixKt2V4zlfOX8cQhkNLY+5dpJCTa6Vev38Ww7D2ananzy3sWO9zBEtml4lzXIGiJMYfczr MdGEJtQDTQeAVT5t4zCHm9LjRSjqcWbdHn0zSTQJP+JJ6hhNmkhksiNHrmvOaN7mdBT4bZ z/KYgY3R8I+apEs19HJmoNC4dNWAGC0gTLxzggZoqmEzWKdUjsUd+QJACl2oGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677622626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9kY6sVQVOVLYhP16QJNYJsPmnEi9/7E/Z9wd7vVCq7w=; b=Cm9NLEqanFsb57gaY/PJwQJC75BRv+0ebWRTiGDuvZQpYy/B4wVHDGzZDJX0sNOjmF1it5 m2eINckkNyqfSGpFJtQDjI8SnBgvgmglTsSSuyvNbKP+7+qmuy+95ohRe3xwlL0SiBHtQs lnmjoZ7FXLcFJEqRyAwMkKTOdbAbXWGzKjpd9YXiLeuRTrmCDSWhSIt5P8nfcDXfA3wRz3 vlMulcEQFkZvELhdvQiZHuXZ1iNrbtVuLn0unVkRKwlL1hlD3yqpC4ZMMqyTKtSBx+F8QV NKxZvrdAzOoz7P4WVEJxZ1rZTAD0b9upvwqnuWwIEU27XUpimeQo45wLNPx3cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677622626; a=rsa-sha256; cv=none; b=hIu+EFATIhPYKG7iUs7OLj90MNV3sLN7/gk1qhqeu9p2Ra5FHIDwhM3pMWlM32Dj6/Zt0C 5FL9gMGNlJMP+ApL67j4QNtJY2RmTeCOQFM47PGlyvH3C3nawLO3F2BnnFUDZ/r4R31F2T 0yv2jNkIFWgLoJGOccZfMvUGijFZPXUcJzTgRsFxAXhlN544L8Yheo3YzuDBM/T3/4UbBT /hEm+dXe5hhz+gbebvV3A3+xJ4cUcb8TGZB+LrVtVuI+eAMFi0ewrEKMpeF8Rt52jJzA+t mTp0abQdFwytOtCdMiY5RxoaSMFObJW4nw4VT9w6XrVPM8gqR7JgAp24dy7uUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRBYZ1tLzz1PFG; Tue, 28 Feb 2023 22:17: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 31SMH6jm095792; Tue, 28 Feb 2023 22:17:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SMH6Gs095791; Tue, 28 Feb 2023 22:17:06 GMT (envelope-from git) Date: Tue, 28 Feb 2023 22:17:06 GMT Message-Id: <202302282217.31SMH6Gs095791@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: dc8616edc580 - main - arm64: set FPEN if we're stuck with HCR_EL2.E2H 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: dc8616edc580806afb1efaec1cdc3cc9a1b3804e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dc8616edc580806afb1efaec1cdc3cc9a1b3804e commit dc8616edc580806afb1efaec1cdc3cc9a1b3804e Author: Kyle Evans AuthorDate: 2023-02-24 19:37:20 +0000 Commit: Kyle Evans CommitDate: 2023-02-28 22:16:14 +0000 arm64: set FPEN if we're stuck with HCR_EL2.E2H On Apple Silicon systems, E2H can't actually be cleared; we're stuck with it. Check it again when we're setting up CPTR_EL2 and set FPEN appropriately to avoid later trapping to EL2 on writes to SIMD registers. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D38819 --- sys/arm64/arm64/locore.S | 15 +++++++++++++-- sys/arm64/include/hypervisor.h | 4 ++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index b37442f15f05..da3001711955 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -263,6 +263,10 @@ LENTRY(drop_to_el1) ldr x2, =(HCR_RW | HCR_APK | HCR_API) msr hcr_el2, x2 + /* Stash value of HCR_EL2 for later */ + isb + mrs x4, hcr_el2 + /* Load the Virtualization Process ID Register */ mrs x2, midr_el1 msr vpidr_el2, x2 @@ -275,8 +279,15 @@ LENTRY(drop_to_el1) ldr x2, .Lsctlr_res1 msr sctlr_el1, x2 - /* Don't trap to EL2 for exceptions */ - mov x2, #CPTR_RES1 + /* + * On some hardware, e.g., Apple M1, we can't clear E2H, so make sure we + * don't trap to EL2 for SIMD register usage to have at least a + * minimally usable system. + */ + tst x4, #HCR_E2H + mov x3, #CPTR_RES1 /* HCR_E2H == 0 */ + mov x4, #CPTR_FPEN /* HCR_E2H == 1 */ + csel x2, x3, x4, eq msr cptr_el2, x2 /* Don't trap to EL2 for CP15 traps */ diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 84abe17f310e..0a0f0c2b3d07 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -45,9 +45,13 @@ #define CNTHCTL_EL1PCTEN (1 << 0) /*Allow EL0/1 physical counter access*/ /* CPTR_EL2 - Architecture feature trap register */ +/* Valid if HCR_EL2.E2H == 0 */ #define CPTR_RES0 0x7fefc800 #define CPTR_RES1 0x000033ff #define CPTR_TFP 0x00000400 +/* Valid if HCR_EL2.E2H == 1 */ +#define CPTR_FPEN 0x00300000 +/* Unconditionally valid */ #define CPTR_TTA 0x00100000 #define CPTR_TCPAC 0x80000000 From nobody Tue Feb 28 22:17: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 4PRBYb3fYMz3v0v3; Tue, 28 Feb 2023 22:17: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 4PRBYb392mz47q7; Tue, 28 Feb 2023 22:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677622627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JCVsCBvri0Com9IdLxEqblo5QGWE1nHKnVjkP3UHCvc=; b=p5wHnrAM3IXNiSyy+vPyqEpKnqwmyB3DRbnNmYrHAr0o6aYIiajEVSkT8pkSaXEnosckeW r+Dul4FURINxcVd/4vdFKA/kmnpjKF+5HrPYTy8xYhv3rVEH7DuOZbeFMXMWlWVzMA+9zO CdyGTAxjtY/2NVhpJApRU0B1LPICK0mKamaPSEzAz1bZHL4y7E/dgx2lRq5WgLhGYstBKt u6KECh+EIIRzm6pX5mdgecXVefdpC3oDHlm+mjtdV8ZJH/eA2rrgCCpbgFeF7D4DjeWltC 4KdHNP4uEyVtoUc1A7f6MEfC76TqSox+yXG1lErpFJEpaWkV31c7Wy6XRQ5QVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677622627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JCVsCBvri0Com9IdLxEqblo5QGWE1nHKnVjkP3UHCvc=; b=egcCj7eSg3YXlTCfqnUnwPsx1PAR0Yd8JhK16zMrmL6y0+6libIfih1aIk/FzNfMv3VT/Q fNgbZW1oYgNloH7/V6SywZAiflfDL65ceW+hxbFCh+I1mjtD3EOx2Jh13y30zEYzyskFyF tDRAT/pP/vIJuBprpAyoD+DFt6ZvKi2kAQ1yAIoaN/1CPu1INnaWuzTQD3qbNsxrTaLTnj bvbk2bBlAlzPBeiPwNUIlsFDyy7/mgneCySIluCYBq5ocFoiK0/eIxVB4XEeE1c6yqr8i4 L43SBrl5eAv1HITdOK/TaxlZH8Il5hvjSZfgM42liQZ0N2LctC1JdNMqpM2Efg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677622627; a=rsa-sha256; cv=none; b=JlsdP4xM/+/skoYRtdlDJln+GZ+aTxrX6l9iHC4mKBuNwxWl9cqq5My1NS0zxcfnf3fVv2 Y8Z4zJBbQnJM2/s0edPLVxHnTkdAaL2ul3Rt+6oss5eQTxyvpLP+LoTHnDAWBTJBYQ13v/ tJueJ3ci9GDGcYrNlFZOygmeP2J4LXBiB6UeWBBf1lLakX22IZkNM3VRZ+/LjIsflHDD5P 6Z+O25t0EarMbDWqozAflJTZ1UtBLm9gwrHkAmixR6rb00GqWHl/PLIHvnyjaRbigNm2ui vcRTsHHZfVCLBapIVB96lv4aVUAOnBRJmv4iPpLRLjo7/twIms7o/qrvlOLOHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRBYb2GKtz1PFH; Tue, 28 Feb 2023 22:17: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 31SMH7ii095817; Tue, 28 Feb 2023 22:17:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SMH7SC095816; Tue, 28 Feb 2023 22:17:07 GMT (envelope-from git) Date: Tue, 28 Feb 2023 22:17:07 GMT Message-Id: <202302282217.31SMH7SC095816@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: 5e54bb1ea9e9 - main - usb: dwc3: implement hw.usb.xhci.use_polling 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: 5e54bb1ea9e904075225dc96641c2ede3fc3273c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5e54bb1ea9e904075225dc96641c2ede3fc3273c commit 5e54bb1ea9e904075225dc96641c2ede3fc3273c Author: Kyle Evans AuthorDate: 2023-02-28 01:59:43 +0000 Commit: Kyle Evans CommitDate: 2023-02-28 22:16:14 +0000 usb: dwc3: implement hw.usb.xhci.use_polling Polling is currently only implemented in the xhci pci attachment. Adding it to dwc3 doesn't make it much uglier, and supporting it can be useful for confirming that hardware's otherwise functional when interrupts are apparently not firing. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D38816 --- sys/dev/usb/controller/dwc3.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c index 361db0f5e835..dc5c90df0d72 100644 --- a/sys/dev/usb/controller/dwc3.c +++ b/sys/dev/usb/controller/dwc3.c @@ -103,6 +103,17 @@ struct snps_dwc3_softc { #define IS_DMA_32B 1 +static void +xhci_interrupt_poll(void *_sc) +{ + struct xhci_softc *sc = _sc; + + USB_BUS_UNLOCK(&sc->sc_bus); + xhci_interrupt(sc); + USB_BUS_LOCK(&sc->sc_bus); + usb_callout_reset(&sc->sc_callout, 1, (void *)&xhci_interrupt_poll, sc); +} + static int snps_dwc3_attach_xhci(device_t dev) { @@ -133,12 +144,14 @@ snps_dwc3_attach_xhci(device_t dev) sprintf(sc->sc_vendor, "Synopsys"); device_set_desc(sc->sc_bus.bdev, "Synopsys"); - err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (driver_intr_t *)xhci_interrupt, sc, &sc->sc_intr_hdl); - if (err != 0) { - device_printf(dev, "Failed to setup IRQ, %d\n", err); - sc->sc_intr_hdl = NULL; - return (err); + if (xhci_use_polling() == 0) { + err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, + NULL, (driver_intr_t *)xhci_interrupt, sc, &sc->sc_intr_hdl); + if (err != 0) { + device_printf(dev, "Failed to setup IRQ, %d\n", err); + sc->sc_intr_hdl = NULL; + return (err); + } } err = xhci_init(sc, dev, IS_DMA_32B); @@ -147,6 +160,15 @@ snps_dwc3_attach_xhci(device_t dev) return (ENXIO); } + usb_callout_init_mtx(&sc->sc_callout, &sc->sc_bus.bus_mtx, 0); + + if (xhci_use_polling() != 0) { + device_printf(dev, "Interrupt polling at %dHz\n", hz); + USB_BUS_LOCK(&sc->sc_bus); + xhci_interrupt_poll(sc); + USB_BUS_UNLOCK(&sc->sc_bus); + } + err = xhci_start_controller(sc); if (err != 0) { device_printf(dev, "Failed to start XHCI controller, with error %d\n", err); From nobody Wed Mar 1 04:30: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 4PRLrH1KpPz3vN3x; Wed, 1 Mar 2023 04:30: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 4PRLrH0qMBz3k2g; Wed, 1 Mar 2023 04:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677645023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p700MPTwuD563EDdET07ag0XKyN1OyD0bZuApTv+fvI=; b=iDnoRtDojfOFAAQtqCHW0m85KNL3klNbzpuQ49T1jdFtskfRUWRiAWYTjGf4ozYaPPAJV6 fm2MnfA2ce0xpj9+Z47CKV6q04enlMUPaRUFeJq2x2prJ/gIWMRnCEr7mgEoDh+d7QO2bZ JM6b3ScjpvTQvLXD0Tnb5eEJvAAOOfyv25l9iJncvgQST+0iQ+XwLMxqR9Sg+3MH1GXzNR 2gWTYDUVELgj4uK57x5V2Lh8kzzfdhFaiBXZJOyaooqcE1SnY1+hBYsAqBgYBeHnw2o0In NY1H/VMnfyIR4O0OOvLArlWNSr9zGx1xZSB+eTIBosbjzsNCnQzQY08uH73QcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677645023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p700MPTwuD563EDdET07ag0XKyN1OyD0bZuApTv+fvI=; b=LPzKghk++Ly3WkBnb3gO4vCEK75thp0ONA7PSPruRqnbKo6FXmNga8i+ZFRKVF6qd2Xcwh gxivgYG1IfoYG8qTWXBABzrerGIN+WL0WjBpsaPtq4d632qUA/oD6impM7DhpBEYZV2yJr 5+Gh5osys5uFGQ9hhnBN1BRoXv5C0RZwRJJFalLM5vb1/lY6wU7Lj4FygxY989siBQmHIU UONrN7G/pLheMaNCKOBeputQL82bZmzZZsrFvwCcf3C4qnVyNBCc+IPbZ8W46AXsQYe5hH xMK70nDzfpD9nfvdTzgA8DMOPLJeG/EiZSTxitwmvFQnura1WE5caqsojRiK9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677645023; a=rsa-sha256; cv=none; b=HloTNjPH7wn25lfm5T9gqa22IpGMiL7e9yMU9gYSGfoTtKBRVUqWuHM5Nrrj32rMiek+U1 +7MVJl0sy0N5YB7jL+ZVy3Xww1j/Nm9W7cxpjTTWz7fmyGw0FeUS7Ofo0gYkT1dM5hKSRm Qb9EYnm6K05aqB+Sc+FhtgdvQlpQsiWUgg73GtNFS0qdffg5eSzjSNw78TRPdfZSk9+ZZA p9ATFoWKGls88qhh2e+SMrQ8eFARNG7UZp4nXdMXJB5+W4kMgZegJ9FTHL0fqKoe4pdsrG VS3TZfxGlR8ykSTmisuKIwXDt2/sK+cYVpWmuarhu6TVo2GVRMi5dmHdSopJ4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRLrG6rBRzLJ5; Wed, 1 Mar 2023 04:30: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 3214UMOb011371; Wed, 1 Mar 2023 04:30:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3214UM2W011370; Wed, 1 Mar 2023 04:30:22 GMT (envelope-from git) Date: Wed, 1 Mar 2023 04:30:22 GMT Message-Id: <202303010430.3214UM2W011370@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: dc6df546be29 - main - i18n: csmapper: hook up the top-level .src files to the 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc6df546be29a468ae21b1b7604e85b703ad6779 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dc6df546be29a468ae21b1b7604e85b703ad6779 commit dc6df546be29a468ae21b1b7604e85b703ad6779 Author: Kyle Evans AuthorDate: 2023-03-01 04:24:54 +0000 Commit: Kyle Evans CommitDate: 2023-03-01 04:26:44 +0000 i18n: csmapper: hook up the top-level .src files to the build The top-level charset.pivot.src may be empty, but the top-level mapper.dir.src is not -- it contains some definitions for supplementary UCS planes. The SMP/SSP definitions aren't actually used at the moment, but the inclusion of the SIP definitions fixes conversions involving JISX0213-1/JISX0213-2 to be possible. Sponsored by: Klara, Inc. --- share/i18n/csmapper/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/i18n/csmapper/Makefile b/share/i18n/csmapper/Makefile index 7c6aca31c019..22c6d9014930 100644 --- a/share/i18n/csmapper/Makefile +++ b/share/i18n/csmapper/Makefile @@ -10,7 +10,7 @@ SUBDIR_PARALLEL= mapper.dir: ${SUBDIR} newfile=$$(for i in ${SUBDIR}; do \ cat $$i/mapper.dir.$$i; \ - done); \ + done; cat ${.CURDIR}/mapper.dir.src); \ [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ printf '%s\n' "$$newfile" >${.TARGET} mapper.dir.db: mapper.dir @@ -22,7 +22,7 @@ CLEANFILES+= mapper.dir mapper.dir.db charset.pivot: ${SUBDIR} newfile=$$(for i in ${SUBDIR}; do \ cat $$i/charset.pivot.$$i; \ - done); \ + done; cat ${.CURDIR}/charset.pivot.src); \ [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ printf '%s\n' "$$newfile" >${.TARGET} charset.pivot.pvdb: charset.pivot From nobody Wed Mar 1 06:05: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 4PRNxW4gMrz3vSM8; Wed, 1 Mar 2023 06:05: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 4PRNxW4B4Tz3qsv; Wed, 1 Mar 2023 06:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677650703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TyUfSgrWsT+3QD3/41xYCts1fHFVLilsYns3Fb/wnqk=; b=U8qtujzwVsokJrPWrHXOF4vypnqy9ohUb6q+9v6PoFfh97MXkok7wqIMv7wcybdshdW413 1MiH7JQkUjRzb279N708Ix+x6OEnfURaeBQ10Bn/CvXZbSRcMSNVKiParpKbfG9IeQIRve 0oswBS8g+B2tEYSiPKdnE53MP3nfQDNOlzotn83gIi96Zv7IIHw1+T3UR8b5HWZ9u6imK1 qiiaYxPCcxH1A1BLcgBg/slNg7fffgiDfCZ0KMOYEgfBmC8eRro0EO13NnyvCnsG6so4ZQ 8Az2/ElYMKT4ZVE6m1Py/Up+xrRlpovkNua3gKEIdyV1XHRSXFjzfkfTGd2oSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677650703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TyUfSgrWsT+3QD3/41xYCts1fHFVLilsYns3Fb/wnqk=; b=ngujIXG2gy8yiDpM2ISRK4sXecEYD4+7k2Smi4gVLIe+6CIVkJaxenQY3bucfKQt4wVlIx xyNwmPuNe1i8H1rx3jLhXDNHWK7ttzThTwIadRJPCn+/gWh3wZd2KybTKICKPvKhhs36SM 2sAeE6oK4J+P1sYlYmujgacwbIk40r38fGBMLNpqFLvHlGopOFitBA1cXt3g4r6R68cBNF w799xR7FmAm8Du2TqhTz2Vzi4gunauo+43o49VwjNKF+JSkN72xXCkVVC7NMFzgBCHl+an +eU+IMq3JPihstKQY/4CC9kYRqX9GpQ/KiJfiFA0VsWQ11eF7xo0Vex4RAuvyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677650703; a=rsa-sha256; cv=none; b=g2/a5T1sZ/sDotOG3ivuGt7RCE6LVv1XRxpgkYNRYbSgyxMBWlNX4M+9kMhODKskP9EmHL ea+PuC6sKRoNk+u5W9MFByR1IKpgYuCW89Zsy42vsnBZ/zLmKbOzZYd4T4DgKj4pJMCn5C ah0c7hPrExEym3frU3RHDp3dlkEa1L392VVmmwGS2CyQZ7rNDFTc9aiYIvKHvGunJX4VAz smePUZ1dd7xjWxG7A0P2wBnCld2my0vyHgeyzvX6OlmEy/3V82aYJ8YH+pVCKkeAUeKmam JjU/cFcOaCjANXadbVgzjNNtkyK9x7qZQgoR6WMdr3wgMnwrsbacGVUO/ofN7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRNxW3FpwzNSh; Wed, 1 Mar 2023 06:05: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 321653uH067134; Wed, 1 Mar 2023 06:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3216530f067133; Wed, 1 Mar 2023 06:05:03 GMT (envelope-from git) Date: Wed, 1 Mar 2023 06:05:03 GMT Message-Id: <202303010605.3216530f067133@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: 8dff0b676140 - main - efifb: add a tunable to select the framebuffer cache attribute 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: 8dff0b6761407357c5bb42ee799c5c9f465557a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8dff0b6761407357c5bb42ee799c5c9f465557a3 commit 8dff0b6761407357c5bb42ee799c5c9f465557a3 Author: Kyle Evans AuthorDate: 2023-03-01 06:04:49 +0000 Commit: Kyle Evans CommitDate: 2023-03-01 06:04:49 +0000 efifb: add a tunable to select the framebuffer cache attribute Mapping the framebuffer with WC (Write Combined) memory type can, in practice, cause some memory transactions to be rate-limited at a fraction of the fb write rate. WC allows one core to queue up many globally visible write transactions, and in the process some unrelated transactions may end up having to wait for all of the queued up PCI writes to be flushed. Add an hw.efifb.cache_attr tunable to allow mapping the framebuffer as uncacheable instead. We should likely be taking a more careful approach of checking the memory map to determine which cacheability attributes are feasible, but the knob lets us use our historically functional behavior while offering a convenient way to switch on a stock kernel. The only valid values for hw.efifb.cache_attr at this time are "uc" and "wc". Original patch by Marc De La Gueronniere along with previous testing. Reviewed by: imp MFC after: 1 week Sponsored by: Verisign, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D17884 --- sys/dev/vt/hw/efifb/efifb.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/sys/dev/vt/hw/efifb/efifb.c b/sys/dev/vt/hw/efifb/efifb.c index b30b1d29e205..1d243599e70c 100644 --- a/sys/dev/vt/hw/efifb/efifb.c +++ b/sys/dev/vt/hw/efifb/efifb.c @@ -103,7 +103,32 @@ vt_efifb_init(struct vt_device *vd) struct fb_info *info; struct efi_fb *efifb; caddr_t kmdp; + int memattr; int roff, goff, boff; + char attr[16]; + + /* + * XXX TODO: I think there's more nuance here than we're acknowledging, + * and we should look into it. It may be that the framebuffer lives in + * a segment of memory that doesn't support one or both of these. We + * should likely be consulting the memory map for any applicable + * cacheability attributes before making a final decision. + */ + memattr = VM_MEMATTR_WRITE_COMBINING; + if (TUNABLE_STR_FETCH("hw.efifb.cache_attr", attr, sizeof(attr))) { + /* + * We'll allow WC but it's currently the default, UC is the only + * other tested one at this time. + */ + if (strcasecmp(attr, "wc") != 0 && + strcasecmp(attr, "uc") != 0) { + printf("efifb: unsupported cache attr specified: %s\n", + attr); + printf("efifb: expected \"wc\" or \"uc\"\n"); + } else if (strcasecmp(attr, "uc") == 0) { + memattr = VM_MEMATTR_UNCACHEABLE; + } + } info = vd->vd_softc; if (info == NULL) @@ -141,7 +166,7 @@ vt_efifb_init(struct vt_device *vd) info->fb_size = info->fb_height * info->fb_stride; info->fb_pbase = efifb->fb_addr; info->fb_vbase = (intptr_t)pmap_mapdev_attr(info->fb_pbase, - info->fb_size, VM_MEMATTR_WRITE_COMBINING); + info->fb_size, memattr); vt_fb_init(vd); From nobody Wed Mar 1 10: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 4PRV9X12sdz3vfml; Wed, 1 Mar 2023 10: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 4PRV9X0WDPz4Jlb; Wed, 1 Mar 2023 10: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=1677664848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tAThNX9DIJUPi+gyN6hCovbHe4Oa9W/ajZoy7sqiI8s=; b=eul/9a/rbdhmPwV9gFae/0NInKuznJ7YaAAYc7H0Gx0t6DsFFnrWRlgdycre5W+VZJ/i53 GLRuQXocNBwlCLbN8oUv4q1+SCVRtavfRYyyvGj0/i8JLmcNSFTkTxGRphpA1ZK0i+6Evl nNg3n5S3bkI7pbnCYTFQHiD5nqmK7xIj225PfnkhQO7apryDBwsH278P7YsXBgsZ4P9Hc7 1A+tCRWpNuQB1wRw/eS6EJ4YoQ+PaXPfSXi8uTewSr8BSNRXB2c7HtRyrEUw7zzMwrWGty x/j8qHWn1GR2Cq0q3hUyOMlJShsZB9bqqkUp3hbUwsfeY+ZZn26pz5a5wIrVPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677664848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tAThNX9DIJUPi+gyN6hCovbHe4Oa9W/ajZoy7sqiI8s=; b=IyWCX6K2mz6midb7FCaPSdENNjKcIRXqfm21sqO62MWr4zx9nhQtcnmnWt50O6PtnwMDv+ sZCqa6lXlnyx820kTaFd3Vh13uejg/ZxUWipYu/ZK41txT0EtyGneAsC+3IvGzSAlXW8v4 XKfHc30pnIt6PdQSrOtOYX1vdnmz2ruGqgQ7Q4K4WngRQ+k+/lkr4CE4VeqfNMrEwD+nOE 4KD7aAAvLbgKZn+1Id385ZCWjRekbhCuK2IcF/MJy3TkkXWyz6o2lwOlQ2GwFiediuSWnN EKaJ/PlQuc8LwSX/NCjlMZKY3ZTef8F/QKdh5Lcf6WvEjkc5aGYJMHDJed/6wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677664848; a=rsa-sha256; cv=none; b=eCk8Aajv7irgef9lBxPiruj69Zc8khmaPWVv7ETrLN2xBDvw/lfGE6c5sZ4SpNauvjuIiJ Is4CZJvBhodvXor20p0JVLuD21ntku1mV5CZYcFlGwNvGdowsgLpzKfiSjV4OMY7VqqxnU tD9WU0dG1DiFzACs7naAzj5c+dwd9f633kw9hOqLiCMmJelDbdSg206yO/7fonY6cDXMDq tFlVSlQs8cY206L9TSd1FCMpG6bxb+IDwIbYmBMaztK03EYz9MbcavKNrWmh1bDPMK1DhY El7fvylDJ2lKL0INZEBeSBuZGouUKZcHMxApuhm7SZF9lwGWoirBakatM6VEJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRV9W6kSTzV92; Wed, 1 Mar 2023 10: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 321A0l09055847; Wed, 1 Mar 2023 10:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321A0l7e055846; Wed, 1 Mar 2023 10:00:47 GMT (envelope-from git) Date: Wed, 1 Mar 2023 10:00:47 GMT Message-Id: <202303011000.321A0l7e055846@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: 69361b878546 - main - if_ovpn tests: skip the if_ovpn_c test if if_ovpn.ko isn't loaded 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: 69361b8785468fe15bb2b169a0b72af5bc108cfa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=69361b8785468fe15bb2b169a0b72af5bc108cfa commit 69361b8785468fe15bb2b169a0b72af5bc108cfa Author: Kristof Provost AuthorDate: 2023-02-28 10:14:24 +0000 Commit: Kristof Provost CommitDate: 2023-03-01 09:07:34 +0000 if_ovpn tests: skip the if_ovpn_c test if if_ovpn.ko isn't loaded Skip the test (rather than loading it) if if_ovpn.ko isn't loaded. Match the behaviour of other tests. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/net/if_ovpn/if_ovpn_c.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/sys/net/if_ovpn/if_ovpn_c.c b/tests/sys/net/if_ovpn/if_ovpn_c.c index d98f5a0dd8e6..fa8a9a07fa35 100644 --- a/tests/sys/net/if_ovpn/if_ovpn_c.c +++ b/tests/sys/net/if_ovpn/if_ovpn_c.c @@ -88,7 +88,8 @@ ATF_TC_BODY(tcp, tc) nvlist_t *nvl; /* Ensure the module is loaded. */ - (void)kldload("if_ovpn"); + if (kldfind("if_ovpn") == -1 && errno == ENOENT) + atf_tc_skip("if_ovpn not loaded"); ovpn_fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); From nobody Wed Mar 1 11:06: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 4PRWdn3RSFz3vkGk; Wed, 1 Mar 2023 11:06: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 4PRWdn1yQKz4QfJ; Wed, 1 Mar 2023 11:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677668813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+srt7vrafQ+u98fFYaf2hUuQKG/3+1aBkPntQUAcXtA=; b=jGRgWRF5Mrcd32WS1qxkMKqyYD7gJqt8Yzcx5StwSdKh/uQuBagwM3fLYl9U6LG2bfgxyg /h1NKzoKvYGCqab9xN8xUOw7A5mo1P5IojNEPAQdQhpGcWbqUbtFuKRgQpkO79iGdWiQAH 6gDVJemTJEAoQDHj7KP4+BS2tLuDQQRFFh5v3+VteOq8GSENFK6i26Deih2OKFdMGPI1O1 sMSRxJMEq4V2Yc2sbO+eVnk9N76wqjrbwYi8Lg/HW1G47Ztk7G32bDideylREWq5sSbjUv EBii6XzrWSzEJh+eNKFknEwNU04feB7JH69cNwmO1nxK5IS5n+TPBJEn2ZYSaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677668813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+srt7vrafQ+u98fFYaf2hUuQKG/3+1aBkPntQUAcXtA=; b=kEHPLDtVcr5XRRRmnMyKNjq/CcyvjXyMFMbRHu2x6z1NAw5cYDzPpIU+506zjjFCu7esH6 ICfqrSYBt/9e3QjCZXfGfN5t0VBc5a0Y7hjlUwksCROVAcuaI5yaJ9Rck7pKYbtK5w6UNF K5EFeGKlJEcCwFgFGiwGQZZu2J2Enrsz5ljFwbH4BbAIo3dtcWsvNrdKVI/s+yjko3K2kA Croo4tZwvuq7ZEOlR3r8YIaneeCdaDnRBQFC6SONdjfAyJdCBxs6W+lRvE4e/JUh2X9W/6 E776VJ/8SH3IhTWsJmd2wdqXqdBafgyASfmnRTw8W61pU2D2o/Ld9InmABJ/5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677668813; a=rsa-sha256; cv=none; b=N2uFAiEreRdsxguC2FA1nYSVgVa0B0nNtRJ8ySXZyW9krMqos/w6asGVJ84Q5ECWo4AqP7 uFZ5zJp6yh/Jk5MSjW2Tt1kt2Y2gSjCkaImQQZNjN/MxNHcPNEmnNsPNbHYOxmLu1K5ZR8 DF+yN8QGggDI+TEx72cx0W0G/AFmW0pf+3U/smLon+Vo1oLqB2HiL/j8Asx0f2OcfGR23t BwjHZNcdmBNXhS+I+JZCVsuB0uBfB+oekVisSvMIP9hsShA8fWghbzu5v01Fep7jacEKuQ FzwCxJwaQXFh9ajA8kaAWhxvnOA9mbCIfqt3JxyZnSIXVjTiqX8sKz/xAD1aug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRWdn0scZzX1r; Wed, 1 Mar 2023 11:06: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 321B6rZd061039; Wed, 1 Mar 2023 11:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321B6r1D061038; Wed, 1 Mar 2023 11:06:53 GMT (envelope-from git) Date: Wed, 1 Mar 2023 11:06:53 GMT Message-Id: <202303011106.321B6r1D061038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: a3571129380d - main - kern: whack __mips__ leftover 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3571129380de7d3807b26b843d0408fde7aafde Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a3571129380de7d3807b26b843d0408fde7aafde commit a3571129380de7d3807b26b843d0408fde7aafde Author: Mateusz Guzik AuthorDate: 2023-03-01 11:05:12 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-01 11:05:12 +0000 kern: whack __mips__ leftover Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/subr_param.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index e9d7ddd49e63..bb8cb5871af2 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -171,7 +171,7 @@ void init_param1(void) { -#if !defined(__mips__) && !defined(__arm64__) +#if !defined(__arm64__) TUNABLE_INT_FETCH("kern.kstack_pages", &kstack_pages); #endif hz = -1; From nobody Wed Mar 1 11:08: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 4PRWg52Sqjz3vkH8; Wed, 1 Mar 2023 11:08: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 4PRWg521G6z4Qxd; Wed, 1 Mar 2023 11:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677668881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f854+CjMPmn9ZiR5KbUeCLGfjL/jZmAguvSJxoZe85o=; b=Jv0omQhzMm3Na3YH56rG/vRqLgqYlP5VNMCZFQZtFHsjy0quTjGAUT3MYIH3P4bdpha+mz sx/o8N6P0xWE0SG+xoKNvit48hbSh0ZWaW8mhxv09zGTcFpeUCxZw32cCzN7NBu2R6AKhd PrwvS1Qtfpo7bl5jQMLcy2rq+f8ZqoGfHG4qHhsR6ezoAEID/SbkALboyyUKNjWouDiB62 UZjfXUWuEeI791i7PHZhTPrs3r8OgNOKiTywVcffcTIaZ9m+kdsXJuan56THXPCXl9p4nr bZ567X+60vGf5EVERw6VN7q+jXCAqM1zUwvF1Z9SoYA5uhGXvPkDXUrgWaFrvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677668881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f854+CjMPmn9ZiR5KbUeCLGfjL/jZmAguvSJxoZe85o=; b=ssPtEPBTertS6SMI7EqkOsNpF8xxa9PQy49zmiFSnRj3crcy1S3ilaHnY6/BFdoRG3JwM+ pQv+BgFsLENJhqoyT/7rUcjC/V7uiiYfciqNq2q9w8FpG/YmdHBnKzryvryRwbBJigsEeF LupC84daHDAQRpvH5nNe0r6z0K6pz15gF9is75mGdSiz68osDbTeWvSyDpLu9yp4bCpk84 jz/XLAF8gNCazEYlFwzTRjGiBbTSLonXZ879Dzou9GGAsfiby81aWIiQ6o7lPZDJnyb1js AZuaK0FkkQmWA6ePckY7mKwayI+1ycvNu7oQkARLPcpPph/OZp0V0BSU+KGvNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677668881; a=rsa-sha256; cv=none; b=ydUUUwUADEKW9UDLDN8o51TqWd6YLP2VimCiQXZN35SuV3sfmwSDWriRlhDyggZABEGRGn E3qcbige9TN00qgcmHfDhbVnsltsAyNDCMfDHU5xzzJSgR79ACdBk8t2J/fe8TZnUrmuoh FhgAp5KR08/Zx0nYICHgLAAvVgtsHfn4CLrXRmuVCr+NkZuxspUsGO67LJAc663K+6eAkj bul/0DhPYAUqnTldMa6i+WjldLzEXw5VjsLEqQQgXJK53zUwsBgGeTw06gG8sXA4UKKPy0 UR/MilhCW9Tq3smFZOprFCt0cgRdJf6bPCryTgOS+JjEDgLNGG0UDNt/X7Nv0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRWg514wszWmX; Wed, 1 Mar 2023 11:08: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 321B81au061344; Wed, 1 Mar 2023 11:08:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321B815d061343; Wed, 1 Mar 2023 11:08:01 GMT (envelope-from git) Date: Wed, 1 Mar 2023 11:08:01 GMT Message-Id: <202303011108.321B815d061343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 33755776313e - main - net: whack __mips__ leftovers 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33755776313e4ebb83da6a742616017d9c946838 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=33755776313e4ebb83da6a742616017d9c946838 commit 33755776313e4ebb83da6a742616017d9c946838 Author: Mateusz Guzik AuthorDate: 2023-03-01 11:07:32 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-01 11:07:32 +0000 net: whack __mips__ leftovers Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/bpf.c | 2 +- sys/net/mp_ring.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 43eed04375d7..3e4521bb28de 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1646,7 +1646,7 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, #endif { struct timeval *tv = (struct timeval *)addr; -#if defined(COMPAT_FREEBSD32) && !defined(__mips__) +#if defined(COMPAT_FREEBSD32) struct timeval32 *tv32; struct timeval tv64; diff --git a/sys/net/mp_ring.h b/sys/net/mp_ring.h index 6dea325dc435..7a166b89233d 100644 --- a/sys/net/mp_ring.h +++ b/sys/net/mp_ring.h @@ -40,7 +40,7 @@ typedef u_int (*mp_ring_drain_t)(struct ifmp_ring *, u_int, u_int); typedef u_int (*mp_ring_can_drain_t)(struct ifmp_ring *); typedef void (*mp_ring_serial_t)(struct ifmp_ring *); -#if defined(__powerpc__) || defined(__mips__) || defined(__i386__) +#if defined(__powerpc__) || defined(__i386__) #define MP_RING_NO_64BIT_ATOMICS #endif From nobody Wed Mar 1 11:09: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 4PRWhl1YCTz3vk0P; Wed, 1 Mar 2023 11:09: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 4PRWhl0wKfz4RPB; Wed, 1 Mar 2023 11:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677668967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4M1HD4YwJ0xkW6J9/gcYkBKi+Z2xKC5On23yKWjbpU=; b=WWJtMRncuOS+z7RFnLaxR90wqUpKPDEliYJXY4d6WzVBxfR+THPrLc/OJ3He2y9zSrgCt0 uTDBRnE+ri7yQCg5RV1kVFCZZ7gEjo1f0z/xzrZkIr1CmcPpJNTI6gGA99BWsyWOxHlsJg vU1dHum4VZ70r9onHjaaAVv3cuMJb6i+4iOLN8wLhLZ/A7+NbXWCw/eriw3gQLad4ajtAP nABoMJsBMkTZqQ7eLI9U3Np7bbp0EoeQHCHHCiGtQPOTo2wduEA872q2YElIsDd7L+3ZZo j/oFgVjp1JkzrnatB6El1XVxkE0lhcUqhYTn1JuYw+CAhwnNCfr51sbw++jWLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677668967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4M1HD4YwJ0xkW6J9/gcYkBKi+Z2xKC5On23yKWjbpU=; b=aTRow5LfL/uze3RXk8AEIvkgxPFNfna/7U4RB0lUdmQHLsqEp4pJwBqjTw9j5d8alIP0kP WozbsJUgqIqCe9kFOJMO6w9tDWUzYbnuiaY6/Ap9taLqqQrRsdptvWUBj3SZ2xrLNnIk/x YWKxbFMq7BKngoBwyDpsEpt5QKG1sowwow+Vq43OcwANA+mlkcx9HEKitAwa6+soGLtl6D /43+j84QqTfGcoNdRqhzRoqt7IPAdBGleTnEav3/qv+KMrmATOeQEZjGPXlncqaAMq37DV zfou7Sg/TYrxUTaMZkbTmfeT3DmYCUPsoybiI3hkA/2FyJlxplVoI2jhav/0GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677668967; a=rsa-sha256; cv=none; b=uatg9rhDsxIwqAWNLtiOgQoZZnKV2zEz3BaEZ+zVlB5nDxL0BYVhyTq+Qg3pmXG7qwVA/v 6pVvi9AgQWl7trLWPGJt8K7aXhmI9LMMxEFjl0Ce+qtOUylc6nWiE+3ST33hfDSo+/NuM/ F/4TypcqBlGMLQ/x7jiwaiEqOjT8gCPS2PAR8Ql6vTImoLJde4NflGOAxla90RMpC607vs cQ0ovnOa2NeXv5gkAgbTPn6lB9Op5aMPQ9AD+XRQoZEXTk/Pnvpf6wBi3SOB1wJaCVKy3u yMMLmxj6vC5akDuTu6sXJ2X+YKSSFZlcJEM1VKcEaPh3YiapvTInKeGbK1uuBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRWhl01LjzX1s; Wed, 1 Mar 2023 11:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321B9QQv061791; Wed, 1 Mar 2023 11:09:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321B9QAf061790; Wed, 1 Mar 2023 11:09:26 GMT (envelope-from git) Date: Wed, 1 Mar 2023 11:09:26 GMT Message-Id: <202303011109.321B9QAf061790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 1ccc3107c296 - main - dtrace: whack __mips__ from dtraceall 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ccc3107c296e9bd029dfa1d01a6beb4afc2ce1e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=1ccc3107c296e9bd029dfa1d01a6beb4afc2ce1e commit 1ccc3107c296e9bd029dfa1d01a6beb4afc2ce1e Author: Mateusz Guzik AuthorDate: 2023-03-01 11:08:52 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-01 11:08:52 +0000 dtrace: whack __mips__ from dtraceall Note contrib code is not modified. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/modules/dtrace/dtraceall/dtraceall.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c index f7faabce4bc4..0d511a86262f 100644 --- a/sys/modules/dtrace/dtraceall/dtraceall.c +++ b/sys/modules/dtrace/dtraceall/dtraceall.c @@ -71,8 +71,7 @@ MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1); MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1); #endif #if defined(__aarch64__) || defined(__amd64__) || defined(__arm__) || \ - defined(__i386__) || defined(__mips__) || \ - defined(__powerpc__) || defined(__riscv) + defined(__i386__) || defined(__powerpc__) || defined(__riscv) MODULE_DEPEND(dtraceall, fbt, 1, 1, 1); #endif #if defined(__amd64__) || defined(__i386__) || defined(__powerpc__) From nobody Wed Mar 1 11:10: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 4PRWjh6zgfz3vk3w; Wed, 1 Mar 2023 11:10: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 4PRWjh6ZGdz4RfV; Wed, 1 Mar 2023 11:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677669016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5wh77O3Gi/+Q6gccpN9I2oy1vTY4z+z1eNYci8XUiCI=; b=b0Xa6lwL4+FjizO8DM4Q69MZFNW0Tc+JoYIL8foUg6qUqBzlvJ7bPBeCZr9UMtBoPvaMq8 ygtVC9+99tbZp/47t8UaqEwvBkLih4AKR31qH1+LVW4BvmqtZJ93lthivj2i6GtKpHR+LF 0CwBSvb2JjBnhldCqEHIR2wF5JKwagWmMKP3FVaIeWVKZpmKHihlY6EowOrPMVuRULoIyN BtASrqA2BwokcBrqCK37ptUle69VpRkLxjG+avaDpHjfv2WfW3O08Lq4YoYkM7za3/OrUI balI4xnT+F/PfGaLrxtUJ6vPjDPuUHDx4FipTdWM2coMZKqJSmQc0n07wnwgdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677669016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5wh77O3Gi/+Q6gccpN9I2oy1vTY4z+z1eNYci8XUiCI=; b=Xrg9eZNB2p4juzBXd9WhSMK5yP6QHxN5pFr8th89NdHVY4XDmfu/usBEDhDSTO78Zn5vY/ iPIBpwXubiq9ZwK0TcGnguDc1Gz0Av4ZI8gEgvv/Hj7V9MzZb4qfYo7ZtQvVkTd0l749l0 P9JgLPBK27z4TcC1qYkNHSC7x+DkPPiA8RQ4S9FJXE0XCNlHPOOD7hLNApGv+fvPBpnjfU PytSXsapV9PxPfOfv3Yiqs0P3/7JGsvk9L8A+b45ovZJYT7HCwEmCv7LCJ6L8MfoyfQspE m4YOgjpoddGJfTu0FrjECSTVXc9snBeIHeuWKVI4Z5XXCuRm46O3aR9QWbvbCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677669016; a=rsa-sha256; cv=none; b=pHQETL5TEojuaql8i2R7uV5DtsV80OkGp2cVS52ZaTN8YOZgHmz+heo6SBTESEbBkrfZ6m KUH78z9rSgVxeleHuZ2XpR0Zbjgt6cZfNIrqvc9LHA9xk2dCeVbElBznXX8N0zzrShN2f8 j3p0uKIFWgQDclfOspoQkIp41Lwv12wklgQahB+J79FjkfPOPFHg03mS5GarExa8+tCZiX oHJjhXqvFxpQiixqnAszzzh8tK/PHPzbd+w8+f5ploiT23EQlkBDjJ/WCJD0Dz3vVn4NPY MrfLwvO5ipwfH/PRS7toKyXzdcKrGa8a6XN8K2B2BPA47+uEopTBiWdv+oS8nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRWjh5g13zX1w; Wed, 1 Mar 2023 11:10: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 321BAG7s069974; Wed, 1 Mar 2023 11:10:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321BAGFC069972; Wed, 1 Mar 2023 11:10:16 GMT (envelope-from git) Date: Wed, 1 Mar 2023 11:10:16 GMT Message-Id: <202303011110.321BAGFC069972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 15c0b8c99861 - main - mips: whack __mips__ leftover 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15c0b8c998616bf43a91f294381c39fb624e7fcc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=15c0b8c998616bf43a91f294381c39fb624e7fcc commit 15c0b8c998616bf43a91f294381c39fb624e7fcc Author: Mateusz Guzik AuthorDate: 2023-03-01 11:09:48 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-01 11:09:48 +0000 mips: whack __mips__ leftover Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/usb/usb_freebsd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/usb_freebsd.h b/sys/dev/usb/usb_freebsd.h index 2d2123d4b622..f01dc33211d5 100644 --- a/sys/dev/usb/usb_freebsd.h +++ b/sys/dev/usb/usb_freebsd.h @@ -64,7 +64,7 @@ #if (!defined(USB_HOST_ALIGN)) || (USB_HOST_ALIGN <= 0) /* Use default value. */ #undef USB_HOST_ALIGN -#if defined(__arm__) || defined(__mips__) || defined(__powerpc__) +#if defined(__arm__) || defined(__powerpc__) #define USB_HOST_ALIGN 32 /* Arm and MIPS need at least this much, if not more */ #else #define USB_HOST_ALIGN 8 /* bytes, must be power of two */ From nobody Wed Mar 1 11:12: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 4PRWlj2dYPz3vjrf; Wed, 1 Mar 2023 11:12: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 4PRWlj15Xkz4S8T; Wed, 1 Mar 2023 11:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677669121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jiVHwz0u2UD5mT6CQFAh/Tvb+r96OfpA3Zj8fcpeNaU=; b=uw3WU4b9xI2xYDz2/0ENNbTBY6ti/GKG9G5d4K1nVjyEOvwk8H1ev8yoJ338LQDrhPLbrg v6PbpYQMttibezKRg1iUCIV96db27KMa5uTEb6RWl6nF1Byew1fTTaNDHZsa7PUPG1pJEl ILAy1cITvHLBEocsqFl9G6K52JylyfG0+gr5GfsaCdb12Q8bAxh1GyzwJas0q6T9BklL5S GzBW0gQEZWB9i7+sLpkuBZy/cSPUm6votoG3Ewv20kEjY5KttjegiTQ6bYGVwpotQmy0JT ypeYYhTO088Ik2AIU/b5OF0iD8INF///4Q+yEYh3bvw7CUoqjbpsQXb1tj1Pvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677669121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jiVHwz0u2UD5mT6CQFAh/Tvb+r96OfpA3Zj8fcpeNaU=; b=i1wvv1aW/2XBAntC1wfde3JqQtsoZm1Hu4BNWnmbSOqWeot6JOKvMtK5+VCb0Fbai3rmtY YO2vTUZK8JIUC/PBUsNIwwptFwilxXntb2PfIwjims09iASt8HOFGu11zGXQBVKFUhSY5Z NkfZUV0pW2MFXb3IXQIXhRjR72AcfuVnefoA4QXoZQFMMHovW6Sxiqnu4XndrWisDK2vl7 mwl29UIzu9vmawcUMNZRxC8QP8YdJSMl/t2tSAPSoLVdpmtCSxyg1AML6TBiHr4Ch5Tf8y InHxbAF5hoGpKDz0PRK5EykGTXfD93edeeJaZd2QCm3Pldnupqqf41zx02sIBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677669121; a=rsa-sha256; cv=none; b=myFujHCzMg2a6RK4QenfKxx9PoYjLn7+GOaM/DIoIg4/7XEDQeCORgpLhifeDQh/xzNVvf pq/yqXU7tBNVLiUF8xDCRh2/YfTJa967wmPNL9KPDa/CcWZ3NN/GFqnY7l5fuQ2Cx5Oe4c jNS2EfV/GiwDZf1dlOk2994v468341MHyn3jU371b+jIVhLYewR03Q3pM9IhhaiklBCO1S +x+PecN+bEndynF69769EuwQn2MoboB4ZejYOQmFzR4R89JavBP0ajlUNnfzZNakumwdKk Ir3WzJz62sFpyOuM9QteyW7QcPeFhdzZ/vUv4zo8AKhCU0CoRdH1QdK+87bNxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRWlh6xvHzX4d; Wed, 1 Mar 2023 11:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321BC01S075252; Wed, 1 Mar 2023 11:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321BC0SI075251; Wed, 1 Mar 2023 11:12:00 GMT (envelope-from git) Date: Wed, 1 Mar 2023 11:12:00 GMT Message-Id: <202303011112.321BC0SI075251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 76a0183e361e - main - syscons: whack __mips__ leftovers 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76a0183e361e7845cd59915166174400dbcead2a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=76a0183e361e7845cd59915166174400dbcead2a commit 76a0183e361e7845cd59915166174400dbcead2a Author: Mateusz Guzik AuthorDate: 2023-03-01 11:11:46 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-01 11:11:46 +0000 syscons: whack __mips__ leftovers Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/syscons/schistory.c | 2 +- sys/dev/syscons/scterm-dumb.c | 2 +- sys/dev/syscons/scterm-sc.c | 2 +- sys/dev/syscons/scterm-teken.c | 2 +- sys/dev/syscons/syscons.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c index efb5d5bf6765..c6efb7f5b24c 100644 --- a/sys/dev/syscons/schistory.c +++ b/sys/dev/syscons/schistory.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if defined(__arm__) || defined(__mips__) || defined(__powerpc__) +#if defined(__arm__) || defined(__powerpc__) #include #else #include diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c index 3011b0de8f52..f158176e99e0 100644 --- a/sys/dev/syscons/scterm-dumb.c +++ b/sys/dev/syscons/scterm-dumb.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if defined(__arm__) || defined(__mips__) || defined(__powerpc__) +#if defined(__arm__) || defined(__powerpc__) #include #else #include diff --git a/sys/dev/syscons/scterm-sc.c b/sys/dev/syscons/scterm-sc.c index 684638f41120..9b36976d2c1a 100644 --- a/sys/dev/syscons/scterm-sc.c +++ b/sys/dev/syscons/scterm-sc.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if defined(__arm__) || defined(__mips__) || defined(__powerpc__) +#if defined(__arm__) || defined(__powerpc__) #include #else #include diff --git a/sys/dev/syscons/scterm-teken.c b/sys/dev/syscons/scterm-teken.c index ed287a74b8f9..2d65b06abbfc 100644 --- a/sys/dev/syscons/scterm-teken.c +++ b/sys/dev/syscons/scterm-teken.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if defined(__arm__) || defined(__mips__) || defined(__powerpc__) +#if defined(__arm__) || defined(__powerpc__) #include #else #include diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index defd0b8380bb..fc4cccdb3fa4 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if defined(__arm__) || defined(__mips__) || defined(__powerpc__) +#if defined(__arm__) || defined(__powerpc__) #include #else #include From nobody Wed Mar 1 11:41: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 4PRXPk6tVHz3vlZP; Wed, 1 Mar 2023 11:41: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 4PRXPk6Qbkz4VX0; Wed, 1 Mar 2023 11:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677670890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePIpyO1iPTZMD8IrhEO4J8ELx/97XPnYwoP/TEU2yqM=; b=K6ot/5fUJXlgnZMn2pJZRPGnT7OYuR3QPThmH48N9wM60lXRJztO0eoks3O5XkIUi0R4cw C45gahDCMi4xOpUmqcJbzaPXZ5TFyYgAwT1PkFiBLrdV8X0gs0/ttnQHaOvbW9vOBjYePv sskC4rDTtxBzuJRHH8b8jl2350IjQgMs3aWemjrnzSAQ4DUwwPNObfoL95BQgQ9iso4u3s bME4QoOoqZaERB8eEyuFc98IW/Vx5ImIS/AyFtK7WwxwGFL7GAWw5gxJs7ppMKHalMi8dM /rK1hF9JzcU6HW8xP7/nGFe0Dimvd3f14BKO2AAZCRpLr4Pj3kyazWlqyKxwpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677670890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePIpyO1iPTZMD8IrhEO4J8ELx/97XPnYwoP/TEU2yqM=; b=Yfd4MFTOtTneaBL2O3WkfZkVC7ofA1CxZ0A0VkC2e20R8qTIqrdUa8tZC4KbN65lx8eKid 3iItpWPldjntkz3dmTdhwu2889Wx4l2nyBRD9FlCzqUhNr1FNTzkoydIzeikMMef6wI2fi lttp5q/cBP1/10XjN6B+CbsMF2vUYVn5hWr1gFtNYnANpBfGMiWJRm4gWWCrL4w8alc629 EPDLikpDtKj3KF3J8bEbFr4GNNCkpdsP+oH3fOhsWA/eb4f8UbawBqolOyVux5iJbNewaa XEuv4sDXSxpPYJXMaTcWNMub4f3IliQSdShP8KmuraaBa8gy3jN187ccT/dW+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677670890; a=rsa-sha256; cv=none; b=l4pApgABMK7UfQvFTiHJ++ZXPZOBm2sYOa3Il5Ht093t7zgfHiKTo08yeNRtqGkf3LUCwM PYbTMU2qEgu9ka62ABJLj2zH1mXrToF89hPFJiBqWKH0AxquUgu821c9hpqUxFzC5iPNKz bSMzT+GdA11DUDC9XQ3T12C/bgpeMlmnYu3jV/ud51nHXmQS9TuJJsKytHprz7XGQHFVPI +AWklgPvTXPr3Kr/bTKLk4C1FeYwNDnWFhXtQfYJA+ESVgcVEpxlAVU2TpMbBNLKrIN/PC XpsyhBaP3mOhjSThWGHjFOGRnA07Sdjt22Jf0AewmivDA/BeCZcRMCEX9cR6kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRXPk5TlXzXg7; Wed, 1 Mar 2023 11:41: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 321BfULf021579; Wed, 1 Mar 2023 11:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321BfU3P021578; Wed, 1 Mar 2023 11:41:30 GMT (envelope-from git) Date: Wed, 1 Mar 2023 11:41:30 GMT Message-Id: <202303011141.321BfU3P021578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 19fe14ec4c0c - main - fb: whack __mips__ leftovers 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19fe14ec4c0cb6cbcf00090e93bf70d34261b15e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=19fe14ec4c0cb6cbcf00090e93bf70d34261b15e commit 19fe14ec4c0cb6cbcf00090e93bf70d34261b15e Author: Mateusz Guzik AuthorDate: 2023-03-01 11:40:38 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-01 11:40:38 +0000 fb: whack __mips__ leftovers Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/fb/fbreg.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h index 944243d4e687..928672eee21f 100644 --- a/sys/dev/fb/fbreg.h +++ b/sys/dev/fb/fbreg.h @@ -67,16 +67,8 @@ void ofwfb_fillw(int pat, void *base, size_t cnt); u_int16_t ofwfb_readw(u_int16_t *addr); void ofwfb_writew(u_int16_t *addr, u_int16_t val); -#elif defined(__mips__) || defined(__arm__) +#elif defined(__arm__) -/* - * Use amd64/i386-like settings under the assumption that MIPS-based display - * drivers will have to add a level of indirection between a syscons-managed - * frame buffer and the actual video hardware. We are forced to do this - * because syscons doesn't carry around required busspace handles and tags to - * use here. This is only really a problem for true VGA devices hooked up to - * MIPS, as others will be performing a translation anyway. - */ #define bcopy_io(s, d, c) memcpy((void *)(d), (void *)(s), (c)) #define bcopy_toio(s, d, c) memcpy((void *)(d), (void *)(s), (c)) #define bcopy_fromio(s, d, c) memcpy((void *)(d), (void *)(s), (c)) @@ -90,10 +82,8 @@ fillw(int val, uint16_t *buf, size_t size) } #define fillw_io(p, d, c) fillw((p), (void *)(d), (c)) -#if defined(__arm__) #define readw(a) (*(uint16_t*)(a)) #define writew(a, v) (*(uint16_t*)(a) = (v)) -#endif #else /* !__i386__ && !__amd64__ && !__powerpc__ */ #define bcopy_io(s, d, c) memcpy_io((d), (s), (c)) From nobody Wed Mar 1 14:07: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 4PRbfl2tjfz3tts1; Wed, 1 Mar 2023 14:07: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 4PRbfl2PJhz3Gl5; Wed, 1 Mar 2023 14:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677679679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsDTalW9x5K8glFGFX85ylnKA1OsyXoHTTbx8GUwfw8=; b=m7ud3Ti9wMppS46e3X9uHjPeaK/4pwJBFnTPC3rxY6TOuZx0IeDFkQxfWfe5YAzo1jID0x GHS6f4zqQLE5FkJZuyrt/dBNFhBluEgCc7VK1IB1dNFeJz0n8W/FZlaNYn4yr2+R1oSrGi +TolWgIF3s0W9XSUSm1His6W2nkSk6nlBPFlyZ+GCnraYzFMrSoyNlGeeGG6T0RxV5nFEO E+1vTJ6vs5O6swTsyBJAPm8VX6F011fbJnfW4WC9bBHJAouDaCK7P/OiY/GpMZGI2VYcx0 Sa12NJ/YUiFx9P7S5xJz6r9Y/K8p0G/URUyj0npJqP+OSFztqbjPAHlpjwGcyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677679679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsDTalW9x5K8glFGFX85ylnKA1OsyXoHTTbx8GUwfw8=; b=WbJ8tTqJhY4ehGszMd2vs26SQK3YmlBdYhILhqKHAx6Y+5iJGUzis+1HV7FeOzKm/P3GYC SMFTocfcJpkrPX004ypHdBaR4l0ZlMA6SpVfEKewt5uuVt31EGlEO7mWETUhBbWB1mn8dm XQf0fWq5Tst0a1T86wjfYn3SxQ+O+BO3HWEK34SoRdKo3kEIlcUHBSPTEdogWobXFfJ92l Uhb0TR0gdFDpdE2NleufpN7szayAn34RfMuG9em7qU8lg19Dco05hgYVOr2aCNa0/4Snz4 RcWzNgpTOJtc79n1TO0OPjpKxJh9q2bSvaLjlsKCvcEbCdYpdwS4Qpj86a1XnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677679679; a=rsa-sha256; cv=none; b=WzjA96Sz2BTbZMpE62HIS7/IzkJIRHd2iF6GvzIWhugOZmVpZv9yVSq7skVzHcQ5sKhLNZ DWhY4AMFTDU6HMw7OOQq7YyIgHpHXeuGGjj7m4yI4Rnv1UU2KAny4Z8PHmK94K0b0c0pnr 9+HU/U82losOTqgyTcHsTjN2vKTrou79BVB2NmXc8+ze3o95fFWC07gZR1lzjqkL691IkF J0QhhI9NiJNg38pxNEN/R6Qh0U8ZzYR4HwOWCETMcMwUW7rz5lVkVS12jJYmCygO/JEQGN V+rNpid1cnABBrYgWKJ0BDQZiS1BwOAzTwqPmzmOAKMyat4VVnWajCedvXutOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRbfl1812zcgK; Wed, 1 Mar 2023 14:07: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 321E7xXR055375; Wed, 1 Mar 2023 14:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321E7xv1055374; Wed, 1 Mar 2023 14:07:59 GMT (envelope-from git) Date: Wed, 1 Mar 2023 14:07:59 GMT Message-Id: <202303011407.321E7xv1055374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Allan Jude Subject: git: 71af885af9c8 - main - u3g(4): Add device ID for the Quectel EM160R 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: allanjude X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71af885af9c86a900beec09d98fb9d305c303744 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by allanjude: URL: https://cgit.FreeBSD.org/src/commit/?id=71af885af9c86a900beec09d98fb9d305c303744 commit 71af885af9c86a900beec09d98fb9d305c303744 Author: Allan Jude AuthorDate: 2023-03-01 14:01:19 +0000 Commit: Allan Jude CommitDate: 2023-03-01 14:05:24 +0000 u3g(4): Add device ID for the Quectel EM160R Also add the EM160R to the man page, noting the work-around required to make it function properly in PPP mode. MFC-After: 1 week Sponsored by: Metify Inc. Sponsored by: Klara Inc. --- share/man/man4/u3g.4 | 10 ++++++++++ sys/dev/usb/serial/u3g.c | 1 + sys/dev/usb/usbdevs | 1 + 3 files changed, 12 insertions(+) diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4 index b5ad77d21c39..e8990968fd7b 100644 --- a/share/man/man4/u3g.4 +++ b/share/man/man4/u3g.4 @@ -74,6 +74,8 @@ Qualcomm Inc. GOBI 1000, 2000 and 3000 devices with MDM1000 or MDM2000 chipsets .It QUECTEL EC25, EM05, EM12-G, EP06-E. .It +Quectel EM160R (see CAVEATS) +.It Huawei B190, E180v, E220, E3372, E3372v153, E5573Cs322, ('') .It Novatel U740, MC950D, X950D, etc. @@ -149,6 +151,14 @@ driver was written by and .An Nick Hibma Aq Mt n_hibma@FreeBSD.org . Hardware for testing was provided by AnyWi Technologies, Leiden, NL. +.Sh CAVEATS +The Quectel EM160R is not officially supported in PPP mode. +In order to use it in PPP mode, the ctsrts option needs to be turned off, +for example, by adding: +.Dl set ctsrts off +to +.Pa /etc/ppp/ppp.conf +in the correct section. .Sh BUGS The automatic mode switch from disk mode to modem mode does not work unless the driver is either built into the kernel or loaded before the device is diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index 8bcc99d5c61d..1cdc28d93de4 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -517,6 +517,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(QUECTEL, EM05, 0), U3G_DEV(QUECTEL, EM12_G, 0), U3G_DEV(QUECTEL, EP06_E, 0), + U3G_DEV(QUECTEL, EM160R, 0), U3G_DEV(SIERRA, AC402, 0), U3G_DEV(SIERRA, AC595U, 0), U3G_DEV(SIERRA, AC313U, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 637b49d5e399..54f0a4ace3a2 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -3988,6 +3988,7 @@ product QUECTEL EC25 0x0125 LTE modem product QUECTEL EM05 0x0127 LTE modem product QUECTEL EP06_E 0x0306 LTE modem product QUECTEL EM12_G 0x0512 LTE modem +product QUECTEL EM160R 0x0620 LTE modem /* Quickshot products */ product QUICKSHOT STRIKEPAD 0x6238 USB StrikePad From nobody Wed Mar 1 14:20: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 4PRbwn6NH9z3tvjN; Wed, 1 Mar 2023 14:20: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 4PRbwn5vCpz3HT5; Wed, 1 Mar 2023 14:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677680409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dsAoWKzxO0x2jTvjoEQrbwYG+3lOXndd3rqOKK6Z8I=; b=TOuF+OInCRtqmKmBuYDJwSV5GhaPZC3l+y5ThJPq4QD1DKPTpEf+VybfhduqplYBXglkxo Fm0vBhXfCKsWzE9HGYeFo3Kcj3UxToa4MqsOtED4StPBOhW0WQCpoFRc93ULN1uMTR0DbK na+ZQhPGG3OL1kMorD3WnToTdr+X4iNg3DC3Z8li1zt7yWRLedhWPx/TjUIbtEGgZn0ICY o7Swc0NW0lpeJhc7Fbpkd4YLLQfqeuNgXaRPA+dqIS+wZxLEWBoQNAciFjE0vw/I6kKPun xR34DM/j5lZNQ3nnW4uD4VZUCreF9PGHt2sZknPK8nrMZ269d0d8P3WIaY47QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677680409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dsAoWKzxO0x2jTvjoEQrbwYG+3lOXndd3rqOKK6Z8I=; b=SOzZvgglxezbZhSCVt/0AU9qJJsJDCiBDk3mnEOnEsw2deuv/JnpPbTXbY+TNvK+lASabN abRp1beRJMfGCCEjZt7kT+XnJa0mcQLV/fUfXx4idrIgk/1hn4exQwqZtXMmpOigggxjv3 wjNYVu54zYKMUmuy5oTrq6EeYyH7epn4SCgg/V9Rv70bFkZ5bkyEBd8KZHwP17KcCmXoC0 /YxHMQuM9IU1PFFhhIu1m4Yd9JT+MhrLhqjzoc8HOdLlnf3L5avysAxbJw0v/x/q7AFvWj 31QEVAxIclBs33LDXxHzBj7KbrUm17vrfUlir8s1HVG7Y1hIRmnFx49vAS1IVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677680409; a=rsa-sha256; cv=none; b=SpjvhLew3rZxF/DXxFgb6EQIpiwk09gCm9tfBJPlbBGY9sxxougHilv1RvjJ2hetUHa6RZ z3PpBJjFFSWJ1k+kfS5poQaiKm+ROH2smvnmAhAIakhunHB9hMQEYHAIbQPuhqcMmsqKZo kSVNAbbK9t5jon4JCG2OUPATiF2q4xNjH2ZKqTwiDFF43b5ByzHD1jf/cjVgyWoOzITu20 QOAMv76UEg60884QlplLifGyHcBJhl63sZenlLR+qe5RXLVFWNy2ni+Ph9jTIh97uOyUV3 PF0gn48aWWcVi97eglgbK0vcf4xOo2KsjdoYdWNK1scjo62tz8daz5PAbnw1oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRbwn4y7kzd6G; Wed, 1 Mar 2023 14:20: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 321EK9uF076531; Wed, 1 Mar 2023 14:20:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321EK9Fg076523; Wed, 1 Mar 2023 14:20:09 GMT (envelope-from git) Date: Wed, 1 Mar 2023 14:20:09 GMT Message-Id: <202303011420.321EK9Fg076523@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: 41ff5ea22cb9 - main - ssh: default VerifyHostKeyDNS to no, following upstream 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: 41ff5ea22cb95deb9e7415510eb2f5f00b91537a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=41ff5ea22cb95deb9e7415510eb2f5f00b91537a commit 41ff5ea22cb95deb9e7415510eb2f5f00b91537a Author: Ed Maste AuthorDate: 2023-02-17 01:26:41 +0000 Commit: Ed Maste CommitDate: 2023-03-01 14:19:07 +0000 ssh: default VerifyHostKeyDNS to no, following upstream Revert to upstream's default. Using VerifyHostKeyDNS may depend on a trusted nameserver and network path. This reverts commit 83c6a5242c80160fff76fb85454938761645b0c4. Reported by: David Leadbeater, G-Research Reviewed by: gordon Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38648 --- crypto/openssh/FREEBSD-upgrade | 1 - crypto/openssh/readconf.c | 6 ------ crypto/openssh/ssh_config | 1 - crypto/openssh/ssh_config.5 | 5 +---- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index bc1122768790..92abda1d0e4c 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -122,7 +122,6 @@ We've modified some configuration defaults in ssh: - CheckHostIP defaults to "no". - - VerifyHostKeyDNS defaults to "yes" if built with LDNS. 3) Canonic host names diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index bbf03c8d953f..9ade0ffa0641 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -2592,14 +2592,8 @@ fill_default_options(Options * options) options->rekey_limit = 0; if (options->rekey_interval == -1) options->rekey_interval = 0; -#if HAVE_LDNS - if (options->verify_host_key_dns == -1) - /* automatically trust a verified SSHFP record */ - options->verify_host_key_dns = 1; -#else if (options->verify_host_key_dns == -1) options->verify_host_key_dns = 0; -#endif if (options->server_alive_interval == -1) options->server_alive_interval = 0; if (options->server_alive_count_max == -1) diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index 306e8f950efd..1eb1c00632b0 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -44,4 +44,3 @@ # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h # UserKnownHostsFile ~/.ssh/known_hosts.d/%k -# VerifyHostKeyDNS yes diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index 153dd9ea4ed8..7c24e12dfdee 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -1991,10 +1991,7 @@ need to confirm new host keys according to the .Cm StrictHostKeyChecking option. The default is -.Cm yes -if compiled with LDNS and -.Cm no -otherwise. +.Cm no . .Pp See also .Sx VERIFYING HOST KEYS From nobody Wed Mar 1 14:44:39 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 4PRcT32k88z3txCW; Wed, 1 Mar 2023 14:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRcT32Djhz3L10; Wed, 1 Mar 2023 14:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677681879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LGg0Nc5nRtkgUTYi2vRxiGpYNKPnqbrP5DnhmS9mg4Y=; b=VYfN6jSVIOPtbhlbIJQCAmNHuPgNj+Hdiwo1Z3NWfyeXHEbnm1AZOKurBXnnqJNXC60AlG 0IihlGgSj0CrU/Pn++vOPV+eta7Vrz8K37CdK4OVNMyXyNk3uT4S1ALsbYXvN6j4qEWryt zrBVEnCBGBD4gJVDzjxc+WqY4ajrY6/LZKFGsQWmyzIfsVecIaK29iOUCBJYNTNL7XNA6C ntHfCVkGW9RD9r0KyElsuGWgX2Gt7IcnZ1zXxD+2qyd87cW+S22Uo9zeHyEuGLZC47wgU+ 3VrIpGNIZ2AfPA7wXvhdxOmgL1Xo1yQu0hlp4tDkwFvvDRIgdlDMR3dLuPl3NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677681879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LGg0Nc5nRtkgUTYi2vRxiGpYNKPnqbrP5DnhmS9mg4Y=; b=oqSnEukngP9HGJOh32pdTUfxkNlKDCVK4Jl0dCF0OA4z2mwSgvqhiVe+CP0hbqGQb303Qx 8ewyHnCnFrBbG9WbYFycaQNQqp7sZBNgjM8QSz1XZSzQRaCDvgg4g8f3q/dtsKZ80/sFko tKu3pJYWSXFCr0tWms0dCeMcfIWDQerLRkbacyNqDhr6rzoqrGrN2xlxETDaYzRC2P5YYh mBKX5hbFdeSVmwc8oIIFUb+o+Lw7ajYZ9Fu9GJGqlrg+qQj1d5fjxq3mFtaJv0UgXO7TEm ln1uw1oh+uSQvIkKwAzJtT8e/MsuEQ+NHtvwXz3q05mCdYqYLHpgE3UT6pomBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677681879; a=rsa-sha256; cv=none; b=Jw6MWKLzB9/TvnEoMBM6jwCSY7ag67+BsqnudgbWN8NXfas/gG/BPt3t+kgtC5OPpWZGeJ ilMRLpuBo/XkCwplBbPjVyqQjYiqKHLnFJ9+K/VaZ4M9UUkG3DcdGAZ2xKpXYMKCsl49y6 FOKHDdk6hoU6FiK00J79OcX8rJYaphqGIpRDctg3Fj/Mulptr+i2FrLrlieWeJYqFRHfHq AcFwDGOYATm9FVwCF7upA0bsyCXyF0J2ezxONDbmsJ5Vd5P73ObF7ASAyPC4LBsT86m0Ww iUEqi9BPEMLDb2tHSjo46WqyQnjvuEzUOkopjnO/ytycNF984/Ku6hCje63s5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRcT31HBWzdf4; Wed, 1 Mar 2023 14:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321EidSs020242; Wed, 1 Mar 2023 14:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321Eidmr020241; Wed, 1 Mar 2023 14:44:39 GMT (envelope-from git) Date: Wed, 1 Mar 2023 14:44:39 GMT Message-Id: <202303011444.321Eidmr020241@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: 281402e0a563 - main - arm64: Shave off two instructions in exceptions 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: 281402e0a5638108ead2529c63e34f3d1771d05e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=281402e0a5638108ead2529c63e34f3d1771d05e commit 281402e0a5638108ead2529c63e34f3d1771d05e Author: Dapeng Gao AuthorDate: 2023-03-01 14:28:53 +0000 Commit: Andrew Turner CommitDate: 2023-03-01 14:43:43 +0000 arm64: Shave off two instructions in exceptions This patch shaves off up to two three instructions in save_registers_head in exception.S for arm64, which would make more space for instructions that could be added in CheriBSD. This is done by: 1. Combining pointer arithmetic with pre-incrementing STP instructions 2. Removing the instruction that sets the frame pointer (x29) as its content is unused Differential Revision: https://reviews.freebsd.org/D34631 --- sys/arm64/arm64/exception.S | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index 55bac5e5228a..fd55e1f39b58 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -41,35 +41,34 @@ __FBSDID("$FreeBSD$"); .macro save_registers_head el .if \el == 1 mov x18, sp - sub sp, sp, #128 + stp x0, x1, [sp, #(TF_X - TF_SIZE - 128)]! +.else + stp x0, x1, [sp, #(TF_X - TF_SIZE)]! .endif - sub sp, sp, #(TF_SIZE) - stp x28, x29, [sp, #(TF_X + 28 * 8)] - stp x26, x27, [sp, #(TF_X + 26 * 8)] - stp x24, x25, [sp, #(TF_X + 24 * 8)] - stp x22, x23, [sp, #(TF_X + 22 * 8)] - stp x20, x21, [sp, #(TF_X + 20 * 8)] - stp x18, x19, [sp, #(TF_X + 18 * 8)] - stp x16, x17, [sp, #(TF_X + 16 * 8)] - stp x14, x15, [sp, #(TF_X + 14 * 8)] - stp x12, x13, [sp, #(TF_X + 12 * 8)] - stp x10, x11, [sp, #(TF_X + 10 * 8)] - stp x8, x9, [sp, #(TF_X + 8 * 8)] - stp x6, x7, [sp, #(TF_X + 6 * 8)] - stp x4, x5, [sp, #(TF_X + 4 * 8)] - stp x2, x3, [sp, #(TF_X + 2 * 8)] - stp x0, x1, [sp, #(TF_X + 0 * 8)] - mrs x10, elr_el1 - mrs x11, spsr_el1 - mrs x12, esr_el1 + stp x2, x3, [sp, #(2 * 8)] + stp x4, x5, [sp, #(4 * 8)] + stp x6, x7, [sp, #(6 * 8)] + stp x8, x9, [sp, #(8 * 8)] + stp x10, x11, [sp, #(10 * 8)] + stp x12, x13, [sp, #(12 * 8)] + stp x14, x15, [sp, #(14 * 8)] + stp x16, x17, [sp, #(16 * 8)] + stp x18, x19, [sp, #(18 * 8)] + stp x20, x21, [sp, #(20 * 8)] + stp x22, x23, [sp, #(22 * 8)] + stp x24, x25, [sp, #(24 * 8)] + stp x26, x27, [sp, #(26 * 8)] + stp x28, x29, [sp, #(28 * 8)] .if \el == 0 mrs x18, sp_el0 .endif + mrs x10, elr_el1 + mrs x11, spsr_el1 + mrs x12, esr_el1 + stp x18, lr, [sp, #(TF_SP - TF_X)]! str x10, [sp, #(TF_ELR)] stp w11, w12, [sp, #(TF_SPSR)] - stp x18, lr, [sp, #(TF_SP)] mrs x18, tpidr_el1 - add x29, sp, #(TF_SIZE) .endm .macro save_registers el From nobody Wed Mar 1 14:48: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 4PRcYZ47VVz3txKh; Wed, 1 Mar 2023 14:48: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 4PRcYZ3bYnz3LSG; Wed, 1 Mar 2023 14:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677682114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4U4v+IxizOO+lGuncEq1yuLXzkjljbPBZ0c4KYl0aU=; b=W/VQX8qD0AKDFr7y8xDro44sM0LLF5StXsIWZoa5T7ANsJzi/f4UJJ063OpDUQFHJD/bHK mNXdXQoBWJzePcdjNY+Wwtm+odU8U+mfQnM9KHFqR66WoHdZqjsnjB24G8xAIeHNcdcQi0 Lwx9+pAUdW2MjDkTyLNVwgV/41t2GDB6P6Zdym+oVNDGzyxdc6pY82nIfMuafBpfTCt59E FojOM69aoLd0UpBSsFTfdKWcJo5pL0Q6dawkTMWc3e+KoJPZJrccyk8wdpyyxn31cFse8b FqTI9pMG/W/JChXwWMgWB3Js5ve5bluGrmH8mP49hdK9Sgko30/hGUrHtP4vpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677682114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4U4v+IxizOO+lGuncEq1yuLXzkjljbPBZ0c4KYl0aU=; b=TgQQISGmcFuwEF1ZXt0SCsywQjQH9qN9xHVTPQSK6oZifSLReqibGGd79SWVjRwEP97+ub FJX7tf3yhKGoS0ac/rFXmLqyl+83lZbaTfTRWoZPvUCzAR3EJoJ7/rJ9jO1hnjk8COmttn aSjwIHfDwUiFdjWIzy2GDLQz91Z36X5QYyGMSO9D0eUEng6k6ufhCvUfYlEB79dkPfYyEP owFi5ce2DXIBFaJhgYutLBsnutHNl5Gh+sMPDybNYZw2Ivyl7IKGAKOBxqBvEJTcJ1T2xM AXEjrz072U4L5Ppbh8YgotDJ/XpnaWRmT9E6zK48GLcKaU1W8dTjyPjHj/IFTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677682114; a=rsa-sha256; cv=none; b=unBNLOgCxM5Ymmi1+yN7Ag9kk+lveVu8UrPQhIE7w7erJhwJR82AgG1hJTEEWH9Y5Nj0xn 5OsSJrMnltXcoKgMTmlKfP16QUSSQO28Ufr8fP7Yu8NVNIlROhjRWIEN5iOg7yoD2XxNn8 oKHvQyEE2j14tNvZ2CV2lQ2qfEJMyvGD8xMGPQPwUKWkuvXc4hPLilaGRJ2zgU6ShBJGnK 1GWWccsu1Z53Xd1FWXDwTCp+0dh+4MiiGUW5HtlTWymvUARBthPMH6YqB5ilMS9OS2BTcP nF3pt/LCitE8r1gKxvCVMm6I2+HDo3aMup4MXtGjfGKqIaRBuzfKvuZexok5+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRcYZ2gQQzdcT; Wed, 1 Mar 2023 14:48: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 321EmYfT021138; Wed, 1 Mar 2023 14:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321EmYan021137; Wed, 1 Mar 2023 14:48:34 GMT (envelope-from git) Date: Wed, 1 Mar 2023 14:48:34 GMT Message-Id: <202303011448.321EmYan021137@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: 5e95f5f53150 - main - thunderx: fix potential sign extension issue 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: 5e95f5f5315083baa7d98d3286f6c0a82621a68e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5e95f5f5315083baa7d98d3286f6c0a82621a68e commit 5e95f5f5315083baa7d98d3286f6c0a82621a68e Author: Ed Maste AuthorDate: 2023-02-28 19:17:30 +0000 Commit: Ed Maste CommitDate: 2023-03-01 14:48:17 +0000 thunderx: fix potential sign extension issue Coverity reported a sign extension issue on rq->caching << 26 in the Linux ThunderX driver. (It appears Coverity Scan doesn't build arm64 objects in FreeBSD.) As done in Linux, add a cast. Fixes: 3c0086b81391 ("Raw import of ThunderX VNIC networking driver...") Sponsored by: The FreeBSD Foundation --- sys/dev/vnic/nicvf_queues.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/nicvf_queues.c b/sys/dev/vnic/nicvf_queues.c index 017d1c6e3e1c..82f045c7777c 100644 --- a/sys/dev/vnic/nicvf_queues.c +++ b/sys/dev/vnic/nicvf_queues.c @@ -1342,7 +1342,7 @@ nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs, mbx.rq.msg = NIC_MBOX_MSG_RQ_CFG; mbx.rq.qs_num = qs->vnic_id; mbx.rq.rq_num = qidx; - mbx.rq.cfg = (rq->caching << 26) | (rq->cq_qs << 19) | + mbx.rq.cfg = ((uint64_t)rq->caching << 26) | (rq->cq_qs << 19) | (rq->cq_idx << 16) | (rq->cont_rbdr_qs << 9) | (rq->cont_qs_rbdr_idx << 8) | (rq->start_rbdr_qs << 1) | (rq->start_qs_rbdr_idx); From nobody Wed Mar 1 15:10: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 4PRd3H4TRhz3tySq; Wed, 1 Mar 2023 15: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 4PRd3H3s1Jz3NHY; Wed, 1 Mar 2023 15: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=1677683451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=725g8bxL8lofX/4HGc2mZLYbVW9ZIIvBu0nehVuZaoI=; b=s51YOuhULvq1kFFvQEYzRGeNCHrZ7k+2Ty0gRP5sHQ1SJntyJb9gewOwp0mKsuro3VifvZ 5S4t9sQMVJPnBvjYN1Ews3AK+JgMyZNATl7YNmD8pzz6oJgBpZgfc8O94c0xudP/rJrvUI 7jHCjAOc+xHWs5tYxAusBVEVapqDOjDQlf1I5iQbSOcNZ5IzHeJLnyV1mIahRXFcUdnajF 5Bosw7hnKOCpn9skIXSeV869Y0mdCzIaQ/csYl5Qa/MCxqzU39harPWXazVx0m/JN2IFZ9 a/ySqg0ASRFo+xdMCMZbol4NtaEkEd/aRkM2b+9ZWx0D8+K74G1A4fP9BBoSSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677683451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=725g8bxL8lofX/4HGc2mZLYbVW9ZIIvBu0nehVuZaoI=; b=jgShVVDD4nbHqTvGgSHbvDA356nTk0Pcs9ZFAX+zHbPPnrggKrav4+GhZSG94xJRI7C1TW xPacpFY8qu7rRKJ1njNz3HgMvSkI1cTDy7FUVDvUEBePQX8G/jL9sXoxaJXJ9czVSw5NFU EOvRml+WjBfydFJFNW4p5OFdSU0T3/nBZTma0VPjfGUQy/9KY6rl4rdFximryN0F+cwBbW GD+Fv9Ny+uu28dK8ksFRSKnNmN/JnTh8/+wZgtbof7lvwbwTFCNOT/bE9URixwzKgqPGxA yyXnjIvhbCdHh92jvhaedq1njq3rRrYE22HwAgzHi2tq/7V2yj4+2FoLPuN+QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677683451; a=rsa-sha256; cv=none; b=jWyZrfyoCj28flytBRZUZ703kK++DU0TuTJhlBViykJ4SnClckHoyUzC8MyMKSa/Q4O0nV bxMjNGnalNPel7OhHJfn/19BjhciL9zeXzJIasHwH7Lep8hJ0IlaITTU3HiAJ5VCgGPIce 7rP8ruj+IvwzibIiaO4d6stRABevuOM/cgCapv2sn10+cCMLWKWRbIAnrsd9zTr66mHCpg vHw9vmqbnUlLhsh2xMpP5alxNBEHVxKWvOgOOxh6ca2zut3jArsuNtXcsdsjMaIjevQ5KX F0e2yPKYDV/pATUJ7gkr4AerFzNi6cW5UbUf5TaiIspKy0lMofRNck9uIbwIHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRd3H2vbNzf46; Wed, 1 Mar 2023 15: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 321FApLN064146; Wed, 1 Mar 2023 15: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 321FAp63064145; Wed, 1 Mar 2023 15:10:51 GMT (envelope-from git) Date: Wed, 1 Mar 2023 15:10:51 GMT Message-Id: <202303011510.321FAp63064145@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: 2a02d3dad391 - main - pf tests: test pfsync over IPSec 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: 2a02d3dad391694516c82e6b7359bcac7d0327d0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2a02d3dad391694516c82e6b7359bcac7d0327d0 commit 2a02d3dad391694516c82e6b7359bcac7d0327d0 Author: Kristof Provost AuthorDate: 2023-03-01 13:02:15 +0000 Commit: Kristof Provost CommitDate: 2023-03-01 15:10:12 +0000 pf tests: test pfsync over IPSec Test that we can transport pfsync (unicast) over IPSec. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/pfsync.sh | 82 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index 7b8268216734..3871d6be8e14 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -588,6 +588,87 @@ pbr_common_cleanup() pft_cleanup } +atf_test_case "ipsec" "cleanup" +ipsec_head() +{ + atf_set descr 'Transport pfsync over IPSec' + atf_set require.user root +} + +ipsec_body() +{ + if ! sysctl -q kern.features.ipsec >/dev/null ; then + atf_skip "This test requires ipsec" + fi + + # Run the common test, to set up pfsync + common_body + + # But we want unicast pfsync + jexec one ifconfig pfsync0 syncpeer 192.0.2.2 + jexec two ifconfig pfsync0 syncpeer 192.0.2.1 + + # Flush existing states + jexec one pfctl -Fs + jexec two pfctl -Fs + + # Now define an ipsec policy to run over the epair_sync interfaces + echo "flush; + spdflush; + spdadd 192.0.2.1/32 192.0.2.2/32 any -P out ipsec esp/transport//require; + spdadd 192.0.2.2/32 192.0.2.1/32 any -P in ipsec esp/transport//require; + add 192.0.2.1 192.0.2.2 esp 0x1000 -E aes-gcm-16 \"12345678901234567890\"; + add 192.0.2.2 192.0.2.1 esp 0x1001 -E aes-gcm-16 \"12345678901234567890\";" \ + | jexec one setkey -c + + echo "flush; + spdflush; + spdadd 192.0.2.2/32 192.0.2.1/32 any -P out ipsec esp/transport//require; + spdadd 192.0.2.1/32 192.0.2.2/32 any -P in ipsec esp/transport//require; + add 192.0.2.1 192.0.2.2 esp 0x1000 -E aes-gcm-16 \"12345678901234567891\"; + add 192.0.2.2 192.0.2.1 esp 0x1001 -E aes-gcm-16 \"12345678901234567891\";" \ + | jexec two setkey -c + + # We've set incompatible keys, so pfsync will be broken. + ping -c 1 -S 198.51.100.254 198.51.100.1 + + # Give pfsync time to do its thing + sleep 2 + + if jexec two pfctl -s states | grep icmp | grep 198.51.100.1 | \ + grep 198.51.100.2 ; then + atf_fail "state synced although IPSec should have prevented it" + fi + + # Flush existing states + jexec one pfctl -Fs + jexec two pfctl -Fs + + # Fix the IPSec key to match + echo "flush; + spdflush; + spdadd 192.0.2.2/32 192.0.2.1/32 any -P out ipsec esp/transport//require; + spdadd 192.0.2.1/32 192.0.2.2/32 any -P in ipsec esp/transport//require; + add 192.0.2.1 192.0.2.2 esp 0x1000 -E aes-gcm-16 \"12345678901234567890\"; + add 192.0.2.2 192.0.2.1 esp 0x1001 -E aes-gcm-16 \"12345678901234567890\";" \ + | jexec two setkey -c + + ping -c 1 -S 198.51.100.254 198.51.100.1 + + # Give pfsync time to do its thing + sleep 2 + + if ! jexec two pfctl -s states | grep icmp | grep 198.51.100.1 | \ + grep 198.51.100.2 ; then + atf_fail "state not found on synced host" + fi +} + +ipsec_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic" @@ -596,4 +677,5 @@ atf_init_test_cases() atf_add_test_case "bulk" atf_add_test_case "pbr" atf_add_test_case "pfsync_pbr" + atf_add_test_case "ipsec" } From nobody Wed Mar 1 15:16: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 4PRd9l1DXDz3tysD; Wed, 1 Mar 2023 15:16: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 4PRd9l0l2xz3PJh; Wed, 1 Mar 2023 15:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677683787; h=from:from:reply-to:subject:subject: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/I/1hIHj0/ZM6IYwjSjcDpkeNNpPzc94AJIo4Ul7b4=; b=ifX/xM2dSAv7bgOdaSMGvH3XpxRg0mN9GmTq0M/lKfQb71dxFX5zD8L7yZ61mBEL+2wQLr 3KPkOvtSlHHLGULc9fVNryrXHgLvPcsCkYtgbdZdrst3XL0SvSNREzFW8jHj1mYDmPm0or B9osz2httKbzVZjuiYoHL4SMenWx5MD6QGoO2LMsxdhiOR8L42jR/bIvBrcHZ0RgJURybM lqJqbdzYhvyJeU7PA/wwA6eHQMfq90HpiHkPtXffgXaWblzPqE3tgjvTvVBmTXSiyxN5ix r2itjkSNxAO7LdB6wLu2KwmAEZ+oqjBUDofYs90AWgs1tAGvamx77Easdld7Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677683787; h=from:from:reply-to:subject:subject: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/I/1hIHj0/ZM6IYwjSjcDpkeNNpPzc94AJIo4Ul7b4=; b=nm4xqjuBMqIaB7ZKRuEFagoVxYPnRs7uBjzQjUq4F1kS215DehzFdOXmj6a1rvKBmO6zd+ +GKffNK7i35PHQz7zjH2uc+/ors/BvriHkMorOd3xTMaagAVQ3WKCDtbUnM5Kpa6Vn/yL9 qQzSnh48OJR/pogWDxJogem6bQxHIX4V4MIbEt3r+89b08DnMLTjUUWJzxWPr936bdTSAx QfzR5/L8qRHgIhRqY0OnCvzceQL1+fTnRnyzBQAVWzhJ128ig2K2QD61mhjs9HK8/j20ZT fGLgVRJtdam6eBwPDVOjIoIJkMqde72GZhPB9vpdpiuuV8Mr/wfBSPALUOhE6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677683787; a=rsa-sha256; cv=none; b=Uxn/O1D67uknObmEdwLrr8haRJUscEu82xcnbmNqB4lfsjDPpkVsU4Z7FlE5maNCwks/PM 3lQtV8+VnLPEpP58FJnpDMef+HMLBS5OgMl6exaZEO8+5SXBjkZwPC2e9wW7vHuTYqQZgx hUmb4W/naUEXnTie9GnzxszZg5hRZbJIwbTZ7hXhSOxEmGLS2S05w6jlF1Yb2vbiEqB5jO DuLnmiDnMhN3e1Z7OyZp3a1zj2z8+xtQAHKujs0yvww1AdQ+jIeq6gJtu/7jqdu6rSpRzm uW7OTEacvEL3laX1H1TK/P7frQozsPHL1NYc7VDC56lR1t325K1Ov0h/PZ2Xzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRd9k6vZ5zdqg; Wed, 1 Mar 2023 15:16: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 321FGQbc070300; Wed, 1 Mar 2023 15:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321FGQe0070299; Wed, 1 Mar 2023 15:16:26 GMT (envelope-from git) Date: Wed, 1 Mar 2023 15:16:26 GMT Message-Id: <202303011516.321FGQe0070299@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: bcd8cd859e69 - main - buf: Make buf_daemon_shutdown() a no-op after a panic 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: bcd8cd859e694bc4a4dfb6fdb8f55de3a96833b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd8cd859e694bc4a4dfb6fdb8f55de3a96833b4 commit bcd8cd859e694bc4a4dfb6fdb8f55de3a96833b4 Author: Mark Johnston AuthorDate: 2023-03-01 15:07:56 +0000 Commit: Mark Johnston CommitDate: 2023-03-01 15:15:54 +0000 buf: Make buf_daemon_shutdown() a no-op after a panic As in commit 9d7cc536e261a7, there is no need to do anything in this context. MFC after: 1 week --- sys/kern/vfs_bio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index b40ee382c42a..f1089964a041 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -3419,6 +3419,9 @@ buf_daemon_shutdown(void *arg __unused, int howto __unused) { int error; + if (KERNEL_PANICKED()) + return; + mtx_lock(&bdlock); bd_shutdown = true; wakeup(&bd_request); From nobody Wed Mar 1 15:24: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 4PRdMS1Ffdz3v03D; Wed, 1 Mar 2023 15: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 4PRdMS0m4Gz3QC7; Wed, 1 Mar 2023 15: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=1677684292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e4DwnioVM2SOyI5Qa56bJgEt26uXaDWgzuBmKQaGZlw=; b=KGASTTstDNELqEyFq/yzfWxzEyQFb5I87PtyIclRuKvTkyA9Ua4OLUe8rCJnWexNrsuIsT 2AmCH+iX/Kn8D5rTiNxP0BbDFQI/cWw8OjmlvI497Ev04aH52UM72b8zUY0UjZpQRZeoVZ Prok7Qfd5XeFFPWw0FslQq0QbU7DPpOHWloMGTu8Qfw/kkXFt9I/+D6DQMyaek4Ksqsy8H Njqk40I/OllEaXQL89tvON8w0N7MlpcGJLRubajezlGotJitukUjRL8F5+zleMe5h6zPRy jn8kbWjFjFYlGo8YYm3W2TS/ocrXj/l+iLosekbKmREQdCpMOJ1nHQpmCdvh+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677684292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e4DwnioVM2SOyI5Qa56bJgEt26uXaDWgzuBmKQaGZlw=; b=ALXxT9gqtCZXqKe/ntywEOEwMa0OXkEzPEg5A2GhN0SDlyHEXR1j1p/kITh9eVZXCQgmxp 1mZqcsXX52AXXdX0euQd4SwMPij810oN1kyGc0liWLJE1oeM7pZ9G7YtTNN6+WxVRTAOt4 YwM9grBV27PCdSnpkkYQuQnZQiN3J3Qun9MVQpS/7iY3+86iuhGXlwkoEI4WGwjfi4YHVw aGJ5vjzlj53M4bE0a/o3sP6Ls7HXPm4cL1wbchNWyF+4xUZ1KbS+vztFXXUCdcppfb2uP/ hpqrSkno2S+gF6tMSyiU33Q3eW6bZovk6oKiTDksKXLXZmB5+SvNx83WPapcZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677684292; a=rsa-sha256; cv=none; b=jdc568MfeJuprOWKGOrIIz2WbK/FETU5sUG/jV/iEgFs2YpP0x8pbZ9OWMZHQGf7j8XXmu uIvE8OseUeMRlBXbP+4AJGFboo27W4SR6duEkklJIL0KZhDV/2VTk0wZ/3k2NJeDeflm9Y omtu/+XDF8qElClVTYnL4oVTLPc2kLfl9dv+nHcLVG7E7Y6ZrzgaK6RVnH/32+nRq/p/8i ldc3agE3lgjMmhMsep6zgolVy3GhoCK/2KR11UooYKGuzdJl1Gel4QC+o20RIgeqHDzWmw Hk2MJxIsq4CIwaM+Ny2Pc3fU7iiRYw28ejpp3Bf5oQ/MJcJSeOX8tmo916EE7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRdMR6wTyzfVx; Wed, 1 Mar 2023 15:24: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 321FOpxc087278; Wed, 1 Mar 2023 15:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321FOppq087277; Wed, 1 Mar 2023 15:24:51 GMT (envelope-from git) Date: Wed, 1 Mar 2023 15:24:51 GMT Message-Id: <202303011524.321FOppq087277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: e6b4177c478d - main - netlink: add userland name mappings to all NETLINK_ROUTE 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6b4177c478da54e25db464ae60ddae9e890c2cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=e6b4177c478da54e25db464ae60ddae9e890c2cb commit e6b4177c478da54e25db464ae60ddae9e890c2cb Author: Alexander V. Chernikov AuthorDate: 2023-03-01 15:22:21 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-01 15:24:45 +0000 netlink: add userland name mappings to all NETLINK_ROUTE messages. MFC after: 1 day --- sys/netlink/route/common.h | 78 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 16 deletions(-) diff --git a/sys/netlink/route/common.h b/sys/netlink/route/common.h index 1bfb888b34c0..1f1d98dc4384 100644 --- a/sys/netlink/route/common.h +++ b/sys/netlink/route/common.h @@ -97,23 +97,64 @@ enum { * Use NL_RTM_ prefix in the kernel and map it to RTM_ * for userland. */ -#define RTM_BASE NL_RTM_BASE -#define RTM_NEWLINK NL_RTM_NEWLINK -#define RTM_DELLINK NL_RTM_DELLINK -#define RTM_GETLINK NL_RTM_GETLINK -#define RTM_SETLINK NL_RTM_SETLINK -#define RTM_NEWADDR NL_RTM_NEWADDR -#define RTM_DELADDR NL_RTM_DELADDR -#define RTM_GETADDR NL_RTM_GETADDR -#define RTM_NEWROUTE NL_RTM_NEWROUTE -#define RTM_DELROUTE NL_RTM_DELROUTE -#define RTM_GETROUTE NL_RTM_GETROUTE -#define RTM_NEWNEXTHOP NL_RTM_NEWNEXTHOP -#define RTM_DELNEXTHOP NL_RTM_DELNEXTHOP -#define RTM_GETNEXTHOP NL_RTM_GETNEXTHOP -#endif +#define RTM_BASE NL_RTM_BASE +#define RTM_NEWLINK NL_RTM_NEWLINK +#define RTM_DELLINK NL_RTM_DELLINK +#define RTM_GETLINK NL_RTM_GETLINK +#define RTM_SETLINK NL_RTM_SETLINK +#define RTM_NEWADDR NL_RTM_NEWADDR +#define RTM_DELADDR NL_RTM_DELADDR +#define RTM_GETADDR NL_RTM_GETADDR +#define RTM_NEWROUTE NL_RTM_NEWROUTE +#define RTM_DELROUTE NL_RTM_DELROUTE +#define RTM_GETROUTE NL_RTM_GETROUTE +#define RTM_NEWNEIGH NL_RTM_NEWNEIGH +#define RTM_DELNEIGH NL_RTM_DELNEIGH +#define RTM_GETNEIGH NL_RTM_GETNEIGH +#define RTM_NEWRULE NL_RTM_NEWRULE +#define RTM_DELRULE NL_RTM_DELRULE +#define RTM_GETRULE NL_RTM_GETRULE +#define RTM_NEWQDISC NL_RTM_NEWQDISC +#define RTM_DELQDISC NL_RTM_DELQDISC +#define RTM_GETQDISC NL_RTM_GETQDISC +#define RTM_NEWTCLASS NL_RTM_NEWTCLASS +#define RTM_DELTCLASS NL_RTM_DELTCLASS +#define RTM_GETTCLASS NL_RTM_GETTCLASS +#define RTM_NEWTFILTER NL_RTM_NEWTFILTER +#define RTM_DELTFILTER NL_RTM_DELTFILTER +#define RTM_GETTFILTER NL_RTM_GETTFILTER +#define RTM_NEWACTION NL_RTM_NEWACTION +#define RTM_DELACTION NL_RTM_DELACTION +#define RTM_GETACTION NL_RTM_GETACTION +#define RTM_NEWPREFIX NL_RTM_NEWPREFIX +#define RTM_GETMULTICAST NL_RTM_GETMULTICAST +#define RTM_GETANYCAST NL_RTM_GETANYCAST +#define RTM_NEWNEIGHTBL NL_RTM_NEWNEIGHTBL +#define RTM_GETNEIGHTBL NL_RTM_GETNEIGHTBL +#define RTM_SETNEIGHTBL NL_RTM_SETNEIGHTBL +#define RTM_NEWNDUSEROPT NL_RTM_NEWNDUSEROPT +#define RTM_NEWADDRLABEL NL_RTM_NEWADDRLABEL +#define RTM_DELADDRLABEL NL_RTM_DELADDRLABEL +#define RTM_GETADDRLABEL NL_RTM_GETADDRLABEL +#define RTM_GETDCB NL_RTM_GETDCB +#define RTM_SETDCB NL_RTM_SETDCB +#define RTM_NEWNETCONF NL_RTM_NEWNETCONF +#define RTM_GETNETCONF NL_RTM_GETNETCONF +#define RTM_NEWMDB NL_RTM_NEWMDB +#define RTM_DELMDB NL_RTM_DELMDB +#define RTM_GETMDB NL_RTM_GETMDB +#define RTM_NEWNSID NL_RTM_NEWNSID +#define RTM_DELNSID NL_RTM_DELNSID +#define RTM_GETNSID NL_RTM_GETNSID +#define RTM_NEWSTATS NL_RTM_NEWSTATS +#define RTM_GETSTATS NL_RTM_GETSTATS +#define RTM_NEWNEXTHOP NL_RTM_NEWNEXTHOP +#define RTM_DELNEXTHOP NL_RTM_DELNEXTHOP +#define RTM_GETNEXTHOP NL_RTM_GETNEXTHOP +#define __RTM_MAX __NL_RTM_MAX + +#define RTM_MAX (roundup2(__RTM_MAX, 4)) -#ifndef _KERNEL /* rtnetlink multicast groups - backwards compatibility for userspace */ #define RTMGRP_LINK 0x01 #define RTMGRP_NOTIFY 0x02 @@ -209,5 +250,10 @@ enum rtnetlink_groups { #define RTNLGRP_MAX (__RTNLGRP_MAX - 1) +/* Defined NETLINK_ROUTE virtual multicast address families */ +#define RTNL_FAMILY_IPMR 128 /* Not supported */ +#define RTNL_FAMILY_IP6MR 129 /* Not supported */ +#define RTNL_FAMILY_MAX 129 + #endif From nobody Wed Mar 1 15:28: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 4PRdRN35d9z3v06l; Wed, 1 Mar 2023 15:28:16 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_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 4PRdRM708Qz3QSB; Wed, 1 Mar 2023 15:28:15 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 321FS7NZ063020 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 1 Mar 2023 17:28:11 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 321FS7NZ063020 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 321FS713063019; Wed, 1 Mar 2023 17:28:07 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 1 Mar 2023 17:28:07 +0200 From: Konstantin Belousov To: John Baldwin Cc: Mateusz Guzik , markj@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 68912701700c - main - ffs_suspend.c: clean up includes Message-ID: References: <202212292056.2BTKuOIu047460@gitrepo.freebsd.org> <8ceb993e-1589-fd24-1786-4438acb9a07f@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-Disposition: inline In-Reply-To: <8ceb993e-1589-fd24-1786-4438acb9a07f@FreeBSD.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4PRdRM708Qz3QSB X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Tue, Feb 28, 2023 at 10:55:41AM -0800, John Baldwin wrote: > On 1/3/23 3:53 AM, Konstantin Belousov wrote: > > On Mon, Jan 02, 2023 at 06:29:57PM +0100, Mateusz Guzik wrote: > > > On 12/29/22, Konstantin Belousov wrote: > > > > The branch main has been updated by kib: > > > > > > > > URL: > > > > https://cgit.FreeBSD.org/src/commit/?id=68912701700ca3230f3e2d4b7858a038f884a327 > > > > > > > > commit 68912701700ca3230f3e2d4b7858a038f884a327 > > > > Author: Konstantin Belousov > > > > AuthorDate: 2022-12-28 18:17:53 +0000 > > > > Commit: Konstantin Belousov > > > > CommitDate: 2022-12-29 20:55:39 +0000 > > > > > > > > ffs_suspend.c: clean up includes > > > > > > > > Order includes alphabetically. > > > > Remove unneeded sys/param.h, it is already included by sys/systm.h. > > > > > > > > Reviewed by: mckusick > > > > Sponsored by: The FreeBSD Foundation > > > > MFC after: 1 week > > > > Differential revision: https://reviews.freebsd.org/D37896 > > > > --- > > > > sys/ufs/ffs/ffs_suspend.c | 7 +++---- > > > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > > > > > diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c > > > > index d13097109758..e7c976b6e921 100644 > > > > --- a/sys/ufs/ffs/ffs_suspend.c > > > > +++ b/sys/ufs/ffs/ffs_suspend.c > > > > @@ -33,15 +33,14 @@ > > > > #include > > > > __FBSDID("$FreeBSD$"); > > > > > > > > -#include > > > > #include > > > > #include > > > > -#include > > > > -#include > > > > -#include > > > > #include > > > > +#include > > > > #include > > > > +#include > > > > #include > > > > +#include > > > > > > > > #include > > > > > > > > > > > > > > tinderbox fails the KCSAN et al kernels: > > > > > > In file included from /usr/src/sys/ufs/ffs/ffs_suspend.c:36: > > > In file included from /usr/src/sys/sys/systm.h:44: > > > In file included from ./machine/atomic.h:73: > > > /usr/src/sys/sys/atomic_san.h:117:24: error: unknown type name 'uint8_t' > > > ATOMIC_SAN_FUNCS(char, uint8_t); > > > ^ > > > it bisects to this commit > > > > > So the problem is that sys/systm.h includes machine/atomic.h which always > > had the pre-requisite sys/types.h, and this is documented in atomic(9). > > But sys/atomic_san.h uses C89 types in prototypes, not just macros, and > > this breaks for real. > > > > I can > > 1. Just add sys/types.h to ufs_suspend.c (I prefer not) > > 2. Add sys/types.h to sys/atomic_san.h. > > 3. Add sys/types.h to sys/systm.h. > > > > IMO #2 is not the best solution, since it pollutes systm.h only sometimes, > > when the right kernel options are used. I would prefer #3, it seems, but > > want to ensure that there is a consensus about the addition to sys/systm.h. > > FYI, I got a different ream of breakages downstream in CheriBSD due to this > commit removing param.h as well. I also only ever recalled Bruce telling me > to do either or first (and only one of them). > I don't recall any special rules for . > > CheriBSD has a local diff that tries to sort headers in systm.h which is why > we get larger breakage: > > --- a/sys/sys/systm.h > +++ b/sys/sys/systm.h > @@ -41,13 +41,22 @@ > #define _SYS_SYSTM_H_ > #include > -#include > -#include > #include > #include > #include > #include /* for people using printf mainly */ > +#include > +#include > > I think if we want to be self-contained we should swap > for . I think moving the includes down would also be > more consistent with style(9) as well. I do not have any objections about both suggested changes. IMO direct use of sys/cdefs.h should be minimized, esp. since we no longer require svn tag. From nobody Wed Mar 1 15:39: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 4PRdhH5CzMz3v152; Wed, 1 Mar 2023 15:39: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 4PRdhH4jtgz3kYH; Wed, 1 Mar 2023 15:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677685167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A8ebUqxw3DXKdck3Cihz/WLKiXsI2f1LPALkGQsbXBY=; b=O0M7QzXuF+4oahMSdQMfqse4Qaw+OOunOPUvVXS0+eIQTU+OuS/Rl5rQtVsR8k5/3nJwWo WTcPX2WxjZ3p8AxjE1U239CpE9edSQx+y2d3usW3cbIq7AUjFkKH/Wf5Yq/q+h7i2Jahd6 MXV7L7Mdir8L/34BXT5Hy1+7aeKneTDpbZJ+/FYdywX0QvzB/KF4bv8OhWxn28A7I5kdbt DAU3HLfMc6WGtBW3+ncDaVrVaYIaoHY6AVLueKOhzhPy+q3yEHf7w3Um+gmeEWDoMzrisO AjN2qmBNIefBrSgoa62jXQThSR8o94iwc0B8us8MqGh/A5YcX/qSH/31STnk8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677685167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A8ebUqxw3DXKdck3Cihz/WLKiXsI2f1LPALkGQsbXBY=; b=lKbHVxwGcnQZQI2IMdep9UGipvPpNKqacnj7H7yqFlGn/A54psWG1kLGV2cM1O+EoiK7nQ nROBlEywkpRHRKQDsiOeVDylgEm4ReKgylQh5kBDn+6bltUot3g8CddYrjo9a4HpIIyExN JMM/q6ebjpIbHoFBdIgvZb+0Ol9CQJe2yTh5oQcMljzPr2Ui7F4mpRXjJA4yt9/zPGu50R 8X1kjfGjKiU49E3nG3N864mThiycI89AB1sKn/6be3ittl01MWeEzzqBQRR1t65TKOYRyG TZHQ/h99yGYKLjSkWrYLEGF9/irHyGJ1djSBZjE43QFn5xjsZH6wEAuyPFVkug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677685167; a=rsa-sha256; cv=none; b=xbpbPQCg4EY9dh7AC/x+q2BtMr/YmmObjdEO/YQZmxIzAN/XrLiNndslpEKzC3ySFQcZ4C d2vTp8yt17W/Hu6YkJncCu82TDtq+54L3xJCmPVRDPrJOSc7RW/uDv/ICUjo5jl4KAY1ie /aRRIiybFQGFrxNQXo7CExSbyTeDXFwEJC58W2uPJ7u1+gnI11sSXiItHmRmLkXr0P7ZGp mphri7lklDxepc2RszB3lrwRkppI738aqUPX9hSjwwpgIoJaCj6zBDwvgXiVDEWo4m0pBW pKA9vcPft69DV69pIFBcaOFsQoAa1TjdGeR9Wt3f/j6q+H9XcjsKeqr0GIO7IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRdhH3kq0zffJ; Wed, 1 Mar 2023 15:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321FdR9L004165; Wed, 1 Mar 2023 15:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321FdRwr004164; Wed, 1 Mar 2023 15:39:27 GMT (envelope-from git) Date: Wed, 1 Mar 2023 15:39:27 GMT Message-Id: <202303011539.321FdRwr004164@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: 1b0033485263 - main - bc: remove MIPS Makefile case 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: 1b003348526323d23785648fa449338447daec5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1b003348526323d23785648fa449338447daec5f commit 1b003348526323d23785648fa449338447daec5f Author: Ed Maste AuthorDate: 2023-02-27 15:05:16 +0000 Commit: Ed Maste CommitDate: 2023-03-01 15:38:12 +0000 bc: remove MIPS Makefile case MIPS support has been removed from FreeBSD. Sponsored by: The FreeBSD Foundation --- usr.bin/gh-bc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile index 223440f2f54d..6554d626af89 100644 --- a/usr.bin/gh-bc/Makefile +++ b/usr.bin/gh-bc/Makefile @@ -71,7 +71,7 @@ MAN_SRC_BC= bc/A.1 MAN_SRC_DC= dc/A.1 # prevent floating point incompatibilities caused by -flto on some architectures -.if ${MACHINE_ARCH:Mmips*} == "" && ${MACHINE_ARCH} != riscv64 +.if ${MACHINE_ARCH} != riscv64 CFLAGS+= -flto .endif From nobody Wed Mar 1 16: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 4PRfDm3jthz3v2gX; Wed, 1 Mar 2023 16:04: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 4PRfDm2NFRz3n3n; Wed, 1 Mar 2023 16:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677686648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HLqFgV6ZKsyd2oY25q1B13YUzSOE1qek3jqbQJZ4mNk=; b=jgqgbDsDXfItnqBmFR3XgPqvvQfCSVD72pkWV6mS9kvUesXSZD3VP9pL1Tjt70ZELddGP/ /j6NzWYdu9nr6bISvIMb1XRBcKaQkfooKWHIWoGltbPOqNyuwkrqz0zUbHWYl7YXJYEQdM 5N93gsv+pc51gRz/v/v4P7saEYEF8yOwKSEYgy4JV8XM+TK0sD89StOFK290Ps4GuvIAtp /AuXAHKiLUV9ayISkKEZFNqs+0keVY+iog91MOVMb4eFPG5VQAjufEt3v712N7NliFBEJt 94BlDbtvEURmbpFb1rA0ZXTLCyclaeAHQIlqmDayh3HdJzUVL4kF95l1owv9aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677686648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HLqFgV6ZKsyd2oY25q1B13YUzSOE1qek3jqbQJZ4mNk=; b=ThkOz+t1z68JSDLyhl651gJmFmD1ajEt4P4qtVdZ87STnpTkyBFg4p7RF70UF1V+IrnR8i CgCri3qVuEmviOWVSl0kuL5t6R1n5fN2Efqa2BK5M0hx9Mty24FRC2heIGLpAyh4XlfvtU 8DTruuXct7zbMrInTvjqATmxltA3GCpSOY9WcRTipT1MqlOuC72tDCT0NHJQKNt7lPb11T BDQAfHP1jU2zuKUrMAgZuztT6iNeADJRvYrRbAfULDoShvZlOEYvjWT0QOCbgPewstV+42 T5UiD0gHGKf/UYiJkvsh/+ILYDTo9d4FdABrEBIQ4BLKmZY9q/zK22vnxCy/Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677686648; a=rsa-sha256; cv=none; b=wlwwABu740tVtQiDLOYtU7HpUp4Hyp6zuBUavi8/vcZPmsUtWDPcv6Ydr5Bf/bd6QqmIo0 HqX7atmQeapxRw/Pw9MazS8UmhQ6yGJkNBPyG8ufbVmkTAmaQP93MV9p4ohOFQ8fLiUGnB 1BuUJP16C0WMyZQycttHwDlinSzStfeVbWggRtO0rdVxcYYJXb106E+ZPxaVGjlp9d4Vi8 aOsRH7+4Zp1RSBfWgvazcMiw7LZMRaG7SWpxEL/AqeNLpOePriEZoVkM7nXVw3O/a7HQJM CbJaqaZqfaazrE4NPRfXZJd99x7IgmX+W8a6QNHuxNl62+VDwCtEccno7zCEhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRfDm1Ts4zghN; Wed, 1 Mar 2023 16:04: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 321G48f8053410; Wed, 1 Mar 2023 16:04:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321G48Ho053409; Wed, 1 Mar 2023 16:04:08 GMT (envelope-from git) Date: Wed, 1 Mar 2023 16:04:08 GMT Message-Id: <202303011604.321G48Ho053409@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: e093c61b2d69 - main - freebsd-update: avoid effects of user's environment on grep 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: e093c61b2d69e9cca54a2332096c0e36f97bffc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e093c61b2d69e9cca54a2332096c0e36f97bffc0 commit e093c61b2d69e9cca54a2332096c0e36f97bffc0 Author: Ed Maste AuthorDate: 2022-12-14 17:13:19 +0000 Commit: Ed Maste CommitDate: 2023-03-01 16:02:54 +0000 freebsd-update: avoid effects of user's environment on grep A user had GREP_OPTIONS containing --color=always, which broke grep use in freebsd-update. Unset this environment variable. PR: 255990 Reviewed by: kevans MFC after: 3 days Sponsored by: The FreeBSD Foundation --- usr.sbin/freebsd-update/freebsd-update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 078043326115..b6cd241c4a48 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3492,6 +3492,9 @@ fi # Set LC_ALL in order to avoid problems with character ranges like [A-Z]. export LC_ALL=C +# Clear environment variables that may affect operation of tools that we use. +unset GREP_OPTIONS + get_params $@ for COMMAND in ${COMMANDS}; do cmd_${COMMAND} From nobody Wed Mar 1 16:52: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 4PRgK34R8vz3v5YF; Wed, 1 Mar 2023 16:52: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 4PRgK33WCSz3w6t; Wed, 1 Mar 2023 16:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677689575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZd0iMa+Ore57ic6TgSK9iWtZjYJ8laCfi2ONu8fW9o=; b=QjSu5IKCBd66pAQ4/LD79yJIEMNtD4/WqpVtuGBAaN+Ap0+xJPvvAlxEnaVJqwnBvOUeIy k3u3wzgtrGOb7Fi2u9A+LCHOMIE/SznqpncAL7wVc9afQ/9D4Ql75Geb2vLLpnXd3HoeG4 ip7GIJdZ1lYyH8KDk4FP0PN4eyYAx2NILjEjjKWB3YZbJJB7I4ivDild9RTQEaS+Tx5i6W RKz9fHr6/xDbGarTJy62PHts8/1S2go8N7Llhywm3UFparDzfxXme+nFQWH1CXRCHWfWdF XvlPBwN8EspvVJExK6oUlLyeL+8dOOc+W5sM/IrKUhEJUL9kEySP+whwp2kfMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677689575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZd0iMa+Ore57ic6TgSK9iWtZjYJ8laCfi2ONu8fW9o=; b=xf29viQH02NA1jqBuVzmXp6BWFgLujALlzo2+UDjWVeUvu/qkmaMNM70rcRBulsXT2JOND b54vBaWiUC/pk0rEe7CB779fCPUbz/fotxhcrVeuvMeJY21eGbCKigeHOIbBw86Z8DyeYZ GGwPZ7lNmS6DrY/PmazJHoMz+i7ol/DDjTXRzwXd0QmghHMAC4YyrRCXE9tB4wxk1R7yO+ PbRqfBYYSeu+JJ4UhrwcnkJMCFxKwMLsrxVGtQBPnAsXyxKsueVBHWd9lPqaqfzbAiiTum wMKKwiahJXb3flp53ASQBupnJfVCmPl3G1DN7PGTTpXKBGkvEHI6m1S1M+H3rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677689575; a=rsa-sha256; cv=none; b=Qk621yA32DlSU3CMdlnEx1oPQBrXa73KvKsw6ASeFxM+6u2l5i5cAryr7hLf4oC7dDeNGA tL4TzMudgQ/ZjOifv1cv3EAWn58kcgce28I3BlHrH/N04GWPq9oGs3T8dUX8AvPOYuB6ld VC4ACEUK2ctiH++yXpV0i5q+JWZPNn90j0TX1Cq3r4KTfA7S4kdXR4s2aKKVzDvFAhg0pO mKmqqVm2062B2Gn5NfsOFqQ06/jBSO8Xq0bKWhUaF6wo+AIaxNPWAZVyoleBMTyKh7jW3p lnNQmFhFpSYxwjnCf2TVpPTKRNM/eR6HQX67akX4aUGoKm4VNeuMsmeniigc9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRgK32ZgBzhZC; Wed, 1 Mar 2023 16:52: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 321Gqtm0034039; Wed, 1 Mar 2023 16:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321Gqt8f034038; Wed, 1 Mar 2023 16:52:55 GMT (envelope-from git) Date: Wed, 1 Mar 2023 16:52:55 GMT Message-Id: <202303011652.321Gqt8f034038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 956171d5bc29 - main - bhyve: remove redundant 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: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 956171d5bc2945bb8740ca8d3c2fcb6c5cc76954 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=956171d5bc2945bb8740ca8d3c2fcb6c5cc76954 commit 956171d5bc2945bb8740ca8d3c2fcb6c5cc76954 Author: Vitaliy Gusev AuthorDate: 2023-03-01 07:45:46 +0000 Commit: Robert Wing CommitDate: 2023-03-01 07:45:46 +0000 bhyve: remove redundant variable Reviewed by: corvink,markj Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38836 --- usr.sbin/bhyve/bhyverun.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 3ff83f55474b..2c1fee23cc13 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1236,7 +1236,7 @@ set_defaults(void) int main(int argc, char *argv[]) { - int c, error, err; + int c, error; int max_vcpus, memflags; struct vmctx *ctx; uint64_t rip; @@ -1437,8 +1437,8 @@ main(int argc, char *argv[]) if (get_config_bool_default("memory.guest_in_core", false)) memflags |= VM_MEM_F_INCORE; vm_set_memflags(ctx, memflags); - err = vm_setup_memory(ctx, memsize, VM_MMAP_ALL); - if (err) { + error = vm_setup_memory(ctx, memsize, VM_MMAP_ALL); + if (error) { fprintf(stderr, "Unable to setup memory (%d)\n", errno); exit(4); } From nobody Wed Mar 1 17:05: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 4PRgbY6kRqz3v5g7; Wed, 1 Mar 2023 17:05: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 4PRgbY69Tjz3ydx; Wed, 1 Mar 2023 17:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677690329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQkDVjJ226WCjVhSFqs9XfCIpSvlGwotH6UbG25Dc/g=; b=DvnJn8bKnXQXj67V3rG9NX5UwGWgTIedheXzwOastMLkqO3XbqIDBxFu7cW3TkuJHJNt1i 2vZkLJb8unEhhuj4yFKTDsmcEZ4gNl4rc/SzW4JGuSQLGzFuuy7YuKc1aZVaIdD3d438k4 hLgySWOnMuhQya+J4GnoVyZ8gSLnH0E3z3DSpfo1edlHB/xAzzRwUFmqdkuYjpOj+J55Rs YLEDkog8mHpkQGe+hX5hGwquiNznfH1bG0qj1bZ0ySCxLewb5swm31XUunGUByFtquKoR2 gMpbgTV05uC9xvSUvnathIINCN92ObdtxzaS/V6Nd+DeI76rHEg2RMJZCeLMgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677690329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQkDVjJ226WCjVhSFqs9XfCIpSvlGwotH6UbG25Dc/g=; b=X8H2WO/3/YHlC2badG2em0ylInOWUQCZjlsFxoJjw8CpDRuvSJw7wywznpVQEuG1Tj8gA1 l7Y0mGrmANunUFJyyMgK8IIqt0XKgWBcQ+1in8pYrANi7S9cJJWNWD4KOk7qjFvuSZ3v7o 1JE3M3pCMZKRwMeiZfByt+kL/JIromJGPB7F81068RYlmwYblM/wbH5O0LtFWPN81AjeAP cjlUMb7jEb0QJOcleM7ty6z5Jw+oUXUiVFLjfvR8GA95oB0md/AgGvOiL55yxbmSNQZmT8 +2PD1vNFSTc+DiM8U54oqx8bvDzRZPiBAYUeKNmiXd+h0feHMQ+A16KNDEpNmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677690329; a=rsa-sha256; cv=none; b=q5UV533M6OK9pi2EHUTx2RugynjY4MeCoOjP+yhoo98OdR8qhffeCaOyrXDuJQCFduSL0/ p9JQvcqX6bfcy+8WCSM0jRoj7Q8S1XEk0kk+hGFZ/iy1E7/BVw1BuJA/lpZfioDuHQBrpe WL3ImwDNZQRRPuyBPXxf6XQL+TCSt88Z+sNo7jQPkdiWP5EYfkllOsGQcsP3Il5Grc5OMQ 8oGgVHnb2epYW1y7IdOlh39qB7DNdQMAA2gJ/HOHsT6NkDDIcLz8gvjl8R4t4nbrdisQ6p w75fR34QR8tPtnNBbZIcs09RKdKScih1pmjZN8pfHiTN0vbClPnUZ2cjzAwSLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRgbY5CGTzhy9; Wed, 1 Mar 2023 17:05: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 321H5TJL051856; Wed, 1 Mar 2023 17:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321H5To3051855; Wed, 1 Mar 2023 17:05:29 GMT (envelope-from git) Date: Wed, 1 Mar 2023 17:05:29 GMT Message-Id: <202303011705.321H5To3051855@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: 71a21ad48915 - main - bhyve: Remove useless return at the end of void function 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: 71a21ad4891504ad82f58c3169aa634968502682 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=71a21ad4891504ad82f58c3169aa634968502682 commit 71a21ad4891504ad82f58c3169aa634968502682 Author: Elyes Haouas AuthorDate: 2023-02-23 06:36:13 +0000 Commit: Ed Maste CommitDate: 2023-03-01 17:04:41 +0000 bhyve: Remove useless return at the end of void function Signed-off-by: Elyes Haouas --- usr.sbin/bhyve/pci_fbuf.c | 2 -- usr.sbin/bhyve/pci_virtio_input.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c index 91215a124c59..fd3305e965ad 100644 --- a/usr.sbin/bhyve/pci_fbuf.c +++ b/usr.sbin/bhyve/pci_fbuf.c @@ -365,8 +365,6 @@ pci_fbuf_render(struct bhyvegc *gc, void *arg) sc->gc_width = sc->memregs.width; sc->gc_height = sc->memregs.height; } - - return; } static int diff --git a/usr.sbin/bhyve/pci_virtio_input.c b/usr.sbin/bhyve/pci_virtio_input.c index 00ec86a70db0..3f661aff8079 100644 --- a/usr.sbin/bhyve/pci_virtio_input.c +++ b/usr.sbin/bhyve/pci_virtio_input.c @@ -567,8 +567,6 @@ done: /* clear queue and send interrupt to guest */ vtinput_eventqueue_clear(queue); vq_endchains(vq, 1); - - return; } static int From nobody Wed Mar 1 18:18: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 4PRjCr4C2Jz3v9rJ; Wed, 1 Mar 2023 18:18: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 4PRjCr3htBz44mn; Wed, 1 Mar 2023 18:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677694712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZG3cDdPCG+nKwAyXno/zpP4bDsH0y6JUlHwNJt/h4R8=; b=cGGAqDAF5G3jfKCFyb6ztKn8OY1U5AU3Uhd5Fo5weRxsKdPb9L9I5gm9AhxJaMZIc/UL8O 00ADk7PpV34EC7U720IP9mFFZ+qe3E6QldlxV5vKEmt+dcW3xLBrtSBG4HJx5Nhidrd4Pn FGvRC2uV23kHziBU/ddCBJxblM1bAjVwjjg1jhAsceANi/3+Ry9W+uPIotfORbw5kev6Ow 36HAVnguKwDIyP7uxGRQ058+Vb/85zpcNtLqGOJw2/sT1zqpTpI1Qn/VOLY0Tn5hVi563t /rdyROfh5gmu2Veqiptok2iFdhYilzbXnDj1IXOXbLLrlaVkHKBtrSdIHtZOhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677694712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZG3cDdPCG+nKwAyXno/zpP4bDsH0y6JUlHwNJt/h4R8=; b=Qvh3I2Cq21W8WF6kU9VpAtDGEyJRCpKhzDIrXQrL46x70XBy0vhawN7pgFMwT6dzLCfJWU LE7ReGpyrbfQh8Qcgy+VCm+UARVh5t2pFO9KvV66ZXVwZcGF8nK859AkGgvukYXRmrzNO/ WWCwdC0bEEkrNZO9Lus+CMVi51+gziQQPYPlZ4cMtCSlslycN4hCL3fkmxqxzVvKbZAE5V XnkC6ggyTWArw0plfaEiFd8gjK3tStzVeAxplzbDozjFyFn5NDeGBfrUy2XM3M1bbjiGUF Xx9dhYbVt3Goldp1d50yZKTrUsKLWMIzql0GE7brI3DWSo6Yl6Upcw9J4jfACA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677694712; a=rsa-sha256; cv=none; b=cWE2CY8A6eJFHeX3ttciXpCdGH9G42V1wFuNJlHIYKFxYJ7Z7HaPCb1Km2kwh1vNnlyf+B Fc3cgSsBJDFAn6evuKVMWhJ4k/eYHgke2hqLFQg8WpFGkTTdKOjljcX+DcH5qbG4TLZY4b ec8OtDxbH2b+jPS291ky2O2XBtmJL6tBwlbQCF14O2jj2azqLuuEjY2FLMHeAsxrhgOnKE H5i7+vgDuRBKIYCMvVFDBcqf54flvd5d5svzksyStAebPR4I9b51936MsdT9TiajwjEm9k QnQk6bk93C7sAEoRkYGyGaVHuAvCM+fMLK7Q/zP7At7ckarxLNcoTb4GRKLrbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRjCr2mjDzkqc; Wed, 1 Mar 2023 18:18: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 321IIW3P067570; Wed, 1 Mar 2023 18:18:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IIWHi067569; Wed, 1 Mar 2023 18:18:32 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:18:32 GMT Message-Id: <202303011818.321IIWHi067569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: b2b294f27cf4 - main - uuidgen: add -c for compact uuid 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2b294f27cf4618d6f7510007b41882860a080b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=b2b294f27cf4618d6f7510007b41882860a080b9 commit b2b294f27cf4618d6f7510007b41882860a080b9 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:29:51 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-01 18:16:25 +0000 uuidgen: add -c for compact uuid It generates the uuid string but without the hyphen MFC After: 3 days Reviews by: tcberner Differential Revision: https://reviews.freebsd.org/D38820 --- bin/uuidgen/uuidgen.1 | 5 ++++- bin/uuidgen/uuidgen.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1 index 83326e3a189a..75fd02703175 100644 --- a/bin/uuidgen/uuidgen.1 +++ b/bin/uuidgen/uuidgen.1 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 23, 2012 +.Dd March 1, 2024 .Dt UUIDGEN 1 .Os .Sh NAME @@ -34,6 +34,7 @@ .Nm .Op Fl 1 .Op Fl r +.Op Fl c .Op Fl n Ar count .Op Fl o Ar filename .Sh DESCRIPTION @@ -53,6 +54,8 @@ instructs to not generate them in batch, but one at a time. .It Fl r This option controls creation of random UUID (version 4). +.It Fl c +This options contols creation of compact UUID (without hyphen). .It Fl n This option controls the number of identifiers generated. By default, multiple identifiers are generated in batch. diff --git a/bin/uuidgen/uuidgen.c b/bin/uuidgen/uuidgen.c index 061907f57109..6dcfdde92a5f 100644 --- a/bin/uuidgen/uuidgen.c +++ b/bin/uuidgen/uuidgen.c @@ -46,6 +46,31 @@ usage(void) exit(1); } +static void +uuid_to_compact_string(const uuid_t *u, char **s, uint32_t *status) +{ + uuid_t nil; + + if (status != NULL) + *status = uuid_s_ok; + + if (s == NULL) + return; + + if (u == NULL) { + u = &nil; + uuid_create_nil(&nil, NULL); + } + + asprintf(s, "%08x%04x%04x%02x%02x%02x%02x%02x%02x%02x%02x", + u->time_low, u->time_mid, u->time_hi_and_version, + u->clock_seq_hi_and_reserved, u->clock_seq_low, u->node[0], + u->node[1], u->node[2], u->node[3], u->node[4], u->node[5]); + + if (*s == NULL && status != NULL) + *status = uuid_s_no_memory; +} + static int uuidgen_v4(struct uuid *store, int count) { @@ -85,16 +110,20 @@ main(int argc, char *argv[]) uuid_t *store, *uuid; char *p; int ch, count, i, iterate, status, version; + void (*tostring)(const uuid_t *, char **, uint32_t *) = uuid_to_string; count = -1; /* no count yet */ fp = stdout; /* default output file */ iterate = 0; /* not one at a time */ version = 1; /* create uuid v1 by default */ - while ((ch = getopt(argc, argv, "1rn:o:")) != -1) + while ((ch = getopt(argc, argv, "1crn:o:")) != -1) switch (ch) { case '1': iterate = 1; break; + case 'c': + tostring = uuid_to_compact_string; + break; case 'r': version = 4; break; @@ -162,7 +191,7 @@ main(int argc, char *argv[]) uuid = store; while (count--) { - uuid_to_string(uuid++, &p, &status); + tostring(uuid++, &p, &status); if (status != uuid_s_ok) err(1, "cannot stringify a UUID"); fprintf(fp, "%s\n", p); From nobody Wed Mar 1 18:18: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 4PRjCs5hvxz3v9JS; Wed, 1 Mar 2023 18:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRjCs4mGzz44X4; Wed, 1 Mar 2023 18:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677694713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mJsXyMyGqs/PR4lqojMbktGri2RuIBdtwIl/UWlesDo=; b=NISpCud+lGsuetzFBhgwmKcudKaE6ePuflZ846B1Z8GRBrAstemETEzRR7Om6GQ9x9npvt L36YxpXp/w1jhAXhkPmWZmavYQIwfdbjevNK7ZFjag0u4EUbX6uK6CMcWrYZEJDOTZYqxJ 22nprUWlhO1s1R91Hqp4l8KRRBw2iruZYj1ZdBxQ1PQLxZqkZeWUNZ8q59P3fMvvipqmUn LiauoxjZFPLHDqBwXklCnVy11w0pXuIRZr3iVwfhK+gUkVLKuIeSBGecDPNVD2KJKQTZal EmZPUHRyROZeoiCqMdug/TOEB3i/aCI6kVmDfx+hxqFoQuP5vLlSOT56uTJ3qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677694713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mJsXyMyGqs/PR4lqojMbktGri2RuIBdtwIl/UWlesDo=; b=I9qVlX8gsAuQ7l9jz7GzQKPqIasCAdVp2oVYtubgD0vh5wS38bevk+8C2G257sYd1/toUE UyGX/ZX00WPYnJkhbE2qLnTZV9Xl5Dpd18DcHYiejTGtb4Oc1mDcBDNaZvJp9Z+Iax28ja /0UP6dmrbkuDJQBnQeeYOt0gp8t0j3ebcFjAQoZZ4qVvj3XY/laRmLr00t+UeUynaKCNMq RZ+LarW7/R4QWUucfawdoh3E4ry3rZhFDUAJzvwL4gopa3z8XMEE8RTNbGxuFJdKRQ+AK4 B80QsRjKvCeYvPk3iV5/7fmMWRQEacxVQSoqFq85ljxr2vRB0xaOTl3PLeXDVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677694713; a=rsa-sha256; cv=none; b=nn/3IXiuy1ZYFvUFhPbQcQh44hSbYhwy4ZbHRcDnaY0i2IGG7OrxB9hjdFoPICsaVKLTZ8 dFYKwJbMh1p3r4OJYs3V72M5wk6TTEjTKY+cLGv92c9FL8nhid1YZxcciJyPw/Wtk2Br+2 8tGH3T8e9KT376L4lrnX7P8q3i+9FuJra432bHxP41qAgpBlN1r/TNHE469bsC5MyoFk6b 9s0ElUw3mKTPQGyvBVM3pIvPmeO2z9KZkAw09mvtKf4vuegX3fLhVeeSlk2V4qpOfAxCYW sV2KvybEaoFWHOqaAkiwg3U9ZBRLTU/SGmaEUCZ5y2bgrHnXGFpqQzKojk3eSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRjCs3Tg1zkQ6; Wed, 1 Mar 2023 18:18: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 321IIXLg067596; Wed, 1 Mar 2023 18:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IIXIT067595; Wed, 1 Mar 2023 18:18:33 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:18:33 GMT Message-Id: <202303011818.321IIXIT067595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a28ccb32bf56 - main - machine-id: generate a compact version of the uuid 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a28ccb32bf5678fc401f1602865ee9b37ca4c990 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a28ccb32bf5678fc401f1602865ee9b37ca4c990 commit a28ccb32bf5678fc401f1602865ee9b37ca4c990 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:31:06 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-01 18:16:25 +0000 machine-id: generate a compact version of the uuid dbus and other actually expect an uuid without hyphens Reported by: tijl MFC After: 3 days --- libexec/rc/rc.d/machine_id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/machine_id b/libexec/rc/rc.d/machine_id index 7cfd7b2d92f8..8bf3e41d0603 100644 --- a/libexec/rc/rc.d/machine_id +++ b/libexec/rc/rc.d/machine_id @@ -23,7 +23,7 @@ machine_id_start() if [ ! -f ${machine_id_file} ] ; then startmsg -n "Creating ${machine_id_file} " t=$(mktemp -t machine-id) - /bin/uuidgen -r -o $t + /bin/uuidgen -r -c -o $t install -C -o root -g wheel -m ${machine_id_perms} "$t" "${machine_id_file}" rm -f "$t" startmsg 'done.' From nobody Wed Mar 1 18:32: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 4PRjXV444jz3vBgj; Wed, 1 Mar 2023 18:32: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 4PRjXV3NMVz46dP; Wed, 1 Mar 2023 18:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXasxH+BT7i9uzTS6CuabTUWXaZGBegEJLsIBoIEeyo=; b=LQX9pC+6ZYy7R1Qr9kPqhUzjcSh0Q3LBfYa4IDRLnmNSofz9U4q1KcWAl0YXRh9HhVuMGb gMORcgfy8PEiUrH/174ZoVyym3aiVDwQ9VCRkVxbOiqHS1zAke4jKEyqXmr3lHRlJXHlhU 7IKzBS6jzuDti78LL5t0E15m7UboTc+oZNFlw31qcJJG5NvZgCYtWdhpZ2GPzZS8xIYkQ0 Kjq0l738TEpPsFep5vYNskrn+PSMPXPJuO99H+t7K4wbQclBePnif/UPZZfBPUDuQaHMdX 9k/nO0n494NM1jDU+JTRjLHKnp6qSc8LHWyNtCkIRLo/55J+UTawxltGmDTCVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXasxH+BT7i9uzTS6CuabTUWXaZGBegEJLsIBoIEeyo=; b=NjHcGAk9fSblc8CvW7gTh3vzPImL/9vhtKYd5r1LVDQppWJSM2hfA2zj1r7eJY3G7xkuOA k3MrEImslD1ucB6avpXNCHRFGiCEJBX59He/ZfshEx4HNuh9hIPEFGmxCUTWMq8CY8TcDT ZxdoVq5eYdW5WVdDoiFe5SosjYz73NYis1yRzkcBPmE7Ni8oNBtj1prh36NkePxwB3FpNO WQsqmV/vyzUCCbUjInh/qpwjOwTO3GQZthU/cL1MQwNMWnAfKzUCp3gcXGAMeW1JoNWB25 KNAwmSk6RhSKTW947p41rCBT2sb2F/RtF42HTtwHKnOivIJoJ7IuFwAgo4iVsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677695578; a=rsa-sha256; cv=none; b=jos7Z2JUvaCYfFBWVvRt1seDn7cSHGJSGMJIHTCGeWf0HLL1lStL0R08SM+R769N8r7ynZ ZICbexK2rDDykz1Hx/EyR4E0tHwwLsy3b26+7hKeRs0fepy/zNHckTIxI21wzW6iARsHQ2 AnWnSR9Dl3NZUDdiu7/1FYRxYWghNBpI2g4yFe1xdjNYseB99mh7759Qg7EOaLwuTAcYWe LwkxHgn4YPt+z3gpCcjtt+UUJBT+O1TNs1uzIftZy4BoP+/AY5jIgUQjBlzCXbEAk8UfqU b3gguoSah089ZngJyvtNu9zy/p0U11/PkK93AIU8W/dYGmIv/aCbQ4qpcLubgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRjXV2PBCzl4t; Wed, 1 Mar 2023 18:32: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 321IWwZW099785; Wed, 1 Mar 2023 18:32:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IWwLL099784; Wed, 1 Mar 2023 18:32:58 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:32:58 GMT Message-Id: <202303011832.321IWwLL099784@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: d90188eff5c5 - main - hwpmc: Don't wrap entire files in #ifdef DEV_ACPI. 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: d90188eff5c5e67d6d33926d6bb4c7b25e37cc4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d90188eff5c5e67d6d33926d6bb4c7b25e37cc4a commit d90188eff5c5e67d6d33926d6bb4c7b25e37cc4a Author: John Baldwin AuthorDate: 2023-03-01 18:31:53 +0000 Commit: John Baldwin CommitDate: 2023-03-01 18:31:53 +0000 hwpmc: Don't wrap entire files in #ifdef DEV_ACPI. A subsequent commit will instead use existing infrastructure to exclude the files from hwpmc.ko for non-ACPI builds. Note that the original commit left the files as optional in sys/conf/files.arm64. This reverts commit 751d88119fdc1dff71d1390c7768942a9b857bc6. Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D38736 --- sys/arm64/arm64/cmn600.c | 7 +------ sys/dev/hwpmc/hwpmc_cmn600.c | 9 +-------- sys/dev/hwpmc/pmu_dmc620.c | 6 ------ sys/modules/hwpmc/Makefile | 2 ++ 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/sys/arm64/arm64/cmn600.c b/sys/arm64/arm64/cmn600.c index c01abc444c8e..e71afa7c6a6c 100644 --- a/sys/arm64/arm64/cmn600.c +++ b/sys/arm64/arm64/cmn600.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2022 Arm Ltd + * Copyright (c) 2021 ARM Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,10 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_acpi.h" -/* - * This depends on ACPI, but is built unconditionally in the hwpmc module. - */ -#ifdef DEV_ACPI #include #include #include @@ -835,4 +831,3 @@ static driver_t cmn600_acpi_driver = { DRIVER_MODULE(cmn600, acpi, cmn600_acpi_driver, 0, 0); MODULE_VERSION(cmn600, 1); -#endif /* DEV_ACPI */ diff --git a/sys/dev/hwpmc/hwpmc_cmn600.c b/sys/dev/hwpmc/hwpmc_cmn600.c index 700a680514a9..fe98fdf969fc 100644 --- a/sys/dev/hwpmc/hwpmc_cmn600.c +++ b/sys/dev/hwpmc/hwpmc_cmn600.c @@ -3,7 +3,7 @@ * * Copyright (c) 2003-2008 Joseph Koshy * Copyright (c) 2007 The FreeBSD Foundation - * Copyright (c) 2021-2022 ARM Ltd + * Copyright (c) 2021 ARM Ltd * * Portions of this software were developed by A. Joseph Koshy under * sponsorship from the FreeBSD Foundation and Google, Inc. @@ -35,12 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_acpi.h" - -/* - * This depends on ACPI, but is built unconditionally in the hwpmc module. - */ -#ifdef DEV_ACPI #include #include #include @@ -830,4 +824,3 @@ pmc_cmn600_finalize(struct pmc_mdep *md) } MODULE_DEPEND(pmc, cmn600, 1, 1, 1); -#endif /* DEV_ACPI */ diff --git a/sys/dev/hwpmc/pmu_dmc620.c b/sys/dev/hwpmc/pmu_dmc620.c index 87efcc8b2b11..e8a9d83d4251 100644 --- a/sys/dev/hwpmc/pmu_dmc620.c +++ b/sys/dev/hwpmc/pmu_dmc620.c @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021 Ampere Computing LLC - * Copyright (c) 2022 Arm Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,10 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_acpi.h" -/* - * This depends on ACPI, but is built unconditionally in the hwpmc module. - */ -#ifdef DEV_ACPI #include #include #include @@ -280,4 +275,3 @@ DRIVER_MODULE(pmu_dmc620, acpi, pmu_dmc620_acpi_driver, 0, 0); /* Reverse dependency. hwpmc needs DMC-620 on ARM64. */ MODULE_DEPEND(pmc, pmu_dmc620, 1, 1, 1); MODULE_VERSION(pmu_dmc620, 1); -#endif /* DEV_ACPI */ diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile index 0db4c55e64f3..a72b3cf8d2fd 100644 --- a/sys/modules/hwpmc/Makefile +++ b/sys/modules/hwpmc/Makefile @@ -12,9 +12,11 @@ SRCS+= vnode_if.h .if ${MACHINE_CPUARCH} == "aarch64" SRCS+= hwpmc_arm64.c hwpmc_arm64_md.c +.if !empty(OPT_ACPI) SRCS+= cmn600.c hwpmc_cmn600.c SRCS+= hwpmc_dmc620.c pmu_dmc620.c .endif +.endif .if ${MACHINE_CPUARCH} == "amd64" SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_tsc.c From nobody Wed Mar 1 18:32: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 4PRjXW4w8Vz3vC2g; Wed, 1 Mar 2023 18:32: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 4PRjXW47WNz46dd; Wed, 1 Mar 2023 18:32:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpdKe+1C5DaBa83cWzs3kJBXyyJELGprQldtCNV/iMY=; b=Lzh/cCR8NrPizHAJAUlVFJoo2M+/dsEfNoDvItbUuAO++Sl5qEgBdQ5StywZR7AOJ5zEa2 tL6h1TuAcOvY0I6xycaJMyIffgwcqqo96SWAQENqXBcmAzhAcJEoHt8ezKN39dC+ATUsPY fMfq8VdrVqXi/WoQ42sC5GE63fyXjjhE1o3bkltuJGjsniFKOuPiR0xDv1RFGDR54aNuUT iO6Oy3RGB8eMrWfTAKmDN1ubtGfb1MNe80rgcqzPIsrGedrlwKjcODLB3v8YqFYkFBG03+ s4cZuPNxd7XLL2pVHTvm1Z0uNBd+OenqzWwmGDz4wmeJ1jkVwA7Jv5nHJWAWSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpdKe+1C5DaBa83cWzs3kJBXyyJELGprQldtCNV/iMY=; b=bxeDcPOR/mvD942N1ye2XtaG5ZZRfomlqoD7c3eSxKy6ZiUxIQuLEdAcSO94SA5No9vVo+ Se9YqtTDTTslCBM6I9EAIpnAOudc8q46n561gqnRzmuTKkt6jvb9zq72IO0vwC91cpGTuv /Gfk0OcMclNVLiyck9VMBbtPtb6p8hWiH3q+A10yF9qTMKNrQ/SwfcpGsr0WzBkqeIWjgB PcrDLJBpUVIc1VHAF6bFIeBQrCKfvMK7jZjhYPhVQfu53GntRSsK+pI5xH3Q4v0ZjOCVQl /+1a3HQdAd6RAK6B3i46JZVKy/e21vxGph8hhnMmdodAHJMroi8ZRBvD+4lKxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677695579; a=rsa-sha256; cv=none; b=KZvXU98ySOjs0ClZIRvc6GcYERlaZdVsnw0RTikNABSdCmu14ljdEGkPRSrQXnXXGaG4IY LkFJwLDuJDLh/QkcDLhTIGJtSbCbdKJ/TCEJE05n3oXWdCDh/cHchMztb+sj1weV7hRJ03 0I2pJYTvRrIo+Gi7F+exJObxN4f4QWFuhqOdrYS7wrh/EoUtkz/FunuGL7qOHv/SmKPgFK K+w023BEMKRHH7IeWYApqYEPURTaMEswZuWKPCFdigChPoW670bu283wcQS0eXATBEI8GC i0z/EQs4KopQ/3uTMEENjIzIx3MdYexzWuM0hfb2qyg36b/IMZqBSWCF0Z0D9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRjXW34FFzl2h; Wed, 1 Mar 2023 18:32: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 321IWxY0099804; Wed, 1 Mar 2023 18:32:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IWxB3099803; Wed, 1 Mar 2023 18:32:59 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:32:59 GMT Message-Id: <202303011832.321IWxB3099803@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: 57716e7361ae - main - sys/modules: fix bogus OPT_ACPI tests 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: 57716e7361aea3fa578a0a8f2b5a65154d4819d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=57716e7361aea3fa578a0a8f2b5a65154d4819d4 commit 57716e7361aea3fa578a0a8f2b5a65154d4819d4 Author: Nathaniel Wesley Filardo AuthorDate: 2023-03-01 18:32:08 +0000 Commit: John Baldwin CommitDate: 2023-03-01 18:32:08 +0000 sys/modules: fix bogus OPT_ACPI tests ACPI is not handled specially by sys/conf/kern.opts.mk (unlike a few options), so we should fall back on the generic behavior of sys/conf/config.mk, which pulls from all the generated opt*.h files, including opt_acpi.h, which will cause DEV_ACPI to be included in KERN_OPTS. Then the generic machinery in sys/conf/kmod.mk will cause SRCS.DEV_ACPI to be included in SRCS when appropriate. Reviewed by: jhb, imp Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D38737 --- sys/modules/dpaa2/Makefile | 4 +--- sys/modules/hwpmc/Makefile | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/modules/dpaa2/Makefile b/sys/modules/dpaa2/Makefile index eeb9e7f340bf..72e8e46143c8 100644 --- a/sys/modules/dpaa2/Makefile +++ b/sys/modules/dpaa2/Makefile @@ -21,12 +21,10 @@ SRCS+= bus_if.h device_if.h miibus_if.h SRCS+= pcib_if.h pci_if.h SRCS+= opt_acpi.h opt_platform.h -.if !empty(OPT_ACPI) -SRCS+= dpaa2_mc_acpi.c \ +SRCS.DEV_ACPI= dpaa2_mc_acpi.c \ memac_mdio_acpi.c \ acpi_if.h \ acpi_bus_if.h -.endif .if !empty(OPT_FDT) SRCS+= dpaa2_mc_fdt.c \ diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile index a72b3cf8d2fd..5e509c5499f3 100644 --- a/sys/modules/hwpmc/Makefile +++ b/sys/modules/hwpmc/Makefile @@ -12,10 +12,8 @@ SRCS+= vnode_if.h .if ${MACHINE_CPUARCH} == "aarch64" SRCS+= hwpmc_arm64.c hwpmc_arm64_md.c -.if !empty(OPT_ACPI) -SRCS+= cmn600.c hwpmc_cmn600.c -SRCS+= hwpmc_dmc620.c pmu_dmc620.c -.endif +SRCS.DEV_ACPI= cmn600.c hwpmc_cmn600.c +SRCS.DEV_ACPI+= hwpmc_dmc620.c pmu_dmc620.c .endif .if ${MACHINE_CPUARCH} == "amd64" From nobody Wed Mar 1 18:33: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 4PRjXX5GJ5z3vBm9; Wed, 1 Mar 2023 18:33: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 4PRjXX4jgwz46lN; Wed, 1 Mar 2023 18:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Gw4KNl+QgoBwgkCJRBbJWBsoACmrv2yIumxtdv64zw=; b=soElvAzAnHt/IyMEsPa/6Xq5cnFZLPnNjoHbhIW6V9SFjUoZ4uLnMko4GdQX1NCMc3rnoM YV0qZHCnxZTyYzXWXONuQU3VxmFS/zLvvpe1UqiypsblinDgVhOHnLxzhmro5RQOlUD+aW n/eG+mJ+BFx9ILP47o6jj5vWxmmj5wLkd9EohYJSvM0IU+Gj9jPAHat6fu9lCV0AEN1ptq k/uOF0AdCPfGBJ13OLwm5hySDzOQxNtPl9EyQgdgSCZZMgLqp1nAMqGB54tKm3q4LvyKWT gkZfiPVsDgiPmxKZharsgG8MtnCMm1vH/U0wkINR3AukN441BD/LTTKH44cByA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Gw4KNl+QgoBwgkCJRBbJWBsoACmrv2yIumxtdv64zw=; b=J5Ko8Q1vZtK35jRwf3xQX7SGdIDkCUQ8JchM0s3PsyO7PINviWqdKTUykaqvA3REK+VdvS U+vn/6HHmeRcQksUOYq+BpQZ7M/tKWLWBONIW4KX2ruyQZFgQISWupd+fQsMZlxBAyt2xA ay8QrYTGZ20yKz1UEAMiP90bZoEz3TzMQ+GwcKnjFA7OJydUMr6qa63VPM43FReAGprvWV fd+NKoxVNAuKDvqeZmlzUGhmlUkaQ9p3Bv/a8ugf8oCcQUecnuMCSG+osfH/xeVrWY/xkI nThuVCl8wljCEi7lSiuAbVkE2RihCpUdHX/YAliylQj1U9j4K8QejRj6NSJL1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677695580; a=rsa-sha256; cv=none; b=KYCesmSp1F6EZZVPzZP8BvKH8q0HGzuL8kx4AZPvyvTlqAYKnwGvR437ulxp895EGjl4JN n+5VAOVSLh5tOYy2Lk1cmMGsGID7zXOPH3wyS3oWv9LiLiz2j9xkJhblfUsoXKk94rXi4s 1iJ9JETofmLJdA/MyALBVGSRD5RkHue3+ehrQ8Ci7G6f+QvOiFSQNfp2y/rX/huESMp4D0 tVp7COgZaxi0NNOmBJ24iOr8CaQaq+XLSTpc92uP3NR0j4ekhPzOyGYP/MdjcVzSDmnLbG JDE50b8muVu6O/4voWTblaUqbAYr6StY2sL8ED/aafkzAkwsSS91R5TxkZBgZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRjXX3qGhzl0d; Wed, 1 Mar 2023 18:33: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 321IX0BZ099841; Wed, 1 Mar 2023 18:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IX0E6099840; Wed, 1 Mar 2023 18:33:00 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:33:00 GMT Message-Id: <202303011833.321IX0E6099840@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: c3dd45c47be9 - main - sys/modules: Make use of SRCS.${KERN_OPT}. 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: c3dd45c47be9b3ea47edc84c6bc6187ab74d966b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c3dd45c47be9b3ea47edc84c6bc6187ab74d966b commit c3dd45c47be9b3ea47edc84c6bc6187ab74d966b Author: John Baldwin AuthorDate: 2023-03-01 18:32:30 +0000 Commit: John Baldwin CommitDate: 2023-03-01 18:32:30 +0000 sys/modules: Make use of SRCS.${KERN_OPT}. kmod.mk appends the value of SRCS.${KERN_OPT} for each defined kernel option to SRCS. This helper is shorter than appending to SRCS under explicit checks on KERN_OPTS. Reviewed by: imp Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D38738 --- sys/modules/cxgbe/if_cxgbe/Makefile | 4 +--- sys/modules/geom/geom_uzip/Makefile | 4 +--- sys/modules/vmm/Makefile | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile index 723029264bac..0a4103de17c8 100644 --- a/sys/modules/cxgbe/if_cxgbe/Makefile +++ b/sys/modules/cxgbe/if_cxgbe/Makefile @@ -23,9 +23,7 @@ SRCS+= t4_filter.c SRCS+= t4_hw.c SRCS+= t4_if.c t4_if.h SRCS+= t4_iov.c -.if ${KERN_OPTS:MKERN_TLS} != "" -SRCS+= t6_kern_tls.c -.endif +SRCS.KERN_TLS+= t6_kern_tls.c SRCS+= t4_keyctx.c SRCS+= t4_l2t.c SRCS+= t4_main.c diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile index 7269a49422ff..8cebb60b54d8 100644 --- a/sys/modules/geom/geom_uzip/Makefile +++ b/sys/modules/geom/geom_uzip/Makefile @@ -10,10 +10,8 @@ SRCS+= g_uzip.h g_uzip_dapi.h g_uzip_lzma.h g_uzip_zlib.h g_uzip_softc.h \ g_uzip_wrkthr.h # This works for buildkernel, but will disable zstd in geom_uzip out of tree. -.if ${KERN_OPTS:MZSTDIO} != "" -SRCS+= g_uzip_zstd.c g_uzip_zstd.h +SRCS.ZSTDIO+= g_uzip_zstd.c g_uzip_zstd.h CFLAGS.g_uzip_zstd.c+= -I${SRCTOP}/sys/contrib/zstd/lib/freebsd -.endif #CFLAGS= -g -DINVARIANT_SUPPORT -DINVARIANTS diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index ef0d9dcb6786..412342967eec 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -61,9 +61,7 @@ SRCS+= vmcb.c \ amdvi_hw.c \ svm_msr.c -.if ${KERN_OPTS:MBHYVE_SNAPSHOT} != "" -SRCS+= vmm_snapshot.c -.endif +SRCS.BHYVE_SNAPSHOT= vmm_snapshot.c CLEANFILES= vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o From nobody Wed Mar 1 18:47: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 4PRjsL6XGlz3vCbl; Wed, 1 Mar 2023 18:47: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 4PRjsL5y3Qz4CQt; Wed, 1 Mar 2023 18:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677696454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjXcAFXPyCLMVqfxbOTb940AEE0fUv7/m/0jlJGTJV4=; b=JjJSFISnKYPWi9yUfg0NqJ+ifS/Abj9OaMBS2Rwkh62+oT0s7poXu1VxPPSAwQkCHHRPEw vrMfljwGu2vLiBl6QD5g+ruLUYtUJ8vqEkHaJwMoYfSwY+Ew7LvQbXGjp1UZO7a+fqkGuU wq0Ca+UjBvgiTxg2YFdKFEZucT9AMiNGH1Mq+q7LLUdOtPTzVairBSX5+b6tmAJj3sXSWq 1kUPmj/f5w0NbhGZCE0OzhcdbcVTRibb6nYjOcoZMxh6U2NSwnEBDOxnw1F4j1hDNZ9JQR MXSMVD3C/5PhHXneh7Q0ltU5dXhDjsYNE3+pyYbS+qi83L7w48CdUKYFm5XR/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677696454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjXcAFXPyCLMVqfxbOTb940AEE0fUv7/m/0jlJGTJV4=; b=GC+a2XVwj+SjLGQfdq5V3ucGA1N9yyXBgBcqCaADhNOvzU+HwMl4koez/BGsPMzdVhCA1b cFJJ89a5wsmh86DXx2+1TapurgKUPj/hNjUUzOxIQCjv9B7CcGXHG4S3RRjSg88RH+bPyN jTmN6WARND1T8BQSGRReGMSK91ABq10UJElPsBSh/XwX5R2L8HdO4NUk/II/pgiR8+rBmK sxXqJV5Ru4nwm1N2WTyKrWuffgH68pnDPFBoRoOeOqybPbyrj7EoBehDgsiQTTkYteJE91 8xgncYZb2+zhtpsjF3cDeyE0hf5C5IgU/2dvMKyYqPG5EtXfie0qCYdYhmbpsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677696454; a=rsa-sha256; cv=none; b=aJ6EbHH3c8B65uU/VOrYdiZoDSDPf2wYVkdPOMnLDSDtCtNTHIDV3CjG+J7B9Ht31d85rI tB61KpV7GYAuimGs4gXZDzHdBPSmCJTm6+yDkZAkfeYofBZbeS+cP+69wKYgNQe5TJj6V6 ZaWVC7zbGDrKM01FwlGwSyC4LO1UIoYnNT42fwur9DeYsRA9/bF4rItgWKMEgLHJKlDgZp SLw8WrpyEqrZ6vIPPk6Dj9AsTPb1nBeYlsc5oTD6X4BfqAlGoUT1RVP+NmOiomz1VpPpVg RU3jwhA7klavTZAvIUBdqvhsZJJGgOU2FV+IUtbven33fXFC6NUaQyDlJzgKGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRjsL4ny9zldy; Wed, 1 Mar 2023 18:47: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 321IlYgr016700; Wed, 1 Mar 2023 18:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IlYDj016699; Wed, 1 Mar 2023 18:47:34 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:47:34 GMT Message-Id: <202303011847.321IlYDj016699@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: 6c7bc93da699 - main - g_part_ebr: always create "compat" aliases 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: 6c7bc93da699054bb8ead58fdc226e084d929515 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6c7bc93da699054bb8ead58fdc226e084d929515 commit 6c7bc93da699054bb8ead58fdc226e084d929515 Author: Ed Maste AuthorDate: 2023-02-27 19:13:09 +0000 Commit: Ed Maste CommitDate: 2023-03-01 18:44:01 +0000 g_part_ebr: always create "compat" aliases The "canonical" EBR partition names like `ada0s4+00002081` are not particularly meaningful. The "compat" aliases share the same namespace as the parent MBR, resulting in user-friendly names like `ada0s6`. These names are consistent with the way Linux names EBR partitions. We previously provided a sysctl kern.features.geom_part_ebr_compat (enabled by default) to control the "compat" names. Remove the sysctl and always create the aliases. Relnotes: yes Reviewed by: cem, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38812 --- sys/geom/part/g_part_ebr.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/sys/geom/part/g_part_ebr.c b/sys/geom/part/g_part_ebr.c index f7aaf1c45cb6..1eb8e30d8adf 100644 --- a/sys/geom/part/g_part_ebr.c +++ b/sys/geom/part/g_part_ebr.c @@ -59,11 +59,6 @@ SYSCTL_DECL(_kern_geom_part); static SYSCTL_NODE(_kern_geom_part, OID_AUTO, ebr, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "GEOM_PART_EBR Extended Boot Record"); -static bool compat_aliases = true; -SYSCTL_BOOL(_kern_geom_part_ebr, OID_AUTO, compat_aliases, - CTLFLAG_RDTUN, &compat_aliases, 0, - "Set non-zero to enable EBR compatibility alias names (e.g., ada0p5)"); - #define EBRNAMFMT "+%08u" #define EBRSIZE 512 @@ -284,12 +279,10 @@ g_part_ebr_add(struct g_part_table *basetable, struct g_part_entry *baseentry, ebr_set_chs(basetable, baseentry->gpe_end, &entry->ent.dp_ecyl, &entry->ent.dp_ehd, &entry->ent.dp_esect); - if (compat_aliases) { - idx = 5; - LIST_FOREACH(iter, &basetable->gpt_entry, gpe_entry) - idx++; - entry->ebr_compat_idx = idx; - } + idx = 5; + LIST_FOREACH(iter, &basetable->gpt_entry, gpe_entry) + idx++; + entry->ebr_compat_idx = idx; return (ebr_parse_type(gpp->gpp_type, &entry->ent.dp_typ)); } @@ -301,11 +294,9 @@ g_part_ebr_add_alias(struct g_part_table *table, struct g_provider *pp, g_provider_add_alias(pp, "%s%s" EBRNAMFMT, pfx, g_part_separator, baseentry->gpe_index); - if (compat_aliases) { - entry = (struct g_part_ebr_entry *)baseentry; - g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, - entry->ebr_compat_idx); - } + entry = (struct g_part_ebr_entry *)baseentry; + g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, + entry->ebr_compat_idx); } static struct g_provider * @@ -317,11 +308,9 @@ g_part_ebr_new_provider(struct g_part_table *table, struct g_geom *gp, pp = g_new_providerf(gp, "%s%s" EBRNAMFMT, pfx, g_part_separator, baseentry->gpe_index); - if (compat_aliases) { - entry = (struct g_part_ebr_entry *)baseentry; - g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, - entry->ebr_compat_idx); - } + entry = (struct g_part_ebr_entry *)baseentry; + g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, + entry->ebr_compat_idx); return (pp); } @@ -573,8 +562,7 @@ g_part_ebr_read(struct g_part_table *basetable, struct g_consumer *cp) entry = (struct g_part_ebr_entry *)baseentry; entry->ent = ent[0]; memcpy(entry->ebr, buf, sizeof(entry->ebr)); - if (compat_aliases) - entry->ebr_compat_idx = idx++; + entry->ebr_compat_idx = idx++; g_free(buf); if (ent[1].dp_typ == 0) From nobody Wed Mar 1 18:51: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 4PRjyC3h1rz3vCdJ; Wed, 1 Mar 2023 18:51: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 4PRjyC3DqCz4Cyj; Wed, 1 Mar 2023 18:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677696707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzevQbiLccMbNO+LO4YGxF82PRV0HRiLp5WlUKnhnow=; b=GLAKY7HJC/xucdz/gmwZkGB2lw2Iy1ASHH+jhV2VE0CMOir1yzXddTa2elJuaKgQsTiRhf rInlazwgVHyMGZ0Q7OOru/2ZViCZDZJBHTK7s4j+u0feBjMCb2A4OCnoWtaoXwxwO5KD09 IcS7zATkk0I4gKu3j3XKG37Sd3RZBxtxivx1hpQXuNS/wS9RsiD2A7bS5KIdMQqEyW62DQ xOIJleLf9Gj6RBN4MmQYDSuztVbwI1Fph7b+Qj63kW28iaNmmNECqGGqs5kXvTM9LQeHDY n3G7nY30KQTGOUZXFu5tIiJSB2Gqt3x231KozV4YjD0anfa9YauiS5JISloFOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677696707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzevQbiLccMbNO+LO4YGxF82PRV0HRiLp5WlUKnhnow=; b=PEROu9hVC6kHYvW2PJPgEyc8Dp/ZGZJCc2ARhJB9N3nGhmkdVwZxgvSH7HZJ2/ncWUHv/r t+9L2iKocQVE+3ga5q3CZVhTLfknGHech+mdmAItDF8C6626L9ln5Sv6+Cmt/Kr3uRJL9K omXy5hzts0rbGxHgAnGZm4s82voZQBmp+7LexMPu1oPn9MrLhOekB7uNledi5+Yh+4y6pQ FGrN3/tJkK9X5teQLUBSOGxXkmVOeB8p9ZQMseY9u5ZuByz+s7FN7U+Yrum68XcXZVdMLb c3JQDbkJXpnyeU6ynMpKitlEuSxIvjMSi2hHXU/G2eQO+4fgxtbhJXMiK0JcOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677696707; a=rsa-sha256; cv=none; b=IUmfiu9avPZa+FGTFUpx+oyDpNk1OReND+4dyQuca9sxT+YGEaeh0Tcr2RQAdDvGdtGiSK R2jxzg/RFbNn4opLv3UdS/zgLvf3mxx7zceDOhbbznLtpTmp4HYmm6/C8bh1AjXzYum/WT aSDsyYaEjmGHg9oiFEEZNZ4izNVgH1Lqs3leMzNdIa02fXGWY3UUUUyFO1JWx5oXlcOlFt efFgHqKitpKGk9/+6SzCZurm7im6yF1D0/jphA/meLXn97XnjvZ5aUjpvUebEEOkPQNHkr FwQ55g+grGo4Om50UsTIivJzanCORP1TxHeENggLoMzCYJvJWHBGdoV0VSrJ/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 4PRjyC2J69zlJ9; Wed, 1 Mar 2023 18:51: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 321Iplwn030655; Wed, 1 Mar 2023 18:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IplPS030654; Wed, 1 Mar 2023 18:51:47 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:51:47 GMT Message-Id: <202303011851.321IplPS030654@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: 89cd5d084e3f - main - usb: Trim another MIPS reference. 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: 89cd5d084e3fc6a0a385eb74d29a18d5da045f16 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=89cd5d084e3fc6a0a385eb74d29a18d5da045f16 commit 89cd5d084e3fc6a0a385eb74d29a18d5da045f16 Author: John Baldwin AuthorDate: 2023-03-01 18:51:27 +0000 Commit: John Baldwin CommitDate: 2023-03-01 18:51:27 +0000 usb: Trim another MIPS reference. Fix a nearby whitespace nit while here. --- sys/dev/usb/usb_freebsd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/usb_freebsd.h b/sys/dev/usb/usb_freebsd.h index f01dc33211d5..977bb4abe029 100644 --- a/sys/dev/usb/usb_freebsd.h +++ b/sys/dev/usb/usb_freebsd.h @@ -65,9 +65,9 @@ /* Use default value. */ #undef USB_HOST_ALIGN #if defined(__arm__) || defined(__powerpc__) -#define USB_HOST_ALIGN 32 /* Arm and MIPS need at least this much, if not more */ +#define USB_HOST_ALIGN 32 /* Arm and PowerPC need at least this much, if not more */ #else -#define USB_HOST_ALIGN 8 /* bytes, must be power of two */ +#define USB_HOST_ALIGN 8 /* bytes, must be power of two */ #endif #endif /* Sanity check for USB_HOST_ALIGN: Verify power of two. */ From nobody Wed Mar 1 18:54: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 4PRk1L3kSPz3vDDV; Wed, 1 Mar 2023 18:54: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 4PRk1L38RBz4DW7; Wed, 1 Mar 2023 18:54:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677696870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQKA7gMk7zjsFHVTBGetu/nWK5tw/dAn1y0MMy9qOy8=; b=i0G/x7f/xI4g8dV7XgFW3BEBA6410/m2XcG4BHJIuR0i56Ld+1dfRcbGpMJVp22QrwgxEB OGpdR8dgW6HFD4lKlpZltM6XwgJ5glZIs7QuWORP9K8C++/fFXnmFtqFvQnUnj0eeK86CW +ClRUNfL0gkkx6t/2NB0U30NIFs/G13Xjhy1XjEBOvh9hfO1/rOqoJvbIfe8SPDTneXkdN Zlvbiu8psd2k4oQbv23Rrxysj7be3sBhi76GSkfRXvN4/7eA7z/LKmk5zx/m2Z9xRqWjhG E+5Lte2ViO7hidRMcSF/I2in/DMzU9SdQBv6wScDn0/Rq5jpn7pyO7+LWZc5Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677696870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQKA7gMk7zjsFHVTBGetu/nWK5tw/dAn1y0MMy9qOy8=; b=Jk7KNs69v51zRXrqObGGY7cLmbYYkhn+q6ipp4aoJt1ZrQ8rrtqvXzBz0yXFWEkGynufMg W+4oJMw8zVJHXzX3I6OaqJ4mqFQSdwEGErMXxb8YRW8tygkku5boDsrT2IKqfa9o64Zalo s6SiSca9JpFsH7mie15vj9zxsmGEgWGXLjjnpkIskTJgsz5NVXvDrzUMj3FGsMmKU+1GMq j+PAPGpBDaLuMilqU1PXy0udKSUuIYj9PTVcQuj35L5a2Fx11mwmYftenpHQTGyfp0n9uo DC+VW9fglmFfbmP7aWQNlh7rS2dqkdoCRLm/WUliHb7qwmSN+Rfot4pBR5HBuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677696870; a=rsa-sha256; cv=none; b=yZsEN2sJw4Yr06DjB7eqy3Te08cOWGsTWPPpthYI/8loCMc3ZHJO8lZLBH3yZWlnHozpcu 1o+e1QV2vRIg92j7KRfpV07wo5nPXGCkz/t/qfBpe6j8lUhSMg13BazroQvZXBMUlXD9qk Y4lO2KCvms8ynQYA4dv4tkWE2W11SDslQsmACnLfcH53mUSFR19n5tG6XLh4KUYTVwI6BI zsY9Pbxg61YTFs1Ul1OIEGDHmEJ/f898U4Kmq00q6poKhFktei7pYRO5hGJbQKKyTA+L1J 5fES9KEER+gdzgvnvCO75FT66uyMb1qVXZK9ZgsnUviU7xez0hVUTHZ3568/IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRk1L1vNrzm0Y; Wed, 1 Mar 2023 18:54: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 321IsUNc033178; Wed, 1 Mar 2023 18:54:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IsU8w033177; Wed, 1 Mar 2023 18:54:30 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:54:30 GMT Message-Id: <202303011854.321IsU8w033177@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: 3f47391177a4 - main - nvram2env: Remove MIPS-specific 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f47391177a452d1561c7aafcc115bb71dd9e097 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3f47391177a452d1561c7aafcc115bb71dd9e097 commit 3f47391177a452d1561c7aafcc115bb71dd9e097 Author: John Baldwin AuthorDate: 2023-03-01 18:54:08 +0000 Commit: John Baldwin CommitDate: 2023-03-01 18:54:08 +0000 nvram2env: Remove MIPS-specific support. --- sys/dev/nvram2env/nvram2env_mips.c | 68 -------------------------------------- 1 file changed, 68 deletions(-) diff --git a/sys/dev/nvram2env/nvram2env_mips.c b/sys/dev/nvram2env/nvram2env_mips.c deleted file mode 100644 index 0432d796b1dd..000000000000 --- a/sys/dev/nvram2env/nvram2env_mips.c +++ /dev/null @@ -1,68 +0,0 @@ -/*- - * Copyright (c) 2010 Aleksandr Rybalko. - * Copyright (c) 2016 Michael Zhilin. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Implementation of pseudo driver for MIPS to copy the NVRAM settings - * from various sources into the kernel environment. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include - -#include - -#include "nvram2env.h" - -static int -nvram2env_mips_probe(device_t dev) -{ - struct nvram2env_softc *sc; - - sc = device_get_softc(dev); - sc->bst = mips_bus_space_generic; - - return (nvram2env_probe(dev)); -} - -static device_method_t nvram2env_mips_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, nvram2env_mips_probe), - - DEVMETHOD_END -}; - -DEFINE_CLASS_1(nvram2env, nvram2env_mips_driver, nvram2env_mips_methods, - sizeof(struct nvram2env_softc), nvram2env_driver); -DRIVER_MODULE(nvram2env_mips, nexus, nvram2env_mips_driver, NULL, NULL); - -MODULE_VERSION(nvram2env_mips, 1); -MODULE_DEPEND(nvram2env_mips, nvram2env, 1, 1, 1); From nobody Wed Mar 1 20:39: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 4PRmLl3M7hz3vKrq; Wed, 1 Mar 2023 20:39: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 4PRmLl2YNJz4NNQ; Wed, 1 Mar 2023 20:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677703183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RN5NkvfpHQkvlbqIaCJLMOV/461FjAciNIcsi1XLtLw=; b=kVLQujFiPNtmB1EZr0Pu1L9a5N3TXomo/L3BPWPZwuVf13R/k3RR0jrISFBOA9v7qB4BnF dyW+Gji2Kl+dFnX5Np8ZZlwt38nmljCvDC0btSTG5wH7zpOlom0TFsGm7wsHr7bK+0+nDF J5YJ0Jr98hxXnput+3hxO9r1H1G8abqDRlBDWV6lQ+BYHm9SKkirBPAtdFr8mXed5zq9VR 8IbhxkRy6J5R32bwDJcinzi4ufbl6BpM26Pzj4rN0zK6AQXm+wL8vWxEsvzQDearzIBIsu VbqUTqJJZ91O0LeXmXMNXEuWAC3Ky/xvvXp2BLJ2F8zoj4QIaENrfL8bnkQzqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677703183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RN5NkvfpHQkvlbqIaCJLMOV/461FjAciNIcsi1XLtLw=; b=eQSRVdILEYsyrqH+opFIZgGL5lXtVmjfOo4Iz3Kv84t2M4ubVQB5P4u62iQq9x8uXpEAtz U5GZ7FGbShdzdaMWq5Mz3aU4gmtUz4RLdTdMid4AbadCsG/orUqusfk+5ynVj6GavXfbA9 o8T0dX5VfwESAc/UBONHMfx6vjv2ETQjxC9ZgGtpOxplJN+DKlx4QdBH2YEnlP245Fv9pS 1WPwlr9pH6En0EPWVJr2QaLAZP/7q3kln+wY152X7r9aesdzNtQtbQxs8MUFHcSlo+0TvR vYoIr7AF57XkA49l8VXC22q6f76XF0LlaDFuT4LqQgkSBPdxsTqPpCzxXYbmgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677703183; a=rsa-sha256; cv=none; b=VIdU4+bPEGn3RyZ8ENI5cYCxbwRNipv6VQ+KuFzK13uZlm+xeOALWhpQIeEWTDXiuLHUCp eKEW715j3CL4Y3L/KKQEwvcv4VOBXkjSWnZE2j48TTKioay2mBDHfKK5b2nv6t+Ah5gjfC ql9OjvQYskqwrZmuy0GOm1deSsqXay1lO8idVvttnKvv/+f8LrLX0NJZZyrhyvNUBr7U+e 5Xwkin5IUIIXGEeQ+QxXhILq2xJtQof0xVfpkvstgfd95ag3Y9v0x+LtJgbQ7chuy8EDq3 rIjKrcA+fS0H+Ymy4jPQIVcNLovoSze6c6rOMuei6ZoQFzOTt8OQK2RBjpVCcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRmLl1ZWMzpLx; Wed, 1 Mar 2023 20:39: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 321KdhBY097242; Wed, 1 Mar 2023 20:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321KdhK0097241; Wed, 1 Mar 2023 20:39:43 GMT (envelope-from git) Date: Wed, 1 Mar 2023 20:39:43 GMT Message-Id: <202303012039.321KdhK0097241@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: 0c428864495a - main - sysctl: tests: fix a couple issues 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: 0c428864495af9dc7d2af4d0a5ae21732af9c739 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0c428864495af9dc7d2af4d0a5ae21732af9c739 commit 0c428864495af9dc7d2af4d0a5ae21732af9c739 Author: Kyle Evans AuthorDate: 2023-03-01 20:35:52 +0000 Commit: Kyle Evans CommitDate: 2023-03-01 20:38:46 +0000 sysctl: tests: fix a couple issues The function that sets test case metadata is actually named ${tc}_head rather than ${tc}, so add the suffix. While we're here, hook the tests up to the infrastructure so that they do get run. Sponsored by: Klara, Inc. --- etc/mtree/BSD.tests.dist | 2 ++ sbin/sysctl/Makefile | 5 +++++ sbin/sysctl/tests/sysctl_test.sh | 12 ++++++------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 859b5c5ace7f..f3420369ad80 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -466,6 +466,8 @@ .. route .. + sysctl + .. .. secure lib diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile index 2069bd3382d2..ee6eba9feae5 100644 --- a/sbin/sysctl/Makefile +++ b/sbin/sysctl/Makefile @@ -1,10 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include + PACKAGE=runtime CONFS= sysctl.conf PROG= sysctl WARNS?= 3 MAN= sysctl.8 +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/sbin/sysctl/tests/sysctl_test.sh b/sbin/sysctl/tests/sysctl_test.sh index a26c2c77b998..e932626a9f14 100644 --- a/sbin/sysctl/tests/sysctl_test.sh +++ b/sbin/sysctl/tests/sysctl_test.sh @@ -38,7 +38,7 @@ sysctl_by_name_body() atf_test_case sysctl_nflag -sysctl_nflag() +sysctl_nflag_head() { atf_set "descr" "Verify -n argument" } @@ -49,7 +49,7 @@ sysctl_nflag_body() atf_test_case sysctl_eflag -sysctl_eflag() +sysctl_eflag_head() { atf_set "descr" "Verify -e argument" } @@ -60,7 +60,7 @@ sysctl_eflag_body() atf_test_case sysctl_tflag -sysctl_tflag() +sysctl_tflag_head() { atf_set "descr" "Verify -t argument" } @@ -71,7 +71,7 @@ sysctl_tflag_body() atf_test_case sysctl_dflag -sysctl_dflag() +sysctl_dflag_head() { atf_set "descr" "Verify -d argument" } @@ -82,7 +82,7 @@ sysctl_dflag_body() atf_test_case sysctl_tflag_dflag -sysctl_tflag_dflag() +sysctl_tflag_dflag_head() { atf_set "descr" "Verify -t -d arguments" } @@ -94,7 +94,7 @@ sysctl_tflag_dflag_body() atf_test_case sysctl_nflag_tflag_dflag -sysctl_nflag_tflag_dflag() +sysctl_nflag_tflag_dflag_head() { atf_set "descr" "Verify -n -t -d arguments" } From nobody Wed Mar 1 21:23: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 4PRnKr313nz3vNHs; Wed, 1 Mar 2023 21:24: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 4PRnKr0yFnz3Fb1; Wed, 1 Mar 2023 21:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677705840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pxm/KdxtBLyLAm+owZrLnSnaDurf4cNRWo5JdX0Nao=; b=ZrN9tTR1/Fv81I2jsMGjB4WaWSdI0NQpQreYIBVv3YNN/0bcYwnot1Y7epFahyyMlzYyIz 5Dv/Wp8tkDqepRoHGGeO5UyfHFBHGSTsJjmyHJcarBloduxRteLyZi3j/Bwy3b1yozMyVa QjwW+4nJ66E6uyhEVKWNqcytH+BAItmzuPXeTiHpIdwB8DrpaMR995dYMf9qhQvxmxrLhQ RftsZN5eXeapBdD32YcPOHmlO+g06122XoXaMgDU1uM0axIFcfXa/js+LcpnjB+VuT02UK bshFl7CSkrYCk2E2XruYpxCAWbPmvzsUuJ5ZRkzuqQ2wKB20ddzftjtvnKggyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677705840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pxm/KdxtBLyLAm+owZrLnSnaDurf4cNRWo5JdX0Nao=; b=n/ARRPTj8+7SIOz4QfZxW9TQ9FCvWfq1hYvErZ906kGjE2CK7IziPpO1+wo5FhZQsbxA71 ZGM737wA+QgXKXlDTRmPY50p2NaB0PoYstLq0t5uYWKRbQqi1hJNMtOF25rIYjcyNjGEVc 4imTQ5fcv9+/AhlHs26RNhd/2m1ZLdcnQgFIb3J3jiUoyCZOQHKE17tdS5zneQ85rf87u1 O8vEp8Wbxukrzp2GGZ/Ux7K6pMtXww4tT/Fq8WzzlMd2JU1Ix8HehmSMfty+xWgF6qt89K fcQ92Bu/V/Ae06vz7CqRuiTwXSrJxMyny4CnOBKgV9mfW7TTFnIw4+OHDxmrVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677705840; a=rsa-sha256; cv=none; b=L38yxyb1DzjBCheLAnWnntJ6hKWA81eGyjqMyrSweWB2ajof5AmRPVInOS7Z0R7a7u9hNX djW4beDudWpvTrIs03MxO4bxAu4Lt3tm+uAHsbbK6q8ZIErDo6l8egUbcj8i7GKcQeDAxD 9C5b8RMqKkQj/PAWORnPwIyX0cLn/NRIpkxwgGVOza4RkouQ3zXlvSbo3EHpaQn0RYuaKq q6T9jUJhDzO0OTUSLcdy1a5apdlviKhhlW5CoGH69WOrhVFwvNE/Qy5FzFYBvxlsCYQGBi +frKgyq3nHdBSGOKIq+4DqNNXbQnnY5FVbTNgUSSMtoX2mUyGM5H2MGzEVWWTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRnKq6qCdzq4S; Wed, 1 Mar 2023 21:23: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 321LNx1x079029; Wed, 1 Mar 2023 21:23:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321LNxSv079028; Wed, 1 Mar 2023 21:23:59 GMT (envelope-from git) Date: Wed, 1 Mar 2023 21:23:59 GMT Message-Id: <202303012123.321LNxSv079028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: e78dc78e517a - main - testing: skip tarfs tests if module is not loadable. 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e78dc78e517ae36143973dd2675da8ec93c4951e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=e78dc78e517ae36143973dd2675da8ec93c4951e commit e78dc78e517ae36143973dd2675da8ec93c4951e Author: Olivier Cochard AuthorDate: 2023-03-01 20:26:54 +0000 Commit: Olivier Cochard CommitDate: 2023-03-01 21:23:07 +0000 testing: skip tarfs tests if module is not loadable. Approved by: asomers Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D38828 --- tests/sys/fs/tarfs/tarfs_test.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 15319e249034..388a78efa476 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -38,6 +38,7 @@ tarfs_basic_head() { atf_set "require.user" "root" } tarfs_basic_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" "${mktar}" tarfs_test.tar.zst atf_check mount -rt tarfs tarfs_test.tar.zst "${mnt}" @@ -47,7 +48,7 @@ tarfs_basic_body() { atf_check_equal "$(sha256 -q "${mnt}"/sparse_file)" ${sum} } tarfs_basic_cleanup() { - umount "${mnt}" + umount "${mnt}" || true } atf_test_case tarfs_notdir_device cleanup @@ -56,6 +57,7 @@ tarfs_notdir_device_head() { atf_set "require.user" "root" } tarfs_notdir_device_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" atf_check mknod d b 0xdead 0xbeef tar cf tarfs_notdir.tar d @@ -76,6 +78,7 @@ tarfs_notdir_dot_head() { atf_set "require.user" "root" } tarfs_notdir_dot_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" echo "hello" >d tar cf tarfs_notdir.tar d @@ -96,6 +99,7 @@ tarfs_notdir_dotdot_head() { atf_set "require.user" "root" } tarfs_notdir_dotdot_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" echo "hello" >d tar cf tarfs_notdir.tar d @@ -116,6 +120,7 @@ tarfs_notdir_file_head() { atf_set "require.user" "root" } tarfs_notdir_file_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" echo "hello" >d tar cf tarfs_notdir.tar d From nobody Wed Mar 1 23:26: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 4PRr3l2C0Sz3vWF5; Wed, 1 Mar 2023 23:26: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 4PRr3l1jNNz3PDD; Wed, 1 Mar 2023 23:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677713219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4PJx6JKnzjvHmgfbRkwuBVVJB3i5XF2OOA/nIYij7d4=; b=SVWXQMQ3vajBzJMBDOvw3PdOgSg82M8qmDHV+y6gfqjG0B/IJ4H2qauLJ7JUAn5nd6PaKk 17Qdwq4JoLvVda1ZzDABpg7RzmtLhzR21frB6Xa5MPWbef28W/4E67KD2zP9tO9EpfBN6L 9/ZsHXxPes2ppLFa7BFwB3gjK7M32Mm+5msCt07eTHtlsgq1A+z9teL8Fb40oJP8ygL5ti h8/4oLiiivRrrG/hY6oLb49IciVErSfOImdFGaYkfP7zvFbXENJSrljdRjM9vRCdy79Le3 WbfBPjh8SxprvahAexi01BkC3ltypPOpuDjodra1ifdK7S4Q0HQBcr3se4Xcig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677713219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4PJx6JKnzjvHmgfbRkwuBVVJB3i5XF2OOA/nIYij7d4=; b=e5OZD0PuIhdBDd8pZPdtKT8nFWFbzi0ZO3iaGv/BKH838MUYrxl8bdyViuRx5JnA5xGBLf Fh0B4HABTxdHYBkNpC8a8tDemKMsCYMK9hBYJSzR9UaF98p5GIcKa4iTm9fWIl7jrWLKGP GNS/rFRs2Iie+zT/CKJmOwJ26QBaBH5X0vAgUd2rqLna2Rq9IvYIQGeRF6WTO/SLiRqxVg dp6ZptBEmKZtFC+YGCbHVKLc11HQOXjzzChdtSoeit6UKylvMz/EVD0DTb5+tjr19chv4B 9a69QLHjI0srxkYS2rQXdgUlatsY/4C/uzKbHc0UJUEIuSBy64rO/o0ieZ67mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677713219; a=rsa-sha256; cv=none; b=d/NXMYyPYIawKWini/KEgA/gf86oMAozahS7pS1g8hND7iYkeQelH8j7aU4fu1YkTt4Q0S uQfpYqiDl1XRFR+la9GqQQ6cXjSG3ScAQq43NV4XP9JURrihhG1kxdX6+oOAD6tlfQxRmb rBWNpr94gz9iX4mXuDIsxFrYNebraqq/qCPMLYhTtFKQMshbTX1c4mqADWFz05/GJeEyv4 w7ie8XrbuyeJcddpHGy1NJkhskvJiXvPEUk3d6gu6XV0utT6LWiCpY+UPidgXsqX/DXpTE jZH2USLIyA2G01MuO7S10l+JdOpePyN/5KecRhE5PQSRro5UgbXGLRiSTPnzvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRr3l0kTmzt59; Wed, 1 Mar 2023 23:26: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 321NQxaZ075651; Wed, 1 Mar 2023 23:26:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321NQxhm075650; Wed, 1 Mar 2023 23:26:59 GMT (envelope-from git) Date: Wed, 1 Mar 2023 23:26:59 GMT Message-Id: <202303012326.321NQxhm075650@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: a90b47abcbdb - main - nfs_fha_new: Fix nfs_fha_new so that sysctls work in prisons 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: a90b47abcbdbd48c68fbf7c407546293479056de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a90b47abcbdbd48c68fbf7c407546293479056de commit a90b47abcbdbd48c68fbf7c407546293479056de Author: Rick Macklem AuthorDate: 2023-03-01 23:25:35 +0000 Commit: Rick Macklem CommitDate: 2023-03-01 23:25:35 +0000 nfs_fha_new: Fix nfs_fha_new so that sysctls work in prisons The sysctls were in "struct fha_params", making it impractical to vnet them. This patch moves the sysctls out of "struct fha_params" and vnet's them, so that they are available in vnet prisons running nfsd(8). It also avoids the IS_DEFAULT_VNET() macros in the VNET_SYSINIT() function. Reviewed by: glebius MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D38748 --- sys/fs/nfsserver/nfs_fha_new.c | 118 ++++++++++++++++++----------------------- sys/fs/nfsserver/nfs_fha_new.h | 3 -- 2 files changed, 53 insertions(+), 68 deletions(-) diff --git a/sys/fs/nfsserver/nfs_fha_new.c b/sys/fs/nfsserver/nfs_fha_new.c index 6ae6884a4b74..20343c7c846f 100644 --- a/sys/fs/nfsserver/nfs_fha_new.c +++ b/sys/fs/nfsserver/nfs_fha_new.c @@ -57,8 +57,46 @@ static void fha_extract_info(struct svc_req *req, struct fha_info *i); NFSD_VNET_DEFINE_STATIC(struct fha_params *, fhanew_softc); +NFSD_VNET_DEFINE_STATIC(struct fha_ctls, nfsfha_ctls); SYSCTL_DECL(_vfs_nfsd); +SYSCTL_NODE(_vfs_nfsd, OID_AUTO, fha, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, + "NFS File Handle Affinity (FHA)"); + +SYSCTL_UINT(_vfs_nfsd_fha, + OID_AUTO, enable, CTLFLAG_NFSD_VNET | CTLFLAG_RWTUN, + &NFSD_VNET_NAME(nfsfha_ctls).enable, 0, + "Enable NFS File Handle Affinity (FHA)"); + +SYSCTL_UINT(_vfs_nfsd_fha, + OID_AUTO, read, CTLFLAG_NFSD_VNET | CTLFLAG_RWTUN, + &NFSD_VNET_NAME(nfsfha_ctls).read, 0, + "Enable NFS FHA read locality"); + +SYSCTL_UINT(_vfs_nfsd_fha, + OID_AUTO, write, CTLFLAG_NFSD_VNET | CTLFLAG_RWTUN, + &NFSD_VNET_NAME(nfsfha_ctls).write, 0, + "Enable NFS FHA write locality"); + +SYSCTL_UINT(_vfs_nfsd_fha, + OID_AUTO, bin_shift, CTLFLAG_NFSD_VNET | CTLFLAG_RWTUN, + &NFSD_VNET_NAME(nfsfha_ctls).bin_shift, 0, + "Maximum locality distance 2^(bin_shift) bytes"); + +SYSCTL_UINT(_vfs_nfsd_fha, + OID_AUTO, max_nfsds_per_fh, CTLFLAG_NFSD_VNET | CTLFLAG_RWTUN, + &NFSD_VNET_NAME(nfsfha_ctls).max_nfsds_per_fh, 0, + "Maximum nfsd threads that " + "should be working on requests for the same file handle"); + +SYSCTL_UINT(_vfs_nfsd_fha, + OID_AUTO, max_reqs_per_nfsd, CTLFLAG_NFSD_VNET | CTLFLAG_RWTUN, + &NFSD_VNET_NAME(nfsfha_ctls).max_reqs_per_nfsd, 0, "Maximum requests that " + "single nfsd thread should be working on at any time"); + +SYSCTL_PROC(_vfs_nfsd_fha, OID_AUTO, fhe_stats, + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, 0, 0, + fhenew_stats_sysctl, "A", ""); extern int newnfs_nfsv3_procid[]; @@ -78,68 +116,19 @@ fhanew_init(void *foo) snprintf(softc->server_name, sizeof(softc->server_name), FHANEW_SERVER_NAME); - /* - * Initialize the sysctl context list for the fha module. - */ - sysctl_ctx_init(&softc->sysctl_ctx); - if (IS_DEFAULT_VNET(curvnet)) { - softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_vfs_nfsd), OID_AUTO, "fha", - CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "NFS File Handle Affinity (FHA)"); - if (softc->sysctl_tree == NULL) { - printf("%s: unable to allocate sysctl tree\n", __func__); - return; - } - } - for (i = 0; i < FHA_HASH_SIZE; i++) mtx_init(&softc->fha_hash[i].mtx, "fhalock", NULL, MTX_DEF); /* * Set the default tuning parameters. */ - softc->ctls.enable = FHA_DEF_ENABLE; - softc->ctls.read = FHA_DEF_READ; - softc->ctls.write = FHA_DEF_WRITE; - softc->ctls.bin_shift = FHA_DEF_BIN_SHIFT; - softc->ctls.max_nfsds_per_fh = FHA_DEF_MAX_NFSDS_PER_FH; - softc->ctls.max_reqs_per_nfsd = FHA_DEF_MAX_REQS_PER_NFSD; + NFSD_VNET(nfsfha_ctls).enable = FHA_DEF_ENABLE; + NFSD_VNET(nfsfha_ctls).read = FHA_DEF_READ; + NFSD_VNET(nfsfha_ctls).write = FHA_DEF_WRITE; + NFSD_VNET(nfsfha_ctls).bin_shift = FHA_DEF_BIN_SHIFT; + NFSD_VNET(nfsfha_ctls).max_nfsds_per_fh = FHA_DEF_MAX_NFSDS_PER_FH; + NFSD_VNET(nfsfha_ctls).max_reqs_per_nfsd = FHA_DEF_MAX_REQS_PER_NFSD; - /* - * Add sysctls so the user can change the tuning parameters. - */ - if (IS_DEFAULT_VNET(curvnet)) { - SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "enable", CTLFLAG_RWTUN, - &softc->ctls.enable, 0, "Enable NFS File Handle Affinity (FHA)"); - - SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "read", CTLFLAG_RWTUN, - &softc->ctls.read, 0, "Enable NFS FHA read locality"); - - SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "write", CTLFLAG_RWTUN, - &softc->ctls.write, 0, "Enable NFS FHA write locality"); - - SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "bin_shift", CTLFLAG_RWTUN, - &softc->ctls.bin_shift, 0, - "Maximum locality distance 2^(bin_shift) bytes"); - - SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "max_nfsds_per_fh", CTLFLAG_RWTUN, - &softc->ctls.max_nfsds_per_fh, 0, "Maximum nfsd threads that " - "should be working on requests for the same file handle"); - - SYSCTL_ADD_UINT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "max_reqs_per_nfsd", CTLFLAG_RWTUN, - &softc->ctls.max_reqs_per_nfsd, 0, "Maximum requests that " - "single nfsd thread should be working on at any time"); - - SYSCTL_ADD_OID(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "fhe_stats", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, - 0, 0, fhenew_stats_sysctl, "A", ""); - } } static void @@ -150,7 +139,6 @@ fhanew_uninit(void *foo) softc = NFSD_VNET(fhanew_softc); - sysctl_ctx_free(&softc->sysctl_ctx); for (i = 0; i < FHA_HASH_SIZE; i++) mtx_destroy(&softc->fha_hash[i].mtx); free(softc, M_TEMP); @@ -489,8 +477,8 @@ fha_hash_entry_choose_thread(struct fha_params *softc, } /* Check whether we should consider locality. */ - if ((i->read && !softc->ctls.read) || - (i->write && !softc->ctls.write)) + if ((i->read && !NFSD_VNET(nfsfha_ctls).read) || + (i->write && !NFSD_VNET(nfsfha_ctls).write)) goto noloc; /* @@ -501,11 +489,11 @@ fha_hash_entry_choose_thread(struct fha_params *softc, offset2 = thread->st_p3; if (((offset1 >= offset2) - && ((offset1 - offset2) < (1 << softc->ctls.bin_shift))) + && ((offset1 - offset2) < (1 << NFSD_VNET(nfsfha_ctls).bin_shift))) || ((offset2 > offset1) - && ((offset2 - offset1) < (1 << softc->ctls.bin_shift)))) { - if ((softc->ctls.max_reqs_per_nfsd == 0) || - (req_count < softc->ctls.max_reqs_per_nfsd)) { + && ((offset2 - offset1) < (1 << NFSD_VNET(nfsfha_ctls).bin_shift)))) { + if ((NFSD_VNET(nfsfha_ctls).max_reqs_per_nfsd == 0) || + (req_count < NFSD_VNET(nfsfha_ctls).max_reqs_per_nfsd)) { #if 0 ITRACE_CURPROC(ITRACE_NFS, ITRACE_INFO, "fha: %p(%d)r", thread, req_count); @@ -535,8 +523,8 @@ noloc: * We didn't find a good match yet. See if we can add * a new thread to this file handle entry's thread list. */ - if ((softc->ctls.max_nfsds_per_fh == 0) || - (fhe->num_threads < softc->ctls.max_nfsds_per_fh)) { + if ((NFSD_VNET(nfsfha_ctls).max_nfsds_per_fh == 0) || + (fhe->num_threads < NFSD_VNET(nfsfha_ctls).max_nfsds_per_fh)) { thread = this_thread; #if 0 ITRACE_CURPROC(ITRACE_NFS, ITRACE_INFO, @@ -569,7 +557,7 @@ fhanew_assign(SVCTHREAD *this_thread, struct svc_req *req) NFSD_CURVNET_SET(NFSD_TD_TO_VNET(curthread)); softc = NFSD_VNET(fhanew_softc); /* Check to see whether we're enabled. */ - if (softc->ctls.enable == 0) + if (NFSD_VNET(nfsfha_ctls).enable == 0) goto thist; /* diff --git a/sys/fs/nfsserver/nfs_fha_new.h b/sys/fs/nfsserver/nfs_fha_new.h index 08f52539450e..5510fa2891f1 100644 --- a/sys/fs/nfsserver/nfs_fha_new.h +++ b/sys/fs/nfsserver/nfs_fha_new.h @@ -95,9 +95,6 @@ struct fha_info { struct fha_params { struct fha_hash_slot fha_hash[FHA_HASH_SIZE]; - struct sysctl_ctx_list sysctl_ctx; - struct sysctl_oid *sysctl_tree; - struct fha_ctls ctls; char server_name[32]; }; From nobody Wed Mar 1 23:30: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 4PRr7q2rmKz3vWGK; Wed, 1 Mar 2023 23:30: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 4PRr7q2CrZz3Q0N; Wed, 1 Mar 2023 23:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677713431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u6rdN0sKK3ZyiMCmqf566B84WnsvbuUt4C3eh2dhTT4=; b=uj0dnx6aPT1O0i5KABuYjiQ8zpqRGg0jX7vNtzePRX87RH+CKHYCYDUL0l560d1U1oRHg2 PTetlzRK+Chz9awDQHE4qrE79Xxp6HUB6PRgV64Dtaii9VT3KU5yMyQJ8CvDx6cvdqi2lM ohY8qadzZXZs43WpPRGhPOIaTrQkMQPWCYskEAlQasz/kJcHwJZAvRxtnOJX/CSiZ4orDW B2qmDIwfLdNTd8wqgewCBA1hZx5XKW0v4z5c+Ptlxr68c1M4JVAuQAI6v+WD3Tl3NZoH2M 7xZIBr1ziQDp4cKseZ0Kbep55fc3ekIMNLkhSCmrZI4kGMetCFNb7euLiHuW5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677713431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u6rdN0sKK3ZyiMCmqf566B84WnsvbuUt4C3eh2dhTT4=; b=iQACjKgJjwpk5+eQ/SObPKUCNjDglKVo8OkW6aL6dhqAVd9RMrULJ/rsW1BPuhmkTG3hPi uDmg9CHPPzvgAsoxowOnWSovdur4iaFGPNa8I1P5Pu3v1Y/p0lcosnFXHAc4ktk858FaI0 gSR/yVEa/DC8ttVmBmyF8gwfIsajxYH8VfNEh+S/oBhWy+2snVUIShfx12OAr4z0JiZ2oR Wn0deby0hAyuaDPuufMxnuBXBE+aecietsL5TTrEMd0EdQw28/O1luVV4KsHOtrHI7L7r7 h3M+ljmI5nhmrvQBq5MoMW5X63BHLuZND2YOzIy0apQBsoV3jQ6wFhcZvF+BJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677713431; a=rsa-sha256; cv=none; b=cvOkhgLdpUs8GoULpf8o35KfmnHjsuSVvkaLXp1WEryyYyPcbVQ2ed+eYAxO5k5Y+cT5Jb SaB+y0dDeHVOJWuMRgJ36LGm8rgckxlZutY7odl6/HXvFOqlJdfQcOKTA2AEmFHiSHjJrd xYRa7d7j78kpEKepbJHesV4C/lZKnnu3RCpeX92zIb7cldQ2Hti+X5fPDz9IabW3HiEdFA Cnl/R/6jgMb2RT+v7PLzxNVfSxYfO/WnLAEpyo7ugBbYZZDFUTZALYlfvvBSlQ3nGCK+cf SbRZTLWDiqiChtqrpPcgSSMWsVjd6+ZlF3fNjbVEXLd/gd2Rzcx4i0/4Wgocnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRr7q1GdGzsnN; Wed, 1 Mar 2023 23:30: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 321NUVBJ084574; Wed, 1 Mar 2023 23:30:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321NUVRb084573; Wed, 1 Mar 2023 23:30:31 GMT (envelope-from git) Date: Wed, 1 Mar 2023 23:30:31 GMT Message-Id: <202303012330.321NUVRb084573@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: 57ff348804f9 - main - svc_rpcsec_gss.c: Separate out the non-vnet initialization 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: 57ff348804f98d956f2e203b665de5a8989dbf8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=57ff348804f98d956f2e203b665de5a8989dbf8c commit 57ff348804f98d956f2e203b665de5a8989dbf8c Author: Rick Macklem AuthorDate: 2023-03-01 23:29:25 +0000 Commit: Rick Macklem CommitDate: 2023-03-01 23:29:25 +0000 svc_rpcsec_gss.c: Separate out the non-vnet initialization Without this patch, a single initialization function was used to initialize both the vnet'd and non-vnet'd data. This patch separates out the non-vnet'd initializations into a separate function invoked by SYSINIT(). This avoids use of IS_DEFAULT_VNET() in the initialization functions and also configures the non-vnet'd initialization function to be called first, although ordering is not currently needed. Reviewed by: glebius MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D38749 --- sys/rpc/rpcsec_gss/svc_rpcsec_gss.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c index 03e185bd912b..132d7fb8c0f4 100644 --- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c +++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c @@ -205,6 +205,25 @@ KGSS_VNET_DEFINE_STATIC(uint32_t, svc_rpc_gss_next_clientid) = 1; static void svc_rpc_gss_init(void *unused __unused) +{ + + svc_auth_reg(RPCSEC_GSS, svc_rpc_gss, rpc_gss_svc_getcred); + sx_init(&svc_rpc_gss_lock, "gsslock"); +} +SYSINIT(svc_rpc_gss_init, SI_SUB_VFS, SI_ORDER_ANY, + svc_rpc_gss_init, NULL); + +static void +svc_rpc_gss_cleanup(void *unused __unused) +{ + + sx_destroy(&svc_rpc_gss_lock); +} +SYSUNINIT(svc_rpc_gss_cleanup, SI_SUB_VFS, SI_ORDER_ANY, + svc_rpc_gss_cleanup, NULL); + +static void +svc_rpc_gss_vnetinit(void *unused __unused) { int i; @@ -214,26 +233,20 @@ svc_rpc_gss_init(void *unused __unused) for (i = 0; i < svc_rpc_gss_client_hash_size; i++) TAILQ_INIT(&KGSS_VNET(svc_rpc_gss_client_hash)[i]); TAILQ_INIT(&KGSS_VNET(svc_rpc_gss_clients)); - if (IS_DEFAULT_VNET(curvnet)) { - svc_auth_reg(RPCSEC_GSS, svc_rpc_gss, rpc_gss_svc_getcred); - sx_init(&svc_rpc_gss_lock, "gsslock"); - } } -VNET_SYSINIT(svc_rpc_gss_init, SI_SUB_VNET_DONE, SI_ORDER_ANY, - svc_rpc_gss_init, NULL); +VNET_SYSINIT(svc_rpc_gss_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY, + svc_rpc_gss_vnetinit, NULL); static void -svc_rpc_gss_cleanup(void *unused __unused) +svc_rpc_gss_vnet_cleanup(void *unused __unused) { mem_free(KGSS_VNET(svc_rpc_gss_client_hash), sizeof(struct svc_rpc_gss_client_list) * svc_rpc_gss_client_hash_size); - if (IS_DEFAULT_VNET(curvnet)) - sx_destroy(&svc_rpc_gss_lock); } -VNET_SYSUNINIT(svc_rpc_gss_cleanup, SI_SUB_VNET_DONE, SI_ORDER_ANY, - svc_rpc_gss_cleanup, NULL); +VNET_SYSUNINIT(svc_rpc_gss_vnet_cleanup, SI_SUB_VNET_DONE, SI_ORDER_ANY, + svc_rpc_gss_vnet_cleanup, NULL); bool_t rpc_gss_set_callback(rpc_gss_callback_t *cb) From nobody Wed Mar 1 23:35: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 4PRrFW4h6Nz3vWhf; Wed, 1 Mar 2023 23:35: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 4PRrFW4BJqz3QPM; Wed, 1 Mar 2023 23:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677713727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdWtbCwC9SHT5icAuccV3cFJETNinCjVm/+SmPg0ALk=; b=W4VS3fDajos99dhLrNkNJE/j2VACehPyQQIIUUoXmM2pE5hMha/ok8VMFNQ9wpAkVq7sr2 xn76F7oGPAZp/qj0FApmZZilzeJ5jkP4tOQ4748uwDV4SZdckCD3XCh8/QxsQ5TrnIsAMk VbfA2YSi7UIIcbUMne5cVDgbfpQkB7G1dAgtCL2AgNHhI957p/5hVbPIDly25WHzR3wlVU 4YD0qCWkmX6+98+IgTTrw5TiiFYHlWTwzTohfk3QjAz9KVBwKfo8DwWzV5xsz4Hhb2Pvsj Mg+QF2BuOzzpkatBZWIInQLV17aaBAROqTp4ozKbZB9ZE3jF/WIGq7woUcwR8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677713727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdWtbCwC9SHT5icAuccV3cFJETNinCjVm/+SmPg0ALk=; b=QDPZE+MC0x9108OkZJo8mcZx/fQVCxgdjZYhMVLILLKX4RarsdALxiO2Tmf2NaOVKy9heU 6hee1Wv13as7AYQfSCQe9fNVcAUx/5bBN9Gaevdp/L8fzyML7mSxGMVUc83XphlI7M1orl 9sikeCJ+y3xK0sy2GyA4IN2OxO39PXS39CAmy0lYpI+C/D+1f7eURigbS1QpWqiW8yvSuh 6CGE+rpIO0nupfjSyvIfusU9J0R4aD49/+b6FFI3RetDS6ZE74gDnUYT7AUWdM+9apN05i DlPWe8FRNg128R/SJ3kDzrX+n2a14o3pUTUj6yPsIu6ullJ760lMu2Np+X6C0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677713727; a=rsa-sha256; cv=none; b=XiPJt8tE0VmxeNxQs65MO167HAEWO9PIYVLVSgrPFVXCgQvr2VH1GvpmzsUNDlSg6wAAx9 02tLy/IHvvqoHj8r1jP16SUbumz1GioBoxI58WCrtCTlQALED7ZxyLYdD05YtaiWa6G2M7 zWWYvHq5INNMr2wYUv2cDI3Oazb9pJVZItE38pdvM3krpdfQjwLzNspyVrc8iuyaWGNfhz E2fJEWOh6xK3Bo1+yF5rgU3z3oF/zbP51XUuVa/A6f4nWMV7qW64YIet1swVC+gx04/fTa 7kqSkVYd9uEOFRLQtuktW8gfnTyIyF7VPgSl65P/OIdPFKDzpZxS0ooYFHaKlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRrFW3FCRzth3; Wed, 1 Mar 2023 23:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321NZRGg091361; Wed, 1 Mar 2023 23:35:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321NZRM9091360; Wed, 1 Mar 2023 23:35:27 GMT (envelope-from git) Date: Wed, 1 Mar 2023 23:35:27 GMT Message-Id: <202303012335.321NZRM9091360@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: 005cca8361a4 - main - Fix typo: messages missing an 'a'. 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: 005cca8361a4932d03bd93fefa998fff69a1e136 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=005cca8361a4932d03bd93fefa998fff69a1e136 commit 005cca8361a4932d03bd93fefa998fff69a1e136 Author: Warner Losh AuthorDate: 2023-03-01 23:34:43 +0000 Commit: Warner Losh CommitDate: 2023-03-01 23:34:43 +0000 Fix typo: messages missing an 'a'. --- .github/PULL_REQUEST_TEMPLATE/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md index 5c56b8fd3e0c..c3d4020f03ec 100755 --- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -1,4 +1,4 @@ -Please include this information, either here or in your commit messges for the +Please include this information, either here or in your commit messages for the pull request, as appropriate (or delete the line if there's nothing relevant. PR: From nobody Thu Mar 2 01:00: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 4PRt7748dXz3vc1V; Thu, 2 Mar 2023 01:00: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 4PRt773dLvz3qCq; Thu, 2 Mar 2023 01:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677718803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZSr1si91AKiISpMhudutRbgZWZd7FXt28xkT2qynlGY=; b=wRJof8AX3LqYidDNprVDBdqRwPXRnFedSuSjGX0on/53HhWo0Qe0V8beMuGGAN6ZrNJxIm wmChgLN7AyBLJ82eLVe5qsecg6ibabb74/aeQBmJI93POjlfNzGpEdyq7CsCc6qU7y3lSw 43hAS9QH5KDVuuetRfTGoiL9pAIuOh4fCMIRyiXBiiR8qFrbyZkNXlGTygb25x4JuX/kWf Au9XKHVowaieBNSE6xW8U6WmO5UENObk7qSDiiMANVpH0+fEnpJc4tjc2FcrlqtcNWs4ma g7RZSOdWHmF9wtqkZO55VgrzgomNbtEFAOa7JI1x+m908C42dLscedP/pK++mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677718803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZSr1si91AKiISpMhudutRbgZWZd7FXt28xkT2qynlGY=; b=NDBhN989K1MEe/k91cf1vKQkufXzbtl0T91P3D5lSKR+kxrkCJbx4xHrt5ZSLSWUhaZnty eW5N0mid00fCPEEog0CHjDcOBHBmVpsQH5YG+bDHu8ueOxTh3lKTil1K3s1oaPPPU0aRPI 2ioSEe+GTwCxF/JvwDo8kIm0RSDxlhKzFFoTrQGm6c5pxfH3U8hWF3M1pr8F+qJqjmi5wW Dkx3KrhvGQs0cvSBWzGEpHReiKExrcrbShFisQdNu8uKvsroGh8WM10Kt0kFQe3LBxtyIY RYY6p8Jb9KbI3+oVzQ+QJF2QpL3j7AFZpruU074XaiP1/XmqA1rqDlbPYmeODg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677718803; a=rsa-sha256; cv=none; b=c+EkjywPY+kG+um281vQuSfDZfDMJ49FbXZ5Za4TUkeHeDrHzr88t+vpmoZrc07WljYsAl 3/CO24MqrGwj2Lv4QDa/E2+eM1Rv4Jt5ocdfB0Kxc435QD+LLvPoEVFYw5hiMuRGb5qh4d B/Twv1yqRAidCAhlTqrdS5iGpAi89MNFovb/+lZbSs19NuLI6a2E71Wq3irNPhN21Wz2DX 88MfofnHcSMW1pQkyGowP+Qjc+g0SJq+HYLcD2joO6qOujt2tS4+lo96BQgvWW4edrEtLW JLPkq7nTjY1FlUewYvXTeMf/2Jy6CdRRYje6Y6Id65z7YnWeS2tn2knkSHBOMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRt772j9kzwNM; Thu, 2 Mar 2023 01:00: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 322103nX027222; Thu, 2 Mar 2023 01:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322103kT027217; Thu, 2 Mar 2023 01:00:03 GMT (envelope-from git) Date: Thu, 2 Mar 2023 01:00:03 GMT Message-Id: <202303020100.322103kT027217@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: c5e54e56e68a - main - tools/build: Hide spurious errors if sys/stat.h does not exist 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: c5e54e56e68aa50beb7d2a7b8ae6611490a7ba9e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c5e54e56e68aa50beb7d2a7b8ae6611490a7ba9e commit c5e54e56e68aa50beb7d2a7b8ae6611490a7ba9e Author: Ed Maste AuthorDate: 2023-02-24 14:43:57 +0000 Commit: Ed Maste CommitDate: 2023-03-02 00:59:26 +0000 tools/build: Hide spurious errors if sys/stat.h does not exist Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38757 --- tools/build/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 53a735ae6295..c7875622b042 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -68,7 +68,11 @@ INCS+= stdlib.h SRCS+= reallocarray.c .endif +.if exists(${HOST_INCLUDE_ROOT}/sys/stat.h) _WITH_UTIMENS!= grep -c utimensat ${HOST_INCLUDE_ROOT}/sys/stat.h || true +.else +_WITH_UTIMENS= 0 +.endif .if ${_WITH_UTIMENS} == 0 SYSINCS+= stat.h SRCS+= futimens.c utimensat.c From nobody Thu Mar 2 01:21: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 4PRtbx0Ccnz3vcwG; Thu, 2 Mar 2023 01:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRtbw6tflz3rV9; Thu, 2 Mar 2023 01:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677720093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hkHPH+1NbmzcgU0mDnfC89zc0fusPp9IVJZXVZAQ4ng=; b=svhcWD/rQeSfXhXQvU9MXYh7Jl8Q6zdoSdnajdkTmueKDIQQ18ZjDwc/QCnwDdMFBo4mEb hhOJhiEYTE/fIMiMrlJ1FSN8b0n8qfN3BlXPO3uugcB+OjeGuJWP8jIQBAF2g/cgpatV55 qxhcejdtmhgf5OlwTYQn9bLg9Beka+3+YpopLzE6Fw1Z+83cdx9o6Z85KC5O+J8Zdry64D ui6A+AEMrLo54NDNc6bG43Q6jUP8dYgGxE+QLEDikS18jXz09FHjL+kfRwdrEUh3tpsWOX NqqfzkVJ1Pp4Q5QfEq3tejqZuPN73gTIpoQ9pbjtyaWSmurBNQ64q6Ca76gHIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677720093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hkHPH+1NbmzcgU0mDnfC89zc0fusPp9IVJZXVZAQ4ng=; b=RBb4EKcQJMyybbL6rIplZPg4c9VfOPock0l1wDJUuq1Hv4Y9JP3i4umKRZFxD16Y/2fybT F7m+ZSPH6EvaPfG/A0H67pivbci5KYzNCRgHjDQ5uJPGTTjoVQjTzzRGmVhzu2xm0lN5Zx 7x0mFf5dCRE3f+1FJvmmVGYKIAMkgp0ccBBTalIUjgBLfeRlTY+S+tDDDhHLiBaKWvawwK Unv3b3Z8A3uYuu3kVAFLmrA0tKWoTDkkrOiQ45QQ+DwzAWAgV7C3u+osvNHexJXpQ0C5MS SwVLDSsgCoD/2DBUX2JT7Tqsusq5Xm1K6uDEvexSM5VY/sxUYJQkPyLlh6UCVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677720093; a=rsa-sha256; cv=none; b=MxCNYE0MZtWBDzLZqKpl9M6kahjSF4qbGxnnu5UKhZfeUSld++le9CBKLkAc/SvnQ4srtf oMp3VVvQnJFisBPgfPfiL4NuKWK+yVBbD70jyFOVm/2xA5LKFA5TUlF7BRHsjoEd9dAybs FHbOSrDCl3sGWQ+S0nj0X6wo3oU7rVOKJ3/R6RJ1V19AmOYbvMfVYVzo39bQpmtSG8LgAq ulMUFl1TfCSijM7kKUk+Aa494EH5elItk5x4j936Gq6B+UcEuZBHDZspmg7VN07vRCny53 8ZiFybl1scg1yQeHNXdZBB63jpeihLhr1bgeMjy1BgpjLgauOtSF+HNGP9TmyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRtbw5xGhzwsg; Thu, 2 Mar 2023 01:21: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 3221LWDh070835; Thu, 2 Mar 2023 01:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3221LWHh070834; Thu, 2 Mar 2023 01:21:32 GMT (envelope-from git) Date: Thu, 2 Mar 2023 01:21:32 GMT Message-Id: <202303020121.3221LWHh070834@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: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain 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: ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f Author: Ed Maste AuthorDate: 2022-12-14 17:34:59 +0000 Commit: Ed Maste CommitDate: 2023-03-02 01:20:33 +0000 freebsd-update: re-edit files if merge conflict markers remain freebsd-update will open ${EDITOR} if conflicts occur while merging updates to config files. Inform the user if they've left conflict markers behind, and go back to editing the file. PR: 185546 PR: 229689 Reviewed by: delphij Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37703 --- usr.sbin/freebsd-update/freebsd-update.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index b6cd241c4a48..225d1e31e3ec 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2543,8 +2543,21 @@ The following file could not be merged automatically: ${F} Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... EOF - read dummy >>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then + break + fi + cat <<-EOF + +Merge conflict markers remain in: ${F} +These must be resolved for the system to be functional. + +Press Enter to return to editing this file. + EOF + done done < failed.merges rm failed.merges From nobody Thu Mar 2 03:00: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 4PRwpg21P2z3vk49; Thu, 2 Mar 2023 03: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 4PRwpg1STtz43yr; Thu, 2 Mar 2023 03: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=1677726059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AhYFLty0UUipE96A+QGCSkgSkXyJHST6Ipsov6ICbU0=; b=k9VLe3abNfK/948MofLGkMHBZpAY7s1JcIWrqtc2yQ0QkFr7BX1GkY7csqGrpUqp9lT2XI uiHkgmB9r8/Zwld4JAQ3RUcWwHYj1xuii7yOkseaV0+x1VaCYU6CV6fRglax6uhCw81J9p mt4PiWHlLmuwcsNo37o8YuIer1UqT6+X13Rzn1FO8sDU9GAzvPaJuRykeq7I6WsMKZVFBW HiEwTsSPmhu1mSn4QwEVHlPfz9wQ6FYwHG29u2rfkFIp2+Nr/VAYxrIEqi1jSLWvrxDGtP iyXr72+Y6c8Df9xptL/09qlv7NG0gT7WLvGZH4D5YNmJk0CpN6qp8oZEno7c3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AhYFLty0UUipE96A+QGCSkgSkXyJHST6Ipsov6ICbU0=; b=mY9U/E2xT2k4GPnA5ZgWNMaksCP99LsDAixivJFMT4IPTsmivGOmsXTSwcZMCRjUhSxNjt Ly09bn9HVgFopKIIsC0Xr3fdRus6axkX9KdcpISeckw1cLR6mKaf5OrQlkEJ6+eSEZ/kPt cWi7FV4wZesTrPIPnRkhMTt1UyIDz0/Ns95NUUCyK3Sc1/QF4SeRKHGjmhK/jIECopX/Al LijlnnoiRI2B/hCS+tDn75r+0UPRKAYsKWmRm4bcdGnFqhKqNVUV1xn/My2/OF3EvkBix8 9CFZZmJGGukQTsrUT+jfdgyZFryqb8uwjDF3b55CxxbPyb3iQ8kLJbHkfEJaCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726059; a=rsa-sha256; cv=none; b=YM4ucxofabRllGvrmIJtxFySLhpQD4xHRgB3wobtHcAOpMsTxoxlmLVMsdEl+rkJqpTYsc XuhTibtcaqToRluOdc9TBKjA14CDnlDs36POpbnoIdWPe2jFYvW5lXm1caJvbYot7Fpq/b XqcTmaPPQU2MiPAmnQqDjRYwUQlMHfuLFbcp5rgYJk8LdOt44rJoWquWlfMDEYSE/AJk7F pdLUlFw5QJlLkdQiUVp3dJ6OVlR+Z5WrfXHw3xfCy2d4FsMECDUTLdoiuPNVvQ/WA4CxME ZqYFhs5WTxmyK1awGLi/JbcthCrU12JJNlJK/L8C0TbhuA7eBOzO6UdDeO01PQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpg0WjvzyxW; Thu, 2 Mar 2023 03: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 32230wYO032430; Thu, 2 Mar 2023 03:00:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32230wHb032429; Thu, 2 Mar 2023 03:00:58 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:00:58 GMT Message-Id: <202303020300.32230wHb032429@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: 6b4ef4b16a69 - main - daemon: use braces with 'if' consistently 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: 6b4ef4b16a6930d91d0d99c4ceb75cd43a7526c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6b4ef4b16a6930d91d0d99c4ceb75cd43a7526c1 commit 6b4ef4b16a6930d91d0d99c4ceb75cd43a7526c1 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:41 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:41 +0000 daemon: use braces with 'if' consistently Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 81 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 27 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index edcdf3141fcc..f9c1f73e193c 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -173,14 +173,16 @@ main(int argc, char *argv[]) break; case 'l': logfac = get_log_mapping(optarg, facilitynames); - if (logfac == -1) + if (logfac == -1) { errx(5, "unrecognized syslog facility"); + } dosyslog = 1; break; case 'm': stdmask = strtol(optarg, &p, 10); - if (p == optarg || stdmask < 0 || stdmask > 3) + if (p == optarg || stdmask < 0 || stdmask > 3) { errx(6, "unrecognized listening mask"); + } break; case 'o': outfn = optarg; @@ -196,13 +198,15 @@ main(int argc, char *argv[]) break; case 'R': restart = strtol(optarg, &p, 0); - if (p == optarg || restart < 1) + if (p == optarg || restart < 1) { errx(6, "invalid restart delay"); + } break; case 's': logpri = get_log_mapping(optarg, prioritynames); - if (logpri == -1) + if (logpri == -1) { errx(4, "unrecognized syslog priority"); + } dosyslog = 1; break; case 'S': @@ -228,20 +232,24 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (argc == 0) + if (argc == 0) { usage(1); + } - if (!title) + if (!title) { title = argv[0]; + } if (outfn) { outfd = open_log(outfn); - if (outfd == -1) + if (outfd == -1) { err(7, "open"); + } } - if (dosyslog) + if (dosyslog) { openlog(logtag, LOG_PID | LOG_NDELAY, logfac); + } ppfh = pfh = NULL; /* @@ -329,8 +337,9 @@ main(int argc, char *argv[]) goto exit; } restart: - if (pipe(pfd)) + if (pipe(pfd)) { err(1, "pipe"); + } /* * Spawn a child to exec the command. */ @@ -356,27 +365,32 @@ restart: /* Now that we are the child, write out the pid. */ pidfile_write(pfh); - if (user != NULL) + if (user != NULL) { restrict_process(user); + } /* * When forking, the child gets the original sigmask, * and dup'd pipes. */ if (pid == 0) { close(pfd[0]); - if (sigprocmask(SIG_SETMASK, &mask_orig, NULL)) + if (sigprocmask(SIG_SETMASK, &mask_orig, NULL)) { err(1, "sigprogmask"); + } if (stdmask & STDERR_FILENO) { - if (dup2(pfd[1], STDERR_FILENO) == -1) + if (dup2(pfd[1], STDERR_FILENO) == -1) { err(1, "dup2"); + } } if (stdmask & STDOUT_FILENO) { - if (dup2(pfd[1], STDOUT_FILENO) == -1) + if (dup2(pfd[1], STDOUT_FILENO) == -1) { err(1, "dup2"); + } } if (pfd[1] != STDERR_FILENO && - pfd[1] != STDOUT_FILENO) + pfd[1] != STDOUT_FILENO) { close(pfd[1]); + } } execvp(argv[0], argv); /* @@ -436,8 +450,9 @@ restart: } } } - if (restart && !terminate) + if (restart && !terminate) { daemon_sleep(restart, 0); + } if (sigprocmask(SIG_BLOCK, &mask_term, NULL)) { warn("sigprocmask"); goto exit; @@ -451,8 +466,9 @@ exit: close(outfd); close(pfd[0]); close(pfd[1]); - if (dosyslog) + if (dosyslog) { closelog(); + } pidfile_remove(pfh); pidfile_remove(ppfh); exit(1); /* If daemon(3) succeeded exit status does not matter. */ @@ -464,8 +480,9 @@ daemon_sleep(time_t secs, long nsecs) struct timespec ts = { secs, nsecs }; while (!terminate && nanosleep(&ts, &ts) == -1) { - if (errno != EINTR) + if (errno != EINTR) { err(1, "nanosleep"); + } } } @@ -507,8 +524,9 @@ get_log_mapping(const char *str, const CODE *c) { const CODE *cp; for (cp = c; cp->c_name; cp++) - if (strcmp(cp->c_name, str) == 0) + if (strcmp(cp->c_name, str) == 0) { return cp->c_val; + } return -1; } @@ -518,11 +536,13 @@ restrict_process(const char *user) struct passwd *pw = NULL; pw = getpwnam(user); - if (pw == NULL) + if (pw == NULL) { errx(1, "unknown user: %s", user); + } - if (setusercontext(NULL, pw, pw->pw_uid, LOGIN_SETALL) != 0) + if (setusercontext(NULL, pw, pw->pw_uid, LOGIN_SETALL) != 0) { errx(1, "failed to set user environment"); + } setenv("USER", pw->pw_name, 1); setenv("HOME", pw->pw_dir, 1); @@ -546,8 +566,9 @@ listen_child(int fd, struct log_params *logpar) assert(logpar); assert(bytes_read < LBUF_SIZE - 1); - if (do_log_reopen) + if (do_log_reopen) { reopen_log(logpar); + } rv = read(fd, buf + bytes_read, LBUF_SIZE - bytes_read - 1); if (rv > 0) { unsigned char *cp; @@ -568,8 +589,9 @@ listen_child(int fd, struct log_params *logpar) memmove(buf, cp + 1, bytes_read); } /* Wait until the buffer is full. */ - if (bytes_read < LBUF_SIZE - 1) + if (bytes_read < LBUF_SIZE - 1) { return 1; + } do_output(buf, bytes_read, logpar); bytes_read = 0; return 1; @@ -601,16 +623,19 @@ do_output(const unsigned char *buf, size_t len, struct log_params *logpar) assert(len <= LBUF_SIZE); assert(logpar); - if (len < 1) + if (len < 1) { return; - if (logpar->dosyslog) + } + if (logpar->dosyslog) { syslog(logpar->logpri, "%.*s", (int)len, buf); + } if (logpar->outfd != -1) { if (write(logpar->outfd, buf, len) == -1) warn("write"); } - if (logpar->noclose && !logpar->dosyslog && logpar->outfd == -1) + if (logpar->noclose && !logpar->dosyslog && logpar->outfd == -1) { printf("%.*s", (int)len, buf); + } } /* @@ -620,8 +645,9 @@ do_output(const unsigned char *buf, size_t len, struct log_params *logpar) static void handle_term(int signo) { - if (pid > 0 && !child_gone) + if (pid > 0 && !child_gone) { kill(pid, signo); + } terminate = 1; } @@ -662,8 +688,9 @@ reopen_log(struct log_params *lpp) do_log_reopen = 0; outfd = open_log(lpp->outfn); - if (lpp->outfd >= 0) + if (lpp->outfd >= 0) { close(lpp->outfd); + } lpp->outfd = outfd; } From nobody Thu Mar 2 03: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 4PRwph3Zkvz3vjt0; Thu, 2 Mar 2023 03:01: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 4PRwph2M1Gz44Fm; Thu, 2 Mar 2023 03: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=1677726060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PQLGq3pGzoSGYDIcvj/5YISYHWrsrjEDoXiAcm4L/PE=; b=Y+oOnZTFF/lGCZ+cGrGc3kRJa4tJrUOOsgkTrkXUpFQtFKBj2WSWRS16dRxXDinzrCws5S tO7uPJJzgj+YT5Ppt1c/pte0/O52mOAbDhDuttF2VvdzhCXKVgFsWJr+0BBCKt3dVFCJl1 iQfe/0fWSGhiSe+kYANacf7CGSVAXRxnMWS7HD7nXQsfoeC199FiQmJWwboUW01YruzGi+ bAGCJZKDhaJazyE16Y628A2zdCUjnBqafsTFUsPGlAzxngRAfOWPK8QuSOaa8kvOFXTWU8 rtp8IwFedlP28gpgIRTW0eq3YXIW3LZ41oM/hDmr7eiRKiIqL3+pEUvG5gt60g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PQLGq3pGzoSGYDIcvj/5YISYHWrsrjEDoXiAcm4L/PE=; b=qcdNv4hATnAkH7J8cFFZy6hIXFOYxet3vzyIvHioVRG2KXiDL9t44JVn5PLLzb6EcBpzkD R5+H0kUDSgW7dpPxeQ5yi/O43i+Mzq8hVAhynG1KatAnP8ZpR9Bk8lco60ZeGQJX6b/WDx TpBfyg2DA3gGu8ntATtBD4IrYC7nKOf1Hwkcu1vw0xJb/P8+cKulbb1k0pPfnbLUJDIVbw AorjZVpq3B83eTzkbKLSnjkY4Lt2sPWy0VNYVDqW5LaEnCZFUjolP3eQ2rZqly5yD3S4GT KLewGPEH2HKd4mqIEh+fr8vG11hDd0jPKhHjL/fdEE31FpO5DJYA2vGandXDOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726060; a=rsa-sha256; cv=none; b=aXBN6LcvhHFnPpJ4g1F9iitTDpridHTsmh0U3KueyvFAapuS5OgqC+TJAutRgcJxWOmvQh rvE1LvFWa67jBKc7Ss+Il53sjH3Xmmr6l18cOIMH/fWpbcRaqr6Mz4hLFmz8JkhLL74Q2S S7nolBiv0YcQ51Sja6Rjo9sT9+z9nEGosrP50y3wGXwHcO9dbp0yAQAqHLp6r9BT0sL9DK IDuHD9zC/y40D9u91n0Vhqe0aXLrjsGlSn4U+eGNgMSD4GwTdcjgcMwvX7QfkeU0I526KT KgUMWByUqo98IbIR5DTFpLIMUW+UDvGiAN1I9MssRH1WSGxvIL8rpgF6L7bNSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwph1QJZz10DP; Thu, 2 Mar 2023 03: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 322310SR032482; Thu, 2 Mar 2023 03: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 322310VJ032468; Thu, 2 Mar 2023 03:01:00 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:00 GMT Message-Id: <202303020301.322310VJ032468@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: e745dc2287ac - main - daemon: consolidate variable declarations and initializaions 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: e745dc2287ac4844c1a21aaa31d0bc3dad6b1b06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e745dc2287ac4844c1a21aaa31d0bc3dad6b1b06 commit e745dc2287ac4844c1a21aaa31d0bc3dad6b1b06 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:41 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:41 +0000 daemon: consolidate variable declarations and initializaions - improve readability by breaking apart single-line multi-variable declarations - initialize simple variables at declaration site - move other top-level variable initializations closer declarations to avoid potential UB and unclutter the use-site. Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 63 +++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index f9c1f73e193c..c8ccd8f892fa 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -79,8 +79,10 @@ static void open_pid_files(const char *, const char *, struct pidfh **, static void do_output(const unsigned char *, size_t, struct log_params *); static void daemon_sleep(time_t, long); -static volatile sig_atomic_t terminate = 0, child_gone = 0, pid = 0, - do_log_reopen = 0; +static volatile sig_atomic_t terminate = 0; +static volatile sig_atomic_t child_gone = 0; +static volatile sig_atomic_t pid = 0; +static volatile sig_atomic_t do_log_reopen = 0; static const char shortopts[] = "+cfHSp:P:ru:o:s:l:t:m:R:T:h"; @@ -139,27 +141,37 @@ usage(int exitcode) int main(int argc, char *argv[]) { - const char *pidfile, *ppidfile, *title, *user, *outfn, *logtag; - int ch, nochdir, noclose, restart, dosyslog, child_eof; - sigset_t mask_susp, mask_orig, mask_read, mask_term; - struct log_params logpar; - int pfd[2] = { -1, -1 }, outfd = -1; - int stdmask, logpri, logfac, log_reopen; - struct pidfh *ppfh, *pfh; - char *p; - - memset(&logpar, 0, sizeof(logpar)); - stdmask = STDOUT_FILENO | STDERR_FILENO; - ppidfile = pidfile = user = NULL; - nochdir = noclose = 1; - logpri = LOG_NOTICE; - logfac = LOG_DAEMON; - logtag = "daemon"; - restart = 0; - dosyslog = 0; - log_reopen = 0; - outfn = NULL; - title = NULL; + char *p = NULL; + const char *pidfile = NULL; + const char *logtag = "daemon"; + const char *outfn = NULL; + const char *ppidfile = NULL; + const char *title = NULL; + const char *user = NULL; + int ch = 0; + int child_eof = 0; + int dosyslog = 0; + int log_reopen = 0; + int logfac = LOG_DAEMON; + int logpri = LOG_NOTICE; + int nochdir = 1; + int noclose = 1; + int outfd = -1; + int pfd[2] = { -1, -1 }; + int restart = 0; + int stdmask = STDOUT_FILENO | STDERR_FILENO; + struct log_params logpar = { 0 }; + struct pidfh *ppfh = NULL; + struct pidfh *pfh = NULL; + sigset_t mask_orig; + sigset_t mask_read; + sigset_t mask_term; + sigset_t mask_susp; + + sigemptyset(&mask_susp); + sigemptyset(&mask_read); + sigemptyset(&mask_term); + while ((ch = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) { switch (ch) { case 'c': @@ -251,7 +263,6 @@ main(int argc, char *argv[]) openlog(logtag, LOG_PID | LOG_NDELAY, logfac); } - ppfh = pfh = NULL; /* * Try to open the pidfile before calling daemon(3), * to be able to report the error intelligently @@ -294,18 +305,15 @@ main(int argc, char *argv[]) sigemptyset(&act_hup.sa_mask); /* Block these when avoiding racing before sigsuspend(). */ - sigemptyset(&mask_susp); sigaddset(&mask_susp, SIGTERM); sigaddset(&mask_susp, SIGCHLD); /* Block SIGTERM when we lack a valid child PID. */ - sigemptyset(&mask_term); sigaddset(&mask_term, SIGTERM); /* * When reading, we wish to avoid SIGCHLD. SIGTERM * has to be caught, otherwise we'll be stuck until * the read() returns - if it returns. */ - sigemptyset(&mask_read); sigaddset(&mask_read, SIGCHLD); /* Block SIGTERM to avoid racing until we have forked. */ if (sigprocmask(SIG_BLOCK, &mask_term, &mask_orig)) { @@ -406,7 +414,6 @@ restart: * might have closed its stdout and stderr, so we must wait for * the SIGCHLD to ensure that the process is actually gone. */ - child_eof = 0; for (;;) { /* * We block SIGCHLD when listening, but SIGTERM we accept From nobody Thu Mar 2 03: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 4PRwpj4cKBz3vjxN; Thu, 2 Mar 2023 03: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 4PRwpj3QM9z44Cf; Thu, 2 Mar 2023 03:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKUo2r1enD7CSZsueBi4OEtNMCA/GqrvXgLsZRRQ1hM=; b=pEXaUm9mFKoqeASuKKy/LIkTRPXfQTHDW+BylNOmi9UNlryNw0qBCUFpBui0mXmd8PfKGN qcCSfPFV7uDxsVjU7Y7fwX0/Us4505oyrqsHUByvOTE0zrFiInb+dHCRT6EmG61Z1z77Ec JwPCWuIIYbZPHu0lc4La4VLtyRTVRSu6+DdwqmLKBYjudW/C05N1h4+a0uKCaJzTqqYRpz w8qcwtG9FTo9YJ6fwMHEo5GakcqNH12rRDF9v5G0Wgl5/hWiawSlg0Tb7PqE1kpCe/IrTO LW0FVr4wwz8lPCisWF1KX9INlc0eyAvmOENcx9nwH2TRM797x7rvnTI+xb1J3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKUo2r1enD7CSZsueBi4OEtNMCA/GqrvXgLsZRRQ1hM=; b=Y0HS5UVJyqCMOu5yDVBgGIePy3GlSIDkFcP2FFlpJIwpzda4IYb8NTEmQ+u9lrjeKfIZNB bhZCXK1z4fUYxGeH9//Nco0mkFa4uPzhKwIqe07Z7LBC4hyc3G158Qsf85jRt/GunyXuUV wk5re6B3ZH9iJvA3d+7W/arWH/tYTVlZBZM5jrpffxGnZZXX5XleQMm7ojgk8gzQqr5puK S/dmlp602MNVkj+stIXo5HiTD79rN56jO+54+pM1CybaGccBf9nQwtzCzgXC1j/tTmE88h NlPwGUtbb1+syZrcIkAO/R61dC/4fqOC1g2QUo8iy2E50Ah6q2O69jGCk+n0EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726061; a=rsa-sha256; cv=none; b=Cn/nLHlkAaHlxEwYv+h9tVZfzemFg27sgkYWZ5yvBQ0gZMFrDeFbFInOmw6r5lXx/FSIn3 awok/1xdYtYI5J1UN5N/H9cFueKItF6TjCNh+ZgxZ9azYcHe4R4sDevpfb3qRz5BwHqQKl UG7GdWQsRhiBA5VcvKi2BI6ejBVJN+Mk6njyZVN67Lr7Nn4dQOqv77vs6CP61+pQHl1xbk KtjidbO9TFr2LnWlDhpZGcoLaqG5sOjW3mSrUQ/DEzjBD+FfhqUQWE+2/h524d8pVF3d+K USj0MyThmaFS/xnvqsZFd8Yu8mDVcXXxKoxR+PrkJVbgAp+wm0X0Yi14Toj0pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpj1vrnz10C2; Thu, 2 Mar 2023 03: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 322311JE033946; Thu, 2 Mar 2023 03: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 32231155033945; Thu, 2 Mar 2023 03:01:01 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:01 GMT Message-Id: <202303020301.32231155033945@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: 84866cefdfb7 - main - daemon: initialize mask_orig with sigemptyset() 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: 84866cefdfb78488543056173aea78748b77159b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=84866cefdfb78488543056173aea78748b77159b commit 84866cefdfb78488543056173aea78748b77159b Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:41 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:41 +0000 daemon: initialize mask_orig with sigemptyset() consolidation of variable declarations and initializations in previous commit allowed me to detect that one of the signal masks is not properly initialized with sigemptyset (as man 3 sigsetops demands) Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index c8ccd8f892fa..9477b2a415e8 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -171,6 +171,7 @@ main(int argc, char *argv[]) sigemptyset(&mask_susp); sigemptyset(&mask_read); sigemptyset(&mask_term); + sigemptyset(&mask_orig); while ((ch = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) { switch (ch) { From nobody Thu Mar 2 03:01: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 4PRwpk5Mwvz3vjxR; Thu, 2 Mar 2023 03: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 4PRwpk3js3z44BC; Thu, 2 Mar 2023 03: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=1677726062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ejq0rbQetekYKZHOGt+y5qtCZFezjvufyaztaazTJ+A=; b=nL+ZHXX0TclnfGSkqV85oXiW8FKpgyBrlNyvXo8c5JOWFlS1p/B4CZWaPgb+zj990ztWeg OguKn+0C2BLeOzWT0dWgWUaXbtkUllI17hnbWsr996cjGty6ZCwHEHSBbI7gbhWUMDVGvU v/BPZq3fNAbkdbSsQIJGkWmGX6pUgh3hElHR85sOefGEXUR9NkkXbuXhOrKbkRqL6Pawsh FYZ10jm9ertnvOP452EXCSGqQ02GXtBsczBTs45JvVYN5WrXxmD9AHecVSqVVZlWV+t57g P4bx2GDK14lD6JBkEkEEQKs4u+D/jMiXj4MZCXVT9vKhdlglsk2VFf6zidNC1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ejq0rbQetekYKZHOGt+y5qtCZFezjvufyaztaazTJ+A=; b=itykquTKfmw5MxfSFgC2VQwuCL5uroOgASWAgbaIKZbMep3djiJihDZdD8Zajn6TtZeCDo rlZn+hUF/xolLor+IktiJO7LlBSwtqYbL+2PUFCaDDG1WjF+EtcccM+RF0pz7/U6nW0YLi Et1UwEL/cFZ6r5cOv/SWZHbWBFn/HIsApZMR0l8QP6O86KQTAJ0bTgfuvYm/hxB8v/qQQn SrgzmARp3SDIjBPEWAK3Wcg01vvlhJ6+xqB39BECIYmpnHh3lTRm1/4fbVdPpjf1URXVzr M9xNXqOxLOnDmenjgCa9ivjZ/raG2BKATkuMop1jBV+jWZad2JXjvseNIgpWrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726062; a=rsa-sha256; cv=none; b=QU2qKCoB/l7F/t/+z9nwoIHv3+sUNhcbW8XAEZWas1qoCxlB0uWBCvZ1nYTe7kkTGLUatF 6sUBHlBCNbRskqUYEzC2Ych+ir4+umX21NkAf/mLqQ63FFYFwHjtvb18CdSJnu04E+GvbJ mU9CKwkYMvSbgR+OFxJUgTLF2hSCXjA6Sv4ce525JOUkXZB7rCtSF7m5VARf7ADuFBuPqI 00maUIw0RhfnNpGdTtrLevXn5DlGA63rMe+/Xm+eHI1yLFv9gUju7pezhk/NtAuDl8LS7G xn7byzYY0Z8JMK41yjppETB1NwUXIwe1dEs2/VgHAeobBSYIR6SoQq5EGvq1Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpk2q1FzyvH; Thu, 2 Mar 2023 03:01: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 322312Of033992; Thu, 2 Mar 2023 03:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322312UB033985; Thu, 2 Mar 2023 03:01:02 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:02 GMT Message-Id: <202303020301.322312UB033985@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: 91b921c7d468 - main - daemon: fix double init of pid 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91b921c7d4684599d1d983f77dcc3df90900adc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=91b921c7d4684599d1d983f77dcc3df90900adc0 commit 91b921c7d4684599d1d983f77dcc3df90900adc0 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: fix double init of pid variable Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 9477b2a415e8..4fe749d9e5fa 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -81,7 +81,7 @@ static void daemon_sleep(time_t, long); static volatile sig_atomic_t terminate = 0; static volatile sig_atomic_t child_gone = 0; -static volatile sig_atomic_t pid = 0; +static volatile sig_atomic_t pid = -1; static volatile sig_atomic_t do_log_reopen = 0; static const char shortopts[] = "+cfHSp:P:ru:o:s:l:t:m:R:T:h"; @@ -286,7 +286,6 @@ main(int argc, char *argv[]) * readable pipe with the child for writing to a log file * and syslog. */ - pid = -1; if (pidfile || ppidfile || restart || outfd != -1 || dosyslog) { struct sigaction act_term, act_chld, act_hup; From nobody Thu Mar 2 03:01: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 4PRwpl6C2Jz3vk6g; Thu, 2 Mar 2023 03:01: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 4PRwpl4l94z44PK; Thu, 2 Mar 2023 03:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBBHS911k8V3ZX7d5oMyWo87uBP/qW9VdWbZuVTQmQs=; b=TaVn9pw53NTvGPK7Dt++WPwbaTLhy1gfP5nN42Lw6MwWtyDHUGsezPwsVnOR0EcM5uUrz5 b1qid944N9VfEg8yZaLHkaA+Ff5XnxW4Pd+ROKOgu74pjGTchCZp7Q4QnVXJDXkey4VTOf XUKRCIGz0VNh548UlDq9lm8chqMwxWrTE1NHxWIh9YghlKIKMDPh1dYRzx/dXVYUvKPW8n vKqmxXZ7fW3fwankjQ1cYfAe59w2TJbXdjmF+VJJJfsRIAIRW2kWtF1kTLFs0JOUknc+Xo VptOeDY23iyyJpD+0IG9OaB8BoqhO2TM5BNodxYX47jIATrle9vaQdWPGS2F9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBBHS911k8V3ZX7d5oMyWo87uBP/qW9VdWbZuVTQmQs=; b=j6juo0NsR+piuhpKjst/gx9TyLc4sVoN37INBMGwAXTwel+3S7LxIOHC8q8OAkv8IFSEIe 6ZbZT0XVm5cC+cZ5rc8Aok7QV36KRfiTZ1viOrIjUjheMn0HFjq4as1nKQhY9u+1C3qjsB anPWjTNYbC/hUvqX0rf80hdh1DW+P8vz2KxCcn81nSij5nfxjFlpFCyLxr91Ce3G5REj2x +pzR46YNj1fKYHTTE8QMTdtUTFmmvJXbCLqzBuvDZdUMJHxShd2Umqnngcd7BoZMv8kp5b 44xugbEG0L6G6pfrg1RMacGKGf1V93sRNqGiiV1bveOcd/PXfX/Z0o+ZTDDWBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726063; a=rsa-sha256; cv=none; b=hHAQmN2EHKhHTvfZ6qLVsBOgBYiOt593eDgEzED06GCUkjRCMk2zPie4574+jbbuM9MlT6 PZGTXUoBwQtsQjBx2ELL0EFkYIhAKeZnP/tEuFx8hDdUWeqi26TjIUteg/UAbXyojC/Z3v grK3G6Sstm8mH0ss3uKKoSjJcDKUaxPYaI7ALYw4QGqDPz5uVVhqrUyQol8pFyDK5Ot8uJ 5ZWhMh96Hteh+WnyaFUfsXAEOF53YN+GPiTUHUEapx0KXrvKyVru9Kg9tOtIX7OR/IB9c7 r+Yhknxd7+8wQ1I91jvyNtnIMlNuwo3tZ1RV7csTn755HzGb43RQNiUsV+sdSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpl3H78zyvK; Thu, 2 Mar 2023 03:01: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 322313ED034060; Thu, 2 Mar 2023 03:01:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322313Mr034059; Thu, 2 Mar 2023 03:01:03 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:03 GMT Message-Id: <202303020301.322313Mr034059@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: 259ed21d21f8 - main - daemon: initialize struct sigaction at declaration site 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: 259ed21d21f81b656f06447716d41c190576477e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=259ed21d21f81b656f06447716d41c190576477e commit 259ed21d21f81b656f06447716d41c190576477e Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: initialize struct sigaction at declaration site This improves readability by uncluttering the code Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 4fe749d9e5fa..0925d16a27a0 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -287,20 +287,19 @@ main(int argc, char *argv[]) * and syslog. */ if (pidfile || ppidfile || restart || outfd != -1 || dosyslog) { - struct sigaction act_term, act_chld, act_hup; + struct sigaction act_term = { 0 }; + struct sigaction act_chld = { 0 }; + struct sigaction act_hup = { 0 }; /* Avoid PID racing with SIGCHLD and SIGTERM. */ - memset(&act_term, 0, sizeof(act_term)); act_term.sa_handler = handle_term; sigemptyset(&act_term.sa_mask); sigaddset(&act_term.sa_mask, SIGCHLD); - memset(&act_chld, 0, sizeof(act_chld)); act_chld.sa_handler = handle_chld; sigemptyset(&act_chld.sa_mask); sigaddset(&act_chld.sa_mask, SIGTERM); - memset(&act_hup, 0, sizeof(act_hup)); act_hup.sa_handler = handle_hup; sigemptyset(&act_hup.sa_mask); From nobody Thu Mar 2 03:01: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 4PRwpn28qgz3vjpR; Thu, 2 Mar 2023 03:01: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 4PRwpm4g4Tz44VJ; Thu, 2 Mar 2023 03:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nt7Ayo2Z/wDQOx/m7wT6vWC18nApKzChSPnXZsAFJX4=; b=UywZ3PHPFxBiQSXEEmn/hjW+5nidAO2jk1Um0U+9g1ianG7egpPB7dRdlEMAQcISD9HTZb nOLS4B2dHpHtEOWLgi/prAffEtdcyjEs2msw9J7CjRYxG0ZIH4by0yCaIGmbrOytkVumSv 7MlUpf/A83DmfioKm0FY2lqq+IpkbaAsD7R7xhGhPqNzwRTGRjY1ODxUp823tn2aHMB25j gxCj6REZUZOSYKOsKRED16S6H5fGBrlBnqVLbCY9NCdZoer5r4AtEaAtw+PGy2O2cS5gKU mvNqAkMCFe627zK6M0dAa5auOb24GRQuhu8o63gnQkzl77Z/YFdpSqIzNZFPVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nt7Ayo2Z/wDQOx/m7wT6vWC18nApKzChSPnXZsAFJX4=; b=Y1k0xieMcI8IZs4xB8ymesuYRWFncgOeEMs1I3z5EWFpFgI8TfRkinE4B06Mu7SqgvreN6 vZ9EoVlMjt+AzrXww5zeOhurJiSp5a8fp5yMBwQ0kZ9z0lsB/MbnI+JSriGkU1FgvkYk6G dwMxuOD8JuESvm2jHMq8Nej6GiH4zKeZUDvK+M1r7VB93u8n/KKScEp9EJF0s0iZAd5Eu5 PSJKIP9hP9KinKNKjBJXLOLUE8Y7MdEsFBD7PmX0NboDErrkdA/3Wc3bziHpYLjBayiUo1 R4sfozYniujK6WkkCq4QVSILuNPfGMHsP2oZVabzp1TkIA4Fc7MtrVNdtkmUIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726064; a=rsa-sha256; cv=none; b=MHNNGzfkSdMIGwHbnnbCoQlNFVHjLQsucPcbnTrvO/luQ3XZTdmrCNIZm3i8/NbCdFpT1b wimKzLB4yLOw9vo92yQ4XSlASGj2OF+SrjC/j/+aWbuKHJvC2DC+K+ighaxvw1EwCJaHal 7fV8F51lEWU0+4SE6ag8Zu8pzvRQTfiqBQ3w00bOCVucliXPwtaSSH3qxLWxE4NGSkJwi7 5C5WJsgv0quoPaUKdgn11UoTIxpOTb8rvDOanB942Q5SEQB60cgECOkP0llDShm1c22zoh PNZvIaWe7/EkhnpcLmexbE7qVlTdEkwx0o+3EUfRcXpTgZLFDPE7X501DWIFxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpm3m48zyxl; Thu, 2 Mar 2023 03:01: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 322314WJ034079; Thu, 2 Mar 2023 03:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322314IV034078; Thu, 2 Mar 2023 03:01:04 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:04 GMT Message-Id: <202303020301.322314IV034078@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: 203df05b692b - main - daemon: add supervision_enabled var 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: 203df05b692b5e2b92c990d8971f5797e3a7a139 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=203df05b692b5e2b92c990d8971f5797e3a7a139 commit 203df05b692b5e2b92c990d8971f5797e3a7a139 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: add supervision_enabled var explicitly name a bunch of boolean checks that enable supervison mode and improve comments Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 0925d16a27a0..f15a3f567a8c 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -141,6 +142,7 @@ usage(int exitcode) int main(int argc, char *argv[]) { + bool supervision_enabled = false; char *p = NULL; const char *pidfile = NULL; const char *logtag = "daemon"; @@ -275,18 +277,31 @@ main(int argc, char *argv[]) } /* Write out parent pidfile if needed. */ pidfile_write(ppfh); + /* - * If the pidfile or restart option is specified the daemon - * executes the command in a forked process and wait on child - * exit to remove the pidfile or restart the command. Normally - * we don't want the monitoring daemon to be terminated - * leaving the running process and the stale pidfile, so we - * catch SIGTERM and forward it to the children expecting to - * get SIGCHLD eventually. We also must fork() to obtain a - * readable pipe with the child for writing to a log file - * and syslog. + * Supervision mode is enabled if one of the following options are used: + * --child-pidfile -p + * --supervisor-pidfile -P + * --restart -r / --restart-delay -R + * --syslog -S + * --syslog-facility -l + * --syslog-priority -s + * --syslog-tag -T + * + * In supervision mode daemon executes the command in a forked process + * and observes the child by waiting for SIGCHILD. In supervision mode + * daemon must never exit before the child, this is necessary to prevent + * orphaning the child and leaving a stale pid file. + * To achieve this daemon catches SIGTERM and + * forwards it to the child, expecting to get SIGCHLD eventually. */ - if (pidfile || ppidfile || restart || outfd != -1 || dosyslog) { + supervision_enabled = pidfile != NULL || + ppidfile != NULL || + restart != 0 || + outfd != -1 || + dosyslog != 0; + + if (supervision_enabled) { struct sigaction act_term = { 0 }; struct sigaction act_chld = { 0 }; struct sigaction act_hup = { 0 }; From nobody Thu Mar 2 03: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 4PRwpp0y26z3vk12; Thu, 2 Mar 2023 03: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 4PRwpn57Vjz44SB; Thu, 2 Mar 2023 03: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=1677726065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+wyrd5V6OK328q06/19tePCGBT8f2bJ9+uIUdB3/sI=; b=AoTA6pz+DxQ3mSmYt376wP8lHLMEAUVOS1Snbq52RRqIB7QeQvhlSOhuUA0aVZRZSEcqSI YY8jWoLDoKBrcmqTReZvSHp04MoSwr+O1MBS2Hl1rBJmyvC0JpZPfJq98ViLdZJ5iP5Q6x FQn0QDrGRu2f+X6S2xvg1AWnu2eOftHDHWInbwQDBeQItc4M03pOBur7FAtQoc4x75+7Vy j4TNfBQBXDKNV773SniOcBRoCSfkTqN4XxlaptqJDZjgfJ3AVMf+RotwFl4ivdfw6P66rr kb4iCdMU98cv4BgwAiWFIJGWFsueHzdMElHbGWOnyiwWp4JbwG9OFFcF/VaG9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+wyrd5V6OK328q06/19tePCGBT8f2bJ9+uIUdB3/sI=; b=W7UXqXNFciGEL6LgtC5JPEh1LlF7x7/iGfFTGlG4IqGEHpL7L5a+crj2eXeNPxUSrTz6fz x1ekMNOPpDllHK7H3cZr4mZHaYQO5rHDvdSg1JlQb2PMzV7C0Cwk3yPFmGM3Q3Nuucc+C6 evwHxV2JOpJ+ztsZ3RyrHidsA1h6OkkYZ6eUOGMNdbG2eTBuWqwVCzCjOvGczsmRRJRnNp PB02xs48AbEZp44yw1uZGcgLAt5+WtrE2MTShkS4BdE2VknH94B84cz0UMNpO/iaqtVsbv f/qm9+PN2oaz+hVub0kZH0w+l0OHkItDhTYa0PfRf6aj7EyFQQKAPCmETDjmCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726065; a=rsa-sha256; cv=none; b=BKCz5cqzL3MG3n2A3ucxYvGr3ouwDzzOcdaWwylGp3TpJeB14npCDQXdPPyONKSEOuAuGY 5/og3KFVVCLu+KlnZxtUDyY+lvg6InZ8TW6AfA+ygabl8W73mOwpVVQ6lo4dGvyIEFWrQF RZsTCzo/GlApe528AsIrKSaxD8M0CfpLsB5iVdpFEUMvjigtaHPrlibp91VbtPJDavKtV4 N/30jbI08YkifyLu1GKqNS5ZHRX6KQfmvkh2lt2C6tLlziNbtfR/No3VfRdW7nELfpdYTa C2pdDK2VwYCnz9cGMdSR9hqRWT04Ce31PHtE9pFBAUgCAIQGLpVAPI7G/GvvGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpn4D7gzyxm; Thu, 2 Mar 2023 03: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 322315vT034230; Thu, 2 Mar 2023 03: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 322315cn034229; Thu, 2 Mar 2023 03:01:05 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:05 GMT Message-Id: <202303020301.322315cn034229@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: f2f9d31d9f9f - main - daemon: make dosyslog variable a bool and give it a better 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2f9d31d9f9f7f319edb95874b41af0733a26624 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f2f9d31d9f9f7f319edb95874b41af0733a26624 commit f2f9d31d9f9f7f319edb95874b41af0733a26624 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: make dosyslog variable a bool and give it a better name Following style(9) and C99 recommendation use bool instead of int for boolean operations. Also give the variable a more descriptive name that follows boolean naming convention. Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index f15a3f567a8c..344b914d464b 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -60,11 +60,11 @@ __FBSDID("$FreeBSD$"); #define LBUF_SIZE 4096 struct log_params { - int dosyslog; int logpri; int noclose; int outfd; const char *outfn; + bool syslog_enabled; }; static void restrict_process(const char *); @@ -143,6 +143,7 @@ int main(int argc, char *argv[]) { bool supervision_enabled = false; + bool syslog_enabled = false; char *p = NULL; const char *pidfile = NULL; const char *logtag = "daemon"; @@ -152,7 +153,6 @@ main(int argc, char *argv[]) const char *user = NULL; int ch = 0; int child_eof = 0; - int dosyslog = 0; int log_reopen = 0; int logfac = LOG_DAEMON; int logpri = LOG_NOTICE; @@ -191,7 +191,7 @@ main(int argc, char *argv[]) if (logfac == -1) { errx(5, "unrecognized syslog facility"); } - dosyslog = 1; + syslog_enabled = true; break; case 'm': stdmask = strtol(optarg, &p, 10); @@ -222,17 +222,17 @@ main(int argc, char *argv[]) if (logpri == -1) { errx(4, "unrecognized syslog priority"); } - dosyslog = 1; + syslog_enabled = true; break; case 'S': - dosyslog = 1; + syslog_enabled = true; break; case 't': title = optarg; break; case 'T': logtag = optarg; - dosyslog = 1; + syslog_enabled = true; break; case 'u': user = optarg; @@ -262,7 +262,7 @@ main(int argc, char *argv[]) } } - if (dosyslog) { + if (syslog_enabled) { openlog(logtag, LOG_PID | LOG_NDELAY, logfac); } @@ -299,7 +299,7 @@ main(int argc, char *argv[]) ppidfile != NULL || restart != 0 || outfd != -1 || - dosyslog != 0; + syslog_enabled == true; if (supervision_enabled) { struct sigaction act_term = { 0 }; @@ -349,7 +349,7 @@ main(int argc, char *argv[]) */ (void)madvise(NULL, 0, MADV_PROTECT); logpar.outfd = outfd; - logpar.dosyslog = dosyslog; + logpar.syslog_enabled = syslog_enabled; logpar.logpri = logpri; logpar.noclose = noclose; logpar.outfn = outfn; @@ -487,7 +487,7 @@ exit: close(outfd); close(pfd[0]); close(pfd[1]); - if (dosyslog) { + if (syslog_enabled) { closelog(); } pidfile_remove(pfh); @@ -647,14 +647,14 @@ do_output(const unsigned char *buf, size_t len, struct log_params *logpar) if (len < 1) { return; } - if (logpar->dosyslog) { + if (logpar->syslog_enabled) { syslog(logpar->logpri, "%.*s", (int)len, buf); } if (logpar->outfd != -1) { if (write(logpar->outfd, buf, len) == -1) warn("write"); } - if (logpar->noclose && !logpar->dosyslog && logpar->outfd == -1) { + if (logpar->noclose && !logpar->syslog_enabled && logpar->outfd == -1) { printf("%.*s", (int)len, buf); } } From nobody Thu Mar 2 03:01: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 4PRwpq1T1Pz3vk14; Thu, 2 Mar 2023 03:01: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 4PRwpp6SGQz44SY; Thu, 2 Mar 2023 03:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HXkf//7GPvMs/Xrfj09Bsn843RTNch0AS/5YEM5ieto=; b=PnyHZJ+DCYtQxrVY6SCf1Vq/zM/W5FzxQcCe7OhnAPEzy+XFxWhef/1fEvmIZOocEXkOVz UsSf8Wze8z5V99ia98v5b1p9X79ol8IPoTrdjoEpzXonRZI6lDTQ0kxH7PKzMyKxaFAdec ioaWIfQ2Gq+5O7Dae4k23K21U1zPY3jnmhdbmgsPq6HMfTbezH1Z4TuoLw/j/QGj4F4LYu nOrfQ2Qw/WnNVJKTHkYSCXT8ZKBqoeMrlGbgk50JNDkEP83uqroN8eUDg6MsJ9JcHxRZJi xrpjoTGstsGA2RGYK1MpQyzNV3VzucaKn1HiWGHlqit0DcCJF+NckFvAjZADNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HXkf//7GPvMs/Xrfj09Bsn843RTNch0AS/5YEM5ieto=; b=hQgr//W99u0qWtFrYqBLhtBq4lreL7oFfDTzxZRw0tpnZ+pKmEeX/TsTeIHndAdrjVmWx4 csK5qzkdwbQL3OFjSXUybYLmc7JbxI45e4uHHGSnuYw3OBux/bszVz/KTW+jq08HxG5c0f rdfVo/EgaJjinmH49Zju/Dq2vOIzHlr2K91KMo3v7q6pJRRppFjSbbnlgYz2I8oSMPRWRA zAmLhT0N5OaxbnEoTmdWEvwEJXt+DYSOJkdxbiQGLoZ6kY1rnVgRXr2f5xZQJ6p1vz47re Tv6fmO3b+BVlqz7g1sX45pua/Q3rpZXvbn19ZWlPaDdPfdDFzZaUtXZ0gW73gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726067; a=rsa-sha256; cv=none; b=BaTtWDW5BYxc0Kd8qbixLK0OSBG1XGWyCY4/QOo38ZPjqI5/c7mVO+GLe299N17+JSVNpv mx+zInw7x6mOoYialISDk70KWCzPnMC6OzY7lw8Pcf93BUZH9kDFgMg4fsyLXdWI9DBm06 N49c1kqT9wVOmP2ok8uADe5L4/3uw5Q76jRybY6GjNhGUmSwIGe+6Mrk9+VHnaG+lQjA24 tIQpq3a+9FT7avWI2Qdi5ZWkakxOupv2Vy00z2I1KfdJL4CxLwFufdijWEQsIgBQf4NtOt GfjDKCrQtp18j3Z8Zsu8DWfiweBA43CihpN1qDWGFtkkqL4I3CTKtxfjsVJedA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpp4k3KzyvP; Thu, 2 Mar 2023 03:01: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 322316nd034337; Thu, 2 Mar 2023 03:01:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322316v1034336; Thu, 2 Mar 2023 03:01:06 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:06 GMT Message-Id: <202303020301.322316v1034336@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: 97022e90c369 - main - daemon: make log_reopen variable a 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97022e90c3693ad1180bd26ebc909ce27893b227 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=97022e90c3693ad1180bd26ebc909ce27893b227 commit 97022e90c3693ad1180bd26ebc909ce27893b227 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: make log_reopen variable a bool Following style(9) and C99 recommendation use bool instead of int for boolean operations. Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 344b914d464b..2db2594041e7 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -144,6 +144,7 @@ main(int argc, char *argv[]) { bool supervision_enabled = false; bool syslog_enabled = false; + bool log_reopen = false; char *p = NULL; const char *pidfile = NULL; const char *logtag = "daemon"; @@ -153,7 +154,6 @@ main(int argc, char *argv[]) const char *user = NULL; int ch = 0; int child_eof = 0; - int log_reopen = 0; int logfac = LOG_DAEMON; int logpri = LOG_NOTICE; int nochdir = 1; @@ -184,7 +184,7 @@ main(int argc, char *argv[]) noclose = 0; break; case 'H': - log_reopen = 1; + log_reopen = true; break; case 'l': logfac = get_log_mapping(optarg, facilitynames); From nobody Thu Mar 2 03:01: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 4PRwpr0gmhz3vk4c; Thu, 2 Mar 2023 03:01: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 4PRwpq64jTz44F7; Thu, 2 Mar 2023 03:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7vqXO9bAJX7LKDf5GlSUH9Z/XWeF7lr5bhf/xoAmecQ=; b=BSH2czMpbeq9ZvggOcJncv/4OepxOYD7DaqbGbmMghtZlL0wpqSswqdAubJD4IFDMNk/uC oFdOF9tNc9Tm+bJPZaD8QO92HlFU2vrWlwJwC70cLw1ZtYRt5oFIUYG8mUxRmmfrkZ0Yh8 gWKpk7XPwQzwW1kO+zDs1ATmvDukjJ9bk5Ra0oKjbk3Yn7uWUayhVHgkJrInF4keveml0T /aCf7v3yp3LjucaM+fS0EOJKmc7+jnYsHiZwbwFrYj9b5GGfScG+THLAeYXgiD2wyVmiHl xiJoLHAjwutORnWrP9mKztZVpl0pAJDKX2fyDu7hxKiYEgeWAxfzhGWpV9Jtaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7vqXO9bAJX7LKDf5GlSUH9Z/XWeF7lr5bhf/xoAmecQ=; b=C3+h9VzhvKNJvG/aAYeCzgY6MiVBy1fiu42Te1pk6YplyCNua+etJyUYX1XeN5cGBi7ade zKy7hOxtRQuEL4Cz+sLhYUhfVkhfvYmHdAQCmzqjTXvxB3uBCHklCIgGndxknRc2vxlddr IDXvaQxiss+TcRQQgPhnEshv3iqAblrsfL2z7l+98zlzKRlNA16jO166Noxv9Pp8UIWFY6 xfRe+kRz4dBYQJoil5sBa4suhvsvz7saQHdvAzKsCmk1wlZeTJdyEL6koCfuh3sNnRkEPu a65LRIXNOaOIX3YxlaRFEGpBXvazFOHJxbW1pKtJRN0e3x+3JF1SEPN2rcNHIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726067; a=rsa-sha256; cv=none; b=uWHlC8BGneYzs5CoiyBrrm0pw7/cLlWUfz2lJ09wRYrFrqzszDPkMutPZvJx8WrRV4NgXi RawprWdEnOxZji55nPSLNSW0+lz/JUJB24s59FpjCKDXLtkuH2QRm2WtyrHwl/JGeRfu0c V5qv2bhpH4lQkawOjkPnlFKe8XpLtCCwM8D9aVpaHcL1XPimcEe1zjzjsSMg4rqi7kyyl9 ZPEKp8nVHk4cZc4Vd/6j2n77Hnv3bz1ugnH3GTZYX3/55pW+Zin6Kp29Thkwr29wcXNGmJ uwsevhn8Spx1V3PSNuoUDFD82otbqZ1ZDcbZpZs6bph/Pw1vOg4SDTAgDfFCFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpq57sQzyvT; Thu, 2 Mar 2023 03:01: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 322317kj034373; Thu, 2 Mar 2023 03:01:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322317VG034372; Thu, 2 Mar 2023 03:01:07 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:07 GMT Message-Id: <202303020301.322317VG034372@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: e70444c622a9 - main - daemon: deduplicate log_params varaibles 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: e70444c622a97e02fb5a76c06f9a48b4a07aa963 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e70444c622a97e02fb5a76c06f9a48b4a07aa963 commit e70444c622a97e02fb5a76c06f9a48b4a07aa963 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: deduplicate log_params varaibles While we're here, sort log_params by size. Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 92 +++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 48 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 2db2594041e7..379c31a0a221 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -60,10 +60,10 @@ __FBSDID("$FreeBSD$"); #define LBUF_SIZE 4096 struct log_params { - int logpri; + const char *output_filename; + int syslog_priority; int noclose; - int outfd; - const char *outfn; + int output_fd; bool syslog_enabled; }; @@ -143,26 +143,27 @@ int main(int argc, char *argv[]) { bool supervision_enabled = false; - bool syslog_enabled = false; bool log_reopen = false; char *p = NULL; const char *pidfile = NULL; - const char *logtag = "daemon"; - const char *outfn = NULL; + const char *syslog_tag = "daemon"; const char *ppidfile = NULL; const char *title = NULL; const char *user = NULL; int ch = 0; int child_eof = 0; - int logfac = LOG_DAEMON; - int logpri = LOG_NOTICE; + int syslog_facility = LOG_DAEMON; int nochdir = 1; - int noclose = 1; - int outfd = -1; int pfd[2] = { -1, -1 }; int restart = 0; int stdmask = STDOUT_FILENO | STDERR_FILENO; - struct log_params logpar = { 0 }; + struct log_params logpar = { + .syslog_enabled = false, + .syslog_priority = LOG_NOTICE, + .noclose = 1, + .output_fd = -1, + .output_filename = NULL + }; struct pidfh *ppfh = NULL; struct pidfh *pfh = NULL; sigset_t mask_orig; @@ -181,17 +182,17 @@ main(int argc, char *argv[]) nochdir = 0; break; case 'f': - noclose = 0; + logpar.noclose = 0; break; case 'H': log_reopen = true; break; case 'l': - logfac = get_log_mapping(optarg, facilitynames); - if (logfac == -1) { + syslog_facility = get_log_mapping(optarg, facilitynames); + if (syslog_facility == -1) { errx(5, "unrecognized syslog facility"); } - syslog_enabled = true; + logpar.syslog_enabled = true; break; case 'm': stdmask = strtol(optarg, &p, 10); @@ -200,7 +201,7 @@ main(int argc, char *argv[]) } break; case 'o': - outfn = optarg; + logpar.output_filename = optarg; break; case 'p': pidfile = optarg; @@ -218,21 +219,21 @@ main(int argc, char *argv[]) } break; case 's': - logpri = get_log_mapping(optarg, prioritynames); - if (logpri == -1) { + logpar.syslog_priority = get_log_mapping(optarg, prioritynames); + if (logpar.syslog_priority == -1) { errx(4, "unrecognized syslog priority"); } - syslog_enabled = true; + logpar.syslog_enabled = true; break; case 'S': - syslog_enabled = true; + logpar.syslog_enabled = true; break; case 't': title = optarg; break; case 'T': - logtag = optarg; - syslog_enabled = true; + syslog_tag = optarg; + logpar.syslog_enabled = true; break; case 'u': user = optarg; @@ -255,15 +256,15 @@ main(int argc, char *argv[]) title = argv[0]; } - if (outfn) { - outfd = open_log(outfn); - if (outfd == -1) { + if (logpar.output_filename) { + logpar.output_fd = open_log(logpar.output_filename); + if (logpar.output_fd == -1) { err(7, "open"); } } - if (syslog_enabled) { - openlog(logtag, LOG_PID | LOG_NDELAY, logfac); + if (logpar.syslog_enabled) { + openlog(syslog_tag, LOG_PID | LOG_NDELAY, syslog_facility); } /* @@ -271,7 +272,7 @@ main(int argc, char *argv[]) * to be able to report the error intelligently */ open_pid_files(pidfile, ppidfile, &pfh, &ppfh); - if (daemon(nochdir, noclose) == -1) { + if (daemon(nochdir, logpar.noclose) == -1) { warn("daemon"); goto exit; } @@ -295,11 +296,11 @@ main(int argc, char *argv[]) * To achieve this daemon catches SIGTERM and * forwards it to the child, expecting to get SIGCHLD eventually. */ - supervision_enabled = pidfile != NULL || + supervision_enabled = pidfile != NULL || ppidfile != NULL || - restart != 0 || - outfd != -1 || - syslog_enabled == true; + restart != 0 || + logpar.output_fd != -1 || + logpar.syslog_enabled == true; if (supervision_enabled) { struct sigaction act_term = { 0 }; @@ -348,12 +349,7 @@ main(int argc, char *argv[]) * not have superuser privileges. */ (void)madvise(NULL, 0, MADV_PROTECT); - logpar.outfd = outfd; - logpar.syslog_enabled = syslog_enabled; - logpar.logpri = logpri; - logpar.noclose = noclose; - logpar.outfn = outfn; - if (log_reopen && outfd >= 0 && + if (log_reopen && logpar.output_fd >= 0 && sigaction(SIGHUP, &act_hup, NULL) == -1) { warn("sigaction"); goto exit; @@ -484,10 +480,10 @@ restart: goto restart; } exit: - close(outfd); + close(logpar.output_fd); close(pfd[0]); close(pfd[1]); - if (syslog_enabled) { + if (logpar.syslog_enabled) { closelog(); } pidfile_remove(pfh); @@ -648,13 +644,13 @@ do_output(const unsigned char *buf, size_t len, struct log_params *logpar) return; } if (logpar->syslog_enabled) { - syslog(logpar->logpri, "%.*s", (int)len, buf); + syslog(logpar->syslog_priority, "%.*s", (int)len, buf); } - if (logpar->outfd != -1) { - if (write(logpar->outfd, buf, len) == -1) + if (logpar->output_fd != -1) { + if (write(logpar->output_fd, buf, len) == -1) warn("write"); } - if (logpar->noclose && !logpar->syslog_enabled && logpar->outfd == -1) { + if (logpar->noclose && !logpar->syslog_enabled && logpar->output_fd == -1) { printf("%.*s", (int)len, buf); } } @@ -708,10 +704,10 @@ reopen_log(struct log_params *lpp) int outfd; do_log_reopen = 0; - outfd = open_log(lpp->outfn); - if (lpp->outfd >= 0) { - close(lpp->outfd); + outfd = open_log(lpp->output_filename); + if (lpp->output_fd >= 0) { + close(lpp->output_fd); } - lpp->outfd = outfd; + lpp->output_fd = outfd; } From nobody Thu Mar 2 03:01: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 4PRwps35Yfz3vk9G; Thu, 2 Mar 2023 03:01: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 4PRwpr6rdGz44FM; Thu, 2 Mar 2023 03:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vBLQMeFTnEjbzwTtLL4BdbWf9lYkLNNDivGq3qM08bM=; b=AF38gMNXYZrKXgq33bD74mMG1WEspJfstlVFsYIajxiMKVSoIMpufbbI8NgEkXcd7NC4M8 25ZppU9YFKWDmltMjYnuNv0wF0zzFeBAnupYpeDL3T7/UMck61ixBwA3sqxMMBmWpxYUme nrIFyJbKCFcrvQJL13V3wKjBCSZyvyifa5p9QHfCLE6icfA9fp30JiKo9T1EBMTN/GvZsl 27VIa8dtOTVqv3dhv6ahQvEJl6To84czbJAq7PUV90/R3DyxCzJCBTccjNXEfUunLVmQNA gkHwmq72WbwakeFa89f2WBErtw1O0Tlk/DXlJa5WBSXLaQA0kiAckcHHXIW/Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vBLQMeFTnEjbzwTtLL4BdbWf9lYkLNNDivGq3qM08bM=; b=AvC/O/DaHAo8x5FAojBqcp/y1rOXE+BHJ4ym5vIiJlAdWQUqhChzIC5iwu3grrc7N5JsXa 7GjsezQEBMs7Ekeb/gKatZdXpSYCEMtduCVTaE6OBTIGfIJtie93hIN9AZD1nkHpOkKv+A SFVpuPujtbjOxnFzFX8nrvnWqRo+er+s4rxr5zUSEEH2Niemeg8829zveMef/Ph++iJ6+r 1rna7o/lft9bSAyM0kEz+X0KVLlSEWTlBD/yCbptvG3gd8iwkfW4ZGk5eOvMi/hy/sAnfl 7uWmeqz0OIK8bZ1tvgBHijBqmch7+AGBYyICXamIQrujFzLN8AXouJhGC/2ytQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726069; a=rsa-sha256; cv=none; b=ZMUB0JbsinywEOJxFJcquEanRKQEBXd3UOEfXhgSVypzZQczJGzpfo9EcQj7ATc340LCLO AnJeChU1SJL2SAb4jGaJPwlGgSeWhpcK8ppXc3fc/lqEn1noZ1uN7BGSd18c3OAzgg7MhK xtIy3mVjsb+PdMWPM35j+0noP9G4IliSZWn2Ldcqz5a7QK4zHp3qT2QBGCPGBwQvuUnET+ 1ngkrsL2lGjz/2NJ7M+OV46xkrGCAA8qbiT5qv/ORkqKUlu1URk5WTeiWtQpZMqhwTRTPO B/URcqEggVK3U3ITE2m3OoGL5WGpf94T7mTttJ5Jr15qgBTvvelEwKBc4/fRDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwpr5dbWz10Ym; Thu, 2 Mar 2023 03:01: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 322318R2034399; Thu, 2 Mar 2023 03:01:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322318tN034398; Thu, 2 Mar 2023 03:01:08 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:08 GMT Message-Id: <202303020301.322318tN034398@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: 6f0636728b53 - main - daemon: move syslog facility and syslog tag into log_params 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: 6f0636728b53c74d3327a8da8c51efee810fbff0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6f0636728b53c74d3327a8da8c51efee810fbff0 commit 6f0636728b53c74d3327a8da8c51efee810fbff0 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: move syslog facility and syslog tag into log_params Since struct log_params already contains logging-related varaiables, including syslog-related, move remaining syslog-related variables into struct log_params as well Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 379c31a0a221..6904dfa1896f 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -61,7 +61,9 @@ __FBSDID("$FreeBSD$"); struct log_params { const char *output_filename; + const char *syslog_tag; int syslog_priority; + int syslog_facility; int noclose; int output_fd; bool syslog_enabled; @@ -146,13 +148,11 @@ main(int argc, char *argv[]) bool log_reopen = false; char *p = NULL; const char *pidfile = NULL; - const char *syslog_tag = "daemon"; const char *ppidfile = NULL; const char *title = NULL; const char *user = NULL; int ch = 0; int child_eof = 0; - int syslog_facility = LOG_DAEMON; int nochdir = 1; int pfd[2] = { -1, -1 }; int restart = 0; @@ -160,6 +160,8 @@ main(int argc, char *argv[]) struct log_params logpar = { .syslog_enabled = false, .syslog_priority = LOG_NOTICE, + .syslog_tag = "daemon", + .syslog_facility = LOG_DAEMON, .noclose = 1, .output_fd = -1, .output_filename = NULL @@ -188,8 +190,8 @@ main(int argc, char *argv[]) log_reopen = true; break; case 'l': - syslog_facility = get_log_mapping(optarg, facilitynames); - if (syslog_facility == -1) { + logpar.syslog_facility = get_log_mapping(optarg, facilitynames); + if (logpar.syslog_facility == -1) { errx(5, "unrecognized syslog facility"); } logpar.syslog_enabled = true; @@ -232,7 +234,7 @@ main(int argc, char *argv[]) title = optarg; break; case 'T': - syslog_tag = optarg; + logpar.syslog_tag = optarg; logpar.syslog_enabled = true; break; case 'u': @@ -264,7 +266,7 @@ main(int argc, char *argv[]) } if (logpar.syslog_enabled) { - openlog(syslog_tag, LOG_PID | LOG_NDELAY, syslog_facility); + openlog(logpar.syslog_tag, LOG_PID | LOG_NDELAY, logpar.syslog_facility); } /* From nobody Thu Mar 2 03:01: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 4PRwpt3YJNz3vk2w; Thu, 2 Mar 2023 03:01: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 4PRwpt1D2Pz44WX; Thu, 2 Mar 2023 03:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBbcNggkjMcjLjfycTQcnuHMR37R+15AuT5/dSldcR0=; b=TpvZsuPSe9qfDQLWLno258AOiUiPyld63KOLqPkR4lGJWpn+k5ml5O49/UHWNuhBd3QLF5 7qd9ajO/kZWC32ijZc5bl+Nov/NjZ8MG6CyDPeWy8j1xtStlyeeHHjTDjYFca5dtzQaSZB qlEjhauACplumCtNukZFHltaN6KuUJw1hrP/Q/Br6/l25P1DV6RxB7hXWQadna1k0qExD9 UiWd2MhvPRXLcpHQzPUzHCuSdTDpTcHV063sT6ozHldUghMPITfoz3tTzcxDk1pricVEns mKV6KqcJ6zAxB9YGVIzSkc8HxPiAHvCXHiY0p1ugqH73a3EmU4GK+qlcpHngXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBbcNggkjMcjLjfycTQcnuHMR37R+15AuT5/dSldcR0=; b=Nclzijek7jd1u95Jp3FLFipgd2Hgo4W/Ww042/6m+sUcCysLkPkoQhaANje1lG5T/PRCLp 0RZrVahQDdq12u1+1wSUJZx7sH8JYwV7su23Hd4B+WxUo5JawkNE/MQRkzhzwyK1hG08Ar 9504ei+HnsJWp7Y6oOjLxQnmCQHDmJ15dEoyOSHfN/SLwpT1SzMuBDVNIx6R0VXbeA9+z5 YhFEm5bUj/jrANI9NBbmPBkHAvEST7QMQ/Wwy9XsTlaIDyZLpFHuZJUfZrCnbqkpuG0EFI O9UXslqWJMkgaRd2GSlGFynFgzaMur2m0OCYh7f00+uNHTD8ok5fxAVmqcs3ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726070; a=rsa-sha256; cv=none; b=N7F0HGtFvsRYs5GVbuRyyL/vizogpuuJDwxBmvnyBJf/BES25BOh3TvBZgEod+2mT6/Wj5 iqj7NLRLFJm6mUETw7D+LLukdfV12+OxT8AuKR5E20dGlo/T7myx4sZ/BATcbMesNb5JY4 1SfxlVBd2GyFADZ7tsxl96PpzE7GDikxbzSvJ6V7jli9oO2+U0i3qwFGJmS+lXcVBS/xxq 3nj7o2oMoce0mFy7lXKgkm0rvlTMXeWEFWGWejwN5wS423Sz6F3s+jYTDdJIkToo0nRnUT vcAEhQGA+RDFMGBGEU1f1/lGflhuxs4/Oz48PNnDSlD5mRn2/fFHRSihJ3LjGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRwps67L1z10W1; Thu, 2 Mar 2023 03:01: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 322319YI034419; Thu, 2 Mar 2023 03:01:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322319ds034418; Thu, 2 Mar 2023 03:01:09 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:09 GMT Message-Id: <202303020301.322319ds034418@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: 129ec8f4805e - main - daemon: more human-friendly variable names 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: 129ec8f4805ec3f33480873dc9cf3b8404c9ece8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=129ec8f4805ec3f33480873dc9cf3b8404c9ece8 commit 129ec8f4805ec3f33480873dc9cf3b8404c9ece8 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:43 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:43 +0000 daemon: more human-friendly variable names Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 94 ++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 6904dfa1896f..af387574c4b5 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -64,7 +64,7 @@ struct log_params { const char *syslog_tag; int syslog_priority; int syslog_facility; - int noclose; + int keep_fds_open; int output_fd; bool syslog_enabled; }; @@ -147,27 +147,27 @@ main(int argc, char *argv[]) bool supervision_enabled = false; bool log_reopen = false; char *p = NULL; - const char *pidfile = NULL; - const char *ppidfile = NULL; + const char *child_pidfile = NULL; + const char *parent_pidfile = NULL; const char *title = NULL; const char *user = NULL; int ch = 0; int child_eof = 0; - int nochdir = 1; + int keep_cur_workdir = 1; int pfd[2] = { -1, -1 }; int restart = 0; int stdmask = STDOUT_FILENO | STDERR_FILENO; - struct log_params logpar = { + struct log_params logparams = { .syslog_enabled = false, .syslog_priority = LOG_NOTICE, .syslog_tag = "daemon", .syslog_facility = LOG_DAEMON, - .noclose = 1, + .keep_fds_open = 1, .output_fd = -1, .output_filename = NULL }; - struct pidfh *ppfh = NULL; - struct pidfh *pfh = NULL; + struct pidfh *parent_pidfh = NULL; + struct pidfh *child_pidfh = NULL; sigset_t mask_orig; sigset_t mask_read; sigset_t mask_term; @@ -181,20 +181,20 @@ main(int argc, char *argv[]) while ((ch = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) { switch (ch) { case 'c': - nochdir = 0; + keep_cur_workdir = 0; break; case 'f': - logpar.noclose = 0; + logparams.keep_fds_open = 0; break; case 'H': log_reopen = true; break; case 'l': - logpar.syslog_facility = get_log_mapping(optarg, facilitynames); - if (logpar.syslog_facility == -1) { + logparams.syslog_facility = get_log_mapping(optarg, facilitynames); + if (logparams.syslog_facility == -1) { errx(5, "unrecognized syslog facility"); } - logpar.syslog_enabled = true; + logparams.syslog_enabled = true; break; case 'm': stdmask = strtol(optarg, &p, 10); @@ -203,13 +203,13 @@ main(int argc, char *argv[]) } break; case 'o': - logpar.output_filename = optarg; + logparams.output_filename = optarg; break; case 'p': - pidfile = optarg; + child_pidfile = optarg; break; case 'P': - ppidfile = optarg; + parent_pidfile = optarg; break; case 'r': restart = 1; @@ -221,21 +221,21 @@ main(int argc, char *argv[]) } break; case 's': - logpar.syslog_priority = get_log_mapping(optarg, prioritynames); - if (logpar.syslog_priority == -1) { + logparams.syslog_priority = get_log_mapping(optarg, prioritynames); + if (logparams.syslog_priority == -1) { errx(4, "unrecognized syslog priority"); } - logpar.syslog_enabled = true; + logparams.syslog_enabled = true; break; case 'S': - logpar.syslog_enabled = true; + logparams.syslog_enabled = true; break; case 't': title = optarg; break; case 'T': - logpar.syslog_tag = optarg; - logpar.syslog_enabled = true; + logparams.syslog_tag = optarg; + logparams.syslog_enabled = true; break; case 'u': user = optarg; @@ -258,28 +258,28 @@ main(int argc, char *argv[]) title = argv[0]; } - if (logpar.output_filename) { - logpar.output_fd = open_log(logpar.output_filename); - if (logpar.output_fd == -1) { + if (logparams.output_filename) { + logparams.output_fd = open_log(logparams.output_filename); + if (logparams.output_fd == -1) { err(7, "open"); } } - if (logpar.syslog_enabled) { - openlog(logpar.syslog_tag, LOG_PID | LOG_NDELAY, logpar.syslog_facility); + if (logparams.syslog_enabled) { + openlog(logparams.syslog_tag, LOG_PID | LOG_NDELAY, logparams.syslog_facility); } /* * Try to open the pidfile before calling daemon(3), * to be able to report the error intelligently */ - open_pid_files(pidfile, ppidfile, &pfh, &ppfh); - if (daemon(nochdir, logpar.noclose) == -1) { + open_pid_files(child_pidfile, parent_pidfile, &child_pidfh, &parent_pidfh); + if (daemon(keep_cur_workdir, logparams.keep_fds_open) == -1) { warn("daemon"); goto exit; } /* Write out parent pidfile if needed. */ - pidfile_write(ppfh); + pidfile_write(parent_pidfh); /* * Supervision mode is enabled if one of the following options are used: @@ -298,11 +298,11 @@ main(int argc, char *argv[]) * To achieve this daemon catches SIGTERM and * forwards it to the child, expecting to get SIGCHLD eventually. */ - supervision_enabled = pidfile != NULL || - ppidfile != NULL || + supervision_enabled = child_pidfile != NULL || + parent_pidfile != NULL || restart != 0 || - logpar.output_fd != -1 || - logpar.syslog_enabled == true; + logparams.output_fd != -1 || + logparams.syslog_enabled == true; if (supervision_enabled) { struct sigaction act_term = { 0 }; @@ -351,7 +351,7 @@ main(int argc, char *argv[]) * not have superuser privileges. */ (void)madvise(NULL, 0, MADV_PROTECT); - if (log_reopen && logpar.output_fd >= 0 && + if (log_reopen && logparams.output_fd >= 0 && sigaction(SIGHUP, &act_hup, NULL) == -1) { warn("sigaction"); goto exit; @@ -383,7 +383,7 @@ restart: } if (pid <= 0) { /* Now that we are the child, write out the pid. */ - pidfile_write(pfh); + pidfile_write(child_pidfh); if (user != NULL) { restrict_process(user); @@ -451,7 +451,7 @@ restart: warn("sigprocmask"); goto exit; } - child_eof = !listen_child(pfd[0], &logpar); + child_eof = !listen_child(pfd[0], &logparams); if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) { warn("sigprocmask"); goto exit; @@ -482,14 +482,14 @@ restart: goto restart; } exit: - close(logpar.output_fd); + close(logparams.output_fd); close(pfd[0]); close(pfd[1]); - if (logpar.syslog_enabled) { + if (logparams.syslog_enabled) { closelog(); } - pidfile_remove(pfh); - pidfile_remove(ppfh); + pidfile_remove(child_pidfh); + pidfile_remove(parent_pidfh); exit(1); /* If daemon(3) succeeded exit status does not matter. */ } @@ -652,7 +652,7 @@ do_output(const unsigned char *buf, size_t len, struct log_params *logpar) if (write(logpar->output_fd, buf, len) == -1) warn("write"); } - if (logpar->noclose && !logpar->syslog_enabled && logpar->output_fd == -1) { + if (logpar->keep_fds_open && !logpar->syslog_enabled && logpar->output_fd == -1) { printf("%.*s", (int)len, buf); } } @@ -701,15 +701,15 @@ open_log(const char *outfn) } static void -reopen_log(struct log_params *lpp) +reopen_log(struct log_params *logparams) { int outfd; do_log_reopen = 0; - outfd = open_log(lpp->output_filename); - if (lpp->output_fd >= 0) { - close(lpp->output_fd); + outfd = open_log(logparams->output_filename); + if (logparams->output_fd >= 0) { + close(logparams->output_fd); } - lpp->output_fd = outfd; + logparams->output_fd = outfd; } From nobody Thu Mar 2 04:28: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 4PRylC33myz3vp1B; Thu, 2 Mar 2023 04:28:07 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRylC2B03z4GS1; Thu, 2 Mar 2023 04:28:07 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677731287; 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=Z8P82lc6xivGvWUvR7ILCWESk7bp0/SkD2vvViLorsg=; b=vLtak7eVsWKmp2U8MGY9iScKxBlxPPrgql1ON0/r2mGg5FR7bPKUTbKBvg/inLCkKFd3Mv RYB0JVgI6c9ch9XdB7g8yCARrrlPqWCj3klmPtJ3DW3yRlcespVzkRpRM1cXtDrTnG2NI/ oJbrOQg3ayztLbqM2aMwTDQKx+B2XXFYtP5D5/VLmPdUFm6VaEQYcu9RBW+EdhUAQ6d/ZB Saz3IKlthqhuGLusCdPV0HxJALY8kxXTi2RXDJjpisFLz+BoFPHjYzlCSPgSzLEt70pdwK Fj8poYdLgHkrh+nOjJISz3K+zWfdpdLVRGO94WmEBHeV9HBgtWFBxIIzA0tt8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677731287; 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=Z8P82lc6xivGvWUvR7ILCWESk7bp0/SkD2vvViLorsg=; b=ihUkWkjKpSiS7vOCX0A8Hll3WKL/46YACYGte86UviLwSrrk+d/Md5W3O9AQk1sDFVYg3w WpIaPkKrWdsxybGDVgvYdE7F3tszpWWjXBxXgtMKwiEbCcyyzTvzO+xw++rJMDy/Wju0gu 56rEW4i0OEErLqPIVH8iwtIOCTdbk4EaNOiJKpkEiaWJlylarKrcSis67z/NP43NzAsTBo KLpTspQ7v8cl6kK1i9y+aA7VsXLxXFjaXXMWURXr6WcrlXR3e3ipj7N0G+jL8GXu81Y3h2 J0iNU4szxM1aTofC7u2pN/4qSXdRwjw8FUz5PPyiKr435q0sKcQdNylnzWT7YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677731287; a=rsa-sha256; cv=none; b=apiYZcsgQLD7B/GulyhOMeAeyoapeFUv3l8ABszvGZLDgXh3xOIzZCeqOV8l4xiByLPcUG fiUe9efd8291qxMxSMOwUuAOYBjmAdda8Zi+VSLXkd8uK9IN6+nhEpRH3uUow7w3ys7FL9 YTUq0+8cW9H/XRyFQWVA2QQZVAGIJkigR1XETjigaf0GbkEDNuf+enov1KBT93hscC1vnf cfVB4A7hGu233uN55vV8Z9SdDyvdHrp48dSpSwfzG9qTFxlYytkWdmnMO6PZKezPZaBpWj +VSK1qRgY4Rwk9AWaMthvrDWxSeuRIPPJYoH5MY0xtRwz3qaaZzvBoSCYFsPYg== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 2A385C8F8; Thu, 2 Mar 2023 04:28:07 +0000 (UTC) Date: Thu, 2 Mar 2023 04:28:07 +0000 From: Alexey Dokuchaev To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 6b4ef4b16a69 - main - daemon: use braces with 'if' consistently Message-ID: References: <202303020300.32230wHb032429@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-Disposition: inline In-Reply-To: <202303020300.32230wHb032429@gitrepo.freebsd.org> X-ThisMailContainsUnwantedMimeParts: N On Thu, Mar 02, 2023 at 03:00:58AM +0000, Kyle Evans wrote: > commit 6b4ef4b16a6930d91d0d99c4ceb75cd43a7526c1 > > daemon: use braces with 'if' consistently > [...] > ... > diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c > index edcdf3141fcc..f9c1f73e193c 100644 > --- a/usr.sbin/daemon/daemon.c > +++ b/usr.sbin/daemon/daemon.c > @@ -173,14 +173,16 @@ main(int argc, char *argv[]) > break; > case 'l': > logfac = get_log_mapping(optarg, facilitynames); > - if (logfac == -1) > + if (logfac == -1) { > errx(5, "unrecognized syslog facility"); > + } Not only that I don't quite understand how does this commit really improve anything, but looks like it's badly formatted as well. ./danfe From nobody Thu Mar 2 04:42: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 4PRz4J31c9z3vpXB; Thu, 2 Mar 2023 04:42:56 +0000 (UTC) (envelope-from kevans@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 4PRz4J2C0Tz4J2K; Thu, 2 Mar 2023 04:42:56 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677732176; 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=Q1EjtoDpm104tcKPMPhKDywF3QPprz4z1FjC3KOHCmE=; b=W10eprXx5mrutdL03eRtzpSCnhzLT+ZjDNwFyKbUE0YvoevXP2svY+kFSTgYfCINCSdcLu zy4EsazCRiPWga5YiR3kiaSMPdMQKjGtZi18olzMRsYIuXxsx+Y2LlX5aZWExXjmOZcKkt 0rrLxk//iFIqcCRzSmTZRlXPyAJi321mLyp20IZgnE8pBsdtBKQjv3z9jd0cgsLQlEly16 WSP2c+VFOqg2R6z10vcRrmpBAosnU0V+3aPSMnPrI9lDtRfd1pyljtlnmrewe4mNNQ5Arr bL/lbzM82bEw5u6HVpiUhiBHVXNTL4aI1/KFUkOOKijVM7Bh8fP0nORRKw8iLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677732176; 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=Q1EjtoDpm104tcKPMPhKDywF3QPprz4z1FjC3KOHCmE=; b=fCAcip3aja3/6VWOsrotBhcNzEt7lffuwfmsfSYZiaxhe82Y7C9A9rMhxw3121di6m1d6D QzWOn7L0ATyWr7iKAqrjxtI/C+Rw/CIi90l9Pu9sWH3777JNOEVqeXQt/0m/EL/opyKgtx Bx3dDnj4WNXau+zZYimP2/GgjHkrKggvHxcrDH3q36cocY/yVhqM5Q7TnzybVRwSs8GGZr qQb8FfJPbmhQpjQ+STGVdn58cDoJrOLHdmS3DcK1VR2D7H45syotno1YB3W0/Yc8LULUbp cTjFAdT9czu7SOP7s0+aqoshrk2YjncQVrtM3IeyH0bTtW0OMjtFTDsytokMMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677732176; a=rsa-sha256; cv=none; b=eQpEZIW4/fXfMDvSbxLseZYHxvIryCKqw7S2MQg/e5NYHNTEq+VTZCQH3C0f7a2JGBILIa rMPozKX/mWx/X+6iwQfMrddNw/HXqCM1Zx4ZAnNzhUH7jCjkJlv8zJmVa1gZuhRY7Je2q1 kfU0Pw04Sn/FKGX3yQUYNjfxECDfWR6rqI9RP4K+rgpzzxum0sXxKRVLg8O+FzQMYfg4Cp +dfcLY3oXJ57A3bfyCcpgJJCTRGGtZtFNtJwneHurGtP3ZgogfRlTAuw51T4I5VRkZ3MET G69hDJoERoBJVSaJMt8Tv61fZN6QGuL75bPQArGrxGcCelAp9S1WjIjXeTp8wA== Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PRz4J1Fw8zL6Y; Thu, 2 Mar 2023 04:42:56 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f178.google.com with SMTP id q2so5597387qki.3; Wed, 01 Mar 2023 20:42:56 -0800 (PST) X-Gm-Message-State: AO0yUKV4sVNcSK81QeCM3g1FNwIWdmvwLMM3ECJzVvrcjub3ktSyjy0n 3MzNacuHJEUTW4nI8H+pKqDM/Ko7cDeKU2IPyBg= X-Google-Smtp-Source: AK7set+FtP3dwxMr52D1NC9oVjqxPVlqxJUIxq7hazu6LAJpWPllp41Z6gP9bW5Qa8rpCINVPCyytA7QMtmacrdFP1M= X-Received: by 2002:a05:620a:1327:b0:742:7fb5:f505 with SMTP id p7-20020a05620a132700b007427fb5f505mr2207028qkj.14.1677732175490; Wed, 01 Mar 2023 20:42:55 -0800 (PST) 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: <202303020300.32230wHb032429@gitrepo.freebsd.org> In-Reply-To: From: Kyle Evans Date: Wed, 1 Mar 2023 22:42:49 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 6b4ef4b16a69 - main - daemon: use braces with 'if' consistently To: Alexey Dokuchaev Cc: Kyle Evans , 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-ThisMailContainsUnwantedMimeParts: N On Wed, Mar 1, 2023 at 10:28=E2=80=AFPM Alexey Dokuchaev wrote: > > On Thu, Mar 02, 2023 at 03:00:58AM +0000, Kyle Evans wrote: > > commit 6b4ef4b16a6930d91d0d99c4ceb75cd43a7526c1 > > > > daemon: use braces with 'if' consistently > > [...] > > ... > > diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c > > index edcdf3141fcc..f9c1f73e193c 100644 > > --- a/usr.sbin/daemon/daemon.c > > +++ b/usr.sbin/daemon/daemon.c > > @@ -173,14 +173,16 @@ main(int argc, char *argv[]) > > break; > > case 'l': > > logfac =3D get_log_mapping(optarg, facilitynames)= ; > > - if (logfac =3D=3D -1) > > + if (logfac =3D=3D -1) { > > errx(5, "unrecognized syslog facility"); > > + } > > Not only that I don't quite understand how does this commit really > improve anything, but looks like it's badly formatted as well. > A-ha, thought I had caught all of the style issues but it appears not. Thanks, Kyle Evans From nobody Thu Mar 2 08:39: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 4PS4KF0GSqz3w33Z; Thu, 2 Mar 2023 08:39: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 4PS4KD6qyZz3hs3; Thu, 2 Mar 2023 08:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677746369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uBjuh/ZtU1U/R49KljWaZpe9raO9FXf6B5t7lw/cuoU=; b=CedODYLMs1agxrZyn1Gz4lqccrUbxDsRfiMevkvU4M97ova72W+tqyEC5wz1VBe5JDq4im I3q28T+JfKXouXNa13Fn2ck62EwdsRYmhCa6/Bq15t4S3jRXXcRQe9x7PRx0kYKVX7NWNe pIxERtzzBCNgihBIc9AA3GYUJ17WUB2ktkkTh0TqILWogkY7Fyse83MusQNsFbPqxdpyZb KndOqEjhHRsrU9QeeU8NOmxX+jcv9gt3yh0obRmvb8QK3vnyNtzLhxJlEebrSPB65iTbt9 o32MALPVXmmmWwKoyB+/JTL/PqUEb+Fz4Mmptwf6bMzCa9/+FbCs+OxF4Jzp2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677746369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uBjuh/ZtU1U/R49KljWaZpe9raO9FXf6B5t7lw/cuoU=; b=naHQxoeFp2H7i9HBmXcJV48rB0q0jDa+xA2awtR/RQNAPFb3Rrn9HV3R2tkyBL1XK8IkLu Xb6D4wPEaWrPkiDxdPqcg5ksa/JKhBRuTMOCg95cHiSmCA7nDdPI64ua47TMGjHbFuI3Sc 0EvhrfFbZGbg5t7upsbw6J4n+51cO4cNCiMrjeMHtYtITG//u0qRSH7fXcgt4/ZuDOveVf l/QwwFGNEH1f6+lgGH+lAxbzTYCWnmWzKQoEQC9k+rpy4LL72v5XIaPeYc/5ufUw+KKDcF rQfwL/UzgKaH+/um52ea4hiFxlCs7xo0cx1bY7eI3M4T+jrCYJrl57GoDX8gOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677746369; a=rsa-sha256; cv=none; b=iKEXLc1UMqlTkXPauLgoye3O+2zU5uCCWDJNcKayFSiQAZJS2e3H4fFfDVe44ZOfaTDfxp 05foxKvgMusEW9Av6k+hpX5fV4U2jMuw5CS5fxc4wmyQy1OZaQh5QXhdA47EI2GdAKnqsj li7K2q/X1Pznr2+fXIl+WuT6sVhoAVIUIMpnVPGhpF/YXd+GkARNzIev/Z/bwIAbGbWs0J gDJI02sD3ITslyD0lAOOOwrhn6XsaWRZckwC6YL4OhqefWKl0SqlTh3YXmeR+zVYewQEjB RXbFhvwB8ezp36F2Tz9FaqYqxdy3bMnjpu5JRsvDn24ShFfgXGmeOgWfIvXuHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PS4KD5tR1z18cq; Thu, 2 Mar 2023 08:39: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 3228dSL7082369; Thu, 2 Mar 2023 08:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3228dSiW082368; Thu, 2 Mar 2023 08:39:28 GMT (envelope-from git) Date: Thu, 2 Mar 2023 08:39:28 GMT Message-Id: <202303020839.3228dSiW082368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0ba66872bea8 - main - uuidgen(1): back to the past and 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ba66872bea87abdf13660d5a7946769fd7b118f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0ba66872bea87abdf13660d5a7946769fd7b118f commit 0ba66872bea87abdf13660d5a7946769fd7b118f Author: Baptiste Daroussin AuthorDate: 2023-03-02 08:35:30 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-02 08:37:03 +0000 uuidgen(1): back to the past and fix typo Reported by: ceri --- bin/uuidgen/uuidgen.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/uuidgen/uuidgen.1 b/bin/uuidgen/uuidgen.1 index 75fd02703175..da174f24a3ba 100644 --- a/bin/uuidgen/uuidgen.1 +++ b/bin/uuidgen/uuidgen.1 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 1, 2024 +.Dd March 1, 2023 .Dt UUIDGEN 1 .Os .Sh NAME @@ -55,7 +55,7 @@ to not generate them in batch, but one at a time. .It Fl r This option controls creation of random UUID (version 4). .It Fl c -This options contols creation of compact UUID (without hyphen). +This options controls creation of compact UUID (without hyphen). .It Fl n This option controls the number of identifiers generated. By default, multiple identifiers are generated in batch. From nobody Thu Mar 2 15:12: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 4PSF2w46f8z3vvsd; Thu, 2 Mar 2023 15:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSF2w3TpMz4JhQ; Thu, 2 Mar 2023 15:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=11bGjXMhImb9Yl6J70SPxsCiQSn3XANLPQoF2+sygBg=; b=icBmrKiFPUIaI5HJPpS0zoeHX/jCcMKnjWdxdB4yzXFYT3nrRQF/fPpqnezY9EjwLbygN9 p88sUcfVBQPm9hjGAzVt0USSVtaRqotzSsZin6cZtJtX31XEed+lHCvY8/Tn/zUToEl/Rt q8/Em52LLUWi5aMq7EYigG57hfrpfaS1SuE8G0ohzBde0OF83Zrhng/f/2JoBSka7cRrOk YZchFTAK5GA9Aoz9p0t1g/s31opzw8KHaUQf/RgA+HMurwQyB4ZeOg0zQU1CTih5XEnZBl oT2ILrBQgk0IojcQB4uV8nAVKVyTY/qDk9VCuTOfklUkfdMlkLgpxCNNGBwQXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=11bGjXMhImb9Yl6J70SPxsCiQSn3XANLPQoF2+sygBg=; b=aMwDysNvAZeAk3AttFKtpDi6TfPDe2bXIxRhfOTAmET0nNpg11frbVgzXMhLh8vo+kcznG x8ALeTZGy4n/SlH4MP+r2YxeILzc7EbDMeg3/+a2KyUxXU+0a9S8QPtkRVx18tUDKdTSJv sWHloDP5RRmRZnbWEtzt3riTH6FBbxI9S1om5vQqj/JizwnhbbiyNC36AKwtl9RRphir2i s4XmJ2xdlqr3VroJzud2HY9/tNRacQDh227Pr4tz7zKprue98fJ7PASJ7s6qYh1Ul4+JcN TddXlNuypXftpSfBjTQoxx7W5Re0f1WzzyQYoeTXS+cppT1yMVU4FQmL9Du1gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769960; a=rsa-sha256; cv=none; b=ZeFjRIWjZ7wR60zvclmc5oZbAR05UpdEK+IwawPtAoKFqWo36flbTyGtU4WFF+KRs7VSJP bqYSTFD7DJ3YKnPI9AjwHzyfRDtjY+ytg/xpTrfHPOxjasSAzLHQZzkg2BzWJkIwqvbePF CX8Kk/0x4Z6BXZtKAIoZ5XLmbdylBVRZk3fLqs/PaQ9SLQvyUi4dlRyyz2shl8auApcEUA 7aPRFH0nNzZ2JmdApyI9baSbAaW/2pvGZhO+cZ6yfkZDXbhAO5tPJkuZo+/5wmoahQ6e7S ozn3vhv1qjc4YVFDB+Gvo0YObJ2K90OCQq6RxMkzVfdb/i1GZJIsTU+kVAHmHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF2w2PqQzLPS; Thu, 2 Mar 2023 15:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 322FCe8P037883; Thu, 2 Mar 2023 15:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCeqo037882; Thu, 2 Mar 2023 15:12:40 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:40 GMT Message-Id: <202303021512.322FCeqo037882@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: beb2af45bd1f - main - bluetooth/hccontrol: Remove useless return at the end of void function 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: beb2af45bd1f0966ea16967ba745083e7fcb42f5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=beb2af45bd1f0966ea16967ba745083e7fcb42f5 commit beb2af45bd1f0966ea16967ba745083e7fcb42f5 Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:06 +0000 Commit: Warner Losh CommitDate: 2023-03-02 14:59:10 +0000 bluetooth/hccontrol: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/bluetooth/hccontrol/le.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/usr.sbin/bluetooth/hccontrol/le.c b/usr.sbin/bluetooth/hccontrol/le.c index ba8809213c06..6f768619e9d3 100644 --- a/usr.sbin/bluetooth/hccontrol/le.c +++ b/usr.sbin/bluetooth/hccontrol/le.c @@ -1086,7 +1086,6 @@ static void handle_le_connection_event(ng_hci_event_pkt_t* e, bool verbose) conn_event->master_clock_accuracy)); } } - return; } static int @@ -1208,8 +1207,6 @@ static void handle_le_remote_features_event(ng_hci_event_pkt_t* e) hci_le_features2str(feat_event->features, buffer, sizeof(buffer))); } - - return; } /* handle_le_remote_features_event */ static int le_rand(int s, int argc, char *argv[]) From nobody Thu Mar 2 15:12: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 4PSF2x4X7Lz3vvy0; Thu, 2 Mar 2023 15:12: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 4PSF2x44kcz4KM9; Thu, 2 Mar 2023 15:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9qVsLK/haXYLvEICmFju4MkQzx1/u+JNw82dbASSdM=; b=SLMSpLPV8owJZCALmge+r4eTcBiSMmtfJqTHub9wGUfPPS37FC4ROlGo8QYSV2NAuJ3Bov vlWuePKJaLEcrpdy3gNjFKEKX9qiQFQuM7e3KZjrBssoMIGGuBjnVdFIgBxgJr8mtujqd9 vwJ4jdG1+Jt6iXkdOcWreJeNUMBVVsbt11KH47ThIzMGsFB16rX3WwZurxZE5XmS00yzFZ s1hPBwabINsQeUvDvQh0NeX8Hg33EWtYjO6LJKnMA1kndAAYqRF2HxOQNQSZtkZ0v5nT8W Nqv1wtUXTgZojSLCHiygGy6H4EB7/i4cqHwh1zk2sw4FkfHRHJSaBpwNscEGZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9qVsLK/haXYLvEICmFju4MkQzx1/u+JNw82dbASSdM=; b=IIYvIvMoj2vPNc7gqhzhFS16nYo/ILBje3T5d7r5qpFrwHDU52o/2Hv2+5rNlkEkeqmyP+ RegIMpU/xnxe/ZZvu08oKCtFtsSx2XEvJcypLst7PHfqPgkTuBD/mz15zNuF/gaU5egxz7 t8ExDZ9hpiYT72N722LaN9ucLxhMlu40EgWL1Ueg0KHiXLDWh1i+iep728+oWw3HjvUTJb Vpuxc3Zs363hI1Tx0ksBM600sOucXdvidIQVEF0M0+dwTFVttD30vMOGrXwwvARZUO2rKl coOg7Hb+wEcTFVX1bLuRfE4ytnqf+SD2aRP/vU4ydRwikR9qLewAhszgYAO+Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769961; a=rsa-sha256; cv=none; b=aKHgb3wjujAG8ikej1MAadenK3qpYT18DvEYQa3SXnmkz1t+cxpEEnogMbBGWoRk3c+sbE zMsfHHutaatOEBwd3HZCbvs+SqyF5CkaX5o4oAXI3mPSaUUbRoIfjPPcjf5ItCQHT7k6zp t+cb8aWUsRU3dM72YrLJ6o2gbPPvkLiit9Ynko/L95y5Dsx6VBReKkwf2WTNPQ4fMroFtj xtv2XSFt/gxRZoqwu+d/F3AvmudOy19LEK2jKf/n+76IrP4lGc30Q3qppLa3xsGy//Sqng JKH8RLUoFrjXlPhb7A6yBgXDqW+tr95ih/3ihKyDkoL+RvQB/gZPRia6vF0Kjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF2x31wNzLDP; Thu, 2 Mar 2023 15:12: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 322FCfeU037913; Thu, 2 Mar 2023 15:12:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCfTc037912; Thu, 2 Mar 2023 15:12:41 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:41 GMT Message-Id: <202303021512.322FCfTc037912@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: b23e15e1c852 - main - dconschat: Remove useless return at the end of void function 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: b23e15e1c8525880f3b0068725831d185b1928b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b23e15e1c8525880f3b0068725831d185b1928b6 commit b23e15e1c8525880f3b0068725831d185b1928b6 Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:06 +0000 Commit: Warner Losh CommitDate: 2023-03-02 14:59:11 +0000 dconschat: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/dconschat/dconschat.c | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/dconschat/dconschat.c b/usr.sbin/dconschat/dconschat.c index af7f8f650d71..0896280d515f 100644 --- a/usr.sbin/dconschat/dconschat.c +++ b/usr.sbin/dconschat/dconschat.c @@ -681,7 +681,6 @@ dconschat_init_socket(struct dcons_state *dc, int port, char *host, int sport) error = kevent(dc->kq, &kev, 1, NULL, 0, &dc->to); if (error < 0) err(1, "kevent"); - return; } static int From nobody Thu Mar 2 15:12: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 4PSF2z0Frnz3vvqj; Thu, 2 Mar 2023 15:12: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 4PSF2y50q5z4K4x; Thu, 2 Mar 2023 15:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkioEuYQV1XGp98PBi9A2W3iCrmiUtTrU76eXtRI36g=; b=qLlE9CEZiStClE9QRoOmZFSpw2eX8NtEQX2p8YW/AADMAV87ZA0CIyvP9ySF1uogtPicDz j87+n6/ElqI2UR8E01c0/Z6ZvgvYm8RJOWTcbx6s3hT7X0IcDIHFFpoLOldz6sa/mPiG36 lq3uOyM3WGB5ctJLhEPM6yCfPMoAxiSC+kTaQHx+1JkTldGR1LeeUq+HVVUCsAWRlWqVV1 wRkg0RPN5slDUGKoO/xQPEYEO5pShQyYNHKWPPAkE1i+FAjrtdsDx88SkUnwL9g7sBuoo7 ihQH/eqffFhnpV9QKQvKysHARTC6OX7cUES9dMiSnKMN+F5g8VFR6mX2fO3FuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkioEuYQV1XGp98PBi9A2W3iCrmiUtTrU76eXtRI36g=; b=ZB2B5UceZSioZfnAL+/t4pZREBFXb9qLB+RKB1ODEvVi5Bjp/HRyC1R1mlzkLCZfQP3DYN fDUacR6tcjLmojCd1eQ9nHsIo6fWznouRn9aKvl/tz0bb+LDOwgnDZj8DUpqmuEWmrpeix +pwRG675VrfqxjNGqv4DDx35M3BIZP7/EzL9j68u/6yQb3eeZ/IZZq7ax4tgsV/2K2D4PR 5r+9bkaDWuYo1zS8niO3UgZKYUxLlORFDqAnsEPjtuhtnkVaJZE905m3qnXgZNmg4t1lk0 HzC3LD+C9Jzgjn8+2qiQfjn9InaL5dmlHIjOaBeQaoNbYhtuKXoftEG8vFmAJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769962; a=rsa-sha256; cv=none; b=jftCsTclIJkCYTvS+CJAPXzBzBX0CFTAh0OdUq8G4HRyl2alwnXLmObABHvJ3G3K2RNV12 I9lqc8YTH0p1kQz2/D2cZ/yd+dfKptDxvQY0Ds16MNWANCuX9B21NIbjq4xCi9LLQRRJLI /m57YUj4I8BWUHODbzZzZt06KIgETmckniMGOh9cyOiSPZRB77h6b3lPT8tk99j8K9434H qMbvkh0pTs6UQEDy9ZSuBwtWKKgXt2mCb8eZE5GizARvb6OHjJKBKTp7By1xL3XhyO5lUh x2iNhqe8IyrA4CPdSU1PBQ2F8QcQuE/YoE/Eiq+9CDQ3dWtflj1NMkJiAQYYIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF2y45sjzLPT; Thu, 2 Mar 2023 15:12: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 322FCgS1037934; Thu, 2 Mar 2023 15:12:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCgJF037933; Thu, 2 Mar 2023 15:12:42 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:42 GMT Message-Id: <202303021512.322FCgJF037933@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: 86cda797bd85 - main - diskinfo: Remove useless return at the end of void function 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: 86cda797bd85531abdbf928030a580f683587c6b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=86cda797bd85531abdbf928030a580f683587c6b commit 86cda797bd85531abdbf928030a580f683587c6b Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:06 +0000 Commit: Warner Losh CommitDate: 2023-03-02 14:59:12 +0000 diskinfo: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/diskinfo/diskinfo.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c index fa95a3b92148..d40f49ab96fa 100644 --- a/usr.sbin/diskinfo/diskinfo.c +++ b/usr.sbin/diskinfo/diskinfo.c @@ -527,7 +527,6 @@ speeddisk(int fd, off_t mediasize, u_int sectorsize) TR(bulk * 1024); printf("\n"); - return; } static void @@ -559,7 +558,6 @@ commandtime(int fd, off_t mediasize, u_int sectorsize) (dtsector - dtmega)*100/2048); printf("\n"); - return; } static void @@ -621,8 +619,6 @@ iops(int fd, off_t mediasize, u_int sectorsize) } TI(completed); - - return; } static void From nobody Thu Mar 2 15:12: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 4PSF301Wxzz3vvsk; Thu, 2 Mar 2023 15:12: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 4PSF2z6tGtz4KKV; Thu, 2 Mar 2023 15:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdDgRfaL+cnmqnffMElic3StsHwdYtUrCFzOqQQfYcQ=; b=QLwnhnIZGLwsgiaI4eIEqgxfzX8FjMNCm6LtdlkzZmgs+yOZ/aObgabYaTqVhwniM3KkEA GAlA/GIM5rBeD1uc4vgA25Upro6CLh86Hii4i5X0mLHlojB32czok2PWgsGvzCnbFX6d5L /JNjkpAzm7YMohEu1Ktso/jMKa2cXM0QV0oW9Vtx0t807tuQXMlElJ+YIyXXoqMXAlnXP8 akNKHFK1BtFiMcybsyZaFoMnt/eJt2whIbQQDRJ2BHp7HGMUK4Uik9kX+sr5AyKx8fqBlG iDPK8bIjijRAyyXxekYihN9Azr21wKdbVlL+IzUDkQXjebRt7HPcid+LUTskug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdDgRfaL+cnmqnffMElic3StsHwdYtUrCFzOqQQfYcQ=; b=HRNIkKajkuyHsvNXMgFAwzze4OJ6xZ8814J2P/3nVU0hTmq9gXUahGrbAconEXb5sQfLai kGoLfNYeBnGYV5fBspo1bBLUm7caG58MJiI3V4XLqh330ewYlF4GNH6UiYMc1qC0h8J7bd sgO7ioWyBZAaYubXehizeVQ9dp1sXkYah935HBgXzv5hqAsUHTTA6Qr5IHneUXTj1GLtuK Dxm3O1sfETvzSfr98WiHMfehAvQx2WxNjUwFcGgYDaMP3Pn/IGHr6MCHFoS5YfoP1qRubQ KUxe9aCe6iotfTSqLyGdCzFtcGBRrW+9iFsP9HITHel/F23H45GknjBu8gzWmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769964; a=rsa-sha256; cv=none; b=KWkurADIfJ92fHfIm1sDTJgctA/ILgtsD7B/Fm1dEH7fzBmd/jBYw5pngt4rFuschCl2V3 ipM9BB0MKZiWMH8Tb1ad+uoelMgW55WmL4P8UxJOBgKgQKdTVtlr0AxPoONQQNqRkHNTXh OgtE1ms26fA2gIRqtPVgHRgu1NCs1GpVh8Vh7NbKh0LSICVkADkYK6CfAVbywXGbtWduc8 ZCqYAFeFnxNoj7DRD3ExGI7n5qJ6cDgfzg2bf24xxQdShesfJSupxtk8OivNOh5A9+i53k fsR8wuJiTdFyPHKxwzm1Yz6bjrf+i/YOMt15JYdRPbxRaSmWNudurDNtCeO+vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF2z51znzLY4; Thu, 2 Mar 2023 15:12: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 322FChnp037953; Thu, 2 Mar 2023 15:12:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FChFl037952; Thu, 2 Mar 2023 15:12:43 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:43 GMT Message-Id: <202303021512.322FChFl037952@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: a5aa07dd855e - main - extattr: Remove useless return at the end of void function 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: a5aa07dd855e55cd2800dd9ff7c3bddce2502b39 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a5aa07dd855e55cd2800dd9ff7c3bddce2502b39 commit a5aa07dd855e55cd2800dd9ff7c3bddce2502b39 Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:06 +0000 Commit: Warner Losh CommitDate: 2023-03-02 14:59:13 +0000 extattr: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/extattr/rmextattr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/extattr/rmextattr.c b/usr.sbin/extattr/rmextattr.c index 0daf15cec940..b2f37d1caf0f 100644 --- a/usr.sbin/extattr/rmextattr.c +++ b/usr.sbin/extattr/rmextattr.c @@ -98,7 +98,6 @@ mkbuf(char **buf, int *oldlen, int newlen) if (*buf == NULL) err(1, "malloc"); *oldlen = newlen; - return; } int From nobody Thu Mar 2 15:12: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 4PSF3105vPz3vwCP; Thu, 2 Mar 2023 15:12: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 4PSF306Zkyz4KY0; Thu, 2 Mar 2023 15:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t9Vc7HIHBAOjcurpG9ZfMT0J79cnMP/w3tg2TCyYGjg=; b=r+jYq2Zx/li/Jhza57MwIryf+GIaQSqPdU7w52y7ptqYPvn/J9s5gY5vdwsZ1B1eweNb9U Bp7o95rR0a/TvbBNT7fzkuDsZAl2f0on9FlPrv8d+gV3wyy6ZKXSAIlXxSg7RDtGOVYBVh F0PkRUwcJEXaD42Oeq3HNT4sdqKYz6icEVWWRjAebqn6e2McaAOLw07S/k98pzdVMqtS10 pPscCOOiCzgkUA3Kdnb4dBpNQBl/VUXBSOBpkepXK/e6UdsP3/kfKDcTDFPdsIYCitCy0b /IE55Ww9QH+mxbcuQxrvyPExj97LaoekjIEiWIYhKmX2Oh/KaAEQGE8gpDKGog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t9Vc7HIHBAOjcurpG9ZfMT0J79cnMP/w3tg2TCyYGjg=; b=MbmUuthJAaRPI+nZ36WyIevAT0F7NJ6RpoCHNEWWuWmoucXsyGuS+StPUJbjZSVfXpQTsu A3CX984pVPNBxoV8l3bCjRAYkm0vVlfcXadP8K5E7m7qvxiLNs7jAFmxw8YCrm17Oi2OLF FO98uD8qBSO39Eb+Fwurm7zT0+Nzbkqt669gJAAKZ28/OQFMWgb0wu9iVlMCB+2mNOfWKj dMhjQv5/OcI7uS4xySNVLv/6XEj80pIS6B0mVFExKQaPtEt7psf0t7Ww6wd/fehx+/hT0h m4hZY62Lgq0Bf4DdoVoxwRbs/nE2rpO8r71tbDXpv+q1Lg45s+6kUk496Or43g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769964; a=rsa-sha256; cv=none; b=mDJ4wRLMPiNW2kg80rDxEf2Xsk5xpj9oh7HM7OjI/W6IpWxtluMRuBGVyEawA+9bjYCFfE HWBYGuEsYoPl50jxa0M5ZSpairUnGnIN0UULuEp5bwbwGIodcjmq21OTQOiBc5eCYs8YdM 6rvohgutRRLkeikDtV5ilNqW+5xs2qD81N2FJgCticLfltVMRQH0T5wsJ8rRxPBt5iT5z0 VJqhUgH7oeQJ0pBffP8A5mmuqArCeJjlVzNNN8rwquHN85N6Ur8X/HWm4Xdz1m06/Xp/3M bKGefQ22KbZsGCZNzSo2/0eaI6M5mL9LE9/3JcOCGVxcNQGJa05iFKDTSeMuaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF305fGSzLDQ; Thu, 2 Mar 2023 15:12: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 322FCiED037981; Thu, 2 Mar 2023 15:12:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCiiJ037980; Thu, 2 Mar 2023 15:12:44 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:44 GMT Message-Id: <202303021512.322FCiiJ037980@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: 1def31df760d - main - lpr: Remove useless return at the end of void function 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: 1def31df760df6bfcc806c793a1c0799d4d43245 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1def31df760df6bfcc806c793a1c0799d4d43245 commit 1def31df760df6bfcc806c793a1c0799d4d43245 Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:07 +0000 Commit: Warner Losh CommitDate: 2023-03-02 15:01:28 +0000 lpr: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/lpr/common_source/common.c | 2 -- usr.sbin/lpr/lpc/cmds.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index b20855515adb..21735fe4dfc9 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -554,8 +554,6 @@ trstat_init(struct printer *pp, const char *fname, int filenum) * save those away along with the file-number */ pp->jobdfnum = filenum; lpd_gettime(&pp->tr_start, pp->tr_timestr, (size_t)TIMESTR_SIZE); - - return; } void diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c index c0debb1fcbcd..ad147a18a8c7 100644 --- a/usr.sbin/lpr/lpc/cmds.c +++ b/usr.sbin/lpr/lpc/cmds.c @@ -644,8 +644,6 @@ clean_gi(int argc, char *argv[]) generic_initerr = 1; } } - - return; } void @@ -656,8 +654,6 @@ tclean_gi(int argc, char *argv[]) /* (...and the fact that 'clean' is priv and 'tclean' is not) */ clean_gi(argc, argv); cln_testonly = 1; - - return; } void From nobody Thu Mar 2 15:12: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 4PSF320p31z3vw9b; Thu, 2 Mar 2023 15:12: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 4PSF320Mcgz4KQq; Thu, 2 Mar 2023 15:12:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mHFGYFRJXuZWtE6aKsdygUGOjepySXm1rA56ml0uGH8=; b=QXnfQLKdK2qO3ZaECeCqJEflRu+dva43QKuQViKJHkdlT6V/JXcEK5GI/IpQ1EcLxpD4Vu cMEeLk/XckCfWDXdvXoS/yo73mpASzDekzCqgaut7dt1iut/mVpTra/bLLUHQM8UYxR2av s2xmXknqD0zlkxySc6eXZ7xhhxOn8qagGDneMMxBW+QsAPQDhaCh8AvwuNei2KxsSvWXBt HtYPgAJMIQGpefoW980iXcwm8XFojiXGkhGXziDm2LxrvaXOB/Q79ePWEvc6EQCBFpnR44 ONFvmXMgXJq/MtIP4XLMUAz0MKgYIFXGwT9V3ZxDrMl7Y1DFmzU+ey7V5k7psg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mHFGYFRJXuZWtE6aKsdygUGOjepySXm1rA56ml0uGH8=; b=HzjOXLVRdEJfa4dypuwUDmLh478TxL2jhIeAGZrbFOPJliNKfFoVSshVC5gdyYrZC97EKy UXLjCdShSjjfpqXOO0R4ioxD60i17DXb2g3h9Z3FbWwHK9LzBz5rzuGlzWmqhyvVMi/W5V nSL3nM+a6LNMO9y/EtfzLLLNTDqSasH92szSqKtquyrizouWh8lPD9rFSPZoRFpBtXYZFQ iS5qPXpRI928RJzRRYdIQChnNMHofPsmEPHCG6iL1DgEoNyJM7vijOcJabbddYHWN5OASc d7J0XyuixnynGaiQ+77m5a5dQMLObA0Cxce3v9cGe3bd6cF6Ze4Y2QYwBiZeqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769966; a=rsa-sha256; cv=none; b=oHZI5rNYbwCyhu1Og/6qStE/zDhpWk46U6PkaFn/dvlfrNBBO5gh6IjVjMiYRGMDDmmOkd ixxukuqpMSHl4dPhwHk+zghdrcjT5OCJca8GvssVq4SlvPBPtxvIthdHxLpBtKZ7Qc+Z3a JaJlTiyu5kmvyMHhOMuUPzLBMri5hBJbxHJQgqUGu+l9nQ5lUdTOy4z3ZV0MJaof4IG748 X7MDkN/8MJvY26stZIIKuY0d6prBPnTeWkUn0BDC13kQsso2g9Vr2CLFMm/GuGijdtLqFI TRWIUUTTQA3HVB91VDM8g5swASu6yjyztNZtkkOvTONxqgeYEzWkWYOyjCDO8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF316ZKTzLNF; Thu, 2 Mar 2023 15:12: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 322FCjBk038009; Thu, 2 Mar 2023 15:12:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCjck038008; Thu, 2 Mar 2023 15:12:45 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:45 GMT Message-Id: <202303021512.322FCjck038008@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: ca2edebb92f6 - main - pmcstat: Remove useless return at the end of void function 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: ca2edebb92f6ba3e8a957e4747aabb7b1a3ffbe0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca2edebb92f6ba3e8a957e4747aabb7b1a3ffbe0 commit ca2edebb92f6ba3e8a957e4747aabb7b1a3ffbe0 Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:07 +0000 Commit: Warner Losh CommitDate: 2023-03-02 15:01:39 +0000 pmcstat: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/pmcstat/pmcstat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c index f366e2175a25..81fa4c75d58e 100644 --- a/usr.sbin/pmcstat/pmcstat.c +++ b/usr.sbin/pmcstat/pmcstat.c @@ -349,8 +349,6 @@ pmcstat_print_pmcs(void) (void) fprintf(args.pa_printfile, "\n"); pmcstat_print_counters(); - - return; } void From nobody Thu Mar 2 15:12: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 4PSF331Tdyz3vvsv; Thu, 2 Mar 2023 15:12: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 4PSF3314F6z4Kqc; Thu, 2 Mar 2023 15:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3Q2Q/IPfc/2o0bDqaZLqo6OR9Wzv0lRMjbeAEU65/c=; b=PRrf+ivcsFDjDjhShUaB9gjadJC/lRvpzvJZapfjN1Awh75sT1hTbqFDLXJfQAsVNFAynh IXqT/alDIExAJWLYA76vdxmrmKZR1ShXZL4cEl5dKE0fwrI7nu8EP71bfVF1Mj8e6ZJlvj Sr4JIykd28JBVrdKCRJ5x5z35s0ib67NyjmDB5wb4GhIfVGSB7CikA/U+05SVIYQTdRSSe b2rFmhBRemKER1awa3Og/ULOnSTDIrAmrcMcBR9GuBZTncoU5gt4ZlqLriqoGKVoScNoCy cW/v11KAlgxPhjTjEaQJaSQZepePwL+O/KHWa7oQvYtqhNS86AowEOdwl/DQCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3Q2Q/IPfc/2o0bDqaZLqo6OR9Wzv0lRMjbeAEU65/c=; b=fAfdl8UOT9dYR6GbkmBquwHHpBmKirUBbhmO03nY0vfjtDiiTNYe8W+2KruNshT6nNqlyK 9WmQC8zT73kTkz9RHjc3fRDhUobN6N2dSaLG5Y5CP3FJNgC4RTNXHTgW983yUq7XbgA1e7 1DUrkpQV6Zi1E+svNLklL07ZiZVibKLpVTnx1ZisTLoYUMeD3oIfsYhfpKu08mOkr5XThU /Sf89/jESUlGeNqKfjSl9MV32TW7B5w02b850HLDGCupKHWhkxkGIfjL9RWdKw/0lcsxi3 L7WGZ5akKnehnUdbJtv/FoMY7/1zJt8DG1a4Txb/vQ5xeSwr0nX0nGjWKHP4Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769967; a=rsa-sha256; cv=none; b=oldeLDdTpZNOP1lA9v8zykbWNvZo8O8gC8m100OJPfWyeW5fYnjJpcWlfng68uocUJuYqD KnhRFkLdT9hX/FeJyUfCsJXzlclbt9K3BJKDEz8ZurFqL9e4NpfkQsBUPksDM5knjLqUWl zQmsCBrK4UQSYaCU1Afyrnzv/s265TJOk6u86EyyrHn5VthLhf4i0WpjFch75ntCty9TPU m6nKHNihlUdzUvupXTsSC8tXCVcVAfbomlEwU60iwBAGNlewxJRsyFJJPFj3y/ymJ7pFgv aRbxLaoALVTOguCNH1mmS+J3epfqphTSZTA9gjoWL69mBgg63kz8PQXhfjYkEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF330BFmzLVM; Thu, 2 Mar 2023 15:12: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 322FCkhl038028; Thu, 2 Mar 2023 15:12:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCk7k038027; Thu, 2 Mar 2023 15:12:46 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:46 GMT Message-Id: <202303021512.322FCk7k038027@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: c7846853d350 - main - rpc.yppasswdd: Remove useless return at the end of void function 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: c7846853d3509529f32286901e65474dd5b6bcc9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c7846853d3509529f32286901e65474dd5b6bcc9 commit c7846853d3509529f32286901e65474dd5b6bcc9 Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:07 +0000 Commit: Warner Losh CommitDate: 2023-03-02 15:01:39 +0000 rpc.yppasswdd: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/rpc.yppasswdd/yppasswdd_server.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c index 56c8defc3ba7..8089dac2a6ea 100644 --- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c +++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c @@ -135,8 +135,6 @@ copy_yp_pass(char *p, int x, int m) yp_password.pw_fields |= _PWF_DIR; EXPAND(yp_password.pw_shell); yp_password.pw_fields |= _PWF_SHELL; - - return; } static int From nobody Thu Mar 2 15:12: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 4PSF343cl8z3vvw2; Thu, 2 Mar 2023 15:12: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 4PSF341sKyz4Kt2; Thu, 2 Mar 2023 15:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYZrkrpiMmatv53EVK4av3Y/vsIN1AOJSuIEILNv1io=; b=O1/5oAViKS/Kr7iUeqp2dihm8auhrzfywM+gHWKoKkz78qN6uFOliSvsMQPsGsn803JxkE T9OMTTGD1fuYLqB9dX/TxbWPqUMVpPcrOiytfShXf9Pqc96KmWtVCQFtK97e4pWBz4RcZP b8yr+aPhzPJlADUXY7UMxxhQNs/IDS194LxemIWZ2MtSmvyvzlo2OhKFP3TZADz/4qmfm2 7vU80n4PaTxqKZp5bsLt30DdH9j0R4jLVkoYqoWHd5vcSvPl9m5NS/1NMP01FAnSNkvI3P hUz0pqC3k6YZ3iGhjUmuOSG3cwjKPt9KTnYb2fYGzBcfXWp2lue/RULPRnkmKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYZrkrpiMmatv53EVK4av3Y/vsIN1AOJSuIEILNv1io=; b=Ft+SyCGzp32fOhklzDAhyVc7EbnI3E6Bqo/sNaYknUWNwM6zreZVXNx1KRNorg8jKQqmx3 H5Yi+UnZCtUEJxAdwInHujlEWuGzUPMnTK9FZ0idhKLovpkJN8yNlkJ2Ft6w7b8onrtIsB an8ExJJEP3jEk5Snu//qmf6DnmpUzGdM/4wXq8lGNIP7HClCMfxYpo1hSsqEj3LfBiD7iJ fGUQNRF/CIW6cQVXEzO+LJi/TBN8yayal8v46JsZE/oBrPjv8C4WB4xVXjc2EqXaGGpqzW IceknVwR7vOhgDDAaksJMAMijPRoKaikxFUt+ORIQ2MvFEGO09Ab1nhgAttV5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769968; a=rsa-sha256; cv=none; b=NPEo66UL5mMQ3suhSClneaL+Qb7lwOZfySUI3/4XxcnBk61rez9f+dvAK5igQ/3sHk7VLD Yf9HC8cDma/nNpq5jfAqAwcVRijCDpGNbK2+Yl5ToKvxMu3FuWn1wqTm/A0bABSBSrBYV5 JC0WNa77SvZh18I4D9LQYZ/k5Ijc7gJ2rPpo4LM8G5Pvpi1kR1GnOnLR+LZK35WP6A//tE z/vhcrQtVjUxooOU9Ooyi24D0fhFAbb2PQmyFTwf/VWF+NQaY4mppve7Djt0I/aZGophNH vYxitMULSjsIlQFU6XZu5iPR8D2g90qtFLHwT4MpSiPNZgBc3wWFewtJSBHdrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF340zZJzLY5; Thu, 2 Mar 2023 15:12: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 322FCmcG038058; Thu, 2 Mar 2023 15:12:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCmcH038057; Thu, 2 Mar 2023 15:12:48 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:48 GMT Message-Id: <202303021512.322FCmcH038057@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: fce4b0c51d7c - main - rpcbind: Remove useless return at the end of void function 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: fce4b0c51d7c2e304df555879046fcc043e69866 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fce4b0c51d7c2e304df555879046fcc043e69866 commit fce4b0c51d7c2e304df555879046fcc043e69866 Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:07 +0000 Commit: Warner Losh CommitDate: 2023-03-02 15:01:39 +0000 rpcbind: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/rpcbind/rpcb_svc_4.c | 1 - usr.sbin/rpcbind/rpcb_svc_com.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/usr.sbin/rpcbind/rpcb_svc_4.c b/usr.sbin/rpcbind/rpcb_svc_4.c index b6ee61771edf..ac96f3c39f8f 100644 --- a/usr.sbin/rpcbind/rpcb_svc_4.c +++ b/usr.sbin/rpcbind/rpcb_svc_4.c @@ -245,7 +245,6 @@ done: } } } - return; } /* diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c index 31cdaf96f074..c6b4930d6972 100644 --- a/usr.sbin/rpcbind/rpcb_svc_com.c +++ b/usr.sbin/rpcbind/rpcb_svc_com.c @@ -1225,7 +1225,6 @@ send_svcsyserr(SVCXPRT *xprt, struct finfo *fi) xprt_set_caller(xprt, fi); svcerr_systemerr(xprt); } - return; } static void @@ -1318,7 +1317,6 @@ done: #endif } else (void) free_slot_by_xid(reply_msg.rm_xid); - return; } static void @@ -1344,7 +1342,6 @@ find_versions(rpcprog_t prog, char *netid, rpcvers_t *lowvp, rpcvers_t *highvp) } *lowvp = lowv; *highvp = highv; - return; } /* From nobody Thu Mar 2 15:12: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 4PSF3533lrz3vvt1; Thu, 2 Mar 2023 15:12: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 4PSF352bnkz4KwV; Thu, 2 Mar 2023 15:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N29jzwaP/MzBzmiNT0VYMo0quw0sBjfYoLCE1DkiY4U=; b=yJ+xtf+ZQJkMWt6RaUWc7HhS6dz1svW+j2Hq6MnzX78rOyX2/QSOfxd9CfPdYCy6VFbPDa szZRtbXy/gt0sB/vaA/avFWl/lNq5wIBhYhUSJz/Y5KKVXuVR3NyuqrGO7nVa1B+KtARB9 dCBCSZuYk7P3+IUvCPIeTD3kSFzhLTXFNjmsJdX6ZSa9trmrQm0emRzCGvNhYgd0dcybVp ziExhZgO0v9Zomyhqk66CColjk8VkPoF+H3TAx/Wut8ABf7I9cmMplgabY/64Pj5/ctZ6Q aOBEE2PGzW0vkwvTGQyR1wNjpMl2MLHomIVfs1uSiaE+O59xnHiApHEKhNb5gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N29jzwaP/MzBzmiNT0VYMo0quw0sBjfYoLCE1DkiY4U=; b=iReqWwttSGVEFFPkohQrKrYyLxn+oiyXULhlX1xBb6qK5ekvC6eQ21NiL156UARhVmX7w6 lhSR494ZJ2yv+Rlyq3jKXTNmruJip7LcKfdzrk+FRLSCM5Fra2ki6jZCedWWMZ+3l0SGYf PCDbSOkDJgYD5ijebrIKgCUJadlbjPwFQeKCvKRjwTb3Em50IPtaDGN7axknVah3v7Sd4N h2uNAie7X+pXXdIRDHiJ0ww075TrjzOEAlcad+l1zB+DX0N6dvvUt3WpESMV7dYKOAGHXY Ux2q2epoQfXbieYWsP3nsjWDGh6SovJTM/wXnQPTIlyqZT09NuaPmUdoMVgZWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769969; a=rsa-sha256; cv=none; b=oie3MBXT8RSoEAwDQeWYQTtE370FZnMKF1n07X5kFXRG3gYABUU+2YdlnnM4W7WDUVQBrh g163fsoBY+xe3AafVWfbuCoyQ/8th4rMe/EX5jeiRRRyYT5GqdPuP1Kl8TxjwJ+qjAs3Oq NpZjgXv1VHK3yTsMH7g+A4NyAUv64yAw1B4ajcLzC6OtXTRt3JFbQXMMpZtQyFHDM/x7Xw rPP/P2U//g2avxvh3kmkpr8IJZIg5YjECtdgCt68BVvyM8oUr4XfBYipRrhjAIxZZQZYY/ 0wu6iuL3lcVMVBfAfNxPUct46DMrNqUjkLcO+F3IAdCKEszFR+PM2CcKm+Crgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF351jdczKsx; Thu, 2 Mar 2023 15:12: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 322FCnie038079; Thu, 2 Mar 2023 15:12:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCn36038078; Thu, 2 Mar 2023 15:12:49 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:49 GMT Message-Id: <202303021512.322FCn36038078@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: 0fd15eb33548 - main - rrenumd: Remove useless return at the end of void function 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: 0fd15eb33548f8f9f3bb5aae25226b4dee402b4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0fd15eb33548f8f9f3bb5aae25226b4dee402b4c commit 0fd15eb33548f8f9f3bb5aae25226b4dee402b4c Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:07 +0000 Commit: Warner Losh CommitDate: 2023-03-02 15:01:39 +0000 rrenumd: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/rrenumd/rrenumd.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c index dd08396b6421..2b9f45c4e6cb 100644 --- a/usr.sbin/rrenumd/rrenumd.c +++ b/usr.sbin/rrenumd/rrenumd.c @@ -348,8 +348,6 @@ sock6_open(struct flags *flags } #endif /* IPSEC_POLICY_IPSEC */ #endif /* IPSEC */ - - return; } static void @@ -414,8 +412,6 @@ sock4_open(struct flags *flags } #endif /* IPSEC_POLICY_IPSEC */ #endif /* IPSEC */ - - return; } static void From nobody Thu Mar 2 15:12: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 4PSF364vMWz3vvt3; Thu, 2 Mar 2023 15:12: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 4PSF3648W0z4Kpw; Thu, 2 Mar 2023 15:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2TbIqIcLHwXMQfD7rXf98NbU5/FONxLXQw4QQrCtYk=; b=rJ2TFUyc8L3ifdMD0c9xe9EnvBWnLvL0KO4HlpmEX7sZlhIsVWYpy5Z9sttWBaypN4+k4w 1+i7ckqTHr5JQoe/nEnfbgdCph1MHOLQvJHpQDfdZYVrw4l4weQ3lEQBU4+knajHGpXUB2 yhveJH/qWYQBz3mxldTMnNDOO6e5mZvpoVCy+/yF5/YoCQGbVF55axjL++VVErL85BPQhj KZN/HLE4pZNMnbaqLjjJ8G9Beq4sFlyMTqnQr7zfHpLQWn/IcOeli+yYmcVlbzSyxYlwiv 39dv9qjeyoHZeA9eW0tQYIeqipw+SyYdBZJsJHFq6AP6QYs/6wlgsp45k2szqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2TbIqIcLHwXMQfD7rXf98NbU5/FONxLXQw4QQrCtYk=; b=wJ4qpnOjHacnv/vAgg6Yz5T9JVuqJraRVDzmptkJXxwJIQ08f//3PNpdiWgbvkNZ7Z33MK yNNEkZYoiGVfAvmfMd1HyedTET5YgVZR2NjSUiChmtMwsqb8qYcgsMun0qNYKWSSldggS7 rfjEzEcYhDWv3g5lTQm34ABiaa3Xw6juLASn0yKy3JfWTO+p3LDgiXXLKCXgFH0YAAwFLm qokwYEmVvKshzewcw+qsVmlGfN+4GgdUjI6NZzNqBP6XeJp32PyVJHwgNfpxFXVFQmz8i8 FpDYaPCgVBTOu6Z9jF+gSaz+fgkHGohP5pNmd4NOLOVVh1bfrlBkm3Jm8lBtjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769970; a=rsa-sha256; cv=none; b=P0buO734Kg80rXlId6RuNvfyEl7cKIvb27bsaXm3AFqkRKAahsWNsPldU++k40aoOOeOa8 MUAE8qJBaFDYt/RzZutaAX+q9MkAJ2LB3+TLvgHHDWyrujiH8CjJ1KWG8IjMnR/YyOt53t EEPA4mZW0d9CzoIhkx662nHYNfet8+vSoq40RLZZKEzGPCvJRqjOsveJZQoqV5087OO78g 784JI93c4/IgYGwneWC7pzHKbMH3lN+LGcN0lOJQvDDJEtqRJNZN4mi8Qx/1rODr0PbH2M c41Mjp/ZAoLCPLngWiKvM6o8lRjVeXAheEXGd4qfO7LmTx9yCHcmpeg+nEZxqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF36310MzLNG; Thu, 2 Mar 2023 15:12: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 322FCo3f038098; Thu, 2 Mar 2023 15:12:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCosF038097; Thu, 2 Mar 2023 15:12:50 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:50 GMT Message-Id: <202303021512.322FCosF038097@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: 0715ec7eb475 - main - usbconfig: Remove useless return at the end of void function 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: 0715ec7eb4759489b68b651a205922a6564ed798 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0715ec7eb4759489b68b651a205922a6564ed798 commit 0715ec7eb4759489b68b651a205922a6564ed798 Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:07 +0000 Commit: Warner Losh CommitDate: 2023-03-02 15:01:39 +0000 usbconfig: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/usbconfig/dump.c | 7 ------- usr.sbin/usbconfig/usbconfig.c | 5 ----- 2 files changed, 12 deletions(-) diff --git a/usr.sbin/usbconfig/dump.c b/usr.sbin/usbconfig/dump.c index 4a52ab9fd85e..84de721a4fc9 100644 --- a/usr.sbin/usbconfig/dump.c +++ b/usr.sbin/usbconfig/dump.c @@ -264,7 +264,6 @@ dump_extra(struct libusb20_me_struct *str, const char *plevel) } printf("\n"); } - return; } static void @@ -276,7 +275,6 @@ dump_endpoint(struct libusb20_device *pdev, edesc = &ep->desc; LIBUSB20_ENDPOINT_DESC(DUMP3, edesc); dump_extra(&ep->extra, " " " " " "); - return; } static void @@ -294,7 +292,6 @@ dump_iface(struct libusb20_device *pdev, printf("\n Endpoint %u\n", z); dump_endpoint(pdev, iface->endpoints + z); } - return; } void @@ -353,7 +350,6 @@ dump_be_quirk_names(struct libusb20_backend *pbe) printf("%s\n", q.quirkname); } printf("\n"); - return; } void @@ -385,7 +381,6 @@ dump_be_dev_quirks(struct libusb20_backend *pbe) } } printf("\n"); - return; } void @@ -395,7 +390,6 @@ dump_device_desc(struct libusb20_device *pdev) ddesc = libusb20_dev_get_device_desc(pdev); LIBUSB20_DEVICE_DESC(DUMP0, ddesc); - return; } void @@ -444,7 +438,6 @@ dump_config(struct libusb20_device *pdev, uint8_t all_cfg) printf("\n"); free(pcfg); } - return; } void diff --git a/usr.sbin/usbconfig/usbconfig.c b/usr.sbin/usbconfig/usbconfig.c index 81112d957bbb..06aafc06cde6 100644 --- a/usr.sbin/usbconfig/usbconfig.c +++ b/usr.sbin/usbconfig/usbconfig.c @@ -182,7 +182,6 @@ be_dev_remove_quirk(struct libusb20_backend *pbe, if (error) { fprintf(stderr, "Removing quirk '%s' failed, continuing.\n", str); } - return; } static void @@ -205,7 +204,6 @@ be_dev_add_quirk(struct libusb20_backend *pbe, if (error) { fprintf(stderr, "Adding quirk '%s' failed, continuing.\n", str); } - return; } static uint8_t @@ -312,7 +310,6 @@ reset_options(struct options *opt) if (opt->buffer) free(opt->buffer); memset(opt, 0, sizeof(*opt)); - return; } static void @@ -542,8 +539,6 @@ flush_command(struct libusb20_backend *pbe, struct options *opt) } done: reset_options(opt); - - return; } int From nobody Thu Mar 2 15:12: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 4PSF380Vd1z3vvlK; Thu, 2 Mar 2023 15:12: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 4PSF374rbpz4Kvg; Thu, 2 Mar 2023 15:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8DUlp1xQXyNApu8fB8VOac+xXfmb2im8sIGWNocbUUI=; b=KFSH1bZc1Cxykei8rn/vJPDVtYgMGNlVlApmpoJfvIVUiIAkuG0BDaTubzhk59d3/Z5oHp qSjs+8jIly9RT+0g7d1wfmKuoKqgHV7umd0KhEYou7mLyr3aE20N+vFH/pmWy8ZlcV/yQe N+ACMAiXTICOgEZLce8/Oxj63kYVB1tesKdsMfmfV4XEfNTcSjBLtbBFIT701hMM63kMXd Y0CW7I0f2WI54qz6PxWInWGAFWLPFRtNPuzf08HtjLbqv04ZkfkalM3g6tA7HiElwBWXDT FwIbgT6nVyFEv2NV9ZfMpE7SzUqP28l6GhLnB84dxHPndgQheQeSqIXfGo0+mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677769971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8DUlp1xQXyNApu8fB8VOac+xXfmb2im8sIGWNocbUUI=; b=gjR9dKx2bsAJyqGZQjObWQd05ljp5ZTCbAwn7aRvAlIVRGNSs7Hk1VYdQq3axUqtQAxX+K tGGP0RnafwSVeJSfngnbABPdCcv3hSmuuYsfM4ljHTZY4i/w/fE1+iFmMkdB0E6rdp6ofO 34yngP8N6pkB/QznUNZ2vP4vxjjC8F0pyCvWzpEnTcNLuyIfKXaqxYghcHN7H2ePrlaz6N SSQscn8JIN+ya+b26vA6GfK8P7C1J6P5WNhG1y+S3WNfL6ZG2z82CQ73V2wIoCD/0R29qw yl+4jF7cZ265oOwjrCoj60rLUKuMoGlkjnbr3ociXkSvaMQeBJUJ54QiLRiEew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677769971; a=rsa-sha256; cv=none; b=HNBnvNH6TPnYgVn9jjgOf9q8zaKraRROJ0Ym5gnhowukhWId4gPC97GUzO6NqEzPfZb+Wu dkFEt92begtnQBdhGdOWfhoN5rP0XxUPduh2TPoC7Rb095rXjKXY6mTy6wicv5a/3OLkf3 /6rKIBtGOk8SADjdhFInRYIc5UziPMAqIeEtNLUgyGwXMLzy+Ydwzg8GElkxZcelztRrR8 4FwnesyKXeU9Upz82ek7mBJJko7CO0fhWWF8SxABIVFUr82EadzKuONdzJQJw1jNgEmSiV I7fwNLl0Ouh4XJcC0S5c6PzeKF41xF90f5wSqRlD39QmicuNRboZPdpz19M6Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSF373y1szLDR; Thu, 2 Mar 2023 15:12: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 322FCpuQ038133; Thu, 2 Mar 2023 15:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FCpCP038130; Thu, 2 Mar 2023 15:12:51 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:12:51 GMT Message-Id: <202303021512.322FCpCP038130@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: ae90e9a9d6c3 - main - yp_mkdb: Remove useless return at the end of void function 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: ae90e9a9d6c3d4f28b2c7d9bd203187ab969b294 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae90e9a9d6c3d4f28b2c7d9bd203187ab969b294 commit ae90e9a9d6c3d4f28b2c7d9bd203187ab969b294 Author: Elyes Haouas AuthorDate: 2023-03-02 14:59:07 +0000 Commit: Warner Losh CommitDate: 2023-03-02 15:01:39 +0000 yp_mkdb: Remove useless return at the end of void function Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/656 --- usr.sbin/yp_mkdb/yp_mkdb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c index 19139c3dc61e..021153bdb03a 100644 --- a/usr.sbin/yp_mkdb/yp_mkdb.c +++ b/usr.sbin/yp_mkdb/yp_mkdb.c @@ -92,7 +92,6 @@ unwind(char *map) (int)data.size, (char *)data.data); (void)(dbp->close)(dbp); - return; } int From nobody Thu Mar 2 15:27: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 4PSFNM3n9wz3vwTT; Thu, 2 Mar 2023 15:27: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 4PSFNM3DWKz4PBM; Thu, 2 Mar 2023 15:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677770867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pRScWnv/2ppEWjrLP8quWrKzvdyQXgqYYt+OD/7uAC8=; b=KafqPfdu1VCCO4NuWG0n0jDab+TlCFdn1hjtbuQZeco6xeCDqKxvcJFjKjkPsasEiNC0zc YIQXPg5r4xP4aaWOH1J6HQGozCcM9uzFI7oXmtCXvTbpqmS8rghjgsixp98PSpGxoaouAC epKWxdZxyTfVecHLhbVuE5Mlv3ZmD4fsmV3Fo15MeQ9BT5Wl64HA/V0kfJaBF45yzW6+eD YGMXSRnOgQYC/NdZniXdC9Xlrmt/hR7XbKd9mPxEvStV8BbBPRwj24swvwftXaWnhWC4Sh 2/9c4dR54oZUyiZjW+qeQ7ypnnDGg3XSNJBdLp+wmxNVF150Ov0buV/Wxarx+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677770867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pRScWnv/2ppEWjrLP8quWrKzvdyQXgqYYt+OD/7uAC8=; b=Vgpp6tg3zBMXSzMN6G6DaNV5CxnJ7pksODir+PKOhf3/cpefZGDbVZxQauy0CaiA8HtswT ZnJpKEg0lyjk12T4+VhE7xlL59LpjG4XkzFIz4iF+cjbjZNrwrl57YC8EyrfKQckocDga8 QzqODtJYjSwY3eiEQvntmz5MdD0PV5ViXW1/gRlSPYU9yM12B0oh9sQljl79Fo4ZQ09lao HLjiJfx92Qmk+RiROn6ys1BqFWSqtmCf+qp1/l7Pahavo6t6Bm7pbf4Czy7oQ1NIkl6EFs 5YcqGZoBskpxuz/9Dyjw0s19EzV7iK/0tFMUHtas0Aglu5QTsTYh5wuOy/oOGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677770867; a=rsa-sha256; cv=none; b=U22f7G85UQ0Q3y3FdwZmV4gQ4lUuBT/wBCNyW577bF7tM8zx5lA15J5F1JwFv+0whFBJG7 Ldnifj/mcMjeJIDZY0w/A58+39WvMvotDjzlhVAn59pQ3wau+OlBzy1kzhfZFUTTEIat/K +o6lf5XWpbWOu+slyrvOpKWp7eahKNG1ifujitiJADZRcgwvosWATYwuLoC/pT99iWGDgl Qkx4d1CNE0SqKO3nXvg48BOOyjHHRMYvBATsVyhggzC4gbcZZL35gX0r/rDHj8vxF4iU9E hz+8yzocmuu3ob7R0kk7Nldg7dORuVPaKsVs2GdToaUhIhu3qu0kRKmU3aX04g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSFNM2GpdzLZB; Thu, 2 Mar 2023 15:27: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 322FRlct054644; Thu, 2 Mar 2023 15:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322FRl5J054643; Thu, 2 Mar 2023 15:27:47 GMT (envelope-from git) Date: Thu, 2 Mar 2023 15:27:47 GMT Message-Id: <202303021527.322FRl5J054643@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: 2c1b8eb29d92 - main - ftgpio: Fix panic at attach and use better device description 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: 2c1b8eb29d92d0911e7493c6a16be04ff6064ad1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c1b8eb29d92d0911e7493c6a16be04ff6064ad1 commit 2c1b8eb29d92d0911e7493c6a16be04ff6064ad1 Author: Stéphane Rochoy AuthorDate: 2023-03-02 15:16:35 +0000 Commit: Warner Losh CommitDate: 2023-03-02 15:17:04 +0000 ftgpio: Fix panic at attach and use better device description Use ftgpio_group_get_status instead of inlining an imperfect version of it to get correct register and avoid panic: ftgpio_group_get_ioreg: invalid register 0 for group 0 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/677 --- sys/dev/ftgpio/ftgpio.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/dev/ftgpio/ftgpio.c b/sys/dev/ftgpio/ftgpio.c index 874f6e832949..7acfdd5b900e 100644 --- a/sys/dev/ftgpio/ftgpio.c +++ b/sys/dev/ftgpio/ftgpio.c @@ -103,7 +103,7 @@ struct ftgpio_device { } ftgpio_devices[] = { { .devid = 0x0704, - .descr = "GPIO Controller on Fintek Super I/O", + .descr = "Fintek F81865", }, }; @@ -289,18 +289,12 @@ static bool ftgpio_pin_is_output(struct ftgpio_softc *sc, uint32_t pin_num) { unsigned group, index; - uint8_t group_io, ioreg; bool is_output; index = FTGPIO_PIN_GETINDEX(pin_num); group = FTGPIO_PIN_GETGROUP(pin_num); - ioreg = ftgpio_group_get_ioreg(sc, REG_OUTPUT_ENABLE, group); - group_io = superio_read(sc->dev, ioreg); - FTGPIO_VERBOSE_PRINTF(sc->dev, "group GPIO%u io is 0x%x (ioreg=0x%x)\n", - group, group_io, ioreg); - - is_output = group_io & (1 << index); + is_output = ftgpio_group_get_status(sc, group) & (1 << index); FTGPIO_VERBOSE_PRINTF(sc->dev, "pin %u io is %s\n", pin_num, group, index, (is_output ? "output" : "input")); return (is_output); From nobody Thu Mar 2 16:54: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 4PSHJH5FGgz3w1lG; Thu, 2 Mar 2023 16: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 4PSHJH4WYhz4bxm; Thu, 2 Mar 2023 16: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=1677776063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ap8+wucvZ6tE+VMUTBNNNFWsJqyxq+aWyJek9FM+Bb8=; b=QB6x7JhUuFQYnrFqGGaGvclnlECYSaMjfDLNHCW3/aJQ7l9J6/NGVLDRC0v99dpu1Wk3pD Nx0OhYIQ0NW868Fd0GxxKuhDFVABrkZcfGbVps0Y1NrAE4FG/W8uhQIv1fLzXoObmy2t4G IGa/tnlmteT7BXKaWtwNHIhlEv7xb5XDgm3TAI8xtIxdtexH8XI0TzfUcMZt4wHphHCth2 nqlIn2Creft2SHDqK375gP7tNmfmHcTqVgG/TJCxYI24zicIhbV3x6V+L+3CbShWhN6bhJ KX7ANd+9ZJHHIaWb8nmiQrF7Pbz+ZfkB6iESvhEu4LyC2jHC1arCNeKEnBr9XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677776063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ap8+wucvZ6tE+VMUTBNNNFWsJqyxq+aWyJek9FM+Bb8=; b=AXWds8bbScxg3DA80yE7N9SX1cBzpJ3bEtds7Le1VyUIrC5Y4MsecKB+yVbckbDaieoABE nDA6Nu9b420zQgFMWP4lxyoknpt/v4ir0JFsf7v09IcVuKyvi8ReUtKi8OO8xOgI4PfEgM p87LW+uKYrqIeYeb6al0u4FbY53Fk7zWrHJcUHUNr6vY7yBs2CFpxyFpA6JxTIK3Uuz+1z p4ABeI0nGSnicyHqvspTJgftndUVVEo47vas1MKxcpkf7NwOcSzgc0PTjr9yM4qVKU/Udz W82f0NdNt4bybIDsh6nNUmLDDiOLzPsLzDPCSu8tKVAK8JmBpztcyW8afrh4DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677776063; a=rsa-sha256; cv=none; b=YhMX1CmKr6kUtrwKtEBO1c7G8T79xVccnFZHha1fAQOa5YtnxI8obrnLe6Gfr3+63Xi1AA Z7LofyVlzQrHSQsq2FUt6V9rKdPZjXC+YYmC+qOyt5Prae2UVcgyio9vddOiUvuJIWnhh+ B5NjyDAf172FWOLmIJcOzloq5YXXx6+nzozA/Tkt9BYgO2mFN7kxefupnK8iWrdbQZ1eWL NKJ5HgsrNvw3ruhIazI84FqeX+BqigoFnAFPj3JHPN33RDPOfDtMzrMPYef9Dcjz4FHzCq tjHyBIm9A4y+EvQb//lPTwvoQAragCYzM8EB+SpuO0u4ELmwQEReY5iisISFag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSHJH3SSszPHn; Thu, 2 Mar 2023 16:54: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 322GsNl2001894; Thu, 2 Mar 2023 16:54:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322GsNmv001893; Thu, 2 Mar 2023 16:54:23 GMT (envelope-from git) Date: Thu, 2 Mar 2023 16:54:23 GMT Message-Id: <202303021654.322GsNmv001893@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: de1a17db8963 - main - moused: Fix typos 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: de1a17db89630f0e2b42739093d7c0f2463d6c09 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=de1a17db89630f0e2b42739093d7c0f2463d6c09 commit de1a17db89630f0e2b42739093d7c0f2463d6c09 Author: Elyes Haouas AuthorDate: 2023-02-24 06:53:51 +0000 Commit: Ed Maste CommitDate: 2023-03-02 16:53:44 +0000 moused: Fix typos Signed-off-by: Elyes Haouas --- usr.sbin/moused/moused.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c index 08aa16f6103b..a6d7a9c2f29b 100644 --- a/usr.sbin/moused/moused.c +++ b/usr.sbin/moused/moused.c @@ -3013,7 +3013,7 @@ pnpparse(pnpid_t *id, char *buf, int len) id->revision = ((buf[1] & 0x3f) << 6) | (buf[2] & 0x3f); debug("PnP rev %d.%02d", id->revision / 100, id->revision % 100); - /* EISA vender and product ID */ + /* EISA vendor and product ID */ id->eisaid = &buf[3]; id->neisaid = 7; @@ -3053,7 +3053,7 @@ pnpparse(pnpid_t *id, char *buf, int len) } /* * PnP COM spec prior to v0.96 allowed '*' in this field, - * it's not allowed now; just igore it. + * it's not allowed now; just ignore it. */ if (buf[j] == '*') ++j; From nobody Thu Mar 2 18:18: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 4PSK9L13Ngz3w6Ym; Thu, 2 Mar 2023 18:18: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 4PSK9L0VvPz3MMk; Thu, 2 Mar 2023 18:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NAVhMisvcIOChcKZ52blPMizcb+LD5P80ECqf9+dvps=; b=gYn+ee8C85Az2IHPG5lnc2x2avxyiQastx8+wyJympAqXuBGSDeKRt0oXtQXGejCxrHsYh rrWpuAFSgQB262lV4itKJKIpa+GkV1GVi17eRpBiZDOY/cWpqStin1nt3NeJN09+u8assY bouwSpOn2Qw6q0iUTjvCLkkVQ6yJIlPcrF3P0tC0QYOHILHvU9hM1dq6fytWcu636sb7wz xO0+dTp8l85A2AoWFSUxRHVdNkUS7oSrvjCCQQ4uSI5rrzzDY3V33k9GXs+66GSCPgatNa kMicH0oTNDoP9PltBFkzbqIGYif7g8scPoFgjfPqY4VnMnusaeJZ3CL36Zk1zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NAVhMisvcIOChcKZ52blPMizcb+LD5P80ECqf9+dvps=; b=eJhBjIDXabOD93DLwDc4S8WwRrwxJXJDhsnPV8C9rbR8ceuiy/O7LO3kkmIMvJgh2WR/4p yMP7BuMmfpY/fcwnnhgDsF5LTpjoFmQidGzUD7TLqd1AODMIOmU7QhSuACfTIWW16x+vUz h5GerhbsE96/Rmzl06YRwfZZlxzcHf2K3eMV3M9oyfOiPmydhnzvAjIkFH4k+THdDOqloc 62lwzqHfb66rdWHF0JnT64R/W33ln8zLcxxljNBsrMP/dZBC3rI7lbemH3Fdmh3bdj+w6k pKlx4CrHFTUXyADtUiss3e2ji+3CWzh16MVbXI+RaWwNfbPw6WNIiNxP3tiTng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781110; a=rsa-sha256; cv=none; b=SatKCTL18LzTW2UF1uHk0wizeQvVxu+hkSUELZNDqUU8tu0qazdaOYk+p0Zx0z/ByZf8u+ LulO79zLKzwoQg+heOGZ8yF/MjQxOREXpmueR5IiODej+7TW21fcl7oYRI+hW78qjXOFUw fRA4JpKT8JreAX4+S6tnVaHccLPK1v1pVdjSDQ7JqSoeGj01kotSzPx/UARp9SfVAuZr+B x9n8w/jnDtskFtslJ366mGKzgF+Ih+Y8rp0/aD+jk9AkrlQNLjYW1C2cPC44T4bNoF+2bP FDRTLW7ZQFoEEChEWUi4NEgSve3RSmcP2IjDxiKhFD2GUz3+aVsVYBMoXzdJbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSK9K6gPHzR9K; Thu, 2 Mar 2023 18:18: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 322IIT8Y035373; Thu, 2 Mar 2023 18:18:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IITGb035372; Thu, 2 Mar 2023 18:18:29 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:18:29 GMT Message-Id: <202303021818.322IITGb035372@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: 6c47abb63bd5 - main - kboot: Hack for running on FreeBSD host 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: 6c47abb63bd55db0f5234ed1c3c107a103e6fb85 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6c47abb63bd55db0f5234ed1c3c107a103e6fb85 commit 6c47abb63bd55db0f5234ed1c3c107a103e6fb85 Author: Warner Losh AuthorDate: 2023-03-02 17:31:05 +0000 Commit: Warner Losh CommitDate: 2023-03-02 18:12:09 +0000 kboot: Hack for running on FreeBSD host When we're running on a FreeBSD host, we can't open /proc/iomem. So, for now, just assume that we have 32GB of ram starting at 4GB. Sponsored by: Netflix --- stand/kboot/main.c | 5 +++++ stand/kboot/seg.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/stand/kboot/main.c b/stand/kboot/main.c index f81d7b2cead4..1cc4c0531772 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -86,6 +86,11 @@ memory_limits(void) committed_as <<= 10; /* Units are kB */ } } + } else { + /* Otherwise, on FreeBSD host, for testing 32GB host: */ + mem_avail = 31ul << 30; /* 31GB free */ + commit_limit = mem_avail * 9 / 10; /* 90% comittable */ + committed_as = 20ul << 20; /* 20MB used */ } printf("Commit limit: %lld Committed bytes %lld Available %lld\n", (long long)commit_limit, (long long)committed_as, diff --git a/stand/kboot/seg.c b/stand/kboot/seg.c index 947aa0a2a7a3..4da53e2bc75d 100644 --- a/stand/kboot/seg.c +++ b/stand/kboot/seg.c @@ -286,6 +286,9 @@ populate_avail_from_iomem(void) fd = open("host:/proc/iomem", O_RDONLY); if (fd == -1) { printf("Can't get memory map\n"); + init_avail(); + // Hack: 32G of RAM starting at 4G + add_avail(4ull << 30, 36ull << 30, system_ram); return false; } From nobody Thu Mar 2 18:18: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 4PSK9M1h4Hz3w6RM; Thu, 2 Mar 2023 18:18: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 4PSK9M0xqYz3Mjt; Thu, 2 Mar 2023 18:18:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCXHcVJ72ObxzLnS1QryTO65W2kz1Zr8M0lXEnaio2I=; b=pJcM0pfEULLVe7Iv3RKAzFgPUkNDJ3aSkH/qLL3QQNh03sIGr7rzAmGwcw7X6Ynsv+TtJC HirN9XhcMSJJKeFyheNELl0T50G0YGr5IudOUGxVgr6F7GOkWeAfCzhqdbJw+kA145ISZx bPV7ZXtEz28CpFIk+9pbxcVz0bi8L9VehCtcLeWWnHdWXPBNeqTQGCVKo+aDPv3kNvwa/j ymkHx3HseoJf2sUIHP5m7OSkuNh0aEFM0FKi5dT7xjraaDOhOxluJVBqXz64mOy50MYlgI nUu8XrFls3c2Is2jeAxihsRxxnHoMq4LxaNQvV3MX8Efm8c08NODSJTtEnrAFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCXHcVJ72ObxzLnS1QryTO65W2kz1Zr8M0lXEnaio2I=; b=TiUTg1x1c8p2cIoZJDvfSUHLQtA5CDZKwLheIioyql2vCir2jC2aVU6CTfrHCo46o6RppA Ml1/s5OOFKA4TWZgh2RrZGJQgc2UqnzKYIKkDUuIpr7xu2CXrmz0kYAi6uy+WwxD4aeACK 3ySACELzSLmf/fRa69sL4NwgDtxoDcu6J5/Yx+0buDRiQ2Yh0BZWUgZU/F65fX4/phLRbk IOHF18bHcJBfPpkZ1Je8MfBRNIhlBRvo4nA0wDy2or7R7JVk2n2An80HHjUqP7ZL2ZJfnV uOKI/T/4ccWwxbucOxesQx/GhYhHKjGPscHsL9jwQr8inKHlyrXSJrAXNSzlGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781111; a=rsa-sha256; cv=none; b=rH3A/XVEHjyR+biMVG3rJb6EMyYyTWl8gdQqxBgrMqfs3aEwMG9F8xm9D+WG7+wh6sooTe sf+ow4LBlJcjITLvBkC0cLowx8Bk1EuLu+rvr96rfUwsktCsW11+oShaSSwkFEe7SvLEcl Vb+y0IPSqedZceiy6qK+lcnFXyJRZb50qxubXv7mIkmaEZOerFGY5XE0QvsqDBPPAi/4lS uk1ddf/i6hI2RYVS4xAdUX1KqCvT+jyS3k+oDlsxgOa0UXeaIv8GNyNk23rDPupmKfpUu7 p39F+VXJcxGgXg6gtwCpL8ktbt3IxK+jckzdnOa3aIS8xKjMag/PfGr+liRkqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSK9M00gqzQW2; Thu, 2 Mar 2023 18:18: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 322IIUp8035392; Thu, 2 Mar 2023 18:18:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IIUbT035391; Thu, 2 Mar 2023 18:18:30 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:18:30 GMT Message-Id: <202303021818.322IIUbT035391@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: 3a616b10d8f7 - main - kboot: Better default boot device 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: 3a616b10d8f7bb0f1af7d6a971bdfbabdfecd896 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3a616b10d8f7bb0f1af7d6a971bdfbabdfecd896 commit 3a616b10d8f7bb0f1af7d6a971bdfbabdfecd896 Author: Warner Losh AuthorDate: 2023-03-02 17:55:06 +0000 Commit: Warner Losh CommitDate: 2023-03-02 18:12:09 +0000 kboot: Better default boot device Provide a better message when we can't find a boot device. Sponsored by: Netflix --- stand/kboot/main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/stand/kboot/main.c b/stand/kboot/main.c index 1cc4c0531772..e01507323bad 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -232,23 +232,22 @@ main(int argc, const char **argv) bootdev = getenv("bootdev"); if (bootdev == NULL) bootdev = hostdisk_gen_probe(); - if (bootdev == NULL) - bootdev="zfs:"; hostfs_root = getenv("hostfs_root"); if (hostfs_root == NULL) hostfs_root = "/"; #if defined(LOADER_ZFS_SUPPORT) - if (strcmp(bootdev, "zfs:") == 0) { + if (bootdev == NULL || strcmp(bootdev, "zfs:") == 0) { /* * Pseudo device that says go find the right ZFS pool. This will be * the first pool that we find that passes the sanity checks (eg looks * like it might be vbootable) and sets currdev to the right thing based * on active BEs, etc */ - hostdisk_zfs_find_default(); - } else + if (hostdisk_zfs_find_default()) + bootdev = getenv("currdev"); + } #endif - { + if (bootdev != NULL) { /* * Otherwise, honor what's on the command line. If we've been * given a specific ZFS partition, then we'll honor it w/o BE @@ -256,6 +255,8 @@ main(int argc, const char **argv) * boot than the default one in the pool. */ set_currdev(bootdev); + } else { + panic("Bootdev is still NULL"); } printf("Boot device: %s with hostfs_root %s\n", bootdev, hostfs_root); From nobody Thu Mar 2 18:18: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 4PSK9N2vh7z3w6RQ; Thu, 2 Mar 2023 18:18: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 4PSK9N1rqhz3MYC; Thu, 2 Mar 2023 18:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68Fbye1BzDMK7OKkzv0nmAdaV8VmMKxC216fdvBEdhg=; b=dT60a9PLsmYaNxqavIV5V8B9DI0j35J91JR/MLRMa+3hw1NEVJiSg14Dl/WoMfsjTNabac lUY8PGCbVINduTLkYVKLftkRtJrEnZUetJwKof9GYxzD/QfQtfijIDWtJSwpc484cKpMv/ ZtFlWz4oFjovvUpS7tTaMczC5IcpVHoNgyodlyg5UcAZSdZdtHdnFvtMCebZlIRF9+bK56 yY9D9kvs7IuAwtPhKM7zZcHvdFbmh6vXbccDwCFWQ5E5mCtYFnWpIenFbS4gxYmJJw5x9e Wu2kRteFpT1U67dRfRgyvGQxspCLeiX6T5mgnq5MsHLKi14xkdpacHwZ76MCPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68Fbye1BzDMK7OKkzv0nmAdaV8VmMKxC216fdvBEdhg=; b=yfNo8+OTsTXtz78DC8pajF730HKjz5yShhYFIrnerRb4/eTIbxiVvoL/QpGQhzTY/KyNtw K29rd3KCOYyhNoT+tpEYQwOhAB6mpGETTpIjBKNB4fd78S+myO0pT9jJBnVLrruniNp7MF f0TtokVBVLTwOvDsDEK4Rv9ekfao9v500JizTL2+UbuUYDo4PuRLUWvif61dzMEKp6fD9f TtOULE0prRpEZql3g51jHtWsWrwQv6kACV0I2ile7iu2lZfSK8HtPUSWqWLvStitFVrC8F axaNTRKBii1hmutpEeTSJK+ud6yK8UY5V2yCXhGbGBFiJYf7DltymYy33F8BPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781112; a=rsa-sha256; cv=none; b=Nc0CUtvWLfLjGOiEWbywL+FbaRBGlBITZFwYj3/NJdQVSwU4YBUAh9C513syPEkIdryejO 6M1tcJIsyPQVp55junT+3pBL7jD2JD8dgPHTNr6OuXVUqJNHQNpn3Im00Lc0Xb35HlD8NZ B+NV+Leq4bk8Qj5pwtXg2h8PPYH1bcMGliBltbFTRsFdc0knrOdw3Zsn/BZDxP09dH5mNr zKN9imCLaWa1GsAUbrV1XF8p6fqr+0NGlTtT9Ay82GYiegzFI9iJK8RTuC/LgqmYBFMOxz dqISNlGK2g59h+VAZGs6L8+8QbjAu6fZjlDz/c+Al6VtKD7Q1/i2p00VYUNgfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSK9N0wH6zR9L; Thu, 2 Mar 2023 18:18: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 322IIWLQ035411; Thu, 2 Mar 2023 18:18:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IIWLN035410; Thu, 2 Mar 2023 18:18:32 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:18:32 GMT Message-Id: <202303021818.322IIWLN035410@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: 35b4acad2f1f - main - kboot: Use MIN instead of min 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: 35b4acad2f1f7ba87eb9e0c7276ef8eef55b4a9c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=35b4acad2f1f7ba87eb9e0c7276ef8eef55b4a9c commit 35b4acad2f1f7ba87eb9e0c7276ef8eef55b4a9c Author: Warner Losh AuthorDate: 2023-03-02 17:56:44 +0000 Commit: Warner Losh CommitDate: 2023-03-02 18:12:10 +0000 kboot: Use MIN instead of min MIN works for any type, while min() is only for integers. So we were rounding down to 0 since that's the size of 4GB truncated to an int. Sponsored by: Netflix --- stand/kboot/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stand/kboot/main.c b/stand/kboot/main.c index e01507323bad..849ad46add6c 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -344,10 +344,11 @@ get_phys_buffer(vm_offset_t dest, const size_t len, void **buf) /* how much space does this segment have */ sz = space_avail(dest); /* Clip to 45% of available memory (need 2 copies) */ - sz = min(sz, rounddown2(mem_avail * 45 / 100, SEGALIGN)); + sz = MIN(sz, rounddown2(mem_avail * 45 / 100, SEGALIGN)); + printf("limit to 45%% of mem_avail %zd\n", sz); /* And only use 95% of what we can allocate */ - sz = min(sz, rounddown2( - (commit_limit - committed_as) * 95 / 100, SEGALIGN)); + sz = MIN(sz, + rounddown2((commit_limit - committed_as) * 95 / 100, SEGALIGN)); printf("Allocating %zd MB for first segment\n", sz >> 20); } From nobody Thu Mar 2 18:18: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 4PSK9P3Zcbz3w6bV; Thu, 2 Mar 2023 18:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSK9P2Z5kz3Mhb; Thu, 2 Mar 2023 18:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h+gPr88wPA09uaVYC+e6JwWjOZ1HRQZ9oCPFlwrst+E=; b=R784B7aLudaNrdyH8fhSWfi/mR0y3B2OLuQfYms4ot8x3YXg1cEBx9D4AUD/dWUYZ0ixL/ O1OOi0RjYivWtIuG/o5PDK0e/Z4sqtqDd/cHct46hqPQhEZHqT+ApOJlZ1kJ/32UwSUczG 7ThuSDY5lIUXygk6gYKgj1GwTnBAzsiaTEdPYHYPGHK3FLNKofyxfekAYQgPLYu8lONxZv diFM6ouMKMAwwc2nyb1HUPDQpmtyg5Rh1KDITu2PEzrMVzP4Ikv15g5sna9z2Uwv2labf6 S0zBC65D7W4HSVtrrvFrN+j/1Zapg8WKcLi3xVRizNMegwEQXJx7ktWrQEqC4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h+gPr88wPA09uaVYC+e6JwWjOZ1HRQZ9oCPFlwrst+E=; b=iMu835wsECobyJsANqX4rU4Bu7uoxWLOvkXKCMBHHi1XTYFZkv7rmzRGoF6uoWzIggA7TZ BMoUaObOjU8HiomOiGPN8nlFNz/ME13ScmxrpKDuGIOpj/2K0oL3IMcIvrlBBfcxITM7q/ XTlq/aGTvWAShoBjG4uAcP5ULiBbFOuNfyWO6+ca6Sr04BZTnYUnf6Lirg4JOgv/W32LKe zDI4us2vrlNfSAmylvzIsKx32urP23P4YTJoelsMeBYK66MwgH86WPpijl3crRsPao0qIQ zn0qQiz5DeDfBYXGcyp8AOPmPPjezeMVW1VjJ4pWrdT7aVBSmIDc2C7ffreCUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781113; a=rsa-sha256; cv=none; b=vcqm09TB09KjL6qSlrVgjlq7i1FsYekovgZ1eJFRtSbPru2grsROHQr3BLLGA/LoMzzgcS ojaQBAszjxjMAaI+Gh9pCzNpdc1GV71JjYU5FRyRs+SRELFHuErwHSykAH7G/clagBcH2J GFUJkxLPaLGxXvJ7AmZTZsn3fX50DItGJvxywqRaTSquFsRuAENTpCYKeqElGNDTF24JQm 3Kysxcsk6SLuPWbCHutK0IQ5QGrnn3g9fn1S5l439+nJUYKdDORoBXSTCJBLzTuZTEBikk WtXgIR/3TKOs7zSZaAAkuRMdVk0Rhe1iHhOEKPC1yEoNpE1qdLYlXFBkgomEwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSK9P1fmdzQrG; Thu, 2 Mar 2023 18:18: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 322IIXHD035430; Thu, 2 Mar 2023 18:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IIXv4035429; Thu, 2 Mar 2023 18:18:33 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:18:33 GMT Message-Id: <202303021818.322IIXv4035429@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: 7b4299eb4e7c - main - kboot: Fix hostdisk_override 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: 7b4299eb4e7ccf3f2a9ecf7b3fadaa8e5aa78dc3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7b4299eb4e7ccf3f2a9ecf7b3fadaa8e5aa78dc3 commit 7b4299eb4e7ccf3f2a9ecf7b3fadaa8e5aa78dc3 Author: Warner Losh AuthorDate: 2023-03-02 17:57:43 +0000 Commit: Warner Losh CommitDate: 2023-03-02 18:12:10 +0000 kboot: Fix hostdisk_override We were assuming that hostdisk_override was both a directory and a file, which is not going to work very well. It's supposed to be a single file, so recode it as such. Simplify erorr handling a little as well and fix a return type-mismatch that doesn't matter for the generated code (return NULL is the same as return false in this context) Sponsored by: Netflix --- stand/kboot/hostdisk.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c index b71ae256b0f6..5cc7825034dd 100644 --- a/stand/kboot/hostdisk.c +++ b/stand/kboot/hostdisk.c @@ -249,31 +249,22 @@ hostdisk_one_disk(struct host_dirent64 *dent, void *argp __unused) return (true); } -static bool -hostdisk_fake_one_disk(struct host_dirent64 *dent, void *argp) +static void +hostdisk_fake_one_disk(char *override) { - char *override_dir = argp; - char *fn = NULL; hdinfo_t *hd = NULL; struct host_kstat sb; - /* - * We only do regular files. Each one is treated as a disk image - * accessible via /dev/${dent->d_name}. - */ - if (dent->d_type != HOST_DT_REG && dent->d_type != HOST_DT_LNK) - return (true); - if (asprintf(&fn, "%s/%s", override_dir, dent->d_name) == -1) - return (true); - if (host_stat(fn, &sb) != 0) - goto err; + if (host_stat(override, &sb) != 0) + return; if (!HOST_S_ISREG(sb.st_mode)) - return (true); + return; if (sb.st_size == 0) - goto err; + return; if ((hd = calloc(1, sizeof(*hd))) == NULL) + return; + if ((hd->hd_dev = strdup(override)) == NULL) goto err; - hd->hd_dev = fn; hd->hd_size = sb.st_size; hd->hd_sectorsize = 512; /* XXX configurable? */ hd->hd_sectors = hd->hd_size / hd->hd_sectorsize; @@ -284,12 +275,10 @@ hostdisk_fake_one_disk(struct host_dirent64 *dent, void *argp) printf("%s: %ju %ju %ju\n", hd->hd_dev, hd->hd_size, hd->hd_sectors, hd->hd_sectorsize); STAILQ_INSERT_TAIL(&hdinfo, hd, hd_link); - /* XXX no partiions? -- is that OK? */ - return (true); + return; err: + free(__DECONST(void *, hd->hd_dev)); free(hd); - free(fn); - return (true); } static void @@ -299,7 +288,7 @@ hostdisk_find_block_devices(void) override=getenv("hostdisk_override"); if (override != NULL) - foreach_file(override, hostdisk_fake_one_disk, override, 0); + hostdisk_fake_one_disk(override); else foreach_file(SYSBLK, hostdisk_one_disk, NULL, 0); } @@ -540,7 +529,7 @@ hostdisk_gen_probe(void) return (rv); } } - return (false); + return (NULL); } #ifdef LOADER_ZFS_SUPPORT From nobody Thu Mar 2 18:59: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 4PSL4x1RVhz3w8Rq; Thu, 2 Mar 2023 18:59: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 4PSL4x10BBz3kRT; Thu, 2 Mar 2023 18:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KXFnBEOXTz+/XfqymN8zMkWtnwv7VgQxZQDGTgDflHs=; b=IVXP4D9gHvyTIzArcxwbfsC2qyYCoypyko4vrDSk7AhJaOTLMKBnjt0VL6quBrAYFh1ZoL UQ/mEJpinF/vSlJcuRP/Zk8VLx0pugmmaebIZKILSeKsQUSY8Blzkxy5DD3R5f01s2/c7y 4GXgpTarinicDy7Bm1XhzHXOhQ6c2ieMSQSAcCaYgbrWToRpo2KAl9T0jl7KxWEFJIQN5e E5a/mkLXd0r6JicmVGda5+B9eYVAAe8ijMpw9YrjbdkDmFsD4kEcadW7YFxDaBYDFMdkCb /VEx7o5xlrDBERUT0FXTNspoXsYx0lFmWq/eIUNi8Y4sBnjKdJprUFi2Ys5r7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KXFnBEOXTz+/XfqymN8zMkWtnwv7VgQxZQDGTgDflHs=; b=wH0dw4vLoC0i8nIR4+JucHS5gik4bhD43gzA/+4vGpBHVWiyw/X2kLeDOxKc2ipfaG2+4L 6XrVzDHMIOkwsZ0cBBY4qEF3aBunZufGzOn3859Q4WZl9DRjsyoSvmgqziueApvtfXy3QN ipnUZHqT/j+4U0xZM4sJErgL0Uz/5yZw2UUo53gVDk8++3kUVZYJj8UrYE25AL3Atz+a2O b7y2mEuymNe7GwVNlyoLkvUH5Vu6gTYfA+s6ay45SIUoOHQbp/q3O3v4jQ5dkLVtfSySNw v3WATrtsgKSlY+C4/2Z7hlIrb8kPyJrepdJnSc+0N4wysYFNqvXPJXSRXeUWBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677783585; a=rsa-sha256; cv=none; b=mhGwhzHzZdzRDZyzVZj/959k/gSqEe/5kh/JPf0ji/UWiRD0k3ymipVqVXtlxZC1Rmn+fG pc0uws6DScVpRLcrVuu98hyseYWayJh3MHI7fxqPUi/wP1NmSOSr+CKpg67RjWvx/9yC+A x2sd1+OnWen0i7u0abdZGzwpVgKmA08RtwplawAx0DpBWaH3YEqkXTOGs6ZS0E7Gra/HEg uAfHiSvNel8mJzCgZX2vj4Oq2bT4KG+U+WdZWPa19TeUwWv0u6TIIc2iIyq/5jMKg/Y0lP c6WAJSh+Gh09fMHLSQIVJi5DcTK6UAWO1WVLf5CS27hzVcp5iLvArN9Y+QlP4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSL4x02h3zRjV; Thu, 2 Mar 2023 18:59: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 322IxivH000944; Thu, 2 Mar 2023 18:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IxiVM000943; Thu, 2 Mar 2023 18:59:44 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:59:44 GMT Message-Id: <202303021859.322IxiVM000943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 58d487c30194 - main - arm: Add PCI and Annapurna devices drivers to LINT 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58d487c301940049beb8f56143eb354c4ca0428e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=58d487c301940049beb8f56143eb354c4ca0428e commit 58d487c301940049beb8f56143eb354c4ca0428e Author: Emmanuel Vadot AuthorDate: 2023-03-02 08:17:21 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-02 18:59:04 +0000 arm: Add PCI and Annapurna devices drivers to LINT Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38847 Reviewed by: imp --- sys/arm/conf/NOTES | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index f18724977321..1cb2df014197 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -33,6 +33,18 @@ device pmu # PMU support (for CCNT). device twsi # i2c controller on Marvel and Allwinner device xdma # xDMA framework for SoC on-chip dma controllers +# PCI/PCIE +device pci +device pci_host_generic + +# Annapurna Alpine drivers +device al_ccu # Alpine Cache Coherency Unit +device al_nb_service # Alpine North Bridge Service +device al_iofic # I/O Fabric Interrupt Controller +device al_serdes # Serializer/Deserializer +device al_udma # Universal DMA +device al_pci # Annapurna Alpine PCI-E + # Add pseudo devices... device clk From nobody Thu Mar 2 18:59: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 4PSL4y2f66z3w8WD; Thu, 2 Mar 2023 18:59: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 4PSL4y25Bdz3kb6; Thu, 2 Mar 2023 18:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+QZ5Nrq7FA0yoywH8fv+zyqf5aZTBMIgwOcxsXCm28=; b=vF/7HA+eNMiI1zAObAMJXsWePSnXM/oLr7cEeJ4KywoZq6G0X4nZwlBVW+UE6a1FV3JPn9 6aj41TP0q3hkEH9r1bkkREfTNoX/TQg3dyfXh9NczoYnNK/n9/LGAd0RB2CL6jlwzE5iqy VMx7kK0NxAeg+ZcyUA0VxicACkVIjvVt+xC8ydnnKlPIujJk2yvdNwhNmZN83JDd78Uo/d c5Am7QlwWCrFUKZ4ixf/Fmx5d2Cx8NOOncpzo6sbkI+rIOsL8mIbLd/GYZHSQ7CPwANRWS u36OVF3PT7EaZ0xoGsdEEt/MTvj/VNueoK1BJU15nCs7Z2e/SKwSVeT1+IQruw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+QZ5Nrq7FA0yoywH8fv+zyqf5aZTBMIgwOcxsXCm28=; b=okYjDxSEqDUMZe8q8OkUnG7NJFec2Xm6rhF0a1CcVJU4UnfT8WzKKzizUkEbAQu09dFiYS qnkAU7wShJKQSsR3hnEu8MH584I4EFYJKj05GD3/tlIVUkzZUUT3VZZ6oABETAFIVqcqH4 FLPlrvDegVVO/v6AYazTcs04GyHkLWxMa0KIjcBrMLehwKQlv9a2g8RUu9Uk9WFuLF/tjo ne8RvYrID4vIJMH1ARPVs9YaSpD0FvqFPL7ojMwnBKNEl6yzWWMaquZD1DSlBToFkVErr6 BuhIza/L1xpDexNHAzJzTIhosqi9JUEwZqC1tWWDDZeYGC5UM4aAlPiNrxQRPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677783586; a=rsa-sha256; cv=none; b=hm7EsfsFLGAeE4ETxw464j0IpSklAJOjZ584P80dLlZ7m/sP3FJmn+r4bpQtSJCWXgJAZz peWIbDUqeiPkFDm2QCiZfmSyRUs6kCZaWTguIgMJMjzbzDuPmbKmLYQFCrxByKtdCoCauw Y+JNOEgfSDTjw2mtyJd5aDYTOwd/PmXMwI5K01geGdvt4z/9nVNutqt+w9e7RkU8JWIH5i l7Q9eoKLHn4gsb0yyjkOFJROD8RfY1cKecHC5bmK8qs4mhTa0UejHNmuYlyOhqGHqs3tg7 QER5/UFcMEEaAtJBlKf1LschJ701Iu6naelGwciUn/OXNgGhhDRvlNdVNAHa/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSL4y1Bt4zSPx; Thu, 2 Mar 2023 18:59: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 322Ixk3e000963; Thu, 2 Mar 2023 18:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IxkU3000962; Thu, 2 Mar 2023 18:59:46 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:59:46 GMT Message-Id: <202303021859.322IxkU3000962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: f201e3800bda - main - arm: Tag ALPINE kernel as NO_UNIVERSE 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f201e3800bda6cae298098b28f8bf624d6d24200 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f201e3800bda6cae298098b28f8bf624d6d24200 commit f201e3800bda6cae298098b28f8bf624d6d24200 Author: Emmanuel Vadot AuthorDate: 2023-03-02 08:18:03 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-02 18:59:11 +0000 arm: Tag ALPINE kernel as NO_UNIVERSE Specific devices are in LINT so no need to build this one as part of make universe. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38848 Reviewed by: imp --- sys/arm/conf/ALPINE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm/conf/ALPINE b/sys/arm/conf/ALPINE index a997973890de..4abcdc2c79da 100644 --- a/sys/arm/conf/ALPINE +++ b/sys/arm/conf/ALPINE @@ -17,6 +17,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident ALPINE include "std.armv7" From nobody Thu Mar 2 18:59: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 4PSL4z3FyRz3w8QD; Thu, 2 Mar 2023 18:59: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 4PSL4z2gSLz3kkY; Thu, 2 Mar 2023 18:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VMhvSCAtWIdyOhPRnZ07BAuNKbonFXlpR17Gvv1TijQ=; b=QEMAa6/GeNKhfgLZRENu3mmF3HafjjQxBQxHdbgdIhg9msWH4BcSBdgQQCQst+H8JO5UE1 qpnQwFzDQfdjzxYZuxVt0dF+BA3UAuudFe9XOMNCY3En7rt7QEAQNmP4KPs9IbsB6kP7Q6 0IIFM733QKDE0ScA2t5/lPfPemFb0HnrN46QYhtx3jxrWOLbKqP0ypVwnuR+249+xgwaFm 2HWtwauJZ1YTcctbMA8wSZ3C3LrZgmVQbKZucBTVseOQwgzSGRla4SApFY/iK3C2P2OOF/ S3R7MGujl3+S/tTSPHxnOdnKOhprzwTDy8JIIYQkZSdsd9CDkQ4zM3O5/8O8tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VMhvSCAtWIdyOhPRnZ07BAuNKbonFXlpR17Gvv1TijQ=; b=EzIKLJKCZirjhsbdi614/DzqmGiRNfq0+aMvVvPcuaabepm62u4M3Oi+uYnaPE/92oHS2T uWu71kdUdvCZ8Rx5ozNmTxn9bpZaK+1Fg8erSth49psA0JfSChMZuId5mXObWesuvJMeXN ZlaVJy9jv0FATerFLefZoJ+UoKhPBUesuMIKvMsFBC6vBoCfALLHXxDRlTU56Bq9W8uT8a BtrE7SuzFjS/D+N4ynDbL/1lgdKNtuTgWaZ8LEp9Jpic4AF/mRjO4ysMo52KcnRvx2Ru64 42PuBpXSZDlpRHUR/EIM/oKrcWvaZKg3N5Qfi8YbQPVtAB0ObWPunGRYSbVGsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677783587; a=rsa-sha256; cv=none; b=fu11E+nE9P8+zuGwXhMSxxbIg7gRuu5U2Yp9pOZ95chDxRrxpgluFYJIh7PBlF4tWmTC5D ilS751LwoWIW68x3WxhXpBoX7fk6DPc6AklRVJoGU3wt2L9abstl82rrH4E21+KH/KqXB/ NwmYIJFsER7Tt6/FCLTzNdVQGzN4EqA9Uot8AVLbOIe6ORWgJRzeAg4cTGK59TLDaG/Glg jiIAhaAIucV5LItTmvuCP9+js8Boj4J8skE6GEQkXSw4k2ZMtKPssQpBLk3QIpYPNvH1ad ke1uyfI6RLfTHVGIXIdzsHRU2Y35rIGaea/3KkQmaT5nnCis1iRvJq7w2EV/nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSL4z1mW9zS9W; Thu, 2 Mar 2023 18:59: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 322Ixlct000982; Thu, 2 Mar 2023 18:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IxlR2000981; Thu, 2 Mar 2023 18:59:47 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:59:47 GMT Message-Id: <202303021859.322IxlR2000981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 68f8ac87e0be - main - arm: Tag EFIKA_MX kernel as NO_UNIVERSE 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68f8ac87e0be6077477a58fcf14e0a9cb208aaa9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=68f8ac87e0be6077477a58fcf14e0a9cb208aaa9 commit 68f8ac87e0be6077477a58fcf14e0a9cb208aaa9 Author: Emmanuel Vadot AuthorDate: 2023-03-02 08:22:59 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-02 18:59:16 +0000 arm: Tag EFIKA_MX kernel as NO_UNIVERSE All drivers are already either in GENERIC or in the IMX51 kernel config so no need to build this one too. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38849 --- sys/arm/conf/EFIKA_MX | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX index 0cd021331151..941922355057 100644 --- a/sys/arm/conf/EFIKA_MX +++ b/sys/arm/conf/EFIKA_MX @@ -18,6 +18,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident EFIKA_MX include "std.armv7" From nobody Thu Mar 2 18:59: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 4PSL504TpNz3w8cg; Thu, 2 Mar 2023 18:59: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 4PSL503fWBz3kfW; Thu, 2 Mar 2023 18:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YiA4ZsDmufJlHwti1/ZirOta9h/Z6fUVI7XXNcj409A=; b=eLE4FFdlml647tD3IqlJXrQmxh26U2sSNYlYLc44uw3gz04LrvbetFCWN5jlKgzxBv/gV3 P0X+gWx2kFLYBbyLCPfONwPtHvAuh1+tR5MPkOdTYhIYEauitrpG2N8tbT2W7DhOtRiQNk md6WFw2MLIobfGBq64pbY6MOHRMqfPR6UtFA3JcWSTLSoI+2oYSQpqHaazMJh+SLeFrpEv i35OFNKQytYBqRaTqPA0TaPjzIP3Ylk4CgZf7uUGGhpVQbvsjr7eWB5zpnA1CZPi+tWAli xu6s8EJ/YMkU31jGeL6dLd8AC6qfSHy3IYKS4aXZx6MwPJ+UL/z4jms9u1LQIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YiA4ZsDmufJlHwti1/ZirOta9h/Z6fUVI7XXNcj409A=; b=VNobvVpXrEs/tClpYF4Qd3Y4N+DtpIo+tjb6a8UsBqkHWgjztpqTG9LVBgiPsS8qoq72Wj DE8aCKTrPF8dsgiD4NTpHlYyNB94Y9mZ8HLYpy6Epu0DcfnQdhez021co438SyDsypu9EB OifzSTkaiNPniArW0ko5o3YFprsNeTF0ljL+fm7oZ3glNNXYM0ltLJ5Gc9VTlpqlRAZAu4 CQ1BtKcdwrMi2BBB71vWkevRBsiouEoeXWpK/E+tiFwlMXRaIDHsa51a8ookluurY+gPha ga6IiPLtWoPhAdo8eQ9OGi6MIM90nz+XOuX3saGd9ZVhroN4LCVFnEIBKM9JrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677783588; a=rsa-sha256; cv=none; b=kuLMnIyEDb3qy2qh8Z/K+DNP92VToBVvblHXQ5+9llEi6RZaVIbIOGQtag9tz94iHuV9c5 gTANwg4MYlqeLwAjtQL1G8cumwTqkMiTTsx0IF5xuK4wQNjOMO4n6wOgW4d8EQ4hN1VQ7H Eivplo/HHc7ZJQjFcg0fFJLBt6r9V7oJzuHTEmSEpaj8BwgKTgg9rs1fDvBxBdNjTmLFRn IOBFUlnEagtvMwmsSrnENV07ervYDYsgt3ddvwTlt12EsQFftNHkjYGXlzoOJfQ1n9fdOg vbXXRLuQWKDstRo25BSiLoJApEGILrLFqh97uE5RSkAFBYxOZDsBo75XkDW/jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSL502hzZzSJd; Thu, 2 Mar 2023 18:59: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 322IxmBX001002; Thu, 2 Mar 2023 18:59:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IxmVx001001; Thu, 2 Mar 2023 18:59:48 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:59:48 GMT Message-Id: <202303021859.322IxmVx001001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 79ec3b10b45a - main - arm: Tag SOCFPGA kernel as NO_UNIVERSE 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79ec3b10b45aed7bbbb2c0c8baa70990a4f034b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=79ec3b10b45aed7bbbb2c0c8baa70990a4f034b1 commit 79ec3b10b45aed7bbbb2c0c8baa70990a4f034b1 Author: Emmanuel Vadot AuthorDate: 2023-03-02 08:25:38 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-02 18:59:23 +0000 arm: Tag SOCFPGA kernel as NO_UNIVERSE All drivers are already either in GENERIC or in the other arches LINT so no need to build this one too. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38850 --- sys/arm/conf/SOCFPGA | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm/conf/SOCFPGA b/sys/arm/conf/SOCFPGA index bd56bcf877c6..0ffd0ab53631 100644 --- a/sys/arm/conf/SOCFPGA +++ b/sys/arm/conf/SOCFPGA @@ -18,6 +18,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident SOCFPGA include "std.armv7" include "../altera/socfpga/std.socfpga" From nobody Thu Mar 2 18:59: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 4PSL516v56z3w8WH; Thu, 2 Mar 2023 18:59: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 4PSL514P0Fz3kyq; Thu, 2 Mar 2023 18:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u5+/lkd9XYcXXECHpcE80AqLL39xpA2YAuIRL6dggQM=; b=eOWGr8GW/PQ938FcGPe+oFYjcDIMt7cugL7NwyWyVeCDTpShMG1odof5Hao1gDqp3LLVcz a61jFSi7/qYqFyDz5EkQEWF5UGEP5yRjxJqfTldOPYZVKdc96kDfzLvR5MTbWIWvGj8233 dq3VmcIj8r9a5Rs9XACizBeDtI8ldXDN0gHXVXnbp40ERBZanbrT8gDr9SbjLDMlRAaBmt eaFrUPN+cxL3DGQC6S0fhRDfgmLrmiuOLySVO3MgTSs/4mtuqlWYdMiF9BwToZSBXTMz4I AkSBDM83OldqAGf9qMGHx8BXOIkhc+maIwvqItf2OikYyYUYDCSFLQAsot/T2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u5+/lkd9XYcXXECHpcE80AqLL39xpA2YAuIRL6dggQM=; b=Fuy0clroFSUMx8SLrXKeyNwsX5/iB791BCj10LkuqW5SoO4pQfxKjaiuMtD95h5aaPjoW3 ipxGdetGA7kfHv2Lyb0od6/xlSZbYvSkXNk1NWyN/VH0886CqOZr/SuvdKrC+WyIYFoOR9 +KsNEZ/e+mouJuKKCeK3vx4NGaP4CrsnXRPYfnLR4onTv0l87BUplxpBbkdltL/F5MDJjw 6FtWZqp5/o3564Wf/Qis2srCPnPG0pJyhX9eB2TqjoqQz/L1SyPiM2QRp2r3IE1dYf2srS mh5tHryIAQD/uz7p+J94b3mEnyT6g+NK1TVxNcY09M9OUYKhPK82Omy6wYzs9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677783589; a=rsa-sha256; cv=none; b=X/GMTIzDUXGlFyar+iLMlA9PIFh/uPpnm1WuyNVHYO375oh1b6tGRG0ELKzeyVr+w1kUkE jC/eS/kFj3tIK6xb0M/DMxGyw6EtAqrDCwmVRelICjUyd6YPU3NRB45LY9l5eskdCFcSpo ZVRnGlHLAQew9kBJFj2efmvKRnklMYTDq1K2PT5Gcpi5GcYvEUSPsFnI4Sp4V9Af/3L3X6 D83bPM60ci4ra9kiu0DTbBiCiOqWVZNAUc5QdQJbGGbb162vBrE94qO6Rj+RQfsyL/oNwo 9J+hyzv6ELh8AXFE/AptcTsFATB3uToi/flxVA9FH9kbYQCKIDRvrcMcTAelFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSL513PZ0zRtb; Thu, 2 Mar 2023 18:59: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 322IxnnR001021; Thu, 2 Mar 2023 18:59:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IxnPN001020; Thu, 2 Mar 2023 18:59:49 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:59:49 GMT Message-Id: <202303021859.322IxnPN001020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 0fed8288c3fd - main - arm: Tag VHYBRID kernel as NO_UNIVERSE 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fed8288c3fd75a57e3fd4649cded9eac07a6758 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0fed8288c3fd75a57e3fd4649cded9eac07a6758 commit 0fed8288c3fd75a57e3fd4649cded9eac07a6758 Author: Emmanuel Vadot AuthorDate: 2023-03-02 08:26:54 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-02 18:59:28 +0000 arm: Tag VHYBRID kernel as NO_UNIVERSE All drivers are already either in GENERIC or in the other arches LINT so no need to build this one too. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38851 --- sys/arm/conf/VYBRID | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID index b702b3f0f1fd..2ce765ec483b 100644 --- a/sys/arm/conf/VYBRID +++ b/sys/arm/conf/VYBRID @@ -18,6 +18,8 @@ # # $FreeBSD$ +#NO_UNIVERSE + ident VYBRID include "std.armv7" include "../freescale/vybrid/std.vybrid" From nobody Thu Mar 2 19:22: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 4PSMSs0FvRz3wCQM; Thu, 2 Mar 2023 20:02:05 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (using TLSv1.3 with cipher TLS_AES_256_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 4PSMSr2tk7z3r89; Thu, 2 Mar 2023 20:02:04 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none Date: Thu, 02 Mar 2023 20:22:04 +0100 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, Steffen Nurpmeso Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain Message-ID: <20230302192204.YPJ7f%steffen@sdaoden.eu> In-Reply-To: <202303020121.3221LWHh070834@gitrepo.freebsd.org> References: <202303020121.3221LWHh070834@gitrepo.freebsd.org> Mail-Followup-To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org User-Agent: s-nail v14.9.24-430-g6a13fd0a75 OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. X-Rspamd-Queue-Id: 4PSMSr2tk7z3r89 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N 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 Hello, .. sorry to be back again, and then it is you once more.. Ed Maste wrote in <202303020121.3221LWHh070834@gitrepo.freebsd.org>: |The branch main has been updated by emaste: | |URL: https://cgit.FreeBSD.org/src/commit/?id=ceb5f28ba5fcfa69de7410d2327\ |d4a5abf2a421f ... |commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f |Author: Ed Maste |AuthorDate: 2022-12-14 17:34:59 +0000 |Commit: Ed Maste |CommitDate: 2023-03-02 01:20:33 +0000 | | freebsd-update: re-edit files if merge conflict markers remain ... |+ if ! egrep -q '^(<<<<<<<|=======|>>>>>>>)(\ |[[:space:]].*)?$' $(pwd)/merge/new/${F} ; then ... It is because i have written to postfix-users with the subject "(GNU) egrep is obsolescent" right before i read your commit: |I do not think this has been reported already, on systems which |use GNU grep(1) postfix produces obsoletion messages. | | $ egrep x y | egrep: warning: egrep is obsolescent; using grep -E ... |POSIX says on this | | This grep has been enhanced in an upwards-compatible way to | provide the exact functionality of the historical egrep and | fgrep commands as well. | It was the clear intention of the standard developers to | consolidate the three greps into a single command. The old | egrep and fgrep commands are likely to be supported for many | years to come as implementation extensions, allowing historical | applications to operate unmodified.. | |This seems to come from Issue 2, released January 1987. |BSD 4.4 writes in usr/src/usr.bin/grep/README/README.FIRST from |1987-06-24 (re-formatted): | | here is the fast 'grep/egrep' package sent to comp.sources and | u. c. berkeley. | included are the prerequisite routines developed by henry | spencer of univ. of toronto -- these are also part of the | comp.sources archive. | | i've already updated spencer's care package to incorporate three | fixes which have appeared in the same forum. | | the makefiles are configured for bsd 4.3 and sys5 unix. | they assume that the spencer regexp() is not already in a system | library -- read the makefile comments if this is not the case. | | for stock 4.3 sites, apply the diff 'diff.egrep.y.bsd' to the | existing source in /usr/src/usr.bin/egrep.y and re-make. this | adds full support for the -i option. the procedure is then: | | make | sh eg.shell # amusement | make install | | ames!jaw | |However, in System V10 it seems there was still a differentiation |even later | | $ find . -type f -name '*grep*' | ./V10/cmd/grep.c | ./V10/cmd/fgrep.c | ./V10/cmd/uucp/uugrep.c | ./V10/cmd/gre/dofgrep.c | ./V10/cmd/egrep/egrep.dist | ./V10/cmd/egrep/egrep.c | ./V10/cmd/backup.old/bgrep.c | |But BSD CSRG comes over with | | $ git show master:usr.bin/grep/egrep/Makefile | # @(#)Makefile 8.1 (Berkeley) 6/27/93 |... | LINKS= ${BINDIR}/egrep ${BINDIR}/grep ${BINDIR}/egrep ${BINDIR}/fgrep | MLINKS= grep.1 egrep.1 grep.1 fgrep.1 |... | |Which is 30 years ago. I am pretty sure that around Y2K FreeBSD |and Linux used grep(1) as a multiplexer already. So i thought .. maybe to bring the in-line-with-Linux to an extend, a FreeBSD style thing on the use of grep -E, maybe. --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) From nobody Thu Mar 2 20:07: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 4PSMZr22VPz3wCmk; Thu, 2 Mar 2023 20:07:16 +0000 (UTC) (envelope-from kevans@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 4PSMZr1MFWz3rc6; Thu, 2 Mar 2023 20:07:16 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677787636; 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=UpqGXMi0gU+xgZPazGQUYvkVvgrBb/q3FUjnL7k/L6o=; b=qtGIo4EBZG6tBvqwF5Y2Rf0ns9hl1YcAUbJPAwtix0ROG4tCqGPt6HOM2VLI888WXCxr0S V5AB8VsXQonJrMGzq9nlTQ37INySKFtKFojOFrCxdR7xwi2FtXALFyIOt7uwe6J1D8gDpB 5/t8NQ/hwBs4si6fQexCZKDUjcwMT8rOhqRDmuBW447yGn47+QDmZG5l2AdJcajcyTUSQa m/Y6g/ulkbvP5xSHB2XmoHy6rqpSUGdlRp5nJpgD63adm9efTuPS9za5R1NREf0FLaTzIZ P5E3SkEtqYKXdU3Jn4Hk+ihLDSSTGf79Q5iYY8IOasFfhOtOc6N2N5EyL/82EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677787636; 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=UpqGXMi0gU+xgZPazGQUYvkVvgrBb/q3FUjnL7k/L6o=; b=k7uaSeaawltl1NVfwReMcWFXjFvbdD4ro/Mpy9i0mee9ICcpyZF/qgoTopgbX6q3kf3Sb2 6BoJ/A9CyMCynu7wmRH09GXfk092gR9Ah2Vanl+Hks+4qUZj6IVfM8jmkimxOT/HH9PPSp iq09N3nhrYDvYlDM7SV+XKinbs+zdcMiDCwX9BpZEo8vOwUuYo0D7A/gFIG7HYutL3X/ru EUGhF9yhS4jKPD0rCn06klEh6NSeDph/2OJYE36/svTLcpONWCRMe7qlze17IswkCPT+Mo /m3JVQEenJhRZ+sTlaZwqPKgmyJUm+2BwhBNw2RM9h/1vQpmZHQFR0Xm9UStfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677787636; a=rsa-sha256; cv=none; b=BSFpl9KqUkfrOd3R8r7sqs6+WUiHsDWLWNXJ3R74RnK8Ps/t10+FFe+xWYAvlw8EVc+dEI rqXpCnuMjOiRcSS+utQKn70HJg8yVqglD805NOJGEeoZnA36E3GG1EytKCDj3VRX5q9ZC0 lrt4IS1M/wju3WRsdmp3FFc/4x6mTmOrQ4xf+FbhzGqj/CPSuDRtcS2hO+ZGQZaOuyA84H qIdPwf5OMZOSubmtGhQkspof/fmCXdNjTWCUY3KBY4mf3+jTTmFSIdAJXladjb3TyaVogx 0ZAMRCC8PpnTZGFCddkS9I2xOHzxomzxwA+9ilHXII25gvus+jHCpxEPpEgrMA== Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PSMZr0HYfzbpX; Thu, 2 Mar 2023 20:07:16 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f180.google.com with SMTP id j10so50743qkg.12; Thu, 02 Mar 2023 12:07:16 -0800 (PST) X-Gm-Message-State: AO0yUKUZE8rtJ/Jo+kyW+YfCRnEYViXER+Aouni/703YK1ZlB73wzQdh 2IRFEtXfeN8Bu/Qjlv0D0JSJnmXjZkBXFd4JTXQ= X-Google-Smtp-Source: AK7set+9zUgzxnEmP33KHutPNqOAIqPuA7TP6lqh6HsWvDNbyYVbSxmDrWrdiUEohQZnlVdYyvnXo9A2VRx3i46rvQs= X-Received: by 2002:a05:620a:2b03:b0:71f:b89c:69be with SMTP id do3-20020a05620a2b0300b0071fb89c69bemr2985447qkb.14.1677787635535; Thu, 02 Mar 2023 12:07:15 -0800 (PST) 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: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu> In-Reply-To: <20230302192204.YPJ7f%steffen@sdaoden.eu> From: Kyle Evans Date: Thu, 2 Mar 2023 14:07:09 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain To: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Cc: Steffen Nurpmeso Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On Thu, Mar 2, 2023 at 2:02=E2=80=AFPM Steffen Nurpmeso wrote: > > Hello, .. sorry to be back again, and then it is you once more.. > > Ed Maste wrote in > <202303020121.3221LWHh070834@gitrepo.freebsd.org>: > |The branch main has been updated by emaste: > | > |URL: https://cgit.FreeBSD.org/src/commit/?id=3Dceb5f28ba5fcfa69de7410d2= 327\ > |d4a5abf2a421f > ... > |commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f > |Author: Ed Maste > |AuthorDate: 2022-12-14 17:34:59 +0000 > |Commit: Ed Maste > |CommitDate: 2023-03-02 01:20:33 +0000 > | > | freebsd-update: re-edit files if merge conflict markers remain > ... > |+ if ! egrep -q '^(<<<<<<<|=3D=3D=3D=3D=3D= =3D=3D|>>>>>>>)(\ > |[[:space:]].*)?$' $(pwd)/merge/new/${F} ; then > ... > > It is because i have written to postfix-users with the subject > "(GNU) egrep is obsolescent" right before i read your commit: > > [... snip ...] > > So i thought .. maybe to bring the in-line-with-Linux to an > extend, a FreeBSD style thing on the use of grep -E, maybe. > I'd really prefer not to be annoying about it until we actually plan to deprecate it, and I haven't seen a single call for removing it from FreeBSD. Thanks, Kyle Evans From nobody Thu Mar 2 20:32: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 4PSN7N4KFXz3wDw3; Thu, 2 Mar 2023 20:32: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 4PSN7N3tkmz3tBL; Thu, 2 Mar 2023 20:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677789120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2l+/t9M5FY5MEeXaQvP28p4vE5r0rgxfH+fvVZ9xGGY=; b=U//K9kVvC2e+QboLW0f+xhy5XKwU+FPKBVO/qrCdDRgV081d2krTEYJfypK3FkWBR8oa4y ASBU3nk7uiIT3oEg97dhLTYZzHIlijDFNWgV36Ugd969MdnXyX1yugL+QgX4gn5ddW0dqR HY47ap5HNTpX6t+ButiJCEcTXY1SWdzpbZ3zopkB5WzI9JmmEpw3XmMOhtjVoSXHrdDt7G WrLMXMu0N2LdfBgwLE9w4x5DSqyAq3bgHtHGOcNP6dMAPTCAY1DT0whvsdRwXxwq8E0M/a rawoVVPY+DMXooVKKvDnqgMfJ5CFIKaD7rQpEI80J+eTvRLGd344KGlBYLPvPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677789120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2l+/t9M5FY5MEeXaQvP28p4vE5r0rgxfH+fvVZ9xGGY=; b=w7ul0NFJiPJscVz4n5oXX1PcTV9o9H1WxgSGOkNoWJM6uDUhJYGna4Kj1cYdSHF8ST8UjH p1J9z/EcraadD+7friP9nryOGSFbhgYuAiYoOYmuymjZc8GtOvLtNM2vdlIl8lL0eIZE3M Gq4rDXin2tn1VCMT/7xLQ4jDtdQfB2gV0hacG9RfJ7ez1SaTOU30Sj/lBsiMmM4wplVLID CQAzyexot9tN1iLplETlEgVgg2JumTaggMysdTtQzXiHUuKN7OOwrob3sb88N7AstTMdAC DVWRu8Ry0n1jf7WEz7fGhiZ83iBLXQ0gh7YfkPtWnot4M++6sdqeyn+zqji53w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677789120; a=rsa-sha256; cv=none; b=OMD6YkzeUUkhyuOlr2aa6IjJeIDzsglyz4fgg9qLbCmWejXL5WZATHZ7qEw9vvvgGD3aHJ GOIWINDFCGqeiKqeQCFCPWNG74RFKgXJ8q0B7P5Pm3N1KVL1vJ8HFuAyk9Jfp7j6MbXeCM r8re6Lsph8zAo0kRCk6qT7YyAEyk9NGMBBgkYtYwX82PzlptKeYhBCrdy+YuHx+UBpZ4IM vNz8HvhrJQcrbbwmrmoX2OJR829dEwNf7RgQLc7oKoxWmSiN/HTnwxaeMSjxQUIS2/RV7T kWIIHJg8y1Pje0pmWCza4Y/UTHXAugbtQeHFKaYtOoPKF2i+BRM4jvZi87aNBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSN7N2yLpzVnB; Thu, 2 Mar 2023 20:32: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 322KW0AT063304; Thu, 2 Mar 2023 20:32:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322KW0qM063303; Thu, 2 Mar 2023 20:32:00 GMT (envelope-from git) Date: Thu, 2 Mar 2023 20:32:00 GMT Message-Id: <202303022032.322KW0qM063303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 72aad3f9028a - main - Fix kernel memory disclosures in mpr and mps 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72aad3f9028af12e6c56a3a461b46a153abd7b24 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=72aad3f9028af12e6c56a3a461b46a153abd7b24 commit 72aad3f9028af12e6c56a3a461b46a153abd7b24 Author: Alan Somers AuthorDate: 2023-03-01 18:53:46 +0000 Commit: Alan Somers CommitDate: 2023-03-02 20:31:06 +0000 Fix kernel memory disclosures in mpr and mps In every mpr and mps ioctl that copies kernel data to userland, validate that the requested length does not exceed the size of the kernel's buffer. Note that all of these ioctls already required root access. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D38842 --- sys/dev/mpr/mpr_user.c | 7 ++++--- sys/dev/mps/mps_user.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/dev/mpr/mpr_user.c b/sys/dev/mpr/mpr_user.c index d04aaa24ea0b..5b5c11dd4a65 100644 --- a/sys/dev/mpr/mpr_user.c +++ b/sys/dev/mpr/mpr_user.c @@ -863,7 +863,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) } mpr_unlock(sc); copyout(cm->cm_reply, PTRIN(data->PtrReply), - data->ReplySize); + MIN(sz, data->ReplySize)); mpr_lock(sc); } mprsas_free_tm(sc, cm); @@ -1087,7 +1087,8 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) data->ReplySize, sz); } mpr_unlock(sc); - copyout(cm->cm_reply, PTRIN(data->PtrReply), data->ReplySize); + copyout(cm->cm_reply, PTRIN(data->PtrReply), + MIN(sz, data->ReplySize)); mpr_lock(sc); if ((function == MPI2_FUNCTION_SCSI_IO_REQUEST) || @@ -2065,7 +2066,7 @@ mpr_user_event_report(struct mpr_softc *sc, mpr_event_report_t *data) if ((size >= sizeof(sc->recorded_events)) && (status == 0)) { mpr_unlock(sc); if (copyout((void *)sc->recorded_events, - PTRIN(data->PtrEvents), size) != 0) + PTRIN(data->PtrEvents), sizeof(sc->recorded_events)) != 0) status = EFAULT; mpr_lock(sc); } else { diff --git a/sys/dev/mps/mps_user.c b/sys/dev/mps/mps_user.c index cdab4d4cd841..9d6aeedafdea 100644 --- a/sys/dev/mps/mps_user.c +++ b/sys/dev/mps/mps_user.c @@ -862,7 +862,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) } mps_unlock(sc); copyout(cm->cm_reply, PTRIN(data->PtrReply), - data->ReplySize); + MIN(sz, data->ReplySize)); mps_lock(sc); } mpssas_free_tm(sc, cm); @@ -1015,7 +1015,8 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) data->ReplySize, sz); } mps_unlock(sc); - copyout(cm->cm_reply, PTRIN(data->PtrReply), data->ReplySize); + copyout(cm->cm_reply, PTRIN(data->PtrReply), + MIN(sz, data->ReplySize)); mps_lock(sc); if ((function == MPI2_FUNCTION_SCSI_IO_REQUEST) || @@ -1955,7 +1956,7 @@ mps_user_event_report(struct mps_softc *sc, mps_event_report_t *data) if ((size >= sizeof(sc->recorded_events)) && (status == 0)) { mps_unlock(sc); if (copyout((void *)sc->recorded_events, - PTRIN(data->PtrEvents), size) != 0) + PTRIN(data->PtrEvents), sizeof(sc->recorded_events)) != 0) status = EFAULT; mps_lock(sc); } else { From nobody Thu Mar 2 20:37: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 4PSNGF4HzMz3wF7J for ; Thu, 2 Mar 2023 20:37:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (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 4PSNGF0kpwz3tcC for ; Thu, 2 Mar 2023 20:37:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x530.google.com with SMTP id cy23so1901100edb.12 for ; Thu, 02 Mar 2023 12:37:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; t=1677789475; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ru94uEtyNNc5AqbntBBIUrJZKueW5OyKIKHPQds943o=; b=Ld/EYoac7Kjggl+nWRjFJ2m0Tkh04CyMeSxGfbZHWI5twm7q1/53o8Y1Xi5uEYgpJ7 MGWQGaAwaCaeAUUfNrcm94ZYpxsr0xQgsNa/rNBompTmFL6T4ga4ZZ0svMJCeEesDeYT vIQiXrFLvVmQR965Jvh6r7e2y8Y+XkCwfMSkPZKKJtu1iKW3J33X7s81ypFeT/GX297H 5hp2u9wPp9QfQHoXRtgnTvycjpbIH71ruHZs/c3Mqg8OYxpOYUe5m4aQQmAikbKj6FTY QBeQA6wlPwQpuUFRMKay8x1gF/vUuJKrs5A+19noX8kyxG7/EKjFwmXP3j/n/09x1+kK vCrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677789475; 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=ru94uEtyNNc5AqbntBBIUrJZKueW5OyKIKHPQds943o=; b=LT/57sjupLaFksdFJpS1P/6NCFT3JEKAnlwNcXUeXtn4YBIQ8sHEBbg3JQamQOiuB4 inOc+WujAYos8JKEf74vEmEVgN2HDU4sWtwvpGOHZFiFZY2rVzTaa1YF9n9rMtJT06oP Wg87aG0NGTjVO+HnZJcxsLHkXakxnnfmWCPGDSe5IdULWJieKvqkuSMn5a7eK9dOG+tv IJj+m5Cz1w0BaUoVENkJKu4jR8DhnkpJTWEkxLHNRdTE+4wrlrdnAGzNb31bYre+6yBY aDVJGav1QcsGrql5fDQwX1U+ezK8dh1u6NpPV5ByFHlSQlgZIAUPI3nmZ+sj1CtLZxnb WfUA== X-Gm-Message-State: AO0yUKXv3lwmlriXo5WaINg4PCSuivOdntFC6KcvjYuWRePnLjhHYsvh JlJ9h5fkzblwMkXE/A7XA8iTFY0xCOfeBvBy2ukUxQ== X-Google-Smtp-Source: AK7set+uzdWyoEiM1gzDD/+BAi+Jdmss8HhD97t6YX8knAo07fPp81IN4pAg+1/ezw157WIB737iDcBUDLKbwOLNxFE= X-Received: by 2002:a17:906:f6c8:b0:888:6294:a1fd with SMTP id jo8-20020a170906f6c800b008886294a1fdmr5577627ejb.2.1677789475458; Thu, 02 Mar 2023 12:37:55 -0800 (PST) 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: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu> In-Reply-To: From: Warner Losh Date: Thu, 2 Mar 2023 13:37:44 -0700 Message-ID: Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain To: Kyle Evans Cc: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Steffen Nurpmeso Content-Type: multipart/alternative; boundary="000000000000b169a105f5f0cde1" X-Rspamd-Queue-Id: 4PSNGF0kpwz3tcC 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 --000000000000b169a105f5f0cde1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 2, 2023 at 1:07=E2=80=AFPM Kyle Evans wrot= e: > On Thu, Mar 2, 2023 at 2:02=E2=80=AFPM Steffen Nurpmeso > wrote: > > > > Hello, .. sorry to be back again, and then it is you once more.. > > > > Ed Maste wrote in > > <202303020121.3221LWHh070834@gitrepo.freebsd.org>: > > |The branch main has been updated by emaste: > > | > > |URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dceb5f28ba5fcfa69de7410d2327\ > > |d4a5abf2a421f > > ... > > |commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f > > |Author: Ed Maste > > |AuthorDate: 2022-12-14 17:34:59 +0000 > > |Commit: Ed Maste > > |CommitDate: 2023-03-02 01:20:33 +0000 > > | > > | freebsd-update: re-edit files if merge conflict markers remain > > ... > > |+ if ! egrep -q > '^(<<<<<<<|=3D=3D=3D=3D=3D=3D=3D|>>>>>>>)(\ > > |[[:space:]].*)?$' $(pwd)/merge/new/${F} ; then > > ... > > > > It is because i have written to postfix-users with the subject > > "(GNU) egrep is obsolescent" right before i read your commit: > > > > [... snip ...] > > > > So i thought .. maybe to bring the in-line-with-Linux to an > > extend, a FreeBSD style thing on the use of grep -E, maybe. > > > > I'd really prefer not to be annoying about it until we actually plan > to deprecate it, and I haven't seen a single call for removing it from > FreeBSD. > I doubt egrep will ever be deprecated. Too many scripts depend on it. And fixing this one is a drop in the bucket. I personally think the warning from gnu-grep is bananas... Warner --000000000000b169a105f5f0cde1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 2, 2023 at 1:07=E2=80=AFP= M Kyle Evans <kevans@freebsd.org> wrote:
On= Thu, Mar 2, 2023 at 2:02=E2=80=AFPM Steffen Nurpmeso <steffen@sdaoden.eu> wrote: >
> Hello, .. sorry to be back again, and then it is you once more..
>
> Ed Maste wrote in
>=C2=A0 <202303020121.3221LWHh070834@gitrepo.freebsd.org>:
>=C2=A0 |The branch main has been updated by emaste:
>=C2=A0 |
>=C2=A0 |URL: https://cgi= t.FreeBSD.org/src/commit/?id=3Dceb5f28ba5fcfa69de7410d2327\
>=C2=A0 |d4a5abf2a421f
>=C2=A0 ...
>=C2=A0 |commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f
>=C2=A0 |Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org><= br> >=C2=A0 |AuthorDate: 2022-12-14 17:34:59 +0000
>=C2=A0 |Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org><= br> >=C2=A0 |CommitDate: 2023-03-02 01:20:33 +0000
>=C2=A0 |
>=C2=A0 |=C2=A0 =C2=A0 freebsd-update: re-edit files if merge conflict m= arkers remain
>=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=A0if ! egrep -q '^(<<<= <<<<|=3D=3D=3D=3D=3D=3D=3D|>>>>>>>)(\
>=C2=A0 |[[:space:]].*)?$' $(pwd)/merge/new/${F} ; then
>=C2=A0 ...
>
> It is because i have written to postfix-users with the subject
> "(GNU) egrep is obsolescent" right before i read your commit= :
>
> [... snip=C2=A0 ...]
>
> So i thought .. maybe to bring the in-line-with-Linux to an
> extend, a FreeBSD style thing on the use of grep -E, maybe.
>

I'd really prefer not to be annoying about it until we actually plan to deprecate it, and I haven't seen a single call for removing it from<= br> FreeBSD.

I doubt egrep will ever be dep= recated. Too many scripts depend on it.
And fixing this one is a = drop in the bucket. I personally think the warning
from gnu-grep = is bananas...

Warner
--000000000000b169a105f5f0cde1-- From nobody Thu Mar 2 20:54: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 4PSNdp2KKrz3wG7Z; Thu, 2 Mar 2023 20:54: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 4PSNdp1v4vz3x3Z; Thu, 2 Mar 2023 20:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dfB8p9n+xRnm7jRkAd2hM/8PH56cwenpGWSt9kdVodk=; b=Ym/MnYfOdKfMZiUPrQNqHctXNhIBuCrEKG/3/LXuGe/875srNzbe44wSBDkBPtmZdfHbSU NR1PwIVf4P2QFNODncFmx+oA1JfHvMxjfaPAEhsbLq1hDuPuqMy5tOYH7Qap2oKslqINyR aSAbgp0e8HAlQNa+86dmTUUuQCgX8p8shG2Hi2Swr9uTBeE6C3OXF0sQM2Ae+y19tEabIX 2tgPCJXwylIld38mny2wbXepgi0NxFe44UyOTfwd+el9LZn7PVxAlwy9ta7K/5vM97FZwF AJucT60dPoTBqJPC3orCG8rE4aghs7k4n9acCygvCt6c5sBoe9kA7rAP3m9pCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dfB8p9n+xRnm7jRkAd2hM/8PH56cwenpGWSt9kdVodk=; b=GcHeMWM8cQAYgSBbYlh56FXFQL1JE/RmXhlzIlQkBnGJcx0b83KWzPPaYsULUE1cZuNf6P lU2XbPs+1UHBNi60YfzvoDeuXAf/YmzcD0OkEdcRcaqzRrF4sNFLr4rgq2QtD7+sC6C48a kYzZDHHtxkVl4jJRD806/LLZQELHyP53vJ1P1H20v3rei/C6l8YurdIpU0FeNfA/mojRGv EHCIqVGwc5TRkGtMHPozXKz7lP6SY2wJp3/NvWH73x6JaWjbDhRRia7cfZTOgHeOewlcvm Y/bpifNXYBwzCHeK/NUoxTELLT4E13XUHWWv1O3ptNi9ya8YQCYab0zG07o9Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677790494; a=rsa-sha256; cv=none; b=g37JjSUm357NyOgFtxrj62zUF4Es7Vu0SvYnsR1vsV6ZwIb+IEt+UPB7Sibd5ZZ+dstXlI xYDpEssFHnz6dOX9dpWgCq8th03VfT29uMXZ+0BgCZJ7e6/MFFUGoJKxBwzf0K8tbRRMdF 1t3VADJ+j/appxU9bUQGZPT5rfDR8ctORyZJbUI/tNZoca6ksgo0oMBFOcmOwZDzhnQxL0 Jd0bg3dUEf2sI5mT8LXvbmM4FawYzCHO6mWWnGt0IyTfVlC18G/4JMojIcNJjoRuWYRNB8 /c40NgHpnwNNoR3XvZatLUrEOVKERdFTzoSjDdbrfuLWsmEkMx/6k7JPUq0TSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSNdp109hzWBm; Thu, 2 Mar 2023 20:54: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 322KssKE097808; Thu, 2 Mar 2023 20:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322KssX3097807; Thu, 2 Mar 2023 20:54:54 GMT (envelope-from git) Date: Thu, 2 Mar 2023 20:54:54 GMT Message-Id: <202303022054.322KssX3097807@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: 939b24b0abbd - main - xlocale: garbage collect references to strtoq_l/strtouq_l 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: 939b24b0abbd703948981c9bcb07afd7b01ca3b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=939b24b0abbd703948981c9bcb07afd7b01ca3b1 commit 939b24b0abbd703948981c9bcb07afd7b01ca3b1 Author: Val Packett AuthorDate: 2023-02-06 19:43:48 +0000 Commit: Ed Maste CommitDate: 2023-03-02 20:53:29 +0000 xlocale: garbage collect references to strtoq_l/strtouq_l These were explicitly never implemented (see lib/libc/locale/DESIGN.xlocale), but were referenced in the manpage and the symbol map. Fixes: 3c87aa1d3dc ("Implement xlocale APIs from Darwin") Reported by: ld.lld 16 being --no-undefined-version by default Reviewed by: theraven, emaste Sponsored by: https://www.patreon.com/valpackett Pull Request: https://github.com/freebsd/freebsd-src/pull/679 Differential Revision: https://reviews.freebsd.org/D38408 --- lib/libc/locale/xlocale.3 | 2 -- lib/libc/stdlib/Symbol.map | 2 -- 2 files changed, 4 deletions(-) diff --git a/lib/libc/locale/xlocale.3 b/lib/libc/locale/xlocale.3 index d1d424feba41..54068b8d7efa 100644 --- a/lib/libc/locale/xlocale.3 +++ b/lib/libc/locale/xlocale.3 @@ -180,10 +180,8 @@ along with the headers that expose them, is provided here: .Xr strtol_l 3 , .Xr strtold_l 3 , .Xr strtoll_l 3 , -.Xr strtoq_l 3 , .Xr strtoul_l 3 , .Xr strtoull_l 3 , -.Xr strtouq_l 3 , .Xr wcstombs_l 3 , .Xr wctomb_l 3 .It In string.h diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map index 7e0b141a21b6..9d2944fdb7e9 100644 --- a/lib/libc/stdlib/Symbol.map +++ b/lib/libc/stdlib/Symbol.map @@ -93,11 +93,9 @@ FBSD_1.3 { strtol_l; strtold_l; strtoll_l; - strtoq_l; strtoul_l; strtoull_l; strtoumax_l; - strtouq_l; }; FBSD_1.4 { From nobody Thu Mar 2 20:59: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 4PSNkx5PYhz3wFy5; Thu, 2 Mar 2023 20:59: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 4PSNkx4lR9z3xdS; Thu, 2 Mar 2023 20:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPt0gANCkYTRKldjPlWKR1PowFP/WbCD1mQUjkSCzOA=; b=AC/CEHIq5miWZb8/pmhki6lvVDIDtiHbq10bnacvrpBJFRVvqxEREPv479SY9B1+yXy89+ 0IQuJfHrnOJODt0RggFQJAsQihz7zFynOdirv/vA/M3jfPpW0jS3FwNkIjQ3WLiOsfDNmM dDcaTuAeKQlqoSLUdm/ePo7YNAZ+vvgRIwRwDN0/vC/EKFR7+zgeYqn7UlTzEQ1TUm9orY neKOgqz60elwf+/q3a7IkW8SCCP6IHm3H0DNt1kXVkJcihCsgUI5zTXgkU3dIwd/lJEbJn 0Pz/gt9UmQ1TYzwbEoHmDrcIbp5v2Ry6rnWKgatuzpIlzIvsnKkNpJHZeEJA+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677790761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPt0gANCkYTRKldjPlWKR1PowFP/WbCD1mQUjkSCzOA=; b=eL7EV+yEZb3QXqCJ8vytIDB1h7lwQcWryWxZ/Qd2Wc8iONNzzE2+uWZBjlt4f1RgrEF2dK E68qqOOdihVNuG+JDDTIxWQvbZE+zmrSQZQvGSqFN6wzfSuLclGvvak0m2C0S74uH6y2rm cBULi5vYx54ywpibGfaYg9Q1OohajFmKnPX7C6ZzyX2PAERglQBZ6mBWGsNQtswXhqWX3I JyaAoHosjRLntDh+SLLtYrGVHlHYITirhoSNr5QhjuVGzE67h3HRaNRiPSRrbGrc7ZzVs/ RUdWuRYFNQRjEGxIdkl2TZSlqE9rg2Xe0+X0/hgVE6Y0p3iidfpo63vTN/pVFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677790761; a=rsa-sha256; cv=none; b=ejvdKyoZYayw95yszxjAV9cfBIXrIaWjwlAQfmEUccAHIAlgN86fKo7LCXgG0mq4GDl7sx QiHIPbWVq1Ydf/I/1mTYPycDaTsYS7luwt6NWshOYMGu/OV3ERTrcWvG9pWsCU05UP+/7W ulNYo7LKPZG9G0ppUsEWmKjXgOX6YtZq7m/PccWAxcmm7JcQRmh1pY/HSJRZNMywf569PX jO3rgUZxnvADAE9QPBIiPNZCbSLGpMeB2f0pZccDyje3Qw97hRYcBMkiIrxMPnLk9LDJi7 ywO86dC23aq/nDPHTwCbfLa2DcDIhiUGv8cuqrsx4gxzBOQPLYSma/nz+T2adQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSNkx3gqPzWDc; Thu, 2 Mar 2023 20:59: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 322KxLJF098511; Thu, 2 Mar 2023 20:59:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322KxL1Y098510; Thu, 2 Mar 2023 20:59:21 GMT (envelope-from git) Date: Thu, 2 Mar 2023 20:59:21 GMT Message-Id: <202303022059.322KxL1Y098510@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: c7a8502bdf18 - main - open.2: describe O_RESOLVE_BENEATH errors correctly 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: c7a8502bdf187ccf035c5b29a93e34cc01346a73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c7a8502bdf187ccf035c5b29a93e34cc01346a73 commit c7a8502bdf187ccf035c5b29a93e34cc01346a73 Author: Val Packett AuthorDate: 2023-02-19 20:14:15 +0000 Commit: Ed Maste CommitDate: 2023-03-02 20:58:00 +0000 open.2: describe O_RESOLVE_BENEATH errors correctly The behavior is the same as in capability mode, it does not actually return EINVAL for absolute lookups: openat(AT_FDCWD,"/tmp/test",O_RDONLY|O_DIRECTORY,00) = 3 (0x3) openat(3,"../../",O_RDONLY|0x800000,00) ERR#93 'Capabilities insufficient' openat(3,"/etc/passwd",O_RDONLY|0x800000,00) ERR#93 'Capabilities insufficient' Fixes: 1f305be43 ("Document {O,AT}_RESOLVE_BENEATH...") Reviewed by: kib, pauamma (manpages), emaste Sponsored by: https://www.patreon.com/valpackett Pull Request: https://github.com/freebsd/freebsd-src/pull/680 Differential Revision: https://reviews.freebsd.org/D38675 --- lib/libc/sys/open.2 | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2 index 876a4ce1e57d..574b6b136d39 100644 --- a/lib/libc/sys/open.2 +++ b/lib/libc/sys/open.2 @@ -28,7 +28,7 @@ .\" @(#)open.2 8.2 (Berkeley) 11/16/93 .\" $FreeBSD$ .\" -.Dd April 22, 2022 +.Dd March 2, 2023 .Dt OPEN 2 .Os .Sh NAME @@ -572,12 +572,6 @@ and .Dv O_EXEC or .Dv O_SEARCH . -.It Bq Er EINVAL -The -.Dv O_RESOLVE_BENEATH -flag is specified and -.Dv path -is absolute. .It Bq Er EBADF The .Fa path @@ -606,19 +600,32 @@ is specified and the process is in capability mode. was called and the process is in capability mode. .It Bq Er ENOTCAPABLE .Fa path -is an absolute path, -or contained a ".." component leading to a -directory outside of the directory hierarchy specified by -.Fa fd , +is an absolute path and the process is in capability mode. +.It Bq Er ENOTCAPABLE +.Fa path +is an absolute path and +.Dv O_RESOLVE_BENEATH +is specified. +.It Bq Er ENOTCAPABLE +.Fa path +contains a ".." component leading to a directory outside +of the directory hierarchy specified by +.Fa fd and the process is in capability mode. .It Bq Er ENOTCAPABLE -The +.Fa path +contains a ".." component leading to a directory outside +of the directory hierarchy specified by +.Fa fd +and .Dv O_RESOLVE_BENEATH -flag was provided, and the relative +is specified. +.It Bq Er ENOTCAPABLE .Fa path -escapes the -.Ar fd -directory. +contains a ".." component, the +.Dv vfs.lookup_cap_dotdot +.Xr sysctl 3 +is set, and the process is in capability mode. .El .Sh SEE ALSO .Xr chmod 2 , From nobody Thu Mar 2 21:10: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 4PSP094LQfz3wGdj; Thu, 2 Mar 2023 21:10: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 4PSP093wwWz3y9c; Thu, 2 Mar 2023 21:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677791449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=teu7ju3P63CT/cPZudrRPNfXleRCPr53Gon9Wr82gBI=; b=JWNUeUbTLRdO65Jm6RJCDd5wOwIN3MhnOopuYQocDjPkOdLPrs5Q3Cu2CD2NYTpxrLfPVt olXRhq9Ze0IQdwFAjODmE1gD+oDOY0M0EL/eiGkMuXCyiMrxiFnJxZ7BdHeS+zLInLJxG+ hQYvSLXIAHSImS4eF4Kb+dZw+Me6zhLdFhSonsMAh4VCIFDXnBZsVYwEuQprEhr2YQVS0I Lu4MuOQazO76mihyO1g9GJQh8HNhraiiY8Hn6h0R6ioMMbhIE65CpNiU6JFQufbERZnyZU kZajmcQG/RSp/ZfeaXHpcJpP4nytwwrDVQz1zxbKHn7OL7uYdUqQw9N5fFMBEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677791449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=teu7ju3P63CT/cPZudrRPNfXleRCPr53Gon9Wr82gBI=; b=Ali2jArejEYICXaPtDSWHGlbAg3iAG7/Tuck8oNed6d2eg8IstZZ+dfMfrhwcaGE5zgwRq c2UXUFOgGS3LaZFkInl1zyKwZoGOKtfteEv30o5LMnCowRuDxV4BKZ4oEzpcYuBnhOzr9L 1ObfcZIepKK4XC/H8x/NgRQX26i37sDWHQrHqIixLgN7SKy2TUGzmVC9KSq6xWbbwky5Es Xu/PQAzzD6ORR5t9mlMxWZswGSgczmQh2ScDVZa/umbtV3yb1EeVrXt/9oUk83lmqODWFX +HRP8ylx23dZU2YNZpN26DcXvXhp9tkoUvVEUqCXzxIz5/8facsR7BwbH+dAHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677791449; a=rsa-sha256; cv=none; b=DVEKaxCfozq9fF/G/Zqps0Q1c8XRAJOVwv8yBU/3WtgV/f8pPgNY6n0M60aT8UDq1U7KUe Q9eylkKaBImSuoKOOC66uOAWzAjGXbzDZtS2xc7vCyTZvqwDKa2vpOIdwlvkVNatHHQBED rRM+FKahDwdurM8oMXlWoBWSblgzZq/iA57LFuSY+N3budffxQGPmswkyKJMEQpsp6Gr9u bhg01nQBmn2XHt512Ivpl0awnQaO5zQ/Jv/otNtwc/SmOjpHgcZAiXdpC6Cw6HFcKKbqxc rBRKNThZ45n9eQ1R6zMwecqd1s4OxLNMPSWr8SUGHeQescYtKtyI/2NIMBugFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSP0931mWzWtK; Thu, 2 Mar 2023 21:10: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 322LAnGe028266; Thu, 2 Mar 2023 21:10:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322LAnRZ028265; Thu, 2 Mar 2023 21:10:49 GMT (envelope-from git) Date: Thu, 2 Mar 2023 21:10:49 GMT Message-Id: <202303022110.322LAnRZ028265@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: 4bbbd5875d32 - main - vfs_mount.c: Allow mountd(8) to do exports in a vnet prison 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: 4bbbd5875d32f3cbe76235d90243f713eff9b9d0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4bbbd5875d32f3cbe76235d90243f713eff9b9d0 commit 4bbbd5875d32f3cbe76235d90243f713eff9b9d0 Author: Rick Macklem AuthorDate: 2023-03-02 21:09:01 +0000 Commit: Rick Macklem CommitDate: 2023-03-02 21:09:01 +0000 vfs_mount.c: Allow mountd(8) to do exports in a vnet prison To run mountd in a vnet prison, three checks in vfs_domount() and vfs_domount_update() related to doing exports needed to be changed, so that a file system visible within the prison but mounted outside the prison can be exported. I did all three in a minimal way, only changing the checks for the specific case of a process (typically mountd) doing exports within a vnet prison and not updating the mount point in other ways. The changes are: - Ignore the error return from vfs_suser(), since the file system being mounted outside the prison will cause it to fail. - Use the priv_check(PRIV_NFS_DAEMON) for this specific case within a prison. - Skip the call to VFS_MOUNT(), since it will return an error, due to the "from" argument not being set correctly. VFS_MOUNT() does not appear to do anything for the case of doing exports only. Reviewed by: markj MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D37741 --- sys/kern/vfs_mount.c | 107 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 93 insertions(+), 14 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index a3990b9203dd..6233d4c3741a 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -78,7 +78,8 @@ __FBSDID("$FreeBSD$"); #define VFS_MOUNTARG_SIZE_MAX (1024 * 64) static int vfs_domount(struct thread *td, const char *fstype, char *fspath, - uint64_t fsflags, struct vfsoptlist **optlist); + uint64_t fsflags, bool jail_export, + struct vfsoptlist **optlist); static void free_mntarg(struct mntarg *ma); static int usermount = 0; @@ -806,7 +807,7 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) struct vfsopt *opt, *tmp_opt; char *fstype, *fspath, *errmsg; int error, fstypelen, fspathlen, errmsg_len, errmsg_pos; - bool autoro; + bool autoro, has_nonexport, jail_export; errmsg = fspath = NULL; errmsg_len = fspathlen = 0; @@ -842,15 +843,37 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) goto bail; } + /* + * Check to see that "export" is only used with the "update", "fstype", + * "fspath", "from" and "errmsg" options when in a vnet jail. + * These are the ones used to set/update exports by mountd(8). + * If only the above options are set in a jail that can run mountd(8), + * then the jail_export argument of vfs_domount() will be true. + * When jail_export is true, the vfs_suser() check does not cause + * failure, but limits the update to exports only. + * This allows mountd(8) running within the vnet jail + * to export file systems visible within the jail, but + * mounted outside of the jail. + */ /* * We need to see if we have the "update" option * before we call vfs_domount(), since vfs_domount() has special * logic based on MNT_UPDATE. This is very important * when we want to update the root filesystem. */ + has_nonexport = false; + jail_export = false; TAILQ_FOREACH_SAFE(opt, optlist, link, tmp_opt) { int do_freeopt = 0; + if (jailed(td->td_ucred) && + strcmp(opt->name, "export") != 0 && + strcmp(opt->name, "update") != 0 && + strcmp(opt->name, "fstype") != 0 && + strcmp(opt->name, "fspath") != 0 && + strcmp(opt->name, "from") != 0 && + strcmp(opt->name, "errmsg") != 0) + has_nonexport = true; if (strcmp(opt->name, "update") == 0) { fsflags |= MNT_UPDATE; do_freeopt = 1; @@ -933,9 +956,10 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) fsflags |= MNT_SYNCHRONOUS; else if (strcmp(opt->name, "union") == 0) fsflags |= MNT_UNION; - else if (strcmp(opt->name, "export") == 0) + else if (strcmp(opt->name, "export") == 0) { fsflags |= MNT_EXPORTED; - else if (strcmp(opt->name, "automounted") == 0) { + jail_export = true; + } else if (strcmp(opt->name, "automounted") == 0) { fsflags |= MNT_AUTOMOUNTED; do_freeopt = 1; } else if (strcmp(opt->name, "nocover") == 0) { @@ -965,7 +989,15 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) goto bail; } - error = vfs_domount(td, fstype, fspath, fsflags, &optlist); + /* + * If has_nonexport is true or the caller is not running within a + * vnet prison that can run mountd(8), set jail_export false. + */ + if (has_nonexport || !jailed(td->td_ucred) || + !prison_check_nfsd(td->td_ucred)) + jail_export = false; + + error = vfs_domount(td, fstype, fspath, fsflags, jail_export, &optlist); if (error == ENOENT) { error = EINVAL; if (errmsg != NULL) @@ -983,7 +1015,8 @@ vfs_donmount(struct thread *td, uint64_t fsflags, struct uio *fsoptions) printf("%s: R/W mount failed, possibly R/O media," " trying R/O mount\n", __func__); fsflags |= MNT_RDONLY; - error = vfs_domount(td, fstype, fspath, fsflags, &optlist); + error = vfs_domount(td, fstype, fspath, fsflags, jail_export, + &optlist); } bail: /* copyout the errmsg */ @@ -1273,6 +1306,7 @@ vfs_domount_update( struct thread *td, /* Calling thread. */ struct vnode *vp, /* Mount point vnode. */ uint64_t fsflags, /* Flags common to all filesystems. */ + bool jail_export, /* Got export option in vnet prison. */ struct vfsoptlist **optlist /* Options local to the filesystem. */ ) { @@ -1284,6 +1318,7 @@ vfs_domount_update( int error, export_error, i, len; uint64_t flag; gid_t *grps; + bool vfs_suser_failed; ASSERT_VOP_ELOCKED(vp, __func__); KASSERT((fsflags & MNT_UPDATE) != 0, ("MNT_UPDATE should be here")); @@ -1312,7 +1347,20 @@ vfs_domount_update( * Only privileged root, or (if MNT_USER is set) the user that * did the original mount is permitted to update it. */ + /* + * For the case of mountd(8) doing exports in a jail, the vfs_suser() + * call does not cause failure. vfs_domount() has already checked + * that "root" is doing this and vfs_suser() will fail when + * the file system has been mounted outside the jail. + * jail_export set true indicates that "export" is not mixed + * with other options that change mount behaviour. + */ + vfs_suser_failed = false; error = vfs_suser(mp, td); + if (jail_export && error != 0) { + error = 0; + vfs_suser_failed = true; + } if (error != 0) { vput(vp); return (error); @@ -1342,11 +1390,26 @@ vfs_domount_update( error = EBUSY; goto end; } - mp->mnt_flag &= ~MNT_UPDATEMASK; - mp->mnt_flag |= fsflags & (MNT_RELOAD | MNT_FORCE | MNT_UPDATE | - MNT_SNAPSHOT | MNT_ROOTFS | MNT_UPDATEMASK | MNT_RDONLY); - if ((mp->mnt_flag & MNT_ASYNC) == 0) - mp->mnt_kern_flag &= ~MNTK_ASYNC; + if (vfs_suser_failed) { + KASSERT((fsflags & (MNT_EXPORTED | MNT_UPDATE)) == + (MNT_EXPORTED | MNT_UPDATE), + ("%s: jailed export did not set expected fsflags", + __func__)); + /* + * For this case, only MNT_UPDATE and + * MNT_EXPORTED have been set in fsflags + * by the options. Only set MNT_UPDATE, + * since that is the one that would be set + * when set in fsflags, below. + */ + mp->mnt_flag |= MNT_UPDATE; + } else { + mp->mnt_flag &= ~MNT_UPDATEMASK; + mp->mnt_flag |= fsflags & (MNT_RELOAD | MNT_FORCE | MNT_UPDATE | + MNT_SNAPSHOT | MNT_ROOTFS | MNT_UPDATEMASK | MNT_RDONLY); + if ((mp->mnt_flag & MNT_ASYNC) == 0) + mp->mnt_kern_flag &= ~MNTK_ASYNC; + } rootvp = vfs_cache_root_clear(mp); MNT_IUNLOCK(mp); mp->mnt_optnew = *optlist; @@ -1357,7 +1420,17 @@ vfs_domount_update( * XXX The final recipients of VFS_MOUNT just overwrite the ndp they * get. No freeing of cn_pnbuf. */ - error = VFS_MOUNT(mp); + /* + * For the case of mountd(8) doing exports from within a vnet jail, + * "from" is typically not set correctly such that VFS_MOUNT() will + * return ENOENT. It is not obvious that VFS_MOUNT() ever needs to be + * called when mountd is doing exports, but this check only applies to + * the specific case where it is running inside a vnet jail, to + * avoid any POLA violation. + */ + error = 0; + if (!jail_export) + error = VFS_MOUNT(mp); export_error = 0; /* Process the export option. */ @@ -1495,6 +1568,7 @@ vfs_domount( const char *fstype, /* Filesystem type. */ char *fspath, /* Mount path. */ uint64_t fsflags, /* Flags common to all filesystems. */ + bool jail_export, /* Got export option in vnet prison. */ struct vfsoptlist **optlist /* Options local to the filesystem. */ ) { @@ -1512,7 +1586,11 @@ vfs_domount( if (strlen(fstype) >= MFSNAMELEN || strlen(fspath) >= MNAMELEN) return (ENAMETOOLONG); - if (jailed(td->td_ucred) || usermount == 0) { + if (jail_export) { + error = priv_check(td, PRIV_NFS_DAEMON); + if (error) + return (error); + } else if (jailed(td->td_ucred) || usermount == 0) { if ((error = priv_check(td, PRIV_VFS_MOUNT)) != 0) return (error); } @@ -1593,7 +1671,8 @@ vfs_domount( } free(pathbuf, M_TEMP); } else - error = vfs_domount_update(td, vp, fsflags, optlist); + error = vfs_domount_update(td, vp, fsflags, jail_export, + optlist); out: NDFREE_PNBUF(&nd); From nobody Thu Mar 2 21:14: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 4PSP4y3Fc5z3wGx5; Thu, 2 Mar 2023 21:14: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 4PSP4y2jN4z40jv; Thu, 2 Mar 2023 21:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677791698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sHEckn+4lAxc+6JQNj5sEHyL7KUvAnZCQII1uKzs1Tk=; b=NS5KZJDwyM0Hkwv3qr9UIr8edTAJdFTkj710a+ZG8qU8ABwAA7HfPvN43LsqtngIYjNDFs 5JFMhpgBMKbvsmGXPcfNz1HoIJq15Y3Szuj1Yt2es5z2bwyF89ioGv1Oi6YVUZyvGrvx3S ju+b3mGW9ikqmKE3+1mZ3LE/thDQExgj8BpKaJIH42cFNcF3x4FrSVVjF1aljZKo4Ce4Qq eWv9ANYXlPBW9p0HJ+rsgSnLcx/j0AvuVCpI/SQUi1iFIJgpIKilbBMCtaPgNevDqu1Oam 0bEAcE+6Jv4iWlfiREyJ/pbOLEBQBa7wmEo1AKdFyR/YzWjU/VauQp501ts+Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677791698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sHEckn+4lAxc+6JQNj5sEHyL7KUvAnZCQII1uKzs1Tk=; b=sd5diYa/dA+M9UH64XgkWJm9FVgGfH70y59fKx6LrlQDy2vPJoCeTU+2twck/vv5QMvbju j1PTMKIfugEVlb3jmuzL6/gB+WvW9Eipjm+xpeIVJRIJPJ1OqsM6cb4dkDL+dCLr8CM0qv G5ZL152ml8GqGW/PDS/lSQzuP5Nq/PqYBrlmcJtDfSydLg+FfUky5kgYk3AsFQ/knnHNAz oB0xMW77UpE4YOwoglz4+A+3nVSXcwCtQZngULVI75qjWs9lfyHscVo0cdQho9oVEMxG4z 1hgODCR74D+JgWKsVbUKfv5bJFFcAsBSW8rC0Nfvt6JKT6HydeJm4VrEr6NBSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677791698; a=rsa-sha256; cv=none; b=HWtjN9NhYWaELlWpvFYHF9tt9abrUATVew6kzMjaWooM/sjIZGt4p/am/xCH2GJb2RjkV6 CZHZnwZ0sO2n+Z6A4KNs/jyWVd4KtlTJX/76KghjRfl49qEKmRclyu9PaPP/IJOHj9ahiD wYdcOXj7vAWxWaKoqY4szn8JwYqVNreFSK98Yw1XZ4Ko0YyzpNA5mNVrmyZDq0ov1RALrl BO+1O55KZgignrfSrHTBoTtzcKjo58U/vqvplR8RmSFM60U2G0QKtKPXNcALAcEAOYV1lI NReowEORZlsmK0wGDxlvXNF2GjHYrIia1NlIF2kRSoruYcvWUVz4BgArhtZCJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSP4y1mtWzWpY; Thu, 2 Mar 2023 21:14: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 322LEw5x032134; Thu, 2 Mar 2023 21:14:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322LEwf7032132; Thu, 2 Mar 2023 21:14:58 GMT (envelope-from git) Date: Thu, 2 Mar 2023 21:14:58 GMT Message-Id: <202303022114.322LEwf7032132@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: cbbb22031f9b - main - kern_jail.c: Remove #ifdefs for VNET_NFSD 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: cbbb22031f9b957967c03dc8e685392f7d7e7fb8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=cbbb22031f9b957967c03dc8e685392f7d7e7fb8 commit cbbb22031f9b957967c03dc8e685392f7d7e7fb8 Author: Rick Macklem AuthorDate: 2023-03-02 21:13:24 +0000 Commit: Rick Macklem CommitDate: 2023-03-02 21:13:24 +0000 kern_jail.c: Remove #ifdefs for VNET_NFSD The consensus was that VNET_NFSD was not needed. This patch removes it from kern_jail.c. With this patch, support for the "allow.nfsd" jail parameter is enabled in the kernel for kernels built with "options VIMAGE". Reviewed by: markj MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D38808 --- sys/kern/kern_jail.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 41bd5cdca620..72d89a290269 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -219,7 +219,7 @@ static struct bool_flags pr_flag_allow[NBBY * NBPW] = { {"allow.unprivileged_proc_debug", "allow.nounprivileged_proc_debug", PR_ALLOW_UNPRIV_DEBUG}, {"allow.suser", "allow.nosuser", PR_ALLOW_SUSER}, -#if defined(VNET_NFSD) && defined(VIMAGE) && defined(NFSD) +#ifdef VIMAGE {"allow.nfsd", "allow.nonfsd", PR_ALLOW_NFSD}, #endif }; @@ -2136,12 +2136,10 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) } #endif -#ifdef VNET_NFSD if (born && pr != &prison0 && (pr->pr_allow & PR_ALLOW_NFSD) != 0 && (pr->pr_root->v_vflag & VV_ROOT) == 0) printf("Warning jail jid=%d: mountd/nfsd requires a separate" " file system\n", pr->pr_id); -#endif drflags &= ~PD_KILL; td->td_retval[0] = pr->pr_id; @@ -3790,12 +3788,7 @@ prison_priv_check(struct ucred *cred, int priv) case PRIV_NFS_DAEMON: case PRIV_VFS_GETFH: case PRIV_VFS_MOUNT_EXPORTED: -#ifdef VNET_NFSD if (!prison_check_nfsd(cred)) -#else - printf("running nfsd in a prison requires a kernel " - "built with ''options VNET_NFSD''\n"); -#endif return (EPERM); #ifdef notyet case PRIV_NFS_LOCKD: @@ -4551,7 +4544,7 @@ SYSCTL_JAIL_PARAM(_allow, unprivileged_proc_debug, CTLTYPE_INT | CTLFLAG_RW, "B", "Unprivileged processes may use process debugging facilities"); SYSCTL_JAIL_PARAM(_allow, suser, CTLTYPE_INT | CTLFLAG_RW, "B", "Processes in jail with uid 0 have privilege"); -#if defined(VNET_NFSD) && defined(VIMAGE) && defined(NFSD) +#ifdef VIMAGE SYSCTL_JAIL_PARAM(_allow, nfsd, CTLTYPE_INT | CTLFLAG_RW, "B", "Mountd/nfsd may run in the jail"); #endif From nobody Thu Mar 2 23:40: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 4PSSJl5xVsz3wPHy; Thu, 2 Mar 2023 23:40: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 4PSSJl4vm9z4Hsk; Thu, 2 Mar 2023 23:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677800423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moGMVsvCgE45uRB/8+pambYkNylumeQhW8wYi+nf4xc=; b=x1x7xq8zRbbcmS7nkuLUOKVHWOroSIs+770redPF2PTskbHCtTxI2p1IfNQfeKzYmLNTIF d7+DRVQoKd33wBuYQ2eUX3ArFhRTZQzWG2LmRtMr+JDUPswuMtRT6RQPYSWHoUUXvDjta2 ho2FLYmrPb7e2c3/4HsCnbikMtbOJ9PuKkog4XS/ImNQq+8J5bRWud5BuXesqYP0TNdal/ vQq/vELm+JqUcwrY1s7KLYs/NJON7UO6yAWAFMUqnyBHe+oMfspkjDvQeLTQBeiskC04V7 XNCsbc5rPwixTajhvYFbDiJCMfXHbCBquRTJfqDZoFqtVQW/KstqXWL+B1l8Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677800423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moGMVsvCgE45uRB/8+pambYkNylumeQhW8wYi+nf4xc=; b=bBeTUEieaEb144fmkpAvkXYeQnLXyCKCGFj5KZfzlpbzWRhQVWQ682ii8EdbClOc8pRNWs GtV7B0ZB0FzG3ag7Qc4gcpqYP3q/R0+N1C1yy2WpHeziYQzBYKR2+9X5+dNyU9tIpYt6Pi z06k7HMYX+O0W6ua6prodqx5nQgmVa1U1b4h4/goG2TftSkJFx60H1d4hzlKFc33nDpo5v y4/KcsDiHrxcDBlIMQwNHtT4W9g9E2cPimBXZqIe5uJ9Dxauw8TBGLDvcLvMUv0MXSSicN S0Zy6a9W+s6UiSvTf9nWHQJcaI0jHQUqiCQZ3HGSGVwasz9+rWrgV+8La++LbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677800423; a=rsa-sha256; cv=none; b=nqCPuDEFZua/dhADdD8+fvd/+8dxK6kepEaNsyunM97Y7keY7AkA9OuIDeaA9V3iYsi1hw A6goN2l/241BB/1HrMn1aaymwOIJws7P/k1EeeMAYAGXFbC+s4MWf8s1IgODPWN0FCBBw2 bEp9ydQcD9i4CoryM6L8lTqNYvuG3HUSqMVAMqy+EfFaffy6fkiiaNdr05Ai7qxy9fi/kN cb8m99lmTW25pb3QCCFjh+j/LhpAlR7GoI8qqwwy7wW377Olitt3VqQLTOryyyP8EFyBJy koUYQBcNP4yTX0t3KO4NscbNberGSD4+10KHVB6TSvdlQg9TEiwWcCfsB60PVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSSJl3pVFzbdM; Thu, 2 Mar 2023 23:40: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 322NeNcY069987; Thu, 2 Mar 2023 23:40:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322NeNYo069986; Thu, 2 Mar 2023 23:40:23 GMT (envelope-from git) Date: Thu, 2 Mar 2023 23:40:23 GMT Message-Id: <202303022340.322NeNYo069986@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: 3746e90118c9 - main - NATM: Remove useless NETGRAPH_ATM_ATMPIF option 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: 3746e90118c941eb5c9123e22fe05026b78382ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3746e90118c941eb5c9123e22fe05026b78382ab commit 3746e90118c941eb5c9123e22fe05026b78382ab Author: Brooks Davis AuthorDate: 2023-03-02 23:36:55 +0000 Commit: Brooks Davis CommitDate: 2023-03-02 23:40:05 +0000 NATM: Remove useless NETGRAPH_ATM_ATMPIF option This code was removed as part of the NATM removal in 2017 and somehow this option was missed. MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38874 --- sys/conf/NOTES | 1 - sys/conf/options | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 4de38aeb4e94..f892593d862a 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -794,7 +794,6 @@ options NETGRAPH_DEBUG # enable extra debugging, this # Node types options NETGRAPH_ASYNC options NETGRAPH_ATMLLC -options NETGRAPH_ATM_ATMPIF options NETGRAPH_BLUETOOTH # ng_bluetooth(4) options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) diff --git a/sys/conf/options b/sys/conf/options index 42529a90a54e..9fe386f6af19 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -510,7 +510,6 @@ NETGRAPH NETGRAPH_DEBUG opt_netgraph.h NETGRAPH_ASYNC opt_netgraph.h NETGRAPH_ATMLLC opt_netgraph.h -NETGRAPH_ATM_ATMPIF opt_netgraph.h NETGRAPH_BLUETOOTH opt_netgraph.h NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h NETGRAPH_BLUETOOTH_H4 opt_netgraph.h From nobody Thu Mar 2 23:40: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 4PSSJm61Lgz3wPT8; Thu, 2 Mar 2023 23:40: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 4PSSJm5WFBz4J49; Thu, 2 Mar 2023 23:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677800424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJsSvkChMibiGXhcwCTTdSrvfZrNiHW556dReQREH4w=; b=Rpcxbsgd5qmisdE1OHHQZErWpLCDSj9noqBoG4IpwZ2s72canMQo2gYItDOw3RplVYkCvS hGsfBVHFUUgUPKN2CaaI2H26HnUldbFNjBjJYO7EsqTJQrOoHc6xQoYFxyR42jiLiWXYRq WU4RBB8OKzY8eEbLPPuNShJMsxEtSqDKTebOJWczX7ouLcm3F18erRuFAE2J0KfSySXOSf 6jnkKubCOld7tBJ++JibzrO0U1/icFJPr4+uZ1iybQudr5hMxHUgYyJWlAbNUUNZew2aZr YIkWe3drES8jCdrTmleAKozcO+jDY3eVr0cMPfoccauHvVHcl/Vg2l/fg3uBNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677800424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJsSvkChMibiGXhcwCTTdSrvfZrNiHW556dReQREH4w=; b=pofwt7WOYa84urXkCCuH1uclMcqW7C1zYBN0BmphU+KJv21g8VVrS3V2zokpZ2c1lRdC0p FPMJLwPOhDz8t7qOg6fOFCbVg2xYtsDLIlz3eoPsaYhHhVvD56VmNRpMWRFVPsMx2+xaGc Ctarzk9wR2X1M5s6XWG70U7tswaZV20VCrp0YzMryxk/JNCVnvVWCwFZnzUnKvsavUEgaH aSRQ11M4sA3y2XKPMdUM2tI5xhilRx8uyVK3NT8hMWPrekpHJQrIaiLtPEyNvu/nLqwG0B PJfA7FACblIPjXUTCNGfzLb44V/WiW+hVoVMf0M+agGMaXgGZ9rnzkwUOjESbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677800424; a=rsa-sha256; cv=none; b=tMg2kvhCuKP5G081xB+P1ggKoN2R3aFU5Xj8zEPqjgOoc6FfBuYoiN99+48E7KluU2Y4WG /MopiZ7azvoucY5whmaIhugICGvvLOVgUjFv9UaN3y46fAX+Hpqzrf9AyTSjAPX5Yqrc1O NB4bimoXPb/wW+CyKTN5taYDsQsxdUUx+d1CRYdsbs+hYecKpEWuFFY1ypXsI+BA2lpD8E c/zYNdPPYbmGzG6yVV7yhJvvlPwdJ2R8fRsumgx2lw1WFckLyvUzUsQtQmobGUUXRezKRd c+PtoAwHkSGoUk2LoS7Gp0rS4m9YaI3WeHk5326OedOZFRtulh0+4Dce1sATPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSSJm4Jd0zbKW; Thu, 2 Mar 2023 23:40: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 322NeOQc070006; Thu, 2 Mar 2023 23:40:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322NeOB0070005; Thu, 2 Mar 2023 23:40:24 GMT (envelope-from git) Date: Thu, 2 Mar 2023 23:40:24 GMT Message-Id: <202303022340.322NeOB0070005@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: bd32aedeee1a - main - NgATM: Remove useless NGATM_ATM option 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: bd32aedeee1a2af8293bfb1a2c85432b7ed8f207 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=bd32aedeee1a2af8293bfb1a2c85432b7ed8f207 commit bd32aedeee1a2af8293bfb1a2c85432b7ed8f207 Author: Brooks Davis AuthorDate: 2023-03-02 23:37:10 +0000 Commit: Brooks Davis CommitDate: 2023-03-02 23:40:05 +0000 NgATM: Remove useless NGATM_ATM option MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38875 --- sys/conf/NOTES | 1 - sys/conf/options | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index f892593d862a..e76fe24d5506 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -842,7 +842,6 @@ options NETGRAPH_VJC options NETGRAPH_VLAN # NgATM - Netgraph ATM -options NGATM_ATM options NGATM_ATMBASE options NGATM_SSCOP options NGATM_SSCFU diff --git a/sys/conf/options b/sys/conf/options index 9fe386f6af19..af83bc967670 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -564,7 +564,6 @@ NETGRAPH_VJC opt_netgraph.h NETGRAPH_VLAN opt_netgraph.h # NgATM options -NGATM_ATM opt_netgraph.h NGATM_ATMBASE opt_netgraph.h NGATM_SSCOP opt_netgraph.h NGATM_SSCFU opt_netgraph.h From nobody Thu Mar 2 23:40: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 4PSSJn6j3sz3wPTF; Thu, 2 Mar 2023 23:40: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 4PSSJn684hz4Hx1; Thu, 2 Mar 2023 23:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677800425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GAqir57J0GXMCYS8WXjqYk/H5kMck24575x8U/ZWL2k=; b=e7g+S1PVAg2fsbg835uVBgxfBVd7nnvqPH8oTqWad05y5UpywpPp/ogYF+FEQpISMLtxcS eAp5Gx41AThET2hVM6ZbXq+PsL/DJ9zEeOju2FFXjfsrKSxIoljPWXubiIUmdKUxQj7AYe NbdHMJYGukPPDPX6HiHn3Nqnf6OzwRS4OFGR2KtwJYFnX/nXBlC2gJTxR0VBgUmiuRhOGf IoOa4pzP52c+fXZvHGVt5O4XyGrVbsGMlgiWtbw4NFscHdGOqSQKZj3clDyH8ZUJTHVOI9 1V+OsFSumFoL0cnZ/7Ddl0L6KpEcGwnhz48tzPJJV7UxudhTULnGhSKzLWVh1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677800425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GAqir57J0GXMCYS8WXjqYk/H5kMck24575x8U/ZWL2k=; b=f0+yqmyGPv47Bg8SubVZnMdnQox4ffE2cgect0k7Pfn8vY0qvRSqvxTciAl8p7SYKVZzlS OwnXG+O2weJc0G4v8CqbjRUDzswWjueBcfENqlF+qQuVuHLX7Yhh0Z0xMoBVJaMgwsgaLW kgWmp/NsbOtR8HiiDWoNwJCkHgFI0I3sJ+1w+z/RIkXYgwDO9HBA8M5kfPeSV0/e+COGu4 t1NXJtogoUHcqv9CWqbjEzCFluSH5K34/P2/Bd3k3/L4dcO0+p2dIPMHv3UJt/cTmpmbGd z/sQJsVga4uckhK2k0qXyv1TlS4POzG8bbjDd5xu3NN2mnHn3S/zYowATixDqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677800425; a=rsa-sha256; cv=none; b=egUDarYuzg/Qw6m1MXdRzwcuPKYiGa9YNl2AIREBi8K2Ccc8F4pNkm1kaW3z34F/2h0wSr SpxhqgJx1s3qhju6pPsiv6Gbo6BpHVv0VpYLpZ+oFT+sBAQdjlXWjUfRcX4TXIISQY6EV0 Ut/6TA1th+5xdb9vQYrMqH2H0NzAmA19dQ9b+Pmrx4BvxHdrMo1/NS29o79AFyDWhlWj/X HHkx3hDg/jgMwI3Kb4B5uURZYw1yi+EUChMXsDSBKdrSr70Gubwlvs4XRbadYXqhdIpfDX 2ekqeg8htgNH0ux90eTLwZ3Es3mb55rSUmS8hsoB3ILSEg27Dd9zJ6pTIAxRaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSSJn5Cm1zbmq; Thu, 2 Mar 2023 23:40: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 322NePPC070031; Thu, 2 Mar 2023 23:40:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322NeP9b070030; Thu, 2 Mar 2023 23:40:25 GMT (envelope-from git) Date: Thu, 2 Mar 2023 23:40:25 GMT Message-Id: <202303022340.322NeP9b070030@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: 3518a5bbd9bb - main - netgraph.4: remove obsolete ng_atm.4 reference 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: 3518a5bbd9bb0c03b38dea62e577042b779c3aed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3518a5bbd9bb0c03b38dea62e577042b779c3aed commit 3518a5bbd9bb0c03b38dea62e577042b779c3aed Author: Brooks Davis AuthorDate: 2023-03-02 23:37:18 +0000 Commit: Brooks Davis CommitDate: 2023-03-02 23:40:05 +0000 netgraph.4: remove obsolete ng_atm.4 reference MFC After: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38876 --- share/man/man4/netgraph.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4 index 6d3679041e5c..bbea09264435 100644 --- a/share/man/man4/netgraph.4 +++ b/share/man/man4/netgraph.4 @@ -1417,7 +1417,6 @@ common networking problems, solved using .Xr socket 2 , .Xr netgraph 3 , .Xr ng_async 4 , -.Xr ng_atm 4 , .Xr ng_atmllc 4 , .Xr ng_bluetooth 4 , .Xr ng_bpf 4 , From nobody Thu Mar 2 23:54: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 4PSSd96zzSz3wPmd; Thu, 2 Mar 2023 23:54:37 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 4PSSd94tWXz4Kht; Thu, 2 Mar 2023 23:54:37 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f41.google.com with SMTP id g17so1460981lfv.4; Thu, 02 Mar 2023 15:54:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677801275; 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=Ym3uzqb1gmy5dQbW7VPtVn4qVC1OL2UUKxmM5vGzD5Y=; b=VcsxpEW0eSDkoeln4XZ6+z5oHuB9e4JyP9UYJ3MhXth+eU+se0VWM8qgaxf3u5uQyB f/o99xyfboc19utPCHdMrjRwL20xhcHaiDK/z5oUO6h94W+8pQZhIjJLvbyDbWWDmpqw 5kHpYQd1UQEl/6rBaJnkElixIVmVc8MxjZrUNlaxeEXqs5Ii6e2r6LsGMSgLU4hm/NsJ IORrvha1o2MAUfyECtkrXMf0X1ONjIIN0STWgVFBeJC5bChLAhXJLhdqQKZPwZd4rY90 lVQuUV55fMWjqBI4wGLkvph1IYD0QXtDqZ9Ndoa04A0MBpkQV/VkIJQc0CVS2bW+c/C3 y1/Q== X-Gm-Message-State: AO0yUKXxOz0xNJyyN/8zklsltJedC2wFs1eDIAYIlwnVr1fQ+Hj5rT6X 2DtNprRm26mNmU2rTKDB4ED/DCPKwKzjyEswgN3NfMjUM+4= X-Google-Smtp-Source: AK7set8fv0p0KUJHwYd2SB46+O92FRHKylVjgM3Fa6BPG8zfzKoZ0DrzFbHHV0+swCZ+TxlB7ICaJetxz2fa+gbFF3s= X-Received: by 2002:ac2:4255:0:b0:4db:257b:f605 with SMTP id m21-20020ac24255000000b004db257bf605mr22621lfl.2.1677801275553; Thu, 02 Mar 2023 15:54:35 -0800 (PST) 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: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu> In-Reply-To: From: Ed Maste Date: Thu, 2 Mar 2023 18:54:26 -0500 Message-ID: Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain To: Warner Losh Cc: Kyle Evans , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Steffen Nurpmeso Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4PSSd94tWXz4Kht 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 Thu, 2 Mar 2023 at 15:37, Warner Losh wrote: > > I doubt egrep will ever be deprecated. Too many scripts depend on it. > And fixing this one is a drop in the bucket. I personally think the warning > from gnu-grep is bananas... Agreed on both points. In the man page we have: -E, --extended-regexp Interpret pattern as an extended regular expression (i.e., force grep to behave as egrep). That said, it's conceivable that this could end up invoking GNU egrep and thus emit a warning. It doesn't hurt to use grep -E instead. From nobody Thu Mar 2 23: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 4PSSkm4w3Yz3wQ9V; Thu, 2 Mar 2023 23:59: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 4PSSkm2hx4z4L3W; Thu, 2 Mar 2023 23:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677801568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tcNDS4FEmVKtobbPxCt8fP+JDMB/FTAJ4GpeUBU6VYM=; b=WCu4IbnKw2rMG4oQKnOz6o+DbqVGm9JzzS5PozePbDfBG9LNBbUk5LG1aTdvlOiB/cohvh 11UW3en9CzKJV8BePC97wsbzlO8Pzf3mTFlkOaJOyJ+ntWsO6tiOBkqTm2aahdynkdQgzN F7sIGUwyFL/kc+0e1sOmEqNIt0fhGQZyE29ZeqXO32yPtwuolbpu8C4rxjOSZj4i2fuJ2s 0LOmoeddG2F6VAsotEx5m8Za5BlUAlyAyDZiJbd4+gUF8lM4Dp3CYjg4OEWRK5AjS+a+Hb 7lD0gv1KnSd9opXRy4JPIOa12PicE3t3AoRj17EvUVt9mEEJfMjXS/z9yzGhKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677801568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tcNDS4FEmVKtobbPxCt8fP+JDMB/FTAJ4GpeUBU6VYM=; b=L4KK3NStG/7nppsS3lyABfGxGDJqbED0Omx2FbDfUqor3hKkeb5mYl2JRfuW3VJVelPWiy A6KFPAl/zymoaCXiJ+US6gh/aonsY+xJvUvugXiy4hANP72ORQvPZ83tJtaVEFee/pKTAz 8pNOFyG0nMMzd+qlVe7XBF3MRFpK3M+4Ji2Se1gV2Dikz4LUeV9y1t/iE6JBJBIkvzrMos ahi016j9WNTxzsfpkLSYAMwaLCGR0q+M2tatD+uu7Gvq8Qa9vOk5CrsL12/4TC4r7mTDba Tzh+/33aUVSN90hMSOpUthLx15MPgWYI4kJgA7lx+68Q/jH1zybUwRxw+gwCBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677801568; a=rsa-sha256; cv=none; b=l+uGqH8Fw1z+WJBOtyG5tLTjdUnFl+SlGn9XPBN7Qnbu26EyvyjXTA+7hKTcjkIFb/nfHP 1C/v9Mc/C+M/6zjGzMYT8x2zkFcgA9czD61mvHB4VjmvYxbH9dlqVktwF3PdXDCnOnQCjK uhNL0qiy8yf6hJYWzAQjM0czpDzDUpET4yttg7uoKM7gMfHzh6cCdeE3RUhHHH4CNaPQgs t/4441AgmlJaTbhli1YZFpN84XbkDBKQegHF/aObZWDhHr3XyT8PHqElj/T7qQhfstvI6L ljEsulc3Q4iXOAmubpjyvX2w5xyid+93vCLcM9x7mTB3vEa3MYJS5a5aVmdPoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSSkm1jWHzcDN; Thu, 2 Mar 2023 23:59: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 322NxSl7093129; Thu, 2 Mar 2023 23:59:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322NxSsO093128; Thu, 2 Mar 2023 23:59:28 GMT (envelope-from git) Date: Thu, 2 Mar 2023 23:59:28 GMT Message-Id: <202303022359.322NxSsO093128@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: e27ded83c76a - main - freebsd-update: use grep -E instead of egrep 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: e27ded83c76a609687a3d9e82b80fe7e1b782bf6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e27ded83c76a609687a3d9e82b80fe7e1b782bf6 commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6 Author: Ed Maste AuthorDate: 2023-03-02 23:54:52 +0000 Commit: Ed Maste CommitDate: 2023-03-02 23:58:58 +0000 freebsd-update: use grep -E instead of egrep GNU egrep emits a warning that it is obsolescent and suggests grep -E instead. Switch to grep -E in case we end up invoking GNU (e)grep (and for consistency with other invocations in this file). Reported by: Steffen Nurpmeso Sponsored by: The FreeBSD Foundation --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 225d1e31e3ec..4ef44d1ad000 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2547,7 +2547,7 @@ manually... read dummy >>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then + if ! grep -qE '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then break fi cat <<-EOF From nobody Fri Mar 3 00:51: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 4PSTtd5mvBz3wSVX; Fri, 3 Mar 2023 00:51: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 4PSTtd5LNlz4QHX; Fri, 3 Mar 2023 00:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677804681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9cfq2hBakdjeokKGdRapvxi8Gn0574Cl45zjVQGIhI=; b=OO0zu7pvHgTqSpQDn8mQ3MYGVf6mndhHmrrpciFhwjsuNDcQoj+OhRZuDpjcPGyo4ksrHp NTHsEY23dxAgBzibrkpuORNkKKt8P85dU/SelH3Gwj6NGt2wm1lbOrdVV2Z4QSL+ztPdyt XGNWDPGZtLZH1687+Fc6+0U32oE90sk9WBIw6Lzth95nYhdPCx0OuwQZqR2q1sPiLCdfA1 gcVTjuwU97DU/ZQrPQpjzd1ZTcoKkrHT7feSXw4k2zI+fa6OFCGCCfYxsIgUfhFToLtS+q O62siQ5lxJ7HhsCWH9xt8QIApSSDwwS9y5cP29lDjcWl318Q1d4yPyWli+w7yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677804681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9cfq2hBakdjeokKGdRapvxi8Gn0574Cl45zjVQGIhI=; b=tGfqzh1NBMrAKEf1o8MPM9sLy7yC2v5G3oAtwfi9tOwPKpkAhKftcj351/eHTM3vuvJXPI 9vKp1Xti7H27SgM095JtVqua19K82OfJ47dr0J9pJkdrsIbqsL4ZalrJ/WQnDMQy1Ef0za dYeKZRRmMOFBelTBM2jR0/MLFLs/MqdZzJG3HRO0bgPT6LtOgChIDKJjvZRgyIf91AWyvu pGXGPzylLxZoABWeB4t9Tao9WiFwmVJiTXKTjKAHKHhOdwGSMGJ7bbXK7slcBgQXuiVa8G NA+8oV8MkbdwNb4b9UI6EoZXtgr4u2O1VXIpqtHsiRoXdMJG8GrpQ/d+TjWWwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677804681; a=rsa-sha256; cv=none; b=UBD8hiXmIkSaM9s+5JyZFCo014Fl3xTxWJAbPa7tUMjE4fMQYfzQFlFHCOsz0AKeUGjaJL 3bsw09BHyXpzO9sDpn7wdzTE8Ibm77470XuzmIuTqxPVbwU43ixZQx8NWOS7yaixNC2bzR FM9oJtIaQmBk8QgLghJPe8wqp2pHp8GMRdptsu6WhiOFNJmy90RqxAmBe0bkYSiPVY/gSc e1+iDMq5J8JvFmKPzBMqji0T7tc0sjMSqKBd0c/YpPcR6xOgTgMIApmM+3B9hKPyhzO5Ma LnugGIIefP9MmEYy94jk+JI+5QMuI7HeHIz4kXB7J3sj+6O5YiQQP1lfjvLwOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSTtd4Q51zdBD; Fri, 3 Mar 2023 00:51: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 3230pLY7089235; Fri, 3 Mar 2023 00:51:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3230pLPs089234; Fri, 3 Mar 2023 00:51:21 GMT (envelope-from git) Date: Fri, 3 Mar 2023 00:51:21 GMT Message-Id: <202303030051.3230pLPs089234@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: cfe244cb370d - main - src.conf.5: regen for KBOOT and KTLS changes 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: cfe244cb370d940d612c972536258057a34b00f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cfe244cb370d940d612c972536258057a34b00f3 commit cfe244cb370d940d612c972536258057a34b00f3 Author: Brooks Davis AuthorDate: 2023-03-03 00:47:09 +0000 Commit: Brooks Davis CommitDate: 2023-03-03 00:50:36 +0000 src.conf.5: regen for KBOOT and KTLS changes kboot was enabled for aarch64 in 46010641267 and KTLS was added for powerpc64* in e552cac3d7d9. --- share/man/man5/src.conf.5 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 9b832b8b89f2..d7c689780cd0 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd January 26, 2023 +.Dd March 3, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -968,12 +968,12 @@ amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and r Do not build kboot, a linuxboot environment loader .Pp This is a default setting on -arm/armv6, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, i386/i386, powerpc/powerpc, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. .It Va WITH_LOADER_KBOOT Build kboot, a linuxboot environment loader .Pp This is a default setting on -amd64/amd64 and powerpc/powerpc64. +amd64/amd64, arm64/aarch64 and powerpc/powerpc64. .It Va WITHOUT_LOADER_LUA Do not build LUA bindings for the boot loader. .Pp @@ -1313,12 +1313,12 @@ is set explicitly) Do not include kernel TLS support in OpenSSL. .Pp This is a default setting on -arm/armv6, arm/armv7, i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, i386/i386, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. .It Va WITH_OPENSSL_KTLS Include kernel TLS support in OpenSSL. .Pp This is a default setting on -amd64/amd64 and arm64/aarch64. +amd64/amd64, arm64/aarch64, powerpc/powerpc64 and powerpc/powerpc64le. .It Va WITHOUT_PAM Do not build PAM library and modules. .Bf -symbolic From nobody Fri Mar 3 00:55: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 4PSTzl6MXsz3wSrD; Fri, 3 Mar 2023 00:55: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 4PSTzl5m8Kz3BtS; Fri, 3 Mar 2023 00:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677804947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bxE8X0ghpSaR3HyuuA3y4XJv+Z4pdp7qTWoj6pi/rLI=; b=LEiY1T+++zFFDLqnYrVly4eDMhMNX3hKctTy4GjpQqWId4dr+0Z53jRbsSqFqfcm1fGs+i ZtrvHodJ95V5XEZc+ZKf7tI4XQO2Bj+0LLEbvsC5xsm/BzfrBb/z4TJhfbZHhqedZDFeBl rK0ZelEaUZs3FzPgHX6yI5AmGU2BJWIFj4UA55Y/pSZ+XGe/iLbyM/m+QR9lo5XisBP1z3 VORN3lzh1RAD8B94E3fTxY2ZnxE3KK6JFCRhee/j4Qt6wKxd1mh0CzqngCzjOffl0hLu0/ ka2CpZrPCq149gyylImOwt39xEvMdmtKqMf86u6dRrSANYPICYrVidwuCBtMDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677804947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bxE8X0ghpSaR3HyuuA3y4XJv+Z4pdp7qTWoj6pi/rLI=; b=k2gQ6r4I3S3RBVYN96QBIpAauL4Oyn4QeniEX+Canu4nvQAXJUiSmN3MlHxg/qQJjX1CSv 9TCTysi/rj/IJDZUOPrxX8MehjYVsBHS779BH9VS0XW2hL3hvcbNeMnnhh5x6HUTEl9kxU XD+e3KRx1a9x6hKyBf8zNT402Q4dKSb2kKP6EMMWf57jWUwM7If9Fun/ZgAMZqwgUejnrL Ly7ue7tblx43+JLSxOMGv9OiqSUO51yzg9H++0Ic3jkSqDzBbD/0zW7f16h+tKoQ2c6+Gi JM6+gdZNjQSYgaZYxJ20UCYw3E8qzmSK1A6E35qqWojnpnl/ZQ6FzPxLIb4Zyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677804947; a=rsa-sha256; cv=none; b=ofsVsdkeUUJO7DTKJxRGLP53Z5aoMfYtmcR349KLf6sufSQGaOclU8SoaK3Vv13MpXEAxX lXzBthNhmefoZSX6K4bltvzQYzyWr1CHxR6VQA8NxwxKbEvCxPm6yeyeJtctb4hif2fgPk 6GtHof2+NV3jcVvgsjMVXO50KGDgUw/aca0NRuVnE5PzwNS8apEOewCtMXbrH7yewqoNaj iif4036mvkTUnWfR29y4n3suSDmjFh8KjsjhNi3C0iExxXy0GFmKNYNB1+ydQctWvvboR6 Bg35uLhaIa0ns6/i/orGOzmsVDnOLjBy6t6c5PgLtyxG6lJZEQg8xtAZjr393Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSTzl4nBDzdfb; Fri, 3 Mar 2023 00:55: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 3230tle7091664; Fri, 3 Mar 2023 00:55:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3230tl3S091663; Fri, 3 Mar 2023 00:55:47 GMT (envelope-from git) Date: Fri, 3 Mar 2023 00:55:47 GMT Message-Id: <202303030055.3230tl3S091663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John-Mark Gurney Subject: git: 2fee87562948 - main - abstract out the vm detection via smbios.. 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: jmg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fee8756294820ff9ec6f8d17324e7d8a0a45040 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jmg: URL: https://cgit.FreeBSD.org/src/commit/?id=2fee8756294820ff9ec6f8d17324e7d8a0a45040 commit 2fee8756294820ff9ec6f8d17324e7d8a0a45040 Author: John-Mark Gurney AuthorDate: 2023-02-23 20:59:50 +0000 Commit: John-Mark Gurney CommitDate: 2023-03-03 00:54:21 +0000 abstract out the vm detection via smbios.. This makes the detection of VMs common between platforms that have SMBios. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D38800 --- sys/amd64/amd64/machdep.c | 3 ++ sys/arm64/arm64/machdep.c | 4 ++ sys/conf/files.arm64 | 2 + sys/conf/files.x86 | 1 + sys/dev/smbios/smbios.h | 4 ++ sys/dev/smbios/smbios_subr.c | 104 +++++++++++++++++++++++++++++++++++++++++++ sys/i386/i386/machdep.c | 3 ++ sys/x86/x86/identcpu.c | 57 ------------------------ 8 files changed, 121 insertions(+), 57 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index f33f2c6509f0..480db1ed2c31 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -117,6 +117,8 @@ __FBSDID("$FreeBSD$"); #include +#include + #include #include #include @@ -1315,6 +1317,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) identify_cpu1(); identify_hypervisor(); + identify_hypervisor_smbios(); identify_cpu_fixup_bsp(); identify_cpu2(); initializecpucache(); diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 2eaf4ef14390..19fa7cd913a0 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -100,6 +100,8 @@ __FBSDID("$FreeBSD$"); #include #endif +#include + enum arm64_bus arm64_bus_method = ARM64_BUS_NONE; /* @@ -873,6 +875,8 @@ initarm(struct arm64_bootparams *abp) kmdp = preload_search_by_type("elf64 kernel"); identify_cpu(0); + identify_hypervisor_smbios(); + update_special_regs(0); link_elf_ireloc(kmdp); diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 02447db830dc..684cb8cb23ba 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -103,6 +103,8 @@ arm64/coresight/coresight_tmc.c standard arm64/coresight/coresight_tmc_acpi.c optional acpi arm64/coresight/coresight_tmc_fdt.c optional fdt +dev/smbios/smbios_subr.c standard + arm64/iommu/iommu.c optional iommu arm64/iommu/iommu_if.m optional iommu arm64/iommu/iommu_pmap.c optional iommu diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 0a32c888cdb2..8774139eee3a 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -292,6 +292,7 @@ dev/qat_c2xxx/qat.c optional qat_c2xxx dev/qat_c2xxx/qat_ae.c optional qat_c2xxx dev/qat_c2xxx/qat_c2xxx.c optional qat_c2xxx dev/qat_c2xxx/qat_hw15.c optional qat_c2xxx +dev/smbios/smbios_subr.c standard libkern/strcmp.c standard libkern/strncmp.c standard libkern/x86/crc32_sse42.c standard diff --git a/sys/dev/smbios/smbios.h b/sys/dev/smbios/smbios.h index ec216b676f2b..e766b54f7dc1 100644 --- a/sys/dev/smbios/smbios.h +++ b/sys/dev/smbios/smbios.h @@ -91,4 +91,8 @@ smbios_walk_table(uint8_t *p, int entries, smbios_callback_t cb, void *arg) } } +#ifdef _KERNEL +void identify_hypervisor_smbios(void); +#endif + #endif /* _SMBIOS_H_ */ diff --git a/sys/dev/smbios/smbios_subr.c b/sys/dev/smbios/smbios_subr.c new file mode 100644 index 000000000000..c28bf0e4983f --- /dev/null +++ b/sys/dev/smbios/smbios_subr.c @@ -0,0 +1,104 @@ +/*- + * Copyright 2014 John Baldwin + * Copyright 2019 Stephen J. Kiernan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp + */ + +#include +#include + +#include + +static const struct { + const char *vm_bname; + int vm_guest; +} vm_bnames[] = { + { "QEMU", VM_GUEST_VM }, /* QEMU */ + { "Plex86", VM_GUEST_VM }, /* Plex86 */ + { "Bochs", VM_GUEST_VM }, /* Bochs */ + { "Xen", VM_GUEST_XEN }, /* Xen */ + { "BHYVE", VM_GUEST_BHYVE }, /* bhyve */ + { "Seabios", VM_GUEST_KVM }, /* KVM */ +}; + +static const struct { + const char *vm_pname; + int vm_guest; +} vm_pnames[] = { + { "VMware Virtual Platform", VM_GUEST_VMWARE }, + { "Virtual Machine", VM_GUEST_VM }, /* Microsoft VirtualPC */ + { "QEMU Virtual Machine", VM_GUEST_VM }, + { "VirtualBox", VM_GUEST_VBOX }, + { "Parallels Virtual Platform", VM_GUEST_PARALLELS }, + { "KVM", VM_GUEST_KVM }, +}; + +void +identify_hypervisor_smbios(void) +{ + char *p; + int i; + + /* + * XXX: Some of these entries may not be needed since they were + * added to FreeBSD before the checks above. + */ + p = kern_getenv("smbios.bios.vendor"); + if (p != NULL) { + for (i = 0; i < nitems(vm_bnames); i++) + if (strcmp(p, vm_bnames[i].vm_bname) == 0) { + vm_guest = vm_bnames[i].vm_guest; + /* If we have a specific match, return */ + if (vm_guest != VM_GUEST_VM) { + freeenv(p); + return; + } + /* + * We are done with bnames, but there might be + * a more specific match in the pnames + */ + break; + } + freeenv(p); + } + p = kern_getenv("smbios.system.product"); + if (p != NULL) { + for (i = 0; i < nitems(vm_pnames); i++) + if (strcmp(p, vm_pnames[i].vm_pname) == 0) { + vm_guest = vm_pnames[i].vm_guest; + freeenv(p); + return; + } + freeenv(p); + } +} diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index e9de8ef602e7..8e3b21dbe195 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -116,6 +116,8 @@ __FBSDID("$FreeBSD$"); #include +#include + #include #include #include @@ -1433,6 +1435,7 @@ init386(int first) } identify_hypervisor(); + identify_hypervisor_smbios(); /* Init basic tunables, hz etc */ init_param1(); diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 2a009d7ec10a..42cca3250481 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -1342,29 +1342,6 @@ hook_tsc_freq(void *arg __unused) SYSINIT(hook_tsc_freq, SI_SUB_CONFIGURE, SI_ORDER_ANY, hook_tsc_freq, NULL); -static const struct { - const char * vm_bname; - int vm_guest; -} vm_bnames[] = { - { "QEMU", VM_GUEST_VM }, /* QEMU */ - { "Plex86", VM_GUEST_VM }, /* Plex86 */ - { "Bochs", VM_GUEST_VM }, /* Bochs */ - { "Xen", VM_GUEST_XEN }, /* Xen */ - { "BHYVE", VM_GUEST_BHYVE }, /* bhyve */ - { "Seabios", VM_GUEST_KVM }, /* KVM */ -}; - -static const struct { - const char * vm_pname; - int vm_guest; -} vm_pnames[] = { - { "VMware Virtual Platform", VM_GUEST_VMWARE }, - { "Virtual Machine", VM_GUEST_VM }, /* Microsoft VirtualPC */ - { "VirtualBox", VM_GUEST_VBOX }, - { "Parallels Virtual Platform", VM_GUEST_PARALLELS }, - { "KVM", VM_GUEST_KVM }, -}; - static struct { const char *vm_cpuid; int vm_guest; @@ -1446,7 +1423,6 @@ identify_hypervisor(void) { u_int regs[4]; char *p; - int i; /* * If CPUID2_HV is set, we are running in a hypervisor environment. @@ -1475,39 +1451,6 @@ identify_hypervisor(void) } freeenv(p); } - - /* - * XXX: Some of these entries may not be needed since they were - * added to FreeBSD before the checks above. - */ - p = kern_getenv("smbios.bios.vendor"); - if (p != NULL) { - for (i = 0; i < nitems(vm_bnames); i++) - if (strcmp(p, vm_bnames[i].vm_bname) == 0) { - vm_guest = vm_bnames[i].vm_guest; - /* If we have a specific match, return */ - if (vm_guest != VM_GUEST_VM) { - freeenv(p); - return; - } - /* - * We are done with bnames, but there might be - * a more specific match in the pnames - */ - break; - } - freeenv(p); - } - p = kern_getenv("smbios.system.product"); - if (p != NULL) { - for (i = 0; i < nitems(vm_pnames); i++) - if (strcmp(p, vm_pnames[i].vm_pname) == 0) { - vm_guest = vm_pnames[i].vm_guest; - freeenv(p); - return; - } - freeenv(p); - } } bool From nobody Fri Mar 3 01:05: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 4PSVBq5Jgmz3wTD2; Fri, 3 Mar 2023 01:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSVBq4qkNz3CLJ; Fri, 3 Mar 2023 01:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677805523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QYHkVQz7witlkG1pPCiJCBhYANhUdxTlB8GPUkrUdaA=; b=qOJ1Yd/TQrjeUXCQsF7DkpUBl4IF9ilixAkvoaZs2UNSRTQ7Uezo4TIm8qKTne6jUIPOKv /yj28uE8UMxAaK0FAWIo2R+NHZH+z8uIm1b++GOXr69qDYsXkaEdyCRT3sbMOq1uRsSJoU 2XjvcvppdJPvEn5FlUllcNoizKkORM/KdNJKYO+h4luEIdxiztz8OUZayt9/18iMj5AvM5 ewgEfKgIX98K6pjz26wkqC15RxKk8KlMcO4iqtoIfct1xxOK1pA3YqFdBZWlqByFDWNT0T Bo8rsnbE9NfbiuSTVHQ4w6mQF1FB7hWfnC5ONn5DIIEhlWI4hvmlgrgUmrM9cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677805523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QYHkVQz7witlkG1pPCiJCBhYANhUdxTlB8GPUkrUdaA=; b=nfowH4CQwYgxgWYhPmt2nmGwGFynR0IUf5Xm3rx+2LWc6bCKxvC+tfccAcaJ5GnDlFMzt1 +llCiJKOCrKzTrqkLu4tRqt+SpBISGo4GAxn0EQio2txl5QuASHfn6aglpIJ02lAYGLbQ+ sXFoeP9rCzICN3MK45E3ftXBWAt1wTd7QXnmRs29m4wSiCalW76mMbTOhZFZt8hQnk9HNJ jm0o/b2PtqY5M1mDhPiXUElkqwiFfzB1Gh93YgjSL8/JSVwyg6PPdJRwCeCLNDzE5RKdgj kqH419LqseakRuq7YIBRF0cwxrFa/6iGC4zNGahZ6Cv0A9vAMG6NlbrZ8aVNQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677805523; a=rsa-sha256; cv=none; b=Rr9dTYzZuDXTmvKf8z6jf9vroa7Ik+Xy6oNKCjc2HPnMy/4qN8OZai9gEZam9iudikR614 69fixDhQwhtFUECnbAaEKocMr/jvCCvOfDI5MN4QOB/T4rs3X6IBZ3CcdjXwBU9DjQvfIA hnHLXQAwu/I0wF7p85t3xTdiTUr1kxsympQ0uqeszWHIEJ8zsPsm4sS18CZ0II/qPQ3V3Q p5G69TZCcf6gRx+tuPj5Q0mY76JHQH195mYDgyJRi8aNBEVMPmV2/t16ZXY1Qy+l5QTIVD yCFlzzHFXmL3/TNiuWVWTWNlBQBsaVHycWxZmJV4fuzFoSYfh6l6YndjHmptRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSVBq3tSZzdv0; Fri, 3 Mar 2023 01:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32315NVs008533; Fri, 3 Mar 2023 01:05:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32315NTX008532; Fri, 3 Mar 2023 01:05:23 GMT (envelope-from git) Date: Fri, 3 Mar 2023 01:05:23 GMT Message-Id: <202303030105.32315NTX008532@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John-Mark Gurney Subject: git: 13597be965b7 - main - length for the 64-bit entry is 32-bits, not 16-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: jmg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13597be965b7bcc7ff2c3c0bc240f3e0acc255cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jmg: URL: https://cgit.FreeBSD.org/src/commit/?id=13597be965b7bcc7ff2c3c0bc240f3e0acc255cf commit 13597be965b7bcc7ff2c3c0bc240f3e0acc255cf Author: John-Mark Gurney AuthorDate: 2023-03-03 01:03:57 +0000 Commit: John-Mark Gurney CommitDate: 2023-03-03 01:03:57 +0000 length for the 64-bit entry is 32-bits, not 16-bits. Reported by: Jérôme Duval (korli on github) --- stand/libsa/smbios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 15c5c7e50565..1bb78faa3b01 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -486,7 +486,7 @@ smbios_probe(const caddr_t addr) #ifdef HAS_SMBV3 if (isv3) { - smbios.length = SMBIOS_GET16(saddr, 0x0c); /* Structure Table Length */ + smbios.length = SMBIOS_GET32(saddr, 0x0c); /* Structure Table Length */ paddr = SMBIOS_GET64(saddr, 0x10); /* Structure Table Address */ smbios.count = -1; /* not present in V3 */ smbios.ver = 0; /* not present in V3 */ From nobody Fri Mar 3 01:44: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 4PSW3Q3vvDz3wVZN; Fri, 3 Mar 2023 01:44: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 4PSW3Q35zGz3FCh; Fri, 3 Mar 2023 01:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677807842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVvht7IwKe1EL3S78z+6qNxx1STfkyYUIKGmbCKBCYc=; b=BAN/dnWcXDeOb/tB/DhPXKP6j/IAKMt8KsdN4sRJwBYVDD+cXoMqvyoxOjKte3DiD+Rcb3 bXpTKXnrG6DhJeq7zuThBZ6Z5d0ApiGCmTRift7Q0KIH7KrC3YRkb5dmwkkr4xmAH2igEK LgKFNg8jPmwJjsxTnX+JY0zCcFrNvJnCBc8LXR/3GE0GAvvqtPpzN31aCBD7sH1CtfYq0+ CPxFW9560MUK72uMi5c+yJI3hCxLlWIKdSPsVApFfRaNrFdQ6OB7HcJK+51tk4CSv+IThH sBS6pxfUnkvf8x+I/LSiQLuTA0I0S6W6TVGo2sn0eMmAeT5bhjdFPXZPoGOBzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677807842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVvht7IwKe1EL3S78z+6qNxx1STfkyYUIKGmbCKBCYc=; b=HmW1Gx9oycc1cwilZo0KOfG6nl1Qnz27cZ7bUAZe6K2G2BwFu3ZlkEnXLvPgLIz3wV2RJd J9UiJ/UAlsmebkPW0u8D6BIPap6GL+rnaDJOtIQI0hkc1hBFBVmr6fOnhfQtKHrQ2Jqg6C SOASELkb/TsFvnW6bupGikWkKHPQJsuOcavQC93NHvmvA11kVyYeHForWq+a3KzlDj6jta 5ITY3zWWp2Ejh8iRr0Vlb/IkMUT2yPx5bwk2evPPNz3gGgN78eOpYX9N1lzi+vbrGY5naF L3c8DJj3YEQoyD0ejJPqCgjaFd3c5YuZ6+pIQFbecmqmSA/3SoPpkdI+5zvMTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677807842; a=rsa-sha256; cv=none; b=nqnRDrkSNw5JCyN1WgJddC1L1x/8XOGoaZ86V4SgH6LIyF0YWRMznaQbQcTQ/FVfoiVlps ts1i+KIl9ZjEeLc2nKK/D7WgBvhNzuoAxWPryEWTkD7848wPmQZCH02vJdbe2tANct7dis eEqXkCmm5CVlsKLOhaDHC6tEUusQ1l2VxuKd9uwBdk8uzmLbx25patX0lkzD/+KEiE0RSX rrOmW4SoWOkzBrEv5G6k6CFMDZBRZd7hfZhWHhyEAYYVwnhttRC0AygAN4vvvuXnjrfgki +yzBs/5qSxYrm6QSulXkBJ5kBeK2qj9db2/WNGg9subhrQW2ZrqWXJu0UPrO+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 4PSW3Q29CFzfkN; Fri, 3 Mar 2023 01:44: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 3231i2AJ073341; Fri, 3 Mar 2023 01:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3231i2cG073340; Fri, 3 Mar 2023 01:44:02 GMT (envelope-from git) Date: Fri, 3 Mar 2023 01:44:02 GMT Message-Id: <202303030144.3231i2cG073340@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: 398b12691b4f - main - mergemaster: add deprecation notice to man page 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: 398b12691b4f1e7a73afca4c051c182bfcaf9671 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=398b12691b4f1e7a73afca4c051c182bfcaf9671 commit 398b12691b4f1e7a73afca4c051c182bfcaf9671 Author: Ed Maste AuthorDate: 2020-01-22 21:04:03 +0000 Commit: Ed Maste CommitDate: 2023-03-03 01:43:34 +0000 mergemaster: add deprecation notice to man page Reviewed by: bapt, gjb, kevans (all earlier) Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D23327 --- usr.sbin/mergemaster/mergemaster.8 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 2f5b85f30b4c..22fa54edfa1f 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 20, 2021 +.Dd March 2, 2023 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -43,6 +43,17 @@ .Op Fl A Ar Target architecture .Op Fl D Ar /destdir/path .Sh DESCRIPTION +.Bf -symbolic +The +.Nm +utility is deprecated and may not be available in +.Fx 14.0 +or later. +Users are advised to use +.Xr etcupdate 8 +instead. +.Ef +.Pp The .Nm utility is a Bourne shell script which is designed to aid you From nobody Fri Mar 3 02:30: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 4PSX4s3x52z3wXg3; Fri, 3 Mar 2023 02:30:21 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSX4s386lz3Hhg; Fri, 3 Mar 2023 02:30:21 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677810621; 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=5ONJR+KvduIYVVsaZ+OL5+biWwsRes3dojk8GHvB7Hs=; b=c1BKlHOyhpmE9zRKlVm4dkeS/AMnKuIp9T6nf5jrKp0Cj+6DOH2EFZnMRnSxL2QtqejyAs C9S+23n6lsjSL63vstXvNo8a1C0/Jx0goNgaPTKevm6xadepKauVZ41cfliDL3Dpx2DZXn Jt4JHvb1+4cM9xXSWsnKKgkz6jSF9rIX9EFzQn/1I1Gy8mRO7JI7+DUNR+sHGkhnpZr/pC I9gA2GwRW1+7FOc9r9MnXy9WIt0KER8u1GSs5s3boQx2B2oLMws2ssW9n1RC2kjL5UPA36 Zx4iL0xpSTeQ7Pqr30r32yy6hJ04IyIvW/bNMcT7E4UA36/uh7sTcTh1EUnQaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677810621; 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=5ONJR+KvduIYVVsaZ+OL5+biWwsRes3dojk8GHvB7Hs=; b=DErs7scfiqobKF+QRxLly3Rc5mHflD0CpzCwJggz9aLhXe2h76XMP5Z4m6KRJHLc5GLqRA 6hBPvXNBngoPyoDlFQO07SOsrmgN0inPkhUmHgopcprn8Jfz18rvSmss43USzQNx5H+4c/ hWP4rUJ6rfH+o6BfpfLi3ZVOHDL2m7EimT68PTY6AayBI1RRHBc1VxwAf3q3A6LlKDIf5p ICEkr8xxrZ62VuS8h5IAgl2cT9cFgkeWl7/JBsFlT+IfQJSNClwqd5ZiSSBJbvQbtJtzAG Tj9Lgz+mAK2y06hySh5wko+GQ7snuqmgsbutej+QxM/G3QvxZ7ZvDuGKLbY25w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677810621; a=rsa-sha256; cv=none; b=bvAKw37+xEEWUCvRiXhLrnq7BHEPrKbNNY6TSu86t6gXqxRSzx4pj+AlsBW9aqXkhlsbtH RVXUekqRKm6DaTCRDsx9UoLdchHToPjcr4TbZtZLaAfk81uYAr1UiZUXlLZMP3fcN+9ku7 r0GYQP3Aw+QIUKHz6qRJUDlC4Qxc344G3WvMuim3Ws/+bDRi0eov02FhCZsAIUpBYWH5kB JYoFgrdzIo4GVcwKV6Ce79H7X3Hmvv1Y2dg1RRDAkxM4MKbiHAwjWegFbEknN9tnI6cjP0 GIdvdaqGhULHSsDPpd5LAkD+j0fb05mVdXHfb3QpC89b8rHzsTsjJDTjSdUz9g== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 492F3FA9C; Fri, 3 Mar 2023 02:30:21 +0000 (UTC) Date: Fri, 3 Mar 2023 02:30:21 +0000 From: Alexey Dokuchaev To: Warner Losh Cc: Kyle Evans , Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Steffen Nurpmeso Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain Message-ID: References: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu> 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-Disposition: inline In-Reply-To: X-ThisMailContainsUnwantedMimeParts: N On Thu, Mar 02, 2023 at 01:37:44PM -0700, Warner Losh wrote: > ... > I doubt egrep will ever be deprecated. Too many scripts depend on it. Oh come on, it's somewhat ironic to hear that from you Warner who apparently loves to deprecated things. :-) Seriously though, [ef]grep should go. Installing what should be one's shell aliases as first-class programs always seemed dubious to me. Admittedly, I welcome GNU grep guys' rather unpopular* decision to help the world clean up those scripts. > warning from gnu-grep is bananas... As any deprecation warning, it can be annoying, but how else would you nudge people to fix their scripts? ./danfe *) https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269840 From nobody Fri Mar 3 03:18: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 4PSY8s43Lsz3wbKF; Fri, 3 Mar 2023 03:18: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 4PSY8s3LPhz3L7s; Fri, 3 Mar 2023 03:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677813533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u0gcsZ4M/pjiMaULbXw/GSUGpW7eRdKLAns43r6GNUE=; b=PM9tT0eBT/DJXatMTebAsbwruD0lEYhiY0crKlb5+2QUT2Dc24kPgrprElXL6HRNgprS52 jk36zp7tiPyfE23ky+njfwpbRAxrvIO3JEohLoW4NT67oda4PQ1iz/bCeZrdRsbTmvj7Kw bbBD82QLsyEIvHnJ5ywBrTE8cT91lu2Ka+YfTdNGycljF+ZgNshDVPIQw1b2kbq2YkB/v3 JyJyegzej1k7L7pmMX7Z6o5Ia2+hRujHqXXf1jUGRaQNh6EzrUoNNZA7G3zRgdqEM//CP8 02fP27qJxQIFkn8Brjdaflxc2BzeaNNJvqDmPWGnxqVikHmDw2n7t4Qy/3/jqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677813533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u0gcsZ4M/pjiMaULbXw/GSUGpW7eRdKLAns43r6GNUE=; b=F1+9aZUZpmvG5L48SNzBARk8msihS5ewCFi90+NBOUa0mTExQz7mF4SYi6WV09r3hdx4Nq 0F074+H8TZzfsmSUADnfxjzptR/hauk4jvzu2Aod1WAkd//fgewZu6ZGmXpi6rEtLLDgFW 2vb6XstRnSsH5wYoYQ3wtZuBuJO5APVCI6IfVcfLYCmdusuQP5uaMg1t+oU1xNAL9SqFGF Bleifl1lTfVEdf0IYPcXawdNT1SAUAqULOOOPLsRAsq7Rz5thwu2JgTTnBHyaclV9gAMgr XM7fgJCE6iNftnpmuSlb+eVKcoQVlTKZnZezfK4/TqvVp3KS2NVbFg2z4VIDJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677813533; a=rsa-sha256; cv=none; b=TKd2Z8hkSfDy2c2Euo5Ldmml9VQGWhCm/QfsAWGuW8XKOtZzD9pfub8FMB7A8FeQ3L7YHC ntuhQTr0PeHXXZjIqfiJIY5PNHWvgAnR7rUeXgJOewImyZR0kmq8KyvwSEIjooUZ1/9/AW PYr6LJ51ZNzxqBkBbnuRGRKZdrHyTpetSm6GixGfDsA0s+1Sd3w8zicfHuvM77/hOKIYgF 9JE7dpXojZr5XyGWxxFAfinUhzz1zMRK/Pdra998+vdhrKyR07q35m/nBVdTNd6/G6BAbv AV3NaDyFzunTz3opEf4BXkph7jM95Uf20pypvY1w69Xk2oBeu7avYgQ5IyQLaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSY8s2NkQzj3x; Fri, 3 Mar 2023 03:18: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 3233Ir6Z023345; Fri, 3 Mar 2023 03:18:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3233IrjF023344; Fri, 3 Mar 2023 03:18:53 GMT (envelope-from git) Date: Fri, 3 Mar 2023 03:18:53 GMT Message-Id: <202303030318.3233IrjF023344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: dda4d97289f1 - main - Makefile.inc1: Support building with macOS Ventura's AMFI Launch Constraints 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dda4d97289f17aa8b2bbfd8d63a746b3a7836fd5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=dda4d97289f17aa8b2bbfd8d63a746b3a7836fd5 commit dda4d97289f17aa8b2bbfd8d63a746b3a7836fd5 Author: Jessica Clarke AuthorDate: 2023-03-03 02:15:30 +0000 Commit: Jessica Clarke CommitDate: 2023-03-03 02:15:30 +0000 Makefile.inc1: Support building with macOS Ventura's AMFI Launch Constraints As of macOS Ventura, Apple-signed binaries cannot be run if copied away from their system location. This security feature doesn't really make sense for boring things like sh(1), more so for applications with special entitlements, but it's universally present, and results in the following error: >>> Install check world bmake[2]: "/Users/Jess/cheri/freebsd/Makefile.inc1" line 572: warning: "MAKEFLAGS= CPUTYPE=dummy /Users/Jess/cheri/build/freebsd-riscv64-build/bmake-install/bin/bmake -f /dev/null -m /Users/Jess/cheri/freebsd/share/mk MK_AUTO_OBJ=no -V CPUTYPE" exited on a signal bmake[2]: "/Users/Jess/cheri/freebsd/Makefile.inc1" line 575: CPUTYPE global should be set with ?=. As with host-symlinks, we don't actually need to copy the files on macOS, since we're not updating the current machine, so copy its approach and just symlink them instead. MFC after: 1 week --- Makefile.inc1 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3399e469ea02..542121976333 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -629,6 +629,18 @@ MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp MKTEMP=mktemp .endif INSTALLTMP!= ${MKTEMP} -d -u -t install + +.if ${.MAKE.OS} == "FreeBSD" +# When building on FreeBSD we always copy the host tools instead of linking +# into INSTALLTMP to avoid issues with incompatible libraries (see r364030). +# Note: we could create links if we don't intend to update the current machine. +INSTALLTMP_COPY_HOST_TOOL=cp +.else +# However, this is not necessary on Linux/macOS. Additionally, copying the host +# tools to another directory with cp results in AMFI Launch Constraint +# Violations on macOS Ventura as part of its System Integrity Protection. +INSTALLTMP_COPY_HOST_TOOL=ln -s +.endif .endif .if make(stagekernel) || make(distributekernel) @@ -1388,7 +1400,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY fi; \ done); \ fi; \ - cp $$libs $$progs ${INSTALLTMP} + ${INSTALLTMP_COPY_HOST_TOOL} $$libs $$progs ${INSTALLTMP} cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale .if defined(NO_ROOT) -mkdir -p ${METALOG:H} From nobody Fri Mar 3 05:17: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 4PSbnZ6mJlz3whPR; Fri, 3 Mar 2023 05:17: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 4PSbnZ6Czcz3l9s; Fri, 3 Mar 2023 05:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TdsQHEZvuKE1N+VPYaQ3i8Nerb4y0c9IPxZU1wOFFgE=; b=XeEZBKk8C53R1q5nvvbZp8qFiNfRng6hUrAyNKf77YAR3ZHjIWEHVyi1GTDLQfD/Gbaln0 /YQWTGackwHxXJeASH0mYKV5Kt6D16qI22ML/8Qw11cb9mZhrCB2r0aKLvA36sS0bdy3bU zYnES7QIIbAaUshwwFdtxi8bt+h1xf3+9MSb6TG0debbE2gYFQP49fa8rMjbQr0MCJN9qz AMw7+p+EY9JoKDMWTU+StuwQ5P8YoBx3tSUKhVYp4J/KHetqo8TXw1Fmi6MdpAoZHIO6bV iVAaMTm//NqMC7E4LiSBYf2+jHxLvpZinhqlb9MA60NHJdIy9A7TfQdtfUc6xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TdsQHEZvuKE1N+VPYaQ3i8Nerb4y0c9IPxZU1wOFFgE=; b=hVevKVFWpGSgvFbmqQsrppfBhlF5VSVwcwxxFamD5f6koJMvCxLkel961kimZZ0CSCKL/H HFQN6C7asyjFMKIiMLGm5JmAy+IugnKKdrN3IKw8DxmCNAhIyL98a5YyqAL6OtEL0UZyHa dlKW1aHPRz9ktYXd87pxxPt9iiqC6W8cmGs+ni3IioeLuuhhnX8rbdoDQl7OK54Hr7818z 0z+SYAizsvFLnbFPjIJpx9Esk9+AW2m1ix8TFmeMGPyoHcyl6AW/LFlCz3xk9+7IGrqu41 oA7nAPZE9cN886EJwW0I7EQj67+xxsufC/BtEm6Q7XscMPV9zmqqjZwrgExN6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677820642; a=rsa-sha256; cv=none; b=Rwzl2iyzYR/+yVtTc8gVYAXDyiTP4o70uYVSvE+VkJejntI/VY0vP3J5yDgSHg/baez/9E QL4D+Kvlw7TuT0JvqIPvRFA6fSDMKgRkRItEf5hg/kVsq3S+5iqueu0o9XdGpydoYeoXct UYsk2B3Jfm9wbmiv0I5/hPu5EPflIg7WIASZtw/2Lcb/Sgv/6dF+V79yPzBFW9LERftE0Y J7jhq8e0BgHMdbvZ9FkaDJvfn4+FV94FR0MD5XJqbPmPxDK2P3VkqXA2/f6CCfgrQ/56ba mFMzEvsgmMJ/4VYLiy4kunksV3WITecLyaXQulG43VZj+da384TqGQ1sFtjO/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 4PSbnZ4xwczlN1; Fri, 3 Mar 2023 05:17: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 3235HMkn019588; Fri, 3 Mar 2023 05:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3235HMI7019587; Fri, 3 Mar 2023 05:17:22 GMT (envelope-from git) Date: Fri, 3 Mar 2023 05:17:22 GMT Message-Id: <202303030517.3235HMI7019587@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: 39ea4280e4c5 - main - daemon: style changes 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: 39ea4280e4c5e41f237e55770f4f62b04b24d899 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=39ea4280e4c5e41f237e55770f4f62b04b24d899 commit 39ea4280e4c5e41f237e55770f4f62b04b24d899 Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:01 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 05:17:01 +0000 daemon: style changes This is not a functional change. - Clean up whitespace (spaces where there should be tabs) - Break up lines that are longer than 80 Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 --- usr.sbin/daemon/daemon.c | 75 ++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index af387574c4b5..16e22efed68e 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -138,7 +138,7 @@ usage(int exitcode) " --syslog-tag -T Set syslog tag\n" " --help -h Show this help\n"); - exit(exitcode); + exit(exitcode); } int @@ -165,7 +165,7 @@ main(int argc, char *argv[]) .keep_fds_open = 1, .output_fd = -1, .output_filename = NULL - }; + }; struct pidfh *parent_pidfh = NULL; struct pidfh *child_pidfh = NULL; sigset_t mask_orig; @@ -190,17 +190,18 @@ main(int argc, char *argv[]) log_reopen = true; break; case 'l': - logparams.syslog_facility = get_log_mapping(optarg, facilitynames); + logparams.syslog_facility = get_log_mapping(optarg, + facilitynames); if (logparams.syslog_facility == -1) { errx(5, "unrecognized syslog facility"); - } + } logparams.syslog_enabled = true; break; case 'm': stdmask = strtol(optarg, &p, 10); if (p == optarg || stdmask < 0 || stdmask > 3) { errx(6, "unrecognized listening mask"); - } + } break; case 'o': logparams.output_filename = optarg; @@ -218,13 +219,14 @@ main(int argc, char *argv[]) restart = strtol(optarg, &p, 0); if (p == optarg || restart < 1) { errx(6, "invalid restart delay"); - } + } break; case 's': - logparams.syslog_priority = get_log_mapping(optarg, prioritynames); + logparams.syslog_priority = get_log_mapping(optarg, + prioritynames); if (logparams.syslog_priority == -1) { errx(4, "unrecognized syslog priority"); - } + } logparams.syslog_enabled = true; break; case 'S': @@ -240,9 +242,9 @@ main(int argc, char *argv[]) case 'u': user = optarg; break; - case 'h': + case 'h': usage(0); - __builtin_unreachable(); + __builtin_unreachable(); default: usage(1); } @@ -252,22 +254,23 @@ main(int argc, char *argv[]) if (argc == 0) { usage(1); - } + } if (!title) { title = argv[0]; - } + } if (logparams.output_filename) { logparams.output_fd = open_log(logparams.output_filename); if (logparams.output_fd == -1) { err(7, "open"); - } + } } if (logparams.syslog_enabled) { - openlog(logparams.syslog_tag, LOG_PID | LOG_NDELAY, logparams.syslog_facility); - } + openlog(logparams.syslog_tag, LOG_PID | LOG_NDELAY, + logparams.syslog_facility); + } /* * Try to open the pidfile before calling daemon(3), @@ -359,7 +362,7 @@ main(int argc, char *argv[]) restart: if (pipe(pfd)) { err(1, "pipe"); - } + } /* * Spawn a child to exec the command. */ @@ -387,7 +390,7 @@ restart: if (user != NULL) { restrict_process(user); - } + } /* * When forking, the child gets the original sigmask, * and dup'd pipes. @@ -396,21 +399,21 @@ restart: close(pfd[0]); if (sigprocmask(SIG_SETMASK, &mask_orig, NULL)) { err(1, "sigprogmask"); - } + } if (stdmask & STDERR_FILENO) { if (dup2(pfd[1], STDERR_FILENO) == -1) { err(1, "dup2"); - } + } } if (stdmask & STDOUT_FILENO) { if (dup2(pfd[1], STDOUT_FILENO) == -1) { err(1, "dup2"); - } + } } if (pfd[1] != STDERR_FILENO && pfd[1] != STDOUT_FILENO) { close(pfd[1]); - } + } } execvp(argv[0], argv); /* @@ -471,7 +474,7 @@ restart: } if (restart && !terminate) { daemon_sleep(restart, 0); - } + } if (sigprocmask(SIG_BLOCK, &mask_term, NULL)) { warn("sigprocmask"); goto exit; @@ -487,7 +490,7 @@ exit: close(pfd[1]); if (logparams.syslog_enabled) { closelog(); - } + } pidfile_remove(child_pidfh); pidfile_remove(parent_pidfh); exit(1); /* If daemon(3) succeeded exit status does not matter. */ @@ -501,7 +504,7 @@ daemon_sleep(time_t secs, long nsecs) while (!terminate && nanosleep(&ts, &ts) == -1) { if (errno != EINTR) { err(1, "nanosleep"); - } + } } } @@ -545,7 +548,7 @@ get_log_mapping(const char *str, const CODE *c) for (cp = c; cp->c_name; cp++) if (strcmp(cp->c_name, str) == 0) { return cp->c_val; - } + } return -1; } @@ -557,11 +560,11 @@ restrict_process(const char *user) pw = getpwnam(user); if (pw == NULL) { errx(1, "unknown user: %s", user); - } + } if (setusercontext(NULL, pw, pw->pw_uid, LOGIN_SETALL) != 0) { errx(1, "failed to set user environment"); - } + } setenv("USER", pw->pw_name, 1); setenv("HOME", pw->pw_dir, 1); @@ -587,7 +590,7 @@ listen_child(int fd, struct log_params *logpar) if (do_log_reopen) { reopen_log(logpar); - } + } rv = read(fd, buf + bytes_read, LBUF_SIZE - bytes_read - 1); if (rv > 0) { unsigned char *cp; @@ -610,7 +613,7 @@ listen_child(int fd, struct log_params *logpar) /* Wait until the buffer is full. */ if (bytes_read < LBUF_SIZE - 1) { return 1; - } + } do_output(buf, bytes_read, logpar); bytes_read = 0; return 1; @@ -644,17 +647,19 @@ do_output(const unsigned char *buf, size_t len, struct log_params *logpar) if (len < 1) { return; - } + } if (logpar->syslog_enabled) { syslog(logpar->syslog_priority, "%.*s", (int)len, buf); - } + } if (logpar->output_fd != -1) { if (write(logpar->output_fd, buf, len) == -1) warn("write"); } - if (logpar->keep_fds_open && !logpar->syslog_enabled && logpar->output_fd == -1) { + if (logpar->keep_fds_open && + !logpar->syslog_enabled && + logpar->output_fd == -1) { printf("%.*s", (int)len, buf); - } + } } /* @@ -666,7 +671,7 @@ handle_term(int signo) { if (pid > 0 && !child_gone) { kill(pid, signo); - } + } terminate = 1; } @@ -709,7 +714,7 @@ reopen_log(struct log_params *logparams) outfd = open_log(logparams->output_filename); if (logparams->output_fd >= 0) { close(logparams->output_fd); - } + } logparams->output_fd = outfd; } From nobody Fri Mar 3 05:17: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 4PSbnc0sg8z3whQy; Fri, 3 Mar 2023 05:17: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 4PSbnc041jz3lPq; Fri, 3 Mar 2023 05:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RbGWRUT/eAXf4ayaqwsyTvEuqUzYfPDuq2Yn7ys4y9c=; b=l/KfPGypzGT17oU+YylnmOSyqImpxiJrxi7dzxc1x/CKfaWRwarhMGnMBI3IaGLgkX8QKb Z8TqvrNQapfTl+jW/K6XqYA0oLpMKTJPXzF2dgsANyRvlplez1rM3FZVM3j1XJTuJG4Twn BX8X3mPrfnV0YhqWl0r5ivXhfD+1lXy3p1rFYYukFg1iIPtMuaKLrH1c07G8LQrQR9M/IP em6vHMIw2XdSZF1Jz94OiroFLACZbGSb5uPcTzPIOPcU+IdzkD7L3up3JOWmepewsPAXv2 TFZivGz7C7N34NdTAg2ULToMGD++v1/5KbtGK1GTVSAZfqew6h5ol00k0so9OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RbGWRUT/eAXf4ayaqwsyTvEuqUzYfPDuq2Yn7ys4y9c=; b=sk2dbwEqOaY/cP6/yWvs6bQ5+5O/EUsUxtYu0IYxf2j042djlVvnEiq4Jc2tmVQFZloQDD fMINzlfZAQszajKzkagjOT7xVDyK6Km5PDR5ZleuxQ0RcEeTGf8cI8oe3239FqYe0Jy3E0 PnrfmWHBLpemHe33YyThKLskgHQT50bmybxNpoC8q5DmaJomoc79vyiH7qCStsqd0OLbKf SUUckCdz/abbTtKCW78pzKCXtsjeniMpo23IZi1B/oPEdEKd7olCWejvDFWOR6JuLSamz4 VJ5ZFjuXVRdisWFoWiDjv67lUPpb/CmjhAMLTQBK+cMXPU0FcxBTBmeAQOlPrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677820644; a=rsa-sha256; cv=none; b=W/FqNRZ2jaGVaZnyhSiAZVc1Qs6RAf8SNf1Witdk/3H3aCqsTWVaYKiD8M8JIBxzmWr7S3 0qZtpFgP4yFFVmJzR8djFv4GXgay4Kgpn6gnwTxLpZRwaQS8kx6Ee4FTjZWikFE1ZEnWYi IOHjfsT3AN0pFAdw62pVFicSU8o/dMnMr/cmo1k7I4vhlrcBN7zxT8UZNCSv/Ff1hM7Cmv IEri8Kasu6aP/EeKNdrKUKXOD0OTmiv7sfSZbmVPMo6tO9OtB8WasEVZ5tUR97ZjwtNADi 1W7ie1SR6xHis6Ko+f5EzKiX6BACjjVbzFaX1cDYHLZPgN8vEov/kDlBs84kCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSbnb5kJMzkrL; Fri, 3 Mar 2023 05:17: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 3235HNpr019607; Fri, 3 Mar 2023 05:17:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3235HN2N019606; Fri, 3 Mar 2023 05:17:23 GMT (envelope-from git) Date: Fri, 3 Mar 2023 05:17:23 GMT Message-Id: <202303030517.3235HN2N019606@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: 75f61ca92098 - main - daemon: flatten and simplify fork() logic 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: 75f61ca92098941f73020f46674f0c40db7270fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=75f61ca92098941f73020f46674f0c40db7270fb commit 75f61ca92098941f73020f46674f0c40db7270fb Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:02 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 05:17:02 +0000 daemon: flatten and simplify fork() logic Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 --- usr.sbin/daemon/daemon.c | 53 ++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 16e22efed68e..964a77deb0f9 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -84,7 +84,7 @@ static void daemon_sleep(time_t, long); static volatile sig_atomic_t terminate = 0; static volatile sig_atomic_t child_gone = 0; -static volatile sig_atomic_t pid = -1; +static volatile sig_atomic_t pid = 0; static volatile sig_atomic_t do_log_reopen = 0; static const char shortopts[] = "+cfHSp:P:ru:o:s:l:t:m:R:T:h"; @@ -368,34 +368,27 @@ restart: */ child_gone = 0; pid = fork(); - if (pid == -1) { - warn("fork"); - goto exit; - } else if (pid > 0) { - /* - * Unblock SIGTERM after we know we have a valid - * child PID to signal. - */ - if (sigprocmask(SIG_UNBLOCK, &mask_term, NULL)) { - warn("sigprocmask"); - goto exit; - } - close(pfd[1]); - pfd[1] = -1; - } } - if (pid <= 0) { - /* Now that we are the child, write out the pid. */ + + /* fork failed, this can only happen when supervision is enabled */ + if (pid == -1) { + warn("fork"); + goto exit; + } + + + /* fork succeeded, this is child's branch or supervision is disabled */ + if (pid == 0) { pidfile_write(child_pidfh); if (user != NULL) { restrict_process(user); } /* - * When forking, the child gets the original sigmask, + * In supervision mode, the child gets the original sigmask, * and dup'd pipes. */ - if (pid == 0) { + if (supervision_enabled) { close(pfd[0]); if (sigprocmask(SIG_SETMASK, &mask_orig, NULL)) { err(1, "sigprogmask"); @@ -416,12 +409,24 @@ restart: } } execvp(argv[0], argv); - /* - * execvp() failed -- report the error. The child is - * now running, so the exit status doesn't matter. - */ + /* execvp() failed - report error and exit this process */ err(1, "%s", argv[0]); } + + /* + * else: pid > 0 + * fork succeeded, this is the parent branch, this can only happen when + * supervision is enabled + * + * Unblock SIGTERM after we know we have a valid child PID to signal. + */ + if (sigprocmask(SIG_UNBLOCK, &mask_term, NULL)) { + warn("sigprocmask"); + goto exit; + } + close(pfd[1]); + pfd[1] = -1; + setproctitle("%s[%d]", title, (int)pid); /* * As we have closed the write end of pipe for parent process, From nobody Fri Mar 3 05:17: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 4PSbnd1C7sz3whBn; Fri, 3 Mar 2023 05:17: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 4PSbnd0fZFz3lSj; Fri, 3 Mar 2023 05:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54dB3jxgSUDTaAz+NkZn3f8TNByNEby3u+JAoSsGyEU=; b=eh+tyq/4NGFy5JnofBYFU0HyLZshn1Mb9o+u3cQGjAe2Hovl2jJl4qHW8NXpoSX5x0HY5p Cegs5krvahe/VpnltezCReQfJjnYJ9pd166DCeEhjAsBgrKME0zjSVzaQGRU4vpEd/dqqT owfDyaE5V+e0Pk1vtNoCHic6i45jSIO2lfnSzCg0zgilkJAwFtiitdTKp7Isrl+GpL7ctm BDRvKiFdTPxcGWDzHVVfy+akIkq9fkgDSrf87iGmLs/uvzEso8dEtwsG/JyZeWJTbyxI6S FwlQsR6p1vn6tfjOxpG08tHTu3iakHkmwtadilzGx5+akkXTcl++CaYGjFVSKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54dB3jxgSUDTaAz+NkZn3f8TNByNEby3u+JAoSsGyEU=; b=YmXT9h+r/NdRy0M7DsUXCwRbU5+cuSX9c/6Yx9d3rCnfPQaMa2ltoCbBkodtfAW8C4dcKs T3liqk1RjTcYIviF9kx/5c8rJUvmNH1kcGVI0T3HX8v1y6OVbSIUbUXGxWwS8DLHZNqEmD sNN6p7xa2NCBGp9RH8Pfm3nLaGWLTEPoPtMAKk0GAIuNVSkcGV3bf28qGKFe/HaArNNgq4 u8qB7D4FCKHsx6IXEvJT9DzBisGccVmETJEbPzT9Z/xt6hZDs4kvdYkKmVtAtleWQEhnia JHXlzBXvJKT+fb70svtjx2DlLbHPASSpVxF6xv9erY+ztanvXv/iTYZWJoXMvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677820645; a=rsa-sha256; cv=none; b=uiDglUgB8Eh3nrAKZfeHeXldI2fPmywX0b4DZOrQTM5v1X9R8AvcMyXElgW8l4+96Ts1lg ktqJ1rQio1jbUDGl2ss2PB+oX5fFDsCwc+8IqOFlo7aSd8RyniqaeN+Y8Au8mEaXNekMct VriYScF6hkK0xguupD1kIqBCiubZfFFXF8pdvvAzjdjNxMSVoHgQRHRhygCV0GJBSRROAr Dc+D7kuYWXFYY8krDZhRCbT2c6N6Xab4W1h2m3lIR1rGDJVniJc8Kv7Xsijo0VwPxs4jU0 0gQ1Na/+u3e2TnqiSjQWyxPJaSj1sN6/Y8BEBBTT+5rH5fTvidQYAUYqSBQjMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSbnc6fL3zlhX; Fri, 3 Mar 2023 05:17: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 3235HO65019626; Fri, 3 Mar 2023 05:17:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3235HOWW019625; Fri, 3 Mar 2023 05:17:24 GMT (envelope-from git) Date: Fri, 3 Mar 2023 05:17:24 GMT Message-Id: <202303030517.3235HOWW019625@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: bc43a9a7157a - main - daemon: change type of listen_child() to C99 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc43a9a7157a8249a492ee3efd8589369dd94228 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bc43a9a7157a8249a492ee3efd8589369dd94228 commit bc43a9a7157a8249a492ee3efd8589369dd94228 Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:02 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 05:17:02 +0000 daemon: change type of listen_child() to C99 bool Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 --- usr.sbin/daemon/daemon.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 964a77deb0f9..5c636bcd0a03 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -73,9 +73,9 @@ static void restrict_process(const char *); static void handle_term(int); static void handle_chld(int); static void handle_hup(int); -static int open_log(const char *); +static int open_log(const char *); static void reopen_log(struct log_params *); -static int listen_child(int, struct log_params *); +static bool listen_child(int, struct log_params *); static int get_log_mapping(const char *, const CODE *); static void open_pid_files(const char *, const char *, struct pidfh **, struct pidfh **); @@ -146,13 +146,13 @@ main(int argc, char *argv[]) { bool supervision_enabled = false; bool log_reopen = false; + bool child_eof = false; char *p = NULL; const char *child_pidfile = NULL; const char *parent_pidfile = NULL; const char *title = NULL; const char *user = NULL; int ch = 0; - int child_eof = 0; int keep_cur_workdir = 1; int pfd[2] = { -1, -1 }; int restart = 0; @@ -580,10 +580,10 @@ restrict_process(const char *user) * We try to collect whole lines terminated by '\n'. Otherwise we collect a * full buffer, and then output it. * - * Return value of 0 is assumed to mean EOF or error, and 1 indicates to + * Return value of false is assumed to mean EOF or error, and true indicates to * continue reading. */ -static int +static bool listen_child(int fd, struct log_params *logpar) { static unsigned char buf[LBUF_SIZE]; @@ -617,18 +617,18 @@ listen_child(int fd, struct log_params *logpar) } /* Wait until the buffer is full. */ if (bytes_read < LBUF_SIZE - 1) { - return 1; + return true; } do_output(buf, bytes_read, logpar); bytes_read = 0; - return 1; + return true; } else if (rv == -1) { /* EINTR should trigger another read. */ if (errno == EINTR) { - return 1; + return true; } else { warn("read"); - return 0; + return false; } } /* Upon EOF, we have to flush what's left of the buffer. */ @@ -636,7 +636,7 @@ listen_child(int fd, struct log_params *logpar) do_output(buf, bytes_read, logpar); bytes_read = 0; } - return 0; + return false; } /* From nobody Fri Mar 3 05:17: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 4PSbnf371Mz3whPY; Fri, 3 Mar 2023 05:17: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 4PSbnf1KpRz3lLn; Fri, 3 Mar 2023 05:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W++qDbUWdb8Y2gANtzWap8/1rE/WJUciMnyVERaWRlA=; b=e5xX+zKGuCKyjYfIbefccOz3pzFX3AanSLCIfYOIaWDHY86tMuUkA/1nfGZnQsLaEIuhB6 8CWH1inhLuSxE1RzMsiPxfnTRZ0gbK/9Ov3gqpRAIMEZUGtp2FvwfSaHF8fwTa6Ltw2lx0 nh41Kh3K5ZEgM7X2LberUj8up2wkwOg6oLEZYyyHuUpREoA2nI2x5XoaXXO+41Nw/JQInq CVcePVV/mfOiypmzIRkjmVjh2YBFKTraan/NzQVEJqPuy48Js2n3S6+75N8EVVkNZBCPwx TTmCdJZa/jnnbQPf5+7XFMnjzCtpZuvDyVR8LxxqdEJAwK7a9tBfqluBuY618w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W++qDbUWdb8Y2gANtzWap8/1rE/WJUciMnyVERaWRlA=; b=AQzPpLcDdVflfzzb34htQNLMDafqvqx4m1WKUiaUlt1G/U9IZFnxW7lDUwVxw4GLHJdLkT +vkQWPy8A69/aEJFqFfo5JymTq67axBmODFiWu4wT2KOxYsKjCBII9Wtpi6aQgEi+ANV1q BBBtm5bNatn5sVl+yZswnQHVr9xhLhzyVNtnq2Tz02fOXccMChawAuzbB4eOzaCxWEyBQ9 lXDPg4L/eaYRvrks6zJdBP/3AYt3tt/CPoON3xVJt/bGm6xAdfv6MWU2QrvXr1y3RA9Mul m+B6Raw4Q0QHotivuZz4BAE6kuZm16PQVqfICbAj3XC4Jm3XTRmPOYk563siwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677820646; a=rsa-sha256; cv=none; b=BepkfTlDWgFYjCG1tNTMHjbPOMuyl+1hUM6+1XxXAQTpYwz4nRlwF1ewNJZ89iGxeI6ZH7 dATsroPXjsNQVo/WDsyKCCNk5G+Sa0KptchT7c3cIZCwlFDK/PPujDpfze/N7IpJcJi2iv nzoYIitPjx1gMakm6gbywCZWesMzRKjXMBsWSyQBNVk+XzYplYa6OlAp7EErOXaw89z/hS 88AHkd8MNSTcFuLna3d0NWDj5IANL8Bq6Ohu3FWbpKeT1rSKGMODDNW+9RapASIVKZ352C nC3r+q4Vg65aqojN8qM7hkibeyhZ/VmgWLLHgAPlcGE2Dr/laCgzfSVElul/+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 4PSbnf0Rq4zlHp; Fri, 3 Mar 2023 05:17: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 3235HP6t019649; Fri, 3 Mar 2023 05:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3235HPPa019648; Fri, 3 Mar 2023 05:17:25 GMT (envelope-from git) Date: Fri, 3 Mar 2023 05:17:25 GMT Message-Id: <202303030517.3235HPPa019648@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: cd1e6e70d001 - main - daemon: simplify if/else chain 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: cd1e6e70d001bea9e9e0220bdfdbd8b5dd9922de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cd1e6e70d001bea9e9e0220bdfdbd8b5dd9922de commit cd1e6e70d001bea9e9e0220bdfdbd8b5dd9922de Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:02 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 05:17:02 +0000 daemon: simplify if/else chain Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 --- usr.sbin/daemon/daemon.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 5c636bcd0a03..2274a3e253a0 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -452,22 +452,16 @@ restart: */ if (child_gone && child_eof) { break; - } else if (terminate) { + } + + if (terminate) { goto exit; - } else if (!child_eof) { - if (sigprocmask(SIG_BLOCK, &mask_read, NULL)) { - warn("sigprocmask"); - goto exit; - } - child_eof = !listen_child(pfd[0], &logparams); - if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) { - warn("sigprocmask"); - goto exit; - } - } else { + } + + if (child_eof) { if (sigprocmask(SIG_BLOCK, &mask_susp, NULL)) { warn("sigprocmask"); - goto exit; + goto exit; } while (!terminate && !child_gone) sigsuspend(&mask_orig); @@ -475,7 +469,21 @@ restart: warn("sigprocmask"); goto exit; } + continue; + } + + if (sigprocmask(SIG_BLOCK, &mask_read, NULL)) { + warn("sigprocmask"); + goto exit; } + + child_eof = !listen_child(pfd[0], &logparams); + + if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) { + warn("sigprocmask"); + goto exit; + } + } if (restart && !terminate) { daemon_sleep(restart, 0); From nobody Fri Mar 3 05:17: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 4PSbng300vz3whBy; Fri, 3 Mar 2023 05:17: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 4PSbng2FWKz3lhP; Fri, 3 Mar 2023 05:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q3QXRauwim5TaX3CSndL7/E7InBGUoOe7irnSWlarM8=; b=HN1peaiYwAefwA1wZQH8Nt7EONrYTDJ4Gen2xaUyXHQSJBw0gY3Pykv+WyOAFxtEgmdgrt 0Gey7ijWdRuOKcfSTSa5v4DCGtC5aZhEgO+Rs1JxpNZhSJRdj6Lo+nHXjqGsBBojs27xu5 U33FDNcFAYoTD4DQBniDqljaHticlqmSfkyprhJ5T+MthJ3EKL+GGFUVT0Hl2A3r1YePue 91J9XULqNk51z0cCC23sBsiqSDxQuTgyxCGU2eAOVcP5jKjivUr+X0HUf+afo/XJyYHkgt ajOPtmpi9ETBe7eC0lcEJua/76ssIEt7WpE41Ls/FjlRgMse7e/NWd+FlbibvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q3QXRauwim5TaX3CSndL7/E7InBGUoOe7irnSWlarM8=; b=XGHf/NQRCZMc103qNCl5VH38RGdrXCkrqJ9Ca9LgSiTJUSMwfveglM2Z0WDfmIOCmRptZF OxtzVPRAU2av9wGic471YWCC3tnorTYkErdNlLwSd5zksFvS/OZODsEHVEzm5RgaBj/hoU g0z20ueeJacs8A3m+1CqoHMGzWmX/Sp0fp+un8mBfkHP+SLoCrxmuAejEklX/yiDDg8RPM l48MPHAL3KQX8lvzOPeexCGHAdap4kBXUKRkBE1ge3AG4nhrlTwdjdvQllro9qAfYvUnnq 4Bnjl4abYh0gOkS1uykJHKXVZh8Io8D3vYnHFR+YPsMUAge8ngtdgWTo82K7oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677820647; a=rsa-sha256; cv=none; b=CPnCtPXUsLqneL8J1ss+2DbRWyl0CIQ6X40pXba7n5sUo/gxmMU3/wU9ZbSvelRAKZf9Ej Ny9qTFCuiNOChcjHgPkVal88CXNAGm/mBEW3/iiQ1fpxsodUXsqHrhWMoa1j3DXJUHTK9o xtnv6995oOsaJyjFCq6BHlFaLYYWFqlYZmcVG7OOGNlAaWFf3QXKVYQac0LUjQdO0WWMZO O1J2bukN5fTnaYaUFQIeoWksHWHJ5NS56GHTwaH4nXfasm0T8V2yHA90fA+4AbpFi8Ogos eHVxpd2R1UrbVO+jUTXAprXp4qPDJnxy8L9CO+GDKNT1UNf8AbEOR3K51CEDtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSbng1LrYzlLZ; Fri, 3 Mar 2023 05:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3235HRHi019674; Fri, 3 Mar 2023 05:17:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3235HRmW019673; Fri, 3 Mar 2023 05:17:27 GMT (envelope-from git) Date: Fri, 3 Mar 2023 05:17:27 GMT Message-Id: <202303030517.3235HRmW019673@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: d6c398d882b6 - main - daemon: add braces to while loop 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: d6c398d882b61e02e6f061be81886b9675f3fb5c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d6c398d882b61e02e6f061be81886b9675f3fb5c commit d6c398d882b61e02e6f061be81886b9675f3fb5c Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:02 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 05:17:02 +0000 daemon: add braces to while loop Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 --- usr.sbin/daemon/daemon.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 2274a3e253a0..d1efebd0fcc2 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -154,7 +154,7 @@ main(int argc, char *argv[]) const char *user = NULL; int ch = 0; int keep_cur_workdir = 1; - int pfd[2] = { -1, -1 }; + int pipe_fd[2] = { -1, -1 }; int restart = 0; int stdmask = STDOUT_FILENO | STDERR_FILENO; struct log_params logparams = { @@ -360,7 +360,7 @@ main(int argc, char *argv[]) goto exit; } restart: - if (pipe(pfd)) { + if (pipe(pipe_fd)) { err(1, "pipe"); } /* @@ -389,23 +389,23 @@ restart: * and dup'd pipes. */ if (supervision_enabled) { - close(pfd[0]); + close(pipe_fd[0]); if (sigprocmask(SIG_SETMASK, &mask_orig, NULL)) { err(1, "sigprogmask"); } if (stdmask & STDERR_FILENO) { - if (dup2(pfd[1], STDERR_FILENO) == -1) { + if (dup2(pipe_fd[1], STDERR_FILENO) == -1) { err(1, "dup2"); } } if (stdmask & STDOUT_FILENO) { - if (dup2(pfd[1], STDOUT_FILENO) == -1) { + if (dup2(pipe_fd[1], STDOUT_FILENO) == -1) { err(1, "dup2"); } } - if (pfd[1] != STDERR_FILENO && - pfd[1] != STDOUT_FILENO) { - close(pfd[1]); + if (pipe_fd[1] != STDERR_FILENO && + pipe_fd[1] != STDOUT_FILENO) { + close(pipe_fd[1]); } } execvp(argv[0], argv); @@ -424,8 +424,8 @@ restart: warn("sigprocmask"); goto exit; } - close(pfd[1]); - pfd[1] = -1; + close(pipe_fd[1]); + pipe_fd[1] = -1; setproctitle("%s[%d]", title, (int)pid); /* @@ -463,8 +463,9 @@ restart: warn("sigprocmask"); goto exit; } - while (!terminate && !child_gone) + while (!terminate && !child_gone) { sigsuspend(&mask_orig); + } if (sigprocmask(SIG_UNBLOCK, &mask_susp, NULL)) { warn("sigprocmask"); goto exit; @@ -477,7 +478,7 @@ restart: goto exit; } - child_eof = !listen_child(pfd[0], &logparams); + child_eof = !listen_child(pipe_fd[0], &logparams); if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) { warn("sigprocmask"); @@ -493,14 +494,14 @@ restart: goto exit; } if (restart && !terminate) { - close(pfd[0]); - pfd[0] = -1; + close(pipe_fd[0]); + pipe_fd[0] = -1; goto restart; } exit: close(logparams.output_fd); - close(pfd[0]); - close(pfd[1]); + close(pipe_fd[0]); + close(pipe_fd[1]); if (logparams.syslog_enabled) { closelog(); } From nobody Fri Mar 3 05:17: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 4PSbnh3z1Kz3whWd; Fri, 3 Mar 2023 05:17: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 4PSbnh3Wqcz3lYt; Fri, 3 Mar 2023 05:17:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7gvs4N1v7mm4CYj7IbTmSeSo6Wf5rZSk3NB9n1DfDc=; b=B2TgpO4DIq0Jq0WYHZ4031aWy/MNK0iqKZiIW6e/6tMoYzW0+PhjJB5OLFejkupvqRUJgx OQqYjR4t5RdjQOIeiorreohwsEqFDl0K10CT1qdz0OoB5dG6At1nTajC7puh9txtmr9hln 47nuxWH+ij932eQ2NEZXw21sH7wjNejj5QukwePGU1A3nJxHhO8yLvW/HGXOyPnldieeZ6 BXZbdZ0WLmSStzSALVVQMiJ0d0YYdI1FDdklTvCYp8bIjv4NRV+pX5GsnjqO7gcCdCAR3S LdCXY3W7F9n+ZUbpjQXJdUwZ+oCiGj0t4PAns3IRXtv2H10KXOQHfZLCI0NtPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7gvs4N1v7mm4CYj7IbTmSeSo6Wf5rZSk3NB9n1DfDc=; b=ZPn54ApCT3VyVNy6mCR5n2yEa91o1qpF+Cgg8oO/vPcfPMd3VfXXqKtGmsA1LZSnyRNOSU S30rNAmCvB6EWFhQQpt1pnUMDWJeD8fURlPZUnoPHVVh7r2WMna+67XApvQjMGX1skRca2 izX0aA2t3sPly2v8ZLSGwgQHsgNbvUFfayKq/c4+TZl3CS9wUaix2wSnaCREexvjfjXuZk 31J8ZzUTDHiaJrN/ULsDktgFlKejqFz9t2fqMGSe6CCLcHgheTkp6v3hFSs/YuuvvT3UUL m8Wg7wRMMNUIMgzvvBS1Jy8aTDenW57K8cczMki8AZWTg28kmbcw1/UkwX4XRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677820648; a=rsa-sha256; cv=none; b=UEmPQ16u+2q4uf7DH2qqk1vMyG6ulbPbZMbIrb9Fhj5K71efyO206hAO69QZZBGdr7EbfK ziu6GVeLKCBLTcttDmnUYx5CNPQcZart6pWF9kPgamtijGNPjl4j4zxC+8qZv2D0L3aXyb 51eUcSH1cQ6SN0szIQ2qpMGhSYpxKdbagUEWjy/Fw7VF7hiCvx6CwcHpxnn0LI2qLMiJs3 2J8qlQCLdXzm98oPgdFi4j8Spu6NKJHh2qLW4h+T9RlDZGpvIQpiSNrKu0wterJw9BoLyw 5PXre/Z9P6U4OnYJ0W1G8Nb2hgrZ9o7ajPQPgcwVkS5F4MwQOsYotjcP54H2Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSbnh2Fc1zlN2; Fri, 3 Mar 2023 05:17: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 3235HSVc019694; Fri, 3 Mar 2023 05:17:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3235HScD019693; Fri, 3 Mar 2023 05:17:28 GMT (envelope-from git) Date: Fri, 3 Mar 2023 05:17:28 GMT Message-Id: <202303030517.3235HScD019693@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: e781739084e9 - main - daemon: decouple restart 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e781739084e9cb120ef4b6657074d2b7336ee405 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e781739084e9cb120ef4b6657074d2b7336ee405 commit e781739084e9cb120ef4b6657074d2b7336ee405 Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:02 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 05:17:02 +0000 daemon: decouple restart variable The 'restart' variable was responsible for enablement of restart behavior and for restart delay. While it may seem convenient it leads to cluttering the exit/restart logic Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 --- usr.sbin/daemon/daemon.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index d1efebd0fcc2..08ae5c74b8c2 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -147,6 +147,7 @@ main(int argc, char *argv[]) bool supervision_enabled = false; bool log_reopen = false; bool child_eof = false; + bool restart_enabled = false; char *p = NULL; const char *child_pidfile = NULL; const char *parent_pidfile = NULL; @@ -155,7 +156,7 @@ main(int argc, char *argv[]) int ch = 0; int keep_cur_workdir = 1; int pipe_fd[2] = { -1, -1 }; - int restart = 0; + int restart_delay = 1; int stdmask = STDOUT_FILENO | STDERR_FILENO; struct log_params logparams = { .syslog_enabled = false, @@ -213,11 +214,12 @@ main(int argc, char *argv[]) parent_pidfile = optarg; break; case 'r': - restart = 1; + restart_enabled = true; break; case 'R': - restart = strtol(optarg, &p, 0); - if (p == optarg || restart < 1) { + restart_enabled = true; + restart_delay = strtol(optarg, &p, 0); + if (p == optarg || restart_delay < 1) { errx(6, "invalid restart delay"); } break; @@ -303,8 +305,8 @@ main(int argc, char *argv[]) */ supervision_enabled = child_pidfile != NULL || parent_pidfile != NULL || - restart != 0 || - logparams.output_fd != -1 || + restart_enabled == true || + logparams.output_fd != -1 || logparams.syslog_enabled == true; if (supervision_enabled) { @@ -486,14 +488,14 @@ restart: } } - if (restart && !terminate) { - daemon_sleep(restart, 0); + if (restart_enabled && !terminate) { + daemon_sleep(restart_delay, 0); } if (sigprocmask(SIG_BLOCK, &mask_term, NULL)) { warn("sigprocmask"); goto exit; } - if (restart && !terminate) { + if (restart_enabled && !terminate) { close(pipe_fd[0]); pipe_fd[0] = -1; goto restart; From nobody Fri Mar 3 05:17: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 4PSbnj4j1Qz3whPd; Fri, 3 Mar 2023 05:17: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 4PSbnj4CB2z3lnr; Fri, 3 Mar 2023 05:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hmX03zDJ1nrlKla26gHvtNk/0YhIiGBm0skttQzxEW4=; b=ddJ2LRGhy+QiDcNWTZmsAR6zgyf1mNwE/V73VZOoD4b5W6B/dVthJUsfNaU3D65d3jxEUE hfgJH+XTdUoITwwVU2OkE1qxUZAUz5m0Gv0e8X2noNytW25tL4gfJ7mAiJgYYROWSDbB/k GuSFantEj/IRqAYu1eLuyjW7DevYwNdgemOr/NdzFNcYqpGwXFhlTVKfECKd55D0fN/Z00 a9X46l/Bb5SpbiczsDbjOJ6NBgwh1CFyAOG+SUfXTMuGsl/vBiAD8tVNvaWKWoe51TsSj4 yQ4a8BBnGduZbBFlevSJPQjUl95xKMkSns0h+uqT3sk72J2bSPkNanXb6n+hRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hmX03zDJ1nrlKla26gHvtNk/0YhIiGBm0skttQzxEW4=; b=pqxC6ShPMsUYrwxMOS6cK+czw0ra3Qn3ftIU6TFh7GGFMAFfy7J6zPC0kAmexCRc4MLb1i k1VMSk8vsr1E21hmE9nuYsKo5A0Bi2oUUNBMj1HXEV+jj/xPyUyOZ8yblgO9gkSiiHe/tF dr8u56WFMcY0/ZufyWf00Z05PVznHJWzIVLiCAF1r4Xxg0EWqr5222VY77eSW2eW7PewbL 40yC0gEvCIyuXuFEGRzJxfcP18KtLFf78LXWwgRFPrEM/cgCYGDWgP/HSlUCKIc26pPZm/ bKBV9S/+z2g1vOnxzG7MJSuOznAAAYunb+8ESEWuWSuL6BAp1dzyzsmq9uqNDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677820649; a=rsa-sha256; cv=none; b=QGhU2ggHhT4/V+MpE59/s2/itVZUjANUXeJIflhJoum/Fof9/c+loSkn0VXQDb6e9yWZV7 MWq9ion+L6vAoFfl3uS6yl9fvj8hZ/7yx3T5RShfYlzilB/GbkvptDlOr3/NrD1GJ9fmYj A2SRGAKpqj6TOLSsnjosKMgt3S4LGxDs9Ni6j4B7a4CR/cmJHBQSZrYTZp+qe18Z3v5Kuf lF8w4sBajTveDN/xQMBJ1MlqhhCCHGyGGinEukUpZvNaLVwre3XApBz8aNd8GjArz2E1RL uYwXAw8JHn/1Z8nre5ScKoPpVAvxBiZ887ATK4y0y/TEUn1qU0To+N8LVNodZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSbnj3FKtzlhY; Fri, 3 Mar 2023 05:17: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 3235HThm019721; Fri, 3 Mar 2023 05:17:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3235HTWd019720; Fri, 3 Mar 2023 05:17:29 GMT (envelope-from git) Date: Fri, 3 Mar 2023 05:17:29 GMT Message-Id: <202303030517.3235HTWd019720@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: f907027b49d9 - main - daemon: set supervise_enabled during argument processing 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: f907027b49d93170ed2e92cf0d183cd643b1f70e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f907027b49d93170ed2e92cf0d183cd643b1f70e commit f907027b49d93170ed2e92cf0d183cd643b1f70e Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:02 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 05:17:02 +0000 daemon: set supervise_enabled during argument processing Now when supervsion mode has it's own variable there is really no reason to set it separately from the rest of the variables. Move initialization of supervise_enabled var to the argument processing switch loop, where it belongs. Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 --- usr.sbin/daemon/daemon.c | 54 +++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 08ae5c74b8c2..3bbf092b500c 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -179,6 +179,23 @@ main(int argc, char *argv[]) sigemptyset(&mask_term); sigemptyset(&mask_orig); + /* + * Supervision mode is enabled if one of the following options are used: + * --child-pidfile -p + * --supervisor-pidfile -P + * --restart -r / --restart-delay -R + * --syslog -S + * --syslog-facility -l + * --syslog-priority -s + * --syslog-tag -T + * + * In supervision mode daemon executes the command in a forked process + * and observes the child by waiting for SIGCHILD. In supervision mode + * daemon must never exit before the child, this is necessary to prevent + * orphaning the child and leaving a stale pid file. + * To achieve this daemon catches SIGTERM and + * forwards it to the child, expecting to get SIGCHLD eventually. + */ while ((ch = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) { switch (ch) { case 'c': @@ -197,6 +214,7 @@ main(int argc, char *argv[]) errx(5, "unrecognized syslog facility"); } logparams.syslog_enabled = true; + supervision_enabled = true; break; case 'm': stdmask = strtol(optarg, &p, 10); @@ -206,15 +224,25 @@ main(int argc, char *argv[]) break; case 'o': logparams.output_filename = optarg; + /* + * TODO: setting output filename doesn't have to turn + * the supervision mode on. For non-supervised mode + * daemon could open the specified file and set it's + * descriptor as both stderr and stout before execve() + */ + supervision_enabled = true; break; case 'p': child_pidfile = optarg; + supervision_enabled = true; break; case 'P': parent_pidfile = optarg; + supervision_enabled = true; break; case 'r': restart_enabled = true; + supervision_enabled = true; break; case 'R': restart_enabled = true; @@ -230,9 +258,11 @@ main(int argc, char *argv[]) errx(4, "unrecognized syslog priority"); } logparams.syslog_enabled = true; + supervision_enabled = true; break; case 'S': logparams.syslog_enabled = true; + supervision_enabled = true; break; case 't': title = optarg; @@ -240,6 +270,7 @@ main(int argc, char *argv[]) case 'T': logparams.syslog_tag = optarg; logparams.syslog_enabled = true; + supervision_enabled = true; break; case 'u': user = optarg; @@ -286,29 +317,6 @@ main(int argc, char *argv[]) /* Write out parent pidfile if needed. */ pidfile_write(parent_pidfh); - /* - * Supervision mode is enabled if one of the following options are used: - * --child-pidfile -p - * --supervisor-pidfile -P - * --restart -r / --restart-delay -R - * --syslog -S - * --syslog-facility -l - * --syslog-priority -s - * --syslog-tag -T - * - * In supervision mode daemon executes the command in a forked process - * and observes the child by waiting for SIGCHILD. In supervision mode - * daemon must never exit before the child, this is necessary to prevent - * orphaning the child and leaving a stale pid file. - * To achieve this daemon catches SIGTERM and - * forwards it to the child, expecting to get SIGCHLD eventually. - */ - supervision_enabled = child_pidfile != NULL || - parent_pidfile != NULL || - restart_enabled == true || - logparams.output_fd != -1 || - logparams.syslog_enabled == true; - if (supervision_enabled) { struct sigaction act_term = { 0 }; struct sigaction act_chld = { 0 }; From nobody Fri Mar 3 05:31: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 4PSc685Rqnz3wjGd; Fri, 3 Mar 2023 05:31:44 +0000 (UTC) (envelope-from kevans@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 4PSc6850Msz3p97; Fri, 3 Mar 2023 05:31:44 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677821504; 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=Ja/iKAuahA949v8SxsQtNpfK2KS3sOQmkcYPQJ9LOIY=; b=m0C6z4ZYbRMhj10d+iMoGJi62QnbBjwOd/TZ1/bzCquxfiNCgV4gew38mWd5LYCOW9CrB9 DCsd75YwAdHaFk2NqJo0zi5uwHpZuWygwJGbJBMdyTA2uR6Vt6CIqt/cMG4TlmGSF3gvvc 5VFhvWDEXxdqEEGfNABC+EXB7FbVgEzrfnZ7t4SoPCdLVfMkro6/eTA90ehQAEzMpG4oxU BWU4nsOlC+cfizCVQQCmRxpCXLB5eM/D1R9YXkFTdgZQRJV+8edLQ3RSnkGJ9hty27WSAj U0Ml9+QKDf+QQ37J1f9NNSDLwIPL776X3ftsVLZw6OjViOhfEZVBBDX9tXBTYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677821504; 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=Ja/iKAuahA949v8SxsQtNpfK2KS3sOQmkcYPQJ9LOIY=; b=eUjrIag91dUwyvjAk0JmF5Jh/1uJicY4j2Od3+nYdxdv77imMDYWvSki4L5tizVpuiLsvq XxItpTr4yx/q0/F4Lq1R64BjhhxFjKan1tGAqmknd77TsMTst1qgfgDjkjxUFrHSYVL4BC zwD0aBet9X8CaftR/Q5/VMtKYVl2So6I9ehMqm/wBgcULdP3VdtYWszkROxFPgsGW+nDf4 xamf+siwms8yEjl6oka0Tygr4Llu+27eiLtax+qWjVPumI/miNcoOOe32LQjVFFfDBVpSX ONUXCit4lExpo6tM3EUZr2oizrjd40/rjnPkIUY0tH9AEZkrALuKypHuUeTEgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677821504; a=rsa-sha256; cv=none; b=NKx1MWEhWQa/ncIjeCl6E0twYpoJWJA3LdH5OelbhMMjO/+FgLAiOPo5zBB9jPoZqMNLEr 6kaU+2oQYzOh6XcL7XTUwvjsdyO+0zU63onvGJ6QXIgRtAMXRAi4cpEct6TWxFHnOA4PFr bPKTP0uQRUPtrjPXQqqwQVajLjr5aE6XHynrKbX1ck0wyHDJ/EoMMEdGoIa/0oLy2JeECU UIhBO+sZiGgowK2jVicvNlrsVJ9ofqVDv8mTdhawb8egAJtyPyQwR6RdxsLcEFQhiOtFof f2pepQ8YMAHfNmXXC5vjLfOkLgKkQUS4PRGc0s4YBhQfp+iJqbexpKLoFkumqg== Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PSc683vgWzljw; Fri, 3 Mar 2023 05:31:44 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f173.google.com with SMTP id a65so396217qkg.13; Thu, 02 Mar 2023 21:31:44 -0800 (PST) X-Gm-Message-State: AO0yUKUszrqB8atRPFb613c+6wSFFhEDMSdP7M2DzZap8+mvg7oJ7URw FQRRbat9IxaAMgTOBoITt/DZ9MexU/Kq+NSXE8s= X-Google-Smtp-Source: AK7set8ShPpQC0hepI52HJ5isuBd2r7SyHgpftz/7jbH1FArFecy3/AvJpgnrMJx7CormhN7mriNDGdV3Y2aGkPcQZ0= X-Received: by 2002:ae9:efd1:0:b0:742:a566:d40c with SMTP id d200-20020ae9efd1000000b00742a566d40cmr49857qkg.14.1677821504085; Thu, 02 Mar 2023 21:31:44 -0800 (PST) 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: <202303030517.3235HRmW019673@gitrepo.freebsd.org> In-Reply-To: <202303030517.3235HRmW019673@gitrepo.freebsd.org> From: Kyle Evans Date: Thu, 2 Mar 2023 23:31:26 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: d6c398d882b6 - main - daemon: add braces to while loop To: Kyle Evans 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-ThisMailContainsUnwantedMimeParts: N On Thu, Mar 2, 2023 at 11:17=E2=80=AFPM Kyle Evans wro= te: > > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dd6c398d882b61e02e6f061be81= 886b9675f3fb5c > > commit d6c398d882b61e02e6f061be81886b9675f3fb5c > Author: Ihor Antonov > AuthorDate: 2023-03-03 05:17:02 +0000 > Commit: Kyle Evans > CommitDate: 2023-03-03 05:17:02 +0000 > > daemon: add braces to while loop > > Reviewed by: kevans > Pull Request: https://github.com/freebsd/freebsd-src/pull/672 > --- Sorry, caught this once but forgot to fix it again when I redid the branch pre-commit. Obviously there's more than just brace-loop here. :-( pfd -> pipe_fd rename for clarity. Thanks, Kyle Evans > usr.sbin/daemon/daemon.c | 33 +++++++++++++++++---------------- > 1 file changed, 17 insertions(+), 16 deletions(-) > > diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c > index 2274a3e253a0..d1efebd0fcc2 100644 > --- a/usr.sbin/daemon/daemon.c > +++ b/usr.sbin/daemon/daemon.c > @@ -154,7 +154,7 @@ main(int argc, char *argv[]) > const char *user =3D NULL; > int ch =3D 0; > int keep_cur_workdir =3D 1; > - int pfd[2] =3D { -1, -1 }; > + int pipe_fd[2] =3D { -1, -1 }; > int restart =3D 0; > int stdmask =3D STDOUT_FILENO | STDERR_FILENO; > struct log_params logparams =3D { > @@ -360,7 +360,7 @@ main(int argc, char *argv[]) > goto exit; > } > restart: > - if (pipe(pfd)) { > + if (pipe(pipe_fd)) { > err(1, "pipe"); > } > /* > @@ -389,23 +389,23 @@ restart: > * and dup'd pipes. > */ > if (supervision_enabled) { > - close(pfd[0]); > + close(pipe_fd[0]); > if (sigprocmask(SIG_SETMASK, &mask_orig, NULL)) { > err(1, "sigprogmask"); > } > if (stdmask & STDERR_FILENO) { > - if (dup2(pfd[1], STDERR_FILENO) =3D=3D -1= ) { > + if (dup2(pipe_fd[1], STDERR_FILENO) =3D= =3D -1) { > err(1, "dup2"); > } > } > if (stdmask & STDOUT_FILENO) { > - if (dup2(pfd[1], STDOUT_FILENO) =3D=3D -1= ) { > + if (dup2(pipe_fd[1], STDOUT_FILENO) =3D= =3D -1) { > err(1, "dup2"); > } > } > - if (pfd[1] !=3D STDERR_FILENO && > - pfd[1] !=3D STDOUT_FILENO) { > - close(pfd[1]); > + if (pipe_fd[1] !=3D STDERR_FILENO && > + pipe_fd[1] !=3D STDOUT_FILENO) { > + close(pipe_fd[1]); > } > } > execvp(argv[0], argv); > @@ -424,8 +424,8 @@ restart: > warn("sigprocmask"); > goto exit; > } > - close(pfd[1]); > - pfd[1] =3D -1; > + close(pipe_fd[1]); > + pipe_fd[1] =3D -1; > > setproctitle("%s[%d]", title, (int)pid); > /* > @@ -463,8 +463,9 @@ restart: > warn("sigprocmask"); > goto exit; > } > - while (!terminate && !child_gone) > + while (!terminate && !child_gone) { > sigsuspend(&mask_orig); > + } > if (sigprocmask(SIG_UNBLOCK, &mask_susp, NULL)) { > warn("sigprocmask"); > goto exit; > @@ -477,7 +478,7 @@ restart: > goto exit; > } > > - child_eof =3D !listen_child(pfd[0], &logparams); > + child_eof =3D !listen_child(pipe_fd[0], &logparams); > > if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) { > warn("sigprocmask"); > @@ -493,14 +494,14 @@ restart: > goto exit; > } > if (restart && !terminate) { > - close(pfd[0]); > - pfd[0] =3D -1; > + close(pipe_fd[0]); > + pipe_fd[0] =3D -1; > goto restart; > } > exit: > close(logparams.output_fd); > - close(pfd[0]); > - close(pfd[1]); > + close(pipe_fd[0]); > + close(pipe_fd[1]); > if (logparams.syslog_enabled) { > closelog(); > } From nobody Fri Mar 3 07:53: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 4PSgF95pNMz3vbrM; Fri, 3 Mar 2023 07:53: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 4PSgF957bYz3wnw; Fri, 3 Mar 2023 07:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677829981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZByiL5Cd+r4t3SL/a3y6i5dvFa8l7sGsOxuSe9UI0U=; b=CU4pu/BFS6PTAbpRHMCFOGLjeJuiHvffetX1f1gN1hnQur3wExFQMVbfRTwtYBnnUTVIdp LXfUcMpq4TJWCgED2v/weuSz7pTmSN7EO4LQxz5bYn0v7gih95SHcYAOYG9l60of7rnaeR OdUYV3GN5RPp2j0vNbXmrenDagvLA6myAY2IHg4pPrGIoQX6lERJhgyjlkIonuRQmn1ubA UseEDZGmUTNCr0gkIdTkZMADhg7EijsNr8YAK+PoEES+K5nxTgSJKrDFMeuNMW8iSj18W6 WeymL/Wvj/rdizKwBbKunXRg+FrcbiT/od0OsWC620KRr9BtEWSXKi9rxSaqZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677829981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZByiL5Cd+r4t3SL/a3y6i5dvFa8l7sGsOxuSe9UI0U=; b=sUMdmCMithcVesztJufg0HxTemHGLDNHzhjD4BhV6kbKI9G69Oy5TKEqheNm4gCfdW3GHh Es6U9qWyehNWVLBqDtEqvU++p8s8OCtj+bWd9gtRuMoKvCKf0Fvoxyt24FR4D7rT+ZI1ey ZEYIcVrg/Rw9AM88TJIwlU2xLE6UpkkqCAWsNrvjP9Zo9ADM9LzJ7fL/lEX/27M8Bg8wD0 JMahHFXrTrgqa750+wdiaa+vJHFdpvxsU5H9aH3jpRi5cYdcXq+EOwOPDBJUk/ykWanONJ IFhyTfLEd5ZBPbTORtcKwbvBTU1rWdQwjF7nTPeSxPgNEwYCZ21OQn5HmUB3Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677829981; a=rsa-sha256; cv=none; b=V2MnJJM1/eQzV0fSxtlDlqKF5U0QxAXJ0c0OThwlNVpKQNCp81z82+oDZ1YKrgKCubHXjH 1xyJ+WN6A5s8P33tmI1ltlN73kfYn+2mTkMcXrol0eLpOJ12e8Lvx8TUriq1XIt5jfHKjs vlSLRMvgW1YJJM1MGzzAxjMa0UhaA9zMA/QJihNm89Ztmh4g6Q2zXKEP56spBj488RYNer ktXgvC+x+WNgx2oWWs0NQLDuSm6dyAVNXejGc37mv3PHy3jm2cb032FV6P+WTzbHGFnrXN /MVHaKVIfQNyCHf+ZXL8uDFlt2GYStqCDhdv20xksAoq8f4WuWLPUb+3dATYCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSgF94Bg4zqYw; Fri, 3 Mar 2023 07:53: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 3237r164079886; Fri, 3 Mar 2023 07:53:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3237r1dU079885; Fri, 3 Mar 2023 07:53:01 GMT (envelope-from git) Date: Fri, 3 Mar 2023 07:53:01 GMT Message-Id: <202303030753.3237r1dU079885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: d43812b17360 - main - Disable ATM programs by default 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d43812b1736059bb60d9ae82ff6c06bc61f93508 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d43812b1736059bb60d9ae82ff6c06bc61f93508 commit d43812b1736059bb60d9ae82ff6c06bc61f93508 Author: Emmanuel Vadot AuthorDate: 2023-03-02 07:21:34 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-03 07:52:35 +0000 Disable ATM programs by default ATM is an old technology, remove build of related programs by default Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38844 Reviewed by: brooks, imp, emaste --- share/mk/src.opts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 8008a94ae329..6be0ae89e1dd 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -59,7 +59,6 @@ __DEFAULT_YES_OPTIONS = \ ACPI \ APM \ AT \ - ATM \ AUDIT \ AUTHPF \ AUTOFS \ @@ -195,6 +194,7 @@ __DEFAULT_YES_OPTIONS = \ ZONEINFO __DEFAULT_NO_OPTIONS = \ + ATM \ BEARSSL \ BHYVE_SNAPSHOT \ CLANG_EXTRAS \ From nobody Fri Mar 3 07:53: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 4PSgFB6KCpz3vbdc; Fri, 3 Mar 2023 07:53: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 4PSgFB5sTPz3x61; Fri, 3 Mar 2023 07:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677829982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DPbUgHjUGwo8GTC2pJtGRzSCQrw8pOcG3cOykb3Bt50=; b=HzFsdMZ9oGUUAVfol9S/StsIOxrRP0jiIo/35deUn5/Txgiq2AddwY+rjgf331C5Hzy4un iNKhnLjEOMwigoNr5DGns57N6kL00aLl5fDek3N363WtMHeqffQyz9KLgVLeeSyzUtMMiP SEPhWxo+LXM6FIZJcYOafnTJP+bSxZaPI6khvswnwblaHLX91sFCtfSQFPqQK031m3wwnY jbPHbILN0f1uESrbkN33L4Bbwv/YuTg4yrhrFKaOH0j9pNsdB+7rXsfMtBf87/N9kedABN nJV994FMJm0BaTBabOrzMjeiqCZ1/DCor84+t3RYgkLbMZkZdDCiLyBKw+STKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677829982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DPbUgHjUGwo8GTC2pJtGRzSCQrw8pOcG3cOykb3Bt50=; b=Qg0zsJag5e97MBCPmLtYjnvmUyVMUjptRVAVkDSYkZjCWBlspqOcs2wFL3VIbflMF9fZnV T7GGAJIR/4XWwgFbmgqnFUJb1h7hVVegANVoCZWYX9uxp0BTMEfbzkSdSbUI9qi/BL+00N 7ii1HKYQv9JpCRrBYbbQdpNLPQrmjdC7I83ScIuWXQCAjNFmgtxFhDMlSM/eP9UY70BUGX BAdMuvrhJ+Ul4NuVQVqJXjl12lQ3PiylmbM8XfmMO+DDIJIsEeUeonj2DAnuYQqz24SKaB Rx1YOmTvu2CKoxGAFeCebkVA08a+s9QS1bozrJamcqycJ3w5TipPvR0+PyCvKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677829982; a=rsa-sha256; cv=none; b=b9WoXj20iunDxaPKMEl5N0sztvbtvEjji7ljC1qjFlyT4+W/CjZcLPYzQZC6TsdtaOrIWG 4h81Rsrp+/U2dYmC13+tFiD0lRApzYR8ucPmA0vGE+W11z8GTSBgJ9SfnIAW+xRSN2+yLu EzXgbWLrT+06aQnseMUDHcNuXQLcJV+A/fUh2GMzFm1ePULaw8j0wtWPjvRfN3jqz0p2HR VwhOuYdh9rzZcmxsH1OA3UgIPwUTrrdjTs+clHILaviK/wEAGLr3EaEUZanigPDn1eAfS6 6+83JyXcExkZIlMY04LSYDNh7mJvbaKGlQRNP6WcFfUWgR/IMZ+6Rnq6gn6x2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSgFB4v99zqPB; Fri, 3 Mar 2023 07:53: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 3237r2Us079912; Fri, 3 Mar 2023 07:53:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3237r2jk079911; Fri, 3 Mar 2023 07:53:02 GMT (envelope-from git) Date: Fri, 3 Mar 2023 07:53:02 GMT Message-Id: <202303030753.3237r2jk079911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 66a175980e40 - main - Add description for WITH_ATM 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66a175980e40e1c63fb12dd100da7c5bae348169 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=66a175980e40e1c63fb12dd100da7c5bae348169 commit 66a175980e40e1c63fb12dd100da7c5bae348169 Author: Emmanuel Vadot AuthorDate: 2023-03-02 07:26:38 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-03 07:52:39 +0000 Add description for WITH_ATM Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38845 --- tools/build/options/WITH_ATM | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/options/WITH_ATM b/tools/build/options/WITH_ATM new file mode 100644 index 000000000000..dcd47b23d63c --- /dev/null +++ b/tools/build/options/WITH_ATM @@ -0,0 +1 @@ +Build ATM Libraries and related programs. From nobody Fri Mar 3 07:53: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 4PSgFD0Bpjz3vbh9; Fri, 3 Mar 2023 07:53: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 4PSgFC6tjRz3x6j; Fri, 3 Mar 2023 07:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677829984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=idp9GLJE3JWVOugcuocoq2MRp3P1+1E2PpWy8xFiPj8=; b=tYvUKgtNH1ozFnQzNNr/D6KD7dV0CNlNo6J+GtCfgm3894d3P3H/RO8rb38G3UibS80hsM oIMt7D3YKAYie7zKbvku+0Zt/P95w8DvmJesqd/MrQilpyDsrkouwk+3DNplHcivpBC32n 8+TA3wvxdJCq1yM4y//0bait5WdF+iCac6FpCxgUGioiqCWgMX8cdRgCrQXJTDKcZ9Sh7i QBk4nS64+zW9OEVSs8C6pDt9BXKJ/Ws1XAeiXitwJybgwYC4CBsDlbMxYYCL0FgEo/eEwf 2Y9caEDT+eLzfd/RXPKu2u06OUafgMu7d+FREZXyqJQkALup5ypitMkt75XMdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677829984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=idp9GLJE3JWVOugcuocoq2MRp3P1+1E2PpWy8xFiPj8=; b=Bnyr3EdH5iCD7X6vByRmQer4C2+asaa4WPfmWjYGWP+kh4UyvEJMd9Ji/03/Iqfj+ws1sZ t8G6LzH7+2wdogRTfftk3JDHQ9tUmNZf2R9Oy6lqmikLRAJAI3eIJMqq6qDsAwZJUm/BYL t9QPI0Q2qQU7Xxo77AMdMwtS1FqoLrmHJTlD8sLA1ScIuZGNcQqVw1OyqFUqMKjScK7cxW wGFW1eWqpBJFAl2cALtcD9Eyg44DFrCPF1bIu+dxj4Ij7vPatQDNgbYLRHb7oweCFlbveW j1/tANFVaT3OY6OyHdC3Ig5b0ti4NJZHkkugkZ4fLamTuo6mPLX6pLUnDxUSiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677829984; a=rsa-sha256; cv=none; b=J2rx4McSRjH7AsWfED06ZOXP0sHi1AE3ogjpJhVhYaUaawje98SHFripCXD6jOIElA2QTT t7Hx9uTt8DYuctAapVVd8aPnjRfGCtI/uR2tIC2ABNOuUkYB38+dSqZrIQA/r/06J49pPl uWOsbz3o4+E/dAwgiI2wELt6Spzstvtl3s5T96wPoUi3lmE6ZNr5kgaLJQpNq+K+PwC80i t/2Dx+EspYwwsoxbSBBW70VoILL/eC5rYspkatkg4Y12bONqY+F2cAsV9PBkr3JI5KbD4a DMkA/rpllTaZ+N0gUI1CmKpvvYr/eorqg/pCdg7j63qy288c0BOvmRExIB0Z3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSgFC60wPzqZj; Fri, 3 Mar 2023 07:53: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 3237r3wI079931; Fri, 3 Mar 2023 07:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3237r3aW079930; Fri, 3 Mar 2023 07:53:03 GMT (envelope-from git) Date: Fri, 3 Mar 2023 07:53:03 GMT Message-Id: <202303030753.3237r3aW079930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 5ea96be40b1b - main - src.conf.5: Regen after switching to WITHOUT_ATM 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ea96be40b1b0af62dc8ffb8f44ae6f82806a5f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea96be40b1b0af62dc8ffb8f44ae6f82806a5f0 commit 5ea96be40b1b0af62dc8ffb8f44ae6f82806a5f0 Author: Emmanuel Vadot AuthorDate: 2023-03-03 07:50:15 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-03 07:52:41 +0000 src.conf.5: Regen after switching to WITHOUT_ATM Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38846 --- share/man/man5/src.conf.5 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index d7c689780cd0..e7bc62d9e2fe 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -127,9 +127,8 @@ checks. Do not build .Xr at 1 and related utilities. -.It Va WITHOUT_ATM -Do not build -programs and libraries related to ATM networking. +.It Va WITH_ATM +Build ATM Libraries and related programs. .It Va WITHOUT_AUDIT Do not build audit support into system programs. .It Va WITHOUT_AUTHPF From nobody Fri Mar 3 09:54: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 4PSjxt3jSbz3vjcZ; Fri, 3 Mar 2023 09:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSjxt3DSVz46Dv; Fri, 3 Mar 2023 09:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677837298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G5tJPndmRrkysVyuhrkocj1EoLbN9TfOEKd1sdsBTp0=; b=qVRaOjNL77fENtEadhvIceGz3ROiT6V59kFEciKaa5FmLxi9bMiGF/mxYoaJ/R+bdLS+q6 mGLvIvp1j25yg/4zIjg0Sq//RIPdxhexpA7SH4KFRo+/drNNzycn28NpxDSVLOhsgLt7wA oNq/wtqsyj3xU+DWlG4H501H9Ut2IuRlkJJU5WXxWEj42onty+wZrm8El1dyukoMU+DXWT zXMitXeuEgq18ha7UUZ5yAmKrs2ELSfHJwUeYr7Op2mmU/LnoZjrCkbK6VW3U3R2xrYiU9 p/duG5uv0MwV+4ZrkwqdzO521iYXMFRi9eP5kE0MmlXyALK/OpTpaq6H3/gDmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677837298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G5tJPndmRrkysVyuhrkocj1EoLbN9TfOEKd1sdsBTp0=; b=VvqanKDq+qimMY2UU4/v7K7bnd00oV2iXTXkSJ3Zw4dcdmc/hL6wYap6slx6VklnEQKtt9 +eseaEHtfPOSz9HxeuuWSuavJC2/QLm85vKtFHEC73TCZ7rZV3v/p77pR88Qj6P9ofkvMF TBbZ2LGODuZqIb3ySnfP/cbnhxBSnTv5cXYwhkS2a04FGfEUdhYX4H641+JiUHzTXwrxV2 bgVwBPes/RSI5QGnllY7hQ+Qg8CZ18kbhsaPsM1MytmphkY+nUpgYtOldVQvmpuW3FFFGX NXjw6CcA5bYWoh5WT2aW81nEZvqqJAR7Z2BS9VdsCm6/mjJ5JLU/NKpxNPtslg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677837298; a=rsa-sha256; cv=none; b=JDHEWE++cMN6mqf7osAu3gcO7iDhov07g5w+XNdQ9O2/3Ft4pc+wvByRy0PPnTWTAl5sMi 5ZcePPcLx+9Nan+NC8KudRM81C03EslAM4hhsCOUqc5ZYqbYAqEelul6MB3D0ec9rEjoWV S31EPa+UZRm0izVqo6nyThkeSwuTGvUoVIdrU8SEc/TiqGpRoP0t+ll0GTY7EJ4JkxDmi2 8TPMgsbSHFvMdPTNep2jdMaNn5tb3UbDuR362FuegV3T2oDG3tyeIV+YtKOXC+ZIjcTyTt O/kKuH7yxiAEDRrmMBGjjczDp7FHNxkjF/4AtTDpJv9A3ccejcBIBRUpTOGY/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 4PSjxt2H6wzsqC; Fri, 3 Mar 2023 09:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3239swbe077212; Fri, 3 Mar 2023 09:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3239swuY077211; Fri, 3 Mar 2023 09:54:58 GMT (envelope-from git) Date: Fri, 3 Mar 2023 09:54:58 GMT Message-Id: <202303030954.3239swuY077211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John-Mark Gurney Subject: git: 144661f94145 - main - note that some arch independent code can live in dev (e.g. SMBios) 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: jmg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 144661f941453e57b1e183bcf3a19633ef242070 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jmg: URL: https://cgit.FreeBSD.org/src/commit/?id=144661f941453e57b1e183bcf3a19633ef242070 commit 144661f941453e57b1e183bcf3a19633ef242070 Author: John-Mark Gurney AuthorDate: 2023-03-03 09:54:07 +0000 Commit: John-Mark Gurney CommitDate: 2023-03-03 09:54:07 +0000 note that some arch independent code can live in dev (e.g. SMBios) --- sys/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/README.md b/sys/README.md index ad7ff9efa578..77db5026eff3 100644 --- a/sys/README.md +++ b/sys/README.md @@ -24,7 +24,7 @@ Source Roadmap: | crypto | crypto drivers | | ddb | interactive kernel debugger - `ddb(4)` | | fs | most filesystems, excluding UFS, NFS, and ZFS | -| dev | device drivers | +| dev | device drivers and other arch independent code | | gdb | kernel remote GDB stub - `gdb(4)` | | geom | GEOM framework - `geom(4)` | | i386 | i386 (32-bit x86) architecture support | From nobody Fri Mar 3 10:09: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 4PSkH468yQz3vk8D; Fri, 3 Mar 2023 10:09:52 +0000 (UTC) (envelope-from des@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 4PSkH45RFhz485x; Fri, 3 Mar 2023 10:09:52 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677838192; 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=UZPL/FeYKTTOAApXxlG4xWVUzi0Af5MY2DqEiclNuWA=; b=lDIIJkpHR4y6EUN3YVviK3UEwW7IsW085c6xIhtCsvMrm9L7CFy5ULO6Xye1kld2EszyTv xt1d5/PySUHwH9nVbonYWbTrbZrQMVisbFCReAkWCBuhlMJJcpC70RQvDusYIdpU8fe29s LKzfP/vamnn1Ekkv2flz5xq0/B6QU9f5dZTXviOb9M6zom4C5kF3vaRRGcbkMuZlcQ9PsW omyqt0sMgPRKgQj0bc7jUtSEAi5HrY4glpQG7XPWSOxdjStlrpk5/SCe2O9fZQbdpjnuzI jqevE2T6inICz4wAdUN++s7TF9QWu06gVYg7seG0hajzBbYfQE87fn8UWTgz7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677838192; 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=UZPL/FeYKTTOAApXxlG4xWVUzi0Af5MY2DqEiclNuWA=; b=yFEnBT2GQOR3GHlVsfXhG0LcbhZdx4D2WCBM9Sdv3zCX6rnx+/MdUQnWmNxjXUFdhLsa7S grjRoNOk+FqdztJ4GewRXPo0i7MJMvekQAV87gg1mQ97iXi+iJynjC0jTCBfNovT1yVOAp ls1EChjl0YdXDquckbNTo8rFgJ85fl52OAwSDfa33TVNu2/bQuqqOBOY5YLsmE++r14/ZY gARfQemAvKfy+/hWCNDQzbVLm6RqHhTbXWQbjmX8pK+BkR8Ut1z6J7Sdaq/hULIhwZtFRd I8jH/oexJIv9o+JlYWpthe8H0mhElmw3+84SST8U6N1iMq1i5uI6CeiGdyD/Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677838192; a=rsa-sha256; cv=none; b=FTbo2icHb4i9PPTcWqrOt7LLfJAlqWiXQFJGExpakvkKY6OzTarm2tJCGfQqIjkcsNL9I9 K2KFczRJrUe0iMuifG0hCvy/Udo6iDEJsKJpbvabgJX59wZHfv8ei3BZjlLzd9NQlbqB9A ciavVLVyU6NKXUmjB/oAbEHGCrmkebg0h68aAs98NZ8ANOweYW6900e6ItZncfugVOCoMX +iFusbSaRq93Zmv/kjzskCoceHJ7e2hui0PsSNkE2ilTGfAcXf91TTgCfwFEk/S0lUTTFc zT9BgtWXAtiDODpbA50Ff4ogTwZWJeqbOSvJxVVitFvIRD2bpQRfwM4sqo361g== Received: from ltc.des.no (unknown [84.210.219.2]) (using TLSv1.3 with cipher TLS_AES_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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PSkH43cy0zv9X; Fri, 3 Mar 2023 10:09:52 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.no (Postfix, from userid 1001) id 3F2851069EC; Fri, 3 Mar 2023 11:09:50 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Rodney W. Grimes" Cc: Cy Schubert , rgrimes@freebsd.org, Juraj Lutter , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1d577bedbae8 - main - unbound: Fix config file path In-Reply-To: <202301181702.30IH2toO010890@gndrsh.dnsmgr.net> (Rodney W. Grimes's message of "Wed, 18 Jan 2023 09:02:55 -0800 (PST)") References: <202301181702.30IH2toO010890@gndrsh.dnsmgr.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (berkeley-unix) Date: Fri, 03 Mar 2023 11:09:50 +0100 Message-ID: <86r0u6rvrl.fsf@ltc.des.no> 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: quoted-printable X-ThisMailContainsUnwantedMimeParts: N "Rodney W. Grimes" writes: > I've read a few of the linux how to's on running unbound chrooted and > it leads me to belive that /etc/unbound/unbound.conf is the correct > value of the path to the config file. > > I'll also spend some ENOTIME idle cycles looking closer at what has > happened here. My gut says that if unbound is running chroot to > /var/unbound then the config file should live in > /var/unbound/etc/unbound/unbound.conf No. Unbound knows it's chrooted, knows _where_ it's chrooted, and adjusts config paths accordingly, cf. e4c53d3bf00a. Also note that the local-unbound configuration is not meant to be user-serviceable. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Fri Mar 3 10:21: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 4PSkWx5cPHz3vkxf; Fri, 3 Mar 2023 10:21: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 4PSkWx4Pb7z49h0; Fri, 3 Mar 2023 10:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677838861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Az0CjxWewlT15SYwaxU8tTRdNhEdck66wcu3lPoyK7g=; b=XftUpOVJvETEBy5VaE3MDdO5YEaA5z2+/7KUrQJR36ZMHKnZjRjFnELb9a0qYGLnmYQuj1 4Y9I6lKtNH38j3z8StAA9hOuZJz6eWj3qEL66aYf3AtLxBCwtl0e3OeCC0s64Ki63gptWE hoTum4jF9Jyn/yzpvFDHw2JFG199pFI6s2SaWEus77qYZvBEo08FP4qx0wTgEg98mdVDVD gAyoj85u4E9zVWDAEBzwar3C05pnlncWOXS3MRh3GyBsZOnu3FkhWW4DB7rpZBJUxbrgwj tFzd5iQ/LxrsWez/Qm23Cek5iXkoVm9FG4b8fL5yuW1s0R2yKtRhT4aVH6YrDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677838861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Az0CjxWewlT15SYwaxU8tTRdNhEdck66wcu3lPoyK7g=; b=NK3/jedI+K7Gjm1yr6GtKpaA1iC0VFetjwcIOUiJmSqHUDsb9ZyjzF44ssoBHJfKHV7E92 /hJvManW453cbkYAFY9upXNb5zXRp/x92GPUiPwxRXg/d0wBDME1Q+EL/VkIx22zg4Wdmo xVWCrW2imods95HNY9m9nV6AxRW+tIfulpl0n+cOLvcR3p958uCUzlz/xGOT2E5SJxKyS9 Ot8j5/AAJRLWTKVJrJVX6+/QrIDf0mvCi9jEcLI+Fu/RJF3DcsenTW164G1O0SM3vqWUQ2 atwwfoLSWm5WPC6H/27gGTx6RmX+At0RQ8gIC9+qsXHjZPurCk7rKmRI6d0Czg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677838861; a=rsa-sha256; cv=none; b=CSnLC3OHBmUqrO8hhe0sNQSiWf8+5elEJPaZxhVPLjafvtTKpzR3h4ilEdsSPKQizBPZCp ppcwJ9RSx1/nqzTSYukd71cZdkzi5pKGdsCNAT5ZuI/Mv2UfWm2FQ+lurJGc6rmueGMWTs eryRTxyfn9C4Ah6Rnk6p38/XKl3BW22XGtRkWMplQZSF2PP0Gt+n0GsjPlJCmnNrXwZYZX EeOX6vS9ZaxRn8w2CZvQ8R3jchw0CwOTxT467KktDMdo6c2obwJp4S//sOek7mDnsWXVj1 33nmsoE0mcuwRRAXXoPM0ZkTuiOWRbVRPKWlVcNADJoz9h7f6skwxCFvruNaGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSkWx3Tfwzt0P; Fri, 3 Mar 2023 10:21: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 323AL1bB020684; Fri, 3 Mar 2023 10:21:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323AL1ue020683; Fri, 3 Mar 2023 10:21:01 GMT (envelope-from git) Date: Fri, 3 Mar 2023 10:21:01 GMT Message-Id: <202303031021.323AL1ue020683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 0ea0a371d2e0 - main - dtrace_proc.4: Fix the description of pr_sname 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ea0a371d2e0f821e4bd7e1c90c772781d80975e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=0ea0a371d2e0f821e4bd7e1c90c772781d80975e commit 0ea0a371d2e0f821e4bd7e1c90c772781d80975e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-03-03 10:14:41 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-03-03 10:16:45 +0000 dtrace_proc.4: Fix the description of pr_sname MFC after: 2 weeks Sponsored by: Klara Inc. Sponsored by: ELW – Entsorgungsbetriebe der Landeshauptstadt Wiesbaden --- share/man/man4/dtrace_proc.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/dtrace_proc.4 b/share/man/man4/dtrace_proc.4 index 9e2c784e7845..410d946d432d 100644 --- a/share/man/man4/dtrace_proc.4 +++ b/share/man/man4/dtrace_proc.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 17, 2016 +.Dd March 3, 2023 .Dt DTRACE_PROC 4 .Os .Sh NAME @@ -188,7 +188,7 @@ Real scheduling priority of the thread. Currently always 0. .It Vt char pr_sname Currently always -.Ql ? . +.Ql \&? . .It Vt short pr_syscall Currently always 0. .It Vt uintptr_t pr_addr From nobody Fri Mar 3 13:11: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 4PSpJx30fmz3vtDY; Fri, 3 Mar 2023 13: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 4PSpJx2WhRz4KWT; Fri, 3 Mar 2023 13:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677849105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+eJ4zJD0k0LIBvIYzDO7h0qPgK13PqHTMbewhMTNli0=; b=ygR5mOEMf07T0Unr5Mr+7Jrbr6mpp7y+A4IC3ydVdljciTXtvZV+6WEhNaupv23qFjR8ny ENwEVhCbV88E2BLdcfJOePEZxBhAp0Hj0BZ1yF4BxqrYWB3i9ZVDhKJN5CLxkOHAYtLCY9 JPiTgf606Vo6wdi4wFAF2be3ZLLKXNHuSLvKeAqhAMtyc+fTiHfISAaVNcJyIo2xz+Pay6 A85jdxk6Ejsg/y9d6Sc1dzQw7yXkdr+XeBiEL+fmRaB9pWZB4rRRo3DGuW6iK0OVIbqzKN 9pBvkTEGhRBg53aevlDiE6tx5Od+CdyXGXldetqHhNiLIuwhAzgQnyib93BqqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677849105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+eJ4zJD0k0LIBvIYzDO7h0qPgK13PqHTMbewhMTNli0=; b=isbB2QS4h0uqHePU22MalJgVU+zrzUOaf8JSXp27OcjNIsRGF6sanpdgZuJ1UjlC1h7GR/ XhJbo+m4dhGTg8LzK2DyUGMwwdiC82ITSJe3zEhckUm5c8iUTtj4atVWU3NGDzEH/rwqKM OBd0YjM2FYVg1GGD+b8MWOJe+ajomxvDwjJAVnJcjtr+l7VsZ6UGrsMqCBBexm1cxrbesF m8UGswsoZEOV0Rsfli8mgrdbz/WaECb3Q9/R6NJfzR/eCDAciEZ5SSbJZhfMGt/KrpwyEp T6sSuVUi1art7m71diRet4EgPMrKPsjdslubTrnk2+MGboGqXOetI3YBKk36nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677849105; a=rsa-sha256; cv=none; b=ns94bk4CsoKTIUbPSLJFi4MFKHDxwQ5RYIGV6EkBek+d6vnLGOktqQ2Niqre1QJzNdCSeB T7ysRXueMr/TkhdBByIOhwALbslp/u8oA5SXzbxpa4gcrveoDnQHcbmA7gnSYqI04qfmKD 1aELnra0CUXShLG77WGPOw0Wx5KJ2e35f2PkZNNVS3ecOumILlUNt4QLOVVgK/LBmjGHo3 6ZWzT0nIqyCeRso0reexYlgMMtJvsdL6fFnE8rmcFei7syJ6/+3RRWCA/+qUyP1Ax8N/Wv OXXcUOmAnT1V2NrCFxFYsMKZR2ndyA21G5Id5edL3486I1nyNanWYh969Z4vSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSpJx1cYjzywD; Fri, 3 Mar 2023 13:11: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 323DBjsH004077; Fri, 3 Mar 2023 13:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323DBjxh004076; Fri, 3 Mar 2023 13:11:45 GMT (envelope-from git) Date: Fri, 3 Mar 2023 13:11:45 GMT Message-Id: <202303031311.323DBjxh004076@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: 4530e0c3e78d - main - bsnmp: Remove "All Rights Reserved" from FreeBSD Foundation copyrights 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: 4530e0c3e78d0616367d37273d6c1f47f627839b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4530e0c3e78d0616367d37273d6c1f47f627839b commit 4530e0c3e78d0616367d37273d6c1f47f627839b Author: Ed Maste AuthorDate: 2023-03-03 13:10:44 +0000 Commit: Ed Maste CommitDate: 2023-03-03 13:11:39 +0000 bsnmp: Remove "All Rights Reserved" from FreeBSD Foundation copyrights --- contrib/bsnmp/lib/snmpcrypto.c | 1 - contrib/bsnmp/lib/tc.def | 1 - contrib/bsnmp/snmp_target/snmp_target.3 | 1 - contrib/bsnmp/snmp_target/target_snmp.c | 1 - contrib/bsnmp/snmp_target/target_tree.def | 1 - contrib/bsnmp/snmp_usm/snmp_usm.3 | 1 - contrib/bsnmp/snmp_usm/usm_snmp.c | 1 - contrib/bsnmp/snmp_usm/usm_tree.def | 1 - contrib/bsnmp/snmp_vacm/snmp_vacm.3 | 1 - contrib/bsnmp/snmp_vacm/vacm_snmp.c | 1 - contrib/bsnmp/snmp_vacm/vacm_tree.def | 1 - 11 files changed, 11 deletions(-) diff --git a/contrib/bsnmp/lib/snmpcrypto.c b/contrib/bsnmp/lib/snmpcrypto.c index 92c7ede7b97f..f29fa89bf603 100644 --- a/contrib/bsnmp/lib/snmpcrypto.c +++ b/contrib/bsnmp/lib/snmpcrypto.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2010 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Shteryana Sotirova Shopova under * sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/lib/tc.def b/contrib/bsnmp/lib/tc.def index 1c408b844122..b43d467eba48 100644 --- a/contrib/bsnmp/lib/tc.def +++ b/contrib/bsnmp/lib/tc.def @@ -1,6 +1,5 @@ #- # Copyright (C) 2010 The FreeBSD Foundation -# All rights reserved. # # This software was developed by Shteryana Sotirova Shopova under # sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_target/snmp_target.3 b/contrib/bsnmp/snmp_target/snmp_target.3 index c9e01a39bc51..262023c185a6 100644 --- a/contrib/bsnmp/snmp_target/snmp_target.3 +++ b/contrib/bsnmp/snmp_target/snmp_target.3 @@ -1,6 +1,5 @@ .\"- .\" Copyright (C) 2010 The FreeBSD Foundation -.\" All rights reserved. .\" .\" This documentation was written by Shteryana Sotirova Shopova under .\" sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_target/target_snmp.c b/contrib/bsnmp/snmp_target/target_snmp.c index 7ea47db0491a..8d733d4b733e 100644 --- a/contrib/bsnmp/snmp_target/target_snmp.c +++ b/contrib/bsnmp/snmp_target/target_snmp.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2010,2018 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Shteryana Sotirova Shopova under * sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_target/target_tree.def b/contrib/bsnmp/snmp_target/target_tree.def index 14424b00bdc6..d7baedd189b2 100644 --- a/contrib/bsnmp/snmp_target/target_tree.def +++ b/contrib/bsnmp/snmp_target/target_tree.def @@ -1,6 +1,5 @@ #- # Copyright (C) 2010 The FreeBSD Foundation -# All rights reserved. # # This software was developed by Shteryana Sotirova Shopova under # sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_usm/snmp_usm.3 b/contrib/bsnmp/snmp_usm/snmp_usm.3 index 03959ede0cd2..4dd88b68e8ea 100644 --- a/contrib/bsnmp/snmp_usm/snmp_usm.3 +++ b/contrib/bsnmp/snmp_usm/snmp_usm.3 @@ -1,6 +1,5 @@ .\"- .\" Copyright (C) 2010 The FreeBSD Foundation -.\" All rights reserved. .\" .\" This documentation was written by Shteryana Sotirova Shopova under .\" sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_usm/usm_snmp.c b/contrib/bsnmp/snmp_usm/usm_snmp.c index 67a971644e7d..6304af021375 100644 --- a/contrib/bsnmp/snmp_usm/usm_snmp.c +++ b/contrib/bsnmp/snmp_usm/usm_snmp.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2010,2018 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Shteryana Sotirova Shopova under * sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_usm/usm_tree.def b/contrib/bsnmp/snmp_usm/usm_tree.def index 84b52956e167..2d6929f63c1a 100644 --- a/contrib/bsnmp/snmp_usm/usm_tree.def +++ b/contrib/bsnmp/snmp_usm/usm_tree.def @@ -1,6 +1,5 @@ #- # Copyright (C) 2010 The FreeBSD Foundation -# All rights reserved. # # This software was developed by Shteryana Sotirova Shopova under # sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_vacm/snmp_vacm.3 b/contrib/bsnmp/snmp_vacm/snmp_vacm.3 index e1213d90097d..b184e30d808e 100644 --- a/contrib/bsnmp/snmp_vacm/snmp_vacm.3 +++ b/contrib/bsnmp/snmp_vacm/snmp_vacm.3 @@ -1,6 +1,5 @@ .\"- .\" Copyright (C) 2010 The FreeBSD Foundation -.\" All rights reserved. .\" .\" This documentation was written by Shteryana Sotirova Shopova under .\" sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_vacm/vacm_snmp.c b/contrib/bsnmp/snmp_vacm/vacm_snmp.c index 192de2d63722..39371176e493 100644 --- a/contrib/bsnmp/snmp_vacm/vacm_snmp.c +++ b/contrib/bsnmp/snmp_vacm/vacm_snmp.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2010,2018 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Shteryana Sotirova Shopova under * sponsorship from the FreeBSD Foundation. diff --git a/contrib/bsnmp/snmp_vacm/vacm_tree.def b/contrib/bsnmp/snmp_vacm/vacm_tree.def index 5418a5a6cac1..a68cc8eed103 100644 --- a/contrib/bsnmp/snmp_vacm/vacm_tree.def +++ b/contrib/bsnmp/snmp_vacm/vacm_tree.def @@ -1,6 +1,5 @@ #- # Copyright (C) 2010 The FreeBSD Foundation -# All rights reserved. # # This software was developed by Shteryana Sotirova Shopova under # sponsorship from the FreeBSD Foundation. From nobody Fri Mar 3 14:02: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 4PSqRN5btFz3vxpK; Fri, 3 Mar 2023 14:02:24 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSqRN33C4z4Q3g; Fri, 3 Mar 2023 14:02:24 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Authentication-Results: mx1.freebsd.org; none Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 323E2GMZ066413; Fri, 3 Mar 2023 06:02:16 -0800 (PST) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 323E2FEN066412; Fri, 3 Mar 2023 06:02:15 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202303031402.323E2FEN066412@gndrsh.dnsmgr.net> Subject: Re: git: 1d577bedbae8 - main - unbound: Fix config file path In-Reply-To: <86r0u6rvrl.fsf@ltc.des.no> To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= Date: Fri, 3 Mar 2023 06:02:15 -0800 (PST) CC: "Rodney W. Grimes" , Cy Schubert , rgrimes@freebsd.org, Juraj Lutter , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4PSqRN33C4z4Q3g X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N [ Charset UTF-8 unsupported, converting... ] > "Rodney W. Grimes" writes: > > I've read a few of the linux how to's on running unbound chrooted and > > it leads me to belive that /etc/unbound/unbound.conf is the correct > > value of the path to the config file. > > > > I'll also spend some ENOTIME idle cycles looking closer at what has > > happened here. My gut says that if unbound is running chroot to > > /var/unbound then the config file should live in > > /var/unbound/etc/unbound/unbound.conf > > No. Unbound knows it's chrooted, knows _where_ it's chrooted, and > adjusts config paths accordingly, cf. e4c53d3bf00a. We disagree then, rather strongly, about this issue. It should not know it is chrooted, and it especially should NOT adjust paths based on that fact. That is a POLA, and it is also hard coding POLICY into an executable. Almost certainly any path mangling done because it is chroot is going to break if I chroot it to some place very different. > > Also note that the local-unbound configuration is not meant to be > user-serviceable. That, again IMHO, is a rather SIC stance to take for a caching DNS server, especially one as flexable as unbound. > > DES > -- > Dag-Erling Sm?rgrav - des@FreeBSD.org > > -- Rod Grimes rgrimes@freebsd.org From nobody Fri Mar 3 14:06: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 4PSqXB33CJz3vxfD; Fri, 3 Mar 2023 14:06: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 4PSqXB2XpCz3Bw4; Fri, 3 Mar 2023 14:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677852394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=44nVGUCy02/LArCntsHPhjMmNxv/jUfm8c5gT1XU7vc=; b=WSTZnKNh6a7xw+kjjIjIE0qFvy/cri4U8EKvsP2rZSmxW30y+SN0JhwEB1uucsrwi/iY07 c7nCHm6G/UzuXIkbvtqE/qIgZssC4KTNstnhxSpYTRak4gY6+yqX8T3aAK6GWVG4r1b3Ab 77L+H3cDgPycdnVHgINTPpmaFEWAUOpH2dEk6lRCUTL63A8pKrqljEhOOdrylNOzvQQLXW iTLwqAP1TYfZ4mLwwAo74IQixOuutSJ4mQBWW1+7dnXbDjFcks67iksegvgyt+BEK8gkzO 19aStnNn6J+2tORDYlCyWt90zgFnAQ2brtvSnaTnsMzW2SEDep3hVA+d+3mt3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677852394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=44nVGUCy02/LArCntsHPhjMmNxv/jUfm8c5gT1XU7vc=; b=OoMQ9pwpxeABgHb6lRYdN+m0bx45RSc8bFZZWBihcjgDXh83537/ntlu+WsEvCy5v3MVZh a0+b28isAyVPRVOgxR6ppBfXMUdVSXcNFNbUIf6SzRT8QYzM++/q0GR8m86V78vjpeIRrR kA3XjQ53sbEXd1yOC9WGvACUx2gfcQczOiI9ESgkRfZe6Vz4LJOX7W0lWqmoFX/UwXUUHI 8vNSDHNs/WOaancuI1Lz3zNsaxCBgnle8/zYUCn68ziOnTHOp1toZf4EkSm8LkmxGZoyP0 7dftgayopb2jVUF0+RRZs5/bgEpm9uVZi5qG/Q50hj32UN11/pGSPvkxfMYuwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677852394; a=rsa-sha256; cv=none; b=Jmi1//PDdllv9VItl+9dfxxjfS05Hc8+FGEZ15uTk5ZCNybDeSMPbfPuY75pnFybp8m5ba QhSDrqnRyoR5lTVjBRhuICdLKWMOSOnyzpwGErzezawwzw7Hz66+u+Ab80dFNx3OOTWqqN J982rexqFKavMSOXA5qK9zQXVtoq0+QZQyttyF9diyioTE2i8vz99KYOAQHl5Z1FWDbQ2r Ipnsxf5/CyvGvJqRMeRD/o4mibAcIOGHhVZySsCSRqluTdbccBXnflk7I14WX50Wi7LCe2 NcP8xy8KSxKir5GPAkK4YTLHTxlKLfmZNXr5OclqhvVBBdjaF0hgEiLwxnLoKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSqXB1P17z11KR; Fri, 3 Mar 2023 14:06: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 323E6YgM087232; Fri, 3 Mar 2023 14:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323E6YxS087231; Fri, 3 Mar 2023 14:06:34 GMT (envelope-from git) Date: Fri, 3 Mar 2023 14:06:34 GMT Message-Id: <202303031406.323E6YxS087231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 61507ae30b90 - main - netlink: add u8/u64 attribute fetcher accessors to snl(3). 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61507ae30b9096eaa0d44fec71211f3843d546eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=61507ae30b9096eaa0d44fec71211f3843d546eb commit 61507ae30b9096eaa0d44fec71211f3843d546eb Author: Alexander V. Chernikov AuthorDate: 2023-03-03 14:05:40 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-03 14:05:40 +0000 netlink: add u8/u64 attribute fetcher accessors to snl(3). MFC after: 2 weeks --- share/man/man3/snl.3 | 8 ++++++++ sys/netlink/netlink_snl.h | 25 ++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/share/man/man3/snl.3 b/share/man/man3/snl.3 index 9fdeeaf56178..8344cf7f8204 100644 --- a/share/man/man3/snl.3 +++ b/share/man/man3/snl.3 @@ -75,10 +75,14 @@ .Ft "bool" .Fn snl_attr_get_flag "struct snl_state *ss" "struct nlattr *nla" "void *target" .Ft "bool" +.Fn snl_attr_get_uint8 "struct snl_state *ss" "struct nlattr *nla" "void *target" +.Ft "bool" .Fn snl_attr_get_uint16 "struct snl_state *ss" "struct nlattr *nla" "void *target" .Ft "bool" .Fn snl_attr_get_uint32 "struct snl_state *ss" "struct nlattr *nla" "void *target" .Ft "bool" +.Fn snl_attr_get_uint64 "struct snl_state *ss" "struct nlattr *nla" "void *target" +.Ft "bool" .Fn snl_attr_get_string "struct snl_state *ss" "struct nlattr *nla" "void *target" .Ft "bool" .Fn snl_attr_get_stringn "struct snl_state *ss" "struct nlattr *nla" "void *target" @@ -181,10 +185,14 @@ A number of predefined getters for the common data types exist. .Fn snl_attr_get_flag converts a flag-type attribute to an uint8_t value of 1 or 0, depending on the attribute presence. +.Fn snl_attr_get_uint8 +stores a uint8_t type attribute into the uint8_t target field. .Fn snl_attr_get_uint16 stores a uint16_t type attribute into the uint16_t target field. .Fn snl_attr_get_uint32 stores a uint32_t type attribute into the uint32_t target field. +.Fn snl_attr_get_uint64 +stores a uint64_t type attribute into the uint64_t target field. .Fn snl_attr_get_ip and .Fn snl_attr_get_ipvia diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 6e2c4b89a7c4..d88808ea6d3b 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -355,6 +355,17 @@ snl_attr_get_flag(struct snl_state *ss __unused, struct nlattr *nla, void *targe return (false); } +static inline bool +snl_attr_get_uint8(struct snl_state *ss __unused, struct nlattr *nla, + const void *arg __unused, void *target) +{ + if (NLA_DATA_LEN(nla) == sizeof(uint8_t)) { + *((uint8_t *)target) = *((const uint8_t *)NLA_DATA_CONST(nla)); + return (true); + } + return (false); +} + static inline bool snl_attr_get_uint16(struct snl_state *ss __unused, struct nlattr *nla, const void *arg __unused, void *target) @@ -377,6 +388,17 @@ snl_attr_get_uint32(struct snl_state *ss __unused, struct nlattr *nla, return (false); } +static inline bool +snl_attr_get_uint64(struct snl_state *ss __unused, struct nlattr *nla, + const void *arg __unused, void *target) +{ + if (NLA_DATA_LEN(nla) == sizeof(uint64_t)) { + memcpy(target, NLA_DATA_CONST(nla), sizeof(uint64_t)); + return (true); + } + return (false); +} + static inline bool snl_attr_get_string(struct snl_state *ss __unused, struct nlattr *nla, const void *arg __unused, void *target) @@ -416,7 +438,8 @@ snl_attr_get_nested(struct snl_state *ss, struct nlattr *nla, const void *arg, v } static inline bool -snl_attr_get_nla(struct snl_state *ss __unused, struct nlattr *nla, void *target) +snl_attr_get_nla(struct snl_state *ss __unused, struct nlattr *nla, + const void *arg __unused, void *target) { *((struct nlattr **)target) = nla; return (true); From nobody Fri Mar 3 15:40: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 4PSscc05KJz3w3B2; Fri, 3 Mar 2023 15:40:32 +0000 (UTC) (envelope-from tijl@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 4PSscb6HRBz3Lkg; Fri, 3 Mar 2023 15:40:31 +0000 (UTC) (envelope-from tijl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677858031; 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=TmMmKdnIelMqdgIVf9DNCYtQWboDUjEZZAeeHOwQUUk=; b=KU6aftVFBtyUqcoukCFJ2lcQhqHVY7XVq7JPusRi9ZYTr10bQQOV7Cy1MUUjwd7yks0PlT VorFhe8o5/sAvzvxUy82hgLQnAVxZ46qCso4jkihiklqNpS3NTmvWqB8iMjhGJILimxq9+ sUwbjfhTSJB3RKDMF25Db340buVMdQ+W9nM7WIMFZi/RQ30L3DKf8aKSo9DywrkZXFf6Wm wrFXkZSrMWpV0oqtvylUwb4HQJI0VngDiRutrqofFbmeHxg5mVPlJ5WqWkYb71rRErmdQs Pk11crLOIjR6uDhK8sGIgi0rHoVdghFHpRfmeThRHqEioOOwq4bjRJTmpAX+uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677858031; 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=TmMmKdnIelMqdgIVf9DNCYtQWboDUjEZZAeeHOwQUUk=; b=ICuJmFh3pC9MIlztMEW3YpDdDZp9SP25qpmBmrYbDYtQeV21c297suAOAfklf8rdiGWH+j eg9rgKymY9Cy+gpNVLeHVwVwpOBHdxg5DqN5SvoyZT3DAf6kB0OSzGYugIkLFz77dYjln7 FaolyyObx05+rxP7AihgQbktuCwXlKMEwLvPZnQOHrqhz67B8A99eNQEPXMo+G55LSnI0s me0Dr3x+6If5J5YlGOMRupaGXX5kgsRPYR4K0niRn2X8bT6CvqtlJNdK77/QE0RFJOtRSD pRugU8cUn1pbhbg6LD4YJMTUFJBfNCyZvddn7GtxZZzL4RYnZecC+eBwdJYzlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677858031; a=rsa-sha256; cv=none; b=uQ2qJkYjx+jGkGGzAd4cZ1nZaLeUq0NT1eWPe85LwXfVc1mcu3+0er1adrejNSZ+9gv9Qz 6ipDzk2yMt16CpbXxuQfJRQ3lXREcXYqtA1HURsXtkTq+HuqWHEwl96wH6W4cMlGDgN7II +iPP9Nppe6UnF/lXBgaamKGuxTaxsNDtsxC6zfjq+k8VZhrCiJyEbppanlfjChd69EU0Lx 8DwmSmcvW9bQJ9tRBAxdpF6yH8Clz4WopGbFsD0uGQU/2JKEhNEil1ZfvzdYbLZVuoPt9g hHG2ezycVARKABN0LWGokSaDttgGLMIRlvGKEC8SZUVv2w7dDRDfYLc9vjE5+Q== Received: from hal.tijl.coosemans.org (unknown [IPv6:2a02:a03f:894b:4700:5c15:2cf5:8c28:ae71]) (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 did not present a certificate) (Authenticated sender: tijl) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PSscb0YX5z10Tx; Fri, 3 Mar 2023 15:40:30 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Date: Fri, 3 Mar 2023 16:40:28 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Baptiste Daroussin , re@FreeBSD.org Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: a28ccb32bf56 - main - machine-id: generate a compact version of the uuid Message-ID: <20230303164028.35766f35@hal.tijl.coosemans.org> In-Reply-To: <202303011818.321IIXIT067595@gitrepo.freebsd.org> References: <202303011818.321IIXIT067595@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-ThisMailContainsUnwantedMimeParts: N On Wed, 1 Mar 2023 18:18:33 GMT Baptiste Daroussin wrote: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a28ccb32bf5678fc401f1602865ee9b37ca4c990 > > commit a28ccb32bf5678fc401f1602865ee9b37ca4c990 > Author: Baptiste Daroussin > AuthorDate: 2023-02-28 10:31:06 +0000 > Commit: Baptiste Daroussin > CommitDate: 2023-03-01 18:16:25 +0000 > > machine-id: generate a compact version of the uuid > > dbus and other actually expect an uuid without hyphens > > Reported by: tijl > MFC After: 3 days > --- > libexec/rc/rc.d/machine_id | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libexec/rc/rc.d/machine_id b/libexec/rc/rc.d/machine_id > index 7cfd7b2d92f8..8bf3e41d0603 100644 > --- a/libexec/rc/rc.d/machine_id > +++ b/libexec/rc/rc.d/machine_id > @@ -23,7 +23,7 @@ machine_id_start() > if [ ! -f ${machine_id_file} ] ; then > startmsg -n "Creating ${machine_id_file} " > t=$(mktemp -t machine-id) > - /bin/uuidgen -r -o $t > + /bin/uuidgen -r -c -o $t > install -C -o root -g wheel -m ${machine_id_perms} "$t" "${machine_id_file}" > rm -f "$t" > startmsg 'done.' I really think this file should be defined to contain the same UUID as /etc/hostid such that there's one and only one UUID per machine. Having two different IDs needlessly complicates things if they end up in logs etc. It also looks like on Linux virtual machines this file contains the SMBIOS UUID just like our /etc/hostid. If /etc/machine-id is supposed to be a portable way to obtain that UUID it should be the same as /etc/hostid. Please have another look at https://reviews.freebsd.org/D38811. This file is supposed to remain constant across updates. If we get this wrong in 13.2, applications may have to deal with the complications for a very long time. From nobody Fri Mar 3 16:02: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 4PSt5r4cpgz3w4Dk; Fri, 3 Mar 2023 16:02: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 4PSt5r4C1tz3NYx; Fri, 3 Mar 2023 16:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677859344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVkMGgYz9Ge/toov4E6ibmcVPAdLO9WIdSU2MFVsR8A=; b=vuAqH+xM9mBNp89fJFNvrogJCWT1jIunLqie2UZr9PyZ2mKKxaBUgEMJSyexWrGI3by5Fg pVtIrcqVM0xwieNVRKcGiJ+CBnGAI3lOPxf1DIsAkx57Q5iA0DQj5jtywKHGMZI8gfdSP0 sOlK1Zf8pBy7fHM57EAzhJxaiINHlT4IIdL9M5MqNL4wU6PA3wLZ9vImlZ8jLTOzES+Q2y aMsNrJ9TJ+bTd68W9fXi2wmoAzOqIO6lEkDWYxFmYEmW2ireBzEKLw+Qe/Eb2+nglHsfbZ 32E8/S5H5bGyJ/v/2STIJn0dK40UTerHO/Nq8+2BUctasOCCq8VM2hSuTtXLzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677859344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVkMGgYz9Ge/toov4E6ibmcVPAdLO9WIdSU2MFVsR8A=; b=RsYcdtwNZI0gXbfEbH2gzfSHfHAsU1B2TT6JVKb2gpIpTtrvwLi9OjoSTitVDXJX5Ln74m KTrRbxvkHi4Eoo7Hz9+d3byQ5VgzYj+CTkj+WvZ6MQHZYt+nyASSP7tg9lZp2Zd1iY9xCM L1vCaLR343OhfUVNMR8QcLR4q9FIAtSSFl0vfH1MwFNqJf5m7voGAgUUeOgHvfqOcppOLU 3X8+R6b5eePl9jbosWo4fjrO9OudeOxwAOIo80HblxlW/RribhPXw6IDJEMBZ4Yr9MvfzX 9W5nEmnu1ynmjzRQY78d4Jsr9ftljI7eG9Ax0Gl64HyCRqzakDADvd7yrxgdzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677859344; a=rsa-sha256; cv=none; b=cFh9ys91QuPvNnitygU+slC74stHngRyPzTJpWUcGTJNUrFS0Xw2/3oohLPrjiNAHYyUkz QkKikqp0GKtIgzcieE3aro/TvnVsIuV75MM8KFLINbTlk9kSgN6NZXC53/seK+1VAu4SjV 0dB2UQvnBPEeuTsfXpa9l74LVi+eoQds+w8oOsMNJ9uGdPUm05aN8Y+j9F7da0v0sQG9By vk9CH4wqNyuEToRsG5S4aFWhvvKlmp/f5j9RdtQZVkPoOePLvwx7IpOtCtASDzBD9PMHcQ HMdYamYGC9lcOBki0TGHXNIJNCzr208svIcQUuILtqXPZCuXed9/juWIEoeW3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSt5r3HDwz14Ck; Fri, 3 Mar 2023 16:02: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 323G2Ofh083946; Fri, 3 Mar 2023 16:02:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323G2Oqj083945; Fri, 3 Mar 2023 16:02:24 GMT (envelope-from git) Date: Fri, 3 Mar 2023 16:02:24 GMT Message-Id: <202303031602.323G2Oqj083945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: ce9f95bd835e - main - netlink: fix vlan interface creation 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce9f95bd835ec7d3ac6def5a910282509b1413f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=ce9f95bd835ec7d3ac6def5a910282509b1413f0 commit ce9f95bd835ec7d3ac6def5a910282509b1413f0 Author: Alexander V. Chernikov AuthorDate: 2023-03-03 16:01:34 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-03-03 16:02:05 +0000 netlink: fix vlan interface creation MFC after: 2 weeks --- sys/netlink/route/iface_drivers.c | 34 +++++++++++++++++++--------------- tests/sys/netlink/test_rtnl_iface.py | 1 - 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 7cfaa5a6614b..be28a0f3b676 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -144,20 +144,14 @@ store_cookie(struct nl_pstate *npt, struct ifnet *ifp) nlmsg_report_cookie(npt, nla_cookie); } -/* - * Generic creation interface handler. - * Responsible for creating interfaces w/o parameters and setting - * misc attributes such as state, mtu or description. - */ static int -create_generic(struct nl_parsed_link *lattrs, const struct nlattr_bmask *bm, - struct nlpcb *nlp, struct nl_pstate *npt) +create_generic_ifd(struct nl_parsed_link *lattrs, const struct nlattr_bmask *bm, + struct ifc_data *ifd, struct nlpcb *nlp, struct nl_pstate *npt) { int error = 0; - struct ifc_data ifd = {}; struct ifnet *ifp = NULL; - error = ifc_create_ifp(lattrs->ifla_ifname, &ifd, &ifp); + error = ifc_create_ifp(lattrs->ifla_ifname, ifd, &ifp); NLP_LOG(LOG_DEBUG2, nlp, "clone for %s returned %d", lattrs->ifla_ifname, error); @@ -177,6 +171,19 @@ create_generic(struct nl_parsed_link *lattrs, const struct nlattr_bmask *bm, return (error); } +/* + * Generic creation interface handler. + * Responsible for creating interfaces w/o parameters and setting + * misc attributes such as state, mtu or description. + */ +static int +create_generic(struct nl_parsed_link *lattrs, const struct nlattr_bmask *bm, + struct nlpcb *nlp, struct nl_pstate *npt) +{ + struct ifc_data ifd = {}; + + return (create_generic_ifd(lattrs, bm, &ifd, nlp, npt)); +} struct nl_cloner generic_cloner = { .name = "_default_", @@ -258,17 +265,14 @@ create_vlan(struct nl_parsed_link *lattrs, const struct nlattr_bmask *bm, return (ENOENT); } - /* Waiting till if_clone changes lands */ -/* struct vlanreq params = { .vlr_tag = attrs.vlan_id, .vlr_proto = attrs.vlan_proto, }; -*/ - int ifname_len = strlen(lattrs->ifla_ifname) + 1; - error = if_clone_create(lattrs->ifla_ifname, ifname_len, (char *)NULL); + strlcpy(params.vlr_parent, if_name(ifp), sizeof(params.vlr_parent)); + struct ifc_data ifd = { .flags = IFC_F_SYSSPACE, .params = ¶ms }; - NLP_LOG(LOG_DEBUG2, nlp, "clone for %s returned %d", lattrs->ifla_ifname, error); + error = create_generic_ifd(lattrs, bm, &ifd, nlp, npt); if_rele(ifp); return (error); diff --git a/tests/sys/netlink/test_rtnl_iface.py b/tests/sys/netlink/test_rtnl_iface.py index 35015ea2ec6e..da3db93b05c6 100644 --- a/tests/sys/netlink/test_rtnl_iface.py +++ b/tests/sys/netlink/test_rtnl_iface.py @@ -313,7 +313,6 @@ class TestRtNlIface(NetlinkTestTemplate, SingleVnetTestTemplate): # * {{nla_len=8, nla_type=IFLA_INFO_KIND}, "vlan"...}, # * {{nla_len=12, nla_type=IFLA_INFO_DATA}, "\x06\x00\x01\x00\x16\x00\x00\x00"} # */ - @pytest.mark.skip(reason="vlan support needs more work") @pytest.mark.require_user("root") def test_create_vlan_plain(self): """Creates 802.1Q VLAN interface in vlanXX and ifX fashion""" From nobody Fri Mar 3 16:12: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 4PStKx1WFpz3w50b; Fri, 3 Mar 2023 16:12:53 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PStKx0tbMz3PQt; Fri, 3 Mar 2023 16:12:53 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.16.1/8.16.1) with ESMTP id 323GCps4000625; Fri, 3 Mar 2023 10:12:51 -0600 (CST) (envelope-from mike@karels.net) Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id 38IuKoMcAmRvAgAAs/W3XQ (envelope-from ); Fri, 03 Mar 2023 10:12:51 -0600 From: Mike Karels To: =?utf-8?q?T=C4=B3l_Coosemans?= Cc: Baptiste Daroussin , re@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: a28ccb32bf56 - main - machine-id: generate a compact version of the uuid Date: Fri, 03 Mar 2023 10:12:50 -0600 X-Mailer: MailMate (1.14r5937) Message-ID: <98A14373-D09C-437D-AAB8-0A140FB46C5E@karels.net> In-Reply-To: <20230303164028.35766f35@hal.tijl.coosemans.org> References: <202303011818.321IIXIT067595@gitrepo.freebsd.org> <20230303164028.35766f35@hal.tijl.coosemans.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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PStKx0tbMz3PQt X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 3 Mar 2023, at 9:40, T=C4=B3l Coosemans wrote: > On Wed, 1 Mar 2023 18:18:33 GMT Baptiste Daroussin w= rote: >> The branch main has been updated by bapt: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3Da28ccb32bf5678fc401f160= 2865ee9b37ca4c990 >> >> commit a28ccb32bf5678fc401f1602865ee9b37ca4c990 >> Author: Baptiste Daroussin >> AuthorDate: 2023-02-28 10:31:06 +0000 >> Commit: Baptiste Daroussin >> CommitDate: 2023-03-01 18:16:25 +0000 >> >> machine-id: generate a compact version of the uuid >> >> dbus and other actually expect an uuid without hyphens >> >> Reported by: tijl >> MFC After: 3 days >> --- >> libexec/rc/rc.d/machine_id | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libexec/rc/rc.d/machine_id b/libexec/rc/rc.d/machine_id >> index 7cfd7b2d92f8..8bf3e41d0603 100644 >> --- a/libexec/rc/rc.d/machine_id >> +++ b/libexec/rc/rc.d/machine_id >> @@ -23,7 +23,7 @@ machine_id_start() >> if [ ! -f ${machine_id_file} ] ; then >> startmsg -n "Creating ${machine_id_file} " >> t=3D$(mktemp -t machine-id) >> - /bin/uuidgen -r -o $t >> + /bin/uuidgen -r -c -o $t >> install -C -o root -g wheel -m ${machine_id_perms} "$t" "${machine_= id_file}" >> rm -f "$t" >> startmsg 'done.' > > I really think this file should be defined to contain the same UUID as > /etc/hostid such that there's one and only one UUID per machine. Havin= g > two different IDs needlessly complicates things if they end up in logs > etc. > > It also looks like on Linux virtual machines this file contains the > SMBIOS UUID just like our /etc/hostid. If /etc/machine-id is supposed > to be a portable way to obtain that UUID it should be the same as > /etc/hostid. I agree. I had the same reaction when the machine-id was added, but thought the requirements were different (in particular, the UUID version)= =2E If at all possible, the two should be the same except for hyphens. > Please have another look at https://reviews.freebsd.org/D38811. This > file is supposed to remain constant across updates. If we get this > wrong in 13.2, applications may have to deal with the complications for= > a very long time. This should be resolved for 13.2 if at all possible. Mike From nobody Fri Mar 3 16:13: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 4PStM25hZjz3w4jD; Fri, 3 Mar 2023 16:13: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 4PStM24YQcz3QMY; Fri, 3 Mar 2023 16:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sza4v0pzIqcoVo5KsAwQJaROyJVVH1DJScDhLItvuGA=; b=N6DsNGdyJK0SA6f1Ffn7QfATOBilBwePGASrBbS7cDXQVqc2grK6Nymwsi9R1xhJ8OiZnB UwzoXh6TwzCZs+ZSZ5IplKDX0lIT4fVTTGRABsFXBm+FRBjLj/J55d8xwp+oHEii7ITZJ+ VWQKlrm6mDhGgQVoDwqq6gWWbWONnStYmy4HgAdBiCCGY60FEuKDPILM2w2wJH989M2/de u9e+7fnHapjW/tNTGWSkr0fgPdaDavYyNrB/tF0tYOzZBnpCGD4HaqTZpKBGpB+ppnV3Ks gk/wDJ/KDbnpBac20ZV7u2H0JJjoZfKqC2C4lPy5yOPt8Upbz3dgXa+ObUrW3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sza4v0pzIqcoVo5KsAwQJaROyJVVH1DJScDhLItvuGA=; b=dI8dv7E93wqbZOY/6jIzV0XoMnK8NgjY/nX7IFBNzBqCJmxAZ+VhqxuX9co5wLq37Q6vMP FYFMaIQyOlbGvYK5B662Ir7XLPpiE/Y7ddukqiyeaI6Zef7CEfzrm83r01hI6CzWDGPe8j MroRCy1c9LjAyEGrrOX92kCmxtk4p4gAsXVTaTRbFwoldqScjOFMnqTMM1Q8G+p/MgUP8a Ot+JYQmVcU9USuOsjh1BNLyTb81d/cEY/+r1LZbDfk11uFTtM4gvdj3e5Gl3MwQ+k9kI9K rVJ7HACIxsBXfHTM83NF0JEewvnTnD+/8DH+Aea5anWWyYdzeDd/b3NERJLgMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677860030; a=rsa-sha256; cv=none; b=aViN1SPVV0BbThoegUQXXB/h7ulmFHrJvtc3TKyEM7Vi75T3vq8I7NX6yNrL59ETJZZ15O 5uUbllr9+L5+HrLL6rW5vV5+DbgUj555QZZjikOyWTI5lSoaJC/scyvEwCMy+8eOosF1Ab mnKUXsCCXbzSCGiQGUXxiXOqYJMxx50yIUxZ5w1zpp6FWhk1VBCnNBqWlGQABWTLMNNzji RHLiRVu9qAdsskJuUQn0j2tvBuJLoPo8zN44O4bRCAIZw5hYyTdpy6jLg39NFrBKUQDb3g R8H9k8qtW+F4knRgeQLhxg2a9yyFWhF7n2WuXdDlsewG+vj2IK7Z8qkgxyfmyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PStM23XS4z14Dk; Fri, 3 Mar 2023 16:13: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 323GDoIC000414; Fri, 3 Mar 2023 16:13:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323GDoQA000413; Fri, 3 Mar 2023 16:13:50 GMT (envelope-from git) Date: Fri, 3 Mar 2023 16:13:50 GMT Message-Id: <202303031613.323GDoQA000413@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: 3f5d875a2731 - main - bhyvectl: Address compiler warnings and bump WARNS 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: 3f5d875a27318a909f23a2b7463c4b2d963085df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3f5d875a27318a909f23a2b7463c4b2d963085df commit 3f5d875a27318a909f23a2b7463c4b2d963085df Author: Mark Johnston AuthorDate: 2023-03-03 14:32:48 +0000 Commit: Mark Johnston CommitDate: 2023-03-03 16:13:22 +0000 bhyvectl: Address compiler warnings and bump WARNS Avoid unaligned accesses in cpu_vendor_intel() and address a few other nits. No functional change intended. Reviewed by: corvink, rew, jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38839 --- usr.sbin/bhyvectl/Makefile | 2 -- usr.sbin/bhyvectl/bhyvectl.c | 30 ++++++++++++------------------ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/usr.sbin/bhyvectl/Makefile b/usr.sbin/bhyvectl/Makefile index c004d603c8db..5b1c04e8ac88 100644 --- a/usr.sbin/bhyvectl/Makefile +++ b/usr.sbin/bhyvectl/Makefile @@ -12,8 +12,6 @@ MAN= bhyvectl.8 LIBADD= vmmapi util -WARNS?= 3 - CFLAGS+= -I${SRCTOP}/sys/amd64/vmm .if ${MK_BHYVE_SNAPSHOT} != "no" diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 14ab6c7ad33e..cab1e6d72c56 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -294,7 +294,7 @@ static int set_desc_ldtr, get_desc_ldtr; static int set_cs, set_ds, set_es, set_fs, set_gs, set_ss, set_tr, set_ldtr; static int get_cs, get_ds, get_es, get_fs, get_gs, get_ss, get_tr, get_ldtr; static int set_x2apic_state, get_x2apic_state; -enum x2apic_state x2apic_state; +static enum x2apic_state x2apic_state; static int unassign_pptdev, bus, slot, func; static int run; static int get_cpu_topology; @@ -316,7 +316,6 @@ static int get_pinbased_ctls, get_procbased_ctls, get_procbased_ctls2; static int get_eptp, get_io_bitmap, get_tsc_offset; static int get_vmcs_entry_interruption_info; static int get_vmcs_interruptibility; -uint32_t vmcs_entry_interruption_info; static int get_vmcs_gpa, get_vmcs_gla; static int get_exception_bitmap; static int get_cr0_mask, get_cr0_shadow; @@ -497,8 +496,8 @@ dump_intel_msr_pm(const char *bitmap, int vcpu) static int dump_msr_bitmap(int vcpu, uint64_t addr, bool cpu_intel) { + char *bitmap; int error, fd, map_size; - const char *bitmap; error = -1; bitmap = MAP_FAILED; @@ -648,25 +647,20 @@ print_intinfo(const char *banner, uint64_t info) static bool cpu_vendor_intel(void) { - u_int regs[4]; - char cpu_vendor[13]; + u_int regs[4], v[3]; do_cpuid(0, regs); - ((u_int *)&cpu_vendor)[0] = regs[1]; - ((u_int *)&cpu_vendor)[1] = regs[3]; - ((u_int *)&cpu_vendor)[2] = regs[2]; - cpu_vendor[12] = '\0'; + v[0] = regs[1]; + v[1] = regs[3]; + v[2] = regs[2]; - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { - return (false); - } else if (strcmp(cpu_vendor, "HygonGenuine") == 0) { - return (false); - } else if (strcmp(cpu_vendor, "GenuineIntel") == 0) { + if (memcmp(v, "GenuineIntel", sizeof(v)) == 0) return (true); - } else { - fprintf(stderr, "Unknown cpu vendor \"%s\"\n", cpu_vendor); - exit(1); - } + if (memcmp(v, "AuthenticAMD", sizeof(v)) == 0 || + memcmp(v, "HygonGenuine", sizeof(v)) == 0) + return (false); + fprintf(stderr, "Unknown cpu vendor \"%s\"\n", (const char *)v); + exit(1); } static int From nobody Fri Mar 3 16:13: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 4PStM36JKLz3w4jG; Fri, 3 Mar 2023 16:13: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 4PStM35hqCz3Qm3; Fri, 3 Mar 2023 16:13:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5X+oEGwhdLOnp3WhkUnXE/EQV9MO+IhbZeOU2wUecWw=; b=Zq36qVmpCc8YYGLIroa3Yjqlq2QIxm2OtxEct3NREcDuT3SHHFwQXft0UYM3Vg1qdprNSI I+9sOtl4EIOFw7+/E0vFn3//BUr9g0/Whq7g3IybzF4fKNz/ljsKdo0ZamLhW41AKPe3Aa 40/GBSA1ttondbplDGNAbufVrL8bWwFcGCrYjkFGH3x1y8KXByZNrmf/oYVB9+nUzxvTrm xJYUEAnNp569Nd6iP47uLZU6KPxBeAk6zVnHWLpH0Y9DcJG9oNKXgekoOwEHc6sLN1JTE6 zLI3ltHTlDN6aq4eaO+UChH4APkLZ/CN/U1SSgHia6iXlMNaBi6jhCxjhqQAZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5X+oEGwhdLOnp3WhkUnXE/EQV9MO+IhbZeOU2wUecWw=; b=Wpeh12d65yNtv2Inm2lHCGtlTlgFAwGPgyapXHj7/wDO7bSjlAg0x3PT6TPrM0//o4aLi6 9I7JbZwrH4kJS0//fw4KCk+oukSGSvXaXlZ4iW0Bu6qYuR71OSXrpdgtje6Va9egPIaA3+ v7gBPocvzteCnUh+H0PSXP9q9tSOEIXCjIvK3IROiQUm4/iCvXm7Rp+SfXwr2Eg8mNPwqZ D8u0b0KFgvBOfyFvix7QwXg4qw8kGObKBe7DD/0jRt/StYZXxcf3SXa7YUcvfPlg8zuWda 09UE2eiL46q6+9E4mnmm2W4FSE2wqBNVB5wCloQBSTEatg4kdISLiN+GFrwqCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677860031; a=rsa-sha256; cv=none; b=k2/xipCy2HhXe3jReDvcwDJ1vT9SE0jejzPPLoyfuxbhMBJXMsY1Rr1rXzfR5v22IpFpVl dvchGpoZLmbW5N5xXiwpFx9SzOj2HFPL2xLY1m1DExKWPENmbEaVZWDVmId+JfLEmeASqq 7muJUzQV+MIH0eKdQE4OSvA6hcYfwNOCvucTypBp8PWAbnv9478RyE9KTY5KP8Z8WLpOeK X6QNm8sVhjfrnYMuTVyPpHfu5IDGA9u6gh1CjBnE1mJGM/skMo1HxTbBMgDxT3GzjcSqUU uGhkzRbITyXCNs+NbWwLgFyA73F6ecxB46Jj5LtyuK5gSofz/ewjzjliV/Q7qQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PStM34dHfz149T; Fri, 3 Mar 2023 16:13: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 323GDpR4000435; Fri, 3 Mar 2023 16:13:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323GDpge000434; Fri, 3 Mar 2023 16:13:51 GMT (envelope-from git) Date: Fri, 3 Mar 2023 16:13:51 GMT Message-Id: <202303031613.323GDpge000434@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: ad43dd69cec7 - main - bhyveload: Address compiler warnings and bump WARNS 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: ad43dd69cec7b568846b45ff990da6dc86e58467 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ad43dd69cec7b568846b45ff990da6dc86e58467 commit ad43dd69cec7b568846b45ff990da6dc86e58467 Author: Mark Johnston AuthorDate: 2023-03-03 14:52:17 +0000 Commit: Mark Johnston CommitDate: 2023-03-03 16:13:22 +0000 bhyveload: Address compiler warnings and bump WARNS Mostly sprinkle __unused. Also duplicate strings passed to addenv() so that constant string literals can be passed. No functional change intended. Reviewed by: corvink, rew, jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38840 --- usr.sbin/bhyveload/Makefile | 2 -- usr.sbin/bhyveload/bhyveload.c | 68 ++++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/usr.sbin/bhyveload/Makefile b/usr.sbin/bhyveload/Makefile index 48bed64c26e4..59672cca47b5 100644 --- a/usr.sbin/bhyveload/Makefile +++ b/usr.sbin/bhyveload/Makefile @@ -7,8 +7,6 @@ PACKAGE= bhyve LIBADD= vmmapi -WARNS?= 3 - CFLAGS+=-I${SRCTOP}/stand/userboot .include diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 1a24b5f0044a..09a9653ece34 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -118,7 +118,7 @@ static void cb_exit(void *arg, int v); */ static void -cb_putc(void *arg, int ch) +cb_putc(void *arg __unused, int ch) { char c = ch; @@ -126,7 +126,7 @@ cb_putc(void *arg, int ch) } static int -cb_getc(void *arg) +cb_getc(void *arg __unused) { char c; @@ -136,7 +136,7 @@ cb_getc(void *arg) } static int -cb_poll(void *arg) +cb_poll(void *arg __unused) { int n; @@ -160,7 +160,7 @@ struct cb_file { }; static int -cb_open(void *arg, const char *filename, void **hp) +cb_open(void *arg __unused, const char *filename, void **hp) { struct cb_file *cf; char path[PATH_MAX]; @@ -202,7 +202,7 @@ out: } static int -cb_close(void *arg, void *h) +cb_close(void *arg __unused, void *h) { struct cb_file *cf = h; @@ -216,7 +216,7 @@ cb_close(void *arg, void *h) } static int -cb_isdir(void *arg, void *h) +cb_isdir(void *arg __unused, void *h) { struct cb_file *cf = h; @@ -224,7 +224,7 @@ cb_isdir(void *arg, void *h) } static int -cb_read(void *arg, void *h, void *buf, size_t size, size_t *resid) +cb_read(void *arg __unused, void *h, void *buf, size_t size, size_t *resid) { struct cb_file *cf = h; ssize_t sz; @@ -239,8 +239,8 @@ cb_read(void *arg, void *h, void *buf, size_t size, size_t *resid) } static int -cb_readdir(void *arg, void *h, uint32_t *fileno_return, uint8_t *type_return, - size_t *namelen_return, char *name) +cb_readdir(void *arg __unused, void *h, uint32_t *fileno_return, + uint8_t *type_return, size_t *namelen_return, char *name) { struct cb_file *cf = h; struct dirent *dp; @@ -266,7 +266,7 @@ cb_readdir(void *arg, void *h, uint32_t *fileno_return, uint8_t *type_return, } static int -cb_seek(void *arg, void *h, uint64_t offset, int whence) +cb_seek(void *arg __unused, void *h, uint64_t offset, int whence) { struct cb_file *cf = h; @@ -278,7 +278,7 @@ cb_seek(void *arg, void *h, uint64_t offset, int whence) } static int -cb_stat(void *arg, void *h, struct stat *sbp) +cb_stat(void *arg __unused, void *h, struct stat *sbp) { struct cb_file *cf = h; @@ -299,7 +299,7 @@ cb_stat(void *arg, void *h, struct stat *sbp) */ static int -cb_diskread(void *arg, int unit, uint64_t from, void *to, size_t size, +cb_diskread(void *arg __unused, int unit, uint64_t from, void *to, size_t size, size_t *resid) { ssize_t n; @@ -314,8 +314,8 @@ cb_diskread(void *arg, int unit, uint64_t from, void *to, size_t size, } static int -cb_diskwrite(void *arg, int unit, uint64_t offset, void *src, size_t size, - size_t *resid) +cb_diskwrite(void *arg __unused, int unit, uint64_t offset, void *src, + size_t size, size_t *resid) { ssize_t n; @@ -329,7 +329,7 @@ cb_diskwrite(void *arg, int unit, uint64_t offset, void *src, size_t size, } static int -cb_diskioctl(void *arg, int unit, u_long cmd, void *data) +cb_diskioctl(void *arg __unused, int unit, u_long cmd, void *data) { struct stat sb; @@ -359,7 +359,7 @@ cb_diskioctl(void *arg, int unit, u_long cmd, void *data) * Guest virtual machine i/o callbacks */ static int -cb_copyin(void *arg, const void *from, uint64_t to, size_t size) +cb_copyin(void *arg __unused, const void *from, uint64_t to, size_t size) { char *ptr; @@ -374,7 +374,7 @@ cb_copyin(void *arg, const void *from, uint64_t to, size_t size) } static int -cb_copyout(void *arg, uint64_t from, void *to, size_t size) +cb_copyout(void *arg __unused, uint64_t from, void *to, size_t size) { char *ptr; @@ -389,7 +389,7 @@ cb_copyout(void *arg, uint64_t from, void *to, size_t size) } static void -cb_setreg(void *arg, int r, uint64_t v) +cb_setreg(void *arg __unused, int r, uint64_t v) { int error; enum vm_reg_name vmreg; @@ -418,7 +418,7 @@ cb_setreg(void *arg, int r, uint64_t v) } static void -cb_setmsr(void *arg, int r, uint64_t v) +cb_setmsr(void *arg __unused, int r, uint64_t v) { int error; enum vm_reg_name vmreg; @@ -446,7 +446,7 @@ cb_setmsr(void *arg, int r, uint64_t v) } static void -cb_setcr(void *arg, int r, uint64_t v) +cb_setcr(void *arg __unused, int r, uint64_t v) { int error; enum vm_reg_name vmreg; @@ -481,7 +481,7 @@ cb_setcr(void *arg, int r, uint64_t v) } static void -cb_setgdt(void *arg, uint64_t base, size_t size) +cb_setgdt(void *arg __unused, uint64_t base, size_t size) { int error; @@ -495,7 +495,7 @@ cb_setgdt(void *arg, uint64_t base, size_t size) } static void -cb_exec(void *arg, uint64_t rip) +cb_exec(void *arg __unused, uint64_t rip) { int error; @@ -518,14 +518,14 @@ cb_exec(void *arg, uint64_t rip) */ static void -cb_delay(void *arg, int usec) +cb_delay(void *arg __unused, int usec) { usleep(usec); } static void -cb_exit(void *arg, int v) +cb_exit(void *arg __unused, int v) { tcsetattr(consout_fd, TCSAFLUSH, &oldterm); @@ -533,7 +533,7 @@ cb_exit(void *arg, int v) } static void -cb_getmem(void *arg, uint64_t *ret_lowmem, uint64_t *ret_highmem) +cb_getmem(void *arg __unused, uint64_t *ret_lowmem, uint64_t *ret_highmem) { *ret_lowmem = vm_get_lowmem_size(ctx); @@ -548,17 +548,21 @@ struct env { static SLIST_HEAD(envhead, env) envhead; static void -addenv(char *str) +addenv(const char *str) { struct env *env; env = malloc(sizeof(struct env)); - env->str = str; + if (env == NULL) + err(EX_OSERR, "malloc"); + env->str = strdup(str); + if (env->str == NULL) + err(EX_OSERR, "strdup"); SLIST_INSERT_HEAD(&envhead, env, next); } static char * -cb_getenv(void *arg, int num) +cb_getenv(void *arg __unused, int num) { int i; struct env *env; @@ -574,22 +578,22 @@ cb_getenv(void *arg, int num) } static int -cb_vm_set_register(void *arg, int vcpu, int reg, uint64_t val) +cb_vm_set_register(void *arg __unused, int vcpu, int reg, uint64_t val) { return (vm_set_register(ctx, vcpu, reg, val)); } static int -cb_vm_set_desc(void *arg, int vcpu, int reg, uint64_t base, u_int limit, - u_int access) +cb_vm_set_desc(void *arg __unused, int vcpu, int reg, uint64_t base, + u_int limit, u_int access) { return (vm_set_desc(ctx, vcpu, reg, base, limit, access)); } static void -cb_swap_interpreter(void *arg, const char *interp_req) +cb_swap_interpreter(void *arg __unused, const char *interp_req) { /* From nobody Fri Mar 3 16:25: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 4PStc03bXMz3w5Py; Fri, 3 Mar 2023 16:25: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 4PStc00Dv8z3hfC; Fri, 3 Mar 2023 16:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNtwq00IF8FoYEehLYAIO/N9SZjs4Fjbd1TVlbyBAAQ=; b=Fazk1qucClsENU6MNf2CpjmyU5GifeN4T4kGnjIqn4630X0Ki80Jsh8qK8zuzrELYJi7Fu 9SVNEEPY60D26T3BQjdruMPyfeXotBuENirMTbRAZ4bM2EVAp/Df55NQNp/9/SaqJ8HBPn ONMvqLJCy8iBjH6oeMRzMKf8CaybMI2znGHPYRh8MGVult4+jKlf0mTjQyAFW9B/+ilu7u PmTxCR7r0QG5Se3CHh2ixTN9x7o1jL14wA72cFGSYCLLN+ghaXanbPDZZPcu2ol2PdiwzS EOt1UNGSK8ebb77EEnwLz8THTsDZ9KoI0F7FIeAcdQXNLzHJ7Jm61SBv2B9aEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNtwq00IF8FoYEehLYAIO/N9SZjs4Fjbd1TVlbyBAAQ=; b=n0I4xwZI5mhbNyuLq74r2iOCGi7lN4SuP7cNRsv4P+VkbsfkT7PXKXmo9xcu1P92L5Bhl+ hKO9cAPjR7hi0lEfvLmfXcCoCdNwQ3R/5mTrSRjYgAhoxbsB/ntG2/CImzmQvOX8Mnyn9j ZwNoG0MLRShQAKHzlX325PoXL46OI71JPSMFbX1TQ9JFQO3ictic+lb8g5gztn1/ajOt5s iXg4Bk5+Ho96aXbR7xTKVOKu7yRKqP1x0mSEBCpt8zLoKXDTuyyO8J0lfjSnK6of4VI3vq RDKlg2PBk0qwnz3bzTLF7/51Km3uGvVLSMcuzW+iDZRWYnlRRlyho3OqrCbmkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677860704; a=rsa-sha256; cv=none; b=EfTvycpk767w2c9rGkrjulsbm5vu+HWYyUqbc0kiE7EtHcC2Rm/CucyTHvPS7p+lKd+Zyk LuvECN87vVNZuUkU12XbiloBZPdtOhi9DEvPTdyng+h1R/ZLPmSseReMcHS1VG3d9qK6U/ aInEusOsfLOvxuTqzn7DKMGK8mdBq4UoExKTn9QAl70ZUk0WsN4WIy0hD6m9QgBstWNZue dzTonOps65aslu0MlzVC/lUROmOvCYjXTqOBukyBPvwKrG5/yiH9Hng7AbopYY4UHTwxy2 v5lNyQmjEreToqE6fPLeKtBDP1AR4NXtxjOcDISo1EIE71ZKiREjNfWwuehjbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PStbz6PZKz14KV; Fri, 3 Mar 2023 16:25: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 323GP3en016949; Fri, 3 Mar 2023 16:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323GP3gD016948; Fri, 3 Mar 2023 16:25:03 GMT (envelope-from git) Date: Fri, 3 Mar 2023 16:25:03 GMT Message-Id: <202303031625.323GP3gD016948@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: 831601773e5a - main - deadlkres: Make parameters settable with tunables 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: 831601773e5ab58b9485c1b111eb8c7c7343abf6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=831601773e5ab58b9485c1b111eb8c7c7343abf6 commit 831601773e5ab58b9485c1b111eb8c7c7343abf6 Author: Mark Johnston AuthorDate: 2023-03-03 16:16:16 +0000 Commit: Mark Johnston CommitDate: 2023-03-03 16:16:41 +0000 deadlkres: Make parameters settable with tunables MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. --- sys/kern/kern_clock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 1670b6fde0c4..6f1581009dcc 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -300,13 +300,13 @@ SYSINIT(deadlkres, SI_SUB_CLOCKS, SI_ORDER_ANY, kthread_start, &deadlkres_kd); static SYSCTL_NODE(_debug, OID_AUTO, deadlkres, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Deadlock resolver"); -SYSCTL_INT(_debug_deadlkres, OID_AUTO, slptime_threshold, CTLFLAG_RW, +SYSCTL_INT(_debug_deadlkres, OID_AUTO, slptime_threshold, CTLFLAG_RWTUN, &slptime_threshold, 0, "Number of seconds within is valid to sleep on a sleepqueue"); -SYSCTL_INT(_debug_deadlkres, OID_AUTO, blktime_threshold, CTLFLAG_RW, +SYSCTL_INT(_debug_deadlkres, OID_AUTO, blktime_threshold, CTLFLAG_RWTUN, &blktime_threshold, 0, "Number of seconds within is valid to block on a turnstile"); -SYSCTL_INT(_debug_deadlkres, OID_AUTO, sleepfreq, CTLFLAG_RW, &sleepfreq, 0, +SYSCTL_INT(_debug_deadlkres, OID_AUTO, sleepfreq, CTLFLAG_RWTUN, &sleepfreq, 0, "Number of seconds between any deadlock resolver thread run"); #endif /* DEADLKRES */ From nobody Fri Mar 3 16:25: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 4PStc159fsz3w5Bg; Fri, 3 Mar 2023 16:25: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 4PStc11Phpz3hfF; Fri, 3 Mar 2023 16:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKl1cM1RKhDnC9zcqAUb8YTx2T10iMEt58Ee5x5pD1U=; b=kY7LbprKwWWWs+BLmu+isIsGG+UeetzDzIl7PKFQ4AYLJJp90hSc1GyXtwSTF2lJ991IPN 4ELy/cfNiSWW/y2ugXBHKRgULWOAQI+zCIhmlQ4RDLSX/2msgd8RshreYj0EqWYz//19c/ 2BIT7/O/0MKUJguPYTL9lw1uhJcWh4B47gjQbk5Qxo8FgF+7p3cx+6Sk8+ZC/sGYlqCVRm 5BSvjvbgxSdKP/yMiavvRbuKWDX30raO4hMYlvPd02cUc5J+Ni0tnwdPTQ8IrURHmANTvl 0kTdyoxya7zpGnfjLCScT6k46U0qHXyw3OWbhVQWTg6RAk6mnUcEnK1+XDzTJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKl1cM1RKhDnC9zcqAUb8YTx2T10iMEt58Ee5x5pD1U=; b=P9xxYS9X85Qknq6HS2XGMiQazmWRTsk44EoRcCJHqC7ZkYu0rghN3dULuALeokK7G81gUB w4HKbP7OU8+SYUXuYOIxthPtKCvtiKYdYAZl9wAV119btLyGkizxTAH943C1xuwp+tE3Y0 wzA3T7FHqch3KkgyiPbrovJT4sEPFnoMmX0FUhhPPc2OJrHPuIfdH6FXuzWo90FQafQqlj f7VjNDL8WKEWLBoyyLHT3lo8ddtOkFJgm+G3g9TxCg5/4jYvHBG/D6uSaFzz8M+1xznINq 5jbrVkGz+joquITBMX5FrsvLcN4mHXqggudPht2L81TFZ53HSltz3IPrG852aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677860705; a=rsa-sha256; cv=none; b=Lk4Zvb0p0qfXVHyFMkE+CdwZZJUwW8PXegP0tmat0tB9hs0DHXjesDS9CajfwgH/WXPcan ZcsjadkKi191zHvHjF6lR5VfWU/zo1U7ytTknjjXM0Zb4iUagP5biJSo+UnDRPpX5vRuc6 biQN4TXzzSsJJSRHZ6a/rfAHKZH3uIkcfTeHHJSzGRHwh7oE74SUjkywv4duhspquJYznI gkuaC9I/BcCNt2+9nqypktdKj4X6/Sl9hStLWueTUTgLIBHSGiF/dYY4lbyOj23SlmUmx3 1HV+oY5358BbEDLVphOoJi8qw7S7caG6H20bKqMKgtRguabDpuHvcNxCbUZ5JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PStc10Sq3z14KW; Fri, 3 Mar 2023 16:25: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 323GP4nK016969; Fri, 3 Mar 2023 16:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323GP406016967; Fri, 3 Mar 2023 16:25:04 GMT (envelope-from git) Date: Fri, 3 Mar 2023 16:25:04 GMT Message-Id: <202303031625.323GP406016967@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: 560f9cd5e1e3 - main - posixshm tests: Correct page size index checks 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: 560f9cd5e1e36ba725f3c677d7b8e514af9f3a85 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=560f9cd5e1e36ba725f3c677d7b8e514af9f3a85 commit 560f9cd5e1e36ba725f3c677d7b8e514af9f3a85 Author: Mark Johnston AuthorDate: 2023-03-03 16:16:21 +0000 Commit: Mark Johnston CommitDate: 2023-03-03 16:16:51 +0000 posixshm tests: Correct page size index checks MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. --- tests/sys/posixshm/posixshm_test.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index 7c63c6542cd7..bc48863f98a0 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1263,7 +1263,8 @@ ATF_TC_BODY(largepage_basic, tc) for (size_t p = 0; p < ps[i] / ps[0]; p++) { ATF_REQUIRE_MSG((vec[p] & MINCORE_INCORE) != 0, "page %zu is not mapped", p); - ATF_REQUIRE_MSG((vec[p] & MINCORE_PSIND(i)) != 0, + ATF_REQUIRE_MSG((vec[p] & MINCORE_SUPER) == + MINCORE_PSIND(i), "page %zu is not in a %zu-byte superpage", p, ps[i]); } @@ -1426,7 +1427,8 @@ ATF_TC_BODY(largepage_mmap, tc) for (size_t p = 0; p < ps[i] / ps[0]; p++) { ATF_REQUIRE_MSG((vec[p] & MINCORE_INCORE) != 0, "page %zu is not resident", p); - ATF_REQUIRE_MSG((vec[p] & MINCORE_PSIND(i)) != 0, + ATF_REQUIRE_MSG((vec[p] & MINCORE_SUPER) == + MINCORE_PSIND(i), "page %zu is not resident", p); } @@ -1761,7 +1763,7 @@ ATF_TC_BODY(largepage_minherit, tc) *(volatile char *)addr = 0; if (mincore(addr, ps[0], &v) != 0) _exit(1); - if ((v & MINCORE_PSIND(i)) == 0) + if ((v & MINCORE_SUPER) == 0) _exit(2); _exit(0); } @@ -1910,7 +1912,7 @@ ATF_TC_BODY(largepage_reopen, tc) ATF_REQUIRE(vec != NULL); ATF_REQUIRE_MSG(mincore(addr, ps[psind], vec) == 0, "mincore failed; error=%d", errno); - ATF_REQUIRE_MSG((vec[0] & MINCORE_PSIND(psind)) != 0, + ATF_REQUIRE_MSG((vec[0] & MINCORE_SUPER) == MINCORE_PSIND(psind), "page not mapped into a %zu-byte superpage", ps[psind]); ATF_REQUIRE_MSG(shm_unlink(test_path) == 0, From nobody Fri Mar 3 16:47: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 4PSv6832l0z3w6DQ; Fri, 3 Mar 2023 16:47: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 4PSv6827mvz3l8j; Fri, 3 Mar 2023 16:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KjJSnVxZoZcujFEMz6AKmv36/HQ6S6IuwvYfqTGppSY=; b=b0g+cMuPFyq0Z3Fc7SjSS2wXFj5JmC7zXMzru6zcFF6afYl7etKS2w2qpqG6RFzwu7l9r9 LkGqczrMJxQlM8VewfyKjGzASrAx2Leyus2M2gu9/nWyInj2kb7ctymV9CmDkOxMNQH0su yUAJ7lpaNM0k5zVSWpz3GPc5hedPE9w+Rwp5ybT08ugvX56LHEKcOiL5zmf1DwpBftkEQa jIGqAfhOlg4UmoeDU7XS5NZzodQAfKyCedHuwlXv+qG3Xf83kdszU7QIU1mSg7WfdUwM/W ETj1jsKqX3TmBvYsMFm7M8z8Ge+pEuUTC4QFxUfvsdhF0UTtVckduMzSR2iIIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KjJSnVxZoZcujFEMz6AKmv36/HQ6S6IuwvYfqTGppSY=; b=ckAKL1u245XOH6r5T1hzZUGShY8qM7k5cFAtWpEFhF7XShka7QzYWoHY/v6kzbYyHOilOq lKfDY90DSlbQWpiq0jwjeyBnNClZAFT0krS9sE9YquhkK//RDbgpQ7/3GewUO0I4F6yYr4 n/WmL8LdAECQOizIlVemCO43DzrvuUT5pndgeshX2fzPrTCoE9KxflC87B3ZygKHHLUFhE mQ1D4VNg4Lc3AJDnhB+EOmDmnJcQaJPoxXd5C5GiWCb3h7Ocy77twxneBTbrEx6/qbSiMn JNX/3+6R8ImRma/d+Uq82wioAJfS9BFPDMl56dgArq4XzuTtSfPSe8jflclCWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677862064; a=rsa-sha256; cv=none; b=WaCFQaqJGzudW0uDZrJ5TYoqrHcE75+d+k4Oj03+MQSv2l3d0r4rxG47Irebi1gzMek0F+ Ir/CeKTenzeb1XEGqIiqCBgdD4tLnq9UrWZ+U5kMbQtJHIsjnXyQwf6AynULz5m2jArx0N QoNivqj2fXLPvOwF9LYXKVtL/YJXNx5eNOj10E0t9KQQueXgsAh5UFPD34rik45TALUu7W ho9uCXzCbeVkDuVktsnJplJUHX6Ri2lc1/NlgakWjZOZP0BlAurseQhawK0BVy3Ce9Krd3 RRKJWNzADhbjMKWHneAtyo7RxrfAG4ieHke2DYGUp8Xeh98aYXIW5BYgWXK7WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSv681CLPz15Bs; Fri, 3 Mar 2023 16:47: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 323GliQM049727; Fri, 3 Mar 2023 16:47:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323GliSK049726; Fri, 3 Mar 2023 16:47:44 GMT (envelope-from git) Date: Fri, 3 Mar 2023 16:47:44 GMT Message-Id: <202303031647.323GliSK049726@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: f0c4b42c6089 - main - nanobsd: remove comment about keeping C++ enabled 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: f0c4b42c608946ceb04241508e118953d841d3e5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f0c4b42c608946ceb04241508e118953d841d3e5 commit f0c4b42c608946ceb04241508e118953d841d3e5 Author: Brooks Davis AuthorDate: 2023-03-03 16:13:44 +0000 Commit: Brooks Davis CommitDate: 2023-03-03 16:47:36 +0000 nanobsd: remove comment about keeping C++ enabled It's no longer possible to disable C++ so there's no need to comment on it. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D38883 --- tools/tools/nanobsd/dhcpd/common | 1 - tools/tools/nanobsd/embedded/common | 1 - 2 files changed, 2 deletions(-) diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common index 07b3f3963d0b..dbd570d5e3c7 100644 --- a/tools/tools/nanobsd/dhcpd/common +++ b/tools/tools/nanobsd/dhcpd/common @@ -98,7 +98,6 @@ NANO_MAKEFS="makefs -B big \ -o bsize=4096,fsize=512,density=8192,optimization=space" export NANO_MAKEFS -# NB: leave c++ enabled so devd can be built CONF_BUILD=" WITHOUT_ACPI=true WITHOUT_ATM=true diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 3998764311bb..37d7421a9a58 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -128,7 +128,6 @@ cust_install_machine_files ( ) ( customize_cmd cust_install_files customize_cmd cust_install_machine_files -# NB: leave c++ enabled so devd can be built CONF_BUILD=" LOCAL_XTOOL_DIRS=usr.bin/mkimg WITHOUT_ACPI=true From nobody Fri Mar 3 16:47: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 4PSv693kbnz3w6YP; Fri, 3 Mar 2023 16:47: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 4PSv6937rqz3l0b; Fri, 3 Mar 2023 16:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=trdJjkEr3HiuCgHu3ACXg94zLQBNGwoC28PQKuEal5g=; b=aAXhyvYBrImxNdTFypJq9TRsJSR7Xq6TBHJOobTrCGKND9AaVGR3ogH5Cg/YsCFRX5omKw pCeAp7EDzHa72iau/YzmJxtXX1LiVYz84l14pjrfhWYC4sRp0QMPtqhVBd/LoneKAuNzCN ucXBc7mSVMsEdEm5w2GRy0yaNVGKemhdqyS2nvqKCROHdT8gWX4Nhb6FeBE02KuQHJl+f1 CDNNuqIfZkXmtvqWTatxRuMWEufO0dX3ccDpUdK6onmiEdYDucrKMQa3jlr23WJLDLAB6o eakEXd704yd65//rA283+RDLXKJ0AfgwJq7JKmwwCYxQ8EYGB37ITPVgNGb1lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=trdJjkEr3HiuCgHu3ACXg94zLQBNGwoC28PQKuEal5g=; b=Zu5+CMJ5iKMo+F3fTGnVndb0y6DPuwvx0UdDe8MKe/I6auUsE20e+gS7AR8CMUfiWa9FUw jgUN6HPDhYyJNy/MPcUGKJebW3BDhr3Opbe8zccJRTJsADaiRZQKGoNAH47NiPSZxFTPQi voJy99UP/iCSb6b24znsd4gBryQW3uBTJZSAunzyItpSYZsX5n3SwgGcu8hyc/bU9+POVx bpMw0Gq/wf+0l8R5crrOKECsqQa3jEUlP4+CT383r7mQymxrHbqAeFl7DoSbPqNBw9b9v9 lnU2UPZCwDwCyQ5Xvl+cK++fdNIF1h5YF5hooU7al2ejQAqhFEExeBnwvMx6yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677862065; a=rsa-sha256; cv=none; b=HFpmGqTAgycVUloS2pMVhMVqrm14diuMwMhATLypyXBzNQWNWBDJLwHLO7oV/B4Eqf4bnm RWislOes2/5JaNotnmEVHsejpOMT3Hu0nzLZet6wGZYEu7AMpBqNOpwlzyzhx1dU/32PnP +ItqQrUevfVT0nGQQixnUd3aPGC6B7TnwUDzT9zIuObFBZr61Cra07Xt2drClae/yORH4k 9RNOpM7AnIL4y6tkgEFQV17EcZFqhZf3fyVGO3Qvd2T4HgVj8J6SjljjrI+rMUGVlMPyNG Uyw7VNGq8lnOWr0hH+vXtMxheS73BCERHQEg95kfR6zkTGwHlY8DCJYjuhjL1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSv692BBXz158G; Fri, 3 Mar 2023 16:47: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 323GljBM049750; Fri, 3 Mar 2023 16:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323GljWT049749; Fri, 3 Mar 2023 16:47:45 GMT (envelope-from git) Date: Fri, 3 Mar 2023 16:47:45 GMT Message-Id: <202303031647.323GljWT049749@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: 211c302f10d7 - main - NgATM: deprecate 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: 211c302f10d76fc12e50c87039cfc06aa9e659c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=211c302f10d76fc12e50c87039cfc06aa9e659c1 commit 211c302f10d76fc12e50c87039cfc06aa9e659c1 Author: Brooks Davis AuthorDate: 2023-03-03 16:20:18 +0000 Commit: Brooks Davis CommitDate: 2023-03-03 16:47:36 +0000 NgATM: deprecate Support for ATM NICs was removed prior to FreeBSD 12. At the time it was unclear if this code was still useful without it. Now the time has come to finish removing support. Add DREPRECATION NOTICEs to the manpages and gone_in(14, ...) warnings in the constructors (or module init for ngatmbase). MFC after: 3 days Relnotes: yes Reviewed by: manu, emaste Differential Revision: https://reviews.freebsd.org/D38877 --- share/man/man4/ng_ccatm.4 | 7 ++++++- share/man/man4/ng_sscfu.4 | 7 ++++++- share/man/man4/ng_sscop.4 | 7 ++++++- share/man/man4/ng_uni.4 | 7 ++++++- share/man/man4/ngatmbase.4 | 7 ++++++- sys/netgraph/atm/ccatm/ng_ccatm.c | 2 ++ sys/netgraph/atm/ngatmbase.c | 2 ++ sys/netgraph/atm/sscfu/ng_sscfu.c | 2 ++ sys/netgraph/atm/sscop/ng_sscop.c | 2 ++ sys/netgraph/atm/uni/ng_uni.c | 2 ++ 10 files changed, 40 insertions(+), 5 deletions(-) diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4 index 3d6778fa25d5..02a5a5f011b5 100644 --- a/share/man/man4/ng_ccatm.4 +++ b/share/man/man4/ng_ccatm.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 10, 2005 +.Dd March 3, 2023 .Dt NG_CCATM 4 .Os .Sh NAME @@ -47,6 +47,11 @@ .In netgraph.h .In netgraph/ng_uni.h .In netgraph/ng_ccatm.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4 index 2c444dacd589..6011deaeb2b3 100644 --- a/share/man/man4/ng_sscfu.4 +++ b/share/man/man4/ng_sscfu.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscfu(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCFU 4 .Os .Sh NAME @@ -40,6 +40,11 @@ .In netnatm/saal/sscopdef.h .In netnatm/saal/sscfudef.h .In netgraph/atm/ng_sscfu.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscfu diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4 index c98a43462581..451edcc4aebf 100644 --- a/share/man/man4/ng_sscop.4 +++ b/share/man/man4/ng_sscop.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscop(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCOP 4 .Os .Sh NAME @@ -39,6 +39,11 @@ .Sh SYNOPSIS .In netnatm/saal/sscopdef.h .In netgraph/atm/ng_sscop.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscop diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4 index da7028b0e015..993119d23c70 100644 --- a/share/man/man4/ng_uni.4 +++ b/share/man/man4/ng_uni.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 6, 2003 +.Dd March 3, 2023 .Dt NG_UNI 4 .Os .Sh NAME @@ -38,6 +38,11 @@ .In netnatm/msg/unistruct.h .In netnatm/sig/unidef.h .In netgraph/atm/ng_uni.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm uni diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4 index 0227b44347bd..6cdc3eb532fc 100644 --- a/share/man/man4/ngatmbase.4 +++ b/share/man/man4/ngatmbase.4 @@ -30,9 +30,14 @@ .\" .\" ngatmbase(4) man page .\" -.Dd August 24, 2004 +.Dd March 3, 2023 .Dt NGATMBASE 4 .Os +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh NAME .Nm ngatmbase .Nd netgraph ATM utility module diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c index 6c27b6aacc0f..4a7af2c4579b 100644 --- a/sys/netgraph/atm/ccatm/ng_ccatm.c +++ b/sys/netgraph/atm/ccatm/ng_ccatm.c @@ -348,6 +348,8 @@ ng_ccatm_constructor(node_p node) { struct ccnode *priv; + gone_in(14, "ng_ccatm: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_CCATM, M_WAITOK | M_ZERO); priv->node = node; diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c index 785bbef26580..0e2d1597d696 100644 --- a/sys/netgraph/atm/ngatmbase.c +++ b/sys/netgraph/atm/ngatmbase.c @@ -77,6 +77,8 @@ static struct mtx ngatm_unilist_mtx; static void uni_msg_init(void) { + gone_in(14, "ngatmbase: netgraph ATM modules"); + mtx_init(&ngatm_unilist_mtx, "netgraph UNI msg header lists", NULL, MTX_DEF); } diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c index 7fe3728b7eae..4811f576df0b 100644 --- a/sys/netgraph/atm/sscfu/ng_sscfu.c +++ b/sys/netgraph/atm/sscfu/ng_sscfu.c @@ -536,6 +536,8 @@ ng_sscfu_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_sscfu: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_SSCFU, M_WAITOK | M_ZERO); if ((priv->sscf = sscfu_create(node, &sscfu_funcs)) == NULL) { diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c index b15ef5e258a1..ae60e7557978 100644 --- a/sys/netgraph/atm/sscop/ng_sscop.c +++ b/sys/netgraph/atm/sscop/ng_sscop.c @@ -246,6 +246,8 @@ ng_sscop_constructor(node_p node) { struct priv *p; + gone_in(14, "ng_sscop: netgraph ATM modules"); + p = malloc(sizeof(*p), M_NG_SSCOP, M_WAITOK | M_ZERO); if ((p->sscop = sscop_create(node, &sscop_funcs)) == NULL) { diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c index c4e1c2c523b5..1313bd062188 100644 --- a/sys/netgraph/atm/uni/ng_uni.c +++ b/sys/netgraph/atm/uni/ng_uni.c @@ -225,6 +225,8 @@ ng_uni_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_uni: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_UNI, M_WAITOK | M_ZERO); if ((priv->uni = uni_create(node, &uni_funcs)) == NULL) { From nobody Fri Mar 3 16:47: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 4PSv6B4cXZz3w6YX; Fri, 3 Mar 2023 16:47: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 4PSv6B3k5nz3lKp; Fri, 3 Mar 2023 16:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+b2qjFRp6ODZwK20oPxSf5v0TCUldq5P7TsC2vkGwU=; b=ePsM4D/QIC6bsgrpbG07JSLvbefGsOxIMh6+1liI9p7ATBfJk5fRYEUSYPXX3CBmytzBUm eowblfXOpIqqmipLfEd15yZbnCVifNcyzpw4aqvCrxvkudTzSKfIJttLEn8J28MKyx9yjL GZ0Ja6xu0bEn/LAy4ZE0wcCyKwsJXJ8dw8h0UcFcCt5pSD0N+X1jhWUfEffz2Fdfvut2iE 3IdLn6Xc5pu5D+jehtHq9zjt4ROfBttuRgbYeTP0WMIXiSFQNm8MuzEwEKCrj/YdJ3mSqe EALyX8eHrsnfse8E+W3ZoZFclHtriGVhTY8jmCen2I/8SGEZ5AoOgswAZFkQaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+b2qjFRp6ODZwK20oPxSf5v0TCUldq5P7TsC2vkGwU=; b=T9jW/fV1tyyiwc0hPmbSD8/y3Tn1j1iuyojnNHYICch7s7sAoxnIxpMmsSZ0ckWlQUuttD Z7FoLqQLNB8B4WKOAb6V+AK9AtIf+Gu+m4OILJDGIH8RtHOhz308Bt2XQG3PyQrpbWyyeE XbfQMAq3dUq2+ULL1jC+DCNBafzWDEk2TqzWJ3hozb58jfqTTwl4tet8dERu8/3PINQTmn 2maUC9Zp0LlVabA3Z3xJelMcOrSpC6KoQeieUISUvjCy/hsXBGKMB+cRZEfvnmqy1SzkuL RMN3/bSz6z9WVVNDHvHJe1SrYAo+V13eVNkwU9tdCRzLPrGvcbfImqtyS1ci4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677862066; a=rsa-sha256; cv=none; b=AwbcKl4fGvj8f7gwTTpj7QmIqlpeKr+z5OIp0w7hobfK3aMRgOdO7iCRVtaDHPmYYfbq34 /vr6/TDMCQxzf7V0qOdrJzBOAO/uFfbUMs6g3wQ99GoE0DoCBv5dVZZfGnMrNnabZJmt8+ OnwuEt3KC2sH9qyeHJkJoAg2g2Hu0EUgiId/cUMSH+leZ/NCVaJOiXaXus5d/cEwhMZpC/ GGlTtofDhgaP0Iy2x+Nmaanou27xogr73FdNaRHdWGmP9WwJvOYD8iDQHFKJNHAIZ+OeZE ZmB+mfU5GE4QtqCu9D7liQtrj3V+PCSbfSMvvCSuZQTnT+T3j8I3TXgsNT+YXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSv6B2kgNz15Bt; Fri, 3 Mar 2023 16:47: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 323GlkCI049774; Fri, 3 Mar 2023 16:47:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323GlkKa049773; Fri, 3 Mar 2023 16:47:46 GMT (envelope-from git) Date: Fri, 3 Mar 2023 16:47:46 GMT Message-Id: <202303031647.323GlkKa049773@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: c2285a7b092f - main - ng_atmllc: deprecate 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: c2285a7b092f524b5694e42bfb5fd24f71815771 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c2285a7b092f524b5694e42bfb5fd24f71815771 commit c2285a7b092f524b5694e42bfb5fd24f71815771 Author: Brooks Davis AuthorDate: 2023-03-03 16:20:29 +0000 Commit: Brooks Davis CommitDate: 2023-03-03 16:47:36 +0000 ng_atmllc: deprecate With the deprecation of NgATM, ng_atmllc is the last vestage of ATM support so deprecate it too. MFC after: 3 days Relnotes: yes Reviewed by: manu, emaste Differential Revision: https://reviews.freebsd.org/D38878 --- share/man/man4/ng_atmllc.4 | 7 ++++++- sys/netgraph/ng_atmllc.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ng_atmllc.4 b/share/man/man4/ng_atmllc.4 index 3c7cfa947fc7..50987b5a5f6c 100644 --- a/share/man/man4/ng_atmllc.4 +++ b/share/man/man4/ng_atmllc.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 8, 2004 +.Dd March 3, 2023 .Dt NG_ATMLLC 4 .Os .Sh NAME @@ -32,6 +32,11 @@ .Nd ATM LLC netgraph node type .Sh SYNOPSIS .In netgraph/ng_atmllc.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm atmllc diff --git a/sys/netgraph/ng_atmllc.c b/sys/netgraph/ng_atmllc.c index 1e4475ae68e0..d4a13fb83128 100644 --- a/sys/netgraph/ng_atmllc.c +++ b/sys/netgraph/ng_atmllc.c @@ -93,6 +93,8 @@ ng_atmllc_constructor(node_p node) { struct ng_atmllc_priv *priv; + gone_in(14, "ng_atmllc"); + priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); From nobody Fri Mar 3 17:01: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 4PSvQS4dnSz3w7Fr; Fri, 3 Mar 2023 17:01: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 4PSvQS3nX2z3n0y; Fri, 3 Mar 2023 17:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJbtOvHTNlFZGVJXiWb3tuYiv7UKrn8dUECmLUbenfA=; b=elU3I/hVb844AklRKTwnclM2+VodxZFSvr2q1nuHui+hXWFu/Ad6RIpFFXkail/tJQAG87 GWDB0HVRibozRibUFMh4IRa8RyFp2c3+O8fwt5Px4xhPxffD95I8jIoPgmYzoqcR1EtYNX PbTC2zlkM0eKKzeRLd/PUgxWNFmjtte4zoJi0nBnfWTk5WeAFBEXJ1OWhkSvljEJRe9788 Z6jU1f6U+KciVqo2yIrsqz1KlUU+KumQN4c9YEYEpirwNE/EdJVMyHHWGpueWZSSmQvvZg IDbsLOlm1Zc/FHgyJOzhPrwg5NZy9Avx1aMB5s8IvFQ6nAh09rKB9mDJp+Sctg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJbtOvHTNlFZGVJXiWb3tuYiv7UKrn8dUECmLUbenfA=; b=CeM7zxlXpmwHqr8cqHPL9h8CbSUaaC47DRWuKzg883SiQ5+cqoGpAoqDHaT4wjSdZ4juT3 3652wYrEIDJXHds64qL3QPjHY8fU8QTMr/XWEi6DcRjs16Ykel3DCIBxgWuaBwpYnNPlt2 uWT2USi9qwd9EQ9oLmll0ME62NE/H1AjzIPOxv2OW55haPmO9DkJL0e+C+mytmMMwGONVG +NubQWxAq5W4tGmRyCkx9Uetqxc+JIH5ZLi9QOXxwlG9umtsqp1r5UT8Wny/ehWLQ10H4q NxuAdUcEUohI8bdAl8n7aT07uKiYhb3zUzIU67utufPGKWkMKBpMEUKT3ecNFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677862912; a=rsa-sha256; cv=none; b=uM9DkSfw01SM+fObt5/LDul+Gk1b79rc1D3y2yOV+2nzm7MjzXw/LsQ7Zs7FI7e/hFQGjQ fhmh/1Q+CyjIgeCLyGH8olLU/VCJBMFQliOnjQK1KbYjFwnukvfwNVxumSBbSzXqEp8mLr wWdd+MsgrSrELtwAcIpk/n0uiMX0YJTrHA42Vjn8sUonrJxyG2Ymqo+KTC3EbyuJTMU+W0 4QSaozGrq1ocj8lXIp4jQlT1w8xcxiDmuiDMrX2KGZJGcO9GtL2yM1Si8YzKJJZ7yAYl5c sxnpFr+fs0wViKmH/4gwFzdQeWTnapz4yXYzo/awwmq0zw0rKfn9NGW8OTmHtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSvQS2rYRz15D4; Fri, 3 Mar 2023 17:01: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 323H1q5k080004; Fri, 3 Mar 2023 17:01:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323H1qIL080003; Fri, 3 Mar 2023 17:01:52 GMT (envelope-from git) Date: Fri, 3 Mar 2023 17:01:52 GMT Message-Id: <202303031701.323H1qIL080003@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: 577b62c2bacc - main - pkgbase: Put termcap.small in the same package as termcap 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: 577b62c2bacc7dfa228591ca3da361e1bc398301 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=577b62c2bacc7dfa228591ca3da361e1bc398301 commit 577b62c2bacc7dfa228591ca3da361e1bc398301 Author: Mark Johnston AuthorDate: 2023-03-03 17:00:14 +0000 Commit: Mark Johnston CommitDate: 2023-03-03 17:01:22 +0000 pkgbase: Put termcap.small in the same package as termcap Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D36951 --- etc/termcap/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/termcap/Makefile b/etc/termcap/Makefile index 98045a22b57d..4b403c446359 100644 --- a/etc/termcap/Makefile +++ b/etc/termcap/Makefile @@ -1,5 +1,6 @@ .PATH: ${SRCTOP}/share/termcap +PACKAGE= runtime CLEANFILES+= termcap.small CONFS= termcap.small From nobody Fri Mar 3 17:02: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 4PSvRT2z2Cz3w7Db; Fri, 3 Mar 2023 17:02: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 4PSvRT0Zg3z3nM1; Fri, 3 Mar 2023 17:02:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERo/sI7+tZ0PiGO0KU2qQIyKUoVGR/54gooqO3ILES4=; b=TiP8K29k1NQxN7DkLzHv47hEphboC+GV3eIwrVaISbi9y4E+EkJtXRyh9c/EJxY8+E/0k6 es+tPj9mrHL7GG3XCHjbzqhJg90yEVTZrw2N5zBGaAXVQoJvR7rw/k/IDuboE1fge8Ing7 zRjLwGFeRs7X6UmuftbtB3f1oML/YzKbteWPU8mg16XN2VpSguuFEHK+19f8xtsY3hWl+i 74ruQgoyWp6t3gUuwwjHq8g9dEZ77rd9IIIiREr1e5Dqfy7f8tExHBkbAo2lvKTruiZp8s frTtIhT3gcWfAmD3BRwr0UM0OBCqoEUhlo++UA9HwNMsfvwZyVHoQKSV6xACyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677862965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERo/sI7+tZ0PiGO0KU2qQIyKUoVGR/54gooqO3ILES4=; b=V9fsFeBf++ROK3FytS7c05tcDMyI2JOT0x2iD1d/yYoCD3MWm6DLvLqaEFV70CQK/uH5DX V0Zd+aTzDvkCenajnYKs1ttzzNZzLlIwsMn4M80IuboR604ebxDi6NicEOxcuj1Q3lsO3v Qw79rLWRLB0KgjuygNe4C+bepVtZmsWiGHqR/P/AjFqnyK8xS587jaGRmSo3duQDzQO0aa +GiQ+23axgV5XyNbtcfQWIJpY4pHTedEOQ82jiBXHNtAe6BWpu1CRE5esJVAgqASnvQLTl R/Sj7gblY2wBCXA0Q9oADBqrxsXIJQ6Oby0elDyE0X4B4r9hf8yYFdL8V5IosA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677862965; a=rsa-sha256; cv=none; b=CxjfXa7E84TR5cRkdO+WDJevRpqesCVAF9NKXx+8rrWvePD+aNDPNXb+a+eTKiFVjaFJbo u9o4KUJujQDB5gZE2uQyAidQHLOyjf/rRA+6cUlnqSZelNVc3j20pyZhlNL+CNs0NK4k/Y 0p5UUSy1a1/kZC5LvptwRUyz0J+MMJfbcOmxaAIEt28Xvki713JmcRR9RgIrn/WuvhDbVb 9/FrM/uuXVwJrEIjLgRqnXR15AOR7je5Pzo7D7hIdH7gjwaZ2fhhTOLl+4msWZw4YRKahc nNfoGvyxhQRtt9+DW7VdxMLyvuuJeoIQVPfYYYq8p+w7Aau/AndeDwjylJ8lqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSvRS6nTRz15Vx; Fri, 3 Mar 2023 17:02: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 323H2i0N082914; Fri, 3 Mar 2023 17:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323H2ig9082913; Fri, 3 Mar 2023 17:02:44 GMT (envelope-from git) Date: Fri, 3 Mar 2023 17:02:44 GMT Message-Id: <202303031702.323H2ig9082913@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: d2ae03bae2ad - main - arm64: disable the physical timer for now if HCR_EL2.E2H is set 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: d2ae03bae2add82124973876dec95eb126ff34c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d2ae03bae2add82124973876dec95eb126ff34c8 commit d2ae03bae2add82124973876dec95eb126ff34c8 Author: Kyle Evans AuthorDate: 2023-03-03 17:02:19 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 17:02:34 +0000 arm64: disable the physical timer for now if HCR_EL2.E2H is set On some hardware, we can't clear HCR_EL2.E2H so accesses to the physical timer hopelessly trap to EL2. Stash off the value of HCR_EL2 and use it in has_hyp() to avoid this. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D38884 --- sys/arm64/arm64/genassym.c | 1 + sys/arm64/arm64/locore.S | 5 +++-- sys/arm64/arm64/machdep.c | 9 ++++++++- sys/arm64/include/machdep.h | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c index bd359699eca9..e444d0166360 100644 --- a/sys/arm64/arm64/genassym.c +++ b/sys/arm64/arm64/genassym.c @@ -45,6 +45,7 @@ ASSYM(BP_KERN_DELTA, offsetof(struct arm64_bootparams, kern_delta)); ASSYM(BP_KERN_STACK, offsetof(struct arm64_bootparams, kern_stack)); ASSYM(BP_KERN_TTBR0, offsetof(struct arm64_bootparams, kern_ttbr0)); ASSYM(BP_BOOT_EL, offsetof(struct arm64_bootparams, boot_el)); +ASSYM(BP_HCR_EL2, offsetof(struct arm64_bootparams, hcr_el2)); ASSYM(PCPU_SIZE, sizeof(struct pcpu)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index da3001711955..1080ebc6217e 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -146,6 +146,7 @@ virtdone: str x25, [x0, #BP_KERN_STACK] str x27, [x0, #BP_KERN_TTBR0] str x23, [x0, #BP_BOOT_EL] + str x4, [x0, #BP_HCR_EL2] /* trace back starts here */ mov fp, #0 @@ -286,8 +287,8 @@ LENTRY(drop_to_el1) */ tst x4, #HCR_E2H mov x3, #CPTR_RES1 /* HCR_E2H == 0 */ - mov x4, #CPTR_FPEN /* HCR_E2H == 1 */ - csel x2, x3, x4, eq + mov x5, #CPTR_FPEN /* HCR_E2H == 1 */ + csel x2, x3, x5, eq msr cptr_el2, x2 /* Don't trap to EL2 for CP15 traps */ diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 19fa7cd913a0..a076bd0a046a 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -124,6 +125,7 @@ static struct trapframe proc0_tf; int early_boot = 1; int cold = 1; static int boot_el; +static uint64_t hcr_el2; struct kva_md_info kmi; @@ -191,7 +193,11 @@ bool has_hyp(void) { - return (boot_el == 2); + /* + * XXX The E2H check is wrong, but it's close enough for now. Needs to + * be re-evaluated once we're running regularly in EL2. + */ + return (boot_el == 2 && (hcr_el2 & HCR_E2H) == 0); } static void @@ -865,6 +871,7 @@ initarm(struct arm64_bootparams *abp) TSRAW(&thread0, TS_ENTER, __func__, NULL); boot_el = abp->boot_el; + hcr_el2 = abp->hcr_el2; /* Parse loader or FDT boot parametes. Determine last used address. */ lastaddr = parse_boot_param(abp); diff --git a/sys/arm64/include/machdep.h b/sys/arm64/include/machdep.h index 112390bb27ef..69babfff8467 100644 --- a/sys/arm64/include/machdep.h +++ b/sys/arm64/include/machdep.h @@ -36,6 +36,7 @@ struct arm64_bootparams { uint64_t kern_delta; vm_offset_t kern_stack; vm_paddr_t kern_ttbr0; + uint64_t hcr_el2; int boot_el; /* EL the kernel booted from */ int pad; }; From nobody Fri Mar 3 18:30: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 4PSxPJ0L9gz3wCLS; Fri, 3 Mar 2023 18:31: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 4PSxPH6z3hz3tCk; Fri, 3 Mar 2023 18:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677868260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ce+DHJd6/vleJ9wVe5RZiIX5srqIYul1H3tiYIDQVV4=; b=OtHPHCALw7RmsyRXJqZzaGnV2zkoPJKsxRoJE3BW2u+A85BtOcyR+wmknJWaD1WwTFvt8j nLvjpPmltqabZh4N2GmR3TxpnTn78tG5+58SBNjNkxCimtr+nzycvjQQbyuhI7Dk1x9YGA gueKp7ATujm2JNc3QMc0CSuG4CaH22AZlKBUAjmS1UClJSVPiK6GSeNzkUzRlPt8q5LtSC wbJfnRv4wJ+DuyJIW8WfqTe4/nhtHgBY8aawkENwRxMT9raTLA1pCrzAqXQ9AC2gCmj7QF 3hrBqnVicQiZj1+trSyT8ZupaAOeSmdEcKJYNxbskdo/PVnBl6BRyZDkWVGzVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677868260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ce+DHJd6/vleJ9wVe5RZiIX5srqIYul1H3tiYIDQVV4=; b=DXqkzadE5EjBbrklrhJzbNaLtvbwvQaOFm3nprNFOxkFncZ4zoU9NsVXWRy7gVtQCJt8oy dI0ND9OZFaROKpKgVynU0EtrOsA5bBAeAkNHcvCdtR8mrj4gJ2ODF56zX/qpBQ0Rq/QXQM sdDS3MUj/1EkhmsPI3qlkhyct192mv9W/xE6BVF+T0YEvR5Z/vr+IIFfpA8OTlwrdLkLT3 0rzR5/tFzAse5Szl4QjERJdH8DrdnvYuheLDWudDSj4XRHHyPmM7hbE8oaGMsgx4ulOot9 Zeeci4MdP4zgUyYBLutPRaln1wwktnG3BmZdAuEbZ74117vYSi5rQyeKkwquuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677868260; a=rsa-sha256; cv=none; b=cjf1K3+R3J7buUC5bAgvP2SGJS8Cj0QYRbxsBqEDSmd0BEalpSF6E5bU/LkXRXEIIFB/l1 UjnsQ4pj/fazTgB5e8Fb6V5rCbze7/i4KRkIQTdsVvX1PpafG1PJ4f7yttBQBTvjCz7+4m 89XZDAAUuqLJrex1XLXm1ivIyi7FlU/GLbbR8mwI+3A/c4JdVeUKadecI4kyw1yFOUX6Iz m9heggXEt6l/wzG0lUZZjS8BkVuP8OTaPM5+IPmGh/UN5EwYa2GoNRXA7GrIsIRpxuuwSE d9OG+TA5YjK5FIEZhR6A5g/lAULx3ZHImZVDU7umboT4raAWK8JS5YfqQqRCag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSxPH61mvz17fK; Fri, 3 Mar 2023 18:30: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 323IUxZI023703; Fri, 3 Mar 2023 18:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323IUxFu023702; Fri, 3 Mar 2023 18:30:59 GMT (envelope-from git) Date: Fri, 3 Mar 2023 18:30:59 GMT Message-Id: <202303031830.323IUxFu023702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 7fc82fd1f82e - main - ipfw: garbage collect ip_fw_chk_ptr 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fc82fd1f82eb37ff52a9199f1e7d640748811ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=7fc82fd1f82eb37ff52a9199f1e7d640748811ba commit 7fc82fd1f82eb37ff52a9199f1e7d640748811ba Author: Gleb Smirnoff AuthorDate: 2023-03-03 18:29:44 +0000 Commit: Gleb Smirnoff CommitDate: 2023-03-03 18:30:15 +0000 ipfw: garbage collect ip_fw_chk_ptr It is a relict left from the old times when ipfw(4) was hooked into IP stack directly, without pfil(9). --- sys/netgraph/ng_bridge.c | 10 ---------- sys/netinet/ip_var.h | 1 - sys/netinet/raw_ip.c | 1 - 3 files changed, 12 deletions(-) diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c index 14068878736d..a8ec0cd207a7 100644 --- a/sys/netgraph/ng_bridge.c +++ b/sys/netgraph/ng_bridge.c @@ -74,9 +74,6 @@ #include #include -#if 0 /* not used yet */ -#include -#endif #include #include #include @@ -860,13 +857,6 @@ ng_bridge_rcvdata(hook_p hook, item_p item) } } - /* Run packet through ipfw processing, if enabled */ -#if 0 - if (priv->conf.ipfw[linkNum] && V_fw_enable && V_ip_fw_chk_ptr != NULL) { - /* XXX not implemented yet */ - } -#endif - /* * If unicast and destination host known, deliver to host's link, * unless it is the same link as the packet came in on. diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 0a2d915b12b3..2dfd7ddb4822 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -296,7 +296,6 @@ enum { #define MTAG_IPFW_CALL 1308397630 /* call stack */ struct ip_fw_args; -typedef int (*ip_fw_chk_ptr_t)(struct ip_fw_args *args); typedef int (*ip_fw_ctl_ptr_t)(struct sockopt *); VNET_DECLARE(ip_fw_ctl_ptr_t, ip_fw_ctl_ptr); #define V_ip_fw_ctl_ptr VNET(ip_fw_ctl_ptr) diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 7278f9711cec..39f40fcebff1 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -97,7 +97,6 @@ VNET_DEFINE(struct inpcbinfo, ripcbinfo); * The data hooks are not used here but it is convenient * to keep them all in one place. */ -VNET_DEFINE(ip_fw_chk_ptr_t, ip_fw_chk_ptr) = NULL; VNET_DEFINE(ip_fw_ctl_ptr_t, ip_fw_ctl_ptr) = NULL; int (*ip_dn_ctl_ptr)(struct sockopt *); From nobody Fri Mar 3 18:36: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 4PSxWq1zr9z3wCJq for ; Fri, 3 Mar 2023 18:36:39 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic308-55.consmr.mail.gq1.yahoo.com (sonic308-55.consmr.mail.gq1.yahoo.com [98.137.68.31]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSxWp0VLTz3vqG for ; Fri, 3 Mar 2023 18:36:37 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=SQZ4lUs+; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.31 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677868596; bh=RRp8oRnZZsfaWG956RKYw4KQwwr3QB+bM1qv9R7Q2KA=; h=From:Subject:Date:Cc:To:References:From:Subject:Reply-To; b=SQZ4lUs+lqY1fNyMUigZNKOxd+WX4ZLycsR787Y7VC4eSEn4TfCBBeA+n/l1qZGNI51P1zMC+v/iNncBW+emuJLHl081ssk8DSciwZTSNXWlnOs9SyF1japvvKRGWyckxwxx2PiauakmqzXKxdxGlyB9QpWuEWVOlkz5G0782bLkZN8gCXRsdfM0y9sO4OWFJaDkuhBNkiJwx2Y7g8RVQq1EJQeuRjqZpbvBO/B8pgOwm/eyEbiI62qnczGTh/LGicM0/ebUli+jTbdDUYjytxpDW/CdJC8sV/Ky2XzJiPFJaPySN6UYW16I2WG9/EB5KnuexW+e/5TVbwcGtJ19Lg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677868596; bh=orqTuA6/oWDEw4fPYunX9QI9MGhnRNj/YNv1mXs8oN/=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=DDfnew4oN20tF+vBIwjtkLuDoGVAr+B0WmpaO3NlIRtStxM3Tmu040oOE4Z9FvW2zkP2hUSagsWStMD2aFCu0RmDNBX/bj2JiclT/QA+x7jy6TtlHBcejFg+tV2nlhEPpibQRXtNc5JlOxdNhv9c5T+ubIMcXQRbu/lbr0EnNRQehx1dVEx8FVj6IlU1zJia8SBlXoDjRzcRfEf312oGGSqq9n0A/Qm22RGZErXtvZImb3fGVyn0tmMfseywel6XL/aYc7gscHaU56f/MlAuNGOzVgIEHEzHYWcosrlGYEOjqsf2O1W7GMh4+pBl1cXaxwr01gXB+/ueK8pdmOK7DQ== X-YMail-OSG: VT0EyoAVM1nS0aL_q22ORxfuq2__kl2VhydoynReI8jI5f0IAz1_qemvJufiKtD TjVcX6OVNkFAnaJPpBJqBREJ.DQujTxQqhh.5cw86WqY0b3fHpbK2WJX6D0rruuRq78Y8r5trmyC S9C6Ek6aPOq75bJ1qvqGccMFT7_IW7xFySEex1iLVesbvDE8tUIb97hrEMJZ_FHVmbYjexlz94tt qzGwxUnAHJ6VpLzreXd0cEE5HDwpcjePNH9Tm7Lsn7ZYiyL8MbC5Rny9D6W6pyn3HFFtHUkf0.a5 MEoC.fi1CN2PQRzeNXb1CUQ8Qy1D7JNSpXof5j580Mmm0ExMeq6KnFSGmzJ9US7.kFfDofm_8iPZ mMGzqm0ysF48axSx3uORqUGPGwapQfjXc0Ameq0POMl0LgOrmnjKXz4yP2UKCPJonR79QYUveIO6 7vu.3zGogo9mj.sbp7aXXqef4yaAZhbsw71nOmGmXRXdI_CE2Sfr21R_tAmahoVWEuc7nXcAS4hQ 4ET6nwX046EB0w9.n8Z77xRg9AO4uRPrxNoPlGdUx81VDCVV0E0x4RW1P2GgOR4iDNi_XAhn_Oq. _P2ahPazi9B5OJKGlgukqQehH_Rs9HGDo.S8dey7kbS6rHCrWRFzrk0.lE.D4rfJwp1O73wQYLse iWxI8DEGDo4PRTBdNNJJU0ZFusQ.wfxRQQ75uVgLnzjWSGRS3okjhSeGNFu017J1YGHicBoQ_mbM sjQYDtUQyDy2f.orRCfy7rof4ZGp7tRds8WeyuCxfEwOEy_LgPBTwPmRG1_xqLRHN2vZ3YmIrhin kmEPRmt12W.Ny294NacM22vq13fDvdEu1abbkvg4i_Oo5D06vD6taSsDf1jfiRn4IaSGaJHcodrP 5tKpSdhI9_rz2dBwFnl4UP0QNtphuRXTLqIkMDrFzDANF_IAtp8hsuEgPx2qKYSJUjpxHeDjlrQG 4_vOUl693kPsyZK2kPwwQyFo1DrnIlKv5BcezW8ANS.wnPrvQniy0cxRQjTrz5adPd5DszU52Lgq AvZSkfpPs6ohyv5S6hLevsmdJVasIyuJjeizOeyl2XIIyRo3icEzW6V5hssteVK5gphTFuCHwKjH DkTPS8V3esnMnIKnWrgBp5KBcftPjttjNC_bIcQGefd5z8.nNVMbKtb4v124VbI0v.3ACqlgr.lx fKQnObAAZuTRUX8b2xl8IyCCYijtnU37CDXlY7uI8MouGUVG62gMKLrqRCelkK4dVh93cYbh7diY bE719bE1JgBlx3k8vo5ScJ6it24sVL2EMHWGiXjYi7ggo0eU9wVve9R1m6ZVRp0MQ5bNLm1QPrAP .Gqu3y41vdGyVMSgzir66SoQ66P.67SBJ1Oj6XlJf_WjBin5FNy2y0Tvdf.sS7wYYu5YC2SilrU3 6b3ysuPJbTaBnoHtXaiDiQ_7Y_bFON2et9uPrs4f2QcAnwsSYTmNGatYfUjxC7t1VTtpUvTTJ8o0 MapTMrRmwi2SOf6HRNSzFjhQDu374lBRKnPC10EzY8kuDGn_1NQUd7tOsC6q2KAjyPKyI3To5ePj X7vb4ImVRr_Y4Zo2.TN.a_T9gpHtfeXCdRa_NsGPDDgTtXbPHQKKbj5EtUtMQzfpdMMr1sSSXTfm 6cAKZwbqr1shtMKTz5wXZ_6rpjWyxJMiO8DCLM8dwJSdQou5GA1MBj0QewFNNsKG2lEMPGsmJash oT1UPPUtO3eqRNow3WCrXW64BmcXTDKBsB0XD7sShq25hi2cGJfdxz9Rlusnl_0o_M8a_Hfdn2Aa UWALFUNyHk6hinCqqCWl5CpnCr1Mrcj0ORJPrERoVwiKyZ4l3qn7KB4VW5I9kXSI.yGkRktJ5h7y PcTE4MaSmMunOQXe5DUbZeNTJvCC3Z2.NDer7fpiqyOvz4vZetVxpQEzthqDzXZ_FSYbUhJvrpbN Ps.64zlIaYBmsvFCP_r2f70gqFndmyJAW3OxyeGpV0SbaiEL2mWP13aDp67forlJOKSWgTlKD96y OgHFikBfhokKjcU56dB9rFIQWU5VkXnJitcCAxTuO2DTDfgVNUIegQb9x.uloyu4K6tW5t9sdg28 Xi090LHVVYR3JQavTRi6LiPFyajcFbW_hwaqa3WbuVlO5rPDglK5tyN58tifgqdAexDbDo7CqXBD fr0ihsCgDJG84oiY2kwQp3emWVVDdaC4T1UGeZY2iIm80I_Di1iXgigxNZsXUMsHS3vL7ulbTe4Z x6DXHkGltT8m8YrjkeKx8ABcQbWcB.rUlMUM24QevYsgB9KVCIOvzaA7Vn7HgPQZpRpOSSoQ4Kmz hORkEg6jEFA-- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.gq1.yahoo.com with HTTP; Fri, 3 Mar 2023 18:36:36 +0000 Received: by hermes--production-gq1-6cf7749bc8-g5z7v (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID f101f13d945b52ccdfa12d3640067696; Fri, 03 Mar 2023 18:36:31 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 \(3731.400.51.1.1\)) Subject: Re: git: a28ccb32bf56 - main - machine-id: generate a compact version of the uuid Message-Id: <6227093D-3D45-4300-97B9-2F2D76C083BE@yahoo.com> Date: Fri, 3 Mar 2023 10:36:20 -0800 Cc: "bapt@freebsd.org" , =?utf-8?Q?T=C4=B3l_Coosemans?= , FreeBSD-STABLE Mailing List , Current FreeBSD To: Mike Karels , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3731.400.51.1.1) References: <6227093D-3D45-4300-97B9-2F2D76C083BE.ref@yahoo.com> X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-0.50)[-0.496]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; TO_DN_EQ_ADDR_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.31:from]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCPT_COUNT_FIVE(0.00)[6]; DKIM_TRACE(0.00)[yahoo.com:+]; RCVD_COUNT_THREE(0.00)[3]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org] X-Rspamd-Queue-Id: 4PSxWp0VLTz3vqG X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N Mike Karels wrote on Date: Fri, 03 Mar 2023 16:12:50 UTC : > On 3 Mar 2023, at 9:40, T=C4=B3l Coosemans wrote: >=20 > > On Wed, 1 Mar 2023 18:18:33 GMT Baptiste Daroussin = wrote: > >> The branch main has been updated by bapt: > >> > >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da28ccb32bf5678fc401f1602865ee9b3= 7ca4c990 > >> > >> commit a28ccb32bf5678fc401f1602865ee9b37ca4c990 > >> Author: Baptiste Daroussin > >> AuthorDate: 2023-02-28 10:31:06 +0000 > >> Commit: Baptiste Daroussin > >> CommitDate: 2023-03-01 18:16:25 +0000 > >> > >> machine-id: generate a compact version of the uuid > >> > >> dbus and other actually expect an uuid without hyphens > >> > >> Reported by: tijl > >> MFC After: 3 days > >> --- > >> libexec/rc/rc.d/machine_id | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/libexec/rc/rc.d/machine_id = b/libexec/rc/rc.d/machine_id > >> index 7cfd7b2d92f8..8bf3e41d0603 100644 > >> --- a/libexec/rc/rc.d/machine_id > >> +++ b/libexec/rc/rc.d/machine_id > >> @@ -23,7 +23,7 @@ machine_id_start() > >> if [ ! -f ${machine_id_file} ] ; then > >> startmsg -n "Creating ${machine_id_file} " > >> t=3D$(mktemp -t machine-id) > >> - /bin/uuidgen -r -o $t > >> + /bin/uuidgen -r -c -o $t > >> install -C -o root -g wheel -m ${machine_id_perms} "$t" = "${machine_id_file}" > >> rm -f "$t" > >> startmsg 'done.' > > > > I really think this file should be defined to contain the same UUID = as > > /etc/hostid such that there's one and only one UUID per machine. = Having > > two different IDs needlessly complicates things if they end up in = logs > > etc. > > > > It also looks like on Linux virtual machines this file contains the > > SMBIOS UUID just like our /etc/hostid. If /etc/machine-id is = supposed > > to be a portable way to obtain that UUID it should be the same as > > /etc/hostid. >=20 > I agree. I had the same reaction when the machine-id was added, but > thought the requirements were different (in particular, the UUID = version). > If at all possible, the two should be the same except for hyphens. >=20 > > Please have another look at https://reviews.freebsd.org/D38811. This > > file is supposed to remain constant across updates. If we get this > > wrong in 13.2, applications may have to deal with the complications = for > > a very long time. >=20 > This should be resolved for 13.2 if at all possible. What are the properties for the content of /etc/hostid in FreeBSD? Where are they documented? /etc/machine-id has strong property guarnatee requirements in linux and dbus (which linux indicates it has adopted requirements from): https://man7.org/linux/man-pages/man5/machine-id.5.html reports: QUOTE The machine ID does not change based on local or network configuration or when hardware is replaced. Due to this and its greater length, it is a more useful replacement for the gethostid(3) call that POSIX specifies. This machine ID adheres to the same format and logic as the D-Bus machine ID. END QUOTE https://dbus.freedesktop.org/doc/dbus-uuidgen.1.html reports: ( used via dbus-uuidgen --ensure=3D/etc/machine-id as one way to get a linux-comaptibile /etc/machine-id for at least some types of contexts ) QUOTE The important properties of the machine UUID are that 1) it remains unchanged until the next reboot and 2) it is different for any two running instances of the OS kernel. That is, if two processes see the same UUID, they should also see the same shared memory, UNIX domain sockets, local X displays, localhost.localdomain resolution, process IDs, and so forth END QUOTE Does /etc/hostid generated the normal way in FreeBSD have such properties? (How do I look that up?) Returning to: https://man7.org/linux/man-pages/man5/machine-id.5.html QUOTE This ID uniquely identifies the host. It should be considered "confidential", and must not be exposed in untrusted environments, in particular on the network. If a stable unique identifier that is tied to the machine is needed for some application, the machine ID or any part of it must not be used directly. Instead the machine ID should be hashed with a cryptographic, keyed hash function, using a fixed, application-specific key. That way the ID will be properly unique, and derived in a constant way from the machine ID but there will be no way to retrieve the original machine ID from the application-specific one. END QUOTE Is that at least recommended for handling FreeBSD's /etc/hostid content? Is FreeBSD going to document /etc/machine-id content properties in a similar manor? If FreeBSD ends up with a /etc/machine-id that does not have the properties and recommended principles of use, it would appear that the /etc/machine-id path would be highly misleading and, so, inappropriate. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Mar 4 05:29: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 4PTD0h42Dlz3vZBr; Sat, 4 Mar 2023 05:29: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 4PTD0h3HGWz3QHk; Sat, 4 Mar 2023 05:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677907748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nVYDLm6rJmOABZHdNXXT+sbXfjAI4jkny1TfTIon7QI=; b=C9VjSl8jtz/KZvsEbscKFMqV5CHjpEGWM3qYQ5jG5oeli8FNsyyTWQKI0VZRbLgKAW9bKJ j303PniGr8I00op+8ni3QMFTIt9trWrMAXUGQgYoH0Nu5CcWMeHMB5Pd9DjiwpUWjVZvhc IqhfEEvIWk/Gux3Ei83GxrLpnsRRv4zpXzTjwUuGqir6uREBJ7E2Fr0AX4zOe1ii1eIczH b5gdBlf9DaBmqGKidi7r/hP7kcY5lCWgCnVZfcivoa2zeauEq8k7mcnacArOwEj2KVHuC7 MkAj4lujsYH18uUwpkPSoEJ23Hq0B1KNvKFwB/oiaD+RnKd2cFtQj+CbbK2ERA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677907748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nVYDLm6rJmOABZHdNXXT+sbXfjAI4jkny1TfTIon7QI=; b=sEwQ4lUJAnEKZzvCRmhjVhNgf812YN/1VlSUyNHci6oys8aKZJ5vUhRiUrqtkZp75ksfwm hMu+PkbVG1ipcdvdfuXek8JxttHvvNLC9rCZZHutszIFsYxICxgmz8QkSqgx/BxkL/ZxO9 WszZ7POhrfw01zgIafFnzcucfgcWICRs2zeixmpmlnmlILhG2ejEsitauU5FWs4tGKxIhV K/gHvHocaW0jJiU+N+/UUl9aI8NHHLsAli6ft/X+QszSBU3N2aoMEXQJl7gL9IDfqrtsLo 1whinQ5HPuJB0FtBlfTCfF1Z/hwcSrd54rQYZQtUHWoGv/ZqGU+TlXaYkz0goA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677907748; a=rsa-sha256; cv=none; b=Cj2/Rf8xGdz2+qM3DRRTzTb3dz4nHJD2fDjMjGuLUFlh89Wb2loug6YAvk66SzIwZu0/kC 0OoZ+SsqW3VbLwcUpvxFwA7tCix9IWfMcDlpKJEHM6pkxYMcS3GlbxiZ1oD//pXVAAClYv 6AOVMQvrMriSk6z2Naaj4DXW0P8pG8VtIW6L5W4RjiPr9rfvYCan4o0JebuXsotPNCz4Za N3J7HQ9IA7yLvhVfvZ1m9FdztEdDqlBi0c8EiMLsUlW7loQocZynoM3y7cCqsrOXtA5tSQ PE7WcCxrk2asBL9DDwVFRdh3Jmj3HosSEW1lSVsWjxJXnqX99FIdz5HflyYwWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTD0h2L5kzSMC; Sat, 4 Mar 2023 05:29: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 3245T8UM003184; Sat, 4 Mar 2023 05:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3245T8pB003183; Sat, 4 Mar 2023 05:29:08 GMT (envelope-from git) Date: Sat, 4 Mar 2023 05:29:08 GMT Message-Id: <202303040529.3245T8pB003183@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: 290f7f4a0921 - main - in_mcat.c: change multicast not member condition 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: 290f7f4a0921d1606aae8568a04f12025fbf834c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=290f7f4a0921d1606aae8568a04f12025fbf834c commit 290f7f4a0921d1606aae8568a04f12025fbf834c Author: Fidaullah Noonari AuthorDate: 2023-02-28 16:44:12 +0000 Commit: Warner Losh CommitDate: 2023-03-04 05:25:17 +0000 in_mcat.c: change multicast not member condition If there is no source filter entry => block if that's SSM ("exclude" mode per RFC 3678 clause 3). If there is an entry => check its action & block if the action is "exclude". It would be nice if the test case in this PR were converted into an ATF test case, but not blocking on that. Reviewed by: imp, melifaro Pull Request: https://github.com/freebsd/freebsd-src/pull/601 --- sys/netinet/in_mcast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index bbedbf8ceaa3..ef29a8072ccb 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -480,7 +480,7 @@ imo_multi_filter(const struct ip_moptions *imo, const struct ifnet *ifp, ims = imo_match_source(imf, src); if ((ims == NULL && mode == MCAST_INCLUDE) || - (ims != NULL && ims->imsl_st[0] != mode)) + (ims != NULL && ims->imsl_st[0] == MCAST_EXCLUDE)) return (MCAST_NOTSMEMBER); return (MCAST_PASS); From nobody Sat Mar 4 06:03: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 4PTDm850wlz3vbdT; Sat, 4 Mar 2023 06:03:20 +0000 (UTC) (envelope-from bapt@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 4PTDm84Mztz3jLQ; Sat, 4 Mar 2023 06:03:20 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677909800; 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=PeEBVBWVW7CdUhuD0MpFiPJAmRdS0rj+pVxcakykXvo=; b=sVn/Qfvjs+yk9/5NAXBno3lXZeomUgXA1hz7wz2L5KsshAWiQorQLfrZ0Cyd7/7C6jQceF rovKwOaBSkGpKXx67cz4wzEbn+S61gUIuQZrQKgJowQsA03EX22d9pzwc0F6CqBHOISXX7 vBdtLqO7yakVPNxX6iglNej3M0n5drmMuoB7g300rNk+WTrXnS9QWA5DMnYR8HSvtTqWY5 /0tcCdCVDaPbhDMRQjKZ/hn1rz7flCtcWwF6T1y1ZsecBBdVc4AUEgVldzPTJCdBiuqsU8 5PjtBLz1vAYKmIDaeU8ngPXAVmiswWFKmCqJSRBe0c5YXPiyTpCIJwUt/mS94g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677909800; 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=PeEBVBWVW7CdUhuD0MpFiPJAmRdS0rj+pVxcakykXvo=; b=cajBlP5pP3FzqXhaWGwWewnRYyhQ6TMd7jr+8X+a01BaaI1pwtJZjK3TL0Pp0outuR/D4N c0ZZN7E2DiIXRSC63hyFInUiJ3NfWFcmB8VKI2I6x6PfDsys5KpvXmcGHw6JgsyKwQywZv FfZ0q8YnpH8RKlpWsZEyT88tjjKr39zWFXMCkDqesxcfuEwVqVDlyJy0tRqakgK7W8xDm/ KzA6jJwchnOvcP7AlY67cG3zuJuZj5fYlD7FpF+CzlgXIT3AAz06XUOJxJs8RR2gZuSJy8 vAJB3w6d++dVmJq0XOqjUtrd/c4XSNKH6dGRT2RKVElcQ6d7nns/FlEedE/WfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677909800; a=rsa-sha256; cv=none; b=JgkIofd7nx9GZC34HY4QbzQsqEGYyaVGN0kDkL8UVEzjDZ7UHl29myhq62N4SqMLgKMzJP OVMwsKtuxWa5uXX7LhB85mFsE/6cHXhv+e5a4RME6qfPxE5OY1FKiVDr2DNtI2UuMrmIvp AvppafNeqo6D3MfJuCYEZjdwHQc3K8Wgqw8nMffYxkaVjj4ROOIsravaCLb6ZNC0kEp7cX fKC68JLoJFP+GpxnJ0c2ZbnAzA8XgAuuxitAbLD1fjmRnxIHgsA7YEO4iiEI8QMgYhxkot rlvdWl83uMLNnfS1i/ROhc3lS6lAU4Yw2y/C4zwb74j65opJIn5nR38wfBny7A== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_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: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PTDm82T5zz1Gh2; Sat, 4 Mar 2023 06:03:20 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from mail.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id E4C181BCEEE; Sat, 4 Mar 2023 07:03:16 +0100 (CET) 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 Date: Sat, 04 Mar 2023 06:03:16 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: "Baptiste Daroussin" Message-ID: <25c644b8deafb5436c76dbffd48adfd07518f513@freebsd.org> TLS-Required: No Subject: Re: git: a28ccb32bf56 - main - machine-id: generate a compact version of the uuid To: "Mike Karels" , "=?utf-8?B?VMSzbCBDb29zZW1hbnM=?=" Cc: re@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <98A14373-D09C-437D-AAB8-0A140FB46C5E@karels.net> References: <98A14373-D09C-437D-AAB8-0A140FB46C5E@karels.net> <202303011818.321IIXIT067595@gitrepo.freebsd.org> <20230303164028.35766f35@hal.tijl.coosemans.org> X-ThisMailContainsUnwantedMimeParts: N 3 mars 2023 =C3=A0 17:12 "Mike Karels" a =C3=A9crit: >=20 >=20On 3 Mar 2023, at 9:40, T=C4=B3l Coosemans wrote: >=20 >=20>=20 >=20> On Wed, 1 Mar 2023 18:18:33 GMT Baptiste Daroussin wrote: > >=20 >=20> >=20 >=20> > The branch main has been updated by bapt: > > >=20 >=20> > URL:=20 >=20> > https://cgit.freebsd.org/src/commit/?id=3Da28ccb32bf5678fc401f160= 2865ee9b37ca4c990 > > >=20 >=20> > commit a28ccb32bf5678fc401f1602865ee9b37ca4c990 > > >=20 >=20> > Author: Baptiste Daroussin > > >=20 >=20> > AuthorDate: 2023-02-28 10:31:06 +0000 > > >=20 >=20> > Commit: Baptiste Daroussin > > >=20 >=20> > CommitDate: 2023-03-01 18:16:25 +0000 > > >=20 >=20> > machine-id: generate a compact version of the uuid > > >=20 >=20> > dbus and other actually expect an uuid without hyphens > > >=20 >=20> > Reported by: tijl > > >=20 >=20> > MFC After: 3 days > > >=20 >=20> > --- > > >=20 >=20> > libexec/rc/rc.d/machine_id | 2 +- > > >=20 >=20> > 1 file changed, 1 insertion(+), 1 deletion(-) > > >=20 >=20> > diff --git a/libexec/rc/rc.d/machine_id b/libexec/rc/rc.d/machin= e_id > > >=20 >=20> > index 7cfd7b2d92f8..8bf3e41d0603 100644 > > >=20 >=20> > --- a/libexec/rc/rc.d/machine_id > > >=20 >=20> > +++ b/libexec/rc/rc.d/machine_id > > >=20 >=20> > @@ -23,7 +23,7 @@ machine_id_start() > > >=20 >=20> > if [ ! -f ${machine_id_file} ] ; then > > >=20 >=20> > startmsg -n "Creating ${machine_id_file} " > > >=20 >=20> > t=3D$(mktemp -t machine-id) > > >=20 >=20> > - /bin/uuidgen -r -o $t > > >=20 >=20> > + /bin/uuidgen -r -c -o $t > > >=20 >=20> > install -C -o root -g wheel -m ${machine_id_perms} "$t" "${machi= ne_id_file}" > > >=20 >=20> > rm -f "$t" > > >=20 >=20> > startmsg 'done.' > > >=20 >=20>=20 >=20> I really think this file should be defined to contain the same UUI= D as > >=20 >=20> /etc/hostid such that there's one and only one UUID per machine. H= aving > >=20 >=20> two different IDs needlessly complicates things if they end up in = logs > >=20 >=20> etc. > >=20 >=20> It also looks like on Linux virtual machines this file contains th= e > >=20 >=20> SMBIOS UUID just like our /etc/hostid. If /etc/machine-id is suppo= sed > >=20 >=20> to be a portable way to obtain that UUID it should be the same as > >=20 >=20> /etc/hostid. > >=20 >=20 > I agree. I had the same reaction when the machine-id was added, but >=20 >=20thought the requirements were different (in particular, the UUID vers= ion). >=20 >=20If at all possible, the two should be the same except for hyphens. >=20 >=20>=20 >=20> Please have another look at . This > > https://reviews.freebsd.org/D38811 > > file is supposed to remain constant across updates. If we get this > >=20 >=20> wrong in 13.2, applications may have to deal with the complication= s for > >=20 >=20> a very long time. > >=20 >=20 > This should be resolved for 13.2 if at all possible. >=20 >=20 Mike > The requirements are diff=C3=A9rent rfc 422 yes would accept what hostid = format uses still all new uuid should follow rfc422. Best regards Bapt From nobody Sat Mar 4 09:12: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 4PTJyf1CMxz3vmqr; Sat, 4 Mar 2023 09:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PTJyd6qg1z3xTK; Sat, 4 Mar 2023 09:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LyBLWvn81mBNCYTJsLKl+NiVZQyssvbwSLBQChXtaYM=; b=ZoQeQOuTUOVLKxYsfVLYdNWSFvrqzs+1j37A4Qb3j1SwbxB3pSq56hR1Xn2Fc2JjuvBt1s UaMadGhieD0ipcDhYENxpoN/NAzpPssoYJ6B/1XPw0ix9QpWyzyPVyx8wv7yXzPA5wmHxl svjpPtym+w0+tZ4WnWVLw7sDvl83h8dfGI7Qzn/ecdxiTdMpTwqqzc1Eoz8Fbw237efJVN VavvRQrF+gv4XUWD48y00GMO32yKygrjH3bK3nwufujGNQFcFXOIEXS/Mphib2GUGZx8pr BxF7gyHSHtBDyoD/C8Cq8N+G91Iz8Z4Q4Tpc6EB5vKEmInn73/yNa5Fvei7q0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LyBLWvn81mBNCYTJsLKl+NiVZQyssvbwSLBQChXtaYM=; b=L6V6SqqCIMS9pcbgEThfVFENeXjGbJptpTgw32M+c/7GdElN8bQHKSdmqND+jWw60/z/YE YObLILOionepLMUpas/2EejNUbHMNSzWFhcGYYL9cF6RVm4WsIjcIaXr3k8LegxdLdn4KE RCGEX94wyY7L5Oq6Ad2039sk3DhX9a/X+uYKI/dpMr9hCRcmDe45OPkQWsIbEjRJCXTrzC WvMG4Bht66OB1/2zaSU6vVY48McAzNoUdm6F7W3wpPrc+K6pPGTnII8funvEgezFt5pUCu UW5sGknVHxUym+bNtAD6C4BEKf2ubzXf1pOZCpnP3NHC0utZiX+LlVW7OuiRGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921161; a=rsa-sha256; cv=none; b=GvCOi+ee3WaKJKd4IqKTNt1idXUktOHAuMtei898PlDU3eE3V9MyWEab9855hQPLbba1Sa /B8VDsXORkmMf0IbIfpw4HTo0fTwZaIUmb3NvUj1MicGXcWvAb+Z4rbGnq2AZM8uZ6hTpH Q2nmzeNpbuj4yPhWXx45ZI321yYJUTJ+q/2TfpUk3A0Njluw7dCp/QFIBBFAGRdGmq+chQ JREq9cMdcvqvY0IHEgFDWHNikuQDxEovqSxnR+dyVny4vqpIzXgVhd4sfS1/O0iVghq6q6 HHutCnyNPdl+Lo1sNhnRHPL4dnmGpjW995/3147Qi6KImSMqvQR2uMFNrwUEMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyd5wbZzYnJ; Sat, 4 Mar 2023 09:12: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 3249Cfus078790; Sat, 4 Mar 2023 09:12:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249Cfuh078789; Sat, 4 Mar 2023 09:12:41 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:41 GMT Message-Id: <202303040912.3249Cfuh078789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 6c5786fd37cb - main - linux(4): Migrate to IfAPI 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c5786fd37cb588f577c7fa63c56fc2f59c38786 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6c5786fd37cb588f577c7fa63c56fc2f59c38786 commit 6c5786fd37cb588f577c7fa63c56fc2f59c38786 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:38 +0000 linux(4): Migrate to IfAPI Migrate linux and linprocfs to use the IfAPI interfaces instead of direct ifnet accesses. The code initially writed by jhibbits@, and adapted by me to 3ab3c9c2. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D38735 --- sys/compat/linprocfs/linprocfs.c | 72 ++++++++++-------- sys/compat/linux/linux.c | 160 +++++++++++++++++++++++++-------------- sys/compat/linux/linux.h | 4 +- sys/compat/linux/linux_ioctl.c | 124 +++++++++++++++++------------- 4 files changed, 217 insertions(+), 143 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index d57c546eb637..a150019ae5ef 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1478,12 +1478,49 @@ linprocfs_doprocmem(PFS_FILL_ARGS) /* * Filler function for proc/net/dev */ +static int +linprocfs_donetdev_cb(if_t ifp, void *arg) +{ + char ifname[LINUX_IFNAMSIZ]; + struct sbuf *sb = arg; + + if (ifname_bsd_to_linux_ifp(ifp, ifname, sizeof(ifname)) <= 0) + return (ENODEV); + + sbuf_printf(sb, "%6.6s: ", ifname); + sbuf_printf(sb, "%7ju %7ju %4ju %4ju %4lu %5lu %10lu %9ju ", + (uintmax_t)if_getcounter(ifp, IFCOUNTER_IBYTES), + (uintmax_t)if_getcounter(ifp, IFCOUNTER_IPACKETS), + (uintmax_t)if_getcounter(ifp, IFCOUNTER_IERRORS), + (uintmax_t)if_getcounter(ifp, IFCOUNTER_IQDROPS), + /* rx_missed_errors */ + 0UL, /* rx_fifo_errors */ + 0UL, /* rx_length_errors + + * rx_over_errors + + * rx_crc_errors + + * rx_frame_errors */ + 0UL, /* rx_compressed */ + (uintmax_t)if_getcounter(ifp, IFCOUNTER_IMCASTS)); + /* XXX-BZ rx only? */ + sbuf_printf(sb, "%8ju %7ju %4ju %4ju %4lu %5ju %7lu %10lu\n", + (uintmax_t)if_getcounter(ifp, IFCOUNTER_OBYTES), + (uintmax_t)if_getcounter(ifp, IFCOUNTER_OPACKETS), + (uintmax_t)if_getcounter(ifp, IFCOUNTER_OERRORS), + (uintmax_t)if_getcounter(ifp, IFCOUNTER_OQDROPS), + 0UL, /* tx_fifo_errors */ + (uintmax_t)if_getcounter(ifp, IFCOUNTER_COLLISIONS), + 0UL, /* tx_carrier_errors + + * tx_aborted_errors + + * tx_window_errors + + * tx_heartbeat_errors*/ + 0UL); /* tx_compressed */ + return (0); +} + static int linprocfs_donetdev(PFS_FILL_ARGS) { struct epoch_tracker et; - char ifname[16]; /* XXX LINUX_IFNAMSIZ */ - struct ifnet *ifp; sbuf_printf(sb, "%6s|%58s|%s\n" "%6s|%58s|%58s\n", @@ -1494,36 +1531,7 @@ linprocfs_donetdev(PFS_FILL_ARGS) CURVNET_SET(TD_TO_VNET(curthread)); NET_EPOCH_ENTER(et); - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - ifname_bsd_to_linux_ifp(ifp, ifname, sizeof(ifname)); - sbuf_printf(sb, "%6.6s: ", ifname); - sbuf_printf(sb, "%7ju %7ju %4ju %4ju %4lu %5lu %10lu %9ju ", - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IBYTES), - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IPACKETS), - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IERRORS), - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IQDROPS), - /* rx_missed_errors */ - 0UL, /* rx_fifo_errors */ - 0UL, /* rx_length_errors + - * rx_over_errors + - * rx_crc_errors + - * rx_frame_errors */ - 0UL, /* rx_compressed */ - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_IMCASTS)); - /* XXX-BZ rx only? */ - sbuf_printf(sb, "%8ju %7ju %4ju %4ju %4lu %5ju %7lu %10lu\n", - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_OBYTES), - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_OPACKETS), - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_OERRORS), - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_OQDROPS), - 0UL, /* tx_fifo_errors */ - (uintmax_t )ifp->if_get_counter(ifp, IFCOUNTER_COLLISIONS), - 0UL, /* tx_carrier_errors + - * tx_aborted_errors + - * tx_window_errors + - * tx_heartbeat_errors*/ - 0UL); /* tx_compressed */ - } + if_foreach(linprocfs_donetdev_cb, sb); NET_EPOCH_EXIT(et); CURVNET_RESTORE(); diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 2570a5fcc89c..a7844f4bbbcf 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -287,13 +287,37 @@ ifname_bsd_to_linux_idx(u_int idx, char *lxname, size_t len) /* * Translate a FreeBSD interface name to a Linux interface name, - * and return the number of bytes copied to lxname. + * and return the number of bytes copied to lxname, 0 if interface + * not found, -1 on error. */ +struct ifname_bsd_to_linux_ifp_cb_s { + struct ifnet *ifp; + int ethno; + char *lxname; + size_t len; +}; + +static int +ifname_bsd_to_linux_ifp_cb(if_t ifp, void *arg) +{ + struct ifname_bsd_to_linux_ifp_cb_s *cbs = arg; + + if (ifp == cbs->ifp) + return (snprintf(cbs->lxname, cbs->len, "eth%d", cbs->ethno)); + if (IFP_IS_ETH(ifp)) + cbs->ethno++; + return (0); +} + int ifname_bsd_to_linux_ifp(struct ifnet *ifp, char *lxname, size_t len) { - struct ifnet *ifscan; - int unit; + struct ifname_bsd_to_linux_ifp_cb_s arg = { + .ifp = ifp, + .ethno = 0, + .lxname = lxname, + .len = len, + }; NET_EPOCH_ASSERT(); @@ -306,17 +330,10 @@ ifname_bsd_to_linux_ifp(struct ifnet *ifp, char *lxname, size_t len) /* Short-circuit non ethernet interfaces. */ if (!IFP_IS_ETH(ifp) || linux_use_real_ifname(ifp)) - return (strlcpy(lxname, ifp->if_xname, len)); - - /* Determine the (relative) unit number for ethernet interfaces. */ - unit = 0; - CK_STAILQ_FOREACH(ifscan, &V_ifnet, if_link) { - if (ifscan == ifp) - return (snprintf(lxname, len, "eth%d", unit)); - if (IFP_IS_ETH(ifscan)) - unit++; - } - return (0); + return (strlcpy(lxname, if_name(ifp), len)); + + /* Determine the (relative) unit number for ethernet interfaces. */ + return (if_foreach(ifname_bsd_to_linux_ifp_cb, &arg)); } /* @@ -325,14 +342,53 @@ ifname_bsd_to_linux_ifp(struct ifnet *ifp, char *lxname, size_t len) * bsdname and lxname need to be least IFNAMSIZ bytes long, but * can point to the same buffer. */ +struct ifname_linux_to_bsd_cb_s { + bool is_lo; + bool is_eth; + int ethno; + int unit; + const char *lxname; + if_t ifp; +}; + +static int +ifname_linux_to_bsd_cb(if_t ifp, void *arg) +{ + struct ifname_linux_to_bsd_cb_s *cbs = arg; + + NET_EPOCH_ASSERT(); + + /* + * Allow Linux programs to use FreeBSD names. Don't presume + * we never have an interface named "eth", so don't make + * the test optional based on is_eth. + */ + if (strncmp(if_name(ifp), cbs->lxname, LINUX_IFNAMSIZ) == 0) + goto out; + if (cbs->is_eth && IFP_IS_ETH(ifp) && cbs->unit == cbs->ethno) + goto out; + if (cbs->is_lo && IFP_IS_LOOP(ifp)) + goto out; + if (IFP_IS_ETH(ifp)) + cbs->ethno++; + return (0); + +out: + cbs->ifp = ifp; + return (1); +} + struct ifnet * ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) { - struct ifnet *ifp; - int len, unit; + struct ifname_linux_to_bsd_cb_s arg = { + .ethno = 0, + .lxname = lxname, + .ifp = NULL, + }; + struct epoch_tracker et; + int len, ret; char *ep; - int index; - bool is_eth, is_lo; for (len = 0; len < LINUX_IFNAMSIZ; ++len) if (!isalpha(lxname[len]) || lxname[len] == '\0') @@ -343,34 +399,21 @@ ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) * Linux loopback interface name is lo (not lo0), * we translate lo to lo0, loX to loX. */ - is_lo = (len == 2 && strncmp(lxname, "lo", LINUX_IFNAMSIZ) == 0); - unit = (int)strtoul(lxname + len, &ep, 10); + arg.is_lo = (len == 2 && strncmp(lxname, "lo", LINUX_IFNAMSIZ) == 0); + arg.unit = (int)strtoul(lxname + len, &ep, 10); if ((ep == NULL || ep == lxname + len || ep >= lxname + LINUX_IFNAMSIZ) && - is_lo == 0) + arg.is_lo == 0) return (NULL); - index = 0; - is_eth = (len == 3 && strncmp(lxname, "eth", len) == 0); + arg.is_eth = (len == 3 && strncmp(lxname, "eth", len) == 0); CURVNET_SET(TD_TO_VNET(td)); - IFNET_RLOCK(); - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - /* - * Allow Linux programs to use FreeBSD names. Don't presume - * we never have an interface named "eth", so don't make - * the test optional based on is_eth. - */ - if (strncmp(ifp->if_xname, lxname, LINUX_IFNAMSIZ) == 0) - break; - if (is_eth && IFP_IS_ETH(ifp) && unit == index++) - break; - if (is_lo && IFP_IS_LOOP(ifp)) - break; - } - IFNET_RUNLOCK(); + NET_EPOCH_ENTER(et); + ret = if_foreach(ifname_linux_to_bsd_cb, &arg); + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); - if (ifp != NULL && bsdname != NULL) - strlcpy(bsdname, ifp->if_xname, IFNAMSIZ); - return (ifp); + if (ret > 0 && arg.ifp != NULL && bsdname != NULL) + strlcpy(bsdname, if_name(arg.ifp), IFNAMSIZ); + return (arg.ifp); } void @@ -378,7 +421,7 @@ linux_ifflags(struct ifnet *ifp, short *flags) { unsigned short fl; - fl = (ifp->if_flags | ifp->if_drv_flags) & 0xffff; + fl = (if_getflags(ifp) | if_getdrvflags(ifp)) & 0xffff; *flags = 0; if (fl & IFF_UP) *flags |= LINUX_IFF_UP; @@ -402,32 +445,35 @@ linux_ifflags(struct ifnet *ifp, short *flags) *flags |= LINUX_IFF_MULTICAST; } +static u_int +linux_ifhwaddr_cb(void *arg, struct ifaddr *ifa, u_int count) +{ + struct sockaddr_dl *sdl = (struct sockaddr_dl *)ifa->ifa_addr; + struct l_sockaddr *lsa = arg; + + if (count > 0) + return (0); + if (sdl->sdl_type != IFT_ETHER) + return (0); + bzero(lsa, sizeof(*lsa)); + lsa->sa_family = LINUX_ARPHRD_ETHER; + bcopy(LLADDR(sdl), lsa->sa_data, LINUX_IFHWADDRLEN); + return (1); +} + int linux_ifhwaddr(struct ifnet *ifp, struct l_sockaddr *lsa) { - struct ifaddr *ifa; - struct sockaddr_dl *sdl; if (IFP_IS_LOOP(ifp)) { bzero(lsa, sizeof(*lsa)); lsa->sa_family = LINUX_ARPHRD_LOOPBACK; return (0); } - if (!IFP_IS_ETH(ifp)) return (ENOENT); - - CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { - sdl = (struct sockaddr_dl*)ifa->ifa_addr; - if (sdl != NULL && (sdl->sdl_family == AF_LINK) && - (sdl->sdl_type == IFT_ETHER)) { - bzero(lsa, sizeof(*lsa)); - lsa->sa_family = LINUX_ARPHRD_ETHER; - bcopy(LLADDR(sdl), lsa->sa_data, LINUX_IFHWADDRLEN); - return (0); - } - } - + if (if_foreach_addr_type(ifp, AF_LINK, linux_ifhwaddr_cb, lsa) > 0) + return (0); return (ENOENT); } diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 055d8e3b9cf6..e133c35010cf 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -287,8 +287,8 @@ struct l_statx { /* * Criteria for interface name translation */ -#define IFP_IS_ETH(ifp) ((ifp)->if_type == IFT_ETHER) -#define IFP_IS_LOOP(ifp) ((ifp)->if_type == IFT_LOOP) +#define IFP_IS_ETH(ifp) (if_gettype(ifp) == IFT_ETHER) +#define IFP_IS_LOOP(ifp) (if_gettype(ifp) == IFT_LOOP) struct ifnet; diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index bfab28f841a0..8900102bbbc7 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2108,40 +2108,91 @@ linux_ioctl_ifname(struct thread *td, struct l_ifreq *uifr) /* * Implement the SIOCGIFCONF ioctl */ +static u_int +linux_ifconf_ifaddr_cb(void *arg, struct ifaddr *ifa, u_int count) +{ +#ifdef COMPAT_LINUX32 + struct l_ifconf *ifc; +#else + struct ifconf *ifc; +#endif + + ifc = arg; + ifc->ifc_len += sizeof(struct l_ifreq); + return (1); +} + +static int +linux_ifconf_ifnet_cb(if_t ifp, void *arg) +{ + + if_foreach_addr_type(ifp, AF_INET, linux_ifconf_ifaddr_cb, arg); + return (0); +} + +struct linux_ifconfig_ifaddr_cb2_s { + struct l_ifreq ifr; + struct sbuf *sb; + size_t max_len; + size_t valid_len; +}; + +static u_int +linux_ifconf_ifaddr_cb2(void *arg, struct ifaddr *ifa, u_int len) +{ + struct linux_ifconfig_ifaddr_cb2_s *cbs = arg; + struct sockaddr *sa = ifa->ifa_addr; + + cbs->ifr.ifr_addr.sa_family = LINUX_AF_INET; + memcpy(cbs->ifr.ifr_addr.sa_data, sa->sa_data, + sizeof(cbs->ifr.ifr_addr.sa_data)); + sbuf_bcat(cbs->sb, &cbs->ifr, sizeof(cbs->ifr)); + cbs->max_len += sizeof(cbs->ifr); + + if (sbuf_error(cbs->sb) == 0) + cbs->valid_len = sbuf_len(cbs->sb); + return (1); +} + +static int +linux_ifconf_ifnet_cb2(if_t ifp, void *arg) +{ + struct linux_ifconfig_ifaddr_cb2_s *cbs = arg; + + bzero(&cbs->ifr, sizeof(cbs->ifr)); + ifname_bsd_to_linux_ifp(ifp, cbs->ifr.ifr_name, + sizeof(cbs->ifr.ifr_name)); + + /* Walk the address list */ + if_foreach_addr_type(ifp, AF_INET, linux_ifconf_ifaddr_cb2, cbs); + return (0); +} static int linux_ifconf(struct thread *td, struct ifconf *uifc) { + struct linux_ifconfig_ifaddr_cb2_s cbs; struct epoch_tracker et; #ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else struct ifconf ifc; #endif - struct l_ifreq ifr; - struct ifnet *ifp; - struct ifaddr *ifa; struct sbuf *sb; - int error, full = 0, valid_len, max_len; + int error, full; error = copyin(uifc, &ifc, sizeof(ifc)); if (error != 0) return (error); - - max_len = maxphys - 1; + full = 0; + cbs.max_len = maxphys - 1; CURVNET_SET(TD_TO_VNET(td)); /* handle the 'request buffer size' case */ if ((l_uintptr_t)ifc.ifc_buf == PTROUT(NULL)) { ifc.ifc_len = 0; NET_EPOCH_ENTER(et); - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { - struct sockaddr *sa = ifa->ifa_addr; - if (sa->sa_family == AF_INET) - ifc.ifc_len += sizeof(ifr); - } - } + if_foreach(linux_ifconf_ifnet_cb, &ifc); NET_EPOCH_EXIT(et); error = copyout(&ifc, uifc, sizeof(ifc)); CURVNET_RESTORE(); @@ -2154,56 +2205,25 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) } again: - if (ifc.ifc_len <= max_len) { - max_len = ifc.ifc_len; + if (ifc.ifc_len <= cbs.max_len) { + cbs.max_len = ifc.ifc_len; full = 1; } - sb = sbuf_new(NULL, NULL, max_len + 1, SBUF_FIXEDLEN); - max_len = 0; - valid_len = 0; + cbs.sb = sb = sbuf_new(NULL, NULL, cbs.max_len + 1, SBUF_FIXEDLEN); + cbs.max_len = 0; + cbs.valid_len = 0; /* Return all AF_INET addresses of all interfaces */ NET_EPOCH_ENTER(et); - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - int addrs = 0; - - bzero(&ifr, sizeof(ifr)); - ifname_bsd_to_linux_ifp(ifp, ifr.ifr_name, - sizeof(ifr.ifr_name)); - - /* Walk the address list */ - CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { - struct sockaddr *sa = ifa->ifa_addr; - - if (sa->sa_family == AF_INET) { - ifr.ifr_addr.sa_family = LINUX_AF_INET; - memcpy(ifr.ifr_addr.sa_data, sa->sa_data, - sizeof(ifr.ifr_addr.sa_data)); - sbuf_bcat(sb, &ifr, sizeof(ifr)); - max_len += sizeof(ifr); - addrs++; - } - - if (sbuf_error(sb) == 0) - valid_len = sbuf_len(sb); - } - if (addrs == 0) { - bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr)); - sbuf_bcat(sb, &ifr, sizeof(ifr)); - max_len += sizeof(ifr); - - if (sbuf_error(sb) == 0) - valid_len = sbuf_len(sb); - } - } + if_foreach(linux_ifconf_ifnet_cb2, &cbs); NET_EPOCH_EXIT(et); - if (valid_len != max_len && !full) { + if (cbs.valid_len != cbs.max_len && !full) { sbuf_delete(sb); goto again; } - ifc.ifc_len = valid_len; + ifc.ifc_len = cbs.valid_len; sbuf_finish(sb); error = copyout(sbuf_data(sb), PTRIN(ifc.ifc_buf), ifc.ifc_len); if (error == 0) From nobody Sat Mar 4 09:12: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 4PTJyg2VJ8z3vmnQ; Sat, 4 Mar 2023 09:12: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 4PTJyg1DhFz3xvN; Sat, 4 Mar 2023 09:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ao3PmmlsABwlRRtFOftxGyHH3wtxIsjU04ZxXyLeAC0=; b=sdldINB1z9d5Y3MAbEWB5+rer2Ejvh6y+tGREvFI3x/sXGCPDxRhhtzdeSiidd65peJvhL M0U2nt3yf5Ogu2tmTuXq22soAv8M+x0ZSfmVgmA5IgCDkj2ltKgY1Y3koRtyBjrYaQJaeC /WB9PjB2aoNVCpH9FYGuRSMRJUasGxt5chuuvEB4II95u7ZK7rs9o90HJq4ngIFleNV9RW feDVNE1bl0QXdkfKB0xC9PBvYVXNluqTzzTqBErs3oTwVgKWUjCu4e6cCzm+TuhnSRIwL3 dv5da0Cf3gV+/eEWFpwR18OQLSqZMTaleGc6bXEM1z8Zoe2Evdytga/f7+3iVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ao3PmmlsABwlRRtFOftxGyHH3wtxIsjU04ZxXyLeAC0=; b=VaARinklHThIYAkVGj5mEE+zCkflk5HfNsh+XKIdfIAvWk4O+oYABS18xMenugFxrY6X6i Jr3Z3E3j0LR/Sc67Hef5oNsfqbTukA1u3rh2zyQgpFmeypfGXMYia6MejgaNE79d2ErgrT z8y/3lsIIESCGTUiDly8NoDVjsdoz/ns6Gxv84ammHr4Y5UXHJng5K9fFGvXMK/8YTVdnH ApyxNEpvSfFCect8TmjvlkBqYIAmpFrrvgLcFBzngxBujP+VVC+GsZepH83GyYEC8tJY0m UAcox4Ahu8/m4UVj4oZc5EnfKKoVyyFk9dPt7nkjSAAYH3zHQKYCz352onjOGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921163; a=rsa-sha256; cv=none; b=OHq0Qvd+21+nqql6qZdDpmsc9uynKtq5g4aj7OhTE9m3QBXp3RsrhL6Z6rWHFtP4nrZeEU s0AkpNHuqiNVvPF4l/3ThZ5zIioNjdAL2s4ZYalrRrfqFsUH3MJ7U4QSSkC4IJMSN8v4Ti 8sydTwVDCx9VrTAJBibViWGDMtiQbApjyxoKz+giavo5/StOYvq0c+BAFDJIp5jRoQK/eg GXGoxQ2H+Kstppf5+OBLu/66IX6IOrTlFGJvpWW//c6dp4tN3z6Hg45983dYu8HXn3jA16 ErumGpVh51ESwppHzn+iYMMH0cd9maoF5soUhJ2ZKmZNa3/sFcCHjQGKAaeZSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyf6rHczZGV; Sat, 4 Mar 2023 09:12: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 3249CgnA078809; Sat, 4 Mar 2023 09:12:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249CgjV078808; Sat, 4 Mar 2023 09:12:42 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:42 GMT Message-Id: <202303040912.3249CgjV078808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 130383f2f10c - main - linux(4): Make linux_ifflags return a value 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 130383f2f10c110de3379a302766fa098290d5ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=130383f2f10c110de3379a302766fa098290d5ac commit 130383f2f10c110de3379a302766fa098290d5ac Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:38 +0000 linux(4): Make linux_ifflags return a value To simplify the use of the function in the printf-like statements. Differential Revision: https://reviews.freebsd.org/D38830 --- sys/compat/linsysfs/linsysfs.c | 4 +--- sys/compat/linux/linux.c | 29 +++++++++++++++-------------- sys/compat/linux/linux_common.h | 2 +- sys/compat/linux/linux_ioctl.c | 4 ++-- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/sys/compat/linsysfs/linsysfs.c b/sys/compat/linsysfs/linsysfs.c index f916858a17a7..0c0744a054a0 100644 --- a/sys/compat/linsysfs/linsysfs.c +++ b/sys/compat/linsysfs/linsysfs.c @@ -98,13 +98,11 @@ static int linsysfs_ifnet_flags(PFS_FILL_ARGS) { struct ifnet *ifp; - unsigned short flags; ifp = ifname_linux_to_bsd(td, pn->pn_parent->pn_name, NULL); if (ifp == NULL) return (ENOENT); - linux_ifflags(ifp, &flags); - sbuf_printf(sb, "0x%x\n", flags); + sbuf_printf(sb, "0x%x\n", linux_ifflags(ifp)); return (0); } diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index a7844f4bbbcf..135bc10e2dc1 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -416,33 +416,34 @@ ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) return (arg.ifp); } -void -linux_ifflags(struct ifnet *ifp, short *flags) +unsigned short +linux_ifflags(struct ifnet *ifp) { - unsigned short fl; + unsigned short fl, flags; fl = (if_getflags(ifp) | if_getdrvflags(ifp)) & 0xffff; - *flags = 0; + flags = 0; if (fl & IFF_UP) - *flags |= LINUX_IFF_UP; + flags |= LINUX_IFF_UP; if (fl & IFF_BROADCAST) - *flags |= LINUX_IFF_BROADCAST; + flags |= LINUX_IFF_BROADCAST; if (fl & IFF_DEBUG) - *flags |= LINUX_IFF_DEBUG; + flags |= LINUX_IFF_DEBUG; if (fl & IFF_LOOPBACK) - *flags |= LINUX_IFF_LOOPBACK; + flags |= LINUX_IFF_LOOPBACK; if (fl & IFF_POINTOPOINT) - *flags |= LINUX_IFF_POINTOPOINT; + flags |= LINUX_IFF_POINTOPOINT; if (fl & IFF_DRV_RUNNING) - *flags |= LINUX_IFF_RUNNING; + flags |= LINUX_IFF_RUNNING; if (fl & IFF_NOARP) - *flags |= LINUX_IFF_NOARP; + flags |= LINUX_IFF_NOARP; if (fl & IFF_PROMISC) - *flags |= LINUX_IFF_PROMISC; + flags |= LINUX_IFF_PROMISC; if (fl & IFF_ALLMULTI) - *flags |= LINUX_IFF_ALLMULTI; + flags |= LINUX_IFF_ALLMULTI; if (fl & IFF_MULTICAST) - *flags |= LINUX_IFF_MULTICAST; + flags |= LINUX_IFF_MULTICAST; + return (flags); } static u_int diff --git a/sys/compat/linux/linux_common.h b/sys/compat/linux/linux_common.h index 9ebaff26b9ff..c25c4abf18ae 100644 --- a/sys/compat/linux/linux_common.h +++ b/sys/compat/linux/linux_common.h @@ -36,7 +36,7 @@ int ifname_bsd_to_linux_name(const char *, char *, size_t); struct ifnet *ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname); -void linux_ifflags(struct ifnet *ifp, short *flags); +unsigned short linux_ifflags(struct ifnet *); int linux_ifhwaddr(struct ifnet *ifp, struct l_sockaddr *lsa); int linux_to_bsd_domain(int domain); diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 8900102bbbc7..8551ba180aa4 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2237,9 +2237,9 @@ again: static int linux_gifflags(struct thread *td, struct ifnet *ifp, struct l_ifreq *ifr) { - l_short flags; + unsigned short flags; - linux_ifflags(ifp, &flags); + flags = linux_ifflags(ifp); return (copyout(&flags, &ifr->ifr_flags, sizeof(flags))); } From nobody Sat Mar 4 09:12: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 4PTJyh39vhz3vn6V; Sat, 4 Mar 2023 09:12: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 4PTJyh22nNz3xsP; Sat, 4 Mar 2023 09:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6L0nxI0+pLs3BjOZX47eGHGzUlBMcH1W4S5Gi//tVg=; b=nEp/FF7Tks4JJhHGLiMu0cmKPbSHErQjbuJFzy+2mCDvlSvih9envtkEE640bRAZnRAnWW 9lLBN4EzJkG0cC3hkBwL4tugVNdm416ljNDjIZjRmHsmDtlLNqExbm3MgxMWXmCM/XEw/n 2VxKklim2QtV1Kn2mPSp0I1vC74PtBa+uDaCnrCCURDj8nBN+porTTjeWBWZJkxMCFlUI2 aUw1AYfFf/BNXS8xuO2Qo3e9pX58RVDcRdw3S1YM0PjccONY4pCy/ZpVYyIlGuZnBZNlwI 1gWD4WEYupcamriYdF+l7Rw+oezjY+4BvIBzynCYoi+4AdPqDrrJSWx104R9/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6L0nxI0+pLs3BjOZX47eGHGzUlBMcH1W4S5Gi//tVg=; b=jCevqbPBAlExaaB9O8tYorDn6NetbeUVX4wL3tc8E5L2azmC5c5Q4YOC8ZKDecAx+WTjlK PaUW54EMxhxyIffVjL/1ZAkQlk/lKG8SfpHsgPXpeUnvpyN6l6ILUzRj5kdpj6No3Jzx5q r+FpM6VKdzCfHw0IZHWoWZJiPAJZVGPekriEz4HApS4BLIdjRqor3F59m86zTE0WasFoo3 6qVkKGzGjpqFLLai7JYpfGPSsE3bPT4WyMlxzfrMsG5FXI8OFZD544QM+IB8ZVEGLU91pn NA/Tmb7uhXlTHD0326txsnv9eLuA82CE7r1nfyW6ZsQ3w+FBPNc0C0dbbBp0BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921164; a=rsa-sha256; cv=none; b=RrVRg8WwZGyc51EDP7XZ3KscsGj0JCyEyaAKnU4RdRx/o9NY+wwkFDXnW0QxaJwVRiWUe8 jle7fOCYy8hSg+CWTHFWxrNM3oo2/gB0TDR2shwxB/vYI2Q19K7PcwwXWFdqvyxkscju83 E9/Br17b8Lpe/VaNRVqD5+J7SbUkkwEpj2k/69qdWkimVq6lX0LgZCn/dpZlqIQAjmOQec Q49me8SdD3IvL53EtdcL6kFwSyYnKCHeLpyY5y8BLN4KpADRPY70wq8WroS6b/xAHV79gF NP7pj9xUwxAbHki4SjqChhGQXwfj3FuAlY5kU8m/XFAm5Ha9S8ofyrB2MTaKNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyh0f66zZGW; Sat, 4 Mar 2023 09:12: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 3249ChoI078834; Sat, 4 Mar 2023 09:12:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249ChQo078833; Sat, 4 Mar 2023 09:12:43 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:43 GMT Message-Id: <202303040912.3249ChQo078833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 5d5b633dde2a - main - linsysfs(4): Refactor to avoid referencing an unstable interfaces 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d5b633dde2a12548daa3188fca27c04b51586bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5d5b633dde2a12548daa3188fca27c04b51586bf commit 5d5b633dde2a12548daa3188fca27c04b51586bf Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:38 +0000 linsysfs(4): Refactor to avoid referencing an unstable interfaces Enter the net epoch when traversing a list of interfaces. For that split the ifname_linux_to_bsd() function on two counterparts, where the ifname_linux_to_ifp() intended to use in epoch, while the ifname_linux_to_bsd() intended to be a self-contained. Until the linux_ioctl_coket() function is refactored, the ifname_linux_to_bsd() temporarily returns interface outside of the net epoch. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D38790 --- sys/compat/linsysfs/linsysfs.c | 103 ++++++++++++++++++++++++++-------------- sys/compat/linux/linux.c | 33 ++++++++----- sys/compat/linux/linux_common.h | 1 + 3 files changed, 90 insertions(+), 47 deletions(-) diff --git a/sys/compat/linsysfs/linsysfs.c b/sys/compat/linsysfs/linsysfs.c index 0c0744a054a0..3b1bdfc280fc 100644 --- a/sys/compat/linsysfs/linsysfs.c +++ b/sys/compat/linsysfs/linsysfs.c @@ -72,18 +72,23 @@ atoi(const char *str) static int linsysfs_ifnet_addr(PFS_FILL_ARGS) { + struct epoch_tracker et; struct l_sockaddr lsa; struct ifnet *ifp; - - ifp = ifname_linux_to_bsd(td, pn->pn_parent->pn_name, NULL); - if (ifp == NULL) - return (ENOENT); - if (linux_ifhwaddr(ifp, &lsa) != 0) - return (ENOENT); - sbuf_printf(sb, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n", - lsa.sa_data[0], lsa.sa_data[1], lsa.sa_data[2], - lsa.sa_data[3], lsa.sa_data[4], lsa.sa_data[5]); - return (0); + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) + error = sbuf_printf(sb, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n", + lsa.sa_data[0], lsa.sa_data[1], lsa.sa_data[2], + lsa.sa_data[3], lsa.sa_data[4], lsa.sa_data[5]); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); } static int @@ -97,37 +102,58 @@ linsysfs_ifnet_addrlen(PFS_FILL_ARGS) static int linsysfs_ifnet_flags(PFS_FILL_ARGS) { + struct epoch_tracker et; struct ifnet *ifp; - - ifp = ifname_linux_to_bsd(td, pn->pn_parent->pn_name, NULL); - if (ifp == NULL) - return (ENOENT); - sbuf_printf(sb, "0x%x\n", linux_ifflags(ifp)); - return (0); + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "0x%x\n", linux_ifflags(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); } static int linsysfs_ifnet_ifindex(PFS_FILL_ARGS) { + struct epoch_tracker et; struct ifnet *ifp; - - ifp = ifname_linux_to_bsd(td, pn->pn_parent->pn_name, NULL); - if (ifp == NULL) - return (ENOENT); - sbuf_printf(sb, "%u\n", if_getindex(ifp)); - return (0); + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "%u\n", if_getindex(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); } static int linsysfs_ifnet_mtu(PFS_FILL_ARGS) { + struct epoch_tracker et; struct ifnet *ifp; - - ifp = ifname_linux_to_bsd(td, pn->pn_parent->pn_name, NULL); - if (ifp == NULL) - return (ENOENT); - sbuf_printf(sb, "%u\n", if_getmtu(ifp)); - return (0); + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL) + error = sbuf_printf(sb, "%u\n", if_getmtu(ifp)); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); } static int @@ -142,16 +168,21 @@ linsysfs_ifnet_tx_queue_len(PFS_FILL_ARGS) static int linsysfs_ifnet_type(PFS_FILL_ARGS) { + struct epoch_tracker et; struct l_sockaddr lsa; struct ifnet *ifp; - - ifp = ifname_linux_to_bsd(td, pn->pn_parent->pn_name, NULL); - if (ifp == NULL) - return (ENOENT); - if (linux_ifhwaddr(ifp, &lsa) != 0) - return (ENOENT); - sbuf_printf(sb, "%d\n", lsa.sa_family); - return (0); + int error; + + CURVNET_SET(TD_TO_VNET(td)); + NET_EPOCH_ENTER(et); + ifp = ifname_linux_to_ifp(td, pn->pn_parent->pn_name); + if (ifp != NULL && (error = linux_ifhwaddr(ifp, &lsa)) == 0) + error = sbuf_printf(sb, "%d\n", lsa.sa_family); + else + error = ENOENT; + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); + return (error == -1 ? ERANGE : error); } static void diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 135bc10e2dc1..f31a4b5e4f5c 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -342,7 +342,7 @@ ifname_bsd_to_linux_ifp(struct ifnet *ifp, char *lxname, size_t len) * bsdname and lxname need to be least IFNAMSIZ bytes long, but * can point to the same buffer. */ -struct ifname_linux_to_bsd_cb_s { +struct ifname_linux_to_ifp_cb_s { bool is_lo; bool is_eth; int ethno; @@ -352,9 +352,9 @@ struct ifname_linux_to_bsd_cb_s { }; static int -ifname_linux_to_bsd_cb(if_t ifp, void *arg) +ifname_linux_to_ifp_cb(if_t ifp, void *arg) { - struct ifname_linux_to_bsd_cb_s *cbs = arg; + struct ifname_linux_to_ifp_cb_s *cbs = arg; NET_EPOCH_ASSERT(); @@ -379,17 +379,18 @@ out: } struct ifnet * -ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) +ifname_linux_to_ifp(struct thread *td, const char *lxname) { - struct ifname_linux_to_bsd_cb_s arg = { + struct ifname_linux_to_ifp_cb_s arg = { .ethno = 0, .lxname = lxname, .ifp = NULL, }; - struct epoch_tracker et; - int len, ret; + int len; char *ep; + NET_EPOCH_ASSERT(); + for (len = 0; len < LINUX_IFNAMSIZ; ++len) if (!isalpha(lxname[len]) || lxname[len] == '\0') break; @@ -406,14 +407,24 @@ ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) return (NULL); arg.is_eth = (len == 3 && strncmp(lxname, "eth", len) == 0); + if_foreach(ifname_linux_to_ifp_cb, &arg); + return (arg.ifp); +} + +struct ifnet * +ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) +{ + struct epoch_tracker et; + struct ifnet *ifp; + CURVNET_SET(TD_TO_VNET(td)); NET_EPOCH_ENTER(et); - ret = if_foreach(ifname_linux_to_bsd_cb, &arg); + ifp = ifname_linux_to_ifp(td, lxname); + if (ifp != NULL && bsdname != NULL) + strlcpy(bsdname, if_name(ifp), IFNAMSIZ); NET_EPOCH_EXIT(et); CURVNET_RESTORE(); - if (ret > 0 && arg.ifp != NULL && bsdname != NULL) - strlcpy(bsdname, if_name(arg.ifp), IFNAMSIZ); - return (arg.ifp); + return (ifp); } unsigned short diff --git a/sys/compat/linux/linux_common.h b/sys/compat/linux/linux_common.h index c25c4abf18ae..4b693ccaf868 100644 --- a/sys/compat/linux/linux_common.h +++ b/sys/compat/linux/linux_common.h @@ -33,6 +33,7 @@ int ifname_bsd_to_linux_ifp(struct ifnet *, char *, size_t); int ifname_bsd_to_linux_idx(u_int, char *, size_t); int ifname_bsd_to_linux_name(const char *, char *, size_t); +struct ifnet *ifname_linux_to_ifp(struct thread *, const char *); struct ifnet *ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname); From nobody Sat Mar 4 09:12: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 4PTJyj4TPgz3vnCm; Sat, 4 Mar 2023 09:12: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 4PTJyj34s3z3yB2; Sat, 4 Mar 2023 09:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyRfQRTtS8JRcohjHbQZCM3Eh+zl3fBNHoIe+VHUYrs=; b=pcobdkiUehKPMx8oa8jcTUr1BfBdyY5OVFa/E5owo4YoCkU3qz9bC6Mt4aup2PnaqwlURU heTff/WJ2GTXc42s4V0VCMzBKevyYtX6DgP8QgJ5S7O8bGSdvcN1bqB3kzMIio3BqN5/Sg duX6dk8iouiGohmOwklt90zi0f0QhWP+sF3tm586CidygX1zyUE4vPXPxwSyAOLYMt7N+c HbkudvI9Zwft6ENNaRUiDEZDBWcKZLRSFsZQsjcSeEX/Xod7LESJfwH/3H3VrI3s3bcUyV v+kD1+w6eaX4NzKzguJiMyGORyzhgq4u6poHwbPBcPp7krBCy0YrK7AkeDzFJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyRfQRTtS8JRcohjHbQZCM3Eh+zl3fBNHoIe+VHUYrs=; b=JZeHSsv9igtKL897rylHhEuTKWUW/7s/C++dQ4W1zEYO59J9xPykS5rQ78ZeuwGE/pgSDI GiyJaaB/SbzKkJPe0XdMkwR4tUaXP4Xo1eXkTgrzg1rAaYBTxZPHg8uJ6DNaWwsK6b28Ja 0p0mVN7zWZWXLiRC/gE711hMwlbRwgn5D0x7U2vaJvJAZeT9B1PHKf+m+alfKoX0AwM+xU QSz0aBjhTDJhchSPltIxthy6UUCr70v+yHlDthKw8AfhGgBml4rHsdsJm7uNalhaRFvvNj XEDmohj9Ldjy2Gi8e5S0fpwi2GAEgq/50YrfTYbOIVupWBZDt37aCqSuyylsFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921165; a=rsa-sha256; cv=none; b=BJr3iITT67/q/JlKiqWMFhJkzXKUe1Hwwi1MARxDTWmSXkHiBrd6FX7jdXKER1ir5SH7Vw G7O/B7XBqVa8eFzVUDJLHsSKRLmHKlzOvTcyy+WJC6bxilOwfHl7DBP2V1hdBL4Zborz+2 7yLfB2Rx6dBjzeKJw2ckE9+PzMX2vDFAJQTVRZi6tAUQQ5JVVUlECHklMWMqLacSSBxSNx 8wAjJ9j40oX5l5/lcpknF6vYJfQgw5wjpQBcBHr8PtB2/TuMMEFpu5LvFaXIb2aT2q9el5 UkEL5KFKO4x5p7lQ6LXZ83uENIleVbm4kcEMBu7cNsJriTref1uYxHBU5PVfNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyj1YzczZ8R; Sat, 4 Mar 2023 09:12: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 3249CjaC078854; Sat, 4 Mar 2023 09:12:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249CjSZ078853; Sat, 4 Mar 2023 09:12:45 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:45 GMT Message-Id: <202303040912.3249CjSZ078853@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: cabbfb60d050 - main - linux(4): Reduce code duplication between MD 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cabbfb60d050f21eda60fb7d9a95718059048686 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=cabbfb60d050f21eda60fb7d9a95718059048686 commit cabbfb60d050f21eda60fb7d9a95718059048686 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:38 +0000 linux(4): Reduce code duplication between MD files Move struct ifnet definitions under compat/linux. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38791 --- sys/amd64/linux/linux.h | 34 ---------------------------------- sys/amd64/linux32/linux.h | 34 ---------------------------------- sys/arm64/linux/linux.h | 34 ---------------------------------- sys/compat/linux/linux_socket.h | 35 +++++++++++++++++++++++++++++++++++ sys/i386/linux/linux.h | 33 --------------------------------- 5 files changed, 35 insertions(+), 135 deletions(-) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index b31b520cb573..09125576d33a 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -224,40 +224,6 @@ union l_semun { l_uintptr_t __pad; }; -struct l_ifmap { - l_ulong mem_start; - l_ulong mem_end; - l_ushort base_addr; - u_char irq; - u_char dma; - u_char port; - /* 3 bytes spare */ -}; - -struct l_ifreq { - union { - char ifrn_name[LINUX_IFNAMSIZ]; - } ifr_ifrn; - - union { - struct l_sockaddr ifru_addr; - struct l_sockaddr ifru_dstaddr; - struct l_sockaddr ifru_broadaddr; - struct l_sockaddr ifru_netmask; - struct l_sockaddr ifru_hwaddr; - l_short ifru_flags[1]; - l_int ifru_ivalue; - l_int ifru_mtu; - struct l_ifmap ifru_map; - char ifru_slave[LINUX_IFNAMSIZ]; - l_uintptr_t ifru_data; - } ifr_ifru; -}; - -#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ -#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ - struct l_ifconf { int ifc_len; union { diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index c77897344506..9beee0b7079c 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -304,40 +304,6 @@ union l_semun { l_uintptr_t __pad; }; -struct l_ifmap { - l_ulong mem_start; - l_ulong mem_end; - l_ushort base_addr; - u_char irq; - u_char dma; - u_char port; - /* 3 bytes spare */ -}; - -struct l_ifreq { - union { - char ifrn_name[LINUX_IFNAMSIZ]; - } ifr_ifrn; - - union { - struct l_sockaddr ifru_addr; - struct l_sockaddr ifru_dstaddr; - struct l_sockaddr ifru_broadaddr; - struct l_sockaddr ifru_netmask; - struct l_sockaddr ifru_hwaddr; - l_short ifru_flags[1]; - l_int ifru_ivalue; - l_int ifru_mtu; - struct l_ifmap ifru_map; - char ifru_slave[LINUX_IFNAMSIZ]; - l_uintptr_t ifru_data; - } ifr_ifru; -}; - -#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ -#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ - struct l_ifconf { int ifc_len; union { diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index 8ecadff2e220..5c95acd86771 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -181,40 +181,6 @@ union l_semun { l_uintptr_t __pad; }; -struct l_ifmap { - l_ulong mem_start; - l_ulong mem_end; - l_ushort base_addr; - u_char irq; - u_char dma; - u_char port; - /* 3 bytes spare*/ -}; - -struct l_ifreq { - union { - char ifrn_name[LINUX_IFNAMSIZ]; - } ifr_ifrn; - - union { - struct l_sockaddr ifru_addr; - struct l_sockaddr ifru_dstaddr; - struct l_sockaddr ifru_broadaddr; - struct l_sockaddr ifru_netmask; - struct l_sockaddr ifru_hwaddr; - l_short ifru_flags[1]; - l_int ifru_ivalue; - l_int ifru_mtu; - struct l_ifmap ifru_map; - char ifru_slave[LINUX_IFNAMSIZ]; - l_uintptr_t ifru_data; - } ifr_ifru; -}; - -#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ -#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ - #define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r)) struct linux_pt_regset { diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h index 74b96fbb9c11..9b332a7a9b86 100644 --- a/sys/compat/linux/linux_socket.h +++ b/sys/compat/linux/linux_socket.h @@ -326,4 +326,39 @@ int linux_accept(struct thread *td, struct linux_accept_args *args); #define LINUX_TCP_INFO 11 #define LINUX_TCP_MD5SIG 14 +struct l_ifmap { + l_ulong mem_start; + l_ulong mem_end; + l_ushort base_addr; + u_char irq; + u_char dma; + u_char port; + /* 3 bytes spare */ +}; + +struct l_ifreq { + union { + char ifrn_name[LINUX_IFNAMSIZ]; + } ifr_ifrn; + + union { + struct l_sockaddr ifru_addr; + struct l_sockaddr ifru_dstaddr; + struct l_sockaddr ifru_broadaddr; + struct l_sockaddr ifru_netmask; + struct l_sockaddr ifru_hwaddr; + l_short ifru_flags[1]; + l_int ifru_ivalue; + l_int ifru_mtu; + struct l_ifmap ifru_map; + char ifru_slave[LINUX_IFNAMSIZ]; + char ifru_newname[LINUX_IFNAMSIZ]; + l_uintptr_t ifru_data; + } ifr_ifru; +}; + +#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ +#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ +#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ + #endif /* _LINUX_SOCKET_H_ */ diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 43bf3ca126b6..7810f8d29ccd 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -279,39 +279,6 @@ union l_semun { l_uintptr_t __pad; }; -struct l_ifmap { - l_ulong mem_start; - l_ulong mem_end; - l_ushort base_addr; - u_char irq; - u_char dma; - u_char port; -}; - -struct l_ifreq { - union { - char ifrn_name[LINUX_IFNAMSIZ]; - } ifr_ifrn; - - union { - struct l_sockaddr ifru_addr; - struct l_sockaddr ifru_dstaddr; - struct l_sockaddr ifru_broadaddr; - struct l_sockaddr ifru_netmask; - struct l_sockaddr ifru_hwaddr; - l_short ifru_flags[1]; - l_int ifru_ivalue; - l_int ifru_mtu; - struct l_ifmap ifru_map; - char ifru_slave[LINUX_IFNAMSIZ]; - l_caddr_t ifru_data; - } ifr_ifru; -}; - -#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ -#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ - struct l_user_desc { l_uint entry_number; l_uint base_addr; From nobody Sat Mar 4 09:12: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 4PTJyk3zDGz3vnCp; Sat, 4 Mar 2023 09:12: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 4PTJyk3SqRz3yHL; Sat, 4 Mar 2023 09:12:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LoiSAELPZ3BP8cwT0sSi4COXLeDqY0jHXq/1MRcf3rQ=; b=LiI5IJv2aF09/y1I6Ql4+a7bvbR5G6aHnxtFPTMuELLbqGet8B3/Skj8rXdkVlblbSsySL A2gNO5/JL6fSN2xMRtJHMBje6AyHKUUXu3uEozqGJfkkSNhngtGAheG6YcVkbPje9QrKtk +urHN6tedVQTglzUs2R/EH2bl4OI+yHg1/y4j5wUlavZKBft6OCAKdKydVfG7yLpyU4vzR eqIOGZNUgnGL1B4JdW+YD14Sr58kNgocJWgNN/DfX0DCbw/PkNjxM2MvSsfHyt3noAF/LC 6V63S+aVxeIRgneHpFlVhigKtZR/AuAoG2eKjJgajQ2SxD+pNTmZ7t5nBrv5ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LoiSAELPZ3BP8cwT0sSi4COXLeDqY0jHXq/1MRcf3rQ=; b=VuNR4TOrR5NQTQNkWuQw+OoBeBpD1ldNHf2YmTBfx1XdY866VO2P2NRpUViME7ztWnF5Lc rPW4LvZ/6ziX3mB/Iah8imJ1S2E4cUlSmoq/BjZ51OZYbEIDvLtxj7ZbjPIOiAp+WSPggn CAbCC4yqZzjjZCCYOZPXeElU9ahzIUZqeL9JbZ6kl0ro4Enkt42anNquGxMIvkKPlhBERc aPR8mOhMZOF4U7yCgYhuLS72bhAxXHVwPLixRkQOv1JNJ1KYKxMogwvesWMJ3aYJ2QPLK5 d9Wh02G6c3GP0b4hFDteTjlFaqdOK7VvMCKmIN45BDk3Je7raBXdjsSuD6XOUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921166; a=rsa-sha256; cv=none; b=h6PW5KBYuIcNxFctrcOV+PKS2ZQiCUXnyHJ+5fr+c/HlPc59dlIfbgPGcW/ba6OHT1i5kJ 5G1Yqttm1Al7qDpx5MS9VhETG5APOh812p7/GfifE3ipsxWCk9ngNxrLTHu9mDe5fdTv7o zE7WemrrBk3VsKK5tdSSBYK3ETYbIkCm66BEHVoATilqnskiahaBT/56jt7N9+EYj1Cep2 qJ1uBJCfZRLL/mjbzgjS7A4KYTXVYXiEL0h+4r1qD7wIfnWiAwXM2nG4vOjzgxVKCWJeHs nd0iiTfRKgD+YBHEvt6n90wZAfbAWFOc6QmcLHZ653RYNytqBa++CcGhYzk2sA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyk2TzxzZ8S; Sat, 4 Mar 2023 09:12: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 3249CkRl078873; Sat, 4 Mar 2023 09:12:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249CkwI078872; Sat, 4 Mar 2023 09:12:46 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:46 GMT Message-Id: <202303040912.3249CkwI078872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: a927409ce820 - main - linux(4): Rename struct l_ifreq members names to avoid conflicts with FreeBSD 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a927409ce820909c344b8f1323285fd01046cc4f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a927409ce820909c344b8f1323285fd01046cc4f commit a927409ce820909c344b8f1323285fd01046cc4f Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:38 +0000 linux(4): Rename struct l_ifreq members names to avoid conflicts with FreeBSD For now we are using mixed names to access struct ifreq members, some of Linux (ifr_name, ifr_ifindex), others of FreeBSD. To avoid conflicts switch to use FreeBSD names. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D38792 --- sys/compat/linux/linux_ioctl.c | 2 +- sys/compat/linux/linux_socket.c | 10 ++++++++++ sys/compat/linux/linux_socket.h | 17 ++++++++++------- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 8551ba180aa4..9f1fdd3a6671 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2097,7 +2097,7 @@ linux_ioctl_ifname(struct thread *td, struct l_ifreq *uifr) error = copyin(uifr, &ifr, sizeof(ifr)); if (error != 0) return (error); - ret = ifname_bsd_to_linux_idx(ifr.ifr_ifindex, ifr.ifr_name, + ret = ifname_bsd_to_linux_idx(ifr.ifr_index, ifr.ifr_name, LINUX_IFNAMSIZ); if (ret > 0) return (copyout(&ifr, uifr, sizeof(ifr))); diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index a3a8cc6733c1..3748c1bedd3c 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -72,6 +72,16 @@ __FBSDID("$FreeBSD$"); #include #include +_Static_assert(offsetof(struct l_ifreq, ifr_ifru) == + offsetof(struct ifreq, ifr_ifru), + "Linux ifreq members names should be equal to FreeeBSD"); +_Static_assert(offsetof(struct l_ifreq, ifr_index) == + offsetof(struct ifreq, ifr_index), + "Linux ifreq members names should be equal to FreeeBSD"); +_Static_assert(offsetof(struct l_ifreq, ifr_name) == + offsetof(struct ifreq, ifr_name), + "Linux ifreq members names should be equal to FreeeBSD"); + #define SECURITY_CONTEXT_STRING "unconfined" static int linux_sendmsg_common(struct thread *, l_int, struct l_msghdr *, diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h index 9b332a7a9b86..ab9ab2100a96 100644 --- a/sys/compat/linux/linux_socket.h +++ b/sys/compat/linux/linux_socket.h @@ -336,11 +336,13 @@ struct l_ifmap { /* 3 bytes spare */ }; +/* + * Careful changing the declaration of this structure. + * To use FreeBSD names to access the struct l_ifreq members the + * member names of struct l_ifreq should be equal to the FreeBSD. + */ struct l_ifreq { - union { - char ifrn_name[LINUX_IFNAMSIZ]; - } ifr_ifrn; - + char ifr_name[LINUX_IFNAMSIZ]; union { struct l_sockaddr ifru_addr; struct l_sockaddr ifru_dstaddr; @@ -348,7 +350,7 @@ struct l_ifreq { struct l_sockaddr ifru_netmask; struct l_sockaddr ifru_hwaddr; l_short ifru_flags[1]; - l_int ifru_ivalue; + l_int ifru_index; l_int ifru_mtu; struct l_ifmap ifru_map; char ifru_slave[LINUX_IFNAMSIZ]; @@ -357,8 +359,9 @@ struct l_ifreq { } ifr_ifru; }; -#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ +/* + * Define here members which are not exists in the FreeBSD struct ifreq. + */ #define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ #endif /* _LINUX_SOCKET_H_ */ From nobody Sat Mar 4 09:12: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 4PTJym13m9z3vn9Q; Sat, 4 Mar 2023 09:12: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 4PTJyl4k8vz3yKh; Sat, 4 Mar 2023 09:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BT0OFKEb9Yz+s980EFzfR45aBVksMLubH0GFZyUmz8s=; b=ZM96EDx/DDiG7FGg80kQQ/HuAKRnvPDVr796cfgfKI69MHVyjUXBnNioXHCiO4zHGAFgpu d3xz6n0SlSRDHpxA02q7gYdyv55yfwxZVnSlV52gdEG/qZwILG+lId+z106qD9N4WMWa8g PSBJIuEIEv0PQeMvFD1JSxS0dlHCfFib2fijWhGoHdcwNh8N6YlAkggKX0funxYpRIfwPA VJM1CRtnM1SO4R4AgrKPWhTg4Lyx6t67d6mwCp9qvmg1QOAqGkFzkOfuFDwmiRsmM+1aaa Dy9PEVE5lzj/+CB4IysT9EU29baRmMiV+M2zmr18vNp8xaIOH9eeMf2sGuFnIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BT0OFKEb9Yz+s980EFzfR45aBVksMLubH0GFZyUmz8s=; b=BTsKCx1OIQ8Cg0zVDYrYSBYKSxAWzBEaNtZ3bfcu+xUY11iaWbNMXfo00kfqNDvtiNEVUo xzYT9YP2VYhzt0EQqQRyZd9Ley5jUUJTuBXoSfIvbc41eMltoLZvjv3c299Jf53/7lrjGx sCKXtcpZdmAPWwTyOgaA8AILHyAPq+U1Hz4zDG+wUfYddIXjf/RtBh+Z8YL7OcqJsZArO9 xuykw0jdkO/8kbids2CcROkjvb6LLIQaWF+f8r+K4fYSgLMjUrkGLAubdVO7ZznQuPfBv2 gZZ8jTGT5G1J+sPgpCOjmoKMnDtJR2xPvGXFt7A+EdqowHs9Ty0VBGMlcHAYkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921167; a=rsa-sha256; cv=none; b=jPgeqAY6uc5+wKmZb+BxKL02EYsWGF+8IeaIQBBLt2X+UEGmTnhWZgCHPTBf/IhSO3oZ6O /x5+Ick26HEoQGmUmNKLSqGigCSm3T2KVlVM6ikfQDcz5CDytVNvhVSru2qPdCTOGpyn5u LRf7dqZub0/AMtS1u9OAG4OdbgiYIlRptPeBMIWcsjLtiGcVq+DeN/gUiW5Bd96xb0fLCB +70mkoL1qVz56dQxpYKyWwe11Yjtr/Ia2a34GnuQySAh1Ra1U+r5z4uuybhZIwRtLyuGwl x/DxeDkP4+fRfGUQl38Tre77DEYsilpFYSMxRENTzHrvyPNlTZm97AvkykHVZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyl3PmhzZ8T; Sat, 4 Mar 2023 09:12: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 3249Clf2078894; Sat, 4 Mar 2023 09:12:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249ClpU078893; Sat, 4 Mar 2023 09:12:47 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:47 GMT Message-Id: <202303040912.3249ClpU078893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 9e7f03e9c688 - main - linux(4): Drop unncessary struct l_ifconf declaration from amd64/linux 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e7f03e9c688d495a78f51b5122a012fa52df57b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=9e7f03e9c688d495a78f51b5122a012fa52df57b commit 9e7f03e9c688d495a78f51b5122a012fa52df57b Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:38 +0000 linux(4): Drop unncessary struct l_ifconf declaration from amd64/linux Its needed only for amd64/linux32 Linuxulator. Differential Revision: https://reviews.freebsd.org/D38793 --- sys/amd64/linux/linux.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index 09125576d33a..d8de283c0201 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -224,17 +224,6 @@ union l_semun { l_uintptr_t __pad; }; -struct l_ifconf { - int ifc_len; - union { - l_uintptr_t ifcu_buf; - l_uintptr_t ifcu_req; - } ifc_ifcu; -}; - -#define ifc_buf ifc_ifcu.ifcu_buf -#define ifc_req ifc_ifcu.ifcu_req - #define LINUX_ARCH_SET_GS 0x1001 #define LINUX_ARCH_SET_FS 0x1002 #define LINUX_ARCH_GET_FS 0x1003 From nobody Sat Mar 4 09:12: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 4PTJym5W7Pz3vmrD; Sat, 4 Mar 2023 09:12: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 4PTJym4t8Qz3yfR; Sat, 4 Mar 2023 09:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d9h5URO4vSn6cwpzgwMXTawk5WvdFMG9mRvazIeH21s=; b=OsbX+SprHnmdrDZanWTMuVpQqzKUulHTh/MCBXqPAVUVt8X3Gb+ChNaykI4nwKTvhRI1ng pw2umS9FLayhYTlZ8A00biqGY7trWzswAGWaveteeKOmC2W+2Zba24HWaXC/H4gDqvonog ngx9fL5MseKwgzhvizEAvJR6ma+GdWYEYnIA43IJKP+VqLXADlxjnPfh3OhTuLaZA0TFnR XZ8LYVYzhqqJjgDb/IK6HD+0Vu6wqgRGTAGsqCULQ1bbiYmiEmBX648GLPOCQI+RotGVKe HnfQkpOdPU/a/ZmWUF0DfcBznbYPLIFY4OezVQgJPs9mfxUuPD3bIY/A1T0pkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d9h5URO4vSn6cwpzgwMXTawk5WvdFMG9mRvazIeH21s=; b=YHWyyBA1Q+DMp8mVmWBfjGb2GgQID3OWqPj//7QJ3SJnxywVS5UM8BJbJN7o2fTiqD03LN YBdoJVKHRxvQE+3oDukE3ZAXOW9E+JvjOF59G+ewzA/uOQLppRaPgvTVaXTk8fRxETIC2b lzNOJ2q77B3IFaTy9qf7JUWfkBVBakhL1SINCgExh0tRYi26RdbxMTZ1psUUTzi8E9juRo m4zJjIxpB05aymL3QIui1dokl2o+scLkL8eGGZGn9nWKU6bUH15mJQS6ixeHg+x2CVo9+B PHhPlrGT1gGnEWLZMhQHtjLAf4d+Q4k+9TUz6GX9z50YXrBDhnPQM/9rnLAZrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921168; a=rsa-sha256; cv=none; b=k8aAYYuvR9nB1AVuK9AhrITWFErEZTSUZ6CQpHg1ztGnoHFMo9uecnJQYjVARian4IAzVt 7vwgCDHhZI6yl9MJ+kmB5G2a/Q0dbVKorO5mESx9WolkEBOk+/l6KqHTgv1SipAyp5dkIn /6ZvYw3FEWnRx17Ne+pT3QFHchdBBdEC5jTRIl1GmrlaX7ugW7JIw+RRU2kkVdwx4xI2ST FFV/8v7cwamjfamsCtWgejgjDUl5gm2FNBUN1Y0lp11tJfKNJbn0jaAv3dj0j9ZECR+wOZ mUV31JB/i6cF+gtTujCSqlb0axjRwtJo+6B6+so68gwVBXeDczeV8xeU15ot3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJym3zXXzYq4; Sat, 4 Mar 2023 09:12: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 3249Cm1x078913; Sat, 4 Mar 2023 09:12:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249CmOt078912; Sat, 4 Mar 2023 09:12:48 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:48 GMT Message-Id: <202303040912.3249CmOt078912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: f9b0675b014d - main - linux(4): Refactor socket ioctl path to avoid referencing an unstable interfaces 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9b0675b014d06995e5337b71129fc94bd1cedd0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=f9b0675b014d06995e5337b71129fc94bd1cedd0 commit f9b0675b014d06995e5337b71129fc94bd1cedd0 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:38 +0000 linux(4): Refactor socket ioctl path to avoid referencing an unstable interfaces Split the linux_ioctl_socket() function on two counterparts, where the linux_ioctl_socket_ifreq() intended to use in a code path which requires the struct ifreq manipulation, i.e., translating in/out values of the struct, while the linux_ioctl_socket() function is left as is, it calls sys_ioctl() without touching in/out values. Due to structures ifreq, sockaddr difference between FreeBSD and Linux the linux_ioctl_socket_ifreq() calls kern_ioctl() directly, converting in and out values to FreeBSD and to Linux accordingly. Finally, modify the ifname_linux_to_bsd() to return error code, not an unstable reference to the interface. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D38794 --- sys/compat/linux/linux.c | 4 +- sys/compat/linux/linux_common.h | 3 +- sys/compat/linux/linux_ioctl.c | 310 +++++++++++++++++----------------------- 3 files changed, 132 insertions(+), 185 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index f31a4b5e4f5c..2e6e52f7490c 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -411,7 +411,7 @@ ifname_linux_to_ifp(struct thread *td, const char *lxname) return (arg.ifp); } -struct ifnet * +int ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) { struct epoch_tracker et; @@ -424,7 +424,7 @@ ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) strlcpy(bsdname, if_name(ifp), IFNAMSIZ); NET_EPOCH_EXIT(et); CURVNET_RESTORE(); - return (ifp); + return (ifp != NULL ? 0 : EINVAL); } unsigned short diff --git a/sys/compat/linux/linux_common.h b/sys/compat/linux/linux_common.h index 4b693ccaf868..3392f55672f3 100644 --- a/sys/compat/linux/linux_common.h +++ b/sys/compat/linux/linux_common.h @@ -34,9 +34,8 @@ int ifname_bsd_to_linux_ifp(struct ifnet *, char *, size_t); int ifname_bsd_to_linux_idx(u_int, char *, size_t); int ifname_bsd_to_linux_name(const char *, char *, size_t); struct ifnet *ifname_linux_to_ifp(struct thread *, const char *); +int ifname_linux_to_bsd(struct thread *, const char *, char *); -struct ifnet *ifname_linux_to_bsd(struct thread *td, - const char *lxname, char *bsdname); unsigned short linux_ifflags(struct ifnet *); int linux_ifhwaddr(struct ifnet *ifp, struct l_sockaddr *lsa); diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 9f1fdd3a6671..4c95745e4307 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -2187,22 +2188,17 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) full = 0; cbs.max_len = maxphys - 1; - CURVNET_SET(TD_TO_VNET(td)); /* handle the 'request buffer size' case */ if ((l_uintptr_t)ifc.ifc_buf == PTROUT(NULL)) { ifc.ifc_len = 0; NET_EPOCH_ENTER(et); if_foreach(linux_ifconf_ifnet_cb, &ifc); NET_EPOCH_EXIT(et); - error = copyout(&ifc, uifc, sizeof(ifc)); - CURVNET_RESTORE(); - return (error); + return (copyout(&ifc, uifc, sizeof(ifc))); } - if (ifc.ifc_len <= 0) { - CURVNET_RESTORE(); + if (ifc.ifc_len <= 0) return (EINVAL); - } again: if (ifc.ifc_len <= cbs.max_len) { @@ -2229,52 +2225,132 @@ again: if (error == 0) error = copyout(&ifc, uifc, sizeof(ifc)); sbuf_delete(sb); - CURVNET_RESTORE(); return (error); } static int -linux_gifflags(struct thread *td, struct ifnet *ifp, struct l_ifreq *ifr) +linux_ioctl_socket_ifreq(struct thread *td, int fd, u_int cmd, + struct l_ifreq *uifr) { - unsigned short flags; - - flags = linux_ifflags(ifp); - - return (copyout(&flags, &ifr->ifr_flags, sizeof(flags))); -} + struct l_ifreq lifr; + struct ifreq bifr; + size_t ifrusiz; + int error, temp_flags; -static int -linux_gifhwaddr(struct ifnet *ifp, struct l_ifreq *ifr) -{ - struct l_sockaddr lsa; - - if (linux_ifhwaddr(ifp, &lsa) != 0) - return (ENOENT); + switch (cmd) { + case LINUX_SIOCGIFINDEX: + cmd = SIOCGIFINDEX; + break; + case LINUX_SIOCGIFFLAGS: + cmd = SIOCGIFFLAGS; + break; + case LINUX_SIOCGIFADDR: + cmd = SIOCGIFADDR; + break; + case LINUX_SIOCSIFADDR: + cmd = SIOCSIFADDR; + break; + case LINUX_SIOCGIFDSTADDR: + cmd = SIOCGIFDSTADDR; + break; + case LINUX_SIOCGIFBRDADDR: + cmd = SIOCGIFBRDADDR; + break; + case LINUX_SIOCGIFNETMASK: + cmd = SIOCGIFNETMASK; + break; + case LINUX_SIOCSIFNETMASK: + cmd = SIOCSIFNETMASK; + break; + case LINUX_SIOCGIFMTU: + cmd = SIOCGIFMTU; + break; + case LINUX_SIOCSIFMTU: + cmd = SIOCSIFMTU; + break; + case LINUX_SIOCGIFHWADDR: + cmd = SIOCGHWADDR; + break; + /* + * XXX This is slightly bogus, but these ioctls are currently + * XXX only used by the aironet (if_an) network driver. + */ + case LINUX_SIOCDEVPRIVATE: + cmd = SIOCGPRIVATE_0; + break; + case LINUX_SIOCDEVPRIVATE+1: + cmd = SIOCGPRIVATE_1; + break; + default: + return (ENOIOCTL); + } - return (copyout(&lsa, &ifr->ifr_hwaddr, sizeof(lsa))); -} + error = copyin(uifr, &lifr, sizeof(lifr)); + if (error != 0) + return (error); + bzero(&bifr, sizeof(bifr)); - /* -* If we fault in bsd_to_linux_ifreq() then we will fault when we call -* the native ioctl(). Thus, we don't really need to check the return -* value of this function. -*/ -static int -bsd_to_linux_ifreq(struct ifreq *arg) -{ - struct ifreq ifr; - size_t ifr_len = sizeof(struct ifreq); - int error; + /* + * The size of Linux enum ifr_ifru is bigger than + * the FreeBSD size due to the struct ifmap. + */ + ifrusiz = (sizeof(lifr) > sizeof(bifr) ? sizeof(bifr) : + sizeof(lifr)) - offsetof(struct l_ifreq, ifr_ifru); + bcopy(&lifr.ifr_ifru, &bifr.ifr_ifru, ifrusiz); - if ((error = copyin(arg, &ifr, ifr_len))) + error = ifname_linux_to_bsd(td, lifr.ifr_name, bifr.ifr_name); + if (error != 0) return (error); - *(u_short *)&ifr.ifr_addr = ifr.ifr_addr.sa_family; + /* Translate in values. */ + switch (cmd) { + case SIOCGIFINDEX: + bifr.ifr_index = lifr.ifr_index; + break; + case SIOCSIFADDR: + case SIOCSIFNETMASK: + bifr.ifr_addr.sa_len = sizeof(struct sockaddr); + bifr.ifr_addr.sa_family = + linux_to_bsd_domain(lifr.ifr_addr.sa_family); + break; + default: + break; + } - error = copyout(&ifr, arg, ifr_len); + error = kern_ioctl(td, fd, cmd, (caddr_t)&bifr); + if (error != 0) + return (error); + bzero(&lifr.ifr_ifru, sizeof(lifr.ifr_ifru)); + + /* Translate out values. */ + switch (cmd) { + case SIOCGIFINDEX: + lifr.ifr_index = bifr.ifr_index; + break; + case SIOCGIFFLAGS: + temp_flags = bifr.ifr_flags | (bifr.ifr_flagshigh << 16); + lifr.ifr_flags = bsd_to_linux_ifflags(temp_flags); + break; + case SIOCGIFADDR: + case SIOCSIFADDR: + case SIOCGIFDSTADDR: + case SIOCGIFBRDADDR: + case SIOCGIFNETMASK: + bcopy(&bifr.ifr_addr, &lifr.ifr_addr, sizeof(bifr.ifr_addr)); + lifr.ifr_addr.sa_family = + bsd_to_linux_domain(bifr.ifr_addr.sa_family); + break; + case SIOCGHWADDR: + bcopy(&bifr.ifr_addr, &lifr.ifr_hwaddr, sizeof(bifr.ifr_addr)); + lifr.ifr_hwaddr.sa_family = LINUX_ARPHRD_ETHER; + break; + default: + bcopy(&bifr.ifr_ifru, &lifr.ifr_ifru, ifrusiz); + break; + } - return (error); + return (copyout(&lifr, uifr, sizeof(lifr))); } /* @@ -2284,84 +2360,34 @@ bsd_to_linux_ifreq(struct ifreq *arg) static int linux_ioctl_socket(struct thread *td, struct linux_ioctl_args *args) { - char lifname[LINUX_IFNAMSIZ], ifname[IFNAMSIZ]; - struct ifnet *ifp; struct file *fp; int error, type; - ifp = NULL; - error = 0; - error = fget(td, args->fd, &cap_ioctl_rights, &fp); if (error != 0) return (error); type = fp->f_type; fdrop(fp, td); + + CURVNET_SET(TD_TO_VNET(td)); + if (type != DTYPE_SOCKET) { /* not a socket - probably a tap / vmnet device */ switch (args->cmd) { case LINUX_SIOCGIFADDR: case LINUX_SIOCSIFADDR: case LINUX_SIOCGIFFLAGS: - return (linux_ioctl_special(td, args)); + error = linux_ioctl_special(td, args); + break; default: - return (ENOIOCTL); + error = ENOIOCTL; + break; } + CURVNET_RESTORE(); + return (error); } - switch (args->cmd & 0xffff) { - case LINUX_FIOGETOWN: - case LINUX_FIOSETOWN: - case LINUX_SIOCADDMULTI: - case LINUX_SIOCATMARK: - case LINUX_SIOCDELMULTI: - case LINUX_SIOCGIFNAME: - case LINUX_SIOCGIFCONF: - case LINUX_SIOCGPGRP: - case LINUX_SIOCSPGRP: - case LINUX_SIOCGIFCOUNT: - /* these ioctls don't take an interface name */ - break; - - case LINUX_SIOCGIFFLAGS: - case LINUX_SIOCGIFADDR: - case LINUX_SIOCSIFADDR: - case LINUX_SIOCGIFDSTADDR: - case LINUX_SIOCGIFBRDADDR: - case LINUX_SIOCGIFNETMASK: - case LINUX_SIOCSIFNETMASK: - case LINUX_SIOCGIFMTU: - case LINUX_SIOCSIFMTU: - case LINUX_SIOCSIFNAME: - case LINUX_SIOCGIFHWADDR: - case LINUX_SIOCSIFHWADDR: - case LINUX_SIOCDEVPRIVATE: - case LINUX_SIOCDEVPRIVATE+1: - case LINUX_SIOCGIFINDEX: - /* copy in the interface name and translate it. */ - error = copyin((void *)args->arg, lifname, LINUX_IFNAMSIZ); - if (error != 0) - return (error); - memset(ifname, 0, sizeof(ifname)); - ifp = ifname_linux_to_bsd(td, lifname, ifname); - if (ifp == NULL) - return (EINVAL); - /* - * We need to copy it back out in case we pass the - * request on to our native ioctl(), which will expect - * the ifreq to be in user space and have the correct - * interface name. - */ - error = copyout(ifname, (void *)args->arg, IFNAMSIZ); - if (error != 0) - return (error); - break; - - default: - return (ENOIOCTL); - } - - switch (args->cmd & 0xffff) { + switch (args->cmd) { case LINUX_FIOSETOWN: args->cmd = FIOSETOWN; error = sys_ioctl(td, (struct ioctl_args *)args); @@ -2397,67 +2423,6 @@ linux_ioctl_socket(struct thread *td, struct linux_ioctl_args *args) error = linux_ifconf(td, (struct ifconf *)args->arg); break; - case LINUX_SIOCGIFFLAGS: - args->cmd = SIOCGIFFLAGS; - error = linux_gifflags(td, ifp, (struct l_ifreq *)args->arg); - break; - - case LINUX_SIOCGIFADDR: - args->cmd = SIOCGIFADDR; - error = sys_ioctl(td, (struct ioctl_args *)args); - bsd_to_linux_ifreq((struct ifreq *)args->arg); - break; - - case LINUX_SIOCSIFADDR: - /* XXX probably doesn't work, included for completeness */ - args->cmd = SIOCSIFADDR; - error = sys_ioctl(td, (struct ioctl_args *)args); - break; - - case LINUX_SIOCGIFDSTADDR: - args->cmd = SIOCGIFDSTADDR; - error = sys_ioctl(td, (struct ioctl_args *)args); - bsd_to_linux_ifreq((struct ifreq *)args->arg); - break; - - case LINUX_SIOCGIFBRDADDR: - args->cmd = SIOCGIFBRDADDR; - error = sys_ioctl(td, (struct ioctl_args *)args); - bsd_to_linux_ifreq((struct ifreq *)args->arg); - break; - - case LINUX_SIOCGIFNETMASK: - args->cmd = SIOCGIFNETMASK; - error = sys_ioctl(td, (struct ioctl_args *)args); - bsd_to_linux_ifreq((struct ifreq *)args->arg); - break; - - case LINUX_SIOCSIFNETMASK: - error = ENOIOCTL; - break; - - case LINUX_SIOCGIFMTU: - args->cmd = SIOCGIFMTU; - error = sys_ioctl(td, (struct ioctl_args *)args); - break; - - case LINUX_SIOCSIFMTU: - args->cmd = SIOCSIFMTU; - error = sys_ioctl(td, (struct ioctl_args *)args); - break; - - case LINUX_SIOCSIFNAME: - error = ENOIOCTL; - break; - - case LINUX_SIOCGIFHWADDR: - error = linux_gifhwaddr(ifp, (struct l_ifreq *)args->arg); - break; - - case LINUX_SIOCSIFHWADDR: - error = ENOIOCTL; - break; - case LINUX_SIOCADDMULTI: args->cmd = SIOCADDMULTI; error = sys_ioctl(td, (struct ioctl_args *)args); @@ -2468,34 +2433,17 @@ linux_ioctl_socket(struct thread *td, struct linux_ioctl_args *args) error = sys_ioctl(td, (struct ioctl_args *)args); break; - case LINUX_SIOCGIFINDEX: - args->cmd = SIOCGIFINDEX; - error = sys_ioctl(td, (struct ioctl_args *)args); - break; - case LINUX_SIOCGIFCOUNT: error = 0; break; - /* - * XXX This is slightly bogus, but these ioctls are currently - * XXX only used by the aironet (if_an) network driver. - */ - case LINUX_SIOCDEVPRIVATE: - args->cmd = SIOCGPRIVATE_0; - error = sys_ioctl(td, (struct ioctl_args *)args); - break; - - case LINUX_SIOCDEVPRIVATE+1: - args->cmd = SIOCGPRIVATE_1; - error = sys_ioctl(td, (struct ioctl_args *)args); + default: + error = linux_ioctl_socket_ifreq(td, args->fd, args->cmd, + PTRIN(args->arg)); break; } - if (ifp != NULL) - /* restore the original interface name */ - copyout(lifname, (void *)args->arg, LINUX_IFNAMSIZ); - + CURVNET_RESTORE(); return (error); } From nobody Sat Mar 4 09:12: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 4PTJyn6YXwz3vmxq; Sat, 4 Mar 2023 09:12: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 4PTJyn63kwz3y4c; Sat, 4 Mar 2023 09:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AD9Renf+HuPjkDQ0DmCV/AtgXY08tjQXB61ZJC8xSmw=; b=qKL4sWhXpKLPfr7CsbxBre5sKmH7eSGh63KyCYpiorVzaShEnospg8bWkzV49ePotj5ObY woJ30WziKFfhrxUPm4UkYp3JyDjXv24+Dw2whvfTnpul1Jn02LJPTck3YgfXGibIwGcTIZ RjpOZASaGG+n0dUA6sWydwSnjQM3sn1pvPSYWIYC22j1ahg7DAjAbp4Kq8Aea0HgUM0kNC ZqlirR6vWwRUoEJPz4Rm7HbLppMILuD+HF3IEtK6iLlcNPuL9fK+DLHFNIsl1yPR+5/tJZ wvyQKLLuz7xsAepaxjDuQT8mQjn+ACuz1S2DHD0RkQciND5Ykkv3agdVPXTNKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AD9Renf+HuPjkDQ0DmCV/AtgXY08tjQXB61ZJC8xSmw=; b=qFFcJLQNtsuLETj6rGNxL58j/mO5ZtkShLaY9gDWfOW04K9aKNdOeSxNTR7c9G7IBe/giQ MED24rIcPq7hLzuMZQ9hFbUc7pjjOnGz6PdJxTSg26bOBM1yagLcEoHdY9IFx2wzo56RqN jMZa+0ajAPEAy7QYMHLylq1TyTlLuXK98VFiZFwqwvbWHT7NrWZ0pwjAfD4hako8VPYc5e sLQPHcZJpSgFc7Prts1VONXEGAx8IRMQHz8ZDG1u6YRBErDqxrSsaoMIQM2rhyer2AhxdK y8P9bAziPHAjPPpu7KtaOM04yzASosAonXSM8XKFL+wEb4jeXyF0R/zMb/njMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921169; a=rsa-sha256; cv=none; b=vaWwUEcgzx6RC7qW4URTeK3mMz4VBSZLpySbedREdAnMHGNc+4fMmHgNpFKdAA6Ybd2Rov wEwHp4IUdJj6GxuV1bFOQ/Lx5tTo5ha5MC0DXIeFbGIya8vXDT753YgqZvTfS+dzeWnJ7+ Nx444/nGygo//w2bEjExFGgCg6R0qNcUKb1Gm2BLmT75mqbvwVznt2UcIWsR/23Ctw8d9Y c/7cUrux5ByW4nZV+ZQ9X8DAexWFCsowumEC95z+42+N9KeHp2PvPDfUWKOX2A0fQ535b8 Udlp54M0ofTU/H68C4P04HMb1vzeEpD6UvbY5X2Mz9XJV9tgHOU7WRyS9fWFjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyn4z2BzYnK; Sat, 4 Mar 2023 09:12: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 3249Cn2g078937; Sat, 4 Mar 2023 09:12:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249CnYm078936; Sat, 4 Mar 2023 09:12:49 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:49 GMT Message-Id: <202303040912.3249CnYm078936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 8d6dd96d50d2 - main - linux(4): Add net epoch assert to the linux_ifhwaddr, linux_ifflags 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d6dd96d50d2e6fea4cbbdb30ff12cc5730b7fbd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8d6dd96d50d2e6fea4cbbdb30ff12cc5730b7fbd commit 8d6dd96d50d2e6fea4cbbdb30ff12cc5730b7fbd Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:38 +0000 linux(4): Add net epoch assert to the linux_ifhwaddr, linux_ifflags Now this functions are intended to use in the net epoch. Reviewed by: emaste, melifaro Differential Revision: https://reviews.freebsd.org/D38795 --- sys/compat/linux/linux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 2e6e52f7490c..273e2a0295c1 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -477,6 +477,8 @@ int linux_ifhwaddr(struct ifnet *ifp, struct l_sockaddr *lsa) { + NET_EPOCH_ASSERT(); + if (IFP_IS_LOOP(ifp)) { bzero(lsa, sizeof(*lsa)); lsa->sa_family = LINUX_ARPHRD_LOOPBACK; From nobody Sat Mar 4 09:12: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 4PTJyp70LRz3vmtN; Sat, 4 Mar 2023 09:12: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 4PTJyp6Tz6z3yvV; Sat, 4 Mar 2023 09:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lol2iBnHpHbmM4yDs3o9XtFcSyHq0OcotOmJIc7y7IA=; b=uGHAZ+AQzmYcDLjFb1WPT5jKhkJMzbZAu/3R6EA1e2AVeVKJX+oZBK8CxnnF6dLc+MAKKB 2Dp7xLfSHC9/6BTH03peov8vSOkf+MudWIyS0D5gdgQ4ZSfCaQpQ86gYvy8pD3mAWISjjT zsz+O7MJZ6WK8y5ZUHEgbNZSBdzTQwMMZfe8yqxXT+Id3Mu7eTUGmDeA8C6bj27bjnfxcA JzELTBtN6qN6ooBrImr545X9uxRjmm218W3m0/tTyAMCHqsYFe9n1DszIKhv+Z/jQD7qOO PPaK4+jb99i4S+KHBH5SvzNdidY6DQpuI15qMsXhTnBnFaOaPbJS9dEM7pp6XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lol2iBnHpHbmM4yDs3o9XtFcSyHq0OcotOmJIc7y7IA=; b=S8LjwoY3r38sNAlUjDLYsEo1IZn3KUW3TGp8Zt27SGYB/Vd+rJQFFQ7jHqn1jO4n0GlKoS VF8NZuyBBO7ZrtCPOQj9UBuy1dAjelxChXiEzK+bpGDtfoxlGIw7r3PrzfMIApdQ/mBN7a 3j0UWcLtAVyPWpmrYx2hJxsGNYcbbHaktaCrqcOUQwozqjzt5AnUxTNlfMGEBx2nK1l7Bq MjYMsJimUfNuzyXGo4Ml2zp6h8sukGAAAEYBj1OLyfCSTuisOH7kxLx3aIf4cW2+UyczWe P6S3HwKOLe7x8ws7I9/uYXde0CrU9UqBrSuFEYD1Trjqb2U4s4x0Rze/Rpu97g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921170; a=rsa-sha256; cv=none; b=VgQzRWt3wCVaOSN+OX3tgC2scQShb/2pxq/RJhmv22LANOxq7g00PyylciX+v4gWQxbrf5 VoPnLRc5z/3u2X3Heu3jEmVpmSldoaHvx89mnILkNdUxY6DeCBUu4+7uCWp8x5kDm1Lufp 7iXX/Gru2O3OtXtLG0sjA+9SVINXBdpeV53YsbZ6hKMg2LzWWo63+/eYYoIt0IPpebH0yN uY3lUXPXJDwPpoT3KbsDmNUhEx0HvdlK2Hj6ePDSbDi7eAUQiEuzxGlwmU4I+3QYJef9us KOHsY5Lji7tT873r+yscROStcvutHRLLCtCo/PznLdak6Zc6C7XbvSH9j9hPUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyp5XgBzYq5; Sat, 4 Mar 2023 09:12: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 3249ConI078964; Sat, 4 Mar 2023 09:12:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249Cop0078963; Sat, 4 Mar 2023 09:12:50 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:50 GMT Message-Id: <202303040912.3249Cop0078963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 96a8c6aa375a - main - linux(4): Fixup of the pointer cast when comparing to an integer 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96a8c6aa375a33dba5a704ed91b7633b7416291a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=96a8c6aa375a33dba5a704ed91b7633b7416291a commit 96a8c6aa375a33dba5a704ed91b7633b7416291a Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:39 +0000 linux(4): Fixup of the pointer cast when comparing to an integer --- sys/compat/linux/linux_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 4c95745e4307..27cf90b96a71 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2189,7 +2189,7 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) cbs.max_len = maxphys - 1; /* handle the 'request buffer size' case */ - if ((l_uintptr_t)ifc.ifc_buf == PTROUT(NULL)) { + if (PTRIN(ifc.ifc_buf) == NULL) { ifc.ifc_len = 0; NET_EPOCH_ENTER(et); if_foreach(linux_ifconf_ifnet_cb, &ifc); From nobody Sat Mar 4 09:12: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 4PTJyr2lzlz3vmtP; Sat, 4 Mar 2023 09:12: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 4PTJyr0Jxcz40CF; Sat, 4 Mar 2023 09:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i/W4pQLPpiEwCV4ZfHe+YDuLfluHrkBYbxTQ6LBQ0Io=; b=Wk9GS+2TgWY0Q2P8DkQ73h6edKLLiYLkPF48nj28RcWZ7OoZENIYZ35+CbvDCIaiDs7FpU Opyl7NuMLdYU3JfRK33dXArQsEx7tXq/4k/4ckzjaDMVyj5GZjmY8EX/zlJOg/0OrDDgle wRR4vjoRSgAXNlfNgEX18/HwU3xai3DeppZqxBbnY5XYqpKQ0EQbMre6toMBvbF0Aguvmr Iyx2UnE90sh5pAnQF7qkgNi/EiQZZNveHM9JvUiqjloEI/FGZ4eCNo/cM70nwPXzfXo7uV Ru2ZeVXeIjnoegeEBka0zVhfHnl64BO7oPq96NVaJ2pp5P1iCtU5D0e14snl2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i/W4pQLPpiEwCV4ZfHe+YDuLfluHrkBYbxTQ6LBQ0Io=; b=XDMf0WjWi3uoKkHOthvbLs3g4qqSVPiUTx+Vw+c4klzGBdcC8Pcr4UQkINaQTM6WTwVhQv uQn5X2xYrsojQQIhCZ+tmZHiQsY68b0ssVU8WKOr9SETs2l6j/Uv5BAB8a66KJgmvP45Ze NnLhcQLJExJRuF4zgjOPFjxwTNzpvMydXI1Xk1dHeFlzT+T9GYTW4JAPhIkC3v5nDDqmco X0AfQiFvpZhOc0ntzaRxACmrWgjocjUD5Ms6bfzoEnE3aMJH+I2vw4Y0Eyn5byBO4A75k0 WnPd/u9bx4ajJUbUhBEk+7SO9VwIHrnnpqNtHCvSuRO1llhvzjxrvhhJKNnFLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921172; a=rsa-sha256; cv=none; b=SOKUTE9CyyTOoQMFeFoGN13p9zxTKoUopPaxqQnykyqwk6kPGMhrVUjjgXEyO+lDdb9fKX XNZlmeDONlIBNbopPfaZfrYrFyV5gHz0Iv15s8LjJOL5ecnTaeLmS6vmGYQMfGfhxgAOdY pAOLNvHVIOaWYAkR5RGTaTjLUAzISu6qghnOewpBUyYN5AyIvc+wjRsrDdN+3lU8KnDkwf gg2uVIqp3f+TujZ75BPSPoaZR5hjOZQlZd5bFJh56JjoyS4+8AmuHPtSJdo+4hmYHRFrX4 cmeMOz/EJu+i2G5a7F9rnpGevEYXWyWS4Mwxpvo1c13q3DDDlj3t1086y9EVxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyq6Xb8zZJ9; Sat, 4 Mar 2023 09:12: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 3249CpiP078984; Sat, 4 Mar 2023 09:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249Cpkt078983; Sat, 4 Mar 2023 09:12:51 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:51 GMT Message-Id: <202303040912.3249Cpkt078983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: d447088d9981 - main - linux(4): Improve linux_ifconf readability 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d447088d998107dfff30c3ca801ff778a9030270 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d447088d998107dfff30c3ca801ff778a9030270 commit d447088d998107dfff30c3ca801ff778a9030270 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:39 +0000 linux(4): Improve linux_ifconf readability Initialize max_len and full variables in a code block where they are used. --- sys/compat/linux/linux_ioctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 27cf90b96a71..839c3a61d647 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2185,8 +2185,6 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) error = copyin(uifc, &ifc, sizeof(ifc)); if (error != 0) return (error); - full = 0; - cbs.max_len = maxphys - 1; /* handle the 'request buffer size' case */ if (PTRIN(ifc.ifc_buf) == NULL) { @@ -2196,10 +2194,12 @@ linux_ifconf(struct thread *td, struct ifconf *uifc) NET_EPOCH_EXIT(et); return (copyout(&ifc, uifc, sizeof(ifc))); } - if (ifc.ifc_len <= 0) return (EINVAL); + full = 0; + cbs.max_len = maxphys - 1; + again: if (ifc.ifc_len <= cbs.max_len) { cbs.max_len = ifc.ifc_len; From nobody Sat Mar 4 09:12: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 4PTJyt4t7vz3vmxx; Sat, 4 Mar 2023 09:12: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 4PTJys1Mh6z40GN; Sat, 4 Mar 2023 09:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEh5LHDEar5fniuvA5qwqxj1ZXzJumQXJlcFkubhJ48=; b=tSdJ0aSJOiXMrmue1PRue0ZunChS9Irq9Fk1/GKgSs4jzN+8F/10KTjnTe2+uwYdTETwcd oy3lHbUPOLSvOcoyjNz9xbrUqqn9t0BLtfw/ZVz5mvhm5mH0GyWLP9Mwdiuu2KMdGCWoZU d5ksLIg3C6wJtqbwl35UYYENNdS9hbjCDlfFH7IAtYJMQbTdLUyBj6zGQnixSZNZFQ4cEG pAUQWtSXeCBFmtX/5tOrXfQQAv6nbzGLlqhomvHGUh9ARyGPWX5Iqcmv6RUOCHtALoMPwL +22Pw9YpFnaulABQ3RCkDOakOcwU01ShEdt9SB5ht1rXPJ/SEp0jePcUhVG9Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEh5LHDEar5fniuvA5qwqxj1ZXzJumQXJlcFkubhJ48=; b=lqJfafw9tmmYbLly/efHebdqlH3T/kmwge35FLbg4TZWEEf3z2ZQbOQTtcpM+rzNyaPycD 4zqLTUSjJkbcrd2PzJKGsQMTuQ8+1d2Ke+juBVi3J48Mngqsk/925KjyE+udBpmgSBwZ/b QdluDuFMbTlT7e1B7cHz0GBXJt8CiE0RlVFocGQXL5DHM02ejNEpBy6E//+FZ5dA1wvxmk wT+lvBzh9nzLyfNtZW3anVkTvUVQ/zfnhT9xItHPcF73Io3ex8Ubi9K0tq2vDq8M0TdwYi AhB72R8pt3TrYKlOdyKj7w5bvK4dkHrqFDWznp2+R+XFm7kqbWshSJUMoGqqxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921173; a=rsa-sha256; cv=none; b=QTPOKcKxvKH4r82uuPJBhPI/ChdgAE+AwboVcq1wTLhvyErv/HgAX2itf9BJ/zLlwyuDMC uN9c4fK2lEJlHCAR/b3FM7/O66u2WSkftwA/WQouDOitJmsbEVGDIVcgOY7Z2NW2QsHi1g Qct9gPRa7yn6DNJJtRXPVXQGJdEBHjsw2Q4EnznqQ7rrYo4ae9PZ+DQ4eS+mj0Hget/jS/ EHen4FBr4adbyWlATYMeiub3AgEYmvtIl+Gar0yH77Kx8QIa/0hCSOJrs+rDAYeq4IfxeB AZKFuVD511QHSjX4Xixfx5mdzTbyYx8HlDE4uuZN7abRkqLv4l7a2/kHOvL9/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJys0SyCzZJB; Sat, 4 Mar 2023 09:12: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 3249CqCB079003; Sat, 4 Mar 2023 09:12:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249CqTA079002; Sat, 4 Mar 2023 09:12:52 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:52 GMT Message-Id: <202303040912.3249CqTA079002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 9883961ed5af - main - linux(4): Drop excess assert that Linux IFNAMSIZ is equal to FreeBSD 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9883961ed5af5f0ade31579e95ac53e8c514faed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=9883961ed5af5f0ade31579e95ac53e8c514faed commit 9883961ed5af5f0ade31579e95ac53e8c514faed Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:39 +0000 linux(4): Drop excess assert that Linux IFNAMSIZ is equal to FreeBSD While here use _Static_assert() instead of the older CTASSERT(). --- sys/compat/linux/linux.c | 2 +- sys/compat/linux/linux_ioctl.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 273e2a0295c1..a4df46d7f9a7 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include -CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ); +_Static_assert(LINUX_IFNAMSIZ == IFNAMSIZ, "Linux IFNAMSIZ"); static bool use_real_ifnames = false; SYSCTL_BOOL(_compat_linux, OID_AUTO, use_real_ifnames, CTLFLAG_RWTUN, diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 839c3a61d647..6d15ecdfa939 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -86,8 +86,6 @@ __FBSDID("$FreeBSD$"); #include -CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ); - #define DEFINE_LINUX_IOCTL_SET(shortname, SHORTNAME) \ static linux_ioctl_function_t linux_ioctl_ ## shortname; \ static struct linux_ioctl_handler shortname ## _handler = { \ From nobody Sat Mar 4 09:12: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 4PTJyv29Bfz3vmrS; Sat, 4 Mar 2023 09:12: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 4PTJyt4BWjz40SX; Sat, 4 Mar 2023 09:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oI3Sc9GP/yqg9a42hUb/lCIHDS0ZuHOX6c28DjbvsgI=; b=QF/V84+6WjWbG4+37PFZGrmluMeGx8Nn2PeVASCrM0ZYqT+i4eRsBYfZaIgr/FdCtzClhQ BcaJ7cjaiMFgR/rvyM2A9J5QeSEQGZeA1AlWm7nGUhjbmCiKYR3iqm0xagZkl/K1GSgoq9 IhFSOovxR1QsTg0bmu0OeGiDdaXxJI4WiKVUTR+ZVRS2A3CRqWIK1i1eAnSDnUDgoeWIEN 80qd8bpwECQ/cl/URZ2CfHvPyIPBFavSgHF5gwm7Y6GBcglbBXXc1oFU2r/s8b/zBkdQou PDQ/QlhXJDO1a7hJKbc+XMxEfhaGa12QRXJ8g1YGAe0TMReU0gK5946t/FNBAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oI3Sc9GP/yqg9a42hUb/lCIHDS0ZuHOX6c28DjbvsgI=; b=OTPyrJOUO7gIwEo2QxLvvGmv3gHg3VuszErsseM6Urlg+xjh7KKr1iGFVxvVxfYDKtbKiQ x6MLJr6b4swzL9AHwKzm3cSXVEbjzFEqQiX8cjHpFphTBFqJa3RnDLE/q8v+BPETjb6bI4 L3pdgAYfqTGXV/d8e/UJUEFUCbMlEnhz+x+DGGgRq+PIPjjvKQUy9J6W/TOz1JW2W7WIEa 0wiCKgnAf9aXSFwBt/fFMZm9NmbFCLFsLiCjnZS/uwaT6RQ+g4mr6DkTsY1eKB6vUiwx0a 6argyNWyWT3KWRuDaCrbcN4heuPQhXvi0wLhEBxOe3ykoQLXuG3B8A3h80qasA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921174; a=rsa-sha256; cv=none; b=n/F/neahsvIRw+ZXLf6GO1jqwZo4DiOEb2y8yXqk+JgIWTSwptcysAHZ0kLtnA/HBBl+lb tMAT+blLAnOcD7/0ySgilIkPvpA/qsNp1UY3tSyT3u7TKqkE9NjkTWn2lTfnQSYUNaryOo /s2CKBocyuvW+vI432ZNa3IFQZiMpQPZ9xG58Xpw6oAKq2g0LhmGvVDySTuaf2mxh/BACl yGjsuRTeBZSrQe12MV/8kHxF7nV8DiS4pGQbWAlMJvLcXvoag4VF+PT867ZPSW8gql59Be VYSlkmvTeO5mAILYh3zS/FIFHDwOp7IlH+H906hEvK21uW1S+R886NeK9xG7yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTJyt1P3TzZJC; Sat, 4 Mar 2023 09:12: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 3249CsYJ079025; Sat, 4 Mar 2023 09:12:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249Csks079024; Sat, 4 Mar 2023 09:12:54 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:54 GMT Message-Id: <202303040912.3249Csks079024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 945a7f0d21a0 - main - linux(4): Assert that the FreeBSD size of struct sockaddr is equal to Linux 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 945a7f0d21a0bcbcce3f308e080f54dfb7da54b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=945a7f0d21a0bcbcce3f308e080f54dfb7da54b1 commit 945a7f0d21a0bcbcce3f308e080f54dfb7da54b1 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:39 +0000 linux(4): Assert that the FreeBSD size of struct sockaddr is equal to Linux Our code depends on the fact that the size of struct sockaddr and the size of sa_data is equal between FreeBSD and Linux. --- sys/compat/linux/linux.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index a4df46d7f9a7..53a874ebfab7 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -57,6 +57,10 @@ __FBSDID("$FreeBSD$"); #include _Static_assert(LINUX_IFNAMSIZ == IFNAMSIZ, "Linux IFNAMSIZ"); +_Static_assert(sizeof(struct sockaddr) == sizeof(struct l_sockaddr), + "Linux struct sockaddr size"); +_Static_assert(offsetof(struct sockaddr, sa_data) == + offsetof(struct l_sockaddr, sa_data), "Linux struct sockaddr layout"); static bool use_real_ifnames = false; SYSCTL_BOOL(_compat_linux, OID_AUTO, use_real_ifnames, CTLFLAG_RWTUN, From nobody Sat Mar 4 09:26: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 4PTKH66Ngtz3vnqk; Sat, 4 Mar 2023 09:26: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 4PTKH65f3Jz44Cl; Sat, 4 Mar 2023 09:26:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677922018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5sNbJWsyXnT733aYv2OaBl6950ZtMB4cZgj8dMPNlU=; b=TQcq6JP2mWVgGfxUJNn4GFej+E643bEL0UUrJfvgbx/GrrWHa2cgCbt/+xF7khtkOEYBhJ EIYFS71UqOS0qFFaNjvLSShv+RMJVzF95T7QWoWCPYfbSUcy3XMGKmzzDjmTnmyvYXGtUn eezWCiZ5hQpRKYkH5TSIeBhh4z5BSKy4teJ7q6Snp2p2pHbPj4VmIf1c8MaU6dmw4YJWFm WZtoLmrUqTrTv5jXpsmZ2YEjshH4l5yygrngRBdXGtW6a2xxcV7m0UxQ8AQg2jNq0qLL/N rXXXFIQnPvsphjBkfrIz7I8A9UHGU9icdU9GtCPBcCRE5yPLj0nMkwqNL5E0uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677922018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5sNbJWsyXnT733aYv2OaBl6950ZtMB4cZgj8dMPNlU=; b=iU3eRQx9cNSHyJtbtWqnkGPOP6MHMYzLzcSs0CUGqbY8DNb5+RWQZY0pDTSAS4Jwae2bY2 2eqv2x8vIicEj95VXhqj30wpTnJkqiI/oFAkebWCxPo5Ncdj+dormiuO4WXIZbewbqQfju xNapuUGLBwhW+JYlY2/BR/tVTdZP7UO/gFNcW4/GOiekxvebObBzopIrl/9OTDN4UVjzpO IB8dnODP12xNw51zi5zSttz4eH+meeyMedQV2GtEmF9wwHznGFWUY1YcCnZKxP/xAMHFIK O2KsDG1rF4mnbITcLgiXH+cdb7r4p8YKR5oHrRUEVCmHOhKEO+uXAX4YbWI2Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677922018; a=rsa-sha256; cv=none; b=BhcCOZud0gaLxSH8+iEOlOOhYHTLpiC1PhcwsekuRm9SjLAiNEBitiaplJSAf97XVfKBx9 GPb500ePPbxEH3ZDlQfPAqVqkwapj7LPdM8KwUvgXO2I6wEYrKIrpEYEPqtM6LaqrzQPN4 R73AUb1wng+UMQ+AZJXmzcO7v8uBgzttx7kPHMcRlQZ6zumOliEk8hDdkwfG68DC+kdPcR qC1xyBSGBx94NQHK7AGgBt9vsIy/8KjEp+ozxH+Ssl832ui2IBLNmBmt8tGskA4ouNK8yb oaDX5eRE1La5elqoq9rjpobhFT/j2UWAvFXJjCczJPEotlKfutLQAn7kDgJPMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTKH64jrRzZSB; Sat, 4 Mar 2023 09:26: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 3249QwAC095525; Sat, 4 Mar 2023 09:26:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249QwjJ095524; Sat, 4 Mar 2023 09:26:58 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:26:58 GMT Message-Id: <202303040926.3249QwjJ095524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 5c32488de0bb - main - linux(4): Add a counterpart to linux_ifflags 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c32488de0bbd9f7b52e3ff8be8ca2facc3169ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5c32488de0bbd9f7b52e3ff8be8ca2facc3169ba commit 5c32488de0bbd9f7b52e3ff8be8ca2facc3169ba Author: Dmitry Chagin AuthorDate: 2023-03-04 09:26:48 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:26:48 +0000 linux(4): Add a counterpart to linux_ifflags For further use in linux_ioctl_socket add bsd_to_linux_ifflags() which accepts FreeBSD interface flags and translate it to Linux if flags. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D38873 --- sys/compat/linux/linux.c | 13 ++++++++++--- sys/compat/linux/linux_common.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 53a874ebfab7..252645cf2ae5 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -434,10 +434,17 @@ ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname) unsigned short linux_ifflags(struct ifnet *ifp) { - unsigned short fl, flags; + unsigned short flags; + + flags = if_getflags(ifp) | if_getdrvflags(ifp); + return (bsd_to_linux_ifflags(flags)); +} + +unsigned short +bsd_to_linux_ifflags(int fl) +{ + unsigned short flags = 0; - fl = (if_getflags(ifp) | if_getdrvflags(ifp)) & 0xffff; - flags = 0; if (fl & IFF_UP) flags |= LINUX_IFF_UP; if (fl & IFF_BROADCAST) diff --git a/sys/compat/linux/linux_common.h b/sys/compat/linux/linux_common.h index 3392f55672f3..94ff5e49b57a 100644 --- a/sys/compat/linux/linux_common.h +++ b/sys/compat/linux/linux_common.h @@ -39,6 +39,7 @@ int ifname_linux_to_bsd(struct thread *, const char *, char *); unsigned short linux_ifflags(struct ifnet *); int linux_ifhwaddr(struct ifnet *ifp, struct l_sockaddr *lsa); +unsigned short bsd_to_linux_ifflags(int); int linux_to_bsd_domain(int domain); int bsd_to_linux_domain(int domain); int bsd_to_linux_sockaddr(const struct sockaddr *sa, From nobody Sat Mar 4 09:42: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 4PTKck4yHFz3vpXZ; Sat, 4 Mar 2023 09:42: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 4PTKck4W9tz45Nh; Sat, 4 Mar 2023 09:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677922934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNA/UPVmXTtpxuiDmWmL+BWb7da65WGd16YOBSJ9icA=; b=KvddHG2M7Ji+M3BOSETdydY7qB+UeYJp23BvXhfOk/4rekxcHm6m3Ho9s73J6W9qIN+/BV n1SNG8zkr2ZORj6HMc+u+yekGIDvdqkfO3j2YeyTvhMkAloWmzIlrPPZi14ELDHle00AcV 0vEeBhTWETlXsqT2euj7MBxbsdBri71cQEIhUM727JflREkiooaHfJCp7ovdx3iG6hIekE JAPDc3tLKGE7AHXYNtWwb8slD+vzRUlp2IMNKUmkxMwyOduta/jomO4nIwDfGc/RdqZ4NU VfcA/0KrQSDBniN3nP+VEoB70NP62D1HJ0NkaaEt1b04Xv9ZDNcb/zV6Yy3gIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677922934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNA/UPVmXTtpxuiDmWmL+BWb7da65WGd16YOBSJ9icA=; b=VmAhi5WBKeTqf81/kRWXLd2M0Qg9ntfNnjaD7ATgpNBpK9Zbn75uakWAazTbpV+DdxJLbd clrtKSHvJewZy1YKC8rmXRN7qdF3zB0Eo6IKy4qMzJpfG952f+dI6j8ZnzuO0tJ3WUukri x9wDr1gh1lKSW7+NPm16obp84JU5RS2zAUkpTBiNw+SfU2wAaFTykyX64Ny2gbaA0YDmuk ejCr4qeHMMhEwcBXlRY4sQRdZsc7//XzNwlAo4PD1nuZMZJhBzwMgKHf0DAl8UY0mHBjfJ X5tXK5h9qDzFRmGRbW2qb/0Yu/0+nz0RV6c4GAr4AvZxXJUqgy2zJUFMD5wjzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677922934; a=rsa-sha256; cv=none; b=TwoMFKbVguUcg55a3aZ5aCcK78sRHR8P8MDlpcmzGplz9DQrAeq3NuoP8sNRNxMjv9D4j/ Vw2vHrLcyAiYVi26XQ/9TVfJK8dTDEOyf+e98VkLlXi0WryinnLOWq84xW8vRtwwt9mc5I I+JtIeN3RfxqeDsFYxwqn0ai9SqMqxLMn5Br83UQZDp7IPpmcH0zxR2WwBCKeyTZ+ftFOL rCN3YF+7D1B+5q8eYyoTzrlGGmI9Mj683j9afllXRJKROniaMW6QWQgnuXJCJmARel+7s3 FBk0XhH3kf8QERhFgNdq3OG9oYcwoTSkqE+eDDvAkrr7S+Yw9jN0rhUFIaPlKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTKck3bDdzZTQ; Sat, 4 Mar 2023 09:42: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 3249gEbK026560; Sat, 4 Mar 2023 09:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249gEL1026559; Sat, 4 Mar 2023 09:42:14 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:42:14 GMT Message-Id: <202303040942.3249gEL1026559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 8243e174630f - main - linux(4): Fixup 5c32488de0 mis-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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8243e174630f09654ae8b93bce8b7d84448bdcf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8243e174630f09654ae8b93bce8b7d84448bdcf3 commit 8243e174630f09654ae8b93bce8b7d84448bdcf3 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:42:04 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:42:04 +0000 linux(4): Fixup 5c32488de0 mis-merge --- sys/compat/linux/linux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 252645cf2ae5..dcf5ac1e6892 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -436,6 +436,8 @@ linux_ifflags(struct ifnet *ifp) { unsigned short flags; + NET_EPOCH_ASSERT(); + flags = if_getflags(ifp) | if_getdrvflags(ifp); return (bsd_to_linux_ifflags(flags)); } From nobody Sat Mar 4 13:38: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 4PTQsC2Q1xz3w2Jw; Sat, 4 Mar 2023 13:38: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 4PTQsC1tDFz4MPH; Sat, 4 Mar 2023 13:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677937103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7sUPOfJvIbNEwSBPtZ7x4nyEwC/EUSVPUQqbojabNE=; b=K4wEGb69ADfV5TvChYsifozCSGP/M7s8+wtWUxikuy5fpeifFDRX2QYHyQQ7CwUsRQkYs8 OJ/ftj3Ip5xRzDUx0zDNCCiEqNJn8VnZ7M15uFUfaX5OXmgG726ZU86ZTsYnKkYnW9GOHY 8gBziEtfl7wqdYyuqz9oKGvg+rqK/XEYAsWIaeEvTn2oW7n1xtxUkIgZu0DMokz0AwodG8 SHQSvYqo4fuq9c09/WlPjtse5YyWWTj0KbrdDBQaUVK9HJm9ybmKMKIa2uDHKTPnlZ6pK6 sf54ngq3CTYfL4+nz/XTUbj9Qog4mVRC69LVCCKfHkB06w77Se8vL1E/FVJZOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677937103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7sUPOfJvIbNEwSBPtZ7x4nyEwC/EUSVPUQqbojabNE=; b=L3l1Rzo3EULVLmr7XAtVyjm18ALZ9CrODffNxLcJw5RoT9qKZayvnlGtTSsFyOUuohBbGD Qa4DWFGQZWc93ypd4yeJvLTq8fLLFeZltR2lwmLTmpBvUQxMV7hTXrTa7vGacNvXYqqr9O cesBeAieo1Zppn1Kw9uOLaNY+0TtaeZhmTeaNNr7VX82Le1b3CEHYQilSBcf9KujImi4oN EgJvhU9x5d3FTVszvbLr8U/nbQEFaLrvkpjwrVjOhG/Fp+MK6d3dycU3dP9MrSxRxN8YaT fgg1bKM0NBuuNRMCzkrmDu4ONtr01S5pGCwgddlo/S5CUk9kHQlPfWMtiF7b8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677937103; a=rsa-sha256; cv=none; b=b+dLRA5nurTsxCOyk+FlwUpBG2w6pfFaxuHJY0eOkgMhVW211CKKMxb3hqgbNzZa/aRZfz JtGbgdTKQTKoOzaVYzYLJRTG9Z8w7dff5mUNkhqvFWxShNY17jOKoaBTI5gzk0t+4j3hXZ GzVyrE5u3v63tYnAs7H4Q5HzfmEmo6PpYlnCaBCSIoNMiazl9nm6xx+Rv8njirL1agWeW3 FQ0vZ0Bw2RuGKSEGGVado6XMT/hIubeozdryj8yoEj6aLdqwsetVhigidm3Jt5k7nqztqU PchmujLwh4bniZyMu+kJx5K+q5h/YKDtB7iXsHJoR4uDDUG9ZzQVYVxiJ0tK5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTQsC0vVtzhf9; Sat, 4 Mar 2023 13:38: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 324DcNuQ005908; Sat, 4 Mar 2023 13:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 324DcN8B005907; Sat, 4 Mar 2023 13:38:23 GMT (envelope-from git) Date: Sat, 4 Mar 2023 13:38:23 GMT Message-Id: <202303041338.324DcN8B005907@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: f5b204adf4a6 - main - ifconfig: remove 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5b204adf4a61e4040dc0af55662a0d22a8cf42b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f5b204adf4a61e4040dc0af55662a0d22a8cf42b commit f5b204adf4a61e4040dc0af55662a0d22a8cf42b Author: Kristof Provost AuthorDate: 2023-03-02 09:30:57 +0000 Commit: Kristof Provost CommitDate: 2023-03-04 10:19:12 +0000 ifconfig: remove unused variable In printgroup() 'cnt' is set, but never read. Remove it. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/ifconfig/ifgroup.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifgroup.c b/sbin/ifconfig/ifgroup.c index 7f1173c316d7..c6f5c2959845 100644 --- a/sbin/ifconfig/ifgroup.c +++ b/sbin/ifconfig/ifgroup.c @@ -114,7 +114,7 @@ printgroup(const char *groupname) { struct ifgroupreq ifgr; struct ifg_req *ifg; - int len, cnt = 0; + int len; int s; s = socket(AF_LOCAL, SOCK_DGRAM, 0); @@ -140,7 +140,6 @@ printgroup(const char *groupname) ifg++) { len -= sizeof(struct ifg_req); printf("%s\n", ifg->ifgrq_member); - cnt++; } free(ifgr.ifgr_groups); From nobody Sat Mar 4 13:38: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 4PTQsD2qQ2z3w2c6; Sat, 4 Mar 2023 13:38: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 4PTQsD2dBqz4Mj7; Sat, 4 Mar 2023 13:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677937104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MSwxUgPNW6maeqF7k8SnEVWjghcyhjZaUKoW+GfnGcI=; b=h7NUKTHBCbZJuUkPNv4tlwk+duLioSwihF9cYvSG58iOAcE7/SNtpDgPV5vAzbWHSo1uph bp6UXLoJt+NBYGpp1yQbeE2L6Qa8gLVDAs9M/uH54d0ywWEZ6dgbMySrUdLu32FRrhlGmH +7sijwpHNiVqEVIYBYglktVp0rGLqyC+1we3i5hAVSMtFTnqMip8Me5ACksUmnEJyByRr2 fMjDVaIVrSkyrneR7KhWo9TWNbYfBqMLjceQpSOeCsnjODrCbSdW+D2oAOQkD3w3acGtg2 m18b6LjlnhQZqm89NYm8l47gftJP72kZ/tiBdwUWOWWcM+1UYU4WsC4DxeEzVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677937104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MSwxUgPNW6maeqF7k8SnEVWjghcyhjZaUKoW+GfnGcI=; b=hcdhSFG7gaF29UfM8/b5epACdwGib4OrL8PzS/6r5hvextSh/j2iklYEOON7PI+N6Xf4wS 0OZt+L+jUcYAX74fjh5Wtva8ulB5M8oC4A+NihOxHMMDqGVS0oZ6HCGFIlxKuvbl8nEMH2 PgIp1Npddl33Mtuyes2AOjcGdQxgguk11r725rahExsl4znplb0DAtdjjc943jDuwP5q4I qUYv+ENJ9ox+9HTHiJ1JGuOFag4gBIo5crLENDIcw3ocnEWT9buvXyB7J0SMKXbAUh2S2S KcnpDj27AHGMuuR2OPtOHnlnXcEEESlzKRkFuAcaNOSLk+nATzDY+v6ATFFp6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677937104; a=rsa-sha256; cv=none; b=ro+NWaU/zd4/GBiaiWDQ28Egcd9yrmEASQtHAxs9OkXV2dgYw+Ezn4MimQo5plZq+XcHrj ulAcwp3hNVNEoejUX8E5Uks0XR2RqIOrveTBjEy3bEta5eTgfeOUFPLvbeQsOolSqcB4JH Bbw+qqNSvXpGc3kBUrACAplxACikfL1ERDtroBZESVqxUHoNT9MH7bjuA6JaUk5+7joG1y HWOo2Odsws+02Qx/s5CFmoAKr29uMus965tqdRLxhSk9S62Bes+Ognhjdtr5F3HG154Lqe BKjur0dnGq2S/6FiKBTA0mmn/car3SbQdxq6dmOxepn/Q8C1VsRHNafNmuOT1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTQsD1k4NzhfB; Sat, 4 Mar 2023 13:38: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 324DcOMX005927; Sat, 4 Mar 2023 13:38:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 324DcOsb005926; Sat, 4 Mar 2023 13:38:24 GMT (envelope-from git) Date: Sat, 4 Mar 2023 13:38:24 GMT Message-Id: <202303041338.324DcOsb005926@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: 38e2d5db2ab1 - main - netpfil tests: Add functions for testing routing scenarios 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: 38e2d5db2ab12f74217e0a8546f7d9c77f782592 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=38e2d5db2ab12f74217e0a8546f7d9c77f782592 commit 38e2d5db2ab12f74217e0a8546f7d9c77f782592 Author: Kristof Provost AuthorDate: 2023-03-04 13:35:24 +0000 Commit: Kristof Provost CommitDate: 2023-03-04 13:35:24 +0000 netpfil tests: Add functions for testing routing scenarios Many pf tests use identical setup where one jail is a router and optionally another jail is a server. Add functions to create such jails for IPv6 and IPv4 and functions to perform tests on such setup. Add tests using those functions: scrub actions, routing table, tcp sequence number modulation. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D38126 --- tests/sys/netpfil/pf/Makefile | 4 +- tests/sys/netpfil/pf/fragmentation.sh | 38 ++++ tests/sys/netpfil/pf/{checksum.sh => modulate.sh} | 74 ++++---- tests/sys/netpfil/pf/rtable.sh | 131 +++++++++++++ tests/sys/netpfil/pf/scrub.sh | 221 ++++++++++++++++++++++ tests/sys/netpfil/pf/utils.subr | 136 +++++++++++++ 6 files changed, 563 insertions(+), 41 deletions(-) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 83f0d94e952e..7256602a55a9 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -7,7 +7,6 @@ TESTS_SUBDIRS+= ioctl ATF_TESTS_SH+= altq \ anchor \ - checksum \ dup \ ether \ forward \ @@ -18,6 +17,7 @@ ATF_TESTS_SH+= altq \ macro \ map_e \ match \ + modulate \ names \ nat \ pass_block \ @@ -27,7 +27,9 @@ ATF_TESTS_SH+= altq \ rdr \ ridentifier \ route_to \ + rtable \ rules_counter \ + scrub \ set_skip \ set_tos \ src_track \ diff --git a/tests/sys/netpfil/pf/fragmentation.sh b/tests/sys/netpfil/pf/fragmentation.sh index fb57cc62d54b..03ba5030d8aa 100644 --- a/tests/sys/netpfil/pf/fragmentation.sh +++ b/tests/sys/netpfil/pf/fragmentation.sh @@ -327,6 +327,43 @@ reassemble_cleanup() pft_cleanup } +atf_test_case "no_df" "cleanup" +no_df_head() +{ + atf_set descr 'Test removing of DF flag' + atf_set require.user root +} + +no_df_body() +{ + setup_router_server_ipv4 + + # Tester can send long packets which will get fragmented by the router. + # Replies from server will come in fragments which might get + # reassembled resulting in a long reply packet sent back to tester. + ifconfig ${epair_tester}a mtu 9000 + jexec router ifconfig ${epair_tester}b mtu 9000 + jexec router ifconfig ${epair_server}a mtu 1500 + jexec server ifconfig ${epair_server}b mtu 1500 + + # Sanity check. + ping_server_check_reply exit:0 --ping-type=icmp + + # Enable packet reassembly with clearing of the no-df flag. + pft_set_rules router \ + "scrub all fragment reassemble no-df" \ + "block" \ + "pass inet proto icmp all icmp-type echoreq" + # Ping with non-fragmentable packets. + # pf will strip the DF flag resulting in fragmentation and packets + # getting properly forwarded. + ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF +} +no_df_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "too_many_fragments" @@ -336,4 +373,5 @@ atf_init_test_cases() atf_add_test_case "overindex" atf_add_test_case "overlimit" atf_add_test_case "reassemble" + atf_add_test_case "no_df" } diff --git a/tests/sys/netpfil/pf/checksum.sh b/tests/sys/netpfil/pf/modulate.sh similarity index 55% rename from tests/sys/netpfil/pf/checksum.sh rename to tests/sys/netpfil/pf/modulate.sh index 9060e763d18d..ea0aa596f959 100644 --- a/tests/sys/netpfil/pf/checksum.sh +++ b/tests/sys/netpfil/pf/modulate.sh @@ -1,6 +1,8 @@ +# $FreeBSD$ +# # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # -# Copyright (c) 2020 Kristof Provost +# Copyright (c) 2023 Kajetan Staszkiewicz # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -25,62 +27,54 @@ . $(atf_get_srcdir)/utils.subr -common_dir=$(atf_get_srcdir)/../common - -atf_test_case "unaligned" "cleanup" -unaligned_head() +atf_test_case "modulate_v4" "cleanup" +modulate_v4_head() { - atf_set descr 'Test unaligned checksum updates' + atf_set descr 'IPv4 TCP sequence number modulation' atf_set require.user root atf_set require.progs scapy } -unaligned_body() +modulate_v4_body() { - pft_init - - epair_in=$(vnet_mkepair) - epair_out=$(vnet_mkepair) - - vnet_mkjail alcatraz ${epair_in}b ${epair_out}a + setup_router_dummy_ipv4 - ifconfig ${epair_in}a 192.0.2.2/24 up - route add -net 198.51.100.0/24 192.0.2.1 - - jexec alcatraz ifconfig ${epair_in}b 192.0.2.1/24 up - jexec alcatraz sysctl net.inet.ip.forwarding=1 - - jexec alcatraz ifconfig ${epair_out}a 198.51.100.1/24 up - jexec alcatraz arp -s 198.51.100.2 00:01:02:03:04:05 + pft_set_rules router \ + "pass in on ${epair_tester}b modulate state" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-seq 42 # Sanity check + ping_dummy_check_request exit:1 --ping-type=tcpsyn --send-seq 42 --expect-seq 42 +} - ifconfig ${epair_out}b up +modulate_v4_cleanup() +{ + pft_cleanup +} - jexec alcatraz pfctl -e - pft_set_rules alcatraz \ - "scrub on ${epair_in}b reassemble tcp max-mss 1200" +atf_test_case "modulate_v6" "cleanup" +modulate_v6_head() +{ + atf_set descr 'IPv6 TCP sequence number modulation' + atf_set require.user root + atf_set require.progs scapy +} - # Check aligned - atf_check -s exit:0 ${common_dir}/pft_ping.py \ - --sendif ${epair_in}a \ - --to 198.51.100.2 \ - --recvif ${epair_out}b \ - --ping-type tcpsyn +modulate_v6_body() +{ + setup_router_dummy_ipv6 - # And unaligned - atf_check -s exit:0 ${common_dir}/pft_ping.py \ - --sendif ${epair_in}a \ - --to 198.51.100.2 \ - --recvif ${epair_out}b \ - --ping-type tcpsyn \ - --send-tcpopt-unaligned + pft_set_rules router \ + "pass in on ${epair_tester}b modulate state" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-seq 42 # Sanity check + ping_dummy_check_request exit:1 --ping-type=tcpsyn --send-seq 42 --expect-seq 42 } -unaligned_cleanup() +modulate_v6_cleanup() { pft_cleanup } atf_init_test_cases() { - atf_add_test_case "unaligned" + atf_add_test_case "modulate_v4" + atf_add_test_case "modulate_v6" } diff --git a/tests/sys/netpfil/pf/rtable.sh b/tests/sys/netpfil/pf/rtable.sh new file mode 100644 index 000000000000..2362176636ac --- /dev/null +++ b/tests/sys/netpfil/pf/rtable.sh @@ -0,0 +1,131 @@ +# $FreeBSD$ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2023 Kajetan Staszkiewicz +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/utils.subr + +atf_test_case "forward_v4" "cleanup" +forward_v4_head() +{ + atf_set descr 'Test IPv4 forwarding with rtable' + atf_set require.user root + atf_set require.progs scapy +} + +forward_v4_body() +{ + setup_router_server_ipv4 + + # Sanity check + ping_server_check_reply exit:0 + + jexec router sysctl net.fibs=2 + jexec router ifconfig ${epair_server}a fib 1 + jexec router route del -net ${net_server} + jexec router route add -fib 1 -net ${net_server} -iface ${epair_server}a + + # Sanity check + ping_server_check_reply exit:1 + + # This rule is not enough. + # Echo requests will be properly forwarded but replies can't be routed back. + pft_set_rules router \ + "pass in on ${epair_tester}b inet proto icmp all icmp-type echoreq rtable 1" + ping_server_check_reply exit:1 + + # Allow replies coming back to the tester properly via stateful filtering post-routing. + pft_set_rules router \ + "pass in on ${epair_tester}b inet proto icmp all icmp-type echoreq rtable 1" \ + "pass out on ${epair_server}a inet proto icmp all icmp-type echoreq rtable 0" + ping_server_check_reply exit:0 + + # Allow replies coming back to the tester properly via provding extra routes in rtable 1 + pft_set_rules router \ + "pass in on ${epair_tester}b inet proto icmp all icmp-type echoreq rtable 1" + jexec router route add -fib 1 -net ${net_tester} -iface ${epair_tester}b + ping_server_check_reply exit:0 +} + +forward_v4_cleanup() +{ + pft_cleanup +} + +atf_test_case "forward_v6" "cleanup" +forward_v6_head() +{ + atf_set descr 'Test IPv6 forwarding with rtable' + atf_set require.user root + atf_set require.progs scapy +} + +forward_v6_body() +{ + setup_router_server_ipv6 + + # Sanity check + ping_server_check_reply exit:0 + + jexec router sysctl net.fibs=2 + jexec router ifconfig ${epair_server}a fib 1 + jexec router route del -6 ${net_server} + jexec router route add -fib 1 -6 ${net_server} -iface ${epair_server}a + + # Sanity check + ping_server_check_reply exit:1 + + # This rule is not enough. + # Echo requests will be properly forwarded but replies can't be routed back. + pft_set_rules router \ + "pass inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ + "pass in on ${epair_tester}b inet6 proto icmp6 icmp6-type echoreq" + ping_server_check_reply exit:1 + + # Allow replies coming back to the tester properly via stateful filtering post-routing. + pft_set_rules router \ + "pass inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ + "pass in on ${epair_tester}b inet6 proto icmp6 icmp6-type echoreq rtable 1" \ + "pass out on ${epair_server}a inet6 proto icmp6 icmp6-type echoreq rtable 0" + ping_server_check_reply exit:0 + + # Allow replies coming back to the tester properly via provding extra routes in rtable 1 + pft_set_rules router \ + "pass inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ + "pass in on ${epair_tester}b inet6 proto icmp6 icmp6-type echoreq rtable 1" + jexec router route add -fib 1 -6 ${net_tester} -iface ${epair_tester}b + ping_server_check_reply exit:0 +} + +forward_v6_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "forward_v4" + atf_add_test_case "forward_v6" +} diff --git a/tests/sys/netpfil/pf/scrub.sh b/tests/sys/netpfil/pf/scrub.sh new file mode 100644 index 000000000000..ccc991ac1929 --- /dev/null +++ b/tests/sys/netpfil/pf/scrub.sh @@ -0,0 +1,221 @@ +# $FreeBSD$ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2020 Kristof Provost +# Copyright (c) 2023 Kajetan Staszkiewicz +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/utils.subr + +atf_test_case "max_mss_v4" "cleanup" +max_mss_v4_head() +{ + atf_set descr 'Test IPv4 scrub "mss" rule' + atf_set require.user root + atf_set require.progs scapy +} + +max_mss_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "scrub on ${epair_tester}b max-mss 1300" + # Check aligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 + # And unaligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 \ + --send-tcpopt-unaligned +} + +max_mss_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "max_mss_v6" "cleanup" +max_mss_v6_head() +{ + atf_set descr 'Test IPv6 scrub "mss" rule' + atf_set require.user root + atf_set require.progs scapy +} + +max_mss_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router "scrub on ${epair_tester}b max-mss 1300" + # Check aligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 + # And unaligned + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-mss=1400 --expect-mss=1300 \ + --send-tcpopt-unaligned +} + +max_mss_v6_cleanup() +{ + pft_cleanup +} + + +atf_test_case "set_tos_v4" "cleanup" +set_tos_v4_head() +{ + atf_set descr 'Test IPv4 scub "set-tos" rule' + atf_set require.user root + atf_set require.progs scapy +} + +set_tos_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "scrub on ${epair_tester}b set-tos 0x42" + ping_dummy_check_request exit:0 --send-tc=0 --expect-tc=66 +} + +set_tos_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "set_tos_v6" "cleanup" +set_tos_v6_head() +{ + atf_set descr 'Test IPv6 scub "set-tos" rule' + atf_set require.user root + atf_set require.progs scapy +} + +set_tos_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router "scrub on ${epair_tester}b set-tos 0x42" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-tc=0 --expect-tc=66 +} + +set_tos_v6_cleanup() +{ + pft_cleanup +} + + +atf_test_case "min_ttl_v4" "cleanup" +min_ttl_v4_head() +{ + atf_set descr 'Test IPv4 scub "min-ttl" rule' + atf_set require.user root + atf_set require.progs scapy +} + +min_ttl_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router "scrub on ${epair_tester}b min-ttl 50" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-hlim=40 --expect-hlim=49 +} + +min_ttl_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "min_ttl_v6" "cleanup" +min_ttl_v6_head() +{ + atf_set descr 'Test IPv6 scub "min-ttl" rule' + atf_set require.user root + atf_set require.progs scapy +} + +min_ttl_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router "scrub on ${epair_tester}b min-ttl 50" + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-hlim=40 --expect-hlim=49 +} + +min_ttl_v6_cleanup() +{ + pft_cleanup +} + + +atf_test_case "no_scrub_v4" "cleanup" +no_scrub_v4_head() +{ + atf_set descr 'Test IPv4 "no scrub" rule' + atf_set require.user root + atf_set require.progs scapy +} + +no_scrub_v4_body() +{ + setup_router_dummy_ipv4 + pft_set_rules router\ + "no scrub on ${epair_tester}b to ${net_server_host_server}" + "scrub on ${epair_tester}b set-tos 0x42" + ping_dummy_check_request exit:0 --send-tc=0 --expect-tc=0 +} + +no_scrub_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "no_scrub_v6" "cleanup" +no_scrub_v6_head() +{ + atf_set descr 'Test IPv6 "no scrub" rule' + atf_set require.user root + atf_set require.progs scapy +} + +no_scrub_v6_body() +{ + setup_router_dummy_ipv6 + pft_set_rules router \ + "no scrub on ${epair_tester}b to ${net_server_host_server}" + "scrub on ${epair_tester}b set-tos 0x42" + ping_dummy_check_request exit:0 --send-tc=0 --expect-tc=0 +} + +no_scrub_v6_cleanup() +{ + pft_cleanup +} + + +atf_init_test_cases() +{ + atf_add_test_case "max_mss_v4" + atf_add_test_case "max_mss_v6" + atf_add_test_case "set_tos_v4" + atf_add_test_case "set_tos_v6" + atf_add_test_case "min_ttl_v4" + atf_add_test_case "min_ttl_v6" + atf_add_test_case "no_scrub_v4" + atf_add_test_case "no_scrub_v6" +} diff --git a/tests/sys/netpfil/pf/utils.subr b/tests/sys/netpfil/pf/utils.subr index f4f7f4fe4d83..d8696b988098 100644 --- a/tests/sys/netpfil/pf/utils.subr +++ b/tests/sys/netpfil/pf/utils.subr @@ -4,6 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # # Copyright (c) 2017 Kristof Provost +# Copyright (c) 2023 Kajetan Staszkiewicz # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -27,6 +28,7 @@ # SUCH DAMAGE. . $(atf_get_srcdir)/../../common/vnet.subr +common_dir=$(atf_get_srcdir)/../common pft_onerror() { @@ -153,3 +155,137 @@ altq_cleanup() { pft_cleanup } + +# Create a bare router jail. +# This function lacks target configuration. +setup_router_ipv4() +{ + pft_init + + epair_tester=$(vnet_mkepair) + epair_server=$(vnet_mkepair) + + net_tester=192.0.2.0/24 + net_tester_mask=24 + net_tester_host_router=192.0.2.1 + net_tester_host_tester=192.0.2.2 + + net_server=198.51.100.0/24 + net_server_mask=24 + net_server_host_router=198.51.100.1 + net_server_host_server=198.51.100.2 + + vnet_mkjail router ${epair_tester}b ${epair_server}a + + ifconfig ${epair_tester}a ${net_tester_host_tester}/${net_tester_mask} up + route add -net ${net_server} ${net_tester_host_router} + + jexec router ifconfig ${epair_tester}b ${net_tester_host_router}/${net_tester_mask} up + jexec router sysctl net.inet.ip.forwarding=1 + jexec router ifconfig ${epair_server}a ${net_server_host_router}/${net_server_mask} up + + jexec router pfctl -e +} + +# Create a router jail. +# The target for tests does not exist but a static ARP entry does +# so packets to it can be properly routed. +setup_router_dummy_ipv4() +{ + setup_router_ipv4 + jexec router arp -s ${net_server_host_server} 00:01:02:03:04:05 + ifconfig ${epair_server}b up +} + +# Create a router and a server jail. +# The server is capable of responding to pings from the tester. +setup_router_server_ipv4() +{ + setup_router_ipv4 + vnet_mkjail server ${epair_server}b + jexec server ifconfig ${epair_server}b ${net_server_host_server}/${net_server_mask} up + jexec server route add -net ${net_tester} ${net_server_host_router} + jexec server nc -4l 666 & + sleep 1 # Give nc time to start and listen +} + +# Create a bare router jail. +# This function lacks target configuration. +setup_router_ipv6() +{ + pft_init + + epair_tester=$(vnet_mkepair) + epair_server=$(vnet_mkepair) + + net_tester=2001:db8:42::/64 + net_tester_mask=64 + net_tester_host_router=2001:db8:42::1 + net_tester_host_tester=2001:db8:42::2 + + net_server=2001:db8:43::/64 + net_server_mask=64 + net_server_host_router=2001:db8:43::1 + net_server_host_server=2001:db8:43::2 + + vnet_mkjail router ${epair_tester}b ${epair_server}a + + ifconfig ${epair_tester}a inet6 ${net_tester_host_tester}/${net_tester_mask}up no_dad + route add -6 ${net_server} ${net_tester_host_router} + + jexec router ifconfig ${epair_tester}b inet6 ${net_tester_host_router}/${net_tester_mask} up no_dad + jexec router sysctl net.inet6.ip6.forwarding=1 + jexec router ifconfig ${epair_server}a inet6 ${net_server_host_router}/${net_server_mask} up no_dad + + jexec router pfctl -e +} + +# Create a router jail. +# The target for tests does not exist but a static NDP entry does +# so packets to it can be properly routed. +setup_router_dummy_ipv6() +{ + setup_router_ipv6 + jexec router ndp -s ${net_server_host_server} 00:01:02:03:04:05 + ifconfig ${epair_server}b up +} + +# Create a router and a server jail. +# The server is capable of responding to pings from tester. +setup_router_server_ipv6() +{ + setup_router_ipv6 + vnet_mkjail server ${epair_server}b + jexec server ifconfig ${epair_server}b inet6 ${net_server_host_server}/${net_server_mask} up no_dad + jexec server route add -6 ${net_tester} ${net_server_host_router} + jexec server nc -6l 666 & + sleep 1 # Give nc time to start and listen +} + +# Ping the dummy static NDP target. +# Check for pings being forwarded through the router towards the target. +ping_dummy_check_request() +{ + exit_condition=$1 + shift + params=$@ + atf_check -s ${exit_condition} ${common_dir}/pft_ping.py \ + --sendif ${epair_tester}a \ + --to ${net_server_host_server} \ + --recvif ${epair_server}b \ + $params +} + +# Ping the server jail. +# Check for responses coming back throught the router back to the tester. +ping_server_check_reply() +{ + exit_condition=$1 + shift + params=$@ + atf_check -s ${exit_condition} ${common_dir}/pft_ping.py \ + --sendif ${epair_tester}a \ + --to ${net_server_host_server} \ + --replyif ${epair_tester}a \ + $params +} From nobody Sat Mar 4 14:32: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 4PTS4B1QVlz3w5Sv; Sat, 4 Mar 2023 14:32:58 +0000 (UTC) (envelope-from tijl@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 4PTS4B0vZLz3D4g; Sat, 4 Mar 2023 14:32:58 +0000 (UTC) (envelope-from tijl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677940378; 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=N6PeDknoxDgm1KsItHXC9riaV+qSWVUb5iob43UKbgg=; b=o2yTyu+IliIGEVl0ImhevWghbuG7G8dwq7kbv0gXF5d7b0KugjWuj6vhJXaT9F8D4ElsNb MXqqs4pePmLcLK1/1IGgR3NBnDJKLxkWEatj1ZB34lYrtLAGWboUQIxy5MXf5YiyQHejAu z80o8jFSGxLzd705TudVoUFBRBCL6USjFp89qAcayncoVTKyag5cK4OlcjPeSIDDsHr97g KRVGWJVOihoALWb4fgkwwCHvS+8g4/IY4zxS8hHq7UN9NawtHhj0+NbYj+45Fq/HhsTdZp U1fRNPD13P00XGJnaQoOdghuEPvLHXlVVLWcD7EDMmLOlxI6bTyLqgg6zRW52Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677940378; 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=N6PeDknoxDgm1KsItHXC9riaV+qSWVUb5iob43UKbgg=; b=VZKIw3GViYQStJmafTmkRqM2hl/KEAPpuB8dxg+bMHZEZGfJexYHJYyjkOGYI2riBsmCMh oG5ldducUX3x4OZL1FXPXTVSukCO7YyATnGQFrx9kFygxNlpFo/mRFGm6RSf9NQiP2g7DV CvGK2kClCIK+ZTPyx6zTl36ZAOdr5S6ksfmm4wy9R1MPU548en/x+cB/v6HSl9TEPeeWlG E63r3HhifxyV21F6pEo7tY/2FMqH4fdjm7mEYgCwHAqbr4fClO9gwMsyeeAqb7K+WN/2D7 Q/PjJ+CAZdM4ce8riyJVRzUDa9OlUfXfQrWMgM+BuVIYG16WAz4pn2n2QhmxEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677940378; a=rsa-sha256; cv=none; b=Va4NFT67fmsRGmGyRU16UOOtgEO5kH6jm+qhac0m0Hsn7h3IxdMNR8TzbOV5s98w+yl9bk 5WYWABl+iIecWY/o5K+EqwMhgLA4LOdPrAvWeaq5sYTsHg3AhfZauCIQYq+Tye4vBm+dNZ 7UZdvdVCwq8ZWvA6vmfZdG7weO18AS4QDSOoZl51WAC0a1rLr/hLMYgHRf5DuSxL3ng9uT h4uaklHrB2N8eIAitE2XliOxc4QFuMekqjll80bjFw4H9T5AObbrBacei4JbJsHyI7m3o9 tyUkTzgILO9Di6d+XY9ihUD8Q+gHeet/X41CHyJzJet7bcaqnygUh72KGiwyhA== Received: from hal.tijl.coosemans.org (unknown [IPv6:2a02:a03f:894b:4700:c041:70fd:a74e:2f53]) (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 did not present a certificate) (Authenticated sender: tijl) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PTS491PKsz1R06; Sat, 4 Mar 2023 14:32:57 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Date: Sat, 4 Mar 2023 15:32:54 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Mark Millard Cc: Mike Karels , dev-commits-src-main@freebsd.org, "bapt@freebsd.org" , FreeBSD-STABLE Mailing List , Current FreeBSD Subject: Re: git: a28ccb32bf56 - main - machine-id: generate a compact version of the uuid Message-ID: <20230304153254.077542bd@hal.tijl.coosemans.org> In-Reply-To: <6227093D-3D45-4300-97B9-2F2D76C083BE@yahoo.com> References: <6227093D-3D45-4300-97B9-2F2D76C083BE.ref@yahoo.com> <6227093D-3D45-4300-97B9-2F2D76C083BE@yahoo.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=US-ASCII Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On Fri, 3 Mar 2023 10:36:20 -0800 Mark Millard wrote: > What are the properties for the content of /etc/hostid > in FreeBSD? Where are they documented? > > /etc/machine-id has strong property guarnatee > requirements in linux and dbus (which linux indicates > it has adopted requirements from): > > https://man7.org/linux/man-pages/man5/machine-id.5.html > > reports: > > QUOTE > The machine ID does not change based on local or network > configuration or when hardware is replaced. Due to this and its > greater length, it is a more useful replacement for the > gethostid(3) call that POSIX specifies. > > This machine ID adheres to the same format and logic as the D-Bus > machine ID. > END QUOTE /etc/hostid is written once. It does not change with network or hardware changes. > https://dbus.freedesktop.org/doc/dbus-uuidgen.1.html reports: > ( used via dbus-uuidgen --ensure=/etc/machine-id as one way > to get a linux-comaptibile /etc/machine-id for at least > some types of contexts ) > > QUOTE > The important properties of the machine UUID are that 1) it remains > unchanged until the next reboot and 2) it is different for any two > running instances of the OS kernel. That is, if two processes see > the same UUID, they should also see the same shared memory, UNIX > domain sockets, local X displays, localhost.localdomain resolution, > process IDs, and so forth > END QUOTE > > > Does /etc/hostid generated the normal way in FreeBSD have such > properties? (How do I look that up?) Yes. It's `kenv smbios.system.uuid` if that's available and generated by uuidgen otherwise. The code is in /etc/rc.d/hostid and /etc/rc.d/hostid_save. > Returning to: > > https://man7.org/linux/man-pages/man5/machine-id.5.html > > QUOTE > This ID uniquely identifies the host. It should be considered > "confidential", and must not be exposed in untrusted > environments, in particular on the network. If a stable unique > identifier that is tied to the machine is needed for some > application, the machine ID or any part of it must not be used > directly. Instead the machine ID should be hashed with a > cryptographic, keyed hash function, using a fixed, > application-specific key. That way the ID will be properly > unique, and derived in a constant way from the machine ID but > there will be no way to retrieve the original machine ID from the > application-specific one. > END QUOTE > > Is that at least recommended for handling FreeBSD's /etc/hostid > content? No, the file is not documented at all, but this is a recommendation on how to use the file not a restriction on the content like the other quotes so this isn't an impediment to using the same ID in /etc/machine-id. > Is FreeBSD going to document /etc/machine-id content properties > in a similar manor? > > > If FreeBSD ends up with a /etc/machine-id that does not have > the properties and recommended principles of use, it would > appear that the /etc/machine-id path would be highly misleading > and, so, inappropriate. From nobody Sat Mar 4 15:20: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 4PTT752fJhz3w7Gw for ; Sat, 4 Mar 2023 15:20:33 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-23.consmr.mail.gq1.yahoo.com (sonic312-23.consmr.mail.gq1.yahoo.com [98.137.69.204]) (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) by mx1.freebsd.org (Postfix) with ESMTPS id 4PTT746trhz3Krn for ; Sat, 4 Mar 2023 15:20:32 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677943231; bh=bZjK2x6VsyMxsgbCJnwKbGEOWB9NFoUiHfMANRxTKT8=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=dqWDAKN4+GAQqdEB+d7vQ6+fR27GlkuoM0fBUFN5glhk7a2xUG+UvFvswhltlgQmlRMYY7QTm3Dh+JgEHJ1fFNNp6uHW1fy8dzBwttSbxaPM7qR5ZIQpz37roiRSCK3SrIQPZWD9zC+9VuBTfbVY6wl5XIh4B/iogo/VsZ3VDE1Qg7AwSx8AJ2dE36pIl+ZR25yBpdFYuBL8DXGPxs9MypUw1MvrLUoSK5MGOp7Qy4rydYwl+enOJZ30SWiJ21VUZcaEUxjGbKH9dFQb07FJNE5fBn6UIuiz+1JzrlzlopOBz1UW6SlBqeW/UZy7sQ6weZ8GIBeZ4JyjRwaR6+ipwg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1677943231; bh=OFCnkG09Dpwc1a6uYUnFjZwE4UE2SOepEYP502LESXX=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=GNsCYJSuplOtpWw6wfNTs3GOsjgTnFA30GO6ZhRoXPitqHEZR3g8hRAp25/qiL/SuBLA2hPUUHr84pOCnyj6h675eyxobrspNOTaRBKKhdQZ7ScHeYCLiCpvIZ/VOd775603PJBfuZenTVDvyd+WrN82b0uGAq+CRljQ0gPWOqjseSccvi9x+vz+zSajV7/fyUhZlmb4EKnXmwyKAsdGRcW6ZOPeA7Za6L9veJH95lKTGuBlDJ2mTE0/2+anNT0BqIAvpNUDfUry//6lD8gwVOH/KUVrldwApSRalpKlTzPYL7ClDe6fca66vWFVda/G6o/uzHFpTXdIXCOUMM7ocA== X-YMail-OSG: 54nEdjAVM1m8aFMt1g7FPgTeEv1GXPsKYPaDpNSXnPMXmzZj72O1hSnmn_0Zs1R JhxYtsxuRj8bbmp.YzQGn0XBg4bonBpqEC0f9pvVatpz2hh2_273yWY3p8.SToR6izswYN.CssH8 aKI_XrNLJcVxn63wIhR0LtY7g5l1XjrzfalM_AvYYUl.JL3d896W6kUPEa9p2J3A90TRjJG.uCVR gNMrhOqLCPsgbIZsD8ZD1OmL5.3mzAaPMxRUCfTnHxUpKPsW2MlB2vwNpGNoUQp6a5Oyj0p7IgNE DOpj60cFgzUTS_CE9LWIvkNkGs8m_jFUb3KEW.1qn4p9ZrSveIj.zcH4WrREzsxoABlQI4EjpUFs hYIcW3vbMQI.wZHdklWL.AoNY1T6Zf.SJWVQC39vr9nmx3g8XUoK0D3heFADKcsriPxFZxD6vZxH 7a9vilDeIC0swGBq8UsPo9vNRjuqMbUI4nP4Mq7.WTD2HR.nj85AsESGYNHZIbVan.clKfHsISF. Scmjf9Di54KngGU3JTI9hEbo5x.c.fUR3TYWGIDwCGCy4EyI7rxqybQPY9CS7oOtsnhu4B7Kj7T. 70NilV29KoYxXW4vH.bbDLAxPzSnHmWQ24mTNXo1tnOy0jFcvhMMUWZlpGoKQ5SMG3vzczDqN.l6 0L4mV8MBIouWpK_YydtGo10tfC3Agp2KmMu9kHUMyYeNSF5gOiUhPbSh7DixpXkXVGww_GdPIGM1 3MYeG_dTqHcaOPwaCvk1GgNRAzTfe5hdhlyC9gaqzUXfNenQlcGQeUOQXkFZLN8.UlC.x3ga8uD1 oRPb2NJ28LMob_cp9IZCSXOFogelkPj7jpZi2vjzDdpPc6W6iEUDH5oVW3KyeGYlOUlXWZ7aZ_oo 5QBxV1iH0toMhKLO98YRPdfzF9wc1oHenIm6DVpKkEm3isa0Rh8BxHrY4J954vktbhrU3rx9MqY3 0Co0usqOzy8gjE3VoR9c2fTVKNg5sGvHMU2jfltGRoNN_GmMXk1tZJRReD5tw1R4.GIZJFNpJXw3 cA1RUKpP51xdZOVhDTChXxEvAZG7LTdHrPUYwwcrNoChNtmrzcpQ90QwEql3HNyir3aPHFIzHWti .kU69gET68WrCgCNn_IxYG70e.E1WQKUbnBr9d0yf8St8LcfQKt7_KRqv88.LVvwGZ4N8DwznmF3 ZJJaarq52kDgHHJHFYxbPmqnRS4vtnfHr1h7eoSkpc53vFdCNbR245QmyganxNIHpAkeEgtCGzLa SRSJQjm.jsutO6cMmHXkC5KGg83dAPcKohfNjRDrvIWQszKUSfLJChYrPM7YlEYJHobSFU0Wwe84 Ow.9F8O3scQgoNBaTj_tKe7Va_ZrawZUgDa1yDn.1wrhRzTyE4GyndCcci7jKs7_jCYlEW1kA62W 5N1ZnihZM8m31GhPqybekbO.k1Q1nIjlb1IEaiRFnbhelZRFSJpKLq00REGH2mb11vycViv0GKxW avOExSIr8kG6TwQVG.iY68NvUzSrzC1CARxc3By1hi5y7BdQXj8CG4a4_sCG5S5f4zuA_V_ZMq5. 8ByHyzK8LKGNN3HC4taDW6oCT9Jck0PKXG7199b0ZYs45U3yjlUD9eevucLKOdjB.3mnGVWAW.nR lwd4C09TZQTcAcJWJlq_5d57FXnW2cdCIiHg_PBsZIQxt.j5aE9dLTlIb0nL0KQgQJOktTB6eVli XvQB8E8Gxe3kXStRt8MoZ8lOK1nf3JhK_q5JMBCiAnVJNwe9Bj8vizQSkSkxZ1Xn1x7CpofwpX.8 vl.wubgN6mgUOXTwyanp8kMTCRDQIG9YfMtID87xdf.lP.g3mPOTC2Rk1kGDh3RuHDACeXzO1swY eonxYC.DVw_F.iHwKh2PHEHytKnK1563MrBuG5PrKZD0zvkP4ruLnOsWDBIXRwKmOqSVhHdfqKBP k.5TcrjAvXmeskTKOnXT.z69CkoVRoULCIn2fh907NKC.GEO5AAC8lhdo9CT3Cagm.MqZ8jsQZFu exWW2XL2KJbyYMS0ER16bQVwB3WpSOD0b9VvfGBTLMK9mX2Ef_xeSlQHUvIkiyEHFQaQjNBFZvsj EsLeEw3jQcDbtqzQP6tASYf3rls0fUrF0WuPZeYy5jKGyZ0MBJpLBRUlRtGLFT0APSQyMM_58Yvd aMwPdWQPAW6bRiLESNn.410c237cOHrsG2V0H3KV9WD_mVFb1k.2bSThiLndkRUs0sIWQDe9AzC4 PYunZXUSmw8PufTXboaKIauH8xNFLQ_.kCIfLSO8OVN9FUU4GPzCEXJu_oGMFu9nkoDXkbPZ5ab5 RtJY- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Sat, 4 Mar 2023 15:20:31 +0000 Received: by hermes--production-gq1-6cf7749bc8-frkdq (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 7d7750c3bdafcd0467063d3696d5b944; Sat, 04 Mar 2023 15:20:28 +0000 (UTC) Content-Type: text/plain; charset=utf-8 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 \(3731.400.51.1.1\)) Subject: Re: git: a28ccb32bf56 - main - machine-id: generate a compact version of the uuid From: Mark Millard In-Reply-To: <20230304153254.077542bd@hal.tijl.coosemans.org> Date: Sat, 4 Mar 2023 07:20:17 -0800 Cc: Mike Karels , dev-commits-src-main@freebsd.org, "bapt@freebsd.org" , FreeBSD-STABLE Mailing List , Current FreeBSD Content-Transfer-Encoding: quoted-printable Message-Id: <08640BC2-2DD0-440F-A70D-D5302F7B70F5@yahoo.com> References: <6227093D-3D45-4300-97B9-2F2D76C083BE.ref@yahoo.com> <6227093D-3D45-4300-97B9-2F2D76C083BE@yahoo.com> <20230304153254.077542bd@hal.tijl.coosemans.org> To: =?utf-8?Q?T=C4=B3l_Coosemans?= X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PTT746trhz3Krn X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Mar 4, 2023, at 06:32, T=C4=B3l Coosemans wrote: >=20 > On Fri, 3 Mar 2023 10:36:20 -0800 Mark Millard = wrote: >> What are the properties for the content of /etc/hostid >> in FreeBSD? Where are they documented? >>=20 >> /etc/machine-id has strong property guarnatee >> requirements in linux and dbus (which linux indicates >> it has adopted requirements from): >>=20 >> https://man7.org/linux/man-pages/man5/machine-id.5.html >>=20 >> reports: >>=20 >> QUOTE >> The machine ID does not change based on local or network >> configuration or when hardware is replaced. Due to this and its >> greater length, it is a more useful replacement for the >> gethostid(3) call that POSIX specifies. >>=20 >> This machine ID adheres to the same format and logic as the D-Bus >> machine ID. >> END QUOTE >=20 > /etc/hostid is written once. It does not change with network or > hardware changes. >=20 >> https://dbus.freedesktop.org/doc/dbus-uuidgen.1.html reports: >> ( used via dbus-uuidgen --ensure=3D/etc/machine-id as one way >> to get a linux-comaptibile /etc/machine-id for at least >> some types of contexts ) >>=20 >> QUOTE >> The important properties of the machine UUID are that 1) it remains >> unchanged until the next reboot and 2) it is different for any two >> running instances of the OS kernel. That is, if two processes see >> the same UUID, they should also see the same shared memory, UNIX >> domain sockets, local X displays, localhost.localdomain resolution, >> process IDs, and so forth >> END QUOTE >>=20 >>=20 >> Does /etc/hostid generated the normal way in FreeBSD have such >> properties? (How do I look that up?) >=20 > Yes. It's `kenv smbios.system.uuid` if that's available and generated > by uuidgen otherwise. The code is in /etc/rc.d/hostid and > /etc/rc.d/hostid_save. I probably also should have quoted the below for completeness: QUOTE Also, don't make it the same on two different systems; it needs to be different anytime there are two different kernels running. END QUOTE There are implications for some virtual environments. >> Returning to: >>=20 >> https://man7.org/linux/man-pages/man5/machine-id.5.html >>=20 >> QUOTE >> This ID uniquely identifies the host. It should be considered >> "confidential", and must not be exposed in untrusted >> environments, in particular on the network. If a stable unique >> identifier that is tied to the machine is needed for some >> application, the machine ID or any part of it must not be used >> directly. Instead the machine ID should be hashed with a >> cryptographic, keyed hash function, using a fixed, >> application-specific key. That way the ID will be properly >> unique, and derived in a constant way from the machine ID but >> there will be no way to retrieve the original machine ID from the >> application-specific one. >> END QUOTE >>=20 >> Is that at least recommended for handling FreeBSD's /etc/hostid >> content? >=20 > No, the file is not documented at all, but this is a recommendation on > how to use the file not a restriction on the content like the other > quotes so this isn't an impediment to using the same ID in > /etc/machine-id. That presumes that what FreeBSD does with /etc/hostid content keeps the content confidential by default, such as using hashing to avoid there being a way to "retrieve the original machine ID". (It may well, but that is not documented.) Otherwise following the recommendation would be an impossibility for /etc/hostid content. >> Is FreeBSD going to document /etc/machine-id content properties >> in a similar manor? >>=20 >>=20 >> If FreeBSD ends up with a /etc/machine-id that does not have >> the properties and recommended principles of use, it would >> appear that the /etc/machine-id path would be highly misleading >> and, so, inappropriate. Thanks for the notes. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Mar 4 16:01: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 4PTV284zC2z3w9cx; Sat, 4 Mar 2023 16:01: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 4PTV284Xhjz3QSZ; Sat, 4 Mar 2023 16:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677945680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aeC7qAnDNZS0HMe+9fSTYIGfU3itxmq0YsvfQvSu1BM=; b=Nfq6MJi1zvEZTMkVxheWFAxQnpPUX2bHIC8b4TUYdqrwgaG3WU/9wT+VWz0/z3RinG1ZMp ea6k6KSRYRuUMsLBmKglinhP0cdTzg3i7VAYQab9q1gu1j5rASP/pJaB3L3m9f8maWdDn8 HdU2yeA/MhAcVdpwSkQC2att3XOaxVkqHyh9YMDMzBE1mYyaa4YmHHteSRqSDxpQhnEdjy fWs4FHCT6pBx5zDe6oYkovKPvSsG2WxZeOxoSIFS0HBiR3d+WuQQaZb3eHNC/eQmOB/C37 w753n0utbSO1QDrfjr1BE5kt+8GnveLBNnsu2nw9viUqWgjiQR5nCC5aoKOeRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677945680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aeC7qAnDNZS0HMe+9fSTYIGfU3itxmq0YsvfQvSu1BM=; b=jVcNKjVsKk1YXy+3DDdtPRtgwL14gZa0Ps4pvSTL1ieSbvQM2y8QaLZ7il8gj0mTll6kkp vKU7THy5qdFuMJLKx1SEcvHQfWxKsJDKjQdI72F8tF2+gkw0w9p7DvLbO+bSWui/w6cWAk j5LzFHUhH0wy9CcVF86tNqgp8JcIUpaa47bB+WKmO44f2Bre/I+KMywoN9iNgeTaiOrLt3 7ANqNauKU/BKCKAs+BCacHqJMs4V57eX/DaHcp7m4fXzNi8QFyRosSy6fpmYLkSqySu1G8 zmLtT4/hrh/DUVQR9Df6zHWt7dMoy4wIKruDTUUeyMISx4jVqaKtQw2Jjuh/nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677945680; a=rsa-sha256; cv=none; b=Ecu5CXOf9XoQHYxGOeSXL6dSG6VdbrWbmy78RlCDLIrTuP7638DdLZfJ170YHb7Qo6Jy6N TDJ+ym3w4VLK4cR5ZrIdOCHyQUezRBvqpKAZYMQwcmcidydsu7tUtzTEDMk0juuZPjmvxw Mv925w1+mgegOfcU3WMA6SeBFEFaRRwTb969Aj8hzB1GO7IUtjallNt1rfvHElxZC0fbp3 s3glDYh49B4dSWr9rk1At0jdvfb/THfhsnAmqcC/1czj7R0R96esHZHvfiStPkvWQ2ll3h gYHMbyc0OhDAGJI0SCLFP+cKffxPWUPHdldd/5ysVxoJCR3CXkHanoe+YE8PwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PTV283cJhzm8f; Sat, 4 Mar 2023 16:01: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 324G1KK9049962; Sat, 4 Mar 2023 16:01:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 324G1KlG049961; Sat, 4 Mar 2023 16:01:20 GMT (envelope-from git) Date: Sat, 4 Mar 2023 16:01:20 GMT Message-Id: <202303041601.324G1KlG049961@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: 6d2feb39ad13 - main - netlink: Fix "version introduced" documentation 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: 6d2feb39ad13768f3ea06381fcd95937a09f0d62 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6d2feb39ad13768f3ea06381fcd95937a09f0d62 commit 6d2feb39ad13768f3ea06381fcd95937a09f0d62 Author: Tom Hukins AuthorDate: 2023-03-04 15:59:02 +0000 Commit: Warner Losh CommitDate: 2023-03-04 16:00:13 +0000 netlink: Fix "version introduced" documentation netlink(4) and associated features will exist in FreeBSD 14.0 but they will also exist in 13.2, an older version, from commits such as 02b958b1 and b309249b. This commit needs merging to stable/13 and releng/13.2. MFC after: 2days (needs to be in RC2) Reviewed by: imp,melifaro Pull Request: https://github.com/freebsd/freebsd-src/pull/651 --- share/man/man3/snl.3 | 2 +- share/man/man4/genetlink.4 | 2 +- share/man/man4/netlink.4 | 2 +- share/man/man4/rtnetlink.4 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man3/snl.3 b/share/man/man3/snl.3 index 8344cf7f8204..2f328aadd023 100644 --- a/share/man/man3/snl.3 +++ b/share/man/man3/snl.3 @@ -305,7 +305,7 @@ and The .Dv SNL library appeared in -.Fx 14.0 . +.Fx 13.2 . .Sh AUTHORS This library was implemented by .An Alexander Chernikov Aq Mt melifaro@FreeBSD.org . diff --git a/share/man/man4/genetlink.4 b/share/man/man4/genetlink.4 index 2c5b9b99f994..a21963b5e3bd 100644 --- a/share/man/man4/genetlink.4 +++ b/share/man/man4/genetlink.4 @@ -138,7 +138,7 @@ The following groups are defined: The .Dv NETLINK_GENERIC protocol family appeared in -.Fx 14.0 . +.Fx 13.2 . .Sh AUTHORS The netlink was implementated by .An -nosplit diff --git a/share/man/man4/netlink.4 b/share/man/man4/netlink.4 index ece4892f481e..e1a0c4b12933 100644 --- a/share/man/man4/netlink.4 +++ b/share/man/man4/netlink.4 @@ -350,7 +350,7 @@ or .Re .Sh HISTORY The netlink protocol appeared in -.Fx 14.0 . +.Fx 13.2 . .Sh AUTHORS The netlink was implemented by .An -nosplit diff --git a/share/man/man4/rtnetlink.4 b/share/man/man4/rtnetlink.4 index 2c601251f7b0..56c124e4f854 100644 --- a/share/man/man4/rtnetlink.4 +++ b/share/man/man4/rtnetlink.4 @@ -532,7 +532,7 @@ RTNLGRP_NEIGH Notifies on ARP/NDP neighbor arrival/removal/change The .Dv NETLINK_ROUTE protocol family appeared in -.Fx 14.0 . +.Fx 13.2 . .Sh AUTHORS The netlink was implementated by .An -nosplit From nobody Sat Mar 4 16:21: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 4PTVTw1dS6z3wBQV; Sat, 4 Mar 2023 16:21:56 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PTVTv6j9hz3hVc; Sat, 4 Mar 2023 16:21:55 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.16.1/8.16.1) with ESMTP id 324GLmUC006375; Sat, 4 Mar 2023 10:21:49 -0600 (CST) (envelope-from mike@karels.net) Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id PF2oOBxwA2TlGAAAs/W3XQ (envelope-from ); Sat, 04 Mar 2023 10:21:48 -0600 From: Mike Karels To: Baptiste Daroussin Cc: =?utf-8?q?T=C4=B3l_Coosemans?= , re@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a28ccb32bf56 - main - machine-id: generate a compact version of the uuid Date: Sat, 04 Mar 2023 10:21:48 -0600 X-Mailer: MailMate (1.14r5937) Message-ID: <77AEE73C-6D27-4BEE-8ABA-D23CFDA54E08@karels.net> In-Reply-To: <25c644b8deafb5436c76dbffd48adfd07518f513@freebsd.org> References: <98A14373-D09C-437D-AAB8-0A140FB46C5E@karels.net> <202303011818.321IIXIT067595@gitrepo.freebsd.org> <20230303164028.35766f35@hal.tijl.coosemans.org> <25c644b8deafb5436c76dbffd48adfd07518f513@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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PTVTv6j9hz3hVc X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4 Mar 2023, at 0:03, Baptiste Daroussin wrote: > 3 mars 2023 =C3=A0 17:12 "Mike Karels" a =C3=A9crit: > > >> >> On 3 Mar 2023, at 9:40, T=C4=B3l Coosemans wrote: >> >>> >>> On Wed, 1 Mar 2023 18:18:33 GMT Baptiste Daroussin = wrote: >>> >>>> >>>> The branch main has been updated by bapt: >>>> >>>> URL: >>>> https://cgit.freebsd.org/src/commit/?id=3Da28ccb32bf5678fc401f160286= 5ee9b37ca4c990 >>>> >>>> commit a28ccb32bf5678fc401f1602865ee9b37ca4c990 >>>> >>>> Author: Baptiste Daroussin >>>> >>>> AuthorDate: 2023-02-28 10:31:06 +0000 >>>> >>>> Commit: Baptiste Daroussin >>>> >>>> CommitDate: 2023-03-01 18:16:25 +0000 >>>> >>>> machine-id: generate a compact version of the uuid >>>> >>>> dbus and other actually expect an uuid without hyphens >>>> >>>> Reported by: tijl >>>> >>>> MFC After: 3 days >>>> >>>> --- >>>> >>>> libexec/rc/rc.d/machine_id | 2 +- >>>> >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/libexec/rc/rc.d/machine_id b/libexec/rc/rc.d/machine_i= d >>>> >>>> index 7cfd7b2d92f8..8bf3e41d0603 100644 >>>> >>>> --- a/libexec/rc/rc.d/machine_id >>>> >>>> +++ b/libexec/rc/rc.d/machine_id >>>> >>>> @@ -23,7 +23,7 @@ machine_id_start() >>>> >>>> if [ ! -f ${machine_id_file} ] ; then >>>> >>>> startmsg -n "Creating ${machine_id_file} " >>>> >>>> t=3D$(mktemp -t machine-id) >>>> >>>> - /bin/uuidgen -r -o $t >>>> >>>> + /bin/uuidgen -r -c -o $t >>>> >>>> install -C -o root -g wheel -m ${machine_id_perms} "$t" "${machine_= id_file}" >>>> >>>> rm -f "$t" >>>> >>>> startmsg 'done.' >>>> >>> >>> I really think this file should be defined to contain the same UUID = as >>> >>> /etc/hostid such that there's one and only one UUID per machine. Hav= ing >>> >>> two different IDs needlessly complicates things if they end up in lo= gs >>> >>> etc. >>> >>> It also looks like on Linux virtual machines this file contains the >>> >>> SMBIOS UUID just like our /etc/hostid. If /etc/machine-id is suppose= d >>> >>> to be a portable way to obtain that UUID it should be the same as >>> >>> /etc/hostid. >>> >> >> I agree. I had the same reaction when the machine-id was added, but >> >> thought the requirements were different (in particular, the UUID versi= on). >> >> If at all possible, the two should be the same except for hyphens. >> >>> >>> Please have another look at . This >>> https://reviews.freebsd.org/D38811 >>> file is supposed to remain constant across updates. If we get this >>> >>> wrong in 13.2, applications may have to deal with the complications = for >>> >>> a very long time. >>> >> >> This should be resolved for 13.2 if at all possible. >> >> Mike >> > > > The requirements are diff=C3=A9rent rfc 422 yes would accept what hosti= d format uses still all new uuid should follow rfc422. Does this mean that if hostid already exists, a compact version of hostid= would be acceptable as the machine-id? This situation will happen as machines are upgraded to 13.2, and it would certainly be preferable to creating a different UUID. Mike