From nobody Mon Jan 27 18:17:45 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 4Yhc8n6bL5z5m3W7; Mon, 27 Jan 2025 18:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yhc8n4t7fz3ph1; Mon, 27 Jan 2025 18:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738001865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZXgnJy9Yyxb6kO4F5TpWbLid2PJd3bkX4DMuhH0Jw8=; b=p/KT8KnmmDNgBDSaXaHOivCUCz3W7Gmut79s7OD3URcUPZbYgfdw22XGVJEBCYujISYTD2 4w3MUGNuvY86EtHpndQeRtAFnJui6ZKVPB2heZBDHjSJ9gt+19RilqbyaBsD1jfBU+byhd o/JuAA9iivlok+6IwnzCfuLCRtHwYCc5EOykY1a0/IcO/2EIoHxojTFjU/kJhvwd8EaOWM jX9P//205SY/gUxo0kF0RILCxVgD4+rANhJ5wkSysH3+MbZ4gxOgZ+jFA3p5nqxx+wgTaE b/g7h4LVlZmjlDjDHFFgBhSVPZ4NrX2pR/i6gJc3aa3uXVf2OnvIfvlfWAcg5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738001865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZXgnJy9Yyxb6kO4F5TpWbLid2PJd3bkX4DMuhH0Jw8=; b=tB2RwRfiXhqNumwh5NDWZbRpVpMAkC7jPzzf+qBz6Y7FVsNgWjwQR0kL3fQkAbDthJ0yU9 d4S4++5TuwMw5mJ6tgI1w6enYR5qmCh0sELBZNBAApLPs1dG0w5mITZJ2+fD69rX5LeAK/ TINmst4EHu7DooFYudqBjT+UsR97NskmR3dHSpUrdF7qVnHDA4Ca/iOLqYuiohTgTAC7Rw djAW2noVizYMod0fZX0JqpW5UDndTDCCyuSwB/4K5RiamxhDdE/0ITEiJIgr03n9PEF1Ix kOwX7iYXx0VbxgmG+cibm6i5LSfagM8G6X/Gt+RB9xZK2/tTcgrgy9SctFT+qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738001865; a=rsa-sha256; cv=none; b=oVo7ekk2ktfv9M6TSYsd9tQM5o/yr23X5q5gJgAD+Q033NrN0AAPDde/9jQOa15iw6Itby K4Xtvy39M9eJjsemtKIZcrwJ0zHVdfwZCkEut1oIgjd9j/YpQDTjPPxfvbCT4Jqfg5js1D fDHuKxe1xlCvauJQ4m9LShC0fS8sramX9hjeuN9jV5W2x4UpzCX/b4OkDeysHlOPNt9YBJ bPnZlMxJ9jCQyZrMaXTgbRMqsktVN63bRUUfOJqI/2/0reoOSsXD4wojFfY7ydzL0ZwuBf zasWtmR6spgsU5mZG6u0U859eZVSHaTDOIix/VjjUPWUlPTCMtDQeBbJekfWKA== 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 4Yhc8n4PrPzgHZ; Mon, 27 Jan 2025 18:17: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 50RIHjDr092306; Mon, 27 Jan 2025 18:17:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RIHjsQ092303; Mon, 27 Jan 2025 18:17:45 GMT (envelope-from git) Date: Mon, 27 Jan 2025 18:17:45 GMT Message-Id: <202501271817.50RIHjsQ092303@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: 4463da0fa365 - stable/13 - atomic: Fix the cast in the atomic_load_consume() interceptor 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4463da0fa365b8ec484068d8d2a58bf0c88317d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4463da0fa365b8ec484068d8d2a58bf0c88317d9 commit 4463da0fa365b8ec484068d8d2a58bf0c88317d9 Author: Mark Johnston AuthorDate: 2024-08-28 19:25:11 +0000 Commit: Olivier Certner CommitDate: 2025-01-27 18:17:16 +0000 atomic: Fix the cast in the atomic_load_consume() interceptor As in commit c7a7e997d25d0, we should permit loading from a pointer to uintptr_t. Note that the other atomic_*_ptr() interfaces currently require casting regardless, only those defined in atomic_common.h try to be generic. Reported by: jrtc27 MFC after: 1 week (cherry picked from commit cb91dc50950ffdfd49337e844e231b69b8b5c634) --- sys/sys/atomic_san.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/atomic_san.h b/sys/sys/atomic_san.h index 4d503e22dcd2..93a9bfcbf593 100644 --- a/sys/sys/atomic_san.h +++ b/sys/sys/atomic_san.h @@ -270,7 +270,7 @@ ATOMIC_SAN_THREAD_FENCE(SAN_INTERCEPTOR_PREFIX); __DECONST(volatile uintptr_t *, (x)))) #define atomic_load_acq_ptr ATOMIC_SAN(load_acq_ptr) #define atomic_load_consume_ptr(x) \ - ((void *)atomic_load_acq_ptr((volatile uintptr_t *)(x))) + ((__typeof(*x))atomic_load_acq_ptr((volatile uintptr_t *)(x))) #define atomic_readandclear_ptr ATOMIC_SAN(readandclear_ptr) #define atomic_set_ptr ATOMIC_SAN(set_ptr) #define atomic_set_acq_ptr ATOMIC_SAN(set_acq_ptr)