From nobody Sun Dec 14 06:36:56 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=1765584811; cv=none; d=zohomail.com; s=zohoarc; b=j7OTe+HyInIXzFYjQhyQsaiEJKnIrfXoe15WlV7oeEsGx7hwNV1OlPMP13SQ9x50wOtyS3nhg788YK4HlUoIBfx50N2tAVmON3cvLJY7j6x1QJxmQnLvTfCqz5CeKiEMyqsa4O+Iw85slh5mDlHuhDErN87NEvSJmqYS1z3GEXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765584811; 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=nPuaHip6FyZyOUSbHKX2UNO9W8V4RuuAnSdb6N5CKfWIYpaHeWtWZN/S/kq7sIN2/rVQZXBOpL5MA2vfmAYVpRoXm/Jb/ayzfEfuY9u+hG4RPcQzuLqiRr4RLCPrK0R8OK9pBPjcbc2BAGHyqZlP+2xn3PAsH/WTavSXTX8xbwk= 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 1765584811139570.2012251191534; Fri, 12 Dec 2025 16:13:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vUDFl-00043T-BD; Fri, 12 Dec 2025 19:12:53 -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 <3eq88aQoKCh0F3K5FHK5HL9HH9E7.5HFJ7FN-67O7EGHG9GN.HK9@flex--marcmorcos.bounces.google.com>) id 1vUDFj-000431-I6 for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:12:51 -0500 Received: from mail-pj1-x104a.google.com ([2607:f8b0:4864:20::104a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3eq88aQoKCh0F3K5FHK5HL9HH9E7.5HFJ7FN-67O7EGHG9GN.HK9@flex--marcmorcos.bounces.google.com>) id 1vUDFi-0006kH-05 for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:12:51 -0500 Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-34566e62f16so2018401a91.1 for ; Fri, 12 Dec 2025 16:12:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1765584767; x=1766189567; 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=D5M2IGTi3P0mpBW9iH/dfdgNkxHzlNf6jDqLkk4EZESUiWA/TO0+Djb8tFzbqpfG6R FdfijBFG0u3kcMujC1ZyNCu4YLxq16EHhfdUvr8GiR285VqrCsey3vNO/283COGjDZ+E U+3i4NCldPUKvE+QlPSGU+T/WjBMSF3hz3uGPEHdcwNA75fjtQ1HmmTn31+1Y9HKck1K JWdV8TriuK6tXqgA1Ln7dxmBhroFSmaA9zuBCDuTvYZNU2u5ZRTO1Hr7zoefrjNrdgHH hQdT2mumo4AoZLKyyvQzIArXXhhP87sLcoI+LdGPVBSGMqO3PT2shy7FG3IIR63PvDDt C8pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765584767; x=1766189567; 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=b0l2iLk08NrQy3EtiPCyrsWhPJWFZszMyVLeKZTOvjfC691/EADnl8i/4PWSPUZg14 iTxl7ULrj0HmdBL4Hpq8j+aGWswvTR6E86PaI8qVgTJ3aCuQZG9J0tD7/IZy1r4wGOd3 OvsGfYVmwGx3FkPcMvdwfKsfUr3bcyHT4iMoL97W5XnZ3dHlGzlghaW1J22fnRgvxGQp vc8hhRccDaUqN5X5+ru/BjflPVLUD5eXb1IxocKiiTAsSqDOZDpfLwzXOlPSEJ1VxTao idUc+B/DIBsxbrDjNpvaB18J/AjqoMwHuIE8iXMBJ+PBSK+KQBnfGSrKQxV04iwdPOro 4wOw== X-Forwarded-Encrypted: i=1; AJvYcCUniq4kJVrPOKOhKKqgeVJmQDJrNmAWHrqhiyIn2btwJ+KXjUVth1taihfX8jQlfr+J/KkETlV57Nol@nongnu.org X-Gm-Message-State: AOJu0YyMS9uFh+D0b2SesBn7le64j7vIOK8iGi19I6MaTvjAlh/V2t4h LGkE1eD2bNX4inb3FPwXJDzaFxJYSrmKtuPRl0AaWaJKOIZkXynJCby3/FD2F6zOx378rO5XZro Ts7/rmix/s5T6jkEV38A2KQ== X-Google-Smtp-Source: AGHT+IEjImOGnlHMiztl4z2ZlqTF3b9vjLnHL3vmRAV9t64A7B/mGpPOtYTnPz2l0lrHh3nOPkeYKOTQotEdpHPM X-Received: from dlbbk2.prod.google.com ([2002:a05:7022:4282:b0:11d:cfca:1df5]) (user=marcmorcos job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:f509:b0:11b:9386:8257 with SMTP id a92af1059eb24-11f34c2628bmr1661310c88.44.1765584762064; Fri, 12 Dec 2025 16:12:42 -0800 (PST) Date: Sat, 13 Dec 2025 00:12:31 +0000 In-Reply-To: <20251213001234.2039232-1-marcmorcos@google.com> Mime-Version: 1.0 References: <20251213001234.2039232-1-marcmorcos@google.com> X-Mailer: git-send-email 2.52.0.239.gd5f0c6e74e-goog Message-ID: <20251213001234.2039232-2-marcmorcos@google.com> Subject: [PATCH 1/4] apic: Resize APICBASE From: Marc Morcos To: maintainer_email_from_script@google.com Cc: cc_list_from_script@google.com, qemu-devel@nongnu.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::104a; envelope-from=3eq88aQoKCh0F3K5FHK5HL9HH9E7.5HFJ7FN-67O7EGHG9GN.HK9@flex--marcmorcos.bounces.google.com; helo=mail-pj1-x104a.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: 1765584813647158500 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 Sun Dec 14 06:36:57 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=1765584833; cv=none; d=zohomail.com; s=zohoarc; b=ecaehEvxEuy/hUyDSBhQlVS6FlGdY/aRARdnyj1+N7vvJAuZFVsg+RDeHbzvBOHkRxo+89jwMJ5NDEvYlgp0QtztHA8WCAryWMcgGwmYkQnrFTUYlWXWU62HtgDWDH7D3yp3LQ1hBNpGOn7NTya5jumiM+GjiAuQDISybnpHH4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765584833; 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=RvtYaww/foeilDfngTCyvyWx2AEjTw5MUPueXGtLWFzJho6Ln2cUoIFWjKdEYcLTvmkfQk7ojY4pf+nV7WVCAk5kyq77muw1imQEDusJg1URmY6juqIAanyhHYqWFHMDXTWSlZ1sEQpFdtocbybkhiXPtmlMybOyiT8kTL5s2d4= 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 1765584833819598.626185898245; Fri, 12 Dec 2025 16:13:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vUDFn-00045a-45; Fri, 12 Dec 2025 19:12:55 -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 <3gK88aQoKCiML9QBLNQBNRFNNFKD.BNLPDLT-CDUDKMNMFMT.NQF@flex--marcmorcos.bounces.google.com>) id 1vUDFk-00043L-UX for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:12:52 -0500 Received: from mail-pj1-x1049.google.com ([2607:f8b0:4864:20::1049]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3gK88aQoKCiML9QBLNQBNRFNNFKD.BNLPDLT-CDUDKMNMFMT.NQF@flex--marcmorcos.bounces.google.com>) id 1vUDFj-0006ki-Ag for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:12:52 -0500 Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-34c314a062aso363333a91.2 for ; Fri, 12 Dec 2025 16:12:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1765584769; x=1766189569; 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=gLHOr/9Q0cBqVVVMQKxgHw4f0yR/Bi+XzGrKqAu+ABLYIvMFIlNuKvkTaYxuLOGreU t0e8pQAqxh1ne6WzdcrN4Ai9fX9/Aq2Knt/eNhdwbhA8QoQUXxUvr2JCz/DKiwS838vg F8xg3BaNXerLoJk1Z/bsvkS0EPbA+Z30kGSk/tb1C9uBqZZ/hbAHxqfWkLze35OvIQ/+ Hu8THwmWjJqhyrT6KKkW6Bm4aZMux/BifkKQhyunSMkTQJiPgxdxHKrPZhLcRN0UqhUu 7mUbdsublpnsnzHPcUiySR6mesW5fgmmxsQnPis+N/4FXGCrX47H0UvMd0fwK9Wk8XVY u2Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765584769; x=1766189569; 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=Se9g20KMMc7tUNm1xkivMmRrxqCCdAMP5Mw4eHm9KENp2NlYnSDX2V7iiGQybtg8Ps NYcWyBVW4DL/TTgQ8yjlDfwdBfVHUhvJJB0aEjmLE6HyrK2W1PpQwbyjGdgGsNHjHKyY vO0bqRuF747B2MD3KB8GY675ubDPjQjvPCbpko72YrMoajvSQZZJ6nE3Yv5ntU9HSmdV uSQ/snhmFJaZTYhryczdvEFyvDdr3PAuI6LFD2VhWlol+hf/qhPbLTYfPZDV/8eCNTsn tRjwNGXwd+6VpRF6PKmIkuna9Uo6AK2EVMR+5T6CzYsJdR6Bn/vvifjG3SaXaN8H/9Tm 90XA== X-Forwarded-Encrypted: i=1; AJvYcCVTUmcbOXRuRfxheY9ByyVSNSk1jzoJQmoJlp0nFtSUfeIoQPwy4mHPEe3++Egx7uEG2dcdVHHURogL@nongnu.org X-Gm-Message-State: AOJu0Yym42n8lJFs6tjZJD6jZlyhAlarTYXLWpYniJN7LnH0X0QVOtY5 K4VsLsE7LWz3/CqWN+j+2cb54g9IgBXwHw1VXm9185s6y1Pt0GsaUQQ3FNBXW5x9wsLatQpwCdy DcbSnfWgwkBO8+e4dmkYp3Q== X-Google-Smtp-Source: AGHT+IEvDGjYAnZwq1k9GfNaflhQiBbW4odebpw+c96Y/GOtuVtYw7zlJj4bIiP9o8Jtpl0PkkekYwITje4OK4QQ X-Received: from dlbbq12.prod.google.com ([2002:a05:7022:670c:b0:11d:fd49:7806]) (user=marcmorcos job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:a89:b0:119:e56b:957d with SMTP id a92af1059eb24-11f34bd9053mr3080352c88.2.1765584768791; Fri, 12 Dec 2025 16:12:48 -0800 (PST) Date: Sat, 13 Dec 2025 00:12:32 +0000 In-Reply-To: <20251213001234.2039232-1-marcmorcos@google.com> Mime-Version: 1.0 References: <20251213001234.2039232-1-marcmorcos@google.com> X-Mailer: git-send-email 2.52.0.239.gd5f0c6e74e-goog Message-ID: <20251213001234.2039232-3-marcmorcos@google.com> Subject: [PATCH 2/4] thread-pool: Fix thread race From: Marc Morcos To: maintainer_email_from_script@google.com Cc: cc_list_from_script@google.com, qemu-devel@nongnu.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::1049; envelope-from=3gK88aQoKCiML9QBLNQBNRFNNFKD.BNLPDLT-CDUDKMNMFMT.NQF@flex--marcmorcos.bounces.google.com; helo=mail-pj1-x1049.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: 1765584835068158501 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 Sun Dec 14 06:36:57 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=1765584824; cv=none; d=zohomail.com; s=zohoarc; b=KIX93FCSqawBb1o3xxUdsXYIK7wwbC3KKXYAekXE2vwjQzq+RbeIBCjCgda3SzyDOOqwZT/3T0RqEpOfDRpHt7oQKW953zQd8w4foj0yb78Ll48eZvbf85UEzNRKU+DN0nnIz7XrnEaADohUFvpjKDJm2DkvHHaxmu6kilqmnd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765584824; 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=YjBHRm1ySC6OXddgXSrjWfNh1+RZX+/1V6tjZyBgMv8rLG914VswABkDxeiEqy1Ht8PlgjQz5fInGEjLMaHB8Z+/6+icp/oIFSeRIUlU2RzfS2Dwy8CeT+oAZ+kmdBzwNCZcig6cM1J6C0EMUg62n2ldzFpv7LbEPJ6j1UT3DZA= 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 1765584824390632.4190881590747; Fri, 12 Dec 2025 16:13:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vUDFo-00046C-6H; Fri, 12 Dec 2025 19:12:56 -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 <3gq88aQoKCiUNBSDNPSDPTHPPHMF.DPNRFNV-EFWFMOPOHOV.PSH@flex--marcmorcos.bounces.google.com>) id 1vUDFm-00044C-21 for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:12:54 -0500 Received: from mail-pj1-x1049.google.com ([2607:f8b0:4864:20::1049]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3gq88aQoKCiUNBSDNPSDPTHPPHMF.DPNRFNV-EFWFMOPOHOV.PSH@flex--marcmorcos.bounces.google.com>) id 1vUDFk-0006kw-D9 for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:12:53 -0500 Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-34a907477b3so3146822a91.2 for ; Fri, 12 Dec 2025 16:12:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1765584770; x=1766189570; 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=4pZ1FmmzyE1y2KxjngM/SwFJJKXIK4JsJXyKbkDzP9tDfZIaZXA928X8Qhmd3hGehE WsY/AZjbtD1hTR2xVZidDvJGiHqnMrFyw9HGFsVS2fy8lriY10CezXBkLaa3J+aaSbzB ziuKpwpRvQN32T//+ms7/8CWTNGZT5guVrMSWDmSLOaHWXiOAHiw9f7oweIy9DkusKLb psEaGH8Unxs2/xgyUkfTd1Yrg5mIRaRQh9VGf3T2WPqivuSbwHA3OF3dQxo9Y28BvUvl VgWe6mFYhAXvzYcqKlTp0ILtm+zQ9GZ/yz0/vJsmNl87Acct5fi6PZ8Opb1SlHf7YAYg hlug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765584770; x=1766189570; 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=OfoybIOykaUruvi/WtIgo8kB7GZt2B1z+E7jQJFndE5qhlipYkqROEpz+Rpg6oMFEz 6ja/+x/GCiEitshfQfd5hpub5thFO0gve9Aa2Mw9J2vpAYu3Z64UZyW5jR5mHd0ikAWI GLJgsXXBjkEzts6CAnGORjeE653EE/VDzGwiyr3WwIzXIotQOY7eM6O1E1PRI652ZkMu LBqRXx54UyME32Bzfu+Z8yBtc01zw+ZnaSrq+FOltTfEivWZLBLisf0ODvF64vcciw1d sBMYXLiq7a5z1Y1sV2F+cu4hhVc5dlcKhSClf2MW4CbWvVEt6yGtolyY5XuBP14T++Op w9PQ== X-Forwarded-Encrypted: i=1; AJvYcCWoICTVtfrbKheEXjKtZZFM9y3wR44tyZl2QcCrFlv8s66AAAwQ9mJ159+clmO2bE+23pIiiH/27vl8@nongnu.org X-Gm-Message-State: AOJu0YxOl7BdDlh9By9FOuskPQcGDKKKGpX9KoFDff4ApnnUavP4gS0D HIEta+dW6FXBEVejODDtMcC+B1eOZznocajxOAPfkHzA83WVt56aJGlQ49K0BTcA1ZrMaoMXNzi vsdTxBY4gFph1aGzCu1bAFA== X-Google-Smtp-Source: AGHT+IFZgGy/54LFCIOGtITvodQtwjMNPJrpkO2x08T+X+pQSvoE39BYo7+RVpUI+PyJkSXvQR/0R145JbF7QwnW X-Received: from dlbqe2.prod.google.com ([2002:a05:7023:b82:b0:11b:13:9d43]) (user=marcmorcos job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:78f:b0:11f:2c69:3e with SMTP id a92af1059eb24-11f35475ccamr2979494c88.6.1765584770388; Fri, 12 Dec 2025 16:12:50 -0800 (PST) Date: Sat, 13 Dec 2025 00:12:33 +0000 In-Reply-To: <20251213001234.2039232-1-marcmorcos@google.com> Mime-Version: 1.0 References: <20251213001234.2039232-1-marcmorcos@google.com> X-Mailer: git-send-email 2.52.0.239.gd5f0c6e74e-goog Message-ID: <20251213001234.2039232-4-marcmorcos@google.com> Subject: [PATCH 3/4] qmp: Fix thread race From: Marc Morcos To: maintainer_email_from_script@google.com Cc: cc_list_from_script@google.com, qemu-devel@nongnu.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::1049; envelope-from=3gq88aQoKCiUNBSDNPSDPTHPPHMF.DPNRFNV-EFWFMOPOHOV.PSH@flex--marcmorcos.bounces.google.com; helo=mail-pj1-x1049.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: 1765584825101158500 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 Sun Dec 14 06:36:57 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=1765584811; cv=none; d=zohomail.com; s=zohoarc; b=Fm55/Yu9fG6oAusR7xITGlrccUDyZo7rkKFg2TGgzCNuxFivfHwA9RfoYTd6WVW85X0LBxIm5jVdvyTmg3mmwD5f9lR0+NsgmcBB939zL3TvawITER7sKiH9ElN2noVpNdB9DNTGB51DqV2LiktGWA54Tpvf0DT7oixDXPxsHwU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765584811; 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=M5KTsujWp4vmtadqPDVL0CV7niqq2hlpTdiESxO/XY4z/x7KvgIsLHtMBM+1UEl5/d4ybwx8ErXCGYY+2lhsZ9UjeIlhhIleqchSpAwLuz8NlLfpSaONCb61+OEzycE1rMHRub2BWkOp8QEvDdwnI/Jhywf+W88aYmmttm1lgf4= 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 1765584811122568.919199568152; Fri, 12 Dec 2025 16:13:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vUDFp-000484-PN; Fri, 12 Dec 2025 19:12: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 <3g688aQoKCiYOCTEOQTEQUIQQING.EQOSGOW-FGXGNPQPIPW.QTI@flex--marcmorcos.bounces.google.com>) id 1vUDFn-00045w-98 for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:12:55 -0500 Received: from mail-pj1-x1049.google.com ([2607:f8b0:4864:20::1049]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3g688aQoKCiYOCTEOQTEQUIQQING.EQOSGOW-FGXGNPQPIPW.QTI@flex--marcmorcos.bounces.google.com>) id 1vUDFl-0006lF-Fe for qemu-devel@nongnu.org; Fri, 12 Dec 2025 19:12:55 -0500 Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-34992a92fa0so3302755a91.3 for ; Fri, 12 Dec 2025 16:12:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1765584772; x=1766189572; 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=QVkXqh4tc19TOQYd52ndlErQVnVnhzNYZ78CeOmWkySuP51rzbXQyvsXpVFgXdmnHq 2JSCDhb7lrB85SEBvaTqi9enbr/rzgpNZBweDKpJgCmZNsG5aarJ4ndy8jg7vVfBGZZw uX4ynQW8TEQ99MWVcxVq9nETX/Vt/1RRLsGXl32ymHllZKE5h/RTnbqumAhEhZKUb/bP EMayXzGBkV6K4TF7WjWhkCNHRmRey7sg3pNPIcJ+lpk0FqtDigjxQ0PBc/ZSzovfRYW6 a+NRt3SYowHeO8Ojv6DOi6/PhlJu8nZg2SYfKeYY0FqHQr+qj9ZID5jCumDW/DiCIq8t 3t7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765584772; x=1766189572; 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=bVx8e4ucrQGzcuOi8Sx9W3j4x33m/UErzBY8sqHamzAXdb/tJBOmSS25RHocSctHUe kRhv9e6UjMpgB4XwrfOZGqljYtEdzngF5Lx84A/guOQJ2IzM+B6UFTseOFaISpyCsPeN D2T6EFBf7Bl7OBeBfOPc3VY2AlP+WFzVIpRoFyiKv113JSL8yr767OgGMQX72iZ8WhEs bQf9d8N09RqeoY4Jj7+jlGRFh6NcKeiT3xvPHAyUwHt2/D+bcZSrbF9fL3yJPkQDU+3v v+gfU6/ZmwmPUL21cUg3kEi09qjPJyojs00xCRc8/QHmb22eN5OBt9MlG7alojzTiCm3 gS/A== X-Forwarded-Encrypted: i=1; AJvYcCVELJsAs1C/zBcis9GSK2QE0obybpe25tn4EKWEploCwj82R4MUgBFFq5A9ob6xrfMnrFkoboKdt2AH@nongnu.org X-Gm-Message-State: AOJu0YyxZB+g34zOlofhZYAqPvOAUXcUqxI5yQvXKQ+yi+LEFdTdD9yr 5UZ3m7JmZjHtlgfEXBttjqasC6k5oWepJApVd2o3vGkKTKVulHtzhWpnzahmLjoB60tudKTyNsR UVjsE1+Tq1XGx44Vz6ncIdQ== X-Google-Smtp-Source: AGHT+IEUGvrC3So8rOyt2TbHT/zUSqqofoEitn5lrSd3XFN6QhMgT++KkhSReRl3upd7u8z2ybNGpqVjWeZ2HROK 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:a8a:b0:11d:f890:6751 with SMTP id a92af1059eb24-11f349a4cffmr2901007c88.10.1765584771745; Fri, 12 Dec 2025 16:12:51 -0800 (PST) Date: Sat, 13 Dec 2025 00:12:34 +0000 In-Reply-To: <20251213001234.2039232-1-marcmorcos@google.com> Mime-Version: 1.0 References: <20251213001234.2039232-1-marcmorcos@google.com> X-Mailer: git-send-email 2.52.0.239.gd5f0c6e74e-goog Message-ID: <20251213001234.2039232-5-marcmorcos@google.com> Subject: [PATCH 4/4] apic: Make apicbase accesses atomic to fix data race From: Marc Morcos To: maintainer_email_from_script@google.com Cc: cc_list_from_script@google.com, qemu-devel@nongnu.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::1049; envelope-from=3g688aQoKCiYOCTEOQTEQUIQQING.EQOSGOW-FGXGNPQPIPW.QTI@flex--marcmorcos.bounces.google.com; helo=mail-pj1-x1049.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: 1765584813534158500 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