From nobody Mon Dec 9 03:28:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y66lQ0CxTz5g7kr; Mon, 09 Dec 2024 03:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y66lP6nNqz44Tt; Mon, 9 Dec 2024 03:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yw+7iYDDkWoxp7bpEySZbIawHfUBl6tOfquMTA7AupA=; b=ZAevO8SJeDPioTLMmSyE3TFxkoFoAb+MBQZm4Zqd392XRn8vNyFQIiSMVHbSPhOnotoQCK 5s7SQRFoym/1Nj7OWYO3hNzkOcUFzNKZrqvnjOIHCAD0X1n/hv/hWHdWtRX5jTfGu3Nno4 IgUid/Iwc5WD7U3sumL6UmuYFNJRTSy6OoW1a0Rg8gSK1xs85tM9wx74NwQQY61h4xd7Tx 9kTIEGd94SVBImbjyrqDrF+QJogUjLCghC8mjrv6mYfDhzRTgBwEnBWPJ8SOvSETDaesC3 4ONYzG+CDTfODwPWD4fUk1M9bOPNh2sjZnKPhSpT/RsOUj3pwNEVqSgmJl2J9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yw+7iYDDkWoxp7bpEySZbIawHfUBl6tOfquMTA7AupA=; b=yDSPb5EiGO4NMUC9ZFDnPID+cDJXn868c3tuPTMdn4CN1sNvTRC0fWkwZsyhLQ4y8S74mT gDUWXeWJEIDwiAR7swS8zU6JsJf3EMPwzkn+EC9e3DzuxO5noSMMaQ16BXBSP1yLK+1ciS zBvwybHR06jr6a3+ZczNOAGGr2S/pUEVJkaQfWKKUvAE6wf8S9Y2hS8Gv4Z5kYMaPdVxrb S+OmeT2Ozc+ctw1IEHQWM67eRWPJyYmgnVXuyJ/7QLk4VbLR6c+StPTO6SBwxK43NujqOF 7BapkL/NSz+Uyfpj4LjIR+FD0yuk70oFQKjCAPxPbb//s66xot8ly8pmAt+1PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733714914; a=rsa-sha256; cv=none; b=psLHDuUnomwo9n+dZfiFXQ3/FwpDBl6bQ0ZBO6CjR1iVxA0VMzJc2r7DwLt+yBGL0m+Oqj g5E2o5UTeyW9k1Dy0/5PsJHNFXelGOWMCyEYN8FmsX+KJx1idLLDeGCwkUmkE1n9vfMUcc 24A7mtdprE0t9eAtiAfGactBcd0Wtje/jsihandWjyzboXjGbfgDPY6+PHEjVXekvosjBy l+bZzqE/I3ZHIWjZgWsqvFthYEq3tq9SnFdxnaT5SCvQikEhJ9xYUZuWw0WQRRIwyVXrbv xjG2MPfLvg41jutlPoRg9lHXPUl8sIWD2ybBsuTTCtJBajsWXXAUEn+IigkRkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y66lP6FhWzLTD; Mon, 9 Dec 2024 03:28: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 4B93SXUg083710; Mon, 9 Dec 2024 03:28:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B93SXxd083707; Mon, 9 Dec 2024 03:28:33 GMT (envelope-from git) Date: Mon, 9 Dec 2024 03:28:33 GMT Message-Id: <202412090328.4B93SXxd083707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6ed68e6f5d47 - main - vm_map: overlap system map mutex and user man sx List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ed68e6f5d47ca30716d4e06c1452e68530970db Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6ed68e6f5d47ca30716d4e06c1452e68530970db commit 6ed68e6f5d47ca30716d4e06c1452e68530970db Author: Konstantin Belousov AuthorDate: 2024-12-05 22:44:08 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-09 03:27:44 +0000 vm_map: overlap system map mutex and user man sx This saves 616-584 = 32 bytes per struct vmspace on amd64, which allows to pack 7 vmspaces per page vs. 6 for non-overlapping layout. I used anonymous union member feature to avoid too much churn. Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D47934 --- sys/vm/vm_kern.c | 3 +-- sys/vm/vm_map.c | 18 +++++++++++------- sys/vm/vm_map.h | 7 +++++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index a748a6c57d65..29a64a0fe6d8 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -830,8 +830,7 @@ kmem_init(vm_offset_t start, vm_offset_t end) vm_size_t quantum; int domain; - vm_map_init(kernel_map, kernel_pmap, VM_MIN_KERNEL_ADDRESS, end); - kernel_map->system_map = 1; + vm_map_init_system(kernel_map, kernel_pmap, VM_MIN_KERNEL_ADDRESS, end); vm_map_lock(kernel_map); /* N.B.: cannot use kgdb to debug, starting with this assignment ... */ (void)vm_map_insert(kernel_map, NULL, 0, diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 910ebfb6dc4e..c3aa499e0dc7 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -292,9 +292,7 @@ vmspace_zinit(void *mem, int size, int flags) vm = (struct vmspace *)mem; map = &vm->vm_map; - memset(map, 0, sizeof(*map)); - mtx_init(&map->system_mtx, "vm map (system)", NULL, - MTX_DEF | MTX_DUPOK); + memset(map, 0, sizeof(*map)); /* set map->system_map = false */ sx_init(&map->lock, "vm map (user)"); PMAP_LOCK_INIT(vmspace_pmap(vm)); return (0); @@ -890,7 +888,6 @@ _vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max) map->header.eflags = MAP_ENTRY_HEADER; map->needs_wakeup = FALSE; - map->system_map = 0; map->pmap = pmap; map->header.end = min; map->header.start = max; @@ -908,13 +905,20 @@ _vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max) void vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max) { - _vm_map_init(map, pmap, min, max); - mtx_init(&map->system_mtx, "vm map (system)", NULL, - MTX_DEF | MTX_DUPOK); + map->system_map = false; sx_init(&map->lock, "vm map (user)"); } +void +vm_map_init_system(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max) +{ + _vm_map_init(map, pmap, min, max); + map->system_map = true; + mtx_init(&map->system_mtx, "vm map (system)", NULL, MTX_DEF | + MTX_DUPOK); +} + /* * vm_map_entry_dispose: [ internal use only ] * diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index d0b4bb52968e..5ecec0531e1c 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -203,8 +203,10 @@ vm_map_entry_system_wired_count(vm_map_entry_t entry) */ struct vm_map { struct vm_map_entry header; /* List of entries */ - struct sx lock; /* Lock for map data */ - struct mtx system_mtx; + union { + struct sx lock; /* Lock for map data */ + struct mtx system_mtx; + }; int nentries; /* Number of entries */ vm_size_t size; /* virtual size */ u_int timestamp; /* Version number */ @@ -484,6 +486,7 @@ int vm_map_fixed(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t, vm_size_t, vm_offset_t vm_map_findspace(vm_map_t, vm_offset_t, vm_size_t); int vm_map_inherit (vm_map_t, vm_offset_t, vm_offset_t, vm_inherit_t); void vm_map_init(vm_map_t, pmap_t, vm_offset_t, vm_offset_t); +void vm_map_init_system(vm_map_t, pmap_t, vm_offset_t, vm_offset_t); int vm_map_insert (vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t, vm_offset_t, vm_prot_t, vm_prot_t, int); int vm_map_lookup (vm_map_t *, vm_offset_t, vm_prot_t, vm_map_entry_t *, vm_object_t *, vm_pindex_t *, vm_prot_t *, boolean_t *); From nobody Mon Dec 9 03:28:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y66lR3Lz3z5g7fv; Mon, 09 Dec 2024 03:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y66lR2lW0z44nx; Mon, 9 Dec 2024 03:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HiJDa3RNVajpJQnYNkg6HFTI0ZFZWigmRoxq+deS2SM=; b=Gcx8rwfr7oz7uoQfH07WsZwQIo0Hcy3RGIQ4SK/i/oeGT7pbxFpnU9K0r+rLI8ZAmpkWYj AkgNhxqocPuvaYa2kyp7QoV0Tf8+KlJsbP3NJiCWJEESKCgk0J6mfVX39sAAZ1GfhHVDhm 3n8/OPRGbREMYIGOSb8W4d+UCySYu7urWad3AuKGW6pN5gbfFEjP21kRgSEhqFxiQ5fSg5 U1cEV8IdLRny6ck/0E8PbwqYfdethTBJMvITYkZLDg8TbrmGM2eGPwjrqaYMuRnThZdZMy DNcTwz65W5oaa6SF/sJgV/nftO8RFRu69YE11FkdunfEd+XJ5Psyw+rj3thixw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HiJDa3RNVajpJQnYNkg6HFTI0ZFZWigmRoxq+deS2SM=; b=johnbBPKELHd9Di7prChG6kOGgziWPOoEGyhPape8cppyQujjf59dzP0ENRJu9HqbgBmAy Vg1V4XPWISzzjtHbBWzEoc2zJzKFW9ggh8Ffs+9bVVKKQ4/nPJlUo+ZyASv5s4wd+3ZDDT eAnaRFIFB5+DMEJBsk8dpgM8cuhk6grK4QlCG6akq71jL9/xCNUGWaJB8Eur8+06073dYe bHXfUWZGtfaTBspY8yfz+gzbuGskY8/g9BpMFrsOLB3g9mONHA5lQ4qLz7fUXxXViAHsdj m3l02m+a3MdhpaEGmY49nAcjmWEAeOGX5ta7NbZ/g4H9fLppLVSmMVdThSilJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733714915; a=rsa-sha256; cv=none; b=ZAkKdHfLQX3+NrI9fr3DMfPmHnmyr8ciJHkmLsgWqMQesTz0W4PBu6LBx2l4zCjmUzBTIy 6MHha13GZikrvRoBz2N1W1wyTIjldVlHCpF7oeaVDTyAOrrgOSYS5Kw2M4hwWbDfpLqNCq TXX47OfIzxOnokJNHzIHQIRPR2QpNP6BitwpyaSJ4pDhv3aJ2fFyvkzzYY4Ww89MWvL8wC Lu1Gyuz/x5Gt0hdTBNMzsKGUuq9CRjF1svQUzXVPifrVtdwEf0FdkdyQlYCsAy2v6hGXvN jzkU4h5xoJyf87Vn4CB48x7h1QXNF6Q6zpqgYHKMVAYrbuQ6sXFyZnRcU0VAMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y66lR0TpszKwx; Mon, 9 Dec 2024 03:28:35 +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 4B93SYvP083764; Mon, 9 Dec 2024 03:28:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B93SYHh083761; Mon, 9 Dec 2024 03:28:34 GMT (envelope-from git) Date: Mon, 9 Dec 2024 03:28:34 GMT Message-Id: <202412090328.4B93SYHh083761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c5b19cef3609 - main - vm_map: wrap map->system_map checks into wrapper List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5b19cef3609211e692d6b21abcddef877c94af7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c5b19cef3609211e692d6b21abcddef877c94af7 commit c5b19cef3609211e692d6b21abcddef877c94af7 Author: Konstantin Belousov AuthorDate: 2024-12-06 23:51:08 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-09 03:27:44 +0000 vm_map: wrap map->system_map checks into wrapper Reviewed by: alc Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D47934 --- sys/vm/vm_fault.c | 2 +- sys/vm/vm_map.c | 49 ++++++++++++++++++++++++------------------------- sys/vm/vm_map.h | 6 ++++++ sys/vm/vm_pageout.c | 2 +- 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 6e0415b30600..8c7fe9e37af1 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1355,7 +1355,7 @@ vm_fault_getpages(struct faultstate *fs, int *behindp, int *aheadp) MPASS(status == FAULT_CONTINUE || status == FAULT_RESTART); if (status == FAULT_RESTART) return (status); - KASSERT(fs->vp == NULL || !fs->map->system_map, + KASSERT(fs->vp == NULL || !vm_map_is_system(fs->map), ("vm_fault: vnode-backed object mapped by system map")); /* diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index c3aa499e0dc7..f7847a244586 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -523,7 +523,7 @@ void _vm_map_lock(vm_map_t map, const char *file, int line) { - if (map->system_map) + if (vm_map_is_system(map)) mtx_lock_flags_(&map->system_mtx, 0, file, line); else sx_xlock_(&map->lock, file, line); @@ -614,7 +614,7 @@ static void _vm_map_assert_locked(vm_map_t map, const char *file, int line) { - if (map->system_map) + if (vm_map_is_system(map)) mtx_assert_(&map->system_mtx, MA_OWNED, file, line); else sx_assert_(&map->lock, SA_XLOCKED, file, line); @@ -657,7 +657,7 @@ _vm_map_unlock(vm_map_t map, const char *file, int line) { VM_MAP_UNLOCK_CONSISTENT(map); - if (map->system_map) { + if (vm_map_is_system(map)) { #ifndef UMA_USE_DMAP if (map == kernel_map && (map->flags & MAP_REPLENISH) != 0) { uma_prealloc(kmapentzone, 1); @@ -675,7 +675,7 @@ void _vm_map_lock_read(vm_map_t map, const char *file, int line) { - if (map->system_map) + if (vm_map_is_system(map)) mtx_lock_flags_(&map->system_mtx, 0, file, line); else sx_slock_(&map->lock, file, line); @@ -685,7 +685,7 @@ void _vm_map_unlock_read(vm_map_t map, const char *file, int line) { - if (map->system_map) { + if (vm_map_is_system(map)) { KASSERT((map->flags & MAP_REPLENISH) == 0, ("%s: MAP_REPLENISH leaked", __func__)); mtx_unlock_flags_(&map->system_mtx, 0, file, line); @@ -700,7 +700,7 @@ _vm_map_trylock(vm_map_t map, const char *file, int line) { int error; - error = map->system_map ? + error = vm_map_is_system(map) ? !mtx_trylock_flags_(&map->system_mtx, 0, file, line) : !sx_try_xlock_(&map->lock, file, line); if (error == 0) @@ -713,7 +713,7 @@ _vm_map_trylock_read(vm_map_t map, const char *file, int line) { int error; - error = map->system_map ? + error = vm_map_is_system(map) ? !mtx_trylock_flags_(&map->system_mtx, 0, file, line) : !sx_try_slock_(&map->lock, file, line); return (error == 0); @@ -734,7 +734,7 @@ _vm_map_lock_upgrade(vm_map_t map, const char *file, int line) { unsigned int last_timestamp; - if (map->system_map) { + if (vm_map_is_system(map)) { mtx_assert_(&map->system_mtx, MA_OWNED, file, line); } else { if (!sx_try_upgrade_(&map->lock, file, line)) { @@ -760,7 +760,7 @@ void _vm_map_lock_downgrade(vm_map_t map, const char *file, int line) { - if (map->system_map) { + if (vm_map_is_system(map)) { KASSERT((map->flags & MAP_REPLENISH) == 0, ("%s: MAP_REPLENISH leaked", __func__)); mtx_assert_(&map->system_mtx, MA_OWNED, file, line); @@ -780,10 +780,9 @@ int vm_map_locked(vm_map_t map) { - if (map->system_map) + if (vm_map_is_system(map)) return (mtx_owned(&map->system_mtx)); - else - return (sx_xlocked(&map->lock)); + return (sx_xlocked(&map->lock)); } /* @@ -806,7 +805,7 @@ _vm_map_unlock_and_wait(vm_map_t map, int timo, const char *file, int line) VM_MAP_UNLOCK_CONSISTENT(map); mtx_lock(&map_sleep_mtx); - if (map->system_map) { + if (vm_map_is_system(map)) { KASSERT((map->flags & MAP_REPLENISH) == 0, ("%s: MAP_REPLENISH leaked", __func__)); mtx_unlock_flags_(&map->system_mtx, 0, file, line); @@ -864,7 +863,7 @@ vm_map_wait_busy(vm_map_t map) VM_MAP_ASSERT_LOCKED(map); while (map->busy) { vm_map_modflags(map, MAP_BUSY_WAKEUP, 0); - if (map->system_map) + if (vm_map_is_system(map)) msleep(&map->busy, &map->system_mtx, 0, "mbusy", 0); else sx_sleep(&map->busy, &map->lock, 0, "mbusy", 0); @@ -927,7 +926,7 @@ vm_map_init_system(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max) static void vm_map_entry_dispose(vm_map_t map, vm_map_entry_t entry) { - uma_zfree(map->system_map ? kmapentzone : mapentzone, entry); + uma_zfree(vm_map_is_system(map) ? kmapentzone : mapentzone, entry); } /* @@ -961,7 +960,7 @@ vm_map_entry_create(vm_map_t map) } } else #endif - if (map->system_map) { + if (vm_map_is_system(map)) { new_entry = uma_zalloc(kmapentzone, M_NOWAIT); } else { new_entry = uma_zalloc(mapentzone, M_WAITOK); @@ -2428,7 +2427,7 @@ vm_map_entry_charge_object(vm_map_t map, vm_map_entry_t entry) VM_MAP_ASSERT_LOCKED(map); KASSERT((entry->eflags & MAP_ENTRY_IS_SUB_MAP) == 0, ("map entry %p is a submap", entry)); - if (entry->object.vm_object == NULL && !map->system_map && + if (entry->object.vm_object == NULL && !vm_map_is_system(map) && (entry->eflags & MAP_ENTRY_GUARD) == 0) vm_map_entry_back(entry); else if (entry->object.vm_object != NULL && @@ -2493,7 +2492,7 @@ vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t startaddr) vm_map_entry_t new_entry; int bdry_idx; - if (!map->system_map) + if (!vm_map_is_system(map)) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "%s: map %p entry %p start 0x%jx", __func__, map, entry, (uintmax_t)startaddr); @@ -2536,7 +2535,7 @@ vm_map_lookup_clip_start(vm_map_t map, vm_offset_t start, vm_map_entry_t entry; int rv; - if (!map->system_map) + if (!vm_map_is_system(map)) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "%s: map %p start 0x%jx prev %p", __func__, map, (uintmax_t)start, prev_entry); @@ -2566,7 +2565,7 @@ vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t endaddr) vm_map_entry_t new_entry; int bdry_idx; - if (!map->system_map) + if (!vm_map_is_system(map)) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "%s: map %p entry %p end 0x%jx", __func__, map, entry, (uintmax_t)endaddr); @@ -3936,7 +3935,7 @@ vm_map_entry_delete(vm_map_t map, vm_map_entry_t entry) MPASS(entry->cred == NULL); MPASS((entry->eflags & MAP_ENTRY_IS_SUB_MAP) == 0); MPASS(object == NULL); - vm_map_entry_deallocate(entry, map->system_map); + vm_map_entry_deallocate(entry, vm_map_is_system(map)); return; } @@ -3987,7 +3986,7 @@ vm_map_entry_delete(vm_map_t map, vm_map_entry_t entry) } VM_OBJECT_WUNLOCK(object); } - if (map->system_map) + if (vm_map_is_system(map)) vm_map_entry_deallocate(entry, TRUE); else { entry->defer_next = curthread->td_map_def_user; @@ -4710,7 +4709,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) p->p_textvp == NULL)) return (KERN_FAILURE); - MPASS(!map->system_map); + MPASS(!vm_map_is_system(map)); lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK); stacklim = lim_cur(curthread, RLIMIT_STACK); @@ -5118,7 +5117,7 @@ RetryLookupLocked: /* * Create an object if necessary. */ - if (entry->object.vm_object == NULL && !map->system_map) { + if (entry->object.vm_object == NULL && !vm_map_is_system(map)) { if (vm_map_lock_upgrade(map)) goto RetryLookup; entry->object.vm_object = vm_object_allocate_anon(atop(size), @@ -5206,7 +5205,7 @@ vm_map_lookup_locked(vm_map_t *var_map, /* IN/OUT */ /* * Fail if an object should be created. */ - if (entry->object.vm_object == NULL && !map->system_map) + if (entry->object.vm_object == NULL && !vm_map_is_system(map)) return (KERN_FAILURE); /* diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 5ecec0531e1c..ed1106734951 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -278,6 +278,12 @@ vm_map_range_valid(vm_map_t map, vm_offset_t start, vm_offset_t end) return (true); } +static inline bool +vm_map_is_system(vm_map_t map) +{ + return ((map->system_map)); +} + #endif /* KLD_MODULE */ #endif /* _KERNEL */ diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index f6c5e6291692..28a54a83fd49 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -1844,7 +1844,7 @@ vm_pageout_oom_pagecount(struct vmspace *vmspace) long res; map = &vmspace->vm_map; - KASSERT(!map->system_map, ("system map")); + KASSERT(!vm_map_is_system(map), ("system map")); sx_assert(&map->lock, SA_LOCKED); res = 0; VM_MAP_ENTRY_FOREACH(entry, map) { From nobody Mon Dec 9 03:28:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y66lT5cJBz5g7c4; Mon, 09 Dec 2024 03:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y66lT3cgbz44jy; Mon, 9 Dec 2024 03:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZIn5HbBTPa+zOlMQz5/NqTvFnDmi4N5j2zfcIxy03o=; b=ySWsV+w5hQHbib4Q2Z33zRZvbZ4/AbMDyKfq0lD8XNihT/P9wX1acI1JaLIwLL4wRfcMtN tORSdfxahAOPst9pE4ltfQfkfHGJRIwNCJFma/DhJUKvCBgPP4ArpUpdCDmCByXca39Ttc 57Cs3GVMiXKDdsW7483Qy/Y36ZQwtXWfTOqbeYARWyS5hTfUUasAAOeXYBR+s/ekXcXbaR CKPk7lZa7QanmlE9KPZ5/nwuVdZYwiyF3v+Wysr0NZ442Hl431zPZ5kAeqmcSSXHa5enxa bHsYH8WWON4O1ATEnyZTKyrfvyDf1Dauz0rSrS9Z5JdxHvyQrNlfW/E2Bx+Vqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZIn5HbBTPa+zOlMQz5/NqTvFnDmi4N5j2zfcIxy03o=; b=o/OFsqb9mH0qvt1hnHSUqlWgy5POcz4ZdOyREdtBmc+lBzf3eo7g88SBaUVQuAQ/esOeS8 IxEd8PhVBNrI0wX6LH+UjCN3QFsnBwO5VgblkUe7FKK8gey3FPEURcZ3htcCMj46ZyMaSo aBoBS1k78VO2cZspyQPgDZqHTxQ69jkJs7uEhqwpZAm94Qf7czEMkpUqq2sdoPRHhBAXRu /MaTQsnK8J3t3UHzTtU8yIfr2jhZzz2dyB0ghn251sBmL6nmtAfxKqwAWoL8efGx2inF5y ilDwyozBqf2tCb6lq9hiOQxTdeKhQv4j4FCConm3zEWDx+RoyxluNid3wgUCtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733714917; a=rsa-sha256; cv=none; b=StzHzYDjITP5xYmYQAoq/mmg9aArfFYOnHArOCCSsLfGLLQBqw/SebQ+BLyRZKYA54xoZe BmSm+JXli8jzXLClGeH7yj2ms8R+RJNOenyOyisrK8oEmhLPDAhQi/k9Kych5rI9WsRGlU 3nFCov+6Hmuov8H3dMl39+L7/inpdAI086mfbR3pVaO4N1F8d/UP+LDGAlIyHCb4IBkW3/ TQhI5ji9s6u/7riZhMwsYDQXDs+dmIclppB82roAuPWwdivZUniQSJHXQw0xhBF6t1VwZC igSqL42LZe/OyWiUfH/rA6lrnXR+Uq49MLnPhDDBCZy0l+5YLl1UD68C5HeXmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y66lT1qGtzLTF; Mon, 9 Dec 2024 03:28:37 +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 4B93SbTp083872; Mon, 9 Dec 2024 03:28:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B93Sbdt083869; Mon, 9 Dec 2024 03:28:37 GMT (envelope-from git) Date: Mon, 9 Dec 2024 03:28:37 GMT Message-Id: <202412090328.4B93Sbdt083869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d939fd2d4512 - main - vm_map: convert several bool members into flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d939fd2d4512c9811246834a19946f69350764e0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d939fd2d4512c9811246834a19946f69350764e0 commit d939fd2d4512c9811246834a19946f69350764e0 Author: Konstantin Belousov AuthorDate: 2024-12-06 23:52:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-09 03:27:44 +0000 vm_map: convert several bool members into flags Extend flags to u_int. Move system_map and needs_wakeup bools into flags. Reviewed by: alc Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D47934 --- sys/vm/vm_kern.c | 6 +++--- sys/vm/vm_map.c | 6 ++---- sys/vm/vm_map.h | 12 ++++++------ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 29a64a0fe6d8..86ab2529e27f 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -724,7 +724,7 @@ kmap_alloc_wait(vm_map_t map, vm_size_t size) swap_release(size); return (0); } - map->needs_wakeup = TRUE; + vm_map_modflags(map, MAP_NEEDS_WAKEUP, 0); vm_map_unlock_and_wait(map, 0); } vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_RW, VM_PROT_RW, @@ -745,8 +745,8 @@ kmap_free_wakeup(vm_map_t map, vm_offset_t addr, vm_size_t size) vm_map_lock(map); (void) vm_map_delete(map, trunc_page(addr), round_page(addr + size)); - if (map->needs_wakeup) { - map->needs_wakeup = FALSE; + if ((map->flags & MAP_NEEDS_WAKEUP) != 0) { + vm_map_modflags(map, 0, MAP_NEEDS_WAKEUP); vm_map_wakeup(map); } vm_map_unlock(map); diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index f7847a244586..564ef59950e4 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -292,7 +292,7 @@ vmspace_zinit(void *mem, int size, int flags) vm = (struct vmspace *)mem; map = &vm->vm_map; - memset(map, 0, sizeof(*map)); /* set map->system_map = false */ + memset(map, 0, sizeof(*map)); /* set MAP_SYSTEM_MAP to false */ sx_init(&map->lock, "vm map (user)"); PMAP_LOCK_INIT(vmspace_pmap(vm)); return (0); @@ -886,7 +886,6 @@ _vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max) { map->header.eflags = MAP_ENTRY_HEADER; - map->needs_wakeup = FALSE; map->pmap = pmap; map->header.end = min; map->header.start = max; @@ -905,7 +904,6 @@ void vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max) { _vm_map_init(map, pmap, min, max); - map->system_map = false; sx_init(&map->lock, "vm map (user)"); } @@ -913,7 +911,7 @@ void vm_map_init_system(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max) { _vm_map_init(map, pmap, min, max); - map->system_map = true; + vm_map_modflags(map, MAP_SYSTEM_MAP, 0); mtx_init(&map->system_mtx, "vm map (system)", NULL, MTX_DEF | MTX_DUPOK); } diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index caed29bd23cf..9645ae1a0527 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -210,9 +210,7 @@ struct vm_map { int nentries; /* Number of entries */ vm_size_t size; /* virtual size */ u_int timestamp; /* Version number */ - u_char needs_wakeup; - u_char system_map; /* (c) Am I a system map? */ - vm_flags_t flags; /* flags for this vm_map */ + u_int flags; /* flags for this vm_map */ vm_map_entry_t root; /* Root of a binary search tree */ pmap_t pmap; /* (c) Physical map */ vm_offset_t anon_loc; @@ -223,7 +221,7 @@ struct vm_map { }; /* - * vm_flags_t values + * vm_map flags values */ #define MAP_WIREFUTURE 0x00000001 /* wire all future pages */ #define MAP_BUSY_WAKEUP 0x00000002 /* thread(s) waiting on busy @@ -236,6 +234,8 @@ struct vm_map { #define MAP_WXORX 0x00000040 /* enforce W^X */ #define MAP_ASLR_STACK 0x00000080 /* stack location is randomized */ +#define MAP_NEEDS_WAKEUP 0x40000000 +#define MAP_SYSTEM_MAP 0x80000000 #ifdef _KERNEL #if defined(KLD_MODULE) && !defined(KLD_TIED) @@ -266,7 +266,7 @@ vm_map_pmap(vm_map_t map) } static __inline void -vm_map_modflags(vm_map_t map, vm_flags_t set, vm_flags_t clear) +vm_map_modflags(vm_map_t map, u_int set, u_int clear) { map->flags = (map->flags | set) & ~clear; } @@ -284,7 +284,7 @@ vm_map_range_valid(vm_map_t map, vm_offset_t start, vm_offset_t end) static inline bool vm_map_is_system(vm_map_t map) { - return ((map->system_map)); + return ((map->flags & MAP_SYSTEM_MAP) != 0); } #endif /* KLD_MODULE */ From nobody Mon Dec 9 03:28:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y66lT0482z5g7hp; Mon, 09 Dec 2024 03:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y66lS4YyHz44lM; Mon, 9 Dec 2024 03:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7GJAEu+0fKJhLDlt8MZA3+IvGR0UM1oTSk/xUUxy3g=; b=QEDtcVVN9oqGiNDvItkWVZu+Au6iORa826W1yP4PV8lq7C2BoTeHOZphJIUUoTXuqMzBE4 Jc25HHsxWJDDCPLJ6iqb/12S5pE+jCRpabtZ+B/cG3e8OTGpywQesC3BiXJIdU4wpaFoBH zyzORr1ylMZAWBI5O0+9pIksbqy24fMcOHCEzvifhMQaoDBUGfJSBNQ/asm0w23fEusBtJ w8frwO53WFQXE7CTF952NXF1JmYkSg6J8YkCENfB4F6Utc7kWpWl5AvIiJ3udPcbAqfOx8 Z3PJb/BY1HumoGVd/dsUBtDKubC9Vi/ZjzcczDl77z1WMm2dyWod3EyEHSEQLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7GJAEu+0fKJhLDlt8MZA3+IvGR0UM1oTSk/xUUxy3g=; b=Mhg96EcO1ZOxlckKksmV/TKUPL4bnP9juL7gfuvECxDhPS+8a1ZY7gYauIx6eh85zXgJTE ey1VUgyfVYpoghWhh/RuWLZK82Qjlbvwe9rHeaAOGzJLrKswUFzZAAX62xSUD6fO7iAqcX d3cQn8QZjtjUd1Zwj/NGfNElNtL4sc9veOdkK0D7V37NxK8d4QT8nSX5O90qtMfLkg8oHS Ch6bSsV2003CxsJ0lRUr4NoB4TjVIWMRkE9q7nu5Fdc/sPun1j5otXc6NZz6WbDazuQf4l joLS/vHeVlvGKva+VV6R95n5E88B1C3fW1OqiDuLqjLyAzHezK8+3imzr/OJIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733714916; a=rsa-sha256; cv=none; b=IdVwFQXyd4FjCrNXDBxDgFxURdoNoJbXrc10r0N024sP2iwshVGnVg2JxSrHNOJ+ccomDE 0nSOJd29i+6zCJH0v3CUtopr0g+aKElUdxwt9trRhax2wTCMaVuNufv/ujtr1ZF2ukE8Ge twHzDYO+9HDCj0qWa8khESxixdn1yLmIx3sLV8om1BYQEKG1cLKLek1NJdCVs9lb1kiTfu rODgODIL/E0WBEmL/W9xBa4WIRHwmblpkM4rX+NgyQAlEDm8ocr+y3TUZ8ZT03snvGwerm 6wOco9b3S6MK0Zrjoc+nUdtLC8wf0jP86z5VMIa5LIiXKFJrXZ9S1QEfe1YRzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y66lS2d8FzLFk; Mon, 9 Dec 2024 03:28:36 +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 4B93SaAI083824; Mon, 9 Dec 2024 03:28:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B93Sa6Y083821; Mon, 9 Dec 2024 03:28:36 GMT (envelope-from git) Date: Mon, 9 Dec 2024 03:28:36 GMT Message-Id: <202412090328.4B93Sa6Y083821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b4431e95542a - main - vm/vm_map.h: extend number of digits in vm_map flags definitions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4431e95542a4edddf8c677ec275201dfde71a2f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b4431e95542a4edddf8c677ec275201dfde71a2f commit b4431e95542a4edddf8c677ec275201dfde71a2f Author: Konstantin Belousov AuthorDate: 2024-12-07 23:58:35 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-09 03:27:44 +0000 vm/vm_map.h: extend number of digits in vm_map flags definitions Reviewed by: alc Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D47934 --- sys/vm/vm_map.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index ed1106734951..caed29bd23cf 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -225,14 +225,17 @@ struct vm_map { /* * vm_flags_t values */ -#define MAP_WIREFUTURE 0x01 /* wire all future pages */ -#define MAP_BUSY_WAKEUP 0x02 /* thread(s) waiting on busy state */ -#define MAP_IS_SUB_MAP 0x04 /* has parent */ -#define MAP_ASLR 0x08 /* enabled ASLR */ -#define MAP_ASLR_IGNSTART 0x10 /* ASLR ignores data segment */ -#define MAP_REPLENISH 0x20 /* kmapent zone needs to be refilled */ -#define MAP_WXORX 0x40 /* enforce W^X */ -#define MAP_ASLR_STACK 0x80 /* stack location is randomized */ +#define MAP_WIREFUTURE 0x00000001 /* wire all future pages */ +#define MAP_BUSY_WAKEUP 0x00000002 /* thread(s) waiting on busy + state */ +#define MAP_IS_SUB_MAP 0x00000004 /* has parent */ +#define MAP_ASLR 0x00000008 /* enabled ASLR */ +#define MAP_ASLR_IGNSTART 0x00000010 /* ASLR ignores data segment */ +#define MAP_REPLENISH 0x00000020 /* kmapent zone needs to be + refilled */ +#define MAP_WXORX 0x00000040 /* enforce W^X */ +#define MAP_ASLR_STACK 0x00000080 /* stack location is + randomized */ #ifdef _KERNEL #if defined(KLD_MODULE) && !defined(KLD_TIED) From nobody Mon Dec 9 03:28:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y66lV6LT5z5g7Hg; Mon, 09 Dec 2024 03:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y66lV3qRNz44rp; Mon, 9 Dec 2024 03:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwUoRSaRpuOEDCZNOHNvdUWXytvxwWnFYasD+eGKbow=; b=oRMBSFXYAU99J+j4bwBgjAUZZ2kfbRBlXEOpn2CDYpFknzFW6CUx8Q7inb+Rce1930ZANl Rk6zNGyac4JFyJ2XPkNy/eCIlO49VduTRNZIZk2O6oipoxub2pO8GbXA29LAD2/qvr1KWs 31xQu4HS4bOhjG+OfHtQLisf6Y4N+60N6CtWY2gG6dDdyPX3jTuNHXfp8vnSgY/hkuIHw5 eBDbAmIuu2kg+du1KOt6muxSU0kCkOTZn9ox7M9SCoGKzjFDpZjOhhrKWFmkTr2MJ1Qmqe PuK7OBmX17goX1xse/s36UFpHEqgOMqYBHUhC6i+kiuMwqipOf12af3r5pFDqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwUoRSaRpuOEDCZNOHNvdUWXytvxwWnFYasD+eGKbow=; b=WKTDs5/1/c3UVQQ1/4nTvvuvNex4nqFhbF+CO6JBhBaw5tDSJIxxpiZw4fq2o3dwZKdTwW 6cdeJ/tQb9XqyU8MODOfFqEtiHF0v4Th9dzmg9Ujx8q+fLz/d53Rl8QYL7dLRMW42uEyuu V91vuqDJG75q739WMsPNpejKaB59dSBFO8KzQbHCT981Y7VNUT3i2K5CHRigBvO0eph9b7 IuZwm5WPwxKjcynuMWembSiAdqj+FDQQOCvCz0T0LBbWVoJqfyDm7zgxxP677QuNNNTxsi Rly3TLYfj66ZkYTDjR9kVmK4lT828mQJeqsW2b3Lr90uwg0ccnO1PtavFp5uYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733714918; a=rsa-sha256; cv=none; b=ujJ94fZfk1p2pbDYsJ1uZBXfHG7QyYsx22waehaWp9/GH1CzX0cFLbsBohRmpZQaAPHVAG 2RoFsyCyxyjCVs4zj276ouLmttjY0kNWjIKJzN0lGs3CT2jYGYkp4ZxDBh2rPKa0pNg3W5 UjJssBWrX8qh9//hIZpQ398h0TjLQAQ9xbF7PobPo+TLkGl5kHgqEDzAl2FRZbxlIdvSuD 7sgEFfyWp+zeRMD5bMabte7uFFciyT8TMHrwzs3eCfE2y50DM0N66NnnAbcohGuZG2oIPd nDkYLonE6ZxQENF9nvpXogUGSZ7fKI7C+pFCWH3X0MOfI43ABy6eKU/9zajKWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y66lV35H9zKwy; Mon, 9 Dec 2024 03:28:38 +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 4B93Scrv083908; Mon, 9 Dec 2024 03:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B93SchT083905; Mon, 9 Dec 2024 03:28:38 GMT (envelope-from git) Date: Mon, 9 Dec 2024 03:28:38 GMT Message-Id: <202412090328.4B93SchT083905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fae0cc5fd82d - main - vm/vm_map.h: drop vm_flags_t List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fae0cc5fd82dce009f06c29e0d9cf5232f03136a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fae0cc5fd82dce009f06c29e0d9cf5232f03136a commit fae0cc5fd82dce009f06c29e0d9cf5232f03136a Author: Konstantin Belousov AuthorDate: 2024-12-07 23:09:57 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-09 03:27:44 +0000 vm/vm_map.h: drop vm_flags_t Suggested by: alc Reviewed by: alc Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D47934 --- sys/vm/vm_map.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 9645ae1a0527..6af3dba42685 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -75,7 +75,6 @@ * vm_map_entry_t an entry in an address map. */ -typedef u_char vm_flags_t; typedef u_int vm_eflags_t; /* From nobody Mon Dec 9 03:28:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y66lW6cpqz5g7c7; Mon, 09 Dec 2024 03:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y66lW58Z2z44kS; Mon, 9 Dec 2024 03:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePJsuYKhlfxilkbB4qQ2w4+Ernab+Jzb3hw7bgaD4lQ=; b=JPK9e/QVfFTxJ2aLGs6m+gtkNRw4fYjbjwwmdN3pFp+ZedyNHBit8j/19Lhl0bEYxXMcat +zbOPUk0MDmUZPoQCTJ+el32ilNyaKO9z3IzqR3iejc+H68Q+MpxyZGckSiVFpu2hgP/vj tPikdM/jXmkYnNMZhPB/U5NJg0cRPYxu3OGqHVu7ZOjvoKCMaiqceI9zNGiJOtTUA+38pK Vrm3fY47QNUddXYWDjSzgrT4sBnIJZYQYvU8qnnMSlMrva9n+Jbvt+6g3LK+4FKdpTLzW3 pZaaobMCBqXy7KatVFzo45KjYZdOh/2fOJSx1F6DoJSh0FlPrNU0VrDj965Kvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733714919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePJsuYKhlfxilkbB4qQ2w4+Ernab+Jzb3hw7bgaD4lQ=; b=bFiAjEs0/Sw3G2rGPRB5m0h3moXr9cPKkK6ifLATCVtuyiKX6Ec04RKZzgJCUc+UxxweBB wB156M5pe202j4X5iFhFNiya+cId5AXgC7ULHZU5UWg5FYKBCK6pztHpPHI3ChFPyFdufV 4YkNTsWUfxSP3tiZVlTjofkLYJ0IzKdpLZvkHP3rILPszATbCF7VNddAi6TWRU9e+9cuKd wLGVCL2aVls9K9tGZzU8B1iNY5orTRamXD3NtSvUCLxz2po1Apa9svGsj4lKstUQm00/1X sZZzVSdaWqMdLQR4M7gauTkMdHlNbkc+JITF9JxUXFMMejQQZDbp3cy5wfLjdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733714919; a=rsa-sha256; cv=none; b=pcvmKtdj+Y2T7qqh1zCH+a7MSvIkoHt6JCGVeZgReVPpgsRFOeDBnMttf2yxhrkqWnWfBI miax9Q+h5GXOUmHv7/XdBwiNmBuzqYEu7oeja9IlBEVrxXi7sEkcE3lEphkGvVuEU/GKww bGqJEj9IZilG+hTI/h1moBJb1fw9dCHC+mePdZ1+3V8TtmTDotQbAJpKM0zZ0E0OqwGD8F SRuZSXMmgvKJmzgplxQvxO3sLTH1lgwT3Fl30g35iWX2ZqL55iIaodtLQ/A8EQ/v7eoUUp VNDmN0o8mHiokIO+SlGfBn/4AT2YnQU0unDV6UD4teIbbslwRz/1y+rBqtNy9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y66lW445WzLV2; Mon, 9 Dec 2024 03:28:39 +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 4B93Sde5083945; Mon, 9 Dec 2024 03:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B93Sd4d083942; Mon, 9 Dec 2024 03:28:39 GMT (envelope-from git) Date: Mon, 9 Dec 2024 03:28:39 GMT Message-Id: <202412090328.4B93Sd4d083942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 32873ecb20ae - main - vm_map(9): some refresh List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32873ecb20aebc5117a849dc9f2a11bd9b364a6b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=32873ecb20aebc5117a849dc9f2a11bd9b364a6b commit 32873ecb20aebc5117a849dc9f2a11bd9b364a6b Author: Konstantin Belousov AuthorDate: 2024-12-07 23:10:52 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-09 03:27:44 +0000 vm_map(9): some refresh Reviewed by: alc Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D47934 --- share/man/man9/vm_map.9 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/share/man/man9/vm_map.9 b/share/man/man9/vm_map.9 index 81379a5c347d..39242dd6b2b8 100644 --- a/share/man/man9/vm_map.9 +++ b/share/man/man9/vm_map.9 @@ -49,15 +49,15 @@ subordinate maps, created using the function. .Bd -literal -offset indent struct vm_map { - struct vm_map_entry header; - struct sx lock; - struct mtx system_mtx; + struct vm_map_entry header; + union { + struct sx lock; + struct mtx system_mtx; + }; int nentries; vm_size_t size; u_int timestamp; - u_char needs_wakeup; - u_char system_map; - vm_flags_t flags; + u_int flags; vm_map_entry_t root; pmap_t pmap; int busy; @@ -83,12 +83,6 @@ A count of the members in use within the circular map entry list. Specifies the size of the virtual address space. .It Va timestamp Used to determine if the map has changed since its last access. -.It Va needs_wakeup -Indicates if a thread is waiting for an allocation within the map. -Used only by system maps. -.It Va system_map -Set to TRUE to indicate that map is a system map; otherwise, it belongs -to a user process. .It Va flags Map flags, described below. .It Va root @@ -106,6 +100,12 @@ Possible map flags: Wire all future pages in this map. .It Dv MAP_BUSY_WAKEUP There are waiters for the map busy status. +.It Va MAP_NEEDS_WAKEUP +Indicates if a thread is waiting for an allocation within the map. +Used only by system maps. +.It Va MAP_SYSTEM_MAP +If set, ndicates that map is a system map; otherwise, it belongs +to a user process. .El .Pp The following flags can be passed to From nobody Mon Dec 9 04:23:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y67yq35yBz5gBwt; Mon, 09 Dec 2024 04:23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y67yq2SWJz4DJ5; Mon, 9 Dec 2024 04:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733718211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=doGdRLh+1Qx9UnEv7DVzGWfLokVHHWfRnqB47qrZ0tA=; b=Vc21VZnce5oWG2Tvt8DlOUv8wSb9XBfTB8Vm806LvvHlqgy+IwaNfslXY6JEbxR6uGjiYm QGCmXefTlLIGI8eZeYfChJzoB7TE4ZXjm6VqVeAHq2r13AHEJVWnwGaDAwUvkw5UfCFM7T NIw7H1znapVtL9zqVTkEkY3D5cAQ+s5m1Yidpbpd70c3psNjW4EewcZRzuNPeBKk2qb+6+ 4gJV9n6XNVPn/SUB/+hWZoSeNBHC2TniAGL2Rht9h2rF+nUm8tXQM3vL6oGOH4BRrSAs0p 0VGtSOz/vklOMjPZ1u/GhU5xssNJw3ktfE60Iyh5HRXNLg/9ENFqAA6nyPd0eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733718211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=doGdRLh+1Qx9UnEv7DVzGWfLokVHHWfRnqB47qrZ0tA=; b=ZgmlGyZ+DwsLSyYvkBVN81Gi5CC7Rr3iPC1BeIz0J7sjCECk2Qjg5njzscMCwFf9MeFzT3 sohIgD3x97J/tio0JwmmX7eIMOfbUcUTd7VY1SFv6pMhISJPQNjYvX6qsOp8AA2XGNcr82 KrQ21UFPLSoGNFUmtUstlj5NSPttyHvJdCXPWBp7y2WIJ5ngt1OWsDfiemJNsr853mIm3l Iu9MtRfRkKuv7lSGAa4flXSBKBOjDNrLXk/ErIN5BgXKSxX9NoSpIGrwByGEkMx2q39B9l DudvUpDs/8D8lgupMAAz9gum3GraM2Sgyi0grpI2abhmYJalrwaPTS8/GQL2fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733718211; a=rsa-sha256; cv=none; b=wWZOIlfbd5V1k0WTL3tNy1hi9DwgudzEGy3X4/nwt4l5Yvkc+QnG++4SFtZ15orgCk6ABo Sf7fTo7PHmvyjdS8HkSXw50gt1/grenPADFkxgMLlVmeItUHbOOGKJOlqshkZWfDcURpID a0SVQ9SOChwLjHYYkJUVGdnD0ddQg0j6SU7hTs/UAfG48VapxU3BQ3arcz8FLhLz+9YKdK SHBIhJSYNmYLszf1ETOwluw0gXd0OM5BWIVNgh11fszJXwQEBO5pl9mX439nWuyVNSCfHs yw3anEtq9sNiPBf51txCauEm/aVMSwWZXYSeewGE8cJiBoHt0YzHUUg/IHaDVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y67yq23rwzMQ2; Mon, 9 Dec 2024 04:23: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 4B94NVr1094640; Mon, 9 Dec 2024 04:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B94NV1V094637; Mon, 9 Dec 2024 04:23:31 GMT (envelope-from git) Date: Mon, 9 Dec 2024 04:23:31 GMT Message-Id: <202412090423.4B94NV1V094637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9114e15a8694 - main - amd64: re-enable la57, try two List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9114e15a86949f7d168bf09dbe78a340d5444e80 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9114e15a86949f7d168bf09dbe78a340d5444e80 commit 9114e15a86949f7d168bf09dbe78a340d5444e80 Author: Konstantin Belousov AuthorDate: 2024-12-09 03:40:33 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-09 04:06:24 +0000 amd64: re-enable la57, try two If you need to use libc with jemalloc without commit eade2001aa9d91440886de8359a4dec9edcde2a9 (head, or b90d68c9b28b0a458bdf4a963397817974ed0f90 stable/14), you have to set vm.pmap.la57 to 0 for system-global effect, or use proccontrol -m la48 on affected image. Sponsored by: The FreeBSD Foundation --- sys/amd64/amd64/pmap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 82110e61d54a..265d48e26c0b 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2182,6 +2182,7 @@ pmap_bootstrap_la57(void *arg __unused) if ((cpu_stdext_feature2 & CPUID_STDEXT2_LA57) == 0) return; + la57 = 1; TUNABLE_INT_FETCH("vm.pmap.la57", &la57); if (!la57) return; From nobody Mon Dec 9 04:25:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y681Q0gm8z5gCBr; Mon, 09 Dec 2024 04:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y681Q0QfVz4F5K; Mon, 9 Dec 2024 04: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=1733718346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3OipfZjXAznFPy4iAupLm//dgMZhyJ+x6DC0yI7GDiY=; b=kApCCk7CekPxGBRoAudB5UXbz6a3/Ucz4yX4w72kwyfFJpjt2MFA7E3lIc2PCeqaNOOcaF 3pcBuqAcTS4ksKVGzP+/2m4RnOXZH3XsYqyPp9S4O5xK53fg3k/o6feLyQJUvGh7jbBAfS SULeAuvBh4oNJCNDKb304wqBXsJVoAsvYi09xiLrFwxXAnIRdGGAbPfP7DLSVFsANs3v7u K4J+SCP2oOVweoyKueYdMJcibGGUScXH8KG3MMVwOhtIcJQk0gL/zwEhjYXAViDZn17b4b QMPbiL3yna9fuwcLQVf6tC2mly65DnNwuEgAgVSJ30qDU2+aOXQh9IWVYhMeEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733718346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3OipfZjXAznFPy4iAupLm//dgMZhyJ+x6DC0yI7GDiY=; b=c4Gs4cVMHWfgkuLB03ysXpTEdIOkDhO6ME2mfKuah0SXkusEWtpJWxjwL+M7tUMbp9grVy Zw4h445+JUwziQUlyZHbvOE5tTpsVAfvgcSsAuOUFU9RIw7aq2Bf/x6U1XglPQlLqCRduj /Sh0aGbmCt/ZaMeJMbgi9B0wsBnMMDb0bn+j2XrsTISByxr+V7o/nm3VDRhQvoyXhsApUZ F6CNHe/n3yODGf4PQjJWlYbOWycFF41lGeOJgMjiGuyPyT+f8EvVydwIjVpCd0DXhnl/kz NHjsGPrkYHgM1ba45oFodc9/CfIloXQoBi1wu/9VVw6qxO6UBWUl08dCcBGeWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733718346; a=rsa-sha256; cv=none; b=HqHdINQYMxwUqsIoCQwScMptmH0jN6W1WfnV3PTddBbWSoBAR6sWhu4uTsa6Rjp9j2Ct+X f2x8p4Gu1c41hwbu/ucZ4rNBfq2fzGN71cKxLOFbz52ZGrAiPo8r6YG1QqKgFpWJqxO3PH P3lcIL1wdFD3uZOOGX8Pw8bL9eniBj2szs0rOEsxkOehJW7X0L3mJ294EvU82jdgFjonHP 6dxNNMZ2mZc3yb6vS9hi/q1OA1hie6LPxFCSt5GgrNepXDhGTG2VMjLtzD263bjV9AEVUY WwsnWQ7Y1Pe1yeTJKvRn0WtWsrHmdZasau73V/bBNKQT+JCs7PWtcQNaQgKilw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y681Q02T2zMf1; Mon, 9 Dec 2024 04: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 4B94Pj0a095596; Mon, 9 Dec 2024 04:25:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B94PjHx095594; Mon, 9 Dec 2024 04:25:45 GMT (envelope-from git) Date: Mon, 9 Dec 2024 04:25:45 GMT Message-Id: <202412090425.4B94PjHx095594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 908f215e80fa - main - MFV: expat 2.6.4. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 908f215e80fa482aa953c39afa6bb516f561fc00 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=908f215e80fa482aa953c39afa6bb516f561fc00 commit 908f215e80fa482aa953c39afa6bb516f561fc00 Merge: 9114e15a8694 7277ee24655b Author: Xin LI AuthorDate: 2024-12-09 04:24:16 +0000 Commit: Xin LI CommitDate: 2024-12-09 04:25:01 +0000 MFV: expat 2.6.4. MFC after: 2 weeks contrib/expat/Changes | 31 ++++++++++++++++++ contrib/expat/README.md | 47 ++++++++++++++++++++++++--- contrib/expat/configure.ac | 6 ++-- contrib/expat/doc/reference.html | 2 +- contrib/expat/doc/xmlwf.1 | 2 +- contrib/expat/doc/xmlwf.xml | 2 +- contrib/expat/examples/element_declarations.c | 9 ++--- contrib/expat/lib/expat.h | 6 ++-- contrib/expat/lib/xmlparse.c | 18 +++++++--- contrib/expat/tests/basic_tests.c | 17 +++++++--- contrib/expat/tests/common.c | 33 ++----------------- contrib/expat/tests/common.h | 11 +------ contrib/expat/tests/handlers.c | 42 +++++++++++++++++++----- contrib/expat/tests/handlers.h | 17 ++++++++-- contrib/expat/tests/misc_tests.c | 39 ++++++++++++++++++---- contrib/expat/xmlwf/xmlfile.c | 4 ++- lib/libexpat/expat_config.h | 9 ++--- lib/libexpat/libbsdxml.3 | 4 +-- 18 files changed, 206 insertions(+), 93 deletions(-) diff --cc contrib/expat/README.md index 180a68e4abbe,000000000000..23d26dad2b92 mode 100644,000000..100644 --- a/contrib/expat/README.md +++ b/contrib/expat/README.md @@@ -1,276 -1,0 +1,315 @@@ +[![Run Linux CI tasks](https://github.com/libexpat/libexpat/actions/workflows/linux.yml/badge.svg)](https://github.com/libexpat/libexpat/actions/workflows/linux.yml) +[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/libexpat/libexpat?svg=true)](https://ci.appveyor.com/project/libexpat/libexpat) +[![Packaging status](https://repology.org/badge/tiny-repos/expat.svg)](https://repology.org/metapackage/expat/versions) +[![Downloads SourceForge](https://img.shields.io/sourceforge/dt/expat?label=Downloads%20SourceForge)](https://sourceforge.net/projects/expat/files/) +[![Downloads GitHub](https://img.shields.io/github/downloads/libexpat/libexpat/total?label=Downloads%20GitHub)](https://github.com/libexpat/libexpat/releases) + +> [!CAUTION] +> +> Expat is **understaffed** and without funding. +> There is a [call for help with details](https://github.com/libexpat/libexpat/blob/master/expat/Changes) +> at the top of the `Changes` file. + + - # Expat, Release 2.6.3 ++# Expat, Release 2.6.4 + +This is Expat, a C99 library for parsing +[XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by +[James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997. +Expat is a stream-oriented XML parser. This means that you register +handlers with the parser before starting the parse. These handlers +are called when the parser discovers the associated structures in the +document being parsed. A start tag is an example of the kind of +structures for which you may register handlers. + +Expat supports the following compilers: + +- GNU GCC >=4.5 +- LLVM Clang >=3.5 +- Microsoft Visual Studio >=16.0/2019 (rolling `${today} minus 5 years`) + +Windows users can use the +[`expat-win32bin-*.*.*.{exe,zip}` download](https://github.com/libexpat/libexpat/releases), +which includes both pre-compiled libraries and executables, and source code for +developers. + +Expat is [free software](https://www.gnu.org/philosophy/free-sw.en.html). +You may copy, distribute, and modify it under the terms of the License +contained in the file +[`COPYING`](https://github.com/libexpat/libexpat/blob/master/expat/COPYING) +distributed with this package. +This license is the same as the MIT/X Consortium license. + + +## Using libexpat in your CMake-Based Project + - There are two ways of using libexpat with CMake: ++There are three documented ways of using libexpat with CMake: + - ### a) Module Mode ++### a) `find_package` with Module Mode + +This approach leverages CMake's own [module `FindEXPAT`](https://cmake.org/cmake/help/latest/module/FindEXPAT.html). + +Notice the *uppercase* `EXPAT` in the following example: + +```cmake +cmake_minimum_required(VERSION 3.0) # or 3.10, see below + +project(hello VERSION 1.0.0) + +find_package(EXPAT 2.2.8 MODULE REQUIRED) + +add_executable(hello + hello.c +) + +# a) for CMake >=3.10 (see CMake's FindEXPAT docs) +target_link_libraries(hello PUBLIC EXPAT::EXPAT) + +# b) for CMake >=3.0 +target_include_directories(hello PRIVATE ${EXPAT_INCLUDE_DIRS}) +target_link_libraries(hello PUBLIC ${EXPAT_LIBRARIES}) +``` + - ### b) Config Mode ++### b) `find_package` with Config Mode + +This approach requires files from… + +- libexpat >=2.2.8 where packaging uses the CMake build system +or +- libexpat >=2.3.0 where packaging uses the GNU Autotools build system + on Linux +or +- libexpat >=2.4.0 where packaging uses the GNU Autotools build system + on macOS or MinGW. + +Notice the *lowercase* `expat` in the following example: + +```cmake +cmake_minimum_required(VERSION 3.0) + +project(hello VERSION 1.0.0) + +find_package(expat 2.2.8 CONFIG REQUIRED char dtd ns) + +add_executable(hello + hello.c +) + +target_link_libraries(hello PUBLIC expat::expat) +``` + ++### c) The `FetchContent` module ++ ++This approach — as demonstrated below — requires CMake >=3.18 for both the ++[`FetchContent` module](https://cmake.org/cmake/help/latest/module/FetchContent.html) ++and its support for the `SOURCE_SUBDIR` option to be available. ++ ++Please note that: ++- Use of the `FetchContent` module with *non-release* SHA1s or `master` ++ of libexpat is neither advised nor considered officially supported. ++- Pinning to a specific commit is great for robust CI. ++- Pinning to a specific commit needs updating every time there is a new ++ release of libexpat — either manually or through automation —, ++ to not miss out on libexpat security updates. ++ ++For an example that pulls in libexpat via Git: ++ ++```cmake ++cmake_minimum_required(VERSION 3.18) ++ ++include(FetchContent) ++ ++project(hello VERSION 1.0.0) ++ ++FetchContent_Declare( ++ expat ++ GIT_REPOSITORY https://github.com/libexpat/libexpat/ ++ GIT_TAG 000000000_GIT_COMMIT_SHA1_HERE_000000000 # i.e. Git tag R_0_Y_Z ++ SOURCE_SUBDIR expat/ ++) ++ ++FetchContent_MakeAvailable(expat) ++ ++add_executable(hello ++ hello.c ++) ++ ++target_link_libraries(hello PUBLIC expat) ++``` ++ + +## Building from a Git Clone + +If you are building Expat from a check-out from the +[Git repository](https://github.com/libexpat/libexpat/), +you need to run a script that generates the configure script using the +GNU autoconf and libtool tools. To do this, you need to have +autoconf 2.58 or newer. Run the script like this: + +```console +./buildconf.sh +``` + +Once this has been done, follow the same instructions as for building +from a source distribution. + + +## Building from a Source Distribution + +### a) Building with the configure script (i.e. GNU Autotools) + +To build Expat from a source distribution, you first run the +configuration shell script in the top level distribution directory: + +```console +./configure +``` + +There are many options which you may provide to configure (which you +can discover by running configure with the `--help` option). But the +one of most interest is the one that sets the installation directory. +By default, the configure script will set things up to install +libexpat into `/usr/local/lib`, `expat.h` into `/usr/local/include`, and +`xmlwf` into `/usr/local/bin`. If, for example, you'd prefer to install +into `/home/me/mystuff/lib`, `/home/me/mystuff/include`, and +`/home/me/mystuff/bin`, you can tell `configure` about that with: + +```console +./configure --prefix=/home/me/mystuff +``` + +Another interesting option is to enable 64-bit integer support for +line and column numbers and the over-all byte index: + +```console +./configure CPPFLAGS=-DXML_LARGE_SIZE +``` + +However, such a modification would be a breaking change to the ABI +and is therefore not recommended for general use — e.g. as part of +a Linux distribution — but rather for builds with special requirements. + +After running the configure script, the `make` command will build +things and `make install` will install things into their proper +location. Have a look at the `Makefile` to learn about additional +`make` options. Note that you need to have write permission into +the directories into which things will be installed. + +If you are interested in building Expat to provide document +information in UTF-16 encoding rather than the default UTF-8, follow +these instructions (after having run `make distclean`). +Please note that we configure with `--without-xmlwf` as xmlwf does not +support this mode of compilation (yet): + +1. Mass-patch `Makefile.am` files to use `libexpatw.la` for a library name: +
+ `find . -name Makefile.am -exec sed + -e 's,libexpat\.la,libexpatw.la,' + -e 's,libexpat_la,libexpatw_la,' + -i.bak {} +` + +1. Run `automake` to re-write `Makefile.in` files:
+ `automake` + +1. For UTF-16 output as unsigned short (and version/error strings as char), + run:
+ `./configure CPPFLAGS=-DXML_UNICODE --without-xmlwf`
+ For UTF-16 output as `wchar_t` (incl. version/error strings), run:
+ `./configure CFLAGS="-g -O2 -fshort-wchar" CPPFLAGS=-DXML_UNICODE_WCHAR_T + --without-xmlwf` +
Note: The latter requires libc compiled with `-fshort-wchar`, as well. + +1. Run `make` (which excludes xmlwf). + +1. Run `make install` (again, excludes xmlwf). + +Using `DESTDIR` is supported. It works as follows: + +```console +make install DESTDIR=/path/to/image +``` + +overrides the in-makefile set `DESTDIR`, because variable-setting priority is + +1. commandline +1. in-makefile +1. environment + +Note: This only applies to the Expat library itself, building UTF-16 versions +of xmlwf and the tests is currently not supported. + +When using Expat with a project using autoconf for configuration, you +can use the probing macro in `conftools/expat.m4` to determine how to +include Expat. See the comments at the top of that file for more +information. + +A reference manual is available in the file `doc/reference.html` in this +distribution. + + +### b) Building with CMake + +The CMake build system is still *experimental* and may replace the primary +build system based on GNU Autotools at some point when it is ready. + + +#### Available Options + +For an idea of the available (non-advanced) options for building with CMake: + +```console +# rm -f CMakeCache.txt ; cmake -D_EXPAT_HELP=ON -LH . | grep -B1 ':.*=' | sed 's,^--$,,' +// Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel ... +CMAKE_BUILD_TYPE:STRING= + +// Install path prefix, prepended onto install directories. +CMAKE_INSTALL_PREFIX:PATH=/usr/local + +// Path to a program. +DOCBOOK_TO_MAN:FILEPATH=/usr/bin/docbook2x-man + +// Build man page for xmlwf +EXPAT_BUILD_DOCS:BOOL=ON + +// Build the examples for expat library +EXPAT_BUILD_EXAMPLES:BOOL=ON + +// Build fuzzers for the expat library +EXPAT_BUILD_FUZZERS:BOOL=OFF + +// Build pkg-config file +EXPAT_BUILD_PKGCONFIG:BOOL=ON + +// Build the tests for expat library +EXPAT_BUILD_TESTS:BOOL=ON + +// Build the xmlwf tool for expat library +EXPAT_BUILD_TOOLS:BOOL=ON + +// Character type to use (char|ushort|wchar_t) [default=char] +EXPAT_CHAR_TYPE:STRING=char + +// Install expat files in cmake install target +EXPAT_ENABLE_INSTALL:BOOL=ON + +// Use /MT flag (static CRT) when compiling in MSVC +EXPAT_MSVC_STATIC_CRT:BOOL=OFF + +// Build fuzzers via ossfuzz for the expat library +EXPAT_OSSFUZZ_BUILD:BOOL=OFF + +// Build a shared expat library +EXPAT_SHARED_LIBS:BOOL=ON + +// Treat all compiler warnings as errors +EXPAT_WARNINGS_AS_ERRORS:BOOL=OFF + +// Make use of getrandom function (ON|OFF|AUTO) [default=AUTO] +EXPAT_WITH_GETRANDOM:STRING=AUTO + +// Utilize libbsd (for arc4random_buf) +EXPAT_WITH_LIBBSD:BOOL=OFF + +// Make use of syscall SYS_getrandom (ON|OFF|AUTO) [default=AUTO] +EXPAT_WITH_SYS_GETRANDOM:STRING=AUTO +``` diff --cc lib/libexpat/expat_config.h index 5d39aeb2e870,000000000000..2bb52a4baa03 mode 100644,000000..100644 --- a/lib/libexpat/expat_config.h +++ b/lib/libexpat/expat_config.h @@@ -1,152 -1,0 +1,149 @@@ +/* expat_config.h. Generated from expat_config.h.in by configure. */ +/* expat_config.h.in. Generated from configure.ac by autoheader. */ + +#ifndef EXPAT_CONFIG_H +#define EXPAT_CONFIG_H 1 + +#include + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* 1234 = LILENDIAN, 4321 = BIGENDIAN */ +#if BYTE_ORDER == LITTLE_ENDIAN +#define BYTEORDER 1234 +#else +#define BYTEORDER 4321 +#endif + +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrandom' function. */ +#define HAVE_GETRANDOM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `bsd' library (-lbsd). */ +/* #undef HAVE_LIBBSD */ + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have `syscall' and `SYS_getrandom'. */ +#define HAVE_SYSCALL_GETRANDOM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "expat" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://github.com/libexpat/libexpat/issues" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "expat" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "expat 2.6.3" ++#define PACKAGE_STRING "expat 2.6.4" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "expat" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "2.6.3" ++#define PACKAGE_VERSION "2.6.4" + +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Version number of package */ - #define VERSION "2.6.3" ++#define VERSION "2.6.4" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define to allow retrieving the byte offsets for attribute names and values. + */ +/* #undef XML_ATTR_INFO */ + +/* Define to specify how much context to retain around the current parse + point, 0 to disable. */ +#define XML_CONTEXT_BYTES 1024 + +/* Define to include code reading entropy from `/dev/urandom'. */ +#define XML_DEV_URANDOM 1 + +/* Define to make parameter entity parsing functionality available. */ +#define XML_DTD 1 + +/* Define as 1/0 to enable/disable support for general entities. */ +#define XML_GE 1 + +/* Define to make XML Namespaces functionality available. */ +#define XML_NS 1 + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `long int' if does not define. */ +/* #undef off_t */ + - /* Define to `unsigned int' if does not define. */ - /* #undef size_t */ - +#endif // ndef EXPAT_CONFIG_H diff --cc lib/libexpat/libbsdxml.3 index 2ec1f71b58bb,000000000000..21c07d39e5e2 mode 100644,000000..100644 --- a/lib/libexpat/libbsdxml.3 +++ b/lib/libexpat/libbsdxml.3 @@@ -1,67 -1,0 +1,67 @@@ +.\"- +.\" Copyright (c) 2002 Poul-Henning Kamp +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\"/ - .Dd October 1, 2024 ++.Dd December 8, 2024 +.Dt LIBBSDXML 3 +.Os +.Sh NAME +.Nm libbsdxml +.Nd eXpat XML parser library +.Sh SYNOPSIS +.In bsdxml.h +.Sh DESCRIPTION +The +.Nm - library is a verbatim copy of the eXpat XML library version 2.6.3. ++library is a verbatim copy of the eXpat XML library version 2.6.4. +.Pp +The +.Nm +library is intended to be used within the +.Fx +base system only. +Use of the +.Nm +library for other purposes is not supported and discouraged. +.Pp +To avoid version and autoconfiguration issues, the library has been +renamed to +.Nm +rather than retain the original eXpat library and include file names +to prevent confusion and autoconfiguration issues for 3rd party +software. +.Sh SEE ALSO +For full documentation, please see the eXpat webpage at +.Pa http://www.libexpat.org/ . +.Sh AUTHORS +.An -nosplit +The original eXpat was written by +.An James Clark Aq Mt jjc@jclark.com . +.Pp +Subsequently eXpat maintenance and development been taken up by a group +of people under the leadership of +.An Fred Drake Aq Mt fdrake@acm.com , +.An Paul Prescod , +and +.An Clark Cooper . From nobody Mon Dec 9 06:53:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6CHT4pSlz5gLXr; Mon, 09 Dec 2024 06:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6CHT4TLHz4PVJ; Mon, 9 Dec 2024 06:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733727189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qU/KqFXSkux0YeN5uzDz0WfkqzOGoCH29E2eReuPNWk=; b=Kk5QB6n9l1L+a0x6HtGfE3Lf1wHy63cS24fIgYoaI65ntlYSGaIhHT4qvzEMGnmwIjZ2Ay YqrXC+253StmBGn15rZyhSdZOsjGlTZbM3Om4X+S7XOyW2w8kwgdoonUkc+Re1ba5VDC7V KuhKOvDP1hxEHd61nQRbWGbNzvF5z2RA10l6Lcb2eUe+Plc6GxWqMGTz+4uGfRloPrxrcp KzOXE7rWuRus6dOwIqh1tNPdc6tlZ4IXHvDpxv5Gtb0lFaMSwFD98TSR8vjPeggzAaDCkv BK8UP2tM6aLEZqbbV853LihmVUgqU0WUldufBtnfRhBniMaChusMasccFnVktA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733727189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qU/KqFXSkux0YeN5uzDz0WfkqzOGoCH29E2eReuPNWk=; b=NA2y4ZoeAIve5MB5lQ42z7+nBIayH4cq26OeyVw8/GrBFaeZ2oICPt72gG12nZOGZi6osc F/1vi/mhEYc3s3++9lq1/Axivr97MQ567VEtrb6QswowhITqu2NxkpcgDExCTqwmeyeynn bYjr35JM63lBKHs/35u1P1D2BgkDzSFXU9OaMNVfbKMIFQfHjPyYs3Q0X7/7COJ5qzGDUR wcvroaJzrGhrgRBxg6VmLcf8KbrIUgQBsov2UomQosgGIn0fJFMCJSChyyGYY1MsbdROgK 516cF5HbY6raro7zHr3hNIDAPhpak1XjBtBXjCiDxohJjW+vlMQwsqDiLIPRXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733727189; a=rsa-sha256; cv=none; b=Z7LSWSefm/f5GlhF9lS3yjzTXy7IOv/+H85ujgFYY7YWCxfXuAcI4O+LxEuq3JK0tgDhYz z8hfQWvyNJ4RXAJO6AHxC67K7vuso0AMbtW5rayMLiUfTdyzm9Dw237AI7eusjJn9iEXsB Rb0nyDk3Xf7fkbEowyTf8WhOgkP2hpPAoO9HGPffzPFYxiOyG3nXf/yny4LmvRONS+c4K9 5FZmPijzeDiPJs6fOIv+8uRh3bMOmLv9VxPx1u/Ef8s54xr5tjXdZ9rVshFIEOMQiIHUFQ WX019/EbTuybKQ/ZMbr6GvCye/SZCQyY6DhD05qgdrItQiK2jpRSnR85inkzQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6CHT44cWzS16; Mon, 9 Dec 2024 06:53:09 +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 4B96r9rv072601; Mon, 9 Dec 2024 06:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B96r9Ef072598; Mon, 9 Dec 2024 06:53:09 GMT (envelope-from git) Date: Mon, 9 Dec 2024 06:53:09 GMT Message-Id: <202412090653.4B96r9Ef072598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: c77c48892655 - main - MFV: less v668. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c77c488926555ca344ae3a417544cf7a720e1de1 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=c77c488926555ca344ae3a417544cf7a720e1de1 commit c77c488926555ca344ae3a417544cf7a720e1de1 Merge: 908f215e80fa 8c9fd1007159 Author: Xin LI AuthorDate: 2024-12-09 04:50:00 +0000 Commit: Xin LI CommitDate: 2024-12-09 05:22:12 +0000 MFV: less v668. MFC after: 2 weeks contrib/less/LICENSE | 2 +- contrib/less/NEWS | 134 ++++++++ contrib/less/brac.c | 2 +- contrib/less/ch.c | 131 ++++---- contrib/less/charset.c | 181 +++++----- contrib/less/charset.h | 2 +- contrib/less/cmd.h | 6 +- contrib/less/cmdbuf.c | 217 ++++++------ contrib/less/command.c | 392 ++++++++++++++-------- contrib/less/compose.uni | 2 +- contrib/less/cvt.c | 33 +- contrib/less/decode.c | 376 +++++++++++++++------ contrib/less/edit.c | 362 ++++++++++---------- contrib/less/evar.c | 192 +++++++++++ contrib/less/filename.c | 430 ++++++++++++------------ contrib/less/fmt.uni | 2 +- contrib/less/forwback.c | 84 +++-- contrib/less/funcs.h | 387 ++++++++++++---------- contrib/less/help.c | 54 +-- contrib/less/ifile.c | 18 +- contrib/less/input.c | 109 +++--- contrib/less/jump.c | 51 ++- contrib/less/lang.h | 57 ++++ contrib/less/less.h | 125 ++++--- contrib/less/less.hlp | 52 ++- contrib/less/less.nro | 389 +++++++++++++++++----- contrib/less/lessecho.c | 15 +- contrib/less/lessecho.nro | 6 +- contrib/less/lesskey.c | 73 ++-- contrib/less/lesskey.h | 24 +- contrib/less/lesskey.nro | 38 ++- contrib/less/lesskey_parse.c | 114 +++++-- contrib/less/lglob.h | 2 +- contrib/less/line.c | 440 ++++++++++++++++-------- contrib/less/linenum.c | 83 +++-- contrib/less/lsystem.c | 17 +- contrib/less/main.c | 272 ++++++++++++--- contrib/less/mark.c | 36 +- contrib/less/optfunc.c | 533 ++++++++++++++++++----------- contrib/less/option.c | 262 ++++++++++----- contrib/less/option.h | 9 +- contrib/less/opttbl.c | 113 ++++--- contrib/less/os.c | 64 ++-- contrib/less/output.c | 501 ++++++++++++++++------------ contrib/less/pattern.c | 40 +-- contrib/less/pattern.h | 6 +- contrib/less/pckeys.h | 2 +- contrib/less/position.c | 70 +++- contrib/less/position.h | 2 +- contrib/less/prompt.c | 112 ++++--- contrib/less/regexp.c | 120 +++---- contrib/less/regexp.h | 14 +- contrib/less/screen.c | 744 ++++++++++++++++++++++++++--------------- contrib/less/scrsize.c | 2 +- contrib/less/search.c | 774 +++++++++++++++++++++++++++++++++++++------ contrib/less/signal.c | 22 +- contrib/less/tags.c | 79 ++--- contrib/less/ttyin.c | 47 ++- contrib/less/ubin.uni | 2 +- contrib/less/version.c | 47 ++- contrib/less/wide.uni | 6 +- contrib/less/xbuf.c | 64 +++- contrib/less/xbuf.h | 13 +- usr.bin/less/Makefile | 2 +- usr.bin/less/defines.h | 62 ++-- 65 files changed, 5718 insertions(+), 2904 deletions(-) diff --cc contrib/less/command.c index c1003d55fada,000000000000..27eba082e520 mode 100644,000000..100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@@ -1,2096 -1,0 +1,2226 @@@ +/* $FreeBSD$ */ +/* - * Copyright (C) 1984-2023 Mark Nudelman ++ * Copyright (C) 1984-2024 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ + + +/* + * User-level command processor. + */ + +#include "less.h" +#if MSDOS_COMPILER==WIN32C +#include +#endif +#include "position.h" +#include "option.h" +#include "cmd.h" + +extern int erase_char, erase2_char, kill_char; +extern int sigs; +extern int quit_if_one_screen; +extern int one_screen; - extern int squished; +extern int sc_width; +extern int sc_height; +extern char *kent; +extern int swindow; +extern int jump_sline; +extern int quitting; +extern int wscroll; +extern int top_scroll; +extern int ignore_eoi; - extern int secure; +extern int hshift; +extern int bs_mode; +extern int proc_backspace; +extern int show_attn; +extern int less_is_more; - extern int status_col; +extern POSITION highest_hilite; - extern POSITION start_attnpos; - extern POSITION end_attnpos; +extern char *every_first_cmd; +extern char version[]; +extern struct scrpos initial_scrpos; +extern IFILE curr_ifile; +extern void *ml_search; +extern void *ml_examine; +extern int wheel_lines; - extern int header_lines; +extern int def_search_type; - extern int updown_match; ++extern lbool search_wrapped; +#if SHELL_ESCAPE || PIPEC +extern void *ml_shell; +#endif +#if EDITOR - extern char *editor; - extern char *editproto; ++extern constant char *editproto; ++#endif ++#if OSC8_LINK ++extern char *osc8_uri; +#endif - extern int screen_trashed; /* The screen has been overwritten */ +extern int shift_count; - extern int oldbot; +extern int forw_prompt; +extern int incr_search; +extern int full_screen; +#if MSDOS_COMPILER==WIN32C +extern int utf_mode; ++extern unsigned less_acp; +#endif + +#if SHELL_ESCAPE +static char *shellcmd = NULL; /* For holding last shell command for "!!" */ +#endif +static int mca; /* The multicharacter command (action) */ +static int search_type; /* The previous type of search */ +static int last_search_type; /* Type of last executed search */ +static LINENUM number; /* The number typed by the user */ +static long fraction; /* The fractional part of the number */ +static struct loption *curropt; +static int opt_lower; +static int optflag; - static int optgetname; ++static lbool optgetname; +static POSITION bottompos; +static int save_hshift; +static int save_bs_mode; +static int save_proc_backspace; ++static int screen_trashed_value = 0; ++static lbool literal_char = FALSE; +#if PIPEC +static char pipec; +#endif + +/* Stack of ungotten chars (via ungetcc) */ +struct ungot { + struct ungot *ug_next; - LWCHAR ug_char; ++ char ug_char; ++ lbool ug_end_command; +}; +static struct ungot* ungot = NULL; + - static void multi_search (char *pattern, int n, int silent); ++static void multi_search(constant char *pattern, int n, int silent); + +/* + * Move the cursor to start of prompt line before executing a command. + * This looks nicer if the command takes a long time before + * updating the screen. + */ +static void cmd_exec(void) +{ + clear_attn(); + clear_bot(); + flush(); +} + +/* + * Indicate we are reading a multi-character command. + */ +static void set_mca(int action) +{ + mca = action; + clear_bot(); + clear_cmd(); +} + +/* + * Indicate we are not reading a multi-character command. + */ +static void clear_mca(void) +{ + if (mca == 0) + return; + mca = 0; +} + +/* + * Set up the display to start a new multi-character command. + */ +static void start_mca(int action, constant char *prompt, void *mlist, int cmdflags) +{ + set_mca(action); + cmd_putstr(prompt); + set_mlist(mlist, cmdflags); +} + +public int in_mca(void) +{ + return (mca != 0 && mca != A_PREFIX); +} + +/* + * Set up the display to start a new search command. + */ +static void mca_search1(void) +{ + int i; + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + set_mca(A_FILTER); + else +#endif + if (search_type & SRCH_FORW) + set_mca(A_F_SEARCH); + else + set_mca(A_B_SEARCH); + + if (search_type & SRCH_NO_MATCH) + cmd_putstr("Non-match "); + if (search_type & SRCH_FIRST_FILE) + cmd_putstr("First-file "); + if (search_type & SRCH_PAST_EOF) + cmd_putstr("EOF-ignore "); + if (search_type & SRCH_NO_MOVE) + cmd_putstr("Keep-pos "); + if (search_type & SRCH_NO_REGEX) + cmd_putstr("Regex-off "); + if (search_type & SRCH_WRAP) + cmd_putstr("Wrap "); + for (i = 1; i <= NUM_SEARCH_COLORS; i++) + { + if (search_type & SRCH_SUBSEARCH(i)) + { + char buf[INT_STRLEN_BOUND(int)+8]; + SNPRINTF1(buf, sizeof(buf), "Sub-%d ", i); + cmd_putstr(buf); + } + } ++ if (literal_char) ++ cmd_putstr("Lit "); + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + cmd_putstr("&/"); + else +#endif + if (search_type & SRCH_FORW) + cmd_putstr("/"); + else + cmd_putstr("?"); + forw_prompt = 0; +} + +static void mca_search(void) +{ + mca_search1(); + set_mlist(ml_search, 0); +} + +/* + * Set up the display to start a new toggle-option command. + */ +static void mca_opt_toggle(void) +{ - int no_prompt; - int flag; - char *dash; ++ int no_prompt = (optflag & OPT_NO_PROMPT); ++ int flag = (optflag & ~OPT_NO_PROMPT); ++ constant char *dash = (flag == OPT_NO_TOGGLE) ? "_" : "-"; + - no_prompt = (optflag & OPT_NO_PROMPT); - flag = (optflag & ~OPT_NO_PROMPT); - dash = (flag == OPT_NO_TOGGLE) ? "_" : "-"; - + set_mca(A_OPT_TOGGLE); + cmd_putstr(dash); + if (optgetname) + cmd_putstr(dash); + if (no_prompt) + cmd_putstr("(P)"); + switch (flag) + { + case OPT_UNSET: + cmd_putstr("+"); + break; + case OPT_SET: + cmd_putstr("!"); + break; + } + forw_prompt = 0; + set_mlist(NULL, 0); +} + +/* + * Execute a multicharacter command. + */ +static void exec_mca(void) +{ - char *cbuf; ++ constant char *cbuf; ++ char *p; + + cmd_exec(); + cbuf = get_cmdbuf(); + if (cbuf == NULL) + return; + + switch (mca) + { + case A_F_SEARCH: + case A_B_SEARCH: + multi_search(cbuf, (int) number, 0); + break; +#if HILITE_SEARCH + case A_FILTER: + search_type ^= SRCH_NO_MATCH; + set_filter_pattern(cbuf, search_type); + break; +#endif + case A_FIRSTCMD: + /* + * Skip leading spaces or + signs in the string. + */ + while (*cbuf == '+' || *cbuf == ' ') + cbuf++; + if (every_first_cmd != NULL) + free(every_first_cmd); + if (*cbuf == '\0') + every_first_cmd = NULL; + else + every_first_cmd = save(cbuf); + break; + case A_OPT_TOGGLE: + toggle_option(curropt, opt_lower, cbuf, optflag); + curropt = NULL; + break; + case A_F_BRACKET: + match_brac(cbuf[0], cbuf[1], 1, (int) number); + break; + case A_B_BRACKET: + match_brac(cbuf[1], cbuf[0], 0, (int) number); + break; +#if EXAMINE + case A_EXAMINE: - if (secure) ++ if (!secure_allow(SF_EXAMINE)) + break; - edit_list(cbuf); ++ p = save(cbuf); ++ edit_list(p); ++ free(p); +#if TAGS + /* If tag structure is loaded then clean it up. */ + cleantags(); +#endif + break; +#endif +#if SHELL_ESCAPE - case A_SHELL: ++ case A_SHELL: { + /* + * !! just uses whatever is in shellcmd. + * Otherwise, copy cmdbuf to shellcmd, + * expanding any special characters ("%" or "#"). + */ ++ constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "!done"; ++ if (done_msg == NULL) ++ ++cbuf; + if (*cbuf != '!') + { + if (shellcmd != NULL) + free(shellcmd); + shellcmd = fexpand(cbuf); + } - - if (secure) ++ if (!secure_allow(SF_SHELL)) + break; + if (shellcmd == NULL) - lsystem("", "!done"); - else - lsystem(shellcmd, "!done"); - break; - case A_PSHELL: - if (secure) ++ shellcmd = ""; ++ lsystem(shellcmd, done_msg); ++ break; } ++ case A_PSHELL: { ++ constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "#done"; ++ if (done_msg == NULL) ++ ++cbuf; ++ if (!secure_allow(SF_SHELL)) + break; - lsystem(pr_expand(cbuf), "#done"); - break; ++ lsystem(pr_expand(cbuf), done_msg); ++ break; } +#endif +#if PIPEC - case A_PIPE: - if (secure) ++ case A_PIPE: { ++ constant char *done_msg = (*cbuf == CONTROL('P')) ? NULL : "|done"; ++ if (done_msg == NULL) ++ ++cbuf; ++ if (!secure_allow(SF_PIPE)) + break; + (void) pipe_mark(pipec, cbuf); - error("|done", NULL_PARG); - break; ++ if (done_msg != NULL) ++ error(done_msg, NULL_PARG); ++ break; } +#endif + } +} + +/* + * Is a character an erase or kill char? + */ - static int is_erase_char(int c) ++static lbool is_erase_char(char c) +{ + return (c == erase_char || c == erase2_char || c == kill_char); +} + +/* + * Is a character a carriage return or newline? + */ - static int is_newline_char(int c) ++static lbool is_newline_char(char c) +{ + return (c == '\n' || c == '\r'); +} + +/* + * Handle the first char of an option (after the initial dash). + */ - static int mca_opt_first_char(int c) ++static int mca_opt_first_char(char c) +{ + int no_prompt = (optflag & OPT_NO_PROMPT); + int flag = (optflag & ~OPT_NO_PROMPT); + if (flag == OPT_NO_TOGGLE) + { + switch (c) + { + case '_': + /* "__" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } else + { + switch (c) + { + case '+': + /* "-+" = UNSET. */ + optflag = no_prompt | ((flag == OPT_UNSET) ? + OPT_TOGGLE : OPT_UNSET); + mca_opt_toggle(); + return (MCA_MORE); + case '!': + /* "-!" = SET */ + optflag = no_prompt | ((flag == OPT_SET) ? + OPT_TOGGLE : OPT_SET); + mca_opt_toggle(); + return (MCA_MORE); + case CONTROL('P'): + optflag ^= OPT_NO_PROMPT; + mca_opt_toggle(); + return (MCA_MORE); + case '-': + /* "--" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } + /* Char was not handled here. */ + return (NO_MCA); +} + +/* + * Add a char to a long option name. + * See if we've got a match for an option name yet. + * If so, display the complete name and stop + * accepting chars until user hits RETURN. + */ - static int mca_opt_nonfirst_char(int c) ++static int mca_opt_nonfirst_char(char c) +{ - char *p; - char *oname; - int err; ++ constant char *p; ++ constant char *oname; ++ lbool ambig; + + if (curropt != NULL) + { + /* + * Already have a match for the name. + * Don't accept anything but erase/kill. + */ + if (is_erase_char(c)) + return (MCA_DONE); + return (MCA_MORE); + } + /* + * Add char to cmd buffer and try to match + * the option name. + */ + if (cmd_char(c) == CC_QUIT) + return (MCA_DONE); + p = get_cmdbuf(); + if (p == NULL) + return (MCA_MORE); + opt_lower = ASCII_IS_LOWER(p[0]); - err = 0; - curropt = findopt_name(&p, &oname, &err); ++ curropt = findopt_name(&p, &oname, &ambig); + if (curropt != NULL) + { + /* + * Got a match. + * Remember the option and + * display the full option name. + */ + cmd_reset(); + mca_opt_toggle(); + for (p = oname; *p != '\0'; p++) + { + c = *p; + if (!opt_lower && ASCII_IS_LOWER(c)) + c = ASCII_TO_UPPER(c); + if (cmd_char(c) != CC_OK) + return (MCA_DONE); + } - } else if (err != OPT_AMBIG) ++ } else if (!ambig) + { + bell(); + } + return (MCA_MORE); +} + +/* + * Handle a char of an option toggle command. + */ - static int mca_opt_char(int c) ++static int mca_opt_char(char c) +{ + PARG parg; + + /* + * This may be a short option (single char), + * or one char of a long option name, + * or one char of the option parameter. + */ + if (curropt == NULL && len_cmdbuf() == 0) + { + int ret = mca_opt_first_char(c); + if (ret != NO_MCA) + return (ret); + } + if (optgetname) + { + /* We're getting a long option name. */ + if (!is_newline_char(c) && c != '=') + return (mca_opt_nonfirst_char(c)); + if (curropt == NULL) + { + parg.p_string = get_cmdbuf(); + if (parg.p_string == NULL) + return (MCA_MORE); + error("There is no --%s option", &parg); + return (MCA_DONE); + } + optgetname = FALSE; + cmd_reset(); + } else + { + if (is_erase_char(c)) + return (NO_MCA); + if (curropt != NULL) + /* We're getting the option parameter. */ + return (NO_MCA); + curropt = findopt(c); + if (curropt == NULL) + { + parg.p_string = propt(c); + error("There is no %s option", &parg); + return (MCA_DONE); + } + opt_lower = ASCII_IS_LOWER(c); + } + /* + * If the option which was entered does not take a + * parameter, toggle the option immediately, + * so user doesn't have to hit RETURN. + */ + if ((optflag & ~OPT_NO_PROMPT) != OPT_TOGGLE || + !opt_has_param(curropt)) + { + toggle_option(curropt, opt_lower, "", optflag); + return (MCA_DONE); + } + /* + * Display a prompt appropriate for the option parameter. + */ - start_mca(A_OPT_TOGGLE, opt_prompt(curropt), (void*)NULL, 0); ++ start_mca(A_OPT_TOGGLE, opt_prompt(curropt), NULL, 0); + return (MCA_MORE); +} + +/* + * Normalize search type. + */ +public int norm_search_type(int st) +{ + /* WRAP and PAST_EOF are mutually exclusive. */ + if ((st & (SRCH_PAST_EOF|SRCH_WRAP)) == (SRCH_PAST_EOF|SRCH_WRAP)) + st ^= SRCH_PAST_EOF; + return st; +} + +/* + * Handle a char of a search command. + */ - static int mca_search_char(int c) ++static int mca_search_char(char c) +{ + int flag = 0; + + /* + * Certain characters as the first char of + * the pattern have special meaning: + * ! Toggle the NO_MATCH flag + * * Toggle the PAST_EOF flag + * @ Toggle the FIRST_FILE flag + */ - if (len_cmdbuf() > 0) ++ if (len_cmdbuf() > 0 || literal_char) ++ { ++ literal_char = FALSE; + return (NO_MCA); ++ } + + switch (c) + { + case '*': + if (less_is_more) + break; + case CONTROL('E'): /* ignore END of file */ + if (mca != A_FILTER) + flag = SRCH_PAST_EOF; + search_type &= ~SRCH_WRAP; + break; + case '@': + if (less_is_more) + break; + case CONTROL('F'): /* FIRST file */ + if (mca != A_FILTER) + flag = SRCH_FIRST_FILE; + break; + case CONTROL('K'): /* KEEP position */ + if (mca != A_FILTER) + flag = SRCH_NO_MOVE; + break; + case CONTROL('S'): { /* SUBSEARCH */ + char buf[INT_STRLEN_BOUND(int)+24]; + SNPRINTF1(buf, sizeof(buf), "Sub-pattern (1-%d):", NUM_SEARCH_COLORS); + clear_bot(); + cmd_putstr(buf); + flush(); + c = getcc(); + if (c >= '1' && c <= '0'+NUM_SEARCH_COLORS) + flag = SRCH_SUBSEARCH(c-'0'); + else + flag = -1; /* calls mca_search() below to repaint */ + break; } + case CONTROL('W'): /* WRAP around */ + if (mca != A_FILTER) + flag = SRCH_WRAP; + break; + case CONTROL('R'): /* Don't use REGULAR EXPRESSIONS */ + flag = SRCH_NO_REGEX; + break; + case CONTROL('N'): /* NOT match */ + case '!': + flag = SRCH_NO_MATCH; + break; ++ case CONTROL('L'): ++ literal_char = TRUE; ++ flag = -1; ++ break; + } + + if (flag != 0) + { + if (flag != -1) + search_type = norm_search_type(search_type ^ flag); + mca_search(); + return (MCA_MORE); + } + return (NO_MCA); +} + +/* + * Handle a character of a multi-character command. + */ - static int mca_char(int c) ++static int mca_char(char c) +{ + int ret; + + switch (mca) + { + case 0: + /* + * We're not in a multicharacter command. + */ + return (NO_MCA); + + case A_PREFIX: + /* + * In the prefix of a command. + * This not considered a multichar command + * (even tho it uses cmdbuf, etc.). + * It is handled in the commands() switch. + */ + return (NO_MCA); + + case A_DIGIT: + /* + * Entering digits of a number. + * Terminated by a non-digit. + */ + if ((c >= '0' && c <= '9') || c == '.') + break; + switch (editchar(c, ECF_PEEK|ECF_NOHISTORY|ECF_NOCOMPLETE|ECF_NORIGHTLEFT)) + { + case A_NOACTION: + /* + * Ignore this char and get another one. + */ + return (MCA_MORE); + case A_INVALID: + /* + * Not part of the number. + * End the number and treat this char + * as a normal command character. + */ + number = cmd_int(&fraction); + clear_mca(); + cmd_accept(); + return (NO_MCA); + } + break; + + case A_OPT_TOGGLE: + ret = mca_opt_char(c); + if (ret != NO_MCA) + return (ret); + break; + + case A_F_SEARCH: + case A_B_SEARCH: + case A_FILTER: + ret = mca_search_char(c); + if (ret != NO_MCA) + return (ret); + break; + + default: + /* Other multicharacter command. */ + break; + } + + /* + * The multichar command is terminated by a newline. + */ + if (is_newline_char(c)) + { + /* + * Execute the command. + */ + exec_mca(); + return (MCA_DONE); + } + + /* + * Append the char to the command buffer. + */ + if (cmd_char(c) == CC_QUIT) + /* + * Abort the multi-char command. + */ + return (MCA_DONE); + + switch (mca) + { + case A_F_BRACKET: + case A_B_BRACKET: + if (len_cmdbuf() >= 2) + { + /* + * Special case for the bracket-matching commands. + * Execute the command after getting exactly two + * characters from the user. + */ + exec_mca(); + return (MCA_DONE); + } + break; + case A_F_SEARCH: + case A_B_SEARCH: + if (incr_search) + { + /* Incremental search: do a search after every input char. */ + int st = (search_type & (SRCH_FORW|SRCH_BACK|SRCH_NO_MATCH|SRCH_NO_REGEX|SRCH_NO_MOVE|SRCH_WRAP|SRCH_SUBSEARCH_ALL)); - char *pattern = get_cmdbuf(); ++ ssize_t save_updown; ++ constant char *pattern = get_cmdbuf(); + if (pattern == NULL) + return (MCA_MORE); + /* + * Must save updown_match because mca_search + * reinits it. That breaks history scrolling. + * {{ This is ugly. mca_search probably shouldn't call set_mlist. }} + */ - int save_updown_match = updown_match; ++ save_updown = save_updown_match(); + cmd_exec(); + if (*pattern == '\0') + { + /* User has backspaced to an empty pattern. */ + undo_search(1); + } else + { + if (search(st | SRCH_INCR, pattern, 1) != 0) + /* No match, invalid pattern, etc. */ + undo_search(1); + } + /* Redraw the search prompt and search string. */ - if (!full_screen) ++ if (is_screen_trashed() || !full_screen) + { + clear(); + repaint(); + } + mca_search1(); - updown_match = save_updown_match; ++ restore_updown_match(save_updown); + cmd_repaint(NULL); + } + break; + } + + /* + * Need another character. + */ + return (MCA_MORE); +} + +/* + * Discard any buffered file data. + */ +static void clear_buffers(void) +{ + if (!(ch_getflags() & CH_CANSEEK)) + return; + ch_flush(); + clr_linenum(); +#if HILITE_SEARCH + clr_hilite(); +#endif +} + ++public void screen_trashed_num(int trashed) ++{ ++ screen_trashed_value = trashed; ++} ++ ++public void screen_trashed(void) ++{ ++ screen_trashed_num(1); ++} ++ ++public int is_screen_trashed(void) ++{ ++ return screen_trashed_value; ++} ++ +/* + * Make sure the screen is displayed. + */ +static void make_display(void) +{ + /* + * If not full_screen, we can't rely on scrolling to fill the screen. + * We need to clear and repaint screen before any change. + */ + if (!full_screen && !(quit_if_one_screen && one_screen)) + clear(); + /* + * If nothing is displayed yet, display starting from initial_scrpos. + */ + if (empty_screen()) + { + if (initial_scrpos.pos == NULL_POSITION) + jump_loc(ch_zero(), 1); + else + jump_loc(initial_scrpos.pos, initial_scrpos.ln); - } else if (screen_trashed || !full_screen) ++ } else if (is_screen_trashed() || !full_screen) + { + int save_top_scroll = top_scroll; + int save_ignore_eoi = ignore_eoi; + top_scroll = 1; + ignore_eoi = 0; - if (screen_trashed == 2) ++ if (is_screen_trashed() == 2) + { + /* Special case used by ignore_eoi: re-open the input file + * and jump to the end of the file. */ + reopen_curr_ifile(); + jump_forw(); + } + repaint(); + top_scroll = save_top_scroll; + ignore_eoi = save_ignore_eoi; *** 3006 LINES SKIPPED *** From nobody Mon Dec 9 09:39:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6GzM4zdMz5g3KF; Mon, 09 Dec 2024 09:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6GzM4B5pz4fcQ; Mon, 9 Dec 2024 09:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733737167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6bN0iGWFQ//gbPW4wDAmnBa7P4Ojd1szo27M2Xnnckw=; b=kBwaJ8+1c6Xkyc+HB3351QABrE9zKvaE3/xvBS14mhIBclCn26lLrsZqWeO3+H6LAnxnhe JPS/6Y6kt5cdkE77sPbU1Jp9olQhC1Kh9/jwe8fFqNnDA10i5Cmt2YXKwX1gjy8sI2/Cnr NrCm03r7xiM2J47zEhE4q7XPyP2QQ0/2tW1Gz8bjKZKCD7bWEeJi/dxJtGMMW6yxjS4vsk ip4StrtHWCTM5zc6/SWE1LEEUDLhOuIj/HBIrei78pUn2DE7AkVlwA/SA/M7H1yeulelED a78B20QFeVwi9vEeIlhJQjLYm2v4+DTXkA6mXFUUG7qTqUyu/JLtPakXiFohzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733737167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6bN0iGWFQ//gbPW4wDAmnBa7P4Ojd1szo27M2Xnnckw=; b=EaDBsh7ZfnNU/cVGtSvbnq3lBQtrUXPol1/PEC7+OlaCQVdi932y7+GsAoYq5qjmGoZ8Dy e0sGKDfq671uIyY49H71DMqfvv3stLBS9+y/aU12YJtlIMDJci5+kpGvB3Y8+20EiNqACv Sw3ToRWhE24VICrVpd8UckVuubT2nY5m90dbeNRvcDX4Z1gspo0lbv3Qg+OnmMEmhBvONl N5wqUWaEcdvqUaWQ7RyT/uh7/v50m64e4CkqosFoHaRdb9o1HGvDy4xFuF+qI1UxYeJ1x5 iWn3i30wAYOCTGdxdRKjQHjGEGqs8938KCTuRKTwAM2xH+JkSP5YfngmqFQiVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733737167; a=rsa-sha256; cv=none; b=irvV5YhFJIZ+0jJ52kxkyZw71VvWKOD8TGxlPsNIUnsHoubyc3avKi+xmubPxCPAcHWJWE fcwE8mKSprATtwi3n9F1SUTkPVK+rmQGw9TbCG38eeQ2/yYSi1ngZycbVrXjNq3/wVmYhg PwS6tlmpex6eY+MWg1uxlaMOWvSXD8Cxtul0SydXdHDASRsJUtSGl5qhp2zeD+KoKVzgVi yhCWAEZqiooeRECs9dPne8ewJryWEkLFfGTjEZQolpdsTYct00w3jeYnttVclizKC4jChi YN+5y8eXXqjg6CKbuTaVLwuPLlMsTCgnPI519O8uiyndMe4ia7d3tU1GeRNfQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6GzM3nJJzXcb; Mon, 9 Dec 2024 09:39: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 4B99dRXD072157; Mon, 9 Dec 2024 09:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B99dRhr072153; Mon, 9 Dec 2024 09:39:27 GMT (envelope-from git) Date: Mon, 9 Dec 2024 09:39:27 GMT Message-Id: <202412090939.4B99dRhr072153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 5b59b0c61e29 - main - pfctl: add -T `reset` to touch pfras_tzero only for non-zero entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b59b0c61e29f684a019afdd2848ffe2d5604e0c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b59b0c61e29f684a019afdd2848ffe2d5604e0c commit 5b59b0c61e29f684a019afdd2848ffe2d5604e0c Author: Leonid Evdokimov AuthorDate: 2024-12-06 12:08:54 +0000 Commit: Kristof Provost CommitDate: 2024-12-09 09:36:34 +0000 pfctl: add -T `reset` to touch pfras_tzero only for non-zero entries This will make it easier for scripts to detect idle hosts in tables. PR: 282984 Reviewed by: kp MFC after: 2 weeks --- sbin/pfctl/pfctl.8 | 7 +++- sbin/pfctl/pfctl.c | 2 +- sbin/pfctl/pfctl_radix.c | 2 +- sbin/pfctl/pfctl_table.c | 44 ++++++++++++++++++++++++ tests/sys/netpfil/pf/table.sh | 80 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index 45a6ea525694..00fbda042b7c 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 20, 2024 +.Dd November 25, 2024 .Dt PFCTL 8 .Os .Sh NAME @@ -508,6 +508,11 @@ Show the content (addresses) of a table. Test if the given addresses match a table. .It Fl T Cm zero Op Ar address ... Clear all the statistics of a table, or only for specified addresses. +.It Fl T Cm reset +Clear statistics only for addresses with non-zero statistics. Addresses +with counter values at zero and their +.Dq Cleared +timestamp are left untouched. .It Fl T Cm load Load only the table definitions from .Xr pf.conf 5 . diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 555c5181eac8..aa3db4619972 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -239,7 +239,7 @@ static const char * const showopt_list[] = { static const char * const tblcmdopt_list[] = { "kill", "flush", "add", "delete", "load", "replace", "show", - "test", "zero", "expire", NULL + "test", "zero", "expire", "reset", NULL }; static const char * const debugopt_list[] = { diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 749e8b4affc9..9bea219a7d81 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -292,7 +292,7 @@ pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, { struct pfioc_table io; - if (size < 0 || (size && !tbl) || addr == NULL) { + if (size < 0 || !tbl || (size && !addr)) { errno = EINVAL; return (-1); } diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 25d9b87d8718..aac031ce26b2 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -60,6 +60,7 @@ static void print_table(struct pfr_table *, int, int); static void print_tstats(struct pfr_tstats *, int); static int load_addr(struct pfr_buffer *, int, char *[], char *, int); static void print_addrx(struct pfr_addr *, struct pfr_addr *, int); +static int nonzero_astats(struct pfr_astats *); static void print_astats(struct pfr_astats *, int); static void radix_perror(void); static void xprintf(int, const char *, ...); @@ -293,6 +294,36 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) print_addrx(a, NULL, opts & PF_OPT_USEDNS); + } else if (!strcmp(command, "reset")) { + struct pfr_astats *as; + + b.pfrb_type = PFRB_ASTATS; + b2.pfrb_type = PFRB_ADDRS; + if (argc || file != NULL) + usage(); + do { + pfr_buf_grow(&b, b.pfrb_size); + b.pfrb_size = b.pfrb_msize; + RVTEST(pfr_get_astats(&table, b.pfrb_caddr, + &b.pfrb_size, flags)); + } while (b.pfrb_size > b.pfrb_msize); + PFRB_FOREACH(as, &b) { + as->pfras_a.pfra_fback = 0; + if (nonzero_astats(as)) + if (pfr_buf_add(&b2, &as->pfras_a)) + err(1, "duplicate buffer"); + } + + if (opts & PF_OPT_VERBOSE) + flags |= PFR_FLAG_FEEDBACK; + RVTEST(pfr_clr_astats(&table, b2.pfrb_caddr, b2.pfrb_size, + &nzero, flags)); + xprintf(opts, "%d/%d stats cleared", nzero, b.pfrb_size); + if (opts & PF_OPT_VERBOSE) + PFRB_FOREACH(a, &b2) + if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) + print_addrx(a, NULL, + opts & PF_OPT_USEDNS); } else if (!strcmp(command, "show")) { b.pfrb_type = (opts & PF_OPT_VERBOSE) ? PFRB_ASTATS : PFRB_ADDRS; @@ -484,6 +515,19 @@ print_addrx(struct pfr_addr *ad, struct pfr_addr *rad, int dns) printf("\n"); } +int +nonzero_astats(struct pfr_astats *as) +{ + uint64_t s = 0; + + for (int dir = 0; dir < PFR_DIR_MAX; dir++) + for (int op = 0; op < PFR_OP_ADDR_MAX; op++) + s |= as->pfras_packets[dir][op] | + as->pfras_bytes[dir][op]; + + return (!!s); +} + void print_astats(struct pfr_astats *as, int dns) { diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 828d76a998be..62c9d66d80ce 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -165,6 +165,85 @@ zero_one_cleanup() pft_cleanup } +atf_test_case "reset_nonzero" "cleanup" +reset_nonzero_head() +{ + atf_set descr 'Test zeroing an address with non-zero counters' + atf_set require.user root +} + +reset_nonzero_body() +{ + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + ifconfig ${epair_send}a inet alias 192.0.2.3/24 + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "table counters { 192.0.2.1, 192.0.2.3 }" \ + "table counters { }" \ + "block all" \ + "pass in from to any" \ + "pass out from any to " \ + "pass on notReallyAnIf from to " \ + "set skip on lo" + + # Nonexisting table can't be reset, following `-T show`. + atf_check -o ignore \ + -s not-exit:0 \ + -e inline:"pfctl: Table does not exist.\n" \ + jexec alcatraz pfctl -t nonexistent -T reset + + atf_check -o ignore \ + -s exit:0 \ + -e inline:"0/0 stats cleared.\n" \ + jexec alcatraz pfctl -t bar -T reset + + # No-op is a valid operation. + atf_check -s exit:0 \ + -e inline:"0/2 stats cleared.\n" \ + jexec alcatraz pfctl -t foo -T reset + + atf_check -s exit:0 -o ignore ping -c 3 -S 192.0.2.3 192.0.2.2 + + atf_check -s exit:0 -e ignore \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -vvT show + + local clrd uniq + clrd=`jexec alcatraz pfctl -t foo -vvT show | grep -c Cleared` + uniq=`jexec alcatraz pfctl -t foo -vvT show | sort -u | grep -c Cleared` + atf_check_equal "$clrd" 2 + atf_check_equal "$uniq" 1 # time they were added + + atf_check -s exit:0 -e ignore \ + -e inline:"1/2 stats cleared.\n" \ + jexec alcatraz pfctl -t foo -T reset + + clrd=`jexec alcatraz pfctl -t foo -vvT show | grep -c Cleared` + uniq=`jexec alcatraz pfctl -t foo -vvT show | sort -u | grep -c Cleared` + atf_check_equal "$clrd" 2 + atf_check_equal "$uniq" 2 # 192.0.2.3 should get new timestamp + + atf_check -s exit:0 -e ignore \ + -o not-match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o not-match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -vvT show +} + +reset_nonzero_cleanup() +{ + pft_cleanup +} + atf_test_case "pr251414" "cleanup" pr251414_head() { @@ -381,6 +460,7 @@ atf_init_test_cases() atf_add_test_case "v4_counters" atf_add_test_case "v6_counters" atf_add_test_case "zero_one" + atf_add_test_case "reset_nonzero" atf_add_test_case "pr251414" atf_add_test_case "automatic" atf_add_test_case "network" From nobody Mon Dec 9 12:38:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6Ly72g7Dz5gFWy; Mon, 09 Dec 2024 12:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6Ly726hcz4428; Mon, 9 Dec 2024 12:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733747919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AlxSjsy+AVBQA13F2uEKntXoke7ViOgEZcrW0CTOVYo=; b=eyRiNv7Oag7IW31vDtK4KEn1TuHd1mBmnV37pBZjs69MXpc6TPWQ/De67kV6IltVZHsoVt V8vqcLnqy3kBxu2PqmsRuBqrzxgXT3LLFp7MzmaPJNLdNDbcDMHbq41l2uCEZJW7oWOa6Q Ls25g5cHbdSb4j1IHlJxRE4gjmfgQ8HK5FoynZIdMCvd0hmb5INBR+lmFS+odivoyyikbS oGDcgRWBp0wV6gjTFvCBKbDwetnN56C8ffPcfUfSiMuH6OyehNJLqG4dNycQG95ymgA3me GbNK+nbgeLPnd4CULhBTq6rWUX6oY61byhVymRbUh4m5hzUpzs+USUKlpYEdTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733747919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AlxSjsy+AVBQA13F2uEKntXoke7ViOgEZcrW0CTOVYo=; b=IjP18ENnO/Aeni4cUBXIy/Dqh363ymh9kQDtlNeI/KbIzR/09SyQRecvr1e2LnMQQlboQS PIlixjWZpHMsSDk0D37N9FS9CeWw7hGNP7qCCKrGeINjxpwODiV3fwV3Ba0VCt3vzSWX+T ZvCaNzGW2RD0PuuiGJQBwy7nxZFXnIIb+Vp/wAE4vCq44hHGYt4lpLBVZjN7Qyd8qzsKgb h7ySm3e3WYV0O/3sIQN20gY3JTjE7uPf1maxtB1a1hX6TTbCQRD0fdbXoHrqZK77TQhJcr C2aSw0cAHujmzwwgHdPDAFES4I4N1p3CQ/8z3adnhcXkh+J2jpUsAJuwDiE4DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733747919; a=rsa-sha256; cv=none; b=VxQjg/xoeeuc8mqQuzp3Q4dCVCPT/ncM7wdhQlct+SwFSsSyTuuVBsMYplugRdUh+iizdS r81z0a4272NUpHINkvLXLa/7xwopIpocmuUcv58pyKOp1Lkqhf+xmtfRgZuJZ4eFckQytu nnDA5EtVVxz0+kFbMzkxK2sJ39UAZ2UNInk9OXybEzPts6s+3fAPuUaNttCfZgWEjrj2Do 3jxCntJdq32zRsGuNz2IqwbXaUbblUXnsnL8+94Bh4MFDumm6Z+4dwnGiqPJIgXPy0i+me WCeg4HI+DeY2j8BxuaywKDhP7mPTy1W84xntT/NSZ67tS8OhAAxV8PdnzABL8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6Ly71brSzdBs; Mon, 9 Dec 2024 12:38:39 +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 4B9Ccdch007918; Mon, 9 Dec 2024 12:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9CcdTl007915; Mon, 9 Dec 2024 12:38:39 GMT (envelope-from git) Date: Mon, 9 Dec 2024 12:38:39 GMT Message-Id: <202412091238.4B9CcdTl007915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4285e024baa8 - main - strptime: Fix day-of-week calculation. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4285e024baa80f81d13cdcc016fdf0721fe57862 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4285e024baa80f81d13cdcc016fdf0721fe57862 commit 4285e024baa80f81d13cdcc016fdf0721fe57862 Author: Dag-Erling Smørgrav AuthorDate: 2024-12-09 12:37:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-12-09 12:38:22 +0000 strptime: Fix day-of-week calculation. The day-of-week calculation used the raw year value without adjusting for TM_YEAR_BASE, so it was off by one for 300 years out of every 400; it just happened to be correct for 1901 through 2000. It also used a loop where a simple addition would have sufficed. While here, simplify our version of Gauss's algorithm, and document that we assume the Gregorian calendar. MFC after: 1 week PR: 282916 Reviewed by: imp, allanjude, philip Differential Revision: https://reviews.freebsd.org/D47977 --- etc/mtree/BSD.tests.dist | 2 ++ lib/libc/stdtime/strptime.3 | 7 ++++- lib/libc/stdtime/strptime.c | 22 ++++++--------- lib/libc/tests/Makefile | 1 + lib/libc/tests/stdtime/Makefile | 7 +++++ lib/libc/tests/stdtime/strptime_test.c | 50 ++++++++++++++++++++++++++++++++++ 6 files changed, 74 insertions(+), 15 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 1762bbfb7bdc..e0c16bd5e570 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -382,6 +382,8 @@ .. stdlib .. + stdtime + .. string .. sys diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3 index 0dfa33aa29cb..7df73d2d080a 100644 --- a/lib/libc/stdtime/strptime.3 +++ b/lib/libc/stdtime/strptime.3 @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" " -.Dd October 2, 2014 +.Dd December 9, 2024 .Dt STRPTIME 3 .Os .Sh NAME @@ -135,6 +135,11 @@ function has been contributed by Powerdog Industries. .Pp This man page was written by .An J\(:org Wunsch . +.Sh CAVEATS +The +.Fn strptime +function assumes the Gregorian calendar and will produce incorrect +results for dates prior to its introduction. .Sh BUGS Both the .Fa %e diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c index c988d968d580..5f1293c7a267 100644 --- a/lib/libc/stdtime/strptime.c +++ b/lib/libc/stdtime/strptime.c @@ -62,17 +62,16 @@ static char * _strptime(const char *, const char *, struct tm *, int *, locale_t #define FLAG_WDAY (1 << 5) /* - * Calculate the week day of the first day of a year. Valid for - * the Gregorian calendar, which began Sept 14, 1752 in the UK - * and its colonies. Ref: - * http://en.wikipedia.org/wiki/Determination_of_the_day_of_the_week + * Gauss's algorithm for the day of the week of the first day of any year + * in the Gregorian calendar. */ - static int first_wday_of(int year) { - return (((2 * (3 - (year / 100) % 4)) + (year % 100) + - ((year % 100) / 4) + (isleap(year) ? 6 : 0) + 1) % 7); + return ((1 + + 5 * ((year - 1) % 4) + + 4 * ((year - 1) % 100) + + 6 * ((year - 1) % 400)) % 7); } static char * @@ -674,13 +673,8 @@ label: flags |= FLAG_MDAY; } if (!(flags & FLAG_WDAY)) { - i = 0; - wday_offset = first_wday_of(tm->tm_year); - while (i++ <= tm->tm_yday) { - if (wday_offset++ >= 6) - wday_offset = 0; - } - tm->tm_wday = wday_offset; + wday_offset = first_wday_of(tm->tm_year + TM_YEAR_BASE); + tm->tm_wday = (wday_offset + tm->tm_yday) % 7; flags |= FLAG_WDAY; } } diff --git a/lib/libc/tests/Makefile b/lib/libc/tests/Makefile index 76a79a9f578b..975c895770ee 100644 --- a/lib/libc/tests/Makefile +++ b/lib/libc/tests/Makefile @@ -16,6 +16,7 @@ TESTS_SUBDIRS+= secure TESTS_SUBDIRS+= setjmp TESTS_SUBDIRS+= stdio TESTS_SUBDIRS+= stdlib +TESTS_SUBDIRS+= stdtime TESTS_SUBDIRS+= string TESTS_SUBDIRS+= sys TESTS_SUBDIRS+= termios diff --git a/lib/libc/tests/stdtime/Makefile b/lib/libc/tests/stdtime/Makefile new file mode 100644 index 000000000000..c7a7f5b9436f --- /dev/null +++ b/lib/libc/tests/stdtime/Makefile @@ -0,0 +1,7 @@ +.include + +ATF_TESTS_C+= strptime_test + +TESTSDIR:= ${TESTSBASE}/${RELDIR:C/libc\/tests/libc/} + +.include diff --git a/lib/libc/tests/stdtime/strptime_test.c b/lib/libc/tests/stdtime/strptime_test.c new file mode 100644 index 000000000000..79a97764999c --- /dev/null +++ b/lib/libc/tests/stdtime/strptime_test.c @@ -0,0 +1,50 @@ +/*- + * Copyright (c) 2024 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include + +ATF_TC_WITHOUT_HEAD(dayofweek); +ATF_TC_BODY(dayofweek, tc) +{ + static const struct { + const char *str; + int wday; + } cases[] = { + { "1582-12-20", 1 }, + { "1700-03-01", 1 }, + { "1752-09-14", 4 }, + { "1800-12-31", 3 }, + { "1801-01-01", 4 }, + { "1900-12-31", 1 }, + { "1901-01-01", 2 }, + { "2000-12-31", 0 }, + { "2001-01-01", 1 }, + { "2100-12-31", 5 }, + { "2101-01-01", 6 }, + { "2200-12-31", 3 }, + { "2201-01-01", 4 }, + { }, + }; + struct tm tm; + + for (unsigned int i = 0; cases[i].str != NULL; i++) { + if (strptime(cases[i].str, "%Y-%m-%d", &tm) == NULL) { + atf_tc_fail_nonfatal("failed to parse %s", + cases[i].str); + } else if (tm.tm_wday != cases[i].wday) { + atf_tc_fail_nonfatal("expected %d for %s, got %d", + cases[i].wday, cases[i].str, tm.tm_wday); + } + } +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, dayofweek); + return (atf_no_error()); +} From nobody Mon Dec 9 14:47:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6PpW2ZMYz5gNnK; Mon, 09 Dec 2024 14:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6PpW1l41z4JK7; Mon, 9 Dec 2024 14:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733755635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysPORChBMjmvd1jbg0hgDpmtqYXkHG+rL2Dw4uflRP4=; b=aA2JVBnNAuLMFMiigsFKuoCg6L+Oc4TunyrZ3gd9wYlkvdMKYjgfTRfyn1Xgx00+GFWJwH 4ttnqwDfF7/OI6SOO75SD9+1K8CUbg4/uHzocOCrEbfenkIdwQPcZsx2E37Rvz5lpf70yr bnZBicHnTNqSZ3cjBsHZLduF9hKIiX6WfS+qg1YF/wfVRqBVPQBwR45UB1OEuxWRRaSYUb 7tq99xfqyUXucWBWE6dkFy5H+7skfxBMzqfL7vM5FgvGWZAKfrMg0OLELG7Ratsl2dShPG CunqocGj+PH+RmZHHjpXQ8G2WbsBQpnvRtoQnAqUBrPUMzpsfhtPWder6u4nvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733755635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysPORChBMjmvd1jbg0hgDpmtqYXkHG+rL2Dw4uflRP4=; b=g5ZVJW9MkAHkPMhSbikAErvQ81Az2TS8K5DKQ2jucPfd0DDaLPbAIxXAci1dLP37bVuSsL 9+2ll0U3pAXp69kqsuXQ8vnwdE3HCWWsp0hHgoklOv6F8z79v80OjkeYvwHs2imbTSSj4H wyXh4btiS3b3O639XW0FTESI+xnHVMIg9MCdpJD0fgx3neId9W+cA4BZQGuLPdQ7quSGme QKYK+/dxpPhFYg7clBmJhULylJUisM2IVNkGgSEe1MCPlTaUMvwLIt6XWDzSITtRZ6oaVd EGCTVA6yQRl27G0lpnz6uvO786urOePDuVQo6K9CSyHTJZPuBXyiDqn5pxUpeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733755635; a=rsa-sha256; cv=none; b=WIR+r7pfKitm7qASElSeWTbY59H7sHEyOuNL4JFgBeLq/f38gskPq6I+E/p8huIA9tmhwB iy+o4FITnQJ0btqkZHH040Cc2ZGp7BP0Y/xoNDnBlh3V5S8Zqgag8RxC7YvktZqobpNKPB WCQFzPoRL1qtKyGtc1Edzi5M9bbJWkrGKGHTu/Tn8nFu9LFLf7dhmrvwLTgtUMFvAN7swl KeOeeSUyQ/3i69Kq6mkwsInWGjCaOJDGq0P9iPsML31vVsXFZdKXHJyZqUWhpTLivnWGbJ xPrtS83ot4sHuIpZshFgndHG5ONo58TW4WzfewSMAxZMA2W/miGzUC/V4F6uWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6PpW1C43zj0n; Mon, 9 Dec 2024 14:47:15 +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 4B9ElFgA050289; Mon, 9 Dec 2024 14:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9ElFBH050286; Mon, 9 Dec 2024 14:47:15 GMT (envelope-from git) Date: Mon, 9 Dec 2024 14:47:15 GMT Message-Id: <202412091447.4B9ElFBH050286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 87e140a5c6f8 - main - iwlwifi: avoid (hard) hang on loading module List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87e140a5c6f89eea7ea6320d1ae34566492abfc0 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=87e140a5c6f89eea7ea6320d1ae34566492abfc0 commit 87e140a5c6f89eea7ea6320d1ae34566492abfc0 Author: Bjoern A. Zeeb AuthorDate: 2024-12-08 20:24:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-12-09 14:45:24 +0000 iwlwifi: avoid (hard) hang on loading module For certain users or chipsets (reports were for CNVi devices but we are not sure if this is limited or specific to them) loading if_iwlwifi hangs. The reason for this is that a SYSINIT (module_load_order()) has not yet run in this case and the Linux driver tries to load the chipsets-specific module. On FreeBSD all supported sub-modules are part of if_iwlwifi so we do not have to load them separately but calling into kern_kldload via LinuxKPI request_module while loading the module gives us a hard hang. iwlwifi calls request_module_nowait() so we can simply skip over this and continue and the SYSINIT will do the job later if no other dependencies fail. Sponsored by: The FreeBSD Foundation MFC after: 3 days PR: 282789 Tested by: Ruslan Makhmatkhanov, Pete Wright Differential Revision: https://reviews.freebsd.org/D47994 --- sys/contrib/dev/iwlwifi/iwl-drv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/iwl-drv.c b/sys/contrib/dev/iwlwifi/iwl-drv.c index 7f4746e5591e..61e5c064de80 100644 --- a/sys/contrib/dev/iwlwifi/iwl-drv.c +++ b/sys/contrib/dev/iwlwifi/iwl-drv.c @@ -1749,7 +1749,20 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) goto out_unbind; } } else { +#if defined(__linux__) request_module_nowait("%s", op->name); +#elif defined(__FreeBSD__) + /* + * In FreeBSD if_iwlwifi contains all drv modules in a single + * module. SYSINIT will do the job later. We cannot call + * into kern_kldload() while being called from kern_kldload(): + * LinuxKPI request_module[_nowait] will hang hard. + * Given this is request_module_nowait() we can simply skip it. + */ + if (bootverbose) + printf("%s: module '%s' not yet available; will be" + "initialized in a moment\n", __func__, op->name); +#endif } mutex_unlock(&iwlwifi_opmode_table_mtx); From nobody Mon Dec 9 15:22:02 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6QZk2xQpz5gQns; Mon, 09 Dec 2024 15:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6QZk2n9Jz4MW1; Mon, 9 Dec 2024 15:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733757726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ab8LxQJmypWtY/ViAVhMM9P/jR8+FA2qOT6kPJ2kCqo=; b=j0bq9okaSVKVe9n7/V2QB3GwNA12pIQHuKi6zPgEiN69zbgS7IavCxYgSk3Izo0J+abeT0 yAflTZ+bjbumC4aN7beJpbG/R2Dlg4L0w+thBss7vSDanfjYyYkxgf2HFQE1crmn8UJeBI nd3Nsxkk8cC6R6tkdK8iNRY+7F89k1tBwt/0jLuUzqD2hKWE0aNmz9A62cBH50Q7Ar7kW6 PbAx+CFbofXyTXmsxU/Ov8hanoUg0x7zbSxTB95H6rQOO4wumep628Ia76O7XutbTQ3Q+l KYUkcgmZ5EtkB7los+buXb8v+jdofUYPQfkmHVzxeOBw06gRQKvTwiWHPyR/4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733757726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ab8LxQJmypWtY/ViAVhMM9P/jR8+FA2qOT6kPJ2kCqo=; b=Pnq/j/S0m+1QujRe2+WcpkjFzd9zrsvzcPYgTh10oCdQFENyOulYdSqweq9/MzydtHaLN8 hY5nFWaE3SVowQx0CpS9yb4/XLzgmjVX/WMFGZQ1Z9qszuvwqq7xCt57ZO6bDaurAORNgL P7LC6tGOKackdvQfy5I0CMwfrapol+G3m5TWfCLmoe5eLfbe2Vsa2La7RFv4YB+aSjbS3r 2+8EG2rkqLXM77JOkuq5ZBueZnKsIAfOKhzv7giIdNqp+AcPuV7PiLfYJYzjhuC8212y9A QVjc30P4oPaXcCAfm0HRvF+cZBaTxdfNkRDEpijyLatuxqrQu0e1c1mDmYAEdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733757726; a=rsa-sha256; cv=none; b=ksCDFm0qjpXp+FXLrHmh0xggpoaWS74MsEALym6F3Af/dKuA6x5pU8fe7U23a4ZO40A2AW 9F+JOdumokkZWm6NgF0pJuS3RIrq6aPcwR+ibtr6dJ/Y2akHrrTVRgwCzsUn3HdlJygh/4 XB3gjmx2WdETvzWC9AIjBoKBWx+G5YP2FwSc8Dibgoo7RqxFdSIfuwj/AKsYRe06xcz6VJ uhsXnx9+pdel7aC9ocz3TNnoSwiosFwiX3uGt+1PKfaXb6LIZVu7uMPEt/5Sp0uw51EeE+ qo/3snRPEKoDEYnBu3U/NOITQmdCAtp/6+zmN4dVAmIANfZbjBRobX/K+KkN1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6QZk2NRVzk9b; Mon, 9 Dec 2024 15:22:06 +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 4B9FM6hW023855; Mon, 9 Dec 2024 15:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9FM2pK023841; Mon, 9 Dec 2024 15:22:02 GMT (envelope-from git) Date: Mon, 9 Dec 2024 15:22:02 GMT Message-Id: <202412091522.4B9FM2pK023841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 26743408e9ff - main - MFV: xz 5.6.3 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26743408e9ff53ac0e041407c359ed3c17c15596 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=26743408e9ff53ac0e041407c359ed3c17c15596 commit 26743408e9ff53ac0e041407c359ed3c17c15596 Merge: 87e140a5c6f8 956197bcea3a Author: Xin LI AuthorDate: 2024-12-09 15:20:04 +0000 Commit: Xin LI CommitDate: 2024-12-09 15:20:04 +0000 MFV: xz 5.6.3 MFC after: 2 weeks contrib/xz/ChangeLog | 1246 +++++++++++++++++++++ contrib/xz/THANKS | 19 + contrib/xz/src/common/tuklib_integer.h | 14 +- contrib/xz/src/liblzma/api/lzma/container.h | 2 +- contrib/xz/src/liblzma/api/lzma/version.h | 2 +- contrib/xz/src/liblzma/check/crc32_table.c | 10 +- contrib/xz/src/liblzma/check/crc_common.h | 6 +- contrib/xz/src/liblzma/check/crc_x86_clmul.h | 12 +- contrib/xz/src/liblzma/rangecoder/range_decoder.h | 24 +- contrib/xz/src/liblzma/simple/arm64.c | 4 +- contrib/xz/src/lzmainfo/lzmainfo.c | 5 +- contrib/xz/src/xz/args.c | 1 - contrib/xz/src/xz/list.c | 7 + contrib/xz/src/xz/mytime.c | 2 +- contrib/xz/src/xzdec/xzdec.c | 2 +- lib/liblzma/config.h | 9 +- 16 files changed, 1321 insertions(+), 44 deletions(-) diff --cc lib/liblzma/config.h index ca7375dd8725,000000000000..3e51b0b92463 mode 100644,000000..100644 --- a/lib/liblzma/config.h +++ b/lib/liblzma/config.h @@@ -1,643 -1,0 +1,640 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* How many MiB of RAM to assume if the real amount cannot be determined. */ +#define ASSUME_RAM 128 + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* FreeBSD - disabled intentionally */ +/* #undef ENABLE_NLS */ + +/* Define to 1 if ARM64 CRC32 instruction is supported. See configure.ac for + details. */ +/* #undef HAVE_ARM64_CRC32 */ + +/* Define to 1 if bswap_16 is available. */ +/* #undef HAVE_BSWAP_16 */ + +/* Define to 1 if bswap_32 is available. */ +/* #undef HAVE_BSWAP_32 */ + +/* Define to 1 if bswap_64 is available. */ +/* #undef HAVE_BSWAP_64 */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +#ifndef WITHOUT_CAPSICUM +/* Define to 1 if you have the 'cap_rights_limit' function. */ +#define HAVE_CAP_RIGHTS_LIMIT 1 +#endif + +/* Define to 1 if the system has the type 'CC_SHA256_CTX'. */ +/* #undef HAVE_CC_SHA256_CTX */ + +/* Define to 1 if you have the 'CC_SHA256_Init' function. */ +/* #undef HAVE_CC_SHA256_INIT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* Define to 1 if crc32 integrity check is enabled. */ +#define HAVE_CHECK_CRC32 1 + +/* Define to 1 if crc64 integrity check is enabled. */ +#define HAVE_CHECK_CRC64 1 + +/* Define to 1 if sha256 integrity check is enabled. */ +#define HAVE_CHECK_SHA256 1 + +/* Define to 1 if you have the 'clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define to 1 if 'CLOCK_MONOTONIC' is declared in . */ +#define HAVE_CLOCK_MONOTONIC 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CPUID_H 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if any of HAVE_DECODER_foo have been defined. */ +#define HAVE_DECODERS 1 + +/* Define to 1 if arm decoder is enabled. */ +#define HAVE_DECODER_ARM 1 + +/* Define to 1 if arm64 decoder is enabled. */ +#define HAVE_DECODER_ARM64 1 + +/* Define to 1 if armthumb decoder is enabled. */ +#define HAVE_DECODER_ARMTHUMB 1 + +/* Define to 1 if delta decoder is enabled. */ +#define HAVE_DECODER_DELTA 1 + +/* Define to 1 if ia64 decoder is enabled. */ +#define HAVE_DECODER_IA64 1 + +/* Define to 1 if lzma1 decoder is enabled. */ +#define HAVE_DECODER_LZMA1 1 + +/* Define to 1 if lzma2 decoder is enabled. */ +#define HAVE_DECODER_LZMA2 1 + +/* Define to 1 if powerpc decoder is enabled. */ +#define HAVE_DECODER_POWERPC 1 + +/* Define to 1 if riscv decoder is enabled. */ +#define HAVE_DECODER_RISCV 1 + +/* Define to 1 if sparc decoder is enabled. */ +#define HAVE_DECODER_SPARC 1 + +/* Define to 1 if x86 decoder is enabled. */ +#define HAVE_DECODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the 'elf_aux_info' function. */ +/* #undef HAVE_ELF_AUX_INFO */ + +/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */ +#define HAVE_ENCODERS 1 + +/* Define to 1 if arm encoder is enabled. */ +#define HAVE_ENCODER_ARM 1 + +/* Define to 1 if arm64 encoder is enabled. */ +#define HAVE_ENCODER_ARM64 1 + +/* Define to 1 if armthumb encoder is enabled. */ +#define HAVE_ENCODER_ARMTHUMB 1 + +/* Define to 1 if delta encoder is enabled. */ +#define HAVE_ENCODER_DELTA 1 + +/* Define to 1 if ia64 encoder is enabled. */ +#define HAVE_ENCODER_IA64 1 + +/* Define to 1 if lzma1 encoder is enabled. */ +#define HAVE_ENCODER_LZMA1 1 + +/* Define to 1 if lzma2 encoder is enabled. */ +#define HAVE_ENCODER_LZMA2 1 + +/* Define to 1 if powerpc encoder is enabled. */ +#define HAVE_ENCODER_POWERPC 1 + +/* Define to 1 if riscv encoder is enabled. */ +#define HAVE_ENCODER_RISCV 1 + +/* Define to 1 if sparc encoder is enabled. */ +#define HAVE_ENCODER_SPARC 1 + +/* Define to 1 if x86 encoder is enabled. */ +#define HAVE_ENCODER_X86 1 + +/* Define to 1 if __attribute__((__constructor__)) is supported for functions. + */ +#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1 + +/* Define to 1 if you have the 'futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the 'futimes' function. */ +/* #undef HAVE_FUTIMES */ + +/* Define to 1 if you have the 'futimesat' function. */ +/* #undef HAVE_FUTIMESAT */ + +/* Define to 1 if you have the 'getauxval' function. */ +/* #undef HAVE_GETAUXVAL */ + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the 'getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_GETTEXT */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +/* FreeBSD - only with clang because the base gcc does not support it */ +#if defined(__clang__) && defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_IMMINTRIN_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if Linux Landlock is supported. See configure.ac for details. + */ +/* #undef HAVE_LINUX_LANDLOCK */ + +/* Define to 1 if .lz (lzip) decompression support is enabled. */ +#define HAVE_LZIP_DECODER 1 + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 to enable bt2 match finder. */ +#define HAVE_MF_BT2 1 + +/* Define to 1 to enable bt3 match finder. */ +#define HAVE_MF_BT3 1 + +/* Define to 1 to enable bt4 match finder. */ +#define HAVE_MF_BT4 1 + +/* Define to 1 to enable hc3 match finder. */ +#define HAVE_MF_HC3 1 + +/* Define to 1 to enable hc4 match finder. */ +#define HAVE_MF_HC4 1 + - /* Define to 1 if MicroLZMA support is enabled. */ - #define HAVE_MICROLZMA 1 - +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if getopt.h declares extern int optreset. */ +#define HAVE_OPTRESET 1 + +/* Define to 1 if you have the 'pledge' function. */ +/* #undef HAVE_PLEDGE */ + +/* Define to 1 if you have the 'posix_fadvise' function. */ +#define HAVE_POSIX_FADVISE 1 + +/* Define to 1 if 'program_invocation_name' is declared in . */ +/* #undef HAVE_PROGRAM_INVOCATION_NAME */ + +/* Define to 1 if you have the 'pthread_condattr_setclock' function. */ +#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +#define HAVE_PTHREAD_PRIO_INHERIT 1 + +/* Define to 1 if you have the 'SHA256Init' function. */ +/* #undef HAVE_SHA256INIT */ + +/* Define to 1 if the system has the type 'SHA256_CTX'. */ +#define HAVE_SHA256_CTX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SHA256_H 1 + +/* Define to 1 if you have the 'SHA256_Init' function. */ +#define HAVE_SHA256_INIT 1 + +/* Define to 1 if the system has the type 'SHA2_CTX'. */ +/* #undef HAVE_SHA2_CTX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SHA2_H */ + +/* Define to 1 if optimizing for size. */ +/* #undef HAVE_SMALL */ + +/* Define to 1 if stdbool.h conforms to C99. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if 'st_atimensec' is a member of 'struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1 + +/* Define to 1 if 'st_atimespec.tv_nsec' is a member of 'struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1 + +/* Define to 1 if 'st_atim.st__tim.tv_nsec' is a member of 'struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */ + +/* Define to 1 if 'st_atim.tv_nsec' is a member of 'struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 + +/* Define to 1 if 'st_uatime' is a member of 'struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_UATIME */ + +/* Define to 1 to if GNU/Linux-specific details are unconditionally wanted for + symbol versioning. Define to 2 to if these are wanted only if also PIC is + defined (allows building both shared and static liblzma at the same time + with Libtool if neither --with-pic nor --without-pic is used). This define + must be used together with liblzma_linux.map. */ +/* #undef HAVE_SYMBOL_VERSIONS_LINUX */ + +/* Define to 1 if you have the 'sysctlbyname' function. */ +/* #undef HAVE_SYSCTLBYNAME */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BYTEORDER_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_CDEFS_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_ENDIAN_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if the system has the type 'uintptr_t'. */ +#define HAVE_UINTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if _mm_set_epi64x and _mm_clmulepi64_si128 are usable. See + configure.ac for details. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_USABLE_CLMUL 1 +#endif + +/* Define to 1 if you have the 'utime' function. */ +/* #undef HAVE_UTIME */ + +/* Define to 1 if you have the 'utimes' function. */ +/* #undef HAVE_UTIMES */ + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#define HAVE_VISIBILITY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if you have the 'wcwidth' function. */ +#define HAVE_WCWIDTH 1 + +/* Define to 1 if the system has the type '_Bool'. */ +#define HAVE__BOOL 1 + +/* Define to 1 if you have the '_futime' function. */ +/* #undef HAVE__FUTIME */ + +/* Define to 1 if _mm_movemask_epi8 is available. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE__MM_MOVEMASK_EPI8 1 +#endif + +/* Define to 1 if the GNU C extension __builtin_assume_aligned is supported. + */ +#define HAVE___BUILTIN_ASSUME_ALIGNED 1 + +/* Define to 1 if the GNU C extensions __builtin_bswap16/32/64 are supported. + */ +#define HAVE___BUILTIN_BSWAPXX 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 when using POSIX threads (pthreads). */ +#define MYTHREAD_POSIX 1 + +/* Define to 1 when using Windows Vista compatible threads. This uses features + that are not available on Windows XP. */ +/* #undef MYTHREAD_VISTA */ + +/* Define to 1 when using Windows 95 (and thus XP) compatible threads. This + avoids use of features that were added in Windows Vista. */ +/* #undef MYTHREAD_WIN95 */ + +/* Define to 1 to disable debugging code. */ +#define NDEBUG 1 + +/* Name of package */ +#define PACKAGE "xz" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "xz@tukaani.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "XZ Utils" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "XZ Utils 5.6.2" ++#define PACKAGE_STRING "XZ Utils 5.6.3" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "xz" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "https://tukaani.org/xz/" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "5.6.2" ++#define PACKAGE_VERSION "5.6.3" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* The size of 'size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 8 + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Define to 1 if the number of available CPU cores can be detected with + cpuset(2). */ +#define TUKLIB_CPUCORES_CPUSET 1 + +/* Define to 1 if the number of available CPU cores can be detected with + pstat_getdynamic(). */ +/* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */ + +/* Define to 1 if the number of available CPU cores can be detected with + sched_getaffinity() */ +/* #undef TUKLIB_CPUCORES_SCHED_GETAFFINITY */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysconf(_SC_NPROCESSORS_ONLN) or sysconf(_SC_NPROC_ONLN). */ +/* #undef TUKLIB_CPUCORES_SYSCONF */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysctl(). */ +/* #undef TUKLIB_CPUCORES_SYSCTL */ + +/* Define to 1 if the system supports fast unaligned access to 16-bit, 32-bit, + and 64-bit integers. */ +/* FreeBSD - derive from __NO_STRICT_ALIGNMENT */ +/* #undef TUKLIB_FAST_UNALIGNED_ACCESS */ + +/* Define to 1 if the amount of physical memory can be detected with + _system_configuration.physmem. */ +/* #undef TUKLIB_PHYSMEM_AIX */ + +/* Define to 1 if the amount of physical memory can be detected with + getinvent_r(). */ +/* #undef TUKLIB_PHYSMEM_GETINVENT_R */ + +/* Define to 1 if the amount of physical memory can be detected with + getsysinfo(). */ +/* #undef TUKLIB_PHYSMEM_GETSYSINFO */ + +/* Define to 1 if the amount of physical memory can be detected with + pstat_getstatic(). */ +/* #undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC */ + +/* Define to 1 if the amount of physical memory can be detected with + sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES). */ +#define TUKLIB_PHYSMEM_SYSCONF 1 + +/* Define to 1 if the amount of physical memory can be detected with sysctl(). + */ +/* #undef TUKLIB_PHYSMEM_SYSCTL */ + +/* Define to 1 if the amount of physical memory can be detected with Linux + sysinfo(). */ +/* #undef TUKLIB_PHYSMEM_SYSINFO */ + +/* Define to 1 to use unsafe type punning, e.g. char *x = ...; *(int *)x = + 123; which violates strict aliasing rules and thus is undefined behavior + and might result in broken code. */ +/* #undef TUKLIB_USE_UNSAFE_TYPE_PUNNING */ + +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# define __STDC_WANT_IEC_60559_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Version number of package */ - #define VERSION "5.6.2" ++#define VERSION "5.6.3" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined(__FreeBSD__) +#include +#if defined(__NO_STRICT_ALIGNMENT) +#define TUKLIB_FAST_UNALIGNED_ACCESS 1 +#endif +#include +#if _BYTE_ORDER == _BIG_ENDIAN +# define WORDS_BIGENDIAN 1 +#endif +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ +/* #undef _LARGE_FILES */ + +/* Number of bits in time_t, on hosts where this is settable. */ +/* #undef _TIME_BITS */ + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT64_T */ + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT8_T */ + +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +/* #undef __GETOPT_PREFIX */ + +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +/* #undef __MINGW_USE_VC2005_COMPAT */ + +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int32_t */ + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint16_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint64_t */ + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint8_t */ + +/* Define to the type of an unsigned integer type wide enough to hold a + pointer, if such a type exists, and if the system does not define it. */ +/* #undef uintptr_t */ From nobody Mon Dec 9 15:45:04 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6R5D2mGDz5gS3W; Mon, 09 Dec 2024 15:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6R5D2Ftzz4Nrb; Mon, 9 Dec 2024 15:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733759104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KJd7NIL50KkuRmhComfUED8MLF76pN1nc8j30Tein1c=; b=RC/HdvEEjNYqeDn0B3hBcHdV5WokycJjp2n3TyB9ksWFNfe5zNzJ0Rpnfbcp2YNtO72Cga x+1g0nlQYT2p9capJ6GD7JLqEntl33YEvXJ6YpXiCEac5Z9OkUISWkJ2xvpjqaWBmo5mKE Y6Es9WRNWCnE+Ye3Qu56Xu/CU3a2RRTMU9CR+oRbUxcLDdap5VNhWshu1EF0YucuAZeTqS Xx9zNWtU/HDRLberwm9Ds4n1WuVvlNNdxuWCO6y7zrFJvruivmnvdtcARZ+kv3Wf4Y62yj 62JusPEvLriszTbvgNpjvqCCCNxKyt0e0LIb98ZowaMC70s0q1IZNRHylHh6dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733759104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KJd7NIL50KkuRmhComfUED8MLF76pN1nc8j30Tein1c=; b=MUK0vTtv+ntuEfWrWhWdEW7RkilyX59qcW2CUvfxCcZHSLo2Gf/mFO0M52Q2EkJBOhyuro RphCsERT2+RMeDdxShgRuS17ySJ6QcC0sVc9bm2heG96fk/vLvpJy7b6Onosi9qqw6vOax bPWndFYGa8gODVN4q+Am/skO1UKmajcdBylGBY1Fn+EzjcU1+k1ekdTdYSdnUFFCFfDo63 JfYapYKFVaOHlhjcZ2oB5zLAmDXvOuJGj39KxMlGUCaF8fNvWr9wDayLF5CmrE0yHVUI/o zR6gTOgCuj+Vt8jqPYEc16MqifiBNVj0gT4ADg0xqE45UjXHC8H35VLUoASiHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733759104; a=rsa-sha256; cv=none; b=nbf7/EudrizkFQNmYoyJBLdh34BMJnHO5CZFF2S3C28KhfCWXFGN+ch/T1yp2i7tG8BVwt if/cNkM/T6zC/fxVqDtkh48X9mQ8pQj+mmlPnPM/6v9xpKb21so8rD97UQAo1DVV25FXJ4 CUwq7FVzC46nTyMH8ZfsILtcS6elFDHXniluZrfumGVHkUI9T/LdJa5+ohejISSJdMdozq Vh81kX4s8cZNxRmLJy9hy9V+JaB3kL6rdMQStJMEUNUsf6QYVS0kbZ4d6Z4Ojg38nHX+sa +k0E3dTxmPfQHQKSETKNUAu25TwECa5hE8Tpzr6HbBxfzcPp5MMByynb6HAE6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6R5D1spNzkZZ; Mon, 9 Dec 2024 15:45: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 4B9Fj4dJ062460; Mon, 9 Dec 2024 15:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Fj4MS062457; Mon, 9 Dec 2024 15:45:04 GMT (envelope-from git) Date: Mon, 9 Dec 2024 15:45:04 GMT Message-Id: <202412091545.4B9Fj4MS062457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 65ec52e6e09f - main - buf_ring: Remove unneeded memory barriers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65ec52e6e09f8b2a610a26638ff65a35ee5557b4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=65ec52e6e09f8b2a610a26638ff65a35ee5557b4 commit 65ec52e6e09f8b2a610a26638ff65a35ee5557b4 Author: Andrew Turner AuthorDate: 2024-12-09 15:04:37 +0000 Commit: Andrew Turner CommitDate: 2024-12-09 15:44:30 +0000 buf_ring: Remove unneeded memory barriers We no longer need a memory barrier on the compare and set operations. If these fail then there are appropriate barriers on the loads earlier in the loop, and if they succeed then no other threads can be accessing the br_ring entry so any store to it is safe. Reviewed by: alc Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46381 --- sys/sys/buf_ring.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h index 9a4bfa9fb549..ab7e683ed0e9 100644 --- a/sys/sys/buf_ring.h +++ b/sys/sys/buf_ring.h @@ -116,7 +116,7 @@ buf_ring_enqueue(struct buf_ring *br, void *buf) } continue; } - } while (!atomic_cmpset_acq_32(&br->br_prod_head, prod_head, prod_next)); + } while (!atomic_cmpset_32(&br->br_prod_head, prod_head, prod_next)); prod_idx = prod_head & mask; #ifdef DEBUG_BUFRING if (br->br_ring[prod_idx] != NULL) @@ -163,7 +163,7 @@ buf_ring_dequeue_mc(struct buf_ring *br) critical_exit(); return (NULL); } - } while (!atomic_cmpset_acq_32(&br->br_cons_head, cons_head, cons_next)); + } while (!atomic_cmpset_32(&br->br_cons_head, cons_head, cons_next)); cons_idx = cons_head & mask; buf = br->br_ring[cons_idx]; From nobody Mon Dec 9 15:45:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6R5F43pkz5gRpR; Mon, 09 Dec 2024 15:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6R5F3BXXz4PBt; Mon, 9 Dec 2024 15:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733759105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A2KDw4iEBnrzUdgohvaxPHalSydkH/jJrZZ41O0FcSo=; b=NJ1d5GaTfIpLe1hgAJ0aZvZ5hBFD9lTvJs3kfPIS/Y5n8ROhHwGf+vEReJ9iUh82syM/x8 Aze1rd7PgQ37oL+jsMLeee2qGCXDK6TIU9CEhUbuHcqOy9x0MJNECPuGiazaZJKMulgtVj uATRjAgL6OVd62mA5OiUy00Z0tq+K4jzbe8Fa48jrWkhuVa09tiV92iWTIQfhQbFl8W2ma 28Ph/z19SWUAu1mZfMD/9EiCeIbJSYshtpcQ3may9bktcz66DYyiLVZGugck0JYfz5RAEP xZmilHkZGOsfkHgPbZg3col3LYAwoOM9q7hv4Dr89q3KdrVJZrvKXwK4iH+Tww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733759105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A2KDw4iEBnrzUdgohvaxPHalSydkH/jJrZZ41O0FcSo=; b=tuu9n/2mr78LZ32kIZ+Y1DgkD8bOVOyemaihi8zkN/SZe9Kh47O93oiyQ/4Psf0NexCFNx FzBztSfoubzBmssHzR1VkJ1fClqkI7TFLxJhHkgAd2UFEOfPU6s1HqGFC7IaZdUWo+MNef kWPx0iGBsiSSEPla7QzTcnJQ4DOmP4lvlEtmowBDFuft+VQyA+jIRNGGZBY0BSz3oapOZW Vg2tYAFTiUePu5oHab43MAu2j7v5sIykpX/NC/nK6eotjAQc8iv0loFN3hoG8BXOTjgqN8 GwZcDM1MdmviyWuA17PIQDVN6/BJ6hfgSLJhRt/m/uDpu1ieHY9GDOXHlCUNoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733759105; a=rsa-sha256; cv=none; b=dMyGeTutNBToM//KUUhM5xUQqpSTBYjfBXU1ix/LWkbpSVVm2SWobdySpTbdzjZJhwD2It fkLX1bg8BolrcuHXZo7PXCmXMBTbyAkhACu5SU9crloQ/rqDkI5ojR+B2e7wgkHx3JSUOz qw2ucWgKOIeEBJgiW/qHenzGX6AKVh2x437VTHCpo5MNGd6dqeP7NfmATp7U1+Z0fVacBw 7Td3EyB4UVT3rOpKPzyVn6FxTOK3bRzOO93ZV5R0tbiZSOoA48KBdapK/jMkualnwMe2Ij dQkaCFzS8o3BvXDTJllHu9ORLoblaMUqdto7VGTjLCi13fQTJICcome1EwN6Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6R5F2psRzk8Y; Mon, 9 Dec 2024 15:45:05 +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 4B9Fj5Qe062508; Mon, 9 Dec 2024 15:45:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Fj5Qu062505; Mon, 9 Dec 2024 15:45:05 GMT (envelope-from git) Date: Mon, 9 Dec 2024 15:45:05 GMT Message-Id: <202412091545.4B9Fj5Qu062505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: bb8c68b25333 - main - acpi_gpiobus: Fix cleanup on set flags failure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb8c68b25333638a20838500ccffee23b4291427 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8c68b25333638a20838500ccffee23b4291427 commit bb8c68b25333638a20838500ccffee23b4291427 Author: Andrew Turner AuthorDate: 2024-12-09 15:14:13 +0000 Commit: Andrew Turner CommitDate: 2024-12-09 15:44:30 +0000 acpi_gpiobus: Fix cleanup on set flags failure When GPIOBUS_PIN_SETFLAGS fails we called gpiobus_free_ivars to clean up the contents of the ivar, then would free the ivar. This lead to a use-after-free as the ivar had already been set on the child so gpiobus_child_deleted would try to free it again. Fix this by removing the early cleanup and letting gpiobus_child_deleted handle it. Fixes: c9e880c0ceef ("gpiobus: Use a bus_child_deleted method to free ivars for children") Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47670 --- sys/dev/gpio/acpi_gpiobus.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index e766c25e5336..be3889f6a89b 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -203,8 +203,6 @@ acpi_gpiobus_enumerate_aei(ACPI_RESOURCE *res, void *context) for (int i = 0; i < devi->gpiobus.npins; i++) { if (GPIOBUS_PIN_SETFLAGS(bus, child, 0, devi->flags)) { - gpiobus_free_ivars(&devi->gpiobus); - free(devi, M_DEVBUF); device_delete_child(bus, child); return (AE_OK); } From nobody Mon Dec 9 16:19:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6Rrv0k5Zz5gTsb; Mon, 09 Dec 2024 16:19: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 4Y6Rrv0Cw0z4SmS; Mon, 9 Dec 2024 16:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxjzKmPFtNf5vw0boeFdVWdusFGuh8ZmcuXoM3j8Teg=; b=qcY/UfqpJdF8Hp6PcFtbI+gHNW/GaBdgMBtB0lM5FPU217axBx3rXhm5rdOPvGZjeDjavw wR/JD8vg894odYaV+bgQZ1N+0UngLn7OgnXjkJ/ZRfabLJV3jrJzbcW4WvxR1LP43Pzxyo 2QSLMKj1tVMcFZ9HQqAk7iMu8O2CpBtkVcWYSVj8eFJOp6FCVguTVA5XBdeiRfhrvLcOFG n/4kWdj3ssiF/rDAv5niWdYyx6jzJpHzWteHmKYQw5Wr483ADQzDciuPXL5NUW+gNRnLOA MLbq4MTNfI7xcwtlaNeTxJi7+q92PRjMyVaAaCbpVbmyjXpmBCoi44GxAmo+Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxjzKmPFtNf5vw0boeFdVWdusFGuh8ZmcuXoM3j8Teg=; b=hZuq0o6mhi+kCRR31JVmrOMgzfffC/kWy0cgMSZNGUlSR6um9JZ9fdfrDIdPwqPhzMgU3V rOxQmeLhiYaNh6LUqkGvLmHcNcqKfez7cQIIYI9IVjFkIH4X8tSdlKUHgMotTCxt/4E3UF OJ1zhrIfuSGkXXUTgcHGKC6hsW65+CXweS9pTSBKBjyUrRtz79hqFvtSi7ORlv2NE1W2a4 yXj90SpCF4V0VgN/Q+twdPBgnN04JS506gD0rCm2oQTu5F3nk65Vv7QzbTVt07DlfVjYo0 mkjsLSHakJcBgvMGCoPLrDqNzv4piUD1PB6FIPFkpiOg/5dFCmdFqy2QUVl51Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733761167; a=rsa-sha256; cv=none; b=YPvraBIiL16REuyGLehN9xeSrqaiwXPXGUU0iahY72QfxteOh+RwaROldr1B2yLbN4MLu9 lU/Eh+MNIjms+ejA3I7WUnEuAqUpAfZaB0aWpiEFtA0qhm/GgQ0cjU0OZl6aXqpfXSgSx4 wL6i5Rz0WBPgKHj8zOxIRXeKz5c1jkmeUaZmY+wrzJbV33ozgjhex7Yv7vaQNwTM1DRpXp APSUv2urevOJ+krO8YAwA+VIZSeFkThH2MIm5Kfhfuy6NTbuw1F/uhiddjJUabXEFxoAr3 d3GErELRKldRIthGG6U5jk7KuoXVTA2V+lXppsAW7kuKe+L2HKDWTmQ2p09bCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6Rrt6p4CzlRv; Mon, 9 Dec 2024 16:19: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 4B9GJQ7G019820; Mon, 9 Dec 2024 16:19:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GJQud019817; Mon, 9 Dec 2024 16:19:26 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:19:26 GMT Message-Id: <202412091619.4B9GJQud019817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d3f035f8d96a - main - ifnet: make sa_dl_equal() a static function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3f035f8d96ae0e1c49ab725aa9d86be63d293d6 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d3f035f8d96ae0e1c49ab725aa9d86be63d293d6 commit d3f035f8d96ae0e1c49ab725aa9d86be63d293d6 Author: Gleb Smirnoff AuthorDate: 2024-12-09 16:18:56 +0000 Commit: Gleb Smirnoff CommitDate: 2024-12-09 16:18:56 +0000 ifnet: make sa_dl_equal() a static function No functional change. Also clears last use of CLLADDR() macro. --- sys/net/if.c | 15 +++++++++------ sys/net/if_dl.h | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 8dc212ae4ac7..25cad0222c06 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1799,13 +1799,16 @@ ifa_free(struct ifaddr *ifa) * structs used to represent other address families, it is necessary * to perform a different comparison. */ +static bool +sa_dl_equal(const struct sockaddr *a, const struct sockaddr *b) +{ + const struct sockaddr_dl *sdl1 = (const struct sockaddr_dl *)a; + const struct sockaddr_dl *sdl2 = (const struct sockaddr_dl *)b; -#define sa_dl_equal(a1, a2) \ - ((((const struct sockaddr_dl *)(a1))->sdl_len == \ - ((const struct sockaddr_dl *)(a2))->sdl_len) && \ - (bcmp(CLLADDR((const struct sockaddr_dl *)(a1)), \ - CLLADDR((const struct sockaddr_dl *)(a2)), \ - ((const struct sockaddr_dl *)(a1))->sdl_alen) == 0)) + return (sdl1->sdl_len == sdl2->sdl_len && + bcmp(sdl1->sdl_data + sdl1->sdl_nlen, + sdl2->sdl_data + sdl2->sdl_nlen, sdl1->sdl_alen) == 0); +} /* * Locate an interface based on a complete address. diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index e19f4a84a7c1..77663c2a20d7 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -66,7 +66,6 @@ struct sockaddr_dl { }; #define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen)) -#define CLLADDR(s) ((c_caddr_t)((s)->sdl_data + (s)->sdl_nlen)) #define LLINDEX(s) ((s)->sdl_index) struct ifnet; From nobody Mon Dec 9 16:19:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6Rrw22zFz5gTWL; Mon, 09 Dec 2024 16:19: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 4Y6Rrw0sjWz4SWK; Mon, 9 Dec 2024 16:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hh0ygwpshNhJ2YBwjucvbjrPs/ErNpzvNzKMlB0n5cc=; b=vUdDSNNyISft+aHalz+s62oWF0WcsWNc86zToEd0cSUuSTxQ2W8y9j6Rsh/CvmavA9v+n6 94nkmvNEuNldSq7veN/lLnGzfmSuGvphby3/7gNbQwjzRePndtcOrVXINiSVP/kJ3U2JWG oiX5EriKA46RubmGYsTjBbTClB6CWO0XZ9bbmqRXMbnIfVczWBoHC+JOHksIyyJkconG/S RKr6lJ5vk7taTSUVTB1aL8r5b2MjYQLfcZz/fgeaGY6/judj9yiM8zb1/+DAm8Wikc7Ytf 8ZDbeBpEqOOzdNuCHA9/irVuyCrd4Np+74eevhYUgkVsHqcH8oVIdCvnIAcLhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hh0ygwpshNhJ2YBwjucvbjrPs/ErNpzvNzKMlB0n5cc=; b=LlsELDLvrTyFWWvGFl+Y+Q/3WcRE3GmXNghBIf/Mi86LJuWTaniM5KZ1JTIoaS1Ng9QRJW 1UazMsWlaPnrV57esMgjOpkuSUY7/sJjZ5Fa/Ilxlo1WckbOVjcDDf7chYCGsGocK2P/Y9 Mi7vMKdkRN1pK6mVSmrVoH7ZxXReVy3FdEOMeZ1i04lGEV+0SNm7TLUo0almasF0Rsbb4/ PE1cTBJVuIZNbXS89FmtL1R21OSb4AQokeNWyQqS5op5/LSmD+dfW853NEiJbVffrhQ1GW ErLumuAXkX4QIhyZD4zP0+iKirFlOT5HOO2PbFGB8wzFF/qbbSbtTWCzy7kzdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733761168; a=rsa-sha256; cv=none; b=ihyztDUA4GdfXmzgNKT8lBZQvW08m3Nqt4OpAaUFZkhHC3iczpdah3gHlMvdm9mg3nHLfF +DQZKBRmEKV9URfqp4pb7aksHCVaYrtzeAJMq6XlRRYa8+pRvrWQ7gJBbRfztKVZlv2Bll mzw/jpRNXqOEqoyBdSMq8NFBSuNjf1cKl3p27Ol6jfUk6ZTdtfaGvprRhE2WPukQUrvECk eVLCGWQwmfh8FR2UQtm6fAhfMrn2o8i01jRxbG2awSGGvv4pVaNgboyuHYecX2Nr5k/KnF wDUaL+GF4CqAMIEkZKtrxlXpZpXPMxWLwaiatTpgiQJj3RWJEbYtFrnMp6tUGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6Rrw0TtzzkYM; Mon, 9 Dec 2024 16:19: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 4B9GJRUF019898; Mon, 9 Dec 2024 16:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GJREQ019895; Mon, 9 Dec 2024 16:19:27 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:19:27 GMT Message-Id: <202412091619.4B9GJREQ019895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8e1af80243ff - main - IfAPI: make if_getlladdr() to return char HEAD branches config description git-daemon-export-ok gl-conf hooks info objects packed-refs refs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e1af80243ff97f56918b363196832af9406597e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8e1af80243ff97f56918b363196832af9406597e commit 8e1af80243ff97f56918b363196832af9406597e Author: Gleb Smirnoff AuthorDate: 2024-12-09 16:18:56 +0000 Commit: Gleb Smirnoff CommitDate: 2024-12-09 16:18:56 +0000 IfAPI: make if_getlladdr() to return char * No functional change. The caddr_t is a relic typedef from C version that didn't have void pointer. In this particular change we really need a char * pointer rather than void, because some consumers use the link level address as a char array. --- sys/net/if.c | 2 +- sys/net/if_var.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 25cad0222c06..08c59627b196 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4888,7 +4888,7 @@ if_setifheaderlen(if_t ifp, int len) return (0); } -caddr_t +char * if_getlladdr(const if_t ifp) { return (IF_LLADDR(ifp)); diff --git a/sys/net/if_var.h b/sys/net/if_var.h index a0271cfe2a7c..83d33330987e 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -643,7 +643,7 @@ void if_setrcvif(struct mbuf *m, if_t ifp); void if_setvtag(struct mbuf *m, u_int16_t tag); u_int16_t if_getvtag(struct mbuf *m); int if_vlantrunkinuse(if_t ifp); -caddr_t if_getlladdr(const if_t ifp); +char *if_getlladdr(const if_t ifp); struct vnet *if_getvnet(const if_t ifp); void *if_gethandle(u_char); void if_vlancap(if_t ifp); From nobody Mon Dec 9 16:19:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6Rrx4Kk3z5gTRx; Mon, 09 Dec 2024 16:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6Rrx1hPqz4SSv; Mon, 9 Dec 2024 16:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wPw+CqCWw8kNwY293SUA1RtxmiaGmFD1tkFx2cxwhNg=; b=g1Q5QAE2st+0oexUYEFgAUSOeiAE53V8n0CytHqpPnLJ1P8+olHNOv4XSBx7as6ahKdrK7 M3lzyd4tlOwpDevHTuFxuD8w1z3/3vLubwdF8hMfYW0RlVeWriXj8eNY85xZsgdF0bYhE6 3HfHUkIPcauIr0jDb46QijLsfAllHhNadgxCLLIHlxCg8D8QjK/JxIkcNh5YXGpCblcTSO FSiXvdlo/2zjlY9X06RSBWHyK6VNW5gCt3Jv9O60wSOd1BeU+0TMibEhCCTzQx9GgRcboU UMSYLD/LcyZfoNXXT5Y04YZvEoFS8cEHL7nBu1QphnbCE3lIQOPFSbpDycuMxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wPw+CqCWw8kNwY293SUA1RtxmiaGmFD1tkFx2cxwhNg=; b=lxHRGLvME3DA1jnfP/9pgUsk7FzxnX9kPpOrcNiZc6Gcl0CN885F6M9vCB0rcvbfGMIFkk 6d7h/BsFO6oJDTFJ4eZXUtexhXeVWcG3nnU5qEWyQYBqpXAuAV6AlbvpNLfVma5vo//EPU 6o3DL3YCBQ7f1DbKuDp0Guv2XW37+M2P9saGQ20Qb5VX6jYPu0IMtJwc+k3a1DyzkBZdie 7VJO1cnxB5pp4sH93l3L2eNz8UJZTUFxvfhE9cfTyn1KWn0DCt3NuI7Mo1wFLmkAfrJzOr DG3CSQ/Uf8zLnQXp+neXKHwRTIYdOjMRemoQ4al/bCnb8JESwjzKdyK/hXM6vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733761169; a=rsa-sha256; cv=none; b=UyR1mGWa0fmtTQ/N1TTnTyJIZysHNQFAYliawsknQ3ji5L0Mbm70llgTn0R41pcIsdhYXF WHgnIWEOUHuZHoGnKyLsX5Hp54mvsUmsQQHnd6TZiJz8fkdK2h+neiR6IXcoArvgtHUhBG ayq5YdG5eh2Rwvo23d89u8HVe0jqbmVqW44tRrvZkN7bdVSJMw8Vg1hXg1xk9GAzAqOtsx R0O02WNiFKOIpq4IbzyJJWMPKHOb626+Ht4fXN0CrLNDyI/CATFxJRaMwcgwyUAMSMwwb4 om0P5W51LO59JvOvyiqo0mIYf9l9Ch+wKPmZavFYJ5hmb7muMMrnjj3Vf4gNQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6Rrx15C5zlRw; Mon, 9 Dec 2024 16:19: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 4B9GJTaH019965; Mon, 9 Dec 2024 16:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GJTIp019962; Mon, 9 Dec 2024 16:19:29 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:19:29 GMT Message-Id: <202412091619.4B9GJTIp019962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a6a0b8d50e87 - main - in6_var.h: make struct in6_ifaddr declaration searchable with grep(1) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6a0b8d50e87c9c18b39e803e06986dcd9b7761b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a6a0b8d50e87c9c18b39e803e06986dcd9b7761b commit a6a0b8d50e87c9c18b39e803e06986dcd9b7761b Author: Gleb Smirnoff AuthorDate: 2024-12-09 16:18:56 +0000 Commit: Gleb Smirnoff CommitDate: 2024-12-09 16:18:56 +0000 in6_var.h: make struct in6_ifaddr declaration searchable with grep(1) --- sys/netinet6/in6_var.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index ef79d11b558d..969625a58934 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -115,7 +115,7 @@ struct in6_ifextra { SLIST_HEAD(in6_multi_head, in6_multi); MALLOC_DECLARE(M_IP6MADDR); -struct in6_ifaddr { +struct in6_ifaddr { struct ifaddr ia_ifa; /* protocol-independent info */ #define ia_ifp ia_ifa.ifa_ifp #define ia_flags ia_ifa.ifa_flags From nobody Mon Dec 9 16:51:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6SYQ4gt8z5gWkb; Mon, 09 Dec 2024 16:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6SYQ43XPz4bbv; Mon, 9 Dec 2024 16:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733763066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oTULH1ftgxjJ97b9zKhNsBSquI38xcQkRVCx5uT01d0=; b=HXQ5HfzHpuBUGb6ZPbV01gGCHnBzUWpW+CQu1pLoxg/XDqOvE+0YJa6A6M7J7ecgH8hRRb iSiuVbc4F7MrLb6xwjXmIUzESuBIkf+5Eg8yRtArnxfOrAcGqFxUKDbdmeHgJ5AkQBCVC2 gF15QXseWp7o4E2C+gmn0TRgF1xEuqtO837FhEFlUBlv7O2WfRH7h21YPr4/J00zCauN9L 6s5IQbeMq1bZtaCWJ2WzKF6R81dueUqagXDbjsSJ+ZBAkHX7o1vys1fjnDTYipEvgnHxv5 bHSbjqm+LnR6713SgSTavanfRIb8oQbHcqP0YHqLzwzdU8YIJDW5jUvLUo5t0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733763066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oTULH1ftgxjJ97b9zKhNsBSquI38xcQkRVCx5uT01d0=; b=dR+7dFa+q9irS3t5970YwJGMei//aXpKxn9Isf9/VrRI9MK3WaaC1J5/txiVPeJpDQC4Ah HHHiQ92EZP7gJFKNhIfLtDa5sR0B6gebDZtW+2yIhZ8f54S+Rh8wEdeJBMdZNfaDwpWD2v dE1rKz/Nn8dmRyTGvUbBeHY7qOZ5Dp1HQWKWgtZJ/xMHeQRh8TRN2lkPQM6G7IC4Sj2IHU /Iv85KGxngtumkeO0ta/8uhXLaG///Uy62qs7q+O6v4umdaovtbE7j41JcTR+UHVjR7VYj T84DsUQQXWAphwm9FrubO0WniIha+08CwbkYzzXqzrq92QfAEDqi4zROShI7RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733763066; a=rsa-sha256; cv=none; b=ywypsM8Xp0QbzX7ufliGuolxew44jgEK7f6qfIDd/+QIH9N8zk8oxNjnUzSV3N4S/RHsiy daijGn0agmt71zW1vMGUdP1+fMvSkdPsWQCzZs+FGDm/jWlYWMc67LA3aE5AGb+BMffpk1 WjGzOn+4zd6/SVNZ4AMpll4u+P9LdUJul+G9Ewfjg35eB5TEYi17aS9WhnEw1FKGeBwJOZ cvyeaujwpYKrEsBOMptPEKBOdBDdJ+lluwXPrBbIc3NRBjGf705pTtcP+l3m9TnsZtjw9a 1+BexST76f/l/EYaoVoR0Lk3D5AUNVBtvgWov+jBvqtoKDHuwmjz2thrqUiVOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6SYQ3fn6zmLJ; Mon, 9 Dec 2024 16:51:06 +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 4B9Gp6mN085443; Mon, 9 Dec 2024 16:51:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Gp6gl085440; Mon, 9 Dec 2024 16:51:06 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:51:06 GMT Message-Id: <202412091651.4B9Gp6gl085440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 40fb1b8bc1cf - main - isp: Fix use after free in aborts handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40fb1b8bc1cf452d83edc5b25bc1d8bd13c0e72d Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=40fb1b8bc1cf452d83edc5b25bc1d8bd13c0e72d commit 40fb1b8bc1cf452d83edc5b25bc1d8bd13c0e72d Author: Alexander Motin AuthorDate: 2024-12-09 16:47:03 +0000 Commit: Alexander Motin CommitDate: 2024-12-09 16:47:03 +0000 isp: Fix use after free in aborts handling When aborting command waiting in restart queue remove it from the queue before freeing it. This should fix NULL dereference panics we saw on some very busy system. MFC after: 2 weeks --- sys/dev/isp/isp_freebsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index fdf4c0eb4e1f..51c1e3abb6de 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -1904,11 +1904,11 @@ isp_target_mark_aborted_early(ispsoftc_t *isp, int chan, tstate_t *tptr, uint32_ STAILQ_FOREACH_SAFE(ntp, &tptr->restart_queue, next, tmp) { this_tag_id = ((at7_entry_t *)ntp->data)->at_rxid; if ((uint64_t)tag_id == TAG_ANY || tag_id == this_tag_id) { + STAILQ_REMOVE(&tptr->restart_queue, ntp, + inot_private_data, next); isp_endcmd(isp, ntp->data, NIL_HANDLE, chan, ECMD_TERMINATE, 0); isp_put_ntpd(isp, chan, ntp); - STAILQ_REMOVE(&tptr->restart_queue, ntp, - inot_private_data, next); } } From nobody Mon Dec 9 17:11:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6T0N2QSwz5gY1J; Mon, 09 Dec 2024 17:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6T0N20Zfz4fV3; Mon, 9 Dec 2024 17:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrvD6hVHI6wI1EyC333Jn8ABSMEV/KzRRyfunucAgaE=; b=WVRfXWNxD+icss8oLP/VDXH4omnoxTaZaH3g+L+bsn/DH0AwUJPGnc0Ntsd1rWFX4htSOl KFYtm1Q/lgAn9dpBwe+W4zWUvq8TQAXy9vaycKgGOA96LgK+BYGCH9+97o0m1LiHe6wd6i GgvvP9Oe5TEtYvLESy0sly0EFsmnca5+SXZh5V+fDnVmZ8wHM2S6ELJ1K+35b1lurrelX5 IP9Z6uoypK4gmKKd4pgB/0JEdbZCEbmnjLV/zNu33Ek2XzTQjXqGnYjmHi/bXiP6B/vbQP AydUauwuGO1FIttgPlV3S/4AfIUMJr02L/iJXzM4r5rWj+wEQ6fLkDB0v+VFCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrvD6hVHI6wI1EyC333Jn8ABSMEV/KzRRyfunucAgaE=; b=xjlMDwHthw2TJvqVIyit093a+4BY6Mpfj3SfTQxHNotWvNnEs0SOY/1RZzTseEVZd5Y2M7 oyqq+NnmqQYBA7s8fw18Xg2aGHNpf1gRVTk7lPp9F7uQMemUFL9kde6c3DlRvUaaNYcDF4 RciJB5xvAlhX7U17HktQqMcwk6EXEf7qqRdi5tRbrXjtCo5EEpLCJjtO4hbaft5/7feVml XaHTUT3IEDb4BVRrq46bC1n8tKoOv9XdPP70PhOcw52BeD8NGJPMf+mN+uwyoWEE4wl++W cOYM0iFoO5nN55q/NLSCN8Bk1Orc1H+Yia3nQiGT2wf07TSIqPW3whR9Uuh0wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733764260; a=rsa-sha256; cv=none; b=ZufWBW584QDEVFL57B6RdgoBmz1p6FszQtSXmaG0n8ea3IHFdIDrOuR9MnxUIDObi/lUIU ZKTvzyABGzBfyH3WOrJofqeppnxU+mZL3m7OdKliheF1eg/ZQmpfft/G6pdEgNka+FL9sa O02kEpQkUcVpAOr099mz9QUSyeadF5fDr67NV1XRMjKxGqjJwW8+ltYq32stBPVm9abDJ9 kdGlLH+XNPPT13Pjsmmv7BLay6vG4ms9E4W4VPDXIrlgpO8pggHvi5WYxOcgharJLCfUcQ V/qGmNGB68kIvxjF2p+WgsdQfNXCRzPr7UEfmQ7XDUoE9OUXY5o3i/0TIeT0Rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6T0N1Tbczmbd; Mon, 9 Dec 2024 17:11:00 +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 4B9HB0v7027487; Mon, 9 Dec 2024 17:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9HB06V027484; Mon, 9 Dec 2024 17:11:00 GMT (envelope-from git) Date: Mon, 9 Dec 2024 17:11:00 GMT Message-Id: <202412091711.4B9HB06V027484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: ec3175fc3b2c - main - isp: Improve task aborts handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec3175fc3b2c1b07144a85e6a3e2fe534acc0c87 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=ec3175fc3b2c1b07144a85e6a3e2fe534acc0c87 commit ec3175fc3b2c1b07144a85e6a3e2fe534acc0c87 Author: Alexander Motin AuthorDate: 2024-12-09 16:52:26 +0000 Commit: Alexander Motin CommitDate: 2024-12-09 16:52:26 +0000 isp: Improve task aborts handling - When handling notify acknowledge from target code for task abort request, not only send abort to the firmware, but also delete the ATIO private data associated with the command. It is required for proper tag reuse, allowing new "conflicting" commands to be passed to the target. CTL was already fixed to handle that right, instead of delaying them in restart queue of the driver. - When target finally aborts the command (which it should have done before the notify ack) we should not send another abort to the firmware. Since we already sent the abort and deleted ATIO private data above, just return successful completion here, doing nothing. Since the tag can be reused by that time, we can not rely on its uniqueness, so when searching to the ATIO private data compare also the aborted CCB pointer in addition to the tag. - Fix BA_RJT sending in isp_acknak_abts(). While it should be rare, teach the code to send error responses for ABTS requests. MFC after: 2 weeks --- sys/dev/isp/isp_freebsd.c | 142 +++++++++++++++++++++------------------------- sys/dev/isp/isp_freebsd.h | 9 ++- sys/dev/isp/isp_target.c | 11 ++-- 3 files changed, 77 insertions(+), 85 deletions(-) diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 51c1e3abb6de..d5aa7a54142e 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -626,8 +626,9 @@ isp_free_pcmd(ispsoftc_t *isp, union ccb *ccb) */ #ifdef ISP_TARGET_MODE static ISP_INLINE tstate_t *get_lun_statep(ispsoftc_t *, int, lun_id_t); -static atio_private_data_t *isp_get_atpd(ispsoftc_t *, int, uint32_t); +static atio_private_data_t *isp_get_atpd(ispsoftc_t *, int, uint32_t, void *); static atio_private_data_t *isp_find_atpd(ispsoftc_t *, int, uint32_t); +static atio_private_data_t *isp_find_atpd_ccb(ispsoftc_t *, int, uint32_t, void *); static void isp_put_atpd(ispsoftc_t *, int, atio_private_data_t *); static inot_private_data_t *isp_get_ntpd(ispsoftc_t *, int); static inot_private_data_t *isp_find_ntpd(ispsoftc_t *, int, uint32_t, uint32_t); @@ -715,7 +716,7 @@ isp_tmcmd_restart(ispsoftc_t *isp) } static atio_private_data_t * -isp_get_atpd(ispsoftc_t *isp, int chan, uint32_t tag) +isp_get_atpd(ispsoftc_t *isp, int chan, uint32_t tag, void *ccb) { struct isp_fc *fc = ISP_FC_PC(isp, chan); atio_private_data_t *atp; @@ -723,6 +724,7 @@ isp_get_atpd(ispsoftc_t *isp, int chan, uint32_t tag) atp = LIST_FIRST(&fc->atfree); if (atp) { LIST_REMOVE(atp, next); + atp->ccb = ccb; atp->tag = tag; LIST_INSERT_HEAD(&fc->atused[ATPDPHASH(tag)], atp, next); } @@ -742,6 +744,23 @@ isp_find_atpd(ispsoftc_t *isp, int chan, uint32_t tag) return (NULL); } +/* + * Similar to above, but in addition to tag searches for opaque CCB pointer, + * It can be used in situations when the tag alone may already be reused. + */ +static atio_private_data_t * +isp_find_atpd_ccb(ispsoftc_t *isp, int chan, uint32_t tag, void *ccb) +{ + struct isp_fc *fc = ISP_FC_PC(isp, chan); + atio_private_data_t *atp; + + LIST_FOREACH(atp, &fc->atused[ATPDPHASH(tag)], next) { + if (atp->tag == tag && atp->ccb == ccb) + return (atp); + } + return (NULL); +} + static void isp_put_atpd(ispsoftc_t *isp, int chan, atio_private_data_t *atp) { @@ -967,16 +986,6 @@ isp_target_start_ctio(ispsoftc_t *isp, union ccb *ccb, enum Start_Ctio_How how) continue; } - /* - * Is this command a dead duck? - */ - if (atp->dead) { - isp_prt(isp, ISP_LOGERR, "%s: [0x%x] not sending a CTIO for a dead command", __func__, cso->tag_id); - ccb->ccb_h.status = CAM_REQ_ABORTED; - xpt_done(ccb); - continue; - } - /* * Check to make sure we're still in target mode. */ @@ -1378,7 +1387,7 @@ isp_handle_platform_atio7(ispsoftc_t *isp, at7_entry_t *aep) */ goto noresrc; } - atp = isp_get_atpd(isp, chan, aep->at_rxid); + atp = isp_get_atpd(isp, chan, aep->at_rxid, atiop); if (atp == NULL) { isp_prt(isp, ISP_LOGTDEBUG0, "[0x%x] out of atps", aep->at_rxid); isp_endcmd(isp, aep, nphdl, chan, SCSI_BUSY, 0); @@ -1733,32 +1742,8 @@ isp_handle_platform_target_notify_ack(ispsoftc_t *isp, isp_notify_t *mp, uint32_ /* * This case is for a responding to an ABTS frame */ - if (mp->nt_lreserved && ((isphdr_t *)mp->nt_lreserved)->rqs_entry_type == RQSTYPE_ABTS_RCVD) { - - /* - * Overload nt_need_ack here to mark whether we've terminated the associated command. - */ - if (mp->nt_need_ack) { - abts_t *abts = (abts_t *)mp->nt_lreserved; - - ISP_MEMZERO(cto, sizeof (ct7_entry_t)); - isp_prt(isp, ISP_LOGTDEBUG0, "%s: [%x] terminating after ABTS received", __func__, abts->abts_rxid_task); - cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; - cto->ct_header.rqs_entry_count = 1; - cto->ct_nphdl = mp->nt_nphdl; - cto->ct_rxid = abts->abts_rxid_task; - cto->ct_iid_lo = mp->nt_sid; - cto->ct_iid_hi = mp->nt_sid >> 16; - cto->ct_oxid = abts->abts_ox_id; - cto->ct_vpidx = mp->nt_channel; - cto->ct_flags = CT7_NOACK|CT7_TERMINATE; - if (isp_send_entry(isp, cto)) { - return (ENOMEM); - } - mp->nt_need_ack = 0; - } - return (isp_acknak_abts(isp, mp->nt_lreserved, 0)); - } + if (mp->nt_lreserved && ((isphdr_t *)mp->nt_lreserved)->rqs_entry_type == RQSTYPE_ABTS_RCVD) + return (isp_acknak_abts(isp, mp->nt_lreserved, (rsp == 0) ? 0 : EINVAL)); /* * General purpose acknowledgement @@ -1890,17 +1875,15 @@ bad: } } +/* + * Clean aborted commands pending restart + */ static void isp_target_mark_aborted_early(ispsoftc_t *isp, int chan, tstate_t *tptr, uint32_t tag_id) { - struct isp_fc *fc = ISP_FC_PC(isp, chan); - atio_private_data_t *atp; inot_private_data_t *ntp, *tmp; uint32_t this_tag_id; - /* - * First, clean any commands pending restart - */ STAILQ_FOREACH_SAFE(ntp, &tptr->restart_queue, next, tmp) { this_tag_id = ((at7_entry_t *)ntp->data)->at_rxid; if ((uint64_t)tag_id == TAG_ANY || tag_id == this_tag_id) { @@ -1911,16 +1894,6 @@ isp_target_mark_aborted_early(ispsoftc_t *isp, int chan, tstate_t *tptr, uint32_ isp_put_ntpd(isp, chan, ntp); } } - - /* - * Now mark other ones dead as well. - */ - for (atp = fc->atpool; atp < &fc->atpool[ATPDPSIZE]; atp++) { - if (atp->lun != tptr->ts_lun) - continue; - if ((uint64_t)tag_id == TAG_ANY || atp->tag == tag_id) - atp->dead = 1; - } } #endif @@ -2283,6 +2256,25 @@ isp_kthread(void *arg) } #ifdef ISP_TARGET_MODE +static int +isp_abort_atpd(ispsoftc_t *isp, int chan, atio_private_data_t *atp) +{ + uint8_t storage[QENTRY_LEN]; + ct7_entry_t *cto = (ct7_entry_t *) storage; + + ISP_MEMZERO(cto, sizeof (ct7_entry_t)); + cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; + cto->ct_header.rqs_entry_count = 1; + cto->ct_nphdl = atp->nphdl; + cto->ct_vpidx = chan; + cto->ct_iid_lo = atp->sid; + cto->ct_iid_hi = atp->sid >> 16; + cto->ct_rxid = atp->tag; + cto->ct_flags = CT7_NOACK|CT7_TERMINATE; + cto->ct_oxid = atp->oxid; + return (isp_send_entry(isp, cto)); +} + static void isp_abort_atio(ispsoftc_t *isp, union ccb *ccb) { @@ -2308,30 +2300,16 @@ isp_abort_atio(ispsoftc_t *isp, union ccb *ccb) } /* Search for the ATIO among running. */ - atp = isp_find_atpd(isp, XS_CHANNEL(accb), accb->atio.tag_id); + atp = isp_find_atpd_ccb(isp, XS_CHANNEL(accb), accb->atio.tag_id, accb); if (atp != NULL) { - /* Send TERMINATE to firmware. */ - if (!atp->dead) { - uint8_t storage[QENTRY_LEN]; - ct7_entry_t *cto = (ct7_entry_t *) storage; - - ISP_MEMZERO(cto, sizeof (ct7_entry_t)); - cto->ct_header.rqs_entry_type = RQSTYPE_CTIO7; - cto->ct_header.rqs_entry_count = 1; - cto->ct_nphdl = atp->nphdl; - cto->ct_rxid = atp->tag; - cto->ct_iid_lo = atp->sid; - cto->ct_iid_hi = atp->sid >> 16; - cto->ct_oxid = atp->oxid; - cto->ct_vpidx = XS_CHANNEL(accb); - cto->ct_flags = CT7_NOACK|CT7_TERMINATE; - isp_send_entry(isp, cto); + if (isp_abort_atpd(isp, XS_CHANNEL(accb), atp)) { + ccb->ccb_h.status = CAM_UA_ABORT; + return; } isp_put_atpd(isp, XS_CHANNEL(accb), atp); - ccb->ccb_h.status = CAM_REQ_CMP; - } else { - ccb->ccb_h.status = CAM_UA_ABORT; } + + ccb->ccb_h.status = CAM_REQ_CMP; } static void @@ -2504,6 +2482,7 @@ isp_action(struct cam_sim *sim, union ccb *ccb) } case XPT_NOTIFY_ACKNOWLEDGE: /* notify ack */ { + atio_private_data_t *atp; inot_private_data_t *ntp; /* @@ -2522,8 +2501,19 @@ isp_action(struct cam_sim *sim, union ccb *ccb) xpt_done(ccb); break; } - if (isp_handle_platform_target_notify_ack(isp, &ntp->nt, - (ccb->ccb_h.flags & CAM_SEND_STATUS) ? ccb->cna2.arg : 0)) { + + /* + * Target should abort all affected CCBs before ACK-ing INOT, + * but if/since it doesn't, add this hack to allow tag reuse. + */ + uint32_t rsp = (ccb->ccb_h.flags & CAM_SEND_STATUS) ? ccb->cna2.arg : 0; + if (ntp->nt.nt_ncode == NT_ABORT_TASK && (rsp & 0xff) == 0 && + (atp = isp_find_atpd(isp, XS_CHANNEL(ccb), ccb->cna2.seq_id)) != NULL) { + if (isp_abort_atpd(isp, XS_CHANNEL(ccb), atp) == 0) + isp_put_atpd(isp, XS_CHANNEL(ccb), atp); + } + + if (isp_handle_platform_target_notify_ack(isp, &ntp->nt, rsp)) { cam_freeze_devq(ccb->ccb_h.path); cam_release_devq(ccb->ccb_h.path, RELSIM_RELEASE_AFTER_TIMEOUT, 0, 10, 0); ccb->ccb_h.status &= ~CAM_STATUS_MASK; diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index bd5bba92c0a9..5bb3dd43b6de 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -89,10 +89,11 @@ void isp_put_ecmd(struct ispsoftc *, isp_ecmd_t *); #include typedef struct atio_private_data { LIST_ENTRY(atio_private_data) next; + void * ccb; + uint32_t tag; /* typically f/w RX_ID */ uint32_t orig_datalen; uint32_t bytes_xfered; uint32_t bytes_in_transit; - uint32_t tag; /* typically f/w RX_ID */ lun_id_t lun; uint32_t nphdl; uint32_t sid; @@ -102,11 +103,9 @@ typedef struct atio_private_data { uint16_t word3; /* PRLI word3 params */ uint16_t ctcnt; /* number of CTIOs currently active */ uint8_t seqno; /* CTIO sequence number */ - uint32_t - srr_notify_rcvd : 1, - cdb0 : 8, + uint8_t cdb0; + uint8_t srr_notify_rcvd : 1, sendst : 1, - dead : 1, tattr : 3, state : 3; void * ests; diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c index 081524aff53c..9d8f8e2a3766 100644 --- a/sys/dev/isp/isp_target.c +++ b/sys/dev/isp/isp_target.c @@ -481,10 +481,14 @@ isp_acknak_abts(ispsoftc_t *isp, void *arg, int errno) ISP_MEMCPY(rsp, abts, QENTRY_LEN); rsp->abts_rsp_header.rqs_entry_type = RQSTYPE_ABTS_RSP; + isp_prt(isp, ISP_LOGTINFO, "[0x%x] ABTS of 0x%x being %s'd", + rsp->abts_rsp_rxid_abts, rsp->abts_rsp_rxid_task, + (errno == 0) ? "BA_ACC" : "BA_RJT"); + rsp->abts_rsp_r_ctl = (errno == 0) ? BA_ACC : BA_RJT; + /* * Swap destination and source for response. */ - rsp->abts_rsp_r_ctl = BA_ACC; tmpw = rsp->abts_rsp_did_lo; tmpb = rsp->abts_rsp_did_hi; rsp->abts_rsp_did_lo = rsp->abts_rsp_sid_lo; @@ -505,15 +509,14 @@ isp_acknak_abts(ispsoftc_t *isp, void *arg, int errno) rx_id = rsp->abts_rsp_rx_id; ox_id = rsp->abts_rsp_ox_id; ISP_MEMZERO(&rsp->abts_rsp_payload.ba_acc, sizeof (rsp->abts_rsp_payload.ba_acc)); - isp_prt(isp, ISP_LOGTINFO, "[0x%x] ABTS of 0x%x being BA_ACC'd", rsp->abts_rsp_rxid_abts, rsp->abts_rsp_rxid_task); rsp->abts_rsp_payload.ba_acc.aborted_rx_id = rx_id; rsp->abts_rsp_payload.ba_acc.aborted_ox_id = ox_id; rsp->abts_rsp_payload.ba_acc.high_seq_cnt = 0xffff; } else { - ISP_MEMZERO(&rsp->abts_rsp_payload.ba_rjt, sizeof (rsp->abts_rsp_payload.ba_acc)); + ISP_MEMZERO(&rsp->abts_rsp_payload.ba_rjt, sizeof (rsp->abts_rsp_payload.ba_rjt)); switch (errno) { case ENOMEM: - rsp->abts_rsp_payload.ba_rjt.reason = 5; /* Logical Unit Busy */ + rsp->abts_rsp_payload.ba_rjt.reason = 5; /* Logical busy */ break; default: rsp->abts_rsp_payload.ba_rjt.reason = 9; /* Unable to perform command request */ From nobody Mon Dec 9 17:14:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6T4l52wmz5gY4d; Mon, 09 Dec 2024 17:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6T4l461Qz4gLR; Mon, 9 Dec 2024 17:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bH2DTZzVc8rpPtdqHTBFt9ai8VShLiZBBn/lBHwO0GE=; b=rwolde9PnIyTKC5Xf+IJP1rbNuOStbJRU/Mko/LntG7UENehTNAtul0UhYqkAeqDfdo6/0 u6twTTDJzIvONNfoKldKwm4wFP66pI6blXHpF3WCt3NuV2qYmU9i/r1Dh4JxPVe96hTdke /h+dsni7ExwKHqTJGZF/RFhFshB3qOwipMNcpgw7MwOv1kGiHkpkendBHQ9WJgrbtgvRil klnYKWjL2ALGMYg1P5ZIctjI7gSbHZDRwiCj3jkyhGUM8TGwX48bOvXzCE+lSkTjd3RJKP TrBomVsTKucznzsItaxOKGhPOs7d5vNgKVa3mA8sCyXV6ZV6lGwCUl90Daukjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bH2DTZzVc8rpPtdqHTBFt9ai8VShLiZBBn/lBHwO0GE=; b=RAb81AcXVV1i/hDHahqpbJzBJwby5KArkin6X/PNgMTW/edK66zb4TiQAZpHMyw5E+nVhZ wxvhtNjS8tAzDESUG5E2S8vE1MFssVaBtTREAdjvdpj6CgyL/7p0GEFAbBYyrLHSffHxGA 47h8CI/GFQF5m+Bz9gQVK2C0cw9oq28xc+Vha5MNQqbYcdEzgB/KYkOcgjyAaNiqfILHFn hbI8xPuYVxNpOowyy1gbUhL/r+SXtDYKavL0yKpZITEsUagiHS2FJOobLNJaf4fXqBBQ4m YirhoE81FsLTG59QQZ99y4qFV6rbIIFtQzTo/7JSRinIC8pALnFz1TqRxDAg2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733764487; a=rsa-sha256; cv=none; b=FCp65bZb0NvKfbkIxY1dd/crL2ExtRb2v+3eyQaZHLbPweyLWBWb9hU6LnZ3q/FkS8zKsp XAupM3jgVmJERKplxOp4E40EJytU7DS13ShNTRHJ0mToRSbvJO/ZouSJiSPmSeQoB7K3NO 7x2C0ptMTzIXWdoYnwOAdDRN/NcRQae9QzWgMtKL3bddETlyX39n3sg0S4jvfgWgvV5CxB ArczaP3b6mpzHe/dkyZ2lj0sz/hvrnyawh7lrqaGKj9QkIc0o4e4G6K6vRsIWR5sYSbO12 dQzHW6MNMCtQS5aySqk5noB7euPmypAPE3kwksw9E9MhPXOKHaMmz98A5IvowA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6T4l3hxQzmcF; Mon, 9 Dec 2024 17:14:47 +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 4B9HElgM030841; Mon, 9 Dec 2024 17:14:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9HEl5Q030838; Mon, 9 Dec 2024 17:14:47 GMT (envelope-from git) Date: Mon, 9 Dec 2024 17:14:47 GMT Message-Id: <202412091714.4B9HEl5Q030838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 6854a1488932 - main - cuse: Use NULL for SYSUNINIT's last arg, which is a pointer type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6854a1488932cd043da940b87eb956d6df7d8522 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6854a1488932cd043da940b87eb956d6df7d8522 commit 6854a1488932cd043da940b87eb956d6df7d8522 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:07 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-09 17:14:07 +0000 cuse: Use NULL for SYSUNINIT's last arg, which is a pointer type MFC after: 3 days --- sys/fs/cuse/cuse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c index e32154654386..d63a7d4691cf 100644 --- a/sys/fs/cuse/cuse.c +++ b/sys/fs/cuse/cuse.c @@ -332,7 +332,7 @@ cuse_kern_uninit(void *arg) mtx_destroy(&cuse_global_mtx); } -SYSUNINIT(cuse_kern_uninit, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_uninit, 0); +SYSUNINIT(cuse_kern_uninit, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_uninit, NULL); static int cuse_server_get(struct cuse_server **ppcs) From nobody Mon Dec 9 17:14:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6T4m606pz5gXvp; Mon, 09 Dec 2024 17:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6T4m5QpPz4gT8; Mon, 9 Dec 2024 17:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ITc9dIBK9LdStibNxyWmPDmG/XooJAcbi2npeXbztPQ=; b=Zq/zmQGOYg1oazpXueGmZQVm992OVvfyCnzVP021Pm7e217rWSvbkb5kxehO/9B+vc5/IJ YRSpGmwVD8+wsyHLzBqIYMpV65xjdHM34fYBst8lsBzQ04AnbrN/2xltrWUkL3w5MEFgmt xEl9WRTtdnPPU/hZhiyISerVu4eYDFlnHXyCJkVRe/ToP0mNBNj1zoShCQJkq/Ob+OChdf TUfd8jo3cyiNjzB0FhUR5tioJ/wVeYD+tDdpfGtJ6zGJdgLePyuPPD+t8NCQxXoWVd1LUb eYfn1SG1BbW7T8Cw0j/bCwryay95uGyP4OY2APAOFs97JeQam4FPXGLK0ns5tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ITc9dIBK9LdStibNxyWmPDmG/XooJAcbi2npeXbztPQ=; b=HRPXRJdFuxPtZQ+BP81g2X2zU3oLxAhIeXaazuLClziz+YxRiGUPas7SsuIVSbAoviKur7 1iT8hz1BkKumnXOvO3BffaLfBE4QspcUFQWpei5QDSEoZqdLU3weiMdCOhZiOClMk5WZE6 RxIMMhjgrGXz0smgKz4dTkXz4elxb/+6xFGD+SNuVGO2nDFCJoq0h7DcV02Bf6z+ZhNtOp roAB9HMVAk4qdhmKMcWciGNxrJNuhmSQv5wdjtzhKSlA1GTlK6/4UE0GOaeMxOjltoQNF6 RKjg3+yaqi9alcfwUmutykcGzF6CqEwfr8D14/UMaoqlyetDI66JeOab1x4vbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733764488; a=rsa-sha256; cv=none; b=d6zoDebj/Q7v9vtV8wa3AyTIx0pJ6Tilf4Ld+pvekLyIBN/iZe8cBAAdF46bNQ2Ch5eiaY icnmziin4K3iv7XDasAfycuA6Ej6FVp02rxigfN77b3xHEcgDvcU1ritD5H2BSmr0J8+wI ji/xhhhnPZm3uzcfmgqXMVIapTLo0a7VV2hYUijCgbSg7rSd3qrIQJdYzByMMpWg8ferlR dJEQ1rCUAbz/t/q03X3yK9O821pYXAw5GwIv3KGpGofYajBSa+6bavwJVsHb4VKYb4g72B fC+wlTzrHLJBoThqyUIJrSV5OGBlqQdvX8CrZOzZHx1Ccp5r7w1I9gvoUunXNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6T4m52Cszmqk; Mon, 9 Dec 2024 17:14:48 +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 4B9HEmTX030916; Mon, 9 Dec 2024 17:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9HEmNI030913; Mon, 9 Dec 2024 17:14:48 GMT (envelope-from git) Date: Mon, 9 Dec 2024 17:14:48 GMT Message-Id: <202412091714.4B9HEmNI030913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 12b2d68bed37 - main - routing: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12b2d68bed37e379929cd9b5e0afe34c387be360 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=12b2d68bed37e379929cd9b5e0afe34c387be360 commit 12b2d68bed37e379929cd9b5e0afe34c387be360 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-09 17:14:08 +0000 routing: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type MFC after: 3 days --- sys/net/route/route_tables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/route/route_tables.c b/sys/net/route/route_tables.c index da829503b846..176ca43fa1c5 100644 --- a/sys/net/route/route_tables.c +++ b/sys/net/route/route_tables.c @@ -314,7 +314,7 @@ vnet_rtables_init(const void *unused __unused) RTABLES_UNLOCK(); } VNET_SYSINIT(vnet_rtables_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, - vnet_rtables_init, 0); + vnet_rtables_init, NULL); #ifdef VIMAGE static void @@ -353,7 +353,7 @@ rtables_destroy(const void *unused __unused) #endif } VNET_SYSUNINIT(rtables_destroy, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, - rtables_destroy, 0); + rtables_destroy, NULL); #endif static inline struct rib_head * From nobody Mon Dec 9 17:14:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6T4p0q8Xz5gXsy; Mon, 09 Dec 2024 17:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6T4n6gMYz4gTM; Mon, 9 Dec 2024 17:14:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CBl/TnYXa1fVKHPD5hXLe6mtl34jtLhQ/nLmvk3zdw=; b=oWhpIXvMxmKPV74CR4dWiL78K4Ng2NlSJ/nCFea9rkSBLptC9eCX2pdqUFhsQF1YzkGLVX +SfjJ5Rh1OJa+s1yur8XONs6VFuYnLFhQ567HCAK0G7NG1TQJVgt8ZNqpEDIOOHJ3D6fRR NRQusCMrBW5+soZE6srH5NTuGNVC4gqzSOQUM10nXhG6n2oTF/NnXoP6g1XczeytSl8GDM gjARRhvvsJi6/0z+C/NJntNzX7tFQIy9R/mUeYjHEYoTkuhAXQSuB1EMvmSxExongvY67/ oPm0S86SPN3J4st6iZ39+ifBhFCNljahgEAZty2Ndshn7kBANF3l7wB8unw7zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CBl/TnYXa1fVKHPD5hXLe6mtl34jtLhQ/nLmvk3zdw=; b=IPxwxA/KAUZTGuoz7XhEpaSIwUsMIHkCJY9jplpl4X9ctacwMbT6RywQIcIgwlJpOErBnv HDgL+Fxg9AhqAlb5qL2Mh8PJIbxQ4XgxNDWdTuqLQGJhGtMF5sbKEBv/rBuZ+mVQZdPvMK MI7jtIdo2RhQ3hXByx9pN3N4nRjne0W9ojRLu6ok6hTDQ5t7sHvbxdxgubZI2JdFZ7qTdr Hy1O19fcSgkU0e2kyTqUZx6g7RjUNc5SGlKLfrBCNKatOhE84RuWTatvRmdtzyFZH/e84H dFk1LHJA8QbbQIhSnUMCAsQ/haG46l/u+PXoTvFQWTylYjvEoKE4hIRjvd0Kyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733764489; a=rsa-sha256; cv=none; b=anwfrr9btEybUg5VCnKs4O1frFj3F7gq/WgnaUeGRoz25MRhExSRj2SvmI3WPseaJRXP47 QB9GAXdJOz0z6tEDwYsrVRI7HkhPRWqgJ4XnOiNK0by0iKqEJQ/TEfYbcWZIAm7rEfTIsy cYP8M3zgmk6q99J68JCYUSs+Lwj/+G0CoMch302Me1F6OdLdQKA1eS9NkEzTuSHYe+tkgc D++muQV0ZSHFRjVEDgwQ5E+GQM0Gmata1iASjuoZZqZ/lFx47xyaTFs2At2WPQfBX1GvJX uheY8umd7oeGtnF7Iq63jYXVdpZVe0XRYZ5IafTJJi6so9UT1nn2+cas8KDznQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6T4n66T1zmDf; Mon, 9 Dec 2024 17:14: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 4B9HEnxF030996; Mon, 9 Dec 2024 17:14:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9HEnBE030993; Mon, 9 Dec 2024 17:14:49 GMT (envelope-from git) Date: Mon, 9 Dec 2024 17:14:49 GMT Message-Id: <202412091714.4B9HEnBE030993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: adc573c8e217 - main - rtsock: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adc573c8e2179310777cef4d6bda19db2ae63dd5 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=adc573c8e2179310777cef4d6bda19db2ae63dd5 commit adc573c8e2179310777cef4d6bda19db2ae63dd5 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-09 17:14:08 +0000 rtsock: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type MFC after: 3 days --- sys/net/rtsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index a5395dcf1469..ce5ec9ce22af 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -261,7 +261,7 @@ vnet_rts_init(void) #endif } VNET_SYSINIT(vnet_rtsock, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, - vnet_rts_init, 0); + vnet_rts_init, NULL); #ifdef VIMAGE static void @@ -271,7 +271,7 @@ vnet_rts_uninit(void) netisr_unregister_vnet(&rtsock_nh); } VNET_SYSUNINIT(vnet_rts_uninit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, - vnet_rts_uninit, 0); + vnet_rts_uninit, NULL); #endif static void From nobody Mon Dec 9 17:14:50 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6T4q2FHNz5gXt2; Mon, 09 Dec 2024 17:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6T4p6zWnz4gWR; Mon, 9 Dec 2024 17:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4TeeuvUZ0rRWGFAUMZKxdQIeKo2uN1NlJivIsJ7omA=; b=dRO3qd9VcAKUdE+M74KYDBDR7y264h9UwUR89rRg33Un7/ZLEC7q5ymlgrHlMEV1XECH4M DYRYYJKd/OEuzz/ZRLpiKYvvUnlM5uGTz9k+gH36hKJk2hTkiQAWBnLyWaxolAp31Vn8hK N6QLC1tE2phpgfsgUmd4sKjqJvUjPtKFYZLH0ASEz6dAubQ85eVStxRVXGTe5OTGr6FLt+ 6SNKoM1IOlRiKHtngt9xpAPSvkW8bzEX2xCNHBWSPmanwSAEh0LlqBVFZg1u4eedd5rBqX C/5lsNnmOazHs/y0dGELNN2QA5kBA9WcC9RKjT94cHJEzaUXKyQkufXjErNbuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4TeeuvUZ0rRWGFAUMZKxdQIeKo2uN1NlJivIsJ7omA=; b=FU7nteo32MONyh9OK/crwMM3gNAU4AGvb7XIqEHsYP4VECDq4S/mQ4A0lgETwot/SHqQSE WP1DiAI1Uf3s9cZKy8zXmi+YuJJgdvyaLkcNls/c/cZBqCCsvMr735dzgUYFvz1e95D0GB cprvHzLw+Ql7ilrsJdnvCCzUaZqxwdCQhHPKgmziCM8o2G2wJYqUJa8W6x3mJcmYcfzh6I bT1JT4d7lQ0eCdXe9fJQRJayaJ4LVlZDUjEVW7Y3ndW0fH+4Q9pEN5LV0v37uD9+WFxYj1 V3AiMggyIbBMDRJN7/WEQN6d91Rs6WFfRefbnAwxHhRzjk0yvB89g/LE5sjltw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733764491; a=rsa-sha256; cv=none; b=sepa1GSNQYrHiET/L1TTvbMK3ovh69Vsadpd5phnCk+0DVpw/EWVgaB/7/k2euqH9lufXk Y/g1U9kY8Hu0X5QiOCZ57V9G3l4wKoVJI0JDe4VYLHRc5SXynFLLZTxpWuz5ZGA8+6XUUB FbEzLOLAQMPkMAJ62DQN7tg2/ZQTjvkbtsn4iWQs5oTPGLkT8KYfPTIcICNvgpwIZdPX1S MqFybkh96e0aJe0y9MhB3UQGyIwGhQdVrumF2fTahc7nP5Ix3NastGlchez0ZVfGvtEEle hiG1Yn5IjB5HOLxlG1338gzq2en2A0JWzhKIfVuhijgM/rhWoGJu+o3j1UPo7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6T4p6bswzmDg; Mon, 9 Dec 2024 17:14:50 +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 4B9HEoB3031059; Mon, 9 Dec 2024 17:14:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9HEotj031056; Mon, 9 Dec 2024 17:14:50 GMT (envelope-from git) Date: Mon, 9 Dec 2024 17:14:50 GMT Message-Id: <202412091714.4B9HEotj031056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: ec6e7677a0db - main - inpcb: Use NULL for VNET_SYSINIT's last arg, which is a pointer type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec6e7677a0dbfbcdb4b740b28a1105256f1fc93e Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ec6e7677a0dbfbcdb4b740b28a1105256f1fc93e commit ec6e7677a0dbfbcdb4b740b28a1105256f1fc93e Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-09 17:14:08 +0000 inpcb: Use NULL for VNET_SYSINIT's last arg, which is a pointer type MFC after: 3 days --- sys/netinet/in_pcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 1309d19121cd..87489e8f457c 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -232,7 +232,7 @@ in_pcbhashseed_init(void) V_in_pcbhashseed = arc4random(); } VNET_SYSINIT(in_pcbhashseed_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, - in_pcbhashseed_init, 0); + in_pcbhashseed_init, NULL); #ifdef INET VNET_DEFINE_STATIC(int, connect_inaddr_wild) = 1; From nobody Mon Dec 9 17:14:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6T4r2mTjz5gYLh; Mon, 09 Dec 2024 17:14:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6T4r1Fvsz4gWq; Mon, 9 Dec 2024 17:14:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pLBZgBi+8/RtAq8o9cixEdATELEUCJmwLlq3U6l9FDU=; b=I/MWxhj96fPoZIO5HMztFHVMYiKEeGUzOXkRi1tR0dhqUO1gi6z0xrTLnC4u1Xyhn3Mz8h HxMo5Y+g7T/Rw22SN9Bp0GV6T7TpGn0tDHPX0ydN5OxUl9lNSnjOuHYNAxytvvuglM4IAw G7YcDwlrlub4xSZ9222/GV4Dj+Uj5rz+Wv+YcGG4kPbNQvB/RlNhRKhPVnRruJPGk2yE86 A6Lpm+ckke3KubLylx2+aYP8PjMTKIh6MfCO6xYbEaGJNJ7DJPJHdSoidw5A+cVfN0uJl7 QwqkCXNG1KHuEP/qD7Kmwoii26A+XFJ/MBgI668bdCOkCWiV2Q0shD3WR8IVRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733764492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pLBZgBi+8/RtAq8o9cixEdATELEUCJmwLlq3U6l9FDU=; b=Hjpj0mmBXRaMaz9Uv1Luo3aACTnluAPrc26cnaznj+3sPdIWHpnsPo/BhiCKt5ZzLPmJgc jSot65GnuruHGf0tti0ncCJctqPUVRlcAHKSDfrIjq3+R4zbVTWxUcrojsaMkYO20rXdBJ wNhthCqKrG/2PhzOF+HFuFex9rxJUzXfcM6eYFIfwTwgHroUay7GMmyWRnxqad3rMrK444 FkNzMRnReWzLB1ZRU8EOs0BwXULpNBOvi675Zpym1qMdS5+njvI/5zWGty8tk4QIHhTDAu gCYGw30yaGoh6byoZitdd9IROmImECf3222UE8rAjb9QELsn6riIcHGNJPwREA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733764492; a=rsa-sha256; cv=none; b=ZRzUvtV6DlUdjPTAGd+9LLoFCUBsb4Krp9YSBgWAmG/zu4XbWjmVHZN4ivEn9THrvcE08E MyefDzh0KQihSiGQzkP7B8+RkmGigHgLRXyv1s4dhswu6XlCJuPSAr95NuW0lY1t47akCq scx8wnaTkiYtQMKNsEYrCHMUg7EkJIE8mhWwxZqUZnzDTwY21K0uA3LwO57LajZ9ztwOj3 GfJAR/jd0G8nDIeTs9grtkzjSBBkTAZQiZJ7mltWlDPdYX+Aql9ljCUpRT+qqfpZHp2YhJ wpxMk8ZCKCBM02DHej989RInoj0mqMx7fbhkLGT8wWqmJkLaU0yRLN6J7mdX3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6T4r0sSQzmDh; Mon, 9 Dec 2024 17:14:52 +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 4B9HEqRL031122; Mon, 9 Dec 2024 17:14:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9HEqAj031119; Mon, 9 Dec 2024 17:14:52 GMT (envelope-from git) Date: Mon, 9 Dec 2024 17:14:52 GMT Message-Id: <202412091714.4B9HEqAj031119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: ac51711cab6e - main - netinet: Use NULL for VNET_SYSINIT's last arg, which is a pointer type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac51711cab6e55a99ee0a565fe0ae30c0305c854 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ac51711cab6e55a99ee0a565fe0ae30c0305c854 commit ac51711cab6e55a99ee0a565fe0ae30c0305c854 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-09 17:14:08 +0000 netinet: Use NULL for VNET_SYSINIT's last arg, which is a pointer type MFC after: 3 days --- sys/netinet/if_ether.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 543e6a3922fb..81f4b901f21b 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1506,7 +1506,7 @@ vnet_arp_init(void) #endif } VNET_SYSINIT(vnet_arp_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_SECOND, - vnet_arp_init, 0); + vnet_arp_init, NULL); #ifdef VIMAGE /* From nobody Mon Dec 9 17:56:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6V0d0cj5z5gbFV; Mon, 09 Dec 2024 17:56: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 4Y6V0c6xT0z4p49; Mon, 9 Dec 2024 17:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733766977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TK0uOn+mz+jRXbtnYedwveU6UotQjGwpVk7aUMRxSvc=; b=NzOJfvYJ+qDvc9ZpRMXxihPKClvtyQCLIaQhUNkRN0C+tYjl4+xUv5Hj+FLImcsQ7uj6I3 AH8qYw0Q83DBqjp/Mk6iNEJ5EUR58ezDfmJ5aWD+lLL+b7EsXHpTsiwHZsISBbb8hchApt HwZ6B0SkAK0XIL+ekCTZghLa0leUBHyvM94xyFyTuI6HO8ZL29l0iI8pS0V3zXT1EgRyaM WnN/shxfJ2I253Pb4R8w9tfaBSmDWuEf4+mzgKNsY86hW0WWpI7dd/hyGks8ttmWavT0WF GGlD43K3VU9N4ssKvKf+1RLisyexPUufN/EcJzXVtqYG1qzvr2YAibjpJ/1YGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733766977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TK0uOn+mz+jRXbtnYedwveU6UotQjGwpVk7aUMRxSvc=; b=HvJQGlb78EWTv2Rla1myFiXDCBl2fIWW9bEopZrefHaceS2e/UBkF+R4kO9f7kXiaxb/jw rwxRXG2C3afUUNN4gRh7V9KM/Jxm4eK5H7cF8BQU53b8wXGxx6pLyku0Ut0HumXW1E+RpV eTbzJHm/yyZlDu/Th5iBAMuhDQIltC5Q4ngBpC4f4M7Uf0z8kgjW26Nb20amffzfc7zXDd xs6uMiKmait6XLRieKYsTuho1tz05m7YUYoAvs/3v6UQ4qd3vHat9vhX0gPAsJnSrMxgQ3 z/beAEcEfHDiTfQRF4I/sIaxzK7lRXvPdGTmSarAezNlN00RtU/x1HMoYybPpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733766977; a=rsa-sha256; cv=none; b=eQRGE8YvBY/73UzgrSIEo1Ejy+lHK+y3OHq0FUkW4QfHek6XlY8H4U7mqh9VHZesnyirGL iV1dKUdq0JDG3uEvjJ70lXFJNXFziEccrtndH08/0suO1XSOpKYrzwACR7M/WA9BSF7Fu/ RdRMCEPGwzZy6NtkbVphawys6KFXjV83K34H310YC5dzoqF3Gq5qapL1Qc3GZ23bwM7oCX /Fy0OqymPa52r3BPZ6Q9/xwH9J97SQRbyhYoxdVI9p8kyyIGr2YW6kctOjm+KsSbdk9csp rG1TH7RrsTudnN28fmrPjL7U4H0mUAMQDGMv+ZZjhAG1XrrCYEAig1XGFCDr/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6V0c6X9Gznh4; Mon, 9 Dec 2024 17:56: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 4B9HuGV7004953; Mon, 9 Dec 2024 17:56:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9HuG1G004950; Mon, 9 Dec 2024 17:56:16 GMT (envelope-from git) Date: Mon, 9 Dec 2024 17:56:16 GMT Message-Id: <202412091756.4B9HuG1G004950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3ca117c6bb1d - main - mandoc: drop 3p section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ca117c6bb1dffaa3542f58339154a7dd166d169 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3ca117c6bb1dffaa3542f58339154a7dd166d169 commit 3ca117c6bb1dffaa3542f58339154a7dd166d169 Author: Brooks Davis AuthorDate: 2024-12-09 17:25:36 +0000 Commit: Brooks Davis CommitDate: 2024-12-09 17:25:36 +0000 mandoc: drop 3p section The 3p is an OpenBSD thing and this list of sections is otherwise entierly customized to FreeBSD. Reviewed by: imp, bapt Differential Revision: https://reviews.freebsd.org/D47948 --- contrib/mandoc/msec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/mandoc/msec.in b/contrib/mandoc/msec.in index fc198202fbf1..1d7518a5e43d 100644 --- a/contrib/mandoc/msec.in +++ b/contrib/mandoc/msec.in @@ -26,7 +26,6 @@ LINE("1", "FreeBSD General Commands Manual") LINE("2", "FreeBSD System Calls Manual") LINE("3", "FreeBSD Library Functions Manual") LINE("3lua", "Lua Library Functions Manual") -LINE("3p", "Perl Library Functions Manual") LINE("4", "FreeBSD Kernel Interfaces Manual") LINE("5", "FreeBSD File Formats Manual") LINE("6", "FreeBSD Games Manual") From nobody Mon Dec 9 19:22:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6Wwv0Nd5z5gh5S for ; Mon, 09 Dec 2024 19:23:11 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6Wwt4W2Tz42Rp for ; Mon, 9 Dec 2024 19:23:10 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-37ed3bd6114so2030595f8f.2 for ; Mon, 09 Dec 2024 11:23:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733772189; x=1734376989; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/trqQltnxaFmieXyrCpU3ggCuBHAzyvWY0HquB88V/E=; b=I6xWL0/bhsN0yM9kJojrlxjn9jucZjavKsWsn4N/RjtXX2Ffn3ESOquQTwUO4ooeyj Dn+tqebvVcXz6EUQXs5yaJBNDubHfSjeql+DM0GazftRAxasHULsxOdtJCtw/xKNf1TR T4UgEqqs7rFCuW3JdM/afnnYeBBj8YtWFh0SIKCUK4Bp2SWs/dMaTzduf4xR7SlbBGFN A1aPk9Jx057KUBEskGu7ZPF7Jzdo/XsbroPMY8+SqTjnI1UNJwrHKLj1FApwktBWXlMs 4fd32sUNj+Uh8cPhSso95Izx9/8su2F3uARcnMSDqV+lmTam44aOF7Sz7crxKXcasIOK dwzQ== X-Forwarded-Encrypted: i=1; AJvYcCXhdPpyYx7ilzykshVD75KqNM9jldB3N47BfED4yNfJbCQiZ44HlwdldgdCLNYvMWHpalWQ2wXjxHxygxkNOjnNHY0NAw==@freebsd.org X-Gm-Message-State: AOJu0Yyycrr+6F+lp60S5GtiIiks9jhGuGgyY/XR4bC8M2DF1qa2N0J1 RVxDihNp4BAZw49Q0NuplFRsNsTrrUAkkMYtc2mtvSgMtqpJrLWdSAcVPAA5fDs= X-Gm-Gg: ASbGncuKkugMJ6b5ONjvSxeLkj92mRJU5qC9rF/TIgbf/Rn6s3glwL/vK5JkW8TtKw8 CkUcnUT7LW4eF7A5jCrfOK7ftKtC+hDXNLKHxj8d68lgwdmy5IxyZGeyGyW1k2QIZ4C49RH8QWG +jEYFS/NcdQ+P0XHlYCLBN+OMyfOnLHjZ3wI3sa8IV1gZ5aw7Q17R9vzRrf0W78gmsQtsLHyUVR vq+qqxnRP1wplCCXoJN+IW//8rhGD3SGOlwqMDcXSwR8DO+3YRIkxU/RvlGGPgD X-Google-Smtp-Source: AGHT+IEuMTWONBjsYG1bzTWhye4LeQv1ijKw3Ke6mUJj6s1oEU8hoqO3Xdt+Kwnyx2wJJfnEdx4pyQ== X-Received: by 2002:a05:6000:1fa5:b0:385:e38f:8cc with SMTP id ffacd0b85a97d-386453f691emr1345679f8f.38.1733772188611; Mon, 09 Dec 2024 11:23:08 -0800 (PST) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38621fbbdd8sm13882239f8f.95.2024.12.09.11.23.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Dec 2024 11:23:08 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.200.121\)) Subject: Re: git: 87e140a5c6f8 - main - iwlwifi: avoid (hard) hang on loading module From: Jessica Clarke In-Reply-To: <202412091447.4B9ElFBH050286@gitrepo.freebsd.org> Date: Mon, 9 Dec 2024 19:22:57 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <6F9C2C43-A3DD-4CF5-AC27-899FE139E9A6@freebsd.org> References: <202412091447.4B9ElFBH050286@gitrepo.freebsd.org> To: "Bjoern A. Zeeb" X-Mailer: Apple Mail (2.3826.200.121) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Y6Wwt4W2Tz42Rp X-Spamd-Bar: ---- On 9 Dec 2024, at 14:47, Bjoern A. Zeeb wrote: >=20 > The branch main has been updated by bz: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D87e140a5c6f89eea7ea6320d1ae34566= 492abfc0 >=20 > commit 87e140a5c6f89eea7ea6320d1ae34566492abfc0 > Author: Bjoern A. Zeeb > AuthorDate: 2024-12-08 20:24:10 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2024-12-09 14:45:24 +0000 >=20 > iwlwifi: avoid (hard) hang on loading module >=20 > For certain users or chipsets (reports were for CNVi devices but > we are not sure if this is limited or specific to them) loading > if_iwlwifi hangs. >=20 > The reason for this is that a SYSINIT (module_load_order()) has not > yet run in this case and the Linux driver tries to load the > chipsets-specific module. On FreeBSD all supported sub-modules are > part of if_iwlwifi so we do not have to load them separately but > calling into kern_kldload via LinuxKPI request_module while loading > the module gives us a hard hang. >=20 > iwlwifi calls request_module_nowait() so we can simply skip over = this > and continue and the SYSINIT will do the job later if no other > dependencies fail. >=20 > Sponsored by: The FreeBSD Foundation > MFC after: 3 days > PR: 282789 > Tested by: Ruslan Makhmatkhanov, Pete Wright > Differential Revision: https://reviews.freebsd.org/D47994 > --- > sys/contrib/dev/iwlwifi/iwl-drv.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) >=20 > diff --git a/sys/contrib/dev/iwlwifi/iwl-drv.c = b/sys/contrib/dev/iwlwifi/iwl-drv.c > index 7f4746e5591e..61e5c064de80 100644 > --- a/sys/contrib/dev/iwlwifi/iwl-drv.c > +++ b/sys/contrib/dev/iwlwifi/iwl-drv.c > @@ -1749,7 +1749,20 @@ static void iwl_req_fw_callback(const struct = firmware *ucode_raw, void *context) > goto out_unbind; > } > } else { > +#if defined(__linux__) > request_module_nowait("%s", op->name); > +#elif defined(__FreeBSD__) > + /* > + * In FreeBSD if_iwlwifi contains all drv modules in a single > + * module. SYSINIT will do the job later. We cannot call > + * into kern_kldload() while being called from kern_kldload(): > + * LinuxKPI request_module[_nowait] will hang hard. > + * Given this is request_module_nowait() we can simply skip it. > + */ > + if (bootverbose) > + printf("%s: module '%s' not yet available; will be" > + "initialized in a moment\n", __func__, op->name); Missing a space in the string. Also, why not just have request_module_nowait itself defer the load until it can be done, at which point it can notice that there=E2=80=99s = nothing to do? Jess > +#endif > } > mutex_unlock(&iwlwifi_opmode_table_mtx); >=20 From nobody Mon Dec 9 19:45:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6XQS0X2lz5ghvl; Mon, 09 Dec 2024 19:45: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 4Y6XQS00DVz44P7; Mon, 9 Dec 2024 19:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733773520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hpvqOedn8wu42Bkm5DRVoosyXFUX4QcYvtAQ3QhRBIg=; b=OiOZclX16RFgHGwoqbjlReJrSffsjgldtl4nA93nKPuVfqE7hlE8kGyGn99B/BJrvMtORq 6tAd6dypxG8j5BKna8y3MROR8nqHxJ1Z2nBHqbFom1+aUOI7qx6l1Ttwf8E1bpTbLC4p7B CaFpmfqm+98JICtdlOcTlBwutGGCVRU3IEN3yAaf0oKxqzjg+RQsJHlhC4DFFVZ1xHbHIl X+AQgOWefSWb2ABBfmxPijypK/UpUQO/V9Oo6dbZOT+f+b4g3Plv3DfXfFGXQ7ZA95wsGF jN8s2ALsJ6WXh7FgV/TCDGpYxQLD18RVfnlwgFBu7OJ+KBGLVjXQe0UiwoLAGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733773520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hpvqOedn8wu42Bkm5DRVoosyXFUX4QcYvtAQ3QhRBIg=; b=SelYICUzu3qB5LtwVQ+F4nOjOJPwMzdmFvoFFJqHlZRRvgN05qWadK5xxh+CgtZOmfMxKV ABZB4YWnMmYrwvd9iMD2ytaJwIezneYEXPHvZMQNjzNjKBZoCbG8oX/PEmGxTLpKScSLmr wwjKz9YQrq+fhNRynu14PlZ0JwOK5x1MuslMvMlg2jnqokXeICvdLG5aVRKbGk6dzUm0B7 uao3B89KK/rY5iVjDW9SCqhIxTaW7m0e/DN0cywCSEMDfFPcwLTtI/2yYwY3VF6OUTi39a 392/H404vAqxjuV9Cw+CkFo8cMMHvVoBA76/SoVep+ZkJtKEl22K/ednQLSbxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733773520; a=rsa-sha256; cv=none; b=jYbXQlHj3a4YIwDCBhxoDddYbetDBsrG6R+ZVaeRLhGP72buqg8kLFEGIBAehAbfIi0LEm cY6f/Ibu2dYgKZx5KjH2+OO+I7+3k3mLMXc/W2uSprUBpXQ5vuFxthNc6rI6XLWHE8hUEa zABHihfMaVLKIhilWsbF36axWBxlTZfa5ytLNtdEALmTvdpuJsp5xxGz4NwWBMCNH1QkcR AzxlrwJ5gABTPJsLrHYs5aPkNLD5jgY+gNxKPh/+L7NEpambtFm7EkFnQBxdm+OJNXg7c9 KbKC2F4hdQnkIIl7NYFlp8/JOy5vpKvBaUg1noDIVHdzIh6QX6CYEBPbCat5JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6XQR6QkQzqy3; Mon, 9 Dec 2024 19:45: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 4B9JjJlQ009429; Mon, 9 Dec 2024 19:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9JjJZj009426; Mon, 9 Dec 2024 19:45:19 GMT (envelope-from git) Date: Mon, 9 Dec 2024 19:45:19 GMT Message-Id: <202412091945.4B9JjJZj009426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b93791f5e7b0 - main - uniq: Correctly document the -D option. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b93791f5e7b0246b121dd98c10d6563298d6b2b0 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b93791f5e7b0246b121dd98c10d6563298d6b2b0 commit b93791f5e7b0246b121dd98c10d6563298d6b2b0 Author: Dag-Erling Smørgrav AuthorDate: 2024-12-09 19:44:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-12-09 19:44:34 +0000 uniq: Correctly document the -D option. The -D option takes an optional argument; modify the usage message and the manual page's synopsis to correctly reflect this. Also update the tests to exercise -D with and without an argument. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D47999 --- usr.bin/uniq/tests/uniq_test.sh | 13 +++++++++++++ usr.bin/uniq/uniq.1 | 6 +++--- usr.bin/uniq/uniq.c | 4 ++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/usr.bin/uniq/tests/uniq_test.sh b/usr.bin/uniq/tests/uniq_test.sh index 9d37245dee4e..fa37c1959a77 100755 --- a/usr.bin/uniq/tests/uniq_test.sh +++ b/usr.bin/uniq/tests/uniq_test.sh @@ -53,7 +53,12 @@ count_repeated_head() { count_repeated_body() { printf "a\na\nb\nb\na\n" >input printf " 2 a\n 2 b\n" >expected + atf_check_uniq -cd + atf_check_uniq -c -d + atf_check_uniq -dc + atf_check_uniq -d -c atf_check_uniq --count --repeated + atf_check_uniq --repeated --count } atf_test_case all_repeated @@ -64,7 +69,15 @@ all_repeated_body() { printf "a\na\nb\na\na\n" >input printf "a\na\na\na\n" >expected atf_check_uniq -D + atf_check_uniq -Dnone atf_check_uniq --all-repeated + atf_check_uniq --all-repeated=none + printf "\na\na\n\na\na\n" >expected + atf_check_uniq -Dprepend + atf_check_uniq --all-repeated=prepend + printf "a\na\n\na\na\n" >expected + atf_check_uniq -Dseparate + atf_check_uniq --all-repeated=separate } atf_test_case skip_fields diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1 index 30dee856d772..0918420e2229 100644 --- a/usr.bin/uniq/uniq.1 +++ b/usr.bin/uniq/uniq.1 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 12, 2024 +.Dd December 9, 2024 .Dt UNIQ 1 .Os .Sh NAME @@ -36,8 +36,8 @@ .Nd report or filter out repeated lines in a file .Sh SYNOPSIS .Nm -.Op Fl c | Fl d | Fl D | Fl u -.Op Fl i +.Op Fl cdiu +.Op Fl D Ns Op Ar septype .Op Fl f Ar num .Op Fl s Ar chars .Oo diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index 9978c4996dc7..1c022e633cf3 100644 --- a/usr.bin/uniq/uniq.c +++ b/usr.bin/uniq/uniq.c @@ -366,7 +366,7 @@ obsolete(char *argv[]) static void usage(void) { - (void)fprintf(stderr, -"usage: uniq [-c | -d | -D | -u] [-i] [-f fields] [-s chars] [input [output]]\n"); + (void)fprintf(stderr, "usage: uniq [-cdiu] [-D[septype]] " + "[-f fields] [-s chars] [input [output]]\n"); exit(1); } From nobody Mon Dec 9 19:45:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6XQT1ddPz5gjVv; Mon, 09 Dec 2024 19:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6XQT10jkz44PB; Mon, 9 Dec 2024 19:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733773521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k3n0zvOcz2SxE3f18lxHvlv8wJaeYrfdx9HZRYt/H4M=; b=Niq7Xfsyz9e8qixbPefNudB1vYA2ameBSPGeITFdy859JC+UtQbITguxguXOkDGbsQt4w/ tVRFFiginL3Gd/2V6jAdI1OffefhqWJCbehxsookL2GbFXTccZTDa4t7B1nQcf6ENeErok tsZDX59MS/uRtuo9xfS9fl1PY3yIzN/dfDWjwc70a+RnXTqH8I3b6N3DLrIGgNC5jgEAeC xfLX/+b6pP8gcI3E9ohOr009uKeFDFNxQI5KSJo8NselE0y7Z4IIFHGCkpSsEqyluo1Fjs Ydcr9INAJ78660CX2sVN8ANDiRKyiqlUA1P3Bd5RcIZQ+Unlv6RMw0wKNCJ/bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733773521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k3n0zvOcz2SxE3f18lxHvlv8wJaeYrfdx9HZRYt/H4M=; b=I/8AuKI81tAJKl1iiutVTKvlDk6wdmExTM6zrg/naPvyN+jLkGX3ZvOoeHIWems4GNEkN2 YO7N/aSsvPij0HTBTkgbyHtCOsogb10/4+5noNldJnBCBsOfPGVDnVIHgREAJSqjiI0tq3 tJtUZJohn8SEFemui9pv9FIlap3OdgPaITE7aI07MNCTYzTomVHTl06iSwOKjICbwZwrmj VR3p9lWYOBAAjWTNVX3n51YXjttsj0SEUXwPMCwasRwc/4KZsAiphQneiq7leactOSTIDm bmsW3O5qC3lPMcs7/kWU3PP0qic8ogiV8w8Wq02eyU1h9ESZYQMqdugsHf6P2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733773521; a=rsa-sha256; cv=none; b=lo1ADNI4IQt6dWFoGx568T0rFZi/o1xt2TDvii1iEUyRBQK9KuX2GAA0xVRY33oB92Vb5F FF+9saFrN5qaS2aCs0n8Z5kMQFg81xcbEyF/gf8lcEfH4XMEZvARLPBY/i3BwxkWBC224r 6+0Q2MYLP0f8o4r9NjUgnoxO7WAuV+YJ6q+E0MR/iM6mfsdX+fLx4eeDz/N6Epl+VZZbCn 9ZMOIjBQ3bBZdfzpbHMm1AF9COexnRFPDsY4fubdAI+70PpmDpdQLfFhbyX7+A5gGOVrZJ TBhYvKdCi41+5Y8svkNm+ANPM7kXBSTi7fiofkJd/oqvq61+OK9Ti/jhdTzvoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6XQT0bDBzrs6; Mon, 9 Dec 2024 19:45: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 4B9JjKgP009484; Mon, 9 Dec 2024 19:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9JjKDi009481; Mon, 9 Dec 2024 19:45:20 GMT (envelope-from git) Date: Mon, 9 Dec 2024 19:45:20 GMT Message-Id: <202412091945.4B9JjKDi009481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c3f8900e6969 - main - uniq: Fix off-by-one bug in -cD case. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3f8900e696998c410dc16f9bd9d45c24c413e6b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c3f8900e696998c410dc16f9bd9d45c24c413e6b commit c3f8900e696998c410dc16f9bd9d45c24c413e6b Author: Dag-Erling Smørgrav AuthorDate: 2024-12-09 19:44:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-12-09 19:44:46 +0000 uniq: Fix off-by-one bug in -cD case. When printing only duplicated lines, the first line of each set is not printed until we encounter the second. When that happens, we need to increment the repetition count between printing the first and the second line, so that if we are also printing counts, we don't print the same (pre-increment) count twice. MFC after: 1 week PR: 275764 Reported by: Yu-Sheng Ma Submitted by: Daniel Tameling (original patch) Sponsored by: Klara, Inc. Reviewed by: tamelingdaniel_gmail.com, asomers, emaste Differential Revision: https://reviews.freebsd.org/D48000 --- usr.bin/uniq/tests/uniq_test.sh | 20 ++++++++++++++++++++ usr.bin/uniq/uniq.c | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/usr.bin/uniq/tests/uniq_test.sh b/usr.bin/uniq/tests/uniq_test.sh index fa37c1959a77..fc143632bdd2 100755 --- a/usr.bin/uniq/tests/uniq_test.sh +++ b/usr.bin/uniq/tests/uniq_test.sh @@ -80,6 +80,25 @@ all_repeated_body() { atf_check_uniq --all-repeated=separate } +atf_test_case count_all_repeated +count_all_repeated_head() { + atf_set descr "count and print every instance of repeated lines" +} +count_all_repeated_body() { + printf "a\na\nb\na\na\n" >input + printf " 1 a\n 2 a\n 1 a\n 2 a\n" >expected + atf_check_uniq -D -c + atf_check_uniq -Dnone -c + atf_check_uniq -cD + atf_check_uniq -cDnone + atf_check_uniq -c -D + atf_check_uniq -c -Dnone + atf_check_uniq --all-repeated --count + atf_check_uniq --all-repeated=none --count + atf_check_uniq --count --all-repeated + atf_check_uniq --count --all-repeated=none +} + atf_test_case skip_fields skip_fields_head() { atf_set descr "skip fields" @@ -196,6 +215,7 @@ atf_init_test_cases() atf_add_test_case repeated atf_add_test_case count_repeated atf_add_test_case all_repeated + atf_add_test_case count_all_repeated atf_add_test_case skip_fields atf_add_test_case skip_fields_tab atf_add_test_case ignore_case diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index 1c022e633cf3..0650ec2e2137 100644 --- a/usr.bin/uniq/uniq.c +++ b/usr.bin/uniq/uniq.c @@ -225,12 +225,13 @@ main (int argc, char *argv[]) fputc('\n', ofp); show(ofp, prevline); } - show(ofp, thisline); } else if (dflag && !cflag) { if (repeats == 0) show(ofp, prevline); } ++repeats; + if (Dflag) + show(ofp, thisline); } } if (ferror(ifp)) From nobody Mon Dec 9 21:55:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6bK65wxfz5grM3; Mon, 09 Dec 2024 21:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6bK6531tz4KDp; Mon, 9 Dec 2024 21:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733781354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePwT8idOdhPr9Sa/ngTU61wUWB8djTIRu4hbX6MKS/c=; b=VdiJomIZx/cA/FsKRugpoeRKZRGyT/Zdx0Ds33qvgKHav51yZGDyIfTYk7CT36JCqs7x78 FZsw/d7Ss/qzTFe2nhCcW0P77XgxFd9sjSrd959SDu7BHTXzNd/G1lyk1t3UCh3mEz4C88 vYOFS/G1bxKN2JzFxhV6cl8EyBxQ3Wp2CTWB0SZj5IDeBiQExUHJOB71bGzQ0QtUVzEXE8 XRZ/9s1CiS4QU8r58mbI9vT/LrJrtnU46H3aLvwq4ha9wLQ6ArrwFq0HiLt/OQcjG8l4n6 eruuOL+aVnyrrkwTw3nsJx9XFEmCFXYfAbAbLiCsZKSlApuTMgfgI7B/rRGyeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733781354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePwT8idOdhPr9Sa/ngTU61wUWB8djTIRu4hbX6MKS/c=; b=NiB8VNNMmlgxVgCl7FZXE6jxYvt8Ecj9wk6fwyMCPhRKMwPm2Lq7xrwHhAvwqqpHF6Zm3W paq7GIOPYuF8EX3MgrXdezb2Rxzb/oxRQ+PcWWkJJZgSvkv6hSAIluCXtm5BUnZ+FeJWCC yo8BedZZbHsc9b088k1uiGG1aBaO7293smkpGK2nto2W26JVI7IMV6Fq56inPbKjJjDnMs kalB5bZcazYz0WIG4PSkqNZKItBaN7HTgXreZdn9VkOR7BI8fFVCzhI4ScJNiGajItt4xt pxROuUdyMtL81gCdJ1u166PtovFwIDEDW7U1+tI8yb9aYCYMDVZo3iaOeY5lEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733781354; a=rsa-sha256; cv=none; b=Hkg8CU0xg8GyueXO/XshBvP5q6H7o9O9eR/Ncs7pmI44KW7FvG0GT0HIi0SaiolsaNzOGD Wx7WmRjI/ngjWQHkdLABpBSi+sIIiaroCekqBhF9zGMSNvr14Mi9oMLSpgtFT8gIHFZumh OZKhmoPopy2VNEuj35w8RQzf7G92Q6mUxpxal9lovFPJoK2jKvwiD048VBWxAjQ6INo43S aDGwhmGLx39bxh9MU1cbhFSfXcaxZjzBXIpngFVnI/L8UDDldfgypwokvlGOGwydPNxmia 5S/Q+Skbz38Jj3Tm9mi85kn9efFuymoPL36SeQVjZh1Mv+9399+T4TrfwArt0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6bK63xpDzvVv; Mon, 9 Dec 2024 21:55:54 +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 4B9Ltsu6052214; Mon, 9 Dec 2024 21:55:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Ltscn052211; Mon, 9 Dec 2024 21:55:54 GMT (envelope-from git) Date: Mon, 9 Dec 2024 21:55:54 GMT Message-Id: <202412092155.4B9Ltscn052211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: f8c90b704189 - main - gic_v3: Correctly handle GICC GIGR Base Address case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8c90b704189c94275d22d7cc204d1d74e821d86 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f8c90b704189c94275d22d7cc204d1d74e821d86 commit f8c90b704189c94275d22d7cc204d1d74e821d86 Author: Jessica Clarke AuthorDate: 2024-12-09 21:55:06 +0000 Commit: Jessica Clarke CommitDate: 2024-12-09 21:55:06 +0000 gic_v3: Correctly handle GICC GIGR Base Address case When using the GICR Base Address field from each GICC structure instead of GICR structures, the field gives the address of a single redistributor page. However, that does not mean that they are not contiguous, and so GICR_TYPER.Last could be clear on them. Thus we must ignore GICR_TYPER.Last in this case and always treat each region as having a single page. Normally we'd do that as a result of checking against the rman's size (though that's a rather roundabout and iffy way of achieving it), but for whatever reason this is bigger on the Qualcomm Snapdragon X Elite (I assume the MADT reports GICv4 but TYPER doesn't report VLPIS and so there is a mismatch between the rman size and the stride used) and we end up walking off the region's mapping. Reviewed by: andrew, phk MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47560 --- sys/arm64/arm64/gic_v3.c | 2 +- sys/arm64/arm64/gic_v3_acpi.c | 1 + sys/arm64/arm64/gic_v3_var.h | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index 964a129111e2..201cdae6de09 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -1434,7 +1434,7 @@ gic_v3_redist_find(struct gic_v3_softc *sc) (GICR_VLPI_BASE_SIZE + GICR_RESERVED_SIZE); } } while (offset < rman_get_size(r_res) && - (typer & GICR_TYPER_LAST) == 0); + !sc->gic_redists.single && (typer & GICR_TYPER_LAST) == 0); } device_printf(sc->dev, "No Re-Distributor found for CPU%u\n", cpuid); diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c index 44c55cf5bbf2..7c3495fd442b 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -300,6 +300,7 @@ gic_v3_acpi_count_regions(device_t dev) acpi_walk_subtables(madt + 1, (char *)madt + madt->Header.Length, madt_count_gicc_redistrib, sc); + sc->gic_redists.single = true; } acpi_unmap_table(madt); diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 1c5d354ee217..8bc0f456d91e 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -53,6 +53,12 @@ struct gic_redists { struct resource ** regions; /* Number of Re-Distributor regions */ u_int nregions; + /* + * Whether to treat each region as a single Re-Distributor page or a + * series of contiguous pages (i.e. from each ACPI MADT GICC's GICR + * Base Address field) + */ + bool single; /* Per-CPU Re-Distributor data */ struct redist_pcpu *pcpu; }; From nobody Tue Dec 10 00:05:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6fBb32pTz5gyRC; Tue, 10 Dec 2024 00:05: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 4Y6fBb2Kg0z4XQp; Tue, 10 Dec 2024 00:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733789127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qx9RUVNhJruYH1l0Z75yTKFPE9M9u01Hd9lcJhn3WrQ=; b=dIcs/FnPH66jspOFIpmueQBoLcpBbadTULZCI55v0OnjPBvPaxx1NlN533ozDB00O5hv6Z 4XMp1wlJg27cqfmmMdhFQGJLKB+InN51owmY3SE1vrMRObmQJ48FxaCTY+Hy1+ptubOrjc oe1F2EVfdlcXFJxs+V7RuGkn7rmDiq2+QClmk5IgM5v0tGs3Mc0TYRuOmgRmJloMgJvTln g23Z5/AshiN0KaEPK684tf6FSNaNdCIRQ5M8gpdKxdoR5GcmZWN6SwxvMOGBB+xSGOJesi elEeIncLjFz+dOE6o0IIreZJZlQ0ZTQXqmcSXZHODv1GP+eu9q3LKGf+P6NNvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733789127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qx9RUVNhJruYH1l0Z75yTKFPE9M9u01Hd9lcJhn3WrQ=; b=gTjE7KcZZD4aXw7wAGpUoYbo0jrSS2xdPb35t5AnVRa6qQosrVWu2FxZzEfq948xdK1sLB NCoM6aqzBgwzgTNPLFg4atO5nQOpoeh8wUwkMuxHP8FTTEMIIOfy6YLPDLQVzMXntGtXt5 cI3ryg4hit5hAF9VfjO6adU2GLOoFH5GBGhJE2/8Bwc2ydLoBo2kPPsXb3FocdpTxkQ1Ux gCW9TOeIeSiF9RujdKvuXhdNfmL4iPb23EyRU+kbeXgipP1r5LiJyzQai1KzWb7xMvPFfx kkez0UHvmTukXgqwWDRQrkSnkeZYbjFV9eSmsGILUUyVh39pmfiJdZHnCxzwcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733789127; a=rsa-sha256; cv=none; b=iqZQyjzzJC/zwY3JbzvDiWMUAdVnQ2McCS5yvVMPW2mWLOIQtf97fyLmmCni4bp6x9zRCp 79j1OW731OcANyiuyr6CiwClxrclftvNPh8UgBavyEMYGT+99hEFUUP7WliPRnS5DgVulc okx3MZ0gP9VqxxyFfJPid3E58L9xbC87zfz1xvwm15BHNsSwKD8iaEfY69FSx+F4vtCqDw q+L1masaK87hLszaZYs2iTuLQYW4iMs2EcHd7aMYFMpJ6a0BtH5TX9L9hPLZ3KjFb90C3e O5iU9v7K2YE4UP5j/Sz5yxY3stndNsTqlXWHKlk6RXpqi21JrbMdpESxCw+atg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6fBb1w8bz10HC; Tue, 10 Dec 2024 00:05: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 4BA05Rs0093564; Tue, 10 Dec 2024 00:05:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BA05Rxv093561; Tue, 10 Dec 2024 00:05:27 GMT (envelope-from git) Date: Tue, 10 Dec 2024 00:05:27 GMT Message-Id: <202412100005.4BA05Rxv093561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 944f45b8094c - main - Cirrus-CI: Add manual LLVM 19 jobs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 944f45b8094ce70eef14d07afc333250ad063a49 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=944f45b8094ce70eef14d07afc333250ad063a49 commit 944f45b8094ce70eef14d07afc333250ad063a49 Author: Ed Maste AuthorDate: 2024-12-09 21:27:01 +0000 Commit: Ed Maste CommitDate: 2024-12-10 00:04:32 +0000 Cirrus-CI: Add manual LLVM 19 jobs The base system compiler is now Clang/LLVM 19. Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 45c31c9f07b2..62766904de2b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -37,6 +37,14 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: llvm18 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite + - name: amd64-llvm19 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: amd64 + TARGET_ARCH: amd64 + TOOLCHAIN: llvm19 + TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: arm64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual @@ -61,6 +69,14 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: llvm18 TOOLCHAIN_PKG: ${TOOLCHAIN} + - name: arm64-llvm19 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + TOOLCHAIN: llvm19 + TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual From nobody Tue Dec 10 01:55:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6hdM5MY7z5h5NH; Tue, 10 Dec 2024 01:55:19 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6hdM4QB3z4jvN; Tue, 10 Dec 2024 01:55:19 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733795719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9UutusI8e7usStpz2dgq5NrF4F4bmjN95T0mtzH6Jqg=; b=PBeFu60PBxuWk5N/h1TD9vzVk90PNt8pN6SVFbUas8Zo2ZEg16lDZcxEPiYe1dPwAwEcK0 TkjBtDW3Olv3sqwzzul0Wez3PdAkkxTP8hq9oWkUy/rJ7SBe/1+gBx4xSZJeTT4kvP9Qog OwIi/RkwNaGuSuWAzPd2tCfAv1JQcZuh65zaFNp2eDq54ehE8HMiggs99mH4VBLM4QBBlp TyAjnyJ6SauIzv20mF6Siz0iaVlQbbF0ijS0ws9pCsW8GB/NYhWmKlrhAW0ww3ugk0lzYG RhiMp75IJd1Ci+I4MQM+ct8ypG4iEiDcVWQsXAgkKHVyxQ10K0osXTEfdW8cTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733795719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9UutusI8e7usStpz2dgq5NrF4F4bmjN95T0mtzH6Jqg=; b=T5t1oCNAEm6RBIMvWn7fm+PoFwrNdn685v/gK7ubE+yP8QQ2UxEv5Gd5O9zg8HfjRcy8XP V+4fNrdXdMJj813PtRdpE07tccXFHVRiW5KkS2Oz9GMWne+mqUhrxYtcBVmMADwi50D02B zhkHkPYqL0f+XFqHnvzvHu307E9SDsA4uh/pB0L5XolhNjxK+MQzMM3nGJ7VwG73AxBVPt JPejPOdw2nIK97KKFNHRC8qThSiMlt8bDHqePKrV6wa1X6PPkhf4NzoXf9xc5YnWWsTz7R 1vsAy7vyDT3Q4sfgpYfQ3EJMmbhTQ96gPCPp6StCIaMsJcrrZAIh+6IKTM4Muw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733795719; a=rsa-sha256; cv=none; b=g3jwneTUJ/vbm6Zw+KRG6+i+8bUDj9KiWBFoxHhiAm/F9//YoAbVGpH3KtkVlfQkWVDqH0 1NZbB5fhZZMgjHZ8GvBlgZf4ZfeLjOHyTWNifSTUYh0ZaAoCve7AOiWz12cY3dOnwqBf1i BvRfz5I/yud/xhXcBd+8ohQa9ZqYZeOzqBS9zxy26/VtWf+L0DkLLokYQbudYjswSMVp7l KVAyb6NsL0YjjJ/eaIH3HHmnwjwyHiO40xvRXZTDmU2aG3iBCvBzVntd6jZ+e095qd5/7H 7FXCR6JgQN7aJe6G8xq2QQeb/gae2N3QIRPaLgrqXGbYNE8ZFf11jBDTMCMsOQ== Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-256) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E6" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Y6hdM33zhz11XF; Tue, 10 Dec 2024 01:55:19 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 5E4A4A64805; Tue, 10 Dec 2024 01:55:11 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 9FFF72D029DC; Tue, 10 Dec 2024 01:55:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 08PL9OtZPdZf; Tue, 10 Dec 2024 01:55:16 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 65A712D029D8; Tue, 10 Dec 2024 01:55:16 +0000 (UTC) Date: Tue, 10 Dec 2024 01:55:15 +0000 (UTC) From: "Bjoern A. Zeeb" To: Jessica Clarke cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 87e140a5c6f8 - main - iwlwifi: avoid (hard) hang on loading module In-Reply-To: <6F9C2C43-A3DD-4CF5-AC27-899FE139E9A6@freebsd.org> Message-ID: <0883q825-802q-2n9q-3s4o-3nq13qpqno71@SerrOFQ.bet> References: <202412091447.4B9ElFBH050286@gitrepo.freebsd.org> <6F9C2C43-A3DD-4CF5-AC27-899FE139E9A6@freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1098556516-515570521-1733795716=:2228" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-515570521-1733795716=:2228 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Mon, 9 Dec 2024, Jessica Clarke wrote: > On 9 Dec 2024, at 14:47, Bjoern A. Zeeb wrote: >> >> The branch main has been updated by bz: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=87e140a5c6f89eea7ea6320d1ae34566492abfc0 >> + if (bootverbose) >> + printf("%s: module '%s' not yet available; will be" >> + "initialized in a moment\n", __func__, op->name); > > Missing a space in the string. Thanks; I'll add that. > Also, why not just have request_module_nowait itself defer the load > until it can be done, at which point it can notice that there’s nothing > to do? Because it's tricky and the (simple) request_module() in LinuxKPI pre-dates me. I think our users currently are a lot happier having working WiFi (or a non-hanging kernel) than to wait some more time. And frankly it's the only place in WiFi this is used and we do not need it, so I'd rather focus on other user-facing problems. /bz -- Bjoern A. Zeeb r15:7 --1098556516-515570521-1733795716=:2228-- From nobody Tue Dec 10 02:39:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6jby5QhMz5h7YQ; Tue, 10 Dec 2024 02:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6jby4WL4z4mRM; Tue, 10 Dec 2024 02:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733798350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vdtc/SR9qpXsZW1UKb1b7ar79PtVCuGUju5kvrd+vXU=; b=NYjyorR590nP53FACOOO2Cb1IR7c/h2/K9Jmx8KrZKnPENcmtOdTCioI7QWAivk9+ZBUjc FZcgY4iWN4MSJ/saoV3z24jFbImJ94daROSY9vQ084zjZy4xX8T6iWT7qoNL0UgTlSByBU /EwXHQGiWM6me5pqFJe1m2z0LfW7COZjllvDXYfJBvELP83wD7GhypdGngNkuWB2TD6uEf YwEx27IwBnv4pB0q6kVPn6fJTxtJGgKIf+QwGEPRiGqz97qA7jvtnfChytNDjIxKxkg08R bYxp92ZFVF4d90v6VO6xUV5trZy0NSmGGc0blpHpU60G/ou+DGDo2ucwvr+5zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733798350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vdtc/SR9qpXsZW1UKb1b7ar79PtVCuGUju5kvrd+vXU=; b=DKO7tupXP1W9cS6HmGaQU7YTwq8l7Ahcf28lg+wSyfMoR8X7dg6+oYOds9XjVrfwhO4Tt7 lOJ0Ev2bXfGlCN0p0GUJjx7Oq4UR5kFBrR5H/BvSwV+1/BTk4aYIaMMaIR5GcmWUfhWO96 yqelbFrDI3NJYDP+W6eSZqbxu4H9bcvKB38XSZKOjBDMar1jaPCinbfYPcdzPjNxFcRjhc dlJxNByqNYWD1aFjteGga7l6Ce0P69PQODo5ym0P+NuRL5DW0HX7clJDm1F896+87JXAaW lIRf9FU1kPP4Vzl+OlZLDHSJ7HTROoUb3btrVE95gn2EaVq4gaMSubIrX8VrKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733798350; a=rsa-sha256; cv=none; b=Vj1MuqUBWgOvDB6nfY3ghyWqF8Wr1DgCjJB5Ycr+0NwbRbUNxYLwRY8D/4X8nqm9JhT9yN urHe0FILupBHVzFTDIE9ZpAbr+vRLf5K/G1s4rGAWyBCyqvxw5WNmtTDPpRF9XfUzn5ujT B09wCiuxwt1ATD6NZQmG2ExS7wVuRqUIgytaPLN5eLqt8f/h0nNwebDc646lBzd+qPKgHo ZKzir6ADsO/UworV7ARU7jZAUBnR8kBOZz7TKt33dbnhG8MPJTX1oy7m8+DcwRqwyLBx8K JR94hh2myi6kTHWYTVROibLOPV2p/e9ziv4FPgEx2Nh1Lipiu6jJvU3+t1Twlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6jby46tcz14G0; Tue, 10 Dec 2024 02:39:10 +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 4BA2dAH2073342; Tue, 10 Dec 2024 02:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BA2dAHp073339; Tue, 10 Dec 2024 02:39:10 GMT (envelope-from git) Date: Tue, 10 Dec 2024 02:39:10 GMT Message-Id: <202412100239.4BA2dAHp073339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8cee8527d09f - main - vm_map(9): grammar corrections List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cee8527d09f47e503264dbe2a02506aa24de8b9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8cee8527d09f47e503264dbe2a02506aa24de8b9 commit 8cee8527d09f47e503264dbe2a02506aa24de8b9 Author: Konstantin Belousov AuthorDate: 2024-12-10 02:38:23 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-10 02:38:23 +0000 vm_map(9): grammar corrections Noted by: alc Sponsored by: The FreeBSD Foundation --- share/man/man9/vm_map.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/vm_map.9 b/share/man/man9/vm_map.9 index 39242dd6b2b8..9f41a24541b1 100644 --- a/share/man/man9/vm_map.9 +++ b/share/man/man9/vm_map.9 @@ -104,7 +104,7 @@ There are waiters for the map busy status. Indicates if a thread is waiting for an allocation within the map. Used only by system maps. .It Va MAP_SYSTEM_MAP -If set, ndicates that map is a system map; otherwise, it belongs +If set, indicates that the map is the system map; otherwise, it belongs to a user process. .El .Pp From nobody Tue Dec 10 08:23:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6sDh5zcfz5fnQC; Tue, 10 Dec 2024 08:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6sDh4N5Pz41Hq; Tue, 10 Dec 2024 08:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733818980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxGjA+cr04N8LZtUtuAtyz827fHJa4ydCLd5cqTOQtI=; b=KDPNrP+0QKPjnqQihfn2uRgc9r9W0x0NtBqoEMhiKW1+SPupgcapPMo8QazRONrR4Vh1f+ KJl0ECCQB91ibOZQVA7UR7JqzvMAI7g4EwD0ZWGlSZnQiBYY8iJzDTucmEunUqmLCMANEC 4JQFu3nERnYnKXgTi1yxItnF0uUuCf90d1tKi2TllGx8Ay/3y4ymYlQFF7vvQLuTrm3jF0 lkxDPVydqQK1aqyMA3NPQsVZv9pGiNg36is28ijwzmEQ68PvxPK7Ul/RM7tLkdHsQz1x3a 52aaiP0S63yaymkX8MbXfA1KgkREGCaTBJoR3oKN3pGr7nKEMQRxZvsG9p9P2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733818980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxGjA+cr04N8LZtUtuAtyz827fHJa4ydCLd5cqTOQtI=; b=GsxfYmM91PyS2h1TxLwi9pGT57PTgYwYGVef7+oCSx2rjPcEPeGXioQ5UIRXcmwSeKbTJF HsG12bKs/drADzNekZ5JulmlK3jErw081vOCgEtK+qyfuq60qRSLcswVABraA0gUbnYe8J LUsyST/QWsEDQwyLjbEQ1KYvNE0jho8B8t9GlYLEBmuyC+6N5FVbEnUQIdRgjCpH7LwhPE b4Y0/2oyvT/XCfH8+2jcKA3TV6pVBda16lCwm3+8I8yfvBlXu5+nhO3jFv2zs1/5dZOqiM mrDZeX26H8vUdbEYlbSQDugJ0eM0omYk0anrklePELEld8zHjQ3BlkzQWhIy5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733818980; a=rsa-sha256; cv=none; b=IUbjkNedpM6FY6R9PY6zCT8y3oJHAPgXXX20u/4y8xP0TALRHT/9dO98rJlqWxZL+8UJ03 bsXIB/jf1UgmC1gaPa6hfaI+r0ZrdmOMDLAYTfWmNkbTIORR7XH92Wk+KdvaqecknmFTMP Rgekolt6FLsD1vQC6SR+cPM0Sv/fgrHDZUii1AZ2I/uVaH29E31HvR4HykHZi6TAPig83L +Ze4DbtxBH+0QwsmgD3wr3Hmr+yZj97qTIe14/GS4Heu13j3LiOGeVeu7es2jQ7a6p/kkH WVTwGVgwc0F9cFNpdCTjmstOwcfaue/3CrNBMFzpfdEMenG6RA5+kEctSN7jkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6sDh40HrzFV5; Tue, 10 Dec 2024 08:23:00 +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 4BA8N0we024683; Tue, 10 Dec 2024 08:23:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BA8N0XR024680; Tue, 10 Dec 2024 08:23:00 GMT (envelope-from git) Date: Tue, 10 Dec 2024 08:23:00 GMT Message-Id: <202412100823.4BA8N0XR024680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 36b39281a666 - main - vmcb.h: fix typo in the comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36b39281a666a4c7269c61f909199131b18783c6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=36b39281a666a4c7269c61f909199131b18783c6 commit 36b39281a666a4c7269c61f909199131b18783c6 Author: Konstantin Belousov AuthorDate: 2024-12-10 08:22:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-10 08:22:37 +0000 vmcb.h: fix typo in the comment Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/amd64/vmm/amd/vmcb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/vmcb.h b/sys/amd64/vmm/amd/vmcb.h index b11dabe5b6de..027e894936bd 100644 --- a/sys/amd64/vmm/amd/vmcb.h +++ b/sys/amd64/vmm/amd/vmcb.h @@ -167,7 +167,7 @@ #define VMCB_NPF_INFO1_GPT BIT(33) /* Guest page table. */ /* - * EXITINTINFO, Interrupt exit info for all intrecepts. + * EXITINTINFO, Interrupt exit info for all interecepts. * Section 15.7.2, Intercepts during IDT Interrupt Delivery. */ #define VMCB_EXITINTINFO_VECTOR(x) ((x) & 0xFF) From nobody Tue Dec 10 08:29:30 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6sNJ680dz5fnhX; Tue, 10 Dec 2024 08:29:36 +0000 (UTC) (envelope-from cvs-src@yandex.ru) Received: from forward500a.mail.yandex.net (forward500a.mail.yandex.net [IPv6:2a02:6b8:c0e:500:1:45:d181:d500]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6sNJ0NGJz41vw; Tue, 10 Dec 2024 08:29:35 +0000 (UTC) (envelope-from cvs-src@yandex.ru) Authentication-Results: mx1.freebsd.org; none Received: from mail-nwsmtp-mxback-production-main-30.vla.yp-c.yandex.net (mail-nwsmtp-mxback-production-main-30.vla.yp-c.yandex.net [IPv6:2a02:6b8:c15:351b:0:640:10e8:0]) by forward500a.mail.yandex.net (Yandex) with ESMTPS id 7E50161524; Tue, 10 Dec 2024 11:29:31 +0300 (MSK) Received: from mail.yandex.ru (2a02:6b8:c0d:2a80:0:640:d777:0 [2a02:6b8:c0d:2a80:0:640:d777:0]) by mail-nwsmtp-mxback-production-main-30.vla.yp-c.yandex.net (mxback/Yandex) with HTTPS id SThhCu5O0W20-A0OW8tV5; Tue, 10 Dec 2024 11:29:31 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1733819371; bh=k///ADcAnUB6BI+I1lxONyKwpMWR0PkZNVyagZTfoAg=; h=Message-Id:References:Date:Subject:To:In-Reply-To:From; b=VowmLMmPymFcXw6AYyYgbGeEHlsWxxxfNTmDVo9a9LROLHZX2FIPJEtM069d3G63E 9AI6aI642BaIUGVip5d9ZOmcV6CI2wOnjGm37Ur/+Ig11Y3RAx9pbLDbBEtqivDa+T rznxkUHBfIS+P2lGsVZ5PIdK/lx0H018alsRwBuU= Received: by mail-sendbernar-production-main-55.vla.yp-c.yandex.net with HTTP; Tue, 10 Dec 2024 11:29:30 +0300 From: Ruslan Makhmatkhanov To: Konstantin Belousov , "src-committers@FreeBSD.org" , "dev-commits-src-all@FreeBSD.org" , "dev-commits-src-main@FreeBSD.org" In-Reply-To: <202412100823.4BA8N0XR024680@gitrepo.freebsd.org> References: <202412100823.4BA8N0XR024680@gitrepo.freebsd.org> Subject: Re: git: 36b39281a666 - main - vmcb.h: fix typo in the comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Tue, 10 Dec 2024 11:29:30 +0300 Message-Id: <2161271733819332@mail.yandex.ru> Content-Transfer-Encoding: base64 Content-Type: text/html; charset=utf-8 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13238, ipnet:2a02:6b8::/32, country:RU] X-Rspamd-Queue-Id: 4Y6sNJ0NGJz41vw X-Spamd-Bar: ---- PGRpdj5JdCBzdGlsbCB3cm9uZyBhZnRlciB0aGUgY2hhbmdlIDopPC9kaXY+PGRpdj7CoDwvZGl2 PjxkaXY+LS0tLS0tLS0tLS0tLS0tLTwvZGl2PjxkaXY+0JrQvtC80YM6IHNyYy1jb21taXR0ZXJz QGZyZWVic2Qub3JnIChzcmMtY29tbWl0dGVyc0BmcmVlYnNkLm9yZyksIGRldi1jb21taXRzLXNy Yy1hbGxAZnJlZWJzZC5vcmcgKGRldi1jb21taXRzLXNyYy1hbGxAZnJlZWJzZC5vcmcpLCBkZXYt Y29tbWl0cy1zcmMtbWFpbkBmcmVlYnNkLm9yZyAoZGV2LWNvbW1pdHMtc3JjLW1haW5AZnJlZWJz ZC5vcmcpOzwvZGl2PjxkaXY+0KLQtdC80LA6IGdpdDogMzZiMzkyODFhNjY2IC0gbWFpbiAtIHZt Y2IuaDogZml4IHR5cG8gaW4gdGhlIGNvbW1lbnQ7PC9kaXY+PGRpdj4xMC4xMi4yMDI0LCAxMToy MywgIktvbnN0YW50aW4gQmVsb3Vzb3YiICZsdDtraWJAZnJlZWJzZC5vcmcmZ3Q7OjwvZGl2Pjxi bG9ja3F1b3RlPjxwPlRoZSBicmFuY2ggbWFpbiBoYXMgYmVlbiB1cGRhdGVkIGJ5IGtpYjo8YnIg Lz48YnIgLz5VUkw6IDxhIGhyZWY9Imh0dHBzOi8vY2dpdC5mcmVlYnNkLm9yZy9zcmMvY29tbWl0 Lz9pZD0zNmIzOTI4MWE2NjZhNGM3MjY5YzYxZjkwOTE5OTEzMWIxODc4M2M2IiByZWw9Im5vb3Bl bmVyIG5vcmVmZXJyZXIiPmh0dHBzOi8vY2dpdC5GcmVlQlNELm9yZy9zcmMvY29tbWl0Lz9pZD0z NmIzOTI4MWE2NjZhNGM3MjY5YzYxZjkwOTE5OTEzMWIxODc4M2M2PC9hPjxiciAvPjxiciAvPmNv bW1pdCAzNmIzOTI4MWE2NjZhNGM3MjY5YzYxZjkwOTE5OTEzMWIxODc4M2M2PGJyIC8+QXV0aG9y OiBLb25zdGFudGluIEJlbG91c292ICZsdDs8YSBocmVmPSJtYWlsdG86a2liQEZyZWVCU0Qub3Jn IiByZWw9Im5vb3BlbmVyIG5vcmVmZXJyZXIiPmtpYkBGcmVlQlNELm9yZzwvYT4mZ3Q7PGJyIC8+ QXV0aG9yRGF0ZTogMjAyNC0xMi0xMCAwODoyMjowMSArMDAwMDxiciAvPkNvbW1pdDogS29uc3Rh bnRpbiBCZWxvdXNvdiAmbHQ7PGEgaHJlZj0ibWFpbHRvOmtpYkBGcmVlQlNELm9yZyIgcmVsPSJu b29wZW5lciBub3JlZmVycmVyIj5raWJARnJlZUJTRC5vcmc8L2E+Jmd0OzxiciAvPkNvbW1pdERh dGU6IDIwMjQtMTItMTAgMDg6MjI6MzcgKzAwMDA8YnIgLz48YnIgLz7CoMKgwqDCoHZtY2IuaDog Zml4IHR5cG8gaW4gdGhlIGNvbW1lbnQ8YnIgLz7CoMKgwqDCoDxiciAvPsKgwqDCoMKgU3BvbnNv cmVkIGJ5OiBUaGUgRnJlZUJTRCBGb3VuZGF0aW9uPGJyIC8+wqDCoMKgwqBNRkMgYWZ0ZXI6IDMg ZGF5czxiciAvPi0tLTxiciAvPsKgc3lzL2FtZDY0L3ZtbS9hbWQvdm1jYi5oIHwgMiArLTxiciAv PsKgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pPGJyIC8+PGJy IC8+ZGlmZiAtLWdpdCBhL3N5cy9hbWQ2NC92bW0vYW1kL3ZtY2IuaCBiL3N5cy9hbWQ2NC92bW0v YW1kL3ZtY2IuaDxiciAvPmluZGV4IGIxMWRhYmU1YjZkZS4uMDI3ZTg5NDkzNmJkIDEwMDY0NDxi ciAvPi0tLSBhL3N5cy9hbWQ2NC92bW0vYW1kL3ZtY2IuaDxiciAvPisrKyBiL3N5cy9hbWQ2NC92 bW0vYW1kL3ZtY2IuaDxiciAvPkBAIC0xNjcsNyArMTY3LDcgQEA8YnIgLz7CoCNkZWZpbmUgVk1D Ql9OUEZfSU5GTzFfR1BUIEJJVCgzMykgLyogR3Vlc3QgcGFnZSB0YWJsZS4gKi88YnIgLz7CoDxi ciAvPsKgLyo8YnIgLz4tICogRVhJVElOVElORk8sIEludGVycnVwdCBleGl0IGluZm8gZm9yIGFs bCBpbnRyZWNlcHRzLjxiciAvPisgKiBFWElUSU5USU5GTywgSW50ZXJydXB0IGV4aXQgaW5mbyBm b3IgYWxsIGludGVyZWNlcHRzLjxiciAvPsKgwqAqIFNlY3Rpb24gMTUuNy4yLCBJbnRlcmNlcHRz IGR1cmluZyBJRFQgSW50ZXJydXB0IERlbGl2ZXJ5LjxiciAvPsKgwqAqLzxiciAvPsKgI2RlZmlu ZSBWTUNCX0VYSVRJTlRJTkZPX1ZFQ1RPUih4KSAoKHgpICZhbXA7IDB4RkYpPGJyIC8+wqA8L3A+ PC9ibG9ja3F1b3RlPjxkaXY+wqA8L2Rpdj48ZGl2PsKgPC9kaXY+PGRpdj4tLcKgPC9kaXY+PGRp dj5SZWdhcmRzLDwvZGl2PjxkaXY+UnVzbGFuPC9kaXY+PGRpdj7CoDwvZGl2Pg== From nobody Tue Dec 10 08:49:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6sqX5DPMz5fptv; Tue, 10 Dec 2024 08:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6sqX2pHsz43Ff; Tue, 10 Dec 2024 08:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733820584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WTOMyw5xDfhpmPk2q3Mnv5/f0KmpESMJAIo1vLNdg60=; b=vIsNUeSRAuDxD+npmpWf8izxLgqOlATe4xTN2GGpRxM7YcmluL6CmQhFb+L669gUjEe9bg H+CK5BzNpeCe0hGErisWm/5BREHXbFYAmStb6/W9NT5iFogMU6+0KW+y8U8CssgZxn9wiI aGY78uMEzSftkLt301xl36WhFQl6tt6TZeWJzTiHnlzl2mu9tC43VTiMbd43bJ8T7tY7/v rtaeUhfLlV8Nh6BzaprD8qYjpkSON5hgKjS1KQNl6Wny5bZ68DHc+WiRxRbPD17PHt2pmZ /2UT2AbzBZjWFG8pGW6o8s50dUhUlwduGaB9+X3HGajjZtmz4PEN5mtqHZurpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733820584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WTOMyw5xDfhpmPk2q3Mnv5/f0KmpESMJAIo1vLNdg60=; b=W91Uih/a0WA69U86JUaBxVhMDfn5Bc0RpSfAzcL8sa9o3EMs1vQTE/5WcfVAOh+0X87Fkz yVw3LCfuJh+zKMhoMhxG+/HhoIMyooz7o8W+n1idu67NWmdQqEqapEvg7bIfj7TnaOvSTd DaH6IDlMptB6PvrHXE1KHj9ncwwKQPO3offHvBS8o22ktP6huiRYghrkj9mESa5jR/Rqpc DL6Fjbw1Jo5sIcj2wuWKzGNG5Rul5FBLGK2G3j8MkptIpf5vXgNCeXRg9DjAqwssh54+8l Md5BWNPjrNIQ6g/jExE8gPFvKFELcjI68WTyiFnab0bkp27q+8t10XFnMj2Wxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733820584; a=rsa-sha256; cv=none; b=dyCTFM1jJ4zC8LQjg5jCI1ouC/tPlq8zXOU7CLRPX0ea3p/Va1vES/UhFg5Xb8qTvV3VvY Bxx5+lNXOSIfrX8HPazATUkmn97cXWsmrQt9zlgfvQsWU21yF7UReFfD8y1A3E1ykm+H3d bOVezbNQFqGEMkVFruuDr48LD20CABIMVc2obger/3o+NUXsVltLpQb4TpIqsT8uCgkhTi zpRI+rqFxz80Q3n6vfhotPpLd2iBpXD5r0oRKw72vXSP8wCqldKoIhvwHRZ8ssB+3EOpEw jV/Lg1ggMKJW5EgooxkCvZgrp8j/qH/D6SQLWHMvfxrOwIXy/AEsBi790jd5tA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6sqX2Q85zGkx; Tue, 10 Dec 2024 08:49:44 +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 4BA8nioV063606; Tue, 10 Dec 2024 08:49:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BA8niM1063603; Tue, 10 Dec 2024 08:49:44 GMT (envelope-from git) Date: Tue, 10 Dec 2024 08:49:44 GMT Message-Id: <202412100849.4BA8niM1063603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e02029e6f487 - main - vmcb.h: fix typo in the comment, try two List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e02029e6f48789394f3ad137fd992b5f33e336fc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e02029e6f48789394f3ad137fd992b5f33e336fc commit e02029e6f48789394f3ad137fd992b5f33e336fc Author: Konstantin Belousov AuthorDate: 2024-12-10 08:48:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-10 08:48:55 +0000 vmcb.h: fix typo in the comment, try two Noted by: rm Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/amd64/vmm/amd/vmcb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/vmcb.h b/sys/amd64/vmm/amd/vmcb.h index 027e894936bd..09150fc26a72 100644 --- a/sys/amd64/vmm/amd/vmcb.h +++ b/sys/amd64/vmm/amd/vmcb.h @@ -167,7 +167,7 @@ #define VMCB_NPF_INFO1_GPT BIT(33) /* Guest page table. */ /* - * EXITINTINFO, Interrupt exit info for all interecepts. + * EXITINTINFO, Interrupt exit info for all intercepts. * Section 15.7.2, Intercepts during IDT Interrupt Delivery. */ #define VMCB_EXITINTINFO_VECTOR(x) ((x) & 0xFF) From nobody Tue Dec 10 15:09:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y72Fs6cwKz5gFlX; Tue, 10 Dec 2024 15:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y72Fs65nGz4grc; Tue, 10 Dec 2024 15:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733843377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6I0XTQuqoedN6Jv8IMLwhUPdZUvdePT+M12Gco/c7no=; b=fOkQBBSH2c/F5j48GG7CSRchBM7B/h+DjsEKrjlXNudTNx0D6qNpP4ZV+CGMGkt/rwp2+T NsC/7nZDkWPFT/p5PnsxDtvTaPmEjNX/xelLyUvlRrSosE/fjsZT9AxxpWFiAGhYfhkhs4 xJNhBhk2x1cg/ZtuTujOpBGtmip2QGJg2B3GUzOULLFd5mMaoPgbVrt2w/RgnKRewMikl+ rkr4eOnHk0ba/z5dyKmRzWjV2JFvPqEE0b+0KxY2oJj/7lnfLC22DytYqjeHNCPiCLyhFc ct1uIwhzAO+lHW673m4ihufUKUglrOvfFbgo/7KJiN1r751/wBbgWymZXtM8OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733843377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6I0XTQuqoedN6Jv8IMLwhUPdZUvdePT+M12Gco/c7no=; b=G2zhH0ds2R3pud8QfTCu/TmLx0q3nUf4WXbE5vzVLKKbzWtDVPW4Hi/2k1wTWmG3PEI7bQ 6c02khtA0EO3T3swN0VbddP5WZ4Xv0jee6UhFks7GgrwRj2fo3qIjMyEL5QSZI6QEPKZan nrixWNe4eGkP549qGuNFZnLlWULw+wsquRdSUtGbclCpcVYaOWpJuj7kIc2o55U6XBk0GK /OZDQsoNG1Mcv1Cowrp8jtXykjwRANajTABIjxxpY46maDr/njimYomC2EuajyQW62VKnK WxmUL+k0ABgPB5MxINb7RMxM1M7TBpON8mKlxeAVS73Aopg1phTnfJovxyEQHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733843377; a=rsa-sha256; cv=none; b=Op/R1R+XCwQbmFlUVhniss3ShhywkTW4vlFRZzkongq1wBBGM8FgXEUSHognwiRc+7B15F qbt9PP+WVssd6VZb1FjcZ2xzLZdz+VpJhbTuAcF5+XbRiMna6hLxGotUjT/MSxye2JIcaK Lc6MOsOvVfc8KEBKsrOjTyaNQ29BwtZ5eF5Vq8l2d3NHMx1DxJkz22d1j+nH7Na2scu1D6 2iWxWNd87c81zrvvPu8PJn0MJN2V+kwkz/+DaNgmx4P0y6kh25/bTqpva2/sK2muNHUm5B Nf1uQ/le+C//2smbyhrBDNi4nEile5sRUNcW3HVB8CXumIw8Hod65R8ztNlztA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y72Fs5SMnzSdR; Tue, 10 Dec 2024 15:09:37 +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 4BAF9bRl071513; Tue, 10 Dec 2024 15:09:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAF9bZI071510; Tue, 10 Dec 2024 15:09:37 GMT (envelope-from git) Date: Tue, 10 Dec 2024 15:09:37 GMT Message-Id: <202412101509.4BAF9bZI071510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c226f193515c - main - riscv: Permit spurious faults in kernel mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c226f193515c8c0665610cb519fe381987f8ee24 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c226f193515c8c0665610cb519fe381987f8ee24 commit c226f193515c8c0665610cb519fe381987f8ee24 Author: Mark Johnston AuthorDate: 2024-12-10 15:07:28 +0000 Commit: Mark Johnston CommitDate: 2024-12-10 15:07:28 +0000 riscv: Permit spurious faults in kernel mode Right now, pmap_enter() does not issue an sfence.vma after overwriting an invalid PTE, so the kernel can trigger a page fault when accessing a freshly created mapping. In this case, pmap_fault() can handle the exception, but we may panic before that. Move the check; this is consistent with arm64 and serves to ensure that we don't call vm_fault() etc. from a context where that's not permitted. Also fix a related bug: don't enable interrupts if they were disabled in the context where the exception occurred. Reviewed by: br Tested by: br MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47688 --- sys/riscv/riscv/trap.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index 3bb1fc7f1010..a1a30eb58220 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -227,11 +227,6 @@ page_fault_handler(struct trapframe *frame, int usermode) pcb = td->td_pcb; stval = frame->tf_stval; - if (td->td_critnest != 0 || td->td_intr_nesting_level != 0 || - WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, - "Kernel page fault") != 0) - goto fatal; - if (usermode) { if (!VIRT_IS_VALID(stval)) { call_trapsignal(td, SIGSEGV, SEGV_MAPERR, (void *)stval, @@ -244,7 +239,8 @@ page_fault_handler(struct trapframe *frame, int usermode) * Enable interrupts for the duration of the page fault. For * user faults this was done already in do_trap_user(). */ - intr_enable(); + if ((frame->tf_sstatus & SSTATUS_SIE) != 0) + intr_enable(); if (stval >= VM_MIN_KERNEL_ADDRESS) { map = kernel_map; @@ -268,6 +264,11 @@ page_fault_handler(struct trapframe *frame, int usermode) if (VIRT_IS_VALID(va) && pmap_fault(map->pmap, va, ftype)) goto done; + if (td->td_critnest != 0 || td->td_intr_nesting_level != 0 || + WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, + "Kernel page fault") != 0) + goto fatal; + error = vm_fault_trap(map, va, ftype, VM_FAULT_NORMAL, &sig, &ucode); if (error != KERN_SUCCESS) { if (usermode) { From nobody Tue Dec 10 17:29:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y75Ln3rWNz5gNvx; Tue, 10 Dec 2024 17:29: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y75Ln1YnDz3xXd; Tue, 10 Dec 2024 17:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733851745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zig6yT8kLxpmImQhqNmFMMgAeZg8QzFe2VsiodWNl3U=; b=XgdMRzGPX6k+eDQrhiTdM8tTMov1jZBSn9zKfHnVMyA/yEn2KUX8vxoDXt/6waoHCqHkj+ NYiIk1yl+AsHtkTyVJNGpS4SFVuaJ2SryqWbdc0s6SK0DjSKi4HhN4q4P+0ZHCJHNpOjqO orEzyAon8AghuyxaDghV6lQDOIoosRDbAMYX3u3doVP4yTlv/fcKkCbZXYbrNQLK+7qSx7 wsTMgmb0j3HYy8j92IKqRdmjlHPpLitDAS9Y4Bcomhui3c9tlwdN3GDtriUNEB/SGdffpl YVUHcXnzPxzv4UkO+AyuMHrELpVeaLG+WWfUKTJenYAARGuavf8Dz/RGguUZIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733851745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zig6yT8kLxpmImQhqNmFMMgAeZg8QzFe2VsiodWNl3U=; b=LgkfeIB+JDIR/oUK9x6f3BMPzyMmOQzsa4oXLUxc3AcXQkY+OnH/do87bJs7fHFn4+Jh9z 7j74wDK3u3hnSdDoqlZozej3f40LQn455P/9aaF47KkqbfRJLkj0U1VlkVvhxMdsneDFko 0FQKwww0YFX+RXM+hF5a3XzfGrwp8gDlI0+guvDuLQjfUI+jiGiom9ob6wFp6G5JSNhD8Z 8Ok6NTVMtcP6HRg1g5nuxjYwNGAdt3yNeIXctGqNUKLzDFfWNq7s++DJfvXBcB5pVklakb IxOxo+2UWZAcEKqiFfVmGdlh0WaYPJY1sNkNeMqUBQijjy6XLOQ9sVFfvJqbiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733851745; a=rsa-sha256; cv=none; b=egHOPJKsO81Y9OfwZMGHFXNxBlyaKdA2uaGchBU79zAijFaLUJpkgF3SjWcVrKmuGG2DL0 mbMEHp9tXKvMIiaqVBMhR+5pJ+Py6ti7t4YTdNbOG+hKaMIUTbEn3edDzhbiE3g7mYRZyl y6e7Z93iVMnvkV7vvS4TSOW2UC9S1JGKghiNiIs/QAbkHSm4cJMMPASApawygl+1fj78AA YyeKgQUSG/p6nEGxtznaJ8lA1sFNZukez6K3Np0X5PcNxFdRtjDY3yshZMsyB8Mg2A8zrV s0ctnpHtPb8XwvdL23kyG8QoNos9N25ud7TWtILDT6rFz5dJr6dRqg0Lw9kiSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y75Ln0yfRzXnr; Tue, 10 Dec 2024 17:29:05 +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 4BAHT5pR031437; Tue, 10 Dec 2024 17:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAHT5lr031434; Tue, 10 Dec 2024 17:29:05 GMT (envelope-from git) Date: Tue, 10 Dec 2024 17:29:05 GMT Message-Id: <202412101729.4BAHT5lr031434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 6dafe8c1e46e - main - Clean pkg cache in release media List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dafe8c1e46e58097b277ab9babb3ec5336713d7 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=6dafe8c1e46e58097b277ab9babb3ec5336713d7 commit 6dafe8c1e46e58097b277ab9babb3ec5336713d7 Author: Muhammad Moinur Rahman AuthorDate: 2024-12-10 17:24:43 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-12-10 17:28:55 +0000 Clean pkg cache in release media Recently wifi-firmware-kmod-release pkgs were added in the release installation media, but unfortunately the pkgs were not cleaned up after the installation. These kept the stale pkgs in the /var/cache. The pkgs should be removed with pkg clean. PR: 283112 Reported by: yanhui.he@broadcom.com Reviewed by: cperciva, emaste Approved by: cperciva, emaste, re (implicit) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47942 --- release/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/Makefile b/release/Makefile index a99486ea4b84..ee2f52ad56af 100644 --- a/release/Makefile +++ b/release/Makefile @@ -79,6 +79,7 @@ PKG_ARGS+= -o METALOG=METALOG PKG_ENV+= ASSUME_ALWAYS_YES=yes PKG_ARGS+= -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos PKG_INSTALL= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} install +PKG_CLEAN= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} clean -a .endif .if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL) @@ -194,6 +195,7 @@ disc1: packagesystem .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} wifi-firmware-kmod-release || true + ${PKG_CLEAN} || true .endif # Set up installation environment ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf @@ -270,6 +272,7 @@ dvd: packagesystem .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} wifi-firmware-kmod-release || true + ${PKG_CLEAN} || true .endif # Set up installation environment ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf From nobody Tue Dec 10 18:12:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y76KR3scsz5gRYF; Tue, 10 Dec 2024 18:12: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 4Y76KR3FxFz458b; Tue, 10 Dec 2024 18:12:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733854379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ci2YM4qx9anMYExG1SntxrMDGfmP5FhiZvS0d1//ctM=; b=wHIc3AK6uSRemyp+alVFcexy76FAdFtuhPzjqXdc3tQb7HHRw/TZJsq/cMs+X6p+RKr1dL z82YXeipGrq/DeLuh0LJbMfvpiC+mdVcFpV99/4tZGeTgUrQxxlWB+1yTCIFWlFD/cNMvD CNk2Jsf7GMYQZqU+pIq5I63Hteoh5tQgjp7wUCiwvVInO4nH+dU8ZgKfDhURxLSWXPzgp7 vKxnqeJr0n/KvjG0+egyFCxTEHTI3qBIRiwVUdgeaB8vFA7FiD0AaBPC8ou/I+yxOgT0WO +oEBJoajcuA27g8LG9TBVOH+f+OmMUPkKEtCVq7qEtp8HWRVH4FrB+4SmnUjEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733854379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ci2YM4qx9anMYExG1SntxrMDGfmP5FhiZvS0d1//ctM=; b=K5Ep804qtoFDf5fUytzrWmT0/U6NoYrpxB4UAVcbHscEylVHxds2JM2mEKqN4k9PeTbNhM xLbWtRFWgB2+xhgJc+PPO4LkyEzGfjq+Dyg6T0ID+LmO8DlxxPC50QMqv0p+ls8OY3aLKQ VBAxDCF6vJ5AGezPeLYQ0FCzA0kalkFTSLEqzD69PUZCN578+TmCbaxyRZsiYZhnKS6cM2 W1ZFxPDwvD4gqQdEDOoIvpu2FvcfM7mcyejbFm+gbiQPwQHL75SsgBrbXDaCKZC3lcxeuc g03YVqt3yrm1YfXZovj9qIvmX2qBww8QToAR8TSB7Bg6GjTkQbdZ9X6O07QXXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733854379; a=rsa-sha256; cv=none; b=HOWWzk4/3QXKZY2jxcjkm0nu0/E6iwBPM4j/H+4Llc8p6dRM6JRsFQcpTGIByukLuRNsWJ DWRMv0Xz+8gm4MzrLVzf6RJ7gg5usMzhNrU4mdjmERfcVKzVXjU0uqUh+BlKeBCFNAwyet Q0/Xx8J38ZXaPyxpF7bMB1wVV+pBM7B1YJIbwa2RRjcWc2GJAwXOHTuoVQTf33+snMFgGH 2PxMyF/EjbwZOVVPO6b43dsEarxA4+n0U+5LaVOeUih1dm4C2DN/KfCHpKIgECYEstiH/O J2SHxrOHFUglcpgnMRNPSw3IwPm7ND8VqrFJ6IyFoACszP2HwTw2b8RNGlNPjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y76KR2sMkzYtG; Tue, 10 Dec 2024 18:12: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 4BAICxc1022678; Tue, 10 Dec 2024 18:12:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAICxvY022675; Tue, 10 Dec 2024 18:12:59 GMT (envelope-from git) Date: Tue, 10 Dec 2024 18:12:59 GMT Message-Id: <202412101812.4BAICxvY022675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Popov Subject: git: c7919fb92d20 - main - netlink: Do not cast to int in NLMSG_HDRLEN and _NLMSG_LEN List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7919fb92d201ab1d5bd3ab0c18cbcea961ef761 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=c7919fb92d201ab1d5bd3ab0c18cbcea961ef761 commit c7919fb92d201ab1d5bd3ab0c18cbcea961ef761 Author: Gleb Popov AuthorDate: 2024-10-29 18:41:34 +0000 Commit: Gleb Popov CommitDate: 2024-12-10 18:11:16 +0000 netlink: Do not cast to int in NLMSG_HDRLEN and _NLMSG_LEN Approved by: melifaro Sponsored by: Future Crew, LLC Differential Revision: https://reviews.freebsd.org/D47333 --- sys/netlink/netlink.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netlink/netlink.h b/sys/netlink/netlink.h index 5724385271fc..e677365b9a21 100644 --- a/sys/netlink/netlink.h +++ b/sys/netlink/netlink.h @@ -210,11 +210,11 @@ enum nlmsginfo_attrs { /* part of netlink(3) API */ #define NLMSG_ALIGNTO NL_ITEM_ALIGN_SIZE #define NLMSG_ALIGN(_len) NL_ITEM_ALIGN(_len) -#define NLMSG_HDRLEN ((int)sizeof(struct nlmsghdr)) +#define NLMSG_HDRLEN (sizeof(struct nlmsghdr)) #define NLMSG_LENGTH(_len) ((_len) + NLMSG_HDRLEN) #define NLMSG_SPACE(_len) NLMSG_ALIGN(NLMSG_LENGTH(_len)) #define NLMSG_DATA(_hdr) NL_ITEM_DATA(_hdr, NLMSG_HDRLEN) -#define _NLMSG_LEN(_hdr) ((int)(_hdr)->nlmsg_len) +#define _NLMSG_LEN(_hdr) ((_hdr)->nlmsg_len) #define _NLMSG_ALIGNED_LEN(_hdr) NLMSG_ALIGN(_NLMSG_LEN(_hdr)) #define NLMSG_OK(_hdr, _len) NL_ITEM_OK(_hdr, _len, NLMSG_HDRLEN, _NLMSG_LEN) #define NLMSG_PAYLOAD(_hdr,_len) (_NLMSG_LEN(_hdr) - NLMSG_SPACE((_len))) @@ -223,7 +223,7 @@ enum nlmsginfo_attrs { #else #define NLMSG_ALIGNTO 4U #define NLMSG_ALIGN(len) (((len) + NLMSG_ALIGNTO - 1) & ~(NLMSG_ALIGNTO - 1)) -#define NLMSG_HDRLEN ((int)NLMSG_ALIGN(sizeof(struct nlmsghdr))) +#define NLMSG_HDRLEN (NLMSG_ALIGN(sizeof(struct nlmsghdr))) #endif /* From nobody Tue Dec 10 18:13:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y76KS4yWZz5gRh3; Tue, 10 Dec 2024 18:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y76KS44hLz458c; Tue, 10 Dec 2024 18:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733854380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+JY4lo/STjC2Co0kx0HMD7orlpEvrxas6KPgfnZuLUU=; b=BTmtjdongcXefTgonmwCmBEw25A/Fh3+KSRowD2+LQZcG1s2XCqx186HMebQCMBlmLE5ZG iN2L5/1Z1a0fkOSuKa81BqUW10SjtEI9FjYhMoDndMrQSyzRfwj6tv5dYCHQv9aqgHX09B 904OQTlyOgTou+yYYgNNYha5wS9VOhjsueo1cgWq6kRfKUQz03G7eoeonWhrDZskO0YrkG RbgDRT8AFIKegpPnYx7Co946rmk84zTVQidCoLxrj6BviM+HZCJCtd7BpxrwKZbw2qNt0O BCooEFEdLC/ukpJqbnlVeuDY9BU3zYbTwyhXmtarzGIjLB6dKoGvR/YWlGXShA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733854380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+JY4lo/STjC2Co0kx0HMD7orlpEvrxas6KPgfnZuLUU=; b=ct6RkcmtZOdPn9FrEuU7tfsGWNQ1In3bY6AhD+bWKmI5m3MvCw/YzqxFGdgmUUx6JfHuCZ QN808iZ5nw6SoJoRo9P72TQAHZUg2yHq/RCx3oqITsrZELqraqvPBTAnW/ik4TOcqr+Hzl CSKSjbXwPzEcikvev/3/wxtYaSssyrz+F1FKq9hF2c4m/Qr8rKswOj0kWGlI2XAu8NREHa 9RDHlrtRAKMHUjk+/8uk9TqDIaOTLvhdWjE9Wj0AxGi1ECET98rcvRMsjAyuM0N/8Hatpt cA+d19g8zbTkm8ENKEacvlIXNgY2PLJO2yLDF0ZkEjIIIFsH15DE1ZGayFwNDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733854380; a=rsa-sha256; cv=none; b=vDA9x+vXaHaxFIFelDgxOJ02ls9v2n74JHDfnXYAX5tkcWQ7Gsb5OCOo3jcGKACJQLlZ+t 5rvOvCYWjrzFq8vaEvB0HTUM22bcvT7HA7VJ6WHfAZ948ij4fK6Cl2scmPv6x3u+gox9ob mXEqby+eYFnjZZG3TchzTbYPYJoXCwTkDc/O7VUsEwrNag/8BsRW/1+vyg+mIqrSdW6zQ4 mHkbGQm7YSHDKfFYSyAmWK3Vmf3m+P1FaG68ommWYsQGc1uK/3qYYhc/DSccd4/3IL6aS0 lHDedGJuf0oVZgmDDcUGqTWrUVgMSgTP+tFRkTgTm03v7gBo/AEFBYbAnZjRLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y76KS3hHczYdh; Tue, 10 Dec 2024 18:13:00 +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 4BAID0Q5022745; Tue, 10 Dec 2024 18:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAID0Xo022742; Tue, 10 Dec 2024 18:13:00 GMT (envelope-from git) Date: Tue, 10 Dec 2024 18:13:00 GMT Message-Id: <202412101813.4BAID0Xo022742@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Popov Subject: git: 9df901c8f8c8 - main - netlink: Pop NLMSG_ALIGNTO and NLMSG_ALIGN out of the #ifndef _KERNEL block List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9df901c8f8c8f6a0766d87fbc6ef3dc1b73423f8 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=9df901c8f8c8f6a0766d87fbc6ef3dc1b73423f8 commit 9df901c8f8c8f6a0766d87fbc6ef3dc1b73423f8 Author: Gleb Popov AuthorDate: 2024-10-31 16:23:23 +0000 Commit: Gleb Popov CommitDate: 2024-12-10 18:12:09 +0000 netlink: Pop NLMSG_ALIGNTO and NLMSG_ALIGN out of the #ifndef _KERNEL block Sponsored by: Future Crew, LLC Approved by: melifaro Differential Revision: https://reviews.freebsd.org/D47333 --- sys/netlink/netlink.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/netlink/netlink.h b/sys/netlink/netlink.h index e677365b9a21..a87363197187 100644 --- a/sys/netlink/netlink.h +++ b/sys/netlink/netlink.h @@ -205,11 +205,12 @@ enum nlmsginfo_attrs { #define NL_ITEM_ITER(_ptr, _len, _LEN_MACRO) \ ((_len) -= _LEN_MACRO(_ptr), NL_ITEM_NEXT(_ptr, _LEN_MACRO)) - -#ifndef _KERNEL /* part of netlink(3) API */ #define NLMSG_ALIGNTO NL_ITEM_ALIGN_SIZE #define NLMSG_ALIGN(_len) NL_ITEM_ALIGN(_len) + +#ifndef _KERNEL +/* part of netlink(3) API */ #define NLMSG_HDRLEN (sizeof(struct nlmsghdr)) #define NLMSG_LENGTH(_len) ((_len) + NLMSG_HDRLEN) #define NLMSG_SPACE(_len) NLMSG_ALIGN(NLMSG_LENGTH(_len)) @@ -221,8 +222,6 @@ enum nlmsginfo_attrs { #define NLMSG_NEXT(_hdr, _len) NL_ITEM_ITER(_hdr, _len, _NLMSG_ALIGNED_LEN) #else -#define NLMSG_ALIGNTO 4U -#define NLMSG_ALIGN(len) (((len) + NLMSG_ALIGNTO - 1) & ~(NLMSG_ALIGNTO - 1)) #define NLMSG_HDRLEN (NLMSG_ALIGN(sizeof(struct nlmsghdr))) #endif From nobody Tue Dec 10 18:13:02 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y76KW0DFJz5gRYP; Tue, 10 Dec 2024 18:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y76KV63Lnz44t5; Tue, 10 Dec 2024 18:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733854382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tAEBOX8oMacwdwobmpL4SNn6GPs0mOzx1HGi/kUapiE=; b=jnxgP0i/hM+97ZCQTZ9Ot46dEtZIxnRLTCuZl7d56y2/3U4nh2z5KOsLzJgh1oJnnJemIo EKVWmoRpA6d+HMS3NONh1OuBXB5HbmxPJClrhigJqRepENPm7ldIVklFLy9pZAMPNDxA2W zGIjcY4XtwYnkS1VVeEnw8VyosgWzrcJoGlMybB4Kpd/3Zm72hE4Z2XWUzSbxUfk+UXnCF gjjs5aHkVu2M+Q1wRwCu/z6Q+tNaSHdkWNhluYT6kuDIXX0faYDaWnOQvTxVro8Neelbpa g9VNE/ZgEdZF0HJ4aJTTNPj6d5hUEFB8SRKaF3Q0QNz6agvUcsoKHHlxDcQXfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733854382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tAEBOX8oMacwdwobmpL4SNn6GPs0mOzx1HGi/kUapiE=; b=LLmUj/+N9dmgkA5bzcZ6VuQ9wqd1jpLhmlQS/WlJxDXIjXF+Fl2pQ72D2oetb/sd52r/4n kJqFg9obD6iQUUN+3sXUQsaNG8LVXLw3d0LUUvHw7zgph8iglJ46FHP8k6TXoHY1suo0Rf UPx44F2+Ds8xrq6hI3g+RitM3ONCsKIpNLxahxf3EbGWP2hKcEo4oT2hLjD15uCzTTsId2 BT0E/3rWpWd7nPT4FugpRnSMCcGGk7zlPsP7OtUixPmZvjpa4wQj1eI8NU82FyIWGKKwpb iisuzab39b0Qt7svEVA8m84jVJ5lzB1G/rKE+fWe9d0eBOgMeJJDLeEUqGVn/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733854382; a=rsa-sha256; cv=none; b=o60z93DIHOn12geqhxt95F+C51GkK8D2FlO0spdQa936FJINK8eeLtqeymUPAbLHUQIo1D 6R1kXSBwdwc4+uX4S5mOIPMhzEjoiH4s0Rq9NAE2LZdXUjtn2zPYcIo2X0ceMwu29iuTjn JATaInVR6toWywYglz/WhmMwU6wFKeaXRXIVdBLlP8lwtKQAXv38D3KGmSjymijfDmjBc0 ORrLxc0J0pR+B0TeqoHvJVKmOnEXWbvgCowmRJ1yBo8IRDnP8HsebUTBKETQH45D0MIAtv 6BsP2fO1bs5cgu41qdg+YmpvXpK3rR39cWXOhe9tjy4S3o1+Dk9F0/4RuTZzjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y76KV5CQVzZQ1; Tue, 10 Dec 2024 18:13:02 +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 4BAID2V5022848; Tue, 10 Dec 2024 18:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAID2pI022845; Tue, 10 Dec 2024 18:13:02 GMT (envelope-from git) Date: Tue, 10 Dec 2024 18:13:02 GMT Message-Id: <202412101813.4BAID2pI022845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Popov Subject: git: 33c670c373c0 - main - netlink.h: Align macro declarations with tabs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33c670c373c065064dd8d8a0cc1623db7e556c5a Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=33c670c373c065064dd8d8a0cc1623db7e556c5a commit 33c670c373c065064dd8d8a0cc1623db7e556c5a Author: Gleb Popov AuthorDate: 2024-10-31 16:56:51 +0000 Commit: Gleb Popov CommitDate: 2024-12-10 18:12:38 +0000 netlink.h: Align macro declarations with tabs Sponsored by: Future Crew, LLC Approved by: melifaro Differential Revision: https://reviews.freebsd.org/D47333 --- sys/netlink/netlink.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netlink/netlink.h b/sys/netlink/netlink.h index d8cf1401fcd0..2395726e7455 100644 --- a/sys/netlink/netlink.h +++ b/sys/netlink/netlink.h @@ -206,15 +206,15 @@ enum nlmsginfo_attrs { ((_len) -= _LEN_MACRO(_ptr), NL_ITEM_NEXT(_ptr, _LEN_MACRO)) /* part of netlink(3) API */ -#define NLMSG_ALIGNTO NL_ITEM_ALIGN_SIZE -#define NLMSG_ALIGN(_len) NL_ITEM_ALIGN(_len) +#define NLMSG_ALIGNTO NL_ITEM_ALIGN_SIZE +#define NLMSG_ALIGN(_len) NL_ITEM_ALIGN(_len) #ifndef _KERNEL /* part of netlink(3) API */ -#define NLMSG_HDRLEN (sizeof(struct nlmsghdr)) -#define NLMSG_LENGTH(_len) ((_len) + NLMSG_HDRLEN) -#define NLMSG_SPACE(_len) NLMSG_ALIGN(NLMSG_LENGTH(_len)) -#define NLMSG_DATA(_hdr) NL_ITEM_DATA(_hdr, NLMSG_HDRLEN) +#define NLMSG_HDRLEN (sizeof(struct nlmsghdr)) +#define NLMSG_LENGTH(_len) ((_len) + NLMSG_HDRLEN) +#define NLMSG_SPACE(_len) NLMSG_ALIGN(NLMSG_LENGTH(_len)) +#define NLMSG_DATA(_hdr) NL_ITEM_DATA(_hdr, NLMSG_HDRLEN) #define _NLMSG_LEN(_hdr) ((_hdr)->nlmsg_len) #define _NLMSG_ALIGNED_LEN(_hdr) NLMSG_ALIGN(_NLMSG_LEN(_hdr)) #define NLMSG_OK(_hdr, _len) NL_ITEM_OK(_hdr, _len, NLMSG_HDRLEN, _NLMSG_LEN) @@ -222,7 +222,7 @@ enum nlmsginfo_attrs { #define NLMSG_NEXT(_hdr, _len) NL_ITEM_ITER(_hdr, _len, _NLMSG_ALIGNED_LEN) #else -#define NLMSG_HDRLEN (NLMSG_ALIGN(sizeof(struct nlmsghdr))) +#define NLMSG_HDRLEN (NLMSG_ALIGN(sizeof(struct nlmsghdr))) #endif /* From nobody Tue Dec 10 20:27:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y79K03LySz5gZtH; Tue, 10 Dec 2024 20:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y79K02ZFMz4Qx4; Tue, 10 Dec 2024 20:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733862468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywv+EpO3MGJ2B/2wh3nKktLQhH0PcEuEAWw0sqIZV50=; b=WULRu7YuSfYQuivA+9qGTdG2dqry7VUWCTB7Vbwh80hOGYZhPBZgm4MexqfMSOCo8Q1f0z BUOLsmucgWN2eCpdl+jUjCK8A4GWwfcGXKw1z0rrZjBqO6q7+Z3t0As3kOAs+FjtbwhE+1 rhXEANHiav6HZA+WUX38R9iEokYN3ZbDSAbUpGBywxGlbKwHp4C+SRhIYgpHlR7TGFdpig ktq6Lbtx+pzJzAkkvloAytpOGxcH5SourK/QV8SdHb5Sk07ekye0J5oyuEjKm+E08Q8u9c nitVA2lTfHlHFsk4PCO7JbVTRDSqAwjsPIj5ltygOsSEUwlibLuuuS4zSmN+xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733862468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywv+EpO3MGJ2B/2wh3nKktLQhH0PcEuEAWw0sqIZV50=; b=AKPCcFJuo6Z+5vH1nRGN7zmfiqkzUmlXthWQOlq/rrsm5Btwz2oyhM++fulDt2UnQ8BSbR TaPQDQ11IuM6p7GDYkhEZA11Kvzm8hIxQY8QnOf4I6fgjfrK7y2UoiZeoSgLysDnfWBu9P ejeFpWf8rD6GXBFMGxjwrso/mZkOI6G7iW3CGXmBM5NVkDSCN57Nm+sUiX0llsrWEvTZnj J7Yag6Kkr/4d9mOexb6XK2VwoUJVDETABfMrYvvdko+k9yD/fUqrbfrV/tJ8jH9+oDQw09 sULSZ83wiDZw6cqVYf0VbRthELjgnllO19PoEEIBZc5jWliUY3MxTpkvuY0mSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733862468; a=rsa-sha256; cv=none; b=c1ntL4zvTWaugpXwSq885vYwPoM25SyoYTrVQGJpO/RndVjEsc5VKL7NZV1n3Z9REBCYq9 rVcTZwMhsZ/FLGPcWuVPrARo90qK8nUuCyIzp3DkY5kBRylwxqM3GjomJGBk3zc+w0RDhG TXdbPy11iGUX0tqGZYDh79OCMd+Zdv2BeNLspodW0hZfvo6SAA+QU7Y1EGAWYeeYqRRRqi 8fPzWE+jrTyMYLVT2/7HhtVN+zDMDH0VEzxP32vNhcV7o3jskm4VGJB9ADPiKa3E+O+sTM Nxe8SyxoW67qJEYAcOmfoMPMafOoTR+X0NRoFN/aNRwoAmUR9as0n+toO9k3TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y79K01wD5zdjV; Tue, 10 Dec 2024 20:27:48 +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 4BAKRmBY066555; Tue, 10 Dec 2024 20:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAKRm9H066552; Tue, 10 Dec 2024 20:27:48 GMT (envelope-from git) Date: Tue, 10 Dec 2024 20:27:48 GMT Message-Id: <202412102027.4BAKRm9H066552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Juraj Lutter Subject: git: 15a8e7d51c15 - main - isp(4): Correct nomenclature for L_Port List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15a8e7d51c156cba47742d7be1be52a327867955 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=15a8e7d51c156cba47742d7be1be52a327867955 commit 15a8e7d51c156cba47742d7be1be52a327867955 Author: Juraj Lutter AuthorDate: 2024-12-10 09:31:43 +0000 Commit: Juraj Lutter CommitDate: 2024-12-10 20:27:18 +0000 isp(4): Correct nomenclature for L_Port L_Port is "Arbitrated loop" port type, not "Loopback", correct this in the manual page. Reviewed by: mav Approved by: mav Differential Revision: https://reviews.freebsd.org/D48014 --- share/man/man4/isp.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4 index dc6a6dbd5d2b..17c83a2e46d9 100644 --- a/share/man/man4/isp.4 +++ b/share/man/man4/isp.4 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 24, 2024 +.Dd December 10, 2024 .Dt ISP 4 .Os .Sh NAME @@ -167,11 +167,11 @@ Supported values are: .Pp .Bl -tag -width ".Li lport-only" -compact .It Li lport -Prefer loopback and fallback to point to point. +Prefer arbitrated loop and fallback to point to point. .It Li nport -Prefer point to point and fallback to loopback. +Prefer point to point and fallback to arbitrated loop. .It Li lport-only -Loopback only. +Arbitrated loop only. .It Li nport-only Point to point only. .El From nobody Tue Dec 10 20:34:51 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y79T76HkGz5gbLY; Tue, 10 Dec 2024 20:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y79T75kGRz4Rgq; Tue, 10 Dec 2024 20:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733862891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8h2fZN/7uo+475vwLIJfx16Hnw4mvbw9PUQfxl68244=; b=UjTpYufiE6kCQRcmeovfoAORjoPSII84llRhQn+0qn2G9lsw6+NeKdizY8145k+4gFSQIk oAZEqvDbbj8HS6VahOZaF+Cl4AsEi5Q8ymzDJNfpGTIR2hBkXBb7IoXMpGZJ4/EpAC8UWp S2sT8WzCwa3VOOvZsWti5hliX0NheOYNz6oBpRwrujtzH8U/fkmtUlAgvjUaBzKV2TNHZA vW14HBMsn7Ov3ZpwCCNpqah5HQbNRqNuw+VrHOZXdsZ2rFd+3FlP0DqD2962Khi56RWIgm tnjJbNuEkxPpmQaekX2iWkSnTExd/X8FkG9gXNcG8rrdKJHcgfPIJTzeWHxcPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733862891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8h2fZN/7uo+475vwLIJfx16Hnw4mvbw9PUQfxl68244=; b=cOUxcqSDmBaDvSI55jvwy3b22ktzxLdMP9X6BWqFzvYdSuDw0xrgwXjCTXQsg0DPAVqrsQ DVX5j4FskdfpMIXghZvVajVivvUjX1+9e9VD0YOUqqd9OMC3KafTf6lqdzDJIYbNd7ldth ECkZtITFsAj39wRfylzwPmhOhETBVftYGPR5/MM8at6xV6mQqtTkKcriqTVY0ZJIJjx7S2 tdB/a7auCO/Fq409k2BDpDJv77dCVaa4sD5T02Y1LnjP3vn4I/LAHXoWSLFHgidD1E5YRL iC75j6qjN8T1pV/YWkGUyn5wTUyVILGKhCsMYKZxgy3hkDGbLYN6+BsKebAJGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733862891; a=rsa-sha256; cv=none; b=dOxOfygOcFIVS7J+dpmAGdqQ1ZdEBF5XsnrSHH9NWBoaQryPh/TrGMbuUHhDtuTyHptoSo 09mk403osRJfyGImDDl61mLSWks4hA2CYzkxOY1/EKcFHZETffaqf140j6cmt+hmTtuyqx HoVQ5TjvRj/VJy6cbvxADk3aen8uIBLWEAaF1LjCpD6heFCGlqg/ymZChVJqytMRnc5bdP wtHFZNGMfAPJPezlfhN2GuhoXj7zLoh8J2UhttQrnkYFl6j0yfqWG3f4Ot8RY0xbDW++fg izXw1bHq6TN4T6R+cyLrtKSEHnxeE9MZkprsuf/c+ld2PeaY7AO2e2b3Bj6SUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y79T75GT7zdTQ; Tue, 10 Dec 2024 20:34:51 +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 4BAKYp7K083983; Tue, 10 Dec 2024 20:34:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAKYple083980; Tue, 10 Dec 2024 20:34:51 GMT (envelope-from git) Date: Tue, 10 Dec 2024 20:34:51 GMT Message-Id: <202412102034.4BAKYple083980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8b1788118a1a - main - cxgbe tom: Enable TLS offload support by default List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b1788118a1af586ed056a00b32a287c41095e7a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8b1788118a1af586ed056a00b32a287c41095e7a commit 8b1788118a1af586ed056a00b32a287c41095e7a Author: John Baldwin AuthorDate: 2024-12-10 20:30:11 +0000 Commit: John Baldwin CommitDate: 2024-12-10 20:31:07 +0000 cxgbe tom: Enable TLS offload support by default Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D47764 --- sys/dev/cxgbe/t4_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index cb7f091f93ca..8c7d1ad4487a 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -7786,7 +7786,7 @@ t4_sysctls(struct adapter *sc) SYSCTL_ADD_INT(ctx, children, OID_AUTO, "rx_coalesce", CTLFLAG_RW, &sc->tt.rx_coalesce, 0, "receive coalescing"); - sc->tt.tls = 0; + sc->tt.tls = 1; SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "tls", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0, sysctl_tls, "I", "Inline TLS allowed"); From nobody Tue Dec 10 20:34:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y79T90fwvz5gZjX; Tue, 10 Dec 2024 20:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y79T9086rz4RkB; Tue, 10 Dec 2024 20:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733862893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3ZjtYZX6pk8Y2eAtiWgXTv2DWvCl5WXNSgoMj+dD2o=; b=hS+UfNeGGZK/Qyf4hZhjl3AcuX6nMJDgNYl9DVrvrw+96pSWZe10PqNA4eYY9JOFmfR4Cw DNy/PLEFJzkYhmpobYYqrCtbfTDH62ixB7fFqkZzdAEbwCw8c3MgzrXYklzQorolxXOUb+ oE8+MCRnBy7F4JY24s2jkRLN6+nerKWNJ2YV4yPvSAtex7vCLf5TA5AYjAieMcA0KajDGb V6QmiY2EreC0Zi64THt9gTet07u2NsxPPHy5XdzIzmVB96GERwr3rSbv/5q3q0YUTkEvvY FC59DygsuBc8o5MXmK36BIuTEK/kG4kZmPUw6wXv0VbBFNKarIETTPVO2IzgUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733862893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3ZjtYZX6pk8Y2eAtiWgXTv2DWvCl5WXNSgoMj+dD2o=; b=KtLKbBO/ACGe0bNY6c513Cek3En6BA/eJ5VQARnfVcv7Ux6mbuIB6rQbUv90xoCT7bpoEn D7Ll1sNwSwyEdn8K3kO39RmRMxDBoB90bnblVlr4gp6Ju6pTeN1jz3U08atPF8bcGnfJXS 4gheCybETFTRLJzLynK1jMeu7x74xLaA9SL5HJ5yfCtTlRRWV51IhULucEJ4QFJlqBGnNQ COpYrSdG+JkZVQ0jFCLLYDbmW4MxwxlN66CHraeIytzMSHR6eA1oRRN6PBPy+pLTe/x0D2 9/8icmXmMD7sC7AYBO0wuih7iUUDtMP8vLmG0Szgu4Sq2whuTfCByQhglkQz8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733862893; a=rsa-sha256; cv=none; b=SasRkHxnvuUtPF4+uYrpi0z44Q/GbZnsEYg0tjK5ze2ACdcKPTkL8u4Q0MsH1RBzWjcnNf mJetps+/lejZ1+93WyoRYnOkuK0jnKLtKdRx92NUK4qYHMlI1uQj5ob0cWJj2cbLYOBMqD WRfqRTZB9gPm+APg5/lbHhVTF4BQVAisxqnWHiHvvdMKHvYvl1xTRXgn+FeE62CpRMYEJ8 EeYN+0DVLOL4Sv/sRsS+T5TcY6eyWSGmVsG25k/OrHM4UvMPermlzdB9FMkg+fVj7YPBW4 lv4x1Qns9ocjqYPw0EDhZoUAVGKaZ0RR5Z86twCSHzzZWsg2ZsdX/VPlGSZ69g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y79T85zDJzd3V; Tue, 10 Dec 2024 20:34:52 +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 4BAKYqDe084054; Tue, 10 Dec 2024 20:34:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAKYquO084050; Tue, 10 Dec 2024 20:34:52 GMT (envelope-from git) Date: Tue, 10 Dec 2024 20:34:52 GMT Message-Id: <202412102034.4BAKYquO084050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 906521882324 - main - cxgbe: Tidy TOE tunables under hw.cxgbe List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90652188232458891a2922fb5a542971aa58055d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=90652188232458891a2922fb5a542971aa58055d commit 90652188232458891a2922fb5a542971aa58055d Author: John Baldwin AuthorDate: 2024-12-10 20:30:30 +0000 Commit: John Baldwin CommitDate: 2024-12-10 20:32:07 +0000 cxgbe: Tidy TOE tunables under hw.cxgbe - Only two of these tunables are used for RATELIMIT without TCP_OFFLOAD. - Mark t4_tmr_idx_ofld and t4_pktc_idx_ofld static. - Move hw.cxgbe.cop_managed_offloading under hw.cxgbe.toe since it is specific to TOE. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D47765 --- sys/dev/cxgbe/t4_main.c | 19 +++++++++++-------- usr.sbin/cxgbetool/cxgbetool.8 | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 8c7d1ad4487a..25d5dee8b781 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -318,15 +318,17 @@ static int t4_nofldtxq = -NOFLDTXQ; SYSCTL_INT(_hw_cxgbe, OID_AUTO, nofldtxq, CTLFLAG_RDTUN, &t4_nofldtxq, 0, "Number of offload TX queues per port"); -#define NOFLDRXQ 2 -static int t4_nofldrxq = -NOFLDRXQ; -SYSCTL_INT(_hw_cxgbe, OID_AUTO, nofldrxq, CTLFLAG_RDTUN, &t4_nofldrxq, 0, - "Number of offload RX queues per port"); - #define NOFLDTXQ_VI 1 static int t4_nofldtxq_vi = -NOFLDTXQ_VI; SYSCTL_INT(_hw_cxgbe, OID_AUTO, nofldtxq_vi, CTLFLAG_RDTUN, &t4_nofldtxq_vi, 0, "Number of offload TX queues per VI"); +#endif + +#if defined(TCP_OFFLOAD) +#define NOFLDRXQ 2 +static int t4_nofldrxq = -NOFLDRXQ; +SYSCTL_INT(_hw_cxgbe, OID_AUTO, nofldrxq, CTLFLAG_RDTUN, &t4_nofldrxq, 0, + "Number of offload RX queues per port"); #define NOFLDRXQ_VI 1 static int t4_nofldrxq_vi = -NOFLDRXQ_VI; @@ -334,12 +336,12 @@ SYSCTL_INT(_hw_cxgbe, OID_AUTO, nofldrxq_vi, CTLFLAG_RDTUN, &t4_nofldrxq_vi, 0, "Number of offload RX queues per VI"); #define TMR_IDX_OFLD 1 -int t4_tmr_idx_ofld = TMR_IDX_OFLD; +static int t4_tmr_idx_ofld = TMR_IDX_OFLD; SYSCTL_INT(_hw_cxgbe, OID_AUTO, holdoff_timer_idx_ofld, CTLFLAG_RDTUN, &t4_tmr_idx_ofld, 0, "Holdoff timer index for offload queues"); #define PKTC_IDX_OFLD (-1) -int t4_pktc_idx_ofld = PKTC_IDX_OFLD; +static int t4_pktc_idx_ofld = PKTC_IDX_OFLD; SYSCTL_INT(_hw_cxgbe, OID_AUTO, holdoff_pktc_idx_ofld, CTLFLAG_RDTUN, &t4_pktc_idx_ofld, 0, "holdoff packet counter index for offload queues"); @@ -686,9 +688,10 @@ SYSCTL_INT(_hw_cxgbe, OID_AUTO, drop_pkts_with_l4_errors, CTLFLAG_RDTUN, * TOE tunables. */ static int t4_cop_managed_offloading = 0; -SYSCTL_INT(_hw_cxgbe, OID_AUTO, cop_managed_offloading, CTLFLAG_RDTUN, +SYSCTL_INT(_hw_cxgbe_toe, OID_AUTO, cop_managed_offloading, CTLFLAG_RDTUN, &t4_cop_managed_offloading, 0, "COP (Connection Offload Policy) controls all TOE offload"); +TUNABLE_INT("hw.cxgbe.cop_managed_offloading", &t4_cop_managed_offloading); #endif #ifdef KERN_TLS diff --git a/usr.sbin/cxgbetool/cxgbetool.8 b/usr.sbin/cxgbetool/cxgbetool.8 index a25a227669ed..995a4146deb3 100644 --- a/usr.sbin/cxgbetool/cxgbetool.8 +++ b/usr.sbin/cxgbetool/cxgbetool.8 @@ -29,7 +29,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd April 14, 2022 +.Dd December 10, 2024 .Dt CXGBETOOL 8 .Os .Sh NAME @@ -553,7 +553,7 @@ Install the Connection Offload Policy (COP) in A COP offers fine-grained control over which connections get offloaded and with what parameters. Set -.Cm hw.cxgbe.cop_managed_offloading="1" +.Cm hw.cxgbe.toe.cop_managed_offloading="1" in loader.conf to ensure that t4_tom will not offload any connection before a COP is installed. Note that t4_tom must be loaded and operational (IFCAP_TOE enabled) as always From nobody Tue Dec 10 20:34:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y79TB25t0z5gb5j; Tue, 10 Dec 2024 20:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y79TB0HRRz4RpJ; Tue, 10 Dec 2024 20:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733862894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00s69XaFLbXJFH7FQ7sqy2gN2pPTrXKYdqFqEm10L2E=; b=X3WvdttOIM/YrEuJcw9cRV7MxZVUqo7KvKwenoru3QUM1EjCjtEasoeUOaDzPyjrEN4H9A pHWB4B+E5089EV+GUUojP8HM2Ny6OkdkfdFcHZII1BEDu784x01bNyxdYZO7ho9dxNGTA2 MS6SujQ6Jmj2sL0AzEgE4a09l4u4lm1eUQE2ZlGp1ghaVWtdt/JNI5SyibM8IwOXGIWBF3 UdwQg9qArjakU/z3IE5KC8nACHRebfAHAmq2/BXX5YeLgQn5U0di9MpwzGaquTNU1uhXto gsT2rBlCwUlhPIGhnnuTJHcdEfD5HdSAk20SOJjzIPt9XRvsJpQoUE/kZ1WtEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733862894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00s69XaFLbXJFH7FQ7sqy2gN2pPTrXKYdqFqEm10L2E=; b=sakUpJPg5VawKF7Mq8byvX0DQ1yXjKmH/1A1L2LVtedwwjfTz4RGAkQjSiyq4DYqtZAcPC RIjJIrXyDqipPAvuBMOa1KqMs7aO/VE4AXd0WeqZpA6jJEQbpKFCh/RTk3JhgfY8SIJQcx JiElBhl0rdF6XXwMu3UJOsOniQtTUsbs915hV5KxUMzn5Gd0PfGL7fy9Z+UdmU4qOeSSx1 P/B2Enyg/6qt5bDxWNj7eII+uIaJ6EmvQoNpWd0tOHNOBr+xRqu3j6TJjXOYROxHbMbVwP Rzese40pl2gnScPEAYHvJaX68YKfcthjXwmo/dcXRlCRI79b+j2LJppjF5PyzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733862894; a=rsa-sha256; cv=none; b=Xvf+zNMPoHS7bmzd6EG8/02zFqMtu5ZGKpgxrQdNs7KN650EQI7DLSJZU742+FK5HRpEzR gHVt+Dj19z7rTWHyFISapdKv0RF8R8pl3qJIux6YNNVq66uOQYkK64KuvwgQal+Dg0ZEIH ibsU/LqFsmDbnLJynuwu617pIB/2X/20RNB/k1Io0+NPj+gwauqTRBRhKE2rwxwOO4HqKi mfzq+rByhbro3DruekfNNUwpnFZtxFZwVnz9yN6yYPYgw6yV+MfM9MMr926rg8UyxX6xJs o2mn9N3o/jrp+rhIinFB2Nhn+wObE6wIwdg1jF7VWeN9yY0X3bNKVjtimx1kfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y79T96qC7zf63; Tue, 10 Dec 2024 20:34:53 +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 4BAKYrvf084141; Tue, 10 Dec 2024 20:34:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAKYrqP084137; Tue, 10 Dec 2024 20:34:53 GMT (envelope-from git) Date: Tue, 10 Dec 2024 20:34:53 GMT Message-Id: <202412102034.4BAKYrqP084137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 34fbc9e421e7 - main - cxgbetool.8: Consistently use .Cm for loader tunables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34fbc9e421e7fbb382a644d8d289311455681734 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=34fbc9e421e7fbb382a644d8d289311455681734 commit 34fbc9e421e7fbb382a644d8d289311455681734 Author: John Baldwin AuthorDate: 2024-12-10 20:34:10 +0000 Commit: John Baldwin CommitDate: 2024-12-10 20:34:10 +0000 cxgbetool.8: Consistently use .Cm for loader tunables Sponsored by: Chelsio Communications --- usr.sbin/cxgbetool/cxgbetool.8 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/cxgbetool/cxgbetool.8 b/usr.sbin/cxgbetool/cxgbetool.8 index 995a4146deb3..a5f345c6b781 100644 --- a/usr.sbin/cxgbetool/cxgbetool.8 +++ b/usr.sbin/cxgbetool/cxgbetool.8 @@ -531,7 +531,9 @@ List all filters programmed into the hardware. Install the firmware configuration file contained in .Ar fw-config.txt to the card. -Set hw.cxgbe.config_file="flash" in loader.conf to get +Set +.Cm hw.cxgbe.config_file="flash" +in loader.conf to get .Xr cxgbe 4 to use the on-flash configuration. .It Cm loadcfg Cm clear From nobody Tue Dec 10 20:48:30 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y79mv27pLz5gbn4; Tue, 10 Dec 2024 20:48: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y79mv1hfpz4VXX; Tue, 10 Dec 2024 20:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733863711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sk5dtdP3A4yRBN+AmVJN9itGZhRxG8cdn4lnXwX1qrU=; b=ptP7SMcGa/fq4VHQFhLeSgb71kpl+Zx7qD3pOq/rdvN8LjMBz4be+Wwqs16SCSkyCSYdVC iZgZyt34317/iM8jG8E16pA68eM4W8q5WuhfPI9D8DuTQg208nPvilE0oxP25jxVzP4e21 p2apsDVoNbUP3qiL98pCIQawak0tSplbL8824/2+SgdwpuJ26hsQRVKJQo8Os7HbUK2N5w TB/7o68see++ndGlyqX99aF24iz34nsaXGm1BHuwpLI4OzQM68Vj00qGrAVQh6+5+4KPFK lP5l3JwB6wSF+GM/UrxILKzIVLSS7mJezDwwrO+E+0rr8ixdI3z0+2SVVrrjyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733863711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sk5dtdP3A4yRBN+AmVJN9itGZhRxG8cdn4lnXwX1qrU=; b=dTsg73shivjLFAC5jKQUgDtu5YcGnUvmnFYd0GCCS9zhELcMukeI3HZr06jbqVvk04xGqj H2Bdi2xM5sPvHBCnngPo8DQihVv9MNO8/kMq6zEDZ/fHYhZv0tW2ssxm6KvV5VT2dOGHzC YWCaX/N1E1W+lc4Nvg2Zq8uQQBOnHXpu7Z+e6m4PLTwTv2jGHA6oFLpSyzeVn/SllcSL9Q IIQMvPZ83f7oH9lTwPM+VehSh8eJiMQpfteS88HIeeIeSukKN1F+PyAy2zwmel368Lrgp1 nkdDf/KI2So5cbk1yKauuIY4gmDswm8+pdjyVR02A9EIDvqG0d7mWgJZ8FOGVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733863711; a=rsa-sha256; cv=none; b=uHbyhR0yW+bZNy8aLB6NMN9v8NNpIQli0FXKdIsDPFxj/0xlEfDgWb7lvbhFVG7oKYBQDd k/e5K+dCm4PBHwHafehXA3sK06Gn62A4wuewMNHhvUuslVnoyrr8mo1c14K4aSMr/lYaOZ EB5Fg0wQjP2XGAIofrB3sjQg0/lAKt8fdlvqtrM4dRVXfQRzbuhqWYsZdwUlnKE6L7q9Tc 8cwRg+Ze12OsBSC2lvNL/R7WxmvfQvjMXvkM3ofvxgj1aZRLGl0sZXcHplSHpyrjbUGICi 5xX+fvzitfOrOGL5YQ6kjTx/2Exj7XeRhYyfyCe8r5eaxHmxkOoZfUxaEu1KiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y79mv0v8vzdvp; Tue, 10 Dec 2024 20:48: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 4BAKmUBF005056; Tue, 10 Dec 2024 20:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAKmU7Z005053; Tue, 10 Dec 2024 20:48:30 GMT (envelope-from git) Date: Tue, 10 Dec 2024 20:48:30 GMT Message-Id: <202412102048.4BAKmU7Z005053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 35623ccc3758 - main - release: Standardize on *-${FS}.* VM image naming List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35623ccc375846648f4dcdfc47c7e84fc9db4852 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=35623ccc375846648f4dcdfc47c7e84fc9db4852 commit 35623ccc375846648f4dcdfc47c7e84fc9db4852 Author: Colin Percival AuthorDate: 2024-12-10 19:57:52 +0000 Commit: Colin Percival CommitDate: 2024-12-10 20:48:17 +0000 release: Standardize on *-${FS}.* VM image naming We publish three sets of VM images on download.freebsd.org: * Generic VM images * BASIC-CLOUDINIT VM images * BASIC-CI VM images Of these, the first had names like FreeBSD-14.2-RELEASE-amd64-ufs.raw.xz, the second had names like FreeBSD-14.2-RELEASE-amd64-BASIC-CLOUDINIT.ufs.qcow2.xz, and the third had names like FreeBSD-14.2-RELEASE-amd64-BASIC-CI.ufs.raw.xz but were listed in the CHECKSUM files with names like FreeBSD-14.2-RELEASE-amd64-BASIC-CI-ufs.raw.xz Standardize these to consistently use a hyphen before the filesystem type rather than a period. Note: On FreeBSD 14 we ship images without the -${FS} component in their names; these are hardlinks to the -ufs images for compatibility purposes. On FreeBSD 13 we only have UFS images and don't include the filesystem in the name. MFC after: 1 week Reported by: jmg Sponsored by: Amazon --- release/Makefile.mirrors | 28 ++++++++++++++-------------- release/Makefile.vm | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 7f7c34e21077..5e65bfbe8b3f 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -212,13 +212,13 @@ vm-images-stage: . for VMFORMAT in ${${CW}_FORMAT} . for FS in ${${CW}_FSLIST} cd ${RELEASEDIR}/vmimages && \ - mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ - ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz - cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ - ${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + mv ${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}-${FS}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}-${FS}.${VMFORMAT}.xz \ + ${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}-${FS}.${VMFORMAT}.xz cd ${VM_DIR}/Latest && \ - ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ - ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}-${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz . endfor . endfor . endif @@ -250,8 +250,8 @@ vm-images-stage: . if ${CW} == BASIC-CLOUDINIT . for VMFORMAT in ${${CW}_FORMAT} . for FS in ${${CW}_FSLIST} - cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ - ${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ + ${VM_DIR}/Latest/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz . endfor . endfor . endif @@ -277,12 +277,12 @@ ci-images-stage: . for FS in ${${CW}_FSLIST} cd ${RELEASEDIR}/ciimages && \ mv ${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ - ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz - cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ - ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}-${FS}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}-${FS}.${VMFORMAT}.xz \ + ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}-${FS}.${VMFORMAT}.xz cd ${CI_DIR}/Latest && \ - ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ - ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}-${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz . endfor . endfor . endif @@ -307,7 +307,7 @@ ci-images-stage: . for VMFORMAT in ${${CW}_FORMAT} . for FS in ${${CW}_FSLIST} cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ - ${CI_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz + ${CI_DIR}/Latest/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz . endfor . endfor . endif diff --git a/release/Makefile.vm b/release/Makefile.vm index 5ae603b05983..5aa506ff6787 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -239,8 +239,8 @@ cloud-install-BASIC-CLOUDINIT: .for _FS in ${BASIC-CLOUDINIT_FSLIST} . for _FMT in ${BASIC-CLOUDINIT_FORMAT} cp -p ${.OBJDIR}/${BASIC-CLOUDINIT${_FS:tu}${_FMT:tu}IMAGE} \ - ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT.${_FS}.${_FMT} - ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT.${_FS}.${_FMT} + ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT} + ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT} . endfor .endfor cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \ From nobody Tue Dec 10 21:21:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7BWS4bkQz5gdmR; Tue, 10 Dec 2024 21:21: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 4Y7BWS430lz4Y5T; Tue, 10 Dec 2024 21:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733865716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xRyWo5WV9eu6THFbbKHV/RrCRorcZEIQnS6ImMswOTs=; b=uVPTSG9BUgAzmMCuV+ljnfKemY0asPYvalmsDxxKl2jgkETQXwBDwxjMVkobRWRKampMrU jd9PW1T0kchZnYdgFWFymPhg1aukfU6pdpexQqA3At+4bbyY8MmhwmxbNS99Yf2zQAnojd g79HPTleO2UmZBiYhs2yox59OmURmdcV33UQpsUIUB7mHooSAefOSrItRXmLIDeZfk5UGQ LZCgKdF3DwderzHt24VxJqGJi8IXOqGrYRh1mC4BxlJuC5SAnXlKYRlNSQzq3mOMK/qfCv PqVqnqPSrgj67/1iT7oZLfcyd6WGnjNDWBGAUtJyppEh0vckigDOTSd8ZL7LkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733865716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xRyWo5WV9eu6THFbbKHV/RrCRorcZEIQnS6ImMswOTs=; b=A55Np0EUJC4mMO4tOhlVHJt3TrNCU7MT8PHepeGCDWSzXdHuS7x2yHS+mvr1MVHvtP0YAd r45kIDuQ51rwJpToKjUshhZAcHRHWkTuda0NC5uF4pxgD46rWz+F6NhzmRP6NG3nHiZi2g 57fKvOR9Alho/XGNyRZVXznailLxMjqlx6hzB5zwNWi4JrFWfRB8UQIlFBncPIiyu4JdQx btXKce39yT7ocAKRbMNo3ipu7PUjoHbZiP05dZ4t/AAO5HXbL02QTiF8xmr1o0eMhSKjyj 6H7nbxA0idQPaSlVX6tIIW1f4DRmEoOz2nFspsA0R5AyJUBYIDN1GSIXRBjIeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733865716; a=rsa-sha256; cv=none; b=uk9lZlvHeS86Oj6/eKy9dWVTLtvz1wxlqQNwApHPkobTOZXXGcvodiVaFET2XEiFMOoXxc 8Mtzh31ElaeSmoNwdMN5Fj9phaBTypFCz/+zMtHoGNK5VQOQNuqD1D8oq+PWt25WSL/oXE agkZ2sPMDr+hhQgcbuIOXRR6Fm6lZVfDEEl58Ws2SNBgT6LVkEHAYAhqI3Q8ucLhCUtJ32 J10Ys+C4AS1USacd3M3167izgjMWaXakyZ6IF87IA/RA66SkiVqNXdkyPmcfbhiR+LTWOB bC5LTDxK0mRoXSaVkV3VnVYqzSJ2y3Lc431dFYShSRjZa6VVYmiVQWILV7lfyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7BWS3fnDzfGr; Tue, 10 Dec 2024 21:21: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 4BALLuVv074551; Tue, 10 Dec 2024 21:21:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BALLuXK074548; Tue, 10 Dec 2024 21:21:56 GMT (envelope-from git) Date: Tue, 10 Dec 2024 21:21:56 GMT Message-Id: <202412102121.4BALLuXK074548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Juraj Lutter Subject: git: f8f999c1ecf4 - main - Streamline synopsis for real-time clock (RTC) drivers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8f999c1ecf4910fbf5a472bc4dd40eb3f8acfe9 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=f8f999c1ecf4910fbf5a472bc4dd40eb3f8acfe9 commit f8f999c1ecf4910fbf5a472bc4dd40eb3f8acfe9 Author: Juraj Lutter AuthorDate: 2024-12-10 19:11:24 +0000 Commit: Juraj Lutter CommitDate: 2024-12-10 21:18:37 +0000 Streamline synopsis for real-time clock (RTC) drivers To make it easier to find RTC drivers, include both "real-time clock" and "RTC" in their synopsis. Reviewed by: mhorne Approved by: mhorne Differential Revision: https://reviews.freebsd.org/D48021 --- share/man/man4/ds1307.4 | 4 ++-- share/man/man4/ds3231.4 | 4 ++-- share/man/man4/man4.arm/aw_rtc.4 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/share/man/man4/ds1307.4 b/share/man/man4/ds1307.4 index ae8884934f09..46d22663e50c 100644 --- a/share/man/man4/ds1307.4 +++ b/share/man/man4/ds1307.4 @@ -22,12 +22,12 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 7, 2015 +.Dd December 10, 2024 .Dt DS1307 4 .Os .Sh NAME .Nm ds1307 -.Nd 64 x 8, serial, i2c real-time clock +.Nd 64 x 8, serial, i2c real-time clock (RTC) .Sh SYNOPSIS .Cd "device iic" .Cd "device iicbus" diff --git a/share/man/man4/ds3231.4 b/share/man/man4/ds3231.4 index 8734e82b4e69..52322eec6eb9 100644 --- a/share/man/man4/ds3231.4 +++ b/share/man/man4/ds3231.4 @@ -22,12 +22,12 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 12, 2016 +.Dd December 10, 2024 .Dt DS3231 4 .Os .Sh NAME .Nm ds3231 -.Nd Extremely Accurate i2c-integrated RTC/TCXO/Crystal +.Nd Extremely Accurate i2c-integrated real-time clock (RTC)/TCXO/Crystal .Sh SYNOPSIS .Cd "device iic" .Cd "device iicbus" diff --git a/share/man/man4/man4.arm/aw_rtc.4 b/share/man/man4/man4.arm/aw_rtc.4 index 5b656ec679e4..12e14dd52bee 100644 --- a/share/man/man4/man4.arm/aw_rtc.4 +++ b/share/man/man4/man4.arm/aw_rtc.4 @@ -22,12 +22,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Dec 25, 2017 +.Dd December 10, 2024 .Dt AW_RTC 4 .Os .Sh NAME .Nm aw_rtc -.Nd driver for the RTC controller in Allwinner SoC +.Nd driver for the real-time clock (RTC) controller in Allwinner SoC .Sh DESCRIPTION The .Nm From nobody Tue Dec 10 21:31:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7BkD0zmdz5gf7f; Tue, 10 Dec 2024 21:31: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 4Y7BkD0Rwdz4Z16; Tue, 10 Dec 2024 21:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733866276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GeFTPdRdI59CaqYktVNLEzcTM27D9yb5FuDQsFtvVHs=; b=KIA84XE9a7b3DgiFaIwelAfhdlxHHxhBJTJfN1rH+6MTjyghzqEb1T0yxkCZIEDIwEt5mF 6NqwXVr/tiOHpN/Dh2Qx/vctGfkEK/reM+LKFn0Rl5Bz9777KS16GIGdykMMLi7ZICjxVa Vj9q90cK0dDaqq9rLWjRtH86NYXrzsbXpH8j/jLPtMDnAgB+LPlukUoSUWxugJWu+JdBM1 taVtI+BBTmt2TsJUfo8gi5dxzzftqRU6SeWYCtAMsm+79+S3v2HCmh5PtM00OttpvBONM9 aVIKyBGe5M7XXB2jRSS+Gj2A49AAIFcNPEVKUreNfa5A4Gafgu2nki7j6tp9Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733866276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GeFTPdRdI59CaqYktVNLEzcTM27D9yb5FuDQsFtvVHs=; b=dZHcMQftpoPRHvSNYjGu0w/+eJ8rUDn4xBikXfZodU7mTZdjblr5ZjzUG13vBSWjHkPfiO ewy2XHdPnzcbM2dl2sV6H9Ry9NVsaDVEd/ew3ZpdMaH+PIP7XLZamv+ts4/jnCPQ3SgZxj 1EdZCa9JnhufYwdILyocXFjjkQgiaKYTM8pRuSTpNvgDlx/NG9rM4dUTpthioXcDuHwWOD XOx5uFzFyu85aNj5djTSrY3MBNp14JTYbxUqspeDItk1z9vEhJ1Eijpb8GPN+3zZMYvWW8 m3GKWClzQYAJpG3T5CosPpRnByw8zMBFdBVyhd+9SFzu/Mvyq9Z87dpb0J4gYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733866276; a=rsa-sha256; cv=none; b=CI0HwDio9l/bg5EfkWO0UhtPUymO3WffkQxoXs55WVBDO91gPIJkH/1qPxESzwkqPNyScF mZ2Ph4dMrR09VJBCC+WAZ+VX4fYDobd3sM1+oJXDGuZcW/ZH/Sjc8aLIBJrZ+C0vM0vqnu yDcsTIciZIzM9GANiW6F8yjygmCWSvotXbY4hrG9UxgOn66cuJ1ibfKDFi2blmSi5YVhXk y1x0YFY4MkfMrqnTWSavY6WwgHfKqgPGBFhb0JtBvM/phOhH7gF0eMwnbkGzmvGGpNALTp HfhN++YSCDFT16mlqn4vlm7AvwIhBqF/Y8wm4tMWupA9GnH+fkGIa8gqHd5Azw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7BkD03jtzgQJ; Tue, 10 Dec 2024 21:31: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 4BALVFet094309; Tue, 10 Dec 2024 21:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BALVFLp094306; Tue, 10 Dec 2024 21:31:15 GMT (envelope-from git) Date: Tue, 10 Dec 2024 21:31:15 GMT Message-Id: <202412102131.4BALVFLp094306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 85471971305d - main - riscv: enable Allwinner if_awg List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85471971305d3c13ef5f2894b44cdf93b5e80f12 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=85471971305d3c13ef5f2894b44cdf93b5e80f12 commit 85471971305d3c13ef5f2894b44cdf93b5e80f12 Author: Mitchell Horne AuthorDate: 2024-12-10 20:43:59 +0000 Commit: Mitchell Horne CommitDate: 2024-12-10 21:28:38 +0000 riscv: enable Allwinner if_awg Enable the driver and dependencies (aw_sid, nvmem). Add compat strings, etc. Found on the Allwinner D1. Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47923 --- share/man/man4/man4.arm/aw_sid.4 | 6 +++++- sys/arm/allwinner/aw_sid.c | 27 +++++++++++++++++++++++++++ sys/arm/allwinner/if_awg.c | 2 ++ sys/riscv/allwinner/files.allwinner | 2 ++ sys/riscv/conf/GENERIC | 1 + sys/riscv/conf/std.allwinner | 2 ++ 6 files changed, 39 insertions(+), 1 deletion(-) diff --git a/share/man/man4/man4.arm/aw_sid.4 b/share/man/man4/man4.arm/aw_sid.4 index be441033d242..5cd2f3d5e072 100644 --- a/share/man/man4/man4.arm/aw_sid.4 +++ b/share/man/man4/man4.arm/aw_sid.4 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 6, 2018 +.Dd October 8, 2024 .Dt AW_SID 4 .Os .Sh NAME @@ -53,6 +53,10 @@ allwinner,sun50i-a64-sid allwinner,sun8i-a83t-sid .It allwinner,sun8i-h3-sid +.It +allwinner,sun50i-h5-sid +.It +allwinner,sun20i-d1-sid .El .Sh SYSCTL VARIABLES The following read-only variables are available via diff --git a/sys/arm/allwinner/aw_sid.c b/sys/arm/allwinner/aw_sid.c index a333eadc20aa..ba5faca33c5e 100644 --- a/sys/arm/allwinner/aw_sid.c +++ b/sys/arm/allwinner/aw_sid.c @@ -169,6 +169,27 @@ static struct aw_sid_efuse h5_efuses[] = { }, }; +static struct aw_sid_efuse d1_efuses[] = { + { + .name = "rootkey", + .desc = "Root Key or ChipID", + .base = EFUSE_OFFSET, + .offset = 0x00, + .size = 16, + .id = AW_SID_FUSE_ROOTKEY, + .public = true, + }, + { + .name = "calibration", + .desc = "Thermal Sensor Calibration Data", + .base = EFUSE_OFFSET, + .offset = 0x34, + .size = 4, + .id = AW_SID_FUSE_THSSENSOR, + .public = true, + }, +}; + struct aw_sid_conf { struct aw_sid_efuse *efuses; size_t nfuses; @@ -204,6 +225,11 @@ static const struct aw_sid_conf h5_conf = { .nfuses = nitems(h5_efuses), }; +static const struct aw_sid_conf d1_conf = { + .efuses = d1_efuses, + .nfuses = nitems(d1_efuses), +}; + static struct ofw_compat_data compat_data[] = { { "allwinner,sun4i-a10-sid", (uintptr_t)&a10_conf}, { "allwinner,sun7i-a20-sid", (uintptr_t)&a20_conf}, @@ -211,6 +237,7 @@ static struct ofw_compat_data compat_data[] = { { "allwinner,sun8i-a83t-sid", (uintptr_t)&a83t_conf}, { "allwinner,sun8i-h3-sid", (uintptr_t)&h3_conf}, { "allwinner,sun50i-h5-sid", (uintptr_t)&h5_conf}, + { "allwinner,sun20i-d1-sid", (uintptr_t)&d1_conf}, { NULL, 0 } }; diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c index 29a75e5a4d9b..98e879d22d3d 100644 --- a/sys/arm/allwinner/if_awg.c +++ b/sys/arm/allwinner/if_awg.c @@ -143,12 +143,14 @@ enum awg_type { EMAC_A83T = 1, EMAC_H3, EMAC_A64, + EMAC_D1, }; static struct ofw_compat_data compat_data[] = { { "allwinner,sun8i-a83t-emac", EMAC_A83T }, { "allwinner,sun8i-h3-emac", EMAC_H3 }, { "allwinner,sun50i-a64-emac", EMAC_A64 }, + { "allwinner,sun20i-d1-emac", EMAC_D1 }, { NULL, 0 } }; diff --git a/sys/riscv/allwinner/files.allwinner b/sys/riscv/allwinner/files.allwinner index e29300c627a1..f6be2cf97e57 100644 --- a/sys/riscv/allwinner/files.allwinner +++ b/sys/riscv/allwinner/files.allwinner @@ -1,7 +1,9 @@ arm/allwinner/aw_rtc.c optional aw_rtc fdt arm/allwinner/aw_syscon.c optional syscon +arm/allwinner/aw_sid.c optional aw_sid nvmem arm/allwinner/aw_wdog.c optional aw_wdog +arm/allwinner/if_awg.c optional awg syscon # Allwinner clock drivers dev/clk/allwinner/aw_ccung.c optional aw_ccu fdt diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 4e01c39bc008..4fdb1bdd6403 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -83,6 +83,7 @@ device rcons # pseudo devices device clk device hwreset +device nvmem device phy device regulator device syscon diff --git a/sys/riscv/conf/std.allwinner b/sys/riscv/conf/std.allwinner index f04e88c98b5b..4f3d98250cc5 100644 --- a/sys/riscv/conf/std.allwinner +++ b/sys/riscv/conf/std.allwinner @@ -7,6 +7,8 @@ options SOC_ALLWINNER_D1 device aw_ccu # Allwinner clock controller device aw_rtc # Allwinner Real-time Clock +device aw_sid # Allwinner Secure ID EFUSE device aw_wdog # Allwinner Watchdog +device awg # Allwinner EMAC Gigabit Ethernet files "../allwinner/files.allwinner" From nobody Tue Dec 10 21:31:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7BkF1cxLz5gfGZ; Tue, 10 Dec 2024 21:31: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 4Y7BkF1CSsz4Z5V; Tue, 10 Dec 2024 21:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733866277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVu8ZoJFC28Qw57RKvyWuwT78XkhipZugbrQPEWH72E=; b=BmZZyPkB3B6i/kpZi+K2d6bQNhbCHhg9ZNHwQ7AgabJN8SDk/upJh9zInt7DyQ7CI1Zc2O iMj5le89aAnclR66fvup7Ikw/mdqPkyMPu0ExThlWCM0HhIjUHNtJronDUmTgk9ZV2RlzJ lgBNiwrDyMrqIca+T1y1kfs44QlsRntYSlbbigG4uDgTws96LyAV8PKMF9GprOLHinRnkS ISFuH8cQ4BmrPD1fmyu2/IT3oj4O+39Ur0z/zh9O2CqSDgXKw4qqcz2X3/+Zkb2AxLj9FX pLIR2PIiCDaloW1TOq8EfxtvxQSBEtGDqSsBdXZQQl4XQ0F5uDKlM6BuSGGVMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733866277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVu8ZoJFC28Qw57RKvyWuwT78XkhipZugbrQPEWH72E=; b=HkE8vyHSHsW78mgJ7YUVLNZa1GiBCnkFSlTkWdLfsN1RyHuEITXpN7Z6VnQahA5FpyQgEv Dk+bFlLel05yMsLBphFbDabM6q2f0siyX302ZjKwwzRiTZTsu7FHZPWpvOhPJuHlWycCUR Vr+ELs+YVIdUAw4awCaLWmLnm2SF+G0oOY4YzsFlilsP3nnhww2+WS5/KYY0Mu+Rrk6wwl Vt8YuN9cZK11Wfrg8Q95gGgpYs6DKlw0uzk5qLjbsvvmAGoJ6UCKSe0UxulvCMvQ2yuyzK jDmwoxM8/Hc0Cz2yQ76Sfv3ywJXesgOBGsOdBAp4+1ij3ePTbvYJQ9gg2Bqq0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733866277; a=rsa-sha256; cv=none; b=AhURtDQZxZBFl/WJTMK8SqT9utv3VX5Xx0UqT4xFHcr4SsW4/03zsvKYC4eg7lON3w8//b /u8voqMIuw1MUO2X4Ba0t287xxBLMDhbjwxX7QkKyu9hMVgf9HR1w+0ZgAbEimURZC93m7 RudCfQoI0fFjeIMPwIx/t4UiOdYTRt0i4d/JTbn9dUoiR5vFg1gvcD3DSocUg2D6S96YSv fnfNq2LZ41rpTePO0mV11DHRD6/AkAgXEx/53SxLzh2gcF8BUF88D353/AX8Oy8xVLdx0E zQ/2RrGyCjMEjr081LuPRI2z0w9pam/W1NXn7uECdJhKLEfxuSXgE/1QoJ2PMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7BkF0qFmzf9w; Tue, 10 Dec 2024 21:31: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 4BALVHDA094351; Tue, 10 Dec 2024 21:31:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BALVHnd094348; Tue, 10 Dec 2024 21:31:17 GMT (envelope-from git) Date: Tue, 10 Dec 2024 21:31:17 GMT Message-Id: <202412102131.4BALVHnd094348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 719245455853 - main - aw_gpio: support Allwinner D1 GPIO List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7192454558532101229629a8575d161013f3a7cb Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7192454558532101229629a8575d161013f3a7cb commit 7192454558532101229629a8575d161013f3a7cb Author: Julien Cassette AuthorDate: 2024-12-10 21:22:40 +0000 Commit: Mitchell Horne CommitDate: 2024-12-10 21:30:13 +0000 aw_gpio: support Allwinner D1 GPIO The GPIO controls the multiplexing of the D1 pins to its peripherals, so this adds the definitions needed by the aw_gpio driver to support the D1. Also, this modifies the aw_gpio driver to support the differences of the D1 controller: - pins can have up to 15 functions - each port is mapped with an alignment of 0x30 - CFG registers have 4 bits per pin - DRV registers have 4 bits per pin - the offset of PULL registers is 0x24 Signed-off-by: Julien Cassette Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D35593 --- share/man/man4/man4.arm/aw_gpio.4 | 5 +- sys/arm/allwinner/allwinner_pinctrl.h | 4 +- sys/arm/allwinner/aw_gpio.c | 136 ++++++++++++++++++++++++++-------- sys/riscv/allwinner/d1_padconf.c | 129 ++++++++++++++++++++++++++++++++ sys/riscv/allwinner/files.allwinner | 3 + sys/riscv/conf/GENERIC | 1 + sys/riscv/conf/std.allwinner | 1 + 7 files changed, 247 insertions(+), 32 deletions(-) diff --git a/share/man/man4/man4.arm/aw_gpio.4 b/share/man/man4/man4.arm/aw_gpio.4 index 3d72e82b3efc..5cbc7562d9bd 100644 --- a/share/man/man4/man4.arm/aw_gpio.4 +++ b/share/man/man4/man4.arm/aw_gpio.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Dec 25, 2017 +.Dd October 8, 2024 .Dt AW_GPIO 4 .Os .Sh NAME @@ -41,6 +41,7 @@ .Cd "options SOC_ALLWINNER_H3" .Cd "options SOC_ALLWINNER_A64" .Cd "options SOC_ALLWINNER_H5" +.Cd "options SOC_ALLWINNER_D1" .Sh DESCRIPTION The .Nm @@ -81,6 +82,8 @@ allwinner,sun8i-h3-r-pinctrl allwinner,sun50i-a64-pinctrl .It allwinner,sun50i-a64-r-pinctrl +.It +allwinner,sun20i-d1-pinctrl .El .Sh SEE ALSO .Xr fdt 4 , diff --git a/sys/arm/allwinner/allwinner_pinctrl.h b/sys/arm/allwinner/allwinner_pinctrl.h index 4eaa2d84146c..67fd13683a46 100644 --- a/sys/arm/allwinner/allwinner_pinctrl.h +++ b/sys/arm/allwinner/allwinner_pinctrl.h @@ -26,13 +26,13 @@ #ifndef _ALLWINNER_PINCTRL_H_ #define _ALLWINNER_PINCTRL_H_ -#define AW_MAX_FUNC_BY_PIN 8 +#define AW_MAX_FUNC_BY_PIN 15 struct allwinner_pins { const char *name; uint8_t port; uint8_t pin; - const char *functions[8]; + const char *functions[AW_MAX_FUNC_BY_PIN]; uint8_t eint_func; uint8_t eint_num; uint8_t eint_bank; diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c index 6ff0516acb3f..b469a7fb453d 100644 --- a/sys/arm/allwinner/aw_gpio.c +++ b/sys/arm/allwinner/aw_gpio.c @@ -4,6 +4,7 @@ * Copyright (c) 2013 Ganbold Tsagaankhuu * Copyright (c) 2012 Oleksandr Tymoshenko * Copyright (c) 2012 Luiz Otavio O Souza. + * Copyright (c) 2022 Julien Cassette * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,7 +57,7 @@ #include #include -#if defined(__aarch64__) +#if defined(__aarch64__) || defined(__riscv) #include "opt_soc.h" #endif @@ -82,9 +83,18 @@ #define AW_PINCTRL 1 #define AW_R_PINCTRL 2 +#if defined(__arm__) || defined(__aarch64__) +#define IRQ_MEMORY_BARRIER(x) arm_irq_memory_barrier(x) +#else +#define IRQ_MEMORY_BARRIER(x) fence() +#endif + struct aw_gpio_conf { struct allwinner_padconf *padconf; const char *banks; + uint32_t bank_size; + uint32_t drv_pin_shift; + uint32_t pul_offset; }; /* Defined in aw_padconf.c */ @@ -93,6 +103,9 @@ extern struct allwinner_padconf a10_padconf; struct aw_gpio_conf a10_gpio_conf = { .padconf = &a10_padconf, .banks = "abcdefghi", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -102,6 +115,9 @@ extern struct allwinner_padconf a13_padconf; struct aw_gpio_conf a13_gpio_conf = { .padconf = &a13_padconf, .banks = "bcdefg", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -111,6 +127,9 @@ extern struct allwinner_padconf a20_padconf; struct aw_gpio_conf a20_gpio_conf = { .padconf = &a20_padconf, .banks = "abcdefghi", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -120,6 +139,9 @@ extern struct allwinner_padconf a31_padconf; struct aw_gpio_conf a31_gpio_conf = { .padconf = &a31_padconf, .banks = "abcdefgh", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -129,6 +151,9 @@ extern struct allwinner_padconf a31s_padconf; struct aw_gpio_conf a31s_gpio_conf = { .padconf = &a31s_padconf, .banks = "abcdefgh", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -137,6 +162,9 @@ extern struct allwinner_padconf a31_r_padconf; struct aw_gpio_conf a31_r_gpio_conf = { .padconf = &a31_r_padconf, .banks = "lm", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -146,6 +174,9 @@ extern struct allwinner_padconf a33_padconf; struct aw_gpio_conf a33_gpio_conf = { .padconf = &a33_padconf, .banks = "bcdefgh", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -156,10 +187,16 @@ extern struct allwinner_padconf h3_r_padconf; struct aw_gpio_conf h3_gpio_conf = { .padconf = &h3_padconf, .banks = "acdefg", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; struct aw_gpio_conf h3_r_gpio_conf = { .padconf = &h3_r_padconf, .banks = "l", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -170,10 +207,16 @@ extern struct allwinner_padconf a83t_r_padconf; struct aw_gpio_conf a83t_gpio_conf = { .padconf = &a83t_padconf, .banks = "bcdefgh" + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; struct aw_gpio_conf a83t_r_gpio_conf = { .padconf = &a83t_r_padconf, .banks = "l", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -184,10 +227,28 @@ extern struct allwinner_padconf a64_r_padconf; struct aw_gpio_conf a64_gpio_conf = { .padconf = &a64_padconf, .banks = "bcdefgh", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; struct aw_gpio_conf a64_r_gpio_conf = { .padconf = &a64_r_padconf, .banks = "l", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, +}; +#endif + +/* Defined in d1_padconf.c */ +#ifdef SOC_ALLWINNER_D1 +extern struct allwinner_padconf d1_padconf; +struct aw_gpio_conf d1_gpio_conf = { + .padconf = &d1_padconf, + .banks = "bcdefg", + .bank_size = 0x30, + .drv_pin_shift = 2, + .pul_offset = 0x24, }; #endif @@ -198,10 +259,16 @@ extern struct allwinner_padconf h6_r_padconf; struct aw_gpio_conf h6_gpio_conf = { .padconf = &h6_padconf, .banks = "cdfgh", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; struct aw_gpio_conf h6_r_gpio_conf = { .padconf = &h6_r_padconf, .banks = "lm", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, }; #endif @@ -240,6 +307,9 @@ static struct ofw_compat_data compat_data[] = { {"allwinner,sun50i-a64-pinctrl", (uintptr_t)&a64_gpio_conf}, {"allwinner,sun50i-a64-r-pinctrl", (uintptr_t)&a64_r_gpio_conf}, #endif +#ifdef SOC_ALLWINNER_D1 + {"allwinner,sun20i-d1-pinctrl", (uintptr_t)&d1_gpio_conf}, +#endif #ifdef SOC_ALLWINNER_H6 {"allwinner,sun50i-h6-pinctrl", (uintptr_t)&h6_gpio_conf}, {"allwinner,sun50i-h6-r-pinctrl", (uintptr_t)&h6_r_gpio_conf}, @@ -293,10 +363,16 @@ static struct resource_spec aw_gpio_res_spec[] = { #define AW_GPIO_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx) #define AW_GPIO_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED) -#define AW_GPIO_GP_CFG(_bank, _idx) 0x00 + ((_bank) * 0x24) + ((_idx) << 2) -#define AW_GPIO_GP_DAT(_bank) 0x10 + ((_bank) * 0x24) -#define AW_GPIO_GP_DRV(_bank, _idx) 0x14 + ((_bank) * 0x24) + ((_idx) << 2) -#define AW_GPIO_GP_PUL(_bank, _idx) 0x1c + ((_bank) * 0x24) + ((_idx) << 2) +#define AW_GPIO_GP_BASE(_sc, _bank) ((_sc)->conf->bank_size * (_bank)) + +#define AW_GPIO_GP_CFG(_sc, _bank, _idx) \ + (AW_GPIO_GP_BASE(_sc, _bank) + 0x00 + ((_idx) << 2)) +#define AW_GPIO_GP_DAT(_sc, _bank) \ + (AW_GPIO_GP_BASE(_sc, _bank) + 0x10) +#define AW_GPIO_GP_DRV(_sc, _bank, _idx) \ + (AW_GPIO_GP_BASE(_sc, _bank) + 0x14 + ((_idx) << 2)) +#define AW_GPIO_GP_PUL(_sc, _bank, _idx) \ + (AW_GPIO_GP_BASE(_sc, _bank) + (_sc)->conf->pul_offset + ((_idx) << 2)) #define AW_GPIO_GP_INT_BASE(_bank) (0x200 + 0x20 * _bank) @@ -346,9 +422,9 @@ aw_gpio_get_function(struct aw_gpio_softc *sc, uint32_t pin) pin = sc->conf->padconf->pins[pin].pin; offset = ((pin & 0x07) << 2); - func = AW_GPIO_READ(sc, AW_GPIO_GP_CFG(bank, pin >> 3)); + func = AW_GPIO_READ(sc, AW_GPIO_GP_CFG(sc, bank, pin >> 3)); - return ((func >> offset) & 0x7); + return ((func >> offset) & 0xF); } static int @@ -367,10 +443,10 @@ aw_gpio_set_function(struct aw_gpio_softc *sc, uint32_t pin, uint32_t f) pin = sc->conf->padconf->pins[pin].pin; offset = ((pin & 0x07) << 2); - data = AW_GPIO_READ(sc, AW_GPIO_GP_CFG(bank, pin >> 3)); - data &= ~(7 << offset); + data = AW_GPIO_READ(sc, AW_GPIO_GP_CFG(sc, bank, pin >> 3)); + data &= ~(0xF << offset); data |= (f << offset); - AW_GPIO_WRITE(sc, AW_GPIO_GP_CFG(bank, pin >> 3), data); + AW_GPIO_WRITE(sc, AW_GPIO_GP_CFG(sc, bank, pin >> 3), data); return (0); } @@ -387,7 +463,7 @@ aw_gpio_get_pud(struct aw_gpio_softc *sc, uint32_t pin) pin = sc->conf->padconf->pins[pin].pin; offset = ((pin & 0x0f) << 1); - val = AW_GPIO_READ(sc, AW_GPIO_GP_PUL(bank, pin >> 4)); + val = AW_GPIO_READ(sc, AW_GPIO_GP_PUL(sc, bank, pin >> 4)); return ((val >> offset) & AW_GPIO_PUD_MASK); } @@ -407,25 +483,26 @@ aw_gpio_set_pud(struct aw_gpio_softc *sc, uint32_t pin, uint32_t state) pin = sc->conf->padconf->pins[pin].pin; offset = ((pin & 0x0f) << 1); - val = AW_GPIO_READ(sc, AW_GPIO_GP_PUL(bank, pin >> 4)); + val = AW_GPIO_READ(sc, AW_GPIO_GP_PUL(sc, bank, pin >> 4)); val &= ~(AW_GPIO_PUD_MASK << offset); val |= (state << offset); - AW_GPIO_WRITE(sc, AW_GPIO_GP_PUL(bank, pin >> 4), val); + AW_GPIO_WRITE(sc, AW_GPIO_GP_PUL(sc, bank, pin >> 4), val); } static uint32_t aw_gpio_get_drv(struct aw_gpio_softc *sc, uint32_t pin) { - uint32_t bank, offset, val; + uint32_t bank, idx, offset, val; /* Must be called with lock held. */ AW_GPIO_LOCK_ASSERT(sc); bank = sc->conf->padconf->pins[pin].port; pin = sc->conf->padconf->pins[pin].pin; - offset = ((pin & 0x0f) << 1); + offset = (pin << sc->conf->drv_pin_shift) & 0x1F; + idx = (pin << sc->conf->drv_pin_shift) >> 5; - val = AW_GPIO_READ(sc, AW_GPIO_GP_DRV(bank, pin >> 4)); + val = AW_GPIO_READ(sc, AW_GPIO_GP_DRV(sc, bank, idx)); return ((val >> offset) & AW_GPIO_DRV_MASK); } @@ -433,7 +510,7 @@ aw_gpio_get_drv(struct aw_gpio_softc *sc, uint32_t pin) static void aw_gpio_set_drv(struct aw_gpio_softc *sc, uint32_t pin, uint32_t drive) { - uint32_t bank, offset, val; + uint32_t bank, idx, offset, val; if (aw_gpio_get_drv(sc, pin) == drive) return; @@ -443,12 +520,13 @@ aw_gpio_set_drv(struct aw_gpio_softc *sc, uint32_t pin, uint32_t drive) bank = sc->conf->padconf->pins[pin].port; pin = sc->conf->padconf->pins[pin].pin; - offset = ((pin & 0x0f) << 1); + offset = (pin << sc->conf->drv_pin_shift) & 0x1F; + idx = (pin << sc->conf->drv_pin_shift) >> 5; - val = AW_GPIO_READ(sc, AW_GPIO_GP_DRV(bank, pin >> 4)); + val = AW_GPIO_READ(sc, AW_GPIO_GP_DRV(sc, bank, idx)); val &= ~(AW_GPIO_DRV_MASK << offset); val |= (drive << offset); - AW_GPIO_WRITE(sc, AW_GPIO_GP_DRV(bank, pin >> 4), val); + AW_GPIO_WRITE(sc, AW_GPIO_GP_DRV(sc, bank, idx), val); } static int @@ -624,12 +702,12 @@ aw_gpio_pin_set_locked(struct aw_gpio_softc *sc, uint32_t pin, bank = sc->conf->padconf->pins[pin].port; pin = sc->conf->padconf->pins[pin].pin; - data = AW_GPIO_READ(sc, AW_GPIO_GP_DAT(bank)); + data = AW_GPIO_READ(sc, AW_GPIO_GP_DAT(sc, bank)); if (value) data |= (1 << pin); else data &= ~(1 << pin); - AW_GPIO_WRITE(sc, AW_GPIO_GP_DAT(bank), data); + AW_GPIO_WRITE(sc, AW_GPIO_GP_DAT(sc, bank), data); return (0); } @@ -672,7 +750,7 @@ aw_gpio_pin_get_locked(struct aw_gpio_softc *sc,uint32_t pin, bank = sc->conf->padconf->pins[pin].port; pin = sc->conf->padconf->pins[pin].pin; - reg_data = AW_GPIO_READ(sc, AW_GPIO_GP_DAT(bank)); + reg_data = AW_GPIO_READ(sc, AW_GPIO_GP_DAT(sc, bank)); *val = (reg_data & (1 << pin)) ? 1 : 0; if (func == sc->conf->padconf->pins[pin].eint_func) @@ -779,12 +857,12 @@ aw_gpio_pin_toggle(device_t dev, uint32_t pin) pin = sc->conf->padconf->pins[pin].pin; AW_GPIO_LOCK(sc); - data = AW_GPIO_READ(sc, AW_GPIO_GP_DAT(bank)); + data = AW_GPIO_READ(sc, AW_GPIO_GP_DAT(sc, bank)); if (data & (1 << pin)) data &= ~(1 << pin); else data |= (1 << pin); - AW_GPIO_WRITE(sc, AW_GPIO_GP_DAT(bank), data); + AW_GPIO_WRITE(sc, AW_GPIO_GP_DAT(sc, bank), data); AW_GPIO_UNLOCK(sc); return (0); @@ -813,9 +891,9 @@ aw_gpio_pin_access_32(device_t dev, uint32_t first_pin, uint32_t clear_pins, return (EINVAL); AW_GPIO_LOCK(sc); - data = AW_GPIO_READ(sc, AW_GPIO_GP_DAT(bank)); + data = AW_GPIO_READ(sc, AW_GPIO_GP_DAT(sc, bank)); if ((clear_pins | change_pins) != 0) - AW_GPIO_WRITE(sc, AW_GPIO_GP_DAT(bank), + AW_GPIO_WRITE(sc, AW_GPIO_GP_DAT(sc, bank), (data & ~clear_pins) ^ change_pins); AW_GPIO_UNLOCK(sc); @@ -1408,7 +1486,7 @@ aw_gpio_pic_post_filter(device_t dev, struct intr_irqsrc *isrc) sc = device_get_softc(dev); gi = (struct gpio_irqsrc *)isrc; - arm_irq_memory_barrier(0); + IRQ_MEMORY_BARRIER(0); AW_GPIO_WRITE(sc, AW_GPIO_GP_INT_STA(gi->bank), 1 << gi->intnum); } @@ -1421,7 +1499,7 @@ aw_gpio_pic_post_ithread(device_t dev, struct intr_irqsrc *isrc) sc = device_get_softc(dev); gi = (struct gpio_irqsrc *)isrc; - arm_irq_memory_barrier(0); + IRQ_MEMORY_BARRIER(0); AW_GPIO_WRITE(sc, AW_GPIO_GP_INT_STA(gi->bank), 1 << gi->intnum); aw_gpio_pic_enable_intr(dev, isrc); } diff --git a/sys/riscv/allwinner/d1_padconf.c b/sys/riscv/allwinner/d1_padconf.c new file mode 100644 index 000000000000..7a429d216051 --- /dev/null +++ b/sys/riscv/allwinner/d1_padconf.c @@ -0,0 +1,129 @@ +/*- + * Copyright (c) 2022 Julien Cassette + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ +#include +#include +#include +#include + +#include + +#include "opt_soc.h" + +static const struct allwinner_pins d1_pins[] = { + { "PB0", 1, 0, { "gpio_in", "gpio_out", "pwm3", "ir", "i2c2", "spi1", "uart0", "uart2", "spdif", [14] = "pb_eint0" }, 14, 0, 1 }, + { "PB1", 1, 1, { "gpio_in", "gpio_out", "pwm4", "i2s2", "i2c2", "i2s2", "uart0", "uart2", "ir", [14] = "pb_eint1" }, 14, 1, 1 }, + { "PB2", 1, 2, { "gpio_in", "gpio_out", "lcd0", "i2s2", "i2c0", "i2s2", "lcd0", "uart4", NULL, [14] = "pb_eint2" }, 14, 2, 1 }, + { "PB3", 1, 3, { "gpio_in", "gpio_out", "lcd0", "i2s2", "i2c0", "i2s2", "lcd0", "uart4", NULL, [14] = "pb_eint3" }, 14, 3, 1 }, + { "PB4", 1, 4, { "gpio_in", "gpio_out", "lcd0", "i2s2", "i2c1", "i2s2", "lcd0", "uart5", NULL, [14] = "pb_eint4" }, 14, 4, 1 }, + { "PB5", 1, 5, { "gpio_in", "gpio_out", "lcd0", "i2s2", "i2c1", "pwm0", "lcd0", "uart5", NULL, [14] = "pb_eint5" }, 14, 5, 1 }, + { "PB6", 1, 6, { "gpio_in", "gpio_out", "lcd0", "i2s2", "i2c3", "pwm1", "lcd0", "uart3", "cpu", [14] = "pb_eint6" }, 14, 6, 1 }, + { "PB7", 1, 7, { "gpio_in", "gpio_out", "lcd0", "i2s2", "i2c3", "ir", "lcd0", "uart3", "cpu", [14] = "pb_eint7" }, 14, 7, 1 }, + { "PB8", 1, 8, { "gpio_in", "gpio_out", "dmic", "pwm5", "i2c2", "spi1", "uart0", "uart1", NULL, [14] = "pb_eint8" }, 14, 8, 1 }, + { "PB9", 1, 9, { "gpio_in", "gpio_out", "dmic", "pwm6", "i2c2", "spi1", "uart0", "uart1", NULL, [14] = "pb_eint9" }, 14, 9, 1 }, + { "PB10", 1, 10, { "gpio_in", "gpio_out", "dmic", "pwm7", "i2c0", "spi1", "clk", "uart1", NULL, [14] = "pb_eint10" }, 14, 10, 1 }, + { "PB11", 1, 11, { "gpio_in", "gpio_out", "dmic", "pwm2", "i2c0", "spi1", "clk", "uart1", NULL, [14] = "pb_eint11" }, 14, 11, 1 }, + { "PB12", 1, 12, { "gpio_in", "gpio_out", "dmic", "pwm0", "spdif", "spi1", "clk", "ir", NULL, [14] = "pb_eint12" }, 14, 12, 1 }, + { "PC0", 2, 0, { "gpio_in", "gpio_out", "uart2", "i2c2", "ledc", NULL, NULL, NULL, NULL, [14] = "pc_eint0" }, 14, 0, 2 }, + { "PC1", 2, 1, { "gpio_in", "gpio_out", "uart2", "i2c2", NULL, NULL, NULL, NULL, NULL, [14] = "pc_eint1" }, 14, 1, 2 }, + { "PC2", 2, 2, { "gpio_in", "gpio_out", "spi0", "mmc2", NULL, NULL, NULL, NULL, NULL, [14] = "pc_eint2" }, 14, 2, 2 }, + { "PC3", 2, 3, { "gpio_in", "gpio_out", "spi0", "mmc2", NULL, NULL, NULL, NULL, NULL, [14] = "pc_eint3" }, 14, 3, 2 }, + { "PC4", 2, 4, { "gpio_in", "gpio_out", "spi0", "mmc2", "boot", NULL, NULL, NULL, NULL, [14] = "pc_eint4" }, 14, 4, 2 }, + { "PC5", 2, 5, { "gpio_in", "gpio_out", "spi0", "mmc2", "boot", NULL, NULL, NULL, NULL, [14] = "pc_eint5" }, 14, 5, 2 }, + { "PC6", 2, 6, { "gpio_in", "gpio_out", "spi0", "mmc2", "uart3", "i2c3", "dbg", NULL, NULL, [14] = "pc_eint6" }, 14, 6, 2 }, + { "PC7", 2, 7, { "gpio_in", "gpio_out", "spi0", "mmc2", "uart3", "i2c3", "tcon", NULL, NULL, [14] = "pc_eint7" }, 14, 7, 2 }, + { "PD0", 3, 0, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "i2c0", NULL, NULL, NULL, [14] = "pd_eint0" }, 14, 0, 3 }, + { "PD1", 3, 1, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "uart2", NULL, NULL, NULL, [14] = "pd_eint1" }, 14, 1, 3 }, + { "PD2", 3, 2, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "uart2", NULL, NULL, NULL, [14] = "pd_eint2" }, 14, 2, 3 }, + { "PD3", 3, 3, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "uart2", NULL, NULL, NULL, [14] = "pd_eint3" }, 14, 3, 3 }, + { "PD4", 3, 4, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "uart2", NULL, NULL, NULL, [14] = "pd_eint4" }, 14, 4, 3 }, + { "PD5", 3, 5, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "uart5", NULL, NULL, NULL, [14] = "pd_eint5" }, 14, 5, 3 }, + { "PD6", 3, 6, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "uart5", NULL, NULL, NULL, [14] = "pd_eint6" }, 14, 6, 3 }, + { "PD7", 3, 7, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "uart4", NULL, NULL, NULL, [14] = "pd_eint7" }, 14, 7, 3 }, + { "PD8", 3, 8, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "uart4", NULL, NULL, NULL, [14] = "pd_eint8" }, 14, 8, 3 }, + { "PD9", 3, 9, { "gpio_in", "gpio_out", "lcd0", "lvds0", "dsi", "pwm6", NULL, NULL, NULL, [14] = "pd_eint9" }, 14, 9, 3 }, + { "PD10", 3, 10, { "gpio_in", "gpio_out", "lcd0", "lvds1", "spi1", "uart3", NULL, NULL, NULL, [14] = "pd_eint10" }, 14, 10, 3 }, + { "PD11", 3, 11, { "gpio_in", "gpio_out", "lcd0", "lvds1", "spi1", "uart3", NULL, NULL, NULL, [14] = "pd_eint11" }, 14, 11, 3 }, + { "PD12", 3, 12, { "gpio_in", "gpio_out", "lcd0", "lvds1", "spi1", "i2c0", NULL, NULL, NULL, [14] = "pd_eint12" }, 14, 12, 3 }, + { "PD13", 3, 13, { "gpio_in", "gpio_out", "lcd0", "lvds1", "spi1", "uart3", NULL, NULL, NULL, [14] = "pd_eint13" }, 14, 13, 3 }, + { "PD14", 3, 14, { "gpio_in", "gpio_out", "lcd0", "lvds1", "spi1", "uart3", NULL, NULL, NULL, [14] = "pd_eint14" }, 14, 14, 3 }, + { "PD15", 3, 15, { "gpio_in", "gpio_out", "lcd0", "lvds1", "spi1", "ir", NULL, NULL, NULL, [14] = "pd_eint15" }, 14, 15, 3 }, + { "PD16", 3, 16, { "gpio_in", "gpio_out", "lcd0", "lvds1", "dmic", "pwm0", NULL, NULL, NULL, [14] = "pd_eint16" }, 14, 16, 3 }, + { "PD17", 3, 17, { "gpio_in", "gpio_out", "lcd0", "lvds1", "dmic", "pwm1", NULL, NULL, NULL, [14] = "pd_eint17" }, 14, 17, 3 }, + { "PD18", 3, 18, { "gpio_in", "gpio_out", "lcd0", "lvds1", "dmic", "pwm2", NULL, NULL, NULL, [14] = "pd_eint18" }, 14, 18, 3 }, + { "PD19", 3, 19, { "gpio_in", "gpio_out", "lcd0", "lvds1", "dmic", "pwm3", NULL, NULL, NULL, [14] = "pd_eint19" }, 14, 19, 3 }, + { "PD20", 3, 20, { "gpio_in", "gpio_out", "lcd0", "i2c2", "dmic", "pwm4", NULL, NULL, NULL, [14] = "pd_eint20" }, 14, 20, 3 }, + { "PD21", 3, 21, { "gpio_in", "gpio_out", "lcd0", "i2c2", "uart1", "pwm5", NULL, NULL, NULL, [14] = "pd_eint21" }, 14, 21, 3 }, + { "PD22", 3, 22, { "gpio_in", "gpio_out", "spdif", "ir", "uart1", "pwm7", NULL, NULL, NULL, [14] = "pd_eint22" }, 14, 22, 3 }, + { "PE0", 4, 0, { "gpio_in", "gpio_out", "ncsi0", "uart2", "i2c1", "lcd0", NULL, NULL, "emac", [14] = "pe_eint0" }, 14, 0, 4 }, + { "PE1", 4, 1, { "gpio_in", "gpio_out", "ncsi0", "uart2", "i2c1", "lcd0", NULL, NULL, "emac", [14] = "pe_eint1" }, 14, 1, 4 }, + { "PE2", 4, 2, { "gpio_in", "gpio_out", "ncsi0", "uart2", "i2c0", "clk", "uart0", NULL, "emac", [14] = "pe_eint2" }, 14, 2, 4 }, + { "PE3", 4, 3, { "gpio_in", "gpio_out", "ncsi0", "uart2", "i2c0", "clk", "uart0", NULL, "emac", [14] = "pe_eint3" }, 14, 3, 4 }, + { "PE4", 4, 4, { "gpio_in", "gpio_out", "ncsi0", "uart4", "i2c2", "clk", "jtag", "jtag", "emac", [14] = "pe_eint4" }, 14, 4, 4 }, + { "PE5", 4, 5, { "gpio_in", "gpio_out", "ncsi0", "uart4", "i2c2", "ledc", "jtag", "jtag", "emac", [14] = "pe_eint5" }, 14, 5, 4 }, + { "PE6", 4, 6, { "gpio_in", "gpio_out", "ncsi0", "uart5", "i2c3", "spdif", "jtag", "jtag", "emac", [14] = "pe_eint6" }, 14, 6, 4 }, + { "PE7", 4, 7, { "gpio_in", "gpio_out", "ncsi0", "uart5", "i2c3", "spdif", "jtag", "jtag", "emac", [14] = "pe_eint7" }, 14, 7, 4 }, + { "PE8", 4, 8, { "gpio_in", "gpio_out", "ncsi0", "uart1", "pwm2", "uart3", "jtag", NULL, "emac", [14] = "pe_eint8" }, 14, 8, 4 }, + { "PE9", 4, 9, { "gpio_in", "gpio_out", "ncsi0", "uart1", "pwm3", "uart3", "jtag", NULL, "emac", [14] = "pe_eint9" }, 14, 9, 4 }, + { "PE10", 4, 10, { "gpio_in", "gpio_out", "ncsi0", "uart1", "pwm4", "ir", "jtag", NULL, "emac", [14] = "pe_eint10" }, 14, 10, 4 }, + { "PE11", 4, 11, { "gpio_in", "gpio_out", "ncsi0", "uart1", "i2s0", "i2s0", "jtag", NULL, "emac", [14] = "pe_eint11" }, 14, 11, 4 }, + { "PE12", 4, 12, { "gpio_in", "gpio_out", "i2c2", "ncsi0", "i2s0", "i2s0", NULL, NULL, "emac", [14] = "pe_eint12" }, 14, 12, 4 }, + { "PE13", 4, 13, { "gpio_in", "gpio_out", "i2c2", "pwm5", "i2s0", "i2s0", "dmic", NULL, "emac", [14] = "pe_eint13" }, 14, 13, 4 }, + { "PE14", 4, 14, { "gpio_in", "gpio_out", "i2c1", "jtag", "i2s0", "i2s0", "dmic", NULL, "emac", [14] = "pe_eint14" }, 14, 14, 4 }, + { "PE15", 4, 15, { "gpio_in", "gpio_out", "i2c1", "jtag", "pwm6", "i2s0", "dmic", NULL, "emac", [14] = "pe_eint15" }, 14, 15, 4 }, + { "PE16", 4, 16, { "gpio_in", "gpio_out", "i2c3", "jtag", "pwm7", "i2s0", "dmic", NULL, NULL, [14] = "pe_eint16" }, 14, 16, 4 }, + { "PE17", 4, 17, { "gpio_in", "gpio_out", "i2c3", "jtag", "ir", "i2s0", "dmic", NULL, NULL, [14] = "pe_eint17" }, 14, 17, 4 }, + { "PF0", 5, 0, { "gpio_in", "gpio_out", "mmc0", NULL, "jtag", "i2s2", "i2s2", NULL, NULL, [14] = "pf_eint0" }, 14, 0, 5 }, + { "PF1", 5, 1, { "gpio_in", "gpio_out", "mmc0", NULL, "jtag", "i2s2", "i2s2", NULL, NULL, [14] = "pf_eint1" }, 14, 1, 5 }, + { "PF2", 5, 2, { "gpio_in", "gpio_out", "mmc0", "uart0", "i2c0", "ledc", "spdif", NULL, NULL, [14] = "pf_eint2" }, 14, 2, 5 }, + { "PF3", 5, 3, { "gpio_in", "gpio_out", "mmc0", NULL, "jtag", "i2s2", NULL, NULL, NULL, [14] = "pf_eint3" }, 14, 3, 5 }, + { "PF4", 5, 4, { "gpio_in", "gpio_out", "mmc0", "uart0", "i2c0", "pwm6", "ir", NULL, NULL, [14] = "pf_eint4" }, 14, 4, 5 }, + { "PF5", 5, 5, { "gpio_in", "gpio_out", "mmc0", NULL, "jtag", "i2s2", NULL, NULL, NULL, [14] = "pf_eint5" }, 14, 5, 5 }, + { "PF6", 5, 6, { "gpio_in", "gpio_out", NULL, "spdif", "ir", "i2s2", "pwm5", NULL, NULL, [14] = "pf_eint6" }, 14, 6, 5 }, + { "PG0", 6, 0, { "gpio_in", "gpio_out", "mmc1", "uart3", "emac", "pwm7", NULL, NULL, NULL, [14] = "pg_eint0" }, 14, 0, 6 }, + { "PG1", 6, 1, { "gpio_in", "gpio_out", "mmc1", "uart3", "emac", "pwm6", NULL, NULL, NULL, [14] = "pg_eint1" }, 14, 1, 6 }, + { "PG2", 6, 2, { "gpio_in", "gpio_out", "mmc1", "uart3", "emac", "uart4", NULL, NULL, NULL, [14] = "pg_eint2" }, 14, 2, 6 }, + { "PG3", 6, 3, { "gpio_in", "gpio_out", "mmc1", "uart3", "emac", "uart4", NULL, NULL, NULL, [14] = "pg_eint3" }, 14, 3, 6 }, + { "PG4", 6, 4, { "gpio_in", "gpio_out", "mmc1", "uart5", "emac", "pwm5", NULL, NULL, NULL, [14] = "pg_eint4" }, 14, 4, 6 }, + { "PG5", 6, 5, { "gpio_in", "gpio_out", "mmc1", "uart5", "emac", "pwm4", NULL, NULL, NULL, [14] = "pg_eint5" }, 14, 5, 6 }, + { "PG6", 6, 6, { "gpio_in", "gpio_out", "uart1", "i2c2", "emac", "pwm1", NULL, NULL, NULL, [14] = "pg_eint6" }, 14, 6, 6 }, + { "PG7", 6, 7, { "gpio_in", "gpio_out", "uart1", "i2c2", "emac", "spdif", NULL, NULL, NULL, [14] = "pg_eint7" }, 14, 7, 6 }, + { "PG8", 6, 8, { "gpio_in", "gpio_out", "uart1", "i2c1", "emac", "uart3", NULL, NULL, NULL, [14] = "pg_eint8" }, 14, 8, 6 }, + { "PG9", 6, 9, { "gpio_in", "gpio_out", "uart1", "i2c1", "emac", "uart3", NULL, NULL, NULL, [14] = "pg_eint9" }, 14, 9, 6 }, + { "PG10", 6, 10, { "gpio_in", "gpio_out", "pwm3", "i2c3", "emac", "clk", "ir", NULL, NULL, [14] = "pg_eint10" }, 14, 10, 6 }, + { "PG11", 6, 11, { "gpio_in", "gpio_out", "i2s1", "i2c3", "emac", "clk", "tcon", NULL, NULL, [14] = "pg_eint11" }, 14, 11, 6 }, + { "PG12", 6, 12, { "gpio_in", "gpio_out", "i2s1", "i2c0", "emac", "clk", "pwm0", "uart1", NULL, [14] = "pg_eint12" }, 14, 12, 6 }, + { "PG13", 6, 13, { "gpio_in", "gpio_out", "i2s1", "i2c0", "emac", "pwm2", "ledc", "uart1", NULL, [14] = "pg_eint13" }, 14, 13, 6 }, + { "PG14", 6, 14, { "gpio_in", "gpio_out", "i2s1", "i2c2", "emac", "i2s1", "spi0", "uart1", NULL, [14] = "pg_eint14" }, 14, 14, 6 }, + { "PG15", 6, 15, { "gpio_in", "gpio_out", "i2s1", "i2c2", "emac", "i2s1", "spi0", "uart1", NULL, [14] = "pg_eint15" }, 14, 15, 6 }, + { "PG16", 6, 16, { "gpio_in", "gpio_out", "ir", "tcon", "pwm5", "clk", "spdif", "ledc", NULL, [14] = "pg_eint16" }, 14, 16, 6 }, + { "PG17", 6, 17, { "gpio_in", "gpio_out", "uart2", "i2c3", "pwm7", "clk", "ir", "uart0", NULL, [14] = "pg_eint17" }, 14, 17, 6 }, + { "PG18", 6, 18, { "gpio_in", "gpio_out", "uart2", "i2c3", "pwm6", "clk", "spdif", "uart0", NULL, [14] = "pg_eint18" }, 14, 18, 6 }, +}; + +const struct allwinner_padconf d1_padconf = { + .npins = nitems(d1_pins), + .pins = d1_pins, +}; diff --git a/sys/riscv/allwinner/files.allwinner b/sys/riscv/allwinner/files.allwinner index f6be2cf97e57..f55d883abf57 100644 --- a/sys/riscv/allwinner/files.allwinner +++ b/sys/riscv/allwinner/files.allwinner @@ -1,4 +1,5 @@ +arm/allwinner/aw_gpio.c optional gpio aw_gpio fdt arm/allwinner/aw_rtc.c optional aw_rtc fdt arm/allwinner/aw_syscon.c optional syscon arm/allwinner/aw_sid.c optional aw_sid nvmem @@ -16,3 +17,5 @@ dev/clk/allwinner/aw_clk_nmm.c optional aw_ccu fdt dev/clk/allwinner/aw_clk_np.c optional aw_ccu fdt dev/clk/allwinner/aw_clk_prediv_mux.c optional aw_ccu fdt dev/clk/allwinner/ccu_d1.c optional soc_allwinner_d1 aw_ccu fdt + +riscv/allwinner/d1_padconf.c optional soc_allwinner_d1 aw_gpio fdt diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 4fdb1bdd6403..5dfc624c9dfe 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -152,6 +152,7 @@ device axidma # Xilinx AXI DMA Controller # GPIO device gpio +device fdt_pinctrl # SPI device spibus diff --git a/sys/riscv/conf/std.allwinner b/sys/riscv/conf/std.allwinner index 4f3d98250cc5..a888e4d5d370 100644 --- a/sys/riscv/conf/std.allwinner +++ b/sys/riscv/conf/std.allwinner @@ -6,6 +6,7 @@ options SOC_ALLWINNER_D1 device aw_ccu # Allwinner clock controller +device aw_gpio # Allwinner GPIO controller device aw_rtc # Allwinner Real-time Clock device aw_sid # Allwinner Secure ID EFUSE device aw_wdog # Allwinner Watchdog From nobody Tue Dec 10 21:31:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7BkG3sk5z5gdhY; Tue, 10 Dec 2024 21:31: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 4Y7BkG2sssz4YmX; Tue, 10 Dec 2024 21:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733866278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aaWstTVIeIsI37T/WxdGJxVuTMOKsISV4gLKiuIHLxA=; b=fWLRzhVbswnaup2nJpQpLzF9Dc8p/7K5FQNH6A4gS2JNWPc2QtT62Y9xHu7vmZRuU4O83h JYs+H45QpfflQO9vin7MI9ZJqPS8WlF2BgqF13CaHw4Eor6K1bHjX0au20q6X3QJXuT8na 8skX0hkbVYW1l5wwaAU2YMClYIhTu1Cipj8FEdsuTTApsN7POVce3waMn7MEoGwAx3O9hh HYs7iv30zxgrXnD3HRxPcgdYrjsaBGAzdUzFbF9L3awd/PrrHCSbjSs4NVEmHkZK/Ism1k fZw4k8LIlksh4N4Hd8s3/KLCMv37RIVYo8drA9CF0mu7Rnt0lXUmZSAIq7CO7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733866278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aaWstTVIeIsI37T/WxdGJxVuTMOKsISV4gLKiuIHLxA=; b=fboHz+q7U9VRE57ht6kIh+MLzrpPsSBsKpStvBkzbOyFb+1ydiVJSt5M2m0WnkXWRziqoZ zsBarsyzh1MAx1/WDLUqLRT7gCmLYPX8GmuzUaEGjBEv02OtqDG/tyssDMRM/BbK1dKB6K qCyPaCJv7Exx7Qp+GdKjumejmgXqHe2i2VCBKiE20L0VeXU1uEJCToWWwAKqssxO/SoTog CogpyyEmhP76PvJxW+EoRonqFKnjxikPXEIJh0c+/hFZZK5tCEitSsN3/xS6Wx0D4IP83r XIb3w0Yi4DcrPfqmw+Ro469u3CexVpq2zmWmlqV7qAdlKXRKPWjuRgSxo7VmyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733866278; a=rsa-sha256; cv=none; b=pdUyIBsiRXn/JNgDAYjpY0lp8CD8I2sM9nFhZNRsUE2UvdUMUJmW+F9kISBbP9S8W5oSQF aQkr76a5lqStlZ292vRcV21b7CTCXhrBzMkHUgfA2MVttqKs6ax2n98NYDPgLAwsrjNRD7 ND2SlVi/EXd18dZLk5pfnVYU6A0cE8ohzRkesvirfhmZmLP1hz9bwFjkRDc2KhFx97I50E ZNTJbrdelCn8qBT+wc7LeAHJIGUP0Cz4XURKlVF+R7tN/vE4XVnwDthJICH5ljRjXucV0R d3+7uyv0Qs50CauoUEP7Zc3xFwkRshvD8TWJ/W+9z1onuw4FQlmKjoeRKURYPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7BkG1q68zgBX; Tue, 10 Dec 2024 21:31: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 4BALVIcD094397; Tue, 10 Dec 2024 21:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BALVILh094394; Tue, 10 Dec 2024 21:31:18 GMT (envelope-from git) Date: Tue, 10 Dec 2024 21:31:18 GMT Message-Id: <202412102131.4BALVILh094394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: b94b51d59973 - main - aw_rtc(4): update man page compatible list List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b94b51d59973b0f74194ae9ea2d8a295c36ea5d6 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b94b51d59973b0f74194ae9ea2d8a295c36ea5d6 commit b94b51d59973b0f74194ae9ea2d8a295c36ea5d6 Author: Mitchell Horne AuthorDate: 2024-12-10 20:50:26 +0000 Commit: Mitchell Horne CommitDate: 2024-12-10 21:30:39 +0000 aw_rtc(4): update man page compatible list After recently enabling for the Allwinner D1. Add this and other missing strings. Sponsored by: The FreeBSD Foundation --- share/man/man4/man4.arm/aw_rtc.4 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/share/man/man4/man4.arm/aw_rtc.4 b/share/man/man4/man4.arm/aw_rtc.4 index 12e14dd52bee..1296cd41da68 100644 --- a/share/man/man4/man4.arm/aw_rtc.4 +++ b/share/man/man4/man4.arm/aw_rtc.4 @@ -35,8 +35,8 @@ device driver provides support for the Allwinner RTC controller. .Sh HARDWARE The current version of the .Nm -driver supports the RTC controller with one of the following compatible -strings : +driver supports the RTC controller with any of the following compatible +strings: .Pp .Bl -bullet -compact .It @@ -45,6 +45,14 @@ allwinner,sun4i-a10-rtc allwinner,sun7i-a20-rtc .It allwinner,sun6i-a31-rtc +.It +allwinner,sun8i-h3-rtc +.It +allwinner,sun20i-d1-rtc +.It +allwinner,sun50i-h5-rtc +.It +allwinner,sun50i-h6-rtc .El .Sh HISTORY The From nobody Tue Dec 10 22:09:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7CZk641yz5ggtm; Tue, 10 Dec 2024 22:09:50 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7CZk47z3z4cpx; Tue, 10 Dec 2024 22:09:50 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-f53.google.com with SMTP id ca18e2360f4ac-844c4ff559cso32713039f.3; Tue, 10 Dec 2024 14:09:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733868589; x=1734473389; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ef8uZR0vUHerAH/qTeBJq5vHWVCp83m0TtcKV0aGY+Q=; b=B+lxc7nkgAd3xx/kox6yoifKXO9uyGxSWfPV8a44kNxuHvnCUb8SLwPY9o9XOUGpuc pVIi7/If3IbVE4gUJllcTm/2MXfpWVMhH+moiGmZq+GKpLvsNIA+EvqjGIX1ZidKIBwC 3pCyGB5ePYFtCAM6myn+sRWT5i6l9okdSwrHLLrR+j3Pnfy2lnZ5UXvw//98CTAFzVLb iVqoDFCoOVXloRCnMjPbTt4rojEhGxNUDTR3oo2uiF6D4XpPiJbMQaAGzjNmUbxQ3vA+ JaD5Zexpv/LkP3dcaOtkXFEuEpUEl+Ekt8g1F76MIxGSg/tEYdMZh9QC6bBzxLznCv3u RQoA== X-Forwarded-Encrypted: i=1; AJvYcCUxXa1FInlo3pzAOCtDlXZkta2zmgFlzLug3BADeSm6esztVO0BLe4hVtET0FVip1xJhotLMilZysYQS4w45uyEpRcg@freebsd.org, AJvYcCVB2iL2Pwe4Z/mCQUq6EuwK9x7Ev+4H2CjWBSje95rSsv04L+4DOb3Zk09DAYXJIn415B316PfUJ5vVGt86Fp00pDwk1G8=@freebsd.org, AJvYcCXlRy3YtiBAjgVjys2/TBha81w0w86UrRqtlR/NIZiX4lrvdUFmSUCbOczVu7JPmcVou6zAK/BUXm9QlzIzusg=@freebsd.org X-Gm-Message-State: AOJu0Yw+UkdftfMjHxlsWomrUppgPlRnH0QNfJO8KpZNsX9P2xBrUe02 MU0o4gPAmDBkyskhB50+1KrLyzd+QLhG9aDEYBg8xHNqMqX3FRKWNoKUMysug7NFiscGrTtAl2q +VcVsoKusMRKp/mrJDsp91UGucFJ+dQ== X-Gm-Gg: ASbGncvBi79lT+Miq6LiMmzNbImg9NV/0i3TMX6odi5wrYGa3wB+VSVu0sq0fMBAJR6 IGJN47lj24usrvBrsuol1zVA6ePgwExyxpd3rvZRpPEL37ChU2SSdRC8gbUncvQTIQTYecw== X-Google-Smtp-Source: AGHT+IHkZkNqMiWH1YyUGmwiQknKIIoGlvBUdgBzFMNnv/++6cTsdlge1Ecci2O0HwbtYNIh3bDI4O+uAwMeJxkQ/Lw= X-Received: by 2002:a05:6602:140c:b0:83a:b43b:da89 with SMTP id ca18e2360f4ac-844cb630557mr116756339f.10.1733868589053; Tue, 10 Dec 2024 14:09:49 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202412091447.4B9ElFBH050286@gitrepo.freebsd.org> <6F9C2C43-A3DD-4CF5-AC27-899FE139E9A6@freebsd.org> <0883q825-802q-2n9q-3s4o-3nq13qpqno71@SerrOFQ.bet> In-Reply-To: <0883q825-802q-2n9q-3s4o-3nq13qpqno71@SerrOFQ.bet> From: Ed Maste Date: Tue, 10 Dec 2024 17:09:38 -0500 Message-ID: Subject: Re: git: 87e140a5c6f8 - main - iwlwifi: avoid (hard) hang on loading module To: "Bjoern A. Zeeb" Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Y7CZk47z3z4cpx X-Spamd-Bar: ---- On Mon, 9 Dec 2024 at 20:55, Bjoern A. Zeeb wrote: > > On Mon, 9 Dec 2024, Jessica Clarke wrote: > > > On 9 Dec 2024, at 14:47, Bjoern A. Zeeb wrote: > >> > >> The branch main has been updated by bz: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=87e140a5c6f89eea7ea6320d1ae34566492abfc0 > >> + if (bootverbose) > >> + printf("%s: module '%s' not yet available; will be" > >> + "initialized in a moment\n", __func__, op->name); > > > > Missing a space in the string. > > Thanks; I'll add that. Or just allow the line to go beyond 80 columns, allowing someone to grep for "will be initialized in a moment" to find the source of this string. From nobody Tue Dec 10 22:50:02 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7DTN4hN0z5gjZx for ; Tue, 10 Dec 2024 22:50:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7DTN2Gdnz4gmn for ; Tue, 10 Dec 2024 22:50:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-7fc8f0598cdso77613a12.1 for ; Tue, 10 Dec 2024 14:50:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1733871014; x=1734475814; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=LzYAaosPG2tTYy7HcFqfYoiKW4lOHDQnwXatPQ23NRk=; b=XTD2kMP70lN0/Q8FJMZBwR6eSWO80ocb1fjDluS6kcI266MvJne2325T8/kPavob9c GQ6tV1EZmX4ftNIokoXqPq//dvDEfCww4ya/j5EMVl3ze9ljfzdtWJ3PGQMKPIyPok7R 7ydt27VzL1XSoyufzdUGiER8zZgaUKOX5MgJaC9uRocCtdDlQ4vYMVp8U6WRx3Hln+GZ 4Y+E3aHpgsNu1sCiIy49N0jjOiPFyzDSJhJtQ23TduhfL4dUDtFdWc0rT1CePV/w8Gix flNcIjE84b5UamTzLhMSYNg0vCkv7lTXVcMKWCN3fS0+3SKlBspN4LWnY15mIhgW6p+C kacA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733871014; x=1734475814; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LzYAaosPG2tTYy7HcFqfYoiKW4lOHDQnwXatPQ23NRk=; b=IKki9qdj9bCU0p+K077fATYlRrBI4MhTn6kQcwylIhxd1vogk8L6pTml7IRYkdDmlZ HgEynB1RiwEKD21xVGC6n7rKxBeEibuUuGjmL378zbuTQoLJJLBU22X//4eSK7urtmSj IQ7SNHXxa1VBLPmNJONB6Gu7qihJxJVCbqrs8f5of4X7rBAKkmMUYs4rS2VSdmihr6I9 RKrnUtCo6rXzGhjLOMiJZxRbRYr11PFfbTJweoXokmWcrQFDoixpvxuQOkv/kVpJyhLa LeQJmI1lND4qp/2MfkjduKnJsDTLLVynaF8QVYKpgXrlmhG4ZxGCmffwJEEtkQPUS3RU gkYA== X-Forwarded-Encrypted: i=1; AJvYcCXg4FkkIQt75nwiRteWLehg8TshnBdykpmhL68YXHLoBDvQqvSLECeXd39kbXIq+/krWuiOKLUOLlqlDfCMQL/h4Ip6kg==@freebsd.org X-Gm-Message-State: AOJu0Yy9Yfqvhq0zvUjeVH99Y3FNpynxFDy5442VKmzDsb9b7DruAV2g mfJbjxsRxTcaUp+EdyTd/ZjqpUIZUKHouJpwkZnlMNAhTgItbW85GA9luEwzwDdL+S77BbodIvx Cg8XxbuGE0lO5Z3NsOuB3rMrTUBIYayEx18/9rw== X-Gm-Gg: ASbGnctBoLSXVV6I6+doz9LoqFCi1SZHghen82hiSpYebntcs9cSjOun+Ka5Jjpt0ic 1MX+6xqbAHRws+h4WKVOqXBx9CJ4ZUmuQQVg45J+fVkPLlt6ZygA44aOa2ZhdOsjQ+A== X-Google-Smtp-Source: AGHT+IGonA3Xqz/+c8ebrd0wToRMdw5xrC/hxMiGA0hS7An8/RKdxZzmym/uDMa60UXGb9WAWo6wEDaBqRkjHpLdluQ= X-Received: by 2002:a17:90b:1347:b0:2ee:5c9b:35c0 with SMTP id 98e67ed59e1d1-2f1287ab9b9mr789437a91.9.1733871014422; Tue, 10 Dec 2024 14:50:14 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202412091447.4B9ElFBH050286@gitrepo.freebsd.org> <6F9C2C43-A3DD-4CF5-AC27-899FE139E9A6@freebsd.org> <0883q825-802q-2n9q-3s4o-3nq13qpqno71@SerrOFQ.bet> In-Reply-To: From: Warner Losh Date: Tue, 10 Dec 2024 15:50:02 -0700 Message-ID: Subject: Re: git: 87e140a5c6f8 - main - iwlwifi: avoid (hard) hang on loading module To: Ed Maste Cc: "Bjoern A. Zeeb" , Jessica Clarke , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000e6cca30628f24d1b" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Y7DTN2Gdnz4gmn X-Spamd-Bar: ---- --000000000000e6cca30628f24d1b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Dec 10, 2024, 3:09=E2=80=AFPM Ed Maste wrote: > On Mon, 9 Dec 2024 at 20:55, Bjoern A. Zeeb wrote: > > > > On Mon, 9 Dec 2024, Jessica Clarke wrote: > > > > > On 9 Dec 2024, at 14:47, Bjoern A. Zeeb wrote: > > >> > > >> The branch main has been updated by bz: > > >> > > >> URL: > https://cgit.FreeBSD.org/src/commit/?id=3D87e140a5c6f89eea7ea6320d1ae3456= 6492abfc0 > > >> + if (bootverbose) > > >> + printf("%s: module '%s' not yet available; will be" > > >> + "initialized in a moment\n", __func__, op->name); > > > > > > Missing a space in the string. > > > > Thanks; I'll add that. > > Or just allow the line to go beyond 80 columns, allowing someone to > grep for "will be initialized in a moment" to find the source of this > string. > It's either in style.9 as a length exception or is in a review somewhere... it make it easier to grep the error messages... Warner > --000000000000e6cca30628f24d1b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, Dec 10, 2024, 3:09=E2=80=AFPM Ed Maste <emaste@freebsd.org> wrote:
On Mon, 9 Dec 2024 at 20:55, Bjoern A. Ze= eb <bz@freebsd.org> wrote:
>
> On Mon, 9 Dec 2024, Jessica Clarke wrote:
>
> > On 9 Dec 2024, at 14:47, Bjoern A. Zeeb <bz@FreeBSD.org> wr= ote:
> >>
> >> The branch main has been updated by bz:
> >>
> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D87e140a5c6f89eea7ea63= 20d1ae34566492abfc0
> >> + if (bootverbose)
> >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0printf("%s: module '%s&#= 39; not yet available; will be"
> >> +=C2=A0 =C2=A0"initialized in a moment\n", __func__= , op->name);
> >
> > Missing a space in the string.
>
> Thanks; I'll add that.

Or just allow the line to go beyond 80 columns, allowing someone to
grep for "will be initialized in a moment" to find the source of = this
string.

It's either in style.9 as a length exception or is in a review s= omewhere...=C2=A0 it make it easier to grep the error messages...

Warner=C2=A0
--000000000000e6cca30628f24d1b-- From nobody Wed Dec 11 00:37:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7Gs14JLlz5g674; Wed, 11 Dec 2024 00:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7Gs13pRkz4tk1; Wed, 11 Dec 2024 00:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733877445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TAkzZLUp16OITE46265TT5VKaYidMwbtAtFKB/Am+I4=; b=kET8d6bH46H9pVOfalQ0icHQ5OOI8/6Z9nM0sM7So2DkkjYp5r8hHvc0uTimfk69F9v0fo Saeh9EQ3ZDGtqEsHaqZpOFDuPW+UAweMNsblDkCECv5qeVAkKCbUJ4XLAqVQfVHa0j5DSY vWvkhLiSM6EECqRRlnQgEN3k2gg/poTPd8vsSKeXJauRE5c9A6MDvSkcn0fvx0AC7Ubi3T Fgd1qQxVUpYI+e/i31Ik+UU6Bi77BjMAuxE1myoptRHlWl63U79DHa6CNukRZ6dc0kuCMC S8frzi+txDJk+EVv+1DWFPAzXrOzCaiTfcwzBDaSQAYsVzgFGxdNAu8fuOVQ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733877445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TAkzZLUp16OITE46265TT5VKaYidMwbtAtFKB/Am+I4=; b=MZNqpfFuQ09g/CjSeDoaUV7e/r8Cmd2zIfNcBW1Soq8b73jXWXeubH707olPU5J4s2LqZw 8EDT483O+FMW7+ohgSPEjKqzVi0EvIdk8EHSl8xNL9rL2/SrqyUE4ReY4qAnTXZWsfOnyf HbIVzOl40uyCMxxVTTMf5LyGuyw36sF16GZjVT7VXMwmfW7dDI+XNyqtADTwBK/rmBePkW JKeKAfkuNmgcb+dBnX8AeE5+9U/dTNmJXgJBDK4VpqLOLz7UYaEQT4SeFjAp6IrfyEqgex 4D+2jmfeC91XYMyWSt6pMe63LN+EiFgfWTQdi2fQHEeeuhbqxETBpBXloBBbRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733877445; a=rsa-sha256; cv=none; b=jqU+DX9ctb546TaEdSFARtPkpBMMPH4iKE8+vnzODnp6osgUB1D8duEKjAo30p+iawdNFJ BeHHWbRWZoeqRVEQ32XiD7wV2daNWeKL0bKGcNW1vdlQeE4KLbH7D2P4A1ghTgoRGDDB08 Nfak7R39J0ktYQRFWJJBB0u0cuW00BFM1XB3HqvZfeabcoAEWa/UdEKM+AGq4T8dA3CtSl v058N19S9ZnKeGF+xrVhRpg8OIcXNedqacAIYeIlsCJcm9/TiVuKOGLjVZ9ngOOvZoZsdJ 7r97XkYVmJ7ArM0d8PUvxV8Yf86/n9sgqO35bmqP3NzBRc9B2iTho2N75hTinA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7Gs13HXrzlVG; Wed, 11 Dec 2024 00:37: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 4BB0bP9l032090; Wed, 11 Dec 2024 00:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BB0bPc2032086; Wed, 11 Dec 2024 00:37:25 GMT (envelope-from git) Date: Wed, 11 Dec 2024 00:37:25 GMT Message-Id: <202412110037.4BB0bPc2032086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: b10b9523f616 - main - kern: fix naming for some AST-handler bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b10b9523f616bbb3eb993af98ac2742e10025e84 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b10b9523f616bbb3eb993af98ac2742e10025e84 commit b10b9523f616bbb3eb993af98ac2742e10025e84 Author: Kyle Evans AuthorDate: 2024-12-11 00:33:54 +0000 Commit: Kyle Evans CommitDate: 2024-12-11 00:37:17 +0000 kern: fix naming for some AST-handler bits These were typo'd at creation, and they should've used the common TDA_ prefix. Switch them now. No compat shims because these are niche enough that it seems unlikely that they've seen large adoption under the wrong name. OK'd by: kib Fixes: c6d31b83 ("AST: rework") --- sys/sys/proc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 3422f75172f0..df7ce6de91d9 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -493,14 +493,14 @@ enum { TDA_KQUEUE, TDA_RACCT, TDA_MOD1, /* For third party use, before signals are */ - TAD_MOD2, /* processed .. */ + TDA_MOD2, /* processed .. */ TDA_PSELECT, /* For discarding temporary signal mask */ TDA_SIG, TDA_KTRACE, TDA_SUSPEND, TDA_SIGSUSPEND, TDA_MOD3, /* .. and after */ - TAD_MOD4, + TDA_MOD4, TDA_MAX, }; #define TDAI(tda) (1U << (tda)) From nobody Wed Dec 11 01:19:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7HnR43Wbz5g8HX; Wed, 11 Dec 2024 01:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7HnR3P0Wz3xFl; Wed, 11 Dec 2024 01:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733879963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ppq4Ooj5X2s91MOPC4GrmNolg5NbgwQk6D5Od1QYKQQ=; b=Kv0zISvA3d/kqqPI96sH2z2b1r+qJKfO1jIen3kNfhf3sHd8/7/0pLppRIZwN2YjWT8nR6 nl9469pRbw3Ikyj1XAc2PFoFP9gD4nnMrilW0WYG3tScz799nWSd8i35Yer7sl4FZQJLXE /5GrZJmR7yiSWgmmBaenDKa5Ru9OMGkTmYazK83ucGVPtIQ9zmYMopkkm4Xei7r02jQPPJ aD+l7hN1u7YoVcVbEbAgDUJ3PxmW5BinKAdNnJmafUPHgiHl8w+DSx8uu0hxMHRlrV9r4f CLFg7xqfKYVCRz2ka5nCdzUJuE361sxquDNfKkcSzcyQ3ScFR7WwEEH6iYy01w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733879963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ppq4Ooj5X2s91MOPC4GrmNolg5NbgwQk6D5Od1QYKQQ=; b=uSxq0XGr+9UGm6UsryGPokOsdeHfLYWwd5ndRSELMB0WPxMsNsrO8JIXKkDyL6DYsjpuBe xttimPrVP54tRWwXj/gbZjYkAl/vQ2mAAPsQT/xFNzzW9tMiR5npv8deQLLeQCfn82uWlV ez8Z1vcsgSGsCcw+hRHqFW6YqsVNJcQuTj2X0wShWpF9lZ8rD+nEImWOWCcrVwJdsgWOh3 6WddxB/GlvmimQsLOsTjmigq8FNImv8N0H+CItmOkvhPbH9a8RtewUCiZmVOekkB056p/O /GV5slDSyll261lCG3phUlJZx6wbRzjlcYG4MVzyEu7HfsyZJDWktytNZcOeXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733879963; a=rsa-sha256; cv=none; b=YlYC/FLckKYTMCkh2ILrOslsqa19J70aBTRlmiXlTNl0VFATxXqGpHwC39rUqfRcn4jMaC r6PIvGMgeYH1i1ShkDEWSx0MfCM/kyWMAtt8M+7d576UKyEAICdDkkTqjXXvi7FarDA1eP GlYazbc9njZmwd6PwfT8z3xu0vZ2LSuMdaZG0zusb9jQdtSHx0XdyEdlMC5SmeH2MPfD/u ucEJpHqk9T4gC2c0/5xsnIPDO8z3jDFtMXYUZdbsJWY7A7mJqP8X93MgPtV3EJ1x0BAnNH v7Qzm11NzEAkUoN+PrPAqA2GwsIMZqKD4OoR1oTfwLkiFogCS2acrlfc9MDu0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7HnR2mCmzmnc; Wed, 11 Dec 2024 01:19: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 4BB1JN3H007323; Wed, 11 Dec 2024 01:19:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BB1JNlV007320; Wed, 11 Dec 2024 01:19:23 GMT (envelope-from git) Date: Wed, 11 Dec 2024 01:19:23 GMT Message-Id: <202412110119.4BB1JNlV007320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 636d377264f5 - main - release: vmimage: setup the default BE properly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 636d377264f51e3dd33bd7f33ebf03e2e148d40d Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=636d377264f51e3dd33bd7f33ebf03e2e148d40d commit 636d377264f51e3dd33bd7f33ebf03e2e148d40d Author: Kyle Evans AuthorDate: 2024-12-11 01:19:08 +0000 Commit: Kyle Evans CommitDate: 2024-12-11 01:19:08 +0000 release: vmimage: setup the default BE properly All of the BE datasets need to be set canmount=noauto so that creating a new BE and switching to it can actually work. With the current setup, the zfs rc script will mount the `default` BE over whichever new BE is activated once it runs. Reported by: andrew Reviewed by: andrew, re (cperciva), imp, markj Differential Revision: https://reviews.freebsd.org/D48017 --- release/tools/vmimage.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 5d98b8990705..223ef928e83c 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -187,7 +187,7 @@ buildfs() { -o poolname=zroot -o bootfs=zroot/ROOT/default -o rootpath=/ \ -o fs=zroot\;mountpoint=none \ -o fs=zroot/ROOT\;mountpoint=none \ - -o fs=zroot/ROOT/default\;mountpoint=/ \ + -o fs=zroot/ROOT/default\;mountpoint=/\;canmount=noauto \ -o fs=zroot/home\;mountpoint=/home \ -o fs=zroot/tmp\;mountpoint=/tmp\;exec=on\;setuid=off \ -o fs=zroot/usr\;mountpoint=/usr\;canmount=off \ From nobody Wed Dec 11 01:24:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7Hvg1bLwz5g8MS; Wed, 11 Dec 2024 01:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7Hvg0zM4z3y0B; Wed, 11 Dec 2024 01:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733880287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnNz7sP0HSxn+pBv9WWslwWXrOaDJB4ADJQYJnKEr7s=; b=d4f2pg2DqzZKbS/0voNcx+eZ8Lm2nHbhNzpHAm9Pzl9KQlwC4k1l9TQBM52MW+A3ZwWVMs DEX4Cc11E5hLLhHxNqCOHb9HKk3Nqgnm0U65kDo+xCnc4p1fF2R4iW6mk0a1CwhcgOtIzQ flFYbiGhq5tvAjh6lcx55xbXd1VoLZ0zp+RrFDwUh3ept+oUQktiQN5dXhHhV2jvrpjbmJ N403gcXa2YRpMkGrvo//HZqxHrtl+2DZ1u/0FHZxJcWoxh2Cn92msAhT5V8eGGtXtSf+CL U/d19tlxY4QX1MnQ9VruWx3FbBsue6N2z0lbgkeefWBoif/zSxMuWfeGlT++ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733880287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnNz7sP0HSxn+pBv9WWslwWXrOaDJB4ADJQYJnKEr7s=; b=N6esEntRORruA4KqdMQqhYxPzy4pvLQUDXijHdXE4ky6R3Evh/cA/Gi6tq2xzmB3couXZX ZyUHNvoVpMFCXSiwM2gyeY0UPmr2LzR6FLw7yUtpg5+IeFvhDA5c/TUNjeVODlucu6YeJK s7zy0kUnuDfmcKBgOvDQCGYY7yCg+tn33enOVJFiSK0M/MOYFvafBoTXQm6iVUskF73mNA KlP2l8RVrFwmCxmWt8wYv/iT1J+O5//MmqHsEha1bbM9M1UnD/w/SgJgcGJdad0bg+2Xi5 FrB9kFlaI2Dr25oIMp6LF5LnImGs863Xvh10nfQmJVTsARvgLsrZ3uCkuSypKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733880287; a=rsa-sha256; cv=none; b=gZmvnQqolL3jktaPaIzCqFnkBYKGLVvzSH7XdUJ5O7MVPo1yJc5wqR/fk0udLFcIZMxaLM FpkNz1x4rU5p5ZcfYMl6H2OvC8IhrfLtd49kmje908GkzAgIDnoKiOmvUXxINqSgWyu2eu KxLgk71hd0BQnSSiSALZ5YpN9LyUIst6Zt82qQ4tHziGWYIu6fTu/b5rtKcFy+8wH6XVcb aYPh6QA+b9vDeecTeYNfe4xHaoB5NZotBb16zm2E7gqOOS7KXk+rJSAL1fdb9CPf3GR4LO Ji93L7BEfug8VaEX6/moCswIvImbG5zX+mxn2wNRxzELhREJy46siPtCgAeG+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7Hvg0LGsznHB; Wed, 11 Dec 2024 01:24:47 +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 4BB1OkaP024214; Wed, 11 Dec 2024 01:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BB1OkEh024211; Wed, 11 Dec 2024 01:24:46 GMT (envelope-from git) Date: Wed, 11 Dec 2024 01:24:46 GMT Message-Id: <202412110124.4BB1OkEh024211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 51f3d0874f62 - main - usb: serial: propagate errors from ucom_queue_command() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51f3d0874f6216907c8971c4af9d6be6c93edf7b Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=51f3d0874f6216907c8971c4af9d6be6c93edf7b commit 51f3d0874f6216907c8971c4af9d6be6c93edf7b Author: Kyle Evans AuthorDate: 2024-12-11 01:23:10 +0000 Commit: Kyle Evans CommitDate: 2024-12-11 01:23:10 +0000 usb: serial: propagate errors from ucom_queue_command() There's only one error that we can get back right now, but future changes will add some more cases that we need to watch out for. Start by returning errors and propagating them back. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D47950 --- sys/dev/usb/serial/usb_serial.c | 49 ++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 300438010c05..11a2e1078a67 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -151,7 +151,7 @@ static int ucom_unit_alloc(void); static void ucom_unit_free(int); static int ucom_attach_tty(struct ucom_super_softc *, struct ucom_softc *); static void ucom_detach_tty(struct ucom_super_softc *, struct ucom_softc *); -static void ucom_queue_command(struct ucom_softc *, +static int ucom_queue_command(struct ucom_softc *, usb_proc_callback_t *, struct termios *pt, struct usb_proc_msg *t0, struct usb_proc_msg *t1); static void ucom_shutdown(struct ucom_softc *); @@ -592,7 +592,7 @@ ucom_set_usb_mode(struct ucom_super_softc *ssc, enum usb_hc_mode usb_mode) } } -static void +static int ucom_queue_command(struct ucom_softc *sc, usb_proc_callback_t *fn, struct termios *pt, struct usb_proc_msg *t0, struct usb_proc_msg *t1) @@ -604,7 +604,7 @@ ucom_queue_command(struct ucom_softc *sc, if (usb_proc_is_gone(&ssc->sc_tq)) { DPRINTF("proc is gone\n"); - return; /* nothing to do */ + return (ENXIO); /* nothing to do */ } /* * NOTE: The task cannot get executed before we drop the @@ -637,6 +637,8 @@ ucom_queue_command(struct ucom_softc *sc, */ if (fn == ucom_cfg_start_transfers) sc->sc_last_start_xfer = &task->hdr; + + return (0); } static void @@ -760,9 +762,8 @@ ucom_open(struct tty *tp) * example if the device is not present: */ error = (sc->sc_callback->ucom_pre_open) (sc); - if (error) { - return (error); - } + if (error != 0) + goto out; } sc->sc_flag |= UCOM_FLAG_HL_READY; @@ -782,14 +783,18 @@ ucom_open(struct tty *tp) sc->sc_jitterbuf_in = 0; sc->sc_jitterbuf_out = 0; - ucom_queue_command(sc, ucom_cfg_open, NULL, + error = ucom_queue_command(sc, ucom_cfg_open, NULL, &sc->sc_open_task[0].hdr, &sc->sc_open_task[1].hdr); + if (error != 0) + goto out; /* Queue transfer enable command last */ - ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, - &sc->sc_start_task[0].hdr, + error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, + &sc->sc_start_task[0].hdr, &sc->sc_start_task[1].hdr); + if (error != 0) + goto out; if (sc->sc_tty == NULL || (sc->sc_tty->t_termios.c_cflag & CNO_RTSDTR) == 0) ucom_modem(tp, SER_DTR | SER_RTS, 0); @@ -800,7 +805,8 @@ ucom_open(struct tty *tp) ucom_status_change(sc); - return (0); +out: + return (error); } static void @@ -836,7 +842,7 @@ ucom_close(struct tty *tp) } ucom_shutdown(sc); - ucom_queue_command(sc, ucom_cfg_close, NULL, + (void)ucom_queue_command(sc, ucom_cfg_close, NULL, &sc->sc_close_task[0].hdr, &sc->sc_close_task[1].hdr); @@ -1077,9 +1083,12 @@ ucom_line_state(struct ucom_softc *sc, sc->sc_pls_set |= set_bits; sc->sc_pls_clr |= clear_bits; - /* defer driver programming */ - ucom_queue_command(sc, ucom_cfg_line_state, NULL, - &sc->sc_line_state_task[0].hdr, + /* + * defer driver programming - we don't propagate any error from + * this call because we'll catch such errors further up the call stack. + */ + (void)ucom_queue_command(sc, ucom_cfg_line_state, NULL, + &sc->sc_line_state_task[0].hdr, &sc->sc_line_state_task[1].hdr); } @@ -1236,7 +1245,7 @@ ucom_status_change(struct ucom_softc *sc) } DPRINTF("\n"); - ucom_queue_command(sc, ucom_cfg_status_change, NULL, + (void)ucom_queue_command(sc, ucom_cfg_status_change, NULL, &sc->sc_status_task[0].hdr, &sc->sc_status_task[1].hdr); } @@ -1310,14 +1319,18 @@ ucom_param(struct tty *tp, struct termios *t) sc->sc_flag &= ~UCOM_FLAG_GP_DATA; /* Queue baud rate programming command first */ - ucom_queue_command(sc, ucom_cfg_param, t, + error = ucom_queue_command(sc, ucom_cfg_param, t, &sc->sc_param_task[0].hdr, &sc->sc_param_task[1].hdr); + if (error != 0) + goto done; /* Queue transfer enable command last */ - ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, - &sc->sc_start_task[0].hdr, + error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, + &sc->sc_start_task[0].hdr, &sc->sc_start_task[1].hdr); + if (error != 0) + goto done; if (t->c_cflag & CRTS_IFLOW) { sc->sc_flag |= UCOM_FLAG_RTS_IFLOW; From nobody Wed Dec 11 01:24:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7Hvh2fW8z5g8VY; Wed, 11 Dec 2024 01:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7Hvh1gpRz3y56; Wed, 11 Dec 2024 01:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733880288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBC4NR0OAygqDBRYRdjnlgu2pgV84rzBZ4UFb0eKgcY=; b=R2J0prx2RXTqs8DZlllNX2qu3aCc2gDueKm9+n3pYDlV++WbEQ0L2D/CkXJqXR09AUhGnD T+im4HK3VoMuDp+aDWour9LSqxGX1r4sJqXlna45xfJQF98QQuYydnpyM+t10oX4JCvuqb 6Hc1ow5+iElFcjzxLRTLwIjkALO9m8WuzTG+gjAp4v61e2eBsNoDVXKjIp3QCtyvMZrLUa 4km885fIRnwDF5pm2iiRpyzZ17nA9dueiEql/TClZ5FcMgX92/75D6J1ry75p6kGpwolHl L17U5b5Sg69wbuy5RkHykyL9eh13CB3RIBtVmCUsvEsigGPx460H3LldUk/EsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733880288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBC4NR0OAygqDBRYRdjnlgu2pgV84rzBZ4UFb0eKgcY=; b=yU6wXa1vt5Z7GRtfH5/v1uDkVjCg0fN4kY5jMynUxCv56sQWLpNhlJvwlJl+HOsWGG4U9V p+zf1AdjRWuPb2cJ8l0EIIJeL/hfF3knoYAkuhZrdozkr5aDLGQ53X7sWvzJ6mDqo2mU19 NXBdE0OqZ44aLUCUOovfKoWEtkJ70VG0Awm710qFaJG8zzankGfr3jO9oxVMEfVSoKKB06 0XRAu4IIqTFl4H2VXLuJN7UBHTTjfjYC50aMz+OxUHy1I1IKiypxLDTKlh+gefaLcFf0n0 8nAbkGIPj6xSSvhVoJ0WXmACfDCTQtw3PrXSNcn/R2EOQpUhE2puXX+4KNUDOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733880288; a=rsa-sha256; cv=none; b=N16TWLWpX/0QmINSWQ07uaNcpgwgDj+JpnsgbT35yddNxdYkg5rbjLqtbFfgnRoheBfKty xWAh6+UiCLOh4Dlz1coYMoMgLq/JDNkV5zUGgoBF7rjnblDxZt/DM4UKY/2vHtzm9m2qtb mqqAMZkB+0OVriItqQv39aWDGR9+K+418n6xUW3OtiC6e6p3udSsNsf8dfDlfiTAeyLi78 gXEjVUgCMh3xXN8vfTARG4wAyZTbXyrP8rqT6JVDpbXe6EkpUlc2mnzsVXNtbIINXHrJas BdM4USdLB0diu05ke9Gyg0kzwAQaml0G1rCHL8o2/0eH+S3iZv81rClJ8W7UaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7Hvh1HmGznHC; Wed, 11 Dec 2024 01:24:48 +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 4BB1Omph024268; Wed, 11 Dec 2024 01:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BB1OmRK024265; Wed, 11 Dec 2024 01:24:48 GMT (envelope-from git) Date: Wed, 11 Dec 2024 01:24:48 GMT Message-Id: <202412110124.4BB1OmRK024265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 729eb176a465 - main - usb: serial: allow the open/close sleep to be interruptible List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 729eb176a465cedc55c5980f116d87be592421f1 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=729eb176a465cedc55c5980f116d87be592421f1 commit 729eb176a465cedc55c5980f116d87be592421f1 Author: Kyle Evans AuthorDate: 2024-12-11 01:23:10 +0000 Commit: Kyle Evans CommitDate: 2024-12-11 01:23:10 +0000 usb: serial: allow the open/close sleep to be interruptible ucom_queue_command will issue commands for open/close, then wait on them to be finished. In the spirit of playing it safe, allow ucom_queue_command's wait to be interrupted in case the usb process gets jammed up waiting on the hardware -- we can at least recover the user thread that initiated it, even if we can't recover the usb process. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D47951 --- sys/dev/usb/serial/usb_serial.c | 14 +++++++-- sys/dev/usb/usb_process.c | 69 ++++++++++++++++++++++++++++++++--------- sys/dev/usb/usb_process.h | 1 + sys/dev/usb/usbdi.h | 2 ++ 4 files changed, 69 insertions(+), 17 deletions(-) diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 11a2e1078a67..30a0c6203086 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -599,6 +599,7 @@ ucom_queue_command(struct ucom_softc *sc, { struct ucom_super_softc *ssc = sc->sc_super; struct ucom_param_task *task; + int error; UCOM_MTX_ASSERT(sc, MA_OWNED); @@ -628,8 +629,15 @@ ucom_queue_command(struct ucom_softc *sc, /* * Closing or opening the device should be synchronous. */ - if (fn == ucom_cfg_close || fn == ucom_cfg_open) - usb_proc_mwait(&ssc->sc_tq, t0, t1); + if (fn == ucom_cfg_close || fn == ucom_cfg_open) { + error = usb_proc_mwait_sig(&ssc->sc_tq, t0, t1); + + /* usb_proc_mwait_sig may have dropped the tty lock. */ + if (error == 0 && sc->sc_tty != NULL && tty_gone(sc->sc_tty)) + error = ENXIO; + } else { + error = 0; + } /* * In case of multiple configure requests, @@ -638,7 +646,7 @@ ucom_queue_command(struct ucom_softc *sc, if (fn == ucom_cfg_start_transfers) sc->sc_last_start_xfer = &task->hdr; - return (0); + return (error); } static void diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c index d88de92336f2..4507c999f50a 100644 --- a/sys/dev/usb/usb_process.c +++ b/sys/dev/usb/usb_process.c @@ -361,25 +361,21 @@ usb_proc_is_gone(struct usb_process *up) return (0); } -/*------------------------------------------------------------------------* - * usb_proc_mwait - * - * This function will return when the USB process message pointed to - * by "pm" is no longer on a queue. This function must be called - * having "up->up_mtx" locked. - *------------------------------------------------------------------------*/ -void -usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) +static int +usb_proc_mwait_impl(struct usb_process *up, void *_pm0, void *_pm1, + bool interruptible) { struct usb_proc_msg *pm0 = _pm0; struct usb_proc_msg *pm1 = _pm1; + int error; /* check if gone */ if (up->up_gone) - return; + return (ENXIO); USB_MTX_ASSERT(up->up_mtx, MA_OWNED); + error = 0; if (up->up_curtd == curthread) { /* Just remove the messages from the queue. */ if (pm0->pm_qentry.tqe_prev) { @@ -391,14 +387,59 @@ usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) pm1->pm_qentry.tqe_prev = NULL; } } else - while (pm0->pm_qentry.tqe_prev || - pm1->pm_qentry.tqe_prev) { + while (error == 0 && (pm0->pm_qentry.tqe_prev || + pm1->pm_qentry.tqe_prev)) { /* check if config thread is gone */ if (up->up_gone) - break; + return (ENXIO); up->up_dsleep = 1; - cv_wait(&up->up_drain, up->up_mtx); + if (interruptible) { + error = cv_wait_sig(&up->up_drain, up->up_mtx); + + /* + * The fact that we were interrupted doesn't + * matter if our goal was accomplished anyways. + */ + if (error != 0 && !USB_PROC_MSG_ENQUEUED(pm0) && + !USB_PROC_MSG_ENQUEUED(pm1)) + error = 0; + } else { + cv_wait(&up->up_drain, up->up_mtx); + } } + + if (error == ERESTART) + error = EINTR; + return (error); +} + +/*------------------------------------------------------------------------* + * usb_proc_mwait + * + * This function will return when the USB process message pointed to + * by "pm" is no longer on a queue. This function must be called + * having "up->up_mtx" locked. + *------------------------------------------------------------------------*/ +void +usb_proc_mwait(struct usb_process *up, void *_pm0, void *_pm1) +{ + + (void)usb_proc_mwait_impl(up, _pm0, _pm1, false); +} + +/*------------------------------------------------------------------------* + * usb_proc_mwait_sig + * + * This function will return when the USB process message pointed to + * by "pm" is no longer on a queue. This function must be called + * having "up->up_mtx" locked. This version of usb_proc_mwait is + * interruptible. + *------------------------------------------------------------------------*/ +int +usb_proc_mwait_sig(struct usb_process *up, void *_pm0, void *_pm1) +{ + + return (usb_proc_mwait_impl(up, _pm0, _pm1, true)); } /*------------------------------------------------------------------------* diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h index 6a8ac0acda33..745d214d2106 100644 --- a/sys/dev/usb/usb_process.h +++ b/sys/dev/usb/usb_process.h @@ -76,6 +76,7 @@ int usb_proc_create(struct usb_process *up, struct mtx *p_mtx, const char *pmesg, uint8_t prio); void usb_proc_drain(struct usb_process *up); void usb_proc_mwait(struct usb_process *up, void *pm0, void *pm1); +int usb_proc_mwait_sig(struct usb_process *up, void *pm0, void *pm1); void usb_proc_free(struct usb_process *up); void *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1); void usb_proc_rewakeup(struct usb_process *up); diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index 5192591281f4..08d130aa2868 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -525,6 +525,8 @@ struct usb_proc_msg { usb_size_t pm_num; }; +#define USB_PROC_MSG_ENQUEUED(msg) ((msg)->pm_qentry.tqe_prev != NULL) + #define USB_FIFO_TX 0 #define USB_FIFO_RX 1 From nobody Wed Dec 11 01:24:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7Hvj4wzCz5g8MW; Wed, 11 Dec 2024 01:24: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7Hvj3WH5z3xcV; Wed, 11 Dec 2024 01:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733880289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aUiweBJLG0+TaHKPCfXYryh4ImCJv8jduWpl+MWioso=; b=LPST/vz8AckybF2qTs64ziIO65nrgMGzVgvIzOpsh2rnu0JfDvrJ/Rfv12cc0ZHFCc/T26 Po4Bjj30a72mkrE8FIic3SF4x83o9vEUr4sQKA3UUVB4QAYaET1xQT6jHTQpDADbzxSW5i IWbcCd+zrHEBfTSlywIz3QjgtQjFKeiPmHYrDj3SRzSzFV8LUd3Kpm96TaVJKv5fPK6wL4 claFUzjJr0Tv/NdZrt45vVUwXbQUAa5rMdxzRUX2540v6KkZ+dDdVMX5v6CFNiTzS+bksi I2HPsbVL6cHLea27r+AB8ga/Cle0nSbP3FyVT3RMnBnuPkvvKmGkcYspZ5wuNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733880289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aUiweBJLG0+TaHKPCfXYryh4ImCJv8jduWpl+MWioso=; b=Gt0ZyLAskgwmHaTcr8zpOIKxQrIvOmqLSjEF2dLaKnxqPhQOeif5mjRMet44TltFY7LdzT dr3bT0D2+6QkpCvi4eJVim0Gbz3eNdDAlVFw+D9xUMyGweBYbV2QQARXETen0bKBDbcxNJ 02i1SRmZiAB+p95EAbUkkXto9zVgDddgYs2ogv08eDY2TnBazXNHncLA7pwzyqW8xBuclI kBoSICigNUGBSPtOugGbCrKQJC+Nlg4DssLQ+JhvewrO8hlb+8qH0Bzz419H1A3qtSEEXD 8CrQdDwxnhLnSkVaJ47b4w2nSdGjqdnfiq4yOYaTPshhncYRZcPvz/U8JRpHdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733880289; a=rsa-sha256; cv=none; b=H3D1HeX5icsfVwF926cNCIfeF8FIldZa/giQe5Lnd69gTDejmVXrIvolGZ3AhOtn6IAo2Y tSQMIYGal5MfoPQ7anRXYAVPSDe5G7Y+4B60rFThvprRlOV3D6E0O7QTHHA7WVgBGMawa2 TPQq3v18Hd/K7cgsNkdTPgvSTc+cyVf7Jjwac7iQWMw0T13TBalfytI55rLMqWyD0T4xBO KA54XPGcHVq0QCrnjESY2b8jtpQu1Jgxbp/DNs+zsD2f3o24XU7DaH3zekQ4FdBTiaegmg s2Ux4RelrV1lFt9ggriPVYTRUWDuriI8Wqyqph9+tMfgGXp87n5qB7TqbFlm+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7Hvj2LWtznVN; Wed, 11 Dec 2024 01:24: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 4BB1OnsT024329; Wed, 11 Dec 2024 01:24:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BB1OnwP024326; Wed, 11 Dec 2024 01:24:49 GMT (envelope-from git) Date: Wed, 11 Dec 2024 01:24:49 GMT Message-Id: <202412110124.4BB1OnwP024326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 36a80f426435 - main - usb: serial: make more commands execute synchronously List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36a80f4264350a2f4f0686eb91ae7f5943d40327 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=36a80f4264350a2f4f0686eb91ae7f5943d40327 commit 36a80f4264350a2f4f0686eb91ae7f5943d40327 Author: Kyle Evans AuthorDate: 2024-12-11 01:23:10 +0000 Commit: Kyle Evans CommitDate: 2024-12-11 01:23:41 +0000 usb: serial: make more commands execute synchronously The termios layer wants some level of guarantee that we've actually submitted param changes to the hardware when our functions return, so we need to do a little more waiting to avoid violating those guarantees. This is especially important as some hardware has some minimum timing specifications around this stuff, and without being less asynchronous the software dealing with these devices can't reasonably operate the hardware without more excessive delays than they should need. More specifically, we make sure that: - The command to start transfers is finished before we toggle DTR/RTS - The status_change command finishes before we return, which may change some fields in the softc that we need for a subsequent call into usb_serial - cfg_param finishes before we re-enable transfers, and we ensure that RTS is appropriately toggled before we return to userland This has been observed to fix some flakiness in connecting to some ESP32 devices. Tested by: kenrap from Libera Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D47952 --- sys/dev/usb/serial/usb_serial.c | 69 +++++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 13 deletions(-) diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 30a0c6203086..dfae051ecfd6 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -153,7 +153,7 @@ static int ucom_attach_tty(struct ucom_super_softc *, struct ucom_softc *); static void ucom_detach_tty(struct ucom_super_softc *, struct ucom_softc *); static int ucom_queue_command(struct ucom_softc *, usb_proc_callback_t *, struct termios *pt, - struct usb_proc_msg *t0, struct usb_proc_msg *t1); + struct usb_proc_msg *t0, struct usb_proc_msg *t1, bool wait); static void ucom_shutdown(struct ucom_softc *); static void ucom_ring(struct ucom_softc *, uint8_t); static void ucom_break(struct ucom_softc *, uint8_t); @@ -592,10 +592,43 @@ ucom_set_usb_mode(struct ucom_super_softc *ssc, enum usb_hc_mode usb_mode) } } +static void +ucom_command_barrier_cb(struct usb_proc_msg *msg __unused) +{ + /* NOP */ +} + +/* + * ucom_command_barrier inserts a dummy task and waits for it so that we can be + * certain that previously enqueued tasks are finished before returning back to + * the tty layer. + */ +static int +ucom_command_barrier(struct ucom_softc *sc) +{ + struct ucom_super_softc *ssc = sc->sc_super; + struct usb_proc_msg dummy = { .pm_callback = ucom_command_barrier_cb }; + struct usb_proc_msg *task; + int error; + + UCOM_MTX_ASSERT(sc, MA_OWNED); + + if (usb_proc_is_gone(&ssc->sc_tq)) { + DPRINTF("proc is gone\n"); + return (ENXIO); /* nothing to do */ + } + + task = usb_proc_msignal(&ssc->sc_tq, &dummy, &dummy); + error = usb_proc_mwait_sig(&ssc->sc_tq, task, task); + if (error == 0 && sc->sc_tty != NULL && tty_gone(sc->sc_tty)) + error = ENXIO; + return (error); +} + static int ucom_queue_command(struct ucom_softc *sc, usb_proc_callback_t *fn, struct termios *pt, - struct usb_proc_msg *t0, struct usb_proc_msg *t1) + struct usb_proc_msg *t0, struct usb_proc_msg *t1, bool wait) { struct ucom_super_softc *ssc = sc->sc_super; struct ucom_param_task *task; @@ -629,7 +662,7 @@ ucom_queue_command(struct ucom_softc *sc, /* * Closing or opening the device should be synchronous. */ - if (fn == ucom_cfg_close || fn == ucom_cfg_open) { + if (wait) { error = usb_proc_mwait_sig(&ssc->sc_tq, t0, t1); /* usb_proc_mwait_sig may have dropped the tty lock. */ @@ -793,14 +826,17 @@ ucom_open(struct tty *tp) error = ucom_queue_command(sc, ucom_cfg_open, NULL, &sc->sc_open_task[0].hdr, - &sc->sc_open_task[1].hdr); + &sc->sc_open_task[1].hdr, true); if (error != 0) goto out; - /* Queue transfer enable command last */ + /* + * Queue transfer enable command last, we'll have a barrier later so we + * don't need to wait on this to complete specifically. + */ error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, &sc->sc_start_task[0].hdr, - &sc->sc_start_task[1].hdr); + &sc->sc_start_task[1].hdr, true); if (error != 0) goto out; @@ -813,6 +849,7 @@ ucom_open(struct tty *tp) ucom_status_change(sc); + error = ucom_command_barrier(sc); out: return (error); } @@ -852,7 +889,7 @@ ucom_close(struct tty *tp) (void)ucom_queue_command(sc, ucom_cfg_close, NULL, &sc->sc_close_task[0].hdr, - &sc->sc_close_task[1].hdr); + &sc->sc_close_task[1].hdr, true); sc->sc_flag &= ~(UCOM_FLAG_HL_READY | UCOM_FLAG_RTS_IFLOW); @@ -933,11 +970,15 @@ ucom_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) #endif case TIOCSBRK: ucom_break(sc, 1); - error = 0; + error = ucom_command_barrier(sc); + if (error == ENXIO) + error = ENODEV; break; case TIOCCBRK: ucom_break(sc, 0); - error = 0; + error = ucom_command_barrier(sc); + if (error == ENXIO) + error = ENODEV; break; default: if (sc->sc_callback->ucom_ioctl) { @@ -1097,7 +1138,7 @@ ucom_line_state(struct ucom_softc *sc, */ (void)ucom_queue_command(sc, ucom_cfg_line_state, NULL, &sc->sc_line_state_task[0].hdr, - &sc->sc_line_state_task[1].hdr); + &sc->sc_line_state_task[1].hdr, false); } static void @@ -1255,7 +1296,7 @@ ucom_status_change(struct ucom_softc *sc) (void)ucom_queue_command(sc, ucom_cfg_status_change, NULL, &sc->sc_status_task[0].hdr, - &sc->sc_status_task[1].hdr); + &sc->sc_status_task[1].hdr, true); } static void @@ -1329,14 +1370,14 @@ ucom_param(struct tty *tp, struct termios *t) /* Queue baud rate programming command first */ error = ucom_queue_command(sc, ucom_cfg_param, t, &sc->sc_param_task[0].hdr, - &sc->sc_param_task[1].hdr); + &sc->sc_param_task[1].hdr, true); if (error != 0) goto done; /* Queue transfer enable command last */ error = ucom_queue_command(sc, ucom_cfg_start_transfers, NULL, &sc->sc_start_task[0].hdr, - &sc->sc_start_task[1].hdr); + &sc->sc_start_task[1].hdr, true); if (error != 0) goto done; @@ -1346,6 +1387,8 @@ ucom_param(struct tty *tp, struct termios *t) sc->sc_flag &= ~UCOM_FLAG_RTS_IFLOW; ucom_modem(tp, SER_RTS, 0); } + + error = ucom_command_barrier(sc); done: if (error) { if (opened) { From nobody Wed Dec 11 02:24:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7KDB4Lqdz5gD5g; Wed, 11 Dec 2024 02:24:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7KDB3NRCz44pQ; Wed, 11 Dec 2024 02:24:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733883850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2J57g32Bbqv+m7O6p5SNxw2DKWfUUiZ4VG6+KkM3Vk=; b=ttn0fG+khayFLjJBWEnhoRYn07+1GznEyilud8YaagrEeH+QY3x+H0TUNGhz2smPvSX7qA Ngdc/qhcBMwimPlJWLCJImLClPIe1bckcj8ABWJPv1xlrDpw0WBiTetQ7n1VVvjNJnfYmW YGOBjSPhJefkud93+Z2B09V1ok77fVHkIWM9A/Pb+Cabk0MNgJJQV2p/+ABZEsMOme2uSM mvGnb1AdAHauOx9392mwJYBmH2EzdkuDMuoblMHyrW5M90VvxqT5wygJ42vOehhLl4m6H9 nWK5KDjz4RKJ76p1GsyKadQA/CdhP19TFGz49+9O5gw6yvd8WKOPU+VIj8Nr0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733883850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2J57g32Bbqv+m7O6p5SNxw2DKWfUUiZ4VG6+KkM3Vk=; b=duWnzGOsLR5Fm2LblT6EfhqlHTSJ+4tGbejcpaV2KAG9nSY5h9fyi+vJ57h3DK7dE/YZEF 6aDM2QMyPJV95GtJZet3dixbiNByaCetzcDww4AEiGtPqFEmf5ngFoiBM1v745r5tNzCgu sgfYfxPKHAKc/ej0UuldR7zxxBA+NXowQpLKEMQWmVzEo+OzAQk9WO6IQ35ZAO5VslcuSr GfihTcWcOsgaz/5pmxNa2wHSXW0r3Xf8+445CbsgJZ8rnfN3iVUgfDaynZ4FpigBo87iBo wpKIVS5RJ5CDgWBTsZrPbw1vbUtZlVjseAQzFCG1zR6uZj85I2/Oo8MshF4e6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733883850; a=rsa-sha256; cv=none; b=W6R/ONul/rh2173LJRgyV/vCYyv4DU3rmecmaYWO19fYF8O2CYY1RniLGj53vShto1Rhcd GuZrAYqbcFyJgrGQuRD616cziviMsktzqpSAbG6fd/N4oeotKASiAPgqoPXkLb+pFmmXE6 0H1WvxEKKXh1ge5mR+KfOP6UmP6VmVvhjSVYo7Mm6RiRYmdH+ozWEVxe7nxh03C/duWATR vlU6IR/mdZqXXoRNJy0o+IgZG9HUpiZy0Be7s9dvtDZic/5zi/uI6pMOLGz9kApgjXvv3z rv+MOqh6XmzVy86xvCfSeXV9hIw9Wtl6rXSNn/ynbAzQBuvWTxVIF8i8QgM7pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7KDB2hG3zpmY; Wed, 11 Dec 2024 02:24:10 +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 4BB2OAuY035552; Wed, 11 Dec 2024 02:24:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BB2OA3O035549; Wed, 11 Dec 2024 02:24:10 GMT (envelope-from git) Date: Wed, 11 Dec 2024 02:24:10 GMT Message-Id: <202412110224.4BB2OA3O035549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 70693a45381b - main - cxgbe tom: Restore support for zerocopy TCP receive for aio_read() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70693a45381b687e40ea30710aa38cb9f24b6b02 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=70693a45381b687e40ea30710aa38cb9f24b6b02 commit 70693a45381b687e40ea30710aa38cb9f24b6b02 Author: John Baldwin AuthorDate: 2024-12-11 02:13:51 +0000 Commit: John Baldwin CommitDate: 2024-12-11 02:23:47 +0000 cxgbe tom: Restore support for zerocopy TCP receive for aio_read() The commit to introduce TCP_USE_DDP support had a couple of bugs that broke support for zerocopy receive via aio_read(). First, the length and offset arguments to mk_update_tcb_for_ddp() were reversed which prevented DDP from working. Second, the AIO state in the toep was initialized too late when the first aio_read() request was queued. Reported by: Harshavardhan Tanneru @ Chelsio Fixes: eba13bbc37ab cxgbe: Support TCP_USE_DDP on offloaded TOE connections MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/tom/t4_ddp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c index 529fc2a5b825..2fee8fa91dac 100644 --- a/sys/dev/cxgbe/tom/t4_ddp.c +++ b/sys/dev/cxgbe/tom/t4_ddp.c @@ -2653,8 +2653,8 @@ sbcopy: * which will keep it open and keep the TCP PCB attached until * after the job is completed. */ - wr = mk_update_tcb_for_ddp(sc, toep, db_idx, &ps->prsv, ps->len, - job->aio_received, ddp_flags, ddp_flags_mask); + wr = mk_update_tcb_for_ddp(sc, toep, db_idx, &ps->prsv, + job->aio_received, ps->len, ddp_flags, ddp_flags_mask); if (wr == NULL) { recycle_pageset(toep, ps); aio_ddp_requeue_one(toep, job); @@ -2820,6 +2820,14 @@ t4_aio_queue_ddp(struct socket *so, struct kaiocb *job) return (EOPNOTSUPP); } + if ((toep->ddp.flags & DDP_AIO) == 0) { + toep->ddp.flags |= DDP_AIO; + TAILQ_INIT(&toep->ddp.cached_pagesets); + TAILQ_INIT(&toep->ddp.aiojobq); + TASK_INIT(&toep->ddp.requeue_task, 0, aio_ddp_requeue_task, + toep); + } + /* * XXX: Think about possibly returning errors for ENOTCONN, * etc. Perhaps the caller would only queue the request @@ -2834,14 +2842,6 @@ t4_aio_queue_ddp(struct socket *so, struct kaiocb *job) TAILQ_INSERT_TAIL(&toep->ddp.aiojobq, job, list); toep->ddp.waiting_count++; - if ((toep->ddp.flags & DDP_AIO) == 0) { - toep->ddp.flags |= DDP_AIO; - TAILQ_INIT(&toep->ddp.cached_pagesets); - TAILQ_INIT(&toep->ddp.aiojobq); - TASK_INIT(&toep->ddp.requeue_task, 0, aio_ddp_requeue_task, - toep); - } - /* * Try to handle this request synchronously. If this has * to block because the task is running, it will just bail From nobody Wed Dec 11 17:47:50 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7jjy5DSRz5gFk4; Wed, 11 Dec 2024 17:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7jjy4hxgz4LCg; Wed, 11 Dec 2024 17:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733939270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zZtVEW2dTM1SsmpG0X34hbFworx4hKTDgJR+ioSrWU=; b=ndODUHN2q9mm15t9rjfbw32za0xlomYgsm73L6okC0VWMQmEYSUhRbD/7PPZOws/jyszdu NezWaeT3c+Z3y2kUaLW9sFmvT7OC3OL438M+gOthsyawT7lDktd677k+W7tp5omCdVWupK YqVkJnsdP6xtyrwsz2mp2L1y2KuKXn1lOC0a+a8hU8BXj0G+LrOcwRQ+qCoHAVj5qXVVih oT840w3mc4vLVzj0+/NE8ijj5wdYbNbEvYxEr4QbdbLz4crG6uI7LNAkb8tNZrFW/BbFTJ fChKr7bco3yk1SX0Khy+I/gHFKbmNqwXt9p/T+GOE75/dYMSImLAMTaZAFcXsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733939270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zZtVEW2dTM1SsmpG0X34hbFworx4hKTDgJR+ioSrWU=; b=lRsjIgsFHBZc9QEE9T/++mRlnI9c5vPm9WwAkAypMgkcVZ4u4tBluY4He21Fe+XlidsaVv rXeiH5kTkJmwTHO2lLdmkpuK6Hl3sMvyUvFBpQ355EsJrEtzngEcTCFJbDpaB8PWn+ByaZ fBY8iHpbfWwn3/y+DUJL83y+FFwWa8PXR7EbOdlmmpWSQXiSHNpOlYyGEzps9uSTAVvnZA QFyLzZ6hNnaglnqi/HobcxEfnN4g6uymdO7aNryEJpRCkIuu3Bo27Da/ftV5dafJXRFFdb mqFMeJdT2OWM+Mwyh3qXPWJ9xzCfV+FuXrwEg2VOnR+Pnf1Aue5KPaUrbvFQ7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733939270; a=rsa-sha256; cv=none; b=WzC7lyPzXwjJBGoqWjB4FyXUoozYlC+tv7S42nzBAJggGd9Bdps3HqZbPf+AnM4UwpcnCQ sGvlLTHlJBfVD9slw+ckFQ7pNfvkdS7svZ0ENytm31Z/SJQ+i9r8ZYKNB5saeBTUbG5i/D rWBTjXWOPXODg1PJ+E/y+Pr1QwlR2aX+Om4cOwP4EoVO1tL1/epLe+Jwce5xDNCUee5Mdm eDbvK2TxGKBB/umM8MZCqP8JiQGsNXrAWMta+8QKcdyO/OzGBEb1ug1eXvKgI5X7TFZ/qp UaN1W6DE0OKIyUXTfFe9bu8XPhakLKJCBA6oUi+5Gfc6WAafEJbvtUKd4QdDMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7jjy4G25zHQ7; Wed, 11 Dec 2024 17:47:50 +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 4BBHloK4049193; Wed, 11 Dec 2024 17:47:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBHloZj049190; Wed, 11 Dec 2024 17:47:50 GMT (envelope-from git) Date: Wed, 11 Dec 2024 17:47:50 GMT Message-Id: <202412111747.4BBHloZj049190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 37bb465d27ee - main - buf_ring: Remove an unneeded barrier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37bb465d27eefd2237e6e3af9592457fccf324e2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=37bb465d27eefd2237e6e3af9592457fccf324e2 commit 37bb465d27eefd2237e6e3af9592457fccf324e2 Author: Andrew Turner AuthorDate: 2024-12-11 15:15:25 +0000 Commit: Andrew Turner CommitDate: 2024-12-11 17:02:24 +0000 buf_ring: Remove an unneeded barrier This was left over from before using atomic(9) consistently. It is unneeded as these loads are already ordered correctly. Reviewed by: alc, kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48002 --- sys/sys/buf_ring.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h index ab7e683ed0e9..00870cbf3531 100644 --- a/sys/sys/buf_ring.h +++ b/sys/sys/buf_ring.h @@ -107,7 +107,6 @@ buf_ring_enqueue(struct buf_ring *br, void *buf) cons_tail = atomic_load_acq_32(&br->br_cons_tail); if ((int32_t)(cons_tail + br->br_prod_size - prod_next) < 1) { - rmb(); if (prod_head == atomic_load_32(&br->br_prod_head) && cons_tail == atomic_load_32(&br->br_cons_tail)) { br->br_drops++; From nobody Wed Dec 11 17:47:51 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7jjz6MPbz5gFrp; Wed, 11 Dec 2024 17:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7jjz5kgQz4L2B; Wed, 11 Dec 2024 17:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733939271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRFbsrre7pm6S5l6omvnpe6Eg7q3l5zrZeXL4J29sCk=; b=SxOehDwo3Fup0SpgDoUaVza164SYihx2zUYgnetr/f4vTSF7cuujzMytB3Ad0jeL2fxiLW mJOSTmLGA6gSgZHYs6/4XMiXHYWFBrCW4bpyVJ2qnc8QqrZDGTu47/4IyPh2l2AaIBpAEf xtVg6SYgx/LfVU2ER9v2+o0dCwp7lR82KfILfRR/78ods5+TAZMeN/wUcqfbRlZZDnKTlh Tv+6Cd1vTVKExKcUTOi4A57EDaPTSs2nNGy2czqvEJLQSpl0ilcIUu8JbXdZwc6dwG7SWC gDXM4G3Zm+vFE+qyrrGhQ/LsZSolM+QCjZ4yiE505VKKExRW+xMN6EZ8elE/KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733939271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRFbsrre7pm6S5l6omvnpe6Eg7q3l5zrZeXL4J29sCk=; b=XxDPViTwVIOsDJkuGpGLpduG9rWme7dXXO5nBs/C/peGT1W0RujXdfU0dTlPrAKAHC6tT9 mmdukETdW4fxCwvLAafO/mbTjGXFTZCFKCgEUhkRoVHUZJ91A4WENV/qNzbLAdlULGOLsJ cD1oHRVvyal2+GmG9VOY09soJNwln29bD61l1b04NqE/28hInYGytCwxUtGth/1ZIL9JiV gsmtbOSYqUnvzAKfIX4YEXJhisFFQ7YfeK9PE4nYQRSsQugO6W1nhxNfjLu7lmbP8/PItF TE5S7NQzdkil15/R9cRmz2zpw86KOET44grk0aiHtlcRk4fd7S8w7Yjf5UDtDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733939271; a=rsa-sha256; cv=none; b=x6XaC01rF8SmkWaJfJIvaRQK2W/DFZEciRvunicxGnWvuXBC8FFeLSZ3ZbVmtgWo+vGo2C cu4yGhdNNV7+pgT2Ae075xU6qMaQeVNlqdmgbVPuxe5ILlFH120IPezht+R5/+njJxGR/+ BDYvauOWlzsoEq3Svbxv+mV0IuTsQCeTou4qejWir0JXeV/soEYWLxCZ7BrX4G50uRmG5X EyR7rYxmjYdt7gjChdSukYYm2FNfWDJNj4o3uK3fXsq5LhlCZEH5nEr0krWscpSFNV0V9K 7BajAFjeN6VXrmIuPjf8Y2R1RUAYwrHR+9DNG0aW1v9YjsvxwSjYK9BF3sglig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7jjz5KTxzJ2T; Wed, 11 Dec 2024 17:47:51 +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 4BBHlpMG049249; Wed, 11 Dec 2024 17:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBHlpjI049245; Wed, 11 Dec 2024 17:47:51 GMT (envelope-from git) Date: Wed, 11 Dec 2024 17:47:51 GMT Message-Id: <202412111747.4BBHlpjI049245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4056e774b1b3 - main - arm64: Move setting TCR_HD to C code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4056e774b1b3b07db83fcf3dea2e62d0bf02cd9b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4056e774b1b3b07db83fcf3dea2e62d0bf02cd9b commit 4056e774b1b3b07db83fcf3dea2e62d0bf02cd9b Author: Andrew Turner AuthorDate: 2024-12-11 15:48:56 +0000 Commit: Andrew Turner CommitDate: 2024-12-11 17:02:24 +0000 arm64: Move setting TCR_HD to C code To allow for it to be more selective when we enable it, e.g. if the CPU has an erratum that prevents us from doing so, move the check for setting TCR_HD to C. Reviewed by: alc Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47808 --- sys/arm64/arm64/locore.S | 17 +++++++---------- sys/arm64/arm64/mp_machdep.c | 1 + sys/arm64/arm64/pmap.c | 21 +++++++++++++++++++++ sys/arm64/include/pmap.h | 1 + 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index f9a179931d7d..e721092455e8 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -940,20 +940,17 @@ LENTRY(start_mmu) bfi x2, x3, #(TCR_ASID_SHIFT), #(TCR_ASID_WIDTH) /* - * Check if the HW supports access flag and dirty state updates, - * and set TCR_EL1.HA and TCR_EL1.HD accordingly. + * Check if the HW supports access flag updates, and set + * TCR_EL1.HA accordingly. The TCR_EL1.HD flag to enable + * HW management of dirty state is set in C code as it may + * need to be disabled because of CPU errata. */ mrs x3, id_aa64mmfr1_el1 and x3, x3, #(ID_AA64MMFR1_HAFDBS_MASK) - cmp x3, #1 - b.ne 1f - orr x2, x2, #(TCR_HA) - b 2f + cbz x3, 1f + orr x2, x2, #(TCR_HA) 1: - cmp x3, #2 - b.ne 2f - orr x2, x2, #(TCR_HA | TCR_HD) -2: + msr tcr_el1, x2 /* diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index e9b015443477..636f26fba939 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -219,6 +219,7 @@ init_secondary(uint64_t cpu) pcpup = cpuid_to_pcpu[cpu]; pcpup->pc_midr = get_midr(); identify_cpu(cpu); + pmap_cpu_init(); /* Ensure the stores in identify_cpu have completed */ atomic_thread_fence_acq_rel(); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 17e34888282a..b8f519388977 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1309,6 +1309,8 @@ pmap_bootstrap(vm_size_t kernlen) vm_paddr_t start_pa, pa; uint64_t tcr; + pmap_cpu_init(); + tcr = READ_SPECIALREG(tcr_el1); /* Verify that the ASID is set through TTBR0. */ @@ -1623,6 +1625,25 @@ pmap_init_pv_table(void) } } +void +pmap_cpu_init(void) +{ + uint64_t id_aa64mmfr1, tcr; + + /* Enable HAFDBS if supported */ + id_aa64mmfr1 = READ_SPECIALREG(id_aa64mmfr1_el1); + if (ID_AA64MMFR1_HAFDBS_VAL(id_aa64mmfr1) >=ID_AA64MMFR1_HAFDBS_AF_DBS){ + tcr = READ_SPECIALREG(tcr_el1) | TCR_HD; + WRITE_SPECIALREG(tcr_el1, tcr); + isb(); + /* Flush the local TLB for the TCR_HD flag change */ + dsb(nshst); + __asm __volatile("tlbi vmalle1"); + dsb(nsh); + isb(); + } +} + /* * Initialize the pmap module. * diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 8bdb4cf025e3..d92069ee42fd 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -140,6 +140,7 @@ extern pt_entry_t pmap_sh_attr; void pmap_activate_vm(pmap_t); void pmap_bootstrap(vm_size_t); +void pmap_cpu_init(void); int pmap_change_attr(vm_offset_t va, vm_size_t size, int mode); int pmap_change_prot(vm_offset_t va, vm_size_t size, vm_prot_t prot); void pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode); From nobody Wed Dec 11 17:47:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7jk112d8z5gFrs; Wed, 11 Dec 2024 17:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7jk06n6fz4LKM; Wed, 11 Dec 2024 17:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733939272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54s/K7LtWOnQANA5dZNSszOAWjmcDJ6FxBO+/r2JWWg=; b=RQLWxKlhGEQjIGN6+ypBRxhdZWup+shiiVz4deaQZ078Hz3d/+Mixr1p1S6vunIF5fsiCl mhZ8hqCq8ahcHk5vfPVIR+7+mhUu7gJ8pxFdNxbEGn4oPpjEj7Z9Gu48cxw77rDOZceHHy VIeoO9nGVsA1sj6heM+clcMfwSgMQYDVZaVP062hxU5EzvsZi5ZPFzV9tjMlx1Y2RwnlT4 eCoYeuw+U15jpQ8p7cgNbE47RMo/IzP2mhuElyqyNZZTkG0BQsaRAaZM7fh2paUvn+8oZp SARKNAJV2x+CW1wp8G646PI1H4ASfZz3ZGUIyAuIrLbt+2uQDvfPf2ZE8b0eZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733939272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54s/K7LtWOnQANA5dZNSszOAWjmcDJ6FxBO+/r2JWWg=; b=JkkY2Oy0xGLHCcf/MOzQwx9HtugJEOC4QapSrFxIFp13ICqc1OUTug9nO3Ap3WpbKQTBrI 29WsRCTVbDE8nZCCN1gaEAQoAjxjzmFTAdIOgVg7fy2/VwZp1xjjZQgE01bn32f9GrXidx TBN/JFlR7h/I4tfpCjmFDza+oJ6YWwfU/Wa9o0/mpXx0osaAaybiJjk/R23yvJOGUmKdtk H/09fDfxeWJnTrrEFiR1T0k2QUw0v1ABvHmrZimLBkZEclr+N+8C+eyTfCrqzlEIRot4uW VHBW7UwABDJjFP6z/dYCf9iHe9Y0kVszQvqHGtDGbqlunmDhu063BlYQvYBz+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733939272; a=rsa-sha256; cv=none; b=COsYIGJozs4v9nZVqn6oDHW+ZNUiWZW24h4d7rOXi35hb5q2iHnrdnHOzxiqPHOhofikTn JD0XFuLUBj21nHxeWIcLiliPkVsTmUuaVPMTOUhc+qXrZQJl6yTsET99F0XZBGVY53MWDk W1zmCMHVtWH7UKGcMoGlT0n2Pm4r9H9/E32OVsqtgR2OKaffgzwQLtIgbibgwc7zZ9YTtG amN2m8rnf9z3bV2QTyfDiMd/eMsgHboPCk2kiuzZHHrqkVJ0UJOoWdEFlUu2mDHhzOQ6h0 q4/sKtBmRLT3OYixGbsJ8JcgTlzZnnlbRgNPj8SwUHG+fdL/wPuIvPV9zZ1+xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7jk06P0ZzHc3; Wed, 11 Dec 2024 17:47:52 +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 4BBHlqcH049294; Wed, 11 Dec 2024 17:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBHlq08049291; Wed, 11 Dec 2024 17:47:52 GMT (envelope-from git) Date: Wed, 11 Dec 2024 17:47:52 GMT Message-Id: <202412111747.4BBHlq08049291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: e7bc16422031 - main - arm64: Add a DBM errata workaround List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7bc16422031803823fd6ef0c5083631dc7dfffc Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e7bc16422031803823fd6ef0c5083631dc7dfffc commit e7bc16422031803823fd6ef0c5083631dc7dfffc Author: Andrew Turner AuthorDate: 2024-12-11 15:49:15 +0000 Commit: Andrew Turner CommitDate: 2024-12-11 17:02:24 +0000 arm64: Add a DBM errata workaround Add a workaround for Cortex-A55 erratum 1024718 and Cortex-A510 erratum 2051678. Both errata are related to the hardware handling of the dirty field in page tables and can be worked around by disabling this feature. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47809 --- sys/arm64/arm64/pmap.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index b8f519388977..fd6798668626 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1629,10 +1629,24 @@ void pmap_cpu_init(void) { uint64_t id_aa64mmfr1, tcr; + bool enable_dbm; + + enable_dbm = false; /* Enable HAFDBS if supported */ id_aa64mmfr1 = READ_SPECIALREG(id_aa64mmfr1_el1); - if (ID_AA64MMFR1_HAFDBS_VAL(id_aa64mmfr1) >=ID_AA64MMFR1_HAFDBS_AF_DBS){ + if (ID_AA64MMFR1_HAFDBS_VAL(id_aa64mmfr1) >= ID_AA64MMFR1_HAFDBS_AF_DBS) + enable_dbm = true; + /* Disable on Cortex-A55 for erratum 1024718 - all revisions */ + if (CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK, CPU_IMPL_ARM, + CPU_PART_CORTEX_A55, 0, 0)) + enable_dbm = false; + /* Disable on Cortex-A510 for erratum 2051678 - r0p0 to r0p2 */ + else if (CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK | CPU_VAR_MASK, + CPU_IMPL_ARM, CPU_PART_CORTEX_A510, 0, 0)) + if (CPU_REV(PCPU_GET(midr)) < 3) + enable_dbm = false; + if (enable_dbm) { tcr = READ_SPECIALREG(tcr_el1) | TCR_HD; WRITE_SPECIALREG(tcr_el1, tcr); isb(); From nobody Wed Dec 11 18:24:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7kXX6CJyz5gHdy; Wed, 11 Dec 2024 18:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7kXX5dtfz4RBp; Wed, 11 Dec 2024 18:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733941484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PDjgb70BAokXGdyDeERTJStgD6lQGRQiAG252Tw5mCE=; b=gVtf8SupakVtBUnQReU3lzg19uPnUj0Jc3DHudKOvSdz9PYJCTb7gsOinyN1ngSF7ZrFYV pDPqECjnyeHBNOYyzOl/CW7Pglgmly07SUx2PIcbC+oNrnDzua/BzMdxMWMD+UiS7EpPGX YyPSBJe28vQ+wKT5VeKWM7KfzRmD6TXQJkFUSVALoz1Mu+w40Y2xGcr/4CiZlSORacxICM tNunLNv3o6bhgmJMA1IIe+iwpMJ/WSM91twmHFrXdh8hGLrn7HfItmSWuGO5tVAHi45sPz Er0ms1gk75BocnA3Ils4eZIUEKPR29oAeaE4UgEFX/+1EMp+JVODxg8MMxb0vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733941484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PDjgb70BAokXGdyDeERTJStgD6lQGRQiAG252Tw5mCE=; b=ogh2oVfUgM5RVwCQJZztDAHHmfoqHxgzTSbr9V4oSCsepsDPKrW2jkT7S2A2hiuPaRfuq/ ZD6wfO57EZPIjaLqr9/lHu2QRILNOcWrDgRHEg6tHo71vGnF3NLvc1a0BwxT4oCHCTS+SE I+oAOAw5jGWvfwJTd+L3XlU2reRveAhAliFONsUdzROei54hjbmUiXi7F5JVjJJTjPOVa+ xyJ0uxfbc1IYebSHQLU/A25WAL3WHaUQiwevv0ld752wVEYuLxKP+gJzMkDW9gwAF77MPv vYHrtcs3NW5wjAfXxOb2NTL8H4CwbKSfFFze85qE5Nyo8JO64S6mrvrHItqqEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733941484; a=rsa-sha256; cv=none; b=EAoA3KnJBK+08MqWIP2C963zLJPYgTd1QlLR1loo84IJVf++fwZu+GrGdXQAaCZ40wAjvT OyWYYm7yuhYNLa7l0NIT9qrMJJjE4yCj4y/ucvwqEOa2i3J9t1xqHXlkl1AbYi1VOxocDW 7ZMsvagbwVKNNjGhjnDShLw5zsdITQZDtEmqn1KQLX82rAuMp/uB73cTSR+qHh9pc4G/EX 5UpmEFjOsS8ussz9ZgPTh6Uycelf8fMJwnXjZSUEtZX0hHyvznGmCHoVQ6tHniyVAoT4+d HufK9Np3I95FuCZLMCbcveNxFY43cb9JtcJIy8oXtUJuRQrFU0Cxo6Ilyfkd8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7kXX4fsSzK94; Wed, 11 Dec 2024 18:24:44 +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 4BBIOind023468; Wed, 11 Dec 2024 18:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBIOiLh023465; Wed, 11 Dec 2024 18:24:44 GMT (envelope-from git) Date: Wed, 11 Dec 2024 18:24:44 GMT Message-Id: <202412111824.4BBIOiLh023465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: d6917af2b9da - main - login.conf.5: remove a stray quote List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6917af2b9da76ac1df1977b2a3c09fb9d45db11 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=d6917af2b9da76ac1df1977b2a3c09fb9d45db11 commit d6917af2b9da76ac1df1977b2a3c09fb9d45db11 Author: Maxim Konovalov AuthorDate: 2024-12-11 18:23:22 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-11 18:23:22 +0000 login.conf.5: remove a stray quote PR: 282858 --- lib/libutil/login.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index b1e7211e4c18..d43fdfb761f3 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -204,7 +204,7 @@ login environment. .It "pseudoterminals number Maximum number of pseudo-terminals." .It "swapuse size Maximum swap space size limit." .It "umtxp number Maximum number of process-shared pthread locks." -.It "pipebuf" size Maximum size of pipe buffers." +.It "pipebuf size Maximum size of pipe buffers." .El .Pp These resource limit entries actually specify both the maximum From nobody Wed Dec 11 18:50:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7l604bwJz5gKRR; Wed, 11 Dec 2024 18:50: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 4Y7l603ZzPz4WK9; Wed, 11 Dec 2024 18:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733943016; h=from:from:reply-to:subject:subject: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/0b3shijbDZ8O5QbEk7NvG1amxEPxeDkYNsZendtiA=; b=GwFeXJRrv5CkdzAy4CzOIpCrEAXFAXvDB1sGle8RH9Ocn/O/CLsbAr9J1MCalBrjzOnOIN ng9Crdnxrp07525jtCwYuQMiDdU6re80vOfgkvZ8SWD96jrpJHC3wTCZ9xHwi6W7xTEfHL 9LJ2Q3FXbqZvwiKb67txNuAnw5mF4j4/0Ed4+VfGmuM0ajcGpSvmf2Pg0NtB8Tx1OHOOnu GTlw6tyVnfznUACdvUqFo/E6GZ+80XZryAUFUHhKYx/NOt7DwV+eBrff7BKOS0OtX2234C UUkmYFlJWKXfBw7HMf1LbIoVoQ2T0nPVXupmn9hEuFYC0HA8G7/Io1On0W/+fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733943016; h=from:from:reply-to:subject:subject: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/0b3shijbDZ8O5QbEk7NvG1amxEPxeDkYNsZendtiA=; b=kGwTokxnbtdtTzMmMl4d0pq0qnESNz9IIURg5fg7i8M3/NgEz59sAUI8cp4pNGsvr7pQt3 KO3UxtC7ZdCh/gBn/SdQ8P1qzYTyO8p8t1Lor0R2E2X6ehVlfSGo8PIpLOaHi8VjNRGIYL IchBBVi+AShqJhgWWx0kdu9ZLiXT8TlmC7dMQzeRnI4xFIDemNTv9orK8PSZSC4nERM6Mh OO2DZCdDR9J974B8YfICTuL1vWSgsF3CcR2Bo/V1VUeacaJczHOG9Fentwk03DRBsHNOqC RzJs92Jp7yoH3B5XYnSgpTguFPyKFBkWN+bZz98fJHqNOfNLWoUPL9N0gVkAMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733943016; a=rsa-sha256; cv=none; b=XO9YMoDLcNnPWQwKl5+wDJzGTJnBJ8NkMP8iUpOS6r3vthlJ9+GA/48KqPDCRI1PLdq+42 sX/nrViwNf2maTAiRXoOLIlSpXM1uJ720Qay5SExTTjqlWMSARWAiji26OEhIAx9TtqzDS 8RkTwEtptLLG8PdKfOn85g/3Fow3GXT3ZcB6gBP+bEhmyMlC2o7Gf3KAbU5JClR160VHZ1 QYnfk6bx6cVm01Trtoaju4V6TTgzRB/jzFAmNh7DKN0wprExOwEbqPa9QiyuM4+9ycE9d7 gLTweiTygDrjavAx2Enb502SVvq6l+ysW6Ie3O9k0rM9hbJuSKifix5/iUI9sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7l602gFRzKhM; Wed, 11 Dec 2024 18:50: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 4BBIoGbG068770; Wed, 11 Dec 2024 18:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBIoGMa068757; Wed, 11 Dec 2024 18:50:16 GMT (envelope-from git) Date: Wed, 11 Dec 2024 18:50:16 GMT Message-Id: <202412111850.4BBIoGMa068757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: eba715c544ea - main - icmp.4: improve icmplim and add icmplim_jitter description List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eba715c544ea89c6b402c55e03b388b77030b997 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=eba715c544ea89c6b402c55e03b388b77030b997 commit eba715c544ea89c6b402c55e03b388b77030b997 Author: Michael Tuexen AuthorDate: 2024-12-11 18:47:11 +0000 Commit: Michael Tuexen CommitDate: 2024-12-11 18:47:11 +0000 icmp.4: improve icmplim and add icmplim_jitter description Reviewed by: cc, bcr MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48025 --- share/man/man4/icmp.4 | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4 index 7bc844edd3c0..c8c92a794e24 100644 --- a/share/man/man4/icmp.4 +++ b/share/man/man4/icmp.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 1, 2022 +.Dd December 11, 2024 .Dt ICMP 4 .Os .Sh NAME @@ -169,10 +169,31 @@ Defaults to false. Enable/disable dropping of ICMP Redirect packets. Defaults to false. .It Va icmplim -.Pq Vt integer -Bandwidth limit for ICMP replies in packets/second. +.Pq Vt unsigned integer +Mean rate limit for replies in packets/second. +The actual limit is +.Va icmplim +plus a random jitter limited by +.Va icmplim_jitter . If set to zero, no limiting will occur. Defaults to 200. +.It Va icmplim_jitter +.Pq Vt unsigned integer +A random jitter between the negative of +.Va icmplim_jitter +and +.Va icmplim_jitter +is applied to +.Va icmplim +for limiting the sending rate of replies. +.Va icmplim_jitter +must be smaller than +.Va icmplim , +if +.Va icmplim +is not zero. +If set to zero, no jitter will be applied. +Defaults to 16. .It Va icmplim_output .Pq Vt boolean Enable/disable logging of ICMP replies bandwidth limiting. From nobody Wed Dec 11 19:31:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7m1q3SwLz5gNDL; Wed, 11 Dec 2024 19:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7m1q2vLzz4btn; Wed, 11 Dec 2024 19:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733945503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xR7Ol74XBRm561fOYKlGtzemNtFqM/oDy/hfp+t4yyw=; b=xCUHgoLvt6aCm0iGJNDbfPzoLzkJZDaJO08PD/k/muTAvPyCG+elYi6+3dXWcPLhsWIuvI vELpf/N1LVrkYwz4sz1cQ12pmtZCHo2LOYbLOQMgLV9cw40WaRn3EV8b/6Pamos1RH18Pt zzmwGMLa4gTRKbS2xtXOG3sSKxJlAJJTSdlp4HlgEmtfV5ZQz1jbRKe82FZxEvHBLp6NaI tOirzpcM1/ZRyzplv6fw9nQ9qv+DFeX8JR1VuuKgO1sxgVPwv+ni3Xs3LcVGetfebBtGCj Y0ZkLmo5+J4MqxYMHkbDMNMLj2OciGG9O9rJ9hNjAOTd/4VE8grBRMsIeaJBOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733945503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xR7Ol74XBRm561fOYKlGtzemNtFqM/oDy/hfp+t4yyw=; b=Iyv9Lhf9kzmaB2e1wHxo4X7rDKyo6uwLrqgo+6Zhet7lkP97CAQnOztLCGIUCeEASx34WG N8L9FGyOzAYEunMDATaY5RwjQhVXn+UAHUwSc5oNkIh1phZYq0WMiveqPJnWTHE3fbd/6W dDkRVFMStkMqFc4mGWxal7BI5X93efVKAlPtW/Ruhdb9SZjJN3iexjdG8xfeQNXTcdyj3L Pvai0Zwe2fcKgMupbAMyGhqLGUoQKp2QtjoQTWQwla9nK/BT5K3MhQE97iizSlBU46NcNa c7aCA9FcS7aOYXXk3gGkzb4cSwOmyq4Y/gxyVRyF/w6R2uFsx6JFxWb2JrZjuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733945503; a=rsa-sha256; cv=none; b=GLE6Ga/Gq2YD/f88I2+J98PYHiqDbCc8csqPlCvxRCUZs5f5yA/K5euiNsMxzc5Mmny8Qd Fw26rCKjE3qUfk4ECJ/8SlV1p5XMkB7qSE7LrJb3nYbly2AjQyBhfzAsITrdiIMOiAF+7Y Pqeps413bgLPxf1aHEWDLDOpIplYWY1+SN10fW6YbFejossEUdZ98O7IGcybPv+saqXmH2 SPqaxPbWsLkLNXHI8Kl7iaeGO+Hfl9GAgty2Y1mFsfQD98yquOi5wUsykeW7iiDq8y3bbO 9Zsna6s/4k1/XlUPqovKZx73PL2wt4e+gSIZr+ol6ydn/tCJvUFrStGCKBTMJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7m1q2VbkzLxk; Wed, 11 Dec 2024 19:31:43 +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 4BBJVhdf049042; Wed, 11 Dec 2024 19:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBJVhBP049031; Wed, 11 Dec 2024 19:31:43 GMT (envelope-from git) Date: Wed, 11 Dec 2024 19:31:43 GMT Message-Id: <202412111931.4BBJVhBP049031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: ac3dedf4e8e0 - main - bsd-family-tree: add FreeBSD 14.2 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac3dedf4e8e08647a2c08e75f1ef69d8bb2831e6 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=ac3dedf4e8e08647a2c08e75f1ef69d8bb2831e6 commit ac3dedf4e8e08647a2c08e75f1ef69d8bb2831e6 Author: Maxim Konovalov AuthorDate: 2024-12-11 19:31:25 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-11 19:31:25 +0000 bsd-family-tree: add FreeBSD 14.2 --- share/misc/bsd-family-tree | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 98f49d3989db..dab6d5a1f77d 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -465,10 +465,12 @@ FreeBSD 5.2 | | | | | | | | | 8.3 | | | FreeBSD | | | | | | 14.1 | | | | | - | | macOS | | | - | | 15 | | | - | FreeBSD | | | | - | 13.4 | | OpenBSD 7.6 | + | | | macOS | | | + | | | 15 | | | + | | FreeBSD | | | | + | | 13.4 | | OpenBSD 7.6 | + | FreeBSD | | | | + | 14.2 | | | | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -907,6 +909,7 @@ FreeBSD 14.1 2024-06-04 [FBD] macOS 15 2024-09-16 [APL] FreeBSD 13.4 2024-09-17 [FBD] OpenBSD 7.6 2024-10-08 [OBD] +FreeBSD 14.2 2024-12-03 [FBD] Bibliography ------------------------ From nobody Wed Dec 11 20:32:50 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7nNM1MThz5gRSN; Wed, 11 Dec 2024 20:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7nNM0qCYz4kmb; Wed, 11 Dec 2024 20:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733949171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+hDKdFTHlYbzQgrKLsWAyBZAFVsfDqNMTyNOTba2GPI=; b=RhYTK6u3Xz7Wl1ZxEtOzdZzznQoYYVKJg4gndgGiO7y3icneiHcv5eAOZHCxuOcpajmZtI 0CQRyoPniwy4zPHIL6DK2yfo+E2JcVoEaHpGvVneIhogVDfXAtbQZ/prOXectDjl3QXj+1 Dl33KLD9m2jaMDXOUxdTtNgEp7UjYQHb20Rax+Qll2QSz5dYO6NpQJBZaWX/oXDkHleF22 2m5XJyYkGw6QnGvorMrkiFCidY+dQQUoagPtGGm05jTlh2zqu2M9z+4F+Va8KjRJfYHfyf LH2LD/wsZ9Ipqfkmfs3ObndnVXvz+Sik0Z1z0wi9m4nxzd5VM9HjkdHfvtCKlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733949171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+hDKdFTHlYbzQgrKLsWAyBZAFVsfDqNMTyNOTba2GPI=; b=sQuyksoI1c3775RXexUTT3nkmBL3s6JnHP9suymmOKqnepGeMxmU3Y8HnvVgfRU5g6pVbT C/HoQ/OtNpVQ/CnN0whtJYd4rRTkaurwd9ZZ0yCQlVIf33KJoeAdyLFqQPbSJ8rv33Ukdc RWdMW+5zXVjNlDMojqVHyad9fC9TWk7SexzXhDzq8/VVsaTdIPyD/pA79QtNldb1J9nnZy mvIZRPTiJMDS7qnHwGGTNImYmzsKK5qYHsiFJUw4VSYzlUDUgUKpwY9eryQS9uhjJVEe0f HpGSnKyPWBWyhhJkKKMf1zv/NV6X22acKPV61kg8URscgNiYTdEr2Zrzr95B+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733949171; a=rsa-sha256; cv=none; b=Vzbul+cBs7SOjDTogyROD58WfnHgM2Tw0/GOf9cgrTpwUx4Y45A42gYZUWv2RCzrLG5ZDj ZRDTWEkUpAn1DNyzwYObYYSFj4woFOS4wvpAIic13j8dURpt5t+GLNC7FU4Uj7K+56roTO 4lM/pTXfVn0bA16ik/3USDyjnFYWL6GxJY6dysU4lcXFg6dQ5kYEaK+r6441tF7U0Hwaz5 KbglCHEAswCSOhj6Nxsz1jtn5iBgiuO+jg9YxisugNJrwkAf2IgpnhtXkF33/2hOmVH0hw bYFXX1RDZhLsZudHVUmF0lvaTjntPV95BObAIZl6E2PMcgzOh2t4SZ/dGuFhpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7nNM0Qd1zMr0; Wed, 11 Dec 2024 20:32:51 +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 4BBKWoWH064548; Wed, 11 Dec 2024 20:32:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBKWoZ9064543; Wed, 11 Dec 2024 20:32:50 GMT (envelope-from git) Date: Wed, 11 Dec 2024 20:32:50 GMT Message-Id: <202412112032.4BBKWoZ9064543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: b9cf179622ba - main - libsys/i386/Symbol.sys.map: sort symbol names List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9cf179622ba002e35f48d2c997f57e9d348a16d Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b9cf179622ba002e35f48d2c997f57e9d348a16d commit b9cf179622ba002e35f48d2c997f57e9d348a16d Author: Brooks Davis AuthorDate: 2024-12-11 20:09:33 +0000 Commit: Brooks Davis CommitDate: 2024-12-11 20:31:30 +0000 libsys/i386/Symbol.sys.map: sort symbol names No functional change. Sponsored by: DARPA, AFRL --- lib/libsys/i386/Symbol.sys.map | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/i386/Symbol.sys.map b/lib/libsys/i386/Symbol.sys.map index 303804935435..6b3169336a3f 100644 --- a/lib/libsys/i386/Symbol.sys.map +++ b/lib/libsys/i386/Symbol.sys.map @@ -1,5 +1,4 @@ FBSD_1.0 { - rfork_thread; i386_clr_watch; i386_get_fsbase; i386_get_gsbase; @@ -11,12 +10,13 @@ FBSD_1.0 { i386_set_ldt; i386_set_watch; i386_vm86; + rfork_thread; }; FBSD_1.6 { x86_pkru_get_perm; - x86_pkru_set_perm; x86_pkru_protect_range; + x86_pkru_set_perm; x86_pkru_unprotect_range; }; From nobody Wed Dec 11 22:54:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7rXD3Qq1z5gbLN; Wed, 11 Dec 2024 22:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7rXD2bZDz42bp; Wed, 11 Dec 2024 22:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733957692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iQLljO6NdUaCbTwOvoHwlnp94UCxhggjBWMqp9rju4U=; b=Vsl6IdL5UQ9+1jSc72r9g/enkcYeecdUPAKTi8ZJpz+GwdqkNJgHNSWKqEs3YbzXSDQGNg +Uxs9HWbBemIbLyMfzbr/RjbMaPWBUVjeZKWRA27JLpcK1Wf8GAt+xpHhRx2ari9qNURV8 IlRrllrj46DXu1Q87+by0MmKXNzWSvwcmSlZZ5Jyv8VheAxdgb7MLs3kBjFheE+f8ufSV3 7wHTFPyfidjxD2Kk6RhHCr+uyRtoI0eCFqPpc1ECaJghPswtWUn/aVJrEkuZsYGszd1Zm2 mhrUmLHIVv78ixDhJkJ98BtywG1U9NhHa+kE0zYR/0Nl4C6BgHxqCPRN5hFjDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733957692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iQLljO6NdUaCbTwOvoHwlnp94UCxhggjBWMqp9rju4U=; b=HkYDnwMtxRQKej1Khjj6AA/k3U21TXvn7LHSGOoATs6D+Z8CbEmsM0TanrWSqG6TSyGP7i u6IZc41fPlUhBdVAGqtOknGmP+aKaLcz/B3c8OB/19p1e6XCd5+0b/RJluCEUSjfTfyGaj YaXFGaZ6BBeYEURz4IsLu0xXRT5EQVSGHBDVn0N/zG+y9u46lNqTsz6o5LIAzkG45i/GyF U+eh2w7awo47ntVprwNxkSdA12KBYSRHavFiuzx4WUmgawanhtKiiQqxoSiMdZbovF6eWo n1eEmbQ8k/YEF6NZAL9A/wzzdJRIduNSlPxLKlOa8/zCbJZHdY6apE2zoyPNLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733957692; a=rsa-sha256; cv=none; b=MqKs7Nw4KynbeJqoXxlaKttyTo3d/fw3eB7+MNjgf40G1Pj7nyGHb+/L2lngcei1yAFmpP xSqOhNuVo5lZiFaZ1y+7dgZ3tX/tVN8oq9b5KZONv8dCmAj0HNGW8m3zLfHTpn5XBNzC8V bLLBVQ1mTjaVaXtOvExLxTEUrIf0Kr/AhozDGSgL7hoV0b3eSz91ARy6DToOaj33xmXz5a 7F/cDPGFJOjOJkKtncbhgOM6ZmPtdSnb7n+jBTdCZOyDVIGt/EfwN6GGyhPQjrtiumK/Va 858zhhdWx8aPkmbV0YicHFHElKU4TZBp32cYraC6zhw+k74xJZYoeI2JqOPQnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7rXD1xsYzRjw; Wed, 11 Dec 2024 22:54:52 +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 4BBMsqcG026286; Wed, 11 Dec 2024 22:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBMsqte026283; Wed, 11 Dec 2024 22:54:52 GMT (envelope-from git) Date: Wed, 11 Dec 2024 22:54:52 GMT Message-Id: <202412112254.4BBMsqte026283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 638b29fe651e - main - x86/atpic: convert INTSRC() macro into designated initializer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 638b29fe651e9a2454d6d73f0af0aec0d208c5d0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=638b29fe651e9a2454d6d73f0af0aec0d208c5d0 commit 638b29fe651e9a2454d6d73f0af0aec0d208c5d0 Author: Elliott Mitchell AuthorDate: 2024-12-11 22:53:42 +0000 Commit: Warner Losh CommitDate: 2024-12-11 22:54:09 +0000 x86/atpic: convert INTSRC() macro into designated initializer Move to using C99 initializers. These make the macros more understandable and easier to use. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1457 --- sys/x86/isa/atpic.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c index 4ea80cfff7f9..56566ef8d64d 100644 --- a/sys/x86/isa/atpic.c +++ b/sys/x86/isa/atpic.c @@ -113,8 +113,12 @@ inthand_t } #define INTSRC(irq) \ - { { &atpics[(irq) / 8].at_pic }, IDTVEC(atpic_intr ## irq ), \ - IDTVEC(atpic_intr ## irq ## _pti), (irq) % 8 } + { \ + .at_intsrc = { &atpics[(irq) / 8].at_pic }, \ + .at_intr = IDTVEC(atpic_intr ## irq ), \ + .at_intr_pti = IDTVEC(atpic_intr ## irq ## _pti), \ + .at_irq = (irq) % 8, \ + } struct atpic { struct pic at_pic; From nobody Wed Dec 11 22:58:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7rcn1rXwz5gbjt; Wed, 11 Dec 2024 22:58: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7rcn0d0Cz42tW; Wed, 11 Dec 2024 22:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733957929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAHMU3qP7iLwIHyjtFOLF0ttXZYs8Xx4hRFQR0jhHnU=; b=Ush54XiCeAUgCusVjWjT7+1toUd6Pu3wdv8rsBKvWRuooSNoTN8axX4T81hz243hPYEg9t xbdE3wU1Ox7Z6l5Fn4VxNxrCOu6itaeJBxK8j3/AWh9AeBaw0BILLb4+oyHZ0Moq7tw8Zx ZCgy4GzVzSl6wa+TYxNJp9PajRLFCsAG9bgIzi1cqX/Ls5CbL0cL3DI12sO3KHFD81gNzN MkScPtufDqsclO6ctqRYHN2itJTBiUNejnnngfPCRi7A1bqX7/Ln9alJ3HoDh2SycP7Iwm 6typLHaNdS3d09sIsxqGOUYk6rTjtY98CpuJRp9j8KhlCKIST8OpCl8KC+9/8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733957929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAHMU3qP7iLwIHyjtFOLF0ttXZYs8Xx4hRFQR0jhHnU=; b=POSzQkvrW3Ywi0zywQHdF7MxdDKXFlKiyvPoRaJoGen/0jJ3HDUl9sY5IteHUtEOP5th4/ NyfXRi3hmJaca0ahMicubIaQJ6BI2LRMShILuhIYIDrgnXtpQxQBNl8UhvZVdvulMeSIff Xue9WVyRITzif+3WPGo6ZAv4EPWxe5vk/XwMHWPKfK40F3Pnk20QrYt7FmEvQcip4bn4gD n5jRf8U4rsUV/13KLv07FO//B3ABM19oF0TtAbVT5lfvkxHzmLNfrzP5Yn9Q5iXm1b7tZs DyIvX98CCmEQPcUNWzU9kExwu+gysSUZJcApDZ/9MgLyqL3m/jh2xN/HyWJnRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733957929; a=rsa-sha256; cv=none; b=GB4GK6jK6BFbk0/tpB6PnBpFWN+6q4GawkTqtFnUIu1ZsOjv340mnzu5VhC2cBGOupBQ2s 8upZL/K5rmi60O/0apbgYdS5b1yh+AJWr+PqTcMz/6K9NnOeMZ//OvSUCGZbnqwa+In4An ROkAIZA4AfPwX01bzN/hTkzSMLxEd9TgPPgm3Txs6a7IdlJMkUDzBPYP8MZgRyOJ5DBiCV 3e3I7qcwlZmYIXqb+c9N3WCqShYTzB2BTzY6gIk75vnsxFSp+i2aHRxpxPuIgoWDRKMMYK GEH+WZok6+EjKyg/vPh4+rvKlFK4twdJdonvh1Wl4rUg5TDmpMvhPMLiSOfsXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7rcm75c4zRgy; Wed, 11 Dec 2024 22:58:48 +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 4BBMwmVL027588; Wed, 11 Dec 2024 22:58:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBMwmok027585; Wed, 11 Dec 2024 22:58:48 GMT (envelope-from git) Date: Wed, 11 Dec 2024 22:58:48 GMT Message-Id: <202412112258.4BBMwmok027585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bf847ea31ae2 - main - rc: ignore InsydeH2O UEFI BIOS UUID placeholder for hostid List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf847ea31ae25953d115a57c77ff556e9641cd26 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf847ea31ae25953d115a57c77ff556e9641cd26 commit bf847ea31ae25953d115a57c77ff556e9641cd26 Author: Franco Fichtner AuthorDate: 2024-11-25 14:00:23 +0000 Commit: Warner Losh CommitDate: 2024-12-11 22:58:14 +0000 rc: ignore InsydeH2O UEFI BIOS UUID placeholder for hostid This caused MAC addresses (e.g. bridge0) to clash on systems running this particular BIOS. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1544 --- libexec/rc/rc.d/hostid | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/rc/rc.d/hostid b/libexec/rc/rc.d/hostid index 18d0fbabf6e4..bde88d7e6be5 100755 --- a/libexec/rc/rc.d/hostid +++ b/libexec/rc/rc.d/hostid @@ -77,6 +77,8 @@ valid_hostid() ;; 11111111-2222-3333-4444-555555555555) ;; + 12345678-1234-5678-90ab-cddeefaabbcc) + ;; 4c4c4544-0000-2010-8020-80c04f202020) ;; 58585858-5858-5858-5858-585858585858) From nobody Wed Dec 11 23:08:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7rqx45xzz5gcCH; Wed, 11 Dec 2024 23:08: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7rqx3b9gz43s8; Wed, 11 Dec 2024 23:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733958509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nd1of46UL2lPWdzwDAzxKGQ8pyMEF8Su+M3miBCfVm0=; b=Opr85fyffFSPTwV9vXc+0OJ3mpPeNzaQfqqLQ6ome/gTAC6qzIdmwgOnCCDCLBzc8P0tQJ HUWNYcL8W+z9DaVNY02Q6zild9+tQmDmSROB6TJWXFPHrF2/e8yv0lmnIiteWD0bcPRQwq s3iR8p5mfDZQff+bleM2jxD69HK5BlPXlaJEXZm70/0tMOnoJ4t/mVfnXGCW+I+naV9wmM CNlTO7wRUQTbriLSA2eTbiOSa3J7VdfN8R/KUsZaQ9J7rIfw5zvVt6o+/ITIIi31q9oPHw K7PYq2dgP9n0kki8jOLUQSFsUB5/VpEMzcteIHNZlbgc9+AbkV0aysjgdGVN0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733958509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nd1of46UL2lPWdzwDAzxKGQ8pyMEF8Su+M3miBCfVm0=; b=EFFEMgfH/Gu5PRkJv9U+sS6Xoez840atD6N3W2RJo6pTAkezVPICeUdoJLGG4ohkHwRgqr CALR5zyBS3Rh2D/eWSk5rJOMUCBe26XjQU2SwazNSseezudyHdgu57ltRD9ETEBTOpwYb2 HqJ3jY+yYAsSM2zX5suoaVLB9bwzQoJ72XI90f9+Ifn7JZ0P1Z5YkgeKSPtbJIMKqGASRO uWOV78WXHfiBBPsSAhxB7jYwSvOehDS8pycaMBXayInE5cMRTk3CJfSBhQ4iLXwAa1ueLr KoFFeMXolKT/o+5jhPVL/FRJ6BalwY3CUntRkoz27WatiGLcrFEjF7as+jT6gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733958509; a=rsa-sha256; cv=none; b=aaRwiFHnp9bnORqeKqU2HwDVahRCzUPBmL/OmLP+FqB2oeuFfA5CxaWaAJx2lb83nr0xX3 QPkDCj1wXks5xSav+lWRG6hMOzPB4jyfhNCDmIF5gbT48gIVeYzUxlyr33Q9mO1PAWujk+ VZ4oMbZf84hm3STwtinrSRTMFkHD0t7bKXuQna/QObdcE1Q6j3RimwnPPDiWIDlOOjRCIl sIKA7wf04ztO4DWWRfksm5egQBXLa7la0R++HNQN/yWxkrPEyptWbPcbl6bFiyE6QZ3dC1 OpbbdZt5LxdeKlM8vR50Al8wL7XTqUrLJVHmowEJONgO8OBWY2d9lPq+ASciyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7rqx3BpmzS95; Wed, 11 Dec 2024 23:08: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 4BBN8T0r046687; Wed, 11 Dec 2024 23:08:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBN8TW8046684; Wed, 11 Dec 2024 23:08:29 GMT (envelope-from git) Date: Wed, 11 Dec 2024 23:08:29 GMT Message-Id: <202412112308.4BBN8TW8046684@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 0e8a36a2ab12 - main - mount_nfs.c: Add an NFS mount option to set a port# for Mount List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e8a36a2ab1223ffb0cbdfd49383d8cf978cfa74 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=0e8a36a2ab1223ffb0cbdfd49383d8cf978cfa74 commit 0e8a36a2ab1223ffb0cbdfd49383d8cf978cfa74 Author: Rick Macklem AuthorDate: 2024-12-11 23:07:05 +0000 Commit: Rick Macklem CommitDate: 2024-12-11 23:07:05 +0000 mount_nfs.c: Add an NFS mount option to set a port# for Mount Normally mount_nfs acquires the port# for the NFS server's Mount protocol (mountd(8)) via rpcbind/portmapper for NFSv3 mounts. This patch adds a new mount option, so that the mount command can specify the port# and avoid using rpcbind for NFSv3 mounts. The new option is called "mountport" since that is what Linux calls their mount option for the same semantics. PR: 282481 Reviewed by: delphij Tested by: Ronald Minnich MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47743 --- sbin/mount_nfs/mount_nfs.c | 56 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index e4c469eff0ae..189bdd70b398 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -108,6 +108,7 @@ static u_char *fh = NULL; static int fhsize = 0; static int secflavor = -1; static int got_principal = 0; +static in_port_t mntproto_port = 0; static enum mountmode { ANY, @@ -360,6 +361,13 @@ main(int argc, char *argv[]) softintr = true; } else if (strcmp(opt, "intr") == 0) { softintr = true; + } else if (strcmp(opt, "mountport") == 0) { + num = strtol(val, &p, 10); + if (*p || num <= 0 || num > IPPORT_MAX) + errx(1, "illegal port num -- " + "%s", val); + mntproto_port = num; + pass_flag_to_nmount=0; } if (pass_flag_to_nmount) { build_iovec(&iov, &iovlen, opt, @@ -900,11 +908,47 @@ tryagain: return (TRYRET_SUCCESS); } + /* + * malloc() and copy the address, so that it can be used for + * nfsargs below. + */ + addrlen = nfs_nb.len; + addr = malloc(addrlen); + if (addr == NULL) + err(1, "malloc"); + bcopy(nfs_nb.buf, addr, addrlen); + /* Send the MOUNTPROC_MNT RPC to get the root filehandle. */ try.tv_sec = 10; try.tv_usec = 0; - clp = clnt_tp_create(hostp, MOUNTPROG, mntvers, nconf_mnt); + if (mntproto_port != 0) { + struct sockaddr *sad; + struct sockaddr_in *sin; + struct sockaddr_in6 *sin6; + + sad = (struct sockaddr *)nfs_nb.buf; + switch (sad->sa_family) { + case AF_INET: + sin = (struct sockaddr_in *)nfs_nb.buf; + sin->sin_port = htons(mntproto_port); + break; + case AF_INET6: + sin6 = (struct sockaddr_in6 *)nfs_nb.buf; + sin6->sin6_port = htons(mntproto_port); + break; + default: + snprintf(errbuf, sizeof(errbuf), + "Mnt port bad addr family %d\n", sad->sa_family); + return (TRYRET_LOCALERR); + } + clp = clnt_tli_create(RPC_ANYFD, nconf_mnt, &nfs_nb, MOUNTPROG, + mntvers, 0, 0); + } else { + /* Get the Mount protocol port# via rpcbind. */ + clp = clnt_tp_create(hostp, MOUNTPROG, mntvers, nconf_mnt); + } if (clp == NULL) { + free(addr); snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s", netid_mnt, hostp, spec, clnt_spcreateerror("RPCMNT: clnt_create")); return (returncode(rpc_createerr.cf_stat, @@ -914,10 +958,10 @@ tryagain: nfhret.auth = secflavor; nfhret.vers = mntvers; clntstat = clnt_call(clp, MOUNTPROC_MNT, (xdrproc_t)xdr_dir, spec, - (xdrproc_t)xdr_fh, &nfhret, - try); + (xdrproc_t)xdr_fh, &nfhret, try); auth_destroy(clp->cl_auth); if (clntstat != RPC_SUCCESS) { + free(addr); if (clntstat == RPC_PROGVERSMISMATCH && trymntmode == ANY) { clnt_destroy(clp); trymntmode = V2; @@ -932,6 +976,7 @@ tryagain: clnt_destroy(clp); if (nfhret.stat != 0) { + free(addr); snprintf(errbuf, sizeof errbuf, "[%s] %s:%s: %s", netid_mnt, hostp, spec, strerror(nfhret.stat)); return (TRYRET_REMOTEERR); @@ -941,13 +986,10 @@ tryagain: * Store the filehandle and server address in nfsargsp, making * sure to copy any locally allocated structures. */ - addrlen = nfs_nb.len; - addr = malloc(addrlen); fhsize = nfhret.fhsize; fh = malloc(fhsize); - if (addr == NULL || fh == NULL) + if (fh == NULL) err(1, "malloc"); - bcopy(nfs_nb.buf, addr, addrlen); bcopy(nfhret.nfh, fh, fhsize); build_iovec(iov, iovlen, "addr", addr, addrlen); From nobody Wed Dec 11 23:14:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7rzL1gbgz5gcl5; Wed, 11 Dec 2024 23:14:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7rzK6bpqz44nl; Wed, 11 Dec 2024 23:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733958893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sBasXUdqZriQZzPoyH3ZyCgYNkBEL+mqKwMV9gN8qnM=; b=TvVtwDzuahFxLEmYXihsPA+GiJbX3Wosnz+xpVSB1v/544i9EB9B9w3xkauqrmRhW57nDG fX+ER8kfPrKqbXeiyZqH6Md5500otCq/gjSysl1ED82trYa/1C4EqRjx5valE/q3nGD5ra nqyHS4/a/UVj+ZKhM8MSFEjN2OQDMCLjsLStiXgxAY0lh2Uj5/wKdIA+zDJg/Jc82xXHTO /UoducYOjTC/eGcy4DGKrt2Pi0zT3Sl55SRETuHR4dpk2ztFEAtG8CiBgPMYetKvmiWaQf IMQ/3lT7lJcjrjMLZpz5rJt+B6RamXZ+ZCex0Lld+6R86PqnquWW6cTL4qdIzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733958893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sBasXUdqZriQZzPoyH3ZyCgYNkBEL+mqKwMV9gN8qnM=; b=q8F648qRB4l7UlHQCxS8KYCSRP5Vuj/OFoXciKLUL4/I/q7HSZHKNkv9BYYgB922BC9zUH rDwiE5x04cj25OFK9242dZB3T+CSoq9MO9RSZ8+nkglXoSnlZulb07v/dOoaYzg8FsJAv8 qNFtbyFlpS0ltNowY8XjWXs4CuegYv/dzoovD4fccas/k9xD7kNeep4ahOL1uxUaVd6Wn0 xH45Ue1vCU1SpohmgYIKM/K0WEce/v0PFez4XM+wr1RM2/TDejXrCOhpzteH0J7ri6dmTh LoHQpZM1J4TBHM+2Ba6ivjtwVZsP6q+axiaOp1+1pRRT3ssQpy9yc6tXG6Na2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733958893; a=rsa-sha256; cv=none; b=nCamKWpzOLJvhm+yLyj3yL6ktccuglwkjfxk8dZTIgH35FajkNtiK4WQtRDG4sZZsDIXaB Y94DOfwYlPGoPAPqmH9aWCE12UxVyoBszk2FK9SK/DMVvjOucz+b8i6CRYsdeYqxbydfzb GEknfw62AYFyfqrTGqUJFpYJtTBKeXRDoinFoJTvMyKF5od9yMtXmpdMt3XheKWHAn011Q F05dthgM9b7KhKZIk3UGBTwQfsz5vXsiN2CRBwksrou82h7k9ssrmSKrhkRgZVmnildRsE zs13SiKWOyt708lgAr1IjMlIVcntIHckHnc59Th2Kf3stRDfuRoTtx2UZltw+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7rzK6ByjzS9t; Wed, 11 Dec 2024 23:14:53 +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 4BBNErHd063675; Wed, 11 Dec 2024 23:14:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBNErTt063672; Wed, 11 Dec 2024 23:14:53 GMT (envelope-from git) Date: Wed, 11 Dec 2024 23:14:53 GMT Message-Id: <202412112314.4BBNErTt063672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 90fb07edbd7a - main - intr/x86: add ioapic_drv_t to reduce number of casts in IO-APIC implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90fb07edbd7adb653bd8dc1aac09a63b7ff76f89 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=90fb07edbd7adb653bd8dc1aac09a63b7ff76f89 commit 90fb07edbd7adb653bd8dc1aac09a63b7ff76f89 Author: Elliott Mitchell AuthorDate: 2024-10-01 19:56:25 +0000 Commit: Warner Losh CommitDate: 2024-12-11 23:14:30 +0000 intr/x86: add ioapic_drv_t to reduce number of casts in IO-APIC implementation void * is handy when you truly do not care about the type. Yet there is so much casting back and forth in the IO-APIC code as to be hazardous. Achieve better static checking by the compiler using a typedef. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1457 --- sys/x86/include/apicvar.h | 24 +++++++++++++----------- sys/x86/x86/io_apic.c | 42 +++++++++++------------------------------- sys/x86/x86/mptable.c | 4 ++-- 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index 61c726f150df..fc9bb0123539 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -196,19 +196,21 @@ extern int *apic_cpuids; /* Allow to replace the lapic_ipi_vectored implementation. */ extern void (*ipi_vectored)(u_int, int); +typedef struct ioapic *ioapic_drv_t; + void apic_register_enumerator(struct apic_enumerator *enumerator); -void *ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase); -int ioapic_disable_pin(void *cookie, u_int pin); -int ioapic_get_vector(void *cookie, u_int pin); -void ioapic_register(void *cookie); -int ioapic_remap_vector(void *cookie, u_int pin, int vector); -int ioapic_set_bus(void *cookie, u_int pin, int bus_type); -int ioapic_set_extint(void *cookie, u_int pin); -int ioapic_set_nmi(void *cookie, u_int pin); -int ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol); -int ioapic_set_triggermode(void *cookie, u_int pin, +ioapic_drv_t ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase); +int ioapic_disable_pin(ioapic_drv_t cookie, u_int pin); +int ioapic_get_vector(ioapic_drv_t cookie, u_int pin); +void ioapic_register(ioapic_drv_t cookie); +int ioapic_remap_vector(ioapic_drv_t cookie, u_int pin, int vector); +int ioapic_set_bus(ioapic_drv_t cookie, u_int pin, int bus_type); +int ioapic_set_extint(ioapic_drv_t cookie, u_int pin); +int ioapic_set_nmi(ioapic_drv_t cookie, u_int pin); +int ioapic_set_polarity(ioapic_drv_t cookie, u_int pin, enum intr_polarity pol); +int ioapic_set_triggermode(ioapic_drv_t cookie, u_int pin, enum intr_trigger trigger); -int ioapic_set_smi(void *cookie, u_int pin); +int ioapic_set_smi(ioapic_drv_t cookie, u_int pin); void lapic_create(u_int apic_id, int boot_cpu); void lapic_init(vm_paddr_t addr); diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 36c7cba77a35..d0f47f82011a 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -606,7 +606,7 @@ ioapic_resume(struct pic *pic, bool suspend_cancelled) /* * Create a plain I/O APIC object. */ -void * +ioapic_drv_t ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase) { struct ioapic *io; @@ -727,22 +727,18 @@ ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase) } int -ioapic_get_vector(void *cookie, u_int pin) +ioapic_get_vector(ioapic_drv_t io, u_int pin) { - struct ioapic *io; - io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (-1); return (io->io_pins[pin].io_irq); } int -ioapic_disable_pin(void *cookie, u_int pin) +ioapic_disable_pin(ioapic_drv_t io, u_int pin) { - struct ioapic *io; - io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); if (io->io_pins[pin].io_irq == IRQ_DISABLED) @@ -754,11 +750,9 @@ ioapic_disable_pin(void *cookie, u_int pin) } int -ioapic_remap_vector(void *cookie, u_int pin, int vector) +ioapic_remap_vector(ioapic_drv_t io, u_int pin, int vector) { - struct ioapic *io; - io = (struct ioapic *)cookie; if (pin >= io->io_numintr || vector < 0) return (EINVAL); if (io->io_pins[pin].io_irq < 0) @@ -771,13 +765,11 @@ ioapic_remap_vector(void *cookie, u_int pin, int vector) } int -ioapic_set_bus(void *cookie, u_int pin, int bus_type) +ioapic_set_bus(ioapic_drv_t io, u_int pin, int bus_type) { - struct ioapic *io; if (bus_type < 0 || bus_type > APIC_BUS_MAX) return (EINVAL); - io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); if (io->io_pins[pin].io_irq < 0) @@ -792,11 +784,9 @@ ioapic_set_bus(void *cookie, u_int pin, int bus_type) } int -ioapic_set_nmi(void *cookie, u_int pin) +ioapic_set_nmi(ioapic_drv_t io, u_int pin) { - struct ioapic *io; - io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); if (io->io_pins[pin].io_irq == IRQ_NMI) @@ -815,11 +805,9 @@ ioapic_set_nmi(void *cookie, u_int pin) } int -ioapic_set_smi(void *cookie, u_int pin) +ioapic_set_smi(ioapic_drv_t io, u_int pin) { - struct ioapic *io; - io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); if (io->io_pins[pin].io_irq == IRQ_SMI) @@ -838,11 +826,9 @@ ioapic_set_smi(void *cookie, u_int pin) } int -ioapic_set_extint(void *cookie, u_int pin) +ioapic_set_extint(ioapic_drv_t io, u_int pin) { - struct ioapic *io; - io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); if (io->io_pins[pin].io_irq == IRQ_EXTINT) @@ -864,12 +850,10 @@ ioapic_set_extint(void *cookie, u_int pin) } int -ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol) +ioapic_set_polarity(ioapic_drv_t io, u_int pin, enum intr_polarity pol) { - struct ioapic *io; int activehi; - io = (struct ioapic *)cookie; if (pin >= io->io_numintr || pol == INTR_POLARITY_CONFORM) return (EINVAL); if (io->io_pins[pin].io_irq < 0) @@ -885,12 +869,10 @@ ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol) } int -ioapic_set_triggermode(void *cookie, u_int pin, enum intr_trigger trigger) +ioapic_set_triggermode(ioapic_drv_t io, u_int pin, enum intr_trigger trigger) { - struct ioapic *io; int edgetrigger; - io = (struct ioapic *)cookie; if (pin >= io->io_numintr || trigger == INTR_TRIGGER_CONFORM) return (EINVAL); if (io->io_pins[pin].io_irq < 0) @@ -909,15 +891,13 @@ ioapic_set_triggermode(void *cookie, u_int pin, enum intr_trigger trigger) * Register a complete I/O APIC object with the interrupt subsystem. */ void -ioapic_register(void *cookie) +ioapic_register(ioapic_drv_t io) { struct ioapic_intsrc *pin; - struct ioapic *io; volatile ioapic_t *apic; uint32_t flags; int i; - io = (struct ioapic *)cookie; apic = io->io_addr; mtx_lock_spin(&icu_lock); flags = ioapic_read(apic, IOAPIC_VER) & IOART_VER_VERSION; diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c index 03b4d4362baa..4f078fd05ec6 100644 --- a/sys/x86/x86/mptable.c +++ b/sys/x86/x86/mptable.c @@ -157,7 +157,7 @@ struct pci_route_interrupt_args { static mpfps_t mpfps; static mpcth_t mpct; static ext_entry_ptr mpet; -static void *ioapics[IOAPIC_MAX_ID + 1]; +static ioapic_drv_t ioapics[IOAPIC_MAX_ID + 1]; static bus_datum *busses; static int mptable_nioapics, mptable_nbusses, mptable_maxbusid; static int pci0 = -1; @@ -760,7 +760,7 @@ intentry_trigger(int_entry_ptr intr) static void mptable_parse_io_int(int_entry_ptr intr) { - void *ioapic; + ioapic_drv_t ioapic; u_int pin, apic_id; apic_id = intr->dst_apic_id; From nobody Wed Dec 11 23:19:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7s4W1XZtz5gd37; Wed, 11 Dec 2024 23:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7s4V6G3qz457C; Wed, 11 Dec 2024 23:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733959162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CbKaQ8Eem/Q+1Gr1KZMVrLtMHutsfRskTrYL0LalKZA=; b=yRTduTOM48MtZLWypltjOmIm93QdID2SDQR/sk+mvp15lx03egAsk861xS3n1UpQJEZckg l2PT42uzgXxWZeg8/RbgfctRo2XPRawkY6PTOFamc95QWbaDvsz402zTNLOhXRg6xZbG5e kzNFMgBHOkYn38KBd77rIIj1e5EeeELD1Vb+IIyBLNGWOlzAEyOb3lo6a4kjt1Vd8Xrqnb mqSsbME+nzi2lvFS7eltwWy/L5DQNXvtAncxRDKvkRQRIpevxtzdio+v/OIOfhSRZUhEkW rRXdsuXYwk1pS/aSWbFhZBTLYCnIMKlNs33WEUryF7/uNxhPDE4D5XswhY3gVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733959162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CbKaQ8Eem/Q+1Gr1KZMVrLtMHutsfRskTrYL0LalKZA=; b=hYQce7uvWd/e5BeURLTSTZdXPtndg/swTJHW1RIO2OVyxVfC3XL3xB7L3kkWvE6nGlLPuB eebs4krHjylkCEjCWAlZ87TXy9aaY+pNM8Ebk0w6A+ufwFTBSr8WCOI3U0ksL9yGPuzBFq 7qEDhhG+bWXTR0xJJ257NEl7qT0gKTqQpUTswn7WsfQiAcDRVopclMivXR0iRDnxJPa3NP cXZP3FdxksiLvuV9wXqt65Oq4C4wDuR1WXbPTXPvd+btiS0HS1FmfpEpPosbyVj/huegrQ Ithy325MNc4tBj3e4n/P00lwVhqgWPmKajCxI/jf+p6YVjjPg2sCIol/8VO/Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733959162; a=rsa-sha256; cv=none; b=XxMA5w/Gz+HHvhthWxI4j2qoiejZ3qH7hBEGkd3uu68zCEkQyM3x96fDT1PpLsECe+gWPW jVJR5vZ89OS8obYYdYQP5ekRbagLK47pOtvXep3t9nPYs9NtZ8ttt7eatjeY+CD0qcCD2K Dwo1yrztJKCNkZGZNjFL/dyD9yu1nELu2XwUOyr+ybE/F07h7sc3kPUJewrr9nUZ7/Yws2 WA+xbqpKLuc0ZcSCGQDkKBay4vw+uJ99nhDHbEmeO13XmSngUSA29w9v56l0UI8/83+T6C dZ8Gj8FaZXrkTmwHgsDIVRC+did47RF4W8D4k2PDdY8Es7oKoiAeSNPGqrmpWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7s4V5t5vzSGX; Wed, 11 Dec 2024 23:19: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 4BBNJMC5065104; Wed, 11 Dec 2024 23:19:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBNJM2O065101; Wed, 11 Dec 2024 23:19:22 GMT (envelope-from git) Date: Wed, 11 Dec 2024 23:19:22 GMT Message-Id: <202412112319.4BBNJM2O065101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 91a74536a159 - main - mount_nfs.8: Document the new "mountport" NFS mount option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91a74536a159e49cee76ae4eb3ce05e2ef70c773 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=91a74536a159e49cee76ae4eb3ce05e2ef70c773 commit 91a74536a159e49cee76ae4eb3ce05e2ef70c773 Author: Rick Macklem AuthorDate: 2024-12-11 23:18:21 +0000 Commit: Rick Macklem CommitDate: 2024-12-11 23:18:21 +0000 mount_nfs.8: Document the new "mountport" NFS mount option Commit 0e8a36a2ab12 adds a new NFS mount option called mountport. This patch for the man page documents this new NFS mount option. This is a content change. Reviewed by: delphij, emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47849 --- sbin/mount_nfs/mount_nfs.8 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index 13f0608ccad9..4ae4b6dbd46b 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 8, 2023 +.Dd November 29, 2024 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -196,6 +196,16 @@ This should be used for mounts on old servers that cannot handle a group list size of 16, as specified in RFC 1057. Try 8, if users in a lot of groups cannot get response from the mount point. +.It Cm mountport Ns = Ns Aq Ar value +Specify the port number to be used to communicate with +.Xr mountd 8 +on the NFS server. +This option allows an NFSv2 or NFSv3 mount to be done without +the need to run the +.Xr rpcbind 8 +service. +This option is meaningless for an NFSv4 mount, since NFSv4 +does not use the Mount protocol. .It Cm mntudp Force the mount protocol to use UDP transport, even for TCP NFS mounts. (Necessary for some old @@ -672,6 +682,7 @@ Same as .Xr mount 8 , .Xr nfsd 8 , .Xr nfsiod 8 , +.Xr rpcbind 8 , .Xr rpc.tlsclntd 8 , .Xr showmount 8 .Sh HISTORY From nobody Wed Dec 11 23:27:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7sFT4hkhz5gdTg; Wed, 11 Dec 2024 23:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7sFT47X7z46MK; Wed, 11 Dec 2024 23:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733959629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BHuT1tSFbFvGKrFNVt7+Lbd5khSjdPGNVRTpw8v8McY=; b=LiXEdYbmuLZj3Rkfhban2y+xP32Q7L3PQjvsZrDRXt6vtf9hqmx7IuiUEUxSytNJJs9OaR 1tJWDU8/bLcBaERgMDOT53Iu73gr27WbP8zam98j/U2RLmwjs5wQOh4lss92ow2lnCBLGm AJhF35ZUKZ1GcquU2O6JGKHKpbamWrzwa5eXWdwuT9MN133yaOqNMioqrK6sVtaPl0csc8 At5m9UsiHyXUsFEPUl47aiawbQeW8gdTXzPaSjTHkvJsF+edQFNpMhvtfS3x7uK1cANx6s vOgWL8uy5DHoOEgmHh9LgaoLiziNjYeHSSSkvuSpVwHmGezC7obWauFs5/e9HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733959629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BHuT1tSFbFvGKrFNVt7+Lbd5khSjdPGNVRTpw8v8McY=; b=XG75njbzZXzkIuZdkQ0znZ/GPw+kqkVToIqh9YFcpw757dQctn8BZDQ6WWxjXjgHNnQ09e fAn+hqvTYHzQQwxIthloYanbWt3VpGc+Sr0SNhe1eT659eo0q6pAs9WV05pnxjEJMv5dUs qwUvo8vl1ZU8vE+LQYeUrEWEs2HWIzcYGR3E7OeTY4IigB59T6w79MjQnKz1aw4FCdHvZY ued0Xjh2VSibEINRk88SyYaQMlIg1Nt7NaUpd84W194VsgeDmGIrR18FTP6+uFNURJHPzV xD66dpsrCpJWDFC+cfJbBIBTZLStUaZrUvbf4wDOcolbz7t/oHINrbJ/z9WTtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733959629; a=rsa-sha256; cv=none; b=eUS/g64B1/vprxROlMfGZu+REqsSgfPNdzOfLb9htpAa8Nm5hYmXLvB5fjPR9FZW3sQoAd jJiwDC5cNU8Qwr4G2lBcDLhD8PQuBuoG7O3P+lG7PrjDzmQHEmq8Tj3AGyb1SnUXnChE5i g5nd13OBe3DaM7te4M17jm8ntK+S4sUWkhNpXhgiMJC9tZovtOVXkwsMrInhCKy7cv6QV8 eySxRa6PrOOryZWJ50ywvXoMgen2VEomxfEsfTiVIzU7sbdZKnaYikXjKzGwLHjyxGJ3VA c4CuTX4iLB8eb8NiWZ7qFI84eu9xz5HGDMvbglrv2g75e/03XLQgeaKQFRHkMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7sFT3fhMzSqS; Wed, 11 Dec 2024 23:27:09 +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 4BBNR9SL083770; Wed, 11 Dec 2024 23:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBNR9pF083767; Wed, 11 Dec 2024 23:27:09 GMT (envelope-from git) Date: Wed, 11 Dec 2024 23:27:09 GMT Message-Id: <202412112327.4BBNR9pF083767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: af66ffbf69e4 - main - RELNOTES: Add an entry for commit 0e8a36a2ab12 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af66ffbf69e4013401b2e0a51af689c12b62387d Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=af66ffbf69e4013401b2e0a51af689c12b62387d commit af66ffbf69e4013401b2e0a51af689c12b62387d Author: Rick Macklem AuthorDate: 2024-12-11 23:25:31 +0000 Commit: Rick Macklem CommitDate: 2024-12-11 23:25:31 +0000 RELNOTES: Add an entry for commit 0e8a36a2ab12 --- RELNOTES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELNOTES b/RELNOTES index a4f6e877ae32..96c80bd483ea 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,11 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +0e8a36a2ab12: + Add a new NFS mount option called "mountport" that may be used + to specify the port# for the NFS server's Mount protocol. + This permits a NFSv3 mount to be done without running rpcbind(8). + b2f7c53430c3: Kernel TLS is now enabled by default in kernels including KTLS support. KTLS is included in GENERIC kernels for aarch64, From nobody Thu Dec 12 01:30:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7w0J4wVSz5gmL8; Thu, 12 Dec 2024 01:30: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 4Y7w0J4PDjz4QLr; Thu, 12 Dec 2024 01:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733967056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bMH7sOk2TdKtWEzdogurgMYHrmzAI5lo9pS84RtdAA8=; b=IGkAiBDsktKc4mUvVtdAuA5gI8/3xAMj2Q2ipt1YpcQD9NSsgnKSeK4XzrjeWiAp6qyg34 jMpsk/uBt+Ba93ejh/NVI+sqr18eBxSdDF2KQWOcALtxo1xrhvtoboVbjjsHde7rNPFvfF K5qbZGkQmqQyc5WqetcQhSjZEGGdtV53oyVJ9i5EdfhGFrndC1fMKowCeCx7XcYnj4+yF4 W+MBIElmyzzH1J+YeTThpUQKbOxrJtCgZJeCuXh1anMVNa9brc8THmK3+7QlUfJeDE+610 FihoXORZGiX0WsTNwagKooeFpZ0VFWNAdWPiOTJG/D9MCgkzCsPzYjRJ97cyWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733967056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bMH7sOk2TdKtWEzdogurgMYHrmzAI5lo9pS84RtdAA8=; b=vvp1wD822ZsRW/z8pW3bBiDThgqwfCG/40C15/pBtROgUh+vNdju+YFclDESr9GoSWBbvU ydNqaYDSCpIJk51odVWC57CWeTOk1RFJI7y6gHaud53AP57Wwn6OylmK5D7f5bCm+plkiJ +5aSUbCRvFrd4QKCyNXrBZQkZirY5iDUsg9xPW9UzRmstjkG2Fd5VtjUk+JXoBinbB5vWx JMGSdpUpj9YAWplKge8A7qDQ8416lBZqht3A7+WiJxmUWnU+22oohuWEMAerfZkt+gISgS s9TUwFx/uNYEjNXM8GWq1QciHsDfIIwOWerv5wT03MggZvrk+w6XOnM4m2A49A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733967056; a=rsa-sha256; cv=none; b=tkjjn6lEuMXZZYyG1gcNYGuGcYqOJpiHwPatfCzuy7Ll1gpMAe1Kk1W4t6C0cfn5fVpVFS dL/+iyZxpoKt7VtuJlITBrlu1PLKNfUOHA2r8DdZvkQr+yr5mV+D2IlPgJRvfKXNOB4N4k oY4cY2wHaV6Dd1GRwtwqPR59Dn9lYUm7n/RiRQ95LfIDeRRvUITBlFwcv1upiy1ALuFDSS v6QpHhVE6si3QwEzGGWth7T7bPhi5oR3rzguFx1YBpktlZ94afrTDdUG0YXBS1FcjCu6t4 s/9gn2TuOJZbvtW6EcAjRWsv6R7IpYvGvKSutS4PzpzXYTBRwQZZmTCWLELVkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7w0J40Y5zXy7; Thu, 12 Dec 2024 01:30: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 4BC1UudP015810; Thu, 12 Dec 2024 01:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BC1Uufq015807; Thu, 12 Dec 2024 01:30:56 GMT (envelope-from git) Date: Thu, 12 Dec 2024 01:30:56 GMT Message-Id: <202412120130.4BC1Uufq015807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 48d92db0804b - main - fusefs: Upgrade FUSE protocol to version 7.32. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48d92db0804b0e70e0d8dca5e1c8a99eaf70cc3c Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=48d92db0804b0e70e0d8dca5e1c8a99eaf70cc3c commit 48d92db0804b0e70e0d8dca5e1c8a99eaf70cc3c Author: Claudiu I. Palincas AuthorDate: 2024-12-11 23:17:54 +0000 Commit: Alan Somers CommitDate: 2024-12-12 01:30:33 +0000 fusefs: Upgrade FUSE protocol to version 7.32. This commit upgrades the FUSE API to protocol 7.32. It doesn't implement any of protocol 7.32's new features. Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D48040 --- sys/fs/fuse/fuse_kernel.h | 81 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/sys/fs/fuse/fuse_kernel.h b/sys/fs/fuse/fuse_kernel.h index ad93a26adaab..14d5508ba3fa 100644 --- a/sys/fs/fuse/fuse_kernel.h +++ b/sys/fs/fuse/fuse_kernel.h @@ -161,6 +161,21 @@ * - add FOPEN_CACHE_DIR * - add FUSE_MAX_PAGES, add max_pages to init_out * - add FUSE_CACHE_SYMLINKS + * + * 7.29 + * - add FUSE_NO_OPENDIR_SUPPORT flag + * + * 7.30 + * - add FUSE_EXPLICIT_INVAL_DATA + * - add FUSE_IOCTL_COMPAT_X32 + * + * 7.31 + * - add FUSE_WRITE_KILL_PRIV flag + * - add FUSE_SETUPMAPPING and FUSE_REMOVEMAPPING + * - add map_alignment to fuse_init_out, add FUSE_MAP_ALIGNMENT flag + * + * 7.32 + * - add flags to fuse_attr, add FUSE_ATTR_SUBMOUNT, add FUSE_SUBMOUNTS */ #ifndef _FUSE_FUSE_KERNEL_H @@ -196,7 +211,7 @@ #define FUSE_KERNEL_VERSION 7 /** Minor version number of this interface */ -#define FUSE_KERNEL_MINOR_VERSION 29 +#define FUSE_KERNEL_MINOR_VERSION 32 /** The node ID of the root inode */ #define FUSE_ROOT_ID 1 @@ -220,7 +235,7 @@ struct fuse_attr { uint32_t gid; uint32_t rdev; uint32_t blksize; - uint32_t padding; + uint32_t flags; }; struct fuse_kstatfs { @@ -265,11 +280,13 @@ struct fuse_file_lock { * FOPEN_KEEP_CACHE: don't invalidate the data cache on open * FOPEN_NONSEEKABLE: the file is not seekable * FOPEN_CACHE_DIR: allow caching this directory + * FOPEN_STREAM: the file is stream-like (no file position at all) */ #define FOPEN_DIRECT_IO (1 << 0) #define FOPEN_KEEP_CACHE (1 << 1) #define FOPEN_NONSEEKABLE (1 << 2) #define FOPEN_CACHE_DIR (1 << 3) +#define FOPEN_STREAM (1 << 4) /** * INIT request/reply flags @@ -299,6 +316,11 @@ struct fuse_file_lock { * FUSE_MAX_PAGES: init_out.max_pages contains the max number of req pages * FUSE_CACHE_SYMLINKS: cache READLINK responses * FUSE_NO_OPENDIR_SUPPORT: kernel supports zero-message opendir + * FUSE_EXPLICIT_INVAL_DATA: only invalidate cached pages on explicit request + * FUSE_MAP_ALIGNMENT: init_out.map_alignment contains log2(byte alignment) for + * foffset and moffset fields in struct + * fuse_setupmapping_out and fuse_removemapping_one. + * FUSE_SUBMOUNTS: kernel supports auto-mounting directory submounts */ #define FUSE_ASYNC_READ (1 << 0) #define FUSE_POSIX_LOCKS (1 << 1) @@ -325,6 +347,9 @@ struct fuse_file_lock { #define FUSE_MAX_PAGES (1 << 22) #define FUSE_CACHE_SYMLINKS (1 << 23) #define FUSE_NO_OPENDIR_SUPPORT (1 << 24) +#define FUSE_EXPLICIT_INVAL_DATA (1 << 25) +#define FUSE_MAP_ALIGNMENT (1 << 26) +#define FUSE_SUBMOUNTS (1 << 27) #ifdef linux /** @@ -356,9 +381,11 @@ struct fuse_file_lock { * * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed * FUSE_WRITE_LOCKOWNER: lock_owner field is valid + * FUSE_WRITE_KILL_PRIV: kill suid and sgid bits */ #define FUSE_WRITE_CACHE (1 << 0) #define FUSE_WRITE_LOCKOWNER (1 << 1) +#define FUSE_WRITE_KILL_PRIV (1 << 2) /** * Read flags @@ -373,6 +400,7 @@ struct fuse_file_lock { * FUSE_IOCTL_RETRY: retry with new iovecs * FUSE_IOCTL_32BIT: 32bit ioctl * FUSE_IOCTL_DIR: is a directory + * FUSE_IOCTL_COMPAT_X32: x32 compat ioctl on 64bit machine (64bit time_t) * * FUSE_IOCTL_MAX_IOV: maximum of in_iovecs + out_iovecs */ @@ -381,6 +409,7 @@ struct fuse_file_lock { #define FUSE_IOCTL_RETRY (1 << 2) #define FUSE_IOCTL_32BIT (1 << 3) #define FUSE_IOCTL_DIR (1 << 4) +#define FUSE_IOCTL_COMPAT_X32 (1 << 5) #define FUSE_IOCTL_MAX_IOV 256 @@ -404,6 +433,13 @@ struct fuse_file_lock { #define FUSE_FALLOC_FL_KEEP_SIZE 0x1 #define FUSE_FALLOC_FL_PUNCH_HOLE 0x2 +/** + * fuse_attr flags + * + * FUSE_ATTR_SUBMOUNT: Object is a submount root + */ +#define FUSE_ATTR_SUBMOUNT (1 << 0) + enum fuse_opcode { FUSE_LOOKUP = 1, FUSE_FORGET = 2, /* no reply */ @@ -450,10 +486,15 @@ enum fuse_opcode { FUSE_RENAME2 = 45, FUSE_LSEEK = 46, FUSE_COPY_FILE_RANGE = 47, + FUSE_SETUPMAPPING = 48, + FUSE_REMOVEMAPPING = 49, #ifdef linux /* CUSE specific operations */ CUSE_INIT = 4096, + /* Reserved opcodes: helpful to detect structure endian-ness */ + CUSE_INIT_BSWAP_RESERVED = 1048576, /* CUSE_INIT << 8 */ + FUSE_INIT_BSWAP_RESERVED = 436207616, /* FUSE_INIT << 24 */ #endif /* linux */ }; @@ -692,7 +733,7 @@ struct fuse_init_out { uint32_t max_write; uint32_t time_gran; uint16_t max_pages; - uint16_t padding; + uint16_t map_alignment; uint32_t unused[8]; }; @@ -863,6 +904,9 @@ struct fuse_notify_retrieve_in { uint64_t dummy4; }; +/* Device ioctls: */ +#define FUSE_DEV_IOC_CLONE _IOR(229, 0, uint32_t) + struct fuse_lseek_in { uint64_t fh; uint64_t offset; @@ -884,4 +928,35 @@ struct fuse_copy_file_range_in { uint64_t flags; }; + +#define FUSE_SETUPMAPPING_FLAG_WRITE (1ull << 0) +#define FUSE_SETUPMAPPING_FLAG_READ (1ull << 1) +struct fuse_setupmapping_in { + /* An already open handle */ + uint64_t fh; + /* Offset into the file to start the mapping */ + uint64_t foffset; + /* Length of mapping required */ + uint64_t len; + /* Flags, FUSE_SETUPMAPPING_FLAG_* */ + uint64_t flags; + /* Offset in Memory Window */ + uint64_t moffset; +}; + +struct fuse_removemapping_in { + /* number of fuse_removemapping_one follows */ + uint32_t count; +}; + +struct fuse_removemapping_one { + /* Offset into the dax window start the unmapping */ + uint64_t moffset; + /* Length of mapping required */ + uint64_t len; +}; + +#define FUSE_REMOVEMAPPING_MAX_ENTRY \ + (PAGE_SIZE / sizeof(struct fuse_removemapping_one)) + #endif /* _FUSE_FUSE_KERNEL_H */ From nobody Thu Dec 12 06:46:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y83010R0dz5h67Y; Thu, 12 Dec 2024 06:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y83006vHxz4qR0; Thu, 12 Dec 2024 06:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733985969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BDUgsK6S45yhAYtDHmqJK9LZzJtEYgGn4tmL9FcVMg8=; b=aRk7vXXE9ftf98g4JyK1UQvi38GsKOE2rQ02Qb+NPRlv7xi6zC6Ail97xzVME/TF7h0A2K ofX7QRRXmtwjaENPxgG6F8Q0l5v+X1H9ktFcVWzObc556CbdA6knXdcP4H8Bba4jV9rPPc x1o1qBAu53Egx2r+NPh2qgo9o5T7lNv1eXj9A+XLxTO+u1oLTUFoSmJU6Hzf/xXdi0z9aJ zva489OjGv5QjCOCOOdFKhyqUt33fSJwQQOv+Oufw5N6u14ttmwAox2aYQkTLdG0DxHBoz KGlvbpY3ESpTlZqzhL1E5fq+qr6YH3NEc1j5ePMlJ+7LJcU2g+6xlfAfNtaSTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733985969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BDUgsK6S45yhAYtDHmqJK9LZzJtEYgGn4tmL9FcVMg8=; b=JJ1zcIuTExP4uQk6soaYUBkE8X3/BvtxijeAFct9sxZcM42UhPQidamhGGd7J/xiW1h/Jy RkmykDBew5Io6OqAAPgavzZPCucT3OZOGePQZaeW+VJMcKBIJ9UuBFgjza96/OhdF0FSC6 ADU2tIT0EDKrn9SiDQ7QoMg+fcfTQaBQ2p6DmlEcy22u9TqHU5/15iAx88VYBQ0rPDkV/O AbgjIJOwKKO9FP8hm+V7SOQErYmV64aS2c2gX1qE/MpSGuZaHpSF5XBS/saX/etpZMkwBm h7Ft6Z/SSWn+091pdk8/t8V5+uA9n/NcmDaB0TUqkrwC9DMIHZgw3wTiZkD33w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733985969; a=rsa-sha256; cv=none; b=a10kAUVgPpeASgrj4lXnGcanmwlg4C+blDP2PevzD65fs0pzNC5Pm4Du//VQDG5UNJ55vJ f98jymNMOxi4IB3ONVLZh0dFhCmr0zqk6RniRyOHNckNA8qutrzYitJemWYOGj91rI5gwd lrBqeiIm+7CJ9dzscdHzmd0ctbgtRqF3a3UFDNvRUwxzMaOI5v7Iih3YoLqsn4DXWfrIaD GVGhETcCxW5Il85B6XaV4iHozFdaY+S3p5ON1w7a1/Gr7Zw+xyZgycwUOFauKewPvk+ze5 m6rsNX+zKLGOPWQKNjIWggGrXfbMfAgP0Z4s4DbqXXjaWFpCNhDgiUqZzeAioA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y83006P1kzjHW; Thu, 12 Dec 2024 06:46: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 4BC6k8jl003589; Thu, 12 Dec 2024 06:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BC6k8wA003586; Thu, 12 Dec 2024 06:46:08 GMT (envelope-from git) Date: Thu, 12 Dec 2024 06:46:08 GMT Message-Id: <202412120646.4BC6k8wA003586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: d4eb2d3f30ee - main - aw_gpio: Add a missing comma List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4eb2d3f30ee492fb5b17c9f2b4a15d1c62fb9e7 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d4eb2d3f30ee492fb5b17c9f2b4a15d1c62fb9e7 commit d4eb2d3f30ee492fb5b17c9f2b4a15d1c62fb9e7 Author: Zhenlei Huang AuthorDate: 2024-12-12 06:45:11 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-12 06:45:11 +0000 aw_gpio: Add a missing comma This unbreaks arm build after commit 719245455853. Fixes: 719245455853 aw_gpio: support Allwinner D1 GPIO --- sys/arm/allwinner/aw_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c index b469a7fb453d..18b47bab12d9 100644 --- a/sys/arm/allwinner/aw_gpio.c +++ b/sys/arm/allwinner/aw_gpio.c @@ -206,7 +206,7 @@ extern struct allwinner_padconf a83t_padconf; extern struct allwinner_padconf a83t_r_padconf; struct aw_gpio_conf a83t_gpio_conf = { .padconf = &a83t_padconf, - .banks = "bcdefgh" + .banks = "bcdefgh", .bank_size = 0x24, .drv_pin_shift = 1, .pul_offset = 0x1C, From nobody Thu Dec 12 07:23:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y83q118NBz5h7yS; Thu, 12 Dec 2024 07:23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y83q10h42z4sR4; Thu, 12 Dec 2024 07:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733988205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TyQeXM9eh2kM8l81fpGmUf9+cDmeUykj4irHXjO0U5E=; b=PVPyiq8MFad9LZ7fHie8MMwv2/SaQ1DKKeygu2B2sgC95E7VqfE+iMUuJozbjBH9g+wMgX 5ZHzCfoXnm65aRKjJt1Smpx04NDtCOv36L4V4YsapZLmnBF/ATUZ1IARQnWMYXS3Kwa9z+ o4uUMlqa7/7RJXlSLoG4hWhAI7+/Rqx6L7Hs397npXY8ev4BT5wdO0FbD3T9boh/9HL6q8 hPdQLJzNDRw3fhu/thYBDMbRxIAuJw/avR7XNgdduF1XO/MBiGNLUNC6kgXW7XYH9lLHjz bu2EdemytjClzFF/7ziEn4/YUlV0Gy23gagiDNfihDSxZM98GXBhXqittmmFlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733988205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TyQeXM9eh2kM8l81fpGmUf9+cDmeUykj4irHXjO0U5E=; b=LFGrINOWUotGSlNpyTZ/Nu1Q4LhVBWd27vNmxjgWft8DAvS1qAHd8Bm3QNrRGd3gPlj6Cc 6oW9eNRCFKAwMJUYOVHDD2Huhgf3/DtvlpscCb/VO6Qs1Lo5qleMZ8RG4BWMH7/LUTh5r8 43i7bY8zaxGn1Sp0xslqQh9423zsqbYruPAj+9LH0vj/ufNInnHWfItHEKjqbqUs05y9o5 q0SJLbkz72o7GhQEJ0HeYlA7I5o9LZw8WL5QNI5aKNZ5HMhpajdM71sibs+E0ZSUIytuiO /Z5c0P2ctLfSWLj+/KOZi+0hsOXYJpwIgnPJORHt7s8KmKpXlh+tbg5kY6tbsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733988205; a=rsa-sha256; cv=none; b=VgcFo+U1/S0smox622WWL1j1oysjxTsfJKRzMi4jmlqRFIzjTXWsRS/vqZnewFv8RAFAgA kBwVtQYUDWDMji3iwqye0jlc/uDgQq63kSziepiHMd8i5wA4JSq9MP64xjIoasmobHO5oL KW5kN9440p9xz0dTRLifFtdCZHAnizT1LbbUHeNEryzovt3lJOK7veashpb6cIBETRsCkt VtYcXu/DYVWkvGYGKhOaM/Be3XhQ53h0LifdE/Nibz1MHBCvieA3gQ18UK7+UJWcLz4qwM MSrNBdvg7NJBN807aKk8dssNU4l68S5/xFkRaUPtBMzej0MnwMonIhbSyYhJ2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y83q1018tzjtR; Thu, 12 Dec 2024 07:23: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 4BC7NOqi079032; Thu, 12 Dec 2024 07:23:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BC7NOCt079029; Thu, 12 Dec 2024 07:23:24 GMT (envelope-from git) Date: Thu, 12 Dec 2024 07:23:24 GMT Message-Id: <202412120723.4BC7NOCt079029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 49224311fe6d - main - ncal: make -h toggle highlighting of today. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49224311fe6d850e5c25a7e79328c87029df6be8 Auto-Submitted: auto-generated The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=49224311fe6d850e5c25a7e79328c87029df6be8 commit 49224311fe6d850e5c25a7e79328c87029df6be8 Author: Poul-Henning Kamp AuthorDate: 2024-12-12 07:22:14 +0000 Commit: Poul-Henning Kamp CommitDate: 2024-12-12 07:22:14 +0000 ncal: make -h toggle highlighting of today. --- usr.bin/ncal/ncal.1 | 3 ++- usr.bin/ncal/ncal.c | 14 ++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1 index 8ece31b79cc1..2c7c82fd318e 100644 --- a/usr.bin/ncal/ncal.1 +++ b/usr.bin/ncal/ncal.1 @@ -79,7 +79,8 @@ the current month is displayed. The options are as follows: .Bl -tag -width indent .It Fl h -Turns off highlighting of today. +Toggle highlighting of today. +By default highlighting is enabled if stdout is a TTY. .It Fl J Display Julian Calendar, if combined with the .Fl e diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c index 2829caf8a6a0..dc50dd60bf0b 100644 --- a/usr.bin/ncal/ncal.c +++ b/usr.bin/ncal/ncal.c @@ -158,7 +158,7 @@ static char jdaystr[] = " 1 2 3 4 5 6 7 8 9" " 350 351 352 353 354 355 356 357 358 359" " 360 361 362 363 364 365 366"; -static int flag_nohighlight; /* user doesn't want a highlighted today */ +static int flag_highlight; /* highlighted today */ static int flag_weeks; /* user wants number of week */ static int nswitch; /* user defined switch date */ static int nswitchb; /* switch date for backward compatibility */ @@ -216,7 +216,7 @@ main(int argc, char *argv[]) int before, after; const char *locale; /* locale to get country code */ - flag_nohighlight = 0; + flag_highlight = isatty(STDOUT_FILENO); flag_weeks = 0; flag_monday = false; @@ -299,7 +299,7 @@ main(int argc, char *argv[]) flag_highlightdate = optarg; break; case 'h': - flag_nohighlight = 1; + flag_highlight = !flag_highlight; break; case 'e': if (flag_backward) @@ -834,8 +834,7 @@ mkmonthr(int y, int m, int jd_flag, struct monthlines *mlines) dt.d = j - jan1 + 1; else sdater(j, &dt); - if (j == highlightdate && !flag_nohighlight - && isatty(STDOUT_FILENO)) + if (j == highlightdate && flag_highlight) highlight(mlines->lines[i] + k, ds + dt.d * dw, dw, &l); else @@ -942,8 +941,7 @@ mkmonthb(int y, int m, int jd_flag, struct monthlines *mlines) dt.d = j - jan1 + 1; else sdateb(j, &dt); - if (j == highlightdate && !flag_nohighlight - && isatty(STDOUT_FILENO)) + if (j == highlightdate && flag_highlight) highlight(mlines->lines[i] + k, ds + dt.d * dw, dw, &l); else @@ -1143,7 +1141,7 @@ highlight(char *dst, char *src, int len, int *extralen) * This check is not necessary, should have been handled before calling * this function. */ - if (flag_nohighlight) { + if (!flag_highlight) { memcpy(dst, src, len); return; } From nobody Thu Dec 12 08:27:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y85DV0xmtz5hBV6; Thu, 12 Dec 2024 08:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y85DV00Wzz3xZL; Thu, 12 Dec 2024 08:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733992026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TI9A/GKANyQLh6sbKSAelgVkmIJLKt1JCq8sFAN2CAI=; b=IWRvWhX6Jp3c/h9OMTKnrgqR3uEbrYEApgBt8oaXr3oYubKhS8DAyjWkQA4fWIU3ElWUX/ UTz0ByC9zimKWd7TR4qBU4SsbSdy3rpA423xoMvNCUGZm/EZWFA0xrKglKYMvyC2RUA7X3 sbqlBLSh7Up2Z+3oIC+OH8EGflCPel+8h+LE4qaoD1FJdhl1BlgsBHANf6PePQCv8oPbz2 KY+IBDbC/ouAJhHvEdv2X2wP7JhGM7hk1XbWf8BciiV+Wu2RFVPp58j1NiA1SVb+nsNZtZ cv/VOX3xB9/7qmQi790aQZCHCpt/JrzD/G5PZJ6HU+u6S97smKYCD9kqCoovgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733992026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TI9A/GKANyQLh6sbKSAelgVkmIJLKt1JCq8sFAN2CAI=; b=RqaKpJmNhLIlGgCHHK0nGSGTW6wCPnLJiaf66pXbQaI1oMkEdYBMnQgqgWET7rB1+/dDZj TWQSxR3NfzjWXF9IlAs5zfVBuFQFZM3aXZTmzseeLXss/KXqmwyNp0V+sdla69XyWqH4Cg eL3zilz4IwMZdFj1l0ejzWRcm1snM6dPCmbPnL9Atktd9FqBAutLTIiXh4oddfi7p2rMIt LghFf1FXNNrygx4QTEMfEsCEGDyDiCuS9hKEYAERLAx3nnu3IKikwVWLgRWhMdxEf9gPV8 j9ulHkcj/kOkxHVtqfoKjbdGPte0uyf75iiZPF06F6zvMKoljcB0rMYJrGRHEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733992026; a=rsa-sha256; cv=none; b=fZKjFY9rMK26C3c3HGjXoYvVGTmgLyJ6CsyUkBCThJVReeULbzHl6NkmRY72jQlW3Ux6h6 2Zt3PZb111ui3mbItaQKiCRJl+viyqehGCLqirKhOltdz8Ru9jwEp7Btuwm7A/8moQnss2 xUet/usHuSTkd9QIlskFSL8FgI7MxJ89/bVB7icR5JBHyNw4xt1C+SUbszebPXcAuvmVqg iolZhib3OShLNGfBpULmUxSM4UnQgsM5dA4j1jAUdwVI0vtzaLfPXtwlifYhFr5XFjorCP 4NnKdSOIrCtmVzl0gthc5OAgGRtCEyQoHm+1w2iF67be02fyrXkC3JGvFDAqpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y85DT6b3DzlWK; Thu, 12 Dec 2024 08:27:05 +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 4BC8R5I5091465; Thu, 12 Dec 2024 08:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BC8R51Y091462; Thu, 12 Dec 2024 08:27:05 GMT (envelope-from git) Date: Thu, 12 Dec 2024 08:27:05 GMT Message-Id: <202412120827.4BC8R51Y091462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: dfd52321b7be - main - nl(1): Capsicumise the utility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfd52321b7beba716fa2bdd4f54e57e9ac806e96 Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=dfd52321b7beba716fa2bdd4f54e57e9ac806e96 commit dfd52321b7beba716fa2bdd4f54e57e9ac806e96 Author: Faraz Vahedi AuthorDate: 2024-10-13 20:03:25 +0000 Commit: Mariusz Zaborski CommitDate: 2024-12-12 08:24:31 +0000 nl(1): Capsicumise the utility Signed-off-by: Faraz Vahedi Reviewed by: markj, oshogbo MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1465 --- usr.bin/nl/nl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c index a6a14239f582..573e03e4ad0d 100644 --- a/usr.bin/nl/nl.c +++ b/usr.bin/nl/nl.c @@ -42,6 +42,8 @@ #include #include +#include + typedef enum { number_all, /* number all lines */ number_nonempty, /* number non-empty lines */ @@ -244,6 +246,11 @@ main(int argc, char *argv[]) /* NOTREACHED */ } + /* Limit standard descriptors and enter capability mode */ + caph_cache_catpages(); + if (caph_limit_stdio() < 0 || caph_enter() < 0) + err(EXIT_FAILURE, "capsicum"); + /* Generate the delimiter sequence */ memcpy(delim, delim1, delim1len); memcpy(delim + delim1len, delim2, delim2len); From nobody Thu Dec 12 13:06:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8CRL3RG1z5gFnc; Thu, 12 Dec 2024 13:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8CRL2nb0z4Qsg; Thu, 12 Dec 2024 13:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734008814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xRYKdxY5GnSgiP6sbgdddItP2LjZK5nA1zWrm6HQVaY=; b=DA4BFUs2TiIIn12ALJEEiu6oNgPxLM7DCMPxMx3TM+nNHGVX+l7qALOV5xAhWvm3m6ZYfn 3NRSmWHHEhMvnyfS6oiL8sQxl5Wv5AiE5ENdFv6svlLFH4Cr+A6+Tb4qxBHdjyGyiYcp2b U+03hS6iX3VuCK8yC4icGaMRQp7HHqWSu62w15O/eIjH/VfIslATXYc9dbGxf0PiOIdsSp FX7eF0p850VudKRw9ukfwTnScVfY+WVQsVZRItDewRkpfSt8WQucUzVGy1JjZCZYGn3rXh hHL41C2AwNZfK3sC4HfllK1GibGz+x31qS4QHM4OpuFsOmc1evJekAeJ4JuOqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734008814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xRYKdxY5GnSgiP6sbgdddItP2LjZK5nA1zWrm6HQVaY=; b=b51pGEzjaHq80jsT+ulTF/W0GRkmqYWCsHcwIqCR3g7f3352lo2XbsAN7cMYABWPw8RT+R lk0IssDXI1iEjdvFOQ5h5b6WcWkc4Edn+ggLsfrRLFGL++Yo1LGneWWQC071Qm2EmuUfr7 o0o4RNz6vXMdYlFaEjjlo8shcE37dzFvN5lblTcNOr7p0wtwmnoMMGBNx3pW2hamK2U3n2 eck/lenYX2nW13PcGcs8eme5vVtl2sva/+t+KURIvrkP7NdRsAioLKWaldh5k4zrUllfFK 4UG62+LNm4BakId7FSL7C4g/mHoBbpuf+7/D7luNBgV2PobZrOqcDAxQOrzK7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734008814; a=rsa-sha256; cv=none; b=LGTcREOHRyEg+5VG2GB3G4ovGsAWVMp7pF1tRlu1XrnfoAsEMqKhXJASNu3jBs+a1Vkqct XHnHXl7NCwLvC3pilas+o7WFnIUhHnuxTWiA6C7OVtIY31CdVkV9gIo+HAMJzIEtzfPNv3 mBuUq8XCniifaKL44Cds2pHOP5AkVVCsv0cZCMT8f64xTaj5lSY/1D1qu3JhuQLuTn3gUN P8FjWv/EnBqFieyC07/4jqntkCMECuFcuuXtU05iGep1voro1YJ5/CsJK82Gj3fLX1SlUY eV8jVIFB1E6UvEAeotqMYNOV6DiwwnN+6H92aDo4yf8h8Y8wJ8YBL4Jsbbs+pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8CRL2G1rztDq; Thu, 12 Dec 2024 13:06:54 +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 4BCD6sIx017461; Thu, 12 Dec 2024 13:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCD6sqR017458; Thu, 12 Dec 2024 13:06:54 GMT (envelope-from git) Date: Thu, 12 Dec 2024 13:06:54 GMT Message-Id: <202412121306.4BCD6sqR017458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 9ea8d692f4cb - main - ipfw: use only needed TCP flags for state tracking List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ea8d692f4cb552902b9e8394260d7f3cf4aefb0 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=9ea8d692f4cb552902b9e8394260d7f3cf4aefb0 commit 9ea8d692f4cb552902b9e8394260d7f3cf4aefb0 Author: Andrey V. Elsukov AuthorDate: 2024-12-12 12:57:45 +0000 Commit: Andrey V. Elsukov CommitDate: 2024-12-12 12:57:45 +0000 ipfw: use only needed TCP flags for state tracking This fixes stateful firewall failures after adding TH_AE flag into TH_FLAGS. Reported by: ronald Fixes: 347dd05 MFC after: 2 weeks --- sys/netpfil/ipfw/ip_fw_dynamic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c index 34aae71c174b..ff55e3360c13 100644 --- a/sys/netpfil/ipfw/ip_fw_dynamic.c +++ b/sys/netpfil/ipfw/ip_fw_dynamic.c @@ -920,7 +920,8 @@ print_dyn_rule_flags(const struct ipfw_flow_id *id, int dyn_type, #define _SEQ_GE(a,b) ((int)((a)-(b)) >= 0) #define BOTH_SYN (TH_SYN | (TH_SYN << 8)) #define BOTH_FIN (TH_FIN | (TH_FIN << 8)) -#define TCP_FLAGS (TH_FLAGS | (TH_FLAGS << 8)) +#define BOTH_RST (TH_RST | (TH_RST << 8)) +#define TCP_FLAGS (BOTH_SYN | BOTH_FIN | BOTH_RST) #define ACK_FWD 0x00010000 /* fwd ack seen */ #define ACK_REV 0x00020000 /* rev ack seen */ #define ACK_BOTH (ACK_FWD | ACK_REV) From nobody Thu Dec 12 14:27:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8FDP6d7Sz5gLKx; Thu, 12 Dec 2024 14:27: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8FDP5x2Wz4XJ1; Thu, 12 Dec 2024 14:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734013653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=znAKrEvJyhSnAEgj9gnvZiw8JulXhqGemf2/YXh+w9I=; b=SaXALUS1VXZjCDOIFjx6Zfh31U5niBQqWtvjYoVb+6jx9Tr0NpYktr1RAPQIaIQPChB33m WAAhLsSVl8rFrIDwHv6HWsigHzJVejHOM6vfsUmKllc54P8grAqPbzkTpoiRaEP/IawabJ woj9eFHu820dGi8ymQsVUU930l+rePKyx8uxj399LJrshWO190bxYrV0aheyESIvo8P6nQ 2tPdlG8mKzd7UeqE1rb9lWcU4lSUZ+ekmspoiD+TfBmxvbKCTL7PBPf6pF8hULGK5wrSXY cI81M4afQZfadBclAHsHRgYne7APzPL8FiQBxZCPueqoBQiPSXYkugLqRdHsRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734013653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=znAKrEvJyhSnAEgj9gnvZiw8JulXhqGemf2/YXh+w9I=; b=fu1X/+5vnqGMEdUVSfYaEPLY32g++3kj46vBvH/T9DZ1kyQCNhjhJQJFJZdUuB/drNewPl HGI3XkwNwT7m6q9wEz3D4BpE4f7up4uMRxXHGoqRFZO77aKU14lpzh8bVSb4/hsIgXZhIo OprTfcfE37n9lfQlLOiFD9Q9BM1suY1bVSp7JnSL06I1QXxd8vzpk22LXHacnTYT7lMoWN /q0PNI4uP6DDbGT4u4w6jlJ3lRjB+p/k5YWEHvfVuiSSwk4r81kXv8s3+Gab0o8E0rRLQR fykTQBUiVslM79A6lazQz0gQt3cBCDipJTE/n3D11eqoyqE3hUabg40mCxxPgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734013653; a=rsa-sha256; cv=none; b=wZphVULGlw9Kuv2r3yS565BSf7o0KzHwpYXQhHts6VasQe/ovJ2KbW74LeuUcuY5bBRnv+ zxQ5+seQoXi3pWlwTD8SV6z+cJZXuCg2m40PTJaf4fgeEb0AJ/p/mwV+imSv2MqEwCoO5Q 4lHxWLATfZj4km8Te0I7W3Ooq7jrWJHJdSXZxJh0XceMBvUgKTjnqWKlsvNoMRn9XAcOxM mw1tTX/gmaRYRGIRV3f681EWBIN2yU6JMZ1+9NhJXmjbS6IyGE8m3F09M9k38Izxz70d3d WV8XNWq2djkpecmwubEokf+EqgltY3f+WVmJ7y4hFCawtO8KBTwI4UtJpFZ1ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8FDP5PPczwRg; Thu, 12 Dec 2024 14:27: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 4BCERXk3066017; Thu, 12 Dec 2024 14:27:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCERXDJ066014; Thu, 12 Dec 2024 14:27:33 GMT (envelope-from git) Date: Thu, 12 Dec 2024 14:27:33 GMT Message-Id: <202412121427.4BCERXDJ066014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a600aabe9b04 - main - inpcb: Close some SO_REUSEPORT_LB races List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a600aabe9b04f0906069a8fb1f8d696ad186080f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a600aabe9b04f0906069a8fb1f8d696ad186080f commit a600aabe9b04f0906069a8fb1f8d696ad186080f Author: Mark Johnston AuthorDate: 2024-12-12 14:02:12 +0000 Commit: Mark Johnston CommitDate: 2024-12-12 14:02:12 +0000 inpcb: Close some SO_REUSEPORT_LB races For a long time, the inpcb lookup path has been lockless in the common case: we use net_epoch to synchronize lookups. However, the routines which update lbgroups were not careful to synchronize with unlocked lookups. I believe that in the worst case this can result in spurious connection aborts (I have a regression test case to exercise this), but it's hard to be certain. Modify in_pcblbgroup* routines to synchronize with unlocked lookup: - When removing inpcbs from an lbgroup, do not shrink the array. The maximum number of lbgroup entries is INPCBLBGROUP_SIZMAX (256), and it doesn't seem worth the complexity to shrink the array when a socket is removed. - When resizing an lbgroup, do not insert it into the hash table until it is fully initialized; otherwise lookups may observe a partially constructed lbgroup. - When adding an inpcb to the group, increment the counter after adding the array entry, using a release store. Otherwise it's possible for lookups to observe a null array slot. - When looking up an entry, use a corresponding acquire load. Reviewed by: ae, glebius MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D48020 --- sys/netinet/in_pcb.c | 94 ++++++++++++++++++++++++++++---------------------- sys/netinet6/in6_pcb.c | 13 +++++-- 2 files changed, 63 insertions(+), 44 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 87489e8f457c..cfe3fd65e032 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -253,9 +253,8 @@ static void in_pcbremhash(struct inpcb *); */ static struct inpcblbgroup * -in_pcblbgroup_alloc(struct inpcblbgrouphead *hdr, struct ucred *cred, - u_char vflag, uint16_t port, const union in_dependaddr *addr, int size, - uint8_t numa_domain) +in_pcblbgroup_alloc(struct ucred *cred, u_char vflag, uint16_t port, + const union in_dependaddr *addr, int size, uint8_t numa_domain) { struct inpcblbgroup *grp; size_t bytes; @@ -270,7 +269,6 @@ in_pcblbgroup_alloc(struct inpcblbgrouphead *hdr, struct ucred *cred, grp->il_numa_domain = numa_domain; grp->il_dependladdr = *addr; grp->il_inpsiz = size; - CK_LIST_INSERT_HEAD(hdr, grp, il_list); return (grp); } @@ -292,6 +290,24 @@ in_pcblbgroup_free(struct inpcblbgroup *grp) NET_EPOCH_CALL(in_pcblbgroup_free_deferred, &grp->il_epoch_ctx); } +static void +in_pcblbgroup_insert(struct inpcblbgroup *grp, struct inpcb *inp) +{ + KASSERT(grp->il_inpcnt < grp->il_inpsiz, + ("invalid local group size %d and count %d", grp->il_inpsiz, + grp->il_inpcnt)); + INP_WLOCK_ASSERT(inp); + + inp->inp_flags |= INP_INLBGROUP; + grp->il_inp[grp->il_inpcnt] = inp; + + /* + * Synchronize with in_pcblookup_lbgroup(): make sure that we don't + * expose a null slot to the lookup path. + */ + atomic_store_rel_int(&grp->il_inpcnt, grp->il_inpcnt + 1); +} + static struct inpcblbgroup * in_pcblbgroup_resize(struct inpcblbgrouphead *hdr, struct inpcblbgroup *old_grp, int size) @@ -299,7 +315,7 @@ in_pcblbgroup_resize(struct inpcblbgrouphead *hdr, struct inpcblbgroup *grp; int i; - grp = in_pcblbgroup_alloc(hdr, old_grp->il_cred, old_grp->il_vflag, + grp = in_pcblbgroup_alloc(old_grp->il_cred, old_grp->il_vflag, old_grp->il_lport, &old_grp->il_dependladdr, size, old_grp->il_numa_domain); if (grp == NULL) @@ -312,34 +328,11 @@ in_pcblbgroup_resize(struct inpcblbgrouphead *hdr, for (i = 0; i < old_grp->il_inpcnt; ++i) grp->il_inp[i] = old_grp->il_inp[i]; grp->il_inpcnt = old_grp->il_inpcnt; + CK_LIST_INSERT_HEAD(hdr, grp, il_list); in_pcblbgroup_free(old_grp); return (grp); } -/* - * PCB at index 'i' is removed from the group. Pull up the ones below il_inp[i] - * and shrink group if possible. - */ -static void -in_pcblbgroup_reorder(struct inpcblbgrouphead *hdr, struct inpcblbgroup **grpp, - int i) -{ - struct inpcblbgroup *grp, *new_grp; - - grp = *grpp; - for (; i + 1 < grp->il_inpcnt; ++i) - grp->il_inp[i] = grp->il_inp[i + 1]; - grp->il_inpcnt--; - - if (grp->il_inpsiz > INPCBLBGROUP_SIZMIN && - grp->il_inpcnt <= grp->il_inpsiz / 4) { - /* Shrink this group. */ - new_grp = in_pcblbgroup_resize(hdr, grp, grp->il_inpsiz / 2); - if (new_grp != NULL) - *grpp = new_grp; - } -} - /* * Add PCB to load balance group for SO_REUSEPORT_LB option. */ @@ -384,11 +377,13 @@ in_pcbinslbgrouphash(struct inpcb *inp, uint8_t numa_domain) } if (grp == NULL) { /* Create new load balance group. */ - grp = in_pcblbgroup_alloc(hdr, inp->inp_cred, inp->inp_vflag, + grp = in_pcblbgroup_alloc(inp->inp_cred, inp->inp_vflag, inp->inp_lport, &inp->inp_inc.inc_ie.ie_dependladdr, INPCBLBGROUP_SIZMIN, numa_domain); if (grp == NULL) return (ENOBUFS); + in_pcblbgroup_insert(grp, inp); + CK_LIST_INSERT_HEAD(hdr, grp, il_list); } else if (grp->il_inpcnt == grp->il_inpsiz) { if (grp->il_inpsiz >= INPCBLBGROUP_SIZMAX) { if (ratecheck(&lastprint, &interval)) @@ -401,15 +396,10 @@ in_pcbinslbgrouphash(struct inpcb *inp, uint8_t numa_domain) grp = in_pcblbgroup_resize(hdr, grp, grp->il_inpsiz * 2); if (grp == NULL) return (ENOBUFS); + in_pcblbgroup_insert(grp, inp); + } else { + in_pcblbgroup_insert(grp, inp); } - - KASSERT(grp->il_inpcnt < grp->il_inpsiz, - ("invalid local group size %d and count %d", grp->il_inpsiz, - grp->il_inpcnt)); - - grp->il_inp[grp->il_inpcnt] = inp; - grp->il_inpcnt++; - inp->inp_flags |= INP_INLBGROUP; return (0); } @@ -441,8 +431,17 @@ in_pcbremlbgrouphash(struct inpcb *inp) /* We are the last, free this local group. */ in_pcblbgroup_free(grp); } else { - /* Pull up inpcbs, shrink group if possible. */ - in_pcblbgroup_reorder(hdr, &grp, i); + KASSERT(grp->il_inpcnt >= 2, + ("invalid local group count %d", + grp->il_inpcnt)); + grp->il_inp[i] = + grp->il_inp[grp->il_inpcnt - 1]; + + /* + * Synchronize with in_pcblookup_lbgroup(). + */ + atomic_store_rel_int(&grp->il_inpcnt, + grp->il_inpcnt - 1); } inp->inp_flags &= ~INP_INLBGROUP; return; @@ -2068,8 +2067,11 @@ in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, const struct inpcblbgrouphead *hdr; struct inpcblbgroup *grp; struct inpcblbgroup *jail_exact, *jail_wild, *local_exact, *local_wild; + struct inpcb *inp; + u_int count; INP_HASH_LOCK_ASSERT(pcbinfo); + NET_EPOCH_ASSERT(); hdr = &pcbinfo->ipi_lbgrouphashbase[ INP_PCBPORTHASH(lport, pcbinfo->ipi_lbgrouphashmask)]; @@ -2128,9 +2130,17 @@ in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, grp = local_wild; if (grp == NULL) return (NULL); + out: - return (grp->il_inp[INP_PCBLBGROUP_PKTHASH(faddr, lport, fport) % - grp->il_inpcnt]); + /* + * Synchronize with in_pcblbgroup_insert(). + */ + count = atomic_load_acq_int(&grp->il_inpcnt); + if (count == 0) + return (NULL); + inp = grp->il_inp[INP_PCBLBGROUP_PKTHASH(faddr, lport, fport) % count]; + KASSERT(inp != NULL, ("%s: inp == NULL", __func__)); + return (inp); } static bool diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 4f7c0912e675..ada5058e56b3 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -893,6 +893,8 @@ in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, const struct inpcblbgrouphead *hdr; struct inpcblbgroup *grp; struct inpcblbgroup *jail_exact, *jail_wild, *local_exact, *local_wild; + struct inpcb *inp; + u_int count; INP_HASH_LOCK_ASSERT(pcbinfo); @@ -954,8 +956,15 @@ in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, if (grp == NULL) return (NULL); out: - return (grp->il_inp[INP6_PCBLBGROUP_PKTHASH(faddr, lport, fport) % - grp->il_inpcnt]); + /* + * Synchronize with in_pcblbgroup_insert(). + */ + count = atomic_load_acq_int(&grp->il_inpcnt); + if (count == 0) + return (NULL); + inp = grp->il_inp[INP6_PCBLBGROUP_PKTHASH(faddr, lport, fport) % count]; + KASSERT(inp != NULL, ("%s: inp == NULL", __func__)); + return (inp); } static bool From nobody Thu Dec 12 14:27:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8FDR0rXrz5gLMl; Thu, 12 Dec 2024 14:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8FDQ62hpz4XZ6; Thu, 12 Dec 2024 14:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734013654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kWrNBa7ARXAHSeosnAjC14spMgGFWv78H0oYTdUTIFQ=; b=Mw3+tFwKEy5s1Mm/MTOumuEs03PqC45Igce+vTPcvAcCOc6dNyJfrit53te85CG+dTzJZR Fqh/F4ZLoTC0kAeh7fwiocNaJEhWyTkUSB764HTb14xamvt2rzfRZoG3JQTiJx2tDsgGJv wQWnWM3Iivghu2RN7subwXmJ4RjHfLziotmM3glDWNkaDPSTq5vJbAIXvAvij2ldDrt1jm tvSV9ggJvzwusStw/W0POVVBWdUDrj7mUMnsye6UbElxo5kQB67wBvuQQf6jRMBwZG0zL6 Da6xy5wATPvHTskaP8pV4FaMNgDGmOdn5yAba7lzmqUV9yrVVrvdYqXpd9Xo5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734013654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kWrNBa7ARXAHSeosnAjC14spMgGFWv78H0oYTdUTIFQ=; b=SSqojkJJtEHFj33v1i05IwO9Ph3yfwAtkTfz6Wp85atBGAX9WGE/Bj1uvG1tAfsXuUzHiZ LgBIYJmQV0RUFfpiMsQDyxqcbenwMTc2vCGoLKqvOTlBRkqAItcPSWgwKgZxEyU2/4xIX8 oEQ7ka4VbuZ//m1IJDW9nBgBeuxWHOqK9WxnvrFtpn/NvWFn88QstJ6PHOeO3TE6lv8Tnf 3/iZMxcbscTJEco0eErRb/X6ZdJcNvNuHoGL0ZXLlkMvZLOWew962qQM97IbTgqlqCU1fR V6Ln8TPGRRd9wis0hOiFoUcNXK8y88qxF+LHppLecLvyLPn0y+IdOxhn1uf7Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734013654; a=rsa-sha256; cv=none; b=qvKGmWSO/ngL8O7ERMv8pEMKZFxpGgH43dM6pfe8PiaUtT10iQ7ni8wynliNnukQdIitel ksNQuSesR4OnaLkkJ1p/5+RbFROCAwo0glP8kRAj+ubYkj2jF36cKeOZTBIr0Z/Z65VovH Fcl+u/m4h1Iw3D7hhHLjrhE/g6eNb54rQ5+0uNJDdwusz6RP0+jnhKD9GpIifyY2kPal9X Ghc52G0vNMuDHcZRr9Jx/hS142h+fTgozN96fauFTBvIfc7q6mr1hYz2OcDVmf6fHYKArN K+hpikTf2DLO8HP5H2abtc7iZTIcZa5bGzfVhm9UvtuAUXAfWwjsT54G8TDxNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8FDQ5fqvzvjH; Thu, 12 Dec 2024 14:27:34 +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 4BCERYYP066065; Thu, 12 Dec 2024 14:27:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCERY2G066062; Thu, 12 Dec 2024 14:27:34 GMT (envelope-from git) Date: Thu, 12 Dec 2024 14:27:34 GMT Message-Id: <202412121427.4BCERY2G066062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4f02a7d739b3 - main - inpcb: Remove bogus SO_REUSEPORT(_LB) checks in in_pcbbind() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f02a7d739b354eef38e19b25866f64842d69414 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f02a7d739b354eef38e19b25866f64842d69414 commit 4f02a7d739b354eef38e19b25866f64842d69414 Author: Mark Johnston AuthorDate: 2024-12-12 14:06:06 +0000 Commit: Mark Johnston CommitDate: 2024-12-12 14:25:15 +0000 inpcb: Remove bogus SO_REUSEPORT(_LB) checks in in_pcbbind() This check for SO_REUSEPORT was added way back in commit 52b65dbe85faf. Per the commit log, this commit restricted this port-stealing check to unicast addresses, and then only if the existing socket does not have SO_REUSEPORT set. In other words, if there exists a socket bound to INADDR_ANY, and we bind a socket to INADDR_ANY with the same port, then the two sockets need not be owned by the same user if the existing socket has SO_REUSEPORT set. This is a surprising semantic; bugzilla PR 7713 gives some additional context. That PR makes a case for the behaviour described above when binding to a multicast address. But, the SO_REUSEPORT check is only applied when binding to a non-multicast address, so it doesn't really make sense. In the PR the committer notes that "unicast applications don't set SO_REUSEPORT", which makes some sense, but also refers to "multicast applications that bind to INADDR_ANY", which sounds a bit suspicious. OpenBSD performs the multicast check, but not the SO_REUSEPORT check. DragonflyBSD removed the SO_REUSEPORT (and INADDR_ANY) checks back in 2014 (commit 0323d5fde12a4). NetBSD explicitly copied our logic and still has it. The plot thickens: 20 years later, SO_REUSEPORT_LB was ported from DragonflyBSD: this option provides similar semantics to SO_REUSEPORT, but for unicast addresses it causes incoming connections/datagrams to be distributed among all sockets in the group. This commit (1a43cff92a20d) inverted the check for SO_REUSEPORT while adding one for SO_REUSEPORT_LB; this appears to have been inadvertent. However: - apparently no one has noticed that the semantics were changed; - sockets belonging to different users can now be bound to the same port so long as they belong to a single lbgroup bound to INADDR_ANY, which is not correct. Simply remove the SO_REUSEPORT(_LB) checks, as their original justification was dubious and their current implementation is wrong; add some tests. Reviewed by: glebius MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D47832 --- sys/netinet/in_pcb.c | 4 +- sys/netinet6/in6_pcb.c | 4 +- tests/sys/netinet/socket_afinet.c | 240 +++++++++++++++++++++++++++++++++++++- 3 files changed, 241 insertions(+), 7 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index cfe3fd65e032..432cae68062a 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -925,9 +925,7 @@ in_pcbbind_avail(struct inpcb *inp, const struct in_addr laddr, (inp->inp_socket->so_type != SOCK_STREAM || in_nullhost(t->inp_faddr)) && (!in_nullhost(laddr) || - !in_nullhost(t->inp_laddr) || - (t->inp_socket->so_options & SO_REUSEPORT) || - (t->inp_socket->so_options & SO_REUSEPORT_LB) == 0) && + !in_nullhost(t->inp_laddr)) && (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) return (EADDRINUSE); } diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index ada5058e56b3..51f2a29918fe 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -245,9 +245,7 @@ in6_pcbbind_avail(struct inpcb *inp, const struct sockaddr_in6 *sin6, (inp->inp_socket->so_type != SOCK_STREAM || IN6_IS_ADDR_UNSPECIFIED(&t->in6p_faddr)) && (!IN6_IS_ADDR_UNSPECIFIED(laddr) || - !IN6_IS_ADDR_UNSPECIFIED(&t->in6p_laddr) || - (t->inp_socket->so_options & SO_REUSEPORT) || - (t->inp_socket->so_options & SO_REUSEPORT_LB) == 0) && + !IN6_IS_ADDR_UNSPECIFIED(&t->in6p_laddr)) && (inp->inp_cred->cr_uid != t->inp_cred->cr_uid)) return (EADDRINUSE); diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index 7076f084719a..ba8c03af46a6 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 Bjoern A. Zeeb + * Copyright (c) 2024 Stormshield * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,11 +26,17 @@ * SUCH DAMAGE. */ -#include +#include #include +#include + #include + #include #include +#include +#include +#include #include @@ -281,6 +288,235 @@ ATF_TC_BODY(socket_afinet_stream_reconnect, tc) ATF_CHECK_EQ(0, rc); } +/* + * Make sure that unprivileged users can't set the IP_BINDANY or IPV6_BINDANY + * socket options. + */ +ATF_TC(socket_afinet_bindany); +ATF_TC_HEAD(socket_afinet_bindany, tc) +{ + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} +ATF_TC_BODY(socket_afinet_bindany, tc) +{ + int s; + + s = socket(AF_INET, SOCK_STREAM, 0); + ATF_REQUIRE(s >= 0); + ATF_REQUIRE_ERRNO(EPERM, + setsockopt(s, IPPROTO_IP, IP_BINDANY, &(int){1}, sizeof(int)) == + -1); + ATF_REQUIRE(close(s) == 0); + + s = socket(AF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s >= 0); + ATF_REQUIRE_ERRNO(EPERM, + setsockopt(s, IPPROTO_IP, IP_BINDANY, &(int){1}, sizeof(int)) == + -1); + ATF_REQUIRE(close(s) == 0); + + s = socket(AF_INET6, SOCK_STREAM, 0); + ATF_REQUIRE(s >= 0); + ATF_REQUIRE_ERRNO(EPERM, + setsockopt(s, IPPROTO_IPV6, IPV6_BINDANY, &(int){1}, sizeof(int)) == + -1); + ATF_REQUIRE(close(s) == 0); + + s = socket(AF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s >= 0); + ATF_REQUIRE_ERRNO(EPERM, + setsockopt(s, IPPROTO_IPV6, IPV6_BINDANY, &(int){1}, sizeof(int)) == + -1); + ATF_REQUIRE(close(s) == 0); +} + +/* + * Bind a socket to the specified address, optionally dropping privileges and + * setting one of the SO_REUSE* options first. + * + * Returns true if the bind succeeded, and false if it failed with EADDRINUSE. + */ +static bool +child_bind(const atf_tc_t *tc, int type, struct sockaddr *sa, int opt, bool unpriv) +{ + const char *user; + pid_t child; + + if (unpriv) { + if (!atf_tc_has_config_var(tc, "unprivileged_user")) + atf_tc_skip("unprivileged_user not set"); + user = atf_tc_get_config_var(tc, "unprivileged_user"); + } else { + user = NULL; + } + + child = fork(); + ATF_REQUIRE(child != -1); + if (child == 0) { + int s; + + if (user != NULL) { + struct passwd *passwd; + + passwd = getpwnam(user); + if (seteuid(passwd->pw_uid) != 0) + _exit(1); + } + + s = socket(sa->sa_family, type, 0); + if (s < 0) + _exit(2); + if (bind(s, sa, sa->sa_len) == 0) + _exit(3); + if (errno != EADDRINUSE) + _exit(4); + if (opt != 0) { + if (setsockopt(s, SOL_SOCKET, opt, &(int){1}, + sizeof(int)) != 0) + _exit(5); + } + if (bind(s, sa, sa->sa_len) == 0) + _exit(6); + if (errno != EADDRINUSE) + _exit(7); + _exit(0); + } else { + int status; + + ATF_REQUIRE_EQ(waitpid(child, &status, 0), child); + ATF_REQUIRE(WIFEXITED(status)); + status = WEXITSTATUS(status); + ATF_REQUIRE_MSG(status == 0 || status == 6, + "child exited with %d", status); + return (status == 6); + } +} + +static bool +child_bind_priv(const atf_tc_t *tc, int type, struct sockaddr *sa, int opt) +{ + return (child_bind(tc, type, sa, opt, false)); +} + +static bool +child_bind_unpriv(const atf_tc_t *tc, int type, struct sockaddr *sa, int opt) +{ + return (child_bind(tc, type, sa, opt, true)); +} + +static int +bind_socket(int domain, int type, int opt, bool unspec, struct sockaddr *sa) +{ + socklen_t slen; + int s; + + s = socket(domain, type, 0); + ATF_REQUIRE(s >= 0); + + if (domain == AF_INET) { + struct sockaddr_in sin; + + bzero(&sin, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_addr.s_addr = htonl(unspec ? + INADDR_ANY : INADDR_LOOPBACK); + sin.sin_port = htons(0); + ATF_REQUIRE(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0); + + slen = sizeof(sin); + } else /* if (domain == AF_INET6) */ { + struct sockaddr_in6 sin6; + + bzero(&sin6, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + sin6.sin6_addr = unspec ? in6addr_any : in6addr_loopback; + sin6.sin6_port = htons(0); + ATF_REQUIRE(bind(s, (struct sockaddr *)&sin6, sizeof(sin6)) == 0); + + slen = sizeof(sin6); + } + + if (opt != 0) { + ATF_REQUIRE(setsockopt(s, SOL_SOCKET, opt, &(int){1}, + sizeof(int)) == 0); + } + + ATF_REQUIRE(getsockname(s, sa, &slen) == 0); + + return (s); +} + +static void +multibind_test(const atf_tc_t *tc, int domain, int type) +{ + struct sockaddr_storage ss; + int opts[4] = { 0, SO_REUSEADDR, SO_REUSEPORT, SO_REUSEPORT_LB }; + int s; + bool flags[2] = { false, true }; + bool res; + + for (size_t flagi = 0; flagi < nitems(flags); flagi++) { + for (size_t opti = 0; opti < nitems(opts); opti++) { + s = bind_socket(domain, type, opts[opti], flags[flagi], + (struct sockaddr *)&ss); + for (size_t optj = 0; optj < nitems(opts); optj++) { + int opt; + + opt = opts[optj]; + res = child_bind_priv(tc, type, + (struct sockaddr *)&ss, opt); + /* + * Multi-binding is only allowed when both + * sockets have SO_REUSEPORT or SO_REUSEPORT_LB + * set. + */ + if (opts[opti] != 0 && + opts[opti] != SO_REUSEADDR && opti == optj) + ATF_REQUIRE(res); + else + ATF_REQUIRE(!res); + + res = child_bind_unpriv(tc, type, + (struct sockaddr *)&ss, opt); + /* + * Multi-binding is only allowed when both + * sockets have the same owner. + * + * XXX-MJ we for some reason permit this when + * binding to the unspecified address, but I + * don't think that's right + */ + if (flags[flagi] && opts[opti] != 0 && + opts[opti] != SO_REUSEADDR && opti == optj) + ATF_REQUIRE(res); + else + ATF_REQUIRE(!res); + } + ATF_REQUIRE(close(s) == 0); + } + } +} + +/* + * Try to bind two sockets to the same address/port tuple. Under some + * conditions this is permitted. + */ +ATF_TC(socket_afinet_multibind); +ATF_TC_HEAD(socket_afinet_multibind, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.config", "unprivileged_user"); +} +ATF_TC_BODY(socket_afinet_multibind, tc) +{ + multibind_test(tc, AF_INET, SOCK_STREAM); + multibind_test(tc, AF_INET, SOCK_DGRAM); + multibind_test(tc, AF_INET6, SOCK_STREAM); + multibind_test(tc, AF_INET6, SOCK_DGRAM); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, socket_afinet); @@ -289,6 +525,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, socket_afinet_poll_no_rdhup); ATF_TP_ADD_TC(tp, socket_afinet_poll_rdhup); ATF_TP_ADD_TC(tp, socket_afinet_stream_reconnect); + ATF_TP_ADD_TC(tp, socket_afinet_bindany); + ATF_TP_ADD_TC(tp, socket_afinet_multibind); return atf_no_error(); } From nobody Thu Dec 12 14:45:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8Fcl1kNXz5gMBG; Thu, 12 Dec 2024 14:45: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 4Y8Fcl14mSz4ZCS; Thu, 12 Dec 2024 14:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734014711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g4SgUsu32jA+FH0LZKutK47lCG16iknjlrmpnJDjwy4=; b=ttBoeQ6tEGyC9bQ3u3tnjsksotcsBLF+PaBNWHW98XEI1xNNyVnRdJXrmVZ1SkDlBfnYTk rxfCB/jPbG06lRhRBUlWqRJSXO11KpSvOoXFIfq+Yu6e4KgOb9T+vLVNCu31+iGhu+SPvQ A4lqvf1NZSs2HzGT3umKpMKIkFXjJpIE+TeF+Ye6bxq+kv7HBjZPv7pfsa9b5tWtrYsYXK 9eL7gvgFJh01V2FCQiivA8x3D7zunTYggdgEC9gsirOb5APyg46x9/oY084s3JmaQsOMgO 5z85rIU0VeLUSkJHg0w7uEXTn81VAIux2As/u1PSTY05UqR4QW25jJixlMP8nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734014711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g4SgUsu32jA+FH0LZKutK47lCG16iknjlrmpnJDjwy4=; b=Q5VBvYeNd1cDbcPIREBh83O9GTBMml868VUOtF02GaQjwJx+sGVmr+yYhD1Aa5adYueYV8 UKKMGaQkD/+RR7jJbXsR0Sf0Sgb9Ut/2sdqZd05RYAwHljK1oX0JmT72jOc2kCeeYDvueE wBqrxFVg/94otuPCBXBMLK3FZbutoT9YoR68cJvgV2xrvqJWgjR8NXE3difl3+Tk+AnsK+ LeNMuwh6bSMFblkZnoF8GzTwoC7SP00IlRBEj+8BIl8MZURO15IzXY7JBJCcrOjuSuYxIk po+rcRqflWdu3fRKIjInmtJ+xJTkthS1NltVibwH6lbvuRTySUana1krBBUagg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734014711; a=rsa-sha256; cv=none; b=ewciEI10VZviYWyJHz8JLJq9DVSw+eQxaRnvQqQYGo6ZUTvfdheWY7orEuHPHW1xpoapDX Rk3pDPrHsNaR8JswF0a3GuSYr/1mg8E3/uOzDe50JOi8LQJvxGwIyaKoVNzQLFejaBsWKw XkqoWXdGikXSJj0cAD9CiAu6sjUnFS6YJtA81YEOgNX7kCnBp6Z2NUZ+Y1ct6S2q1ZrPTr GMEy7ke2fpWoDo2DNNMxb2dn4fkVnhBawjDiWccidLsCRB1Lvh1HiXevGJwUKgu+xp0XFg +ckmWE2NsR+yEysr2VsrqVagbbMqMruUVTvdylN8fGtthsDQt75J7PwZ3E4zNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8Fcl0YQGzxKC; Thu, 12 Dec 2024 14:45: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 4BCEjAYL002187; Thu, 12 Dec 2024 14:45:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCEjAQw002184; Thu, 12 Dec 2024 14:45:10 GMT (envelope-from git) Date: Thu, 12 Dec 2024 14:45:10 GMT Message-Id: <202412121445.4BCEjAQw002184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c9febea3dc8a - main - icmp: improve INVARIANTS check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9febea3dc8ac8e308e8fc5a2e74dd0313fdc5d2 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c9febea3dc8ac8e308e8fc5a2e74dd0313fdc5d2 commit c9febea3dc8ac8e308e8fc5a2e74dd0313fdc5d2 Author: Michael Tuexen AuthorDate: 2024-12-12 14:40:49 +0000 Commit: Michael Tuexen CommitDate: 2024-12-12 14:40:49 +0000 icmp: improve INVARIANTS check Actually check the conditions that are enforced by the error checking code instead of a condition which is * checking a number to be non-negative instead of positive * depending on a random number Perform the checks consistently for ICMPv4 and ICMPv6. Reviewed by: glebius, rrs, cc MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48001 --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 1149796c0db3..58484e532fef 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1148,7 +1148,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmplim + V_icmplim_curr_jitter >= 0); + MPASS(V_icmplim == 0 || V_icmplim > V_icmplim_jitter); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index e0f642544327..d1c2f2c85142 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2817,7 +2817,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter >= 0); + MPASS(V_icmp6errppslim == 0 || V_icmp6errppslim > V_icmp6lim_jitter); return (error); } From nobody Thu Dec 12 16:30:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8HyF6cXGz5gT04; Thu, 12 Dec 2024 16:30: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8HyF60Yhz4lmy; Thu, 12 Dec 2024 16:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734021029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mkuk1Sb87rIc7e5vD+03kpyBj/piWqnpD1q/Mf7TiY=; b=JaBF8fVBfIscljPxdOCbQyVoYqHNS91MYIEsJYwstJmIWcGbOgbXAvw328zeyotRgASDfS QCf5R0w43f3G0W+QwKgMo2ej2fR9XzkSppZs6tK6c6gR8ozVRKgg08c47m+9iZ70jVekc+ 6k/q4LN4RfmbRRK9iw7K0ju3H5IEzqSb6vPvje/Klkcr+uIg6/v3A2EQnQO9ptJuA7rS/x 3Mg3NOflttPYhEpOFyOrEVIQz3aiIa563Nh6vR3PoAfJ7QNqB3VAYR2t5SSHdDb8SP0jIR 0DpHSN64UfKLW4XI/T8W69Vxtn3NtSVkvGtuu480RIvGQFWSn0mlQkAbK0ghYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734021029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mkuk1Sb87rIc7e5vD+03kpyBj/piWqnpD1q/Mf7TiY=; b=OfO/QHd8atrBJHNksQRKc0DE962tFW/l+rIFRK6VihdA5nyTQiDSKLZ6JP3q+Fk9pHVho1 cQHhMqm40VP1S9QjRoMv4n7Dm5mp4Rd5bu/aXMTDRbKef3numhWsdZLXgk1e3bNqWgDE+t xsecrdWwmXTwV/8MXz3kcOJcYKnmwO2pmNT7gW9kutEHuIsRSZ6K5cwQozJYcnKFPeLBy6 iP2cS+y2HoAcIKNgcMNd8BkLpBDS5a5CDQUFEw/Jp7mnXJHUWiHNGSohSoCRat+Up08kiw upc5qHzK+ab4vj9CGB1k8jGHCdRYIGN/gjkvPoiEzt+ML9KakZ+4i0AlcccKTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734021029; a=rsa-sha256; cv=none; b=ovQIsE5mQSBVBYkh1b7vcubEU5i29jjfxW5BLP6xFGq3k6sz/Hzl5YPWshumRrGwXnqqwt otuQjE3NP0rfH9S+WYbSvKbxQY+hPnWF1cvS/z5f3hdYQnHxqtyz6cosowyLVnS7FpFioF Q3npdjhaQrTFbLBC4AcnSqGfxpB43rfr8yT9bCHOSRpelPvzXuhK8LbrQiywMbVhO0ZhE5 7+898ta/3LR5Vt7p1kZADYkEhhY582MmLoLgilmCYpxMRigTIF6GYPa09hIedrZKmWwJTI CEIT+7iteISUJNFCla9Ec/VtUZTGtMZ7SERzYfEwMPIBHFw7X7jhwFLjzdd7MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8HyF5br7z10qM; Thu, 12 Dec 2024 16:30: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 4BCGUT7m000268; Thu, 12 Dec 2024 16:30:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCGUTiS000265; Thu, 12 Dec 2024 16:30:29 GMT (envelope-from git) Date: Thu, 12 Dec 2024 16:30:29 GMT Message-Id: <202412121630.4BCGUTiS000265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7d0d52fc7c53 - main - distributeworld: dedup dist(.debug).meta generation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d0d52fc7c53bcb3c827fa6873baf583633ad183 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7d0d52fc7c53bcb3c827fa6873baf583633ad183 commit 7d0d52fc7c53bcb3c827fa6873baf583633ad183 Author: Brooks Davis AuthorDate: 2024-12-12 16:14:14 +0000 Commit: Brooks Davis CommitDate: 2024-12-12 16:14:14 +0000 distributeworld: dedup dist(.debug).meta generation Debug file distribution metadata generation was added in 2d0bcb76c8530 as a near duplicate of the default distribution bits. Add another loop instead of copying the code. While here, improve indentation. Reviewed by: emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D48038 --- Makefile.inc1 | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ef63bfd52381..5cf431733f8e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1538,24 +1538,16 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .endfor .if defined(NO_ROOT) .for dist in base ${EXTRA_DISTRIBUTIONS} +.for path suffix in "" .meta /usr/lib/debug .debug.meta @# For each file that exists in this dist, print the corresponding @# line from the METALOG. This relies on the fact that @# a line containing only the filename will sort immediately before @# the relevant mtree line. cd ${DESTDIR}/${DISTDIR}; \ - find ./${dist} | ${METALOG_SORT_CMD} -u ${METALOG} - | \ - awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}/, "."); print } }' > \ - ${DESTDIR}/${DISTDIR}/${dist}.meta + find ./${dist}${path} | ${METALOG_SORT_CMD} -u ${METALOG} - | \ + awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}/, "."); print } }' > \ + ${DESTDIR}/${DISTDIR}/${dist}${suffix} .endfor -.for dist in ${DEBUG_DISTRIBUTIONS} - @# For each file that exists in this dist, print the corresponding - @# line from the METALOG. This relies on the fact that - @# a line containing only the filename will sort immediately before - @# the relevant mtree line. - cd ${DESTDIR}/${DISTDIR}; \ - find ./${dist}/usr/lib/debug | ${METALOG_SORT_CMD} -u ${METALOG} - | \ - awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}/, "."); print } }' > \ - ${DESTDIR}/${DISTDIR}/${dist}.debug.meta .endfor .endif .endif # make(distributeworld) From nobody Thu Dec 12 16:59:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8Jbd6Sdbz5gVYp; Thu, 12 Dec 2024 16:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8Jbd5bmbz4nsM; Thu, 12 Dec 2024 16:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734022765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBhR41fm2UdGTFILG/bKw7OyJ+eVYvXIU5QaXmgTtLo=; b=QeXBwqV6iJZN1LgW4+5eUlT1hC/7DW+cDxwH/KSXs7INiiabOm4UxNTa1tWHHUtLtBWU+e V6iJwe3wTsoeIUvC4g2RJlUxOkDQ6DetuLEdRaipLpNOSmsQ3JaftquadGCCwviIPltDgg WfqC8hG+0GYiLfTAiW1gBuAi4vSO6hee6lhGH1e/3nLoeyxfbuwYxriMYTEUabgYjIY9Bm hBdDnQ6rr6oUYOwqqqwoa1WHhWe/GfAHxKCRu/e4Q2mwmE1Az254p5r5NJ4Yoqf/8W3/U5 7Bk+IloS4RGM/MS0wHmvynOD4D7+cXMQK5Ptutvcm2OgQbDxh5JiX9hsNPeQNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734022765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBhR41fm2UdGTFILG/bKw7OyJ+eVYvXIU5QaXmgTtLo=; b=JAIhmHkvuAWt0hEZJ/1SPyE8cz9qA/yKA0OCegNFriSFL/8md3+VJTtIfAYeD4TuXx/ymW mzIExuAiTz2weJk+wbaEcktNvHRMBop3Buy0PJNBKu5qdm8DeiRZFItqScRDzv/dIJQ3F7 BDJUdKLjya8KiPkNT0e/U5fTu3ihcrXyXFSNUcYDwwjRj4RR/RKanNlxl1XvhekVEzRgp1 Tdko7/tBzG12cJtDJXvR/aM8+nOCXEzoDaJtebidWKqUAqcltle+4SDaA0K3CJHgpl8s4o DpqSoKQcy6Qdh5HhGIm5mIulOBe20y0f7ktlbaMWIjel3tAsw6OCGHzmrkqJ0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734022765; a=rsa-sha256; cv=none; b=Tg5mHYGP1TCoN4CK/0nObFd+DuDEvKhxMSTdIcqssOz6didDMElVD+KJykR3eMr21C/ZH2 Cfxd2rfo+VQdSNqYcgzWgvIOD/2mQlWYI+X4n/sSKcozB4nJLICbRCQK6ApzfNqMbfZGcF EFlnaEp07a7LQjg4Si+8a0pKVEA//egbk7rCN2W9v5Eiydfiebxlxln6ZOHDfbeXFYB2UP JTVq7itd+J7e1KqfQcd4KEa4LWlcRbQiCvZ22L9qT2cqz15aDV/l1BFnHXqG7PTQmRHurm geO9n/EcQsoK6zJ6W79ru3RexDCyJucV5iA+AFPrIbRcgkWxOtlJ5Y2dS3FYcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8Jbd544Xz11VB; Thu, 12 Dec 2024 16:59: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 4BCGxPI3047194; Thu, 12 Dec 2024 16:59:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCGxPiP047191; Thu, 12 Dec 2024 16:59:25 GMT (envelope-from git) Date: Thu, 12 Dec 2024 16:59:25 GMT Message-Id: <202412121659.4BCGxPiP047191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5e310866c373 - main - Cirrus-CI: Switch default job to llvm19-amd64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e310866c3733cbf2e38e15c3f16cba16136829e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5e310866c3733cbf2e38e15c3f16cba16136829e commit 5e310866c3733cbf2e38e15c3f16cba16136829e Author: Ed Maste AuthorDate: 2024-12-10 01:58:57 +0000 Commit: Ed Maste CommitDate: 2024-12-12 16:58:01 +0000 Cirrus-CI: Switch default job to llvm19-amd64 Clang/LLVM19 matches the default in-tree toolchain. Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 62766904de2b..2a1a8b6cbf3b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -31,15 +31,15 @@ task: TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm18 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 TOOLCHAIN: llvm18 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm19 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' - trigger_type: manual + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' env: TARGET: amd64 TARGET_ARCH: amd64 From nobody Thu Dec 12 17:13:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8Jw50PxSz5gW9m; Thu, 12 Dec 2024 17:13:41 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp052.goneo.de [85.220.129.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8Jw45PsSz4qLD; Thu, 12 Dec 2024 17:13:40 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id E1FC124098D; Thu, 12 Dec 2024 18:13:38 +0100 (CET) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 16ADD2402D8; Thu, 12 Dec 2024 18:13:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1734023617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Mwr9BR4LbDSA5z91tOxKB61kr++W2bPEdvC7wcNho6w=; b=AyaD1TZo/rcPQ6jA47j2PESs3TN4h6uD4s9qkCraYlumWqgx5EFite9eeaPscTqnknczM4 xojObUNBQhnN7dJUI8rFWT9ox22QbKHgWWPSftfIZgOs2plJ3QqDYcgx8r8e0wF76Ub/M+ 1iTKzmUu/FWvLrVJuo1bWBH59AWufLnIAeQGpqSk9sx6YMKqCtGopmH24vStKuE5p/T2eI kJwIV14XZJbF0loB4quhra4ArTS8de8W5Tn3bAdqn/3cC0bOO4mVXWVnrlc/mzdd6czMqI dom2oIZLtwMWTd/F78fuGd2SUkD5r3EehdbhhhMHYqE4aLUQWS5geEb1+jF/+w== Received: from thor.intern.walstatt.dynvpn.de (dynamic-078-055-054-119.78.55.pool.telefonica.de [78.55.54.119]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id BB0932402D7; Thu, 12 Dec 2024 18:13:36 +0100 (CET) Date: Thu, 12 Dec 2024 18:13:09 +0100 From: FreeBSD User To: "Andrey V. Elsukov" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, freebsd-current@freebsd.org Subject: Re: git: 9ea8d692f4cb - main - ipfw: use only needed TCP flags for state tracking Message-ID: <20241212181336.01db53f2@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202412121306.4BCD6sqR017458@gitrepo.freebsd.org> References: <202412121306.4BCD6sqR017458@gitrepo.freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: db1dde X-Rspamd-UID: 3f15e0 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Queue-Id: 4Y8Jw45PsSz4qLD X-Spamd-Bar: ---- Am Thu, 12 Dec 2024 13:06:54 GMT "Andrey V. Elsukov" schrieb: > The branch main has been updated by ae: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9ea8d692f4cb552902b9e8394260d7f3cf4aefb0 > > commit 9ea8d692f4cb552902b9e8394260d7f3cf4aefb0 > Author: Andrey V. Elsukov > AuthorDate: 2024-12-12 12:57:45 +0000 > Commit: Andrey V. Elsukov > CommitDate: 2024-12-12 12:57:45 +0000 > > ipfw: use only needed TCP flags for state tracking > > This fixes stateful firewall failures after adding TH_AE flag > into TH_FLAGS. > > Reported by: ronald > Fixes: 347dd05 > MFC after: 2 weeks > --- > sys/netpfil/ipfw/ip_fw_dynamic.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c > index 34aae71c174b..ff55e3360c13 100644 > --- a/sys/netpfil/ipfw/ip_fw_dynamic.c > +++ b/sys/netpfil/ipfw/ip_fw_dynamic.c > @@ -920,7 +920,8 @@ print_dyn_rule_flags(const struct ipfw_flow_id *id, int dyn_type, > #define _SEQ_GE(a,b) ((int)((a)-(b)) >= 0) > #define BOTH_SYN (TH_SYN | (TH_SYN << 8)) > #define BOTH_FIN (TH_FIN | (TH_FIN << 8)) > -#define TCP_FLAGS (TH_FLAGS | (TH_FLAGS << 8)) > +#define BOTH_RST (TH_RST | (TH_RST << 8)) > +#define TCP_FLAGS (BOTH_SYN | BOTH_FIN | BOTH_RST) > #define ACK_FWD 0x00010000 /* fwd ack seen */ > #define ACK_REV 0x00020000 /* rev ack seen */ > #define ACK_BOTH (ACK_FWD | ACK_REV) > The problem reported is now also present in 14-STABLE! -- O. Hartmann From nobody Thu Dec 12 18:18:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMP3PkKz5gZfW; Thu, 12 Dec 2024 18:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8LMP2Tvdz3wtY; Thu, 12 Dec 2024 18:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfl5YqhWA9LNbtWeSdbgeDARKLgXELMkt+XjP9qZT9I=; b=U4OuSNyxnU8HzPQoe5XQsDihF0yLvMLeV1fCS/cdB+/26bU7jnFKm+W6F0RPNcmTex3tGX /kr23VUM/c/XAmKoYFoqqNCtIAE7KmPW8NrVNm5Oxh0akMnC0bra1KXkqJGTR4XBwUDQk2 E1DgNgcUL5uBvamS7FZendRb9Fv1CZchACYY2I2/9dg+diT+5JgWYA1uZz1Z3DV0vvHS9y huNYpIG/JQz/bY1iT4Y3lbJl/TyCigP5T3CTf+55B5w7vNecDJN79KmibomJJLNHc9t+zq yn7LDsEzMa4Jmy8ioc3cXVNWEchkReUg66oXyjCBTWqT7qk9/oqYZ2Gs81on6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfl5YqhWA9LNbtWeSdbgeDARKLgXELMkt+XjP9qZT9I=; b=BVLFF4JIcWXtKBB7is05A2pV4YBrz5pYJzjzsvQdjTpZt5wpYYk7aW1EWkNrBxWXeT3maC Sn8zpLBqN8za/mzyjXck23wUJ4FT35xkXZdv3rLIJnrAodmPC5Tg/4rzw/eSDTcBtJ4J48 aw+7t07h6oXUaWCis3H0+tiuRrykyTmKnNX/UGbp4U5WQntXTyAOCPl4a64m2NP4+o0wTn WSS3/4AxK7PFn+IuD2S8GhkrwH4wqgNSi7Zs7tuj1C3Doy5Rm1wXKBz79ukTCTEDO2N13O HqMWeO/WbXVu8R1OFEoAyx3feCJERvFxkRaN343kda2ycTv7lIwfnTuLmQX7Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027537; a=rsa-sha256; cv=none; b=FkG5rLkNWjjqbWepS8AEqiXcM7Qa5kFfQO3i/znsPWCkzIMDZTe8ZuQG+kPL+azjfB3E2A 6r+PrMizoIwvDIqM6RHS8wUpCax5/9u4OmwQJiIE9rudDNl1+YHe4DwDXyjdTBklQiVKRV u+gI0GAHXeYYGtJfntnVKiG+/zVmOrlHk9df7kEFDRa5f9oNGNlNZai4bbBG76PRe1y8iM mRvndbzWQ0yldIaWXAg6B1aUg5h/amRtdUA92wPa+K9i78zR1MG6MF2rpr8PW7K6lMTy6a Xe5ok7QEmqjnSGOiSCgs7+HwtMHzVGXw96oAhGMXThCLwZ0v97Rat/GdaSsnPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMP2594z13ny; Thu, 12 Dec 2024 18:18:57 +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 4BCIIvPs096966; Thu, 12 Dec 2024 18:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIIv5l096963; Thu, 12 Dec 2024 18:18:57 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:18:57 GMT Message-Id: <202412121818.4BCIIv5l096963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b77b7aeb185d - main - arm64: Fix the alt name for ZCR_EL1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b77b7aeb185d3a6c2d04aa6a69531894d4eba848 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b77b7aeb185d3a6c2d04aa6a69531894d4eba848 commit b77b7aeb185d3a6c2d04aa6a69531894d4eba848 Author: Andrew Turner AuthorDate: 2024-12-11 17:55:05 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:22 +0000 arm64: Fix the alt name for ZCR_EL1 Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47810 --- sys/arm64/include/armreg.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 5e87fafbec31..93758da884a1 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2776,12 +2776,12 @@ /* ZCR_EL1 - SVE Control Register */ #define ZCR_EL1 MRS_REG(ZCR_EL1) -#define ZCR_EL1_REG MRS_REG_ALT_NAME(ZCR_EL1_REG) -#define ZCR_EL1_REG_op0 3 -#define ZCR_EL1_REG_op1 0 -#define ZCR_EL1_REG_CRn 1 -#define ZCR_EL1_REG_CRm 2 -#define ZCR_EL1_REG_op2 0 +#define ZCR_EL1_REG MRS_REG_ALT_NAME(ZCR_EL1) +#define ZCR_EL1_op0 3 +#define ZCR_EL1_op1 0 +#define ZCR_EL1_CRn 1 +#define ZCR_EL1_CRm 2 +#define ZCR_EL1_op2 0 #define ZCR_LEN_SHIFT 0 #define ZCR_LEN_MASK (0xf << ZCR_LEN_SHIFT) #define ZCR_LEN_BYTES(x) ((((x) & ZCR_LEN_MASK) + 1) * 16) From nobody Thu Dec 12 18:18:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMQ4nd4z5gZps; Thu, 12 Dec 2024 18:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8LMQ35wsz3xLr; Thu, 12 Dec 2024 18:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ii5OZvfWU06F5Zq+8qR2MjY0f0ZkXfcvbiX3L1DRM3o=; b=tfB79UbqYte1pID7HJLudRHnp7ZZFoUgO1ToPVb/SQmEiI21LDla2EP91wmy6bPZswY+0p hhshwTTG4hOERUoB0etdRGb0sbkgZLGKeqDmb7cn+FJL1EvVIkSsLSR68hroG4D20K88Vp 4n8GVEQtXkYICLuoCMIoyGfaMcZ2gGQ1oXMf4BmxefzWhUT1gc9E84fznomUr9cpVUoXky MDxznT/qc3Jee9pqrap8jVn7VseU9OIFFZjRHLPQsT/Pk7o9OomdTDCMvFBC6MwoRWyPOO 1GPfmZGB7laFgy09D8F4aUVefrrbZoP85smKmn3TIQ5/FZtxfMVqiQsIbdas+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ii5OZvfWU06F5Zq+8qR2MjY0f0ZkXfcvbiX3L1DRM3o=; b=Ggax7wPKYxs4guTFxwxQnDl4zftPolTA2MzJcptsR301eo7PD07G/+q9mO5HGyR15ELE/j 8O48IP82AmNy+KGBv8n8rzF9Zb7KY8EpEoHlHDx0pGe87XIwuP9KpbPAOiDjv6fhAo5Be8 hGo3a2ERNwIqy7NpruJu2EWqOO3ASAgf5Vyqx0Gn6/YSwFNAE0UmO/tZB891Or/qfVH4pL e4Z9QCVhAg+Ob1KeKd8jBdfb8YRZwquAUrBHoPrG15ARVwXtx+q9rgy6iCh7QnbSA1BFxM FjgT61bmonBoFZqY2h6aPXm64PRvuivoqQ0UmcKBNx54yTn45lvZourUdSGpMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027538; a=rsa-sha256; cv=none; b=w2qZrZM0hRuuBj5rCZDxbVsz89z6xBItXv1LauK+DwlpLsDRlPzQIT1G0RHAka1DNgua36 HHvWMA7NWEYF/rvksUy1Fhdn1OjV9vCDrumNdQLbBVi2G2eJzefsGk/Q5iIIw6jGDmutqS 5hoQaxKMeYZLT9T3e6zVUXWaVuhOO76o8GnSU4hofe8D1l6iIyhuVYtktJ9ysHQH2ZbQ75 JMuVTnfZa9RQFEIN7P1ny2xi4piUsd+2tPblVkpp3Y3xTZUqDg/BeKzXyn/GanTcPeecx2 r7IpECQzlMVByw0C2hUW47FCofNPMWQiUIfCtdIvCTGv+Y4AHFKh7k4Gg0ZPWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMQ2j9cz13Lv; Thu, 12 Dec 2024 18:18:58 +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 4BCIIwd6097008; Thu, 12 Dec 2024 18:18:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIIwST097005; Thu, 12 Dec 2024 18:18:58 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:18:58 GMT Message-Id: <202412121818.4BCIIwST097005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 14006c96214a - main - arm64: Fix the MRS_EXACT_IF_DIFFERENT check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14006c96214a772ba2e2f07bb4301657d8c2055a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=14006c96214a772ba2e2f07bb4301657d8c2055a commit 14006c96214a772ba2e2f07bb4301657d8c2055a Author: Andrew Turner AuthorDate: 2024-12-11 17:54:37 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:22 +0000 arm64: Fix the MRS_EXACT_IF_DIFFERENT check When comparing two ID registers to create a common userspace view we have an option where we set an exact value only if the two are different. This is only used in one field in the cache type register that is accessible by userspace without being trapped by the kernel. In preparation for trapping access to this register to handle it in the kernel in some situations fix the 'if different' check. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47811 --- sys/arm64/arm64/identcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 95e7669d053e..646d10d5ae1a 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2261,7 +2261,7 @@ update_special_reg_field(uint64_t user_reg, u_int type, uint64_t value, switch (type & MRS_TYPE_MASK) { case MRS_EXACT_IF_DIFFERENT: - if (mrs_field_cmp(new_val, cur, shift, width, sign) != 0) + if (mrs_field_cmp(new_val, cur, shift, width, sign) == 0) break; /* FALLTHROUGH */ case MRS_EXACT: From nobody Thu Dec 12 18:18:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMR6Df2z5gZpt; Thu, 12 Dec 2024 18:18: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 4Y8LMR4bLXz3xNv; Thu, 12 Dec 2024 18:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ARoS6RfXi980GUtwQZ1Y7XqDseJfooC8A2gyq+JZPo=; b=X6fmOnspW77gsP08y6OJrZMVUE/z/5JVwCpNVnQO9fbeuGTrcszvLb9mb8CYOlWnd9Tqfw 2R7iCp/HdF4vU6t6O2KLMEnfS7xw1qQ0IRmmUXUHVT615yOC3b/+ykXrdD8Me2JCKrJLCP HyvtebomAOHTd4PTkIbKavPG38fBP0X/Ltc8AB98N1Em4Z1N+QgylmWsK/rlHn81MAeHlH 2xLXCOBj/QjHSzuWChJomrH1Xwk1GtD8QU1dcSQ3KuCEsFaypmUhMHcswJnODItjteIGWH munMBd/O0EFa+Ht7xyttyNbLYE7DnsxQ6s5PS7ZQ/Rxm4cHNyUo7P8tReotx/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ARoS6RfXi980GUtwQZ1Y7XqDseJfooC8A2gyq+JZPo=; b=HmlPp74shq6aUZRl9qpc3N7tY+ujM4u5Ez8QHmReQUsI9U9dYD1oyyKthuLR0zd6G2yqWj mCwo7o/Mpbpsl9JvLa8kwiVRT1eEv8dgr0rWOBapqc5i9AtwdrG8N6AYpmPLYHSteFBD8L A6XmxNvKglR8vq+XopUDWikqqITvS43lbtxR4NCzbvWwC5IjLchwiVXd76vRyUrdLjauG3 PtvxCmmQ7dXq9RSiXds/o/jxRvK8XZhlT0Ylsb98NxG4tAX9T5ZOpiB2+i+sJyufVKncsU e6AB+UlDgWw5Nv5mx2WccLY6RWzvITejBYkIwwcF7ZM12RYA4ZXJT69fUmbkaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027539; a=rsa-sha256; cv=none; b=vhNbhskjb7Upj5oVhppJg3rF/48f42m+PMrG1mz2NDVVhbq2Pnhd9OKhnIbvpZQsPDobYx jes9X6r7VT/mifXm8WT4480b8jh9Clw9iThfUrcsAtytD9UoFYLjpImSKBIHOC2Q1l2ia7 qDuq1d0xyqbS0keilo7hMtnrB9oAf1F6HU4uB5nPg17mHdrhoygGJhDft2Kvy3dxM5Brfg uCZSPVHk5KeSwIpqU0OgDQNiSd7m/qLL4kneOtGR+O4Cb09LRJlNPsp3NJz0OjMyP4J25y IUK9bnMz+BzcUJZfXoQArCIeU7lINZeR7OLz0eZ4IIHolfjt4mldctdH36bWBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMR47NRz13Jj; Thu, 12 Dec 2024 18:18: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 4BCIIxcb097057; Thu, 12 Dec 2024 18:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIIx0R097054; Thu, 12 Dec 2024 18:18:59 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:18:59 GMT Message-Id: <202412121818.4BCIIx0R097054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4b516226dc39 - main - arm64: Add CTR_EL0 op and CR values List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b516226dc39c6c1918cb85a254fed59570bdc4f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4b516226dc39c6c1918cb85a254fed59570bdc4f commit 4b516226dc39c6c1918cb85a254fed59570bdc4f Author: Andrew Turner AuthorDate: 2024-12-11 17:55:31 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:22 +0000 arm64: Add CTR_EL0 op and CR values Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47813 --- sys/arm64/include/armreg.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 93758da884a1..e955f3f4a5c0 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -363,6 +363,13 @@ #define CSSELR_InD 0x00000001 /* CTR_EL0 - Cache Type Register */ +#define CTR_EL0 MRS_REG(CTR_EL0) +#define CTR_EL0_REG MRS_REG_ALT_NAME(CTR_EL0) +#define CTR_EL0_op0 3 +#define CTR_EL0_op1 3 +#define CTR_EL0_CRn 0 +#define CTR_EL0_CRm 0 +#define CTR_EL0_op2 1 #define CTR_RES1 (1 << 31) #define CTR_TminLine_SHIFT 32 #define CTR_TminLine_MASK (UL(0x3f) << CTR_TminLine_SHIFT) From nobody Thu Dec 12 18:19:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMT0RLNz5gZn9; Thu, 12 Dec 2024 18:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8LMS5bGvz3xP7; Thu, 12 Dec 2024 18:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Em8S6LZnYx4CDFIAq94cf0OpV6l1yiG/Y/KzjlOsyAw=; b=ndPOeDbIMn17CLkubbMrPe4+PKsgk1fPA0qF9lOQ5lM74mWUTuWBvDj8ioButGz8zAfgS0 8X6A9BDFzlxfsDsPvbWeVJRCXBCelmZhbUFt3w36CsSZs+C1zqJpxDvXukCx8WXXQvKrAJ 4flyJbHlpDCrUvcFP5TfOHS6RnLHlL95pH4jNsFDz+U3HXKBBKR1T38H8ZQsqlQlVtGBpX Rw7KwT4WDI8gjWrMZDXTZ5DgHlgi1+xVywEBC1iAEkS1dAJyv8gZT9/d/kI80xSB9qQt1H E79rcBcPA5VJrYSNH80jpehulTbQQmCG5sXG78joX/wdx88lWr6dDFbIjRoAww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Em8S6LZnYx4CDFIAq94cf0OpV6l1yiG/Y/KzjlOsyAw=; b=UBli5Q24qf6OzVfSRX7B8T8N162Ipsfn5khBQ6Q8GzWa12TDaAy6TVrq+gqBg0cftb60xV cZiugdYc05gmmXscJSyKl79W3ExNEhPETrEZ8iS9vxlzZZmsgV70Moq8y2zwcsGTB3whdq KrP/aFs0o8J58Uxr8zXO8p74lcFQUA6cJmWtp15jJWbY3ZX3Bhxt9tzNmJr2cF/P68PV1V DMZFm1Z/OyY7FDg5YWlZrTrfkQxnlA8mAHL7PKipyOnfozdIQF0boV+HzZE7EqxBwFQGbU az51QDJ1McpqqxT+wtg5Gk5z9JuE6GZaBmTI64TIfbxm8urCjU0zzx9allXrew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027540; a=rsa-sha256; cv=none; b=A5JHEhySzVMAsGq8J55EjfucyIS/UL3Yl/+tjzE0ijRzpPmHcgp+yieB4M0AvJRaXEF1mR SrBqylYnv71ROzIRPkG27RpLDyBqsyzI3rkSbwijgcFlrWPC6OYn24gnd0VZyXAisnNALa B5cfduwrE3XT9PvAmWQhrmxwRb+LNNcYyZu3VgZ+zbGBRVYYteWXOSGUPlad8tFaUVAIvW 4KK2d6DKPIDAbAA5yVf0J4/pm1fWKcH42bRNjqugKcyZPMRDlNX2SD4n6ze6YpXJnii9Np cCAR0W71euN6wkLQ/xotJt+zg9zQUvh+Ho5N4KOw2AxYLdMsguzXuaf4I6l72A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMS4j63z13Lw; Thu, 12 Dec 2024 18:19:00 +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 4BCIJ0Gq097124; Thu, 12 Dec 2024 18:19:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIJ0SF097121; Thu, 12 Dec 2024 18:19:00 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:19:00 GMT Message-Id: <202412121819.4BCIJ0SF097121@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 938e4b131c48 - main - arm64: Use the PAN msr mnemonic rather than .inst List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 938e4b131c483a05d5e5ea8f2bb44dfd1514868b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=938e4b131c483a05d5e5ea8f2bb44dfd1514868b commit 938e4b131c483a05d5e5ea8f2bb44dfd1514868b Author: Andrew Turner AuthorDate: 2024-11-27 16:17:07 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:22 +0000 arm64: Use the PAN msr mnemonic rather than .inst Switch from creating the msr instructions to manage PAN to use the "msr pan, #1" instruction directly. When this was added clang didn't have support to assemble the instructions. This appears to have been added to clang 13 which is sufficiently old enough. Binutils releases from around the same time appear to have added this instruction so any modern gcc should also support this instruction. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47817 --- sys/arm64/arm64/machdep.c | 10 ++++------ sys/arm64/include/asm.h | 12 +++++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index b61fec3fdd11..03f041851c8f 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -187,11 +187,6 @@ pan_enable(void) { /* - * The LLVM integrated assembler doesn't understand the PAN - * PSTATE field. Because of this we need to manually create - * the instruction in an asm block. This is equivalent to: - * msr pan, #1 - * * This sets the PAN bit, stopping the kernel from accessing * memory when userspace can also access it unless the kernel * uses the userspace load/store instructions. @@ -199,7 +194,10 @@ pan_enable(void) if (has_pan) { WRITE_SPECIALREG(sctlr_el1, READ_SPECIALREG(sctlr_el1) & ~SCTLR_SPAN); - __asm __volatile(".inst 0xd500409f | (0x1 << 8)"); + __asm __volatile( + ".arch_extension pan \n" + "msr pan, #1 \n" + ".arch_extension nopan \n"); } } diff --git a/sys/arm64/include/asm.h b/sys/arm64/include/asm.h index 16be39b3eae4..cc0a7d8293c9 100644 --- a/sys/arm64/include/asm.h +++ b/sys/arm64/include/asm.h @@ -87,19 +87,25 @@ ldr tmp, =has_pan; /* Get the addr of has_pan */ \ ldr reg, [tmp]; /* Read it */ \ cbz reg, 997f; /* If no PAN skip */ \ - .inst 0xd500409f | (0 << 8); /* Clear PAN */ \ + .arch_extension pan; \ + msr pan, #0; /* Disable PAN checks */ \ + .arch_extension nopan; \ 997: #define EXIT_USER_ACCESS(reg) \ cbz reg, 998f; /* If no PAN skip */ \ - .inst 0xd500409f | (1 << 8); /* Set PAN */ \ + .arch_extension pan; \ + msr pan, #1; /* Enable PAN checks */ \ + .arch_extension nopan; \ 998: #define EXIT_USER_ACCESS_CHECK(reg, tmp) \ ldr tmp, =has_pan; /* Get the addr of has_pan */ \ ldr reg, [tmp]; /* Read it */ \ cbz reg, 999f; /* If no PAN skip */ \ - .inst 0xd500409f | (1 << 8); /* Set PAN */ \ + .arch_extension pan; \ + msr pan, #1; /* Enable PAN checks */ \ + .arch_extension nopan; \ 999: /* From nobody Thu Dec 12 18:19:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMV02F2z5gZnG; Thu, 12 Dec 2024 18:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8LMT6QFHz3xML; Thu, 12 Dec 2024 18:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dtqtAmuAv40AxfLbt4DZuDDpEyfSxmyJbiCxKW/9zVk=; b=RBSbS9WkA3RBRIzJEe1zu7ltP4EA9MgC5YcTdC7PP60pEmrmTg4tbZyVzoVB9CzL+QkgdL h0RZxq6FR1hlXEaV+fwIArBkDWKA7iGTqctQHxlhh6hOa6ywBDkoESRIt+YzzCvr4nWTqO OP3tP+39BhxVEmquE7Mj4nfv0UvsaMfqFs2wc/zq8VoffRs2cPg1wF3OxOc9dZlkyHliu+ assyrmMkr89C+vHr4jBAhfPIpXnu2A8eYTafAIxqymbvN3xJngdc60gIVxqWA7mSJ1Tl96 oGl8304GKN2gEeLG6xM8p2BRZMnA64cmRl8LJ3bjDYMsT5qGsI+Jj+gMITF7LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dtqtAmuAv40AxfLbt4DZuDDpEyfSxmyJbiCxKW/9zVk=; b=eZyFf6rJUOobgJ2+q7uOYLvDUssrhwS7Z//2I2eeGgZjzapK/GgegQIXh1QyNCHzdfMvUF 06JUrSEPjNE5Hz8i4EZa3FInzONV2qggzHNcZXFn0+a256HURf5AwuSce+U7BVzekR341m 3H57GbuX/Bl8gRMybdqtJ3wueIywkzPI7BRvVeUFHX4EryO3Ad/yt2n62E+otcK0AImxx1 JhWQPMbmwSV7inJ9OjsQKsfZD/OdMer+/U4x4ANJC8VOXaCXRLAW5IL6J0uvdsCgdxQgeP Bmt+DehqtUU/9JojiADhHvPzax1/NBiPE/qYLMpxyYkkDuDnIwF4e07KXKE7Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027541; a=rsa-sha256; cv=none; b=Pv2j+7rvEzLzdZ9PSFArE0PDVo6gv/L7+LZ25ur5BE3HbKWDUFzNXpA5+BjnDStg2dDsVB rOVBTG+hYgSfPpW4TbaUuREPhxpupVOP06w5AXKh7AktOByTivYRqtOVByVSTEtp/j6+Qm Xa4WMpuzI3esGJAVhZ3Ny7vgOEmYsKfUwumXRk2vIEVq/hVBSqgI7E3AXC4iAwKpR0OL+b koCRiwQ89ot4WypdCQcEJzNMskXjhEAiVYd6l+KkghESetXowXBKO5ChuwnOQnoyOOhdaJ 6Tf10Wt1STlzfnH9zVvrBIXp9N1Nxf1x3ucxHFMKecQetIlx7QNIggHhmBge1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMT61dpz13WK; Thu, 12 Dec 2024 18:19:01 +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 4BCIJ1id097193; Thu, 12 Dec 2024 18:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIJ1KW097190; Thu, 12 Dec 2024 18:19:01 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:19:01 GMT Message-Id: <202412121819.4BCIJ1KW097190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ba1904937d9a - main - acpica: Extract _OSC parsing to a common file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba1904937d9ae0539e39001467a1519b17177118 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ba1904937d9ae0539e39001467a1519b17177118 commit ba1904937d9ae0539e39001467a1519b17177118 Author: Andrew Turner AuthorDate: 2024-12-12 16:29:45 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:22 +0000 acpica: Extract _OSC parsing to a common file This will be used by pci_host_generic_acpi.c so needs to be in a common location. Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48044 --- sys/dev/acpica/acpi_pcib.c | 59 ++++++++++++++++++++++++++++++++++++++++ sys/dev/acpica/acpi_pcib_acpi.c | 60 ++--------------------------------------- sys/dev/acpica/acpi_pcibvar.h | 1 + 3 files changed, 62 insertions(+), 58 deletions(-) diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index b16457ec853d..dfb4f143d5c4 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -38,6 +38,7 @@ #include #include +#include #include #include "pcib_if.h" @@ -277,3 +278,61 @@ acpi_pcib_get_cpus(device_t pcib, device_t dev, enum cpu_sets op, return (bus_get_cpus(pcib, op, setsize, cpuset)); } + +int +acpi_pcib_osc(device_t pcib, uint32_t *ap_osc_ctl, uint32_t osc_ctl) +{ + ACPI_STATUS status; + ACPI_HANDLE handle; + uint32_t cap_set[3]; + + static uint8_t pci_host_bridge_uuid[ACPI_UUID_LENGTH] = { + 0x5b, 0x4d, 0xdb, 0x33, 0xf7, 0x1f, 0x1c, 0x40, + 0x96, 0x57, 0x74, 0x41, 0xc0, 0x3d, 0xd7, 0x66 + }; + + /* + * Don't invoke _OSC if a control is already granted. + * However, always invoke _OSC during attach when 0 is passed. + */ + if (osc_ctl != 0 && (*ap_osc_ctl & osc_ctl) == osc_ctl) + return (0); + + /* Support Field: Extended PCI Config Space, PCI Segment Groups, MSI */ + cap_set[PCI_OSC_SUPPORT] = PCIM_OSC_SUPPORT_EXT_PCI_CONF | + PCIM_OSC_SUPPORT_SEG_GROUP | PCIM_OSC_SUPPORT_MSI; + /* Active State Power Management, Clock Power Management Capability */ + if (pci_enable_aspm) + cap_set[PCI_OSC_SUPPORT] |= PCIM_OSC_SUPPORT_ASPM | + PCIM_OSC_SUPPORT_CPMC; + + /* Control Field */ + cap_set[PCI_OSC_CTL] = *ap_osc_ctl | osc_ctl; + + handle = acpi_get_handle(pcib); + status = acpi_EvaluateOSC(handle, pci_host_bridge_uuid, 1, + nitems(cap_set), cap_set, cap_set, false); + if (ACPI_FAILURE(status)) { + if (status == AE_NOT_FOUND) { + *ap_osc_ctl |= osc_ctl; + return (0); + } + device_printf(pcib, "_OSC failed: %s\n", + AcpiFormatException(status)); + return (EIO); + } + + /* + * _OSC may return an error in the status word, but will + * update the control mask always. _OSC should not revoke + * previously-granted controls. + */ + if ((cap_set[PCI_OSC_CTL] & *ap_osc_ctl) != *ap_osc_ctl) + device_printf(pcib, "_OSC revoked %#x\n", + (cap_set[PCI_OSC_CTL] & *ap_osc_ctl) ^ *ap_osc_ctl); + *ap_osc_ctl = cap_set[PCI_OSC_CTL]; + if ((*ap_osc_ctl & osc_ctl) != osc_ctl) + return (EIO); + + return (0); +} diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index bd005aed8fdc..e4cff4639a93 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -286,62 +286,6 @@ get_decoded_bus_range(struct acpi_hpcib_softc *sc, rman_res_t *startp, return (true); } -static int -acpi_pcib_osc(struct acpi_hpcib_softc *sc, uint32_t osc_ctl) -{ - ACPI_STATUS status; - uint32_t cap_set[3]; - - static uint8_t pci_host_bridge_uuid[ACPI_UUID_LENGTH] = { - 0x5b, 0x4d, 0xdb, 0x33, 0xf7, 0x1f, 0x1c, 0x40, - 0x96, 0x57, 0x74, 0x41, 0xc0, 0x3d, 0xd7, 0x66 - }; - - /* - * Don't invoke _OSC if a control is already granted. - * However, always invoke _OSC during attach when 0 is passed. - */ - if (osc_ctl != 0 && (sc->ap_osc_ctl & osc_ctl) == osc_ctl) - return (0); - - /* Support Field: Extended PCI Config Space, PCI Segment Groups, MSI */ - cap_set[PCI_OSC_SUPPORT] = PCIM_OSC_SUPPORT_EXT_PCI_CONF | - PCIM_OSC_SUPPORT_SEG_GROUP | PCIM_OSC_SUPPORT_MSI; - /* Active State Power Management, Clock Power Management Capability */ - if (pci_enable_aspm) - cap_set[PCI_OSC_SUPPORT] |= PCIM_OSC_SUPPORT_ASPM | - PCIM_OSC_SUPPORT_CPMC; - - /* Control Field */ - cap_set[PCI_OSC_CTL] = sc->ap_osc_ctl | osc_ctl; - - status = acpi_EvaluateOSC(sc->ap_handle, pci_host_bridge_uuid, 1, - nitems(cap_set), cap_set, cap_set, false); - if (ACPI_FAILURE(status)) { - if (status == AE_NOT_FOUND) { - sc->ap_osc_ctl |= osc_ctl; - return (0); - } - device_printf(sc->ap_dev, "_OSC failed: %s\n", - AcpiFormatException(status)); - return (EIO); - } - - /* - * _OSC may return an error in the status word, but will - * update the control mask always. _OSC should not revoke - * previously-granted controls. - */ - if ((cap_set[PCI_OSC_CTL] & sc->ap_osc_ctl) != sc->ap_osc_ctl) - device_printf(sc->ap_dev, "_OSC revoked %#x\n", - (cap_set[PCI_OSC_CTL] & sc->ap_osc_ctl) ^ sc->ap_osc_ctl); - sc->ap_osc_ctl = cap_set[PCI_OSC_CTL]; - if ((sc->ap_osc_ctl & osc_ctl) != osc_ctl) - return (EIO); - - return (0); -} - static int acpi_pcib_acpi_attach(device_t dev) { @@ -367,7 +311,7 @@ acpi_pcib_acpi_attach(device_t dev) if (!acpi_DeviceIsPresent(dev)) return (ENXIO); - acpi_pcib_osc(sc, 0); + acpi_pcib_osc(dev, &sc->ap_osc_ctl, 0); /* * Get our segment number by evaluating _SEG. @@ -759,7 +703,7 @@ acpi_pcib_request_feature(device_t pcib, device_t dev, enum pci_feature feature) return (EINVAL); } - return (acpi_pcib_osc(sc, osc_ctl)); + return (acpi_pcib_osc(dev, &sc->ap_osc_ctl, osc_ctl)); } static bus_dma_tag_t diff --git a/sys/dev/acpica/acpi_pcibvar.h b/sys/dev/acpica/acpi_pcibvar.h index 2b75c276f9d1..c763eeea1941 100644 --- a/sys/dev/acpica/acpi_pcibvar.h +++ b/sys/dev/acpica/acpi_pcibvar.h @@ -40,6 +40,7 @@ int acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, ACPI_BUFFER *prtbuf); int acpi_pcib_power_for_sleep(device_t pcib, device_t dev, int *pstate); +int acpi_pcib_osc(device_t pcib, uint32_t *ap_osc_ctl, uint32_t osc_ctl); #endif /* _KERNEL */ From nobody Thu Dec 12 18:19:02 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMW2Q0Bz5gZnH; Thu, 12 Dec 2024 18:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8LMW0LmWz3xDw; Thu, 12 Dec 2024 18:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewKvno5+GgvbJSABk+ZgLfX73wIeha7cYJU79GKLRgI=; b=f0YfZQCtEVAActndtQXYAUB5Cop8fHDnjvPqzw3BAlfQcvkHy6esGGbabarCVoWIJzsQCt NU3zcsIE0zoQ01fu8UtgdvykRWw0wDJTLTv7ojlEvgU7cCAnHqZCPlO95thmTzdK0+pu2M AFq4iIV1OExMxvCegtIvRT7HzFl+WJCdHFmtbSH82phSKYDqpX+8HHsUZ5L27aJYdKXY92 FKgnA6sv7vatcaWgOn9k7Qxt6hU3Oy7SFCqwIDe/DQ3nXtJmt2995X0JLF9Vcae9IaREv9 FxATbRZVXTD9krFwCGT7cbUNz/qx4D19C0qOrAlZX6u9fjBfCT6iMiddjB6aiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewKvno5+GgvbJSABk+ZgLfX73wIeha7cYJU79GKLRgI=; b=J1t48lem97GhXpnq1ngJWLv5ehAits67McuNRn9/SlcJ7ZIhFrisJuxf402axE7ava915U G2F/aWxjhpu/RjcRzJCII4B1zTVnflWBODv1tMupCsk4ojOLbTK6atcKqJdQlWict0hBdn u7M0w5zPRElSO6svBMMeEyen5tMuZFG7rvjeAklm2848JoQJjrBcY6DYxpr/7LbUrzYHAX cKvxMhNJPOqr6UpTzsm4x89qCvmW/eEWWSq0ZSY9FrmTD9UbKAZAs13PWcMKod7HktK3HF w7ltYD9Xj1QlBOKtlLmEeABAolz/MsOhSspkIZLzu6WhAQtFe+b6QL3aEyHXtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027543; a=rsa-sha256; cv=none; b=WeSmFkx9jlI/638cm1OJQ9kIZbYuECgs3C4QGnD1wrzttuAkVLXWlleByw0dyIaQr6DTVW nNMViCYbFdgcYC4nj9/ilSyb/x7/V9IWJfxYb2MTh8290ZLuiggjfR25K9fqnPQjLDruSt fozAfUXCaidTZ9e/pC20UUJGMszCuQlJKHFrIBeZzHs/+BArfF82q7W0Su1MtG8NiyqrtN xXjs96mNsjPsyqO5HxvbvJ//ozFHbj8jNgT1YSAlrBZK2hFq4Qt9q69Zj3fD2XJ0XDbHFA 7Bf66r9Uuq2HRsv+4w8Uk2hi9CmFLJlpkPACXCHewDFR3ipX50NhXMbR9rogVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMV6zY3z13Z4; Thu, 12 Dec 2024 18:19:02 +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 4BCIJ2LB097244; Thu, 12 Dec 2024 18:19:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIJ2fN097241; Thu, 12 Dec 2024 18:19:02 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:19:02 GMT Message-Id: <202412121819.4BCIJ2fN097241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: fafb43abd0dc - main - pci: Use a switch statement when reading ivars List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fafb43abd0dcaf2d36ec7344f46e7e19c42be888 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fafb43abd0dcaf2d36ec7344f46e7e19c42be888 commit fafb43abd0dcaf2d36ec7344f46e7e19c42be888 Author: Andrew Turner AuthorDate: 2024-12-12 16:30:02 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:23 +0000 pci: Use a switch statement when reading ivars In pci_host_generic.c use a switch statement rather than a series of if statements. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48045 --- sys/dev/pci/pci_host_generic.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index b47a90348388..e9a9e99b4b17 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -369,13 +369,11 @@ generic_pcie_read_ivar(device_t dev, device_t child, int index, struct generic_pcie_core_softc *sc; sc = device_get_softc(dev); - - if (index == PCIB_IVAR_BUS) { + switch (index) { + case PCIB_IVAR_BUS: *result = sc->bus_start; return (0); - } - - if (index == PCIB_IVAR_DOMAIN) { + case PCIB_IVAR_DOMAIN: *result = sc->ecam; return (0); } From nobody Thu Dec 12 18:19:03 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMX4Lc5z5gZy7; Thu, 12 Dec 2024 18:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8LMX10Zbz3xPm; Thu, 12 Dec 2024 18:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hg15G/C8SabPlMYhqHiM4q7FSVtRrWbyb5gRKEhtYRQ=; b=HQKR8bKmQfk36eauoOss8J7UzPv9bFoe2wsbvifLm/FUabXsxCSB+GOLSHzrXe2ulQD4WK 0FNFaLo+juUR2Mm0AxHenwvNg+SieHMTobfmmFwYTGqUGdeA4EHJqNAk8QVGIGx/LZbCw/ sfgioKlUH6OKMgRgfw7i9PRau8RQA8bucBthrhmYG9O88wtI4WeoyuxdAxbuvhzk75mvER E0h5WHlieK0f9PzpZ2Pp08qC0cUVW46pnyMy5sHByDYO6D+iVlz+UE45wS9Zndrx4I4ybn ntKMn0Czs/XbF0j59v09uL999ELE/nvIKCJ7x7R5uohZqtgp8ZjgLc/xORGEjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hg15G/C8SabPlMYhqHiM4q7FSVtRrWbyb5gRKEhtYRQ=; b=TBuXdwFeFJlOBkM+DNsch0jOOYLiAkd7aogozAAWWqjiuzDn/9FkM+fQl90L31ssyyBa3C KwdS+BBbplQcfHAPDUotVIo08OQGJa1ORasZ8MyISmDL9lotkG0Mi9WqHRHhRk7y4BsiDI oyQWvREhmRS7s4UvbsTUZmnk/Z4UdNJRgqZsuiBm8Dac5onnKAAt/BDxDXaowH2IYP4xaQ 57PK8dEw1rC6CKyoKpiZOdcpaF1BYwxZ9PWyc43I4IXDEsBfTVkW7n4c0+3iZiwZDBUnO6 I3iDJ1MQRCttkwbCoSoTnDcRN1nnKp2dfgOrObf1P0eH3HclkGsaDAVg0JB1kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027544; a=rsa-sha256; cv=none; b=LM4a7AsgQjrYOGwO++OC+H4T10cr7xSgqPjqjGfcjf4NSJByC2SSKsXcw56Q4rrEmeDnVJ 9YYjRa1KMLkLYV20F9EyHYAJm67acBa1edhD0nY+x7IP0ay7UJ/fEx6ZKhh5MdGgUs1oQn 6YLkgbWOKzEb6tgUe1jGLbg/vswIACrRbX6EfhaYLL7QDFq54ecHZrpRmGQ2KBynBVhQ/b LJJE1ZPCS5aKD2ERFocg5NgZw9d5Qqo6AzLGEKBGLY9j1FMWt/kacKrb76mIv/LMf/uXgg 4cf147q1JiQ5nlwsl/9q3nbAz9Xx5JOY/SLuuZK6oPoZhqPEzAWNhsM9nHTVrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMX0cZHz13Lx; Thu, 12 Dec 2024 18:19: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 4BCIJ3uH097286; Thu, 12 Dec 2024 18:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIJ3EP097283; Thu, 12 Dec 2024 18:19:03 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:19:03 GMT Message-Id: <202412121819.4BCIJ3EP097283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 7cafe75c8c52 - main - pci: Make generic_pcie_read_ivar non static List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cafe75c8c52deffcb3e64200eb4187a52cf202d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7cafe75c8c52deffcb3e64200eb4187a52cf202d commit 7cafe75c8c52deffcb3e64200eb4187a52cf202d Author: Andrew Turner AuthorDate: 2024-12-12 16:30:16 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:23 +0000 pci: Make generic_pcie_read_ivar non static Allow this to be called from attachments to allow more ivars to be implemented. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48046 --- sys/dev/pci/pci_host_generic.c | 4 +--- sys/dev/pci/pci_host_generic.h | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index e9a9e99b4b17..373a54a25a4d 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -67,8 +67,6 @@ static uint32_t generic_pcie_read_config(device_t dev, u_int bus, u_int slot, static void generic_pcie_write_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, uint32_t val, int bytes); static int generic_pcie_maxslots(device_t dev); -static int generic_pcie_read_ivar(device_t dev, device_t child, int index, - uintptr_t *result); static int generic_pcie_write_ivar(device_t dev, device_t child, int index, uintptr_t value); @@ -362,7 +360,7 @@ generic_pcie_maxslots(device_t dev) return (31); /* max slots per bus acc. to standard */ } -static int +int generic_pcie_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) { diff --git a/sys/dev/pci/pci_host_generic.h b/sys/dev/pci/pci_host_generic.h index 688345e92db5..7aa8852fd30a 100644 --- a/sys/dev/pci/pci_host_generic.h +++ b/sys/dev/pci/pci_host_generic.h @@ -97,5 +97,6 @@ struct resource *pci_host_generic_core_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); int pci_host_generic_core_release_resource(device_t, device_t, struct resource *); +int generic_pcie_read_ivar(device_t, device_t, int, uintptr_t *); #endif /* __PCI_HOST_GENERIC_H_ */ From nobody Thu Dec 12 18:19:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMY596Kz5gZfp; Thu, 12 Dec 2024 18:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8LMY1pGtz3xHT; Thu, 12 Dec 2024 18:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7uYapxSxjB2xu+sJzOLN82kEIulLD2vePjaZzSvAws=; b=C7tBr7QCsqrc9ARKsdiTJGXCnwwYGKraL5ARIC0uylSyxzDXGr6X4IUSzOnRYudmpULFl4 5Cn0h2PEuOC6jAWlktqFXxR97pcOc6jZf9jmp+YSRYcyF+zUKY3hBZV5AQqFkW2ldWbD1v OKnrs0NKuDXgXvcdRtGHzBGiiYs2+x6Z/b2BQWyQComSZEHU6RhXW91spRdk6SCthQ851J wVFdafeJa9+3KjQHS/X7armxhXSFhz3hXSC6xZesk29SuaaDGnB8xMH83n+iEJc2pFENni NSMVqv+Ol1dz9nkmG4yE0McWI7HzJjwNC0S0NDlm7ZhJXSjnnuDjw5kZDeSdtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7uYapxSxjB2xu+sJzOLN82kEIulLD2vePjaZzSvAws=; b=do78vJXFquvfZ9/fzH2bPeO/sq5X5iZNDh2gfJUOco5htXkyPdSAUdcnDXjCQnNKTeRsNi O2GHLxbz9X4Zv4Oz7tQc5cWLEM9N/LYOmLWnYF5MUUgj2sL6E0/XYMrvXQ81tti1PoF9SM sEUuQYnACT4XJH0R3bb4m9ostYpWg8subMTF3m1UpBjBNR6TFdDoE74Txu9clGcxJvtchZ ejoMVpR5eJ/Ps8c0dgA7GdZQfr1botCfiFvsK6w9vfMTnCU8Eioxugn1oUtaag8OlHN65n QVrG0TANL6GnIbYU8MvLjFXMX7uxU/TyySj82ba1qNJeLl13JCKehiRRT6panw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027545; a=rsa-sha256; cv=none; b=uJuyaX04npzwt+9QxKeyz7tH2BQ40D9pIbwFjOxTK40d+t2yFYzLrNWYB79HqoLepNZsEz 5aLwa+FAiH4TPmGCXdRQKjcVbjGJIQxPnl4hFH+1lS3fudoCC5VmspS1USDh458s7Vf0I6 KayQVRBgeqP+X4W+pegNrqpUFfIsoJlgWq/znDcKbc4dkBqjSnay0JGvmBjqwatxkXGOij o6svtQ0pPmwMvrtBGWkK4Q4mXxd8m1XxUBpZnkN5Yy09X0Lfofzot49OxpWm++vpOOkA25 yn6S1FKxoGWEAY0mkoloZdosYkE4rnVyV02sPm0AUqfgXBMl4luBaauwgITQAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMY1M4Zz133R; Thu, 12 Dec 2024 18:19:05 +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 4BCIJ5K4097322; Thu, 12 Dec 2024 18:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIJ5VB097319; Thu, 12 Dec 2024 18:19:05 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:19:05 GMT Message-Id: <202412121819.4BCIJ5VB097319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: deb36d0c6543 - main - pci_host_generic: Support ACPI_IVAR_HANDLE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: deb36d0c65436d16b04f99cc2a27bd0f3980a6f0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=deb36d0c65436d16b04f99cc2a27bd0f3980a6f0 commit deb36d0c65436d16b04f99cc2a27bd0f3980a6f0 Author: Andrew Turner AuthorDate: 2024-12-12 16:30:28 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:23 +0000 pci_host_generic: Support ACPI_IVAR_HANDLE In the ACPI attachment support the ACPI_IVAR_HANDLE ivar. While here use the common ivar function to support the common ivars. Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48047 --- sys/dev/pci/pci_host_generic_acpi.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_generic_acpi.c index 770060e7f46f..d90b7c0c01f8 100644 --- a/sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/pci_host_generic_acpi.c @@ -344,23 +344,16 @@ static int generic_pcie_acpi_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) { - struct generic_pcie_acpi_softc *sc; - - sc = device_get_softc(dev); - - if (index == PCIB_IVAR_BUS) { - *result = sc->base.bus_start; - return (0); - } + ACPI_HANDLE handle; - if (index == PCIB_IVAR_DOMAIN) { - *result = sc->base.ecam; + switch (index) { + case ACPI_IVAR_HANDLE: + handle = acpi_get_handle(dev); + *result = (uintptr_t)handle; return (0); } - if (bootverbose) - device_printf(dev, "ERROR: Unknown index %d.\n", index); - return (ENOENT); + return (generic_pcie_read_ivar(dev, child, index, result)); } static int From nobody Thu Dec 12 18:19:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMZ4mj7z5gZnN; Thu, 12 Dec 2024 18:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8LMZ2jqwz3xdj; Thu, 12 Dec 2024 18:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7YHN3DJozd5yXSlkxP7Tz63yq7F1UlPOoKBzlZfccCQ=; b=Bl6zgKFtMqjGn0pU4TPMf2rj5UQi1wbFweu7LlPoud1BxQPnRPwVUb4a8hdArYNatRSJ0L VGHeCYrJJqYxsIK7tz+kqksso+PSxc0uCqul1a9IukOh2jBVhgcC4YXHe7+FUEdbyGaVdv DJpuBiHsrhFbf1Jt3LjT/0bbbeAZPesIPBAxGZMW4FvF9bKAO+dAlBIu2dDFJb0/l5ZIxE 4MzGYALgSW0THvsHqulgRa3joMxICN0xEm8TUEDFqMnMZctWzlWJhGhVlzjC8qFUdFgZzc vXu3nex6uZF3ZvI1of+7Aaf1UcFqw84kUxPtrFYln7TLNbbsJHGn+l8HsCog+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7YHN3DJozd5yXSlkxP7Tz63yq7F1UlPOoKBzlZfccCQ=; b=Y4RsAIc2+q32G65ynY8zeq/CT5sdVsV6I6weAX/aKV1j1uaMc02B7BMbM4ZSc/dCIwLAdc 0Z/WnSXCflpLK/KyJu6k16SL3E6Fxi81t2+u+XxXYc+yHRD80tTOVqAzE+A5QjuV13a7P9 kQBp9BleVqNZws9cgNjKsfLU0U3NR4KQJfhz3D4Ez3UwhJNIwi9i4De4WlbMuIaV8si8FH xZ+30/MquaTvfBJJs3+lNB/l6EyEJD2+kAIdMLZSH6gNJ11+dLbUVI23/W94rz87d6YG/O oFFrp6nZQqgQaky42Ot0MNCfhsm8g8/sQM29gCxtu2CX3xFKVzYi5EtwcbFqEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027546; a=rsa-sha256; cv=none; b=h1yhZv5swisgviOd8BsYDqiDa/fLCBN0TqSR7E+V9SWG2SuFt3B09d/oo8WnL3I8hrqRZA N3fa3r/EwZTl6bb5KONQCPvRuVHUvKWArfHIaf+98XoYEKhDjLOBA3txocJVDyJNbp/pxv RKiu4kBLFLM1whY+tw6j4Ydo5rtevZLQmzXdqIwC3B9C7RThNr3nxKUuVbl+CCtBZyiBri +A9U/20BGcydjQ9ff6vYBw0/kckLDK7dmqcNd1BMjuDv6hMjFj3ADiXRCxPMJ1cMdTmcij RJGwFJdQUaxvV33NRibcE1ZLKhk5h6jGAFlLEEAItngvmS1VmMVjyK9NnAW2Mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMZ280jz133S; Thu, 12 Dec 2024 18:19:06 +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 4BCIJ6Ir097367; Thu, 12 Dec 2024 18:19:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIJ6fq097364; Thu, 12 Dec 2024 18:19:06 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:19:06 GMT Message-Id: <202412121819.4BCIJ6fq097364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 1f5c50a86173 - main - pci_host_generic:Add pcib_request_feature on ACPI List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f5c50a8617355758510675cb9412f56fed12efc Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1f5c50a8617355758510675cb9412f56fed12efc commit 1f5c50a8617355758510675cb9412f56fed12efc Author: Andrew Turner AuthorDate: 2024-12-12 16:30:39 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:23 +0000 pci_host_generic:Add pcib_request_feature on ACPI In the ACPI attachment add support for the pcib_request_feature method. This uses the common _OSC handling. Reviewed by: imp, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48048 --- sys/dev/pci/pci_host_generic_acpi.c | 27 +++++++++++++++++++++++++++ sys/dev/pci/pci_host_generic_acpi.h | 1 + 2 files changed, 28 insertions(+) diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_generic_acpi.c index d90b7c0c01f8..1ff3a6bda707 100644 --- a/sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/pci_host_generic_acpi.c @@ -287,6 +287,8 @@ pci_host_generic_acpi_init(device_t dev) sc = device_get_softc(dev); handle = acpi_get_handle(dev); + acpi_pcib_osc(dev, &sc->osc_ctl, 0); + /* Get Start bus number for the PCI host bus is from _BBN method */ status = acpi_GetInteger(handle, "_BBN", &sc->base.bus_start); if (ACPI_FAILURE(status)) { @@ -504,6 +506,30 @@ generic_pcie_acpi_get_id(device_t pci, device_t child, enum pci_id_type type, return (pcib_get_id(pci, child, type, id)); } +static int +generic_pcie_acpi_request_feature(device_t pcib, device_t dev, + enum pci_feature feature) +{ + struct generic_pcie_acpi_softc *sc; + uint32_t osc_ctl; + + sc = device_get_softc(pcib); + + switch (feature) { + case PCI_FEATURE_HP: + osc_ctl = PCIM_OSC_CTL_PCIE_HP; + break; + case PCI_FEATURE_AER: + osc_ctl = PCIM_OSC_CTL_PCIE_AER; + break; + default: + return (EINVAL); + } + + return (acpi_pcib_osc(pcib, &sc->osc_ctl, osc_ctl)); +} + + static device_method_t generic_pcie_acpi_methods[] = { DEVMETHOD(device_probe, generic_pcie_acpi_probe), DEVMETHOD(device_attach, pci_host_generic_acpi_attach), @@ -517,6 +543,7 @@ static device_method_t generic_pcie_acpi_methods[] = { DEVMETHOD(pcib_release_msix, generic_pcie_acpi_release_msix), DEVMETHOD(pcib_map_msi, generic_pcie_acpi_map_msi), DEVMETHOD(pcib_get_id, generic_pcie_acpi_get_id), + DEVMETHOD(pcib_request_feature, generic_pcie_acpi_request_feature), DEVMETHOD_END }; diff --git a/sys/dev/pci/pci_host_generic_acpi.h b/sys/dev/pci/pci_host_generic_acpi.h index 802099abb9d7..5617da971306 100644 --- a/sys/dev/pci/pci_host_generic_acpi.h +++ b/sys/dev/pci/pci_host_generic_acpi.h @@ -35,6 +35,7 @@ struct generic_pcie_acpi_softc { struct generic_pcie_core_softc base; int segment; + uint32_t osc_ctl; ACPI_BUFFER ap_prt; /* interrupt routing table */ }; From nobody Thu Dec 12 18:19:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8LMc0Fy7z5gZfs; Thu, 12 Dec 2024 18:19: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 4Y8LMb3xS4z3xf2; Thu, 12 Dec 2024 18:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4CJqSn8UHB+x+92q0WnnmkKTirmYsn+huQK755tOUd0=; b=GFSp0xKKQWtlXy5kSbJu1Ps3LVMKgiq1uW3YSwlZsz9NLkYC5rqDaNJp+VamFLTT3E+bxO 9YIL8D3Xf2WY45Sx0rXa8ScaRxs0K9uVpeExtpp236Rwde7m0DO0Ar3e8sGf9qTvtk1fx2 taLXgFFETdtN6wxDCsEXvBETrajJxzjCqJVd/3GXT/5nPs2FeloK8I/2KxiA5ck2v/vpCG vRWED4GPWgpAtGOK1jeHbBQJHcmKoODaIMe+aPFqjA0lEa19knD4BNj85stxT1hiqynk4I CxjjjfcfzR40rgDwpSswa4EQu6M6R2/f9+qTS+rmCWoVcbvge5KEDBXzTuKtFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734027547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4CJqSn8UHB+x+92q0WnnmkKTirmYsn+huQK755tOUd0=; b=OuPF04cvCYl0BrivbQohea7kaBBr9aJw9+0y62PN+Ft1Hj2Az5wgprenr4AjEmeuVfpgb0 drQJ0TI5fwzIrobCtaH+KgXV9/cWpZwUUFakCbnPy8KTv+nSo+bXjj4Wb5MbIxo3sVcXhd GWVNshXlF/RO5Zxdy6dBildejhwtYqdDa0ruAdZAnL2ZD9G7PZ80Yy0Ra+eUuQXJN8ho5L 9A9JgQP1aUBQ/HQ91si5Z8Cx7piIqmLUZGk3aAtm7zn3vVrGXUg6BuFtrBif52qeIN7JUu +hT6KdIuBH1ZmawPZAHfnh5N27NuptX28gI+J9lizEEnLnZ96QeB9D3aeRotYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734027547; a=rsa-sha256; cv=none; b=JzOTZdYrMC3s4HXQc/K+bfC7kJCvxuGpC3ZhrJjduSoaGn4xNCfxdRnOtLWhYGr+KRQxaw hEbhZLdNNGXMPcYyfcpl5MWsqaDN1iol27FIRSbwnVit8rHzvFwUy5m9NuhUSY0TbyhWxr WCxaFT8PUf+uHQdKtAiJBoWLrT1qabhZk2MPcoHPUMF7MJ0OMmhigdJ9cz/7Q4EM+/Zj+O SgMsD8Y5TqmChly3C/63cMCnrcKSZkaLwUJeuKRUS8PxRYIxcfSfRLJQilfXDskfOrZWER xgiZnqTBYHHkMMVZ2s8+IcmGNAlxlWv/d55+PKeKizAH5zH7BBRQE+xsS+9oxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8LMb3W6Kz13Z5; Thu, 12 Dec 2024 18:19: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 4BCIJ7hn097415; Thu, 12 Dec 2024 18:19:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCIJ7Hd097412; Thu, 12 Dec 2024 18:19:07 GMT (envelope-from git) Date: Thu, 12 Dec 2024 18:19:07 GMT Message-Id: <202412121819.4BCIJ7Hd097412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 38cb1ba8637d - main - conf: Add acpi_pci.c to the arm64 build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38cb1ba8637d08ce3f6b3c614f39698db153cd4d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=38cb1ba8637d08ce3f6b3c614f39698db153cd4d commit 38cb1ba8637d08ce3f6b3c614f39698db153cd4d Author: Andrew Turner AuthorDate: 2024-12-12 16:30:50 +0000 Commit: Andrew Turner CommitDate: 2024-12-12 18:00:56 +0000 conf: Add acpi_pci.c to the arm64 build Reviewed by: jhb, emaste, cperciva Relnotes: yes (Support PCIe hotplug on arm64) Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48049 --- sys/conf/files.arm64 | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index a1e73e593a99..3846301977d1 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -188,6 +188,7 @@ crypto/openssl/aarch64/vpaes-armv8.S optional ossl \ dev/acpica/acpi_bus_if.m optional acpi dev/acpica/acpi_if.m optional acpi +dev/acpica/acpi_pci.c optional acpi pci dev/acpica/acpi_pci_link.c optional acpi pci dev/acpica/acpi_pcib.c optional acpi pci dev/acpica/acpi_pxm.c optional acpi From nobody Fri Dec 13 13:06:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8qNY4j68z5gYPg; Fri, 13 Dec 2024 13:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8qNY49MVz4VJ2; Fri, 13 Dec 2024 13:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734095197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yEKTrl3i+7c5ZsSC1Cb02N6EGEGZTRk6y+2jIpFJdY=; b=OQwkkYU1s66sYdh3mdN1P5bTAtCRgEosdtb4J/XoYLXAE0nRksY1VrHy66586BUEEsErgV sOa7v9sUERs0PrVs3v6raCxj4K47f4+PK0BP0rAkhHZG0XDrubQIafL7fiAbHTpEBKYo0M WqAn20crhb78gMndYAY3L3m9OXVkZeuqvhd2moqm+7i8792DyqTPew823cq2tYDyyr7TEi fqPqahGyRrVL5u12SG901vS2tPwFvNwk8aA1JsNYMgl+kD3LmvxhCZrnHC62kyRJeC91SE 4Y7mHIvRLYRQHx8IeU8MmiAiqudaWLboQSQz41ZHj3xrWT/eAFZpj/tlOOGw/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734095197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yEKTrl3i+7c5ZsSC1Cb02N6EGEGZTRk6y+2jIpFJdY=; b=rgDDli4jbAy1DkK1sMl11D2hZMTpOx1v3oqyDxVcm/lMa/Man8mfN2UosL9qTnPqj9lDIq 0sVjLaZWnuOyW0vN/GHBtNazlrnX1w12uGA2Oe0SpW2mqltW+3Cr4AZ88P6fuvoHfyaP+3 9r91qz98ZJz0P8iZ/PKQJiePzgnHkqSz0gsnm+I7wks3QVD0zk7DbklMuArCWKBzmJPVFN sI8YDtVQewBQtfp/ADDr7CnTqNblAeVdImXFOWNAu4cvn/HhBebOxh+k+XbUpeEiQRHZFA i+Qm1+Amx0e11XtBVD89rMMe/MvSqkK6sd6lYR+fm6jMwVLEcViPJFX+cjRbXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734095197; a=rsa-sha256; cv=none; b=KL0o598n59nWohxFZXT6VCrMpkojYNEcjivYCYNyNyuKxEIH380r85YrhSLf1O4IfcisiP iJ2/BMFfkw14+596WNZBI7BnXHOHgemeqYj9Ez9Ft8d6Rgi3zZM6KkHkgZPxCyurIggscQ O4B5LP9JAZO0q6MrF7BdWrQEO0QuRTgfZ3xDQU6xfGieZmdm4sNMMvKEnfQVyFgsdykCA9 y0oa1KMrTCMhwUWU47lyijPwC6zQ3JBtxb5jJ0ycUBSfZDJSv4INhtztiYUALS9h6/b+ZN Yzh+85Focoff3cygKgCLmD8DualQbYLhgVfcEN96Eap7u6szJhuiGxAb1bokLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8qNY3fhTzf9N; Fri, 13 Dec 2024 13:06:37 +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 4BDD6b2X011256; Fri, 13 Dec 2024 13:06:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDD6bxu011253; Fri, 13 Dec 2024 13:06:37 GMT (envelope-from git) Date: Fri, 13 Dec 2024 13:06:37 GMT Message-Id: <202412131306.4BDD6bxu011253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a1097094c4c5 - main - newvers: Set explicit git revision length List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1097094c4c5d810287aca092f4ab5f9f86a426a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a1097094c4c5d810287aca092f4ab5f9f86a426a commit a1097094c4c5d810287aca092f4ab5f9f86a426a Author: Pat Maddox AuthorDate: 2024-12-13 05:28:18 +0000 Commit: Ed Maste CommitDate: 2024-12-13 13:06:10 +0000 newvers: Set explicit git revision length The --short flag is configurable. Setting an explicit length supports reproducible builds. Signed-off-by: Pat Maddox Reviewed by: emaste, imp Differential revision: https://github.com/freebsd/freebsd-src/pull/1547 --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 481af5480399..6e5f0716c90d 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -255,7 +255,7 @@ if [ -n "$svnversion" ] ; then fi if [ -n "$git_cmd" ] ; then - git=$($git_cmd rev-parse --verify --short HEAD 2>/dev/null) + git=$($git_cmd rev-parse --verify --short=12 HEAD 2>/dev/null) if [ "$($git_cmd rev-parse --is-shallow-repository)" = false ] ; then git_cnt=$($git_cmd rev-list --first-parent --count HEAD 2>/dev/null) if [ -n "$git_cnt" ] ; then From nobody Fri Dec 13 14:05:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8rj326s9z5gcSr; Fri, 13 Dec 2024 14:05: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 4Y8rj31c5hz4fQ4; Fri, 13 Dec 2024 14:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734098759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1R+Zhljuqsi/cs6tivHCJlFnQKzflRL8K81Z/f8jyI=; b=DTy9elAXHCy8MqA61h16br/r4X767ZyvT38OLItuSKBApEkOoAVq6AqxqcZ9FjhO2GPedD ls0psiZ1Mc1Vrok7XtEnNIAsL+yHZ55cX8k56aD3sxugKXbMG3cUs2lh7T5o2OTD74tN3g Nfy+zY/iqefYGvl7AOoZxIXopHeOpGwMNESKrMcYX5HHMKvdov16nJRekgW4tMISgaPD1a +RMG+4GxA+1glTMILEz+GsT7SbIOLgMQ6+trsudZAdPuac7cN1EdMCJyO9vFOK3o6VqDH9 yPlbFRcIUGILjHc6aOfJdC8bgvulHNjGBQzvRwVzbCnLAND2/1H2t+DVgpvi+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734098759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1R+Zhljuqsi/cs6tivHCJlFnQKzflRL8K81Z/f8jyI=; b=MeL4csbZ/W+qb98bRKcW9JZXSedvlhzruAe19p2pFHU43M07SCydDj95idkoRGoFdaMngG O0juHCFLXJjv0u0B8KF2ZyVggi1HNXU/3brxDhK93fEA4/jGLf+ITRDGHYB84jWP2WDLGO MBBrIIyM33zcsJiWS4rEE1oO3rCtPcVBNTdFppf+JcQ5SUbhH31cogFW0+CW3bm9hm8P+n 7AsgGcFGBa0IKukMpPeYKXn8r/lixJ9Tr8OUOq+V8jk6hugq2mip6EzueALYNciG/JB0Go lzdaCkykS02ttq/uJqKckL4snUV1Hh9X1/ejHgDplZatj2Hm+zufC+tupvYkXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734098759; a=rsa-sha256; cv=none; b=LDXRvQbgkAYRILOx1S2Z4c4FNBulUdg0pN2A98kWKxTegYDP11CShlVy1CxvbmIMQmDCXp OPhjY56k8lvvaOvWihgwWU/vxt4GWm9rwzOSK7iZFMmsRRQ871NSgRgm9O0tVQzVz+AHlS kAv1oDhdkhuDM7RTw1bTOKbd4BTt9gJIbSbRV0RrwmqT9Rb7R7PIdnYH5YnfxBCBpDpJo1 Owp7XWocArp9WfOCOActzmfJ7q+05VD5V0g9UinoLaaZBq6kXKCcO3TE6kyVx5yAGuzG7D rA9RFrBfhEqPNTSEqwzI3/ZjyhvrSljUk2yI5Y+NBUah7DAG2bK53DE0pAR7Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8rj31BpHzh1q; Fri, 13 Dec 2024 14:05: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 4BDE5xg1023259; Fri, 13 Dec 2024 14:05:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDE5x1K023256; Fri, 13 Dec 2024 14:05:59 GMT (envelope-from git) Date: Fri, 13 Dec 2024 14:05:59 GMT Message-Id: <202412131405.4BDE5x1K023256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: cf0ede720391 - main - tarfs: 'struct tarfs_fid': Switch 'gen' to 'u_int', avoid packing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf0ede720391de986e350f23229da21c13bc7e9d Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=cf0ede720391de986e350f23229da21c13bc7e9d commit cf0ede720391de986e350f23229da21c13bc7e9d Author: Olivier Certner AuthorDate: 2024-12-06 16:35:08 +0000 Commit: Olivier Certner CommitDate: 2024-12-13 14:04:42 +0000 tarfs: 'struct tarfs_fid': Switch 'gen' to 'u_int', avoid packing As the 'gen' field in 'struct tarfs_node' (and then 'struct tarfs_fid') is filled with arc4random() which returns an unsigned int, change its type in both structures. This allows reordering fields in 'struct tarfs_fid' to reduce its size, finally avoiding the use of '__packed' to ensure it fits into 'struct fid'. While here, remove the 'data0' field which wasn't necessary from the start. Reviewed by: markj, rmacklem, des Approved by: markj (mentor) MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D47954 --- sys/fs/tarfs/tarfs.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/fs/tarfs/tarfs.h b/sys/fs/tarfs/tarfs.h index ffb95d2c0ac5..46fa8b55b3ad 100644 --- a/sys/fs/tarfs/tarfs.h +++ b/sys/fs/tarfs/tarfs.h @@ -74,7 +74,7 @@ struct tarfs_node { struct timespec mtime; struct timespec ctime; struct timespec birthtime; - unsigned long gen; + uint32_t gen; /* Block map */ size_t nblk; @@ -161,11 +161,10 @@ struct tarfs_zio { }; struct tarfs_fid { - u_short len; /* length of data in bytes */ - u_short data0; /* force alignment */ - ino_t ino; - unsigned long gen; -} __packed; + u_short len; /* length of data in bytes */ + uint32_t gen; + ino_t ino; +}; #define TARFS_NODE_LOCK(tnp) \ mtx_lock(&(tnp)->lock) From nobody Fri Dec 13 14:06:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8rj45Hsqz5gcSs; Fri, 13 Dec 2024 14:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8rj43ZQBz4fHD; Fri, 13 Dec 2024 14:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734098760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8eyrBVdyEVn7ivnDZkl/clZRWj3+qiJuUw2ObteoNUw=; b=Vye8sZgszvYc7Kh/I0RQRWtw2Oy/NVOiqI86ek4Udya1IQo0l3quq/3Un1CBm/6wh0vQHL OVPjj44JKd5i9enTWBO3HxSwQQH4P8lT8Tb7qw4MUbzSWnepDJyeQJBiTxXSilv9nKcrq3 7uDdGc8F03D/6SZCRvB+A0o2okidr8A8PuaoNQW4agI/dxE6Gh277ewWur8uCqEK1IvQSz 2VWfO30z9GdxY0q0phCNy7Zv97ok3WhpifcdVD/XW+4ybuMwuJ/JSGULWCeD+GI5B9a21g 4LRfcePmbJejw1Dndmr6HQrcXrvdbfUpXfsw0CqXwZMuVVLjd3sfhIcHY9g63w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734098760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8eyrBVdyEVn7ivnDZkl/clZRWj3+qiJuUw2ObteoNUw=; b=UoUtu1TR/TzL33OnF8H2crmIrV+SzUibGurHFku3+6scBw84HNXKSo1a5GZeGUpSjAXpZb Hm+oPxOCZ4GCTCdBrduXs60i4TKZ8pdZfWKWg27oCiJsfK/vcWlXD+3L1vGG0wIP3uiW3D kG9Sqoiz10EcNKAg99SYPGv1Qjnv2bluvYZQXAMIkSNj86jwzefwPTuMZbLoAW+KaS/txt 4Fjrink8gUxLiT5AU1eiRZTr8aW+pOVEaPLsjjHipfCDprBk1t7vr1VAQZKlnTrPRQlfo+ 4ZIPxjRIf/ZeIkqyloqsbkk9QWrn033zKJxobdac8IV4AmT1mS4Uf0SwbHE+QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734098760; a=rsa-sha256; cv=none; b=Y7a/zFQSIbbbaMIhSnhRr+gHrSsuxibpdzGa4vjxkORjtE4DuiEeZ2bnTxjdUTv5rGOov0 H0aI2e+AP0N4wjCoZP+v+HN6daySd1X/HDDbpOG7WEdvy3SlQNpnyZP9kk0z74631sJXEg RxiDOMuJgRzXH8JWkAnGqr8crMbN00KgJ9v3gPGikdiHxWz5q0aezRQRzFXas2OH3v26BS iNwpcIpSeqETnDjqqXZx4mr66Dw2uoiozDklRRjltRSArz5r7Vg6xIYRB0+vGeeU1751Wm ABA9jxeqN2wYO38E0ZJxq11jNmMTrV3HsFjPM4m8tNYlN14c30zjFhwRTTgOKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8rj42CDRzgXM; Fri, 13 Dec 2024 14:06:00 +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 4BDE60FG023319; Fri, 13 Dec 2024 14:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDE60TV023316; Fri, 13 Dec 2024 14:06:00 GMT (envelope-from git) Date: Fri, 13 Dec 2024 14:06:00 GMT Message-Id: <202412131406.4BDE60TV023316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 8ae6247aa966 - main - ext2fs: 'struct ufid': Re-order fields and unpack List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ae6247aa966989412bd75fc7c26728690b9e944 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae6247aa966989412bd75fc7c26728690b9e944 commit 8ae6247aa966989412bd75fc7c26728690b9e944 Author: Olivier Certner AuthorDate: 2024-12-06 16:37:56 +0000 Commit: Olivier Certner CommitDate: 2024-12-13 14:04:50 +0000 ext2fs: 'struct ufid': Re-order fields and unpack Re-ordering the fields suppresses the trailing padding which was causing the structure to overflow 'struct fid'. While here, re-indent in a more visually pleasing way. Reviewed by: rmacklem, emaste, markj Approved by: markj (mentor) MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D47955 --- sys/fs/ext2fs/inode.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/fs/ext2fs/inode.h b/sys/fs/ext2fs/inode.h index 63102deb10b0..c45339bfde40 100644 --- a/sys/fs/ext2fs/inode.h +++ b/sys/fs/ext2fs/inode.h @@ -187,11 +187,11 @@ struct indir { /* This overlays the fid structure (see mount.h). */ struct ufid { - uint16_t ufid_len; /* Length of structure. */ - uint16_t ufid_pad; /* Force 32-bit alignment. */ - ino_t ufid_ino; /* File number (ino). */ - uint32_t ufid_gen; /* Generation number. */ -} __packed; + uint16_t ufid_len; /* Length of structure. */ + uint16_t ufid_pad; /* Force 32-bit alignment. */ + uint32_t ufid_gen; /* Generation number. */ + ino_t ufid_ino; /* File number (ino). */ +}; #endif /* _KERNEL */ #endif /* !_FS_EXT2FS_INODE_H_ */ From nobody Fri Dec 13 14:08:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8rm36BRhz5gd2y; Fri, 13 Dec 2024 14:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8rm33RS2z4fvk; Fri, 13 Dec 2024 14:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734098915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uUhMj5KdDfWqqyoOiSiG58x1Y7CMwblOSHCIY9xVpI=; b=JsbogUbp9pny09pebBuD/RlXADUKoRFNCY04uOjG6CokbF0/qFT/VUq4NRlvgU1Qbo0gxW B96FPxLYTiMT9Oh8z/gIj8lS1afmghZYAEaerJZzzOKjma9ytXDC+Ntx6E+L4FjcitZl9k vXNBA4Jy0W87QvKLr4X3qRcfIZ45QwLkbTSnwJ1d0dfWWbe5zczzGBgiKJgO1ijzK5oOFL j9v80X9T+YiNGtSpJHotIcAl+sow8oNzT7Qb2VosqPGl8J52kApsoXjuT0vsKigme098Z1 /IQ+kIptgVcP7bBJzc2m8MOSKYkL3H9Mv30mTEh4/IizbEm1b1iNDJw14pfxbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734098915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uUhMj5KdDfWqqyoOiSiG58x1Y7CMwblOSHCIY9xVpI=; b=dbifBi5n615zS2vUVV8coQLlx5Twi96nShcdrwwOHrjlhXZvUk/QUg1b+L4UrKlPbOXX2w 2P9JSWDCwiuHsU3BbwOPTF3ykAeoHb7nmYWK+U6Pj0jStlbsKStXlYX+En2P8mQQoxkRBp jqiiFIyh46FebN2zVL6Snl5Im/GST6ngOQ836qCbUgO3RkpD4YPtMkVZXUi9xBiDGPYkZo RHyl/n37iYs/ciORapk4Uuut+lzOZkB7vQDpbjrweBWCbxm+FSOexnKeOvw33ftEgjgbqv RUbNCr1jiLF9cLUkszFsCG3gIHzcXFXuruPZNHlCbexfekTDF7UT3vQ39Sg3LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734098915; a=rsa-sha256; cv=none; b=Jb9TKqq41rxLMZfLjFUPbm9AJ220jXDLBQB8q3AuJFZrwuiQuCdEcmSVU4+GGzin2V4+ww dXOaK/XG9Q9wHmefQvMNqyCE+RJFxPkpwSIf++pdwTHQNpDF2+2s5WW6EK0wC6v69YUXTA TIjWZeYBxm6oM7rIWSSgpiixVGZDR99KyKudc82m0U4HccsIpWm6g8WiW0WBwgytSU/CvD Pfe6LU7gGRZCuMqVxgB3rAlHIVF9CMV+NlXeJ21joEye9e41ApYATbsr3iwE6UexntgDas q7jC+6X/4stgF4MNXkf+YDHYQvzZKGOBR7S1kWeQEU4SOddsEmK5seubvObtsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8rm3336mzh1r; Fri, 13 Dec 2024 14:08:35 +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 4BDE8Zhg024177; Fri, 13 Dec 2024 14:08:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDE8ZRF024174; Fri, 13 Dec 2024 14:08:35 GMT (envelope-from git) Date: Fri, 13 Dec 2024 14:08:35 GMT Message-Id: <202412131408.4BDE8ZRF024174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 989998529387 - main - fusefs: FUSE_NOTIFY_INVAL_* must busy the mountpoint List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 989998529387b4d98dfaa6c499ad88b006f78de8 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=989998529387b4d98dfaa6c499ad88b006f78de8 commit 989998529387b4d98dfaa6c499ad88b006f78de8 Author: Alan Somers AuthorDate: 2024-12-13 14:00:20 +0000 Commit: Alan Somers CommitDate: 2024-12-13 14:08:30 +0000 fusefs: FUSE_NOTIFY_INVAL_* must busy the mountpoint Unusually, the FUSE_NOTIFY_INVAL_INODE and FUSE_NOTIFY_INVAL_ENTRY messages are fully asynchronous. The server sends them to the kernel unsolicited. That means that unlike every other fuse message coming from the server, these two arrive to a potentially unbusied mountpoint. So they must explicitly busy it. Otherwise a page fault could result if the mountpoint were being unmounted. Reported by: JSML4ThWwBID69YC@protonmail.com MFC after: 2 weeks --- sys/fs/fuse/fuse_device.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c index 087316e86e90..0a5da63c1f54 100644 --- a/sys/fs/fuse/fuse_device.c +++ b/sys/fs/fuse/fuse_device.c @@ -439,7 +439,6 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) err = devfs_get_cdevpriv((void **)&data); if (err != 0) return (err); - mp = data->mp; if (uio->uio_resid < sizeof(struct fuse_out_header)) { SDT_PROBE2(fusefs, , device, trace, 1, @@ -542,6 +541,13 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) } else if (ohead.unique == 0){ /* unique == 0 means asynchronous notification */ SDT_PROBE1(fusefs, , device, fuse_device_write_notify, &ohead); + mp = data->mp; + vfs_ref(mp); + err = vfs_busy(mp, 0); + vfs_rel(mp); + if (err) + return (err); + switch (ohead.error) { case FUSE_NOTIFY_INVAL_ENTRY: err = fuse_internal_invalidate_entry(mp, uio); @@ -566,6 +572,7 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) /* Not implemented */ err = ENOSYS; } + vfs_unbusy(mp); } else { /* no callback at all! */ SDT_PROBE1(fusefs, , device, fuse_device_write_missing_ticket, From nobody Fri Dec 13 14:53:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8sm143jwz5ggt5; Fri, 13 Dec 2024 14:53:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8sm139NGz4nqT; Fri, 13 Dec 2024 14:53:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734101617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yXSeU/Wtu9rJ/jtnkvTk1qGO46Lsm6MnsdwZIciwAAo=; b=A+S0XjB8c5VvuMsY8OrIlsjxwT3wvWHvamuSVY8KvxWseXueitzRqOgGQawPbdHmFwLSys mlq7PWtbqFbhrYh2mp4raynO37Y+PLJYck2tB1dOkFSM80bsy1BK5KhTzL9QLT+mCm75lb Kgy3kUGFegBCPRNttNpMRCb9ughKmlB3ryshD8zqn9FOCeSxhhiUMO6Q06r+EB9tudGsgu pKwFm/YOyfhK04TDYq1kIJYvJaD6SloQyfpPG6r1khaOSwhywk4jeyFePVuabSV6Xwm4Wp U72AZ8lW6MqTSMW8MG3yibGSzjgEW57tKOs65frBBOAAvQZZl5ujfbNl7UpRIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734101617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yXSeU/Wtu9rJ/jtnkvTk1qGO46Lsm6MnsdwZIciwAAo=; b=GAMaz0xPo+ug/qEX1jiaHAz9srFi+es6QEONR+aVf8xAlEuF/udqc2hBqtDCgJ2BvmERD/ nuZS4Cpp8EjroqxWtxULt6AJWfGqws5lhwROQyCw6pI5CzRqjvmsdWC0cS+qzXVrNl4mHN FTvRESmJ0HuOojUVXSQWUGGrmGb4WKa0848E34lQKDnxHp59LpqtTgxks3nwClsJpSiBy7 YvV7Z+GYxFONYqOsKf3OKeVcjkhcCBOcDVmy0dXw6O+Zdm4Boeb6C4RnjC1fkQunB3J2OG VDRleaD60h9zOplVaPg1vTK61UYExjiB4q6gqUS7OZ6T+hZ9OeDgB0WJQ29fzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734101617; a=rsa-sha256; cv=none; b=buIiAFoEH71DwqZpb/Wu8BQYmk7SxCswYIKgVib0t/AA2HJMbFxKCzA43jGV7PuZzh0s20 EksCxIV4EGbnFQmgy/RATaiiMyzDUGwqcf1VRM71+Te1b7u7UiE0Z3fvsNHtoCAOQZuRqb Fqmgq4BGdS3YQxdnGcfzw0+7NWmeWjgJmlMv6/mw1jPY3dDlVX3nUw1khNMSM3PhI5hAjo 6lAt8RG8UP7D5FBhwRDVZytC4TqaavKX9sZDGvOBvmLzuRyLHH/EU1+rYD0g1wZ7sP9n9T 0pqP0zKEID2R9cMVRmqDjfZ69JI+WR5s1AgyLwM1fkzCyrHpmn51Hz7gZyQtsQ== Received: from [IPV6:2601:5c0:4200:b830:1582:acc4:74b1:890e] (unknown [IPv6:2601:5c0:4200:b830:1582:acc4:74b1:890e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Y8sm11NP5zb2N; Fri, 13 Dec 2024 14:53:37 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Fri, 13 Dec 2024 09:53:36 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length Content-Language: en-US To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202412131306.4BDD6bxu011253@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202412131306.4BDD6bxu011253@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/13/24 08:06, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a1097094c4c5d810287aca092f4ab5f9f86a426a > > commit a1097094c4c5d810287aca092f4ab5f9f86a426a > Author: Pat Maddox > AuthorDate: 2024-12-13 05:28:18 +0000 > Commit: Ed Maste > CommitDate: 2024-12-13 13:06:10 +0000 > > newvers: Set explicit git revision length > > The --short flag is configurable. Setting an explicit length supports > reproducible builds. > > Signed-off-by: Pat Maddox > Reviewed by: emaste, imp > Differential revision: https://github.com/freebsd/freebsd-src/pull/1547 Hmm, this seems to defeat the purpose of the --short flag. I think if you want this to be reproducible you just need to use the full hash. If we get enough commits that git thinks we need a longer short hash, then truncating the hash to a shorter length here is a bug. -- John Baldwin From nobody Fri Dec 13 15:23:50 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8tQv0Pkwz5gj41; Fri, 13 Dec 2024 15:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8tQt6pDzz4qrM; Fri, 13 Dec 2024 15:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734103431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UEur47oPN9WrQb7QCqUM53gNx6xdi73mch6+cSadP3o=; b=oP1Lf1JhTdzmVTuEWtEhxx77WehGxWw2kE+I61WN1WXoSPSi3ewUWE1YMXB0sRkuCtLXAW 8jBrENwTC4hvoEdny4sgaecYjSUZJgcpyb0FCFzPigyV+ToBP91hPWXW21sGb4052tjVeY fhuSVAL+/sm4kEXWbx+P5c8waLq6wFFG7MVXRpYCv/H8V6ZSmfIB3aZxAgXPzEJbegyr6I tmJtmkwMrXUWH8sumt0G1QqLQyIhlM1YIHctnTu7c8drELzj7pnvqLUYm+EuYp3SCfF3tl uUdaEGBbuNXXy3uxPAzcnHbC1uTLl61I56Xy4b3yzcGWUbhgzUX04TB88tZDDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734103431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UEur47oPN9WrQb7QCqUM53gNx6xdi73mch6+cSadP3o=; b=O6339FMd0RzQ2180mVgYijTma8vuxMW0oV9CP1pT9k8AmsrpRlZx07bz2l8qsaZYxFChOz 4I3C4jdNm2ulj7sIBFwp6UE0Oqcjc7jcqMl97qmGf2XHM0Q5Ew4a4Dh6j+yS4hy9pEnMVc rEFTYyqgJpZmfm3s+ESz6bnSXuzxaY0x7NGEB2TFvRH1RridwHD88u8QNQikWwcjY8L5HX +ZZOSHCczgblmpeLAOe++c5CL6j0lwczXcBt/UotMgORmqOzm1zm8mGh741tVSwxtXKTfe zKfd4ned9YQpMUxsz3BDUlwAjbtJsSirNqUt9uhJBilc8pbuyxgNZGBm9YxKQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734103431; a=rsa-sha256; cv=none; b=mEEvno6tZwuCtkiXhQGmpqlcAmmjJY4G8onW4/07fFbgtq/WlSUjr33PgobTPpUGK2fwtw ohbuHWKe1bZ5v9MHHQNVjTrt5XTbwtmD89SUpNfTnyXFnujW/agOIrQwmmR5jJ+zzAxIZV w+HlGkzcX9fAsf5H/qJ0+etmLUvFKex2Z2H77gL6RKnyvXA9cqn0oF7rSKVlZ50sGsUnuL lmUr0CO6zzgZ5NyI1EjyumZX5BCUTWzC28k0/tXTRnLS18fpzC4EOOzIArqzuBIJforCn4 RhdN8gVfovYVxggWSzJjcZlC0lpzy3gPZX2Uyq2qfyYu1S0No604zNn/n+R74w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8tQt6P44zjj7; Fri, 13 Dec 2024 15:23:50 +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 4BDFNoel071076; Fri, 13 Dec 2024 15:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDFNooZ071073; Fri, 13 Dec 2024 15:23:50 GMT (envelope-from git) Date: Fri, 13 Dec 2024 15:23:50 GMT Message-Id: <202412131523.4BDFNooZ071073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f6575ed0deb0 - main - Makefile.inc1: Require DISTDIR be set for `make distributeworld` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6575ed0deb08026c5ee261495e000831688e5a2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f6575ed0deb08026c5ee261495e000831688e5a2 commit f6575ed0deb08026c5ee261495e000831688e5a2 Author: Ed Maste AuthorDate: 2024-12-11 15:53:42 +0000 Commit: Ed Maste CommitDate: 2024-12-13 15:22:01 +0000 Makefile.inc1: Require DISTDIR be set for `make distributeworld` distributeworld is the target used to stage world for building dist sets for release targets, and is not really intended for end-user use. If DISTDIR is not set we would attempt to write to the root directory. Error out in this case, serving as an assertion that an internal target is not being used incorrectly. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48030 --- Makefile.inc1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5cf431733f8e..bd0ed3ebfba8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1001,6 +1001,9 @@ IMAKE_INSTALL= INSTALL="${INSTALL_CMD} ${INSTALLFLAGS}" IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}" .endif .if make(distributeworld) +.if ${DISTDIR:U/} == / +.error DISTDIR must be set for make distributeworld and may not be the root directory. +.endif CERTCTLDESTDIR= ${DESTDIR}/${DISTDIR} CERTCTLFLAGS+= -d /base .else From nobody Fri Dec 13 16:50:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8wLS6J4Nz5gpR7; Fri, 13 Dec 2024 16: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 4Y8wLS3b4jz43Fh; Fri, 13 Dec 2024 16: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=1734108608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2sL8UpXM7ryUnFcDGfFEP5yxeIkEj1CGUVvmD8f9mVg=; b=gDmMjJmp1+LG8mnsqmbcoClgm/9nkYKxYiuA8mbySN/Gyrd52b2BpD9foutm+fuBL+Mz+e soyHLsKCVSZZHUy9NjqVOHza4IXkOYk1K88NnSNvTsWoMtNwImv2LfC0f/KRWQIGvi7Ypp s33IIyO8JYpV2fGpIaF+mjkkQyfeIFtyk+uzoruejDUqzagQ9aFxYpn8HpXIx7pe8C26mL HXFTYM81NI5BXTMpmga4oEt4ISo/pynqINKDX3YRuup2c6Vn4PJZe+gqHn/y0bWBvYK5XR MKhth9kX2DOMh5mTTlFKwshqojqEN0olIyPr8hiP+acpT9f/Lc1JTOgImdDpwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734108608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2sL8UpXM7ryUnFcDGfFEP5yxeIkEj1CGUVvmD8f9mVg=; b=O6bpazbJJZea9qYiWbBqktfcUr8Y4LS2KBKblPx2tM0GQbalLSBUBImI3b06zu2NGm9mWa Tl8957eXNWJ8gTEH5mHL+EQvL3LMAUvMJx7UhHFHxrItyzvIy/3k+XmRQpjg/6LUpo6Mbe 4OLWHfzvwW5mheLacPGpr3cJ01DQOt6l+QC40dzotdw6fpCeGn6yhiK/Q9MoqvZJ3Ue7PH BHdec9ptp6kpdIDbFKBJ910PHiNjF/Tq1sylDbhdQu1bRlr0l5s+L/6FUy8R6F5EB6yHuz 7nIF8DiCw10PDvBF8jtHApmpFU/4KhvAmMZwBxoPSvZS94Tu6YA0/hn9mDmPKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734108608; a=rsa-sha256; cv=none; b=eLcMKdpAPrc/qZ4lTmrjtHiR4ELmKREMvCpt9TfIFMtIntSMnRYdmr+s6oJrqANjwniSlg EqUgRuSEDmm2+vuIU5KLMr2BJ20rY5voafwI31QGDiFju4xr2uaOL62waqI6m+ncCeBngZ zVyJtg9W7rP+ZlzgZL6dPsiYvsAwZ60yp8nMpEX/A3oT9/jmaTwzaGsFPCKQ6d+XFmKQgb YZqJAwS/HtRtyso/5t3uh1+7i61pqOexxOYzH6YuYuMaUaHDKK6S6iDichYd/BR1Tfgcmw o1AV/ohdolJP7arRJ2/KD0KVTZ1IWIzW26SJUAyi2jszF0T0HWmXgCA++uxjFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8wLS34yGzlp6; Fri, 13 Dec 2024 16: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 4BDGo88E024920; Fri, 13 Dec 2024 16: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 4BDGo89i024915; Fri, 13 Dec 2024 16:50:08 GMT (envelope-from git) Date: Fri, 13 Dec 2024 16:50:08 GMT Message-Id: <202412131650.4BDGo89i024915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: e2fc29e53986 - main - release: fix architecture for OCI images List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2fc29e53986c69ac91d40e7f1ef8fbca317771e Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=e2fc29e53986c69ac91d40e7f1ef8fbca317771e commit e2fc29e53986c69ac91d40e7f1ef8fbca317771e Author: Doug Rabson AuthorDate: 2024-12-04 13:23:58 +0000 Commit: Doug Rabson CommitDate: 2024-12-13 16:47:05 +0000 release: fix architecture for OCI images PR: 283260 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48051 --- release/scripts/make-oci-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/make-oci-image.sh b/release/scripts/make-oci-image.sh index a139a38d1930..6180ed9d53b4 100644 --- a/release/scripts/make-oci-image.sh +++ b/release/scripts/make-oci-image.sh @@ -56,7 +56,7 @@ else base_image=scratch fi -c=$(buildah from ${base_image}) +c=$(buildah from --arch ${arch} ${base_image}) m=$(buildah mount $c) oci_image_build buildah unmount $c From nobody Fri Dec 13 16:53:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8wQ8018mz5gpXB; Fri, 13 Dec 2024 16:53: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 4Y8wQ75w6lz44GC; Fri, 13 Dec 2024 16:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734108799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xari2lipuzLqUx0jVo8jAcMFefgmJjnPLZ5j+Auu2Os=; b=UlwbIH3xVMiTfR7QE1ZnRX5jXlTXeTwpvyxTMvlbOKWl/9DuWXAa7bdlFPmLvvazABzZz/ Wd8AEPsrjoRZUiH2tpNgAHj6Knl6BAYq32QoHoh8znXF5+7vJtUgSz+zaoLitzuaTFBq/8 6nzoIpbuPFxLvJY9E4bjmtiozmZyPdd1BmuAzxHNXbAI3pHOfV8BJZC8hiG9nfSw3qu7Il Tl7ATUwx1lIclx/y0LF90odSLsNgdL/TwprFRnbmFsrI6wzdvAA4O03UE6WHlTnmuCcZ9C xFVtP8hhMoELk+Sdnzhq1O/s5HLz6aEFNFteIfAx4hIxVn1uZz63nDy6mIezfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734108799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xari2lipuzLqUx0jVo8jAcMFefgmJjnPLZ5j+Auu2Os=; b=nmbCvr3tqb54y35iIvVpTl0HY95FyjMuo9UdQnmDwWx+rO4x0zUXfW81AgfKzGyqnzFw+9 6bFfi1G+wJGm1j8+WP4ntbZofM3Q+g39S9reRcjGH12ap04nE376nW3OSYXbU1iMCiTM8/ P6BfIYYsC3/XLC07LInt+iSMtBGgXOUuka1W+52s1sPYt0Mur7eJ1zqLnlFC+H1uKokP0C 8ftrD/ej6+pI43IontjQtDmlJiEgcDCIJIJP8ZlNRZp7QwEV2W7zB0eBWvtj11S7FzC5h7 J2JtXNOJPG4CrEOfngiZEKs+VXLvz5WhCYL0t/ig/UIYDwKNWpR6lqyRS/2xfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734108799; a=rsa-sha256; cv=none; b=qRXWAO7JyJ4RL2W9ASD1C9M33nL//sCD/9Nt5ge7j2OL8l2T8yzHggdyOSbHVkuilmWWvi KhnjIvLtt6X3ES7a4ShR6i5cvpf6JxjnbNjQhOVYMj7camvNOADCj1vb3OUTBSm/YwllUF 4xUzQaUnPTC/LtQi6Cu/00rzEkel6O4JIwIreunUHxjAawuZ/RqIn46toPwR3vQ2XJDb7N 3skyxB0Qx7ZalGXOV718eW0qWJc9ft7QOjuLXcbV3RUl72LktoooXQeFz++QMnZiK/0Kvh Nr7mJNmYgO9cJMqqwoQdNqoEki3jpXjYslrzhuJNys2wHT3MdZVA57weSIheaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8wQ75QpCzlgk; Fri, 13 Dec 2024 16:53: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 4BDGrJVv038612; Fri, 13 Dec 2024 16:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDGrJlk038609; Fri, 13 Dec 2024 16:53:19 GMT (envelope-from git) Date: Fri, 13 Dec 2024 16:53:19 GMT Message-Id: <202412131653.4BDGrJlk038609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7c89253bda3e - main - vmm: Initialize error in vmmdev_rw List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c89253bda3ea32a9c44104c2d09f86b70195cad Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7c89253bda3ea32a9c44104c2d09f86b70195cad commit 7c89253bda3ea32a9c44104c2d09f86b70195cad Author: John Baldwin AuthorDate: 2024-12-13 16:52:31 +0000 Commit: John Baldwin CommitDate: 2024-12-13 16:52:31 +0000 vmm: Initialize error in vmmdev_rw CID: 1568045 Reported by: Coverity Scan Reviewed by: markj Fixes: 4008758105a6 vmm: Validate credentials when opening a vmmdev Differential Revision: https://reviews.freebsd.org/D48073 --- sys/dev/vmm/vmm_dev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 4bea4360a51c..4ab99f92f72a 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -195,6 +195,7 @@ vmmdev_rw(struct cdev *cdev, struct uio *uio, int flags) */ vm_slock_memsegs(sc->vm); + error = 0; prot = (uio->uio_rw == UIO_WRITE ? VM_PROT_WRITE : VM_PROT_READ); maxaddr = vmm_sysmem_maxaddr(sc->vm); while (uio->uio_resid > 0 && error == 0) { From nobody Fri Dec 13 16:55:04 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8wS865Dwz5gpJQ; Fri, 13 Dec 2024 16:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8wS85bTpz44LD; Fri, 13 Dec 2024 16:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734108904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SOp90CaoixiH5ZNGDRYjLHC7aQIsvptnFkBK2GjXA2Q=; b=Y4xf+eAvxJo2469R8PudRc/t5S69x3vp6KTjTNQmcYGrA07qPEcDa4eufbcRthUv9bizgm 4eaoMx+QQs79d47zx6tks7LH4FITlzHYy1eYGSDUPcbUYUVNp/Zc5taC1LD75xFLRkAsok 7Eh+gZeCFYhdD148/Kcvjo+CKDRcCmWRIfxoMHmk9KzBsCGrJMQ5U/lPNmbPl25P0t/GM0 z1W7YrQmgRd4ov2JTPrnySS9gqxhQIf0Yj/be2/TtYLqKCGh8CsrqMp++eCgMReQ0JqJUr ldnp7P2PW7obxq1IxUL6T5DwnHW4N2gKy8JUjwn4mLmtT3yAYnyv1o3ZvrFImg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734108904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SOp90CaoixiH5ZNGDRYjLHC7aQIsvptnFkBK2GjXA2Q=; b=miGFj7Ys+PrHV6h0qRqOIq9sMmp4UVoWHcpBcTy/3fzwC0c7InGpbLhCE7i/RYOu7c5Y6g 5MNBfdmKft0r4nLIrvQxxlCEofJH1gnq0RNXMtxOSlr51xLLsTo2ec8KW2638odJCYExbi JYJ0LTrDTYSISXQrEONxKVJCzeKrSbFLU9DYB5fboI+waC0XloZs1Zj+oLZaLWv/aWMKq9 uIXlr7/fW1TxzL4PKQZ40nJIN2hQ5tFWrP0izXm9EJyyaQmVFz9bm2O2sU8EL+DY5qerc2 eGYS/g6xMRgxeA/b1eKL9eaEhkMstfaj3aZyzYVTdEzwfMDSzI69T2wxmb0nzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734108904; a=rsa-sha256; cv=none; b=TEUQSPzl+94mdJHYomLghPhPFI3RbdMnLv0uctiymW9JMuuyepJ8pU7fMrYW63UIqo9j7n pjbk4Hj3XbUBZpE0zJ83oMyW6dCdzdxIOrdaRHvuGvlnALrRP2zhqjxLocAKPdnK9khbtX okZWFqadF6A/nSbNqbTbl6r2JOaAt9VydvsXLcFY/JhhW9yleWfLZkCJ5uCHObmLV738QR 84+rozL3xG4JRyVYv3QojUVtsro+A9kNoe5BY2QptBqt6wwmQ4d8OPwhdfCfBFqnwKPWR0 Nydr8NnIiz4vCFCLAgchIufLt6iG2hNPyr9l3JxMjQSuSfAU8EQoOFcMYl+R6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8wS854P2zlsP; Fri, 13 Dec 2024 16:55: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 4BDGt4h5039285; Fri, 13 Dec 2024 16:55:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDGt4sa039282; Fri, 13 Dec 2024 16:55:04 GMT (envelope-from git) Date: Fri, 13 Dec 2024 16:55:04 GMT Message-Id: <202412131655.4BDGt4sa039282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 91c6231246b5 - main - timeradd.3: Add missing .Pp after .Ed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91c6231246b587209e585376c15553f574b17463 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=91c6231246b587209e585376c15553f574b17463 commit 91c6231246b587209e585376c15553f574b17463 Author: John Baldwin AuthorDate: 2024-12-13 16:53:51 +0000 Commit: John Baldwin CommitDate: 2024-12-13 16:53:51 +0000 timeradd.3: Add missing .Pp after .Ed This ensures a blank line between the end of the struct timeval definition and the following paragraph. Formatting change only. Sponsored by: Chelsio Communications --- share/man/man3/timeradd.3 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man3/timeradd.3 b/share/man/man3/timeradd.3 index 6ce601f25150..9720267883ef 100644 --- a/share/man/man3/timeradd.3 +++ b/share/man/man3/timeradd.3 @@ -85,6 +85,7 @@ struct timeval { long tv_usec; /* and microseconds */ }; .Ed +.Pp And the .Fa timespec structure is defined in From nobody Fri Dec 13 17:09:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8wnK26Ztz5gqWM; Fri, 13 Dec 2024 17:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8wnK15bJz45TY; Fri, 13 Dec 2024 17:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734109797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdN95eZ1XyJemA2Zi4187PEP1on8yUNutmkiRe2SOa4=; b=eWVn+D9dje+VQW8j5Y8vf6LCjArp51GLEoUuyehqnHZuQpqwaiyIiuXNRajXQ6b3laMU3u dBN8jyt5KclVmk8WLVt4ZO5abwHpVKL/oIZx7WYpnXk4aIJ8u52owhxRc/kNcyIU5rnnJj UiWS/5pz1xsc+de+4DRJ7K3Ci61vEd6wolU9LTl2xTUgAZE8wrEY9aYKSN64HPv4qi5kBz Ajo8HDo2AhjiG7Qgf4rdjUuZCcKZNwK/VtUT4y4sCvKNzuoGR97efdflbDF6Vie06RtskG 44agwMVRoyH8CP6vUt1x+0+Cy0EHYtVayQLk+SLqCIZimqaFwv38tx54HrRAWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734109797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdN95eZ1XyJemA2Zi4187PEP1on8yUNutmkiRe2SOa4=; b=pFGy97chsUYGbbM/0ROrHFMZ+vXHnLJ5Ha78K6FyO6e+dIvgQs0m7VGKoqYOj5hIGMXnFz 2mnTcjnVWhH5vnlNjtis/cNzhMkAq18DS/gSS+sIa/8z5j4unyY3n1+gjwUjsPA9nGydL6 X7LsV2O4ckrIsMHufDGZp+Su9cIcDlMoKwtSjz99Y886Sz+VgINajRfBu3Oloz+qPPpVQP 93iH2SYwmrA0nTdsXyI6flijFP6xHKiaJ+IkCxCJgFDC8LD+0TrKznZYfiBWk6/yAcEKv7 1XpG4hve6TTH17yIRDBwkajH1cB+0EdKN8N6ywo/kUnbO4HixrAfaRp5eykUaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734109797; a=rsa-sha256; cv=none; b=i9pMcI8+ZxAPXHj1ZkusbVOvf9FXHjTz2k1prj2BhJkqwddF1bwpoPJLwFHri4Uex7Ubik M56SI95sOR2TAyR5SUjKmU5TVm0XGOa05bm3P317vRMrlmgWebS5X9grPdJdvppR3VCC/z ifOjDDi+QepCRIHG9mSkate7Zf3n3D6iMc8BOLoAEmyxunBDqwyUQViU+wqxlO0psRJnmm GGNNPocnZv9xZkRtCMj5AncwBZLwFuC57IcDbhpBSQ3/RDFzKBFSjB2xRyCxnm84eeG3RE edqcfcrSWM6Am5xXnUQQE61QYDos5HNaoE5/EdynkgWI1QvG//oZWghmsNz4oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8wnK0ZbZzm9J; Fri, 13 Dec 2024 17:09:57 +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 4BDH9u5E060564; Fri, 13 Dec 2024 17:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDH9u1b060561; Fri, 13 Dec 2024 17:09:56 GMT (envelope-from git) Date: Fri, 13 Dec 2024 17:09:56 GMT Message-Id: <202412131709.4BDH9u1b060561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 41adc5f29ba6 - main - release: Always use NO_ROOT for distribute* and package* List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41adc5f29ba6955e09f46e4d2c25da6fcd263ba2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=41adc5f29ba6955e09f46e4d2c25da6fcd263ba2 commit 41adc5f29ba6955e09f46e4d2c25da6fcd263ba2 Author: Ed Maste AuthorDate: 2024-12-12 01:36:15 +0000 Commit: Ed Maste CommitDate: 2024-12-13 17:08:01 +0000 release: Always use NO_ROOT for distribute* and package* We used to have two different code paths for generating release media dist sets, one which expected to run as root, and one which did not. It was possible that the two different paths could generate different results. We can use the path that does not *require* root also when running as root, so use it always. We'll want to do eventually do the same for all release targets, but these ones are an easy place to start. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48041 --- release/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/release/Makefile b/release/Makefile index ee2f52ad56af..6b05b986318d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -132,26 +132,24 @@ clean: beforeclean base.txz: mkdir -p ${DISTDIR} - ( cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} ) # Bootstrap etcupdate(8) database. sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \ - -L /dev/null ${NO_ROOT:D-N} -.if defined(NO_ROOT) + -L /dev/null -N echo "./var/db/etcupdate type=dir uname=root gname=wheel mode=0755" >> ${.OBJDIR}/${DISTDIR}/base.meta sed -n 's,^\.,./var/db/etcupdate/current,p' ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG \ >> ${.OBJDIR}/${DISTDIR}/base.meta rm ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG -.endif # Package all components - ( cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/*.txz . kernel.txz: mkdir -p ${DISTDIR} - ( cd ${WORLDDIR} && ${IMAKE} distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) - ( cd ${WORLDDIR} && ${IMAKE} packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/kernel*.txz . src.txz: From nobody Fri Dec 13 18:23:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8yPq1cctz5gvN1; Fri, 13 Dec 2024 18:23: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 4Y8yPq0ttDz4Cwr; Fri, 13 Dec 2024 18:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734114191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pchU68LHsN9HLJVROtSTNEZkDCv5vP1br4r7e9Kr0B0=; b=tDXYYaMccoLqyRpHDxl1AgSMqEcAif3agnOh1V0WIKYMSuRMRVC5d/2ZRZjXheLA8JIaci h5FxGQF7zBcBe003EYfRI+0ThtB2kg2RW7MR34ru2z5woWTC6bGo0wGcyWOku3Gjaq+xlS 4OTeQWZgUVteM4FYJiaSmqqYiAPcOl/B5YF1C4FlP2kM7kvBMV4yZD9HRckaZiL+JhrnyU Lr6pbOFB6Qf4l19EudQicntBXTiaBdsjQNpJOA6ji2IB84vE1Je36BT3p6hcpA8lmQtMwu 6PoPOMwUJTCudZYkFFTg6/ht2EsyWpt1eq837I1v2hGvL5U7pNOaOD3tyvmalQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734114191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pchU68LHsN9HLJVROtSTNEZkDCv5vP1br4r7e9Kr0B0=; b=fjEf7UwaYWom5Ej1RMf1AhlH9G693zfpvRFsmV9B3pQ7fiio5UTcOc92dgZ9kIBCh32tvj OmCzMqpt+OQE2u6/qlt2gCAb1vE967791/91IA/dWVVbEKYMYATb3naDcf6LzjgBH4M2sj pXUMxE8+M27Fb+0aOpqNDSyok/Tge5zEaEkkI18yUdLuS3OHyYHj7grbKkwTkJWyG8M8j8 tydNKS46ikUbPSiupk6nYkRaDjA+3OkzMyBF3DaEOnZ6cv8vmSK31x6d+g1K2b+Vxj2zej dNHaW3nhtzo7+7fvNzPSxqtCUJjW4GoVUKffgvKv4oYav9lWkwksn7EiDoILyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734114191; a=rsa-sha256; cv=none; b=T9ZLgMuCumQ8VOdy6k/a2mW6UC6Kzm1O+yx003AkufZ8gyX+rsevTujShhTblN9lqxep7s JnjSTg6T9Z9CMXXePKD/iiNePRG2U5aH5ftOLqyyrnK9SwH1w03xoZnOQI7W4AucQjFQrA lJEZXW4MtC6fmHAF7udi22B+t4VqzTIP038nrtckWlUqJqwkAvSis3FldFRhmxw0Vv0S1d d4XDXgkflbigw9AOyAgSd/v4qrbHddJrL/zSoRpUf1W4RGyyhfPfD+SzM9jgUYNzqmSPtr 2bk7avcIyBTFoyiuyUxtjQUrZg4xk4vpAPqhrMqiC7NASoEDBhvhoyW9TcrWjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8yPq0V6Kzp2n; Fri, 13 Dec 2024 18:23: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 4BDINANp007002; Fri, 13 Dec 2024 18:23:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDINAJo006999; Fri, 13 Dec 2024 18:23:10 GMT (envelope-from git) Date: Fri, 13 Dec 2024 18:23:10 GMT Message-Id: <202412131823.4BDINAJo006999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 6e55ba5b3131 - main - Export the kernel API pgrp_calc_jobc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e55ba5b31317b78df7f09d4b0f5a112a34b3917 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=6e55ba5b31317b78df7f09d4b0f5a112a34b3917 commit 6e55ba5b31317b78df7f09d4b0f5a112a34b3917 Author: joyu liao AuthorDate: 2024-12-13 18:22:53 +0000 Commit: Justin Hibbits CommitDate: 2024-12-13 18:25:46 +0000 Export the kernel API pgrp_calc_jobc Summary: Export the kernel API pgrp_calc_jobc for use by other modules or functions. Reviewed By: kib Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D47539 --- sys/kern/kern_proc.c | 2 +- sys/sys/proc.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 77ae6cbddea5..463ecb025317 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -725,7 +725,7 @@ jobc_parent(struct proc *p, struct proc *p_exiting) return (jobc_reaper(pp)); } -static int +int pgrp_calc_jobc(struct pgrp *pgrp) { struct proc *q; diff --git a/sys/sys/proc.h b/sys/sys/proc.h index df7ce6de91d9..2615fa0dc275 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1176,6 +1176,7 @@ int p_canwait(struct thread *td, struct proc *p); struct pargs *pargs_alloc(int len); void pargs_drop(struct pargs *pa); void pargs_hold(struct pargs *pa); +int pgrp_calc_jobc(struct pgrp *pgrp); void proc_add_orphan(struct proc *child, struct proc *parent); int proc_get_binpath(struct proc *p, char *binname, char **fullpath, char **freepath); From nobody Fri Dec 13 20:30:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y91Dh1nRCz5g5Bp; Fri, 13 Dec 2024 20:30: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 4Y91Dg6V71z4TZy; Fri, 13 Dec 2024 20:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734121827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WmNY70qGu7pKm/3H6HKQAcSx2G3CNYt21DApPXQ5v+U=; b=HcaSGzXiuaTKa/3KRfH1Sb4jgwKQNLuvA5igxGTGkDlfKYq8yb6+g7XhoO9PFj/0Z851iE uab7EkGaX1Jj6Ryz8HxVTre6bBzj3eoz1MgMC/rARaZQrcxVHEbfxWXIfS2mJ5HUIjWYVZ RVM1Lxou+ZEUrfGfRrv89pKmoxGdWPHoo01OZXBv+TiI21GgapJ0GpFoNLREZC+FWmJekM 4Z2oGvgIs95h1R1YEkh1epwuClFjpJK50rNAAj/iK/phEkmKFOk6JfAhKK7EwvOBMHs3qC LG6OuogrkcZiNDS3zinDMwGoyJYWFLAVqTzr23McZI/0cCVuvnDXxhDTwIoB3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734121827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WmNY70qGu7pKm/3H6HKQAcSx2G3CNYt21DApPXQ5v+U=; b=b7u+qZU8D596nj9kYbmS4hS/E07a7y/8JUqDIf6jUMADwADxnFKhzd1DLxnyVbq510KNl5 B+tyJOrTYF9mMd81b+7IvPifnY0n99Ag5zTDItOUs9bzsx/uVVTodO+9SbX3/kjhzxw4Sr KdCNxKHv43vH7HEleT8p7HUVj7rEU/5cQoPmMb6f4/oN+CnOdFM9m503eTHW1DEV0ks/jj tzx691sQX3gB4rcIKeS8mrPw60BOER0cqjpWg6B4mOAE0VaJmUBjaN5074sT7N34csM8bu uptI7YmyqSqnBhhYBernRyi7nvL5Zc1QoGFjb0bfNTjH9aCfZc0MshGyySlhRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734121827; a=rsa-sha256; cv=none; b=JsEhLLWL/esosbOMtEfkDGGsWps2NQZvSSzlOjnkNZ3rPgbFYty1crJK66mfzv+CdPZ5wk yjDU0HtJ/rWiKcJMJbsQSxK12j0mYBTs0eMIAyt4IhjajVskXDaze7xuUT0MPSUNNqoYV5 7Y+V+csKEAPxZZ6LY6C1JMSAipR/mkMPoFrjzEcz3WI/koSjWQnHgPdkTaXIYm7cR9A8hg pLvK+giP7atzya5BxR9tLuL3DU+Dr8w3V9UDapQ9TTnly3L8OTS5V31BHeQ4qqLFsk/TOx 2+c2da2rRGfAuzkVgjbCl7UNOyGPdTVBhAwfVB4q+dIKRtFsLoUuO8VxtSxtHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y91Dg5zfdzsMc; Fri, 13 Dec 2024 20:30: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 4BDKURsP041344; Fri, 13 Dec 2024 20:30:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDKURIE041341; Fri, 13 Dec 2024 20:30:27 GMT (envelope-from git) Date: Fri, 13 Dec 2024 20:30:27 GMT Message-Id: <202412132030.4BDKURIE041341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 926905796749 - main - linuxkpi: Fix a lock leak in lkpi_sta_scan_to_auth() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 926905796749750da6464b97ec4f8eec0882cc0e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=926905796749750da6464b97ec4f8eec0882cc0e commit 926905796749750da6464b97ec4f8eec0882cc0e Author: Mark Johnston AuthorDate: 2024-12-13 20:28:13 +0000 Commit: Mark Johnston CommitDate: 2024-12-13 20:28:13 +0000 linuxkpi: Fix a lock leak in lkpi_sta_scan_to_auth() PR: 283015 Reviewed by: bz MFC after: 1 week Fixes: 0936c648ad0e ("LinuxKPI: 802.11: update the ni/lsta reference cycle") Differential Revision: https://reviews.freebsd.org/D47949 --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 44c96909a002..edc3131286f5 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1181,6 +1181,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif, vap, vap->iv_bss, lvif->lvif_bss, (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, lvif->lvif_bss_synched); + LKPI_80211_LVIF_UNLOCK(lvif); + ieee80211_free_node(ni); /* Error handling for the local ni. */ return (EBUSY); } LKPI_80211_LVIF_UNLOCK(lvif); From nobody Fri Dec 13 23:04:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y94fK6QGQz5gH8T; Fri, 13 Dec 2024 23:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y94fK5qYbz4mVG; Fri, 13 Dec 2024 23:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbW0i+O937ShGz7HxlFiscKOnA8axF3Vtl/PZukYNf4=; b=w+JqKyUNhXa0VVJuou8WD6j0zr0hnI8F9/BQtUUCvVXF21lYMyQpaubQcn5PP5zz9xAlkH Pa5px6E8R+oV2V41a7Q3XcO54Swwao858ciFtsZnGfEyIDJPW2ib3JuApPKRTfvIbKKekZ I6+A8IVTPhG9IcWGwpIjqlNu2z2UcTdnzKey8anW4RqtHs/RZraOI5J4xAXMluO6P8vQ9M j5body5HBFIzNZgPBYrZ0DO91y3QGvdKfgqUb7PstFsDhFsxSRFHBHsJpn8wEJgIfm8ofp OHE4WYe7DTXesnrXjL96Uy/nw06LRMi4Jhq82I5npUd3Y7ixj5JOh99qnHmWoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbW0i+O937ShGz7HxlFiscKOnA8axF3Vtl/PZukYNf4=; b=Zc8juOhtHeSzIvxPNLcHzAaJhDXAw8pRe9Ngn4+H0iJWkVBr6YI2UexQraj2JgPKtU2Znk SbKtVYvBr+lvMjWzof6saTLNfRQ8pPypKS1z3wzmLzx/3JB2aMYOx8Oxr2a+za4VCaaF0Q OFLvs4NeTqXEND0reqp2cOneh0/BY56JMqlPUIvhk8LKPWlID6lBn9nRmRRd9AmNRlewIF jeCDSYyzj7+4qVNuI7e5gIbsgpsRrsFQIssCNNmeQvUEaqpjk/eRUENuwrtuda8TExgelo i0sVZFmt5dbEtEvfRhkq/sscfUrB2oN1OLTFZl4qy2nKYunSb18FYAcRos8MGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131065; a=rsa-sha256; cv=none; b=svfGNitC6c92+FWPANy1XCj0cO7C3NTYQnM/wm02eNLECKiiqLC//UYXLtvyAfZJo2esD2 cwGuKd+F/JOj2QLoITjh70SivVMZgm/c7+EaNeJkoAG6OlU7bSrsqSsM8oN/DiwZzXo6gw yVcS1Ky1SosTh3ICl1+fwpGhF5ef1aamwYujrWYdA5BsTh5k/rN9ewUiAVgCyEV/tDl9dJ cpNjlnEf6BxjHUwRwAcc27km5MwOoppV3VpoMkUN0HvXyJ8Bl5G1otjp2omiF5T5Ogx2E0 Nrt/JR4kk4m7YvgFLt8abhYFlsbxe18KsKoB7VzI8QVzGdtG4AASAW4R9tZ5Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y94fK5Qtxzxb8; Fri, 13 Dec 2024 23:04: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 4BDN4PG6029062; Fri, 13 Dec 2024 23:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4PGV029059; Fri, 13 Dec 2024 23:04:25 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:25 GMT Message-Id: <202412132304.4BDN4PGV029059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b55f5e1c4ae3 - main - jemalloc: Move generated jemalloc.3 into lib/libc tree List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b55f5e1c4ae375d92dfd597901f238a230e868da Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b55f5e1c4ae375d92dfd597901f238a230e868da commit b55f5e1c4ae375d92dfd597901f238a230e868da Author: Warner Losh AuthorDate: 2024-12-13 17:11:51 +0000 Commit: Warner Losh CommitDate: 2024-12-13 22:58:31 +0000 jemalloc: Move generated jemalloc.3 into lib/libc tree The more generated things that are in contrib/jemalloc tree, the more chances for interference goes way up. So, move this file into our lib/libc tree. I didn't add a 'generated file' line / info, but this is funky enough I don't think we need that. We do add things to the man page, and that should be tracked in the contrib/jemalloc tree to allow better importing experience. Sponsored by: Netflix --- lib/libc/stdlib/malloc/jemalloc/Makefile.inc | 7 +++---- .../jemalloc/doc => lib/libc/stdlib/malloc/jemalloc}/jemalloc.3 | 0 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc index d916d69f471f..31c7a283f518 100644 --- a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc +++ b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc @@ -1,3 +1,5 @@ +.PATH: ${LIBC_SRCTOP}/stdlib/malloc/jemalloc + JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bin.c bitmap.c \ ckh.c ctl.c div.c extent.c extent_dss.c extent_mmap.c hash.c hook.c \ large.c log.c malloc_io.c mutex.c mutex_pool.c nstime.c pages.c \ @@ -16,10 +18,7 @@ jemalloc_${src}: ${SRCTOP}/contrib/jemalloc/src/${src} .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .endfor -MAN+=jemalloc.3 -CLEANFILES+=jemalloc.3 -jemalloc.3: ${SRCTOP}/contrib/jemalloc/doc/jemalloc.3 .NOMETA - ln -sf ${.ALLSRC} ${.TARGET} +MAN+= jemalloc.3 MLINKS+= \ jemalloc.3 malloc.3 \ diff --git a/contrib/jemalloc/doc/jemalloc.3 b/lib/libc/stdlib/malloc/jemalloc/jemalloc.3 similarity index 100% rename from contrib/jemalloc/doc/jemalloc.3 rename to lib/libc/stdlib/malloc/jemalloc/jemalloc.3 From nobody Fri Dec 13 23:04:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y94fM02T0z5gHTT; Fri, 13 Dec 2024 23:04: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 4Y94fL6ZPQz4mjf; Fri, 13 Dec 2024 23:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yErTZeargmnwW3dtejqsP3F7ovUIyFoXBao5J1dmymg=; b=tCN+NjLKzde3oVgKzHqgFLkf2Au4o+zhae7Hd/xNRbVpzwJu2cYP6AV0OYnAs9tQ6JKHXC TxcY8svyr0ujRrNXWUzM4/kflpulRiZEzXq2Ts1az3Y0ACR8pmiHdSHWq+a0p8H1Niswfz gfoZntYXB2Grno9MyqMKJHANEaw+xDhi5n5GxdQ0V30aCfdlO0csgdEmdMwGem7J9JGFnw eQCSfVgScc0NBeHHgmc1HoLMCShwgMxZCqdKbQWAUCj2e1bOdOtorI4RUPNWvbaT3JrPO8 JyOyT2YIPJonR6jgZVvoH3YsrMDMXnG3cqk/lNMZc6FQU9PLMdL2RNDcXkhc7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yErTZeargmnwW3dtejqsP3F7ovUIyFoXBao5J1dmymg=; b=lOm1nAGwdVHma5XS4Hk8tEYwSpak3JQysh2iCZv4+aKzc/UvI6/N0vLhecnTTW44Ng6hw3 YhSFVks6pseJcwC+Wj5aJQWj56CiGm37fyUwjNtadetIOxmn21RGhOQ5i1EoN9T/6LFJJ3 +UIM75IeBDCWChTfM7JFfPnM9vxKvVSTmE0a5Y30cPkBdkr6w2VsLAfteNNTNjZi4EIdly oOBm8fyOndGy1LMdIrwSVblNNtrHLwpZtsFpMMBpA8uWKgZX7zkF7IJqiT2DD83a3CoXRm 1eERcOt/4sAroQSoHWGzMjkhoZJZmXa8vSC1HajHz/aDg+dwtYq2iLyDb0Du+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131066; a=rsa-sha256; cv=none; b=mWFOq31jZVY3XjBk5vYDZk6HEsivyBgQqtILMAp8ZhhHqmv9xPD+iz+0q3BKZ9E/9U5Djy 3nD22Q0nNMkJ3hJxov8W84aEfPmVqL8wW865ujxnfBbXDOu89Qsm5SdZVo2ijlsJ4T3K3j ZwQFCz/CISh4ZMxgQuzQvLJ4toXK4M3lqvFZVzEMGy/yEr2/Uuiy9prh5xHh8eH+IH2PKS nWvMLfWd/qqctRcXfUHE9CA0uF3ayD+oPHWIehzBTHfKXh6k1Izkcrym0NbVcWoguGZ5QT ULFPMfab4JwJVWvQ7niAyznq5CwEQZrXE39LM6iza4n/NKkOF3nScs/NfV8dhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y94fL68pNzxXk; Fri, 13 Dec 2024 23:04: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 4BDN4Qlc029114; Fri, 13 Dec 2024 23:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4QSd029112; Fri, 13 Dec 2024 23:04:26 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:26 GMT Message-Id: <202412132304.4BDN4QSd029112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 42ee30f19cc7 - main - depend-cleanup.sh: Need to delete jemalloc.3 in objtree List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42ee30f19cc7ad85187cbf97155dbd5207a04845 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=42ee30f19cc7ad85187cbf97155dbd5207a04845 commit 42ee30f19cc7ad85187cbf97155dbd5207a04845 Author: Warner Losh AuthorDate: 2024-12-13 17:46:59 +0000 Commit: Warner Losh CommitDate: 2024-12-13 23:04:34 +0000 depend-cleanup.sh: Need to delete jemalloc.3 in objtree With the jemalloc.3 move into the tree (it's a generated file that we don't/can't generate as part of the build), we need to remove it from the .OBJDIR or make gets confused about how to build it (honestly for reasons unknown). Sponsored by: Netflix --- tools/build/depend-cleanup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 6e7585f0afe6..81acf517f9d7 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -231,3 +231,11 @@ clean_dep lib/libcrypt crypt-md5 c clean_dep lib/libcrypt crypt-nthash c clean_dep lib/libcrypt crypt-sha256 c clean_dep lib/libcrypt crypt-sha512 c + +# 20241213 b55f5e1c4ae3 jemalloc: Move generated jemalloc.3 into lib/libc tree +if [ -e "$OBJTOP"/lib/libc/jemalloc.3 ]; then + # Have to cleanup the jemalloc.3 in the obj tree since make gets + # confused and won't use the one in lib/libc/malloc/jemalloc/jemalloc.3 + echo "Removing stale jemalloc.3 object" + run rm -f "$OBJTOP"/lib/libc/jemalloc.3 +fi From nobody Fri Dec 13 23:04:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y94fN2hNfz5gH8X; Fri, 13 Dec 2024 23:04: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 4Y94fN0Hzrz4mHm; Fri, 13 Dec 2024 23:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODe/0UWoe9n/Uux+ljXHwfxtAMhAT1aYx9FVGyTAjsM=; b=DmN6qzEO8tFjdnaQI0wta6Gfzpj3GdiR6FcgvnvnGgEnh+C+vZcGOfXB6Xg7dfDPO7dezs QLA5eMgq3krbM0UYT3fmV71rAHb5ytrmIH4u5e8UnJDUlSEjCN5uQiaI7P9v2G5H/PKS3N EuXAa/bz3SWOIBEqrAAGBGyLBjfW2whY6MawRV4EIGfjwX+SEzACZDSpq/MxIVFALCtuWv 3WTBVNpBC+h5Z71HCHiuC1SHDy+WVhZaJRycUvQHCaKqKdT4Z4pyEiibPFCkDas2uOBQ1J z4G953oM0iw6wwRryPSxlANSwlslLqJ31IEI48ClehL8d+BnVmU8bsnznyTxxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODe/0UWoe9n/Uux+ljXHwfxtAMhAT1aYx9FVGyTAjsM=; b=XCvzkCimPffX0zliIocjAcbTq0ruN7OYyCyxPc0yox469OgOssNBPG0V9BC5oY4VKnfwMi PHKJfZoIhacjepwo+lzZIOhEcEfSDKl8pcAZLg4D3uGebn1sc2qiu+EGa4fvssYfACm4Mr dWBUuflqLkTdbZ8XS2D6SIj7j8TME3KBqnZAnVkvkhfoQ7WKpOD4EXzYz0ushQRs5P0kCT wE95p4xBBxgCdSGONZSJoS8pWtdc2i6+9wfuVWXf5kusUALtVwWpzsbC/6adKAKPAmHEgG z1wdI0BosMtn44d3UzmZNMADwsUX2AHtuCXi3kJAu3kE4f3Rl816jxSjKyqO8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131068; a=rsa-sha256; cv=none; b=jyJRtFImQcJORc0+Gklw/mu8Y13c5Pucp7Q+MBTyOZ63U2g9Puv0F8YgGBp7qaqG+mYTCT 1Ml5xoi5diwbIQLeECEmBfRpYy7czWIdePwbyM57MncAwc9GaFIBdYDINXK6r85VqXa+le zbDrNsN1CUvNVDsoIYQKhPam/uZlzHwMJYfJFg+Vh3GoqGMFl0H4b7VyuzjU4Z25IwA7Iu tCKk5hi2iHu0NH7XxkCGGfdCd+XrQpX12J+pjC7d5I4K3F8ODwq9c+maRlQklhb+Ai8e4O LONpHCvOG4eAaATcWWEwiAivv9tHqeoU5ovC5zc57vwDLvwbXMSI1OmyKJ+fpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y94fM6hl0zxXl; Fri, 13 Dec 2024 23:04: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 4BDN4R1r029162; Fri, 13 Dec 2024 23:04:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4RYg029159; Fri, 13 Dec 2024 23:04:27 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:27 GMT Message-Id: <202412132304.4BDN4RYg029159@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7fdf597e96a0 - main - jemalloc: Move generated files into lib/libc tree List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fdf597e96a02165cfe22ff357b857d5fa15ed8a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7fdf597e96a02165cfe22ff357b857d5fa15ed8a commit 7fdf597e96a02165cfe22ff357b857d5fa15ed8a Author: Warner Losh AuthorDate: 2024-12-13 19:15:58 +0000 Commit: Warner Losh CommitDate: 2024-12-13 23:04:39 +0000 jemalloc: Move generated files into lib/libc tree Make it easire to update jemalloc by moving the FreeBSD specific files and the generated files into lib/libc. This allows us to regenerate them more easily, and emphasizes a bit that we may have to regenerate stuff from upstream. This is necessary to also unthin the import from the vendor branch as well (which will be needed to simplify the imports in the future since we are trying to use contrib/jemalloc for two different things). No functional change. Sponsored by: Netflix --- lib/libc/stdlib/malloc/jemalloc/Makefile.inc | 2 +- .../malloc}/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h | 0 .../jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h | 0 .../malloc}/jemalloc/include/jemalloc/internal/jemalloc_preamble.h | 0 .../malloc}/jemalloc/include/jemalloc/internal/private_namespace.h | 0 .../malloc}/jemalloc/include/jemalloc/internal/public_namespace.h | 0 .../libc/stdlib/malloc}/jemalloc/include/jemalloc/jemalloc.h | 0 .../libc/stdlib/malloc}/jemalloc/include/jemalloc/jemalloc_FreeBSD.h | 0 .../libc/stdlib/malloc}/jemalloc/include/jemalloc/jemalloc_typedefs.h | 0 9 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc index 31c7a283f518..c10d79dbce6c 100644 --- a/lib/libc/stdlib/malloc/jemalloc/Makefile.inc +++ b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc @@ -6,7 +6,7 @@ JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bin.c bitmap.c \ prng.c prof.c rtree.c safety_check.c sc.c stats.c sz.c tcache.c \ test_hooks.c ticker.c tsd.c witness.c -CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include +CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include -I${LIBC_SRCTOP}/stdlib/malloc/jemalloc/include .if ${MK_JEMALLOC_LG_VADDR_WIDE} != no CFLAGS+=-D_USE_LG_VADDR_WIDE .endif diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_internal_defs_FreeBSD.h diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_preamble.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/jemalloc_preamble.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/jemalloc_preamble.h diff --git a/contrib/jemalloc/include/jemalloc/internal/private_namespace.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/private_namespace.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/private_namespace.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/private_namespace.h diff --git a/contrib/jemalloc/include/jemalloc/internal/public_namespace.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/public_namespace.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/internal/public_namespace.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/internal/public_namespace.h diff --git a/contrib/jemalloc/include/jemalloc/jemalloc.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/jemalloc.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc.h diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_FreeBSD.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_FreeBSD.h diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h b/lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_typedefs.h similarity index 100% rename from contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h rename to lib/libc/stdlib/malloc/jemalloc/include/jemalloc/jemalloc_typedefs.h From nobody Fri Dec 13 23:04:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y94fP2jGmz5gHNY; Fri, 13 Dec 2024 23:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y94fP1t7Jz4mVr; Fri, 13 Dec 2024 23:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4plu5399ps+dm4wsrd10LGgVoL9iNNuljVohvp/q6g=; b=UjCqsJA9ejIHbAtM/gOQaYa315GLlCjddJ4Q0ULc2M3sdS9FSbPN5J+XBMqr9m77fQ+5iP 2ifzPP18IfB8t/N1Q7P6bBHKqnxxRtoAgBKoUKbtQXW5RUvWRj9CLDMV2eZCxfxT/7EAde NEOfC0j6XKrSL7DoLNPN1HgDXHoUFJvqTpTI5thWSwQDAbSDHPJurR8Z2EKchaWHYAOoqz slGXJkCtrVBIIftA7PkzGzGEKO0cRCThqRmuiPuD3zcT4Ppo1J05Cy+pppbWSJTtcrfjID tuk3QyaKYgx6BCLOqL+hi6EnZ9owIfsdF1zGRn2om9TdKVCrt30XBIr3Vtdepw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4plu5399ps+dm4wsrd10LGgVoL9iNNuljVohvp/q6g=; b=fZ5rAyv+Lqw4Mi2eN4AwHQ22vIsXqgZFqnm7f5I5/EdfDv0lthOxn5NEAARvZuD28/HmYy R1j6mznMoZMu4Y/bQUVLd7mUpNgP848gPwKyNzxhaqIeEjBU+8z4ViTdcoJdVmzBjPg+aV XdpbYTOrKEZvU0HSevkCakTuldwEeDSmuz4VBDUSb2w6a5dAo4tGsP5qE18rvByjyDD1U/ wpYwQgqkxm3xG5ER1G/P4MFLWS9/X/wdY2yAoFD3+gytm6PHKvq6Gw9gpbEdwnt15gdkZE 1bc58XxP0f20GjVV1DleHz+FhMh4Cl4YrPWgKsnNq3w92MG4ITc2tzZ3k1P8sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131069; a=rsa-sha256; cv=none; b=oynZ1qOlmscHPnj67tnonaGCuMYBYGyUXeWq1XJ1sZKSBTM5FvN6YRxhim5zjYhHAGi0eA 30WnMVK+gY1Oz5cZIn5DgZbv4zixEOO1J3kZiMaxlc+O/hmFCLBElSir8fgFCvdcl57BeA gBD/NMOJy45P94GBa3WdEvlx0y+mZKrY1Oe3KOQcezengCMDinGS62jGCDze3cspWi3PBl tboChXLvLEuXu3+QBRx1BvOx5F1+Irnhsz3zrQwmEJIFhli0VdzDJ6Y8A+j0dU1NQDL0wg ecokQoIS0BJlpMbE8zSl9Xk3wOoNWuPt1ASltVW/c3rcgIP2jwmrZRTYNl/wRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y94fP0xHLzxdS; Fri, 13 Dec 2024 23:04: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 4BDN4Tjk029221; Fri, 13 Dec 2024 23:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4Txv029218; Fri, 13 Dec 2024 23:04:29 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:29 GMT Message-Id: <202412132304.4BDN4Txv029218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7bcf5319c110 - main - jemalloc: Reduce diffs to 5.2.1 revert to using JEMALLOC_FALLTHROUGH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bcf5319c1106b761bcb2a4facfeccf1b9db758d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7bcf5319c1106b761bcb2a4facfeccf1b9db758d commit 7bcf5319c1106b761bcb2a4facfeccf1b9db758d Author: Warner Losh AuthorDate: 2024-12-13 22:23:39 +0000 Commit: Warner Losh CommitDate: 2024-12-13 23:04:40 +0000 jemalloc: Reduce diffs to 5.2.1 revert to using JEMALLOC_FALLTHROUGH In the import of 5.2.1 (c5ad81420c495), JEMALLOC_FALLTHROUGH was changed to break (judging by the tagged upstream sources). This changes it back to upstream. No functional change: this is just a textual change (though the fallthrough macro doesn't expand to break). Sponsored by: Netflix --- contrib/jemalloc/include/jemalloc/internal/hash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/jemalloc/include/jemalloc/internal/hash.h b/contrib/jemalloc/include/jemalloc/internal/hash.h index 935ddcfc95a1..0270034e876d 100644 --- a/contrib/jemalloc/include/jemalloc/internal/hash.h +++ b/contrib/jemalloc/include/jemalloc/internal/hash.h @@ -199,7 +199,7 @@ hash_x86_128(const void *key, const int len, uint32_t seed, case 2: k1 ^= tail[ 1] << 8; JEMALLOC_FALLTHROUGH case 1: k1 ^= tail[ 0] << 0; k1 *= c1; k1 = hash_rotl_32(k1, 15); k1 *= c2; h1 ^= k1; - break; + JEMALLOC_FALLTHROUGH } } From nobody Fri Dec 13 23:04:30 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y94fQ55fZz5gH3d; Fri, 13 Dec 2024 23:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y94fQ2K1Bz4mW5; Fri, 13 Dec 2024 23:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/iOGDFFrgiEFvE/sxF48h+Jo8ssIv79DNMwOUBJ2DU8=; b=ISedPU+0cHTOSeTY7lwVQ1qPCb0PaxRyx99wQTF8Rf0dHHfCPEAvgtRGN+09lRu7TiZlqn 8EzZhUtXgjP6BhGii6AgwncZasFv0oL+SfM59jkBquYmShRa5U3KwquH2lQLWv7gIZVxyB j1bjb+XB+a0EB7hhpdcH5+eoPG+adWC+oVbBui2D+VnoTHqUMG5dTCDGvpMTd2/3lnyfbV qOEzc+/dTYEB5AhzpGXjjrwrEvlGZsNQ2sJ2auDL4mV3peJaBAaByiILNwp8WWq6JW9iW2 rNbO2wxNt36UmgPtTnSrldwsBbeV1YaoBwCphExaPc2hfO8ndliuzgnUutX/qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/iOGDFFrgiEFvE/sxF48h+Jo8ssIv79DNMwOUBJ2DU8=; b=KdTtMC4tHQc8dN2xymCH03wbjVCV8NlpJxAmLe1OqgDSPD3OP4yTgOUw8xsWreG7IYQ4FE +VLlVv3R98C4Ub5rpEah7YM7oGAYDzRDRkpw+kijPFpD74lhMld/voVMZqovcW8r2GRpVt dw5ajmqY9fuCc+IiOzVLT4JstfN3SBtranndmQVOmChXtSm7qt22g3CEbjkNKieZsR657w mUmVFi9eOQVptHatwLAtD47RAbeYSt2QyOXNHPBIU7jACg38YNjzQz3Kr7m/AwyeZuWTe7 Is3/wV8rd6D9/kZOIc1KYkE4RkRQK1R3o3GE239IwrXlQkV0a+myEr2Bdn/lcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131070; a=rsa-sha256; cv=none; b=jNMQbmWJEW1BR/SpKgK3gJ0GNLjxmssSwC1AXBRLOgWIjgcyTNfvGwUMKPYkzwLBxVxSXR LYkW1iI1zQb7W9SGucwgD0TmdNlvmAT7YrGyNRMCBjB1CDQierZYcXN6rTqVNzu+ECQBw3 mFCElKqalEN6oG4s98ca4ZYQaKHBzo9pb3f9cHZ6/OlN1bP+eYH55xM9pKi3RkomW391NL QeKBHm6k3kJ0P2oFN+GYicHPmFmtl1AUPCC9Lrs2OkdPsrNlpVCtGZ8I5GD0SKhJ/JrkbA 6Z0AtkmPOs589TWGl3O9nYHJ7NwGxiph0qPmcq53/KgtWXS5Y/lwaSZTrEk+jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y94fQ1vgxzxLv; Fri, 13 Dec 2024 23:04: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 4BDN4UuQ029274; Fri, 13 Dec 2024 23:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4UWP029271; Fri, 13 Dec 2024 23:04:30 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:30 GMT Message-Id: <202412132304.4BDN4UWP029271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: db589b5de608 - main - jemalloc: Retire ifdef for ELF_BSDF_VMNOOVERCOMMIT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db589b5de60806aa5e775ed075cb76a09ccdb95f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=db589b5de60806aa5e775ed075cb76a09ccdb95f commit db589b5de60806aa5e775ed075cb76a09ccdb95f Author: Warner Losh AuthorDate: 2024-12-13 22:47:47 +0000 Commit: Warner Losh CommitDate: 2024-12-13 23:04:40 +0000 jemalloc: Retire ifdef for ELF_BSDF_VMNOOVERCOMMIT ELF_BSDF_VMNOOVERCOMMIT was introduced in time for stable/13 (but not stable/12), so is now in all supported branches. We're highly unlikely to merge future versions to stable/13 let alone anything earlier. Sponsored by: Netflix --- contrib/jemalloc/src/pages.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/jemalloc/src/pages.c b/contrib/jemalloc/src/pages.c index 6405bb528984..5df9ccdfe5df 100644 --- a/contrib/jemalloc/src/pages.c +++ b/contrib/jemalloc/src/pages.c @@ -441,13 +441,10 @@ static bool os_overcommits_sysctl(void) { int vm_overcommit; size_t sz; - -#ifdef ELF_BSDF_VMNOOVERCOMMIT int bsdflags; if (_elf_aux_info(AT_BSDFLAGS, &bsdflags, sizeof(bsdflags)) == 0) return ((bsdflags & ELF_BSDF_VMNOOVERCOMMIT) == 0); -#endif sz = sizeof(vm_overcommit); #if defined(__FreeBSD__) && defined(VM_OVERCOMMIT) From nobody Fri Dec 13 23:04:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y94fS1Jwbz5gH1d; Fri, 13 Dec 2024 23:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y94fR3FFFz4mrw; Fri, 13 Dec 2024 23:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ntuG8uxFqxRAmYH7SER/HI/20SbBZD24aLKitIrukT4=; b=Suh5duBHiy8X7lExtCtwnF3qtk5QrKbYzWHt7WB/xfqaVC9LppI8RfNtpBajRVpAzomvMr py1cKlt9vSpNM4ph7a2HMfHYCdu5vP6g0e842n4bCcFNaINxQcGLTYj8wOnyNn1i9iug8V SjeMVVFBGPjVQX6DoufpbWadul+spHFOFN9JKJbTrcxvx30/9dWzLwarJPuijRFoF4efvl Zy+9bTHozsPnI/CRjcveBB5xBOWZaPujzNnWylRusWk1nA6Uc7gA8F4C4muBYhx9jP1MLl vt5l3v3QAuOgektcdBgqTJjfHBrluqYMGL03qRyuyORu5Ah9nIRviQuDEXcZ3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ntuG8uxFqxRAmYH7SER/HI/20SbBZD24aLKitIrukT4=; b=ZPrpXTLNwval3kG0ffUEzudHd9aUxZMti74S0bO3hiiYAsN3kJVYeLfs+3/Mw+aswY8OoF L5MHIk1G4bypF6LKK8gaH40Q8kfvVdBeeWApHnkpYZ3tZ+SHiLYz+4McWFFhUxW839Itcr kVh7lOpdJeGhtDW78X67b3o2wFoPaeZdnn5Lm4RvZkxeUdBlc3KqgYVJipAh98nia6ogN8 VbJuCyRHl+TTB4eKSlVTEkEyxQTUIszac97yjaj0aBDm7dYeB67QRp+REv1RQhS4raGtC0 7lG+xUGFylt/CM5KWiqrzIUYcyBW/ebFqWjvuDwBkePoO3aOjpU9fkzwOLsmVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131071; a=rsa-sha256; cv=none; b=VTt7t1oVVvpPjy6zt+cQvMLEHSFiVsv7Iy7eDWIWM1q+HKQS49nirY1I2tGdA8H6frWHx7 vGJPu8hZVrWLbey4icDtIXFkb2NrH0tjDH5eSbYNxNyKJxPf8+26TdtbT/S2wyo0mFoOy/ BcB5kMwNlQlVKAwooElqTi6kLhoSOcFPPU2mCfhTTLH54G8h9pmg9ltUxkmB4MLvUyl1R0 s5+DKC7cUGIin+JCfOgbDq+tn+sL/dR/h8hXQLplD77YTiMK/cMm810L2/4e+pUyPVcfn2 u/W28dpogIbiFUgEoZypb/4VqOMIuZbOwXF1q2PHpdrNoK66RAnia1KnnRwUtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y94fR2fWFzx4h; Fri, 13 Dec 2024 23:04: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 4BDN4Vme029316; Fri, 13 Dec 2024 23:04:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4Vx5029313; Fri, 13 Dec 2024 23:04:31 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:31 GMT Message-Id: <202412132304.4BDN4Vx5029313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 59e013a52c22 - main - jemalloc: Retire SWAP_RESERVE_* compat shims List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59e013a52c22624be0f4b0f9bfe0918bc6f50b93 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=59e013a52c22624be0f4b0f9bfe0918bc6f50b93 commit 59e013a52c22624be0f4b0f9bfe0918bc6f50b93 Author: Warner Losh AuthorDate: 2024-12-13 22:49:42 +0000 Commit: Warner Losh CommitDate: 2024-12-13 23:04:40 +0000 jemalloc: Retire SWAP_RESERVE_* compat shims We no longer need these compat shims. They were needed for FreeBSD 12 and earlier. Sponsored by: Netflix --- contrib/jemalloc/src/pages.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/contrib/jemalloc/src/pages.c b/contrib/jemalloc/src/pages.c index 5df9ccdfe5df..1050c3925153 100644 --- a/contrib/jemalloc/src/pages.c +++ b/contrib/jemalloc/src/pages.c @@ -461,10 +461,6 @@ os_overcommits_sysctl(void) { } #endif -#ifndef SWAP_RESERVE_FORCE_ON -#define SWAP_RESERVE_FORCE_ON (1 << 0) -#define SWAP_RESERVE_RLIMIT_ON (1 << 1) -#endif return ((vm_overcommit & (SWAP_RESERVE_FORCE_ON | SWAP_RESERVE_RLIMIT_ON)) == 0); } From nobody Sat Dec 14 00:14:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y96CG1VY1z5gMM7; Sat, 14 Dec 2024 00:14:34 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f176.google.com (mail-il1-f176.google.com [209.85.166.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y96CF6My8z40lk; Sat, 14 Dec 2024 00:14:33 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-f176.google.com with SMTP id e9e14a558f8ab-3a9cdcec53fso19081395ab.1; Fri, 13 Dec 2024 16:14:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734135272; x=1734740072; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XaiU5zLIUuI8U7FrU0JqbyROmWcBCTMCzx3ieJFDCcM=; b=ACqUloW8whkxBreVM7rvsN2g5ewqQGzvsJytTUgkFsjJg4atPXjeDpwwqHffC8Ve1z BE+53S4FhyIRrGFHG/NFeXAojcwTg8Yuke5M+Jh8jO1ZV6BOs+Y/EzchuvCtgDC6va6a PBqqt/+eYWaEMkxiwZN/VCy+r88ED318zfdLc/5jsC79vRJ8VOWNGtpzZlXdzWvCG5uw fIglcXqZRzMysRmKBTOKBc80CVH8slw1819iLMUBzmR/I6DvnvlpxojnC4l+5Ot+P9vy vwb0op5qZ+Fo/QUW+W9S9Deoc3cFnybBaIEtFOZhrpTjYlxpmhLRjgRwlqx0onTP0smF lkew== X-Forwarded-Encrypted: i=1; AJvYcCUqEa0TVnOCqmwugaLbut4ryJz015UqPQwERYk03wFbsqZfTvKZc+jccaTo736xSQGBW0lA6VWGdWn32CdDplAMN/Qz@freebsd.org, AJvYcCVmSY8AiUmJtfaERZTa0j4Z6fddLC+ntxVlXmdmBz8yTD02iCi0GdeiAGoYU1DPOMJXrtODP8OslHYaKGBczFZ42ddhmws=@freebsd.org X-Gm-Message-State: AOJu0Yx0xwHZ7eLQ354Ohe+GNLJaYvcSQEOIOSrx1rHOnOtpPiNdCLLG BlNxiJLi7sTdAuB3yvKKQuqwnnBYZj8/8GjWGvnBQuifg0ov/eWU4EH93pdDXd1rMi9BbuYz3DS RVhFo/G1CAk/J3BkrE0cro46zc1dRou16 X-Gm-Gg: ASbGnctnoGglhcpDUrWd7ZygaA9qSFCeY3x0K4saN/IUtFHBh69+ASfAsIsqVSWaDcz nAxFhb+4Id/qh6oO2SWyMEQuZSysRT20gr6jSNA== X-Google-Smtp-Source: AGHT+IGlHlcfsOtsfSZZxo+MA25xKS7KOBQzgGwj4Hl4HiDc+be5e0C5dmo5kAH6MCHannFtQMhbw00m441hzE+h9r4= X-Received: by 2002:a05:6e02:156a:b0:3a7:a3a4:2cb3 with SMTP id e9e14a558f8ab-3aff8c92298mr51543085ab.15.1734135272536; Fri, 13 Dec 2024 16:14:32 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202412131306.4BDD6bxu011253@gitrepo.freebsd.org> In-Reply-To: From: Ed Maste Date: Fri, 13 Dec 2024 19:14:21 -0500 Message-ID: Subject: Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Y96CF6My8z40lk X-Spamd-Bar: ---- On Fri, 13 Dec 2024 at 09:53, John Baldwin wrote: > > On 12/13/24 08:06, Ed Maste wrote: > > The branch main has been updated by emaste: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=a1097094c4c5d810287aca092f4ab5f9f86a426a > > > > commit a1097094c4c5d810287aca092f4ab5f9f86a426a > > Author: Pat Maddox > > AuthorDate: 2024-12-13 05:28:18 +0000 > > Commit: Ed Maste > > CommitDate: 2024-12-13 13:06:10 +0000 > > > > newvers: Set explicit git revision length > > > > The --short flag is configurable. Setting an explicit length supports > > reproducible builds. > > > > Signed-off-by: Pat Maddox > > Reviewed by: emaste, imp > > Differential revision: https://github.com/freebsd/freebsd-src/pull/1547 > > Hmm, this seems to defeat the purpose of the --short flag. I think if you want > this to be reproducible you just need to use the full hash. If we get enough commits > that git thinks we need a longer short hash, then truncating the hash to a shorter > length here is a bug. --short with no explicit length is most likely to result in nonreproducibility due to a user setting a different default short length in their git config. Note that --short won't truncate and result in a conflict, it will just exceed the specified length if necessary. For example, $ git rev-parse --short=4 freebsd/main 926905 It's possible for this to result in occasional trouble when attempting to reproduce an older build (if --short=12 is sufficient today, but a future commit introduces a conflict), but I don't think it's a large concern. We could increase it to 13 or 14 now. From nobody Sat Dec 14 02:17:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y98xd3ZWJz5gWNF; Sat, 14 Dec 2024 02:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y98xd2qf9z4X5s; Sat, 14 Dec 2024 02:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xighsT3paNQ4BBIzQnxL5eFKCFQwkf3TK02GborEoJQ=; b=iFayCAnSulh2PeQFwIAnOtmDV08wFvGr0btzfjqyUVXXhW4He1bfZ/sJm6uzgEHZfXKggl pU8L78X4vHBC363I6Jaw8u7CTcKkHhki3pD1WvOiOFBKuM2DvD2zIsLdqMMz5vMiLKAKts Qujqj98zdUnBHRDrtxY99xb0GZrvk6MxzAJmKR0Ha5tOfFLVmdqpYJiKTj6gY256FQSnuy FB6+GCib09PIkXFxSPx22ddAsd2BuPQMtrfikC74Z0TIOl0Ebi6YPXaqGUBb0klEPmX8c4 a9ZjdVJFITBGkvtxyn/SqC3ktDJrSPibdDfMAZMKzppSSVaw4AFNnMjijGwS8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xighsT3paNQ4BBIzQnxL5eFKCFQwkf3TK02GborEoJQ=; b=kxrXsnzKiFi6t5NPSqpx00UWtru33jL1IoNiRJyBCnonCSp2PPKWEW/k822psdV+7577/5 QrZGa+5TiAxAE+Xv/M4F0g+p/NDH2aXASd6kjhsvhZYuKw4Pc+F8tbAYXYGcD0SUCQD8Sc KQCDrfT11wl5q4jSrVuY1Onux5N95uLOjqBGnR4vq1cT7EbdXLEN+4tROzQ3U3cjIGs46r jgBPsse9oLbFZIawut8RkH510csKt8vkLnqsdfBnf1KYY3xN4vFAlWlBiVC+kt++I3kEiO Fz4pqbwJnzY3USDINwJ9JpGRpLwKdavIrGSZ7TiAPbqcIm1Ek29AEpQ0J58Cfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734142677; a=rsa-sha256; cv=none; b=KfgaOg+qPpzKFLUqUCT7KsDyjh5R+ZwvuslYE6B5I0gg3zGa36fryobiCM1yE8BYuLFd1V U3pdy+gzpvO0kfqhq6nsBQplkU5HpUYcInoQs/e7XsaGHiMfMD39/QFdYTFTl7QdS6OW4M cbIrkCU+2S1AeTvYrrjVItjAsdY2s2Eqz3UX0C8WO8bsnDce2AJAZmRf5Wqo5lcKAIVUyW qbiY7C2aGpEwDz8TUSua6szvZ0UoQZMoPvKoqW8kVSc2aGfpIBodzTwoEaR70lON3gJIZL uD12y5MhiyteehzrU0KYySiQFxBrquYc6WnS1SNlxPxt9yFoNOXC2o37B4PqUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y98xd2Bmyz13C2; Sat, 14 Dec 2024 02:17:57 +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 4BE2Hv0V085868; Sat, 14 Dec 2024 02:17:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE2Hv5D085866; Sat, 14 Dec 2024 02:17:57 GMT (envelope-from git) Date: Sat, 14 Dec 2024 02:17:57 GMT Message-Id: <202412140217.4BE2Hv5D085866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 7722d5e21477 - main - rtwn: add RTL8812/RTL8821 VHT80 channel programming, spur management List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7722d5e214772be22ef20bee46afeed2e9f78858 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=7722d5e214772be22ef20bee46afeed2e9f78858 commit 7722d5e214772be22ef20bee46afeed2e9f78858 Author: Adrian Chadd AuthorDate: 2024-12-04 05:58:05 +0000 Commit: Adrian Chadd CommitDate: 2024-12-14 02:17:27 +0000 rtwn: add RTL8812/RTL8821 VHT80 channel programming, spur management * add VHT80 channel programming * add VHT80 spur management, sync with Linux rtw88 Obtained from: Linux rtw88 Differential Revision: https://reviews.freebsd.org/D47901 --- sys/dev/rtwn/rtl8812a/r12a_chan.c | 81 ++++++++++++++++++++++++++++++++++----- sys/dev/rtwn/rtl8812a/r12a_reg.h | 4 ++ 2 files changed, 75 insertions(+), 10 deletions(-) diff --git a/sys/dev/rtwn/rtl8812a/r12a_chan.c b/sys/dev/rtwn/rtl8812a/r12a_chan.c index 789a14b0e1d6..749f0e09e831 100644 --- a/sys/dev/rtwn/rtl8812a/r12a_chan.c +++ b/sys/dev/rtwn/rtl8812a/r12a_chan.c @@ -374,12 +374,20 @@ r12a_fix_spur(struct rtwn_softc *sc, struct ieee80211_channel *c) } else { rtwn_bb_setbits(sc, R12A_RFMOD, 0x400, 0x800); - if (!IEEE80211_IS_CHAN_HT40(c) && /* 20 MHz */ + if ((IEEE80211_IS_CHAN_B(c) || + IEEE80211_IS_CHAN_ANYG(c) || + IEEE80211_IS_CHAN_HT20(c)) && /* 2GHz, 20 MHz */ (chan == 13 || chan == 14)) { rtwn_bb_setbits(sc, R12A_RFMOD, 0, 0x300); rtwn_bb_setbits(sc, R12A_ADC_BUF_CLK, 0, 0x40000000); - } else { /* !80 Mhz */ + } else if (IEEE80211_IS_CHAN_HT40(c) || + IEEE80211_IS_CHAN_VHT40(c)) { + /* XXX double check! */ + rtwn_bb_setbits(sc, R12A_ADC_BUF_CLK, + 0, 0x40000000); + } else if (IEEE80211_IS_CHAN_VHT80(c)) { + /* XXX double check! */ rtwn_bb_setbits(sc, R12A_RFMOD, 0x100, 0x200); rtwn_bb_setbits(sc, R12A_ADC_BUF_CLK, 0x40000000, 0); @@ -387,7 +395,9 @@ r12a_fix_spur(struct rtwn_softc *sc, struct ieee80211_channel *c) } } else { /* Set ADC clock to 160M to resolve 2480 MHz spur. */ - if (!IEEE80211_IS_CHAN_HT40(c) && /* 20 MHz */ + if ((IEEE80211_IS_CHAN_B(c) || + IEEE80211_IS_CHAN_ANYG(c) || + IEEE80211_IS_CHAN_HT20(c)) && /* 2GHz, 20 MHz */ (chan == 13 || chan == 14)) rtwn_bb_setbits(sc, R12A_RFMOD, 0, 0x300); else if (IEEE80211_IS_CHAN_2GHZ(c)) @@ -489,16 +499,67 @@ r12a_set_chan(struct rtwn_softc *sc, struct ieee80211_channel *c) rtwn_rf_setbits(sc, i, R92C_RF_CHNLBW, 0xff, chan); } -#ifdef notyet - if (IEEE80211_IS_CHAN_HT80(c)) { /* 80 MHz */ - rtwn_setbits_2(sc, R92C_WMAC_TRXPTCL_CTL, 0x80, 0x100); + if (IEEE80211_IS_CHAN_VHT80(c)) { /* 80 MHz */ + uint8_t ext20 = 0, ext40 = 0; + uint8_t txsc; + /* calculate ext20/ext40 */ + if (c->ic_ieee > c->ic_vht_ch_freq1) { + if (c->ic_ieee - c->ic_vht_ch_freq1 == 2) { + ext20 = R12A_DATA_SEC_PRIM_UP_20; + ext40 = R12A_DATA_SEC_PRIM_UP_40; + } else { + ext20 = R12A_DATA_SEC_PRIM_UPPER_20; + ext40 = R12A_DATA_SEC_PRIM_UP_40; + } + } else { + if (c->ic_vht_ch_freq1 - c->ic_ieee == 2) { + ext20 = R12A_DATA_SEC_PRIM_DOWN_20; + ext40 = R12A_DATA_SEC_PRIM_DOWN_40; + } else { + ext20 = R12A_DATA_SEC_PRIM_LOWER_20; + ext40 = R12A_DATA_SEC_PRIM_DOWN_40; + } + } + /* Form txsc from sec20/sec40 config */ + txsc = SM(R12A_DATA_SEC_TXSC_20M, ext20); + txsc |= SM(R12A_DATA_SEC_TXSC_40M, ext40); + + rtwn_setbits_2(sc, R92C_WMAC_TRXPTCL_CTL, 0x180, 0x100); - /* TODO */ + /* DATA_SEC, for ext20/ext40 */ + rtwn_write_1(sc, R12A_DATA_SEC, txsc); + + /* ADCCLK */ + rtwn_bb_setbits(sc, R12A_RFMOD, 0x003003c3, 0x00300202); + + /* ADC160 - Set bit 30 */ + rtwn_bb_setbits(sc, R12A_ADC_BUF_CLK, 0, 0x40000000); + + /* ADCCLK, ext20 */ + /* discard high 4 bits */ + val = rtwn_bb_read(sc, R12A_RFMOD); + val = RW(val, R12A_RFMOD_EXT_CHAN, ext20); + rtwn_bb_write(sc, R12A_RFMOD, val); + /* CCA2ND, ext20 */ + val = rtwn_bb_read(sc, R12A_CCA_ON_SEC); + val = RW(val, R12A_CCA_ON_SEC_EXT_CHAN, ext20); + rtwn_bb_write(sc, R12A_CCA_ON_SEC, val); + + /* PEAK_TH */ + if (rtwn_read_1(sc, 0x837) & 0x04) + val = 0x01400000; + else if (sc->nrxchains == 2 && sc->ntxchains == 2) + val = 0x01800000; + else + val = 0x01c00000; + + rtwn_bb_setbits(sc, R12A_L1_PEAK_TH, 0x03c00000, val); + /* BWMASK */ val = 0x0; - } else -#endif - if (IEEE80211_IS_CHAN_HT40(c)) { /* 40 MHz */ + + } else if (IEEE80211_IS_CHAN_HT40(c) || + IEEE80211_IS_CHAN_VHT40(c)) { /* 40 MHz */ uint8_t ext_chan; if (IEEE80211_IS_CHAN_HT40U(c)) diff --git a/sys/dev/rtwn/rtl8812a/r12a_reg.h b/sys/dev/rtwn/rtl8812a/r12a_reg.h index 4f5f6f28c11a..13867fb76973 100644 --- a/sys/dev/rtwn/rtl8812a/r12a_reg.h +++ b/sys/dev/rtwn/rtl8812a/r12a_reg.h @@ -45,6 +45,10 @@ #define R12A_AMPDU_MAX_TIME 0x456 #define R12A_AMPDU_MAX_LENGTH R92C_AGGLEN_LMT #define R12A_DATA_SEC 0x483 +#define R12A_DATA_SEC_TXSC_20M_M 0x0000000f +#define R12A_DATA_SEC_TXSC_20M_S 0 +#define R12A_DATA_SEC_TXSC_40M_M 0x000000f0 +#define R12A_DATA_SEC_TXSC_40M_S 4 #define R12A_ARFR_2G(i) (0x48c + (i) * 8) #define R12A_HT_SINGLE_AMPDU 0x4c7 From nobody Sat Dec 14 02:17:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y98xf4pHnz5gWQv; Sat, 14 Dec 2024 02:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y98xf3LqXz4X0v; Sat, 14 Dec 2024 02:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8z4p1IcPUJ6vDcnBtlTuMLeSnCXxqKPbM12I77dJOQY=; b=ScfDcmMRN42gmplha5OptIOnTdlFkozT+8kr5LqIMni6uWuTXFj77MotcKYsVeQP45EWtB 6ZBdoKkv7stOVP+H5X+031f5nWVovnF1ORWapQVHZqEOpHQzapKZRhwId7qVeUBr1k56fw 7d6GyzDCbP95ltEAFykB455N0TIJh8SJ9Vn6USE4NKlcwuJHqmZ73zdzsk/JjtU92oQ4uc 5rFWou8QfUahNvdiCKrvYejFT/q2Hn/SvUQi0KTntWaVa8FksS/oiteTkcjhS5JVoWoeLJ 6pNx1rkl/KhMOmr0Qr6ulTmJ4k4UDgVP12KYim+VKg0hFvSKd3NE/bSnjs01Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8z4p1IcPUJ6vDcnBtlTuMLeSnCXxqKPbM12I77dJOQY=; b=M1LTyNeXn94te0Ev4B4HT1W45SvDwdeTnqkf9Zdx28iTV7C0F9+2pBW6HxuYUblRNi9HUQ GnJy4WmguonuN2MlFI15Ic1s0wG//A7fcWMOElyceV6+3Lqlg20bOQPPfeX2La7D3wjeTF ND7pZHm9/NaJDB0m54MQQy7ydaQxQcqWQSJRWPgFRkQWwsKiOG4BsouW+MO99hFSbYxp1R hulkiy/pX/D79G1Qp3VTY26bDM86fb8XZJjTbNAbdG2J5cQw1FnuW6AODUGl6dLsIRYOJk 6yzGF9qVRpnRhId/8gNx/YLJD8sG7TMSdycydPRbY6wXJmnqOwgNZMQVPQYDRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734142678; a=rsa-sha256; cv=none; b=K7ZLAWQkDUNWAoG9F9f8uoYuQ4xg0StB35K9r221EgSjKbd1NbjwFe3qD6eC1TNrnT+suT WB386Wxu+4pQA0Q325Z9fqiMozp+FoJzeC6DANp31wr3Cibcr1LbcGMuGTZXi6V73ulXd7 LdLKAihWU6crCDNb402VW1upRU9JIsufLMT32mnLrAIPg5stJGTDk2XDU5BkTvoCsQOnYS j1g1Db5qmHr/gUfSFB+eMGI3BMQW7LMlVKaWQtfFpIZrbYviMg+8uM8Dmpjd75Z16v3WHd 5dP6JEfTlwgZl4rydtckGL4miSf21WG7TGPVCrUgXvF4qvlw1AeqKRzNPXJB+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y98xf2yTlz13Hy; Sat, 14 Dec 2024 02:17:58 +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 4BE2HwL3085922; Sat, 14 Dec 2024 02:17:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE2HwHD085919; Sat, 14 Dec 2024 02:17:58 GMT (envelope-from git) Date: Sat, 14 Dec 2024 02:17:58 GMT Message-Id: <202412140217.4BE2HwHD085919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 7b71689c9ccd - main - rtwn: update RTL8812AU/RTL8821AU receive path to include VHT info List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b71689c9ccd71d9683e6d55d42e090e292d13d2 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=7b71689c9ccd71d9683e6d55d42e090e292d13d2 commit 7b71689c9ccd71d9683e6d55d42e090e292d13d2 Author: Adrian Chadd AuthorDate: 2024-12-04 06:26:09 +0000 Commit: Adrian Chadd CommitDate: 2024-12-14 02:17:40 +0000 rtwn: update RTL8812AU/RTL8821AU receive path to include VHT info * RX frames with short-GI can be either HT or VHT * Add placeholders for RX VHT rate, PHY type, etc Differential Revision: https://reviews.freebsd.org/D47902 --- sys/dev/rtwn/rtl8812a/r12a_rx.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/dev/rtwn/rtl8812a/r12a_rx.c b/sys/dev/rtwn/rtl8812a/r12a_rx.c index 482e4ee38c81..805775033fd1 100644 --- a/sys/dev/rtwn/rtl8812a/r12a_rx.c +++ b/sys/dev/rtwn/rtl8812a/r12a_rx.c @@ -246,7 +246,8 @@ r12a_get_rx_stats(struct rtwn_softc *sc, struct ieee80211_rx_stats *rxs, rxs->c_pktflags |= IEEE80211_RX_F_AMPDU_MORE; } - if ((rxdw4 & R12A_RXDW4_SPLCP) && RTWN_RATE_IS_HT(rate)) + if ((rxdw4 & R12A_RXDW4_SPLCP) && + (RTWN_RATE_IS_HT(rate) || RTWN_RATE_IS_VHT(rate))) rxs->c_pktflags |= IEEE80211_RX_F_SHORTGI; switch (MS(rxdw4, R12A_RXDW4_BW)) { @@ -277,11 +278,14 @@ r12a_get_rx_stats(struct rtwn_softc *sc, struct ieee80211_rx_stats *rxs, rxs->c_phytype = IEEE80211_RX_FP_11A; else rxs->c_phytype = IEEE80211_RX_FP_11G; - } else { + } else if (RTWN_RATE_IS_HT(rate)) { if (is5ghz) rxs->c_phytype = IEEE80211_RX_FP_11NA; else rxs->c_phytype = IEEE80211_RX_FP_11NG; + } else if (RTWN_RATE_IS_VHT(rate)) { + /* TODO: there's no FP_VHT_5GHZ yet */ + rxs->c_phytype = IEEE80211_RX_FP_11NA; } } @@ -292,11 +296,15 @@ r12a_get_rx_stats(struct rtwn_softc *sc, struct ieee80211_rx_stats *rxs, rxs->c_pktflags |= IEEE80211_RX_F_CCK; else rxs->c_pktflags |= IEEE80211_RX_F_OFDM; - } else { /* MCS0~15. */ - /* TODO: VHT rates */ + } else if (RTWN_RATE_IS_HT(rate)) { /* MCS0~15. */ rxs->c_rate = IEEE80211_RATE_MCS | RTWN_RIDX_TO_MCS(rate); rxs->c_pktflags |= IEEE80211_RX_F_HT; + } else if (RTWN_RATE_IS_VHT(rate)) { + /* XXX: need to revisit VHT rate representation */ + rxs->c_vhtnss = (rate - RTWN_RIDX_VHT_MCS_SHIFT) / 10; + rxs->c_rate = (rate - RTWN_RIDX_VHT_MCS_SHIFT) % 10; + rxs->c_pktflags |= IEEE80211_RX_F_VHT; } /* From nobody Sat Dec 14 02:17:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y98xg67dJz5gWLf; Sat, 14 Dec 2024 02:17: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 4Y98xg584vz4X7b; Sat, 14 Dec 2024 02:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tGf3XC+V+8HmfT8ip82320v29oN58qgv58dZN4P7gAE=; b=v4kIujNx8EGbtBFFGCqJKs0SxNF/h+ahlflm+VvtXxKSVJ+5Wr6jWLFHIsyIYsemJVGEUS 1J5OXb1P86SXVweyfYUmbAjide0zQoOoBS7h1098z77qcvGCXrPnzmVAXVFOvGTeS1OaiT 02i1P4tW17P/gAG2T7s0PSEK69iWiyEFiXKUhvkOv92popJXWk2cY2hFOfGyYYAHijEFVU 4zgrHLG0RHsOASKUhQtYgDdiNkyvdvZfV3KfRxPX9clSz1SucZbGh7NjSbA2xCnC/G7wmT 0uZhwhGc1sK9CiEkBmKPUdZpeTbSfdmL8GCTQGAymsXgStkSlb9oacSwdAhc6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tGf3XC+V+8HmfT8ip82320v29oN58qgv58dZN4P7gAE=; b=vkYVaXhCNJGc5IWKhC8tWnLR5D8bXdNsK0PJi1Xzd7C/SxoCUwRj3afwTw2KOorF8woJTR kM2CO8Qw8koq1nLGxz1qaKEn2gKAeObVppl9AS/5LLq+k2usYLllKiRE+YaQJuf/CU6r3R Wd1kezjUOYIt9LkjQyWbAQwOWz0fxM1nsnElIUnATSvS2ORdcepc4KdVExEbs2zgN6mTq8 YM4epmgj08Paog8c9YqM0kYoSlpVDpRx/KisX0T1fZvq2NlRjXIutrkzsNURXXe4r/juSq fRTSXkwW+iTbnvPGUmMO6cH9hStLgrBsKDgNj6gg48SvlEAQZmrviSkcl2VDow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734142679; a=rsa-sha256; cv=none; b=vJ5ah5cYAuliS2Ucm9H0enxBQrmQaj1c8uA7DwYUivNN6VJlK3UBt1yB5KhAzny38cTmDp zFH3DFSlbl9XcubmPIkKIITmkHZu4Cq7nyzXAp2RuFsHhVyaW7L441KKCG4v1Yh34VfoEQ FU9jt3QorDDpToechtCvo1e3BnyCSPeHB2WwJbD1/qwa/waTKz+FmcMghpadro2Jj5Pih5 ug59Xyh6zVkgj6HgDWJZ89Bvh6wkM4ABgdO4dwBN1y1YV88mrZlVl6hdy24NSAfGjTDOl1 xR1ejAkTQNnsO85pdvJ8nfdhS1YVsgP1FElovsAZS3MW3DbCf42qKmYICci3Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y98xg40kFz13J0; Sat, 14 Dec 2024 02:17: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 4BE2Hx1N085979; Sat, 14 Dec 2024 02:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE2HxFO085976; Sat, 14 Dec 2024 02:17:59 GMT (envelope-from git) Date: Sat, 14 Dec 2024 02:17:59 GMT Message-Id: <202412140217.4BE2HxFO085976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 35e63136a8c2 - main - rtwn: add a register value for R92C_FPGA0_POWER_SAVE, and other bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35e63136a8c264b96cc07c1a2cd51e5894cfa67c Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=35e63136a8c264b96cc07c1a2cd51e5894cfa67c commit 35e63136a8c264b96cc07c1a2cd51e5894cfa67c Author: Adrian Chadd AuthorDate: 2024-12-06 23:51:07 +0000 Commit: Adrian Chadd CommitDate: 2024-12-14 02:17:52 +0000 rtwn: add a register value for R92C_FPGA0_POWER_SAVE, and other bits * add a register value for the R92C_FPGA0_POWER_SAVE register * add the field names and mask * add a mask for the 40MHz upper/lower bits in R92C_RMRR; I think I need to debug and overhaul the 20/40MHz config path to get 40MHz working right. Local testing: * rtl8188eu, sta mode * rtl8192cu, sta mode --- sys/dev/rtwn/rtl8192c/r92c_chan.c | 3 ++- sys/dev/rtwn/rtl8192c/r92c_reg.h | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/rtwn/rtl8192c/r92c_chan.c b/sys/dev/rtwn/rtl8192c/r92c_chan.c index 55d73c934f1e..108fbbf16c59 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_chan.c +++ b/sys/dev/rtwn/rtl8192c/r92c_chan.c @@ -262,7 +262,8 @@ r92c_set_bw40(struct rtwn_softc *sc, uint8_t chan, int prichlo) rtwn_bb_setbits(sc, R92C_FPGA0_ANAPARAM2, R92C_FPGA0_ANAPARAM2_CBW20, 0); - rtwn_bb_setbits(sc, 0x818, 0x0c000000, (prichlo ? 2 : 1) << 26); + rtwn_bb_setbits(sc, R92C_FPGA0_POWER_SAVE, + R92C_FPGA0_POWER_SAVE_PS_MASK, (prichlo ? 2 : 1) << 26); /* Select 40MHz bandwidth. */ rtwn_rf_write(sc, 0, R92C_RF_CHNLBW, diff --git a/sys/dev/rtwn/rtl8192c/r92c_reg.h b/sys/dev/rtwn/rtl8192c/r92c_reg.h index e640b6b560b1..6ca4a4eca031 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_reg.h +++ b/sys/dev/rtwn/rtl8192c/r92c_reg.h @@ -520,6 +520,7 @@ #define R92C_RRSR_RATE_BITMAP_S 0 #define R92C_RRSR_RATE_CCK_ONLY_1M 0xffff1 #define R92C_RRSR_RATE_ALL 0xfffff +#define R92C_RRSR_RSC_SUBCHNL_MASK 0x00600000 #define R92C_RRSR_RSC_LOWSUBCHNL 0x00200000 #define R92C_RRSR_RSC_UPSUBCHNL 0x00400000 #define R92C_RRSR_SHORT 0x00800000 @@ -668,6 +669,7 @@ */ #define R92C_FPGA0_RFMOD 0x800 #define R92C_FPGA0_TXINFO 0x804 +#define R92C_FPGA0_POWER_SAVE 0x818 #define R92C_HSSI_PARAM1(chain) (0x820 + (chain) * 8) #define R92C_HSSI_PARAM2(chain) (0x824 + (chain) * 8) #define R92C_TXAGC_RATE18_06(i) (((i) == 0) ? 0xe00 : 0x830) @@ -725,6 +727,11 @@ #define R92C_RFMOD_CCK_EN 0x01000000 #define R92C_RFMOD_OFDM_EN 0x02000000 +/* Bits for R92C_FPGA0_POWER_SAVE. */ +#define R92C_FPGA0_POWER_SAVE_PS_MASK 0x0c000000 +#define R92C_FPGA0_POWER_SAVE_PS_LOWER_CHANNEL 0x04000000 +#define R92C_FPGA0_POWER_SAVE_PS_UPPER_CHANNEL 0x08000000 + /* Bits for R92C_HSSI_PARAM1(i). */ #define R92C_HSSI_PARAM1_PI 0x00000100 From nobody Sat Dec 14 04:15:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9CYm4ps2z5gdZ4; Sat, 14 Dec 2024 04:15: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 4Y9CYm401lz4vsB; Sat, 14 Dec 2024 04:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734149756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUi/lfvdfP9pXo7SZa41Ep74/Klm2xVbUo6IygNDMrM=; b=AEQxpIImzLJZXp67za/hmgTSpZ+pDaXjBFTz4gr+4XQhmI37sn7GuMLJuGvz7mkOhrSu2l EIeTUf91VaCArYFYx7BxnKCH0khe8/oQKFOIfIvfwEUG96ulsKCHw/m65kjO7jQ4R+VwCY hJcGFTYMDMTc2MuleqJ98zJuO/fZhaoz611sNTBeyn+n6ks5dW0EbiIxLjpPj9QDmyzMyX HMQTifu1BpluU1UEX/PKU56HIXvpV2F0BV2ccnzX5p+thE23SXuFbspcGAxn3aF2H8lRSc hnsvqJgFwaZ8+A12OvhCVYHyKqv4Ba9HE1Vwgg/y1gQVzXHf4d8WkVyNSmSfjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734149756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUi/lfvdfP9pXo7SZa41Ep74/Klm2xVbUo6IygNDMrM=; b=UOovs5JHlYpNuFmJHkODu/sSFpkpd365HJtso+VQS0+wd8BEdVAFPqH6QsVm5zwWkH2Nes nh7/wwAuvETocLFumCDqBcPVnCNyiB+aci2bGKGz0Xl3QVfKhwIDNlYPcU+NnoHqguKdgk NhaIYrlX4Q8NHyhe+uQoGx+BG1k3FydzETNImBvY957zbScwM4NZamiyxWcz61dN6goCh9 k4N51KAJawuvIZyndSyego7muAt1L6UhBcCjfOrqJxsApHey3bXle7nBDkaW6OFy+xja9m N3i7ZpYSeyDotbu3th62ay5pAuuQHCW86wiKmwaWfgF5CC5oUP2bYCjEKfHqnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734149756; a=rsa-sha256; cv=none; b=NNBAtdpgrygTPM1Z97J6MEluUi2ysVDG+ffJ7HWdJEG7zyWgvZawSFZVmxUMTX4R67UfU0 WMxcs/1vwM0UfhcRNjbpCoziFuAaHS5k5uFmSCofVoeNswyhCq8KrUuHoXAWXs8NqJxC5E B0fsjA3+PGZk7oGxwx6Eaw3riH31cptKEMeHFAfl/uOF8u2iWZqv0XQRJCBJDKBjzhkqkv ubZbgPtLdJ0iZ/4T8TukqaTIhOQNmSzz7ypReXqmMjAB6YdynCMiFY/Jqfqa+g06Mx2ebG YsCViFldvbvxZGGFJiYOYtWnNrEdoIJ8W2wEaz18HmvByuJ1dY9Fn0FYBZqRng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9CYm3HGBz16PZ; Sat, 14 Dec 2024 04:15: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 4BE4FuVY012044; Sat, 14 Dec 2024 04:15:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE4Fuwp012041; Sat, 14 Dec 2024 04:15:56 GMT (envelope-from git) Date: Sat, 14 Dec 2024 04:15:56 GMT Message-Id: <202412140415.4BE4Fuwp012041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 212d7f439aa3 - main - Tweak ppoll() to include 1003.1-2024 visibility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 212d7f439aa3fa276e87291c1e83545298381824 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=212d7f439aa3fa276e87291c1e83545298381824 commit 212d7f439aa3fa276e87291c1e83545298381824 Author: Kyle Evans AuthorDate: 2024-12-14 04:15:19 +0000 Commit: Kyle Evans CommitDate: 2024-12-14 04:15:19 +0000 Tweak ppoll() to include 1003.1-2024 visibility Note in the manpage that the 2024 edition finally added ppoll(), and also add the appropriate declarations for the correct versions of _POSIX_C_SOURCE. Differential Revision: https://reviews.freebsd.org/D48043 --- include/ssp/poll.h | 4 ++-- lib/libsys/poll.2 | 5 +++-- sys/sys/poll.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/ssp/poll.h b/include/ssp/poll.h index 815e73eb46b7..231fef3ef364 100644 --- a/include/ssp/poll.h +++ b/include/ssp/poll.h @@ -42,7 +42,7 @@ __ssp_redirect_raw_impl(int, poll, poll, return (__ssp_real(poll)(fds, nfds, timeout)); } -#if __BSD_VISIBLE +#if _POSIX_C_SOURCE >= 202405 __ssp_redirect_raw_impl(int, ppoll, ppoll, (struct pollfd fds[], nfds_t nfds, const struct timespec *__restrict timeout, @@ -53,7 +53,7 @@ __ssp_redirect_raw_impl(int, ppoll, ppoll, return (__ssp_real(ppoll)(fds, nfds, timeout, newsigmask)); } -#endif /* __BSD_VISIBLE */ +#endif /* _POSIX_C_SOURCE >= 202405 */ __END_DECLS #endif /* __SSP_FORTIFY_LEVEL > 0 */ diff --git a/lib/libsys/poll.2 b/lib/libsys/poll.2 index 6a5cc1dc3a89..6e6ed33f7a6b 100644 --- a/lib/libsys/poll.2 +++ b/lib/libsys/poll.2 @@ -27,7 +27,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 27, 2021 +.Dd December 11, 2024 .Dt POLL 2 .Os .Sh NAME @@ -268,7 +268,8 @@ function conforms to .St -p1003.1-2001 . The .Fn ppoll -is not specified by POSIX. +function conforms to +.St -p1003.1-2024 . The POLLRDHUP flag is not specified by POSIX, but is compatible with Linux and illumos. diff --git a/sys/sys/poll.h b/sys/sys/poll.h index d5f2c0373942..4b626d722b09 100644 --- a/sys/sys/poll.h +++ b/sys/sys/poll.h @@ -96,7 +96,7 @@ struct pollfd { #ifndef _KERNEL -#if __BSD_VISIBLE +#if _POSIX_C_SOURCE >= 202405 #include #include @@ -115,7 +115,7 @@ typedef __sigset_t sigset_t; __BEGIN_DECLS int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout); -#if __BSD_VISIBLE +#if _POSIX_C_SOURCE >= 202405 int ppoll(struct pollfd _pfd[], nfds_t _nfds, const struct timespec *__restrict _timeout, const sigset_t *__restrict _newsigmask); From nobody Sat Dec 14 04:31:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9CwG3l9jz5gfhq; Sat, 14 Dec 2024 04:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9CwG30Dyz3xZ4; Sat, 14 Dec 2024 04:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734150718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UqI8995+XPCGGJvdTYjADY2GSzs/rPTt4a5MZ/f71Rg=; b=Tmkn62zGeAhSbUXaEupPOlF36TGCwJmt+VyCWJJ/0+ErhNX5dSexPTMHWj7+qZWIhaRgWr 43kA3ipm2pl9TCgUemoc9zraMfRjHh9QFYVrden4wNgasKZMBPFyMoqvzIRCm3yZqwJQi+ LOe+qWkb1X5BkLlRYkFADjrZwM7vttoweo0oNu4nT8a1CQgSCD4wNxYhvbCinLHsx6jGM6 JUeqpgTpnq8mdQqTMJbHjg9PSo4ltAPWKtrnIeus/EYaFGzc/ZGOxiqw6ycgLuG82vK+iZ wzBw9HbpTSFNafSoMjlFPLG2CgxZ6bayz4lE0ROW0uFcDXYGf1AC4SmtDmXrjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734150718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UqI8995+XPCGGJvdTYjADY2GSzs/rPTt4a5MZ/f71Rg=; b=WzFrnusnz7kqNMlffSQpW6IwpIfnQsle0xJ/1+/FVR+7Sjizm+dOQ7aTRJe03n0u31wMy4 ipmeUV1GJZW4Q12M2EtUEutLlzzfPVQkVTuCYkFuTj7NC+PN2pz0or47059xM6ibaU4uns nNCYlVWlmuYRGuvmtH7WzL47h6lOsCXv9XI4XMfx3OOXvemo+oGB5vg+3ZTcEmYK3TUW0b KpJcRbA49e9c20TuUKgDOAZNP8QYkDq0rNmMysUkSMhWSpzPmA+NRndiOl9WP3IyU8Au4f Tz+FdVbnhAjkyLv05t9IaYCA1G8spNDzTte+OOKrB6sEzbhvlLWUx3xMK/XeBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734150718; a=rsa-sha256; cv=none; b=U1givtDT0Tq+MJphlZVA+QcNndA80JdPR7AU2nNS0E5Ai+q5wUqN636jS6PJj5EWWlz58E xl5HR2oHKFZCUUkDTD+m0oXkDXP8F8BwsbkaNw3nkkDjMKyNLCBLTv4jZlzXyJ1/Yz34LU EZ68CNaj2QhkoOdhkS3HKRNyWAlbow0wqcVeXvCf79K90mr4pRAckqSlixs60QctkgeiC5 ueF9Mr5aIAxXtyQ6o/NJgtEMMfdFGKSqnXnId4gY1X2dVF7LnMjZVG56MPMfZlzySH7Igu iyX4URf89ffcwR4JFnHvnQPcWE98Vw538thj4oeQvtqNy7ASg2JQhoR+tF9N3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9CwG2bHvz17HD; Sat, 14 Dec 2024 04:31:58 +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 4BE4VwAC046908; Sat, 14 Dec 2024 04:31:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE4Vw1s046891; Sat, 14 Dec 2024 04:31:58 GMT (envelope-from git) Date: Sat, 14 Dec 2024 04:31:58 GMT Message-Id: <202412140431.4BE4Vw1s046891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 48b05b8fc248 - main - loader: set boot_safe when safe mode is selected List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48b05b8fc2485ba5cc7ba7b52c62965feea101a8 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=48b05b8fc2485ba5cc7ba7b52c62965feea101a8 commit 48b05b8fc2485ba5cc7ba7b52c62965feea101a8 Author: Kyle Evans AuthorDate: 2024-12-14 04:31:22 +0000 Commit: Kyle Evans CommitDate: 2024-12-14 04:31:28 +0000 loader: set boot_safe when safe mode is selected This may be used to disable or limit functionality of some services when safe mode is selected. The particular value of boot_safe should not be considered significant, only its presence in the environment. Reviewed by: imp, tsoome Differential Revision: https://reviews.freebsd.org/D32172 --- stand/forth/menu-commands.4th | 2 ++ stand/lua/core.lua | 2 ++ stand/man/loader_simp.8 | 17 ++++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/stand/forth/menu-commands.4th b/stand/forth/menu-commands.4th index 2c3d787c65e1..13bbcf73201c 100644 --- a/stand/forth/menu-commands.4th +++ b/stand/forth/menu-commands.4th @@ -128,6 +128,7 @@ also menu-namespace also menu-command-helpers s" set hw.ata.atapi_dma=0" evaluate s" set kern.eventtimer.periodic=1" evaluate s" set kern.geom.part.check_integrity=0" evaluate + s" set boot_safe=YES" evaluate ; : safemode_disable ( -- ) @@ -136,6 +137,7 @@ also menu-namespace also menu-command-helpers s" hw.ata.atapi_dma" unsetenv s" kern.eventtimer.periodic" unsetenv s" kern.geom.part.check_integrity" unsetenv + s" boot_safe" unsetenv ; : init_safemode ( N -- N ) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 3582720f2a81..5976cc65156d 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -179,12 +179,14 @@ function core.setSafeMode(safe_mode) loader.setenv("hw.ata.atapi_dma", "0") loader.setenv("kern.eventtimer.periodic", "1") loader.setenv("kern.geom.part.check_integrity", "0") + loader.setenv("boot_safe", "YES") else loader.unsetenv("kern.smp.disabled") loader.unsetenv("hw.ata.ata_dma") loader.unsetenv("hw.ata.atapi_dma") loader.unsetenv("kern.eventtimer.periodic") loader.unsetenv("kern.geom.part.check_integrity") + loader.unsetenv("boot_safe") end core.sm = safe_mode end diff --git a/stand/man/loader_simp.8 b/stand/man/loader_simp.8 index 49214e78b494..cdacd823b1a5 100644 --- a/stand/man/loader_simp.8 +++ b/stand/man/loader_simp.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 29, 2021 +.Dd September 30, 2021 .Dt LOADER_SIMP 8 .Os .Sh NAME @@ -339,6 +339,21 @@ In a running system, the state of console muting can be manipulated by the utility. .It Va boot_pause During the device probe, pause after each line is printed. +.It Va boot_safe +Force userland to boot in +.Dq safe mode , +which may disable or limit the functionality of some services that may not be +desired in safe mode. +This is typically set by selecting +.Dq safe mode +in the loader menu, which also sets some other hints for the kernel. +Applications wishing to respect safe mode should +.Sy only +test for the presence of +.Va boot_safe +in +.Xr kenv 1 , +not for any particular value. .It Va boot_serial Force the use of a serial console even when an internal console is present. From nobody Sat Dec 14 04:31:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9CwH4yv0z5gfsC; Sat, 14 Dec 2024 04:31: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 4Y9CwH41Tnz3xZ7; Sat, 14 Dec 2024 04:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734150719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktHlTm4sdpBsgQF/ER3j72zvbGFL9k8Yo3ATLIqfjS4=; b=a+HFR8RttLyAojXj703RiJpWYXFeXribuK5rHGazVeurhj+ZqLoZgqxbie16JQElEtZRTK d01ERkFsI0FGtRY12M4rf79VYwz8mRRoyXlU5Q9I0sAHBq1EksxeVg/V1HXvwUmhv41M/P eBMn/JvtZ/u3hdhCEnAPUBNYK3oDziJ15UIl1EH5WUt7AxjDeCDCjC0K61yC3uK0zvYX52 BJxSmLPMcrq/Mh7DY7OCy4lz6WgiWnYUjLgXaSD6GjOR3UMZeGl9MLcVLHf6tsx25JXl6g 5jTRyGmsgZ9VThd2cHY8mXjvUnGeelG7mkHt7L8uGMapgPY4mNXz/XQeBWuVXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734150719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktHlTm4sdpBsgQF/ER3j72zvbGFL9k8Yo3ATLIqfjS4=; b=DhkvEEaAhFKyPh1dgrRyXl+hhC3Q5IlpGkDFsbyyzV234ME582U9/BR/bQOe1JHWXdYwYb CL+a/wfXRBHUBjVY5obI7pFN1992vorodpDG9fkvskvY5waRtbJQOwS6uWRpY+FXJqIpz3 AAOa2oO8sm6bk0+k3wKk3mJoPfKzjPeUQDUKTgHD6WAgbkrGssIsE89t2G6pQBuHW5vAq2 EcN3XOoPjimwG0B0iRDOta/Q5raq+BcLrZ1qLLUm4Nh8t57KwGJ/oTZjymC0ZJSY/cCmGr RujLxsABNc8ak8S1qXpDmP185LiFVcJj1rOtcXZEskYEXw3ocM8OqK7w5E5IqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734150719; a=rsa-sha256; cv=none; b=KWU8y9sWBIiab5PkK0VYdTX1xNVqNyNVd7AKkepQkX0anP/3y88Wzx5amsX01+3sa5QbHI tY1/E2W3mOFUA4yJH6AklVKEdzuoX3AafWGZvLXc85Ely8BYdJJL1RkGsIb4mn0+rI58ZK QpnDSAvOWimkwXTLZRHbl647tnnJ/DZif9esETT8WBjiMODcZgk44gpWoKiS4DWpQmu4w0 il69+bPx2Q2tRxmEsFFNR2o7HTvT3Qxjhq8gXZYG+HdVMfa4qC5XdLO7NZagfas+DFKhUO LUZsxIv+20SQVOjd8I2QIH6VrOVgQI+2RFOqcmze+9NB9ZPpFVIb42G5LRImbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9CwH3cWtz16wX; Sat, 14 Dec 2024 04:31: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 4BE4VxUJ046971; Sat, 14 Dec 2024 04:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE4Vx9l046968; Sat, 14 Dec 2024 04:31:59 GMT (envelope-from git) Date: Sat, 14 Dec 2024 04:31:59 GMT Message-Id: <202412140431.4BE4Vx9l046968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 17aec740b0b2 - main - devmatch: do nothing if booted in safe mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17aec740b0b2112eb1803ca6d5ec8c8161f8dcae Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=17aec740b0b2112eb1803ca6d5ec8c8161f8dcae commit 17aec740b0b2112eb1803ca6d5ec8c8161f8dcae Author: Kyle Evans AuthorDate: 2024-12-14 04:31:22 +0000 Commit: Kyle Evans CommitDate: 2024-12-14 04:31:38 +0000 devmatch: do nothing if booted in safe mode Safe mode may be enabled because of some problem discovered with a kmod, thus wanting to avoid devmatch. Honor it and let the user deal with the fallout of not autoloading modules. We've at least made it to userland and the user demonstrably has a local console as they selected safe mode in the first place, so this shouldn't be fatal if we don't, e.g., load a necessary NIC driver. --- libexec/rc/rc.d/devmatch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch index 0999159bb332..7a8726de5677 100755 --- a/libexec/rc/rc.d/devmatch +++ b/libexec/rc/rc.d/devmatch @@ -41,7 +41,10 @@ one_nomatch="$2" devmatch_start() { - local x m list + local x m list boot_safe + + boot_safe=$(kenv -q boot_safe || echo "NO") + checkyesno boot_safe && return if [ -n "$one_nomatch" ]; then list=$(devmatch -p "${one_nomatch}" | sort -u) From nobody Sat Dec 14 04:33:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9Cxk6NHNz5gg6F; Sat, 14 Dec 2024 04:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9Cxk448Nz40WK; Sat, 14 Dec 2024 04:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734150794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jGP1t/EK0WGRN2SoAjFXfg48fcrQp+vv+e6yWjpx3Qc=; b=N3EzQNgqD+dkvy+LIEi7cL/h/YRfMvRA2gRRXZE54Zxl7Ip2BDuJN+phfeueT/qjmmzMs9 p3nNAZVmJO7zihdcaiOPEiEWcJ9TT9GBnLu/ChnhSfznZQ+bzInTKEJsNiq2rSA4I86V4U O5W5IW1FbiNsONsaitGJ1StZKOs3qpYDPI6ln/dNumPek4Srjzh9LyVBF/x+z89rtFizok iHCnUvqMnH1ljkfk7ee6fgzEzUB0H8xzSivUF9sVUVKGu7lesODt+xierVzJlCpt3c/ZfS 78ppUN/M55+0YFYqfJE0WJ59Dm68/aWpAo1O6C8WchJ2hM9JYuXkvHZlg/fBPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734150794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jGP1t/EK0WGRN2SoAjFXfg48fcrQp+vv+e6yWjpx3Qc=; b=Pot8B3cygUk6atUNgpC8y8oh7JKXSeq0meXRaH+OFSWNJzAXYZRFotyP/ZHgfBWDTecBT6 pil94NuIfrdk3YhrDO2V1mUrp6OZxAyZJitjDT+B8X6HQFv/HYVX/07ATaCSNkVjUqXQsw DQLrotN/K9jBgfaIFdJqD6MqPLPlx0XTUbWZVB4Z8NalJSXoua2t4tZSZ7LOCocUewxFyc FKV1ALR2iuUdfhO7ZFe7U5ZEWmhbvwdePFLwc2xfH4/zhAiTPzItSVNbbjhOo4Cq4B57NJ 084GYr8y4dPy9eGwudN0p5cH0/sXfkrA2P61R7ub4ImiwHvKxN7y4BM9PwANlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734150794; a=rsa-sha256; cv=none; b=b1j2q6rYEfDqMgNqv8VeKI5pcuDrk0CmOMU573Y3dZodWVdAehhybj1hIH2GBT9s4n4cSQ V7AL0XjNqNO9NHRfs4uYFes46PUOiRFUeewa+PqpJSZeHpxnAFjyeQctKyYlI5rVVCr449 7RDsUxQlZjZle/coJ+Q4ZbZyRYkHJy7xfevgjn4c5CSBjhBQFA0nikjNe1awqHJ1+yMPTC okBaknY6tCM+9BL04+TGUB7VKpo6LtrcpYnQyvmtDT1+hLBjdP6Pln87wFCUWWUGm7HT5A QN2ru7+9BLMDe4k0zPowbJtZSuT6sL5PnquqgCxtjUVq8G/7jiZU+AUUj+i8kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9Cxk3hPpz17HJ; Sat, 14 Dec 2024 04:33: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 4BE4XEbI048578; Sat, 14 Dec 2024 04:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE4XEGS048575; Sat, 14 Dec 2024 04:33:14 GMT (envelope-from git) Date: Sat, 14 Dec 2024 04:33:14 GMT Message-Id: <202412140433.4BE4XEGS048575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 86b4df97d0fc - main - cat: report copy_file_range() errors with the read filename List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86b4df97d0fc6980242e6d047390047c8c7be7dc Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=86b4df97d0fc6980242e6d047390047c8c7be7dc commit 86b4df97d0fc6980242e6d047390047c8c7be7dc Author: Kyle Evans AuthorDate: 2024-12-14 04:32:54 +0000 Commit: Kyle Evans CommitDate: 2024-12-14 04:32:54 +0000 cat: report copy_file_range() errors with the read filename The error may be due to an error while writing, but it's more helpful to report what we were trying to from rather than "stdout" for these errors. Noticed because of what happens now when `cat` gets an EISDIR for reading from a dirfd: kevans@ifrit:~$ cat /etc cat: stdout: Is a directory which, after this change, becomes: kevans@aarch64-dev:~$ cat /etc cat: /etc: Is a directory Reviewed by: allanjude, des, mm Differential Revision: https://reviews.freebsd.org/D41784 --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 3e7974e5f334..c4c04fb3fff6 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -271,7 +271,7 @@ scanfiles(char *argv[], int cooked __unused) errno == EISDIR) raw_cat(fd); else - err(1, "stdout"); + err(1, "%s", filename); } #else raw_cat(fd); From nobody Sat Dec 14 05:18:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9DyQ0Qm7z5gjKX; Sat, 14 Dec 2024 05:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9DyP6vV4z42sp; Sat, 14 Dec 2024 05:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734153534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XATT4astVgWV6Lzc0mTM+G4DbcIldpCWpY16CV6vnw=; b=qVNkTi6PAN9xp7KIqvRIVNSfKhO6WFiQg6VzemoiNm7hZ+bum1C8Iag+rh+/3tDQrhdrxe e5EKc0h+YUZ+TNRxzomR9zWlX75z7RKssWb1ffD5awevIOaMsnv0z7V4K/bEGYYJkOGg/V MoBU9vjKN3uiv3n4lUAELNstUOXjUvUrbZGLW9Ua0PI9SpCpDlYFeZ5dOzxxTTdO3sbO8+ h19V8A1/+76wSzIV5ZTnZYNXUkKNbXsYhUy/b8uBmPNUZDgWL9LKEHEkOmHrcTTeG97+LG trpeI1yPEDFNj4/GU0PlgIn7g93+scghSWNzEdcwYNgisnFb98bkL4IdEPG+bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734153534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XATT4astVgWV6Lzc0mTM+G4DbcIldpCWpY16CV6vnw=; b=cuT29kTC61A1ET4NwObIBAnF0wRgS1BvMMoR2ozWVi0C5A6NLk72LcskqA/Htsdott1m26 zo3yYEMI2z6LtKMVSExXepztSMAae2xtgNkf1gRThcchabGlGuJFVgGQOp3EsXHJJo2/LW ubONZo78Ryc38QmnUAS/y/pcls6P6fxDK6p0ZjjWwyK4XAfMZu0KkzoCX3huZDtWAQJKm6 KBxSc+rOE0uoqh4pyiOnWcb2GxG11XtP9u1OXxcudg7D/mhkPJoKJ2vTdJTjhOsPC89+Dy NCvFjmm53XHmXhYJMnyNTiqYcii+2psnMIoHPxJwW105lvNQwTjF3SmppWFKyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734153534; a=rsa-sha256; cv=none; b=eGESQyY8CWZ/iHWjjWkfgR8yDyCAylzRPhhQuuUaKlxuyH8C3YdBAUcw8k8MPvtp/9kNTD MYqQ6zHVRRQzmSZYqldnXskHd3g28ouYPuHKL+L62YmMJent/v3uJ0bPsQ6NJzlKdV97m8 iOL+BwMfzJbyRPH0SB73wkUR8XJoukI3jlPbNHpOqto/7rEk1P9bQ/rfySY7sPznox0SkB rjp0Wll3BRB4+FufeqeRVGcazYkLpkJXG7n9LUFG38ZJ3pZVJ5tkeF6fHog52Qc0iD7HFu Yg/kAwE5NWB0Qbhq7JZ6Nyoj32qwXecnC0N3fDqqz+q+KVEkWks7dXC+7yQbVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9DyP6MCsz18MJ; Sat, 14 Dec 2024 05:18:53 +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 4BE5IrLq025619; Sat, 14 Dec 2024 05:18:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE5Irqr025616; Sat, 14 Dec 2024 05:18:53 GMT (envelope-from git) Date: Sat, 14 Dec 2024 05:18:53 GMT Message-Id: <202412140518.4BE5Irqr025616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: dabf006a638f - main - Add per-process flag to disable logsigexit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dabf006a638fdc44cdcf69731de8ac83959db731 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dabf006a638fdc44cdcf69731de8ac83959db731 commit dabf006a638fdc44cdcf69731de8ac83959db731 Author: Kyle Evans AuthorDate: 2024-12-14 05:17:20 +0000 Commit: Kyle Evans CommitDate: 2024-12-14 05:18:30 +0000 Add per-process flag to disable logsigexit I added a third value for kern.logsigexit to mean 'auto' as an abundance of caution, but I don't know how much it matters -- that can be easily consolidated back to boolean-ish. This is primarily targeted towards people running test suites under CI (e.g. buildbot, jenkins). Oftentimes tests entail segfaults that are expected, and logs get spammed -- this can be particularly high volume depending on the application. Per-process control of this behavior is desirable because they may still want to be logging legitimate segfaults, so the system-wide atomic bomb kern.logsigexit=0 is not a great option. This adds a process flag to disable it, controllable via procctl(2)/proccontrol(1); the latter knows it as "sigexitlog" due to its length, but it's referred to almost everywhere else as "sigexit_log." Reviewed by: kib (earlier version), pstef Differential Revision: https://reviews.freebsd.org/D21903 --- lib/libsys/procctl.2 | 37 +++++++++++++++++++++++-- sys/compat/freebsd32/freebsd32_misc.c | 3 ++ sys/kern/kern_fork.c | 3 +- sys/kern/kern_procctl.c | 52 +++++++++++++++++++++++++++++++++++ sys/kern/kern_sig.c | 8 +++++- sys/sys/proc.h | 3 ++ sys/sys/procctl.h | 6 ++++ usr.bin/proccontrol/proccontrol.1 | 7 +++-- usr.bin/proccontrol/proccontrol.c | 24 ++++++++++++++++ 9 files changed, 137 insertions(+), 6 deletions(-) diff --git a/lib/libsys/procctl.2 b/lib/libsys/procctl.2 index 2d443a1ae4bd..75804ba243f1 100644 --- a/lib/libsys/procctl.2 +++ b/lib/libsys/procctl.2 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 4, 2024 +.Dd December 14, 2024 .Dt PROCCTL 2 .Os .Sh NAME @@ -79,7 +79,7 @@ All status query requests require the caller to have the right to observe the target. .Pp The following commands are supported: -.Bl -tag -width PROC_TRAPCAP_STATUS +.Bl -tag -width PROC_LOGSIGEXIT_STATUS .It Dv PROC_ASLR_CTL Controls Address Space Layout Randomization (ASLR) in program images created @@ -127,6 +127,39 @@ If the currently executed image in the process itself has ASLR enabled, the .Dv PROC_ASLR_ACTIVE flag is or-ed with the value listed above. +.It Dv PROC_LOGSIGEXIT_CTL +Controls the logging of exits due to signals that would normally cause a core +dump. +The +.Va arg +parameter must point to an integer variable holding one of the following values: +.Bl -tag -width PROC_LOGSIGEXIT_FORCE_DISABLE +.It Dv PROC_LOGSIGEXIT_FORCE_ENABLE +Enables logging of exits due to signals that would normally cause a core dump. +Logging is done via +.Xr log 9 +with a log level of +.Dv LOG_INFO . +.It Dv PROC_LOGSIGEXIT_FORCE_DISABLE +Disables the logging of exits due to signals that would normally cause a core +dump. +.It Dv PROC_LOGSIGEXIT_NOFORCE +The logging behavior is delegated to the +.Xr sysctl 3 +MIB variable +.Va kern.logsigexit . +.El +.It Dv PROC_LOGSIGEXIT_STATUS +Returns the current status of logging for the target process. +The +.Va arg +parameter must point to an integer variable, where one of the following values +is written: +.Bl -tag -width PROC_LOGSIGEXIT_FORCE_DISABLE +.It Dv PROC_LOGSIGEXIT_FORCE_ENABLE +.It Dv PROC_LOGSIGEXIT_FORCE_DISABLE +.It Dv PROC_LOGSIGEXIT_NOFORCE +.El .It Dv PROC_PROTMAX_CTL Controls the maximum protection used for .Xr mmap 2 diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index e6aea3acdecd..67ebb5d52589 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -3860,6 +3860,7 @@ freebsd32_procctl(struct thread *td, struct freebsd32_procctl_args *uap) case PROC_TRAPCAP_CTL: case PROC_NO_NEW_PRIVS_CTL: case PROC_WXMAP_CTL: + case PROC_LOGSIGEXIT_CTL: error = copyin(PTRIN(uap->data), &flags, sizeof(flags)); if (error != 0) return (error); @@ -3895,6 +3896,7 @@ freebsd32_procctl(struct thread *td, struct freebsd32_procctl_args *uap) case PROC_TRAPCAP_STATUS: case PROC_NO_NEW_PRIVS_STATUS: case PROC_WXMAP_STATUS: + case PROC_LOGSIGEXIT_STATUS: data = &flags; break; case PROC_PDEATHSIG_CTL: @@ -3928,6 +3930,7 @@ freebsd32_procctl(struct thread *td, struct freebsd32_procctl_args *uap) case PROC_TRAPCAP_STATUS: case PROC_NO_NEW_PRIVS_STATUS: case PROC_WXMAP_STATUS: + case PROC_LOGSIGEXIT_STATUS: if (error == 0) error = copyout(&flags, uap->data, sizeof(flags)); break; diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 41f6a76c4fa1..a66bc4be62a8 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -496,7 +496,8 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * P2_ASLR_IGNSTART | P2_NOTRACE | P2_NOTRACE_EXEC | P2_PROTMAX_ENABLE | P2_PROTMAX_DISABLE | P2_TRAPCAP | P2_STKGAP_DISABLE | P2_STKGAP_DISABLE_EXEC | P2_NO_NEW_PRIVS | - P2_WXORX_DISABLE | P2_WXORX_ENABLE_EXEC); + P2_WXORX_DISABLE | P2_WXORX_ENABLE_EXEC | P2_LOGSIGEXIT_CTL | + P2_LOGSIGEXIT_ENABLE); p2->p_swtick = ticks; if (p1->p_flag & P_PROFIL) startprofclock(p2); diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index e7519f1b0de4..96365e192d3c 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -945,6 +945,46 @@ pdeathsig_status(struct thread *td, struct proc *p, void *data) return (0); } +static int +logsigexit_ctl(struct thread *td, struct proc *p, void *data) +{ + int state; + + PROC_LOCK_ASSERT(p, MA_OWNED); + state = *(int *)data; + + switch (state) { + case PROC_LOGSIGEXIT_CTL_NOFORCE: + p->p_flag2 &= ~(P2_LOGSIGEXIT_CTL | P2_LOGSIGEXIT_ENABLE); + break; + case PROC_LOGSIGEXIT_CTL_FORCE_ENABLE: + p->p_flag2 |= P2_LOGSIGEXIT_CTL | P2_LOGSIGEXIT_ENABLE; + break; + case PROC_LOGSIGEXIT_CTL_FORCE_DISABLE: + p->p_flag2 |= P2_LOGSIGEXIT_CTL; + p->p_flag2 &= ~P2_LOGSIGEXIT_ENABLE; + break; + default: + return (EINVAL); + } + return (0); +} + +static int +logsigexit_status(struct thread *td, struct proc *p, void *data) +{ + int state; + + if ((p->p_flag2 & P2_LOGSIGEXIT_CTL) == 0) + state = PROC_LOGSIGEXIT_CTL_NOFORCE; + else if ((p->p_flag2 & P2_LOGSIGEXIT_ENABLE) != 0) + state = PROC_LOGSIGEXIT_CTL_FORCE_ENABLE; + else + state = PROC_LOGSIGEXIT_CTL_FORCE_DISABLE; + *(int *)data = state; + return (0); +} + enum { PCTL_SLOCKED, PCTL_XLOCKED, @@ -1100,6 +1140,18 @@ static const struct procctl_cmd_info procctl_cmds_info[] = { .need_candebug = false, .copyin_sz = 0, .copyout_sz = sizeof(int), .exec = wxmap_status, .copyout_on_error = false, }, + [PROC_LOGSIGEXIT_CTL] = + { .lock_tree = PCTL_SLOCKED, .one_proc = true, + .esrch_is_einval = false, .no_nonnull_data = false, + .need_candebug = true, + .copyin_sz = sizeof(int), .copyout_sz = 0, + .exec = logsigexit_ctl, .copyout_on_error = false, }, + [PROC_LOGSIGEXIT_STATUS] = + { .lock_tree = PCTL_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, .no_nonnull_data = false, + .need_candebug = false, + .copyin_sz = 0, .copyout_sz = sizeof(int), + .exec = logsigexit_status, .copyout_on_error = false, }, }; int diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index c59bfd035be7..d7aa932aa7e3 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -3606,11 +3606,17 @@ sigexit(struct thread *td, int sig) struct proc *p = td->td_proc; const char *coreinfo; int rv; + bool logexit; PROC_LOCK_ASSERT(p, MA_OWNED); proc_set_p2_wexit(p); p->p_acflag |= AXSIG; + if ((p->p_flag2 & P2_LOGSIGEXIT_CTL) == 0) + logexit = kern_logsigexit != 0; + else + logexit = (p->p_flag2 & P2_LOGSIGEXIT_ENABLE) != 0; + /* * We must be single-threading to generate a core dump. This * ensures that the registers in the core file are up-to-date. @@ -3649,7 +3655,7 @@ sigexit(struct thread *td, int sig) coreinfo = " (no core dump - other error)"; break; } - if (kern_logsigexit) + if (logexit) log(LOG_INFO, "pid %d (%s), jid %d, uid %d: exited on " "signal %d%s\n", p->p_pid, p->p_comm, diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 2615fa0dc275..786cc447dc2c 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -886,6 +886,9 @@ struct proc { #define P2_MEMBAR_GLOBE 0x00400000 /* membar global expedited registered */ +#define P2_LOGSIGEXIT_ENABLE 0x00800000 /* Disable logging on sigexit */ +#define P2_LOGSIGEXIT_CTL 0x01000000 /* Override kern.logsigexit */ + /* Flags protected by proctree_lock, kept in p_treeflags. */ #define P_TREE_ORPHANED 0x00000001 /* Reparented, on orphan list */ #define P_TREE_FIRST_ORPHAN 0x00000002 /* First element of orphan diff --git a/sys/sys/procctl.h b/sys/sys/procctl.h index 851ca821d72d..11b831882f0a 100644 --- a/sys/sys/procctl.h +++ b/sys/sys/procctl.h @@ -65,6 +65,8 @@ #define PROC_NO_NEW_PRIVS_STATUS 20 /* query suid/sgid disabled status */ #define PROC_WXMAP_CTL 21 /* control W^X */ #define PROC_WXMAP_STATUS 22 /* query W^X */ +#define PROC_LOGSIGEXIT_CTL 23 /* en/dis logging on sigexit */ +#define PROC_LOGSIGEXIT_STATUS 24 /* query logging on sigexit */ /* Operations for PROC_SPROTECT (passed in integer arg). */ #define PPROT_OP(x) ((x) & 0xf) @@ -153,6 +155,10 @@ struct procctl_reaper_kill { #define PROC_WX_MAPPINGS_DISALLOW_EXEC 0x0002 #define PROC_WXORX_ENFORCE 0x80000000 +#define PROC_LOGSIGEXIT_CTL_NOFORCE 1 +#define PROC_LOGSIGEXIT_CTL_FORCE_ENABLE 2 +#define PROC_LOGSIGEXIT_CTL_FORCE_DISABLE 3 + #ifndef _KERNEL __BEGIN_DECLS int procctl(idtype_t, id_t, int, void *); diff --git a/usr.bin/proccontrol/proccontrol.1 b/usr.bin/proccontrol/proccontrol.1 index e0d0e9416d35..817e9b5865bc 100644 --- a/usr.bin/proccontrol/proccontrol.1 +++ b/usr.bin/proccontrol/proccontrol.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 23, 2024 +.Dd December 14, 2024 .Dt PROCCONTROL 1 .Os .Sh NAME @@ -56,7 +56,7 @@ parameter Possible values for .Ar mode are: -.Bl -tag -width trapcap +.Bl -tag -width logsigexit .It Ar aslr Control the Address Space Layout Randomization. Only applicable to the new process spawned. @@ -79,6 +79,9 @@ Controls the KPTI enable, AMD64 only. .It Ar la48 Control limiting usermode process address space to 48 bits of address, AMD64 only, on machines capable of 57-bit addressing. +.It Ar logsigexit +Controls the logging of exits due to a signal that would normally cause a core +dump. .El .Pp The diff --git a/usr.bin/proccontrol/proccontrol.c b/usr.bin/proccontrol/proccontrol.c index 32c4c9e7f1a0..3548ca606656 100644 --- a/usr.bin/proccontrol/proccontrol.c +++ b/usr.bin/proccontrol/proccontrol.c @@ -51,6 +51,7 @@ enum mode { MODE_LA57, MODE_LA48, #endif + MODE_LOGSIGEXIT, }; static const struct { @@ -71,6 +72,7 @@ static const struct { { MODE_LA57, "la57" }, { MODE_LA48, "la48" }, #endif + { MODE_LOGSIGEXIT, "logsigexit" }, }; static pid_t @@ -194,6 +196,10 @@ main(int argc, char *argv[]) error = procctl(P_PID, pid, PROC_LA_STATUS, &arg); break; #endif + case MODE_LOGSIGEXIT: + error = procctl(P_PID, pid, PROC_LOGSIGEXIT_STATUS, + &arg); + break; default: usage(); break; @@ -331,6 +337,19 @@ main(int argc, char *argv[]) printf(", la57 active\n"); break; #endif + case MODE_LOGSIGEXIT: + switch (arg) { + case PROC_LOGSIGEXIT_CTL_NOFORCE: + printf("not forced\n"); + break; + case PROC_LOGSIGEXIT_CTL_FORCE_ENABLE: + printf("force enabled\n"); + break; + case PROC_LOGSIGEXIT_CTL_FORCE_DISABLE: + printf("force disabled\n"); + break; + } + break; } } else { switch (mode) { @@ -390,6 +409,11 @@ main(int argc, char *argv[]) error = procctl(P_PID, pid, PROC_LA_CTL, &arg); break; #endif + case MODE_LOGSIGEXIT: + arg = enable ? PROC_LOGSIGEXIT_CTL_FORCE_ENABLE : + PROC_LOGSIGEXIT_CTL_FORCE_DISABLE; + error = procctl(P_PID, pid, PROC_LOGSIGEXIT_CTL, &arg); + break; default: usage(); break; From nobody Sat Dec 14 07:06:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9HLV6nfzz5gpYk; Sat, 14 Dec 2024 07:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9HLV6BlDz4F7m; Sat, 14 Dec 2024 07:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734159986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=52UaCzUbsfCSgxVZFALTrhcd9ZxhOTRcNeQOUyaKq2E=; b=T5oHgUg2YI6ROm/KkRTx25y2AWqcJ5eVtMcZ4W5c+2i+j13prAc53vJd0YSTo72Fj/sdxH 2A/5DZuno3z/guKs49BATkrLkG69cLS5kBrR5J1GpI9yPxZcfjOwlWpk+HukMrVj0uTFF1 9pxSthNXSiNds7WkOnEAal9Zi9Wy6T3XEPQ3EjjJKxCiPMczDzJ0KoykgVWoQH8iZutEB1 gToz5mqTRFlo6Lt0gH53Iko7yuNW6IwKYDl7NuBZb53lYbFcZcJyf9V38GnhilK89aAPsk LRwjy6jvk2grAfHOWI2wHyh6ssHz0EJFqz/WEmGZj4qJzxeBoyTuSASow1cgqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734159986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=52UaCzUbsfCSgxVZFALTrhcd9ZxhOTRcNeQOUyaKq2E=; b=DiFMeZPSyJdcmKmsCjz7/S7AGbwRV8G3h13BApt49RUFM/+3EuRXJNmNWTg/uPi3G8W3my uHv/tpOQyckyMByU8Ves7rrbgv1jogsYUaTO79hYphYeQWqrF1QT0Pn5iWv6Kw4rljC/Q+ M1HhXlCVkwB4z9/OvXzWAPYHqAxm+dziOh2zm7KyTgwPZem5n2JFLQzVCpt/raGGUbQ39I 1oSKnqJWhs+2t1wAus79DUfQiAbLjnyH76/dLTbOzV69ysKOPNoXU5yB6tNWX9ZBIc6XsI rjoZEjh1Pidy6LMv7DBhOf5F92DYpTsLeyvmYp6fpROeAMEtzcKckoBm4xpP5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734159986; a=rsa-sha256; cv=none; b=LFwrN2+sP+bi7PTSncZGPCf1QS6N9BsnMkbad40IhLn79Ux6u3gdSawccKsBg1pPyK1+6B paFZ1KPp2E9UboBl+yv5QmkaUbNUeNeJrD596S7W/yJAuFk4iqnxTo2OJqYxyv/SO0aqOF kFRpC0G/e/qXruYclylFl7iyLxm0OeZK2r/OwDDPzaGbbHWpI4Y+nwJVJzdpQ7iQq7Nlog keBsaf+s2mWxd9g8EKdAz8d+OqpybnqNWYbWUUEU4mrdtc/JC0f8lWQ3FDbKGJ5Y4ztSPi GiE9f9tcSRllNCDkn4Ro27ihS4bkPuM0xxrrvMpiQLjiWBsGginMYbSFFrJwPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9HLV5ksBz1ByJ; Sat, 14 Dec 2024 07:06: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 4BE76Qgw030427; Sat, 14 Dec 2024 07:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE76Qci030424; Sat, 14 Dec 2024 07:06:26 GMT (envelope-from git) Date: Sat, 14 Dec 2024 07:06:26 GMT Message-Id: <202412140706.4BE76Qci030424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: da5aed38d80a - main - Revert "Tweak ppoll() to include 1003.1-2024 visibility" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da5aed38d80a000a6bc3819e51c9f5c0ed5a77a1 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=da5aed38d80a000a6bc3819e51c9f5c0ed5a77a1 commit da5aed38d80a000a6bc3819e51c9f5c0ed5a77a1 Author: Kyle Evans AuthorDate: 2024-12-14 07:05:09 +0000 Commit: Kyle Evans CommitDate: 2024-12-14 07:05:09 +0000 Revert "Tweak ppoll() to include 1003.1-2024 visibility" This reverts commit 212d7f439aa3fa276e87291c1e83545298381824. A last minute change to remove __BSD_VISIBLE unearthed some breakage that I failed to re-test. Sigh. --- include/ssp/poll.h | 4 ++-- lib/libsys/poll.2 | 5 ++--- sys/sys/poll.h | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/ssp/poll.h b/include/ssp/poll.h index 231fef3ef364..815e73eb46b7 100644 --- a/include/ssp/poll.h +++ b/include/ssp/poll.h @@ -42,7 +42,7 @@ __ssp_redirect_raw_impl(int, poll, poll, return (__ssp_real(poll)(fds, nfds, timeout)); } -#if _POSIX_C_SOURCE >= 202405 +#if __BSD_VISIBLE __ssp_redirect_raw_impl(int, ppoll, ppoll, (struct pollfd fds[], nfds_t nfds, const struct timespec *__restrict timeout, @@ -53,7 +53,7 @@ __ssp_redirect_raw_impl(int, ppoll, ppoll, return (__ssp_real(ppoll)(fds, nfds, timeout, newsigmask)); } -#endif /* _POSIX_C_SOURCE >= 202405 */ +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* __SSP_FORTIFY_LEVEL > 0 */ diff --git a/lib/libsys/poll.2 b/lib/libsys/poll.2 index 6e6ed33f7a6b..6a5cc1dc3a89 100644 --- a/lib/libsys/poll.2 +++ b/lib/libsys/poll.2 @@ -27,7 +27,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 11, 2024 +.Dd April 27, 2021 .Dt POLL 2 .Os .Sh NAME @@ -268,8 +268,7 @@ function conforms to .St -p1003.1-2001 . The .Fn ppoll -function conforms to -.St -p1003.1-2024 . +is not specified by POSIX. The POLLRDHUP flag is not specified by POSIX, but is compatible with Linux and illumos. diff --git a/sys/sys/poll.h b/sys/sys/poll.h index 4b626d722b09..d5f2c0373942 100644 --- a/sys/sys/poll.h +++ b/sys/sys/poll.h @@ -96,7 +96,7 @@ struct pollfd { #ifndef _KERNEL -#if _POSIX_C_SOURCE >= 202405 +#if __BSD_VISIBLE #include #include @@ -115,7 +115,7 @@ typedef __sigset_t sigset_t; __BEGIN_DECLS int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout); -#if _POSIX_C_SOURCE >= 202405 +#if __BSD_VISIBLE int ppoll(struct pollfd _pfd[], nfds_t _nfds, const struct timespec *__restrict _timeout, const sigset_t *__restrict _newsigmask); From nobody Sat Dec 14 11:47:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9Pbm5tm5z5h6dH; Sat, 14 Dec 2024 11:48:20 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9Pbl0dSSz4h75; Sat, 14 Dec 2024 11:48:18 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=EiBVHYkl; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 94.130.200.20 as permitted sender) smtp.mailfrom=herbert@gojira.at; dmarc=none Date: Sat, 14 Dec 2024 12:47:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1734176890; bh=+tR1KbDDUbGk8JuiV4NowAHGBtbmfNm60UcPcPa/2gg=; h=Date:Message-ID:From:To:Subject:MIME-Version:Content-Type; b=EiBVHYklXrd2tUOPoMW9OdGxMv7Vf8wWb4K75mkCu07pONbGr/tw+m1gRowG8Me8/ 3DIrtthaVDsp0zmtrF88vuyCfDde2xiarinzV7CgGrc2zrhEE6Z/tnF2diN09Gt+LN 2KUDKJQTScQYIkKOCmRYnCJXXqLQAS5kDqWE0NoCDCRZR2yDsvxSzOgwwaVfcPCoGT fdIrW0FcB2itmMbTK4BncIJVOTIGwXGy+z+CldWjfJXuw2HScLOec922DQuq0/Yre9 /Cq8LVbYI4qpETqRiiV0lwhpu4rqmbc8g4+x3uB1UBN9tYwmaQsk+wniltoQ3zEZnz lI3TJ0jESBtow== Message-ID: <87y10icwq0.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 42ee30f19cc7 - main - depend-cleanup.sh: Need to delete jemalloc.3 in objtree In-Reply-To: <202412132304.4BDN4QSd029112@gitrepo.freebsd.org> References: <202412132304.4BDN4QSd029112@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.997]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; R_SPF_ALLOW(-0.20)[+ip4:94.130.200.20]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[gojira.at]; RCPT_COUNT_THREE(0.00)[3]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; TO_DN_NONE(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[gojira.at:+] X-Rspamd-Queue-Id: 4Y9Pbl0dSSz4h75 X-Spamd-Bar: -- On Sat, 14 Dec 2024 00:04:26 +0100, Warner Losh wrote: > > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=42ee30f19cc7ad85187cbf97155dbd5207a04845 > > commit 42ee30f19cc7ad85187cbf97155dbd5207a04845 > Author: Warner Losh > AuthorDate: 2024-12-13 17:46:59 +0000 > Commit: Warner Losh > CommitDate: 2024-12-13 23:04:34 +0000 > > depend-cleanup.sh: Need to delete jemalloc.3 in objtree > > With the jemalloc.3 move into the tree (it's a generated file that we > don't/can't generate as part of the build), we need to remove it from > the .OBJDIR or make gets confused about how to build it (honestly for > reasons unknown). > > Sponsored by: Netflix > --- > tools/build/depend-cleanup.sh | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh > index 6e7585f0afe6..81acf517f9d7 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -231,3 +231,11 @@ clean_dep lib/libcrypt crypt-md5 c > clean_dep lib/libcrypt crypt-nthash c > clean_dep lib/libcrypt crypt-sha256 c > clean_dep lib/libcrypt crypt-sha512 c > + > +# 20241213 b55f5e1c4ae3 jemalloc: Move generated jemalloc.3 into lib/libc tree > +if [ -e "$OBJTOP"/lib/libc/jemalloc.3 ]; then > + # Have to cleanup the jemalloc.3 in the obj tree since make gets > + # confused and won't use the one in lib/libc/malloc/jemalloc/jemalloc.3 > + echo "Removing stale jemalloc.3 object" > + run rm -f "$OBJTOP"/lib/libc/jemalloc.3 > +fi Does this actually work? Should this be if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then ? From nobody Sat Dec 14 12:50:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9Qzx4Zm4z5hB2j; Sat, 14 Dec 2024 12:50:53 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9Qzx1VXJz4lwl; Sat, 14 Dec 2024 12:50:53 +0000 (UTC) (envelope-from david@catwhisker.org) Authentication-Results: mx1.freebsd.org; none Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.18.1/8.18.1) with ESMTP id 4BEColf6093558; Sat, 14 Dec 2024 12:50:47 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.18.1/8.18.1/Submit) id 4BECoVoW093557; Sat, 14 Dec 2024 04:50:31 -0800 (PST) (envelope-from david) Date: Sat, 14 Dec 2024 04:50:31 -0800 From: David Wolfskill To: Warner Losh Cc: "Herbert J. Skuhra" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 42ee30f19cc7 - main - depend-cleanup.sh: Need to delete jemalloc.3 in objtree Message-ID: References: <202412132304.4BDN4QSd029112@gitrepo.freebsd.org> <87y10icwq0.wl-herbert@gojira.at> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="78wWDnwD/iYnl64s" Content-Disposition: inline In-Reply-To: <87y10icwq0.wl-herbert@gojira.at> X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US] X-Rspamd-Queue-Id: 4Y9Qzx1VXJz4lwl X-Spamd-Bar: ---- --78wWDnwD/iYnl64s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Dec 14, 2024 at 12:47:35PM +0100, Herbert J. Skuhra wrote: > On Sat, 14 Dec 2024 00:04:26 +0100, Warner Losh wrote: > >=20 > > The branch main has been updated by imp: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D42ee30f19cc7ad85187cbf97= 155dbd5207a04845 > >=20 > > commit 42ee30f19cc7ad85187cbf97155dbd5207a04845 > > Author: Warner Losh > > AuthorDate: 2024-12-13 17:46:59 +0000 > > Commit: Warner Losh > > CommitDate: 2024-12-13 23:04:34 +0000 > >=20 > > depend-cleanup.sh: Need to delete jemalloc.3 in objtree > > ... =20 > Does this actually work? Should this be >=20 > if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then >=20 > ? Empirically: On a system running: FreeBSD 15.0-CURRENT #61 main-n274188-38cb1ba8637d: Fri Dec 13 11:58:34 UTC= 2024 root@freebeast.catwhisker.org:/common/S4/obj/usr/src/amd64.amd64/= sys/GENERIC amd64 1500029 1500029 after updating sources to main-n274215-da5aed38d80a and starting an in-place source upgrade using meta mode, the build failed: =2E.. Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/mail/mail Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/tftp/tftp.1.gz make[4]: don't know how to make jemalloc.3. Stop make[4]: stopped making "all" in /usr/src/lib/libc =2EERROR_TARGET=3D'jemalloc.3' =2EERROR_META_FILE=3D'' =2EMAKE.LEVEL=3D'4' MAKEFILE=3D'' =2EMAKE.MODE=3D'meta missing-filemon=3Dyes missing-meta=3Dyes silent=3Dyes = verbose' _ERROR_CMD=3D'.PHONY' =2E... I then used "find" to find any ocurrences of "jemalloc.3" in /usr/obj/; one was found: a symlink named /usr/obj/usr/src/amd64.amd64/lib/libc/jemalloc.3, which pointed to /usr/src/contrib/jemalloc/doc/jemalloc.3. The latter did not exist. Once I removed the symlink, the build succeeeded: FreeBSD 15.0-CURRENT #62 main-n274215-da5aed38d80a: Sat Dec 14 12:08:41 UTC= 2024 root@freebeast.catwhisker.org:/common/S4/obj/usr/src/amd64.amd64/= sys/GENERIC amd64 1500029 1500029 On a pair of other (slower) machines, I then had the opportunity to remove the symlink before starting the build; those completed without incident. I believe a src/UPDATING entry would be sufficient to help folks avoid the error condition. Peace, david --=20 David H. Wolfskill david@catwhisker.org Re. tariffs: https://en.wikipedia.org/wiki/Smoot%E2%80%93Hawley_Tariff_Act See https://www.catwhisker.org/~david/publickey.gpg for my public key. --78wWDnwD/iYnl64s Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iNUEARYKAH0WIQSTLzOSbomIK53fjFliipiWhXYx5QUCZ11/F18UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0OTMy RjMzOTI2RTg5ODgyQjlEREY4QzU5NjI4QTk4OTY4NTc2MzFFNQAKCRBiipiWhXYx 5UMiAQCUzoRUvqbmUj5G6yosU7mjO8ez4OkJCMhqJnOD05u1ogD+KAIXWRdCIpk6 Z9rPp7al59hd5NIuVqOme/cueAoRVwo= =pMBL -----END PGP SIGNATURE----- --78wWDnwD/iYnl64s-- From nobody Sat Dec 14 20:54:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9djz4Wm2z5glH4 for ; Sat, 14 Dec 2024 20:54:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9djz2c1qz4Kdn for ; Sat, 14 Dec 2024 20:54:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-2ee8aa26415so2541280a91.1 for ; Sat, 14 Dec 2024 12:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1734209670; x=1734814470; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=SUPQG0Albe+JpqvSGPJjfetaH2f6tBS/1AXfX2BFwcc=; b=BP6b2IPhve2ywFdWOTIs9bqpQV9hLm//V4PGcSEJSDJoZV3CTyzbNBdhAh+fiKltN0 9DytUr6DsY1BUOkCAv+VJeClPng8E6He0OEga3BhyhMF8CUtTOZZSYuvFjyB/9N1J0c8 HZgYc5DbmHGmr7hYSiiEtVmCJNFRojjfnyhVsf6mtziCL4e7ggqLgnESeE2rskEVY4Aw 3f4qmE3eSBXTqxQUkbMGEy39+7YRz/VY+rvlBv3w86joHpqTL0mYjZN8QxsOuNCvK9ug wme3OL5TaybqQzyoaDVWpegafPUIL7D/Gd+PlcwjtjWnc3qBBHZjlz/TANP/1IxXjT3q U7ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734209670; x=1734814470; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SUPQG0Albe+JpqvSGPJjfetaH2f6tBS/1AXfX2BFwcc=; b=R7Ki65T1tFPcUl9ncgIj2t/x9HMsAHl2xpVSfWLRAltMBumsbb6sGzNPGfLtTHm/kK U56nJeMSAGBM5ys/2Gx/8C5rgaW+5RdLviio31Ch0eqOsyXAT/3nXFOmcfax3ACiqe+2 l7e/IS9+DJ/3FklpzG5tr0DxAXoBQ92lElXrz1nhd37SngnMkOd3eqSiZguFFFpyOV2f i+nE7LYNDlGSsfND384AXgqaxVjYavObj8DtFbQEoa5PcZ/1xUgnI/lm/oQtf7ZPVHe7 Q/qZ41aKyqLVaHSddN2gnrKmTFAN0qR/WFY0sFIJFCTv2eWFUBRfPS/JIimY19bvcJuI ND7g== X-Forwarded-Encrypted: i=1; AJvYcCVKWjFf/d3XuaIntsQhpSQmC08RYH3jiuC7jVICYqOZaPflBrNpXrSmq3Q+eECxFNtNsQrJcvWmFXeICmqxYg8QtMSfTg==@freebsd.org X-Gm-Message-State: AOJu0YxiQt53DsJGhuS0GtKcBvXoVs6+XheJXHN8KUofO67lZtJ5epwq JZbvklK37z7U+zyDy2ZVro3BbnMr9DyxRaluRmH2kxF741HHV1jVdWvfKNjR+zKtnb4FjCQLj9y CCHxHqzonv2pDDPZiIkPHMJBBu7k8cph1GcWEEw== X-Gm-Gg: ASbGncuMi1sgI1yAQq69dB+Jt5Qa1S3+MgWtOoIBqcjkpnrVbJUen3pJNCQx2lyftH1 MwINMQ38L8mog73tFE7/2/gEsnnut9ZXlvEv4INvAoy9vGaEae6hPnKE/4qhHvGG3AfmS X-Google-Smtp-Source: AGHT+IFS5o7PwUJ/5umvXvqUW424gfGGXyVlxFzSlxM6PPKQZBk0iNcZv+fPK8Ym8IgEt3Xb/NKavSyQsYc62uW93Lk= X-Received: by 2002:a17:90b:2548:b0:2ee:d958:1b18 with SMTP id 98e67ed59e1d1-2f2901b7ddbmr9815756a91.36.1734209669815; Sat, 14 Dec 2024 12:54:29 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202412132304.4BDN4QSd029112@gitrepo.freebsd.org> <87y10icwq0.wl-herbert@gojira.at> In-Reply-To: From: Warner Losh Date: Sat, 14 Dec 2024 13:54:18 -0700 Message-ID: Subject: Re: git: 42ee30f19cc7 - main - depend-cleanup.sh: Need to delete jemalloc.3 in objtree To: David Wolfskill Cc: Warner Losh , "Herbert J. Skuhra" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000560038062941275b" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Y9djz2c1qz4Kdn X-Spamd-Bar: ---- --000000000000560038062941275b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Dec 14, 2024 at 5:50=E2=80=AFAM David Wolfskill wrote: > On Sat, Dec 14, 2024 at 12:47:35PM +0100, Herbert J. Skuhra wrote: > > On Sat, 14 Dec 2024 00:04:26 +0100, Warner Losh wrote: > > > > > > The branch main has been updated by imp: > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D42ee30f19cc7ad85187cbf97155dbd5= 207a04845 > > > > > > commit 42ee30f19cc7ad85187cbf97155dbd5207a04845 > > > Author: Warner Losh > > > AuthorDate: 2024-12-13 17:46:59 +0000 > > > Commit: Warner Losh > > > CommitDate: 2024-12-13 23:04:34 +0000 > > > > > > depend-cleanup.sh: Need to delete jemalloc.3 in objtree > > > ... > > > Does this actually work? Should this be > > > > if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then > > > > ? > > Empirically: > On a system running: > FreeBSD 15.0-CURRENT #61 main-n274188-38cb1ba8637d: Fri Dec 13 11:58:34 > UTC 2024 root@freebeast.catwhisker.org:/common/S4/obj/usr/src/amd64.a= md64/sys/GENERIC > amd64 1500029 1500029 > > after updating sources to main-n274215-da5aed38d80a and starting an > in-place source upgrade using meta mode, the build failed: > > ... > Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/mail/mail > Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/tftp/tftp.1.gz > make[4]: don't know how to make jemalloc.3. Stop > Yea, I tested in the wrong tree.. I've just tested in the right tree so will be pushing a fix. Warner > make[4]: stopped making "all" in /usr/src/lib/libc > .ERROR_TARGET=3D'jemalloc.3' > .ERROR_META_FILE=3D'' > .MAKE.LEVEL=3D'4' > MAKEFILE=3D'' > .MAKE.MODE=3D'meta missing-filemon=3Dyes missing-meta=3Dyes silent=3Dyes = verbose' > _ERROR_CMD=3D'.PHONY' > .... > > I then used "find" to find any ocurrences of "jemalloc.3" in > /usr/obj/; one was found: a symlink named > /usr/obj/usr/src/amd64.amd64/lib/libc/jemalloc.3, which pointed to > /usr/src/contrib/jemalloc/doc/jemalloc.3. > > The latter did not exist. > > Once I removed the symlink, the build succeeeded: > FreeBSD 15.0-CURRENT #62 main-n274215-da5aed38d80a: Sat Dec 14 12:08:41 > UTC 2024 root@freebeast.catwhisker.org:/common/S4/obj/usr/src/amd64.a= md64/sys/GENERIC > amd64 1500029 1500029 > > On a pair of other (slower) machines, I then had the opportunity to > remove the symlink before starting the build; those completed without > incident. > > I believe a src/UPDATING entry would be sufficient to help folks > avoid the error condition. > > Peace, > david > -- > David H. Wolfskill david@catwhisker.org > Re. tariffs: https://en.wikipedia.org/wiki/Smoot%E2%80%93Hawley_Tariff_Ac= t > > See https://www.catwhisker.org/~david/publickey.gpg for my public key. > --000000000000560038062941275b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sat, Dec 14,= 2024 at 5:50=E2=80=AFAM David Wolfskill <david@catwhisker.org> wrote:
On Sat, Dec 14, 2024 at 12:47:35PM +0100, Her= bert J. Skuhra wrote:
> On Sat, 14 Dec 2024 00:04:26 +0100, Warner Losh wrote:
> >
> > The branch main has been updated by imp:
> >
> > URL: htt= ps://cgit.FreeBSD.org/src/commit/?id=3D42ee30f19cc7ad85187cbf97155dbd5207a0= 4845
> >
> > commit 42ee30f19cc7ad85187cbf97155dbd5207a04845
> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org> > > AuthorDate: 2024-12-13 17:46:59 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org> > > CommitDate: 2024-12-13 23:04:34 +0000
> >
> >=C2=A0 =C2=A0 =C2=A0depend-cleanup.sh: Need to delete jemalloc.3 i= n objtree
> > ...=C2=A0 =C2=A0 =C2=A0

> Does this actually work? Should this be
>
> if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then
>
> ?

Empirically:
On a system running:
FreeBSD 15.0-CURRENT #61 main-n274188-38cb1ba8637d: Fri Dec 13 11:58:34 UTC= 2024=C2=A0 =C2=A0 =C2=A0root@freebeast.catwhisker.org:/common/S4/obj/usr/src/a= md64.amd64/sys/GENERIC amd64 1500029 1500029

after updating sources to main-n274215-da5aed38d80a and starting an
in-place source upgrade using meta mode, the build failed:

...
Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/mail/mail
Building /common/S4/obj/usr/src/amd64.amd64/usr.bin/tftp/tftp.1.gz
make[4]: don't know how to make jemalloc.3. Stop
<= br>
Yea, I tested in the wrong tree.. I've just tested in the= right tree so will be pushing a fix.

Warner
=
=C2=A0
make[4]: stopped making "all" in /usr/src/lib/libc
.ERROR_TARGET=3D'jemalloc.3'
.ERROR_META_FILE=3D''
.MAKE.LEVEL=3D'4'
MAKEFILE=3D''
.MAKE.MODE=3D'meta missing-filemon=3Dyes missing-meta=3Dyes silent=3Dye= s verbose'
_ERROR_CMD=3D'.PHONY'
....

I then used "find" to find any ocurrences of "jemalloc.3&quo= t; in
/usr/obj/; one was found: a symlink named
/usr/obj/usr/src/amd64.amd64/lib/libc/jemalloc.3, which pointed to
/usr/src/contrib/jemalloc/doc/jemalloc.3.

The latter did not exist.

Once I removed the symlink, the build succeeeded:
FreeBSD 15.0-CURRENT #62 main-n274215-da5aed38d80a: Sat Dec 14 12:08:41 UTC= 2024=C2=A0 =C2=A0 =C2=A0root@freebeast.catwhisker.org:/common/S4/obj/usr/src/a= md64.amd64/sys/GENERIC amd64 1500029 1500029

On a pair of other (slower) machines, I then had the opportunity to
remove the symlink before starting the build; those completed without
incident.

I believe a src/UPDATING entry would be sufficient to help folks
avoid the error condition.

Peace,
david
--
David H. Wolfskill=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 david@catwhisker.org
Re. tariffs: https://en.wikipedia.org/w= iki/Smoot%E2%80%93Hawley_Tariff_Act

See https://www.catwhisker.org/~david/publickey.gpg for my public key.
--000000000000560038062941275b-- From nobody Sat Dec 14 20:58:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9dq356l1z5glrb; Sat, 14 Dec 2024 20:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9dq32h4Bz4L52; Sat, 14 Dec 2024 20:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734209935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0JxZSJ7V/x6iMxs6VO5reEaEHKm6YCb7k9Mfe7KFAY=; b=R9ggjGKkYF0+nYLh02DEvIW37l/A2wetRbIHfVn/E2y6FU5BBS7yJWRDC7Ux5ylJUu/os3 /isLB6y4TLYYlvAi1pKcHc3nUUA6dvgvDIZ4A7sI/OfLw3L6Nbfp14jLlA25ZcX/IUz4fA 3zxG8k9kRaBJbk+BrvgXtcgSPvK36P0ndbGuw317jxsoKEDqlN/O40bsxUwDGK8osrAinh EbV6PZXDDb65fTROVZXDAEi3h7I+WJ0O8WYKjTrHWpiH2T3P0ZS1TaRu5Am9rTr4pMNFeH tLMS4B1qVBISplYfKXJCSlIt8t1eeb3fGs4eVSqyrtJXiZ5usFGNuzZOvadFtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734209935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0JxZSJ7V/x6iMxs6VO5reEaEHKm6YCb7k9Mfe7KFAY=; b=B8NV6u5BxyqgWh2C0tiaJnOSq45nttrxqEFA5XCfuTeaOfhh+gouVlmgix2ZMZdOjdUnwP YdKgIWf86lKLlo+vkHmlD85MvrLjL/SvMLm4IGeITSFabkMCwHelRCurPWh3bxnQuMnuc2 I5h5wn2mSHdIFC1ShVxUJGHHidKMVauA0TRLnkb38oHbRukSaZLQNt5ZdEHW08a8LolmJE tBnHEwSO0jRnvP1RfRiR7QChChjXdDYRHbQIFwm+0rGIrlmtiRArcYXSELY2yDlyTZq7pS X9sYIB1NVeYa2fkA77nf2CxAU5mI8ILKABgyPPwnMPnneFsvso2PZb5MZDQBvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734209935; a=rsa-sha256; cv=none; b=N13fpP2gmXayYOTsvJmPr8IOhXqSkm1YOY16XV/vbXUiNq80jj061FCe/4alFrU1gdZkjd uRmeMmeBf+Lf36PLJGM1yy5ASOoab840SEclOOS0c7QoHOVo3iMyYljySlQSiOL5+jRAdo 2O6h7pQf5OCwLf2cg9KaKKkEZ7AzAEPQERynaJ8vq8hPM9eaCL/r7woHZuUpLfDDNWPyPr CWOLtBzDZiIRKcPABKexQ+1ow7r3oEG4u4BO9izW3WdxT3SDOiau5GrBUD+q4KckDf4y+W QmnaqHs9ALwK0ewE2j3tF0DR3vhM9eZH4DUU6X93p9APF5YhmRYz9YFzUm92Ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9dq328g5zdZ9; Sat, 14 Dec 2024 20:58:55 +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 4BEKwtHN076405; Sat, 14 Dec 2024 20:58:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BEKwtbi076402; Sat, 14 Dec 2024 20:58:55 GMT (envelope-from git) Date: Sat, 14 Dec 2024 20:58:55 GMT Message-Id: <202412142058.4BEKwtbi076402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1d69498623c0 - main - depend-cleanup: Fix test arg List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d69498623c0eced2de0f97cd553aff81a936911 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d69498623c0eced2de0f97cd553aff81a936911 commit 1d69498623c0eced2de0f97cd553aff81a936911 Author: Warner Losh AuthorDate: 2024-12-14 15:55:18 +0000 Commit: Warner Losh CommitDate: 2024-12-14 20:56:10 +0000 depend-cleanup: Fix test arg -e follows the symlink to see if the file exists. I tested on the wrong tree, so it appeared to work for me. Change to -h which see if the link is there or not. The file will never not be a link if present. Fixes: 42ee30f19cc7 Noticed by: Herbert Skuhra Sponsored by: Netflix --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 81acf517f9d7..8aee1d0e9e71 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -233,7 +233,7 @@ clean_dep lib/libcrypt crypt-sha256 c clean_dep lib/libcrypt crypt-sha512 c # 20241213 b55f5e1c4ae3 jemalloc: Move generated jemalloc.3 into lib/libc tree -if [ -e "$OBJTOP"/lib/libc/jemalloc.3 ]; then +if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then # Have to cleanup the jemalloc.3 in the obj tree since make gets # confused and won't use the one in lib/libc/malloc/jemalloc/jemalloc.3 echo "Removing stale jemalloc.3 object" From nobody Sun Dec 15 04:40:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9r3c12Djz5hGDX; Sun, 15 Dec 2024 04:40: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 4Y9r3b6xP9z42S5; Sun, 15 Dec 2024 04:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734237628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPtvpKjswL/qvoVuuwskPFWCnJF3ca1ojWNYUgDgqzs=; b=DR/By7vqH8LdnmFiaHOZJ4DaaObVRGaRShlKn6lWJTK3XPTpba4286Fj0fyH578B1Yx8UM MW5mAgytmFQ1wTxdRUDH9u1WcV2/DY6OfKe0KM1jb7nN+cSR/OXcEgCpMVuvxnq4BVwoIi JI7nIPZqme/EMMi93SQY896hfHbgg8FX1NcLriKvpNZzzqbPQRTHYQJ87YiaGXR6skQt+o rDbD5+9UdXiM/qW6kaAXZkgw7B2PmoEk2drTbCYh9nnRUjm9HGNcSM65bGWKYN4RHQSJFj QD6BZEwLxRxyPW6i8wAxI60KYp48AulX3BWbwF8jBldGu6D2T+6iKFrLMazxvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734237628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPtvpKjswL/qvoVuuwskPFWCnJF3ca1ojWNYUgDgqzs=; b=ZJyVEziD6930pXJCkABYu7RLMC6pTV01BPU96Ts5PbmmCmuDPtoIMQ6dQn/h6WiZHWmtdT QK4SI7BBsClUW1vptc9R0/fWIcgMvUrE+X9/3pz9dkvr63f8JmPO2pRnywCmyk/nPePh6g ijAtG3b8fajJguwWXPF6LCTwlWrYU34lp01p9+zbGFNc307bKvPVv/aUmJ7hgRQIuC6R8e Nu/2ohMsK/mpvDd6CSta8JXmkDJBTY2TIrKq2Jldb6vUauRjqJLIrRUrTqw8j5+gJSlu+B 9yTxCHzx0BigaZ0GqiFjKN2SDqShobWW+xYdYbsRoSaY/zHziA/TpgCx8LopYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734237628; a=rsa-sha256; cv=none; b=mBySXU8KC4Z+ZevYpVG5rGTkQupt23SsBYo3wR6WsDz2vq5DL6CNxSWupl/RKx/vEK9S3u 3ui+JSrjemp4GXNWVEX5ay3jW3I67gqS6YCf/4J88U2/YSA5WTKnlWCHs8tKruSwn3+NZj SX6jxbd4r3VTyuGKYZo16HV6FGThm7CEwGQeyB5Qi6EsP537fADNhgZZAJ6yQn+z2nMwp6 +JUwT8PSwJRRdVC/CLN2E9cr6gSqYPcaPO/QJNNVHhjb/KkpWjPOp4xxTwhKyKrc+pHnFL NxU5baF4TaV2Tc0qR9u9P7AApGcRJZe4O/ZSO6SyYfjMSZzMuqdgQaVoIdsrLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9r3b6XYXzsvR; Sun, 15 Dec 2024 04:40: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 4BF4eRZB040224; Sun, 15 Dec 2024 04:40:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF4eRcW040221; Sun, 15 Dec 2024 04:40:27 GMT (envelope-from git) Date: Sun, 15 Dec 2024 04:40:27 GMT Message-Id: <202412150440.4BF4eRcW040221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 1a2a0db0a9ec - main - tests: kern: improve logsigexit test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a2a0db0a9ecf0f761eadbfe81289515a7efa5f0 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1a2a0db0a9ecf0f761eadbfe81289515a7efa5f0 commit 1a2a0db0a9ecf0f761eadbfe81289515a7efa5f0 Author: Kyle Evans AuthorDate: 2024-12-15 04:40:15 +0000 Commit: Kyle Evans CommitDate: 2024-12-15 04:40:15 +0000 tests: kern: improve logsigexit test Use dmesg(8) instead rather than relying on a particular syslogd configuration, and just skip the test if we can't access the msgbuf. While we're here, remove some debugging output that we don't actually need. --- tests/sys/kern/logsigexit_test.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/sys/kern/logsigexit_test.sh b/tests/sys/kern/logsigexit_test.sh index c40c033bbefd..f0db02613533 100644 --- a/tests/sys/kern/logsigexit_test.sh +++ b/tests/sys/kern/logsigexit_test.sh @@ -8,6 +8,10 @@ atf_test_case basic basic_body() { + if ! dmesg >/dev/null 2>&1; then + atf_skip "No dmesg(8) access" + fi + # SIGABRT carefully chosen to avoid issues when run under Kyua. No # matter the value of the global kern.logsigexit, these should force # the messages as appropriate and we'll all be happy. @@ -22,12 +26,9 @@ basic_body() read enpid < enabled.out read dispid < disabled.out - 1>&2 echo "$enpid" - 1>&2 echo "$dispid" - - atf_check grep -Eq "$enpid.+exited on signal" /var/log/messages - atf_check -s not-exit:0 \ - grep -Eq "$dispid.+exited on signal" /var/log/messages + atf_check -o save:dmesg.out dmesg + atf_check grep -Eq "$enpid.+exited on signal" dmesg.out + atf_check -s not-exit:0 grep -Eq "$dispid.+exited on signal" dmesg.out } atf_init_test_cases() From nobody Sun Dec 15 04:40:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9r3d1tcDz5hGGv; Sun, 15 Dec 2024 04:40: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9r3d0pk0z42Mm; Sun, 15 Dec 2024 04:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734237629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=afisJsPxAAznFRh1huZ6PnZWCw6tRFBbeTQe59RVJ7E=; b=AiQb8rsNGirUNvjdQvBym8ZXYLxIV92H/E50JmEx4gaHcAFq01oXeroIOu1azA0dV/b9cW XlpMcZEJYQyuJdRdP3ZhoitmpC7zB9MmQ4EH8pJzjDn8j7pzjQ6YdboxuJ8kwGSbA5XMpZ y4Zx6D7qFGHT5unqhGD3aY0VIvegLO9T6vPMTyMC9sdsA8CuMNA15/1E3DHkab0Pg01lPh sVtJWpzn5KpWGvR6DdgHnXdPBWUAGF2GZB2M7FGFJOAhC4SNalM9AbUDprttlH0U9UJ8W6 socvya/I6yOZuW1mEMWLVpib0kzOoKK+b+ezKt0zW7w4ddWRpYq/KgrM19GAFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734237629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=afisJsPxAAznFRh1huZ6PnZWCw6tRFBbeTQe59RVJ7E=; b=OGujfu59qbH9EFsO2LUWlQVf+y9Jkfc9N7A0PZdQ94t5GQ6lD+sxOBlplGJ3NPYjDpBURL a1tIbbogtlPN6HpAznEHlGgXsuaFpLivkHByKP5KopU5di3QFE4POuWP9k2U3Js8XpAEUg FoP9h26kPdWQH+PSSHMpmZdy6ElnK6Le//pGji+jGWigfG13vUf6ANjS3jMtDwc9c9nA9R TLWxt20UpX/T2LGP7Qq9Hwa+3flRe8IZkDX4LwYvDVtLqhY0n41WHuZQhsZ1d+4870gTvi O5r/u3XwXLdF+aGp1k9eibBtt0dg1je/jiWqbt8ubdGsDzqzSNPRM7ZtaBNkhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734237629; a=rsa-sha256; cv=none; b=SBwJzVOoeG0f0WSbkhiQJZGaFzwbU484uZLxpzpxAC+FNaoKdqKD1NqtyYq20uhTKTDcDi EAl58mZ9OW5wP1UrxLwkpjqqDSpnl/hTT2t5oNyp7o8k6jBPJWL2dkPAZX7fu3ppLBIh6E sojeifFel/7/93Zi32oj/pTNVzawHvyhh+aScVLrBKPNKCvRzWxsseDwLqOKpO+++QNkFA 7MQhUWrHtlYH8akn9Hu14AhZ5/DdgLGp6/uhqfCpBJOweMb1NqY2QCe4dPDqXCM3vwr241 2qqj3NNsLW5NRBOFdejKRrpD5r7hHaWuitPUZEJPW/Vop56yGchpXHkbWQTg7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9r3d0Q3FzsqR; Sun, 15 Dec 2024 04:40: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 4BF4eSIh040275; Sun, 15 Dec 2024 04:40:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF4eSVj040272; Sun, 15 Dec 2024 04:40:28 GMT (envelope-from git) Date: Sun, 15 Dec 2024 04:40:28 GMT Message-Id: <202412150440.4BF4eSVj040272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 74ecdf86d8d2 - main - Tweak ppoll() to include 1003.1-2024 visibility, take two List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74ecdf86d8d2a94a4bfcf094a2e21b4747e4907f Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=74ecdf86d8d2a94a4bfcf094a2e21b4747e4907f commit 74ecdf86d8d2a94a4bfcf094a2e21b4747e4907f Author: Kyle Evans AuthorDate: 2024-12-15 04:40:16 +0000 Commit: Kyle Evans CommitDate: 2024-12-15 04:40:16 +0000 Tweak ppoll() to include 1003.1-2024 visibility, take two Note in the manpage that the 2024 edition finally added ppoll(), and also add the appropriate declarations for the correct versions of _POSIX_C_SOURCE (via __POSIX_VISIBLE). Differential Revision: https://reviews.freebsd.org/D48043 --- include/ssp/poll.h | 4 ++-- lib/libsys/poll.2 | 5 +++-- sys/sys/poll.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/ssp/poll.h b/include/ssp/poll.h index 815e73eb46b7..90a8b368b8bf 100644 --- a/include/ssp/poll.h +++ b/include/ssp/poll.h @@ -42,7 +42,7 @@ __ssp_redirect_raw_impl(int, poll, poll, return (__ssp_real(poll)(fds, nfds, timeout)); } -#if __BSD_VISIBLE +#if __POSIX_VISIBLE >= 202405 __ssp_redirect_raw_impl(int, ppoll, ppoll, (struct pollfd fds[], nfds_t nfds, const struct timespec *__restrict timeout, @@ -53,7 +53,7 @@ __ssp_redirect_raw_impl(int, ppoll, ppoll, return (__ssp_real(ppoll)(fds, nfds, timeout, newsigmask)); } -#endif /* __BSD_VISIBLE */ +#endif /* __POSIX_VISIBLE >= 202405 */ __END_DECLS #endif /* __SSP_FORTIFY_LEVEL > 0 */ diff --git a/lib/libsys/poll.2 b/lib/libsys/poll.2 index 6a5cc1dc3a89..6e6ed33f7a6b 100644 --- a/lib/libsys/poll.2 +++ b/lib/libsys/poll.2 @@ -27,7 +27,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 27, 2021 +.Dd December 11, 2024 .Dt POLL 2 .Os .Sh NAME @@ -268,7 +268,8 @@ function conforms to .St -p1003.1-2001 . The .Fn ppoll -is not specified by POSIX. +function conforms to +.St -p1003.1-2024 . The POLLRDHUP flag is not specified by POSIX, but is compatible with Linux and illumos. diff --git a/sys/sys/poll.h b/sys/sys/poll.h index d5f2c0373942..4f34210ea1c9 100644 --- a/sys/sys/poll.h +++ b/sys/sys/poll.h @@ -96,7 +96,7 @@ struct pollfd { #ifndef _KERNEL -#if __BSD_VISIBLE +#if __POSIX_VISIBLE >= 202405 #include #include @@ -115,7 +115,7 @@ typedef __sigset_t sigset_t; __BEGIN_DECLS int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout); -#if __BSD_VISIBLE +#if __POSIX_VISIBLE >= 202405 int ppoll(struct pollfd _pfd[], nfds_t _nfds, const struct timespec *__restrict _timeout, const sigset_t *__restrict _newsigmask); From nobody Sun Dec 15 15:40:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6jH12Ngz5gyCf; Sun, 15 Dec 2024 15:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB6jH0cm6z40T8; Sun, 15 Dec 2024 15:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fG6fPBocUOfoGZGOk6+U7eZpJWr6fUVRv6z48z7ID5g=; b=qL68Na2nmoPea9XLaNQZGiDhoO0Rxm+cIPd4uPwbn4G9AkHzodVtdXHJDE9BDu4exsTVy/ CpEUevXcPJkcWLo498eTbY8pQPkBQKFFAhsdqZZt4h9oCxZsIOMfrNEDRA1xkMnIxmjhHH nHjk9vJIuZLk3bu4Me6jFw31tmrpJCnjuUhk+JEBIvCsoMUlHok6QY4868lb36yjyOOGu3 YxgoqppIUkNuDcoZFNYMk5fSpS2bcSPSF0XEpNcsQN1LwhOJgSZo9rTOtAdojT4tCg8Xij LAevajOpE0kXpX45R+oV5noi4nGG/3glRtjfqiDaqkF4eNcOQMApL7h+bqj3Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fG6fPBocUOfoGZGOk6+U7eZpJWr6fUVRv6z48z7ID5g=; b=nEGLn5EnaDnaTdF0MJ8tVTs7G8XCmvGnjF/ZPeFatA3tbhV/drgoHHkP/Fuaul75wKmP42 UGYMBxRYHL6s6plQAXjoqh0QjIYGFb3pAEjtAZcXjfvo4v6a7biIJ/l16YbPrOOvfunE1P Vvv5Vp3E0kM3kHGRpZfY4qahT8yl2cG+UmESm7xR3+6+InZ6Pva1cz2a20EFm6QZnGEWDl MFO1MP+6VUO9um7RnO9ffYbpQWRWFuLvenexxo15UwuyHLzN9ONXg3DpBOE1sAFBTvxSW6 NsEXlH+bp2+Nou7VmhtJHuGR+79CQYDUGRwka5eqQ+nMszm25M6SAVsC9TipyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277235; a=rsa-sha256; cv=none; b=HfuyhMDfXm8oDuXuAOxRShJwjqA8jB5OzOqda0F76xkqUPgbpN9S22driTcKlvMRJ7IHjt VpeAjCxaBpkJcxnf+sn6zeZgsjVrI8nOw+0v86ADjGN3rtL4sdfRPN8kxN1h43LGY2daV7 tO51VC1QLpCdw4jNbmdaag0town5EnFidTJYEpkYticMjF2IQhM5QexBa23kXkOrJSBC4c k4pK8kcqtVioP7hNz1iF14scTkbulStq+9jGAgRfHrKgbL5XXIpqEiRl8g+qPb8pYgkFCB IjTW8pNmeyTaag7XmQO/kLCf8SaLHJb6n2vzwvuxMXvbE+GUU+ZGTv6WuAt5xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6jH0D0czDvc; Sun, 15 Dec 2024 15:40:35 +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 4BFFeYYb069275; Sun, 15 Dec 2024 15:40:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFeYu6069272; Sun, 15 Dec 2024 15:40:34 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:40:34 GMT Message-Id: <202412151540.4BFFeYu6069272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 459dc427873c - main - x86: Refactor kernel-mode NMI handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 459dc427873c9a294387ec74a96e6f7824de7435 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=459dc427873c9a294387ec74a96e6f7824de7435 commit 459dc427873c9a294387ec74a96e6f7824de7435 Author: Bojan Novković AuthorDate: 2024-12-15 13:56:40 +0000 Commit: Bojan Novković CommitDate: 2024-12-15 15:39:36 +0000 x86: Refactor kernel-mode NMI handling This refactor aims to add the ability to share performance counter interrupts by refactoring the kernel-mode NMI handler. The handler now allows multiple drivers to service the same interrupt (e.g. hwpmc(4) and hwt(4)'s Intel Processor Trace backend). Reviewed by: kib, avg Differential Revision: https://reviews.freebsd.org/D46421 --- sys/amd64/amd64/trap.c | 32 ++-------------- sys/i386/i386/trap.c | 26 +++---------- sys/x86/include/x86_var.h | 4 +- sys/x86/x86/cpu_machdep.c | 95 +++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 104 insertions(+), 53 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 6ceeea41ea91..4590be501d64 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -230,38 +230,22 @@ trap(struct trapframe *frame) VM_CNT_INC(v_trap); type = frame->tf_trapno; -#ifdef SMP - /* Handler for NMI IPIs used for stopping CPUs. */ - if (type == T_NMI && ipi_nmi_handler() == 0) - return; -#endif - #ifdef KDB if (kdb_active) { kdb_reenter(); return; } #endif + if (type == T_NMI) { + nmi_handle_intr(frame); + return; + } if (type == T_RESERVED) { trap_fatal(frame, 0); return; } - if (type == T_NMI) { -#ifdef HWPMC_HOOKS - /* - * CPU PMCs interrupt using an NMI. If the PMC module is - * active, pass the 'rip' value to the PMC module's interrupt - * handler. A non-zero return value from the handler means that - * the NMI was consumed by it and we can return immediately. - */ - if (pmc_intr != NULL && - (*pmc_intr)(frame) != 0) - return; -#endif - } - if ((frame->tf_rflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled @@ -392,10 +376,6 @@ trap(struct trapframe *frame) signo = SIGFPE; break; - case T_NMI: - nmi_handle_intr(type, frame); - return; - case T_OFLOW: /* integer overflow fault */ ucode = FPE_INTOVF; signo = SIGFPE; @@ -619,10 +599,6 @@ trap(struct trapframe *frame) return; #endif break; - - case T_NMI: - nmi_handle_intr(type, frame); - return; } trap_fatal(frame, 0); diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 693e3a2f94b4..9e310c049daa 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -237,12 +237,6 @@ trap(struct trapframe *frame) KASSERT((read_eflags() & PSL_I) == 0, ("trap: interrupts enabled, type %d frame %p", type, frame)); -#ifdef SMP - /* Handler for NMI IPIs used for stopping CPUs. */ - if (type == T_NMI && ipi_nmi_handler() == 0) - return; -#endif /* SMP */ - #ifdef KDB if (kdb_active) { kdb_reenter(); @@ -251,24 +245,14 @@ trap(struct trapframe *frame) #endif trap_check_kstack(); - if (type == T_RESERVED) { - trap_fatal(frame, 0); + if (type == T_NMI) { + nmi_handle_intr(frame); return; } - if (type == T_NMI) { -#ifdef HWPMC_HOOKS - /* - * CPU PMCs interrupt using an NMI so we check for that first. - * If the HWPMC module is active, 'pmc_hook' will point to - * the function to be called. A non-zero return value from the - * hook means that the NMI was consumed by it and that we can - * return immediately. - */ - if (pmc_intr != NULL && - (*pmc_intr)(frame) != 0) - return; -#endif + if (type == T_RESERVED) { + trap_fatal(frame, 0); + return; } if (type == T_MCHK) { diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h index 6609871bf89e..dbb4e9557ed0 100644 --- a/sys/x86/include/x86_var.h +++ b/sys/x86/include/x86_var.h @@ -148,7 +148,9 @@ void zenbleed_sanitize_enable(void); void zenbleed_check_and_apply(bool all_cpus); void nmi_call_kdb(u_int cpu, u_int type, struct trapframe *frame); void nmi_call_kdb_smp(u_int type, struct trapframe *frame); -void nmi_handle_intr(u_int type, struct trapframe *frame); +void nmi_register_handler(int (*handler)(struct trapframe *)); +void nmi_remove_handler(int (*handler)(struct trapframe *)); +void nmi_handle_intr(struct trapframe *frame); void pagecopy(void *from, void *to); void printcpuinfo(void); int pti_get_default(void); diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 5f6cc35dda6f..4df652f1f2a8 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -76,6 +76,7 @@ #include #include #include +#include #include #ifdef SMP #include @@ -885,17 +886,105 @@ nmi_call_kdb(u_int cpu, u_int type, struct trapframe *frame) panic("NMI"); } +/* + * Dynamically registered NMI handlers. + */ +struct nmi_handler { + int running; + int (*func)(struct trapframe *); + struct nmi_handler *next; +}; +static struct nmi_handler *nmi_handlers_head = NULL; +MALLOC_DEFINE(M_NMI, "NMI handlers", + "List entries for dynamically registered NMI handlers"); + void -nmi_handle_intr(u_int type, struct trapframe *frame) +nmi_register_handler(int (*handler)(struct trapframe *)) { + struct nmi_handler *hp; + int (*hpf)(struct trapframe *); + + hp = (struct nmi_handler *)atomic_load_acq_ptr( + (uintptr_t *)&nmi_handlers_head); + while (hp != NULL) { + hpf = hp->func; + MPASS(hpf != handler); + if (hpf == NULL && + atomic_cmpset_ptr((volatile uintptr_t *)&hp->func, + (uintptr_t)NULL, (uintptr_t)handler) != 0) { + hp->running = 0; + return; + } + hp = (struct nmi_handler *)atomic_load_acq_ptr( + (uintptr_t *)&hp->next); + } + hp = malloc(sizeof(struct nmi_handler), M_NMI, M_WAITOK | M_ZERO); + hp->func = handler; + hp->next = nmi_handlers_head; + while (atomic_fcmpset_rel_ptr( + (volatile uintptr_t *)&nmi_handlers_head, + (uintptr_t *)&hp->next, (uintptr_t)hp) == 0) + ; +} +void +nmi_remove_handler(int (*handler)(struct trapframe *)) +{ + struct nmi_handler *hp; + + hp = (struct nmi_handler *)atomic_load_acq_ptr( + (uintptr_t *)&nmi_handlers_head); + while (hp != NULL) { + if (hp->func == handler) { + hp->func = NULL; + /* Wait for the handler to exit before returning. */ + while (atomic_load_int(&hp->running) != 0) + cpu_spinwait(); + return; + } + hp = (struct nmi_handler *)atomic_load_acq_ptr( + (uintptr_t *)&hp->next); + } + + panic("%s: attempting to remove an unregistered NMI handler %p\n", + __func__, handler); +} + +void +nmi_handle_intr(struct trapframe *frame) +{ + int (*func)(struct trapframe *); + struct nmi_handler *hp; + bool handled; + +#ifdef SMP + /* Handler for NMI IPIs used for stopping CPUs. */ + if (ipi_nmi_handler() == 0) + return; +#endif + handled = false; + hp = (struct nmi_handler *)atomic_load_acq_ptr( + (uintptr_t *)&nmi_handlers_head); + while (hp != NULL) { + func = hp->func; + if (func != NULL) { + atomic_add_int(&hp->running, 1); + if (func(frame) != 0) + handled = true; + atomic_subtract_int(&hp->running, 1); + } + hp = (struct nmi_handler *)atomic_load_acq_ptr( + (uintptr_t *)&hp->next); + } + if (handled) + return; #ifdef SMP if (nmi_is_broadcast) { - nmi_call_kdb_smp(type, frame); + nmi_call_kdb_smp(T_NMI, frame); return; } #endif - nmi_call_kdb(PCPU_GET(cpuid), type, frame); + nmi_call_kdb(PCPU_GET(cpuid), T_NMI, frame); } static int hw_ibrs_active; From nobody Sun Dec 15 15:40:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6jJ2W8Lz5gy2S; Sun, 15 Dec 2024 15:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB6jJ1wJDz40Qb; Sun, 15 Dec 2024 15:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRB9O2cpQGvEKBQctcFj90KAFpMonf+m9ORV1tW0nx0=; b=AdVvWIDovwwwBARXpMdNb+p1B6VN7WbCcS6YSrVJ3G8EydK+BYx5FewU1c590m0/9rzqrk 04v5Wysb8QE1trey8YhP3IxakCjvXSQcd4dvfNjoL1/G8574l4fst5k7FwHBwLDjJN1ftP YJswZe/acLDWi7WnPE3RDvdnD78HJCxy6b6y2WQ7JfS9UBzq9ZcDMEZ6SeX330tRSTfHOX Vrplva/+rv5KUBXLJNNB/2GQeuGghG1EPxFM/XmLqNyNGBG+oN6Z8lT+Akk0YG6awVLs03 SemfR3ZzwBHTbSu033IPdJLw/sAPjGCnahoup5aJb5nPDO1e+Xc0QIFA9wuatA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRB9O2cpQGvEKBQctcFj90KAFpMonf+m9ORV1tW0nx0=; b=GsTRTYz0n+7pfzwvFq2kzHOrZFmrbK5nYJYtZ+PD5yIqQrUeE9Mjk3OXdC+mheGG8K66Rd SfkmdL9iv3aNHjhwR+oILgoCFjrnFeJwvPkNiNV+97I82KrJRzTjv6u9DU0El1i4OV7qWl F9TilsDBaP/IFQeoY/WYGvrzPH1O/cFrtQo4rIHqEDTy17fEFwcTNxlskBkjE9ywwTYVB1 77ToXVHkWSiug7HTqkL/F3pwOUqzH6qbFXOXFmQMvQiQdeF8JVhSDehKlogrRbDMGDMBM7 39PfKNREMeCsqwjRzodCohOsgr40A9gRFVbxFEegGe4XJgicssG2ePqd54R3mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277236; a=rsa-sha256; cv=none; b=ozvqXmXn/EaeskvgRUY1ntyCt44fftAupOCdpA4MfuPGLZmpUyzeIN1tFSyYP+KVWmn6Zh /I9uVc0KHzEpxWgnSsY5uE7u4EYwmGbi08Qlu8ywTNyg2KShnD2s+nzuOSp91E/h5DaixB Xz3vFB9r+xf2wZJT2O16Y9HbutBd0ZVTBYQRKf5/u0tTjZ5Cd52qzQzz/9b+OJBzvmh1BL D8I5vyyyU7NtZwEIPjSPC7hRJjBAmLgxpo+AgY1LUAo1l5e40/hmJ7eCDehdkEmWTZEybf WOIo/TgYCvNHzv4QXaD1Exhu37c4YKMQ5aB/ELsOdahUeYWLsWKmnNCKDFapTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6jJ1WsxzDw7; Sun, 15 Dec 2024 15:40:36 +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 4BFFeakw069331; Sun, 15 Dec 2024 15:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFeaS2069328; Sun, 15 Dec 2024 15:40:36 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:40:36 GMT Message-Id: <202412151540.4BFFeaS2069328@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 04e832672159 - main - x86: Allow sharing of perfomance counter interrupts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04e832672159cae412e8984e0b0cabfa6e7428b7 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=04e832672159cae412e8984e0b0cabfa6e7428b7 commit 04e832672159cae412e8984e0b0cabfa6e7428b7 Author: Bojan Novković AuthorDate: 2024-12-15 14:00:19 +0000 Commit: Bojan Novković CommitDate: 2024-12-15 15:39:36 +0000 x86: Allow sharing of perfomance counter interrupts This patch refactors the Performance Counter interrupt setup code to allow sharing the interrupt line between multiple drivers. More specifically, Performance Counter interrupts are used by both hwpmc(4) and hwt(4)'s upcoming Intel Processor Trace backend. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D46420 --- sys/dev/hwpmc/hwpmc_core.c | 4 ++-- sys/dev/hwpmc/hwpmc_x86.c | 4 ++-- sys/x86/include/apicvar.h | 6 +++--- sys/x86/x86/local_apic.c | 33 ++++++++++++++------------------- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index bf224ded126f..83784b93718e 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -1051,7 +1051,7 @@ core_intr(struct trapframe *tf) counter_u64_add(pmc_stats.pm_intr_ignored, 1); if (found_interrupt) - lapic_reenable_pmc(); + lapic_reenable_pcint(); return (found_interrupt); } @@ -1150,7 +1150,7 @@ core2_intr(struct trapframe *tf) counter_u64_add(pmc_stats.pm_intr_ignored, 1); if (found_interrupt) - lapic_reenable_pmc(); + lapic_reenable_pcint(); /* * Reenable all non-stalled PMCs. diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c index 1d04a6610674..54cc919eec30 100644 --- a/sys/dev/hwpmc/hwpmc_x86.c +++ b/sys/dev/hwpmc/hwpmc_x86.c @@ -242,7 +242,7 @@ pmc_md_initialize(void) return (NULL); /* disallow sampling if we do not have an LAPIC */ - if (md != NULL && !lapic_enable_pmc()) + if (md != NULL && !lapic_enable_pcint()) for (i = 0; i < md->pmd_nclass; i++) { if (i == PMC_CLASS_INDEX_SOFT) continue; @@ -256,7 +256,7 @@ void pmc_md_finalize(struct pmc_mdep *md) { - lapic_disable_pmc(); + lapic_disable_pcint(); if (cpu_vendor_id == CPU_VENDOR_AMD || cpu_vendor_id == CPU_VENDOR_HYGON) pmc_amd_finalize(md); diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index fc9bb0123539..c537d0ee0cdd 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -231,9 +231,9 @@ void apic_enable_vector(u_int apic_id, u_int vector); void apic_disable_vector(u_int apic_id, u_int vector); void apic_free_vector(u_int apic_id, u_int vector, u_int irq); void lapic_calibrate_timer(void); -int lapic_enable_pmc(void); -void lapic_disable_pmc(void); -void lapic_reenable_pmc(void); +int lapic_enable_pcint(void); +void lapic_disable_pcint(void); +void lapic_reenable_pcint(void); void lapic_enable_cmc(void); int lapic_enable_mca_elvt(void); void lapic_ipi_raw(register_t icrlo, u_int dest); diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 6a913883cc5c..86cbe9a050dc 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -35,7 +35,6 @@ #include #include "opt_atpic.h" -#include "opt_hwpmc_hooks.h" #include "opt_ddb.h" @@ -50,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -206,6 +206,7 @@ static uint64_t lapic_ipi_wait_mult; static int __read_mostly lapic_ds_idle_timeout = 1000000; #endif unsigned int max_apic_id; +static int pcint_refcnt = 0; SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "APIC options"); @@ -809,20 +810,19 @@ lapic_intrcnt(void *dummy __unused) SYSINIT(lapic_intrcnt, SI_SUB_INTR, SI_ORDER_MIDDLE, lapic_intrcnt, NULL); void -lapic_reenable_pmc(void) +lapic_reenable_pcint(void) { -#ifdef HWPMC_HOOKS uint32_t value; + if (refcount_load(&pcint_refcnt) == 0) + return; value = lapic_read32(LAPIC_LVT_PCINT); value &= ~APIC_LVT_M; lapic_write32(LAPIC_LVT_PCINT, value); -#endif } -#ifdef HWPMC_HOOKS static void -lapic_update_pmc(void *dummy) +lapic_update_pcint(void *dummy) { struct lapic *la; @@ -830,7 +830,6 @@ lapic_update_pmc(void *dummy) lapic_write32(LAPIC_LVT_PCINT, lvt_mode(la, APIC_LVT_PMC, lapic_read32(LAPIC_LVT_PCINT))); } -#endif void lapic_calibrate_timer(void) @@ -858,9 +857,8 @@ lapic_calibrate_timer(void) } int -lapic_enable_pmc(void) +lapic_enable_pcint(void) { -#ifdef HWPMC_HOOKS u_int32_t maxlvt; #ifdef DEV_ATPIC @@ -873,21 +871,18 @@ lapic_enable_pmc(void) maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT; if (maxlvt < APIC_LVT_PMC) return (0); - + if (refcount_acquire(&pcint_refcnt) > 0) + return (1); lvts[APIC_LVT_PMC].lvt_masked = 0; MPASS(mp_ncpus == 1 || smp_started); - smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL); + smp_rendezvous(NULL, lapic_update_pcint, NULL, NULL); return (1); -#else - return (0); -#endif } void -lapic_disable_pmc(void) +lapic_disable_pcint(void) { -#ifdef HWPMC_HOOKS u_int32_t maxlvt; #ifdef DEV_ATPIC @@ -900,15 +895,15 @@ lapic_disable_pmc(void) maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT; if (maxlvt < APIC_LVT_PMC) return; - + if (refcount_release(&pcint_refcnt)) + return; lvts[APIC_LVT_PMC].lvt_masked = 1; #ifdef SMP /* The APs should always be started when hwpmc is unloaded. */ KASSERT(mp_ncpus == 1 || smp_started, ("hwpmc unloaded too early")); #endif - smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL); -#endif + smp_rendezvous(NULL, lapic_update_pcint, NULL, NULL); } static int From nobody Sun Dec 15 15:40:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6jL09Bpz5gyCg; Sun, 15 Dec 2024 15:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB6jK2Bspz40Nq; Sun, 15 Dec 2024 15:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3x6vjBQePddEoU+0hmYNJRGO7Tk4BwAQprLO7LsG8g=; b=VQtcNEGVAPxxA/MvZsDn2RvXDB1488Gxv84Xyqj62P7NcsNEnEM62W8tlWv8aqfqy1ANh5 XJX88pjhycxXKKm4TbVpgOuMJkU6PKHddBfgNpZTd8bHljMxUidlYpLr9B8Xjvm31id+oE F6v392+ehdRzRlQZXfCVglupw/WmIir0lJcRYkdo2Kt0flU02s9ypv/0zf9pa1qlyPn1/K 46EpT3BvuZ2tspdHuR0bRBRXJ5wNjZP7LoQy+KWLHVRoNhPTmaz1PusSqhDAWJLxZswK5r mH6thgYLZmX6Lwjubv0nXxj3nXCf8J7YOY2Cg/a5e+qrR3s/WkZHAnehj5psaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3x6vjBQePddEoU+0hmYNJRGO7Tk4BwAQprLO7LsG8g=; b=SM76mebdCvt0ROHbr8x9YlGjtIDx7sNxqmNdAibdzDsRe5jYoX89FinlYXC99VkXvkDFOg 8V8zq3MzLrr1qCPrNsjosBA+k6fj7DDPzr+6XdOS7CPap6fgf13g/TPLv/l+UON8m4OXiO JzgNxOsd8RGIZ0lQLszLn+WFckCruD2sN+xRvmvcbEkReNoWyKNwpFQJUuDGFT/v6uOJdl LQdMKzpzD4KH9erPyCnuhZcpSuArpOYybFOrfxuVaMOrjFiqeKHtH2i2Qas5G0O+cX0WUq LTGQomifKfZ+AI1I5MfjOeTk/dy5QgAOkPJclAyqbrLGOIqx4mDFwJJQjAfzlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277237; a=rsa-sha256; cv=none; b=SaFMsEgeIkRMcG9oDzd1RHsPIALrDMfdGRpX5iHSuEgHeuUrDhYWvsouq12ZnJKyKEfY5N aXb0Mg98GHHsUdHoMVoLXz/GaYgV71yPBLFo9NGGSLls2WTwjWociUXhBq07NjhjNktHQi Zg8TzAHYsairlr/gaRJzNEWIqh21br3Hc/7Z8dWK5yKGSAL4dx9oxiDnuiuBWv9JaNKJ0K nwsqpWMUCzZ5kwNSNmmNqOwumix8rBOK0Y1bvuPXcKRy9Af7r3Nlq40lZFeWh2CvzCiTab n2XBzldxZlyBec6PHoEaDWHfMGuE+/bu2mpmJZ4VtNwOXr24NefjksOiup8e8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6jK1pKSzDw9; Sun, 15 Dec 2024 15:40:37 +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 4BFFebas069397; Sun, 15 Dec 2024 15:40:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFebXj069394; Sun, 15 Dec 2024 15:40:37 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:40:37 GMT Message-Id: <202412151540.4BFFebXj069394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 593e874e6124 - main - amd64: Add wrappers for XRSTORS and XSAVES List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 593e874e61249c845ca83e9284e4d9061643e8fb Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=593e874e61249c845ca83e9284e4d9061643e8fb commit 593e874e61249c845ca83e9284e4d9061643e8fb Author: Bojan Novković AuthorDate: 2024-12-15 14:02:13 +0000 Commit: Bojan Novković CommitDate: 2024-12-15 15:39:36 +0000 amd64: Add wrappers for XRSTORS and XSAVES Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D46984 --- sys/amd64/include/cpufunc.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index ca53d73b0186..d180f5c76afb 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -942,6 +942,29 @@ sgx_eremove(void *epc) return (sgx_encls(SGX_EREMOVE, 0, (uint64_t)epc, 0)); } +static __inline void +xrstors(uint8_t *save_area, uint64_t state_bitmap) +{ + uint32_t low, hi; + + low = state_bitmap; + hi = state_bitmap >> 32; + __asm __volatile("xrstors %0" : : "m"(*save_area), "a"(low), + "d"(hi)); +} + +static __inline void +xsaves(uint8_t *save_area, uint64_t state_bitmap) +{ + uint32_t low, hi; + + low = state_bitmap; + hi = state_bitmap >> 32; + __asm __volatile("xsaves %0" : "=m"(*save_area) : "a"(low), + "d"(hi) + : "memory"); +} + void reset_dbregs(void); #ifdef _KERNEL From nobody Sun Dec 15 15:40:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6jL5DsSz5gy60; Sun, 15 Dec 2024 15:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB6jL39Njz40Hn; Sun, 15 Dec 2024 15:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0rZtaXTDkO6TJ/psRwpzdWGwzo/eU5GDAsVHZg/E2hc=; b=Y43Z3lNYkU4GAkG1un2TrCvfMKAr/G2+ikZVIFt7Bnn6o16voRSNpXh1WdoIbrBF2VzIhE lNBLoWWmTxa6ubAErb7f2pXlRSjX5yTe15R9PVtqvyHU3NEsRS9XPqrBHpNT+vtK6XmjN1 xrEnFdbNoS6sGxC7t72q50ft77p464kFOjBZCmC7FnAyDDnZ0Jp3teROAn1UCvSFXgPxaM 6Bz3Tkkv2MJBPzxbvRi03/vCy770F1dU+QNHyGIRHdtGkNuJcu5b8DEqciAeJc+MxCMWti eMiKtQNsHJN1om+ijGVt0JSxSmIaOvITb67Mo5WGfbhkOLLrlecNg35eZKAfnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0rZtaXTDkO6TJ/psRwpzdWGwzo/eU5GDAsVHZg/E2hc=; b=dKV3jp5I/p+/SXcugZoJcIgbgnaaJaEyCv6mp9uq1e29A67bFEHqz0AJO+OIT/Gzz4ppmW 0u1nJMLI7nqcX10AekIQnxHa1PmftN1kSSjGfn/wsXHZjQWxSbRIlpXaeakoXzokKxFPcK M4ADxM3jeAqMTviIvbeufTroqkbAuLTVcNKw8hmmbWRiVrwJq9EwGOaoGxg5go9TdHa/vw YOY4xcid7ZzLEHVWLgUhVBacJQmRebSM4kbCjc/852QOAhOYoY+qqwb5diPgGUnBgTFWO6 DIkzitRg2xugvHG9ty4ktu2PYnIftxtcvSzDRpXeMW0MHsvLZWS7xyyc0vEXUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277238; a=rsa-sha256; cv=none; b=V9So7Oi743toKVoCSSdt2Ma67hFUaMMQ2tjZgdtMYlBsMwMrFLrfAiCcf/VafqGT+VRJMd cdRwg/tIxBSozNakNgtQ9LDnzcWsrNwNU4BhOHHPmZYTu2PZwAsPL4Drbgnvr6U9x0X0Hr dE54/p75v+O+fO2s2/9iv+zjttBxFn58x3anCfJi6VmxrqvE9W8krkkRWMdbFG40hod8wU XdOMa/cLVcjGNqRiN5ReGB+UDY9po5Bv3N+NiGlwMq/ryPk6C8TNnu0Mrn1U2qO8URtsOk I+oIUxqG+t6HoQQraHLiph/inJfpvrHZp/Z6XcQrOVYYxWDse9eu54WgIWwKBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6jL2nd5z1Chw; Sun, 15 Dec 2024 15:40:38 +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 4BFFec57069457; Sun, 15 Dec 2024 15:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFecLY069454; Sun, 15 Dec 2024 15:40:38 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:40:38 GMT Message-Id: <202412151540.4BFFecLY069454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 0c4fa0bdcf87 - main - x86: Add definitions for some Intel Processor Trace bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c4fa0bdcf87bee66d749c7550da852717522bdf Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=0c4fa0bdcf87bee66d749c7550da852717522bdf commit 0c4fa0bdcf87bee66d749c7550da852717522bdf Author: Bojan Novković AuthorDate: 2024-12-15 14:03:34 +0000 Commit: Bojan Novković CommitDate: 2024-12-15 15:39:36 +0000 x86: Add definitions for some Intel Processor Trace bits This patch adds definitions for Intel PT-related MSRs and several PT feature bits. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D46419 --- sys/x86/include/specialreg.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index 9dc30e31e540..e9dde5c3b46a 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -123,6 +123,7 @@ #define XFEATURE_ENABLED_OPMASK 0x00000020 #define XFEATURE_ENABLED_ZMM_HI256 0x00000040 #define XFEATURE_ENABLED_HI16_ZMM 0x00000080 +#define XFEATURE_ENABLED_PT 0x00000100 #define XFEATURE_ENABLED_PKRU 0x00000200 #define XFEATURE_ENABLED_TILECONFIG 0x00020000 #define XFEATURE_ENABLED_TILEDATA 0x00040000 @@ -213,6 +214,7 @@ #define CPUPT_MTC (1 << 3) /* MTC Supported */ #define CPUPT_PRW (1 << 4) /* PTWRITE Supported */ #define CPUPT_PWR (1 << 5) /* Power Event Trace Supported */ +#define CPUPT_DIS_TNT (1 << 8) /* TNT disable supported */ /* Leaf 0 ecx. */ #define CPUPT_TOPA (1 << 0) /* ToPA Output Supported */ @@ -654,6 +656,12 @@ #define MSR_PAT 0x277 #define MSR_MC0_CTL2 0x280 #define MSR_MTRRdefType 0x2ff +#define MSR_IA_GLOBAL_STATUS 0x38E +#define MSR_IA_GLOBAL_CTRL 0x38F +#define MSR_IA_GLOBAL_OVF_CTRL 0x390 +#define MSR_IA_GLOBAL_STATUS_RESET 0x390 +#define MSR_IA_GLOBAL_STATUS_SET 0x391 +#define GLOBAL_STATUS_FLAG_TRACETOPAPMI (1ULL << 55) #define MSR_MC0_CTL 0x400 #define MSR_MC0_STATUS 0x401 #define MSR_MC0_ADDR 0x402 @@ -781,6 +789,7 @@ #define RTIT_CTL_ADDR2_CFG_M (0xfULL << RTIT_CTL_ADDR2_CFG_S) #define RTIT_CTL_ADDR3_CFG_S 44 #define RTIT_CTL_ADDR3_CFG_M (0xfULL << RTIT_CTL_ADDR3_CFG_S) +#define RTIT_CTL_DIS_TNT (1ULL << 55) #define MSR_IA32_RTIT_STATUS 0x571 /* Tracing Status Register (R/W) */ #define RTIT_STATUS_FILTEREN (1 << 0) #define RTIT_STATUS_CONTEXTEN (1 << 1) From nobody Sun Dec 15 15:40:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6jM6l2vz5gyCn; Sun, 15 Dec 2024 15:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB6jM4MwNz40L8; Sun, 15 Dec 2024 15:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Qulm8WlkRRS1IC98I7aHHIdJKYg63by4IAIwDCWBWU=; b=QmVpDQwpsENitG0tDgigOj9LaDb34ODf4X5kRLEwFCcpFrSu1UN1521A89T6srNnJIIlAa zOThARWlgCt9aRLlQPWrSUrgaEPFc0VucvOp8kbT2/p124udoFDeFVE47MBDyJnRw4E9nR 3rULwrcAjE9IKdO3VNmSeiKN13wvWzOqlcjMWQqt+fVmXXAochRe68Tw+M8vatXLmVaiiE iWUch19E9lmYZFr70NNi6qw5xZsNsBQvGgQfkxT/r1alzCv9uzs5WZrtapuDG+ySslWLSG bCh+GiG0TItwByxtEMHICFk2c5Xm/R/68r18uIEa5prmnqvVI1DPhcubsB2n8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Qulm8WlkRRS1IC98I7aHHIdJKYg63by4IAIwDCWBWU=; b=GF3C2zV6Uglk98FTg2M/aP3b5kYQB8S8imnAt6ivU0cfTGWL0nTovrGJh4bWwxUs7SY3P8 z2LWBTEHHA9rA1WzUIcJhM/wIpQs9lEf2oT5aSHYY+UjQZbJuq7dMMlXnKzH2QP8YDdb3T 0VIXTTE5yGZ+sSwi/JmwmnitMWK1rcPcSWv8YZCbxAGS+cbRjVTHiU9Y5tZpTfGOykvyuV 6TQH/Y058xFNAvhVxxA7M+3r8EpkLJ7c2Dvw1yoIU9tbfPMPvxMPaO9d1JaA0SJJ3ymnl/ ZDZRWSVi1DObA//ei5KCdWzRyFoInP6BzB8+zMU+p1suzWTUq8CAYIUOycczvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277239; a=rsa-sha256; cv=none; b=iRBkUefJDhiy9F2BekIFDa0ug0vxx6Whbr6M2Vi5ikmaGj0sTZfmg2xZTC6a2rWTcyxRq9 spXBdz1GXKnJ6QJfnC58F0/UC93cHxGqjvtvuvNOSjkLmLMFQqOaLDP0iHXsEy6iFF2MkG Z0h7GyKui+3plelwFtLcaP/Lb2AWmeXpINhD9CnKfJLCh1VbioKZ7EfOjzV2zr4zIQNnuI dk8FcFOejeDH5gro6cCwazsVVVfkutuCsb7Zcy3GrcKzxbC46cmveom5+AX13lYJvZcd2x zdmG/V98j9XIYTSymZc/eUUbuWv763nyc0NtamB74BsyPSzD65snT1L8dYLRpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6jM3p72zDwB; Sun, 15 Dec 2024 15:40:39 +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 4BFFedtI069518; Sun, 15 Dec 2024 15:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFedOk069515; Sun, 15 Dec 2024 15:40:39 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:40:39 GMT Message-Id: <202412151540.4BFFedOk069515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 7bcaff05223e - main - x86: Add routines for querying XSAVE feature information List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bcaff05223eb81611372e341a120391925fa724 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=7bcaff05223eb81611372e341a120391925fa724 commit 7bcaff05223eb81611372e341a120391925fa724 Author: Bojan Novković AuthorDate: 2024-12-15 14:04:58 +0000 Commit: Bojan Novković CommitDate: 2024-12-15 15:39:36 +0000 x86: Add routines for querying XSAVE feature information This patch adds several routines that track and expose information about various XSAVE-related features. More specifically, it adds the ability to check whether a given XFEATURE is supported and which XSAVE extensions are supported. Furthermore, it adds several routines for calculating the size and offsets within a save area given a XSAVE feature bitmap. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D47394 --- sys/amd64/amd64/fpu.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++- sys/x86/include/fpu.h | 6 +++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 58a135e827a8..591bd196ca7d 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -164,12 +164,14 @@ SYSCTL_INT(_hw, HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, int use_xsave; /* non-static for cpu_switch.S */ uint64_t xsave_mask; /* the same */ +static uint64_t xsave_extensions; static uma_zone_t fpu_save_area_zone; static struct savefpu *fpu_initialstate; static struct xsave_area_elm_descr { u_int offset; u_int size; + u_int flags; } *xsave_area_desc; static void @@ -452,6 +454,9 @@ fpuinitstate(void *arg __unused) * Region of an XSAVE Area" for the source of offsets/sizes. */ if (use_xsave) { + cpuid_count(0xd, 1, cp); + xsave_extensions = cp[0]; + xstate_bv = (uint64_t *)((char *)(fpu_initialstate + 1) + offsetof(struct xstate_hdr, xstate_bv)); *xstate_bv = XFEATURE_ENABLED_X87 | XFEATURE_ENABLED_SSE; @@ -465,8 +470,9 @@ fpuinitstate(void *arg __unused) for (i = 2; i < max_ext_n; i++) { cpuid_count(0xd, i, cp); - xsave_area_desc[i].offset = cp[1]; xsave_area_desc[i].size = cp[0]; + xsave_area_desc[i].offset = cp[1]; + xsave_area_desc[i].flags = cp[2]; } } @@ -1285,3 +1291,106 @@ fpu_save_area_reset(struct savefpu *fsa) bcopy(fpu_initialstate, fsa, cpu_max_ext_state_size); } + +static __inline void +xsave_extfeature_check(uint64_t feature) +{ + + KASSERT((feature & (feature - 1)) == 0, + ("%s: invalid XFEATURE 0x%lx", __func__, feature)); + KASSERT(feature < flsl(xsave_mask), + ("%s: unsupported XFEATURE 0x%lx", __func__, feature)); +} + +static __inline void +xsave_extstate_bv_check(uint64_t xstate_bv) +{ + KASSERT(xstate_bv != 0 && ilog2(xstate_bv) < flsl(xsave_mask), + ("%s: invalid XSTATE_BV 0x%lx", __func__, xstate_bv)); +} + +/* + * Returns whether the XFEATURE 'feature' is supported as a user state + * or supervisor state component. + */ +bool +xsave_extfeature_supported(uint64_t feature, bool supervisor) +{ + int idx; + + KASSERT(use_xsave, ("%s: XSAVE not supported", __func__)); + xsave_extfeature_check(feature); + + if ((xsave_mask & feature) == 0) + return (false); + idx = ilog2(feature); + return (((xsave_area_desc[idx].flags & CPUID_EXTSTATE_SUPERVISOR) != 0) == + supervisor); +} + +/* + * Returns whether the given XSAVE extension is supported. + */ +bool +xsave_extension_supported(uint64_t extension) +{ + KASSERT(use_xsave, ("%s: XSAVE not supported", __func__)); + + return ((xsave_extensions & extension) != 0); +} + +/* + * Returns offset for XFEATURE 'feature' given the requested feature bitmap + * 'xstate_bv', and extended region format ('compact'). + */ +size_t +xsave_area_offset(uint64_t xstate_bv, uint64_t feature, + bool compact) +{ + int i, idx; + size_t offs; + struct xsave_area_elm_descr *xep; + + KASSERT(use_xsave, ("%s: XSAVE not supported", __func__)); + xsave_extstate_bv_check(xstate_bv); + xsave_extfeature_check(feature); + + idx = ilog2(feature); + if (!compact) + return (xsave_area_desc[idx].offset); + offs = sizeof(struct savefpu) + sizeof(struct xstate_hdr); + xstate_bv &= ~(XFEATURE_ENABLED_X87 | XFEATURE_ENABLED_SSE); + while ((i = ffs(xstate_bv) - 1) > 0 && i < idx) { + xep = &xsave_area_desc[i]; + if ((xep->flags & CPUID_EXTSTATE_ALIGNED) != 0) + offs = roundup2(offs, 64); + offs += xep->size; + xstate_bv &= ~((uint64_t)1 << i); + } + + return (offs); +} + +/* + * Returns the XSAVE area size for the requested feature bitmap + * 'xstate_bv' and extended region format ('compact'). + */ +size_t +xsave_area_size(uint64_t xstate_bv, bool compact) +{ + int last_idx; + + KASSERT(use_xsave, ("%s: XSAVE not supported", __func__)); + xsave_extstate_bv_check(xstate_bv); + + last_idx = ilog2(xstate_bv); + + return (xsave_area_offset(xstate_bv, (uint64_t)1 << last_idx, compact) + + xsave_area_desc[last_idx].size); +} + +size_t +xsave_area_hdr_offset(void) +{ + return (sizeof(struct savefpu)); +} diff --git a/sys/x86/include/fpu.h b/sys/x86/include/fpu.h index cf2235e4d2bf..9d2e43f6386e 100644 --- a/sys/x86/include/fpu.h +++ b/sys/x86/include/fpu.h @@ -218,6 +218,12 @@ struct savefpu_ymm { */ #define fpu_enable() clts() #define fpu_disable() load_cr0(rcr0() | CR0_TS) + +bool xsave_extfeature_supported(uint64_t feature, bool supervisor); +bool xsave_extension_supported(uint64_t extension); +size_t xsave_area_hdr_offset(void); +size_t xsave_area_offset(uint64_t xstate_bv, uint64_t feature, bool compact); +size_t xsave_area_size(uint64_t xstate_bv, bool compact); #endif #endif /* !_X86_FPU_H_ */ From nobody Sun Dec 15 15:40:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6jN6TZ5z5gy9t; Sun, 15 Dec 2024 15:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB6jN5HCVz40cY; Sun, 15 Dec 2024 15:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hK9HhNPcLDdt7O7KL1EILimS2SC06Zf1CKFZJu+W7JQ=; b=E6+JC4tA5Sx4EEXkihfNvMcdDwAgLw97QbitnUme5miqxPVU0fV4CiQ6BtOjDhMHATXyg0 +HovE6wVBZcuqkwbJlF7ejXJiut322nkh5R2GpV0CUcQBwCNsfcK7dtaZZvWLPmmfkYVEw oqJ5HVQ2yiZPWwsBWpr/C9mmOVDnMwdYyGaXXRncSyKOl0Z4IzC2SFG6kUdnXBCpIZoln8 KNx3Dt8VGlTAV7QoBdF4KynEnOIL0eNVUGj0Eoc53AuhVVdzN/1umqipTfC7YcRWXRd8WO IK+j8LQbUT7Z89YBj3oyi/blP73DCG25aMIxEcCkmldun8md81LzRFY1Ilr3wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hK9HhNPcLDdt7O7KL1EILimS2SC06Zf1CKFZJu+W7JQ=; b=DwOEj8okp7/BP2Orl3ad7PxPvJjaGkU1WcX+6/2uTwzntTMggVmnOsxmm7YWGP15mSELF2 a1nrRc993YvwfXhkURYRwOIAI1MBwOxBvmTHZF8hfiF4t/si26TespnBFSIS/U9zoKkLCh 2zZDK5y678iaALlde43wwQZdTnU2/Ln0EGLeHsotwTjtfdHRhE6tmy/Stn1On67e6y887v PEgPCtEkKxYZyuL3Nwwfi7oxNs21FTAQZGubw9jNf4xxiX61JXAXYDBzWy6lNP2S8NehiG eSDbXinw+zbjgzVL63/ai9EX0ELWGmlnZkfiClVlQ1OVryrRHZ68Lo5pUXFx5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277240; a=rsa-sha256; cv=none; b=h2IxYjdzwr9T40QhfxOjzUsJ6fH2e/HuaRHefd4TICAeQsFqGaVzV0WG3KWbCK+p0jKsx7 ENMkaA9OT7aXQZjHHaOIPFyvIl90HWEacyLQa5HkQflNQqbVYakGD3Yb+BzpiCMdxFuWd6 ED7yXzZnhYqMC7w7HIbmBmk+yqsYzf3OYgXRID5vWvptmYBD0wMjbkkPgmCNkSXGG43JF6 /xa0e7+MCnQFYlYI6Kk3xxk3YeoprUYHQNrNq/KELfAftznO5DL9lS375jeZSrh0cjADPR W0csHDLzgdF8Y7FWYOGlx3+rvhTaBKCY4UKM/tN6EfR1WVe1rg1QJE3zTDfmVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6jN4tlYz1Chx; Sun, 15 Dec 2024 15:40:40 +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 4BFFeeaX069593; Sun, 15 Dec 2024 15:40:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFeeox069590; Sun, 15 Dec 2024 15:40:40 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:40:40 GMT Message-Id: <202412151540.4BFFeeox069590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: d5ce54dddf49 - main - hwpmc_x86: Register interrupt handler using the dynamic NMI registration interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5ce54dddf4927a2edd3e57ee67722dfccb567a8 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=d5ce54dddf4927a2edd3e57ee67722dfccb567a8 commit d5ce54dddf4927a2edd3e57ee67722dfccb567a8 Author: Bojan Novković AuthorDate: 2024-12-15 14:06:58 +0000 Commit: Bojan Novković CommitDate: 2024-12-15 15:39:36 +0000 hwpmc_x86: Register interrupt handler using the dynamic NMI registration interface Register the PCINT handler using the nmi_{register, remove}_handler interfaces (introduced in D46421) in preparation for hwt(4)'s Intel Processor Trace backend. No functional change intended. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D47989 --- sys/dev/hwpmc/hwpmc_x86.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c index 54cc919eec30..2c6c4cd148bf 100644 --- a/sys/dev/hwpmc/hwpmc_x86.c +++ b/sys/dev/hwpmc/hwpmc_x86.c @@ -248,6 +248,7 @@ pmc_md_initialize(void) continue; md->pmd_classdep[i].pcd_caps &= ~PMC_CAP_INTERRUPT; } + nmi_register_handler(md->pmd_intr); return (md); } @@ -257,6 +258,7 @@ pmc_md_finalize(struct pmc_mdep *md) { lapic_disable_pcint(); + nmi_remove_handler(md->pmd_intr); if (cpu_vendor_id == CPU_VENDOR_AMD || cpu_vendor_id == CPU_VENDOR_HYGON) pmc_amd_finalize(md); From nobody Sun Dec 15 16:24:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB7hD0jR4z5h21l; Sun, 15 Dec 2024 16:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB7hD0DXnz49h2; Sun, 15 Dec 2024 16:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734279884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PHsAyIo4jQ31sFhx9S8CG3RCxEhIVYHgfKjO2EMEGL0=; b=W4zi6w9fbnNl5vECelY+dSzRjJ5GubVP8dXciO36M15IR1z3lIdQkeDSdZfPxosR55XZPY jFxU9hHSghTFyd3axAg8x3q7vbk/RRlOVulaRQM+hSCl6kVwJKV40apJc3YAHL9yqHRZVt eLGo5fJO9Coa4IKJItjMbjNiEiG1+CRUNtnrYlOZozon/1cOJJAvTluL1+TBUermzufLbm IyLle9Y2iRZaooIgp4MdYp8+tb6WEVWWQHRtrJLQM2QoXVJcijalYK5FExr1mRXaqyTMxm xvsrpAkFkcJAv7hBW6rM0Pa79eQ4phixyK1rPRkZOfHJoeJpjW3vwrrPm8fYxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734279884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PHsAyIo4jQ31sFhx9S8CG3RCxEhIVYHgfKjO2EMEGL0=; b=S7AZRrLSOmBPkdJ77A2T7yZaFx9DwGAg5Fw6S7tz5jXdt8n6QFYJ1r4khA/UardLYDX+WQ c84sNGniX2FcPO7Lv+w4nSGt85oUCAZwIJyWLwRmaFmswCK/w5sUeLAZsHKrOQ3Oq/C9ej SZZYyd6eOKOWCHLw9EwQHuR3uI+ZTxr4Xf/uxSZjNhCSHc4/7Sk3ct0HihcvuGT/SkcJIO Bg/Y7x5eMDsmPL77uK1hO8e0WAGq/1y9g6j9ytO1jTizsq8azxZaLj57CkmarxSMTwfXGR 4zUO8XhI49IjRUe/4ySCpLs3oWAKBE2CUvup3+RDGRKtn+jblDaQieyzyj3NPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734279884; a=rsa-sha256; cv=none; b=f1wOZFlCvc0o7hiK+DhlTy0bb1OqwsqJF91fCqx0Z6HO7K9jFkMtWLDv8seEDUfmYtZWT1 HarS+DtbrSkO5oIqZ+VdmC4c4Ql4u5YUzUGe91gHnpQM/95MuyRBoHpNXhHT40DUqQowX+ PNaEkA8y885rVu82WXZ+BaH5zovq8Lv3I9+lgMRNBC9RLh9tlb0OpuLL1OGigT17PTSi5W ql4Q9VV40gPnFM285KYb8r96ZgGG5mHpwMYYNPpzyxSv6TFJRT8Am/g0HNfZQfLKGbh8Dm UALiSBXQiXRn1rco7JtlgPsBIdX3jLt1zB5Uue0tZn9VWCiu9ZTQBgzeAl90fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB7hC6xGPzG4S; Sun, 15 Dec 2024 16:24:43 +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 4BFGOhLQ052871; Sun, 15 Dec 2024 16:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFGOh6o052868; Sun, 15 Dec 2024 16:24:43 GMT (envelope-from git) Date: Sun, 15 Dec 2024 16:24:43 GMT Message-Id: <202412151624.4BFGOh6o052868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 70236f02f05a - main - Revert "jemalloc: Reduce diffs to 5.2.1 revert to using JEMALLOC_FALLTHROUGH" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70236f02f05a95164a99270639b3eaad8c12fd06 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=70236f02f05a95164a99270639b3eaad8c12fd06 commit 70236f02f05a95164a99270639b3eaad8c12fd06 Author: Warner Losh AuthorDate: 2024-12-15 16:23:59 +0000 Commit: Warner Losh CommitDate: 2024-12-15 16:23:59 +0000 Revert "jemalloc: Reduce diffs to 5.2.1 revert to using JEMALLOC_FALLTHROUGH" This reverts commit 7bcf5319c1106b761bcb2a4facfeccf1b9db758d. Turns out this is needed for gcc, at least through gcc 14. This wasn't documented it the import when it came in, so revert with this note. Sponsored by: Netflix --- contrib/jemalloc/include/jemalloc/internal/hash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/jemalloc/include/jemalloc/internal/hash.h b/contrib/jemalloc/include/jemalloc/internal/hash.h index 0270034e876d..935ddcfc95a1 100644 --- a/contrib/jemalloc/include/jemalloc/internal/hash.h +++ b/contrib/jemalloc/include/jemalloc/internal/hash.h @@ -199,7 +199,7 @@ hash_x86_128(const void *key, const int len, uint32_t seed, case 2: k1 ^= tail[ 1] << 8; JEMALLOC_FALLTHROUGH case 1: k1 ^= tail[ 0] << 0; k1 *= c1; k1 = hash_rotl_32(k1, 15); k1 *= c2; h1 ^= k1; - JEMALLOC_FALLTHROUGH + break; } } From nobody Sun Dec 15 17:48:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB9Y16Fj0z5h638; Sun, 15 Dec 2024 17:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB9Y15Gnxz4Khj; Sun, 15 Dec 2024 17:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734284917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PudYRk3PHPXkufnYeETy3/O2AYnYYmEkhSassYwlhFY=; b=HL9Ne3yNqjiJQp7sDi5dMnArjISPMea9fZXja0JNsUaoJEHfKGJ/k4PCYdb3coK2Y271Es PAVrGWSs2MvFM098oLU2I904nQj++kLXpMoEyqPzdEMlROceNHdwZKSn6cf2crBMCUrpks ONxNNnLETm+5YJXAAXGVrXGZN5b9auT0a56pU37CKjjNhazuqEfV1Ldu4/9rDUt6k4iP6H T+xtQZ2iiAgJlDYU2Knbjf7VJOcKmxTevG3Fn+r6lKjfRzgnvAcsuZ3a5OLh7yMKu+6QMc bvyfBJqFQveiK4NjBOEzqudMDpCMVekRbY2Zbp6zTaV4j8tIflJhLJH41s0W7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734284917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PudYRk3PHPXkufnYeETy3/O2AYnYYmEkhSassYwlhFY=; b=GdwnXvTyN5hDep80491fhMx0o3N1bPlB7w9YXe3zwXQVihNhK97zRV6L1nU9KjbAAgD1a0 A+zu5tf4DOdo9KrM3HUNyU1Jo+9BO59eKtry8uhorusT2uyWEIBrZ277L1exs1Cdk6YZTh /eFvTmD0Pfurz396Vq8rpMDV9CDL8vlX93DXm9cQOkqEb5tFzUrUVBZAOzJ7kxIxNfRvMY 8jD84gkmgyGWnvDK8boG7Jz/IqdAuXnShc66iAOZQEOxypDPvuRr3S5k/eqEkVJ3e+r+bi nE4kPl7MrqmPUchRjSQ2g/+W8ah6bLy578XOMJGt3CYJ8ObZGeGgCLAwei1DlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734284917; a=rsa-sha256; cv=none; b=STIYfLAm+nTc2HA+XptO53Scl+rE8kOjvTdHTvtbbAyaekerMce7xBjknV3JZ2gqC3zams DFBUABB5kCs0Yv8M0IzOV3RjVdPlwHOXtqEk7yWRkA830S07aPUJYji6JPQIgyMmkwSRsd mnFPCjl+RvyL0RhYlJ9AQyyHpRly2IGxYqnUF3j0PoUTd2aDNJMC9qjXagHvaazl1M+Mug vXjLSIWtPw/3yfevHt117xbHOtK3UrwYqXegZ8evd476I20GGMLgPUQ3I0paitcrHb1f+u jI6RP2WGftv3/ZHo1fcO4ExvU6Ulz/C4JzPMShG0r0mCdX9U1YRqduOcqP6RrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB9Y14l26zJ2l; Sun, 15 Dec 2024 17:48:37 +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 4BFHmbax003066; Sun, 15 Dec 2024 17:48:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFHmb0f003063; Sun, 15 Dec 2024 17:48:37 GMT (envelope-from git) Date: Sun, 15 Dec 2024 17:48:37 GMT Message-Id: <202412151748.4BFHmb0f003063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 3342e5967dc7 - main - i386: Fix incorrect NMI handler invocations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3342e5967dc7193d97f99a92b81824db81efe2f1 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=3342e5967dc7193d97f99a92b81824db81efe2f1 commit 3342e5967dc7193d97f99a92b81824db81efe2f1 Author: Bojan Novković AuthorDate: 2024-12-15 17:44:34 +0000 Commit: Bojan Novković CommitDate: 2024-12-15 17:47:52 +0000 i386: Fix incorrect NMI handler invocations Fixes: 459dc42 --- sys/i386/i386/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 9e310c049daa..a8b7df42a283 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -428,7 +428,7 @@ user_trctrap_out: } return; #else /* !POWERFAIL_NMI */ - nmi_handle_intr(type, frame); + nmi_handle_intr(frame); return; #endif /* POWERFAIL_NMI */ @@ -685,7 +685,7 @@ kernel_trctrap: } return; #else /* !POWERFAIL_NMI */ - nmi_handle_intr(type, frame); + nmi_handle_intr(frame); return; #endif /* POWERFAIL_NMI */ } From nobody Sun Dec 15 22:48:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YBJCJ3sZJz5hQS1; Sun, 15 Dec 2024 22:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBJCJ3Lr3z4rdX; Sun, 15 Dec 2024 22:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734302924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3jSj6RBWY7ACdIZKuQuTFc3LN/fFSVy8v3JQrTv9eZA=; b=MnPZbi4PvDl537tY7q+PUMS8olJVowS93MwMT/c9zEQLahA2je5F0quJm7aoCUxVYj6BAi UExiYaPAWIdzw+0AlOxxYXqCT+0sAzdx4YmJc4qV2vZHxsMx/50DqXodTKp1RzzC9CHJx8 SaXFRSs2zrUPQ9pojemTL3EqigiljmTpI4UhWq7t2mn0EQRPSu7jOA8qLGlsuqOF6ZhJig v+VwdnIfVAbQEWIz4mMZB6Xi5GlZKdrDVkxglBW+gGrHAOAozEC3VIZPuh3nanruGHA80G e5qbf6C9Q2ipzZYeDUo99GrUgWId1enR69L8DcryMWWJdT54Vfj6a6mTNRaC/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734302924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3jSj6RBWY7ACdIZKuQuTFc3LN/fFSVy8v3JQrTv9eZA=; b=aLrhPeYBh9AvybZbWsg+cNFmye0Yy6In/5wqFklNzk7k3I84NtkMpxFA0YOoaNbBBWn/sQ zU/TM03UsKBdyzoUcMybccLx31xalySw4ydfGfO2qlVBd94yEH6FeKSF5F3Begwde9gaak OOTFz1qgSHDizgtuDVfMAbw2+CtQhYrNNxZb/j4/Sgv2sNSU3ZC2z/Npo+mUmFhJOC+/DY sITQpujD154cfwQ03qaZDvlQd4VHP1iDVe+NfOn0F84meodj5SJ6loWXFE+w93Hgs/TJAj C93ur/ga9FXn/JFmxPgpPhR2PYSzDX89JQzYayn4Vx9U2fEFREgf4H25UiW9OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734302924; a=rsa-sha256; cv=none; b=LU+B2nPWdUXew/MqrFliq2Lxe2lfklPjwWyaPphupBtfv+1C5tvv/uqUuIV0ePPnUZGOFN 6C0HZnnaEi7qiZmA4ab9D6wzA1fFdWr4/+Ruewc0wiJ4L8Wbe5Op5hjbUmiVb2pmO7uW/r JUVNLMlhhC/jI5qaiPtXOCwwdOmVpO/Av10VzCbttsoQVsrlu6h++/47ow9328seLIHS5P DUqPPhOXJfNR9QPaKuLi6M+h8XEkrijmPumA8Pc6UTJrF+wbH1XOhm4sMhzbe9IbxiO9ws +ZzieOvHX8GHeQy3Rx8HMk/Lp+2ZuQBOdz5xZKgwbwihRDU7ihpEPMvf0YCbsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YBJCJ2W8JzSJR; Sun, 15 Dec 2024 22:48:44 +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 4BFMmixu061738; Sun, 15 Dec 2024 22:48:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFMmif4061735; Sun, 15 Dec 2024 22:48:44 GMT (envelope-from git) Date: Sun, 15 Dec 2024 22:48:44 GMT Message-Id: <202412152248.4BFMmif4061735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 29a9d7c6ce78 - main - mlx5_core: fix panic on sriov enablement List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29a9d7c6ce78825251ea127ade445236607b0b81 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=29a9d7c6ce78825251ea127ade445236607b0b81 commit 29a9d7c6ce78825251ea127ade445236607b0b81 Author: Ariel Ehrenberg AuthorDate: 2024-11-12 09:16:26 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-15 22:27:31 +0000 mlx5_core: fix panic on sriov enablement Align the code of fdb steering with flow steering core and add missing parts in namespace initialization and in prio logic PR: 281714 Sponsored by: NVidia networking --- sys/dev/mlx5/mlx5_core/mlx5_eswitch.c | 18 +++++++++++------- sys/dev/mlx5/mlx5_core/mlx5_fs_core.c | 8 ++++++++ sys/dev/mlx5/mlx5_ifc.h | 8 -------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c b/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c index a7bff68b68e6..8c96beeb509f 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_eswitch.c @@ -218,7 +218,7 @@ static int modify_esw_vport_cvlan(struct mlx5_core_dev *dev, u32 vport, static struct mlx5_flow_handle * esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u8 mac[ETH_ALEN], u32 vport) { - struct mlx5_flow_destination dest; + struct mlx5_flow_destination dest = {}; struct mlx5_flow_handle *flow_rule = NULL; struct mlx5_flow_act flow_act = {}; struct mlx5_flow_spec *spec; @@ -240,13 +240,13 @@ esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u8 mac[ETH_ALEN], u32 vport) /* Match criteria mask */ memset(dmac_c, 0xff, 6); - dest.type = MLX5_FLOW_CONTEXT_DEST_TYPE_VPORT; + dest.type = MLX5_FLOW_DESTINATION_TYPE_VPORT; dest.vport.num = vport; esw_debug(esw->dev, "\tFDB add rule dmac_v(%pM) dmac_c(%pM) -> vport(%d)\n", dmac_v, dmac_c, vport); - flow_act.action = MLX5_FLOW_RULE_FWD_ACTION_DEST; + flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST; flow_rule = mlx5_add_flow_rules(esw->fdb_table.fdb, spec, &flow_act, &dest, 1); @@ -290,7 +290,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw) /* (-2) Since MaorG said so .. */ table_size = BIT(MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size)) - 2; - ft_attr.prio = 0; + ft_attr.prio = FDB_SLOW_PATH; ft_attr.max_fte = table_size; fdb = mlx5_create_flow_table(root_ns, &ft_attr); if (IS_ERR_OR_NULL(fdb)) { @@ -616,7 +616,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw, esw_debug(dev, "Create vport[%d] egress ACL log_max_size(%d)\n", vport->vport, MLX5_CAP_ESW_EGRESS_ACL(dev, log_max_ft_size)); - root_ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_EGRESS); + root_ns = mlx5_get_flow_vport_acl_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_EGRESS, vport->vport); if (!root_ns) { esw_warn(dev, "Failed to get E-Switch egress flow namespace\n"); return; @@ -627,6 +627,8 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw, return; ft_attr.max_fte = table_size; + if (vport->vport) + ft_attr.flags = MLX5_FLOW_TABLE_OTHER_VPORT; acl = mlx5_create_vport_flow_table(root_ns, &ft_attr, vport->vport); if (IS_ERR_OR_NULL(acl)) { err = PTR_ERR(acl); @@ -716,7 +718,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw, esw_debug(dev, "Create vport[%d] ingress ACL log_max_size(%d)\n", vport->vport, MLX5_CAP_ESW_INGRESS_ACL(dev, log_max_ft_size)); - root_ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_INGRESS); + root_ns = mlx5_get_flow_vport_acl_namespace(dev, MLX5_FLOW_NAMESPACE_ESW_INGRESS, vport->vport); if (!root_ns) { esw_warn(dev, "Failed to get E-Switch ingress flow namespace\n"); return; @@ -727,6 +729,8 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw, return; ft_attr.max_fte = table_size; + if (vport->vport) + ft_attr.flags = MLX5_FLOW_TABLE_OTHER_VPORT; acl = mlx5_create_vport_flow_table(root_ns, &ft_attr, vport->vport); if (IS_ERR_OR_NULL(acl)) { err = PTR_ERR(acl); @@ -1004,7 +1008,7 @@ int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs) esw_warn(esw->dev, "E-Switch ingress ACL is not supported by FW\n"); if (!MLX5_CAP_ESW_EGRESS_ACL(esw->dev, ft_support)) - esw_warn(esw->dev, "E-Switch engress ACL is not supported by FW\n"); + esw_warn(esw->dev, "E-Switch egress ACL is not supported by FW\n"); esw_info(esw->dev, "E-Switch enable SRIOV: nvfs(%d)\n", nvfs); diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_core.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_core.c index 1a058e0bf711..8d93d4740462 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fs_core.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_core.c @@ -144,6 +144,8 @@ #define KERNEL_TX_MACSEC_NUM_LEVELS 2 #define KERNEL_TX_MACSEC_MIN_LEVEL (KERNEL_TX_IPSEC_MIN_LEVEL + KERNEL_TX_MACSEC_NUM_PRIOS) +#define MAX_VPORTS 128 + struct node_caps { size_t arr_sz; long *caps; @@ -3184,6 +3186,12 @@ int mlx5_fs_core_init(struct mlx5_core_dev *dev) if (err) goto err; } + err = mlx5_fs_egress_acls_init(dev, MAX_VPORTS); + if (err) + goto err; + err = mlx5_fs_ingress_acls_init(dev, MAX_VPORTS); + if (err) + goto err; } if (MLX5_CAP_FLOWTABLE_SNIFFER_RX(dev, ft_support)) { diff --git a/sys/dev/mlx5/mlx5_ifc.h b/sys/dev/mlx5/mlx5_ifc.h index 20deb783f174..3f75acd250da 100644 --- a/sys/dev/mlx5/mlx5_ifc.h +++ b/sys/dev/mlx5/mlx5_ifc.h @@ -555,14 +555,6 @@ struct mlx5_ifc_flow_counter_list_bits { u8 reserved_1[0x20]; }; -enum { - MLX5_FLOW_CONTEXT_DEST_TYPE_VPORT = 0x0, - MLX5_FLOW_CONTEXT_DEST_TYPE_FLOW_TABLE = 0x1, - MLX5_FLOW_CONTEXT_DEST_TYPE_TIR = 0x2, - MLX5_FLOW_CONTEXT_DEST_TYPE_QP = 0x3, - MLX5_FLOW_CONTEXT_DEST_TYPE_TABLE_TYPE = 0xA, -}; - struct mlx5_ifc_dest_format_struct_bits { u8 destination_type[0x8]; u8 destination_id[0x18]; From nobody Sun Dec 15 22:48:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YBJCK3xyqz5hQYJ; Sun, 15 Dec 2024 22:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBJCK3NZpz4s3N; Sun, 15 Dec 2024 22:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734302925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=71X4J82u6PWGg37OkGxRgEI+h3jJmv/IY1fgMYiSLoY=; b=Lifr4jfL1Gxuk9FVu28XatRp0D4g8b+06xqkMygp7E7NQABhh8bMX5dV22hzSdJLAqlQev pO6IJJQhP4o0C+nlfLm0RFqODUROiZFFUOb5NutPhZHnHE5FWDUM9jy15EeCTIeNIaQyw5 vpC+yM5MJHsCXEsoGyVbDFaOhXLyb2sxNp+WR/HL5csT+XP0rlw4QBYqPp2gzIPwRQxX5d r1kxi9Q2Y1nQuPpyEqWoE1bA8eLHDg984EtmMUO51/Izy4Ek7VDwuCBq5rxuw8u8uH2uMX s2G8fQsYmq1jA6BHnEN1v8ReNiDX0ovcH5LotOf6/lW1j8fUxrBABMnzxz7RAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734302925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=71X4J82u6PWGg37OkGxRgEI+h3jJmv/IY1fgMYiSLoY=; b=rV5BZOyOKzouCw7Ic/h0QGR+CMSZH5MA8XIfwhvmLBzwYzCkZppyY76cJYTTlrZuV2sL6c Hzr1JNW9VTvyLWOT/Jwjx+5aZAzEXOSeHXAxi/9ShQXK5MGaOoh16bpeva49NEmMaGLP5P 50hCPMaKENhcXT/5N8h0HluGJkAzvBh/acZ7kbpmkWMTPJWUSQCsecFPmgtKEbJ5btwIEt lvo7Qm6Q1au1QsTX3xTc+fjBOOwj+u5gaZM/aAPo/gR6PyDqwVDqtMR/SG/2UiUHIZFo3S 21hOZ6CJdsBXUxtjCt9/lgotruFZUOuWIiMot6U11L0AqQZHX/Fi8fKxBb+/rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734302925; a=rsa-sha256; cv=none; b=mWhB4M20bPIZFsJCydAiJHrKV6barfuIlhhKI5NNx8jIQBiZK2OpQyqppeyKy9+x6/0fut aR9GbQeH21WeM140U7+BdJl7qeAlP2QNIH6p/j4Rh1Z/EVZSt+1gQTXFS9i0FT3yA1KIXW ql2coO2qJgzUykuTZ93EoOzt1Zz/BxTT/mNIS4EaTagP/qA30XCxAwMTZiFlu1zlkdgvQZ kwSBsGuX+XVD7nB5Usas/18n+NB3cOIgv23KiciPVFwKgvMoYBMsE/Du2sgI/Rvuned/u8 QG0g+Slp6Sge90QWNnOP0jT5V/d0mAjFMsjoL/OA1U1FTz3U5zRVRJmwLi/AvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YBJCK30jJzRsg; Sun, 15 Dec 2024 22:48:45 +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 4BFMmjOU061789; Sun, 15 Dec 2024 22:48:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFMmjnq061786; Sun, 15 Dec 2024 22:48:45 GMT (envelope-from git) Date: Sun, 15 Dec 2024 22:48:45 GMT Message-Id: <202412152248.4BFMmjnq061786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2fb2c0351237 - main - mlx5_core: fix "no space" error on sriov enablement List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fb2c0351237aed71abedb7eb6d737b4390b490a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2fb2c0351237aed71abedb7eb6d737b4390b490a commit 2fb2c0351237aed71abedb7eb6d737b4390b490a Author: Ariel Ehrenberg AuthorDate: 2024-11-25 13:10:41 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-15 22:27:53 +0000 mlx5_core: fix "no space" error on sriov enablement Change POOL_NEXT_SIZE define value from 0 to BIT(30), since this define is used to request the available maximum sized flow table, and zero doesn't make sense for it, whereas many places in the driver use zero explicitly expecting the smallest table size possible but instead due to this define they end up allocating the biggest table size unawarely. Sponsored by: NVidia networking --- sys/dev/mlx5/mlx5_core/fs_ft_pool.h | 2 +- sys/dev/mlx5/mlx5_core/mlx5_fs_ft_pool.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/fs_ft_pool.h b/sys/dev/mlx5/mlx5_core/fs_ft_pool.h index b81e70d51bd6..a5e4df624e27 100644 --- a/sys/dev/mlx5/mlx5_core/fs_ft_pool.h +++ b/sys/dev/mlx5/mlx5_core/fs_ft_pool.h @@ -9,7 +9,7 @@ #include #include -#define POOL_NEXT_SIZE 0 +#define POOL_NEXT_SIZE BIT(30) int mlx5_ft_pool_init(struct mlx5_core_dev *dev); void mlx5_ft_pool_destroy(struct mlx5_core_dev *dev); diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_ft_pool.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_ft_pool.c index c14590acc772..70d9d235b629 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fs_ft_pool.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_ft_pool.c @@ -50,7 +50,8 @@ mlx5_ft_pool_get_avail_sz(struct mlx5_core_dev *dev, enum fs_flow_table_type tab int i, found_i = -1; for (i = ARRAY_SIZE(FT_POOLS) - 1; i >= 0; i--) { - if (dev->priv.ft_pool->ft_left[i] && FT_POOLS[i] >= desired_size && + if (dev->priv.ft_pool->ft_left[i] && + (FT_POOLS[i] >= desired_size || desired_size == POOL_NEXT_SIZE) && FT_POOLS[i] <= max_ft_size) { found_i = i; if (desired_size != POOL_NEXT_SIZE) From nobody Sun Dec 15 23:08:51 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YBJfW6YkLz5hR9N; Sun, 15 Dec 2024 23:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBJfW3txCz4x1w; Sun, 15 Dec 2024 23:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734304131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8xFYSdt8EOyL5OLkN6NRj0wN+kdeXupLiEjC7Rxi+/k=; b=hXIVKHUDlR53A3C6VQCXPwFbMCGNZURMmEq1Gz/BiUUlk/FyxMcoUgod9qlJswHLkGAl+9 E/qDrM8Y3yQS2ecAahmsxVhPrQic9EerVrsIwiwmCYKZIEd3v2mnZlcvl9UjYmv5Tn9lBg M27q9hOX0Z26OCSMIrobuF+n6eGd/I4mOm6kNvLYWDkwChNB5XUwqSmjQ/IkU5J/I8Ll6k Tpehc0rhw3KGoIUWQf5v8OvAL+mTw/OOto8cSkHL1zsZvfh23i+oslFQieAOTVoKzZVpvp l2aEyFZvUKCmAbCdKyMpmBDq9uOIcU37KQ9GZ5966D2SM4R/1H5XlBDqikDlRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734304131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8xFYSdt8EOyL5OLkN6NRj0wN+kdeXupLiEjC7Rxi+/k=; b=c4SKTkfOfdWyWZnQYVNKAwanCDKIWOPt1GUqKdX2StuBEKf07JhpxVGb5CC/WbCERlo2xP l5y25k1HMkr8MeiGhhC/0hRFkpaFpKOgq+2ev6bZVlnpmn5bkgQ0duIixWrIoTqSCaYsER frkfRZaxSO4igl1X5wS5onbESPbvczh+Q4CY6+NbZrzutulOkwQjh5y7W/xZJDywryGd09 f5bA46EtUMg9v1Plnsvlxb1ONna8c4moNNSMQ0XCR8bUG0SWrq7UVJsugrq0PyxpOMkBmr Ce1a1zmE28Jqq7KoT5rxZyDV12iMRrcOG9vOIY2Fie12uag54hGKnSbWlGozBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734304131; a=rsa-sha256; cv=none; b=Y1h1xK0mOO+G8IH6MYg6Oea0vxwtceArL0rek8uBEmfNXfCKhI0PDY4VVK0AVDDukc6n4j TVEPSfePf3698G1TMBYU9XXZd03RC1GbZ0gQxAxFI3l8SWUYl9Km0KgTwQX4uKNZCLd8+V Lgd/uZs+2/Btdf/slyUHGrG+jAPAiztDGAgHvQFln719oUVJ6eFHIwerFR2QNv18B4WGBP yHyKqi9TfdrnKWDKTCTlQVRdpJcS+ltn5fzwPSo7Aj/T8wM0shLlmoA+TneRPZ0ocnrQet GJiyoepmUxKb53QooZBee9mLuZYkfuJR5e9TndrrtT0PosnuPI/S0L8rtNpvmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YBJfW3VS2zSby; Sun, 15 Dec 2024 23:08:51 +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 4BFN8pR0000158; Sun, 15 Dec 2024 23:08:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFN8px8000155; Sun, 15 Dec 2024 23:08:51 GMT (envelope-from git) Date: Sun, 15 Dec 2024 23:08:51 GMT Message-Id: <202412152308.4BFN8px8000155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 58d1fdfaa90a - main - amd iommu: remove unused function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58d1fdfaa90a5365a5f951e2ac80e0fce02ca9bb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=58d1fdfaa90a5365a5f951e2ac80e0fce02ca9bb commit 58d1fdfaa90a5365a5f951e2ac80e0fce02ca9bb Author: Konstantin Belousov AuthorDate: 2024-12-15 22:49:52 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-15 22:49:52 +0000 amd iommu: remove unused function Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/x86/iommu/amd_drv.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 0712a2a2225f..77c4c68765c9 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -80,12 +80,6 @@ static int amdiommu_enable = 0; static TAILQ_HEAD(, amdiommu_unit) amdiommu_units = TAILQ_HEAD_INITIALIZER(amdiommu_units); -static u_int -ivrs_info_to_unit_id(UINT32 info) -{ - return ((info & ACPI_IVHD_UNIT_ID_MASK) >> 8); -} - typedef bool (*amdiommu_itercc_t)(void *, void *); typedef bool (*amdiommu_iter40_t)(ACPI_IVRS_HARDWARE2 *, void *); typedef bool (*amdiommu_iter11_t)(ACPI_IVRS_HARDWARE2 *, void *);