From nobody Thu Nov 13 15:09:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580741790273704.9155637972083; Mon, 3 Feb 2020 06:56:30 -0800 (PST) Received: from localhost ([::1]:42626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyd9J-0007BK-1I for importer@patchew.org; Mon, 03 Feb 2020 09:56:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44706) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyd0f-00071S-3a for qemu-devel@nongnu.org; Mon, 03 Feb 2020 09:47:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyd0d-0003Ib-Fb for qemu-devel@nongnu.org; Mon, 03 Feb 2020 09:47:33 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:46009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iyd0d-0003Hm-9Y for qemu-devel@nongnu.org; Mon, 03 Feb 2020 09:47:31 -0500 Received: by mail-wr1-x442.google.com with SMTP id a6so18494509wrx.12 for ; Mon, 03 Feb 2020 06:47:31 -0800 (PST) Received: from cloudburst.c.hoisthospitality.com ([135.196.99.211]) by smtp.gmail.com with ESMTPSA id h2sm26429739wrt.45.2020.02.03.06.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2020 06:47:29 -0800 (PST) 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=4YEwUgXqMm4/ex3vX/ecAj+lmJE3iRPAxqCBL/YGcWE=; b=PEvOkN9EB66cctkdi8BaRf1PrzLNOaa4iXeV2OheGE7R78rHNQ0VgvpUvqjJyHSfZw kPR29tbOK9ccoF4mOI5RTs9rZeZrkAU2Oh46mMca1oy6fHYcM7Pm5bpadUvlTGVoVZbW 3OhPdhGlHCLI8YKNEQfBe6/c9Ovp3O87KDgzAwjhA5tNjPkyADmR+Rzmi7BIFW5NmHG5 nDVunaaQxGPkF1/sFnY2uyO3KrVDBzKNZA0l87KDvTkAKLirov6W/R1jA7DQI97SetYj cKKYssM4Dde6LAZaHcegJ5A5G5KRTxwYQdfO4PvtgvtTvInwVWMY6iHb8tmRQPsUXCxm auxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4YEwUgXqMm4/ex3vX/ecAj+lmJE3iRPAxqCBL/YGcWE=; b=aWTAn31uKR8KadDYhsBMMO5Eg7qOe6L2LYk1WsD5UT4sTR3IZG7R9pPcbNXWhZWf89 W/38whqsVEWswf4TkHX6VLS+zdJWm+CGSQXhpl/7AtlwlN+alfESaaVb1K1FLv3t8jdg SOm/kygaettYHzLCNnny/XCFMeF5jz1IASnH4VWX/z0kDyG6HtKwOVAHhbfqyB/DI3PF Qh4ahaWtY/518KYuMnzrLSqun6xCSUMO5nady5iaUDaP3GMqkPc2sjZj/XXBsX2hlWb1 c2LJNxoVvmMM+ilPzcCiF+NyH4MJwwPxnGH5ChX5mzypbqy0gUA8agZTk9PIyOYzxqrB dt7w== X-Gm-Message-State: APjAAAXVpNCd7VUw2xR2CZ5SVC0errZE6o0mG/PQsmm01IYwJTg7T71t EWYXaTIENjzRDJ2h2bNLeEu6KmFGdxfAxw== X-Google-Smtp-Source: APXvYqyCJm+SMzPv8vyhjLW9IX4Uos0fpAOIkuAigrnfnDar8Ofq3wMca/QX25162vXbvFn6l6AGbg== X-Received: by 2002:adf:f986:: with SMTP id f6mr12272124wrr.182.1580741250129; Mon, 03 Feb 2020 06:47:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 13/20] target/arm: Enforce PAN semantics in get_S1prot Date: Mon, 3 Feb 2020 14:47:09 +0000 Message-Id: <20200203144716.32204-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200203144716.32204-1-richard.henderson@linaro.org> References: <20200203144716.32204-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 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, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) If we have a PAN-enforcing mmu_idx, set prot =3D=3D 0 if user_rw !=3D 0. Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/internals.h | 13 +++++++++++++ target/arm/helper.c | 3 +++ 2 files changed, 16 insertions(+) diff --git a/target/arm/internals.h b/target/arm/internals.h index f6709a2b08..4a139644b5 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -893,6 +893,19 @@ static inline bool regime_is_secure(CPUARMState *env, = ARMMMUIdx mmu_idx) } } =20 +static inline bool regime_is_pan(CPUARMState *env, ARMMMUIdx mmu_idx) +{ + switch (mmu_idx) { + case ARMMMUIdx_Stage1_E1_PAN: + case ARMMMUIdx_E10_1_PAN: + case ARMMMUIdx_E20_2_PAN: + case ARMMMUIdx_SE10_1_PAN: + return true; + default: + return false; + } +} + /* Return the FSR value for a debug exception (watchpoint, hardware * breakpoint or BKPT insn) targeting the specified exception level. */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 638abe6af0..18e4cbb63c 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9578,6 +9578,9 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu= _idx, bool is_aa64, if (is_user) { prot_rw =3D user_rw; } else { + if (user_rw && regime_is_pan(env, mmu_idx)) { + return 0; + } prot_rw =3D simple_ap_to_rw_prot_is_user(ap, false); } =20 --=20 2.20.1