From nobody Mon Jan 27 18:20:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhcCx60dnz5m3s8; Mon, 27 Jan 2025 18:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YhcCx4M7Gz3r9D; Mon, 27 Jan 2025 18:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738002029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YSA0X3yML4eqxkFJ7TjKbAEKaJsB3tmBXLHMLkMyUjQ=; b=PYkAI7bahjUfip3r6tvTuHm95k4AWZYElrQdKnEIkchNLSYt/zjOmaHQWfRThQjqXNPqvw 3wEemJceoYAwqVbAfQ1NEPAjkJFhvfMW5SPO3iZEeyT96WTyv5pgBXeHYy1QLuVpIj1ePQ V8pzf29vdpgbzLEiLNNMqLEOcyNaUHj6BgNPd2UGhMfEGZ9KlsSPfMxotNzd02tPFaAGQ6 ZBfdhOAB5Hvt9bFqjSlRx7qmdyFJq7ypDibTX8jEzFqxskNqIuI2Pv709CBd806XPR9oV/ elYS/qGazdAUBNBzLFVfiTD4y6SUIEmpB5NeozcIAeA+z+rQcE7/SmS7BWmJnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738002029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YSA0X3yML4eqxkFJ7TjKbAEKaJsB3tmBXLHMLkMyUjQ=; b=l6gf476Nvu7+Cv4QAQGZi7+Md1qz++FHO2Rsi3r4nzR2JWHuMvk1ySwZr8uLjJ0hcvTqS3 Kqx1qkFSYPjwH40rvyNCWPyZLhwUB734jD2qrx9pzIJLOUHycWZprvTWzrUVm9GifsbWB/ 3oFltvXZvk6nEZvbbTFhzGtheKdEpIzi/1SqgX5VDtkyPeFNT6PDtmaMHrc62jz+wq1e/w 5eFxOcHnb6vDSuYaJsTkMAk5zUx3bEU7ceWPKZs/IjEQ+zxyXvDUu9WV3oG/V9zEwZdtyp N6i1UhB6g7ocRYU09/M3pY7hfvlExev9cdxZVE8jW0euZL4MG/zKKIk3+peBEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738002029; a=rsa-sha256; cv=none; b=Z0loQqd0eTWP9aBQTW2n+0c0iqXuPa10+iIRSbYkiT5ILwnvKYdQa8xustU68OO1fEdLJ0 bcJFX0yrjGIF1CIdFlNfJ3AdWkjrX0RVQhaoOfRQkv/z2pQcPgfs2821gnuraOAoTik7ou TGnuDTJ8gPxm3qIhFXmJ4al4JzgvKqOqN+wtEnJUTMjKLF0AgaZ40r1cjNXm3rehw9KKZP 3IUqWWsU4HvcAeFt6NBfksEFwih26WAU3EWnartYPKqKfuFhA4qmIq5OsMdCexHQ1c4twG 2KXYeKwPsHQE4wvMEPkPCQJprMoSgEWLtaS6dpCNwIuoteOx1+auu7zDyl3sdw== 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 4YhcCx3yNczgW8; Mon, 27 Jan 2025 18:20: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 50RIKTrW002222; Mon, 27 Jan 2025 18:20:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RIKTKf002219; Mon, 27 Jan 2025 18:20:29 GMT (envelope-from git) Date: Mon, 27 Jan 2025 18:20:29 GMT Message-Id: <202501271820.50RIKTKf002219@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: aab45924bdb1 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: aab45924bdb10338654e25ab9ecec106b7eb368b Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=aab45924bdb10338654e25ab9ecec106b7eb368b commit aab45924bdb10338654e25ab9ecec106b7eb368b Author: Olivier Certner AuthorDate: 2025-01-20 14:38:42 +0000 Commit: Olivier Certner CommitDate: 2025-01-27 18:19:57 +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); \ }) /*