From nobody Mon Jan 27 18:17:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yhc8v0CjJz5m3b3; Mon, 27 Jan 2025 18:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yhc8t1Vkcz3pmf; Mon, 27 Jan 2025 18:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738001870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ILQf+OAfFwK9aFnVIPr72PUS06rcQWjOhUWWgV/OxVk=; b=mi8SfPbiBgeLX+ZbwLor7YxtIWnXRbG+GUvjD18ZSlv2PUrh2dMzGxYq9QF3HbeK2ivDWT EuuR8ccHLQ2qLry/tHADTyPuMOuSBCW4GOfxJdeydK+YCxip6ZSW8pDxvYUOZbsqFD+BrQ +nMDT6kzzvaYNKFemX0H6gVB9+77bSbip+1erLYr1lOYtAS/uIR+BP3qbjeLev8d2wZ6xb 8DGaAznzUB3NllXdUkjBEHVvK0NymaPAnyaThDDKRTNfLCzyglBxtKGgToEe2rwIKXYpJm iN3z7iOXuT9U32fh6BeGrRCmoakceO1g19URy2711u9IPsrxf4h48EWwQ9zzEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738001870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ILQf+OAfFwK9aFnVIPr72PUS06rcQWjOhUWWgV/OxVk=; b=J+U0x2YRbvb1uqr/5bsTEqjVS6SZ8ZEJ6WRbk7HiXd/GSdCe6vfk3bgoJoMzQ43vCq34yu VBxDtIcDRMnvBV8FcPB6huMJ0qpPLDtnfILoqvkFZ6FQgZ6C+7VuUTr5IfCqGj0Q5Z5J24 fQBdcbx5BLkt3+E072E45IVq07MZKQtRcbokE3lmJGFo09b8ozw5KXUx0EGivqiwNYO1Ad mX1ccfQg6dggBTLObDyFzlVhT/P572BiMb1ng/qRxEXIIst6F33QOzKzpwF1KDr9jd/NQ4 f1UwaNX6z+LsdTA/poPxrNHXuqJh43rGm7NMz5DgOs+AZnnBMH+06tghs1yYPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738001870; a=rsa-sha256; cv=none; b=WASpFivKIzsSivrgPIwO50yRNq0xhpD4TjsXEp+8bIf5fIzeBKeApiigXTGdDF+pueaGGU R/z6wSp1BnjSXRH05KM3Fl87ft0380YVBqylZ7EXNkkliRk1rJXd/leqf8vWL0eQl/GuJo g0oDBO7qPSLRxTHjcv0tp7X/s+vDI+2jYv1RAWBY8QQuz2Fle3WxloFIpLZ0qeLkHPBuOS 0/eSfGRryjPSoKZVXYSvTCH0/1PTOvVzRpl7vQTaF57/QICKpF94zOoF0O9VRHY7J78Ndm eRri0OKHrqfGIMyJPHv9W/aYWop2DUVqSBwCPMW+gZgXMDijqaKspi/iFRYa0Q== 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 4Yhc8t15cvzg2q; Mon, 27 Jan 2025 18:17: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 50RIHosp092446; Mon, 27 Jan 2025 18:17:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RIHoRa092442; Mon, 27 Jan 2025 18:17:50 GMT (envelope-from git) Date: Mon, 27 Jan 2025 18:17:50 GMT Message-Id: <202501271817.50RIHoRa092442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: fb4bc4c325ec - stable/13 - smr: Load to accept pointers to const pointers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fb4bc4c325eca15247a2e21ded0a70f92ec15488 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fb4bc4c325eca15247a2e21ded0a70f92ec15488 commit fb4bc4c325eca15247a2e21ded0a70f92ec15488 Author: Olivier Certner AuthorDate: 2025-01-20 14:38:42 +0000 Commit: Olivier Certner CommitDate: 2025-01-27 18:17:17 +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 (cherry picked from commit 1ac0afaa962bc847294d5e6bf1e749b7ffa78cfd) --- 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); \ }) /*