From patchwork Mon Feb 19 17:31:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 774106 Delivered-To: patch@linaro.org Received: by 2002:a5d:4943:0:b0:33b:4db1:f5b3 with SMTP id r3csp1276802wrs; Mon, 19 Feb 2024 09:32:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWogkFwI1hv56iHHtWSv9HdcByzPglRmQ+BuHK3ug4E+HbBwRY/lU8RpWt41Wk26w1hBMx5IEXSRybBjbfsWdAx X-Google-Smtp-Source: AGHT+IGMFsfpOxf2NiSeyjdpvF/SOebcoKfSm/ZYeUOjip8M+j/zbtdCGR7Pa3mkTde+J26NvL0S X-Received: by 2002:a05:620a:47e0:b0:787:72da:ea79 with SMTP id du32-20020a05620a47e000b0078772daea79mr968939qkb.65.1708363965501; Mon, 19 Feb 2024 09:32:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708363965; cv=none; d=google.com; s=arc-20160816; b=HkOae9HwvTi41rps2iapsVSDEz/v2+8GoFrQbV1RXJcQ05aQvLEW5Iqi1vWk2xZ+Ia PoR8sZPSCpV06pN1fw59qWjhMOj/IDngvmhe6c+fytULEMvg1iUiTSTrfQIruuBFQwAn ojuwfW3FUZkn5UvGk9eCp9saaWzXSeXOmfqspG6GCpBRKCRoM8fagm3r+7iNG28prgLd IuJVGO3OwRsudpm5JgwE2bYfyrQvX4WTt5T6LKyx9dPrzHGQFNukvtaC6oLGcb8cBBUI oo7gUyPm1pdCZh8CVPIZOD9KAW4Q36dnQw5Nli8uGsRcV3K+pVO4V+tzwsllN+tZRRvQ snAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:from:reply-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; bh=pkdD0Rb/8aXwpx7HzATggZ+cMVA//rHrczbjt8PRYrI=; fh=IWwS5zZr3iNuWktpfl74KO1FMT51s9jDqG5MPb7jFCs=; b=fAuyEfbXbcYJAsnWeyWCyc2NrG7PLiHhQJBZifYKRytMXxeF0opE1dEzq5NaBFKbsu eeERhLlssu65Evw0ISk1NBy1Y74T6QUfhw1/3vZ5PO5AYjod7xdYWcn+X72xsWdwTM51 Q7LlWr+jSkB3lnkkIozJwbjn0EKdHlxfSSaCJafIeAy7I6Ud0K5IEAuWYJytxsuuBQmM ouLx317w0XpFOCcAS/PZRZGgi+d5QO+YBoZ8vO3woFZRTkDegVAdUKCXh+cIp/dxcCuX JZ803cMvyF+E9v1uZZyLOVBlq8dYAwe/85EqGBo9HfMR8A7amoCUZRnR6Svo2Tk0dEv9 Cniw==; dara=google.com 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q8-20020a05620a0c8800b0078734f1e04csi6382640qki.639.2024.02.19.09.32.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Feb 2024 09:32:45 -0800 (PST) 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc7VG-0003Zs-8q; Mon, 19 Feb 2024 12:32:30 -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 ) id 1rc7VF-0003Zd-1j for qemu-devel@nongnu.org; Mon, 19 Feb 2024 12:32:29 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rc7VC-0004JR-BL for qemu-devel@nongnu.org; Mon, 19 Feb 2024 12:32:28 -0500 Received: from mail.maildlp.com (unknown [172.18.186.31]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4TdqJB05nKz6K6Dq; Tue, 20 Feb 2024 01:28:26 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 12E0A140516; Tue, 20 Feb 2024 01:32:23 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.247.231) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 19 Feb 2024 17:32:22 +0000 To: , Peter Maydell , Gregory Price , =?utf-8?q?Alex_Benn=C3=A9e?= , Sajjan Rao , Dimitrios Palyvos , , Paolo Bonzini , Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= CC: , Subject: [PATCH v2 1/3] accel/tcg: Set can_do_io at at start of lookup_tb_ptr helper Date: Mon, 19 Feb 2024 17:31:51 +0000 Message-ID: <20240219173153.12114-2-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240219173153.12114-1-Jonathan.Cameron@huawei.com> References: <20240219173153.12114-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.122.247.231] X-ClientProxiedBy: lhrpeml100006.china.huawei.com (7.191.160.224) To lhrpeml500005.china.huawei.com (7.191.163.240) Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-to: Jonathan Cameron X-Patchwork-Original-From: Jonathan Cameron via From: Jonathan Cameron Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell If a page table is in IO memory and lookup_tb_ptr probes the TLB it can result in a page table walk for the instruction fetch. If this hits IO memory and io_prepare falsely assumes it needs to do a TLB recompile. Avoid that by setting can_do_io at the start of lookup_tb_ptr. Link: https://lore.kernel.org/qemu-devel/CAFEAcA_a_AyQ=Epz3_+CheAT8Crsk9mOu894wbNW_FywamkZiw@mail.gmail.com/#t Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell Signed-off-by: Jonathan Cameron --- v2: Picked up tags and adjusted patch description as question now resolved (whether Peter was happy to give SoB) accel/tcg/cpu-exec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 977576ca14..52239a441f 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -396,6 +396,14 @@ const void *HELPER(lookup_tb_ptr)(CPUArchState *env) uint64_t cs_base; uint32_t flags, cflags; + /* + * By definition we've just finished a TB, so I/O is OK. + * Avoid the possibility of calling cpu_io_recompile() if + * a page table walk triggered by tb_lookup() calling + * probe_access_internal() happens to touch an MMIO device. + * The next TB, if we chain to it, will clear the flag again. + */ + cpu->neg.can_do_io = true; cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); cflags = curr_cflags(cpu);