From nobody Mon Aug 18 09:18:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c56Zg6Gs9z64t4P; Mon, 18 Aug 2025 09:18: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c56Zg5QCsz3bmm; Mon, 18 Aug 2025 09:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755508699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOM7p7FkwlTyHlUVoJ7wJqzeBbe/Pnx0A3nufJqUrNg=; b=T3zqa8rxZmnEYUG1t5YW7EIkCF/gXTDFMxjokw9DsMVhPZuloBpWumNASVtyXGaDgvAoZe LD2CiHnVl/fs6e2QvI1ETsQFxVldYwfTTXl6zM5DpfCVdXcoo1Zy+gtisdZZYTBlIESSed TGKTQ/HX11YKU6k2tnn7DRsEN/NfgUh6MkQuB1VBUDRrHwUog2J5hyku3kcAPgkB+ehS81 J0I/MZ7OswkGMGT7NqV86EBw96bNOYGo3WtCQt9pUv2wyOwRhJXB6NCbGrekd80CnRZVHa FKe20NbDE0w1bc4Gbbl4ghYIhZC5+1fF94Fue7r6lJIBr5Tv8CR6ZTPGFaRwSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755508699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOM7p7FkwlTyHlUVoJ7wJqzeBbe/Pnx0A3nufJqUrNg=; b=hRG3ldNc4Y6oun8Qcqh0e1V1OlZdwq4us4kjBIogStVDeALyHWTjDHi8bVtdoNS8k/2pKl uaLxErwOAZr+ZnhPZCLpFrJaO4so4SYw2KSsJA+S0SggZgLqFzg8WkLWzJ9IM6ISeL/m7Z 2cggPMUZsAyezbDg5JgAwL/umiMtjPgatiP2tAIi212Dd8cn0c3+1+eGiolUs90CbcZD58 bYar/QIEQ4abxy1KhRvB+utJMEwxm0QBTJrwr62zx3kmPB0oCLP9/zhE4Nbd9SqE6gFuzi w8aIvWE5z7ejKk9l2T0yEKiU+BhJVBdX7C1iEVZ6xbdMMn8+8/svgrSfyZF2Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755508699; a=rsa-sha256; cv=none; b=XxE/ccHD8KktDTxlwYKuuvQ7cxRjp7YWjB+TbtMhJobIEVRCfCNG94LrFIdXK7y6HkN76t 0uiBpfehamb5fRTJKZq6+Cw3T/ZzdWmfQxt1L4POGeFrV2tdpBIkfPrr2k0ECnTbBsy0s2 V7jZ28js+t7SI8I2lYfd/9y1Km0qK1EgjjX672cQmbW8bSJRjFNxjBfNM9KOzH05ditKm/ 99nC1SEyYh66dGKlLYVGJyg+CfDWMNMCqR8O6nxIINm/wXs4tPoWZk2S89ziJOp4leBBi6 DdUtr8LM20wzZxETPJB/wRoPVRZkBjQhUxfnhccgY1QJ6TT6avEUeqhHYPBDAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c56Zg4kX2zr1s; Mon, 18 Aug 2025 09:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57I9IJ3L061933; Mon, 18 Aug 2025 09:18:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57I9IJvU061930; Mon, 18 Aug 2025 09:18:19 GMT (envelope-from git) Date: Mon, 18 Aug 2025 09:18:19 GMT Message-Id: <202508180918.57I9IJvU061930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pietro Cerutti Subject: git: 4d41e3a22d32 - stable/14 - null: support EVFILT_READ/EVFILT_WRITE kevent filters List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d41e3a22d320e45619c2a10ce73957d15c3efc2 Auto-Submitted: auto-generated The branch stable/14 has been updated by gahr: URL: https://cgit.FreeBSD.org/src/commit/?id=4d41e3a22d320e45619c2a10ce73957d15c3efc2 commit 4d41e3a22d320e45619c2a10ce73957d15c3efc2 Author: Pietro Cerutti AuthorDate: 2025-08-07 20:24:06 +0000 Commit: Pietro Cerutti CommitDate: 2025-08-18 09:18:01 +0000 null: support EVFILT_READ/EVFILT_WRITE kevent filters This enhances the full, null, and zero devices to support read and write kevent filters. A read event is immediately triggered for full and null, and never for zero. A write event is immediately triggered for zero and null, and never for full. Reviewed by: cognet MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51807 (cherry picked from commit b89104dfd5cf001b34963b9e02083027f9d215d5) --- sys/dev/null/null.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c index 4565639574f3..b04f4cd8919a 100644 --- a/sys/dev/null/null.c +++ b/sys/dev/null/null.c @@ -4,6 +4,7 @@ * Copyright (c) 2000 Mark R. V. Murray & Jeroen C. van Gelderen * Copyright (c) 2001-2004 Mark R. V. Murray * Copyright (c) 2014 Eitan Adler + * Copyright (c) 2025 Pietro Cerutti * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,6 +41,7 @@ #include #include #include +#include #include #include @@ -54,12 +56,26 @@ static d_write_t null_write; static d_ioctl_t null_ioctl; static d_ioctl_t zero_ioctl; static d_read_t zero_read; +static d_kqfilter_t kqfilter; +static int one_ev(struct knote *kn, long hint); +static int zero_ev(struct knote *kn, long hint); + +static const struct filterops one_fop = { + .f_isfd = 1, + .f_event = one_ev +}; + +static const struct filterops zero_fop = { + .f_isfd = 1, + .f_event = zero_ev +}; static struct cdevsw full_cdevsw = { .d_version = D_VERSION, .d_read = zero_read, .d_write = full_write, .d_ioctl = zero_ioctl, + .d_kqfilter = kqfilter, .d_name = "full", }; @@ -68,6 +84,7 @@ static struct cdevsw null_cdevsw = { .d_read = (d_read_t *)nullop, .d_write = null_write, .d_ioctl = null_ioctl, + .d_kqfilter = kqfilter, .d_name = "null", }; @@ -76,6 +93,7 @@ static struct cdevsw zero_cdevsw = { .d_read = zero_read, .d_write = null_write, .d_ioctl = zero_ioctl, + .d_kqfilter = kqfilter, .d_name = "zero", .d_flags = D_MMAP_ANON, }; @@ -198,5 +216,35 @@ null_modevent(module_t mod __unused, int type, void *data __unused) return (0); } +static int +one_ev(struct knote *kn, long hint) +{ + + return (1); +} + +static int +zero_ev(struct knote *kn, long hint) +{ + + return (0); +} + +static int +kqfilter(struct cdev *dev, struct knote *kn) +{ + + switch (kn->kn_filter) { + case EVFILT_READ: + kn->kn_fop = dev->si_devsw == &null_cdevsw ? &zero_fop : &one_fop; + return (0); + case EVFILT_WRITE: + kn->kn_fop = dev->si_devsw == &full_cdevsw ? &zero_fop : &one_fop; + return (0); + default: + return (EOPNOTSUPP); + } +} + DEV_MODULE(null, null_modevent, NULL); MODULE_VERSION(null, 1); From nobody Tue Aug 19 03:18:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c5ZYX2KzCz64tmL; Tue, 19 Aug 2025 03:18: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c5ZYX1nHqz3GMV; Tue, 19 Aug 2025 03:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755573536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UrXxJigxm78gMaGPuDWFKpW8ib/bX84x6O24YN/KssI=; b=NOoU6KGNenUIIwDm1U6MhYOgG4xL4RsXcdaOo5LSVn5du7oYswy1LqREdUpcPAMeGBtL9L zWzHWD2w09st+CBF0rBF76Kkq4FJVqEQNTgs20eEnw4Lz1mmkBpNm7VfJF1/FFmpl7wb8Y 1FiHdAFv4Vd6dFf7Ze59UnKl8cXu7ZVyjigVSRH5SczL9yTzJHcg7dTaWsAEMGAm2vHT2T yyl3tUEDGkRZY+Bs1Osm6rcokKk9HLKJ99XPwaPBAShpXVhkPsTEAHuOl2feitOrDnp7xM 6TtdyIvQUSQWHMxEvU7TcDqh5m2nGCEthAHzPmItj/MxYMWmb8UcYybbNuxf2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755573536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UrXxJigxm78gMaGPuDWFKpW8ib/bX84x6O24YN/KssI=; b=d6LkKO5dswkQjZAgSsM7gahJxPrFuAfJ8pFxYXfcbt8SRECm+dqX0fQV3QI4xXtzl+1qZa 6zTIiyk1vDQpyS051kl4JJx2OIQeLnIBYzjgYBS/ZH0GIMjxKQRyshLy7cWwiindhb070D OwpSfsOg0SOrmgHHBiDtb29HXTOXCbS8rSMZN0PCH1pF75yOoyCkKyNxZ5AEc4+db0+RYb V2z8nSpltOiuooaNkKq9ZdKRcTYHCYIv/qLMi5APOdFrNVBzt8h5uwhhuFVq0YtmW1IfQ3 nFEFCyrjdR4Rt/qYWP0zpo9iUB+nkoLObQ7Hy8MDqFAA6rIsr4F0LfR83cotnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755573536; a=rsa-sha256; cv=none; b=WRyXBNupCWjjA5nCniKIywIbLZXjahmodUR+aiGtxpsir9vMj8DUAlLA2khnhq4AP8nfMb Bl2i2lENzbESj8x3EC+93KN7q3dGtmzFMjQGMx5VChM/RXQW8HYeKXYtjKvJqr6xkqFFiM 0gvEp3+Xm3paV0uiQjhfhQ570XMevmih0pU1aR5/prl8AXMAtFxsRO6RDh6DZK/HEmj+by EL/cssMra8WBs8xIKFF0eqE6Dx++NyUJPeDCkJqW7Dv9cUUkFdrlEWBa7dkDCAgvaDWRIT Jv9i2LSOgy80xq9VMUHRoLQbQCE+v/tz25LJmCX6N09D1MJa8F/fQGCWpwZKaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c5ZYX1GlKz1NDy; Tue, 19 Aug 2025 03:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57J3Iuok000653; Tue, 19 Aug 2025 03:18:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57J3IuFA000650; Tue, 19 Aug 2025 03:18:56 GMT (envelope-from git) Date: Tue, 19 Aug 2025 03:18:56 GMT Message-Id: <202508190318.57J3IuFA000650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7c4565e3e75e - stable/14 - [libm] Fix undefined behavior of a left shifted of a signed integer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c4565e3e75e110b167f04efbe9d9d6355fcf2de Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c4565e3e75e110b167f04efbe9d9d6355fcf2de commit 7c4565e3e75e110b167f04efbe9d9d6355fcf2de Author: Steve Kargl AuthorDate: 2025-08-12 04:26:29 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-18 19:23:29 +0000 [libm] Fix undefined behavior of a left shifted of a signed integer PR: 288778 (cherry picked from commit d180086e6eae2e152e803ed6cf13775a7c006dc7) --- lib/msun/src/e_fmod.c | 30 ++++++++++++------------------ lib/msun/src/math_private.h | 21 +++++++++++++++++++++ lib/msun/src/s_ilogb.c | 13 +++++-------- lib/msun/src/s_remquo.c | 30 ++++++++++++------------------ 4 files changed, 50 insertions(+), 44 deletions(-) diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c index dd96f6bcd7cb..f8f1bcd88c6d 100644 --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -27,14 +27,14 @@ static const double one = 1.0, Zero[] = {0.0, -0.0,}; double fmod(double x, double y) { - int32_t n,hx,hy,hz,ix,iy,sx,i; - u_int32_t lx,ly,lz; + int32_t hx, hy, hz, ix, iy, n, sx; + u_int32_t lx, ly, lz; EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hy,ly,y); sx = hx&0x80000000; /* sign of x */ - hx ^=sx; /* |x| */ - hy &= 0x7fffffff; /* |y| */ + hx ^= sx; /* |x| */ + hy &= 0x7fffffff; /* |y| */ /* purge off exception values */ if((hy|ly)==0||(hx>=0x7ff00000)|| /* y=0,or x not finite */ @@ -47,22 +47,16 @@ fmod(double x, double y) } /* determine ix = ilogb(x) */ - if(hx<0x00100000) { /* subnormal x */ - if(hx==0) { - for (ix = -1043, i=lx; i>0; i<<=1) ix -=1; - } else { - for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1; - } - } else ix = (hx>>20)-1023; + if(hx<0x00100000) + ix = subnormal_ilogb(hx, lx); + else + ix = (hx>>20)-1023; /* determine iy = ilogb(y) */ - if(hy<0x00100000) { /* subnormal y */ - if(hy==0) { - for (iy = -1043, i=ly; i>0; i<<=1) iy -=1; - } else { - for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1; - } - } else iy = (hy>>20)-1023; + if(hy<0x00100000) + iy = subnormal_ilogb(hy, ly); + else + iy = (hy>>20)-1023; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -1022) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index bdf45a9035bc..1f5878445a8c 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -740,6 +740,27 @@ irintl(long double x) (ar) = (x) - (ai); \ } while (0) +/* + * For a double entity split into high and low parts, compute ilogb. + */ +static inline int32_t +subnormal_ilogb(int32_t hi, int32_t lo) +{ + int32_t j; + uint32_t i; + + j = -1022; + if (hi == 0) { + j -= 21; + i = (uint32_t)lo; + } else + i = (uint32_t)hi << 11; + + for (; i < 0x7fffffff; i <<= 1) j -= 1; + + return (j); +} + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c index ac9feceaf14e..c85c689024a3 100644 --- a/lib/msun/src/s_ilogb.c +++ b/lib/msun/src/s_ilogb.c @@ -22,21 +22,18 @@ #include "math.h" #include "math_private.h" - int ilogb(double x) +int +ilogb(double x) { - int32_t hx,lx,ix; + int32_t hx, ix, lx; EXTRACT_WORDS(hx,lx,x); hx &= 0x7fffffff; if(hx<0x00100000) { if((hx|lx)==0) return FP_ILOGB0; - else /* subnormal x */ - if(hx==0) { - for (ix = -1043; lx>0; lx<<=1) ix -=1; - } else { - for (ix = -1022,hx<<=11; hx>0; hx<<=1) ix -=1; - } + else + ix = subnormal_ilogb(hx, lx); return ix; } else if (hx<0x7ff00000) return (hx>>20)-1023; diff --git a/lib/msun/src/s_remquo.c b/lib/msun/src/s_remquo.c index a3f73f779c1b..5630838fe3b4 100644 --- a/lib/msun/src/s_remquo.c +++ b/lib/msun/src/s_remquo.c @@ -5,7 +5,7 @@ * * Developed at SunSoft, a Sun Microsystems, Inc. business. * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice + * software is freely granted, provided that this notice * is preserved. * ==================================================== */ @@ -28,7 +28,7 @@ static const double Zero[] = {0.0, -0.0,}; double remquo(double x, double y, int *quo) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx,hy,hz,ix,iy,n,sx; u_int32_t lx,ly,lz,q,sxy; EXTRACT_WORDS(hx,lx,x); @@ -54,25 +54,19 @@ remquo(double x, double y, int *quo) } /* determine ix = ilogb(x) */ - if(hx<0x00100000) { /* subnormal x */ - if(hx==0) { - for (ix = -1043, i=lx; i>0; i<<=1) ix -=1; - } else { - for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1; - } - } else ix = (hx>>20)-1023; + if(hx<0x00100000) + ix = subnormal_ilogb(hx, lx); + else + ix = (hx>>20)-1023; /* determine iy = ilogb(y) */ - if(hy<0x00100000) { /* subnormal y */ - if(hy==0) { - for (iy = -1043, i=ly; i>0; i<<=1) iy -=1; - } else { - for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1; - } - } else iy = (hy>>20)-1023; + if(hy<0x00100000) + iy = subnormal_ilogb(hy, ly); + else + iy = (hy>>20)-1023; /* set up {hx,lx}, {hy,ly} and align y to x */ - if(ix >= -1022) + if(ix >= -1022) hx = 0x00100000|(0x000fffff&hx); else { /* subnormal x, shift x to normal */ n = -1022-ix; @@ -84,7 +78,7 @@ remquo(double x, double y, int *quo) lx = 0; } } - if(iy >= -1022) + if(iy >= -1022) hy = 0x00100000|(0x000fffff&hy); else { /* subnormal y, shift y to normal */ n = -1022-iy; From nobody Wed Aug 20 06:55:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6HJv2f16z64FBF; Wed, 20 Aug 2025 06:55: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HJv1CzFz3SGY; Wed, 20 Aug 2025 06:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SG2RNNmE16BlHsOnKUQ0LSXV5bX3k3VA71x36AtnNWU=; b=nVB0RUiGkptFFBUAEXyr8wW1BhpuXkr8/K2wnZp4UgW8O9OXuM8j3/zcmyhdOI2QHXWWKb 6A9S4mIORAPn2oFTTputR8lq0nB6qY+wP46xsaiUmXWENjJtrFWqlTcZfSZwM7EofLoKz0 on5CKanEOhdPXroFZBd6xjmmgebFNWF4BUMv1r9hbiym7B63/YchIoRSqDC6hvlgKOqnDF lCkTxMei/Vn5KqhGRiXHBw8oGQH1JzhOnvFcwjFPHyy/mTyKwV9mDaD/Sfx5l7rBr6eQie SDRcdyTOowAa0SYydAbs/Se2S0sgCVieGB9Y/eMs39HfNZONEIFfMKYPojxoiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SG2RNNmE16BlHsOnKUQ0LSXV5bX3k3VA71x36AtnNWU=; b=AT9uU0zpjdswwkFWRaEnhC2EerSVpb0o/oA7AHD06FyYRn7+3nbZ2EvU2GAcwZ0PhG3bRS ivcNlyKfDv0qL483JWBD2iZnyFcpS1wkMiBQd7tknrOISTozBCdd1FTWC+EaRQwH9gdKVr e5x1G4Zwmx3Ple5jp+xEeZHc35RyX8kBPxVyMbbtb4qEYJCke5xI8wwkw61Pzy8kTS446u EZpwnGaCZ9dbO8jvxDdE6583f9ugeL3furuvRKjId7pmb9ZmDw30l4aDrA2RxPlhcGgksL 140nY6PFSdoQVkjcPWs0yB+LmypyNTCbxJfYtx860p9hf6+8ZQVihoDr8X9tzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755672927; a=rsa-sha256; cv=none; b=dMqb6eGyyQd1xjygSD3V9+xEi8k+dZaYzAdz+CcCPxoVBdharIVzbwIrODYmxmieWjOcKe NPZe6zNjFDF7TKn9pA8ttlVrGBJdyYS8n2oqaJ4xwkC3EGloCNP2yTRDG+b5x4/O8nh+Tg ArHYv1fdUBUgE4t6pY7/D7VPEq3TWWuYWcwlUKmEm1y3d1Kyp+05eiPVzAY96KJJoKk/+u iewr4ChgqbmfzIvwW24DbQAldbqJ5raPhF2RU7FPwVRjCC7rNUIOFrwnIj9jU0/UZylTPd 888aUCHAglcq1LyZbiq9IdJIXAeGS8pOAzF5I+t7CLXFPyiAUqKuRJ5bosiu7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HJv0pR9z12tR; Wed, 20 Aug 2025 06:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6tR3i022329; Wed, 20 Aug 2025 06:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6tRCJ022326; Wed, 20 Aug 2025 06:55:27 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:55:27 GMT Message-Id: <202508200655.57K6tRCJ022326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e3ba3105f735 - stable/14 - isci(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e3ba3105f735c8ab1b7fb726345498d4aa3d456c Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e3ba3105f735c8ab1b7fb726345498d4aa3d456c commit e3ba3105f735c8ab1b7fb726345498d4aa3d456c Author: Gordon Bergling AuthorDate: 2025-08-17 07:33:50 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:53:44 +0000 isci(4): Fix a typo in a source code comment - s/contants/constants/ (cherry picked from commit 663061da205e4112fa25bc628f35a56f0e31a39a) --- sys/dev/isci/scil/intel_sata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/isci/scil/intel_sata.h b/sys/dev/isci/scil/intel_sata.h index 4cf4adf03e07..fdad5be9b083 100644 --- a/sys/dev/isci/scil/intel_sata.h +++ b/sys/dev/isci/scil/intel_sata.h @@ -61,7 +61,7 @@ * * @brief This file defines all of the SATA releated constants, enumerations, * and types. Please note that this file does not necessarily contain - * an exhaustive list of all contants and commands. + * an exhaustive list of all constants and commands. */ /** From nobody Wed Aug 20 06:55:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6HJw3mcHz64V71; Wed, 20 Aug 2025 06:55: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HJw2CyFz3SV8; Wed, 20 Aug 2025 06:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CJF67CNr33xRUqEV22WksaY53X+m0x44uOs2NdL48RY=; b=EW//fSpxQQsVS1aeP05AR2V5H4dvk47c+rug8PbtvCh+65mLAsF+Xh1TlE9bEcxIXPfA8W vAYSJG91FMvT2LC4VuHf8GqMOXuWsqdKA5kqMl+iW7pBfDVKkQDI3UvCD/2ktphvQ6RlkZ fkbXQTY5yw3vSPmocC9s82FG72aFlkGEoUNB+pw/DsbyZ/YcQK7dxsnAe3n4n59NHHSdum VZ0OEhVb3nNAYzext4pGkAleGM58jCqndrbQvBp6sI+5BraJufXS4mmBtUAhy1QNs0e0Xs z3kewlkoRNq06kzXL+fBO44UUpTLIGcyUOkJLY5XyVcjjHnj1Km553wZSlRCsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755672928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CJF67CNr33xRUqEV22WksaY53X+m0x44uOs2NdL48RY=; b=cGsH/gqbKrVPCyDJdZ7iVeAZIdxgT3opLYn3E6E+W+W7O14/D4P4RnyncE3dPemLVgH3F4 1xEyobNwvP8akmsdOYHYGS/CynJvYkyets4svZLbkXk2rDebNilfheY3JW0f2vtcmYI+7M CWcru4uxedi2rii8H54Hia6IZc7LqGmI9NUih3zWkQDayvHFThu6izToBn3AF/9KefXQg1 viLt6K74RX1tC+Al5dhpZH4V92lAEnyu6O/4i1+U1eg+hxlznwTzbpXJSjTQRPEQOqYFy/ YtfCtqiiwJ1gfxrxtZu6Z+VZ3K7LaPLqzbIY/PA7OmI8VIOd+FojjeJFDJQYJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755672928; a=rsa-sha256; cv=none; b=FQO2gmDGHNBNeClE5EE/0pM1rBmB16FjQrpvljLZAyW9JjYlyChUhzvSVWgBmrPF80H4hr ydVan7Dh5uIG8qn/vdMNAXJnJjfJqFYaSyMN7ok+/neNjzYPMhHRYiCLrB5+4731hBk0du ai3Ef1yHVx5eKrqKssM6n+hCTNjT4Vj/mF9suUUWnZA3S1Fbp/6A5MfVQVImgSEtKd3bAN DxUrPIE2u1Zwun5x7Qcc0iZhDIPnInF2r7zXI0YhgNl92ZrrY2nzAQaQX/f5iMVr6bcjMr Zs1rbomrusW7cwokx4WIXxwkAk2XPAtbJqc9nBkmoCc6L+4+/Z2uydIwmLuNSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HJw1kmgz12M5; Wed, 20 Aug 2025 06:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6tS3e022362; Wed, 20 Aug 2025 06:55:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6tSh7022359; Wed, 20 Aug 2025 06:55:28 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:55:28 GMT Message-Id: <202508200655.57K6tSh7022359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1458494b92e6 - stable/14 - test/netfibs: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1458494b92e6e55ede271e3faa4b074353f1cb00 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1458494b92e6e55ede271e3faa4b074353f1cb00 commit 1458494b92e6e55ede271e3faa4b074353f1cb00 Author: Gordon Bergling AuthorDate: 2025-08-17 07:32:10 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:54:00 +0000 test/netfibs: Fix a typo in a source code comment - s/aguments/arguments/ (cherry picked from commit f066a425059e6ce80997f8ed850b74cc168c4d5e) --- tools/test/netfibs/reflector.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/netfibs/reflector.sh b/tools/test/netfibs/reflector.sh index b9500689a321..a68019532010 100755 --- a/tools/test/netfibs/reflector.sh +++ b/tools/test/netfibs/reflector.sh @@ -897,7 +897,7 @@ testrx_run_test() *) _opts="-d" ;; esac - # Convert netcat options to reflect aguments. + # Convert netcat options to reflect arguments. case "${_o}" in -i) _opts="${_opts} -T TCP6" ;; # Use TCP for START/DONE. -u) _opts="${_opts} -T UDP6" ;; From nobody Wed Aug 20 06:59:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6HPD5wcxz64VGt; Wed, 20 Aug 2025 06:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HPD5L5Yz3T1l; Wed, 20 Aug 2025 06:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZFT9TMYZI93zf+SYc/x4QtQSOh1FfbVXN+mR9Ib4DtA=; b=Iy3WjuWIuLgaRBtJ9zNOwbFcntd49IBA3bw+ob+wtriFqOxjduGKc+I/D8pFCz6Ygbzn1N hiQgJVzz1sXJ+7HD8koddYAbf/mDWY34qRJrBzBst4DKEmUqbGJHfYiBEvQQhbJs6NQPqY 9AjkMfuM7LO5cyFtv/UF/20oVzSDjmiyhMaNXHcHAe6sQExa+a71pMub3+aWJqZwABkcwo Nb8qT2m9uTvIIavhdH+VTmsudbshYcz3fjF9ofQWa9NgnrAyDDQEaatorSMlq4CbCCMknc +PKgV3IWJUTAvct7RpLXd40Kc9nZp7P8sMX/x6RSovBXoUxUzkvIp4ibCxatMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZFT9TMYZI93zf+SYc/x4QtQSOh1FfbVXN+mR9Ib4DtA=; b=OTQj6aBinGc/mvYtXuhySI40QqC8PtuC3CRf+c6PWRhsVX4YLUIZ8lOo41re4eGukx0+ad lWMUngbIvvGiAmnLOiNvEZJshd1tkM8HcOoBnxbCRTrNCXFEcXpkeQWi9zVeguOTT6rEF/ NHfXwyCqSavhNXYFU7Fr1RChplOlmKlYiA9+dIwMIflaAIBQZFCso0OFwwxUSt3b0fmi9o 1XKONwgXYdlodI9oU35gpuzjLW96AJbvA1f0MvoRf3u9wT5aNvaZPLZ/yn17kNy/4i5obs /2blZ9Ga+N6kmrQSWGDnm3A5k0xeWzd4dfm8mEPK/ihP091xVgHEyvt/r4Lj9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673152; a=rsa-sha256; cv=none; b=w6npms8tbh1rfHUWqwMWyD8/7YtljXLogsWa8rscc2uGZYm0f3Y9/FppvoYHwra14ySDOQ nwQeq0JKhUWfkjHVZEj9lqzngTM0bXngyxWBju/2L6P1yRMacncmPquyNzgpZ0GWCeLghD 3FkBrMqFl7W41afoZFv3vzvoYvxjyUkJvPhIHaR3yw8is0z/4oU2C7wKZ01mrMV4Yb9hse NmZNNQYiU0Vcph86g8dqaPCmyVLWHQUyA+Kh64MVZ+1bzr9XxxtNsfYLBPs/bhI2ZlAYlm LBSvP7jB0hSy98WGFn1deMMAMf810e5ZUaJ9a7TCZpSb31CmT/sF3wuSolIm/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HPD4xyhz12WG; Wed, 20 Aug 2025 06:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6xCYE023603; Wed, 20 Aug 2025 06:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xC3o023600; Wed, 20 Aug 2025 06:59:12 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:12 GMT Message-Id: <202508200659.57K6xC3o023600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 03fb545e27ef - stable/14 - localedef.1: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 03fb545e27ef01db821a0cdc0d40035225a2d5ac Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=03fb545e27ef01db821a0cdc0d40035225a2d5ac commit 03fb545e27ef01db821a0cdc0d40035225a2d5ac Author: Gordon Bergling AuthorDate: 2025-08-17 07:29:04 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:56:16 +0000 localedef.1: Fix a typo in the manual page - s/contants/content/ (cherry picked from commit c0367c654a3340c5aa194a3137489f760d556139) --- usr.bin/localedef/localedef.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/localedef/localedef.1 b/usr.bin/localedef/localedef.1 index be37715f490d..918b57961c6c 100644 --- a/usr.bin/localedef/localedef.1 +++ b/usr.bin/localedef/localedef.1 @@ -164,7 +164,7 @@ unless instructed otherwise by the .Fl D ( BSD output) option. -The contants of this directory should generally be copied into the +The content of this directory should generally be copied into the appropriate subdirectory of .Pa /usr/share/locale in order the definitions to be visible to programs linked with libc. From nobody Wed Aug 20 06:59:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6HPF6Zkqz64VGv; Wed, 20 Aug 2025 06:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HPF66fhz3T1m; Wed, 20 Aug 2025 06:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8JlGJ4FFHbWAMXTKfLiybkgZStJe+WB3DLPsZp7/wA=; b=mXMtBw4f6Bavvh0SWtLcX9Nx3LaCuEcM9wzs003N0hCw5j1ma7h0YaMW1zoKXORsUh4o9Z 1MYbRg2L4NpvH/GEafMDcbf5//epiH8ComMKu071OkgG7d/0PSVEPWmedcFF5Zbf1PkqGO xur8BPEzEZ9zGoREv8KkPgHtrYahzmYjpi4fJdi93RyO9b9pMhiCtGMhz6+CTqmQyCaxWa L9kFrJGldwe+S8QpCHQI7yL/FWI6edjwMYplap/sDYerQEPVH4Qhn552f6kAsYFCKaOPob UNqNiupfO+ODEsiY5nhVj40VtyZugd81K+SmBsq71Wty6+witRsTqEPYIgx1AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8JlGJ4FFHbWAMXTKfLiybkgZStJe+WB3DLPsZp7/wA=; b=KLKtjRB2iM9oFdqfnMAwHYGhiO3eKXWpDT6YRQ+IRE7ueuDrUv5ogQt1GduBv4N8KVAnYI jfsbQVLH5yGryOgXypZipTHvsxysQWJ84OF7PfESuPUhsJSQ21v5UWtO5f2BsPVy7zc3KJ Cksz8Ub6oDr8rN8ZTtY6ebaLDdfyANxTjFciWZ0+A1y6OC418IVAD9KeWSQexfkfg0GBQo 58hjHXBwBeJ73u2rLp99K+BHt0IK+p7UKSmmbjAxGPmL79GX4ZKHXcilvWsxgAYAC4uBHp 8h/bpLhcCbDdbfwi78BbtVabxSMZ/U4M8tKbUuxnCI8+ZaBDn0jrMOHzsLjm7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673153; a=rsa-sha256; cv=none; b=P4VFzAd+Y/S7wmyD41k2y/xMusvu4hh1PGiV2S/V1F3vy91l8C008Xwhtl2Zvy10cJIdUA o697ndvsNRlZu+rp+g3taZ7mGMPTZPlJ3lwqhPI45Dhpj1+TBIaHnr66+jUBi1AQXKwESE uOF/g0RUljR6Phoa+bgFebHZ3UX4x45l7HX1MUN6s6FgnvCUG+C/1KQTa+POtXtvPQy/Bd c5gitbMpuGFR5UdvNpaiCjYAjHRJY/pkSr+hS7hDMpgp+TRD3ucjO5G4seklvUkWmQCl7C SsHUdNfqbYBrwL6VeYNoM54zySn8i6vDHHKpuRVd+bYYBuActkTKoKeyuuWLug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HPF5kvHz13Cp; Wed, 20 Aug 2025 06:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6xDRk023635; Wed, 20 Aug 2025 06:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xD7T023632; Wed, 20 Aug 2025 06:59:13 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:13 GMT Message-Id: <202508200659.57K6xD7T023632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7f1296b8dab1 - stable/14 - services_mkdb(8): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f1296b8dab1b177a150dff150cb2585e9f833d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7f1296b8dab1b177a150dff150cb2585e9f833d7 commit 7f1296b8dab1b177a150dff150cb2585e9f833d7 Author: Gordon Bergling AuthorDate: 2025-08-17 07:26:53 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:56:30 +0000 services_mkdb(8): Fix a typo in a source code comment - s/priviledged/privileged/ (cherry picked from commit fbf0efd02608473021692d377dd567f247a1a85c) --- usr.sbin/services_mkdb/services | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/services_mkdb/services b/usr.sbin/services_mkdb/services index 799778c3c365..8f066cd24379 100644 --- a/usr.sbin/services_mkdb/services +++ b/usr.sbin/services_mkdb/services @@ -896,7 +896,7 @@ biff 512/udp comsat #used by mail system to notify users # processes on the same machine login 513/tcp #remote login a la telnet; # automatic authentication performed -# based on priviledged port numbers +# based on privileged port numbers # and distributed data bases which # identify "authentication domains" who 513/udp whod #maintains data bases showing who's From nobody Wed Aug 20 06:59:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6HPH22cSz64VPk; Wed, 20 Aug 2025 06:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HPH0RrYz3TDx; Wed, 20 Aug 2025 06:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=17U/D0CpINJrAGK/nt49tk2MN4MvrW3AuaL+sCNOQKY=; b=s/ZjSTaBl/FEpn7lWwQUvpzF/TlD0ltZ6Ex4d3CJc91IBRdswJxC2MUP/XGBdFaYzxtZfY D+ctY882D87La3H7eQSTUB8Lpr8MmT2kHy4393zGcaGnoRfxoDU5BTfLSK3u6adTfAbNFF zVpAzGmZzjUU8JppnN81P4vuHABQBCJcD+fLKJmzKpwzbTHWhtomErkKRP4YPY0YcS9HjC Su7RjEkOLcpcq5A0/bvszNS5hN+IS7C/jP1h2qsY+cankh38GerDCkrH6b0koeOxIpNr3H VpP1tHjU6qNtwWkgqJ9PlcYPr+vH4sLpGfRl3iilJ83rMwUSD07W7xci78g+xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=17U/D0CpINJrAGK/nt49tk2MN4MvrW3AuaL+sCNOQKY=; b=HzeKxirsN0njaj585ZrFy0qSzi/gBnVP+VJsaza/rpCtPYhjLxE6ws8fzfNocHtskiz65d 3XnUIkATDlzmovvQu7bHlBRcb1xyYfb9dCIn7kXBXhBZYiSGVPjZXBqep0v1tPqWew1nCw eqiIPx38OEkbg/M+HGknFmwdUapWuMQ+UcOj8TotckSeNwRQ+jSGzwATSzJCiVxRLa7BxQ Z65mfFAghqzEgUBYQ1cpCRMYpiDCG1DW/TdjA46xU9iFXMHEEDxGdR8VL3in0U96jl/03W 9upubenLXvHCnW+zmBo5izhSOcvNeaWI6rZZYSsMBXqZgADLlZFnplBa7ZNRUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673155; a=rsa-sha256; cv=none; b=tjSOhsZ9E/lcVRndJ3sG9tol+mj82LvEE7JsoYB3vgwvqHyhBMpjvd4L9s6HB5ceOt3CsQ IrehEuJwKL1w4HkuftvYx/nEcZcIFgmLZwlO8UNthY2DNX01GEBkhRfacDzxMzssWDotq+ eh5j/QyJ/wcLoHtOMMCZ32RsJB6zAhyyvO8dzBwCJqPbXRc3Ef2wf9oKDLpQPd7eguZ/V9 dUxXUkPkym6GZypRtTXL8cxkoavqr6YFAkwlMslmElNnXRiX3L0pjRRXcs7o26HKuCh+e2 yJTFVxQuevrbXPje/ETIchHRZbcf4PRGGQsQxvMLIjIrjTiZeeaGNSpUyWuBwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HPG6yX5z139M; Wed, 20 Aug 2025 06:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6xEYD023674; Wed, 20 Aug 2025 06:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xE4E023671; Wed, 20 Aug 2025 06:59:14 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:14 GMT Message-Id: <202508200659.57K6xE4E023671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d88135570023 - stable/14 - libc: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d88135570023b2699744db78f8e76f298a00b1b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d88135570023b2699744db78f8e76f298a00b1b4 commit d88135570023b2699744db78f8e76f298a00b1b4 Author: Gordon Bergling AuthorDate: 2025-08-17 07:24:59 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:56:45 +0000 libc: Fix a typo in a source code comment - s/aguments/arguments/ (cherry picked from commit 333b0490e3132bf8f1a0d974d8b2597caf765970) --- lib/libc/i386/gen/makecontext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/i386/gen/makecontext.c b/lib/libc/i386/gen/makecontext.c index 7b4845ac6bee..9fedd8b99c47 100644 --- a/lib/libc/i386/gen/makecontext.c +++ b/lib/libc/i386/gen/makecontext.c @@ -124,7 +124,7 @@ __makecontext(ucontext_t *ucp, void (*start)(void), int argc, ...) /* * Setup the top of the stack with the user start routine - * followed by all of its aguments and the pointer to the + * followed by all of its arguments and the pointer to the * ucontext. We need to leave a spare spot at the top of * the stack because setcontext will move eip to the top * of the stack before returning. From nobody Wed Aug 20 06:59:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6HPJ2QcRz64V86; Wed, 20 Aug 2025 06:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HPJ1DVfz3TH3; Wed, 20 Aug 2025 06:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z8QEIlXtSryFs9XEmAsML++y0N2t4WX9U9x2+SoKu6A=; b=twO1autWzfuQvyY3aCSCO5CLS6Hh2mXqo/RAvWjRZeury98YiMMfBKAKs1+gUdVAyObOAT 87lXEJGCMlAZhmhBhUfMukEjgKLETwOtXD5sNLqbOZk2z1WRRY3/x+T1cyHw5gKsZv/kha xdAXudyRJw4Sw2B5s+t9TSNOdCUslq4i8aKa/B956YNuz/0Rqcx4mMGhNkjwGZIktJ9OLM Rzh4umJ3z5E+gMBNioouIsfj50mix+Q7d/bUP4dApK0Q1dN/dIUUur0CZIvq2AuQ/XNJSi eZ1mFe5qdRlps8rQDY759twx1ZKNPLKU1uZ1K2jSoy5lIvcEp1Txm5SBKnw8bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z8QEIlXtSryFs9XEmAsML++y0N2t4WX9U9x2+SoKu6A=; b=labyl2o4245xucxSsEEnU4zTLy8VGxPjo9Bnw4erYs1YdfQtxqOMAAxihdeOrXGpDplgM5 H2Z4p6WfAeeRh56vgj1+LQDEU5j6I5WmHc7KVm3ZP1Laa9QtR56E+z5U1XPLt5rfD3R7IH D9sw2sdO0bf4wy9kuoRZmydfaO5uUWYvPumRIlqz3qJ7nzExafdS3sZrG2C87NC+wmmhKL DyrJUHdsxhtk5yGRnqyJJGwY0IP9ruPUiLd2oPYzqZDi6zyWrVBg+RXeZWpa3sJQKRDNZX /9wg1MNyslpe6DMH3SJUyQv8memkxC+mmBovQALVZnVWBAg1VsO0eV2FaVzdYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673156; a=rsa-sha256; cv=none; b=fNwtCb/0QawIXbgmKYwvgRwHa4g57bSD+dSbm4vRjHDx/VOQ151w4fbNPIjXTc1L/JrQ8b z7P888MPYoo4d3Zr4yCS58U0YUoapXezD3uEhPjf2+Xb/tgB2sAbc/5cBWSd22vkhR2H73 x0djTqtHcV+fbAnEORlrjgLE/z9JR71naH231MP4hb7oY2tC9ZrFLsK2wfW9I3hi41Z5rN qsEFMOmnGP9QR7hui2sN80i8XHep7G5trJGxC/ZplX/rCEj2kN7pqW/rIt8KIIE86idJsM I9ypbyHSB61yQ5B/VEdGcpqHJKqcNkuHN3z8cwrfxe4FmIJw5e82djl2AC2RrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HPJ0nz2z12tS; Wed, 20 Aug 2025 06:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6xGIr023706; Wed, 20 Aug 2025 06:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xGZn023703; Wed, 20 Aug 2025 06:59:16 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:16 GMT Message-Id: <202508200659.57K6xGZn023703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f5a611989fa4 - stable/14 - g_part: Fix a few typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5a611989fa442706665d87afcc0607fe7d2cc6e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a611989fa442706665d87afcc0607fe7d2cc6e commit f5a611989fa442706665d87afcc0607fe7d2cc6e Author: Gordon Bergling AuthorDate: 2025-08-17 09:30:16 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:57:03 +0000 g_part: Fix a few typos in source code comments - s/partitition/partition/ (cherry picked from commit 7ce07c41423d143cd3f7b8f7e61c2f3e8b6336c2) --- sys/geom/part/g_part.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index c0baf5cc8992..13752bbe8afe 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -1046,7 +1046,7 @@ g_part_ctl_create(struct gctl_req *req, struct g_part_parms *gpp) /* * Synthesize a disk geometry. Some partitioning schemes * depend on it and since some file systems need it even - * when the partitition scheme doesn't, we do it here in + * when the partition scheme doesn't, we do it here in * scheme-independent code. */ g_part_geometry(table, cp, pp->mediasize / pp->sectorsize); @@ -1539,7 +1539,7 @@ g_part_ctl_undo(struct gctl_req *req, struct g_part_parms *gpp) /* * Synthesize a disk geometry. Some partitioning schemes * depend on it and since some file systems need it even - * when the partitition scheme doesn't, we do it here in + * when the partition scheme doesn't, we do it here in * scheme-independent code. */ pp = cp->provider; @@ -2023,7 +2023,7 @@ g_part_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) /* * Synthesize a disk geometry. Some partitioning schemes * depend on it and since some file systems need it even - * when the partitition scheme doesn't, we do it here in + * when the partition scheme doesn't, we do it here in * scheme-independent code. */ g_part_geometry(table, cp, pp->mediasize / pp->sectorsize); From nobody Wed Aug 20 06:59:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6HPK48gyz64VDS; Wed, 20 Aug 2025 06:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HPK257lz3TCc; Wed, 20 Aug 2025 06:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RjCIjNzSARr8nuIuveYhzd40009Y5PngHTZHBhgku7w=; b=B5NnX3cksaj4eZajhfO2a+1yJq93IwmQxOHwYsDJfLZz94Iu57ZUN3hEx4rya2T2upTzRf LmtxuKMiLyT2R3AUG9Ws3ptYLSHFMoML6p5yPR2WxqjQhuYtCogfH6Kenj+xyUyiVJo0tJ ZGR4IYqAZTCiA3fQet4imfzjEIWgTPWjbEWfxp0V66kmXjxLsrmzwOplJhB8kuhxZhuldq Owg91Xk9JnjbvyhMtulDbZVV10iZZhH5cpChnwM7NU+GlOjX2uzb7Hoh5NvXROllSCUbEs AyLOP1O57yDE1cYaURVRzUib60tJNissSldcoRAthKkpfQ+pz5rtjGleRrgcNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RjCIjNzSARr8nuIuveYhzd40009Y5PngHTZHBhgku7w=; b=HnQCVqi6fHVLQ5dDgYDnXTY9L9RnveeZ++1L/Bpn7YWTAMfPicrZ9xDlTqLOhxCA2YM8yK 0lOHjLY/34rGSvSxo178CU3pDO/terzZBrZIa/tk40Cl7ch+oq0+DCR8nQ2rbmIZvN5SoG bf6tgzxsOO396nrLtH12qAsgLAepTCjSaNrX+dmLPRbye680E/cvq/kCXe/nJgQ+vOGfth lZ2/+D/QyCEE1Pf/9Z16E0NcSdnIvJtf/oqdkHpfkVKNp8zBp8qY96I/VFPiwIxVPWm6RJ E0UPgxitnsRZ08qPxjNV6AKf5aVnf4r94Rm4IBupQbSkVTAt1F0+7HEXGqzjRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673157; a=rsa-sha256; cv=none; b=nVNoUrgpBp3mxO7kzChGoWlqh88BYUE8QUhHnBsjKOtPne8jqJbjZc4UFxNKh//Q8Vntco yI9hx9AkevX77bt6VcB2Ait3m0V0G+HzfZ13BrMHo4k7AcPrR7WFq8lXKfmpX77bLZxp63 aGv49YrpPxKqcrozZONEE8cpWPvyLT3OEdWRp46xIh+M63AfXKywBiXO9bn129Qvt/vOxO z5zLquxJi7d9RCAlNiG6Vw6/hUlnxR/wTe+huWYM5KxomJNAzzMNdv515gQnUOVmV0/Czw Hed4Mmjzgr00dixROYKZ7cqTJ+ycmlTwj2NlwTw4SAdccJOHa3dt7cEG/RDOJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HPK1ShXz12WH; Wed, 20 Aug 2025 06:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6xHKq023738; Wed, 20 Aug 2025 06:59:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xHMN023735; Wed, 20 Aug 2025 06:59:17 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:17 GMT Message-Id: <202508200659.57K6xHMN023735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 3807e87f4eec - stable/14 - udp: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3807e87f4eec6614d2e975f43a4f8308f3a4743a Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3807e87f4eec6614d2e975f43a4f8308f3a4743a commit 3807e87f4eec6614d2e975f43a4f8308f3a4743a Author: Gordon Bergling AuthorDate: 2025-08-17 09:26:44 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:57:17 +0000 udp: Fix a typo in a source code comment - s/datgram/datagram/ (cherry picked from commit a3a78bd7a7446a9a437391c681ba196d956987da) --- sys/netinet/udp_usrreq.c | 2 +- sys/netinet6/udp6_usrreq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index adf8f0afc125..653c42a84214 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -450,7 +450,7 @@ udp_multi_input(struct mbuf *m, int proto, struct sockaddr_in *udp_in) /* * No matching pcb found; discard datagram. (No need * to send an ICMP Port Unreachable for a broadcast - * or multicast datgram.) + * or multicast datagram.) */ UDPSTAT_INC(udps_noport); if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 4a82315ea2f0..066cf79c3a07 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -333,7 +333,7 @@ udp6_multi_input(struct mbuf *m, int off, int proto, /* * No matching pcb found; discard datagram. (No need * to send an ICMP Port Unreachable for a broadcast - * or multicast datgram.) + * or multicast datagram.) */ UDPSTAT_INC(udps_noport); UDPSTAT_INC(udps_noportmcast); From nobody Wed Aug 20 06:59:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6HPL4yyVz64VK8; Wed, 20 Aug 2025 06:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HPL35Zgz3THl; Wed, 20 Aug 2025 06:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vi6ssl3hcNxZlOUQBmLggxw4cSXdAKf3J6fx769Ashk=; b=JRgCXpXkRsjZOJMHL252ZLh9Dej/0yl6j5BSMl5P9pByCHRKhn55Tb9hI9F4Fw2R8ZwrXS XUuyBO+bRSgJLlJLEiWP/6TI3jSmUsn9aOlBAiYWKdrxheIR+VhPDV2P1/Aoexid8b59YA MLqxMNmSkgkG6ZKtcaZ3q6YquODjk25AnJ9MZAR6Q13bqnT3ODGLXtxjnSUmcOg6hen9Lo Co0EAbvx2TJ4V8ccbQivBbE8bnFPg1on/SU2zspFvFFXjEUxJKEKCFzf6QSG9UWeCf4lvL MTiMw82pxsU3we7wJBZlYWVNBZ7GV7QNqGAIinsS+auc7DHRZr5jHoakorjn0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vi6ssl3hcNxZlOUQBmLggxw4cSXdAKf3J6fx769Ashk=; b=u8ItDUvFkFIVACxTDkHmbfhltdJbqCxO4E9SBdzPZx5PovV/550/n27Gkzlja2tQnJ8H2A rhmHd6KoURrAHt0LFpFXl7TVLaeubOBtwwJuzQUiUe/VbWOWiIbDmlUf/RbrctiguaDuGm nrFKaJwci0ZEBTiWhAqxkdn7iqDyQNxie2znRgCaEJKEyPeUXWCmW/Zboaf87E2Y45n5Hg uMT3oaBYZEbExHHo2pSxR93f8Hnp16tRuEGSaKmcT+qyaXzvx+eHAHBbzT7BH0AX/BU88Z zidPjF4XaUu+hcWKlaorlFInWO47nWs2Ea1v/eMeybtT7/NTrimDv5mbk4vPzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673158; a=rsa-sha256; cv=none; b=ovWNkM83w3lFVeMoT9TYTRq2ltEx6FOG9CkGyraH6SkRwA5fG8AplF8lNJGNj3m5CCM5YE f5S4Flvd49VR1F/hovqqRSif0z59IPPTYsoH42gLkicGcbimOyjxYfutBGK8aNlPL4vFW0 Hx/7URJAIRW3EGcFVbOo+JlaoHGp33aJciAdJhWXMRSEuzSD8WqeyoR9Xr4X6dT4rrzBFP fZUYEBs+X0D6HS7t4/Wvwdfkp9TR12DsUkI6crJyJlFXFwJUpZ0Fw0GWcfdBt1NnKD8rra xz99kK5qMhw/pWGn+vH6E9iSb4m2pBgq0uLOsGLvEGfpD5HjnMN0KxRBA5kN5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HPL2Scbz134T; Wed, 20 Aug 2025 06:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6xIMW023772; Wed, 20 Aug 2025 06:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xIEV023769; Wed, 20 Aug 2025 06:59:18 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:18 GMT Message-Id: <202508200659.57K6xIEV023769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 15f637f65c22 - stable/14 - ice(4): Fix a few typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 15f637f65c22cc608d18f6155ffd2f6b2171b46a Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=15f637f65c22cc608d18f6155ffd2f6b2171b46a commit 15f637f65c22cc608d18f6155ffd2f6b2171b46a Author: Gordon Bergling AuthorDate: 2025-08-17 08:32:24 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:57:33 +0000 ice(4): Fix a few typos in source code comments - s/wit/with/ - s/Recceive/Receive/ - s/convenction/convention/ - s/metaddata/metadata/ Obtained from: OpenBSD (cherry picked from commit 9113e9d687058877009c8f3a871fbe845db6a592) --- sys/dev/ice/ice_bitops.h | 4 ++-- sys/dev/ice/ice_lan_tx_rx.h | 2 +- sys/dev/ice/ice_lib.h | 2 +- sys/dev/ice/ice_protocol_type.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h index c480900596f4..a623f810c101 100644 --- a/sys/dev/ice/ice_bitops.h +++ b/sys/dev/ice/ice_bitops.h @@ -198,7 +198,7 @@ static inline void ice_zero_bitmap(ice_bitmap_t *bmp, u16 size) * ice_and_bitmap - bitwise AND 2 bitmaps and store result in dst bitmap * @dst: Destination bitmap that receive the result of the operation * @bmp1: The first bitmap to intersect - * @bmp2: The second bitmap to intersect wit the first + * @bmp2: The second bitmap to intersect with the first * @size: Size of the bitmaps in bits * * This function performs a bitwise AND on two "source" bitmaps of the same size @@ -237,7 +237,7 @@ ice_and_bitmap(ice_bitmap_t *dst, const ice_bitmap_t *bmp1, * ice_or_bitmap - bitwise OR 2 bitmaps and store result in dst bitmap * @dst: Destination bitmap that receive the result of the operation * @bmp1: The first bitmap to intersect - * @bmp2: The second bitmap to intersect wit the first + * @bmp2: The second bitmap to intersect with the first * @size: Size of the bitmaps in bits * * This function performs a bitwise OR on two "source" bitmaps of the same size diff --git a/sys/dev/ice/ice_lan_tx_rx.h b/sys/dev/ice/ice_lan_tx_rx.h index 693e0ca5efc6..eedacdab0216 100644 --- a/sys/dev/ice/ice_lan_tx_rx.h +++ b/sys/dev/ice/ice_lan_tx_rx.h @@ -630,7 +630,7 @@ enum ice_rxdid { ICE_RXDID_LAST = 63, }; -/* Recceive Flex descriptor Dword Index */ +/* Receive Flex descriptor Dword Index */ enum ice_flex_word { ICE_RX_FLEX_DWORD_0 = 0, ICE_RX_FLEX_DWORD_1, diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h index b6b23ec82161..28c4f668292c 100644 --- a/sys/dev/ice/ice_lib.h +++ b/sys/dev/ice/ice_lib.h @@ -313,7 +313,7 @@ enum ice_dyn_idx_t { ICE_ITR_NONE = 3 /* ITR_NONE must not be used as an index */ }; -/* By convenction ITR0 is used for RX, and ITR1 is used for TX */ +/* By convention ITR0 is used for RX, and ITR1 is used for TX */ #define ICE_RX_ITR ICE_IDX_ITR0 #define ICE_TX_ITR ICE_IDX_ITR1 diff --git a/sys/dev/ice/ice_protocol_type.h b/sys/dev/ice/ice_protocol_type.h index 300d61bfb5d9..b90c25e6c427 100644 --- a/sys/dev/ice/ice_protocol_type.h +++ b/sys/dev/ice/ice_protocol_type.h @@ -143,7 +143,7 @@ enum ice_prot_id { ICE_PROT_LLDP_OF = 117, ICE_PROT_ARP_OF = 118, ICE_PROT_EAPOL_OF = 120, - ICE_PROT_META_ID = 255, /* when offset == metaddata */ + ICE_PROT_META_ID = 255, /* when offset == metadata */ ICE_PROT_INVALID = 255 /* when offset == ICE_FV_OFFSET_INVAL */ }; From nobody Wed Aug 20 06:59:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6HPN0fWGz64VBQ; Wed, 20 Aug 2025 06:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HPM4DrCz3T6d; Wed, 20 Aug 2025 06:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fkp3TcYQN1tSVVS82Y1oF3AzejUoSNtdgt6t3x6E7iU=; b=jeLocTDDi3QzDB3xQFX2zEVYZHB7ZeUvGJtm6+HLFoQ/UXSwrnggWrO7XByj0bRmzR4XS5 BHsD5gare1TZ8v4qDX5l9v0OLcqVPfzl4abGFkm0PIZa+VTn0/Nu8f+o8RmgVA7JOe8qgM 75oq4tZckhCa32bpZntzoKQQftXX4MoAhuhBciKMBlzTOX9rSf8d4RE3pPitdCTzaxrp0y FqD2giyjRF/cEFjT9GsgmKXX3JzOe1FqZ8NVR8I8rcbp3YF7Hez0CWu5+STmwLp+CYV4XF +e7Bi+VHuzteV/z/F10rj0qt5lCa0FyGFIGWb+7MTF3gC7MenEx0l7azEhF1dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fkp3TcYQN1tSVVS82Y1oF3AzejUoSNtdgt6t3x6E7iU=; b=GmTtMqNvl6zuw9om/47X/3w1+MAqROj/huEEkrJi2Y+HvPO+kxHCiU3Au+GZCmeeX3TK7N swDDqv9AVsxPXM8bdXPgV1bTGa1VowT25u6l8LQZQvG57KTsebC022LxKIOd9+kTTyW98c chveKDzNObTxx8GsHvA4Z8MuC7kBBFO5A580tCt3q3Qk9E+D2vdbamAHTdaiFnpc9ofvYw 3IuxkVwLRZT9Cfp6nAwMRB8t5dWJTKRdxGtZNQ0HiUeb9bWzTStBaDyKYI/WecdWE/OHSq ZFpEJ/UUs2irKv7hpsF5qN4VRDazY9ydsSr8YxC1OBTBzmdgu47LES1xJPlxoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673159; a=rsa-sha256; cv=none; b=myG1e0fIX+RSEGDgByhttzwiujvWL9boa7UqQozOZ/refiAJORquMuAZwHeaKWcQ3Z7MoF GxCQ4RDTcImbT2cZecHd8a4ym+NexdCBEuOOmxtCoWfQke1XSYN0earPodhP8XbFHToYDS tUhmMYHpe5SU1anvWaM15OwPdD1/PDUQRianWfVqW05jajiGJn0Jr/qPiy8/6lcSV/xLFR hKurLbIiVBVzhdoEtGxLws5zVHb6C3Q9zambjhHVvsRkWIRBldubGU5vIWZZXeeAQVdLyY FrMVAOfpBn8AJkfwGVe+xv2/PArXxuig5GfMcypoU9h5AZABmMtg/OmFYOuBZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HPM3ltKz12Q7; Wed, 20 Aug 2025 06:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6xJL0023805; Wed, 20 Aug 2025 06:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xJZw023802; Wed, 20 Aug 2025 06:59:19 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:19 GMT Message-Id: <202508200659.57K6xJZw023802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f17d7105cbca - stable/14 - isa: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f17d7105cbca4679aa9dcc92cdac7b5ffd2b569f Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f17d7105cbca4679aa9dcc92cdac7b5ffd2b569f commit f17d7105cbca4679aa9dcc92cdac7b5ffd2b569f Author: Gordon Bergling AuthorDate: 2025-08-17 09:28:20 +0000 Commit: Gordon Bergling CommitDate: 2025-08-20 06:57:48 +0000 isa: Fix a typo in a source code comment - s/Monochome/Monochrome/ (cherry picked from commit 4c7b81cfa29084bb0013969c175700069e6d7019) --- sys/isa/isareg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h index 8cbc0b171c4f..17a203bb7466 100644 --- a/sys/isa/isareg.h +++ b/sys/isa/isareg.h @@ -51,7 +51,7 @@ #define IO_RTC 0x070 /* RTC */ #define IO_ICU2 0x0A0 /* 8259A Interrupt Controller #2 */ -#define IO_MDA 0x3B0 /* Monochome Adapter */ +#define IO_MDA 0x3B0 /* Monochrome Adapter */ #define IO_VGA 0x3C0 /* E/VGA Ports */ #define IO_CGA 0x3D0 /* CGA Ports */ From nobody Wed Aug 20 08:14:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6K3l2qxXz64b2T; Wed, 20 Aug 2025 08:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6K3l1ppmz3f7x; Wed, 20 Aug 2025 08:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S54pgR59OSZ2ewMj5KkcmMf9ZmnT4LI1tJdQHVz8kVk=; b=e5LoWeO1cHcjWxbcPcI/QUVXQO3o4TvbaCFMHQDUnSJTpyt1VqoD3N2r11k2ogslZyj8DR Or9m/8I0eWbfCQRSZlk5U2J8k1yRu56xu6lPhzfPM0sn/sz3yth+XmSM/F9K2JIS9aoTcz 5oekbrk92+4Vm69Kob4AgZ8Pah1u78q5LYwj7144+HPU4zfJQHjVUItDeNK1gG3Uwly7kd DkXBV/uEphKGEdu0vR19abitlKN2jQqwf8CV/WHQToBMI2Sh3iRLyvSa6PWT+/BUrsz5uG troyzvkzfte0+1pAPVG+zL93l6sQT41Hi7HqVcqULbUXHghFXM8BlDKTx/NcGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755677651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S54pgR59OSZ2ewMj5KkcmMf9ZmnT4LI1tJdQHVz8kVk=; b=CPgv6ZZuxyaY3IBGsCFSWHPtwY96g/6LnNzMmjwpPltDxvF6BP71lEHpt1mkwZD0yeR/AI fL1APTp8fjftIuVBXAQKu1ENDVZFLyrHe2GHmkjWpx8gawHoyn6n9UrTN3qIp1Av6jV0M3 yCnCb+cgwHCStyF7RDnTU6dcVf5pKQRofXTo2dB2IbOhveT79stVe+aVw6uKdelDgH8yTl hTVQZIsU7Q93VCYZnCNYM1BoaQKz56kJWsmNZ5yfIBOoAUSFNsrJtJGgkq8hVO5uuW1yWa cFKn8bQ/IehB6YDCcy+xUpua1v8WCihoXWcpzMBxG0VogHoyrZfUL+bymzpMew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755677651; a=rsa-sha256; cv=none; b=HQ6coZGr/vLtYCzdovh9U2pXqBoRrcf9OplfHD2TNvhZhMf/1S6yKVSr0uAuxsc7gFuylv WN4dG9eGruE8TeWvE/mNtkchEp2YAxvgYL2x17yGX0oHAPJz0FXBvISBtZNIKOHX+KIQuX 0GWPNREt6FmgCUgSIL0347sbqjNPAND7rsiJ3C5f/s8+QEXi4zRIH1KiP8LIpMMy/JzmP6 TENyN4ByYKPSfijDgY1m1NZgZbnF2LULdE8v7g7FqwU6hmXIi8ts4CEgfGO8NH1pJcExN/ VcO8EqG75s30x6wNOw+tFYEgvAhW4y3eqxfOheMSTVFYhvFxU7wW281bchXvmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6K3l1Kwxz153t; Wed, 20 Aug 2025 08:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K8EBkE073817; Wed, 20 Aug 2025 08:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K8EBrr073814; Wed, 20 Aug 2025 08:14:11 GMT (envelope-from git) Date: Wed, 20 Aug 2025 08:14:11 GMT Message-Id: <202508200814.57K8EBrr073814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c1ccb7d304fb - stable/14 - ufs_times_locked(): style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c1ccb7d304fbaa28531c604318a6b50cd5f8ecc9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c1ccb7d304fbaa28531c604318a6b50cd5f8ecc9 commit c1ccb7d304fbaa28531c604318a6b50cd5f8ecc9 Author: Konstantin Belousov AuthorDate: 2025-08-17 14:03:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-20 08:09:35 +0000 ufs_times_locked(): style (cherry picked from commit 054c6e5b2fd629d651ce709e2916e13a0279309d) --- sys/ufs/ufs/ufs_vnops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index bc62ad59ff00..4aed4f7db42c 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -161,27 +161,27 @@ ufs_itimes_locked(struct vnode *vp) if ((vp->v_type == VBLK || vp->v_type == VCHR) && !DOINGSOFTDEP(vp)) UFS_INODE_SET_FLAG(ip, IN_LAZYMOD); else if (((vp->v_mount->mnt_kern_flag & - (MNTK_SUSPENDED | MNTK_SUSPEND)) == 0) || - (ip->i_flag & (IN_CHANGE | IN_UPDATE))) + (MNTK_SUSPENDED | MNTK_SUSPEND)) == 0) || + (ip->i_flag & (IN_CHANGE | IN_UPDATE)) != 0) UFS_INODE_SET_FLAG(ip, IN_MODIFIED); - else if (ip->i_flag & IN_ACCESS) + else if ((ip->i_flag & IN_ACCESS) != 0) UFS_INODE_SET_FLAG(ip, IN_LAZYACCESS); vfs_timestamp(&ts); - if (ip->i_flag & IN_ACCESS) { + if ((ip->i_flag & IN_ACCESS) != 0) { DIP_SET(ip, i_atime, ts.tv_sec); DIP_SET(ip, i_atimensec, ts.tv_nsec); } - if (ip->i_flag & IN_UPDATE) { + if ((ip->i_flag & IN_UPDATE) != 0) { DIP_SET(ip, i_mtime, ts.tv_sec); DIP_SET(ip, i_mtimensec, ts.tv_nsec); } - if (ip->i_flag & IN_CHANGE) { + if ((ip->i_flag & IN_CHANGE) != 0) { DIP_SET(ip, i_ctime, ts.tv_sec); DIP_SET(ip, i_ctimensec, ts.tv_nsec); DIP_SET(ip, i_modrev, DIP(ip, i_modrev) + 1); } - out: +out: ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_UPDATE); } From nobody Wed Aug 20 10:45:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6NQv6sCKz64lBD; Wed, 20 Aug 2025 10:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6NQv5FV3z452q; Wed, 20 Aug 2025 10:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755686759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R+1oY5GZ/EyBMkIHj92IfccZ9q3x4IOg0/5nLHo7WPU=; b=YU0aVIU9nUglx9JeNqDs7xP4Jfl3R/6Q4ES8t/OyD81JQdGYtP8VP3NvwusoWFPJBelfH9 pfi2gNn2FP/Mw2BrH+zbuddQDKSl3puxEjR0aFQoIqRxQpRHTjP5zObEIeMnKdWdEUcOrV cxqgJYFLPoQ/jcBo09LayC6PpXNYARfJlep/fc/bMYt1TsNQRZV09ayc0uY0Ex5/p3JBsx USZcAGPnnSlMJCLAK1KKnLUyOnnGx1xDfGe/UE/B5KAqHuo5bIT8aCL2+RX9Cz8lRP/+D6 8EW3aSerU08H7NEl5eIQd3QlF+M0YsGvMRaAuCVl9UCoO23fvMEKL5esokXWsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755686759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R+1oY5GZ/EyBMkIHj92IfccZ9q3x4IOg0/5nLHo7WPU=; b=W1VVjhiDIunOiaJAU+XDGsiuf9otj1r/fy9TV34jlQxfvdcJtqdSxE4QW2nXJep1MlBk+h U2ucmd6En8pBi+Zzc5nbm4xHAfMydmKdjlNV+RvFwiKkEl2vNSGUA2YPmTrjj77YokQ2ia TZ43XVr+kYT6to28IiQEv0PRMUohckI4nIandIKLjEfySbx2G2XMN+I4Y7S6GOe0vupjPU Qwdi4hsvcZwlpjLROprQIxe8bv2ld52A8PvuX5LdNf5jaxtHM/ByERo/eLpWxxqu6k42pc YYSnOrE00iRRp3XXptFKbwPAym5IgEztO74JfxyJcMrdrz4ApaExLyXhWpWL7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755686759; a=rsa-sha256; cv=none; b=L9XfeMiSmmox668lqffa0XalgAFMhoHNI1Qc1Hdy2xBq5JSZGccd3xlVxNEYGI9YrQAbeV LK0g3HyhXIrVaZ1TdICrpCJ90QBenjDbD87IeFrl690g7D98VPnSXzAtmCSMjqUbXnTtgN Ra5kwBUyRepHvrfHJcdmaMLt/sysQXbGIXd1u7FYCUEj8S4nfE5C3o7LQDtnZ4gwh2TjOH KAE9xKkdxgODiBFHMoPezj+QxTyXWiCJapv1hsSgT9xLZPtYhbWE3PDZXYxemxHCkuGIZ/ aa2tcYe3zWNiQdbK+CvRxgdAT+yVboUFEjZpSKOvmk4E4Qu4SaGzsrUXU1AI/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6NQv4X8tz18n7; Wed, 20 Aug 2025 10:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57KAjxav057946; Wed, 20 Aug 2025 10:45:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KAjx69057941; Wed, 20 Aug 2025 10:45:59 GMT (envelope-from git) Date: Wed, 20 Aug 2025 10:45:59 GMT Message-Id: <202508201045.57KAjx69057941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6a1e5dcb0051 - stable/14 - sysctl.3: Reference kinfo_getvmmap(3), kinfo_getfile(3), and kinfo_getproc(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a1e5dcb00514e056c1d702b46603142fcf48454 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=6a1e5dcb00514e056c1d702b46603142fcf48454 commit 6a1e5dcb00514e056c1d702b46603142fcf48454 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-31 16:06:08 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-20 10:45:31 +0000 sysctl.3: Reference kinfo_getvmmap(3), kinfo_getfile(3), and kinfo_getproc(3) It seems to be a good place to help the user discover those useful wrappers. Reviewed by: christos MFC after: 3 days Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51654 (cherry picked from commit 04c8bba8c8672d186837e353d4f2335a26f0c3c1) --- lib/libc/gen/sysctl.3 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3 index a87aa7772413..c82bcf3c0d72 100644 --- a/lib/libc/gen/sysctl.3 +++ b/lib/libc/gen/sysctl.3 @@ -27,7 +27,7 @@ .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\" -.Dd March 16, 2023 +.Dd July 31, 2025 .Dt SYSCTL 3 .Os .Sh NAME @@ -529,8 +529,12 @@ The path of the process' text file is returned. The in-kernel call stacks for the threads of the specified process. .It Dv KERN_PROC_VMMAP The description of the map entries for the process. +Also refer to +.Xr kinfo_getvmmap 3 . .It Dv KERN_PROC_FILEDESC The file descriptors for files opened in the specified process. +Also refer to +.Xr kinfo_getfile 3 . .It Dv KERN_PROC_GROUPS Groups associated with the process. .It Dv KERN_PROC_ENV @@ -951,6 +955,7 @@ A process without appropriate privilege attempts to set a value. .El .Sh SEE ALSO .Xr confstr 3 , +.Xr kinfo_getproc 3 , .Xr kvm 3 , .Xr sysconf 3 , .Xr sysctl 8 From nobody Wed Aug 20 10:46:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6NRN0fgLz64l7y; Wed, 20 Aug 2025 10:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6NRM70dcz45F8; Wed, 20 Aug 2025 10:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755686784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktcSWMcFxaE69B9tnjYensGeI09WIODeRGavwhgJ6vA=; b=qZxTucKnG4ZrEGquK+C2AtdFp22K8+ZGwXgb8vShWm+fw/Czl/3idKTWnFLmYuQ2aT/JOe jzYkGhSMaXaE6EF0ObePDbpe73LWkjG+qnUMG72ZVQHH+pQRX4vMwc6FfrAmol1TTzpNmf Jle9G14nmJXhWeNmqYRgk+efQ6BHWCgEOmtgi7uopJ5DxSDp3VSF1OMCIt+V56pKVFx+ZK HgztoVW3UlDZoRFvVVRGKfuY+VSJNxoshN5mOyYVhYeYvjMEhZK3F2Tvq/2dz+edbuVusm ajsAgGJqTVN/Zhkm8ESFmh7Zy09lGJOq+busckll9g70pXyzG6bdt2llM+Y2fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755686784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktcSWMcFxaE69B9tnjYensGeI09WIODeRGavwhgJ6vA=; b=Tf/DXbUxwFMfWdcSSL4rwFIdbGRIxDwmsgS3T5LR3Zks1iMLXhtB4p/UWgQPLMrVWtxjFg KSUUqflAJhbKH/MMFgB/uee8B7xM9IJRtzFPU/Mm5Vn3/oIlUdZEMUW7LMqeejt7IthW1l gB4WZnI9lD+/+xKIb39dhFaYrBbr+tXV3Vh0XPnODMeaf5vzm6cJyBeQKyhgDpEgsSzDWn r/YuQpKuNMnTlRqbWtLKmNF8QPe/9Y4ylEWnHLtY9hWr+bJ0apx+yVVK5vwo+7wq8a8Sgx y5P8qj8xXpwvPMi1aWAbqBpFROpFRxhTpw73wis1tLuYlhSD9Aiu4nnEOsWH/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755686784; a=rsa-sha256; cv=none; b=YQsskVPgZh4tLO4FEf1E/mS7cVT/ODL9mG8KaRbznH8f3XquAX8+rYiCvXc+mcfFXjfav+ eiG7mPjR98uuVsQySWBvBzATTzKf4ryt7wUU+DiJ6QIN54y8s9dyO9sL6c6tJy/fhsPd2c jTI7u7Ef0/evkMgo+PJELWlrRjC3KhJCyMCUImoQPDDjnrFrYp1NRhqlTH3gF7VnTFvqWx EJOqDmyO35GdSJIySnijPeP8ua9bQWHJ33IdqlUFYCO7SA1MUrjKxZVdZjQR10HhM8eYRc Geop3sPoNWeRwXtg6c4k+7sp3kIOHTrRei1y/tYkM1znY7MrZBaEYc14Vvo51w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6NRM6YGdz18Yb; Wed, 20 Aug 2025 10:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57KAkNmA058179; Wed, 20 Aug 2025 10:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KAkN54058176; Wed, 20 Aug 2025 10:46:23 GMT (envelope-from git) Date: Wed, 20 Aug 2025 10:46:23 GMT Message-Id: <202508201046.57KAkN54058176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b09a75d675dc - stable/14 - dtrace.1: Document security.bsd.allow_destructive_dtrace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b09a75d675dcaa9a1e5dcc63f7cfbb5df85419e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=b09a75d675dcaa9a1e5dcc63f7cfbb5df85419e6 commit b09a75d675dcaa9a1e5dcc63f7cfbb5df85419e6 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-08-01 15:23:20 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-20 10:46:18 +0000 dtrace.1: Document security.bsd.allow_destructive_dtrace PR: 288284 Reviewed by: bcr, markj MFC after: 3 days Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51633 (cherry picked from commit 1acfb873cf2e59f9ddf53602cbc67fa810c878a6) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 0603a32da5e2..eafc25f187d5 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 16, 2025 +.Dd July 30, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -537,6 +537,17 @@ option is not specified, .Nm does not permit the compilation or enabling of a D program that contains destructive actions. +.Pp +Set the +.Va security.bsd.allow_destructive_dtrace +.Xr loader 8 +tunable +to +.Ql 0 +to disallow the possibility of enabling destructive actions system-wide at any point at all. +Any attempts to enable destructive actions will cause +.Nm +to exit with a runtime error. .It Fl x Ar arg Op Ns = Ns value Enable or modify a DTrace runtime option or D compiler option. Boolean options are enabled by specifying their name. @@ -1219,6 +1230,18 @@ failed or that the specified request could not be satisfied. .It 2 Invalid command line options or arguments were specified. .El +.Sh DIAGNOSTICS +.Bl -diag +.It dtrace: could not enable tracing: Permission denied +This can happen when +.Nm +fails to enable destructive actions because +.Va security.bsd.allow_destructive_dtrace +is set to +.Ql 0 +in +.Xr loader.conf 5 . +.El .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , From nobody Wed Aug 20 10:50:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6NWg58gzz64l88; Wed, 20 Aug 2025 10:50: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6NWg4YM7z45Ts; Wed, 20 Aug 2025 10:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755687007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k2aXAglmhWigwFUBKTBDFXeCAJtVC/heK8mBVlkdCvU=; b=SnJ3MrjWfmL9Pl13X0XszsB9AF9ADq7AZZGjq4qav7E79fhdEkuqw9slHwncL/TzY4oz2K d8mkUMAbkPAdsKeHrwxQi/FuHjpUxXGLmoUQzO3W3PIfeFgDrRBTKHdWRI0W/OxFfDj7B1 9PglnzmknrGuYGuOyCO0AqQ/OEiEKyWNHRwD3p/DXQ7ZgQURqawUN/iouNWYnny0iolWoJ xZW1SqARep1edWvk8ZpJd1ViLteQAuG4BzplSuIDgaTLAovSHXi7x2yjMLbd1T6sBKSCci rBzi8Iv0Se5btVM3Uji3nggefq4mL8l0r4PWmxz1nJtdHMV52gKUrFHD4jjpyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755687007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k2aXAglmhWigwFUBKTBDFXeCAJtVC/heK8mBVlkdCvU=; b=HyBxLWMKCBM5tEv6Eau/9BfPB+J0lxPFIVNd82Y6Fvg+78G6NoFKTmkONxSfkp0A97mT13 QSXWEQL5Hi5yNnTR4ZpeoJDDERBfSeXQvhp2p0toQgmGtVy9+OdaE/HfcjIYRvgw/LzZBU h/kZYsbYmsyAMeB8hXCs3v2eRRqPis9MpStb/O9XIjQdnEJIofjJxQ5OIT1FKtBMmGKBDj BtCfXZrEDN+k3cbc/uEK+D1hiHMpSeJqxxCfagSFLvImBhJ1Jz+GGoGhII8CArwhKoycZu edP1CG3vlmNPOEy0po9p8v0hb7T+Vt8jBG0KbVrVqW23BS3IlPYpeHgPvY79jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755687007; a=rsa-sha256; cv=none; b=OsRe1T0y3gbMiLeD7UzJ42S95+Az0CwUuz523kVJhyGrE7u7/fGz/rcaVkwS1vDLnajeSZ xxndvLV4U7cNmKfAgo4G/UcQR3tjLZsI02ym7yFPUp/6YkoFRkp0J14S3uNN1g7B5T7FSe dlVq31pDzuCSBim5Ob4uTzTiHUQbZqUBzj67tA/PMrWgQx5f241qVMq5UCxy15Hx90GHgj CO4zoHBjsxiljDaWWh3RcMRVZOYRZcBQbGyjWtudZoCRSfjh5gLWJVidE9qwuQ5mZle43J yA/NpQY43olL27DHjEuzXF7roqFYDVbkx39HJAHphi94JTd+q5KtF7MmNmoIkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6NWg48MXz18n9; Wed, 20 Aug 2025 10:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57KAo7h0062656; Wed, 20 Aug 2025 10:50:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KAo7WE062652; Wed, 20 Aug 2025 10:50:07 GMT (envelope-from git) Date: Wed, 20 Aug 2025 10:50:07 GMT Message-Id: <202508201050.57KAo7WE062652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 1a6f2bf37241 - stable/13 - dtrace.1: fix mandoc -Tlint List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a6f2bf37241d57168cdecc75f3f432e44e9cc8f Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a6f2bf37241d57168cdecc75f3f432e44e9cc8f commit 1a6f2bf37241d57168cdecc75f3f432e44e9cc8f Author: Christos Margiolis AuthorDate: 2023-05-23 14:29:19 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-20 10:49:07 +0000 dtrace.1: fix mandoc -Tlint Reviewed by: markj Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D40230 (cherry picked from commit ed35c7cf7762c26246cb032b7ed30dcfbcee7a3b) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 853538949a4d..609bf00655e7 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -803,11 +803,6 @@ failed or that the specified request could not be satisfied. .It 2 Invalid command line options or arguments were specified. .El -.Sh HISTORY -The -.Nm -utility first appeared in -.Fx 7.1 . .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , @@ -826,3 +821,8 @@ utility first appeared in .Rs .%T Solaris Dynamic Tracing Guide .Re +.Sh HISTORY +The +.Nm +utility first appeared in +.Fx 7.1 . From nobody Wed Aug 20 10:50:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6NWh6RVmz64lhY; Wed, 20 Aug 2025 10:50: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6NWh4lyBz45My; Wed, 20 Aug 2025 10:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755687008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AAx9VdBKDcWUzbFo3a2EQEeRKcF3J8+a9B/nB/Kdpig=; b=KduuoAjGlmJKwI2Wd2V2bQrwy67XXUpNzKWqBYzwowk7/3Hi+D3xK11TP19W+c9oRhqZPK fBJ5OSlH6jNIHJ/UXACaUR2himRs5A1GNDG3XU77dHR2EBb/JrZiP7xqlDyA2sVwDPSGo8 KJOY0VaPqD2ukOEHD8u4g3SIJROjQ8rpkRUlnXBAvxcDiZ+JrmL81fXI2ACXvm/P7qEM4q bobGvq3enxJbGlk/inT+4m4sBR+cdtQk4R+oTxn1/AI5kf4kYsqfAtYMzN/7M8n8vtAn4D FvYw8JpPE3GlcEm/CMJ67gh5iC4p+9C+uWHZNB04lP85O0Z/8rwul6+JzSSziA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755687008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AAx9VdBKDcWUzbFo3a2EQEeRKcF3J8+a9B/nB/Kdpig=; b=eIHrHreOnEf1NCYj6p8+YBsxB+Rqgv2MnWLeujJssaB5JJywMngE3Zr9ebBfFXlaLVivV7 T/zkZxzbNlOozBPiSvsWRr/zeHPeozHKPugP/CUBfqtNVwNLa/SIiLuZhdwPmVJcIrOvkS d5LJ2l3CbvZr2okJETf/ZDO2oITAXngBgfd9UELBKRCIKB3kkbLBDWsRSLw5SqAqHFXY8f MjaZ6beIxSLx/UqbfHBkkrhPiIXHE0k1O+WTEi7KVZ1U754MsssExbGMONvQqOGvaVbJIK B11JmzuVfXiCU5KY18dzoE3D5f+SUWGM/kNjnhLqEaZj82RoZZtoxuhG3mnWRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755687008; a=rsa-sha256; cv=none; b=CMAheFdDJXfF0YgTN6RW2g2sJCFo0g80N41jKmY0QkES9QWExRPkpDXrb9OAsVICEWArQr uvn9tSiu/qrD0fBEXMglZxmPN3nGXIQIG9eVuFGoeAeAzzU0DHaeB2hBEt3+lRAC9lpur/ 5t0fwNMXyl50hSc4EQx2ZRQ9Vsgs01YmQckibXptncFfpj69epajB1H3/xfLZm9hdStJDM OK/Vfii9ZpctQ9xAC+4h1HkP73fXMc2U3XcNm1bls8il70sz7vaoRFLwc0oYSQZAaYbWPO RCGfKsJ8SQTBTecYfdBjaOC2ZjLN88gqlIVnxhdJdtl66mf8PBGeCQpWSks90Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6NWh4MHxz193W; Wed, 20 Aug 2025 10:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57KAo88U062917; Wed, 20 Aug 2025 10:50:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KAo8JL062912; Wed, 20 Aug 2025 10:50:08 GMT (envelope-from git) Date: Wed, 20 Aug 2025 10:50:08 GMT Message-Id: <202508201050.57KAo8JL062912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e84d5425bf53 - stable/13 - dtrace.1: Document security.bsd.allow_destructive_dtrace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e84d5425bf533c61d00aaa8e52f505d328f4b02d Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=e84d5425bf533c61d00aaa8e52f505d328f4b02d commit e84d5425bf533c61d00aaa8e52f505d328f4b02d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-08-01 15:23:20 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-20 10:49:10 +0000 dtrace.1: Document security.bsd.allow_destructive_dtrace PR: 288284 Reviewed by: bcr, markj MFC after: 3 days Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51633 (cherry picked from commit 1acfb873cf2e59f9ddf53602cbc67fa810c878a6) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 609bf00655e7..a98d851b9998 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 16, 2025 +.Dd July 30, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -517,6 +517,17 @@ option is not specified, .Nm does not permit the compilation or enabling of a D program that contains destructive actions. +.Pp +Set the +.Va security.bsd.allow_destructive_dtrace +.Xr loader 8 +tunable +to +.Ql 0 +to disallow the possibility of enabling destructive actions system-wide at any point at all. +Any attempts to enable destructive actions will cause +.Nm +to exit with a runtime error. .It Fl x Ar arg Op Ns = Ns value Enable or modify a DTrace runtime option or D compiler option. Boolean options are enabled by specifying their name. @@ -803,6 +814,18 @@ failed or that the specified request could not be satisfied. .It 2 Invalid command line options or arguments were specified. .El +.Sh DIAGNOSTICS +.Bl -diag +.It dtrace: could not enable tracing: Permission denied +This can happen when +.Nm +fails to enable destructive actions because +.Va security.bsd.allow_destructive_dtrace +is set to +.Ql 0 +in +.Xr loader.conf 5 . +.El .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , From nobody Thu Aug 21 07:46:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6wPC1mCMz65xWL; Thu, 21 Aug 2025 07:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6wPC1Cj0z42ly; Thu, 21 Aug 2025 07:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755762383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajwztm/qe9bwljpdeoo49OdFWZChpo6z6D3S7LOmR14=; b=DKmJrbPmyemDT33t0cboRNzVlGvfZIdcaVuSVk/bM27OWnB34hVXbNG17pezNGODOHXXLc JAUOIwF82vMcoUCdY99Dca8LDiKJLf/wRd4O2Jz3Qm8yqhrnfwivK/HuRHpGZ1ui/YzfL5 qRigIVPw/06rgkmL1oTovZrHL3kj4yqnWrCCfuWXwY1Av0qsGbhAwv7pfKQO8ZL+pX5LI4 Pdo628qUfwch1xqeJfnqZAHMNQ75qMgVpChDLgQAtWDogOSOJCNzmHbTEx7k6m/Jpb5Xzo JZmOfQqdTqJaEOr0wZysvPZIa2IOiIdLhZPKA23Yhb+mXAExKKa4oi2lJdE+Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755762383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ajwztm/qe9bwljpdeoo49OdFWZChpo6z6D3S7LOmR14=; b=j0oOS1xsaXM4X0tEUQzMk0JIhEnnnWOMl1kifO1vL6ZvboMy9tFNhmQZAgLOImrXADyJu6 gkyYy0HhirZ05TxSO2h4JQfflxnfZlEk8rTUeGh78kHNPlyikXTPH/5MZenuaQ3QCth5OB mmmFlB9OqvuVHBA4GtpoZUahoZJFItm5KwtN6oJdiCzR45/hrdQ/J1rt0jPN7PAZ/OO3nE EFJR7L8KX/NY5+xtBTtRrIYEro6YZpvn85lhKWVOvfuTvEAI9ghLzyCC26pUEte4U8+GRT Sx2d6+zSJ5bTkC76srFgiLyVVvASvHTYswxswz5GXIkMN7edfmmYd7UAr6izTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755762383; a=rsa-sha256; cv=none; b=KWDQkfD+RP4iVpv9Jd0OyMnEN3FF8g7cC0ZXRRUhqyZqXbJ/XFfemb93+rXrISUwKFsS1T amAc2Q0aIDQluUDqy1oPyZ81snZ2DpoGJLCimFhSf152KG0iIhh2od/7RbJzbls0B7D/Am JEFGQloHRTX9Mrdq/Eq+bIQmitHGSqAObcpGMFNn+M5AyHTzdb/wK72x9tFlDLElJIYc9U XzzCKObI1YnMY+XJ+tnxaXBsMM+XW1Xosrrin2pnObgwtv8QZyBADveoae5DTWICbWZenU vPuv/LdRPvwaDBjAqNv0bmT7hwqkNe+oYU4OOB0WpAueDy2U4KaefflIE4772w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6wPC0ncDzrB7; Thu, 21 Aug 2025 07:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57L7kNei034719; Thu, 21 Aug 2025 07:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57L7kNG8034716; Thu, 21 Aug 2025 07:46:23 GMT (envelope-from git) Date: Thu, 21 Aug 2025 07:46:23 GMT Message-Id: <202508210746.57L7kNG8034716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d94b403b590f - stable/14 - nfsport.h: minor comments cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d94b403b590f381ac924078b80c5e04ee62dd79c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d94b403b590f381ac924078b80c5e04ee62dd79c commit d94b403b590f381ac924078b80c5e04ee62dd79c Author: Konstantin Belousov AuthorDate: 2025-08-18 02:49:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-21 07:46:01 +0000 nfsport.h: minor comments cleanup (cherry picked from commit c04fe26aa2f7d4c10070fc5cdbe047102f83c1be) --- sys/fs/nfs/nfsport.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 0b16ba9b85a8..557ed0a5dfc9 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -901,15 +901,6 @@ int nfsmsleep(void *, void *, int, const char *, struct timespec *); #define NFSBCMP(s, d, l) bcmp((s), (d), (l)) #define NFSBZERO(s, l) bzero((s), (l)) -/* - * Some queue.h files don't have these dfined in them. - */ -#ifndef LIST_END -#define LIST_END(head) NULL -#define SLIST_END(head) NULL -#define TAILQ_END(head) NULL -#endif - /* * This must be defined to be a global variable that increments once * per second, but never stops or goes backwards, even when a "date" @@ -1030,9 +1021,6 @@ void ncl_copy_vattr(struct vattr *dst, struct vattr *src); #define NFSINCRGLOBAL(a) ((a)++) #define NFSDECRGLOBAL(a) ((a)--) -/* - * Assorted funky stuff to make things work under Darwin8. - */ /* * These macros checks for a field in vattr being set. */ From nobody Thu Aug 21 10:43:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c70KP3Q0bz64ghR; Thu, 21 Aug 2025 10:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c70KP1tx1z3SWl; Thu, 21 Aug 2025 10:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KvpSbqqllL11bJaSYrmkgPmTP8iArPAfdJ/jCwluhSE=; b=ddNCftN/5i440xmIO6KnTXwJHIE3ip2v2YXx7iudrZu0gMYiMiQiwVVG4LeQpsu5lCxhZ7 XIwkIFuR7OmjgNCFkQJn0BUPAcDsvUQb0bmlJaUMwoF8GVajYY7uRvxOld53Jcur6FJaFu XnynTY2mBxmVtxzDYUKt6g7Vux5dg3DDveRabC7t1dMZCOc87N3rQWu6iVs9lVZJ5mOqIi ze1LVetMDG48i3BTvDRKoDxu1nG2sGt38UEHbpGZO58EH3LwGytAQsPH5af5GXC8KQuDBj k3gA+TH4ozPfwvR7xugbciYOdzDWwIruT91C5kTVkAJmv0eKy4gmfZ8YsSZfMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KvpSbqqllL11bJaSYrmkgPmTP8iArPAfdJ/jCwluhSE=; b=c66hjMVlrH2yfRYRn3oxf+0wzLFMEqMyXQH+nZn0iRydGY+dXPMlHucw9jpULnNr0O4OA2 +OvBZyVUoY5rCX/QOxb1vv5wawuC7PUyKukQj7GqL/VL9x0L3JcKdRLeWo7Tq76JB06Hf0 j9eZfOhSE+xH6DS39PUIV2wGzjOgUY/HCbUNFFsPuPPJ6XoMsjeVt4+Lh6azjujrCeeTIu lH5DrDoPEiw+qIgl6b8wGlFa3zhhzy0rXvWYJ9bPy0WdaFqUzww4ldl7VDx/wRbUF1DFvo T4o5sfRMVPLqRB6E/h5gNc2Jc0OZl2yqce8j62Zij9OmgyiNsZfvyG8mX5bixg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755773001; a=rsa-sha256; cv=none; b=ar62j1ZtwLX621W4lSmbhuDpX5MM4kZaG21f07VthtmzzATleTL8tF6rw0WpcyOOajwXvn BfpM4Xk0EYKNKQ33CSPvbr8+GZnpHihDxYp0qaTdY/eQly0eYMlOCLODwX3zFuJHwrwoaX 9ksQ+H3C1fB8CvysHrHqeJ3j064cHc4qC6UI3S3k0ZBDYRfKUD0/z7kxRNNXQ8RXhAwNRL u50bKz2esAnXpiXrMy7gtj/i48R4HT5BLTw+SNmr0FrmqzvUSn7l0ERKGH7ICe/zTw+ncz LNXPqlWDAHElxwRNVzrU3SHUwaCWE6vY7BovbMOU4kIFApsxNgIIFI50MuEYYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c70KP1GcSzwZM; Thu, 21 Aug 2025 10:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57LAhL7d075525; Thu, 21 Aug 2025 10:43:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LAhLC3075522; Thu, 21 Aug 2025 10:43:21 GMT (envelope-from git) Date: Thu, 21 Aug 2025 10:43:21 GMT Message-Id: <202508211043.57LAhLC3075522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 0a0f3b405100 - stable/14 - [libm] Avoid left shift of signed integer entities List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a0f3b405100e2c8a51234a4fe77c92bbfe9746c Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0a0f3b405100e2c8a51234a4fe77c92bbfe9746c commit 0a0f3b405100e2c8a51234a4fe77c92bbfe9746c Author: Steve Kargl AuthorDate: 2025-08-14 18:38:41 +0000 Commit: Dimitry Andric CommitDate: 2025-08-21 10:41:18 +0000 [libm] Avoid left shift of signed integer entities Follow-up commit d180086e6eae by fixing the left shift of signed integer entities through the use of a helper function. Specific per file changes are: * lib/msun/src/e_fmodf.c: * lib/msun/src/s_remquof.c: . Eliminate now unused variable 'i'. . Sort declaration statement. . Use subnormal_ilogbf() to avoid left shift of signed integer. * lib/msun/src/math_private.h b/lib/msun/src/math_private.h: . Implement subnormal_ilogbf() to extract an exponent of a subnormal float. This avoids left shifts of signed integers. . Update nearby comment. * lib/msun/src/s_ilogbf.c . Fix declaration of the function statement in accordance with style(9). . Use subnormal_ilogbf() to avoid left shift of signed integer. PR: 288850 MFC after: 1 week (cherry picked from commit c58c77246f88da87f309e8c449e98195d43e2c76) --- lib/msun/src/e_fmodf.c | 16 +++++++++------- lib/msun/src/math_private.h | 16 +++++++++++++++- lib/msun/src/s_ilogbf.c | 5 +++-- lib/msun/src/s_remquof.c | 16 +++++++++------- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c index a7d1a0c22acd..ada969db44c7 100644 --- a/lib/msun/src/e_fmodf.c +++ b/lib/msun/src/e_fmodf.c @@ -27,7 +27,7 @@ static const float one = 1.0, Zero[] = {0.0, -0.0,}; float fmodf(float x, float y) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx, hy, hz, ix, iy, n, sx; GET_FLOAT_WORD(hx,x); GET_FLOAT_WORD(hy,y); @@ -44,14 +44,16 @@ fmodf(float x, float y) return Zero[(u_int32_t)sx>>31]; /* |x|=|y| return x*0*/ /* determine ix = ilogb(x) */ - if(hx<0x00800000) { /* subnormal x */ - for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; - } else ix = (hx>>23)-127; + if(hx<0x00800000) + ix = subnormal_ilogbf(hx); + else + ix = (hx>>23)-127; /* determine iy = ilogb(y) */ - if(hy<0x00800000) { /* subnormal y */ - for (iy = -126,i=(hy<<8); i>=0; i<<=1) iy -=1; - } else iy = (hy>>23)-127; + if(hy<0x00800000) + iy = subnormal_ilogbf(hy); + else + iy = (hy>>23)-127; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -126) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 1f5878445a8c..08c45b7602b4 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -741,7 +741,7 @@ irintl(long double x) } while (0) /* - * For a double entity split into high and low parts, compute ilogb. + * For a subnormal double entity split into high and low parts, compute ilogb. */ static inline int32_t subnormal_ilogb(int32_t hi, int32_t lo) @@ -761,6 +761,20 @@ subnormal_ilogb(int32_t hi, int32_t lo) return (j); } +/* + * For a subnormal float entity represented as an int32_t, compute ilogb. + */ +static inline int32_t +subnormal_ilogbf(int32_t hx) +{ + int32_t j; + uint32_t i; + i = (uint32_t) hx << 8; + for (j = -126; i < 0x7fffffff; i <<= 1) j -=1; + + return (j); +} + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c index e0f8fee26ac8..5195e2331af3 100644 --- a/lib/msun/src/s_ilogbf.c +++ b/lib/msun/src/s_ilogbf.c @@ -18,7 +18,8 @@ #include "math.h" #include "math_private.h" - int ilogbf(float x) +int +ilogbf(float x) { int32_t hx,ix; @@ -28,7 +29,7 @@ if(hx==0) return FP_ILOGB0; else /* subnormal x */ - for (ix = -126,hx<<=8; hx>0; hx<<=1) ix -=1; + ix = subnormal_ilogbf(hx); return ix; } else if (hx<0x7f800000) return (hx>>23)-127; diff --git a/lib/msun/src/s_remquof.c b/lib/msun/src/s_remquof.c index 5818cc55cf6f..6ffca7c3c737 100644 --- a/lib/msun/src/s_remquof.c +++ b/lib/msun/src/s_remquof.c @@ -26,7 +26,7 @@ static const float Zero[] = {0.0, -0.0,}; float remquof(float x, float y, int *quo) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx, hy, hz, ix, iy, n, sx; u_int32_t q,sxy; GET_FLOAT_WORD(hx,x); @@ -48,14 +48,16 @@ remquof(float x, float y, int *quo) } /* determine ix = ilogb(x) */ - if(hx<0x00800000) { /* subnormal x */ - for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; - } else ix = (hx>>23)-127; + if(hx<0x00800000) + ix = subnormal_ilogbf(hx); + else + ix = (hx>>23)-127; /* determine iy = ilogb(y) */ - if(hy<0x00800000) { /* subnormal y */ - for (iy = -126,i=(hy<<8); i>0; i<<=1) iy -=1; - } else iy = (hy>>23)-127; + if(hy<0x00800000) + iy = subnormal_ilogbf(hy); + else + iy = (hy>>23)-127; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -126) From nobody Thu Aug 21 10:43:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c70Kc5Xk0z64gl1; Thu, 21 Aug 2025 10:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c70Kc49Xrz3Svc; Thu, 21 Aug 2025 10:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P69n9WS9OKLxlvbxLB3gJAJ39UyqnCJVYm3SrPpHdb8=; b=kOLloYXW+2uRMtPYK/CyejwYp/M9QNBgKsLUcvv4r/bif5VROPbYZOYbhE48UL1V3+YLIO ASry9nmDXtJzjrjoxFF+KXujztl8ji158Fefdzk1ix7vM9w+ksVhqya9URkVALfuW12NjB sdsXVwyKsOStRxEL3O+PqNx44Lm4twWAMS5W16XyupOjF0eCvHR5OmJxMD4XltZum4B8/0 5de2n/M/cKzzUJdqPBIPwvuY0ogMCUeNwmixTIYEdDUlhegcWJigSmjcMhg5Gnug3/tvD/ NMBGWO+K01lRoEsTzXc1muicWWt60/I9BoQTh35ZBjem/GqEHHGAdMfUYW+PBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P69n9WS9OKLxlvbxLB3gJAJ39UyqnCJVYm3SrPpHdb8=; b=t+vEDNcyrBceB8XLOfFqbLlgf8bMUzUq3eKTTnRK38aDRx1bfJrHQnYxRP709tiWV8j+P9 OZ6yHijR1/GssC5wS6Q/U5z+gZxL6XUmdzDida/FF4szWtcXv/A0vatDu4TIUe8m0lf8gA x3Ybyridoifd36hMmvXHTiaHLoAV5befw2UiUfc+7k0dsKE9FPFNWvlL/FTRHkgJxils7i dTXEWDHYWI9auzjGJ6HUUy6emyD44RQajiJhZvSEI90cQW5KcfVTp3diPgFCojVWrtPOqQ ZEHelcOnaVBh2LNGQ2bO8nFlBOfVtNh3XVicFrAcVFxA32kjZ7Rj2SQLLXb7eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755773012; a=rsa-sha256; cv=none; b=t0cFdfhchXJ4gGgOoGrCPaHQnWKZilCOaxvcZDIM04L25g25SpwP+cPnEldBNJQNbyZHzn HaiXWPCr2vs5mQyWFg9joDJr5QF7Np7ALpg0XNMo2pJs2ACAJHh93WLt9cyuuGTkEQ/iZw 4VSD4MebldiJL/l+Fa0PgSHvc4Lbf+jAGJz3oTKunHhsY3kXUS96BLrPBAAL7hL0AJaXNv Yfo8ZpITp67Ze6kJmBLqzZGjNEKj+NF27CE9XeD/W1Vu9LYwucjeG9iW0oxm5wfAOS4hMQ 49t4fBF5orCpgndTBAauTlevpZvGpRm8imFemJGEXAQq9oWDK/KfCWSjFtmAQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c70Kc3mTHzwcB; Thu, 21 Aug 2025 10:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57LAhWd1075703; Thu, 21 Aug 2025 10:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LAhWc7075700; Thu, 21 Aug 2025 10:43:32 GMT (envelope-from git) Date: Thu, 21 Aug 2025 10:43:32 GMT Message-Id: <202508211043.57LAhWc7075700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 94b09b2f3440 - stable/13 - [libm] Fix undefined behavior of a left shifted of a signed integer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94b09b2f3440b16b58dd744fcaa73229f6503c10 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=94b09b2f3440b16b58dd744fcaa73229f6503c10 commit 94b09b2f3440b16b58dd744fcaa73229f6503c10 Author: Steve Kargl AuthorDate: 2025-08-12 04:26:29 +0000 Commit: Dimitry Andric CommitDate: 2025-08-21 10:41:41 +0000 [libm] Fix undefined behavior of a left shifted of a signed integer The patch fixes a few instances of left shifts on signed integer entities. A 'static inline' helper function 'subnormal_ilogb()' has been added to math_private.h. This function is then used e_fmod.c, s_ilogb(), and s_remquo.c. The change in s_remquo.c has only been compile tested. The change to e_fmod.c has been test on over 3 billion pairs of subnormal numbers where testing included x > y and x < y pairs. The test compared the output from fmod() with the output from mpfr_fmod() from MPFR. There were no difference. The change to s_ilogb() has had limited testing where its output was compared against frexp(). In this testing, no differences in output were detected. PR: 288778 MFC after: 1 week (cherry picked from commit d180086e6eae2e152e803ed6cf13775a7c006dc7) --- lib/msun/src/e_fmod.c | 30 ++++++++++++------------------ lib/msun/src/math_private.h | 21 +++++++++++++++++++++ lib/msun/src/s_ilogb.c | 13 +++++-------- lib/msun/src/s_remquo.c | 30 ++++++++++++------------------ 4 files changed, 50 insertions(+), 44 deletions(-) diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c index fdfb56c2a475..973ab2ef30c4 100644 --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -28,14 +28,14 @@ static const double one = 1.0, Zero[] = {0.0, -0.0,}; double fmod(double x, double y) { - int32_t n,hx,hy,hz,ix,iy,sx,i; - u_int32_t lx,ly,lz; + int32_t hx, hy, hz, ix, iy, n, sx; + u_int32_t lx, ly, lz; EXTRACT_WORDS(hx,lx,x); EXTRACT_WORDS(hy,ly,y); sx = hx&0x80000000; /* sign of x */ - hx ^=sx; /* |x| */ - hy &= 0x7fffffff; /* |y| */ + hx ^= sx; /* |x| */ + hy &= 0x7fffffff; /* |y| */ /* purge off exception values */ if((hy|ly)==0||(hx>=0x7ff00000)|| /* y=0,or x not finite */ @@ -48,22 +48,16 @@ fmod(double x, double y) } /* determine ix = ilogb(x) */ - if(hx<0x00100000) { /* subnormal x */ - if(hx==0) { - for (ix = -1043, i=lx; i>0; i<<=1) ix -=1; - } else { - for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1; - } - } else ix = (hx>>20)-1023; + if(hx<0x00100000) + ix = subnormal_ilogb(hx, lx); + else + ix = (hx>>20)-1023; /* determine iy = ilogb(y) */ - if(hy<0x00100000) { /* subnormal y */ - if(hy==0) { - for (iy = -1043, i=ly; i>0; i<<=1) iy -=1; - } else { - for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1; - } - } else iy = (hy>>20)-1023; + if(hy<0x00100000) + iy = subnormal_ilogb(hy, ly); + else + iy = (hy>>20)-1023; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -1022) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index b71a8d03c0a1..8023cdf05857 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -740,6 +740,27 @@ irintl(long double x) (ar) = (x) - (ai); \ } while (0) +/* + * For a double entity split into high and low parts, compute ilogb. + */ +static inline int32_t +subnormal_ilogb(int32_t hi, int32_t lo) +{ + int32_t j; + uint32_t i; + + j = -1022; + if (hi == 0) { + j -= 21; + i = (uint32_t)lo; + } else + i = (uint32_t)hi << 11; + + for (; i < 0x7fffffff; i <<= 1) j -= 1; + + return (j); +} + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c index 0b076edbd9b5..a958182a2a35 100644 --- a/lib/msun/src/s_ilogb.c +++ b/lib/msun/src/s_ilogb.c @@ -23,21 +23,18 @@ #include "math.h" #include "math_private.h" - int ilogb(double x) +int +ilogb(double x) { - int32_t hx,lx,ix; + int32_t hx, ix, lx; EXTRACT_WORDS(hx,lx,x); hx &= 0x7fffffff; if(hx<0x00100000) { if((hx|lx)==0) return FP_ILOGB0; - else /* subnormal x */ - if(hx==0) { - for (ix = -1043; lx>0; lx<<=1) ix -=1; - } else { - for (ix = -1022,hx<<=11; hx>0; hx<<=1) ix -=1; - } + else + ix = subnormal_ilogb(hx, lx); return ix; } else if (hx<0x7ff00000) return (hx>>20)-1023; diff --git a/lib/msun/src/s_remquo.c b/lib/msun/src/s_remquo.c index e3aac25230e0..fba788ed5104 100644 --- a/lib/msun/src/s_remquo.c +++ b/lib/msun/src/s_remquo.c @@ -5,7 +5,7 @@ * * Developed at SunSoft, a Sun Microsystems, Inc. business. * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice + * software is freely granted, provided that this notice * is preserved. * ==================================================== */ @@ -29,7 +29,7 @@ static const double Zero[] = {0.0, -0.0,}; double remquo(double x, double y, int *quo) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx,hy,hz,ix,iy,n,sx; u_int32_t lx,ly,lz,q,sxy; EXTRACT_WORDS(hx,lx,x); @@ -55,25 +55,19 @@ remquo(double x, double y, int *quo) } /* determine ix = ilogb(x) */ - if(hx<0x00100000) { /* subnormal x */ - if(hx==0) { - for (ix = -1043, i=lx; i>0; i<<=1) ix -=1; - } else { - for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1; - } - } else ix = (hx>>20)-1023; + if(hx<0x00100000) + ix = subnormal_ilogb(hx, lx); + else + ix = (hx>>20)-1023; /* determine iy = ilogb(y) */ - if(hy<0x00100000) { /* subnormal y */ - if(hy==0) { - for (iy = -1043, i=ly; i>0; i<<=1) iy -=1; - } else { - for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1; - } - } else iy = (hy>>20)-1023; + if(hy<0x00100000) + iy = subnormal_ilogb(hy, ly); + else + iy = (hy>>20)-1023; /* set up {hx,lx}, {hy,ly} and align y to x */ - if(ix >= -1022) + if(ix >= -1022) hx = 0x00100000|(0x000fffff&hx); else { /* subnormal x, shift x to normal */ n = -1022-ix; @@ -85,7 +79,7 @@ remquo(double x, double y, int *quo) lx = 0; } } - if(iy >= -1022) + if(iy >= -1022) hy = 0x00100000|(0x000fffff&hy); else { /* subnormal y, shift y to normal */ n = -1022-iy; From nobody Thu Aug 21 10:43:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c70Kd5xx9z64gxx; Thu, 21 Aug 2025 10:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c70Kd5Lt7z3Ss8; Thu, 21 Aug 2025 10:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIzdbBKUPr9BE7NqTkjl5a0dpR5FopasnxlLAavKkx8=; b=WzyYJZxjaI/1BTgbILjAQmWuaS7A6ZDV5XI3PuqX/awC6Xfla3If29HU3uSVvhgJ0nyumN PomFO0KQ97k8fWJqNY+ZnHZw714HzFrCR6EpruUZrQTNO6W85yMdanfPst8s3jgO2etHq/ RP7qoTGXhSfSe/MgX9ishUONwBr1Y6QSkdMORgnt6EYYhGJT1CNNpnRDuCjvkujutlfTgA FsmeHFYrlBSEnX8y6FMcBk59+3X9HzhyWU4Qs500q9Kf2bBROvabylYh5bfLwWGW+yGcOn Tk4k6bvLze/gbHvEYreX6Oy15zGGMgMjjIGo+ydq8bOS7D6edF6LjNIbdeol7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755773013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIzdbBKUPr9BE7NqTkjl5a0dpR5FopasnxlLAavKkx8=; b=cBkmfutCYrm5CeiDShdeHytFoZyykmdqVB0oEuOSUkMzTFu7/7S0Jto9Nd2eSCjVZcQzf8 ZDxbYxEAC9ZioWSF3vqhRO7F7uCWlDGpfkkbFvEAxdZFPh2wtFDMXEaC71/U7f4wRP3FZg P1uBdMD/tODbVF+dhlfyDZfPY68H5K59m5Z78sotqRJrH/ldFYr8POZioCn6Zx9YHMRoFw OCykkZReeMoQPpGyjwWASKsh2kDbjAMAYi9PCyMTeo1OrANxQXgiCT7WylIGgFmY9nhGu3 Wie9wKo1nAxRxT2ObI3Zoa6MAXWJyI08G0k0DKJ2aWgEuaJ9O2kQxcXdbX+yBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755773013; a=rsa-sha256; cv=none; b=YavF9ZXpoCN3UzphU+grMFKMZeOYb2laEVCkQ8rVpoXPZ+Db+9g93t8fiLMxOh3DPWunit AyEhkWWmfnhG+h1+w3FlPg6Q4wnfwntGPTgRtUhOLk1jAmbjQvutzNi5hPd9eH7y9zWlyY Fectd8ee0Uesv+nxqVOBw/6wuk5Wl6NZu5nN8C4Q9A/xt1yTjRPuQNLgLQ8acnDJPcRvor oKCz6FXcXMnDFqZas+dT1EyunImZgr3+ewbE5Gu3psFHgM81hAPmHypVeQeYmWn611FnSD Nr6IsMMDeRUaPp0bQpW8g4PlDlatclgyZBnmpESzlBzivPdQpTGugtm51kQ2sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c70Kd4jZ0zwcC; Thu, 21 Aug 2025 10:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57LAhXlP075739; Thu, 21 Aug 2025 10:43:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LAhXjZ075736; Thu, 21 Aug 2025 10:43:33 GMT (envelope-from git) Date: Thu, 21 Aug 2025 10:43:33 GMT Message-Id: <202508211043.57LAhXjZ075736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8d2c0354e138 - stable/13 - [libm] Avoid left shift of signed integer entities List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8d2c0354e138c49e2d5f6e0160fd3c710052a0ef Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8d2c0354e138c49e2d5f6e0160fd3c710052a0ef commit 8d2c0354e138c49e2d5f6e0160fd3c710052a0ef Author: Steve Kargl AuthorDate: 2025-08-14 18:38:41 +0000 Commit: Dimitry Andric CommitDate: 2025-08-21 10:41:43 +0000 [libm] Avoid left shift of signed integer entities Follow-up commit d180086e6eae by fixing the left shift of signed integer entities through the use of a helper function. Specific per file changes are: * lib/msun/src/e_fmodf.c: * lib/msun/src/s_remquof.c: . Eliminate now unused variable 'i'. . Sort declaration statement. . Use subnormal_ilogbf() to avoid left shift of signed integer. * lib/msun/src/math_private.h b/lib/msun/src/math_private.h: . Implement subnormal_ilogbf() to extract an exponent of a subnormal float. This avoids left shifts of signed integers. . Update nearby comment. * lib/msun/src/s_ilogbf.c . Fix declaration of the function statement in accordance with style(9). . Use subnormal_ilogbf() to avoid left shift of signed integer. PR: 288850 MFC after: 1 week (cherry picked from commit c58c77246f88da87f309e8c449e98195d43e2c76) --- lib/msun/src/e_fmodf.c | 16 +++++++++------- lib/msun/src/math_private.h | 16 +++++++++++++++- lib/msun/src/s_ilogbf.c | 5 +++-- lib/msun/src/s_remquof.c | 16 +++++++++------- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c index 0e6633fbe739..fc6fee879f52 100644 --- a/lib/msun/src/e_fmodf.c +++ b/lib/msun/src/e_fmodf.c @@ -28,7 +28,7 @@ static const float one = 1.0, Zero[] = {0.0, -0.0,}; float fmodf(float x, float y) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx, hy, hz, ix, iy, n, sx; GET_FLOAT_WORD(hx,x); GET_FLOAT_WORD(hy,y); @@ -45,14 +45,16 @@ fmodf(float x, float y) return Zero[(u_int32_t)sx>>31]; /* |x|=|y| return x*0*/ /* determine ix = ilogb(x) */ - if(hx<0x00800000) { /* subnormal x */ - for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; - } else ix = (hx>>23)-127; + if(hx<0x00800000) + ix = subnormal_ilogbf(hx); + else + ix = (hx>>23)-127; /* determine iy = ilogb(y) */ - if(hy<0x00800000) { /* subnormal y */ - for (iy = -126,i=(hy<<8); i>=0; i<<=1) iy -=1; - } else iy = (hy>>23)-127; + if(hy<0x00800000) + iy = subnormal_ilogbf(hy); + else + iy = (hy>>23)-127; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -126) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 8023cdf05857..6513c2ce14fc 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -741,7 +741,7 @@ irintl(long double x) } while (0) /* - * For a double entity split into high and low parts, compute ilogb. + * For a subnormal double entity split into high and low parts, compute ilogb. */ static inline int32_t subnormal_ilogb(int32_t hi, int32_t lo) @@ -761,6 +761,20 @@ subnormal_ilogb(int32_t hi, int32_t lo) return (j); } +/* + * For a subnormal float entity represented as an int32_t, compute ilogb. + */ +static inline int32_t +subnormal_ilogbf(int32_t hx) +{ + int32_t j; + uint32_t i; + i = (uint32_t) hx << 8; + for (j = -126; i < 0x7fffffff; i <<= 1) j -=1; + + return (j); +} + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c index ff3df1fc5b90..75508ab77120 100644 --- a/lib/msun/src/s_ilogbf.c +++ b/lib/msun/src/s_ilogbf.c @@ -19,7 +19,8 @@ #include "math.h" #include "math_private.h" - int ilogbf(float x) +int +ilogbf(float x) { int32_t hx,ix; @@ -29,7 +30,7 @@ if(hx==0) return FP_ILOGB0; else /* subnormal x */ - for (ix = -126,hx<<=8; hx>0; hx<<=1) ix -=1; + ix = subnormal_ilogbf(hx); return ix; } else if (hx<0x7f800000) return (hx>>23)-127; diff --git a/lib/msun/src/s_remquof.c b/lib/msun/src/s_remquof.c index c42bd8c4320d..39b87a91845f 100644 --- a/lib/msun/src/s_remquof.c +++ b/lib/msun/src/s_remquof.c @@ -27,7 +27,7 @@ static const float Zero[] = {0.0, -0.0,}; float remquof(float x, float y, int *quo) { - int32_t n,hx,hy,hz,ix,iy,sx,i; + int32_t hx, hy, hz, ix, iy, n, sx; u_int32_t q,sxy; GET_FLOAT_WORD(hx,x); @@ -49,14 +49,16 @@ remquof(float x, float y, int *quo) } /* determine ix = ilogb(x) */ - if(hx<0x00800000) { /* subnormal x */ - for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; - } else ix = (hx>>23)-127; + if(hx<0x00800000) + ix = subnormal_ilogbf(hx); + else + ix = (hx>>23)-127; /* determine iy = ilogb(y) */ - if(hy<0x00800000) { /* subnormal y */ - for (iy = -126,i=(hy<<8); i>0; i<<=1) iy -=1; - } else iy = (hy>>23)-127; + if(hy<0x00800000) + iy = subnormal_ilogbf(hy); + else + iy = (hy>>23)-127; /* set up {hx,lx}, {hy,ly} and align y to x */ if(ix >= -126) From nobody Fri Aug 22 05:25:46 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7TDW0Rxpz65JJt; Fri, 22 Aug 2025 05:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7TDV6MWwz3qMY; Fri, 22 Aug 2025 05:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gIe7NaHaxGz13nzxgq+0LhUk5dCvUQscbPZqqHJ/zko=; b=RMuCZt1jYhnl3zImVCpczMljyGcU1xv9BwjHWuvoYxiZM0fmPEwMOaI0WK8DgqL03esjmP TN+a8Ssq4uMMxg0BllSBpnWuQYqf+4YkmgFTTgUPviWWjtc+r97IRFFrbxc3NHuAfPUagA Qoq8saFlytQBQy4mXDT7PETWPO6ZdN3MeM4sdqN61S80qhD3bot19LabbRtfd+kEbxE8CD 0sSu6tfWWlzf/FZzC0AnI3dFvDpUqB/ABy4N2Jz5yKGB85SU38oU/FirViCr3q9xOl2IUX 6Wr9w1x2F0uwrURao+O4c2oQCPaDRanK13FXAXhjo2sjCIJzpGqV5hl5DVvgzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gIe7NaHaxGz13nzxgq+0LhUk5dCvUQscbPZqqHJ/zko=; b=c6pJJJVzRbeVsu9Hq9vmmkuSvU6iFuhd+XMFsZ8Uv/LRVbaVNjhg+EvqlH6DpcuHwiGC2Y /QCTfVSfSi7x3jJ9s10vamZ+Vl1nsCPCh0eNDdNJKVM1A2dwbuTIRS7YC4mgriy2aryJUx 9x2Ra0f2IVA66RT5LF6VnKz/D87X4iznbp/SSKIDc/XrXPw7crxb0/Ou+bVxKOSnhleelU QhzQkZ820S35wwG5PJrdFqhdiihYanl54eI/08Q/r+yhSRu1POzywEIACqeH9RFDvK7ppH rlM+CmjXnK6M9AalAQSh4DvGR4Biqn2jHnnoIZLJNJunMzOHllFWVQmSz/Ncbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755840346; a=rsa-sha256; cv=none; b=jmCNkzvYx2UvByUb0QMHwYPRuUctQjUnUn9DIPOpsfyo81roIqMsS+230ESimf2iGNWEV3 cbIqJ069pILNkHEUI+w/odwoFLfCDWMUp4HctLNgVAuSJw8sCVvueTucapL8UFIisTnGAr 1DwParSuvgLnGFxo++ZB+jflgy473JbvVov2eJzYwFeKgJT2qORUBE8qZQkoVtOh0HqbKc q307DI+znxZI7ZEjbGwy7ebFfxqsI0qEwm7j5Ug6uOo1DV5rvk8p371Ix8fqDGCdMny7ol 15sLyEtler+R13GBqS080uNvTBGn8At8TB0GfoMjwx0YsPKQ+ciNc8Kqd19XgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7TDV5ZJKzY4t; Fri, 22 Aug 2025 05:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57M5PkT1089061; Fri, 22 Aug 2025 05:25:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M5PkVD089058; Fri, 22 Aug 2025 05:25:46 GMT (envelope-from git) Date: Fri, 22 Aug 2025 05:25:46 GMT Message-Id: <202508220525.57M5PkVD089058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 4e8ac151bca9 - stable/14 - bnxt(4): Fix typos in a comment and a kernel message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4e8ac151bca92afbca258718a689d30a87e49d31 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4e8ac151bca92afbca258718a689d30a87e49d31 commit 4e8ac151bca92afbca258718a689d30a87e49d31 Author: Gordon Bergling AuthorDate: 2025-08-17 07:04:49 +0000 Commit: Gordon Bergling CommitDate: 2025-08-22 05:24:14 +0000 bnxt(4): Fix typos in a comment and a kernel message - s/priviledged/privileged/ (cherry picked from commit 74eb496c1019f702a28b4fa757f1139fbcf44895) --- sys/dev/bnxt/bnxt_re/qplib_res.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/bnxt/bnxt_re/qplib_res.c b/sys/dev/bnxt/bnxt_re/qplib_res.c index 69661c67708c..f527af031176 100644 --- a/sys/dev/bnxt/bnxt_re/qplib_res.c +++ b/sys/dev/bnxt/bnxt_re/qplib_res.c @@ -875,7 +875,7 @@ int bnxt_qplib_alloc_dpi(struct bnxt_qplib_res *res, dpi->umdbr = umaddr; switch (type) { case BNXT_QPLIB_DPI_TYPE_KERNEL: - /* priviledged dbr was already mapped just initialize it. */ + /* privileged dbr was already mapped just initialize it. */ dpi->umdbr = dpit->ucreg.bar_base + dpit->ucreg.offset + bit_num * PAGE_SIZE; dpi->dbr = dpit->priv_db; @@ -1150,7 +1150,7 @@ int bnxt_qplib_map_db_bar(struct bnxt_qplib_res *res) } ucreg->bar_reg = ioremap(ucreg->bar_base, ucreg->len); if (!ucreg->bar_reg) { - dev_err(&res->pdev->dev, "priviledged dpi map failed!\n"); + dev_err(&res->pdev->dev, "privileged dpi map failed!\n"); return -ENOMEM; } From nobody Fri Aug 22 05:27:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7TGK0SCQz65JK4; Fri, 22 Aug 2025 05:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7TGJ5L7Sz3qtP; Fri, 22 Aug 2025 05:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2rWip8ng5DPsTgas7vkpPRqwJRmGYtUQUMjuRi9jBuE=; b=tZADV6D7UwZIAtJFr9eOLtZ/94VzaUxWX5gDmUsL+VRCnI9VLvh845PaslMWfhDUtKqVRG 2vlfFU6sjDnYbRKqHI63Relt1pBKcxP5D5EaN7zurChckfjYkdPDS8TIFYoevIpvHUjQxX O/POXMwrbdczjM2VtdKIbKrCh1yVdKTCNX4aZVhJxq3/k186BovO9cOXOuuHBFwXerL0HP Qg9QjMU8R/HVkwU6Gob3+18renXflHikVfIirrwomOg96WHe4RtqU6TtZ51JF8eoViUQSy na3sV8SGO8Oz0vXLsNRWdNTVdrtRcJgsxtNpe2WBt6Xk9wowna8JVDDTuSI3tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2rWip8ng5DPsTgas7vkpPRqwJRmGYtUQUMjuRi9jBuE=; b=SRk/7n9Y+VzpzKY0qNuSe5aJBuoziri9weZ1J1Esc57Jopee5mReLiVa7pl0I4M3shcBQU sEA9NRpcZZIYn6kBCdrz7WJzCGkUuP6n3Qv2mg1qXfXB2GkpbPPRl3sFCiskXsYRz+Dsaa Smy1VLy55RJFHBLC70zWSh6YI1n6oRYPjD2FKAzNTbUzf2qebSZj12BAJEn2YBFmC0f/mL 53552M95EIQsQFIWvaWagb6GFQIGrHRNercnGwzjTxD4FOyPxpOlZZrrPuMpqj+bOrBrMV eBOEQcy+Q84QNdnWbyoESxxOsGGTn6T+di8Edv+HzM7Sj7WXQIAJYqzSo6gyZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755840440; a=rsa-sha256; cv=none; b=FB7cV6DHLEyVTnIeXZ13fWtTfs8obJb8FtWVcf6UZ84rmqSOCTjwnxlK8uBJQ6yQ4SasKP WC9BzCQt7/Y2Q2SFlLWLobQWVtA7uPJ1S3cpk/Z/1xZEqU9s8GspfjAfolkK9FNl0SglY0 yI7EO/poaXydoLqJE5BJs1Nv57ihHh33eS0HuoPK80V7EUiFrMrF+5VF9w9t3654dCxD4p 3moN9JDqBVkdgKSm6t8GGEUGre2y2Ithv3jzdsIgGEhzUQZQINJ2ZqTT8uxAhDIn3ogLkq Rdg2SOTref1gZezh3w5cWpcC3QVj7y0xNFwDGQp8zFKR3bVkAhoD7STsYbPjfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7TGJ4pkVzXgv; Fri, 22 Aug 2025 05:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57M5RKBB089539; Fri, 22 Aug 2025 05:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M5RKlU089536; Fri, 22 Aug 2025 05:27:20 GMT (envelope-from git) Date: Fri, 22 Aug 2025 05:27:20 GMT Message-Id: <202508220527.57M5RKlU089536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a4e9f8567708 - stable/14 - arm: Fix two typos in kernel messages of pmu_fdt.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a4e9f8567708a6e67bb634b3168c7fdca560e663 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a4e9f8567708a6e67bb634b3168c7fdca560e663 commit a4e9f8567708a6e67bb634b3168c7fdca560e663 Author: Gordon Bergling AuthorDate: 2025-08-17 07:01:13 +0000 Commit: Gordon Bergling CommitDate: 2025-08-22 05:25:56 +0000 arm: Fix two typos in kernel messages of pmu_fdt.c - s/interupt/interrupt/ (cherry picked from commit 9c7a9b3ff1eebbc15ef26bbdaae4f9448450523f) --- sys/arm/arm/pmu_fdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/arm/pmu_fdt.c b/sys/arm/arm/pmu_fdt.c index bb4d7557c176..0c2138581860 100644 --- a/sys/arm/arm/pmu_fdt.c +++ b/sys/arm/arm/pmu_fdt.c @@ -153,7 +153,7 @@ pmu_parse_intr(device_t dev, struct pmu_softc *sc) if (intr_is_per_cpu(sc->irq[0].res)) { if (has_affinity) { device_printf(dev, - "Per CPU interupt have declared affinity\n"); + "Per CPU interrupt have declared affinity\n"); err = ENXIO; goto done; } @@ -180,7 +180,7 @@ pmu_parse_intr(device_t dev, struct pmu_softc *sc) if (intr_is_per_cpu(sc->irq[i].res)) { - device_printf(dev, "Unexpected per CPU interupt\n"); + device_printf(dev, "Unexpected per CPU interrupt\n"); err = ENXIO; goto done; } From nobody Fri Aug 22 05:29:31 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7TJq4dwVz65JVb; Fri, 22 Aug 2025 05:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7TJq3Y1jz3r1S; Fri, 22 Aug 2025 05:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=auxcwFYHPk4iGx5u3fVHHRaeMMqVUdweWI/DenSHiLA=; b=AfeW5brOZMdT/1AWEfjmO/LDDMEPWfm2LLhun8MH+kBwqBvtYTrdEtYlthCh3A4Xp0saXt la1d5oF/6Ohp+5ekLpcHTBSP5qxC/4teyV91zV2OqqNfiX/bPIvJ+dOk+DeZIEhdgKd38o sLbvl+vAa27Hm8Ow5Cy3EQAu7hN6QC/362K/nV32dB4jSY/WyM/i/ajJLEPaxg7iIX9yYG MrQDMEML6beGsXJMV6SfC7PoDGsVIX+cqhgmB/EKHcOW2me+3cce9EXFqYgGMnW+1bYR1S NitFk5yWEB7+/+3c+EPNlzmqHuRBJhil7tdt8tYgvNSTw+nrKxVf5vJt6/6S2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755840571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=auxcwFYHPk4iGx5u3fVHHRaeMMqVUdweWI/DenSHiLA=; b=HW4n/E+Y1eAewtbcOP+VYsPZmp74vd8e6ZJiSrx3EL9iKZTvOwbg7+u4csFgSJ3sM6cmvI 9hGcQ3oi8csrfojNK0Xc/oE9r2cKZqJWtgQ3c6aLnk1lcrLkde1qO7CKhxg6/SUkjs+Jnn fBDgjxFKzpyy57+fish/9VTM3/jz1KyAPDIov6kUkkZoNJTK3syWEfs0YL1XMbSq12Nxoj tjehPqoeuUcUH8K8K9iqzkwr8M0GzpzKwKP9QiwTVAT4WQkMuIDxtTzQiKSeIvALYA/OSl bbdo4FAgdJADnDz9v42zfEkRpUbYpHyltd+5pPd33/J8MESOpa4jJ/2fbm20OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755840571; a=rsa-sha256; cv=none; b=RHI6b7fUM1BADZmjKxE6fhNhhLqMwiETAU7c1ug+kvEZqkN7r8CVnqWDbFEVi3BDn0hLis Z2NbVhlhudmwet1VWd4Em3GuHQ+e+11KzQv4lPGa0mDU4+Sr8V3Z6Z0Jcy93V8h6ZKiwoJ viY0C8kLD0dbaT9Cl0m5V5x4zairIdKSaixT1LMmd/YScBsgf10g85N+nxduo/J9LVVb+N RmnbZ1LWJjvGS2oiBjnolUr4MtDqdi4jL5n7kuWi7jn/pLGs8ngwTIUL7hU2P6m+p2MdRR p/jkA3I1fYWkh7VK44KB539+G5OcmY0LZoMMcmgapEszMRygSMKahKr/zgwQXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7TJq2zLqzY7G; Fri, 22 Aug 2025 05:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57M5TVRh090219; Fri, 22 Aug 2025 05:29:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M5TVu0090216; Fri, 22 Aug 2025 05:29:31 GMT (envelope-from git) Date: Fri, 22 Aug 2025 05:29:31 GMT Message-Id: <202508220529.57M5TVu0090216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9418999e0afe - stable/13 - arm: Fix two typos in kernel messages of pmu_fdt.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9418999e0afe924167eeda63451051bb7485fe0c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9418999e0afe924167eeda63451051bb7485fe0c commit 9418999e0afe924167eeda63451051bb7485fe0c Author: Gordon Bergling AuthorDate: 2025-08-17 07:01:13 +0000 Commit: Gordon Bergling CommitDate: 2025-08-22 05:28:04 +0000 arm: Fix two typos in kernel messages of pmu_fdt.c - s/interupt/interrupt/ (cherry picked from commit 9c7a9b3ff1eebbc15ef26bbdaae4f9448450523f) --- sys/arm/arm/pmu_fdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/arm/pmu_fdt.c b/sys/arm/arm/pmu_fdt.c index 598fe51820d9..13ff4057c129 100644 --- a/sys/arm/arm/pmu_fdt.c +++ b/sys/arm/arm/pmu_fdt.c @@ -153,7 +153,7 @@ pmu_parse_intr(device_t dev, struct pmu_softc *sc) if (intr_is_per_cpu(sc->irq[0].res)) { if (has_affinity) { device_printf(dev, - "Per CPU interupt have declared affinity\n"); + "Per CPU interrupt have declared affinity\n"); err = ENXIO; goto done; } @@ -180,7 +180,7 @@ pmu_parse_intr(device_t dev, struct pmu_softc *sc) if (intr_is_per_cpu(sc->irq[i].res)) { - device_printf(dev, "Unexpected per CPU interupt\n"); + device_printf(dev, "Unexpected per CPU interrupt\n"); err = ENXIO; goto done; } From nobody Sat Aug 23 00:11:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCC75nVz65Rq6; Sat, 23 Aug 2025 00:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCC6Ms8z3ZdL; Sat, 23 Aug 2025 00:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7mcMOd3bmOO2cDNHdHpwP8lg0tBP9ryr/ErVf/2z+Xk=; b=Tllsu1+wCrZjWA5ge/hzzUSy5JiW4DjWxOM0syDJjr91NlIT7VgJMWfSILDgKOS6lfUlAM PjtnJKZUSnSTH1wMi8h/KDG97/v33IUwxxstCISXYfFfKtvGinp0VpUes3FCBL0jTDeQiO FSu7S5xYNVzijltfgyGsh0Wbjc781UEm4XPzIRURxoJGjw+U1bAn2Wp2UAFYRfQM6feGKn Cb0heCuRU1oYkS3uiXnA5BqJd30wmBrz3ucqfEO7cccFKnL7QqlDnih+zZJiXzupbk+66T Y6h4RzJ6TWjPX2ooyOLE9FrRHdpVHS8oPaM8uWmC+5WxPJpWkIeBGVgd3lLikw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7mcMOd3bmOO2cDNHdHpwP8lg0tBP9ryr/ErVf/2z+Xk=; b=yp53bco2KRe3JBqgyZ+Q/JKk2GQve7vo8d0rW0GjR5oWxIaZEJmSqE2bnLp+bzJyqQHZdp 7em6EZ1qAkvS5u4LwJiI71pnKRai2RHpkviHjMcgs7ImO03q1cw3/XCLwWrjA80Lk8xQXT 4U9Pff7V7PAqTOGXxDJOCeOARxaFl1LQHJMse2oIQITB1/kYi3jAGKtuuce1X8P33w95Xz EW3v0zrJTPx1mNQ2TdL+eLeg8Z/FtXt0M4obJq72j0zAKooLsBXxC+FvG4Msd4wHums2ob qC0T7egfhOcnRWNYzVoOy2TUmuoyquuvLd5UFzqEN3P6vKFazEX22nL7oX0RlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907879; a=rsa-sha256; cv=none; b=D8cJylicHv/IISxaFF+N2aH0i3VUbojTFKYP40cxL7dtsqifD1ozAxeJxDRQa9LuO5RTSN t4VBk6JGsd+pq8y8LinAE1lUhAKmInBVCbaVfJba0BDSZoIcW6qggf6jvk9XvZd57eWUlv +F6n2FweUM8XbIK8bTBFnIaP6opMSe/0Fljbu/MbP0Lwn3WPwsKI6uBU2NwCtcugyAaMeI Xo7Irbkjrg3rneoVETnGG99lG7PYj3oelx7XpwrA7qX7hLCPhRfugeHKJ0gLPJlV6+dOm3 QgaMXNJCbxrsOCXbywWlMz0Je9uurYkiUCt/oBzM3+jU0hNKUfCALoFHmsgVIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCC5yV4z174R; Sat, 23 Aug 2025 00:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BJp5097016; Sat, 23 Aug 2025 00:11:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BJZZ097013; Sat, 23 Aug 2025 00:11:19 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:19 GMT Message-Id: <202508230011.57N0BJZZ097013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 7b4ef8bcaf8c - stable/14 - syslogd.8: Remove incorrect .Aq List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b4ef8bcaf8c38c056b83a690ea214a4c0c028c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7b4ef8bcaf8c38c056b83a690ea214a4c0c028c6 commit 7b4ef8bcaf8c38c056b83a690ea214a4c0c028c6 Author: Lexi Winter AuthorDate: 2025-08-15 02:24:23 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 21:44:42 +0000 syslogd.8: Remove incorrect .Aq Using .Aq is wrong here, because the protocol says the prefix must use ASCII <>. MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51880 (cherry picked from commit c75550e499971549b31d514ab139b80297c14792) --- usr.sbin/syslogd/syslogd.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8 index 8e595245c594..6f0224759310 100644 --- a/usr.sbin/syslogd/syslogd.8 +++ b/usr.sbin/syslogd/syslogd.8 @@ -398,7 +398,7 @@ The message can contain a priority code, which should be a preceding decimal number in angle braces, for example, -.Sq Aq 5 . +.Sq <5> . This priority code should map into the priorities defined in the include file .In sys/syslog.h . From nobody Sat Aug 23 00:11:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCF20q0z65Rq7; Sat, 23 Aug 2025 00:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCF0FM6z3Zm8; Sat, 23 Aug 2025 00:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AVxyAIYqQheSAflRnYZSpLTI3xa0mmuS+jVXcnYGxoA=; b=GxknCthVgE9FZAoM7WATR/1HhX9QhhVlAuBA4mSveaLwqpfM46aaUa6T5BJG3QtrC3qElo cdRCEEC5MZL9YuWE5mYk7CkUpHpHUAsXtq11x/E3Wc6DpOFMU5HxOdbWdRQHifsuum3UV5 CM2Ol2e5sqc9UlB1xSkW6hDQbnVDlC8JAMNdrp2VWg5EaY5SHxjeESsETV089GMSbw26X3 k2O+TtFw7B1HkUhh21/2SnmSmBGWrn0mcwLWILERClup3ZC6B6yL1CESsMMA1VArUpZRFw XV7hQrblYsPlxdd3O5qpvveOaeRx0nmDfmEVGPirAuATYk2YpZrh8rtFoW9HWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AVxyAIYqQheSAflRnYZSpLTI3xa0mmuS+jVXcnYGxoA=; b=CDdn03gMzxTp5C5TQbQnB1UT4T6O7rRPN/NV50YqG8YfsoY3ervomiv3E8b0hMi6ZZ8CIn XKs9KpBRxaISuiL6ynd7QtPyquczoN9gNvXrCmfae6XNvcJCuDvYb79ZxbnhKWA8ZoyNAJ uIVHJWJg3zwrOz/BXl3pDr34JJJ3S8tzcJkVWA8orjpjZDxhkISLbW2ns6oPr20nEGNQa7 Ppm5ABbHIKh6R1U2eP48zsf7sUOH/hLM5FKxpIIzKzCB97gVCny5TlVXGbwfzutvmFcCdH 1NbuAGh9ZwdWbfHy1PAPPQ2uAKSmA9xJdw+8I3o48K5YHTuR6Xi+fjFWvSjTTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907881; a=rsa-sha256; cv=none; b=cmnRvCaZe1H3Dmf4cQeYGSSNh37uY6vcnPLPHq/ZY5uR/47XoKnx1ym9z4Y4YplYe/IOdq yD+uGGC/ZYTmbc+Bo5aq9wJaqanSn2E/M/6POFupKFiPkbvisXRPREO0JtSrBL/RogeZvo 6sMU8FYoTiiZ4XXx89A4UxbPeZr41EnpQtiGMygn78d9wrYgQIECenaTeAmyJ+AG9wK2UW a4BQ95fYVtG5BKQT8GkBLtJ2gbNcJSTpNDet5Kzs8QrfOdpxLPOWMtfv4Q4wZDvE9Tfz5E tqcObmQEoROBIWUPN+TmFZAK64Ge2719KnVjZQ3hJplL33bSS43uhA7PsmBYOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCD6x7mz174T; Sat, 23 Aug 2025 00:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BKRP097052; Sat, 23 Aug 2025 00:11:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BK8o097049; Sat, 23 Aug 2025 00:11:20 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:20 GMT Message-Id: <202508230011.57N0BK8o097049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: d0fe99e288dc - stable/14 - tests/sys/net: if_bridge_test does not require python List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0fe99e288dceed9c4d87e6ca837a8079b128df3 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=d0fe99e288dceed9c4d87e6ca837a8079b128df3 commit d0fe99e288dceed9c4d87e6ca837a8079b128df3 Author: Lexi Winter AuthorDate: 2025-08-10 15:27:08 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 21:46:16 +0000 tests/sys/net: if_bridge_test does not require python This was originally added for if_bridge_test:span which uses scapy, but that requirement is now annotated in the test itself. Remove the requirement so the remaining bridge tests can run without Python installed. (cherry picked from commit bc9867173f6af243929129b7050af6c64966c7d6) --- tests/sys/net/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile index 95ab86156a0a..a29a8207ee33 100644 --- a/tests/sys/net/Makefile +++ b/tests/sys/net/Makefile @@ -6,7 +6,6 @@ BINDIR= ${TESTSDIR} ATF_TESTS_C+= if_epair ATF_TESTS_SH+= if_epair_test ATF_TESTS_SH+= if_bridge_test -TEST_METADATA.if_bridge_test+= required_programs="python" ATF_TESTS_SH+= if_clone_test ATF_TESTS_SH+= if_gif ATF_TESTS_SH+= if_lagg_test From nobody Sat Aug 23 00:11:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCG3H95z65RbX; Sat, 23 Aug 2025 00:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCG0t62z3ZdN; Sat, 23 Aug 2025 00:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kNVXOhW5dMYaNIwLmuto9FxmWBahI8GA0TJZ9dL3oj4=; b=HPnOnTYJmkyXWVM/J5ZK5hn3i+eiqZy4u+1+vtlJjHYLJu/ZFtD5wo6MKXP5+3uotIj9FC m00jJ1Q83PQnmMUdssqbAeFECBYhS9dqfgYwI5cVpzXwiDVePI5NgO6arF5D669OwouDkr 8K0zz5P/9lh7TKxYTLme9je1U3ptbM48Q3l6b5J1X/BHsf1XG/SUE7/jmLKW0kovTLDOXj 2UZL7YMpV4D3bdUB0UMELGkrTg7hCsXtfsChoiwlkCSuBJ6Ex2Ms3TeS57ED1DDZ7gXdIY G/cTzrnJR27j48W4Eo6xYdBuzeIVmeiF73o2J1sIJ66LF8O86iTutYD5yqXiJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kNVXOhW5dMYaNIwLmuto9FxmWBahI8GA0TJZ9dL3oj4=; b=Ynf9yt22I/rI189BuY/oGseHklYOapBLbKl7NdCN1fmEviQQMd3G5Bb2F4GjuBa0tzcfbA WmiiCluuO2et1cTCgjeVqBiRkPg2b7PJ+hGSAWaEolqenD0BZTpe5e1xFiIIUfvepKXz+a Bie5Hkm7cHNDzB1bbsa89J/pvOnBM1l+pPHPCYN4qt8u8cxoFDCci1xxorCSIUS9aObvR/ Ss6EX+qp3gzDp5i6q3iBWVf//0TUtiak9FLupBCUNGPi1kYNFtUAEIdx+yBaDL/rcW5zpC nRHji4fqS8qW8zsHpOotinx6Crf1AhFvRyV73qJhQmxGA1e1xcVsJ/xPrjn1RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907882; a=rsa-sha256; cv=none; b=Cb/X8Ccyd7i1nWu8IDjVY9NIEcCc0hJqz/s7zFCzbRKojnAuKvVphj2VNnw9G49Uewl1G7 l2jvSQQ51MZ8n9hu7YcdnzQDluGm3MeWqAuIXzGRqWyeU/Y9rIiUHgktjh9emWzIMfgZqE QgsvxJAwSkw3Mu4mFl6wwzynTxQamTnFyuWjwyzz5TZXhDO38NhNS6M0N2wE4rCmvzoPED tNLC/Qn4GqTE5uK9XfFXplbv5KUy8VAprG5Tc007oVlXWB8I5mCSA8ZyXlyk72T7HdyZyK v1bR8xOMgAvnWwcPhiw0F89FKiswtSJ+Bmrl1F6PbXa+LeWpl2sn/ylZ2SD4iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCG0LmXz17Ms; Sat, 23 Aug 2025 00:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BL2G098288; Sat, 23 Aug 2025 00:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BLh5098274; Sat, 23 Aug 2025 00:11:21 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:21 GMT Message-Id: <202508230011.57N0BLh5098274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 1eb29a37f26b - stable/14 - rc.conf: Use user.localbase to determine _localbase List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1eb29a37f26b1a3671f38037dd61975e1b1105cf Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1eb29a37f26b1a3671f38037dd61975e1b1105cf commit 1eb29a37f26b1a3671f38037dd61975e1b1105cf Author: Lexi Winter AuthorDate: 2025-08-10 12:24:03 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 21:47:24 +0000 rc.conf: Use user.localbase to determine _localbase When running an rc.d script outside of boot, ${_localbase} isn't set, and rc.conf hardcodes the default value to /usr/local. Instead, try to get the localbase from the user.localbase sysctl, and only fall back to /usr/local if we can't for some reason. This fixes e.g. /etc/rc.d/ldconfig when localbase has a non-default value. Reviewed by: imp, des Differential Revision: https://reviews.freebsd.org/D51852 (cherry picked from commit 5467020a540d92a39dcabc149a264f3c0d0c084c) --- libexec/rc/rc.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index b3c54c3cb0f0..a8a8ae01b488 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -21,6 +21,7 @@ ############################################################## # Set default value of _localbase if not previously set +: ${_localbase:="$(/sbin/sysctl -n user.localbase 2> /dev/null)"} : ${_localbase:="/usr/local"} # rc_debug can't be set here without interferring with rc.subr's setting it From nobody Sat Aug 23 00:11:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCH3NSRz65Rdb; Sat, 23 Aug 2025 00:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCH1hd2z3ZmH; Sat, 23 Aug 2025 00:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mwABlM09PqVbGaqgsngyHfXwhofEGrAX2rKj5CYQWLc=; b=NnulDcpoQH3q8PfiJf+ly4ZS2EHfmICnPm5mSxToHombhD22XeyVDSLSuFk9YwAMTtKmsa IS803uskKDHz52YowneJUtyvKV8mnQNJsOkYcdP8DuiBMrXlzbaGPOu3NXja14YqXfx4NV 8TmQj0ebx9Mn53DkiYt5vAqIeucuCMKT7FU09GmLJWY/DlI3rLqhCf5TVwKjr1mBEbHo2B Ut4+oZcFFEYHNZ2ptXeElEYEG3b0F0Mn5+KNAUPhdMV/B7HevI9Z7Kxc9CVjMER7/woEXG DrhD76mH58Yn+/MVKHxTKWQd4pfjXXELVtuWfY6iJcpkOyNMuFd2BRrFwS+jNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mwABlM09PqVbGaqgsngyHfXwhofEGrAX2rKj5CYQWLc=; b=QuB359pEYEeHRE7a0q/iTY6hMk5TGb+7cbeqCV4YXYbskcUhZoa3FGDG4LD3hxGF44LhDo VLy+/1b+vYi3iFT7Vavy9S5nsD5OsZQPSFXji9Y1FGCiXUDgpmAnZ1J6LrYNhuExlmodW+ MrwDl3fwTmy46zNpPMDwjOC4dy+SUkP8qjCP8auBFEW2GJ0ya39FbQKu96afz7GO1G/Mhy 8X/hBBfzehVJF6gqOCTqgEG8alwpS7P90nBDDb9ueSdjeFlyIxEdYhrl4IsoBBXcQYApGp 2FAR4wCYTPNx5GIf5guboNkrX9JvxUw6JypDRrNx+WJycroLZ+7asIWbqCEclA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907883; a=rsa-sha256; cv=none; b=Vq0sepawmR9/OS9yDKCKrvoVxQJ++l4J0g6aE1g5HOS33g8wk9aaCTdsJ93lSXU09OH72u bBURnpZ8OFk8hUnsUIeH47C8oObL3B3Fc4xhN4FUupWitXA6JxIK5qzsD2zVmc/DuIUh9s CSqlY7xbfbA4R5S4rUGP8eNGGdLLyhMhDUgNh9oKdIPdARIkKiIWjJyWpelHIjY+hrVnR9 tgI3FO9W+fH0tcqARYu46hEVvnrTdESmF+cCazWaXXsqsJEoj1NEwNjSuOtgJXdkO0j1vf XvYpW3r7nnxQnL1/owCfKqUgqVJRDn5HNq12eLgUAF8pXBiWf/kotZZVJH1wZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCH1G0Fz174V; Sat, 23 Aug 2025 00:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BNNv099626; Sat, 23 Aug 2025 00:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BNQb099602; Sat, 23 Aug 2025 00:11:23 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:23 GMT Message-Id: <202508230011.57N0BNQb099602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 5c4e9a10334b - stable/14 - share/misc: Move init.ee to the correct package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d commit 5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d Author: Lexi Winter AuthorDate: 2025-08-07 11:44:38 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 22:12:19 +0000 share/misc: Move init.ee to the correct package Also, only install it if MK_EE is enabled. Reviewed by: manu (previous version) Differential Revision: https://reviews.freebsd.org/D51787 (cherry picked from commit 3958a0eb7efdea1e76137a0b8da55af7af4d4738) --- share/misc/Makefile | 10 +++++++++- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/share/misc/Makefile b/share/misc/Makefile index dc0d5f619240..5f43b616f2f2 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -4,8 +4,9 @@ .PATH: ${.CURDIR}/../../sys/dev/usb +FILESGROUPS= FILES FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ - committers-src.dot flowers init.ee \ + committers-src.dot flowers \ iso3166 iso639 latin1 mdoc.template operator pci_vendors \ scsi_modes usb_vendors \ organization.dot @@ -17,4 +18,11 @@ FILES+= usb_hid_usages FILES+= usbdevs .endif +.if ${MK_EE} != "no" +FILESGROUPS+= EE +EE= init.ee +EEDIR= ${FILESDIR} +EEPACKAGE= ee +.endif + .include diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 3e78ca88d75e..5ee0f64e4129 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1649,6 +1649,7 @@ OLD_FILES+=usr/bin/ree OLD_FILES+=usr/share/man/man1/edit.1.gz OLD_FILES+=usr/share/man/man1/ee.1.gz OLD_FILES+=usr/share/man/man1/ree.1.gz +OLD_FILES+=usr/share/misc/init.ee OLD_FILES+=usr/share/nls/C/ee.cat OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat From nobody Sat Aug 23 00:11:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCJ73t7z65Rdf; Sat, 23 Aug 2025 00:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCJ2pLxz3ZmX; Sat, 23 Aug 2025 00:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZ9Tdy6al0yMLMSGzuIYijJclAmQXmnOt7nr18UqlLo=; b=TvwRyTH4wPCO05h8pk3lJ2Ayd6TvSvRhDZYsKZA/pMGjRYdE8J8Es0Jp/DhMUfPinZhtZS 7DlnZ6Rk3yn07TKICpdeA7S0RrYMd/YRVL+DWCzFA4975D/r4VKbT/pLeTwhFFkIayQP6b huVnPOwg87OKygCTZ+W5PasgsTXIYtZy5kc6McbtQyJeQ8tvQRp8D9ylFAlqWrGd9anGmj r3g8okw037OJaX2MHQ3DzULQDii2lKeVPsyUmk+zgaH36XuOPdOFDihPMBqiGjNzfXUmW0 uoRC4jzsGsSIYPuyVE7XdSzJNl7EAJtOwc7k0Q8q0b5mAHGzxPu4sy4200hMwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZ9Tdy6al0yMLMSGzuIYijJclAmQXmnOt7nr18UqlLo=; b=f6YDPnuayyXh6ZlGanFZcFH4iXblwuzzzj/E43ucSGlAW1NDGOQq22YxiurGMHK3dIl2+n 2p4Hc2tPCs4kBBg8qq9FvA2+4TiXyNNDHg50uIH9k0KDyuzUxkOo0dGRNV+IphT/tVHhAY IKA6/2Ox+YrpY65jpbYL0XaUnfaBkvaZmE8kC7b9noEpdS5Qlwi5fXDqsWaYIAdzsPWrgC pumuuVw/EJyEwDzlmmeH4nH3gVY1y1gFg9SDTkrEHhlDMZfeNNzy4UDXpe98U2x7K+C9Cd MBT+3rD+27avGvV1+MZIWmkXJ+p8bwep+XcYNV105OkeyTP1Eb6x+YfxUWIXkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907884; a=rsa-sha256; cv=none; b=S8/JBu76uj3hvJrx5hooL9QCOVruhiC0QU0P21AbBrwBo39T7XIyAnpM83m6XcyNYy2i5t WfmQf/Qb6r3rkZhhJ8K9HOkvoo8JX3bELN5v9u7iGBl+ULt37kTbfXQ/ynZxFQ1TvwtC7D uuZERI00gvB2CaG/SXf7cM5FY2ea9Lgx7X560mH3y0Au9VEQn7wiNtXzWnTVoRDsfyoi+I xXen72b+ChmvTCKx2qkIHy7jo9nQU8gQh+D3Z/1fblyltfNg3qo5e7mGtGjB4yxbbGeg2c PZdCmqlxzgPfG6zgADhkE7f3lYjPfRzPJRvGY/VMT1VeERejdJhYvVA0jiUhmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCJ2Bbyz17PS; Sat, 23 Aug 2025 00:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BOeG099791; Sat, 23 Aug 2025 00:11:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BOnt099788; Sat, 23 Aug 2025 00:11:24 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:24 GMT Message-Id: <202508230011.57N0BOnt099788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 394f7ebf10bd - stable/14 - share/mk: Use :ts,:[*] to stringify TAG_ARGS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 394f7ebf10bdb398d31f9115dd26b2d900fe1f6d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=394f7ebf10bdb398d31f9115dd26b2d900fe1f6d commit 394f7ebf10bdb398d31f9115dd26b2d900fe1f6d Author: Lexi Winter AuthorDate: 2025-08-07 11:44:01 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 22:12:43 +0000 share/mk: Use :ts,:[*] to stringify TAG_ARGS This avoids a situation where we sometimes prepend an empty tag, leading to arguments like "-T ,package=foo". Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D51785 (cherry picked from commit 399faa7d3ae8938d73d58c9224123a71a2096947) --- share/mk/bsd.confs.mk | 2 +- share/mk/bsd.dirs.mk | 2 +- share/mk/bsd.doc.mk | 2 +- share/mk/bsd.incs.mk | 2 +- share/mk/bsd.lib.mk | 2 +- share/mk/bsd.links.mk | 2 +- share/mk/bsd.prog.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index c4fb62782b75..6b67273aa1ea 100644 --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -49,7 +49,7 @@ ${group}TAGS+= package=${PACKAGE:Uutilities} . endif . endif ${group}TAGS+= config -${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} +${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]} . endif diff --git a/share/mk/bsd.dirs.mk b/share/mk/bsd.dirs.mk index 8e090d3f2cbd..6a7f2ed83f64 100644 --- a/share/mk/bsd.dirs.mk +++ b/share/mk/bsd.dirs.mk @@ -22,7 +22,7 @@ ${dir}_FLAG= -f ${${dir}_FLAGS} . if !defined(${dir}TAGS) || ! ${${dir}TAGS:Mpackage=*} ${dir}TAGS+= package=${${dir}PACKAGE:Uutilities} . endif -${dir}TAG_ARGS= -T ${${dir}TAGS:[*]:S/ /,/g} +${dir}TAG_ARGS= -T ${${dir}TAGS:ts,:[*]} . endif installdirs: installdirs-${dir} diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index 59025a1cee05..9633b89f95c2 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -84,7 +84,7 @@ TRFLAGS+= -t .if !defined(TAGS) || ! ${TAGS:Mpackage=*} TAGS+= package=${PACKAGE:Uutilities} .endif -TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} +TAG_ARGS= -T ${TAGS:ts,:[*]} .endif DCOMPRESS_EXT?= ${COMPRESS_EXT} diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk index df4cf4641141..848ee0aa2ea9 100644 --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -37,7 +37,7 @@ ${group}TAGS+= package=${${group}PACKAGE:Uutilities},dev ${group}TAGS+= package=${PACKAGE:Uutilities},dev .endif .endif -${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} +${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]} .endif _${group}INCS= diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index c9f92cc57000..d6a7786e17fd 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -74,7 +74,7 @@ TAGS+= lib${_libcompat} .if !defined(TAGS) || ! ${TAGS:Mpackage=*} TAGS+= package=${PACKAGE:Uutilities} .endif -TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} +TAG_ARGS= -T ${TAGS:ts,:[*]} .endif # ELF hardening knobs diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk index 437ffd0d3b34..509520a24a3a 100644 --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -7,7 +7,7 @@ .if !defined(TAGS) || ! ${TAGS:Mpackage=*} TAGS+= package=${PACKAGE} .endif -TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} +TAG_ARGS= -T ${TAGS:ts,:[*]} .endif afterinstall: _installlinks diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 3895ff67a787..0d3bac406e23 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -121,7 +121,7 @@ STRIP?= -s .if !defined(TAGS) || ! ${TAGS:Mpackage=*} TAGS+= package=${PACKAGE:Uutilities} .endif -TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} +TAG_ARGS= -T ${TAGS:ts,:[*]} .endif .if defined(NO_SHARED) && ${NO_SHARED:tl} != "no" From nobody Sat Aug 23 00:11:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCM1T2lz65RW5; Sat, 23 Aug 2025 00:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCL47Kfz3Zv1; Sat, 23 Aug 2025 00:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQOE39yxFRY0BjxsSuC0xNu0m356YDMVRMh9+i+Zcfk=; b=uWgbhYz67+xMAeIbgBe3MP+tUeVSCiYXhPfrmtfabwyMJ4eBPxZg622MDSGI5tsc/JC52U tTAuGloySYahcITUmHC2NngMsSxg6cCE0e14rGZ3Wn7MYf/ygLBjQbayPAOTM/DH4U3L0O czuvjDp4eZJtSWGJbxkRPzTKFaa9vSNMFLXn8KkYQSJP7VG1EDRAkya6VK8M47tvCGub5f fXAoUR8mdP45f3FKlidsbCLDJsZ/bsrBo7vlhB8GwNYuElUwLl7PHhsiWB5gdI02G652+W +YM6nk2LOI43NuklggMGJuPtIT/kHGpLY99sOqSevCJ5DKGObbpt0/6D9JY56w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQOE39yxFRY0BjxsSuC0xNu0m356YDMVRMh9+i+Zcfk=; b=FAk5xZNOvFfWLCVNuVBGpSq0OAepzklY1sLQr9A5PQEMNaA4KgT3jpvt6Oc9MOYz/vtwVj cTPiaVJxVli+WKUaM8E1pQoEBWDrzMShPNRWChHSL9H9b6F9fmZ5MVpmhvHgEu5KVBtK1v tgGqpvHO2c1MaMlbb12oPk5/zRtlamg7REZ4vzE3iUnPb1Sj2MBTc/W2jt4cUY62rGMOTD F1qompa4gXn2jYvmVG6sMUMhQHKeAgH9MLtL3iIVYU7TYVeze8J6RvUKfCKen4QYoRs5u6 OFgF3r8fMr2Cx0lUa1LWT8vatU2/SMAAr+Tthqh0Dec1ChAUd8xwo44xKhFdoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907886; a=rsa-sha256; cv=none; b=hXLPw59Wm//f8mPRwzYt8+2av7i8pShwZyi0XTUtoVOLpH370MOE9evPeU4ljb7tNyfJDi ZuOCIPC1cI8qsfQWxYwAIp1SOsFcbGUp1pQjYQIRHp1GSw/tnruSdHXdL2FrR0gVqpRIAq M9hbvFy21MuxN1IOz6CbpwlwJuXzHKM+IXJpuYUsvIKYv6FZTpX8hkCyGTzJdK2mSBg4eF a+u4vS0SJ+76XB6zOGyQI7OeTbBRP4u76HPE7IlTI+wgLgB9SEr8ZF9odULNqYVfz7Kmxs 1pcmWwC4Za1/Mbed08F8XPXp4FgtR/d8A4oXmezW9OkxhF0uVMxPg/a/hLU3eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCL3S2hz17Mx; Sat, 23 Aug 2025 00:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BQGD099858; Sat, 23 Aug 2025 00:11:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BQ34099855; Sat, 23 Aug 2025 00:11:26 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:26 GMT Message-Id: <202508230011.57N0BQ34099855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 99f2177b0905 - stable/14 - ifconfig: Support variable-argument commands List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99f2177b0905b9567ee35fd060b0db931e87b542 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=99f2177b0905b9567ee35fd060b0db931e87b542 commit 99f2177b0905b9567ee35fd060b0db931e87b542 Author: Lexi Winter AuthorDate: 2025-07-31 15:54:53 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 ifconfig: Support variable-argument commands Add a new type of command, DEF_CMD_VARG, which takes an (argc, argv) pair instead of a fixed number of arguments. This allows commands to do their own argument parsing and accept a variable number of arguments. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D51243 (cherry picked from commit 7d4a177efc653bc60a496ba0adf5cb4e0560fa07) --- sbin/ifconfig/ifconfig.c | 7 +++++++ sbin/ifconfig/ifconfig.h | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index c1e3e0af83c2..9d7a40b9049a 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1218,6 +1218,13 @@ top: argc -= 2, argv += 2; } else if (p->c_parameter == SPARAM && p->c_u.c_func3) { p->c_u.c_func3(ctx, *argv, p->c_sparameter); + } else if (p->c_parameter == ARGVECTOR && p->c_u.c_funcv) { + int argsdone; + + argsdone = p->c_u.c_funcv(ctx, argc - 1, + (const char *const *)argv + 1); + argc -= argsdone; + argv += argsdone; } else if (p->c_u.c_func) p->c_u.c_func(ctx, *argv, p->c_parameter); argc--, argv++; diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 0ae317aca409..be333d0ae02f 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -66,6 +66,7 @@ typedef struct ifconfig_context if_ctx; typedef void c_func(if_ctx *ctx, const char *cmd, int arg); typedef void c_func2(if_ctx *ctx, const char *arg1, const char *arg2); typedef void c_func3(if_ctx *ctx, const char *cmd, const char *arg); +typedef int c_funcv(if_ctx *ctx, int argc, const char *const *argv); struct cmd { const char *c_name; @@ -74,11 +75,13 @@ struct cmd { #define NEXTARG2 0xfffffe /* has 2 following args */ #define OPTARG 0xfffffd /* has optional following arg */ #define SPARAM 0xfffffc /* parameter is string c_sparameter */ +#define ARGVECTOR 0xfffffb /* takes argument vector */ const char *c_sparameter; union { c_func *c_func; c_func2 *c_func2; c_func3 *c_func3; + c_funcv *c_funcv; } c_u; int c_iscloneop; struct cmd *c_next; @@ -120,6 +123,13 @@ void callback_register(callback_func *, void *); .c_iscloneop = 0, \ .c_next = NULL, \ } +#define DEF_CMD_VARG(name, func) { \ + .c_name = (name), \ + .c_parameter = ARGVECTOR, \ + .c_u = { .c_funcv = (func) }, \ + .c_iscloneop = 0, \ + .c_next = NULL, \ +} #define DEF_CMD_SARG(name, sparam, func) { \ .c_name = (name), \ .c_parameter = SPARAM, \ From nobody Sat Aug 23 00:11:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCK4Vrwz65Rmj; Sat, 23 Aug 2025 00:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCK3Kgnz3ZkM; Sat, 23 Aug 2025 00:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SThkL2utKgmLx82bkiN7uWQoykWWX+8Ddx5hLeiSSes=; b=PtbPQC0tG5EQ7yVBvc3WqYotG+gpUuXtNuZT1veuW8NgXZ/e4XX3BBjxTml1KxX2Q2zl79 jl/Npetz+PCdb4Uvvo9I0Sog6dFIdZ1JKMYIpf3X5kHPTDD94yRhnn3jdubhHp0mVd2rp4 JnT55kSpQJZ5x4WqKRp7TkUBggT2rmFsbSAukYUpiF2BduFL8VvVtjMG/1i3s4vsNa1gxx YAsCnnDU7I059qijkcYfUzj2+lGmeHL5aYsP7vz4JAPtIEr9eKNxKS5/0t+7gFyvXBB2ZY jr7M3UfXT975tXbGj3Gfvyens3ey07lqqtDzRT81fxalz6x93ea0ePWnkFJvFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SThkL2utKgmLx82bkiN7uWQoykWWX+8Ddx5hLeiSSes=; b=bK5bKZJLxilPkUF1+aFBTDp3HXx9hQg0F2WgL57NhfUvLlNG0nX7irNR1opno43RDBdcYp nD5B5ZDyyzK47jRMOEefC+6V03FGC90RN/UfVoD02kvNEf984ZDbJuR4AR1LPmZa+dRNyO Vt217x5WTYbdh85LLOnKsuV3l1UeRxmmB+kIQiT/WF9lCuA7euASeX+RUmOgGtHIn6/6B+ Xz82qkEcgR5+haN+Fq28VW8B9uCCpDfU+Ciy838Iovl3BPC8TJslhM9Lk2PMklDEm1rBLA QbXFWBx7njm9SlelLvsNazz05iokfg1Cfl9M3fpkJhRsT/vP3lqSXg00c5MlbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907885; a=rsa-sha256; cv=none; b=GBxmOyW1vBQedDmVsu+UOXmsie/qNW++khZUugpeFfVghz9KQv+TdtXG1LShueeaKUHlO/ IBWO23+yGmFryau0enrL/QSyFQeTrLiHcuRVtOTEt/PMw8Q5n856DoenXZt2Zb99M2s00N U+jGdeajew/ivUwpJ/3J5mfB5PCZl+4y0DIo3AB4qq5Su1hh4PmD+0hEuqREQrNuh1dn1I GmBR6nMfJXi/8TF3H4QzAC8kCXI/Mdb60m/9ghCBVHNCd/Wv/JHEBUmgjMII1PKNXkccYu UvsRSIOV5spVYAvV79Da8pYkk0uV6lUO0Zj97+8dD8aH7vAI4OcUT+A07ikvkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCK2rBJz16tC; Sat, 23 Aug 2025 00:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BPom099825; Sat, 23 Aug 2025 00:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BPef099822; Sat, 23 Aug 2025 00:11:25 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:25 GMT Message-Id: <202508230011.57N0BPef099822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 4f295cd38b0a - stable/14 - bsd.files.mk: Fix FILESPACKAGE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f295cd38b0a59d56bfdebb10346e2e91ebf7c19 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=4f295cd38b0a59d56bfdebb10346e2e91ebf7c19 commit 4f295cd38b0a59d56bfdebb10346e2e91ebf7c19 Author: Lexi Winter AuthorDate: 2025-08-07 11:43:25 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:12 +0000 bsd.files.mk: Fix FILESPACKAGE Because TAGS may already have a package tag, assigning TAGS to FILESTAGS causes the value of FILESPACKAGE to be ignored. Only assign tags other than package, and take the default package from ${PACKAGE}, which matches the behaviour of bsd.confs.mk and bsd.man.mk. This fixes several files that were wrongly installed in utilities, including /usr/share/examples/sendmail/mailer.conf and some files in /usr/share/nls. The fix trips a bug in share/syscons where Makefile.inc was setting FILESPACKAGE to the wrong package, but the problem was hidden because the subdirectories set PACKAGE explicitly. Fix this by setting the correct FILESPACKAGE in Makefile.inc and removing the PACKAGEs. In stable/14, this creates a new FreeBSD-examples package, so add an entry to Makefile.packages. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D51784 (cherry picked from commit 1e629ebb15db9ee0cb11a3654d7bcd3046a0df54) --- release/packages/Makefile.package | 2 ++ share/mk/bsd.files.mk | 6 +++--- share/syscons/Makefile.inc | 3 +-- share/syscons/fonts/Makefile | 3 --- share/syscons/keymaps/Makefile | 3 --- share/syscons/scrnmaps/Makefile | 3 --- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 0f7cec0fb5a1..b1b735c61c84 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -61,6 +61,8 @@ efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities elftoolchain_COMMENT= ElfToolchain programs and libraries elftoolchain_DESC= ElfToolchain programs and libraries +examples_COMMENT= Examples in /usr/share/examples +examples_DESC= Examples in /usr/share/examples fetch_COMMENT= Fetch Utility fetch_DESC= Fetch Utility ftp_COMMENT= FTP Utilities diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index a330a8dddbbd..c074362ae7f4 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -39,14 +39,14 @@ STAGE_SETS+= ${group:C,[/*],_,g} .if ${group} == "FILES" FILESPACKAGE?= ${PACKAGE:Uutilities} -FILESTAGS+= ${TAGS} +FILESTAGS+= ${TAGS:Npackage=*} .endif .if defined(NO_ROOT) .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*} -${group}TAGS+= package=${${group}PACKAGE:Uutilities} +${group}TAGS+= package=${${group}PACKAGE:U${PACKAGE:Uutilities}} .endif -${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} +${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]} .endif diff --git a/share/syscons/Makefile.inc b/share/syscons/Makefile.inc index 0b22547cec2f..d4635b273f40 100644 --- a/share/syscons/Makefile.inc +++ b/share/syscons/Makefile.inc @@ -1,2 +1 @@ - -FILESPACKAGE= syscons +FILESPACKAGE= syscons-data diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index 8dfd012c9103..ba3341da87e3 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -1,6 +1,3 @@ - -PACKAGE= syscons-data - FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \ cp437-thin-8x8.fnt cp437-thin-8x16.fnt \ diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index a8aaa08c47d3..bf0099288a19 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -1,6 +1,3 @@ - -PACKAGE= syscons-data - FILES= INDEX.keymaps \ be.iso.kbd be.iso.acc.kbd \ bg.bds.ctrlcaps.kbd bg.phonetic.ctrlcaps.kbd \ diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile index b7e94fd16293..ffbd6be3df4d 100644 --- a/share/syscons/scrnmaps/Makefile +++ b/share/syscons/scrnmaps/Makefile @@ -1,6 +1,3 @@ - -PACKAGE= syscons-data - SCRMAPS = armscii8-2haik8.scm \ iso-8859-1_to_cp437.scm iso-8859-4_for_vga9.scm \ iso-8859-7_to_cp437.scm \ From nobody Sat Aug 23 00:11:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCN0VXwz65RXj; Sat, 23 Aug 2025 00:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCM4Tbmz3ZvL; Sat, 23 Aug 2025 00:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=De5t2xTkzCzvTOuSdCVVLjMEXH/R6721s6M0YNBps7U=; b=OxQv7hXfE2+n7JHmAUi8oA0qFvR6IewG+Zbo4Z0eGpHINNGdl5kllwCbFGjIr2kBqRbufc +1+dUEEcn1l6BEMTeo+gZ9pYp/cn6tjxfCm4WSDDsWxgxdg4IUcnDUg9aavzRZcUOmTlfn h7gNO6JwBFsDj6L9X2Z87qtIq9wkyY4hTX1IFycisylX9rY9VJHxzA0O3FaN1lvyDgLP5O GROgfg15qK4zkZ4hv0/2edGGmKj/6guoIFiTS19vRJqCNS904Qdjcd48nU+uRTTCKZO468 h18RLR7qScXo27qZQxEyxvDJ1IufcTDYd6kgLRemMR6SMq5tCpfhIz8P5D+kUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=De5t2xTkzCzvTOuSdCVVLjMEXH/R6721s6M0YNBps7U=; b=PpL1tyawX0BshQGeKoXYPU70QccjXQ+rugTAGZC5hBzmO1OQ25PmuQBeaMdEp08mSdy1+8 FRt6AWGZuPbao853NOGEVsb2TmMP+La06UcSR74eFV0fygFDRayetM6hx/MPvMqF0k+buL hKa6klWA0LJ8AA+TirWGHqqkeLt1ALhmfGOc3DlArDJbAMQpaubVrMZd7PDW0VyAavzJJz P49MT07PMbR7x8pM92oeKAjLY4C17gTyoSeZTzCCJpMCMWZxSkQd6lpPEpGDlF3k7koDPT cRNRdmvU179V+rzHIb9QxWKTG95m1N78a9DQyjjqLxpVew+adt7DUFFFb5dxBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907887; a=rsa-sha256; cv=none; b=Jw1Rl3GGhIYVHKrMYSGvqyjiygbScKIDUQtbl5LFMcLhT80iQRMYSGNIbYydJsy91wGzVe aHf9z+GrT7N7bs+0h6yqI4eSmijj9qubSoHoHkIeQXpDFgl1TmzNmhMP6ANmQM4xAwTanr ZRism6oAwZ3O/AR4UrRLs0hJSWR+UmFXPTkYc9fPeM7F1kOr9uVeRnhJyxCKSTsTiPvWiF NBXhe92Xq5c90q7Q9G59J4hl6AOtDza8xiNs9f2ww3/aZbvJsJRiUUt4L7E23YGHfqbqNw /6/2UKq/stEvCkIRRY9WNOoHCBfTGBq8ERssfDySkMQ1/ugaOJIsVS1s++uXpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCM3n2Wz17FC; Sat, 23 Aug 2025 00:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BRG8099891; Sat, 23 Aug 2025 00:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BRnG099888; Sat, 23 Aug 2025 00:11:27 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:27 GMT Message-Id: <202508230011.57N0BRnG099888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 8b728c63f777 - stable/14 - ifconfig/ifbridge.c: add get_vlan_id() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b728c63f777f3b2e220fe28fbe24b74f5a7c388 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8b728c63f777f3b2e220fe28fbe24b74f5a7c388 commit 8b728c63f777f3b2e220fe28fbe24b74f5a7c388 Author: Lexi Winter AuthorDate: 2025-07-28 14:09:29 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 ifconfig/ifbridge.c: add get_vlan_id() This is like get_val() but takes an ether_vlanid_t* and ensures the value is a valid VLAN ID. This avoids redundant comparisons and casting when parsing VLAN IDs. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51548 (cherry picked from commit 287a5fdcd3c941ce73705c664b5df4932ba3bad4) --- sbin/ifconfig/ifbridge.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 2d0af1255a73..973c4f9cfe6e 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -79,6 +79,20 @@ get_val(const char *cp, u_long *valp) return (0); } +static int +get_vlan_id(const char *cp, ether_vlanid_t *valp) +{ + u_long val; + + if (get_val(cp, &val) == -1) + return (-1); + if (val < 0x1 || val > 0xffe) + return (-1); + + *valp = (ether_vlanid_t)val; + return (0); +} + static int do_cmd(if_ctx *ctx, u_long op, void *arg, size_t argsize, int set) { From nobody Sat Aug 23 00:11:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCP0TgHz65RqL; Sat, 23 Aug 2025 00:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCN4j5cz3Zqx; Sat, 23 Aug 2025 00:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=En2b4M4dD6IUQRJ6gXEqwYhb+mOfqvlMz/2MwjIu9Fk=; b=e0ICf9ALuPEWF9PW+myXiM/gtG0FsCk0PuTuWqrwDcjWYCT/6opbWy+7QiK4p0NoYTgkKr y+Zql2bUJHZuo+oOMyMr/gmhLI2E13XVM3tHdK6XNNWPGhdHmFcjLlUxocqdC6ctRWubWT yRe/kZ1N6YAkgSB9Z4w5TxpgAZQox9ytXuLvDCGOppMjzoJaljOjwzz9GWo17Er4TBPpC0 9OanbnlabqqBt9LPDgxBRrjD5okGBM4dQcPndMxjlj5RSzNo2PIwlI2c/TPGO4+UoJdWCD ycK+7ZSBTO2lkyupB84pQkb2EsKSxd0wcwrIJUwEH12aoxp4PBIwBHlF3i/RUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=En2b4M4dD6IUQRJ6gXEqwYhb+mOfqvlMz/2MwjIu9Fk=; b=f30fn4WVdQlBekWengY8jor4aL259+CsQJMcgevVMN82CS36mn5KuvB5bMiqz1BnHFyG1U 3+hwXAa2e/U3EiVpZv+i/IRttk9LcIn1Z7QEuEGjam6hOEi/h4EOAtrh+O0cNd75tT+3z1 MAeLPpFotfksNtzBQMtYcesfQ1iKrCCQrvlvAwz8m9Ua60ljKQlOvIK/VyBbDpqOQu3ntn otTdfjIrmiptTsC6OCZrysmVc2iSq+nlT3qXyh0YolPSS8Bv3n/sb44UZk828Oc2Zj7hGg QysK9/9izmWxUTFH5Gf+lTQCwYVaGLiOz1VNl3JDvumk7Y0re9U1vjRXWgpFQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907888; a=rsa-sha256; cv=none; b=Auxkp5BRYK/4C9LmUiWL4C4pt300fWkmy5u6Yf3WO0vqxlaWTuZ5w2DQiire8KzV5up3df 2VWrMljvLxahh0/YHMYfJk45rgNmp6VE8Xgscg99pCY3CZRhpzGgChzKp7epI+hKMqGUO8 ZwVG2Lsf3Q4FcNplcRfCdmri+MB4MJVGffGoJaba0QtDaGk7+/sBrltl9e4V0zCPIEXSxU D2ik1Y+XcV2xRRukLBs+PcqvWEeDCSwaH9wzx71lY7QrNp3wfH5+UbvEhCYKWSxnw/pLl3 nQnP4Aerow0iMoYiahGhWWVFQpOUV6kN15/zqvAwibbhjaUcu7GgjBNa4lVbaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCN4Jjyz17PY; Sat, 23 Aug 2025 00:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BSfI099924; Sat, 23 Aug 2025 00:11:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BSHg099921; Sat, 23 Aug 2025 00:11:28 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:28 GMT Message-Id: <202508230011.57N0BSHg099921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: c064ee9d7d97 - stable/14 - ifconfig: Support VLAN ID in static/deladdr List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c064ee9d7d974d5626e43f7817db940cefe9dead Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=c064ee9d7d974d5626e43f7817db940cefe9dead commit c064ee9d7d974d5626e43f7817db940cefe9dead Author: Lexi Winter AuthorDate: 2025-07-31 15:56:51 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 ifconfig: Support VLAN ID in static/deladdr Add an optional "vlan " argument to the bridge static and deladdr commands to allow addresses to be added to / removed from a particular vlan. No changes to if_bridge are required as the kernel API already supports this, it just wasn't exposed in ifconfig. Add tests for the new functionality, and improve the test for the existing "static" command. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D51243 (cherry picked from commit 3650722abf2922893540361a1369b54abc5ff8d2) --- sbin/ifconfig/ifbridge.c | 71 +++++++++++++++++++++++++++++++---------- sbin/ifconfig/ifconfig.8 | 18 ++++++++--- tests/sys/net/if_bridge_test.sh | 70 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 136 insertions(+), 23 deletions(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 973c4f9cfe6e..9d3296ea6a3e 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -401,43 +401,80 @@ setbridge_flushall(if_ctx *ctx, const char *val __unused, int dummy __unused) err(1, "BRDGFLUSH"); } -static void -setbridge_static(if_ctx *ctx, const char *val, const char *mac) +static int +setbridge_static(if_ctx *ctx, int argc, const char *const *argv) { struct ifbareq req; struct ether_addr *ea; + int arg; + + if (argc < 2) + errx(1, "usage: static
[vlan ]"); + arg = 0; memset(&req, 0, sizeof(req)); - strlcpy(req.ifba_ifsname, val, sizeof(req.ifba_ifsname)); + req.ifba_flags = IFBAF_STATIC; - ea = ether_aton(mac); - if (ea == NULL) - errx(1, "%s: invalid address: %s", val, mac); + strlcpy(req.ifba_ifsname, argv[arg], sizeof(req.ifba_ifsname)); + ++arg; + ea = ether_aton(argv[arg]); + if (ea == NULL) + errx(1, "invalid address: %s", argv[arg]); memcpy(req.ifba_dst, ea->octet, sizeof(req.ifba_dst)); - req.ifba_flags = IFBAF_STATIC; - req.ifba_vlan = 0; /* XXX allow user to specify */ + ++arg; + + req.ifba_vlan = 0; + if (argc > 2 && strcmp(argv[arg], "vlan") == 0) { + if (argc < 3) + errx(1, "usage: static
" + "[vlan ]"); + ++arg; + + if (get_vlan_id(argv[arg], &req.ifba_vlan) < 0) + errx(1, "invalid vlan id: %s", argv[arg]); + ++arg; + } if (do_cmd(ctx, BRDGSADDR, &req, sizeof(req), 1) < 0) - err(1, "BRDGSADDR %s", val); + err(1, "BRDGSADDR"); + return arg; } -static void -setbridge_deladdr(if_ctx *ctx, const char *val, int dummy __unused) +static int +setbridge_deladdr(if_ctx *ctx, int argc, const char *const *argv) { struct ifbareq req; struct ether_addr *ea; + int arg; + + if (argc < 1) + errx(1, "usage: deladdr
[vlan ]"); + arg = 0; memset(&req, 0, sizeof(req)); - ea = ether_aton(val); + ea = ether_aton(argv[arg]); if (ea == NULL) - errx(1, "invalid address: %s", val); - + errx(1, "invalid address: %s", argv[arg]); memcpy(req.ifba_dst, ea->octet, sizeof(req.ifba_dst)); + ++arg; + + req.ifba_vlan = 0; + if (argc >= 2 && strcmp(argv[arg], "vlan") == 0) { + if (argc < 3) + errx(1, "usage: deladdr
[vlan ]"); + ++arg; + + if (get_vlan_id(argv[arg], &req.ifba_vlan) < 0) + errx(1, "invalid vlan id: %s", argv[arg]); + ++arg; + } if (do_cmd(ctx, BRDGDADDR, &req, sizeof(req), 1) < 0) - err(1, "BRDGDADDR %s", val); + err(1, "BRDGDADDR"); + + return arg; } static void @@ -660,8 +697,8 @@ static struct cmd bridge_cmds[] = { DEF_CMD_ARG("-autoptp", unsetbridge_autoptp), DEF_CMD("flush", 0, setbridge_flush), DEF_CMD("flushall", 0, setbridge_flushall), - DEF_CMD_ARG2("static", setbridge_static), - DEF_CMD_ARG("deladdr", setbridge_deladdr), + DEF_CMD_VARG("static", setbridge_static), + DEF_CMD_VARG("deladdr", setbridge_deladdr), DEF_CMD("addr", 1, setbridge_addr), DEF_CMD_ARG("maxaddr", setbridge_maxaddr), DEF_CMD_ARG("hellotime", setbridge_hellotime), diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index ce15e3a68abc..85dad643f588 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 11, 2025 +.Dd July 30, 2025 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2521,15 +2521,23 @@ is zero, then address cache entries will not be expired. The default is 1200 seconds. .It Cm addr Display the addresses that have been learned by the bridge. -.It Cm static Ar interface-name Ar address -Add a static entry into the address cache pointing to +.It Cm static Ar interface-name Ar address Op Cm vlan Ar vlan-id +Add a static entry into the address cache for pointing to .Ar interface-name . +If +.Ar vlan-id +is specified, the entry is added for that VLAN, otherwise it is added +for VLAN 0. +.Pp Static entries are never aged out of the cache or re-placed, even if the address is seen on a different interface. -.It Cm deladdr Ar address +.It Cm deladdr Ar address Op Cm vlan Ar vlan-id Delete .Ar address -from the address cache. +from the address cache. If +.Ar vlan-id +is specified, the entry is deleted from that VLAN's address table, +otherwise it is deleted from the VLAN 0 address table. .It Cm flush Delete all dynamically-learned addresses from the address cache. .It Cm flushall diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh index 5438f67cf637..264a8986fcf9 100755 --- a/tests/sys/net/if_bridge_test.sh +++ b/tests/sys/net/if_bridge_test.sh @@ -245,7 +245,8 @@ static_body() jexec one ifconfig ${bridge} static ${epair}a 00:01:02:03:04:05 # List addresses - atf_check -s exit:0 -o ignore \ + atf_check -s exit:0 \ + -o match:"00:01:02:03:04:05 Vlan0 ${epair}a 0 flags=1" \ jexec one ifconfig ${bridge} addr # Delete with bad address format @@ -266,6 +267,72 @@ static_cleanup() vnet_cleanup } +atf_test_case "vstatic" "cleanup" +vstatic_head() +{ + atf_set descr 'Bridge VLAN static address test' + atf_set require.user root +} + +vstatic_body() +{ + vnet_init + vnet_init_bridge + + epair=$(vnet_mkepair) + bridge=$(vnet_mkbridge) + + vnet_mkjail one ${bridge} ${epair}a + + ifconfig ${epair}b up + + jexec one ifconfig ${bridge} up + jexec one ifconfig ${epair}a up + jexec one ifconfig ${bridge} addm ${epair}a + + # Wrong interface + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} static ${epair}b 00:01:02:03:04:05 vlan 10 + + # Bad address format + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} static ${epair}a 00:01:02:03:04 vlan 10 + + # Invalid VLAN ID + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} static ${epair}a 00:01:02:03:04:05 vlan 5000 + + # Correct add + atf_check -s exit:0 -o ignore jexec one \ + ifconfig ${bridge} static ${epair}a 00:01:02:03:04:05 vlan 10 + + # List addresses + atf_check -s exit:0 \ + -o match:"00:01:02:03:04:05 Vlan10 ${epair}a 0 flags=1" \ + jexec one ifconfig ${bridge} addr + + # Delete with bad address format + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} deladdr 00:01:02:03:04 vlan 10 + + # Delete with unlisted address + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} deladdr 00:01:02:03:04:06 vlan 10 + + # Delete with wrong vlan id + atf_check -s exit:1 -o ignore -e ignore jexec one \ + ifconfig ${bridge} deladdr 00:01:02:03:04:05 vlan 20 + + # Correct delete + atf_check -s exit:0 -o ignore jexec one \ + ifconfig ${bridge} deladdr 00:01:02:03:04:05 vlan 10 +} + +vstatic_cleanup() +{ + vnet_cleanup +} + atf_test_case "span" "cleanup" span_head() { @@ -835,6 +902,7 @@ atf_init_test_cases() atf_add_test_case "stp" atf_add_test_case "stp_vlan" atf_add_test_case "static" + atf_add_test_case "vstatic" atf_add_test_case "span" atf_add_test_case "inherit_mac" atf_add_test_case "delete_with_members" From nobody Sat Aug 23 00:11:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCQ56SQz65Rms; Sat, 23 Aug 2025 00:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCP5flFz3b5m; Sat, 23 Aug 2025 00:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5s7u6QKD6KXDI3JgJ251hz9psUpjnxB0SO3wgS1nekM=; b=MS5pmjGI0azRbXOky6f+Dh7QxUG8JNNqNTQdsynS4Yar8z2DJiHFk9GBtRUKReZjsUBn2T jeUMOaMvFJBMx4Tlk6eS4hJU0DUYf5H/JYgt2wasswn5cBB01SpZJ0wX4CogG6cSq8pXtx FiFwOguKt5RomK+y2ldsFuNa/T48w++GB4ahBSKuvfzIChTUHtXBK5J2cWp7dpJT9PsTwn GgSZIlPqlDgEnmByFM1WNxUCexuROJJtHea+keZ1l0bWP81VUHItZgsWZQgbjqH//Asg50 CPWDCXl0r5HksW38KlhGhdld2ZR/Xep47gL657yptZeeInE0EkykoRtvLimBrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5s7u6QKD6KXDI3JgJ251hz9psUpjnxB0SO3wgS1nekM=; b=QpCwEBjHCO9gFEzOLssvu1eTRsKjZ2AvNs8cs1ZSItCmbrMsPbFJwnIDVa6k0Qhy1V94B1 zJWPGfQS8js39hc0HST1suUbYDldX4w5C9x5TK3ZZpFcncT57g8EUr9QzD+xW4tHwkCwCq hwMUGrwdEYS1H/FoYXmPMGaVaAmxr9MKzt+Wfp1tnanPSUBOBEuHiOd5/V8eKuSGxvNs8L cfCqZto6VREjZmW3N6s78B3Oujl2d16LEBQybk/DFywN3p7rKGdGVjCOINnOerZQPy/nQu NpIsXARqfYcv0N9abRouIwAPle4PRY4WNxrCNzdM/RVXogoJvzd366/2z0x08A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907889; a=rsa-sha256; cv=none; b=JtBdN6otXKFao8E5xbeejpfBm3HnKAgW3M2IBpdUCLQPctzy52tFl7TGevG9EJBLUx2gkN Ojth699v+Op0nNDe/Ms9fsFJC20WUwGVefpHDcN7UDrdXFCELVQR9SXVkq/NEseIMvt1n/ 8k+vZQ3V72TGfQOmDgU3rYT0dpipBuuir5DfUmb938BeI1/wVa9u1K/kxQnZYc3NbOZW6F uPh2CBQ+RMHe7um0vZtCZRUC5keFfVuZkXSUOUsL4DXWlgEBxnvTUy1eglZfpzD1T3Frx9 Aqd5I/XoRUjj6Iuvo48O/DJoExnFF1Jl+wHmlnCp5i/KtdO2FcMal4FKZpx9BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCP5FXqz174X; Sat, 23 Aug 2025 00:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BTLj099957; Sat, 23 Aug 2025 00:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BTPN099954; Sat, 23 Aug 2025 00:11:29 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:29 GMT Message-Id: <202508230011.57N0BTPN099954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 8174561013b3 - stable/14 - bsdinstall: use the canonical name for compression List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8174561013b3f2a0685819e037934e47f63d917a Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8174561013b3f2a0685819e037934e47f63d917a commit 8174561013b3f2a0685819e037934e47f63d917a Author: Lexi Winter AuthorDate: 2025-07-28 12:45:26 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 bsdinstall: use the canonical name for compression According to zfsprops(7), the canonical property for the compression algorithm is "compression", with "compress" accepted as an alternate name. Use the canonical name in bsdinstall. While here, change "lz4" to "on" so we pick up any future changes in the default compression algorithm. MFC after: 1 week Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D51572 (cherry picked from commit 16045420e7f83489ecd5e2163aa9bb11236962f5) --- usr.sbin/bsdinstall/bsdinstall.8 | 2 +- usr.sbin/bsdinstall/scripts/zfsboot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 50c8948a7989..cc8920b11aff 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -429,7 +429,7 @@ Each option must be preceded by the -O flag to be taken into consideration or the pool will not be created due to errors using the command .Cm zpool . Default: -.Dq Li "-O compress=lz4 -O atime=off" +.Dq Li "-O compression=on -O atime=off" .It Ev ZFSBOOT_BEROOT_NAME Name for the boot environment parent dataset. This is a non-mountable dataset meant to be a parent dataset where different diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 59e6359d311e..445e491eb391 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -51,7 +51,7 @@ f_include $BSDCFG_SHARE/variable.subr # # Default options to use when creating zroot pool # -: ${ZFSBOOT_POOL_CREATE_OPTIONS:=-O compress=lz4 -O atime=off} +: ${ZFSBOOT_POOL_CREATE_OPTIONS:=-O compression=on -O atime=off} # # Default name for the boot environment parent dataset From nobody Sat Aug 23 00:11:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCR2Fq4z65Rbj; Sat, 23 Aug 2025 00:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCQ6YdBz3Zyg; Sat, 23 Aug 2025 00:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oR1pSKj/X+g3y+0WQy/eFhbOumuo1n2M2oq/N+PqBow=; b=HEQlwIBSFEceaosenCETurzGpXQm6S/tTcYNt6urR2IX3iYB83oUk2HQb6K0BbOaTe/cKd HL0iq0GrEbbBPwIL1SiqySN3rHycDMoJ1JRflqf7bYwq/A2lhFDvVsV+bCecYhNKphQTJY vSvOcdtwEXNZZMTYPG7oVBOxiB8OTWKVvZce6eZD3SKZk3owUM+G0nULLK0TpyLvNAX8Ry 9g6a7Hw+Dlvy++bLnkDT0sOP9YWqwPC2AhEL59HGQS3fLAe6rDUGBAP+8QC56rkr6ob8re aWUj/cwXNEvVOcEBaXhGOYowTQh73Hp6U0zDI/8PtmPVebc3DgECJQc2byt8DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oR1pSKj/X+g3y+0WQy/eFhbOumuo1n2M2oq/N+PqBow=; b=sojuw7fIwK91fvRE6JdQ35sjhswEe3CylaUmXv81qJjcQTi78CgeMklA7+kILzxkyHJnN0 KxKDbr5+/eaMOt3WXeNURhgd3zIoYGFbVEGuZJdaKDDj3IgkdVCdgIA0f05JKnEPgz+rj5 /BT6nd0rwAw/zxiySIXfrBXV6PRiw7vSbDIrUll08t6OjS+oDd/17p2LZkV6PSQalklUs7 5+ynyPEiPAozj+SH6QPeaSYUh5bSZJcI6mYgoK3SunRIQb/LrtOpipjpWp+7lnmXYnUE2X JlvhgDrpmYRX1/ecv5WbzvJgRabG4e9h1hjB8oTifp503dbNUrW1tgVNSfNdbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907890; a=rsa-sha256; cv=none; b=sUytoAuftaR4dBXN6XhbQz5b84TrrWMNdS+iBcTpybUCjp40fLO4ldYYW2LsDLTPQLOk6Y /7n3jNTq1wfdcB/e4Wiaa4oqXGikANsbxOgNnUvXjOvkVxTZynrHOtP9j1Uf5PHb2gmixA xOFLXkRi7OIN8A3l5qBDZMYRhIlgcQwaulcZjnEKX0/Tj3vrlk0TJYDHUcU+Znx4AKctJk QSyylm0N9EgAYSyMifmMxRMpn50CsDL/dpxJVy1tH5NMIN90J5HX36iffZHl0vpy40Cb70 /Ys9uYt0leDB/26UdZuKVzBbynyH00/nK3XdMnlAHwFe91DuGBlbQeTLDDND/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCQ69RVz16tD; Sat, 23 Aug 2025 00:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BUp4099996; Sat, 23 Aug 2025 00:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BUQM099993; Sat, 23 Aug 2025 00:11:30 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:30 GMT Message-Id: <202508230011.57N0BUQM099993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 637fa8441f0c - stable/14 - packages: fix ownership of /tmp and /dev List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 637fa8441f0c8712b64f7ad95d072fcef5435c11 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=637fa8441f0c8712b64f7ad95d072fcef5435c11 commit 637fa8441f0c8712b64f7ad95d072fcef5435c11 Author: Lexi Winter AuthorDate: 2025-06-04 05:38:48 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 packages: fix ownership of /tmp and /dev release/packages/runtime.ucl manually adds "/tmp" and "/dev" to the "directories" key, which causes them to be included in the manifest with the user/group owner of whoever built the package repository: drwxr-xr-x 7 ivy wheel 512 Jun 1 17:24 /dev drwxrwxrwt 10 ivy wheel 10 Jun 1 17:42 /tmp Remove the manual entries and instead put an explicit package tag in etc/mtree/BSD.root.dist. This also means /tmp gets the right mode by default and we can remove the chmod from the post-install script. PR: 288746 Reviewed by: manu, kevans, emaste Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50636 (cherry picked from commit 6b2993e74ebaacd46bd1e438787c23450cd2752d) --- etc/mtree/BSD.root.dist | 4 ++-- release/packages/runtime.ucl | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index a85ce552589c..33d9b2ffc47c 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -34,7 +34,7 @@ zfs .. .. - dev mode=0555 + dev mode=0555 tags=package=runtime .. etc X11 @@ -132,7 +132,7 @@ .. sbin .. - tmp mode=01777 + tmp mode=01777 tags=package=runtime .. usr .. diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl index 8a337c038fdd..b04bc32f33cc 100644 --- a/release/packages/runtime.ucl +++ b/release/packages/runtime.ucl @@ -3,10 +3,5 @@ scripts: { post-install = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: d149be3a0cbe - stable/14 - UPDATING: Document a pkgbase change List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d149be3a0cbe27599921b0952bd8de18413fceaf Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=d149be3a0cbe27599921b0952bd8de18413fceaf commit d149be3a0cbe27599921b0952bd8de18413fceaf Author: Lexi Winter AuthorDate: 2025-08-22 22:45:01 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 UPDATING: Document a pkgbase change The MFC of 2ade134cc271 ("bsd.files.mk: Fix FILESPACKAGE") means files which were supposed to be installed in /usr/share/examples are now actually installed there. This is a direct commit to stable/14. Relnotes: yes --- UPDATING | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/UPDATING b/UPDATING index be2d8be0ff49..858b24aad471 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20250822: + A build system bug which caused some files to be installed in the wrong + package has been fixed. As a result some files have moved to different + packages; in particular, files under /usr/share/examples are now in the + new FreeBSD-examples package. + + This change only affects pkgbase users. + 20250713: LinuxKPI dma-mapping.h were pulled into the tree from drm-kmod. LinuxKPI acpi changes effecting drivers and drm-kmod. From nobody Sat Aug 23 21:20:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c8VMJ2JFKz66Rdd; Sat, 23 Aug 2025 21:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8VMJ0DRKz3tfC; Sat, 23 Aug 2025 21:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WE7ljHxWoRk14Od73NJ04Dmb9Yfj76YNWWEJBKv7hI4=; b=Wsas69vj2O1v2Z2CPFlaMg1EwfdmuR7/74MWA36wMQXVvodThDF/D7OuqHZGKOmK7oe2do 7i9rWx+sRaQY1rllpuMt6n9+1GYSSVBRQRx5gadGIkmvwTdA1PxRRdQgfRln6zLnEVL8e5 p33hIPBFBY/rPhcB/ubdNSPfu8XAG9z2xS0zosKcsj+94jagTDX41u2AyGLbl95h1JNg7k KD2P130fxKny6YFynYr54wB/0ys8PRFsnJwsQfWiAZ/oqmrupSaVVeZ7W3/UPV1XB1ImX8 25KHpRNDNDYlVRCf0IHSTTKrDiMhsmIxa1YKvxs74UAH1E8ShdN8/J5zcPeQ1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WE7ljHxWoRk14Od73NJ04Dmb9Yfj76YNWWEJBKv7hI4=; b=vjctP3wIWWsMAhsTkYeVS7ImDqNaOyQfqGl+ux4GTtYpC6/VB1oonD1PM/zEtRYOk0KM01 eyP3kY3ryDKkZNx4CnmrTF9jaezYGZzAc9i2sVXbC6h6gMOAK0utYYipnbHitJbp4hPM7Y 4wdlf6fYPl2n7uKGD8WxYE93pJ2p6iMUyxMh+QRA7Sj+RaqKvOohS/Duj84jQI529RNn3F hQDvalJr8ikVI3lBPLa+YVMKWGXfQLeE68KqdCtmCRcS6iGa73gcL7bEtuZTyWG23N7EXO 0TebpIbH1fTs7CFuhE0zChCnsPJPW7c4PWOFlEI/FnlCIwtJSJyi0P9kCK5Vqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984012; a=rsa-sha256; cv=none; b=wOE64cEa3iRkJN1QSt8l0tRto0cfvsTGhQGS9mxa4fFxetM2JdusZ/8xeEQ1KPg83Wi7Hb ku07PLPcCdBvI9Dgq+I18OPHFD+m89IATMiEIK34uRqMMKi6b75OVv1bmBdOmM775By4BB GxRQrbo6ZvuspHRz0y2N1ngpwVZC6/QrBIPjzwbuAHXEwUumhqJsHsa9w3DvTH7mj53oe2 9URiARMR30qFQL9NaQWR0M5BKhSTBr0fOgG8yMmluW+V5E6Kqe72/shLWYTw+GDg5xM8Px Ik4jFgrkqxydqkjv3TJ96wA9unWpHfcJQh0Nn7Te6WIROsOkguyc2PQmghH72g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c8VMH6qHJzZ72; Sat, 23 Aug 2025 21:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57NLKBL8086554; Sat, 23 Aug 2025 21:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLKB9K086540; Sat, 23 Aug 2025 21:20:11 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:20:11 GMT Message-Id: <202508232120.57NLKB9K086540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 3f61ececacd8 - stable/14 - nfsd: Avoid relocking vnode for NFSv4 Readdir List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f61ececacd8d86f7c9dfc73383e0346f66f0784 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3f61ececacd8d86f7c9dfc73383e0346f66f0784 commit 3f61ececacd8d86f7c9dfc73383e0346f66f0784 Author: Rick Macklem AuthorDate: 2025-07-19 22:45:40 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:15:18 +0000 nfsd: Avoid relocking vnode for NFSv4 Readdir Without this patch, nfsv4_fillattr() relocks the vnode to test to see if extended attributes are supported. This is inefficient and could cause deadlocks if Readdir ever asks for this attribute. At this time, no extant NFSv4 client asks for this attribute for Readdir, but this patch fixes the problem in case a future client does so, by moving the test for extended attribute support to before the nfsv4_fillattr() call where the vnode is still locked. (cherry picked from commit c00baac0ab46f54951a29b834e064935b749ae9a) --- sys/fs/nfs/nfs_commonsubs.c | 19 +++---------------- sys/fs/nfs/nfs_var.h | 6 +++--- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- sys/fs/nfsclient/nfs_clstate.c | 2 +- sys/fs/nfsserver/nfs_nfsdport.c | 24 ++++++++++++++++++------ sys/fs/nfsserver/nfs_nfsdserv.c | 16 ++++++++++++++-- 6 files changed, 40 insertions(+), 29 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index cb9e32376170..560720911e84 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -640,7 +640,8 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, NFSATTRBIT_TIMECREATE)) NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE); (void) nfsv4_fillattr(nd, vp->v_mount, vp, NULL, vap, NULL, 0, - &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL); + &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, + false); break; } } @@ -2580,7 +2581,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, NFSACL_T *saclp, struct vattr *vap, fhandle_t *fhp, int rderror, nfsattrbit_t *attrbitp, struct ucred *cred, NFSPROC_T *p, int isdgram, int reterr, int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, - struct statfs *pnfssf) + struct statfs *pnfssf, bool xattrsupp) { int bitpos, retnum = 0; u_int32_t *tl; @@ -2594,8 +2595,6 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, struct nfsfsinfo fsinf; struct timespec temptime; NFSACL_T *aclp, *naclp = NULL; - size_t atsiz; - bool xattrsupp; #ifdef QUOTA struct dqblk dqb; uid_t savuid; @@ -2679,18 +2678,6 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, } } - /* Check to see if Extended Attributes are supported. */ - xattrsupp = false; - if (NFSISSET_ATTRBIT(retbitp, NFSATTRBIT_XATTRSUPPORT)) { - if (NFSVOPLOCK(vp, LK_SHARED) == 0) { - error = VOP_GETEXTATTR(vp, EXTATTR_NAMESPACE_USER, - "xxx", NULL, &atsiz, cred, p); - NFSVOPUNLOCK(vp); - if (error != EOPNOTSUPP) - xattrsupp = true; - } - } - /* * Put out the attribute bitmap for the ones being filled in * and get the field for the number of attributes returned. diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 8b8b3f5ce961..bcb0588ef012 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -394,8 +394,8 @@ int nfsrv_putopbit(struct nfsrv_descript *, nfsopbit_t *); void nfsrv_wcc(struct nfsrv_descript *, int, struct nfsvattr *, int, struct nfsvattr *); int nfsv4_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, NFSACL_T *, - struct vattr *, fhandle_t *, int, nfsattrbit_t *, - struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, struct statfs *); + struct vattr *, fhandle_t *, int, nfsattrbit_t *, struct ucred *, + NFSPROC_T *, int, int, int, int, uint64_t, struct statfs *, bool); void nfsrv_fillattr(struct nfsrv_descript *, struct nfsvattr *); struct mbuf *nfsrv_adj(struct mbuf *, int, int); void nfsrv_postopattr(struct nfsrv_descript *, int, struct nfsvattr *); @@ -726,7 +726,7 @@ int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct nfsrv_descript *, NFSPROC_T *); int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *, - struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t); + struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, bool); int nfsrv_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, NFSACL_T *, NFSPROC_T *); int nfsv4_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 5722810191b4..3c580b90e6b9 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5319,7 +5319,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPROC_T *p, NFSZERO_ATTRBIT(&attrbits); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); (void) nfsv4_fillattr(nd, vp->v_mount, vp, aclp, NULL, NULL, 0, - &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL); + &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, false); error = nfscl_request(nd, vp, p, cred); if (error) return (error); diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index af8297b68c0e..bbfcd96408c2 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -3702,7 +3702,7 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) if (!error) (void) nfsv4_fillattr(nd, NULL, NULL, NULL, &va, NULL, 0, &rattrbits, NULL, p, 0, 0, 0, 0, - (uint64_t)0, NULL); + (uint64_t)0, NULL, false); break; case NFSV4OP_CBRECALL: NFSCL_DEBUG(4, "cbrecall\n"); diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index ae3d81926db2..a4a729613038 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -2022,7 +2022,8 @@ int nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, struct nfsvattr *nvap, fhandle_t *fhp, int rderror, nfsattrbit_t *attrbitp, struct ucred *cred, struct thread *p, int isdgram, int reterr, - int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno) + int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, + bool xattrsupp) { struct statfs *sf; int error; @@ -2041,7 +2042,7 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, } error = nfsv4_fillattr(nd, mp, vp, NULL, &nvap->na_vattr, fhp, rderror, attrbitp, cred, p, isdgram, reterr, supports_nfsv4acls, at_root, - mounted_on_fileno, sf); + mounted_on_fileno, sf, xattrsupp); free(sf, M_TEMP); NFSEXITCODE2(0, nd); return (error); @@ -2341,7 +2342,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, struct nfsvattr nva, at, *nvap = &nva; struct mbuf *mb0, *mb1; struct nfsreferral *refp; - int nlen, r, error = 0, getret = 1, usevget = 1; + int nlen, r, error = 0, getret = 1, ret, usevget = 1; int siz, cnt, fullsiz, eofflag, ncookies, entrycnt; caddr_t bpos0, bpos1; u_int64_t off, toff, verf __unused; @@ -2355,6 +2356,8 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, uint64_t mounted_on_fileno; struct thread *p = curthread; int bextpg0, bextpg1, bextpgsiz0, bextpgsiz1; + size_t atsiz; + bool xattrsupp; if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); @@ -2821,9 +2824,18 @@ again: *tl++ = newnfs_true; txdr_hyper(*cookiep, tl); dirlen += nfsm_strtom(nd, dp->d_name, nlen); + xattrsupp = false; if (nvp != NULL) { supports_nfsv4acls = nfs_supportsnfsv4acls(nvp); + if (NFSISSET_ATTRBIT(&attrbits, + NFSATTRBIT_XATTRSUPPORT)) { + ret = VOP_GETEXTATTR(nvp, + EXTATTR_NAMESPACE_USER, + "xxx", NULL, &atsiz, + nd->nd_cred, p); + xattrsupp = ret != EOPNOTSUPP; + } NFSVOPUNLOCK(nvp); } else supports_nfsv4acls = 0; @@ -2843,13 +2855,13 @@ again: nvp, nvap, &nfh, r, &rderrbits, nd->nd_cred, p, isdgram, 0, supports_nfsv4acls, at_root, - mounted_on_fileno); + mounted_on_fileno, xattrsupp); } else { dirlen += nfsvno_fillattr(nd, new_mp, nvp, nvap, &nfh, r, &attrbits, nd->nd_cred, p, isdgram, 0, supports_nfsv4acls, at_root, - mounted_on_fileno); + mounted_on_fileno, xattrsupp); } if (nvp != NULL) vrele(nvp); @@ -6222,7 +6234,7 @@ nfsrv_setacldsdorpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, * the same type (VREG). */ nfsv4_fillattr(nd, NULL, vp, aclp, NULL, NULL, 0, &attrbits, NULL, - NULL, 0, 0, 0, 0, 0, NULL); + NULL, 0, 0, 0, 0, 0, NULL, false); error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL); if (error != 0) { diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 846d4037ef27..88ae643d193e 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -240,7 +240,7 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, { struct nfsvattr nva; fhandle_t fh; - int at_root = 0, error = 0, supports_nfsv4acls; + int at_root = 0, error = 0, ret, supports_nfsv4acls; struct nfsreferral *refp; nfsattrbit_t attrbits, tmpbits; struct mount *mp; @@ -249,6 +249,8 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, uint64_t mounted_on_fileno = 0; accmode_t accmode; struct thread *p = curthread; + size_t atsiz; + bool xattrsupp; if (nd->nd_repstat) goto out; @@ -306,6 +308,15 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, &nva, &attrbits, p); if (nd->nd_repstat == 0) { supports_nfsv4acls = nfs_supportsnfsv4acls(vp); + xattrsupp = false; + if (NFSISSET_ATTRBIT(&attrbits, + NFSATTRBIT_XATTRSUPPORT)) { + ret = VOP_GETEXTATTR(vp, + EXTATTR_NAMESPACE_USER, + "xxx", NULL, &atsiz, nd->nd_cred, + p); + xattrsupp = ret != EOPNOTSUPP; + } mp = vp->v_mount; if (nfsrv_enable_crossmntpt != 0 && vp->v_type == VDIR && @@ -339,7 +350,8 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, (void)nfsvno_fillattr(nd, mp, vp, &nva, &fh, 0, &attrbits, nd->nd_cred, p, isdgram, 1, supports_nfsv4acls, - at_root, mounted_on_fileno); + at_root, mounted_on_fileno, + xattrsupp); vfs_unbusy(mp); } vrele(vp); From nobody Sat Aug 23 21:23:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c8VRL4DlYz66Rsl; Sat, 23 Aug 2025 21:23: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8VRL3P2rz3v4F; Sat, 23 Aug 2025 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCrP+QF7HOuWhHB1T5Tls+8Y/rMR6bixK5HI3C+BZIc=; b=Gqj66vQHu5k4zbwyzKgs71jcIWCCMOVvlz4gLB/1if0nZdNqXKqw3+V+RPM0U55Lm7nE+Y +c4ev5Rqti0Viyc4xlwgyEA8ZNVxYwAo+sqpHBAKQE8NLM/EVlcTDisI1vtEYj5VTp++IV 1pi8k7Y5LoQTDNRIe0MHqsNzla2lHdMKDLqCOMOapny2RxXTA0/EI7H4FhqWo1HpXNh2Fr TnFvceU95osJf+QryMrhFwNnQZv0Dsa/fiZ+js2lRiAzMk4oLkhwgrKNdiV0Dwdk0gEdY2 LVKH35lVx5NtenEuyCIbNso6BchSxoY6mwhuvUOZm6JE1BCNUBAaZdkCjx67bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCrP+QF7HOuWhHB1T5Tls+8Y/rMR6bixK5HI3C+BZIc=; b=dUnl/JLQXDDlwJFRXPU6N3K7PtRsUcrm+VAYL4EqzxzJ+Dhm6mmUgd7fH+hZgzuAAhRRFn fxdxRk8tIjGEFUangs5eE7SAOLsG8x0KK+Fg+wk5rkJTrMVslbjSCW+hpMFVC3T80KhSzL xo1l0FCnm8S2BD6qoV7ND5mzu1tEWtY1kC5ume5OD6ZVKeJco0NIyuBdqdxDGnHSPgXxYs AwUeXWMpR53+Ypu0NawZC7t7vF/Kb+tXKBvDqJMBi5ZylsSlfcM0nanlIsKm0ES7VD6KxE Xs3JT75alwL+6PSoDbALx9wbhb6VmMJyJOFQ12L5/dbpidwpOUAyBZ5p3GdPAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984222; a=rsa-sha256; cv=none; b=q4yxpdaygFAKTPPkRG95XOdulAK1kFH9IK5c4dEBQ5pOHDXhfRd6n3WeYgG6GGOXA8SbBO B/bbn0chaDll2wsjdkKn1QOsyV3rJ/82hhaMwRcO5cm5vP1Ze5VT3ZRNx3z3sslumjnIKt 3Sa0Y49zuNp2X26x/6Al4R432t3eyeeIkTAZNdHN4/6hHqiqMbJgF6rKKAdWa8I/+Yxpvn 8AfAI61gaFSJqWMAHFhUgx1HeZeYk/LjL76tL10qfupTFPtJ/+saUhsWYB1eBmbJYmeOwj Uy7WUrTBV3Ef4TiGK4CWh/zs8nZjKLRO/yWmQGd2FT4TrRRdjSSQz44uCONf7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c8VRL2wjRzZSP; Sat, 23 Aug 2025 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57NLNgfi097854; Sat, 23 Aug 2025 21:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLNg3h097851; Sat, 23 Aug 2025 21:23:42 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:23:42 GMT Message-Id: <202508232123.57NLNg3h097851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 248daca0b3c3 - stable/14 - nfscl: Fix GetACL so that it does not want a reply cached List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 248daca0b3c3bd411a4629047e21cc03532890c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=248daca0b3c3bd411a4629047e21cc03532890c0 commit 248daca0b3c3bd411a4629047e21cc03532890c0 Author: Rick Macklem AuthorDate: 2025-08-04 23:36:28 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:21:02 +0000 nfscl: Fix GetACL so that it does not want a reply cached Without this patch, an NFSv4.1/4.2 GetACL RPC requests that the session cache the reply. In some cases, the reply may be too large to cache, resulting in a NFS4ERR_X error from the server. Since a GetACL is idempotent, disable reply caching for it, by setting that it can generate a large reply. Tested against a Linux server with a large ACL on a file. (cherry picked from commit 51affb7e97161e260f6d99cb0904daf7cc9f51a7) --- sys/fs/nfs/nfs_commonsubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 560720911e84..bde9be0885e0 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -218,7 +218,7 @@ NFSD_VNET_DEFINE_STATIC(u_char *, nfsrv_dnsname) = NULL; */ static int nfs_bigreply[NFSV42_NPROCS] = { 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0 }; /* local functions */ From nobody Sat Aug 23 21:25:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c8VTD6wkcz66S6H; Sat, 23 Aug 2025 21:25: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8VTD5X8sz3vdp; Sat, 23 Aug 2025 21:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wv/RkPRRIQnVSPQmsQmQubuGdmLgcsfogTvA0XqbKV8=; b=OaRWrgRdvIONj0d8miUj4Io/DFi8TcBakN0oVtPYFvnj50Ix4MveyLLRr/5JrGku8vt5HC /+Ss0ockJRkztaNPGKMiM+br9KfX/SDVNspoHEGcubhJjhqK9gkEMGnYPpiUAXmeLrkvF8 anEhRzgwP0/dzr6iCbDU7uovWGciJHaY2bXT46mph37VtxGSEesn1lJJ4fLNC3wpbhaSrz g9RUor2Y8oYZDK/N41OSnFxW916wzhJnGImk/ZZAkX5OI9IkGVj69BirDNSvATfZEddoil gso9Japo6JWHhJfsvbQYw2dMHkSqrPAGIdRDKAC3WgbG3J82CxN+K9KINSHCOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wv/RkPRRIQnVSPQmsQmQubuGdmLgcsfogTvA0XqbKV8=; b=PuvAALyqqFshBEDbC5wzfXmrTAxGK68wJ0WwZgPrIp/jozm0o694W8C4fiPt+Bkf5ntujE 8N7RDRQJ2pM8uFL2ArmurVz3zjy6HKjTzOeG0nbifSXp8vtjmi25kn1+hL6AkwtRfQgxxT odICpGSOZ/r65uP67eWRnN7jMPD8/nUe7XARtWvqzFODDwMciFI8KZ3DOOIiMHvw5ApyC/ 0UrP5smn+Y7i3ZYyghQ6e4ngG+OF6y1hJjVm+5jyDxbQu3fm7kh4CIQNYpJ4QGJhZWNUJt 12CuNg4toF/Gh4niBDiGdEzXBX+UGJ7aEaOMCOk5Huofism67uAYTM2Pn/HkUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984320; a=rsa-sha256; cv=none; b=p5r6RJauqMQCEsodjuHRAT7Hs7kytQ93ts0VJEcaA8//5ACnCbgszd7m0ryHbfBjQwBQZR HgkdeIuuAEr3xTYl+IUHzpa2JMjStc0zvUFgUTz+N/fLKgmipSeavoQRzzwe/KAtU0NfNF dIvylPBkfVx4dycSwk6v5a3640zgzS/oeh2y3uz0eKd2Jjl46ziUjk1hC6mSAL1alCmQt7 LSm5bKKLMW9yjKfj67Vv/YfUFKrhD9BX/mQwqLpMTMaPOUBck7JPEBTxdnKJ9tFcMMe2js kSJx5bxU7CToRrgmmSC5I5m15AMqLRRB7s5RnaQqHhRxwxaBPa+//qqgvUv9/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c8VTD51SMzZQ2; Sat, 23 Aug 2025 21:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57NLPKT3098589; Sat, 23 Aug 2025 21:25:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLPK5i098586; Sat, 23 Aug 2025 21:25:20 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:25:20 GMT Message-Id: <202508232125.57NLPK5i098586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 2fd0083fcc23 - stable/14 - vfs_syscalls.c: Fix handling of offset args for copy_file_range List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fd0083fcc23f4c25860b8890292448720a5961c Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2fd0083fcc23f4c25860b8890292448720a5961c commit 2fd0083fcc23f4c25860b8890292448720a5961c Author: Rick Macklem AuthorDate: 2025-08-09 21:15:07 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:22:14 +0000 vfs_syscalls.c: Fix handling of offset args for copy_file_range Commit 197997a broke handling of the offset arguments to copy_file_range() when specified non-NULL. The code fails to update the offsets and, as such, a loop like: do { len = copy_file_range(infd, &inpos, outfd, &outpos, SSIZE_MAX, 0); } while (len > 0); becomes an infinite loop, just doing the same copy over and over again. This patch fixes it. The clause "(foffsets_locked || foffsets_set)" in the if is not actually needed for correctness, but I thought it made the code a little more readable and might avoid some static analyzer from throwing a "used before being set" for the savinoff and savoutoff variables. (cherry picked from commit 4046ad6bb0ee542a42d89a48a7d6a56564ed7f33) --- sys/kern/vfs_syscalls.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 37dc48c6a297..ded3a87e7f8b 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4918,11 +4918,12 @@ kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, size_t retlen; void *rl_rcookie, *rl_wcookie; off_t inoff, outoff, savinoff, savoutoff; - bool foffsets_locked; + bool foffsets_locked, foffsets_set; infp = outfp = NULL; rl_rcookie = rl_wcookie = NULL; foffsets_locked = false; + foffsets_set = false; error = 0; retlen = 0; @@ -4990,6 +4991,8 @@ kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, } foffset_lock_pair(infp1, &inoff, outfp1, &outoff, 0); foffsets_locked = true; + } else { + foffsets_set = true; } savinoff = inoff; savoutoff = outoff; @@ -5045,11 +5048,12 @@ out: vn_rangelock_unlock(invp, rl_rcookie); if (rl_wcookie != NULL) vn_rangelock_unlock(outvp, rl_wcookie); + if ((foffsets_locked || foffsets_set) && + (error == EINTR || error == ERESTART)) { + inoff = savinoff; + outoff = savoutoff; + } if (foffsets_locked) { - if (error == EINTR || error == ERESTART) { - inoff = savinoff; - outoff = savoutoff; - } if (inoffp == NULL) foffset_unlock(infp, inoff, 0); else @@ -5058,6 +5062,9 @@ out: foffset_unlock(outfp, outoff, 0); else *outoffp = outoff; + } else if (foffsets_set) { + *inoffp = inoff; + *outoffp = outoff; } if (outfp != NULL) fdrop(outfp, td); From nobody Sat Aug 23 21:33:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c8Vg15HdSz66STb; Sat, 23 Aug 2025 21:33: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8Vg14J0Tz3wTb; Sat, 23 Aug 2025 21:33:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSk3dwSA+7yc/3HNEVwmM8bUp119fELNxZq9zmBhMlk=; b=sOQr4NI6mpOw2RIUEdBEB6eS3ZpvxNpB+Dtx4yleYhYYleI3jiSuuXSG0+esHMwWi2KXVO k3ATR8H1L1GqCL/LjrqzynGE2xYVHtiOilP22Kq/OzpIXlwsf3fkyhznJ6ifzCrznqZ4x6 3IN7WlhM36eHWJgTsmhQpjNY0ICplvXEDTrp6hARNh4uyRXTD/9RtO6ib9Jc/r88z2bFx6 bwDV5cDlcCE7aWBaV0syjxXTo5X4R4nukqTzbY1Vb83fJwCJ1Cc1PZ3DgQ4UsrrW0Km1L2 X5rrNCyUeGfbmN/S5hZlu/etp4/qZzVGwmMo0JqTTksYXYWyhPPZaYwISP2nBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSk3dwSA+7yc/3HNEVwmM8bUp119fELNxZq9zmBhMlk=; b=svjTFeck+e3qIqBflfF2gHW+fGXYTCDyBMA/uUSMdcEhbcJuot//XXpTEFi+61mx5Me1FP tjPL0eEmQmM7BzXt4nR85mWHLVb0KAPJUCqMw5XMZhf9AQHMkEqWb7+n+GezD/XKFa9bmE HBOyQcslAMAsfmr5wGDnjaL9FaNFVNrjcJKv4M3rkhTFaT/f+DkJml6PQcKo09EF09P+e0 1dtpKTcd8yz2vI8RoX8BkcMKhH36gTNq0IytHfux3PyYKZLKIAR/HuQFyPOkbNedrgZkCU 72F4OFPy0LcgH7HPRhwuvFP+lQGFJXyTdEw2zcBVgnw/amReMY9otk8jeezKqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984829; a=rsa-sha256; cv=none; b=DtABVxpYWzbUt2f4m19eL9mAhKlbiddraWkO9W2wE/9l6ICJkC6cnKo1vT1IJNtdNIwVn9 PD09A1ZhgCXr6n6rd1DX+d2f1iKzJaAYDOCX994t9l4WuY6azRvRlUgn3/+QFBaJniV6TC sYsMTQTkeandEDnXEUUXhVG9Hk6yfXNfTXAfRhBiuDPBTrwap/JCRdK6xMnhCXbhi7Etir zqP4DlEFXUi8en+bxJInYQTdggJzNokwu6VPwxTW1JFqXnpNROhoMOZRhG2jIJfH/BJZM1 TKqsVIWLRpOsm1u9VKp+JwF0ZDt9BVgNMAI5HzI1DSShjeRkUmy5i7Tj+lBcyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c8Vg13q6xzZB2; Sat, 23 Aug 2025 21:33:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57NLXn3Q017352; Sat, 23 Aug 2025 21:33:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLXnIE017349; Sat, 23 Aug 2025 21:33:49 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:33:49 GMT Message-Id: <202508232133.57NLXnIE017349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 4f22d274ab0d - stable/14 - param.h: Bump __FreeBSD_version for 3f61ececacd8 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f22d274ab0d1da23c000e4f7f2ea003c5fa94a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4f22d274ab0d1da23c000e4f7f2ea003c5fa94a7 commit 4f22d274ab0d1da23c000e4f7f2ea003c5fa94a7 Author: Rick Macklem AuthorDate: 2025-08-23 21:30:10 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:30:10 +0000 param.h: Bump __FreeBSD_version for 3f61ececacd8 Bump __FreeBSD_version to 1403505 for 3f61ececacd8 since this commit changes the internal KAPI between the NFS modules. --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 3c3f4093ee1f..d3863d670431 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1403504 +#define __FreeBSD_version 1403505 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sat Aug 23 21:36:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c8Vjd0lg8z66S6D; Sat, 23 Aug 2025 21:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8Vjc6tQpz3wp1; Sat, 23 Aug 2025 21:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3q6dZPynpuBZ5eCNF5f8Biy6zKoGnPI8ztg/jnNOFm8=; b=HqnpGFoAqrzJPtduNeZNM9c9faSoav+aRHoaiyYULWHtpibmXppLaUKaXdTiCUzvjZ0VXZ 5dtKASA9axd92U/WaGYW+61YLI6wOHvBdm0McrRUT1kpPZKFNleluAfZCtnF8VA44WJKhE Qn7ZIVSNmiucnO75REu8YQEl312RTdphmTnPYO1y/H7M09P/nFASSBgZQyAZ43v2zPcEIO Tjj8Q4QdApwDZ9rjJkpHmXJzUfh0BF0JHpUqw6U8+FNDn0wZjhBgxYo8cCYye/lbLELg9y RF58rXagqxGHNedlgarCKN0c81/KpQj2X5sI4b1nhk+ulhks70FmQ8MpDPbbSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3q6dZPynpuBZ5eCNF5f8Biy6zKoGnPI8ztg/jnNOFm8=; b=SVTfcfaFk3WgM+IIDkWkbxpCFAL+lL9Q12iVFs9otP5tYT8kpdjd6J9Qiv7/G3nrCs1QQy v96d1TLD5VIYBSqPJJ+YBSn2wMLOhdjGrl6bRRJZsHCaCEJUb/cU7NNeJCFhBuOJDk0Emk SpSo9gdtLyGkvyFWGV3a1Blig/50HgChubns9nqp0qq7byp0NZgxcKNiqCBs9A5tNDyQMM TkVAkbTBBDINwrOaorilJW0gVtIUTnpuRiiBxI6FmTxzlGwR/oWd8gmISfpa3f5xIFXZTg W3dYeHW3FeCpGBOcHQS85P7yM0nVI2Yd8L1WyX7wi9vLr+7iwH6jHYFPS0BG0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984965; a=rsa-sha256; cv=none; b=eXBrzgj/cE4ryJ02o3JF9Cr8+XYsSdJF5a0+p+hrUO7Y5FvJmmGTTVHjA89WcQCrft7UU/ cwzm2dSlU2CpwIvuMjq5xsOMhh1i8GJ3dI5tB0yqxssVyVqw1ueu2flzClGwZzVcjXz3cX 70dm+lpdvDfUtahkOKdzblF1C3JWc1j1y9WhWEvL4x1NesIOwkNP6xnmanOiUssLbrH64u 6zspy4PXbSrskuRWBsYJNxc0PQ2EMnECPltCIcTYrjeI0EsqG2Gh7mVbqcUqg0SDd1uAC/ +Zowb3ln+/wIeTDe3TwvqYURgXHXxLUDr/pSH1LJ/IBsNtRcockzFhHb52PYAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c8Vjc6RVkzZB3; Sat, 23 Aug 2025 21:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57NLa49E018152; Sat, 23 Aug 2025 21:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLa4S0018149; Sat, 23 Aug 2025 21:36:04 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:36:04 GMT Message-Id: <202508232136.57NLa4S0018149@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: ea35c5b54fcc - stable/14 - UPDATING: Add an entry for commit 3f61ececacd8 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea35c5b54fccf7a3f71857a251e610a5090ad154 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ea35c5b54fccf7a3f71857a251e610a5090ad154 commit ea35c5b54fccf7a3f71857a251e610a5090ad154 Author: Rick Macklem AuthorDate: 2025-08-23 21:33:26 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:33:26 +0000 UPDATING: Add an entry for commit 3f61ececacd8 --- UPDATING | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UPDATING b/UPDATING index 858b24aad471..965ecac80055 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20250823: + Commit 3f61ececacd8 changed the internal KAPI between + the NFS modules. As such, they all need to be rebuilt + from sources. + 20250822: A build system bug which caused some files to be installed in the wrong package has been fixed. As a result some files have moved to different From nobody Sun Aug 24 00:27:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c8ZWD3jX7z64hpZ; Sun, 24 Aug 2025 00:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8ZWD32TKz3CGM; Sun, 24 Aug 2025 00:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755995240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xramz2JLZDlw4DbhA5af/cxpraWi0aeQOJxh64MTbv8=; b=rlNqCPIv9cpQWFQosf8XoUGoZQGQqW4a0A18XFFRdN1lFBjTCB8lvQx3nX+bCRcWwKj8tJ VnwX/Zgc7wEHnz5VxteaLEQWaStSkEJkpwJ3NNEWD9Iuv+agtfWH6XnkN/gjSXaD4NdSgp MPRKBR8HDnYCXdYJ8I5DFdFm3sglVDLo+YbG/iNoZ1lbQemgWr8g3JyIy8nbnd3XPIdE7y KwGVcfDZBijhb/EwMv+pLOD/FjuRreb/mc6c7n3QqZ7spIuDduWJknS7E/msvEO4F65Qcy hsSORgF/FaceuVfJa1pM5Y0FkHYODQOFJerd0D98xjzv5Lsly7mY51Rjr3+izg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755995240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xramz2JLZDlw4DbhA5af/cxpraWi0aeQOJxh64MTbv8=; b=FMyICyEOE3/4tMQ9V17osS12XvPe9TRMyuqT6JH80oyP9Uzl9804D3Fxs6MNcUS5YX87TW d6W0yr4KsVwwcwXAxXzGJgMu9bbVCETRyo97aDAWwaPCa8o11JF3xp/4DjPTIEbU+I/0kw 8ax/7YMzRiaOA2G4oxbmDfpWJBcsoMVKzAEc9HROVRTLnwLuIj4/m1jXBofEWGMQosEu1k GBO7LWEa/qL/wbH9iwFZlN97Rqey1pi2s3UmoqlTyLoTN+GMQaXdID79NW0TeSity2tTq9 KlNzvBJjlB/mjtFxwLQLiK3Z7LH0RkdTbHmPbOsQyYGSua0xvZ+e80qcH3ga8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755995240; a=rsa-sha256; cv=none; b=cTJcVyf6qMYoRdhq0OUJy+r7EjxfOl+1Myhce6FTKkcpP2bILJcgtGFvbnOzx6bjA+4GoK D9OnIfobrm4DGgKDT8mkptk7qqU4Nv1+M2qYADskuKBDGxOZGjmIRPwQJA+Qjmpd+hTADq wOhQtllOL0nPuJINSIi87bF4RZ/IeO2LqRVQdYjFyZHffmFFUNOpu+2W7viE+cpWTBjEYq N/WtdsaqZBxP9VqnTupVQR5dKiI6c/qCp7I28J/bo8scN/edIvEtsFP78f2963Bfv174dF g0b/hYFUz0rQos/+oKy2NpfwEzqBJcSfhGoavP5kEYEtWbM+HzKUIBhRcSgRTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c8ZWD29DNzg1P; Sun, 24 Aug 2025 00:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57O0RKLk038172; Sun, 24 Aug 2025 00:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57O0RKv4038169; Sun, 24 Aug 2025 00:27:20 GMT (envelope-from git) Date: Sun, 24 Aug 2025 00:27:20 GMT Message-Id: <202508240027.57O0RKv4038169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0c3d511959ba - stable/14 - ufs: st_rdev is only meaningful for special nodes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c3d511959bac1661cb3891042e380bc480d8266 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0c3d511959bac1661cb3891042e380bc480d8266 commit 0c3d511959bac1661cb3891042e380bc480d8266 Author: Konstantin Belousov AuthorDate: 2025-08-17 13:03:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-24 00:26:56 +0000 ufs: st_rdev is only meaningful for special nodes (cherry picked from commit 6fd60c4887cb08203f654e6aac6b4dbaaf76111b) --- sys/ufs/ufs/ufs_vnops.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 4aed4f7db42c..d9e9397631f4 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -542,7 +542,8 @@ ufs_stat(struct vop_stat_args *ap) sb->st_uid = ip->i_uid; sb->st_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - sb->st_rdev = ip->i_din1->di_rdev; + sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din1->di_rdev : NODEV; sb->st_size = ip->i_din1->di_size; sb->st_mtim.tv_sec = ip->i_din1->di_mtime; sb->st_mtim.tv_nsec = ip->i_din1->di_mtimensec; @@ -553,7 +554,8 @@ ufs_stat(struct vop_stat_args *ap) sb->st_blocks = dbtob((uint64_t)ip->i_din1->di_blocks) / S_BLKSIZE; sb->st_filerev = ip->i_din1->di_modrev; } else { - sb->st_rdev = ip->i_din2->di_rdev; + sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din2->di_rdev : NODEV; sb->st_size = ip->i_din2->di_size; sb->st_mtim.tv_sec = ip->i_din2->di_mtime; sb->st_mtim.tv_nsec = ip->i_din2->di_mtimensec; @@ -605,7 +607,8 @@ ufs_getattr( vap->va_uid = ip->i_uid; vap->va_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - vap->va_rdev = ip->i_din1->di_rdev; + vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din1->di_rdev : NODEV; vap->va_size = ip->i_din1->di_size; vap->va_mtime.tv_sec = ip->i_din1->di_mtime; vap->va_mtime.tv_nsec = ip->i_din1->di_mtimensec; @@ -614,7 +617,8 @@ ufs_getattr( vap->va_bytes = dbtob((uint64_t)ip->i_din1->di_blocks); vap->va_filerev = ip->i_din1->di_modrev; } else { - vap->va_rdev = ip->i_din2->di_rdev; + vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? + ip->i_din2->di_rdev : NODEV; vap->va_size = ip->i_din2->di_size; vap->va_mtime.tv_sec = ip->i_din2->di_mtime; vap->va_mtime.tv_nsec = ip->i_din2->di_mtimensec; From nobody Sun Aug 24 20:50:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c95fX4Kyjz661ZJ; Sun, 24 Aug 2025 20:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c95fX3qlqz3PVf; Sun, 24 Aug 2025 20:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756068628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YJgqun7hb6n7n4VF7z8WmENClxpxi8+qc9DKAr2+R6Q=; b=kjz6GNHypZ5ufMw/+7907zolI0FkXv9kZOtIIGl3TnzqRDjCcRsFaBmxVF4ljmQNMR3+CX NXyONU4EBiaQDNQzQiXhJGyovbRoHAsvyVKvrpECzmWOxxUkA/8noS8sVZb/VFyERo9DEb KGgPLscsVR70l4PFAyaN1jbfShnEOAof0t4waeHQ/y0UUCksTjCjgN5iBWwH6/XcyAQghD +Z2trsyiY7xAVEOIj9P1T3b/eM/pP1DnJBuQtdFJEM3nioTe+KmpuWja875281aJvAZ1Oh wnLnEQHCseiVeYKyAhiAtq4rPtbjUUDNWI4OG5xfwAQbALtE86oiN8HsoyhNrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756068628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YJgqun7hb6n7n4VF7z8WmENClxpxi8+qc9DKAr2+R6Q=; b=heRsCPB91BBU3f90KTfGTX+SrIvmX4tum5UuB9VMeFwKkGgxPD0O/zcCLX4oHaOuQMF98q XE3Uk7fSWwgnm9uK5nnG2FFT+56pRPwHx4yBveS/70zZMPt45TZMDt4Kgj9R+palx5n4wP xB2hNNy+8eKxOMd+dxlgmhtx55vi8B9Q3jt00runoxxqjwREZApofFlUn1phWCFDctlFzh fUOr8+dmtjcqrmKuQBEVTkV/rQ0FrjuS93ZSIwhZqljz8sd1V/VBbu7WuVQdNQhvgTItn/ REigtaB+vgLKuYa+BajtM6rfdJyGdVA99DPKq/HGSEuHrB2VN5CkdoXCraJSQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756068628; a=rsa-sha256; cv=none; b=Mx1EOXUgQtvABTAlYD38DTl5S+GVQ45lGs2MTKVVjfB9bas7cRutOOa5oIocvub5RUoPHq ulkwSr5b2HcVhgkdh8yM5su05DTgn6fGHF6+lI/fH73zSn7lcTRJkQOWcJooc2M7ainUKp SGh5ipAvRzUTrVB0qtI132/8xGqSFEatUEDZP8AjF5YZ7Zaxn3/D199Tr5IywQyEfdE35I fobnjTA9GYUP6hMHTJv64kTqbC/f+ZaB+DYiuT4GrSXjQqOtepI4Suyn5ONeEQO8UE19Yh W/nPCd0IP0ztZnKspRLxsw9ttZGWn0K+Ey1+xteMbPriX5yfUhTkuYvIZxmysA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c95fX3QCFz43k; Sun, 24 Aug 2025 20:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57OKoS2G048312; Sun, 24 Aug 2025 20:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OKoSRr048309; Sun, 24 Aug 2025 20:50:28 GMT (envelope-from git) Date: Sun, 24 Aug 2025 20:50:28 GMT Message-Id: <202508242050.57OKoSRr048309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 53b021680ed9 - stable/14 - bsdinstall: Improve message for existing FreeBSD EFI entry List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53b021680ed97b7169ffc244894a8f8179867ac6 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=53b021680ed97b7169ffc244894a8f8179867ac6 commit 53b021680ed97b7169ffc244894a8f8179867ac6 Author: Ed Maste AuthorDate: 2025-07-25 14:25:18 +0000 Commit: Ed Maste CommitDate: 2025-08-24 20:49:40 +0000 bsdinstall: Improve message for existing FreeBSD EFI entry When reinstalling FreeBSD bsdinstall reported "There are multiple FreeBSD EFI boot entries." This sounds like something went wrong in the past. Clarify that there may be only one existing entry, which is not surprising for a reinstall. Reviewed by: manu, ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51527 (cherry picked from commit ebc6ff8db17683b566d49fe89a43a668d3d67915) --- usr.sbin/bsdinstall/scripts/bootconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig index 618a1966095e..6438f7ef1fca 100755 --- a/usr.sbin/bsdinstall/scripts/bootconfig +++ b/usr.sbin/bsdinstall/scripts/bootconfig @@ -71,7 +71,7 @@ update_uefi_bootentry() fi $DIALOG --backtitle "$OSNAME Installer" --title 'Boot Configuration' \ - --yesno "There are multiple \"$OSNAME\" EFI boot entries. Would you like to remove them all and add a new one?" 0 0 + --yesno "One or more \"$OSNAME\" EFI boot manager entries already exist. Would you like to remove them all and add a new one?" 0 0 if [ $? -eq $DIALOG_OK ]; then for entry in $(efibootmgr | awk "\$NF == \"$EFI_LABEL_NAME\" { sub(/.*Boot/,\"\", \$1); sub(/\*/,\"\", \$1); print \$1 }"); do efibootmgr -B -b ${entry}