From patchwork Thu Apr 10 22:55:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 879763 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp490725wrq; Thu, 10 Apr 2025 15:57:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXZMY1CU5i9r/Xk8NoKZZIOciyHp06htP4UxtXD0gGjg3mbmsXLpCxqehCmC4WDbC1pUIhhqg==@linaro.org X-Google-Smtp-Source: AGHT+IGTC8HXQ5rdEUlWgDY8f8K8Pd40q7CDYAXeccJG6o0UMNIs5Xe/Q5wuuFGe1yB6SYx8E6xm X-Received: by 2002:a05:620a:3913:b0:7c5:d7c4:6e0c with SMTP id af79cd13be357-7c7af0e236cmr125897485a.27.1744325824780; Thu, 10 Apr 2025 15:57:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744325824; cv=none; d=google.com; s=arc-20240605; b=fEgD205wfRIrWZJLtEKEpDDAePSxkcHIaf7l9k/LSrlP+9MOcaf9OonYTQqitvKAx0 WDkeojlZ2tr4seUIBgbWN2ZngHwzkh/gKtOvRRojgQcz/OXzTrnKDR7+dfJFMeEwfAKx xtFmBLqWk0hkdimgjA4V323zFLDHoi3G07uvv6BheU8KP+AM9WQcTKjQtEeLOzd3yt9S jz0cn+7lMwKrYJ7CdyPtCREQxC/4LsLh69WpJA0O2UhBiwVI8NiDd/4wK/jfSM0k/fPn xCG/lX7OC8t3hK9m2H/k2ozgPlrKRhf9sDg435mOBBS7vjezHPGWU+etYZnGii7xJ4uP /9+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/+C5+b1a8mySGOnXpO+yRnlPSMlppK5ZlK3cVTr23jo=; fh=j5SzIm5dVIM/yF22bQTTbAMrLwtQfyqa6lzJwFAx340=; b=PLjzWOTaKSEl7XbHxK9kf8t2eeRy+3WVRRB2C6slYB0kALw+Cwb2bHWlk3ZkUiOLJb G1hwUaiZNwIrxuMeRrzA2GNB2G6oLc152RkTUWoIxdkFsxDvq38Rjq5pILg/uJffYwJ7 foe0cVbzIVak/18ZQYry0/sp4RXJImGPJO2887wNiVtjh3k48oQn/kDu70TDge0D5ZjE qDm3mdWe4IZ/r9qLgLut3xQWM2mBWf11qoFzv+79wX+Qa5gvtOXv4VIpVWzccK5L5bHr QEfrxi1Pqj/i1i6MugvGT6pgUL2ZS0mWKbt3LY6x+1QNJYvU29Hm9FXqh7qQ0JdxGmf/ SmyQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=akpNfIYu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c7a89f6ce5si183706685a.283.2025.04.10.15.57.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Apr 2025 15:57:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=akpNfIYu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u30ow-0004DQ-Ts; Thu, 10 Apr 2025 18:56:30 -0400 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 1u30od-0004Bp-Js for qemu-devel@nongnu.org; Thu, 10 Apr 2025 18:56:14 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u30oa-0002ZK-JS for qemu-devel@nongnu.org; Thu, 10 Apr 2025 18:56:11 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-22435603572so13836055ad.1 for ; Thu, 10 Apr 2025 15:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744325767; x=1744930567; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/+C5+b1a8mySGOnXpO+yRnlPSMlppK5ZlK3cVTr23jo=; b=akpNfIYu3iBkedpLWkyIF6Kqy5U6zrRhldChiIEYj17SmLvgwX2gyKXgqT+N6zDBY3 41ptre0RbbJ4eQGTO8yBLIpu2JPkVSp3cz4xKNRAWKGhR0/RXdlksQNsPA1SN+j0yD40 bfrXCwVM4AYIVYwSGxCAxx+ROxsHAddDKTeRKmqSMX70hCt6lzXnn67Zbg9JLgUsTVqQ HR82dB5BAVNW3D3dvFJqF+VmbUWUtTlVsMpKdPdl5DrOMOisMweJ7OTbWais846cP8Yt mBH4M90SvLEbfXreVGsuODfs35y+Ez0SbJMOyhJ6LzGBs6+zhU1teKtpEuGMyI11MuBd luMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744325767; x=1744930567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/+C5+b1a8mySGOnXpO+yRnlPSMlppK5ZlK3cVTr23jo=; b=U98QrVpbcOrC1TbcPQPYb8Ohig8sBnfJJ4maBaWEjUPPOzzUnhIcm9YktUGOeBejNG NINYBJeOS0Z3AbPjAvq27XbYrqczrnh4y+9UlQTMosyEwADUQScLbNCVpCI6C+6YR23y oj8YMZKM/5z8/oiQBhRBy/75E1NXZrkYvGk+nScdy2wqQxEqUp3XS6wxM/CbvNXN2JKG bnsLoWFNoJdUjgeu9MSZ2XebE2R4Rp+IgIi7s/0oLqJB6/UFW3lqbmFOFAObZcyDCcQW xhogx2Pq4POwjckNiy8ZbblHT5tudg0Hum0+nzP7vz9eyGBLqzXCNgKJ/jTaJT+6eruB MyUw== X-Gm-Message-State: AOJu0YzPgHh44XezB6DOeTYVQZ4snX4uR8xrwPeT1bckDCEo71dsaqD1 ivOGdmLnwfFYdzbQlsVPvjy8afTwJ4DVWD8FS74LBLczj9RkaDQ9V8I+3HFzL3gWXxko3VMvgcA p2Yo= X-Gm-Gg: ASbGncseH93nEfIP0zK4t/mW2L+akHAtRS2i4TdnKl4BzezX5n1ozClzaPMpPC/Elab Ng43e94Xpa/3ZUxhd1ZTI9V+cXUwthTBU4CLXZVLjZwIlPveqb5KaD0J27GB3g4aCNXbZRzTKt1 p9rZFP0qplabJNM9EuD78Pw2RY2Qi+tWSm0WM6cgwud7gL34wJ3uepK//45uXF5leGnCa6v38J3 POB/iOtSGXWAB03nqpmeur8npQ8EQomvkpI7ykzRrChnk/2n8FVZCkt1rFUZjRnRqx/dPy5Q2o+ o/9Y4JF+zHVXWvcvCOfn+gbNeD3tkJ85bLvgTQgW X-Received: by 2002:a17:903:2bce:b0:224:ab0:9b00 with SMTP id d9443c01a7336-22bea4bcc57mr8155805ad.27.1744325767220; Thu, 10 Apr 2025 15:56:07 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7c97228sm36249225ad.128.2025.04.10.15.56.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 15:56:06 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Stefan Hajnoczi , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Paolo Bonzini , Phil Dennis-Jordan , Pierrick Bouvier Subject: [PATCH 1/2] system/main: transfer replay mutex ownership from main thread to main loop thread Date: Thu, 10 Apr 2025 15:55:49 -0700 Message-Id: <20250410225550.46807-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410225550.46807-1-pierrick.bouvier@linaro.org> References: <20250410225550.46807-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x635.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org On MacOS, UI event loop has to be ran in the main thread of a process. Because of that restriction, on this platform, qemu main event loop is ran on another thread [1]. This breaks record/replay feature, which expects thread running qemu_init to initialize hold this lock, breaking associated functional tests on MacOS. Thus, as a generalization, and similar to how BQL is handled, we release it after init, and reacquire the lock before entering main event loop, avoiding a special case if a separate thread is used. Tested on MacOS with: $ meson test -C build --setup thorough --print-errorlogs \ func-x86_64-x86_64_replay func-arm-arm_replay func-aarch64-aarch64_replay $ ./build/qemu-system-x86_64 -nographic -icount shift=auto,rr=record,rrfile=replay.log $ ./build/qemu-system-x86_64 -nographic -icount shift=auto,rr=replay,rrfile=replay.log [1] https://gitlab.com/qemu-project/qemu/-/commit/f5ab12caba4f1656479c1feb5248beac1c833243 Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2907 Signed-off-by: Pierrick Bouvier Reviewed-by: Nicholas Piggin --- system/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/main.c b/system/main.c index ecb12fd397c..1c022067349 100644 --- a/system/main.c +++ b/system/main.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-main.h" #include "qemu/main-loop.h" +#include "system/replay.h" #include "system/system.h" #ifdef CONFIG_SDL @@ -44,10 +45,12 @@ static void *qemu_default_main(void *opaque) { int status; + replay_mutex_lock(); bql_lock(); status = qemu_main_loop(); qemu_cleanup(status); bql_unlock(); + replay_mutex_unlock(); exit(status); } @@ -67,6 +70,7 @@ int main(int argc, char **argv) { qemu_init(argc, argv); bql_unlock(); + replay_mutex_unlock(); if (qemu_main) { QemuThread main_loop_thread; qemu_thread_create(&main_loop_thread, "qemu_main",