From patchwork Thu Nov 9 13:59:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 742583 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:110f:b0:32d:baff:b0ca with SMTP id z15csp861082wrw; Thu, 9 Nov 2023 06:15:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IF1frdIEEougO4nnukY7z7fO15Lob4jJJhswlju+3IkOvlqaOcySlysd+guYaqpjpoQX7Br X-Received: by 2002:a05:6512:1243:b0:509:fbf:f235 with SMTP id fb3-20020a056512124300b005090fbff235mr1999967lfb.6.1699539350245; Thu, 09 Nov 2023 06:15:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699539350; cv=none; d=google.com; s=arc-20160816; b=aS4511PqxklTgr15hJNVM7OMRP4ARQSnBdnJ6iJQ9fT6o5dKHQ7B3fq7qmo9MSWWfz o3s1xzvwpSTY+zKzIMvabLrFqSC4p9uDCGHJVVJWrQzroqOKWpdlDy2eYYxSOiuJKsnp WaVC8GcnWc5SQf6eWV70/PqgvFJ+85FZppJ1ZtFrhb635/b2qlt+a1BN2dSaGUOUTRsU AKOPPzYdPeQQO7YRSkJyRpg6mPL77m5kD4kSGRjP0g6EqmOK6Yy3ZdNuG2EQ7SuQTsg8 kBkErtje6oJ64sQ/9gZAI9ROjBxOQt05Ychej0ZcNbJo3WnWmrnE3Qr4iOMD5O38BzxO xfew== 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=PJPyZ1eaHaaK6NhxbRWVgQUcB2Fhhf63vpdj+ssGaf4=; fh=L196pQKRERZGaJF7hFtC+jRPyzKAn1vHHXd3Z6ZIEH8=; b=AGYtLy5+6yMDKhSZMWLWYo9clsFYUGBjBObm7OPyntL9xJqSj9mbJHIu5IgF2lTzRE I4YkI/j5zNMgVtuyt90c8a8Jo9YAfUWO1N9OOEkxjjq77WR1JWJTVpaI7oATVIkv3o7p IKDZBXk2fDQPDsQxEnlhcQPPtLqvbImNqcGIw8FMlzAn8vuxxXpNyZwtSGc++Rl8i3J4 rJVKFBESpw3OBTKp7ooILeLoTBC6rSIqEAxm3Vn5ZS9X6Z6ttsgY9MSX10pwQ5STdySn vjtPJ4T59YIxGgyj7NM/+26BM0fG3Yxg6aQhCPXw/9IpY7BbPqmxjkAs2H//cv8xcJo/ a+Yw== 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 cc12-20020a5d5c0c000000b0032daa84148bsi5899903wrb.413.2023.11.09.06.15.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Nov 2023 06:15:50 -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 1r15fv-0006Lx-Fl; Thu, 09 Nov 2023 09:06:27 -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 1r15dj-0000Wa-Ap; Thu, 09 Nov 2023 09:04:14 -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 1r15de-00078w-Qx; Thu, 09 Nov 2023 09:04:10 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D68EF31BE8; Thu, 9 Nov 2023 16:59:57 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id DFB383451F; Thu, 9 Nov 2023 16:59:49 +0300 (MSK) Received: (nullmailer pid 1462924 invoked by uid 1000); Thu, 09 Nov 2023 13:59:47 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-7.2.7 48/62] target/arm: Don't allow stage 2 page table walks to downgrade to NS Date: Thu, 9 Nov 2023 16:59:16 +0300 Message-Id: <20231109135933.1462615-48-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, 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell Bit 63 in a Table descriptor is only the NSTable bit for stage 1 translations; in stage 2 it is RES0. We were incorrectly looking at it all the time. This causes problems if: * the stage 2 table descriptor was incorrectly setting the RES0 bit * we are doing a stage 2 translation in Secure address space for a NonSecure stage 1 regime -- in this case we would incorrectly do an immediate downgrade to NonSecure A bug elsewhere in the code currently prevents us from getting to the second situation, but when we fix that it will be possible. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20230504135425.2748672-2-peter.maydell@linaro.org (cherry picked from commit 21a4ab8318ba6f049aac244e237cd1557586e216) Signed-off-by: Michael Tokarev diff --git a/target/arm/ptw.c b/target/arm/ptw.c index fa013044c1..e593bc339a 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1382,17 +1382,18 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, descaddrmask &= ~indexmask_grainsize; /* - * Secure accesses start with the page table in secure memory and + * Secure stage 1 accesses start with the page table in secure memory and * can be downgraded to non-secure at any step. Non-secure accesses * remain non-secure. We implement this by just ORing in the NSTable/NS * bits at each step. + * Stage 2 never gets this kind of downgrade. */ tableattrs = is_secure ? 0 : (1 << 4); next_level: descaddr |= (address >> (stride * (4 - level))) & indexmask; descaddr &= ~7ULL; - nstable = extract32(tableattrs, 4, 1); + nstable = !regime_is_stage2(mmu_idx) && extract32(tableattrs, 4, 1); if (nstable) { /* * Stage2_S -> Stage2 or Phys_S -> Phys_NS