From nobody Fri May 17 02:03:34 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1680893595; cv=none; d=zohomail.com; s=zohoarc; b=YpA3NQ30kS0BzkvO0f3zK7sr8BuIMxn3fis/OGVe5JX+rNuvLZ9SH5IXZfk+d62u6FaZrD/JaaAnUfT/AbziP+Lx79eO1zePAMe+FTiHuw4/kBS19GDzXGGHm+EPkExI3iR3Nd6sVa8Y7bksfvpvx3mJ3Es4v6q6bsObQVAfPSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680893595; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2qWjpSR7JS8/58Ywm9SNFYWb7gykfyATwi7wvhb4xc8=; b=MaACqVVTakLfXjy5x8VKILCIJUU7yh/j6XDccnjFaQdvBqHb185b8D5vrkZrtdYyIylVifoB0fyCvjVIEk5OuMSxpJSKHCUrcif0AzPrSzxRq89cM+7AHpi5s2gaVXfmEzNyRx4fEDaUZpON7VdLLyE7bV/bDzR6lCeyRGWF/Qo= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1680893595818255.0209746053156; Fri, 7 Apr 2023 11:53:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkrBn-00053E-5z; Fri, 07 Apr 2023 14:51:59 -0400 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 1pkrBk-00052B-FU for qemu-devel@nongnu.org; Fri, 07 Apr 2023 14:51:56 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pkrBh-000874-Fn for qemu-devel@nongnu.org; Fri, 07 Apr 2023 14:51:56 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 60-20020a17090a09c200b0023fcc8ce113so2031827pjo.4 for ; Fri, 07 Apr 2023 11:51:51 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:8bb4:5a9d:7ab7:b4b8]) by smtp.gmail.com with ESMTPSA id v4-20020a1709028d8400b0019c13d032d8sm3205796plo.253.2023.04.07.11.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 11:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680893511; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2qWjpSR7JS8/58Ywm9SNFYWb7gykfyATwi7wvhb4xc8=; b=d7QEVjRj8bLrUGAByzh3iK60WtnSRXb9Ei1/8vlsQ8rDTAg6gZWxiKGsqjBUtAZlqN dpEc2UVgl0qHQHF0uzUrONXWKFXsB2JhR4OKSy8X7us3pavVh660IYVoZzfcv6N66NVj GzfGp+BxAjNu4zCt1ZMOuQSLu+Myd31W1Sk4DeSE2vswuhWPBj5zzx5gVV6zyYmUVY0C ihUES38khSFyREVm20wMhRudEHbezQ7vF+jUeaVPpBukiK0rhZ1sknxeIMao4fiZDlEl DZjNNhm+jwCPyL7MoEfoZwJgqi/ymDDVQAl7mQPWJQS1hmDS7bdEa1HGNhK07WS29AlZ N9Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680893511; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2qWjpSR7JS8/58Ywm9SNFYWb7gykfyATwi7wvhb4xc8=; b=2UhhzB0/yD70gWSCiSl4MKcT+vsQGbnXCl20Z+lA2l/szG0zUnibvk9BI1fD4nS8YO thUShCzlZ9y3eHl57LbgVMBOjaFJby4ptrRSeEoiNoCQgIl/GPao/WJc0d6ek5L8vABy u+BfWvBphY91v/04X12LpBRS2jSOxd8NQCA/0+bj6VK+ljQ/kmKE/WSChSNknjywq6kc 9p46RkiAaBRqvUroXIFU5PRH7V+I0XyPjGWuQnJnsoA2f85jw//6viCncQDBAHGrIm2/ TjjDjavkvb4ttlb0JU8QE6vJsdEM7gdy4mxuudpFrimh/BjGoWOPU0ZKPk6RoHG1P/OI 8y/w== X-Gm-Message-State: AAQBX9fOAiBR7tzNbXWC2yi9EjN/bLDjNthJPeKt+cpEhHAlc3G+zR+a kxuhXF/P/y5Rz8GcJ65NAECNq9fiJHgL0LZpHl0= X-Google-Smtp-Source: AKy350bD2aovWQLccuTINTSE0F9smMiAKd7FjCNX6LspR9WWUQqDDaxlogwkgsvqv8FzyI6mCDQUdA== X-Received: by 2002:a17:902:cec7:b0:1a1:c82d:dcf3 with SMTP id d7-20020a170902cec700b001a1c82ddcf3mr12068847plg.12.1680893511072; Fri, 07 Apr 2023 11:51:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH 1/2] target/arm: PTE bit GP only applies to stage1 Date: Fri, 7 Apr 2023 11:51:48 -0700 Message-Id: <20230407185149.3253946-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230407185149.3253946-1-richard.henderson@linaro.org> References: <20230407185149.3253946-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680893596644100003 Content-Type: text/plain; charset="utf-8" Only perform the extract of GP during the stage1 walk. Reported-by: Peter Maydell Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/ptw.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index ec3f51782a..58a6de09bc 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1585,11 +1585,6 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1T= ranslate *ptw, result->f.attrs.secure =3D false; } =20 - /* When in aarch64 mode, and BTI is enabled, remember GP in the TLB. = */ - if (aarch64 && cpu_isar_feature(aa64_bti, cpu)) { - result->f.guarded =3D extract64(attrs, 50, 1); /* GP */ - } - if (regime_is_stage2(mmu_idx)) { result->cacheattrs.is_s2_format =3D true; result->cacheattrs.attrs =3D extract32(attrs, 2, 4); @@ -1600,6 +1595,11 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1T= ranslate *ptw, assert(attrindx <=3D 7); result->cacheattrs.is_s2_format =3D false; result->cacheattrs.attrs =3D extract64(mair, attrindx * 8, 8); + + /* When in aarch64 mode, and BTI is enabled, remember GP in the TL= B. */ + if (aarch64 && cpu_isar_feature(aa64_bti, cpu)) { + result->f.guarded =3D extract64(attrs, 50, 1); /* GP */ + } } =20 /* --=20 2.34.1 From nobody Fri May 17 02:03:34 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1680893595; cv=none; d=zohomail.com; s=zohoarc; b=m1P/ervXY9bP7pSOakuKEWn5XogPayrG5BrREmrvjzGUDqyL0du9BP7ey4Speqlit2iDnMUrAtQ7pR3Ab2D9aWxivP/IrJeEiEvBT7LpdZJ3OrXQpSFq/VlKXh4lyt504SP7rK88bx9p9ufYu/YWATAT0Cz4mH6bZYKPeYqq4pI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680893595; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zTH6CuxWrs3z8O8UOxqSLGt5vbpCwQ7b4HezyRm7T4A=; b=H97zBLO9RKAKFHONClR19ysL2l0sqDQFo8jhveSDzGCQY4lgXQaiRB38v1udd1gv/PxFfYIsTwM6IMGxxEIJAMMOwMMerWD+OniPqWSjQ+HgkAgF84I0qyEF0gGqXK+Jvh0XMDcpWTx9Uo8RRXmn8S5pJT1A7O6+y2Uib+CbUyI= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1680893595692761.330387309309; Fri, 7 Apr 2023 11:53:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkrBn-00053L-9j; Fri, 07 Apr 2023 14:51:59 -0400 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 1pkrBk-00052K-MY for qemu-devel@nongnu.org; Fri, 07 Apr 2023 14:51:57 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pkrBh-00087V-GV for qemu-devel@nongnu.org; Fri, 07 Apr 2023 14:51:56 -0400 Received: by mail-pj1-x1035.google.com with SMTP id go23so2421044pjb.4 for ; Fri, 07 Apr 2023 11:51:52 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:8bb4:5a9d:7ab7:b4b8]) by smtp.gmail.com with ESMTPSA id v4-20020a1709028d8400b0019c13d032d8sm3205796plo.253.2023.04.07.11.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 11:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680893512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zTH6CuxWrs3z8O8UOxqSLGt5vbpCwQ7b4HezyRm7T4A=; b=ITvzG9Z+LfxLtCWv+7OYOSLDXxlkY8q+kL4+VK9C+PMjZOajRxHU4m69Y/93/zgTup 826AdLSBxO0ooW5RbEJipPGx+st8cOZEHSRuaWJirNUxt5yDWS279QDUvou1WwQsIQaC 3fOg6ijoh06WxWF3BA2ohVHCPa1uiGhYEbSFKMlXcoqOzHaybMjQvtfHPSF673l2QUeY F8ZKrPG+GfbXvJfs+qCNtacBI/NRgPZogRzHv9rQq3Q9wekgeQoSrCny6GRA+RY033Ox CLyzS0IxHtaMwNL/nyKPnYCth8fzoJY15Atm0eZM/FUj53PdKqpyFIwmuveQeg59CdSx Gl9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680893512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zTH6CuxWrs3z8O8UOxqSLGt5vbpCwQ7b4HezyRm7T4A=; b=6r4ME0zVwR3ggXBJBSyguiTKKAISRV4xTCaMY4UQP/9xQsYDjELEEO7kd1KPRQgU32 +IT6ls3347w0IanTed7Y/Ui+b25dwnsjrXj9H7xQmQGN8TFP5r6WucvF6MQFki/6L2gr 9Ui5GtpBUXqEmfZHqapAU4jWr46pxgVMuB4WCj+PVRi6Hl4afFAgMZ9cg3e3wknE3nu4 zzsNhj3Al3EQgWmAc7uENgcB/WuiUhcTsXwgMptAfUQ2VOmCpKBhiVGc3yOTgAPuWP8h Ji1Bk99BbDDzL8Ujfxtxzb8u4WtnIibg4lAgXvfoZ13i6EWG9OYRiqzu4P6Dgk/Y3Wq4 ehMQ== X-Gm-Message-State: AAQBX9ene9KA/JNAUBDEsO+KU7RgTvQ0P6F988+g+F+kUKBnV+c8l/AE 1ZN4MJ0it6B3h/8geqK5iVAd8gWGMceu0wh5xfU= X-Google-Smtp-Source: AKy350bDDPTjlpEiIVBvOISRYOUCe3WXip6wY1tBCvESh1QpW3ern3THmyHdLUCMWDTglv5MFGbYaw== X-Received: by 2002:a17:90b:1802:b0:23f:9d83:ad76 with SMTP id lw2-20020a17090b180200b0023f9d83ad76mr3342835pjb.23.1680893511990; Fri, 07 Apr 2023 11:51:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 2/2] target/arm: Copy guarded bit in combine_cacheattrs Date: Fri, 7 Apr 2023 11:51:49 -0700 Message-Id: <20230407185149.3253946-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230407185149.3253946-1-richard.henderson@linaro.org> References: <20230407185149.3253946-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680893596702100005 Content-Type: text/plain; charset="utf-8" The guarded bit comes from the stage1 walk. Fixes: Coverity CID 1507929 Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/ptw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 58a6de09bc..6d72950a79 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2576,6 +2576,7 @@ static ARMCacheAttrs combine_cacheattrs(uint64_t hcr, =20 assert(!s1.is_s2_format); ret.is_s2_format =3D false; + ret.guarded =3D s1.guarded; =20 if (s1.attrs =3D=3D 0xf0) { tagged =3D true; --=20 2.34.1