From nobody Thu Nov 6 01:09:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153829573286363.376510924559625; Sun, 30 Sep 2018 01:22:12 -0700 (PDT) Received: from localhost ([::1]:54250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6WzQ-0000hT-TA for importer@patchew.org; Sun, 30 Sep 2018 04:22:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6Wr5-00024b-3s for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6Wr3-0008Pq-Q7 for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:31 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34107) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6Wr3-0008Lz-1v for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:29 -0400 Received: by mail-wr1-x431.google.com with SMTP id z4-v6so9103877wrb.1 for ; Sun, 30 Sep 2018 01:13:28 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.13.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=a+DLbgaLK0FHFo96YcnfcuwyJkwgNIoRmCla4mOTSKQ=; b=KaCf5oXUiY1hUNQe47yc8OnvERhentAdgjEeoMG9M3ci4x/q3SD/5ozZXGPLMMEWlX LlZKWyhWeDTm5wUYZQhBl22uq/vCYanZKgRh2lZjA8hhBMkMjAS6+gnrlzyJ95xq79pF teFrZPxyIrb6QnTPJOk8AF6WkchmXQnHQ67cpbsxg4j0NOVbEL9jKAPhtwh+lbLFnn6Z E8FLfXR9cE2AGuxQB6Nsf3s42WuFqtqIWMrdDiY1t2GhqrydOgIHWowKfCjYzVu3gpZl ZuvqJZaQhj4p5S55LtOm2mgWWoCcxou5FVKgFebK4pin5g4NNuzKZ6erj2QXNspv1fNJ h+RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=a+DLbgaLK0FHFo96YcnfcuwyJkwgNIoRmCla4mOTSKQ=; b=e5w6ImerE2rjFTApwbTO9HSVgdFnryHnMr8JggS26qoeNu8pOtDCGUojhbu1787eAT QdWetrividOA+6NyHWHfpW0ABB5Vq5RUejHIaRRrMgQVJgNiAjFIa0SizWhm9J78Y0lT qOdqRiIGGNKkFcA/FW7ADDDmHibk823MOnwhZHpPO4pu0xfay4gWSIIHpO0P53eEmaiu nRp4D8a+1JGu9m4WgnF/uR8IJKW5SDB5fKLoMpINss35Rud+MHy/k2PB+ZcvQUHA9x4p ecZOpJJkhCKQ0wXv7asiw+v9xo2MfezOdouUWBnWolPgiEn7nR4htN4jdnaeQBOHUSt3 YMkw== X-Gm-Message-State: ABuFfoi08CNNsNxlm7RfQVQbvXMIe7debMzw2KVwqhzfDUvQmEOA2u96 /RBptzYvkBkExiGDDfPOk2VaSKFh X-Google-Smtp-Source: ACcGV60vrVOK8ZtvxlgHWz36hOr9Bb1Y07BhCEPh0JL9UucrbyLWVz1nA1j2YmHzKzH5JuZRDP1cjw== X-Received: by 2002:a5d:5342:: with SMTP id t2-v6mr3646299wrv.257.1538295207019; Sun, 30 Sep 2018 01:13:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:06 +0200 Message-Id: <1538295197-23704-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PULL 08/79] util: add atomic64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Emilio G. Cota" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Emilio G. Cota" This introduces read/set accessors for int64_t and uint64_t. Signed-off-by: Emilio G. Cota Message-Id: <20180910232752.31565-3-cota@braap.org> Signed-off-by: Paolo Bonzini --- include/qemu/atomic.h | 34 +++++++++++++++++++++ util/Makefile.objs | 1 + util/atomic64.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ util/cacheinfo.c | 3 ++ 4 files changed, 121 insertions(+) create mode 100644 util/atomic64.c diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index de3e36f..f6993a8 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -450,4 +450,38 @@ _oldn; \ }) =20 +/* Abstractions to access atomically (i.e. "once") i64/u64 variables */ +#ifdef CONFIG_ATOMIC64 +static inline int64_t atomic_read_i64(const int64_t *ptr) +{ + /* use __nocheck because sizeof(void *) might be < sizeof(u64) */ + return atomic_read__nocheck(ptr); +} + +static inline uint64_t atomic_read_u64(const uint64_t *ptr) +{ + return atomic_read__nocheck(ptr); +} + +static inline void atomic_set_i64(int64_t *ptr, int64_t val) +{ + atomic_set__nocheck(ptr, val); +} + +static inline void atomic_set_u64(uint64_t *ptr, uint64_t val) +{ + atomic_set__nocheck(ptr, val); +} + +static inline void atomic64_init(void) +{ +} +#else /* !CONFIG_ATOMIC64 */ +int64_t atomic_read_i64(const int64_t *ptr); +uint64_t atomic_read_u64(const uint64_t *ptr); +void atomic_set_i64(int64_t *ptr, int64_t val); +void atomic_set_u64(uint64_t *ptr, uint64_t val); +void atomic64_init(void); +#endif /* !CONFIG_ATOMIC64 */ + #endif /* QEMU_ATOMIC_H */ diff --git a/util/Makefile.objs b/util/Makefile.objs index 0e88899..0820923 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -3,6 +3,7 @@ util-obj-y +=3D bufferiszero.o util-obj-y +=3D lockcnt.o util-obj-y +=3D aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o util-obj-y +=3D main-loop.o iohandler.o +util-obj-$(call lnot,$(CONFIG_ATOMIC64)) +=3D atomic64.o util-obj-$(CONFIG_POSIX) +=3D aio-posix.o util-obj-$(CONFIG_POSIX) +=3D compatfd.o util-obj-$(CONFIG_POSIX) +=3D event_notifier-posix.o diff --git a/util/atomic64.c b/util/atomic64.c new file mode 100644 index 0000000..b198a6c --- /dev/null +++ b/util/atomic64.c @@ -0,0 +1,83 @@ +/* + * 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" + +#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(atomic_read_i64, int64_t) +GEN_READ(atomic_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(atomic_set_i64, int64_t) +GEN_SET(atomic_set_u64, uint64_t) +#undef GEN_SET + +void atomic64_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/cacheinfo.c b/util/cacheinfo.c index 6c8fe79..3cd080b 100644 --- a/util/cacheinfo.c +++ b/util/cacheinfo.c @@ -8,6 +8,7 @@ =20 #include "qemu/osdep.h" #include "qemu/host-utils.h" +#include "qemu/atomic.h" =20 int qemu_icache_linesize =3D 0; int qemu_icache_linesize_log; @@ -182,4 +183,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); + + atomic64_init(); } --=20 1.8.3.1