From patchwork Wed Mar 8 16:57:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 660456 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp437330wrb; Wed, 8 Mar 2023 09:09:48 -0800 (PST) X-Google-Smtp-Source: AK7set/SH/+XgetAW0tUCBENtEGzyfd2jhHXiWKngI99FY7lE8wcma0NnLhbqoRZn/SAqapJP+jl X-Received: by 2002:a05:7500:c99:b0:fb:277b:183 with SMTP id fu25-20020a0575000c9900b000fb277b0183mr578739gab.68.1678295388012; Wed, 08 Mar 2023 09:09:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678295387; cv=none; d=google.com; s=arc-20160816; b=zvCEdb5VSgZq8EF5qjeoXEuNTabtzKZib+44+uD/9tSGykZe1Bj/sMcs2Q423hC7qf YaaEcumoZfUPadp5UsH2r7RFuzN8a6ZjN7CIopu8+AVzFFHn+i1qzvZMFWd1ZcNhH/F5 JNyEEcJtOI5GAyOVXKPYTazeRkltLPBDcnf9N7Lxxkhgm+bUtYHU4iebsAYYU0GT722s BM7VbeT184PiOurS+JmUWKSx3QDymcdeqvDpd8rSkTUxeiFGtwJPRrz7PX1Z3cTk2R6i 5fiWz8xaHeAOGFnNjw4IaeSOCljAbCFxUSHDSrWob/jSSgIFWlTFjnR9tSY50MjM+VDw 3ClQ== 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=1osm2aifSZIXoAbwLppt4xGIY91THCHQ9WgFg3MrQkU=; b=qKfn31rqUo2ktjyzBSFWK5TMnjCXPUd1QCN32ybGdOHcESLClYq4YeqBuPvDcaVcTY +u9WMQem3eZWq+qiSYLtwBoNuYXIbps+7tFfbEkreYFUBHzGJ5hHprdG5tEIKLlSS8bP asJxRyac5aMkl2caltcXJbYlLbKlSn2eeQV/74c1B1p4JcqcI57W2YhdyDy4AptG2m/i pTwLShJfBN+R4bpp5ijhwzWDMGTzl+JlDqRmlTioQzwfupvd3L41Sw18y2HXjCXDBQOJ 84ITatChUg5HE9kSS7I/AOO6JQgF4Eb876F+DMTaIyggpAmsAdiGe0OUiTeKk+GWZZoR 0RQA== 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 w10-20020a67ffca000000b0041204f01d6dsi5255044vsq.693.2023.03.08.09.09.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Mar 2023 09:09:47 -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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZx82-0004Fu-Fb; Wed, 08 Mar 2023 11:59:02 -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 1pZx80-0004En-Mw; Wed, 08 Mar 2023 11:59:00 -0500 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 1pZx7y-00040X-PG; Wed, 08 Mar 2023 11:59:00 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C647E400EC; Wed, 8 Mar 2023 19:58:20 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 6DA531FE; Wed, 8 Mar 2023 19:58:19 +0300 (MSK) Received: (nullmailer pid 2098282 invoked by uid 1000); Wed, 08 Mar 2023 16:58:15 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Sid Manning , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Michael Tokarev Subject: [PATCH 15/47] target/arm: Fix physical address resolution for Stage2 Date: Wed, 8 Mar 2023 19:57:18 +0300 Message-Id: <20230308165815.2098148-15-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230308165035.2097594-1-mjt@msgid.tls.msk.ru> References: <20230308165035.2097594-1-mjt@msgid.tls.msk.ru> 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 Conversion to probe_access_full missed applying the page offset. Cc: qemu-stable@nongnu.org Reported-by: Sid Manning Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20230126233134.103193-1-richard.henderson@linaro.org Fixes: f3639a64f602 ("target/arm: Use softmmu tlbs for page table walking") Signed-off-by: Richard Henderson Signed-off-by: Peter Maydell (cherry picked from commit 9d2617ac7d3139d870ba14204aedd74395990192) Signed-off-by: Michael Tokarev --- target/arm/ptw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index bb22271a1d..0b16068557 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -266,7 +266,7 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw, if (unlikely(flags & TLB_INVALID_MASK)) { goto fail; } - ptw->out_phys = full->phys_addr; + ptw->out_phys = full->phys_addr | (addr & ~TARGET_PAGE_MASK); ptw->out_rw = full->prot & PAGE_WRITE; pte_attrs = full->pte_attrs; pte_secure = full->attrs.secure;