From nobody Mon Jan 20 15:50:46 2025 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 4YcFDR10J6z5kGcf; Mon, 20 Jan 2025 15:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YcFDQ6jNgz3NW8; Mon, 20 Jan 2025 15:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737388247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxG5hRFQsvSqSnmfTAeADzBGLAsaegY/v/WgD3fApfI=; b=xiZPQ5kSiBKO89J95zWifvw2sUv/8Yh3R+ArTjBmwxoUX1dMcSa28+O+V/mOcta0PYCT+O xK5DP3y/ZTF/VBSxIwZKFsLGcgHkSOYVztqB1VOhpos69P+lQf3tL0A1tfSS0r7PiQ50m/ AFJT7X9hr8Jxqk7lB2VzwX11X+ecZz767OWUx0IuYdXBkkKZHOZtYNsBcQifjCR+H3EI9K XXig8qDrcXj/rOhRucy2NSLzqdPtoTBFXqL9whzhGoyy04LK0/wgb9hFACVDHwmhHEGqqu p0h+wQmB0duikTtZGABpFdQZGGk2O5FmS4ufux2VN37RCJZDzIeCZzXSTGw+Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737388247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxG5hRFQsvSqSnmfTAeADzBGLAsaegY/v/WgD3fApfI=; b=LGrw+0z0zPKDP00YuPyCsbM+2xsJJrOG0rtH3sw1qqNpR4dRRe3mZeMeboEzrPSTcFJTRv iHKHSupQnCUz5PryeQLAC4OtCunqmpCDhtz+Rm+AjVhJyQFubIIqKD/eeB4b0KezdkStCG Uv7Ar5RjqKzdeoWeSO/rAWyG4ycvmBScIXXXsNBcXtOUol6LDOCcC8SVo4c1z99KezmT9c pcMwaAnVurh2o4hscLegy0vA9EeITXaYa0PrpNoyPQ/I+Rl+yIIs3YRl7ju6e/BVDyWSP4 ONub6EfvYRm8xMQVl+eZLZP4IGE/P8jycdR09pLj9vylsEfGwk3RhAwWWBlqhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737388247; a=rsa-sha256; cv=none; b=A/Fa5tPP7T+5NCzA8bI39M7cAr7bgfm3sR+HX4ARGdi4gXk6QmMVOE/OxeJWybaz/laKf3 k91nhBARnGWYbU3QXAMXUO7I+/xdFdGcTEazkPiQJpMAvRQCWeTjr6tjy8YhQ3UDl3i3Eh o024mufGEMi6nrHPprvyoJhBqrI1Tz7bvhYWmcRakI6AhM/ComyLEOKf6JanRC4eGvR95Q vnc//l6KgRl3gJ++1FNClYjs1qVmH8oln/QIBJS7W24NUBN4S2c06gCvyic1vL2tjwbwZ0 dqJL5dL83P4Wn5EpdATruL2exfXEBtdMsunT0Erp5g6ps/nqRf+y01CEY1A4Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YcFDQ6C2QzBQY; Mon, 20 Jan 2025 15:50: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 50KFokI0047935; Mon, 20 Jan 2025 15:50:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KFokt2047932; Mon, 20 Jan 2025 15:50:46 GMT (envelope-from git) Date: Mon, 20 Jan 2025 15:50:46 GMT Message-Id: <202501201550.50KFokt2047932@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: c57c02ebf7bc - main - smr: Load to accept pointers to const pointers 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 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: c57c02ebf7bcc9b02a0dc11711e8d8a6960ad34b Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c57c02ebf7bcc9b02a0dc11711e8d8a6960ad34b commit c57c02ebf7bcc9b02a0dc11711e8d8a6960ad34b Author: Olivier Certner AuthorDate: 2025-01-20 14:38:42 +0000 Commit: Olivier Certner CommitDate: 2025-01-20 15:49:52 +0000 smr: Load to accept pointers to const pointers Pointers passed to the smr_entered_load() and smr_serialized_load() macros are in the end used as arguments to atomic_load_*ptr(), so convert them to the now acceptable 'const uintptr_t *' ones (instead of 'uintptr_tr *'), making these macros accept pointers to constant pointers. Reviewed by: kib MFC after: 4 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48497 --- sys/sys/smr_types.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/sys/smr_types.h b/sys/sys/smr_types.h index 9da4a73c568c..0257236f7314 100644 --- a/sys/sys/smr_types.h +++ b/sys/sys/smr_types.h @@ -60,7 +60,8 @@ struct { \ */ #define smr_entered_load(p, smr) ({ \ SMR_ASSERT(SMR_ENTERED((smr)), "smr_entered_load"); \ - (__typeof((p)->__ptr))atomic_load_acq_ptr((uintptr_t *)&(p)->__ptr); \ + (__typeof((p)->__ptr))atomic_load_acq_ptr( \ + (const uintptr_t *)&(p)->__ptr); \ }) /* @@ -70,7 +71,8 @@ struct { \ */ #define smr_serialized_load(p, ex) ({ \ SMR_ASSERT(ex, "smr_serialized_load"); \ - (__typeof((p)->__ptr))atomic_load_ptr(&(p)->__ptr); \ + (__typeof((p)->__ptr))atomic_load_ptr( \ + (const uintptr_t *)&(p)->__ptr); \ }) /*