From patchwork Mon Mar 7 16:47:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 548876 Delivered-To: patch@linaro.org Received: by 2002:adf:80eb:0:0:0:0:0 with SMTP id 98csp1094055wrl; Mon, 7 Mar 2022 08:52:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7V8Ve6giD47d5Xp1JXnMIOZKeZYNd8Mdxyjzf+/n3zO0J2iJHE+xpa1G6Li9VWNp1Obbx X-Received: by 2002:a25:7804:0:b0:628:ec4c:989b with SMTP id t4-20020a257804000000b00628ec4c989bmr8320750ybc.428.1646671977992; Mon, 07 Mar 2022 08:52:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646671977; cv=none; d=google.com; s=arc-20160816; b=yjlJHnESAhf4lbDKx06C6+LukVSJpeb2XXyr0bq1xRWQB1yhr8P4UsjKdlfiUcI565 152Yk6dGLe62OaM/ipEY689rqbi1Kk0hZRiX7t8DUv8t3DUOubh3n17OFSLYe2VUa2Ns MEdOobuWiysFMZluO/8PVELsQ45y4oJQPFA2kC/TRo3WXXo8axBSaDcTH+NM5xGULoSc 2Rdg/P+6JV/WzT7NigSc79GkkB06W7VJ2fHseKlhfwU03ty6PLreUUausuRPV/MCbIcZ 2k5qLHTUcxkqNAJN2fnnM7H4NJ1c4Kw+nO+iyAa7LtIaqPbyZJMmxY+2zY8uAvwBbGrb HMpg== 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:to:from :dkim-signature; bh=1uFtbkyoP6FALtVBSBQYa/7yZFXHFLiOSjVsvV63nhI=; b=0DuKpT3l+lh9xyrRaTD8kGrRfYWpAkvfW/H8o+abZnxvD3q4OS+eItB/qkdjXKjYjm XE7E+crfHvVx8IBljHVX6Ev5TkUb5OARX0/3BVSBiZTDlgBOJcRDaNjKkkj3Q5HcSJuD 62pWM29iaV9IYXXGNf6ZitBNHCPPuyjyiVwi3joAMOlDdoCxmxmuFsEIukbGS+pNm/wB rM2slP29llG/MT+1IwSoTmeZdLtM8zKRlkq1lBbHkYIwZhgRN3xGeDvFL2WPOR7i8gVb 2SIP2lWGNZNmxpO4ezwK23b50ziNDOijtG939upmEZCx2diF8RFQEev6o9Fq4P4Hy8kX rQiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fG5yZY+V; 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=pass (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 f64-20020a251f43000000b00620f5f60543si8221013ybf.534.2022.03.07.08.52.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Mar 2022 08:52:57 -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=pass header.i=@linaro.org header.s=google header.b=fG5yZY+V; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRGbR-00045s-DZ for patch@linaro.org; Mon, 07 Mar 2022 11:52:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRGWB-00023U-Hn for qemu-devel@nongnu.org; Mon, 07 Mar 2022 11:47:33 -0500 Received: from [2a00:1450:4864:20::32c] (port=41695 helo=mail-wm1-x32c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nRGW7-0007mY-JY for qemu-devel@nongnu.org; Mon, 07 Mar 2022 11:47:29 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 7-20020a05600c228700b00385fd860f49so8803967wmf.0 for ; Mon, 07 Mar 2022 08:47:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1uFtbkyoP6FALtVBSBQYa/7yZFXHFLiOSjVsvV63nhI=; b=fG5yZY+VnwRpA397cIx7pnc5BjEX5gBPH9M2iuLHOZluX4mGR0/Me/JtSHBvNeUSiR rN5B8GxlLDCDIQ/HC7MzjR/6MnsulksdOUSo1p/0EbnlAf/b/BqaHhYnQ2jiYVGuaXap keRmdr0O+dDejiCj4itSxR4VWZvaM7AH54fNr/zTHbF2pA3PYKcDA29D+Eyl1D2Kq+mk KdjxOUugeLnKTaLtS5oPcmX2KPPzu1r0hpbXKguiEQw9YLlB8fVNXQ0yjQqP98K1XMbr cahkOgJ3mWdIxplZBHXv+p1401gZEBk7B1dcjQD9tAkndMv5SIdxd//3Yrtr8/94vjVh 8ZFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1uFtbkyoP6FALtVBSBQYa/7yZFXHFLiOSjVsvV63nhI=; b=HeG/K0l1i3w4CrR+7eR9FvY/5ZDM0ZWHWlXRxLCljDyLMznN6baVs6mAybqO3gyCJU +Od0nvO6TAYBdpXU79640VX/zx/K+A1HEZH8rB7FXIplkTzntfNu2z83X8bQ3XGvM3LS ue2cvTHRI+6YH0/3r7dp4eEVJkM96+/qZmmEwHY69x21PWM/K4WApBh+KJ6qmfr+CrzE KiVWGjZCjrhnSomvxdHsaw031qmYqizaDoLUV8MTNc9U0F8dAK0E2sJ0Pbi5gDiljxJE iIY8BvsiyS0iOhxEz6wLhPCFsVKcUXFUc0nPmwb3ouSn0KpmcGDA0tnO314o9VaWUVkc UzXw== X-Gm-Message-State: AOAM530b4Guhp5HyMprY2wf+g1iYsQJ+kF9mO1fREVSdJ9AvEh/myyGe xiP27njQ+/SUc/sXmtSa01WCl212oQ4WbA== X-Received: by 2002:a1c:ed0e:0:b0:380:fa8c:da99 with SMTP id l14-20020a1ced0e000000b00380fa8cda99mr9845859wmh.135.1646671646321; Mon, 07 Mar 2022 08:47:26 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v188-20020a1cacc5000000b00384b71a50d5sm13806652wme.24.2022.03.07.08.47.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 08:47:25 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/18] target/arm: Provide cpu property for controling FEAT_LPA2 Date: Mon, 7 Mar 2022 16:47:08 +0000 Message-Id: <20220307164709.2503250-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220307164709.2503250-1-peter.maydell@linaro.org> References: <20220307164709.2503250-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" From: Richard Henderson There is a Linux kernel bug present until v5.12 that prevents booting with FEAT_LPA2 enabled. As a workaround for TCG, allow the feature to be disabled from -cpu max. Since this kernel bug is present in the Fedora 31 image that we test in avocado, disable lpa2 on the command-line. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/cpu.h | 5 ++++- target/arm/cpu.c | 6 ++++++ target/arm/cpu64.c | 24 ++++++++++++++++++++++++ tests/avocado/boot_linux.py | 2 ++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 24d9fff1705..4aa70ceca12 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -204,10 +204,12 @@ typedef struct { # define ARM_MAX_VQ 16 void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp); void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp); +void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp); #else # define ARM_MAX_VQ 1 static inline void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) { } static inline void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) { } +static inline void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) { } #endif typedef struct ARMVectorReg { @@ -975,10 +977,11 @@ struct ARMCPU { /* * Intermediate values used during property parsing. - * Once finalized, the values should be read from ID_AA64ISAR1. + * Once finalized, the values should be read from ID_AA64*. */ bool prop_pauth; bool prop_pauth_impdef; + bool prop_lpa2; /* DCZ blocksize, in log_2(words), ie low 4 bits of DCZID_EL0 */ uint32_t dcz_blocksize; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 7091684a16d..185d4e774d5 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1392,6 +1392,12 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp) error_propagate(errp, local_err); return; } + + arm_cpu_lpa2_finalize(cpu, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } } if (kvm_enabled()) { diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 2fdc16bf182..eb44c05822c 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -688,6 +688,29 @@ void aarch64_add_pauth_properties(Object *obj) } } +static Property arm_cpu_lpa2_property = + DEFINE_PROP_BOOL("lpa2", ARMCPU, prop_lpa2, true); + +void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) +{ + uint64_t t; + + /* + * We only install the property for tcg -cpu max; this is the + * only situation in which the cpu field can be true. + */ + if (!cpu->prop_lpa2) { + return; + } + + t = cpu->isar.id_aa64mmfr0; + t = FIELD_DP64(t, ID_AA64MMFR0, TGRAN16, 2); /* 16k pages w/ LPA2 */ + t = FIELD_DP64(t, ID_AA64MMFR0, TGRAN4, 1); /* 4k pages w/ LPA2 */ + t = FIELD_DP64(t, ID_AA64MMFR0, TGRAN16_2, 3); /* 16k stage2 w/ LPA2 */ + t = FIELD_DP64(t, ID_AA64MMFR0, TGRAN4_2, 3); /* 4k stage2 w/ LPA2 */ + cpu->isar.id_aa64mmfr0 = t; +} + static void aarch64_host_initfn(Object *obj) { #if defined(CONFIG_KVM) @@ -897,6 +920,7 @@ static void aarch64_max_initfn(Object *obj) aarch64_add_sve_properties(obj); object_property_add(obj, "sve-max-vq", "uint32", cpu_max_get_sve_max_vq, cpu_max_set_sve_max_vq, NULL, NULL); + qdev_property_add_static(DEVICE(obj), &arm_cpu_lpa2_property); } static void aarch64_a64fx_initfn(Object *obj) diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index ab19146d1ee..ee584d2fdf2 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -79,6 +79,7 @@ def test_virt_tcg_gicv2(self): """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") + self.vm.add_args("-cpu", "max,lpa2=off") self.vm.add_args("-machine", "virt,gic-version=2") self.add_common_args() self.launch_and_wait(set_up_ssh_connection=False) @@ -91,6 +92,7 @@ def test_virt_tcg_gicv3(self): """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") + self.vm.add_args("-cpu", "max,lpa2=off") self.vm.add_args("-machine", "virt,gic-version=3") self.add_common_args() self.launch_and_wait(set_up_ssh_connection=False)