From nobody Mon Dec 15 00:30:54 2025 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=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1765584926; cv=none; d=zohomail.com; s=zohoarc; b=PHWbWaBPYlv6Kd2alP6pln2d6Y9YBRLa8SgmQ2nF7in1K/ApxOlQnvOqrGMsSTvOEzsV0P3+GA6nZQ7PPg76UKUDUYIcmLtFEjxIVl6NKuSmfkqeSQqkHWp5kueK3LbsL7oSehNmoS64OFH+7RilJd+b2jMTHFNi8hNR5g+49FA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765584926; h=Content-Type:Cc:Cc: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; bh=a9byHUhq171lB8iBLQB0kPeEXv2KRtdFiOEay6iUm0M=; b=nV6p0HlONpMYSyNDdlmOIUJ+uJG/LMf3aiVUFGj3S7XohkUjasQBjYacqyK7fSnBXr81Le+F9X9EeLU7lwzAbY5v5nXjTtLau10s2lrvRRXqU+nHtpcCfVgWa4bdesTgZ5eN9Yd4Z3MGiiBCUqZ5MedbiXCBQtIV+z2Expq0cRg= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176558492630037.97192151333536; Fri, 12 Dec 2025 16:15:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vUDHl-0006en-Ud; Fri, 12 Dec 2025 19:14:57 -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 <3_K88aQoKCp8L9QBLNQBNRFNNFKD.BNLPDLT-CDUDKMNMFMT.NQF@flex--marcmorcos.bounces.google.com>) id 1vUDHk-0006bz-8A for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:14:56 -0500 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3_K88aQoKCp8L9QBLNQBNRFNNFKD.BNLPDLT-CDUDKMNMFMT.NQF@flex--marcmorcos.bounces.google.com>) id 1vUDHi-00078Y-Q8 for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:14:55 -0500 Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-bc0de474d4eso3042414a12.0 for ; Fri, 12 Dec 2025 16:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1765584892; x=1766189692; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=a9byHUhq171lB8iBLQB0kPeEXv2KRtdFiOEay6iUm0M=; b=VUGXfSMSpigtY9Ezy0Ze5tK8mpeLn49RAuyWaha4hhqJ01nKS3wMIiWhDQ2fn9zQMi UahaTIUAEsoy4oZlYviAYf9mpHP594an33wGt3LVbrMHyu/bcuYIcE05UAHmiENuxcD+ yCf2JXT9WFVPWjngiSEN1NqEKiAWXti97AIv3FdrlqV9ovG3hVKIy6ZdAmQfSCJuFpQb 6e1XZQd2nPAGgPY383OOVu9rPb8EU2vlFkyrTALy0P8R6fvYEdKjsqWmBaonDfRDzXQA bkoEBjuuZHGBO64/z7cq0b8TbECbHcSjE8VBjrYLnKw3TUXg7mG+I5YNZZ3a2XRC/EXm BxFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765584892; x=1766189692; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=a9byHUhq171lB8iBLQB0kPeEXv2KRtdFiOEay6iUm0M=; b=W1sllXKUGthDKuP7JWh8MVKawO/QPJeEwMvDV+/VThBXy1xdBhda9rYKv+aoLFZqkL +2RMP2f7XlkQOd4Y3TBdgTSCjDlnL4eE7GY7T7jVL7CDB5bAEQtScnoYodRzw7bNDbLO DgCdQzU9mPsHhfV0y7qUArZrvRv4u7hVuqwgs1DWfWOpU1QNvxtX8+wNmOMiJN+CVo1I EIp30gyziMXFbJ43ofksnUQ4MtLuNS++JuSj4gOogROUu55R2RdPasczTxIyFr0v72/V 4pp1+nj3dtO4WxJJGpm8tjr+hbEA34T/B+6Hv0gAv+2khv9ytAElYbOCmjGarKRjt3Vz EOXQ== X-Forwarded-Encrypted: i=1; AJvYcCUQW++pV/Bl5eC1HKvYaGQvJmBvfnnoy5wzwkWAyd3xZwERC4ZYs1GGQKEE6K5JWPzU3+PxabOWy43Z@nongnu.org X-Gm-Message-State: AOJu0YxY7r4l9MN8HIGpwGLxuB5meq+yAmG1CmWLk1HQSqF6QmlZFnse 8mrGEJhomgocRwxhA88J4vrDLkxBq+dwnVt+xvWJPMrkwvvr4ftV6XTnIzj+ohcTQepj5k16fot 6LUhUXWMZnu+utdr95SLhgA== X-Google-Smtp-Source: AGHT+IGcin5hyq+n2qr2rmLGMVgo9UOC9nitcjENNrPSfYURQhY4WzARb8mesPEMZ3bMottnA8mjRAjvdj3DTytt X-Received: from dyx19.prod.google.com ([2002:a05:693c:8213:b0:2a4:6ffc:87c9]) (user=marcmorcos job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:8283:b0:2a4:4bce:309c with SMTP id 5a478bee46e88-2ac3025c82emr2257346eec.22.1765584892396; Fri, 12 Dec 2025 16:14:52 -0800 (PST) Date: Sat, 13 Dec 2025 00:14:40 +0000 In-Reply-To: <20251213001443.2041258-1-marcmorcos@google.com> Mime-Version: 1.0 References: <20251213001443.2041258-1-marcmorcos@google.com> X-Mailer: git-send-email 2.52.0.239.gd5f0c6e74e-goog Message-ID: <20251213001443.2041258-2-marcmorcos@google.com> Subject: [PATCH 1/4] apic: Resize APICBASE From: Marc Morcos To: Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Dr . David Alan Gilbert" Cc: "Michael S . Tsirkin" , Marcel Apfelbaum , Markus Armbruster , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Marc Morcos 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::549; envelope-from=3_K88aQoKCp8L9QBLNQBNRFNNFKD.BNLPDLT-CDUDKMNMFMT.NQF@flex--marcmorcos.bounces.google.com; helo=mail-pg1-x549.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, 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, USER_IN_DEF_DKIM_WL=-7.5 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 @google.com) X-ZM-MESSAGEID: 1765584927355158500 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" APICBASE is 36-bits wide, so this commit resizes it to hold the full data. Signed-off-by: Marc Morcos --- hw/intc/apic_common.c | 4 ++-- include/hw/i386/apic_internal.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index ec9e978b0b..1e9aba2e48 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -233,7 +233,7 @@ static void apic_reset_common(DeviceState *dev) { APICCommonState *s =3D APIC_COMMON(dev); APICCommonClass *info =3D APIC_COMMON_GET_CLASS(s); - uint32_t bsp; + uint64_t bsp; =20 bsp =3D s->apicbase & MSR_IA32_APICBASE_BSP; s->apicbase =3D APIC_DEFAULT_ADDRESS | bsp | MSR_IA32_APICBASE_ENABLE; @@ -363,7 +363,7 @@ static const VMStateDescription vmstate_apic_common =3D= { .post_load =3D apic_dispatch_post_load, .priority =3D MIG_PRI_APIC, .fields =3D (const VMStateField[]) { - VMSTATE_UINT32(apicbase, APICCommonState), + VMSTATE_UINT64(apicbase, APICCommonState), VMSTATE_UINT8(id, APICCommonState), VMSTATE_UINT8(arb_id, APICCommonState), VMSTATE_UINT8(tpr, APICCommonState), diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_interna= l.h index 4a62fdceb4..c7ee65ce1d 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -158,7 +158,7 @@ struct APICCommonState { =20 MemoryRegion io_memory; X86CPU *cpu; - uint32_t apicbase; + uint64_t apicbase; uint8_t id; /* legacy APIC ID */ uint32_t initial_apic_id; uint8_t version; --=20 2.52.0.239.gd5f0c6e74e-goog From nobody Mon Dec 15 00:30:54 2025 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=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1765584939; cv=none; d=zohomail.com; s=zohoarc; b=Z7lSIXKi7sUIIkNmdtJbWatCOhGQJpXYyn40bzMiwcm5n2cekdi6yiIRWzk4V5819qiEsiRfZEBhpElNzoXou5geLdx5I9zC0nNSRT8wk2PX0+E56MH7571RrMknQbVSnT0kr+sIdST5cAeZS37NvTrXYdqx8/7LgM1lzx7m88c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765584939; h=Content-Type:Cc:Cc: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; bh=cIINZ9mAAnwnFIApNJGoEI7Ff32PcTgxuAaJihLVJeo=; b=WcBXAEk6j4VRnQ+h/52X5RTFCUoyyWNPV3FqVMiByUQB3Jt4a7bA2GdEBybeQHpAa12utbYArIm2lJWuZQxhHMTTH2GCyAKn6qnSYrfiyEZ9eB3T7cUmGVusvg9BQReyKq4FtZ2QAQ3xLm+LHTEvD6gZJSmp/ELhoJeZSeSlfh0= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1765584939624972.7396761362478; Fri, 12 Dec 2025 16:15:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vUDHn-0006g3-G9; Fri, 12 Dec 2025 19:14:59 -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 <3_a88aQoKCqAMARCMORCOSGOOGLE.COMQEMU-DEVELNONGNU.ORG@flex--marcmorcos.bounces.google.com>) id 1vUDHl-0006eJ-KD for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:14:57 -0500 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3_a88aQoKCqAMARCMORCOSGOOGLE.COMQEMU-DEVELNONGNU.ORG@flex--marcmorcos.bounces.google.com>) id 1vUDHk-00078g-1V for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:14:57 -0500 Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-bddf9ce4935so1474914a12.1 for ; Fri, 12 Dec 2025 16:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1765584894; x=1766189694; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=cIINZ9mAAnwnFIApNJGoEI7Ff32PcTgxuAaJihLVJeo=; b=PygxctaSm8nfv8VxGpdPEYDynnK+v/SRFyGfCYO7QkLEPOOfBH3cn+qtlxMG+9uXpH nFcmAZPfCO5VLiNfp59egfmo3qVisLn2XPezZ50fhCPvskH+z+ce/ileyMojmZCUw/5Y 1kguiCal7wCK+s/BBRceoQxow1V/Pg4BjRLK61fgRrBYVq3yd9fVBbn/paQOYgsrZ6Cy uHEqqqQRS7Feg+uYrnsdIso0ca6ay2U+SOXYI6EUyjpLH9aRk8ClEeSXsiSnk2ruylJx rLo5l8yFyIpKmZvLgcCXPT3XzLQpNAkkK5Xy3rxUPGDpy8FSrR/MGOXAgVtIHaUcsUCz QWaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765584894; x=1766189694; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cIINZ9mAAnwnFIApNJGoEI7Ff32PcTgxuAaJihLVJeo=; b=f93JYhfTR6XKE6XGYZDfK0p3ZIWR7Z9wyvQgALNEQpEuwKHBFzECzovuyu2cWRNcBh bNX7UGV6UUUyHGmvfx3g91QTGjlNg2UMBh5sf+4qBKVntIXga4ACVU/saihOa5H3jygl uJ6FveFoH8iWSyon+iIkGVB4pbeNTMttkuyeYRbxhkojBKTQ+MvU4hvbNMdbIYn1unYy oEXSRj790yDpLxOyceC2hm1Bt/A6Lc70x9g7Fi/tgiQN/nx8dIOL2hoxlDwjYppSFvcY xru7jOLRt+y3wVdQOqkR2budyROT6uHfJ4ITN2k28y7yZ+Ep6E3vn2S2i3jVaPtvTCwS Cwuw== X-Forwarded-Encrypted: i=1; AJvYcCVa2kjIU0be+WC2cyKlreK8XBMwlfJtiskPwpjkqZRT9E+kcTociII8AX9PzwMv8QY8dqGVzZfoVJ6Y@nongnu.org X-Gm-Message-State: AOJu0YyJtALcddENP8GWw1BextzFLjdgtNsVVoZqrjhMUT3eY6JDg6t/ SRDb/pdI/UBcLfwil/INxOkmzxJKSlRfEjwsqqqs/qRfbyJd9d0WA7PEv3tR1hraNQjnn5Pv4Da jixODYpEQOiL1/pwQLO454g== X-Google-Smtp-Source: AGHT+IERTu/TvouPTqzMqN3ZIas79v3Ibpzrcwkdq6SBy47/OiGEzsE9m49kedocAPClataQQ5xVjjJRVwvvkCtI X-Received: from dlg19.prod.google.com ([2002:a05:7022:793:b0:119:78ff:fe0f]) (user=marcmorcos job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7023:a85:b0:11a:fec5:d005 with SMTP id a92af1059eb24-11f34bde202mr2623159c88.10.1765584893863; Fri, 12 Dec 2025 16:14:53 -0800 (PST) Date: Sat, 13 Dec 2025 00:14:41 +0000 In-Reply-To: <20251213001443.2041258-1-marcmorcos@google.com> Mime-Version: 1.0 References: <20251213001443.2041258-1-marcmorcos@google.com> X-Mailer: git-send-email 2.52.0.239.gd5f0c6e74e-goog Message-ID: <20251213001443.2041258-3-marcmorcos@google.com> Subject: [PATCH 2/4] thread-pool: Fix thread race From: Marc Morcos To: Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Dr . David Alan Gilbert" Cc: "Michael S . Tsirkin" , Marcel Apfelbaum , Markus Armbruster , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Marc Morcos 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::549; envelope-from=3_a88aQoKCqAMARCMORCOSGOOGLE.COMQEMU-DEVELNONGNU.ORG@flex--marcmorcos.bounces.google.com; helo=mail-pg1-x549.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, 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, USER_IN_DEF_DKIM_WL=-7.5 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 @google.com) X-ZM-MESSAGEID: 1765584941400158500 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix a data race occurred between `worker_thread()` writing and `thread_pool_completion_bh()` reading shared data in `util/thread-pool.c`. Signed-off-by: Marc Morcos --- util/thread-pool.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/util/thread-pool.c b/util/thread-pool.c index d2ead6b728..1ced3bd371 100644 --- a/util/thread-pool.c +++ b/util/thread-pool.c @@ -18,6 +18,7 @@ #include "qemu/defer-call.h" #include "qemu/queue.h" #include "qemu/thread.h" +#include "qemu/atomic.h" #include "qemu/coroutine.h" #include "trace.h" #include "block/thread-pool.h" @@ -39,9 +40,13 @@ struct ThreadPoolElementAio { ThreadPoolFunc *func; void *arg; =20 - /* Moving state out of THREAD_QUEUED is protected by lock. After - * that, only the worker thread can write to it. Reads and writes - * of state and ret are ordered with memory barriers. + /* + * Accessed with atomics. Moving state out of THREAD_QUEUED is + * protected by pool->lock and only the worker thread can move + * the state from THREAD_ACTIVE to THREAD_DONE. + * + * When state is THREAD_DONE, ret must have been written already. + * Use acquire/release ordering when reading/writing ret as well. */ enum ThreadState state; int ret; @@ -105,15 +110,14 @@ static void *worker_thread(void *opaque) =20 req =3D QTAILQ_FIRST(&pool->request_list); QTAILQ_REMOVE(&pool->request_list, req, reqs); - req->state =3D THREAD_ACTIVE; + qatomic_set(&req->state, THREAD_ACTIVE); qemu_mutex_unlock(&pool->lock); =20 ret =3D req->func(req->arg); =20 req->ret =3D ret; - /* Write ret before state. */ - smp_wmb(); - req->state =3D THREAD_DONE; + /* _release to write ret before state. */ + qatomic_store_release(&req->state, THREAD_DONE); =20 qemu_bh_schedule(pool->completion_bh); qemu_mutex_lock(&pool->lock); @@ -180,7 +184,8 @@ static void thread_pool_completion_bh(void *opaque) =20 restart: QLIST_FOREACH_SAFE(elem, &pool->head, all, next) { - if (elem->state !=3D THREAD_DONE) { + /* _acquire to read state before ret. */ + if (qatomic_load_acquire(&elem->state) !=3D THREAD_DONE) { continue; } =20 @@ -189,9 +194,6 @@ restart: QLIST_REMOVE(elem, all); =20 if (elem->common.cb) { - /* Read state before ret. */ - smp_rmb(); - /* Schedule ourselves in case elem->common.cb() calls aio_poll= () to * wait for another request that completed at the same time. */ @@ -223,12 +225,12 @@ static void thread_pool_cancel(BlockAIOCB *acb) trace_thread_pool_cancel_aio(elem, elem->common.opaque); =20 QEMU_LOCK_GUARD(&pool->lock); - if (elem->state =3D=3D THREAD_QUEUED) { + if (qatomic_read(&elem->state) =3D=3D THREAD_QUEUED) { QTAILQ_REMOVE(&pool->request_list, elem, reqs); qemu_bh_schedule(pool->completion_bh); =20 - elem->state =3D THREAD_DONE; - elem->ret =3D -ECANCELED; + qatomic_set(&elem->ret, -ECANCELED); + qatomic_store_release(&elem->state, THREAD_DONE); } =20 } --=20 2.52.0.239.gd5f0c6e74e-goog From nobody Mon Dec 15 00:30:54 2025 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=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1765584922; cv=none; d=zohomail.com; s=zohoarc; b=PTEM1/qxT9fOGbNus89LBvIKYmsiUcOqrEplGIFN6+A+dZ9/bbCmNOMCCJa4UKqXU0hZGfMq8uLehVg55NXlDGDFYiXQjs3AvukSDhj7AgQ5mZHJGfIgUanI5GW46+Gu0tTQLTNxW0Q38M/Cp0hQiNVi9WWitJsLJJHLuMnOxjg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765584922; h=Content-Type:Cc:Cc: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; bh=sl9CNn1EVZEpq7y7cqXda6K3glgb23SOapyyZsDMnjg=; b=Hw8iXp/WPWikmuSOw8LQqgLJfjJ7QpB8H2sQi0rZFT9MNpy5ONikJVeBs3i7WykKqU+qDHaFcv4ifbNgg5DZA9kZGabUTOvJMPRhV2G6VjtdfCSFZ9uhtqt+eFr/tyDTEQGELpeg/Vm0DC3YnuqD0vR9AfHXKBFj97ybzbzE56k= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1765584922309348.692902348281; Fri, 12 Dec 2025 16:15:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vUDHo-0006gB-6X; Fri, 12 Dec 2025 19:15:00 -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 <3_688aQoKCqIOCTEOQTEQUIQQING.EQOSGOW-FGXGNPQPIPW.QTI@flex--marcmorcos.bounces.google.com>) id 1vUDHm-0006fV-LH for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:14:58 -0500 Received: from mail-pg1-x54a.google.com ([2607:f8b0:4864:20::54a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3_688aQoKCqIOCTEOQTEQUIQQING.EQOSGOW-FGXGNPQPIPW.QTI@flex--marcmorcos.bounces.google.com>) id 1vUDHl-000797-56 for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:14:58 -0500 Received: by mail-pg1-x54a.google.com with SMTP id 41be03b00d2f7-b630b4d8d52so1714528a12.3 for ; Fri, 12 Dec 2025 16:14:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1765584895; x=1766189695; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sl9CNn1EVZEpq7y7cqXda6K3glgb23SOapyyZsDMnjg=; b=HP0QXTSRWHK3x/2uHqxk3k1zqJ8DnpoIet2AUAJL+trOXKL0DYQPJ6ia19Fl3mSpNI d6tupxAZGfiLLJ+YBA+/5j18kWhWk2MyaRQNZE0bea/dsxztOhxhGQcTGf6MreF9HCyk kDP7wo/+349GqYOEJ6wobXmDU7oroAZ5ZbxmMrV47gFMMplNqlGPySVkZGg7iyUVqEYz 6k4pa0V3U169NX+vfOCyKN1r4S6OZK5q9R0SibDjQ4Ch5b357WC47kOtFeBEKIGCqmI6 VPadAqGUwTnVy7ZXSAPNdHoxUnTceQWhnUMfKZf/3q2zLyU5hntHjr15X14jxPGTkY35 lTAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765584895; x=1766189695; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sl9CNn1EVZEpq7y7cqXda6K3glgb23SOapyyZsDMnjg=; b=Ytqb4dBtDBkIOzzaeu0uMz1+rgYG0ufn4YyNwirqQsMEZMB9bnRW8GWwU256gPkJLM ZLGtoA5usncU0/Lq2tgDTkLfLL67QzPp+Sa9xI6suD7QHaVS+W1epvSzXMbcjSSVw6JA lQayN2W3+oeQAMFCFBjdL1BkQz86K/mAn9V7NtDxkQhzZyXYd227y3IQ8PGmQwFNGN64 AgCHezPO6HOx7ezRFgRsjRSpqjMQhLaekDHdig1GBPWcjWFhIAbir+DJjKc9MLGCpSEp upvdxRPhyBqj5HIqMcY8MobyirpdjRwIWreZydmEjvMdA8YWcUeiKKZx1Fut5Nbbedet ENBg== X-Forwarded-Encrypted: i=1; AJvYcCUCKE6/O1JzzobaRSLgzVtL2bJn+ow7YCle1IVz/PRZI0BGO2DZyIDlZju/mtkIb6zrA4SqOiA6E7eF@nongnu.org X-Gm-Message-State: AOJu0YyLn9Tovg+kHRZpmiIacozW+TmonWdz7RFzksPPvuMfVQldhq/X rwdSRj8mT+f64DS9OSrhUt4eZYSoFUXJ6Vw5JzoBa51WaQNVqjeWGv12pBav9uog/0ANnwLo58h OBXkk47F6kYqoyFExlTn3ew== X-Google-Smtp-Source: AGHT+IE8+xrHCWoej8QIHCaGCUtpB6hyutXgRJeL9Co2narXZoICzwtqZy/98P5K8Cw5wHfygJT+Pm+hzJ2VPvoE X-Received: from dycmv3.prod.google.com ([2002:a05:693c:2803:b0:2ac:3a02:feae]) (user=marcmorcos job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:6213:b0:2a4:3593:ddf3 with SMTP id 5a478bee46e88-2ac3012b8a3mr3278144eec.32.1765584895347; Fri, 12 Dec 2025 16:14:55 -0800 (PST) Date: Sat, 13 Dec 2025 00:14:42 +0000 In-Reply-To: <20251213001443.2041258-1-marcmorcos@google.com> Mime-Version: 1.0 References: <20251213001443.2041258-1-marcmorcos@google.com> X-Mailer: git-send-email 2.52.0.239.gd5f0c6e74e-goog Message-ID: <20251213001443.2041258-4-marcmorcos@google.com> Subject: [PATCH 3/4] qmp: Fix thread race From: Marc Morcos To: Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Dr . David Alan Gilbert" Cc: "Michael S . Tsirkin" , Marcel Apfelbaum , Markus Armbruster , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Marc Morcos 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::54a; envelope-from=3_688aQoKCqIOCTEOQTEQUIQQING.EQOSGOW-FGXGNPQPIPW.QTI@flex--marcmorcos.bounces.google.com; helo=mail-pg1-x54a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, 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, USER_IN_DEF_DKIM_WL=-7.5 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 @google.com) X-ZM-MESSAGEID: 1765584923225158500 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This fixes a thread race involving the monitor in monitor_qmp_event and mon= itor_qapi_event_emit . Signed-off-by: Marc Morcos --- monitor/monitor.c | 11 ++++++++++- monitor/qmp.c | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/monitor/monitor.c b/monitor/monitor.c index c5a5d30877..4bfd72939d 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -338,6 +338,7 @@ static void monitor_qapi_event_emit(QAPIEvent event, QD= ict *qdict) { Monitor *mon; MonitorQMP *qmp_mon; + bool do_send =3D false; =20 trace_monitor_protocol_event_emit(event, qdict); QTAILQ_FOREACH(mon, &mon_list, entry) { @@ -346,7 +347,15 @@ static void monitor_qapi_event_emit(QAPIEvent event, Q= Dict *qdict) } =20 qmp_mon =3D container_of(mon, MonitorQMP, common); - if (qmp_mon->commands !=3D &qmp_cap_negotiation_commands) { + do_send =3D false; + + WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { + if (qmp_mon->commands !=3D &qmp_cap_negotiation_commands) { + do_send =3D true; + } + } + + if (do_send) { qmp_send_response(qmp_mon, qdict); } } diff --git a/monitor/qmp.c b/monitor/qmp.c index cb99a12d94..e1419a9efa 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -462,8 +462,10 @@ static void monitor_qmp_event(void *opaque, QEMUChrEve= nt event) =20 switch (event) { case CHR_EVENT_OPENED: - mon->commands =3D &qmp_cap_negotiation_commands; - monitor_qmp_caps_reset(mon); + WITH_QEMU_LOCK_GUARD(&mon->common.mon_lock) { + mon->commands =3D &qmp_cap_negotiation_commands; + monitor_qmp_caps_reset(mon); + } data =3D qmp_greeting(mon); qmp_send_response(mon, data); qobject_unref(data); --=20 2.52.0.239.gd5f0c6e74e-goog From nobody Mon Dec 15 00:30:54 2025 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=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1765584934; cv=none; d=zohomail.com; s=zohoarc; b=atrFp0N5ztLoK6HlFBpHf4gkSmE7t5DhHbWOXucwaKZi17iioDwV3cCyFnYyrKtAHzSTgYDoEDCM6f435cL5jQxZpgipeYT4utx+bShrm1XN2HrF6g9aEogpjqetblNfN/bWytsfYzkGWh5EOg4Xq8dAcAcL9XGpYB6HHpcCyOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765584934; h=Content-Type:Cc:Cc: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; bh=r0/im7YjCCi+qgN9Vco+Ebkxox6sDC/emBzqJ0iO8yU=; b=PXeCutEfrmqu3z0iiARdWrYB83+pSdUE8qQ8cj1vdJjAXKao85qXZZxQteCKPoCpblnZaLdmgnvd9o3ClI7KsNuOxhXLf1Wmb80uA610Ii0W27/VjiF/d6o7vtnY6pCHQH6gUjzwu+ns6Gw2ZraS5hbG3wL0fUcmUkdVXHHjg5Y= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176558493466929.30794253735837; Fri, 12 Dec 2025 16:15:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vUDHr-0006iq-7y; Fri, 12 Dec 2025 19:15:03 -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 <3ALA8aQoKCqMPDUFPRUFRVJRRJOH.FRPTHPX-GHYHOQRQJQX.RUJ@flex--marcmorcos.bounces.google.com>) id 1vUDHo-0006gQ-LY for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:15:00 -0500 Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3ALA8aQoKCqMPDUFPRUFRVJRRJOH.FRPTHPX-GHYHOQRQJQX.RUJ@flex--marcmorcos.bounces.google.com>) id 1vUDHm-00079Q-PG for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:15:00 -0500 Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-29efd658fadso37920555ad.0 for ; Fri, 12 Dec 2025 16:14:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1765584897; x=1766189697; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=r0/im7YjCCi+qgN9Vco+Ebkxox6sDC/emBzqJ0iO8yU=; b=thcDYKXrxCTmaGmKlQt9bKaxZt1JQyhwBCRO/M+a1k3EoNPOuLSO+I/zyyGsN5NClk UBRmRdsEInWgPUzXcEZLHg6pzbe7ktestQ1XVZFdUtctvj/sR5r3UuXCDv34t/eW/Bsx bZ2J98U8AUCo2Y+718lbGl6GHh+4gFFVkSXGYuPfD2AFLWGgCdRNCVH+bVQB4cWY5G3i qHEDBZ6lGvS6I2NGepG5nTX0CQvE/GR67cpUWHOcv2ZY1rexTirg7PCcXe408tWK33yY hpG4IJM6rTbN0k+Ajf7RiOhGK6yhSY3lq0k0p790TfcmRmPJGfvurvrK0Upfj3cJL1wW bF3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765584897; x=1766189697; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r0/im7YjCCi+qgN9Vco+Ebkxox6sDC/emBzqJ0iO8yU=; b=xFjAe2oAphX0pb5aaieR7mrBmc4dhm2bEhxoYhSnsNsShn9DPckNciwFU/hucPuGVE EiD4G42JND49/hCB0hiEGnXhjIlKrL4ynt0OHMEvA9IvZA1k7ysiw299AQVzFTJgaHGB pyJFPL8hiUEhM7FMRjVozNp4IHbc16phJgAY/AsJgmMhv/D+Z/1fwRh9i6dVTAcRKlrr sH3hh1Vus2XQBk6ysbmsqGVDIpBRFzqV31HfJ4DWiIcJx224sht/t7a+yjDJRWj9/Qxf ZCtf6WT/J+VUYmKZyXGipXzdPMKjmJdKu/5G1uJEK8cvV2lXwfdHzF3A2IaJwXBqohK0 l5RA== X-Forwarded-Encrypted: i=1; AJvYcCXHhLO92BbflKZGge6hnVdEYm39rzSBrn1b3DgVJfklg3f7JMiMpFyOfzKv56S9RdEQrdZ0Ig1fcD6K@nongnu.org X-Gm-Message-State: AOJu0YwJtDIqXwRabCgJCXUoLCwm2GcNyTPrMQ8kuYwobyro0VOEkKMU JlXYhxA3BgOOKysP/FsU9Evz59qM5hV41+niAW6l75Mw3CGOPm0/OFpCHmGlsbt/Diji/uQBiq5 +Znq6rKCtf9qjAqnr1R7ZQg== X-Google-Smtp-Source: AGHT+IGP+nbj+TPXEpjND5WvAvwQyuoZEIuskWGCKNVI2224dHhTfkISQO4miX5JQWLAWdIhcNFv/TjfUJgNAbxi X-Received: from dlbcj13.prod.google.com ([2002:a05:7022:698d:b0:11a:51f9:d69]) (user=marcmorcos job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:b886:b0:11d:ef84:6cff with SMTP id a92af1059eb24-11f34c56ff8mr2376497c88.37.1765584896801; Fri, 12 Dec 2025 16:14:56 -0800 (PST) Date: Sat, 13 Dec 2025 00:14:43 +0000 In-Reply-To: <20251213001443.2041258-1-marcmorcos@google.com> Mime-Version: 1.0 References: <20251213001443.2041258-1-marcmorcos@google.com> X-Mailer: git-send-email 2.52.0.239.gd5f0c6e74e-goog Message-ID: <20251213001443.2041258-5-marcmorcos@google.com> Subject: [PATCH 4/4] apic: Make apicbase accesses atomic to fix data race From: Marc Morcos To: Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Dr . David Alan Gilbert" Cc: "Michael S . Tsirkin" , Marcel Apfelbaum , Markus Armbruster , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Marc Morcos 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::649; envelope-from=3ALA8aQoKCqMPDUFPRUFRVJRRJOH.FRPTHPX-GHYHOQRQJQX.RUJ@flex--marcmorcos.bounces.google.com; helo=mail-pl1-x649.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, 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, USER_IN_DEF_DKIM_WL=-7.5 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 @google.com) X-ZM-MESSAGEID: 1765584935562158500 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A data race on APICCommonState->apicbase was detected by ThreadSanitizer. To resolve this race, direct accesses to s->apicbase are converted to use the appropriate qatomic_*__nocheck() atomic operations. This ensures that reads and writes are properly ordered and visible across threa= ds. This patch depends on the previous commit changing the type of `apicbase` to `uint64_t`. The race was identified by the following TSAN report: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D WARNING: ThreadSanitizer: data race Read of size 8 at ... by main thread: #0 cpu_is_apic_enabled hw/intc/apic_common.c:75:15 ... #15 main_loop_wait util/main-loop.c:600:5 ... Previous write of size 8 at ... by thread T7 'CPU 0/KVM': #0 kvm_apic_set_base hw/i386/kvm/apic.c:101:17 #1 cpu_set_apic_base hw/intc/apic_common.c:47:16 #2 kvm_arch_post_run target/i386/kvm/kvm.c:5621:5 #3 kvm_cpu_exec accel/kvm/kvm-all.c:3229:17 #4 kvm_vcpu_thread_fn accel/kvm/kvm-accel-ops.c:51:17 ... SUMMARY: ThreadSanitizer: data race hw/intc/apic_common.c:75:15 in cpu_is_a= pic_enabled =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Signed-off-by: Marc Morcos --- hw/i386/kvm/apic.c | 12 ++++++++---- hw/intc/apic_common.c | 20 ++++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 82355f0463..b9b03c529f 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -34,9 +34,10 @@ static inline uint32_t kvm_apic_get_reg(struct kvm_lapic= _state *kapic, static void kvm_put_apic_state(APICCommonState *s, struct kvm_lapic_state = *kapic) { int i; + uint64_t apicbase =3D qatomic_read__nocheck(&s->apicbase); =20 memset(kapic, 0, sizeof(*kapic)); - if (kvm_has_x2apic_api() && s->apicbase & MSR_IA32_APICBASE_EXTD) { + if (kvm_has_x2apic_api() && apicbase & MSR_IA32_APICBASE_EXTD) { kvm_apic_set_reg(kapic, 0x2, s->initial_apic_id); } else { kvm_apic_set_reg(kapic, 0x2, s->id << 24); @@ -63,8 +64,9 @@ static void kvm_put_apic_state(APICCommonState *s, struct= kvm_lapic_state *kapic void kvm_get_apic_state(APICCommonState *s, struct kvm_lapic_state *kapic) { int i, v; + uint64_t apicbase =3D qatomic_read__nocheck(&s->apicbase); =20 - if (kvm_has_x2apic_api() && s->apicbase & MSR_IA32_APICBASE_EXTD) { + if (kvm_has_x2apic_api() && apicbase & MSR_IA32_APICBASE_EXTD) { assert(kvm_apic_get_reg(kapic, 0x2) =3D=3D s->initial_apic_id); } else { s->id =3D kvm_apic_get_reg(kapic, 0x2) >> 24; @@ -97,7 +99,7 @@ void kvm_get_apic_state(APICCommonState *s, struct kvm_la= pic_state *kapic) =20 static int kvm_apic_set_base(APICCommonState *s, uint64_t val) { - s->apicbase =3D val; + qatomic_set__nocheck(&s->apicbase, val); return 0; } =20 @@ -140,12 +142,14 @@ static void kvm_apic_put(CPUState *cs, run_on_cpu_dat= a data) APICCommonState *s =3D data.host_ptr; struct kvm_lapic_state kapic; int ret; + uint64_t apicbase; =20 if (is_tdx_vm()) { return; } =20 - kvm_put_apicbase(s->cpu, s->apicbase); + apicbase =3D qatomic_read__nocheck(&s->apicbase); + kvm_put_apicbase(s->cpu, apicbase); kvm_put_apic_state(s, &kapic); =20 ret =3D kvm_vcpu_ioctl(CPU(s->cpu), KVM_SET_LAPIC, &kapic); diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 1e9aba2e48..9e42189d8a 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -19,6 +19,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/atomic.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" @@ -52,8 +53,9 @@ int cpu_set_apic_base(APICCommonState *s, uint64_t val) uint64_t cpu_get_apic_base(APICCommonState *s) { if (s) { - trace_cpu_get_apic_base((uint64_t)s->apicbase); - return s->apicbase; + uint64_t apicbase =3D qatomic_read__nocheck(&s->apicbase); + trace_cpu_get_apic_base(apicbase); + return apicbase; } else { trace_cpu_get_apic_base(MSR_IA32_APICBASE_BSP); return MSR_IA32_APICBASE_BSP; @@ -66,7 +68,7 @@ bool cpu_is_apic_enabled(APICCommonState *s) return false; } =20 - return s->apicbase & MSR_IA32_APICBASE_ENABLE; + return qatomic_read__nocheck(&s->apicbase) & MSR_IA32_APICBASE_ENABLE; } =20 void cpu_set_apic_tpr(APICCommonState *s, uint8_t val) @@ -223,9 +225,9 @@ void apic_designate_bsp(APICCommonState *s, bool bsp) } =20 if (bsp) { - s->apicbase |=3D MSR_IA32_APICBASE_BSP; + qatomic_fetch_or(&s->apicbase, MSR_IA32_APICBASE_BSP); } else { - s->apicbase &=3D ~MSR_IA32_APICBASE_BSP; + qatomic_fetch_and(&s->apicbase, ~MSR_IA32_APICBASE_BSP); } } =20 @@ -235,8 +237,9 @@ static void apic_reset_common(DeviceState *dev) APICCommonClass *info =3D APIC_COMMON_GET_CLASS(s); uint64_t bsp; =20 - bsp =3D s->apicbase & MSR_IA32_APICBASE_BSP; - s->apicbase =3D APIC_DEFAULT_ADDRESS | bsp | MSR_IA32_APICBASE_ENABLE; + bsp =3D qatomic_read__nocheck(&s->apicbase) & MSR_IA32_APICBASE_BSP; + qatomic_set__nocheck(&s->apicbase, + APIC_DEFAULT_ADDRESS | bsp | MSR_IA32_APICBASE_ENABLE); s->id =3D s->initial_apic_id; =20 kvm_reset_irq_delivered(); @@ -405,7 +408,8 @@ static void apic_common_get_id(Object *obj, Visitor *v,= const char *name, APICCommonState *s =3D APIC_COMMON(obj); uint32_t value; =20 - value =3D s->apicbase & MSR_IA32_APICBASE_EXTD ? s->initial_apic_id : = s->id; + value =3D qatomic_read__nocheck(&s->apicbase) & MSR_IA32_APICBASE_EXTD= ? + s->initial_apic_id : s->id; visit_type_uint32(v, name, &value, errp); } =20 --=20 2.52.0.239.gd5f0c6e74e-goog