From patchwork Wed Oct 4 08:02:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 729250 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a4e:0:b0:31d:da82:a3b4 with SMTP id v14csp220967wrs; Wed, 4 Oct 2023 01:10:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdLcbE1sRHupa8Ck9pKnWnOA2bGFr+CfB059n8kg5FWCHxf1XFQnDjhQf+Ni1iPeUwuFHg X-Received: by 2002:a0c:e04b:0:b0:65b:896:1cb1 with SMTP id y11-20020a0ce04b000000b0065b08961cb1mr1907208qvk.17.1696407041301; Wed, 04 Oct 2023 01:10:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696407041; cv=none; d=google.com; s=arc-20160816; b=i5SvxXvmSqpdwRmTJeE5XUX+vLahUjV+xPsVWXjdMmd6uatPjLzX2rixU/cBfO3ByB nk7DGHlDbrnKRNZ1Ars956Z6fWjude1e5A0en7awf8NHAIiNvfPp0UasbOvhVO1XBpZn ETlenjULnvDydi3gmOP9qpaUB6ey+dRQr0Z/4KP8im2wYDE3MTOOPkQI5gnKpViMGuFV buSqhCionEFClu+LXDtlJAAp2eDJ3FyvWvWgb5hpHRCgZsdh8GWmXB3nWTLZCC0ksn/y jTGrcZMP8jxq1ZsaWYGg5SJYjlnj+9CkDyOjDmfgaqUZcWU+cvFZMbJFjQoBmotgoKB/ 5MeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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; bh=wihOXMd1nKS+Pxco9iBgoCgCAPpjbg4ugLtxwJLBR/4=; fh=K4abbxCgZAPvqzOXA+PZ7RIZh+KufMVJze7rXLOwES0=; b=Udtn2WKvufbOo3V/vGizq6FlEuDeJGb/vgipSMmsx54kkmkNUdkf6TSSlnMk1fB2Ym zlRmO6pGK/8MRN0I/ltTQi7G3ixM5iL/z1DurYQLnU5QZcykmG1elYoLkUI+72Jzfaaz /atoFSTnMGVSzrSK+8G349d0krXXwpA8juAnZbjVyfpwHT40Mma1k4mYkkoDju7AtRoe kHuUjoHyii2Mr4MENZhAAq+wI5rdETnfBO0ZKg3+yT8jlV6dtHXTQgjC36sX3BjPhKAk xQBUx0SQMI+NuhAT6TI+/p/JKnlCbxQhR/8rA/2y19p9kiaygFqdAHObqpqrAnzHj0uO kydQ== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n9-20020a0c8c09000000b0065d0353baa0si1252554qvb.51.2023.10.04.01.10.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2023 01:10:41 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnwvz-0003WA-RV; Wed, 04 Oct 2023 04:08:44 -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 1qnwtW-00060K-VI; Wed, 04 Oct 2023 04:06:16 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qnwtR-0003hV-7L; Wed, 04 Oct 2023 04:06:09 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E84B5275B4; Wed, 4 Oct 2023 11:02:30 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 40DBC2CBED; Wed, 4 Oct 2023 11:02:30 +0300 (MSK) Received: (nullmailer pid 2702868 invoked by uid 1000); Wed, 04 Oct 2023 08:02:22 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-8.1.2 39/45] accel/tcg: Always set CF_LAST_IO with CF_NOIRQ Date: Wed, 4 Oct 2023 11:02:00 +0300 Message-Id: <20231004080221.2702636-39-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Richard Henderson Without this we can get see loops through cpu_io_recompile, in which the cpu makes no progress. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit 200c1f904f46c209cb022e711a48b89e46512902) Signed-off-by: Michael Tokarev diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index e2c494e75e..c724e8b6f1 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -720,7 +720,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret) && cpu_neg(cpu)->icount_decr.u16.low + cpu->icount_extra == 0) { /* Execute just one insn to trigger exception pending in the log */ cpu->cflags_next_tb = (curr_cflags(cpu) & ~CF_USE_ICOUNT) - | CF_NOIRQ | 1; + | CF_LAST_IO | CF_NOIRQ | 1; } #endif return false; diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c index c406b2f7b7..85684f2b3d 100644 --- a/accel/tcg/tb-maint.c +++ b/accel/tcg/tb-maint.c @@ -1083,7 +1083,8 @@ bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr, uintptr_t pc) if (current_tb_modified) { /* Force execution of one insn next time. */ CPUState *cpu = current_cpu; - cpu->cflags_next_tb = 1 | CF_NOIRQ | curr_cflags(current_cpu); + cpu->cflags_next_tb = + 1 | CF_LAST_IO | CF_NOIRQ | curr_cflags(current_cpu); return true; } return false; @@ -1153,7 +1154,8 @@ tb_invalidate_phys_page_range__locked(struct page_collection *pages, if (current_tb_modified) { page_collection_unlock(pages); /* Force execution of one insn next time. */ - current_cpu->cflags_next_tb = 1 | CF_NOIRQ | curr_cflags(current_cpu); + current_cpu->cflags_next_tb = + 1 | CF_LAST_IO | CF_NOIRQ | curr_cflags(current_cpu); mmap_unlock(); cpu_loop_exit_noexc(current_cpu); }