From nobody Fri Nov 7 19:48:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(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 1548458413127632.7226576381073; Fri, 25 Jan 2019 15:20:13 -0800 (PST) Received: from localhost ([127.0.0.1]:52290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnAld-0001ow-Se for importer@patchew.org; Fri, 25 Jan 2019 18:20:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnAe7-0004QH-Tk for qemu-devel@nongnu.org; Fri, 25 Jan 2019 18:12:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gnAPX-0005HB-SJ for qemu-devel@nongnu.org; Fri, 25 Jan 2019 17:57:20 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:34248) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gnAPX-0005Fj-LZ for qemu-devel@nongnu.org; Fri, 25 Jan 2019 17:57:19 -0500 Received: by mail-pg1-x543.google.com with SMTP id j10so4797609pga.1 for ; Fri, 25 Jan 2019 14:57:19 -0800 (PST) Received: from cloudburst.twiddle.net (97-126-115-157.tukw.qwest.net. [97.126.115.157]) by smtp.gmail.com with ESMTPSA id c7sm39148321pfh.18.2019.01.25.14.57.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Jan 2019 14:57:17 -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; bh=9CGDXRL9RJ71h8U2OmRVl+QRQuVLerVJq7UGYM/rjbk=; b=SehOq6kZpS2ZJGVppZlEa7HbNHywdMVKCBfC9SusxWUxCm/2+z6wWaBOIs/m9sf4GF Wu1fe5KqanGqdN04jy87zynHbZw6d0tVmqR9GLHJjD03hwBHxg71IlQVr6mUY7xbcdcn cBe3EWCfaDA+Vj3ENcKQri18fIx3jx6wQuH3Y= 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; bh=9CGDXRL9RJ71h8U2OmRVl+QRQuVLerVJq7UGYM/rjbk=; b=LFEOgaLbNj9xj2aREMqqzXn/2XmnNQalHCqj9bW+cQ/opYOGqsZTLPfUzpR7Es7yEP K+sxE2XFv0YvTjolt9Hz9X1YX1oC9iWdPryE6LzxGsmafIoSIITVpnvxuExxjilq3tJq CkhY59KeYIzFybnxtzfgnVUz8w1oHJFUUzH9rTYa+YWF7Z4rs5GT8yQ/HeLpIbJdwVDZ BfBolUx/3bhssHBCDzUIk7zE+Mw4xLtlwmjqSFgF1++IqnSKVqIiYiCDdd2C0YdswLzX XeEdXBc/u7Y/cp9gxpITnucP+BVzLV7mxJl0UPyMwJam/MsNuxMys890GL6qjEG9Lhvd t9xg== X-Gm-Message-State: AJcUukfjR6Ukcjp1K2SFLqJEe0WO6lr3c+syp/gVWOnMpC6VBPHT8jHb waHgPNBvUy6aV8VUZlIxuO75NEdPg9s= X-Google-Smtp-Source: ALg8bN4J5pKV1DustyY+l07Prmd/iPUmhHyPggDyddRvsi9aLrp2pdtyVxk00FAvaLW5tW1a5i7azA== X-Received: by 2002:a62:1484:: with SMTP id 126mr12623237pfu.257.1548457038194; Fri, 25 Jan 2019 14:57:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 14:57:08 -0800 Message-Id: <20190125225714.10234-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190125225714.10234-1-richard.henderson@linaro.org> References: <20190125225714.10234-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH 1/6] target/arm: Always enable pac keys for user-only 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@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the pac properties. This approach cannot work as written because the properties are applied before arm_cpu_reset, which zeros SCTLR_EL1 (amongst everything else). We can re-introduce the properties if they turn out to be useful. But since linux 5.0 enables all of the keys, they may not be. Fixes: 1ae9cfbd470 Signed-off-by: Richard Henderson --- target/arm/cpu.c | 3 +++ target/arm/cpu64.c | 60 ---------------------------------------------- 2 files changed, 3 insertions(+), 60 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 7e1f3dd637..1e79b97a9c 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -162,6 +162,9 @@ static void arm_cpu_reset(CPUState *s) env->pstate =3D PSTATE_MODE_EL0t; /* Userspace expects access to DC ZVA, CTL_EL0 and the cache ops */ env->cp15.sctlr_el[1] |=3D SCTLR_UCT | SCTLR_UCI | SCTLR_DZE; + /* Enable all PAC keys. */ + env->cp15.sctlr_el[1] |=3D (SCTLR_EnIA | SCTLR_EnIB | + SCTLR_EnDA | SCTLR_EnDB); /* Enable all PAC instructions */ env->cp15.hcr_el2 |=3D HCR_API; env->cp15.scr_el3 |=3D SCR_API; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index e9bc461c36..303d0ef075 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -281,38 +281,6 @@ static void cpu_max_set_sve_vq(Object *obj, Visitor *v= , const char *name, error_propagate(errp, err); } =20 -#ifdef CONFIG_USER_ONLY -static void cpu_max_get_packey(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - ARMCPU *cpu =3D ARM_CPU(obj); - const uint64_t *bit =3D opaque; - bool enabled =3D (cpu->env.cp15.sctlr_el[1] & *bit) !=3D 0; - - visit_type_bool(v, name, &enabled, errp); -} - -static void cpu_max_set_packey(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - ARMCPU *cpu =3D ARM_CPU(obj); - Error *err =3D NULL; - const uint64_t *bit =3D opaque; - bool enabled; - - visit_type_bool(v, name, &enabled, errp); - - if (!err) { - if (enabled) { - cpu->env.cp15.sctlr_el[1] |=3D *bit; - } else { - cpu->env.cp15.sctlr_el[1] &=3D ~*bit; - } - } - error_propagate(errp, err); -} -#endif - /* -cpu max: if KVM is enabled, like -cpu host (best possible with this ho= st); * otherwise, a CPU with as many features enabled as our emulation support= s. * The version of '-cpu max' for qemu-system-arm is defined in cpu.c; @@ -388,34 +356,6 @@ static void aarch64_max_initfn(Object *obj) */ cpu->ctr =3D 0x80038003; /* 32 byte I and D cacheline size, VIPT i= cache */ cpu->dcz_blocksize =3D 7; /* 512 bytes */ - - /* - * Note that Linux will enable enable all of the keys at once. - * But doing it this way will allow experimentation beyond that. - */ - { - static const uint64_t apia_bit =3D SCTLR_EnIA; - static const uint64_t apib_bit =3D SCTLR_EnIB; - static const uint64_t apda_bit =3D SCTLR_EnDA; - static const uint64_t apdb_bit =3D SCTLR_EnDB; - - object_property_add(obj, "apia", "bool", cpu_max_get_packey, - cpu_max_set_packey, NULL, - (void *)&apia_bit, &error_fatal); - object_property_add(obj, "apib", "bool", cpu_max_get_packey, - cpu_max_set_packey, NULL, - (void *)&apib_bit, &error_fatal); - object_property_add(obj, "apda", "bool", cpu_max_get_packey, - cpu_max_set_packey, NULL, - (void *)&apda_bit, &error_fatal); - object_property_add(obj, "apdb", "bool", cpu_max_get_packey, - cpu_max_set_packey, NULL, - (void *)&apdb_bit, &error_fatal); - - /* Enable all PAC keys by default. */ - cpu->env.cp15.sctlr_el[1] |=3D SCTLR_EnIA | SCTLR_EnIB; - cpu->env.cp15.sctlr_el[1] |=3D SCTLR_EnDA | SCTLR_EnDB; - } #endif =20 cpu->sve_max_vq =3D ARM_MAX_VQ; --=20 2.17.2