From patchwork Thu Sep 16 15:29:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 512953 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1332467jao; Thu, 16 Sep 2021 08:43:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz49ekKMzvB9kpv/SAv/HaxNDyVlZes4cTX26a88fOE2szUzxdvAjZKxOEP6G44y9kyaz3f X-Received: by 2002:a37:809:: with SMTP id 9mr5535968qki.318.1631806986873; Thu, 16 Sep 2021 08:43:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631806986; cv=none; d=google.com; s=arc-20160816; b=bL6k4mtT2YNgm1WsWMeaSALDfLY0bH0vIXQoMqQlhHAt869wzuzd6UX0IMMOc8kj2L aMy5zKz/qSbTtbJ9xRTd0FudzjPHEYxsCyQwMCu7IQzkmGeSJ+/snE9Igwxe1t2vlafL 0zqvpYP07+vb+pQkWVihUl4K7FDqISHSNFzVx6ZQkcP7J3yCJOw6NsjrBrqU5MuDSpMF gSELGvzlcoQydh+2B/7KQzmddKiGWG41LHhvStS6rFhnq1M7FGIiKe0xxlLWE9AWJjjS ON1+nJpEnsZDOHQ1KCHc2/3iBpWBwk1PFmDbEDvDaiAC89BI1puFs2FzNMtXQZJauajH n7Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=1ujtoHmWANpUUSk4HPJATTFV4O1b/xtgCUsvKjJvcGw=; b=mNf1DJwdLYoYpXnjJ95dfsdyPlYxdmhzrQ6sirXzu8HRNTDCIGImZ773GmsFl+Tim1 EM/grNsjOqBCXltcTdlBYd8BHYrmLKRMvK8wvlGvd0u0AhGP0FKplh1PXHSTmaVakzQX zmjzcJNoN0CDQKvmVEw8LamLnR6D12VQ3yoC98NixuEYNoak3i+Tsn7GRTrR0GkehiSP aSA7g85Ijf8UGHIOYWTz6TQryLflQVzxoRJ71OV0BX5Mtil8ns4mGxU1p6qSaCqzn9/O t0vjdCNxUO4WhgkvSmEi/6zDxLtwYGoKjNQ3mEPT1KgMZ0MtCMyR3XqJHZN/yQyfAS8x Wvkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d2H+8Hhr; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h12si1775484qtu.101.2021.09.16.08.43.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Sep 2021 08:43:06 -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=d2H+8Hhr; 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 Received: from localhost ([::1]:36822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtXW-0006Ex-CZ for patch@linaro.org; Thu, 16 Sep 2021 11:43:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLS-0001JW-17 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:39 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:53172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLN-0002PZ-CP for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:37 -0400 Received: by mail-pj1-x1032.google.com with SMTP id v19so4815356pjh.2 for ; Thu, 16 Sep 2021 08:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1ujtoHmWANpUUSk4HPJATTFV4O1b/xtgCUsvKjJvcGw=; b=d2H+8HhrodxXptlwYf4BGIzvlTvUJt5pysQDsX9FuJ7KV06wzYhoDw2n+9ufcam4ob otBUXg1egQBBS0utDdMjWcUIJFy6Jp3OqT7eK/VPv76cB34Wp3BV4dDN9kOpqxTE3q0y mh0WLoaXkdr/NE8mewtE6OwLrACbVhALdNTXiRNk9k8O19ieV6KsCyvZ0uVI+73YXG24 mSyJI4b5C3ijQ3X2xjrpiUxllFveMzJhxb/ktb/JLMzby7UvgFEKjBht62Y0mkqs8sSK 9QXlhczxraqW+Cpc4VN4cVj9Lh3oaUpg9EktSaMHMLXEY+TL/b0Ko9Xe2TnrBEh7noEv f5tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1ujtoHmWANpUUSk4HPJATTFV4O1b/xtgCUsvKjJvcGw=; b=A47gQUgEmuwsVUFKnZe9S4AV0P8s7JsfDgf73CcRGn52qWn6b9v7xbkMQXwqV7S6qH RsH6CcvF6hY7LhgQE0M5ECWtpFhRQyJ7xIEjktpus0UOU4GqsW1+x6PRFMLrtlYOwM0x TH01mKtJeC346dpaZJfJ466mtgm/1tQv7vIQj6g4a4VLcREdFl0ji4Qfttqkm4sEGjXa NkTi85Bda2xvW/V+ilMqxv1rSBVPRkQa07DAv1+cxDpCruwOoTLxe2vwfxurT+HZGZGY 3fuxa51xxSb2b8/HWn1T84Q5fJzvPjNMdW6CL+lpea/GGDkO5qWKhAR1tan87I4R0FJe +F3w== X-Gm-Message-State: AOAM530whb8NoKz6PHiT1ORzGvwoXc9bKgopi/iZ/f033LdYzX3ZcOhr LnBLH1IN5oALGwT+j0eCtycnITh/o/g4/A== X-Received: by 2002:a17:90a:7f01:: with SMTP id k1mr6813591pjl.156.1631806230843; Thu, 16 Sep 2021 08:30:30 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 07/35] accel/whpx: Implement AccelOpsClass::has_work() Date: Thu, 16 Sep 2021 08:29:57 -0700 Message-Id: <20210916153025.1944763-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Implement WHPX has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-7-f4bug@amsat.org> Signed-off-by: Richard Henderson --- softmmu/cpus.c | 4 +--- target/i386/whpx/whpx-accel-ops.c | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 3db7bd4eb4..6bce52ce56 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -41,7 +41,6 @@ #include "sysemu/replay.h" #include "sysemu/runstate.h" #include "sysemu/cpu-timers.h" -#include "sysemu/whpx.h" #include "hw/boards.h" #include "hw/hw.h" #include "trace.h" @@ -89,8 +88,7 @@ bool cpu_thread_is_idle(CPUState *cpu) if (cpu_is_stopped(cpu)) { return true; } - if (!cpu->halted || cpu_has_work(cpu) || - whpx_apic_in_platform()) { + if (!cpu->halted || cpu_has_work(cpu)) { return false; } return true; diff --git a/target/i386/whpx/whpx-accel-ops.c b/target/i386/whpx/whpx-accel-ops.c index 6bc47c5309..1f9c6d52c2 100644 --- a/target/i386/whpx/whpx-accel-ops.c +++ b/target/i386/whpx/whpx-accel-ops.c @@ -83,6 +83,11 @@ static void whpx_kick_vcpu_thread(CPUState *cpu) } } +static bool whpx_cpu_has_work(CPUState *cpu) +{ + return whpx_apic_in_platform(); +} + static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops = ACCEL_OPS_CLASS(oc); @@ -94,6 +99,7 @@ static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_post_init = whpx_cpu_synchronize_post_init; ops->synchronize_state = whpx_cpu_synchronize_state; ops->synchronize_pre_loadvm = whpx_cpu_synchronize_pre_loadvm; + ops->has_work = whpx_cpu_has_work; } static const TypeInfo whpx_accel_ops_type = {