From patchwork Mon Jan 28 17:39:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 156811 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3699394jaa; Mon, 28 Jan 2019 09:43:36 -0800 (PST) X-Google-Smtp-Source: ALg8bN5woFiM8ez6LZjoAph10hLPP0AYVlyKX1WBQbNuk2zaWYPEe0vr4NGHR2ThDUeBVrfQOHHQ X-Received: by 2002:a1c:6e06:: with SMTP id j6mr18711394wmc.3.1548697416246; Mon, 28 Jan 2019 09:43:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548697416; cv=none; d=google.com; s=arc-20160816; b=P7sJp7au4PlSXcZkNKzrVAcHpaz2iQ7vVrzBq72EtAR6u7JbpUlVDplGA51y/JJBxd ZncM+281r7rtczClfgBk8y60IZixqyOPDRfTkPSbRALUZ9nKX3Yz7F354Msza4Z8OKCN nDmZVtcUdQYUSd7wohzopx3eldwL7sqJgD153sBGv6MHoEU7tIHyRyOIN9Qg1n5UWg00 pzCciWUpEbp+ANdj80Z5uD29dKaQScU5OqbapXTn4d0A8XI8O2HPKItR9LYGvOFcEGuv nOusDNsqAcW/idNSzU5oCnx5NAHjY3fTUusdRb/xpz0o08CZXKVaugHjFA/XKlkKX8ms jhXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=4Ma4KyFZWMZDWKwrBGwmM0xc8BBD1DkWp6hR/NBgppo=; b=Q1Ya5gHlYau+FGWNte+Y+8TMmkflOhlT08C3yIZYZFbWsL3bMqSPYQsPVUCY8NvrWK HIuKl70DaPMX2ggYcSCWINvdskKZLi6KkYecd8YbP75y86dnh+6v8xqBA3cs77s0Oj9z rlCZX4or1Ldv5ZphMWmerSUcphgBvbNp0scZ7Dgdntcdx6DeEwPDN7DwoS7NNXXV0PGU lzWTE4egdA+z1SDvo5N2yzwN022IR2+E7bVnUwji8z41YY28pZdcAQzPf/2Z54L2/96H 4173b6kenbwC+90p+qHVDtkQCl6sS3EZccjbW00JQZuwXbGcSGGEK7haqFYRliVDtrqz 3mZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gAuz06FK; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m12si79703259wrn.358.2019.01.28.09.43.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 28 Jan 2019 09:43:36 -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; dkim=fail header.i=@linaro.org header.s=google header.b=gAuz06FK; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:35967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goAwZ-0004Ip-52 for patch@linaro.org; Mon, 28 Jan 2019 12:43:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goAst-00024b-QO for qemu-devel@nongnu.org; Mon, 28 Jan 2019 12:39:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goAss-0003Wm-5z for qemu-devel@nongnu.org; Mon, 28 Jan 2019 12:39:47 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:52761) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1goAsr-0003Ty-HL for qemu-devel@nongnu.org; Mon, 28 Jan 2019 12:39:45 -0500 Received: by mail-wm1-x342.google.com with SMTP id m1so14933824wml.2 for ; Mon, 28 Jan 2019 09:39:43 -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=4Ma4KyFZWMZDWKwrBGwmM0xc8BBD1DkWp6hR/NBgppo=; b=gAuz06FKTv9Y8r9Da05CsvEAmSMjpl8j8HcIrtT9DshKG2mT3OAF9rzXpyStPlRL+a U+4795imPXuovl0bqoeHeqAsYYT8kfGxl4ug5zf4Y7Ag5H4MJWAzpBtHKEWpicxHhb06 9fEucmscjteZp9q3BNn8pEcvTMZsfhmK5Uc/4= 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=4Ma4KyFZWMZDWKwrBGwmM0xc8BBD1DkWp6hR/NBgppo=; b=BgUM+z7cpPINT00fB47d6YGtFQjWR6TKaqsbY8bioWecH1hqBirwjwtvdAQuQkNgwm jWHIr4GiHs/ZEorAbPTpLPPVMbMEa+FpbkEbp+AxhKMGypZ1aAxY4T9cHsKAcO+j2Zkm 01cGH/WAVsuEz9UjNgf3BpZtRZ3PZSRDoK4l36NBJ/bWnICaJN2LIIDHCVmUsJUV8umY FIOx2s9rJUPPh58oikeoz94zqxJ2jaaIQZTYGrULDigH4PUIalDRPXVazOX51MoU23hA qHZr5osMoa0eN8paZrlRn8rQprFIAfcmQ4DAyOK1ojipJlVR3sd9rpY2IeLvtBdLVJ+M 97xA== X-Gm-Message-State: AJcUukeCVTVKPD7sDYyfq/dyzZ4s+HgreTrYerFeV1AHiTJrFsAo7Atz V+9DrKGAlqoYtIy3X7FfnYkI2A== X-Received: by 2002:a7b:ce84:: with SMTP id q4mr18921037wmj.105.1548697182179; Mon, 28 Jan 2019 09:39:42 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t199sm348163wmt.1.2019.01.28.09.39.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Jan 2019 09:39:40 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8D6913E050B; Mon, 28 Jan 2019 17:39:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 28 Jan 2019 17:39:37 +0000 Message-Id: <20190128173940.25813-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190128173940.25813-1-alex.bennee@linaro.org> References: <20190128173940.25813-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v1 1/4] target/arm: relax permission checks for HWCAP_CPUID registers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Although technically not visible to userspace the kernel does make them visible via a trap and emulate ABI. We provide a new permission mask (PL0U_R) which maps to PL0_R for CONFIG_USER builds and adjust the minimum permission check accordingly. Signed-off-by: Alex Bennée --- target/arm/cpu.h | 12 ++++++++++++ target/arm/helper.c | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index ff81db420d..3b3c359cca 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2202,6 +2202,18 @@ static inline bool cptype_valid(int cptype) #define PL0_R (0x02 | PL1_R) #define PL0_W (0x01 | PL1_W) +/* + * For user-mode some registers are accessible to EL0 via a kernel + * trap-and-emulate ABI. In this case we define the read permissions + * as actually being PL0_R. However some bits of any given register + * may still be masked. + */ +#ifdef CONFIG_USER_ONLY +#define PL0U_R PL0_R +#else +#define PL0U_R PL1_R +#endif + #define PL3_RW (PL3_R | PL3_W) #define PL2_RW (PL2_R | PL2_W) #define PL1_RW (PL1_R | PL1_W) diff --git a/target/arm/helper.c b/target/arm/helper.c index 92666e5208..42c1c0b144 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6731,7 +6731,11 @@ void define_one_arm_cp_reg_with_opaque(ARMCPU *cpu, if (r->state != ARM_CP_STATE_AA32) { int mask = 0; switch (r->opc1) { - case 0: case 1: case 2: + case 0: + /* min_EL EL1, but some accessible to EL0 via kernel ABI */ + mask = PL0U_R | PL1_RW; + break; + case 1: case 2: /* min_EL EL1 */ mask = PL1_RW; break;