From nobody Mon Aug 24 16:29:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hTGbK4tplz6pbRD for ; Mon, 24 Aug 2026 16:29: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTGbJ6wKFz40yW for ; Mon, 24 Aug 2026 16:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787588989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nsMMvHL2fe7UBGuAmYeZGByhG5WEUSsWZLYkUvMGvO0=; b=R+cJNpjFeg4DKZGoueQNfHjuGOipZ8NCqDQfchXYE5AwVQeKkUSDoxq6/KDvdjHgcFzk7I mPHUGO8kZ19ShJNhrxiRfzOGX1A2hlyskYcaXTc11V477QBgM+eBPbMW8eIb75U+etTS7n JJ8TYEsGSv9pfBDkqYW2ARuBplhyyzjZ+6Y8VVCgH+yLeYCsGnRuZ8Ty/9I+Y79y7R9MYT wAQo7PWAEqDr4PQk0fp3EOP6tPsjUsgiWdBuIVUnNGdwJyw0MznC6z0HANwPAoGtPD9xLd w2Eg7FJz+lK4tzb8h+ZKJFRPxbwJuZMJ27zNjw3dWu4XZefuiS1aPS022GQtnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787588989; a=rsa-sha256; cv=none; b=Cv8M54n/3jX3YwIXv3LLz5mfzdRr7bjTybvvG0jmnV+mbTSQAnoRZTq3vGZTT5T6+DNJNG x/RzkrvQLeLCYF3iHoDUxiMNovPY7TJym1kbpZg8YxSrK9CQp2oe/aTEhUJyAcPnWB5DmS 1KBHn0qhpPol8XP0wzyg246eopX6zuFYese8vzugjJNu4fN1tEuZDFwU49MEaWC8yItm6t l01uk5aS2JAr9pZdqjs/jwfmOmCytzUirGkdA3KFzAmZGZDAaRg3dfAd7Ccm67qojsnkyT Epg+b6ey+CEso5OjsQPA7Hs/hPNpjjU9i2GyOE36qeYcbLhJ60O8E8OZn//nsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787588989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nsMMvHL2fe7UBGuAmYeZGByhG5WEUSsWZLYkUvMGvO0=; b=NdLqLDYjWeGdLXomgJkDY7tQE3TI8ROsi9npx6x5uJHc9bDLWGwwkPCpQ6oCxDZV2aRCZW PbGD/o9uaxTvJxr09N1OcCP0KKXw5aWFBJhJW+/WmAqUat9mHWGYYz1rXMj4skUSv7ynLK N4ROi6k5amOGj2vWunFcg6h5EFYmmwkJihcjjaR9GKSBIcocEf/L4Ehsw0b2B1/wudKx+A CX9DVoSuIITxlNp5c0M0oTxc+uZFKiuzx1Ckr5WubwEBJJLI2ZtmxA9Uqj2XQaj8bLUwjT n8KktY+esLgvHtkdzvPzqPADD2/dAI6fi8St+UA1uWULovbZ4RjTWKuFvm/GXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTGbJ5xz1z19rL for ; Mon, 24 Aug 2026 16:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22c83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 16:29:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 318915568443 - stable/15 - atomic: Implement atomic_{set,clear}_8 in _atomic_subword.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 318915568443f1fdb65faab0f559c872f09628c6 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 16:29:48 +0000 Message-Id: <6a8c717c.22c83.cee1fbc@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=318915568443f1fdb65faab0f559c872f09628c6 commit 318915568443f1fdb65faab0f559c872f09628c6 Author: Mark Johnston AuthorDate: 2026-08-03 14:02:33 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 15:17:54 +0000 atomic: Implement atomic_{set,clear}_8 in _atomic_subword.h Reimplement atomic_{set,clear}_16 using atomic_set_32. Remove emulation of these operations from vm_page.c. Reviewed by: alc, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D58580 (cherry picked from commit fb63bc67483ee52245d6161150702974da3d001c) --- sys/sys/_atomic_subword.h | 54 +++++++++++++++++++++++---------- sys/vm/vm_page.c | 76 ++++++----------------------------------------- 2 files changed, 48 insertions(+), 82 deletions(-) diff --git a/sys/sys/_atomic_subword.h b/sys/sys/_atomic_subword.h index 284e2bfa340f..907fef0bb193 100644 --- a/sys/sys/_atomic_subword.h +++ b/sys/sys/_atomic_subword.h @@ -201,21 +201,42 @@ atomic_load_acq_16(const volatile uint16_t *p) } #endif -#undef _ATOMIC_WORD_ALIGNED -#undef _ATOMIC_BYTE_SHIFT -#undef _ATOMIC_HWORD_SHIFT +#ifndef atomic_set_8 +static __inline void +atomic_set_8(volatile uint8_t *p, uint8_t bit) +{ + uint32_t *addr; + int shift; + + addr = _ATOMIC_WORD_ALIGNED(p); + shift = _ATOMIC_BYTE_SHIFT(p); + atomic_set_32(addr, (uint32_t)bit << shift); +} +#endif #ifndef atomic_set_16 static __inline void atomic_set_16(volatile uint16_t *p, uint16_t bit) { - uint16_t v; + uint32_t *addr; + int shift; + + addr = _ATOMIC_WORD_ALIGNED(p); + shift = _ATOMIC_HWORD_SHIFT(p); + atomic_set_32(addr, (uint32_t)bit << shift); +} +#endif + +#ifndef atomic_clear_8 +static __inline void +atomic_clear_8(volatile uint8_t *p, uint8_t bit) +{ + uint32_t *addr; + int shift; - v = atomic_load_16(p); - for (;;) { - if (atomic_fcmpset_16(p, &v, v | bit)) - break; - } + addr = _ATOMIC_WORD_ALIGNED(p); + shift = _ATOMIC_BYTE_SHIFT(p); + atomic_clear_32(addr, (uint32_t)bit << shift); } #endif @@ -223,14 +244,17 @@ atomic_set_16(volatile uint16_t *p, uint16_t bit) static __inline void atomic_clear_16(volatile uint16_t *p, uint16_t bit) { - uint16_t v; + uint32_t *addr; + int shift; - v = atomic_load_16(p); - for (;;) { - if (atomic_fcmpset_16(p, &v, v & ~bit)) - break; - } + addr = _ATOMIC_WORD_ALIGNED(p); + shift = _ATOMIC_HWORD_SHIFT(p); + atomic_clear_32(addr, (uint32_t)bit << shift); } #endif +#undef _ATOMIC_WORD_ALIGNED +#undef _ATOMIC_BYTE_SHIFT +#undef _ATOMIC_HWORD_SHIFT + #endif /* _SYS__ATOMIC_SUBWORD_H_ */ diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index ce5748bd5f33..fdf63b2160f6 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -5363,67 +5363,33 @@ vm_page_bits(int base, int size) void vm_page_bits_set(vm_page_t m, vm_page_bits_t *bits, vm_page_bits_t set) { - #if PAGE_SIZE == 32768 atomic_set_64((uint64_t *)bits, set); #elif PAGE_SIZE == 16384 atomic_set_32((uint32_t *)bits, set); -#elif (PAGE_SIZE == 8192) && defined(atomic_set_16) +#elif PAGE_SIZE == 8192 atomic_set_16((uint16_t *)bits, set); -#elif (PAGE_SIZE == 4096) && defined(atomic_set_8) +#elif PAGE_SIZE == 4096 atomic_set_8((uint8_t *)bits, set); -#else /* PAGE_SIZE <= 8192 */ - uintptr_t addr; - int shift; - - addr = (uintptr_t)bits; - /* - * Use a trick to perform a 32-bit atomic on the - * containing aligned word, to not depend on the existence - * of atomic_{set, clear}_{8, 16}. - */ - shift = addr & (sizeof(uint32_t) - 1); -#if BYTE_ORDER == BIG_ENDIAN - shift = (sizeof(uint32_t) - sizeof(vm_page_bits_t) - shift) * NBBY; #else - shift *= NBBY; +#error unhandled page size #endif - addr &= ~(sizeof(uint32_t) - 1); - atomic_set_32((uint32_t *)addr, set << shift); -#endif /* PAGE_SIZE */ } static inline void vm_page_bits_clear(vm_page_t m, vm_page_bits_t *bits, vm_page_bits_t clear) { - #if PAGE_SIZE == 32768 atomic_clear_64((uint64_t *)bits, clear); #elif PAGE_SIZE == 16384 atomic_clear_32((uint32_t *)bits, clear); -#elif (PAGE_SIZE == 8192) && defined(atomic_clear_16) +#elif PAGE_SIZE == 8192 atomic_clear_16((uint16_t *)bits, clear); -#elif (PAGE_SIZE == 4096) && defined(atomic_clear_8) +#elif PAGE_SIZE == 4096 atomic_clear_8((uint8_t *)bits, clear); -#else /* PAGE_SIZE <= 8192 */ - uintptr_t addr; - int shift; - - addr = (uintptr_t)bits; - /* - * Use a trick to perform a 32-bit atomic on the - * containing aligned word, to not depend on the existence - * of atomic_{set, clear}_{8, 16}. - */ - shift = addr & (sizeof(uint32_t) - 1); -#if BYTE_ORDER == BIG_ENDIAN - shift = (sizeof(uint32_t) - sizeof(vm_page_bits_t) - shift) * NBBY; #else - shift *= NBBY; +#error unhandled page size #endif - addr &= ~(sizeof(uint32_t) - 1); - atomic_clear_32((uint32_t *)addr, clear << shift); -#endif /* PAGE_SIZE */ } static inline vm_page_bits_t @@ -5441,45 +5407,21 @@ vm_page_bits_swap(vm_page_t m, vm_page_bits_t *bits, vm_page_bits_t newbits) old = *bits; while (atomic_fcmpset_32(bits, &old, newbits) == 0); return (old); -#elif (PAGE_SIZE == 8192) && defined(atomic_fcmpset_16) +#elif PAGE_SIZE == 8192 uint16_t old; old = *bits; while (atomic_fcmpset_16(bits, &old, newbits) == 0); return (old); -#elif (PAGE_SIZE == 4096) && defined(atomic_fcmpset_8) +#elif PAGE_SIZE == 4096 uint8_t old; old = *bits; while (atomic_fcmpset_8(bits, &old, newbits) == 0); return (old); -#else /* PAGE_SIZE <= 4096*/ - uintptr_t addr; - uint32_t old, new, mask; - int shift; - - addr = (uintptr_t)bits; - /* - * Use a trick to perform a 32-bit atomic on the - * containing aligned word, to not depend on the existence - * of atomic_{set, swap, clear}_{8, 16}. - */ - shift = addr & (sizeof(uint32_t) - 1); -#if BYTE_ORDER == BIG_ENDIAN - shift = (sizeof(uint32_t) - sizeof(vm_page_bits_t) - shift) * NBBY; #else - shift *= NBBY; +#error unhandled page size #endif - addr &= ~(sizeof(uint32_t) - 1); - mask = VM_PAGE_BITS_ALL << shift; - - old = *bits; - do { - new = old & ~mask; - new |= newbits << shift; - } while (atomic_fcmpset_32((uint32_t *)addr, &old, new) == 0); - return (old >> shift); -#endif /* PAGE_SIZE */ } /*