From nobody Sun Jan 11 01:13:47 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=1767850720; cv=none; d=zohomail.com; s=zohoarc; b=bk89KwzEiL535jSMqB65mhB/KB1QFgwzpcbU0MarGNKVyIu0vm4g2SjVeitC+hIsGUgebCu11FcCPx6ekSJgNUl/pNufvBUJhiGTKtvCx2wtniE8qHD72kaHQ7rbQ/mnxbYwq7cKNPZXY/V+oU373RbpVBiemc/eUvd/n+DPrBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767850720; 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=Qk9SB8JO0RESz19bpbP6fq/MmjYYFRiZpkdFfoU416M=; b=RidYscmGF3G0VqUQbV1xQKJccQYKeNdhZ4k6zpACFTxuUEngZbDawyQOSEOboDRXU19LtZfkIfY+aO+SF1wfCxLVSsvl1m6dkZR96FX583bSq3ngX3PDCBJkYGx92wqkYzMrn8nVbhH+5l9Itjgr3AiOSBVWgBaMXLxwuRtTyUQ= 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 176785072020091.39160337622354; Wed, 7 Jan 2026 21:38:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdifz-0004w0-AQ; Thu, 08 Jan 2026 00:35:15 -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 1vdifl-0004dp-72 for qemu-devel@nongnu.org; Thu, 08 Jan 2026 00:35:02 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vdifj-0005zB-4Z for qemu-devel@nongnu.org; Thu, 08 Jan 2026 00:35:00 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2a081c163b0so20987715ad.0 for ; Wed, 07 Jan 2026 21:34:58 -0800 (PST) Received: from stoup.. ([180.233.125.201]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cb2d93sm66341465ad.63.2026.01.07.21.34.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 21:34:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767850498; x=1768455298; 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=Qk9SB8JO0RESz19bpbP6fq/MmjYYFRiZpkdFfoU416M=; b=psF6Mp1/TlM00DC2nIr+lhHzycIk3cOmOgM81JVpaOsNc58qe+IVWrNldb4ig97uyO 60vEsmyimvyDO5LqjXrp43lI4AoRMdmG0fwkP4Nxd/H2PH3dAcMMSPk48F4xYM6PeVqc 1Dujk1E+glMQZmHIBqOYjlVDtwGo/Kr5F0pv2k4tE2dkLrYt110vjiRDShjuOGMUWQaH 5hkwc/fEotoqR9RWQSpF9n1LU8VGolm9LAluUxXxDe6A2KOFLKWVqUNKMzYuJpSZjVkC QRgcnq+soTC4/Td4TckXI2Z4ZheXnIdzOYriKEaP1VePDk0EkUDqqPcCC2476S4ng7mn N+Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767850498; x=1768455298; 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=Qk9SB8JO0RESz19bpbP6fq/MmjYYFRiZpkdFfoU416M=; b=OWkL9JwUhDRCaC7nl5c6U6L5k/H0pp1vG56MmGFsDgz78OWGARxsEGfBXLeoQBwap2 I6akWNqbXuKWsQGxd24jhhow8qesZc9ErTYpb8l1EJWOmxsbF/xQ6h3xE2FH0CYpdJCh rMwAmJbpwBOrRpLhOmXpwuHPs2OEMjOnNWemxY7krykNDefl+BwYx2PtroURo2qgNXJc vab9oNHMx5lsLdysAsxNA8hohtAaTZGxgllC86qz9P7QwGFcA5pCF9oYgpU0HwOO/yw3 PuMzwiKzHf4suCipWoEKr3qGYxIUJQifJ0v+ZhZvA1TJOVTedOk1va2BKTaq5Q5lU7M7 JcFA== X-Gm-Message-State: AOJu0Yz1RBHUFhX50ERA9zgny9pGKeHHYaDjuj+eTsubZvK67QJK1mjP fobLs4tGsVmiImXBrSbq5PfciK5UcaqilOdzecXiE3Huj3LE7ChL5lXG8HwAxCmt3zvWmiXD4Cr hrsH7VqQ= X-Gm-Gg: AY/fxX7QXtDJGxnBjr5KOcHYT7iYFXdjgNX80KZmL2AA70khdKlL9RHHwhW7B3532yc 6j+IOWheRv9RH9JcC+g+qZGeBn6e+Sa7UYuWHgtaObE5bkiL2+I8Iqi7c25AAo2XU36ZRvWk0a3 m9T3yr8X4oNlIlHIP9WMeAOppsMEr75BqL71+A+ow9LozixGOrsg1uTkqxL48YOc4Qakp5KmgPm dS8fokxVx810Pr1bo8UXxXHhittGe2Lyj0dmN3qy34/6zT9gRtoxcQ6WH+7HOQED7vKIFFWo06f eFGDay+Vrt8r1hRDWvzxYixf8iq05Odzq6xQcHaMfp+7iZpozC6K8n3Qlb46y1OVNh/sipTHbNZ Z7/oh20BiNtPlecwK4Hbqs3MqwdB0yjd2HjF2yKl7CcWvG11TwFdkguxUC4lSpalPjdKi3+Bbzd fK1AIDsscYhTRCpIjhyw== X-Google-Smtp-Source: AGHT+IHAtWA2Gruc/a1XGawTBLRjdqrMwNA9zh3/fKUrqCgqi18G7dbc2ARAUytCMYaiAOryhCJEyw== X-Received: by 2002:a17:903:13c6:b0:2a3:bf5f:936b with SMTP id d9443c01a7336-2a3ee43639fmr40738235ad.26.1767850497358; Wed, 07 Jan 2026 21:34:57 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 47/50] util: Remove stats64 Date: Thu, 8 Jan 2026 16:30:15 +1100 Message-ID: <20260108053018.626690-48-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::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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: 1767850720635158500 Content-Type: text/plain; charset="utf-8" This API is no longer used. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/qemu/stats64.h | 199 ----------------------------------------- util/stats64.c | 148 ------------------------------ util/meson.build | 1 - 3 files changed, 348 deletions(-) delete mode 100644 include/qemu/stats64.h delete mode 100644 util/stats64.c diff --git a/include/qemu/stats64.h b/include/qemu/stats64.h deleted file mode 100644 index 99b5cb724a..0000000000 --- a/include/qemu/stats64.h +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Atomic operations on 64-bit quantities. - * - * Copyright (C) 2017 Red Hat, Inc. - * - * Author: Paolo Bonzini - * - * This work is licensed under the terms of the GNU GPL, version 2 or late= r. - * See the COPYING file in the top-level directory. - */ - -#ifndef QEMU_STATS64_H -#define QEMU_STATS64_H - -#include "qemu/atomic.h" - -/* This provides atomic operations on 64-bit type, using a reader-writer - * spinlock on architectures that do not have 64-bit accesses. Even on - * those architectures, it tries hard not to take the lock. - */ - -typedef struct Stat64 { -#ifdef CONFIG_ATOMIC64 - aligned_uint64_t value; -#else - uint32_t low, high; - uint32_t lock; -#endif -} Stat64; - -#ifdef CONFIG_ATOMIC64 -static inline void stat64_init(Stat64 *s, uint64_t value) -{ - /* This is not guaranteed to be atomic! */ - *s =3D (Stat64) { value }; -} - -static inline uint64_t stat64_get(const Stat64 *s) -{ - return qatomic_read__nocheck(&s->value); -} - -static inline void stat64_set(Stat64 *s, uint64_t value) -{ - qatomic_set__nocheck(&s->value, value); -} - -static inline void stat64_add(Stat64 *s, uint64_t value) -{ - qatomic_add(&s->value, value); -} - -static inline void stat64_min(Stat64 *s, uint64_t value) -{ - uint64_t orig =3D qatomic_read__nocheck(&s->value); - while (orig > value) { - orig =3D qatomic_cmpxchg__nocheck(&s->value, orig, value); - } -} - -static inline void stat64_max(Stat64 *s, uint64_t value) -{ - uint64_t orig =3D qatomic_read__nocheck(&s->value); - while (orig < value) { - orig =3D qatomic_cmpxchg__nocheck(&s->value, orig, value); - } -} -#else -uint64_t stat64_get(const Stat64 *s); -void stat64_set(Stat64 *s, uint64_t value); -bool stat64_min_slow(Stat64 *s, uint64_t value); -bool stat64_max_slow(Stat64 *s, uint64_t value); -bool stat64_add32_carry(Stat64 *s, uint32_t low, uint32_t high); - -static inline void stat64_init(Stat64 *s, uint64_t value) -{ - /* This is not guaranteed to be atomic! */ - *s =3D (Stat64) { .low =3D value, .high =3D value >> 32, .lock =3D 0 }; -} - -static inline void stat64_add(Stat64 *s, uint64_t value) -{ - uint32_t low, high; - high =3D value >> 32; - low =3D (uint32_t) value; - if (!low) { - if (high) { - qatomic_add(&s->high, high); - } - return; - } - - for (;;) { - uint32_t orig =3D s->low; - uint32_t result =3D orig + low; - uint32_t old; - - if (result < low || high) { - /* If the high part is affected, take the lock. */ - if (stat64_add32_carry(s, low, high)) { - return; - } - continue; - } - - /* No carry, try with a 32-bit cmpxchg. The result is independent= of - * the high 32 bits, so it can race just fine with stat64_add32_ca= rry - * and even stat64_get! - */ - old =3D qatomic_cmpxchg(&s->low, orig, result); - if (orig =3D=3D old) { - return; - } - } -} - -static inline void stat64_min(Stat64 *s, uint64_t value) -{ - uint32_t low, high; - uint32_t orig_low, orig_high; - - high =3D value >> 32; - low =3D (uint32_t) value; - do { - orig_high =3D qatomic_read(&s->high); - if (orig_high < high) { - return; - } - - if (orig_high =3D=3D high) { - /* High 32 bits are equal. Read low after high, otherwise we - * can get a false positive (e.g. 0x1235,0x0000 changes to - * 0x1234,0x8000 and we read it as 0x1234,0x0000). Pairs with - * the write barrier in stat64_min_slow. - */ - smp_rmb(); - orig_low =3D qatomic_read(&s->low); - if (orig_low <=3D low) { - return; - } - - /* See if we were lucky and a writer raced against us. The - * barrier is theoretically unnecessary, but if we remove it - * we may miss being lucky. - */ - smp_rmb(); - orig_high =3D qatomic_read(&s->high); - if (orig_high < high) { - return; - } - } - - /* If the value changes in any way, we have to take the lock. */ - } while (!stat64_min_slow(s, value)); -} - -static inline void stat64_max(Stat64 *s, uint64_t value) -{ - uint32_t low, high; - uint32_t orig_low, orig_high; - - high =3D value >> 32; - low =3D (uint32_t) value; - do { - orig_high =3D qatomic_read(&s->high); - if (orig_high > high) { - return; - } - - if (orig_high =3D=3D high) { - /* High 32 bits are equal. Read low after high, otherwise we - * can get a false positive (e.g. 0x1234,0x8000 changes to - * 0x1235,0x0000 and we read it as 0x1235,0x8000). Pairs with - * the write barrier in stat64_max_slow. - */ - smp_rmb(); - orig_low =3D qatomic_read(&s->low); - if (orig_low >=3D low) { - return; - } - - /* See if we were lucky and a writer raced against us. The - * barrier is theoretically unnecessary, but if we remove it - * we may miss being lucky. - */ - smp_rmb(); - orig_high =3D qatomic_read(&s->high); - if (orig_high > high) { - return; - } - } - - /* If the value changes in any way, we have to take the lock. */ - } while (!stat64_max_slow(s, value)); -} - -#endif - -#endif diff --git a/util/stats64.c b/util/stats64.c deleted file mode 100644 index 09736014ec..0000000000 --- a/util/stats64.c +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Atomic operations on 64-bit quantities. - * - * Copyright (C) 2017 Red Hat, Inc. - * - * Author: Paolo Bonzini - * - * This work is licensed under the terms of the GNU GPL, version 2 or late= r. - * See the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "qemu/atomic.h" -#include "qemu/stats64.h" -#include "qemu/processor.h" - -#ifndef CONFIG_ATOMIC64 -static inline void stat64_rdlock(Stat64 *s) -{ - /* Keep out incoming writers to avoid them starving us. */ - qatomic_add(&s->lock, 2); - - /* If there is a concurrent writer, wait for it. */ - while (qatomic_read(&s->lock) & 1) { - cpu_relax(); - } -} - -static inline void stat64_rdunlock(Stat64 *s) -{ - qatomic_sub(&s->lock, 2); -} - -static inline bool stat64_wrtrylock(Stat64 *s) -{ - return qatomic_cmpxchg(&s->lock, 0, 1) =3D=3D 0; -} - -static inline void stat64_wrunlock(Stat64 *s) -{ - qatomic_dec(&s->lock); -} - -uint64_t stat64_get(const Stat64 *s) -{ - uint32_t high, low; - - stat64_rdlock((Stat64 *)s); - - /* 64-bit writes always take the lock, so we can read in - * any order. - */ - high =3D qatomic_read(&s->high); - low =3D qatomic_read(&s->low); - stat64_rdunlock((Stat64 *)s); - - return ((uint64_t)high << 32) | low; -} - -void stat64_set(Stat64 *s, uint64_t val) -{ - while (!stat64_wrtrylock(s)) { - cpu_relax(); - } - - qatomic_set(&s->high, val >> 32); - qatomic_set(&s->low, val); - stat64_wrunlock(s); -} - -bool stat64_add32_carry(Stat64 *s, uint32_t low, uint32_t high) -{ - uint32_t old; - - if (!stat64_wrtrylock(s)) { - cpu_relax(); - return false; - } - - /* 64-bit reads always take the lock, so they don't care about the - * order of our update. By updating s->low first, we can check - * whether we have to carry into s->high. - */ - old =3D qatomic_fetch_add(&s->low, low); - high +=3D (old + low) < old; - qatomic_add(&s->high, high); - stat64_wrunlock(s); - return true; -} - -bool stat64_min_slow(Stat64 *s, uint64_t value) -{ - uint32_t high, low; - uint64_t orig; - - if (!stat64_wrtrylock(s)) { - cpu_relax(); - return false; - } - - high =3D qatomic_read(&s->high); - low =3D qatomic_read(&s->low); - - orig =3D ((uint64_t)high << 32) | low; - if (value < orig) { - /* We have to set low before high, just like stat64_min reads - * high before low. The value may become higher temporarily, but - * stat64_get does not notice (it takes the lock) and the only ill - * effect on stat64_min is that the slow path may be triggered - * unnecessarily. - */ - qatomic_set(&s->low, (uint32_t)value); - smp_wmb(); - qatomic_set(&s->high, value >> 32); - } - stat64_wrunlock(s); - return true; -} - -bool stat64_max_slow(Stat64 *s, uint64_t value) -{ - uint32_t high, low; - uint64_t orig; - - if (!stat64_wrtrylock(s)) { - cpu_relax(); - return false; - } - - high =3D qatomic_read(&s->high); - low =3D qatomic_read(&s->low); - - orig =3D ((uint64_t)high << 32) | low; - if (value > orig) { - /* We have to set low before high, just like stat64_max reads - * high before low. The value may become lower temporarily, but - * stat64_get does not notice (it takes the lock) and the only ill - * effect on stat64_max is that the slow path may be triggered - * unnecessarily. - */ - qatomic_set(&s->low, (uint32_t)value); - smp_wmb(); - qatomic_set(&s->high, value >> 32); - } - stat64_wrunlock(s); - return true; -} -#endif diff --git a/util/meson.build b/util/meson.build index 35029380a3..d7d6b213f6 100644 --- a/util/meson.build +++ b/util/meson.build @@ -59,7 +59,6 @@ util_ss.add(files('qht.c')) util_ss.add(files('qsp.c')) util_ss.add(files('range.c')) util_ss.add(files('reserved-region.c')) -util_ss.add(files('stats64.c')) util_ss.add(files('systemd.c')) util_ss.add(files('transactions.c')) util_ss.add(files('guest-random.c')) --=20 2.43.0