From nobody Sun Jan 11 01:14:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1767850734; cv=none; d=zohomail.com; s=zohoarc; b=KJbxDeCpIAQGEev9tu01x0rH/1XrFnnKeJFe7eFHbIgSFF/Qy5MuQYI+UDLq2YPK+BghPO/79OMi6IGZCXirf4aiLJTMO9nXtFHLCH1hC6NbIVmZTVWJczx9wQ6/WhqY438ARv69rwET1GIau3Hmyy5W5pNSB6v/JT9nVDqob88= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767850734; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=v2qu161usDgTbexXzzoRx8DVaGsr+BfbZP1SAOgGMrw=; b=FddZpiYu9f47Q97FwlPYG2id5P/074ES/EBVwSpqrfxQqftvLYbiSSYqpc94MAc+rVjn+nMEZILliHPyfp/217C1Wi6m9qtUjJYGCSIJKbkzsvRQzzXPMSuaBUcDsfLKKYzQ66+KSXwYQ+OoCi5JxmYFrO04W53vegAXws5Saa0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767850734565864.5509148824515; Wed, 7 Jan 2026 21:38:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdig1-000509-VD; Thu, 08 Jan 2026 00:35:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdifn-0004eI-1s for qemu-devel@nongnu.org; Thu, 08 Jan 2026 00:35:06 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vdifk-0005zW-KX for qemu-devel@nongnu.org; Thu, 08 Jan 2026 00:35:02 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2a09757004cso28229895ad.3 for ; Wed, 07 Jan 2026 21:35:00 -0800 (PST) Received: from stoup.. ([180.233.125.201]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cb2d93sm66341465ad.63.2026.01.07.21.34.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 21:34:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767850499; x=1768455299; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=v2qu161usDgTbexXzzoRx8DVaGsr+BfbZP1SAOgGMrw=; b=o8GgIRGhsAuMDzZH5oXTlIqHkDRopXA8dT7f8W52fPPV0YAQAg64kFNDX+l6Bs17UQ fZa/Rb+xVz8+Xc43edBZwczNcwKGO6TvR0SbDjZXsM1uNcOFaGVorpvAU8oi3aF5WQop r8JgKceLimwE2ybSR8SmbhmZmIo1TYDGhb/DCZsELH26srvmBLVQaqHxAsKRp+yN+6gJ hlRDMnlZNzmuA7YS7zxl7uXmBoCFBebaIieR4JZPXXC0pvd6XEJHYypz0tKSfOLv4Qep dESwWkWpWYS2/bKQOfbVbnLAzMGe27kx6AVT6P4Mb0cLm09Uo9NnoyjvBDRXKtA//z6B rgCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767850499; x=1768455299; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=v2qu161usDgTbexXzzoRx8DVaGsr+BfbZP1SAOgGMrw=; b=VWxVCyVdMqONwwkZnkvTSlSo3H22M1FcdsN5HJGS0JbokJmgg9WS0cr3URqmopn2O/ 97Hm51F8+zipTe1dHE8SOKEFO7MTPmBEP9Qls6wJA/Eeu18RR8eom/aU8gZnKuiypcuK Nyta3H2TJOWVHzBbRHycZhhVUgoENBHYRuf5Xb3iKvmBVzfCZhOGFSf/gVIP7NmkKGsK eENATkxD01NBwXyW/Ul1d5EFVxyIBUZaXfIWxCVa4MjdT+/O2vid0Jvwa3ocEfijkPtd rCdKQBwHYi51iM3nBnB3n7k16E25KOm1YLP+IOWzwBGnLvkWQc4/NiQVA18gFd7/6WWz G/Lw== X-Gm-Message-State: AOJu0Yx4japg+E92/p0LwuxAomFPXOniV1ZlYRhgkXrS7ceIPXNFsvzf X4JnFxm27likMPa5+GeilW7a1OpWzor/XjmnfsMiz5OnyN0nFthDzQKtex3Tym1Y3/6F9U9Xcbg CXgTpEac= X-Gm-Gg: AY/fxX5EdC7BhBuOjGsekBjBphGzPlmjMmyP6UafjVhhK7qJbOjF9oWKuXY2wxrhd50 oLjybIk9JEYs7KY2tJG8JdJ4IUg1pOfuzSsV32W3L4uR5CGdX4xc8ZMRQCnjDf4oG0tot5n9i8a kbX9N7YW6KiXsXPPIWcS+0PaIFlBmpkIPGWHwIpXcFj3ZIJGBck5mMOT+eH01errB9lUQ6SG74o ZmrqkqrhBttZcuAKHasyQbIHEw0gEIXeTmyhwHhGCVhSwcrHdkzhuvcbeZkMakbK3nD4Pahk9t9 7C3oYDx0rPH651meW8Rycgqc0nx2i94Tdg0XHqfSyc3IIJk31tcnzxtExxHX5QdJt6YCwlJTjIo cJxy4kcJkRtBeB0E40kJhCySIBNWu2xNqpsqHsi952c02IhPuKTNBQf4D2L6jORAdTK6HUfl5po cfXiJZnM4mQLLwndRpUQ== X-Google-Smtp-Source: AGHT+IEjhhcXCfRKYp4tjot8fXuUcTjUQ0Evmq1mGqLOFjz1f8u/vbsmJvXNN88vDLtlxq57ukgQGQ== X-Received: by 2002:a17:902:ce88:b0:298:6a79:397b with SMTP id d9443c01a7336-2a3ee4b8d62mr43844505ad.56.1767850499204; Wed, 07 Jan 2026 21:34:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 48/50] include/qemu/atomic: Drop qatomic_{read,set}_[iu]64 Date: Thu, 8 Jan 2026 16:30:16 +1100 Message-ID: <20260108053018.626690-49-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260108053018.626690-1-richard.henderson@linaro.org> References: <20260108053018.626690-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1767850736658158500 Content-Type: text/plain; charset="utf-8" Replace all uses with the normal qatomic_{read,set}. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/qemu/atomic.h | 22 ---------- accel/qtest/qtest.c | 4 +- accel/tcg/icount-common.c | 25 ++++++----- system/dirtylimit.c | 2 +- tests/unit/test-rcu-list.c | 17 ++++---- util/atomic64.c | 85 -------------------------------------- util/cacheflush.c | 2 - util/qsp.c | 8 ++-- util/meson.build | 3 -- 9 files changed, 27 insertions(+), 141 deletions(-) delete mode 100644 util/atomic64.c diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index c39dc99f2f..27d98014d4 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -247,26 +247,4 @@ typedef int64_t aligned_int64_t __attribute__((aligned(8))); typedef uint64_t aligned_uint64_t __attribute__((aligned(8))); =20 -#ifdef CONFIG_ATOMIC64 -/* Use __nocheck because sizeof(void *) might be < sizeof(u64) */ -#define qatomic_read_i64(P) \ - _Generic(*(P), int64_t: qatomic_read__nocheck(P)) -#define qatomic_read_u64(P) \ - _Generic(*(P), uint64_t: qatomic_read__nocheck(P)) -#define qatomic_set_i64(P, V) \ - _Generic(*(P), int64_t: qatomic_set__nocheck(P, V)) -#define qatomic_set_u64(P, V) \ - _Generic(*(P), uint64_t: qatomic_set__nocheck(P, V)) - -static inline void qatomic64_init(void) -{ -} -#else /* !CONFIG_ATOMIC64 */ -int64_t qatomic_read_i64(const int64_t *ptr); -uint64_t qatomic_read_u64(const uint64_t *ptr); -void qatomic_set_i64(int64_t *ptr, int64_t val); -void qatomic_set_u64(uint64_t *ptr, uint64_t val); -void qatomic64_init(void); -#endif /* !CONFIG_ATOMIC64 */ - #endif /* QEMU_ATOMIC_H */ diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 1d4337d698..bb1491d93b 100644 --- a/accel/qtest/qtest.c +++ b/accel/qtest/qtest.c @@ -31,12 +31,12 @@ static int64_t qtest_clock_counter; =20 static int64_t qtest_get_virtual_clock(void) { - return qatomic_read_i64(&qtest_clock_counter); + return qatomic_read(&qtest_clock_counter); } =20 static void qtest_set_virtual_clock(int64_t count) { - qatomic_set_i64(&qtest_clock_counter, count); + qatomic_set(&qtest_clock_counter, count); } =20 static int qtest_init_accel(AccelState *as, MachineState *ms) diff --git a/accel/tcg/icount-common.c b/accel/tcg/icount-common.c index d6471174a3..b1b6c005fe 100644 --- a/accel/tcg/icount-common.c +++ b/accel/tcg/icount-common.c @@ -86,8 +86,8 @@ static void icount_update_locked(CPUState *cpu) int64_t executed =3D icount_get_executed(cpu); cpu->icount_budget -=3D executed; =20 - qatomic_set_i64(&timers_state.qemu_icount, - timers_state.qemu_icount + executed); + qatomic_set(&timers_state.qemu_icount, + timers_state.qemu_icount + executed); } =20 /* @@ -116,15 +116,14 @@ static int64_t icount_get_raw_locked(void) /* Take into account what has run */ icount_update_locked(cpu); } - /* The read is protected by the seqlock, but needs atomic64 to avoid U= B */ - return qatomic_read_i64(&timers_state.qemu_icount); + /* The read is protected by the seqlock, but needs atomic to avoid UB = */ + return qatomic_read(&timers_state.qemu_icount); } =20 static int64_t icount_get_locked(void) { int64_t icount =3D icount_get_raw_locked(); - return qatomic_read_i64(&timers_state.qemu_icount_bias) + - icount_to_ns(icount); + return qatomic_read(&timers_state.qemu_icount_bias) + icount_to_ns(ico= unt); } =20 int64_t icount_get_raw(void) @@ -201,9 +200,9 @@ static void icount_adjust(void) timers_state.icount_time_shift + 1); } timers_state.last_delta =3D delta; - qatomic_set_i64(&timers_state.qemu_icount_bias, - cur_icount - (timers_state.qemu_icount - << timers_state.icount_time_shift)); + qatomic_set(&timers_state.qemu_icount_bias, + cur_icount - (timers_state.qemu_icount + << timers_state.icount_time_shift)); seqlock_write_unlock(&timers_state.vm_clock_seqlock, &timers_state.vm_clock_lock); } @@ -269,8 +268,8 @@ static void icount_warp_rt(void) } warp_delta =3D MIN(warp_delta, delta); } - qatomic_set_i64(&timers_state.qemu_icount_bias, - timers_state.qemu_icount_bias + warp_delta); + qatomic_set(&timers_state.qemu_icount_bias, + timers_state.qemu_icount_bias + warp_delta); } timers_state.vm_clock_warp_start =3D -1; seqlock_write_unlock(&timers_state.vm_clock_seqlock, @@ -361,8 +360,8 @@ void icount_start_warp_timer(void) */ seqlock_write_lock(&timers_state.vm_clock_seqlock, &timers_state.vm_clock_lock); - qatomic_set_i64(&timers_state.qemu_icount_bias, - timers_state.qemu_icount_bias + deadline); + qatomic_set(&timers_state.qemu_icount_bias, + timers_state.qemu_icount_bias + deadline); seqlock_write_unlock(&timers_state.vm_clock_seqlock, &timers_state.vm_clock_lock); qemu_clock_notify(QEMU_CLOCK_VIRTUAL); diff --git a/system/dirtylimit.c b/system/dirtylimit.c index a0c327533c..50fa67f3d6 100644 --- a/system/dirtylimit.c +++ b/system/dirtylimit.c @@ -123,7 +123,7 @@ static void *vcpu_dirty_rate_stat_thread(void *opaque) int64_t vcpu_dirty_rate_get(int cpu_index) { DirtyRateVcpu *rates =3D vcpu_dirty_rate_stat->stat.rates; - return qatomic_read_i64(&rates[cpu_index].dirty_rate); + return qatomic_read(&rates[cpu_index].dirty_rate); } =20 void vcpu_dirty_rate_stat_start(void) diff --git a/tests/unit/test-rcu-list.c b/tests/unit/test-rcu-list.c index 8f0adb8b00..8dde3e61a8 100644 --- a/tests/unit/test-rcu-list.c +++ b/tests/unit/test-rcu-list.c @@ -105,7 +105,7 @@ static void reclaim_list_el(struct rcu_head *prcu) struct list_element *el =3D container_of(prcu, struct list_element, rc= u); g_free(el); /* Accessed only from call_rcu thread. */ - qatomic_set_i64(&n_reclaims, n_reclaims + 1); + qatomic_set(&n_reclaims, n_reclaims + 1); } =20 #if TEST_LIST_TYPE =3D=3D 1 @@ -247,7 +247,7 @@ static void *rcu_q_updater(void *arg) qemu_mutex_lock(&counts_mutex); n_nodes +=3D n_nodes_local; n_updates +=3D n_updates_local; - qatomic_set_i64(&n_nodes_removed, n_nodes_removed + n_removed_local); + qatomic_set(&n_nodes_removed, n_nodes_removed + n_removed_local); qemu_mutex_unlock(&counts_mutex); return NULL; } @@ -301,23 +301,22 @@ static void rcu_qtest(const char *test, int duration,= int nreaders) n_removed_local++; } qemu_mutex_lock(&counts_mutex); - qatomic_set_i64(&n_nodes_removed, n_nodes_removed + n_removed_local); + qatomic_set(&n_nodes_removed, n_nodes_removed + n_removed_local); qemu_mutex_unlock(&counts_mutex); synchronize_rcu(); - while (qatomic_read_i64(&n_nodes_removed) > - qatomic_read_i64(&n_reclaims)) { + while (qatomic_read(&n_nodes_removed) > qatomic_read(&n_reclaims)) { g_usleep(100); synchronize_rcu(); } if (g_test_in_charge) { - g_assert_cmpint(qatomic_read_i64(&n_nodes_removed), =3D=3D, - qatomic_read_i64(&n_reclaims)); + g_assert_cmpint(qatomic_read(&n_nodes_removed), =3D=3D, + qatomic_read(&n_reclaims)); } else { printf("%s: %d readers; 1 updater; nodes read: " \ "%lld, nodes removed: %"PRIi64"; nodes reclaimed: %"PRIi64"= \n", test, nthreadsrunning - 1, n_reads, - qatomic_read_i64(&n_nodes_removed), - qatomic_read_i64(&n_reclaims)); + qatomic_read(&n_nodes_removed), + qatomic_read(&n_reclaims)); exit(0); } } diff --git a/util/atomic64.c b/util/atomic64.c deleted file mode 100644 index c20d071d8e..0000000000 --- a/util/atomic64.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2018, Emilio G. Cota - * - * License: GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ -#include "qemu/osdep.h" -#include "qemu/atomic.h" -#include "qemu/thread.h" -#include "qemu/cacheinfo.h" -#include "qemu/memalign.h" - -#ifdef CONFIG_ATOMIC64 -#error This file must only be compiled if !CONFIG_ATOMIC64 -#endif - -/* - * When !CONFIG_ATOMIC64, we serialize both reads and writes with spinlock= s. - * We use an array of spinlocks, with padding computed at run-time based on - * the host's dcache line size. - * We point to the array with a void * to simplify the padding's computati= on. - * Each spinlock is located every lock_size bytes. - */ -static void *lock_array; -static size_t lock_size; - -/* - * Systems without CONFIG_ATOMIC64 are unlikely to have many cores, so we = use a - * small array of locks. - */ -#define NR_LOCKS 16 - -static QemuSpin *addr_to_lock(const void *addr) -{ - uintptr_t a =3D (uintptr_t)addr; - uintptr_t idx; - - idx =3D a >> qemu_dcache_linesize_log; - idx ^=3D (idx >> 8) ^ (idx >> 16); - idx &=3D NR_LOCKS - 1; - return lock_array + idx * lock_size; -} - -#define GEN_READ(name, type) \ - type name(const type *ptr) \ - { \ - QemuSpin *lock =3D addr_to_lock(ptr); \ - type ret; \ - \ - qemu_spin_lock(lock); \ - ret =3D *ptr; \ - qemu_spin_unlock(lock); \ - return ret; \ - } - -GEN_READ(qatomic_read_i64, int64_t) -GEN_READ(qatomic_read_u64, uint64_t) -#undef GEN_READ - -#define GEN_SET(name, type) \ - void name(type *ptr, type val) \ - { \ - QemuSpin *lock =3D addr_to_lock(ptr); \ - \ - qemu_spin_lock(lock); \ - *ptr =3D val; \ - qemu_spin_unlock(lock); \ - } - -GEN_SET(qatomic_set_i64, int64_t) -GEN_SET(qatomic_set_u64, uint64_t) -#undef GEN_SET - -void qatomic64_init(void) -{ - int i; - - lock_size =3D ROUND_UP(sizeof(QemuSpin), qemu_dcache_linesize); - lock_array =3D qemu_memalign(qemu_dcache_linesize, lock_size * NR_LOCK= S); - for (i =3D 0; i < NR_LOCKS; i++) { - QemuSpin *lock =3D lock_array + i * lock_size; - - qemu_spin_init(lock); - } -} diff --git a/util/cacheflush.c b/util/cacheflush.c index 99221a409f..c043c5f881 100644 --- a/util/cacheflush.c +++ b/util/cacheflush.c @@ -216,8 +216,6 @@ static void __attribute__((constructor)) init_cache_inf= o(void) qemu_icache_linesize_log =3D ctz32(isize); qemu_dcache_linesize =3D dsize; qemu_dcache_linesize_log =3D ctz32(dsize); - - qatomic64_init(); } =20 =20 diff --git a/util/qsp.c b/util/qsp.c index 6b783e2e7f..382e4397e2 100644 --- a/util/qsp.c +++ b/util/qsp.c @@ -346,9 +346,9 @@ static QSPEntry *qsp_entry_get(const void *obj, const c= har *file, int line, */ static inline void do_qsp_entry_record(QSPEntry *e, int64_t delta, bool ac= q) { - qatomic_set_u64(&e->ns, e->ns + delta); + qatomic_set(&e->ns, e->ns + delta); if (acq) { - qatomic_set_u64(&e->n_acqs, e->n_acqs + 1); + qatomic_set(&e->n_acqs, e->n_acqs + 1); } } =20 @@ -538,8 +538,8 @@ static void qsp_aggregate(void *p, uint32_t h, void *up) * The entry is in the global hash table; read from it atomically (as = in * "read once"). */ - agg->ns +=3D qatomic_read_u64(&e->ns); - agg->n_acqs +=3D qatomic_read_u64(&e->n_acqs); + agg->ns +=3D qatomic_read(&e->ns); + agg->n_acqs +=3D qatomic_read(&e->n_acqs); } =20 static void qsp_iter_diff(void *p, uint32_t hash, void *htp) diff --git a/util/meson.build b/util/meson.build index d7d6b213f6..59e835a8d3 100644 --- a/util/meson.build +++ b/util/meson.build @@ -1,8 +1,5 @@ util_ss.add(files('osdep.c', 'cutils.c', 'unicode.c', 'qemu-timer-common.c= ')) util_ss.add(files('thread-context.c'), numa) -if not config_host_data.get('CONFIG_ATOMIC64') - util_ss.add(files('atomic64.c')) -endif if host_os !=3D 'windows' util_ss.add(files('aio-posix.c')) util_ss.add(files('fdmon-poll.c')) --=20 2.43.0