From nobody Mon Jan 27 18:17:44 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 4Yhc8n0S3Wz5m3YS; 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 4Yhc8m5LXrz3pnx; Mon, 27 Jan 2025 18:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738001864; 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=Tr7IjBNMiPmO1Du7kt+kLGpv3YJR3nbHFne7dClny6Q=; b=PjnKHDlAj3+EIrXrsNDcgIdJkRR93r7xxIeZOKUbyalZSiaMdcyKf24m2T91Y0I3ohB+OO e5L/TlDQGVYG5W0rinDNoNsEuUOUG9E3hwwvh3sI23PjEDZXxsXxwbgQzvYvQ8ugJn/ydG bqQpknjLu1NU/t+mBgtJrGoEXVMuoKjMW2fckPqeW9a9tH1c/UCrIhqNOdXn0K5WPGUz6t z3g0w2ayOG9IrRX/wR1EI4AKjAWswB90YSBJ/utRwDqa/5wDCLqcgcv5Bya8IVx1GQNQ5H +d4qpiSSoJwlrIjGZAg8pZKWyWm6ylMQnwhGDmFUGE58GIDQJnwcjt9VAZFVKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738001864; 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=Tr7IjBNMiPmO1Du7kt+kLGpv3YJR3nbHFne7dClny6Q=; b=gsaT0JRRx2Hmde77H3xKXwWGPrgDNut75bY7oJhB4Ifqfglhd5lOMesrLOjOLwSql7VlDp zFWZ+twIYRwQsd+yg/evupXqFM34zUCWNPzIecqAG2yyNx1xsyiWKO/b5RPm0qv2n1Hmqk REbwHVu3XDA2ktD2+RpUj2FtFkEAXK7PH/7rSr8IZDzK1+aOK+49mSDrAMuaqUXIXuB2oI /OXKFd4jEHKTLt5UWZjYX2hYhPx/KIJLxVXaPUeh5o8/T1ZBQlippA+dSiE0WHcYdvjUAU g4UxeYSwN2hJNV0pDFWPg5I8J7GdjDoTO4Qnf0RXfgrwBYO5pDhT1or/NdOCiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738001864; a=rsa-sha256; cv=none; b=g2zzXzbHgtZKkPQDH0CjjtjXJGJTVQK39axLdoB+z1kRzpvrQKpkomEVLcOekOw6JAWbCA oXNnYzlt5zyhPncUAUqLaS0hOmyLfezPpiF6c+hWV3tdOKbA6iIgaPnwAqlJayMTU2SHiZ Spc47M9QReDkVLZ31npFVF0lugmmesMwlB/+RAVJs4dymsx4V+lz9bnIWVBSCPMJM+AN3u DZIFaL9bwImJc1dWQp2molbRHgDWIOWziYFI/Nm/90WqpKa7e+uCgXis7y9ccbwoLEKQHG Jw2ITuWjmTzs82Lfha5xOwzykhR4z549dblkha7Ea+gN0eJetZMJkTARuWF0yw== 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 4Yhc8m4QFlzg2p; Mon, 27 Jan 2025 18:17:44 +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 50RIHi2S092272; Mon, 27 Jan 2025 18:17:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RIHijt092269; Mon, 27 Jan 2025 18:17:44 GMT (envelope-from git) Date: Mon, 27 Jan 2025 18:17:44 GMT Message-Id: <202501271817.50RIHijt092269@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: 176599b58779 - stable/13 - atomic: Avoid casting the return value of atomic_load_ptr to void * 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: 176599b58779b0062b50a5813654eefa5ec78869 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=176599b58779b0062b50a5813654eefa5ec78869 commit 176599b58779b0062b50a5813654eefa5ec78869 Author: Mark Johnston AuthorDate: 2024-08-28 18:51:06 +0000 Commit: Olivier Certner CommitDate: 2025-01-27 18:17:11 +0000 atomic: Avoid casting the return value of atomic_load_ptr to void * Otherwise a cast is needed to load a uintptr_t value. Fixes: e1f4d623779d ("rangelocks: remove unneeded cast of the atomic_load_ptr() result") MFC after: 1 week (cherry picked from commit c7a7e997d25d0b33769252d002b16839c864c83d) --- sys/sys/atomic_san.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/sys/atomic_san.h b/sys/sys/atomic_san.h index 22a8faa9e24e..4d503e22dcd2 100644 --- a/sys/sys/atomic_san.h +++ b/sys/sys/atomic_san.h @@ -266,7 +266,8 @@ ATOMIC_SAN_THREAD_FENCE(SAN_INTERCEPTOR_PREFIX); #define atomic_fcmpset_rel_ptr ATOMIC_SAN(fcmpset_rel_ptr) #define atomic_fetchadd_ptr ATOMIC_SAN(fetchadd_ptr) #define atomic_load_ptr(x) \ - ((void *)ATOMIC_SAN(load_ptr)(__DECONST(volatile uintptr_t *, (x)))) + ((__typeof(*x))ATOMIC_SAN(load_ptr)( \ + __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)))