From patchwork Tue Oct 19 14:08:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 515955 Delivered-To: patch@linaro.org Received: by 2002:ac0:cd8c:0:0:0:0:0 with SMTP id d12csp716486imp; Tue, 19 Oct 2021 07:39:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfVm75PBgyOsnGCTemV1xqPSGoIbXT2E34Z/35lShEHcskcQjkWuU/zRlSV58uXCsOXCx7 X-Received: by 2002:ac8:7d14:: with SMTP id g20mr315272qtb.185.1634654341474; Tue, 19 Oct 2021 07:39:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634654341; cv=pass; d=google.com; s=arc-20160816; b=XYoEj13E1yM9yCxbHYZ/v7KFdhXf/PI7g9VeJmbQEvEEzteFuUKYaDw3FW1B0rcVQe Ejky4fcNcJZdaa8g4+qvZe6PjcdW6UoHiPxjKHXrNLLfdu/W+EfE2scKPGodLtc9nR8d AoHhG1ggBJJqt0lg/P5Vb9vFKU26MR/EyU4nnYwzAfxwsWCMcfj0aH30UM7uP8LBNE2C zKgE0KQeziiCtGi6Vkqxf4aNqCcuxWPJP7fxZ6RqD5aMP6e8e9RHaj5SkZaVr5B1cu9o WYWHsAYWP6B2g/I1QSqsPysPXeEouCfw9bRq5RBz5xKY+Zwj4LxFJEnOxUwMLECvFQE2 iV+A== ARC-Message-Signature: i=2; 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:cc:to :from:dkim-signature; bh=wvHv9eaWCE3qmCVGDTw3ai276CdKLfaO42BJE6vMc/o=; b=zU2N9/5OIBnyV0IKeqx69t6IX14aaKKSClvyoT7LZVLmXmGkABELTJ2s4WmheqpfIi WPP4C4f2wwoqUI+Yyq6aacmWVudCU4QM82+K76Io/rEqD9hwqvxRBK2pAiC/3kvEC/qp ZUQguLTaVcE9HZH9OC2zTxwLgHA3gFUim3h63A+/uSAKpVmTET3GuLrPtO0kurLLJLMR aMCSMA88GLZBpnqAO6CF4YVgKTQrKkk/EZRNcnlfbAhsMKauzrGCSx2Il5ygT7Jy+69y /I7P+OHR+GdA2tvOU1Xgy8SeaY2L7+I/m1ta66jenLOg1ekqWY8yRyIiM0ro2zugeuYQ +6+A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=j4SBFOSq; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e13si6503426vsj.293.2021.10.19.07.39.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 07:39:01 -0700 (PDT) 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=@amd.com header.s=selector1 header.b=j4SBFOSq; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from localhost ([::1]:46712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcqGa-0000iP-S2 for patch@linaro.org; Tue, 19 Oct 2021 10:39:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcq1A-0003RN-Oz; Tue, 19 Oct 2021 10:23:05 -0400 Received: from mail-dm6nam10on2086.outbound.protection.outlook.com ([40.107.93.86]:41952 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcq16-0001KS-IS; Tue, 19 Oct 2021 10:23:04 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FZbhQlrGCpdD+o6eO2TugNdgEBwIUAAODUbZcvz0JRLH/WOF+3T9VxWOy/+5E/I9fuANeO8r0szu/bCd85n7GjqpQMwWB9tQ++DRToGDodMejK0376Hfh7hXyh+UcjEg+WkgHyUVO/EK7vWl+iO7nbYA8II8ylox29M4p/fD3YMjVLnsDxJ50Aqg2w0jnhy5DgLCHbzpQT++57LeBofFjsoGH3ut4XX7AIJY0rEPJ1LtDJAyzB8QhlcFryM7d+qAewVJeaB5TKcM3/s8LP3w8+hQV1RRlCvS3h9yfBi6EHsukY6wHTcZDx7EOyxLqDmuI3sE+ZJ9M+JT2aiA7QliwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wvHv9eaWCE3qmCVGDTw3ai276CdKLfaO42BJE6vMc/o=; b=dzkKTY0QBmE6qNyMBa/6f5195eFL2kQR+wKNntjJKc9OtpAQ3UCXR2URoAN1iwgyNm5ovXseehfbKHBO1TlLKatmDd5YBszCON/N5ZQ92YVIuTAlAWA/FFOS5q+dSkp2/19xRzy04X3vjWLXOZI2YIrQWo783RJXYNLTO2s6F52lcGIeKYClwqFFduxqRPO9bw089sOY/rv709/jJ46nyOW2jHvNvrFpPxKtoMG8EpoDEcxi8Kp4mC4TPjparqJr556L8xaTLz/O4wypNpgC3I1wp1Eu9cdrLR3TfRv8VpKBC6JHnVZG7RkCOG9f4PuFl7Gh0czdHCBsmPQDua9MUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wvHv9eaWCE3qmCVGDTw3ai276CdKLfaO42BJE6vMc/o=; b=j4SBFOSq8BnW5qv4MpRBoBL0c3t5/ZPfTen9Fyn27bISVd1zVyhREV9X4HxSVAE/67DPz0HiQFYAaVXrWxcB1lPWI15QeDP/iSN9QEcMexackzjS/ouArPwkaFTwD8d1Tczol5u2fnml6gtj8OwbyWlC9tN0Fw5/XB2rNG7atZY= Received: from DM5PR07CA0159.namprd07.prod.outlook.com (2603:10b6:3:ee::25) by DM5PR12MB1738.namprd12.prod.outlook.com (2603:10b6:3:112::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Tue, 19 Oct 2021 14:22:54 +0000 Received: from DM6NAM11FT018.eop-nam11.prod.protection.outlook.com (2603:10b6:3:ee:cafe::97) by DM5PR07CA0159.outlook.office365.com (2603:10b6:3:ee::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 14:22:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT018.mail.protection.outlook.com (10.13.172.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 14:22:53 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Tue, 19 Oct 2021 09:22:52 -0500 From: Michael Roth To: CC: , Richard Henderson , Peter Maydell Subject: [PATCH 02/64] linux-user/aarch64: Enable hwcap for RND, BTI, and MTE Date: Tue, 19 Oct 2021 09:08:42 -0500 Message-ID: <20211019140944.152419-3-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019140944.152419-1-michael.roth@amd.com> References: <20211019140944.152419-1-michael.roth@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 305fddac-ad4e-4e12-3844-08d9930bf077 X-MS-TrafficTypeDiagnostic: DM5PR12MB1738: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +9EycFDjytEukygFOSg0b2iaNPDt40UTELwxL6Kk1Q/Yib0kf9aCzm/pE74NfBDqJDi7cj4BR1QYDAfOAeRv7P9CVr22degBnsqD0pQHzjUbwwOqbaIknvwlVc37fLWANtHianUsPiNMLRh6UIIPeTmeSbBCKZUMt5gFWlTFhxKQpddFXV5zLVLPaGEOHeSFLdDq6tri6Qr7Sobivg0be0GvbOiqh/N1V8t12R7oryHmLHtdak9ry0WgdBrBwE+Pl+U90H6jv00bbM1KLvoXSGfegDxktscZ0rIbxIKaVvlIQMTM627498xn0y2sCn8O3jAid7LOV/tY+2aVLklCIayiQpG4OZ7xrJmI5jN/7u7NY75xKjYTkxP7VcwGiaxG9SE2XmtshAG1CBi2CovrQqEaBSjHIOCYhAfSWBaoa/XEdsYF8gvOXHdqi024tyaIG5mmeDcB1sZlQMmo7XVVS398unCm2LQBEdYni52VVWtP8A01CznNbmCD5tf2ehxnoCMh5vP2AFq8vPOXi0ZGznWNRhjojPkp9JD/GVrv0fJgnetRwmqYmNczS4HuTq49w/0GH77nllh2UNtUFhRp3saa/7P+uzz0l7Jf1W5VpT4uVXZD7mwAQJlzBd9B+5+9STkJR0UE+UmSVOtIFAgFm40ovL80wR35+fgJ1v3+eDGwGZtKuS7wwjGXvMRQB7IfKexnEBQ27O/1UvHDik8lzxGhIChl/Y1iyTCDd9q+AiroRNCrbuMMK7la44pZbHSlT9rQe3FQoMaPUtXgc07G0IEWWsRB8K0mVUvxfvYlNsQJyT898Oz/up8rU3v+cIzx X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(426003)(336012)(36860700001)(54906003)(2906002)(1076003)(26005)(44832011)(2616005)(36756003)(6666004)(5660300002)(16526019)(186003)(6916009)(83380400001)(4326008)(508600001)(70206006)(966005)(70586007)(47076005)(8936002)(81166007)(86362001)(356005)(8676002)(316002)(82310400003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 14:22:53.7114 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 305fddac-ad4e-4e12-3844-08d9930bf077 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT018.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1738 Received-SPF: softfail client-ip=40.107.93.86; envelope-from=Michael.Roth@amd.com; helo=NAM10-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 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 These three features are already enabled by TCG, but are missing their hwcap bits. Update HWCAP2 from linux v5.12. Cc: qemu-stable@nongnu.org (for 6.0.1) Buglink: https://bugs.launchpad.net/bugs/1926044 Signed-off-by: Richard Henderson Message-id: 20210427214108.88503-1-richard.henderson@linaro.org Signed-off-by: Peter Maydell (cherry picked from commit 68948d18224b93361e2880e2946ab268d0c650d7) Signed-off-by: Michael Roth --- linux-user/elfload.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.25.1 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index c6731013fd..fc9c4f12be 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -586,6 +586,16 @@ enum { ARM_HWCAP2_A64_SVESM4 = 1 << 6, ARM_HWCAP2_A64_FLAGM2 = 1 << 7, ARM_HWCAP2_A64_FRINT = 1 << 8, + ARM_HWCAP2_A64_SVEI8MM = 1 << 9, + ARM_HWCAP2_A64_SVEF32MM = 1 << 10, + ARM_HWCAP2_A64_SVEF64MM = 1 << 11, + ARM_HWCAP2_A64_SVEBF16 = 1 << 12, + ARM_HWCAP2_A64_I8MM = 1 << 13, + ARM_HWCAP2_A64_BF16 = 1 << 14, + ARM_HWCAP2_A64_DGH = 1 << 15, + ARM_HWCAP2_A64_RNG = 1 << 16, + ARM_HWCAP2_A64_BTI = 1 << 17, + ARM_HWCAP2_A64_MTE = 1 << 18, }; #define ELF_HWCAP get_elf_hwcap() @@ -640,6 +650,9 @@ static uint32_t get_elf_hwcap2(void) GET_FEATURE_ID(aa64_dcpodp, ARM_HWCAP2_A64_DCPODP); GET_FEATURE_ID(aa64_condm_5, ARM_HWCAP2_A64_FLAGM2); GET_FEATURE_ID(aa64_frint, ARM_HWCAP2_A64_FRINT); + GET_FEATURE_ID(aa64_rndr, ARM_HWCAP2_A64_RNG); + GET_FEATURE_ID(aa64_bti, ARM_HWCAP2_A64_BTI); + GET_FEATURE_ID(aa64_mte, ARM_HWCAP2_A64_MTE); return hwcaps; } From patchwork Tue Oct 19 14:08:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 515960 Delivered-To: patch@linaro.org Received: by 2002:ac0:cd8c:0:0:0:0:0 with SMTP id d12csp786990imp; Tue, 19 Oct 2021 08:47:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrplmw/qXqvw70yAVc1RRUnGGivUpCqGP5QjyYZMoS/BDVHMmWKKGLFss56f2qOZaRF1dO X-Received: by 2002:a4a:e788:: with SMTP id x8mr5280965oov.75.1634658430950; Tue, 19 Oct 2021 08:47:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634658430; cv=pass; d=google.com; s=arc-20160816; b=rfQWHC+sanZcJZOhvMBCWRF1QpEmwm7gr/EkiFxecumB/bsuLse4zpHj3IJhxx+MdI V9nCM86fkY7azunucg0TG85aJOnGYuRYcMJ7ikDsTEUclhxL4VJ3qcVXcog5bItIxDJl Zxuyv2He2bfoHEWyTtXczJzAwcnz61Wz5ILTwlrsFjvcvLsODD/f2dZKP5rUQLwMo9Y4 R08wvmI1XcUSX5j1KzHD3m98akIBJHKI0Euzq1cvTnfNBjLOsvQOcB0a/KLaD/P6FjnT FaAGMc+Mk8wcPODqDxwlXBMLrbk+xxCKhpSHPLZoKloKxK71QPNFiQLlGJzubSSVzZTy uyFg== ARC-Message-Signature: i=2; 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:cc:to :from:dkim-signature; bh=3dbmu41gzExlIBkRVbHuUTC3dUS0rIqJ126RuElBaMs=; b=M4Ojtl4wikoQwoaGzbFO7Yq3i3HoFbzJXBxbAkn51Fkv0L7cxX/UIslwi9mGcB8Slu oRzn7bLpgfpT/dYtre1RuVZBoar00Qkbvo3ZmnhNB3Mmp4Q/XlGjH98EfrF5nFev3y84 SENQsg1eMCeDbBv7iJnwt05ziJyY8Nl3plUBFrdyrRPK6Dv5T5lwwhHYuc9hNFMuEzsY QWg5rYoA5hkhloB6VFMKqpohTF/V2l29mwJAYgyem8IgwcIxo0PBkEKbeHy4t2Cyf3sN F/NQjIgoXa7qTmrwdzdMHwJdqC9k/+Hyxvnn0N9ISuHzOhIWvrrkvNUBOxNWdN9x9pRD fCkQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=DOMHrJzT; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n74si18126635ota.106.2021.10.19.08.47.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 08:47:10 -0700 (PDT) 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=@amd.com header.s=selector1 header.b=DOMHrJzT; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from localhost ([::1]:45166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcrKY-0005IL-5p for patch@linaro.org; Tue, 19 Oct 2021 11:47:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcqEf-0006m6-5T; Tue, 19 Oct 2021 10:37:01 -0400 Received: from mail-bn8nam11on2078.outbound.protection.outlook.com ([40.107.236.78]:44512 helo=NAM11-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcqEc-00005f-Q1; Tue, 19 Oct 2021 10:37:00 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CSlR4Nzr1QitUUqBEN4OM6h9xMdOway57t0YsZ9naYfupYezvrFeVwJDqD5v1R+/xrD959vfbCJ7YcgahX5sbErYzp/9VL3gfiUV4+DU2fmgqLk5ofQO3c4hsiAyIHs71Kfz+snqc3QtmHG+M+ClNp3DQXCZwVytQECztX9zBaGlB7xDgACXpID1Y4xVP9UFsxjSxZENwhRsVZDovwzuAfPzu7g8JTnYCTzZRkaBy9Kn7JvZSQSvW8czKnFoBTgchZtCdIXqtHYC55Na9H+2Z06jLBvg0lO7kis802Aofg9wH+6kDgXUnhY+SPuzDdf6MgxVouHV+dXu19Av/wNqUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3dbmu41gzExlIBkRVbHuUTC3dUS0rIqJ126RuElBaMs=; b=j2EUjWCUumIlXLzAD2Yap3roBhmp4qHm85mLaFSheovx9ZbYC+hbwa68ugbpB3Sv/XB7xI74OcIQ0VNBAlOtoRuWv3l6iegr/ND0wY5v1HwGK2Gw237n7RVk5F2STM3jfv5hQ6DRYUBGXuOa2NzM7JX4ObdKsydjwgXAFlklu93K5/RvORPoCNfQtbpQhic0RyWvXLK7tvmSu85QnBT3KpP1bSYWOZBQHQvUxZdyaZdlCUTDRvqyP0w8RHEVSTR0W2lrRC0z/4NXLo4MyausgopWhrCKY/5VW3q1KwaZeSkYViKfWKXoLCzZh1VvThqDfJUiK3YdIycpqsRgpRsQ1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3dbmu41gzExlIBkRVbHuUTC3dUS0rIqJ126RuElBaMs=; b=DOMHrJzTbuN7B2yN27DgmGbsdpgk4xwu+J/daNlBPGemMuGKBR6lJIsgS3kPN30CWovmIu/YhKX0uVHN6jMtZPaq1J0Bq4Z4kxb9sQw0HdZOMU6j5lXwGB3+4f1BuNz0nEaNxOmdx1g+T69kVJyU4lA0z0qLka9wqW0omlj12Rw= Received: from DM6PR07CA0102.namprd07.prod.outlook.com (2603:10b6:5:337::35) by BL1PR12MB5379.namprd12.prod.outlook.com (2603:10b6:208:317::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Tue, 19 Oct 2021 14:36:53 +0000 Received: from DM6NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:5:337:cafe::50) by DM6PR07CA0102.outlook.office365.com (2603:10b6:5:337::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Tue, 19 Oct 2021 14:36:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT023.mail.protection.outlook.com (10.13.173.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 14:36:52 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Tue, 19 Oct 2021 09:36:51 -0500 From: Michael Roth To: CC: , Richard Henderson , Paolo Bonzini Subject: [PATCH 06/64] target/i386: Exit tb after wrmsr Date: Tue, 19 Oct 2021 09:08:46 -0500 Message-ID: <20211019140944.152419-7-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019140944.152419-1-michael.roth@amd.com> References: <20211019140944.152419-1-michael.roth@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4665dac9-0811-4f15-c8fa-08d9930de48d X-MS-TrafficTypeDiagnostic: BL1PR12MB5379: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:15; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: piUR9Myq4egTV7lTQ0YoPwvXFvDFV6HjmDQCDcV62+pjqbZ2Y2JQdDEDjw70D6nND2qbq9lLX2ULXm3M9Eil8n4GY3cqkHwgVO1MA/Fcfaqqq8hWWBRWYWWopYZG+3m3WXkkkfAkan13GoNSM2ZA77JyAfPAfmtcl5gbMHLKElqLRFNOGMsaZZDunP204IwVFMTHYe8J1Gp1zKaxrFMhx4FRPHVoVOpCrRUbM/mECgOzw6/M5f1oixcKYWnFWckw0jRxqNqqd/IS4eypufmhG+au+ySuj0AJJhYuIrJdOrdmpph56dc24uLF9JzodAGUfZZUv1Y1ePD2qlU+n/eDEujx1xcogja58tAsh2dP/O6xcY8pVQ4eq5xCTpp58lDySl/awU3nSF99G8rnpLFxx9jUyIvMrP6XaoP7yaItwnPGxWgW0K37xwXe5nYEDXFlJibRRYCYvF8tYYyfqVRoGTFhLe0mUqijhSHimxbCD1W/bsAmv439q1cDFJDqb81NiC/Wp96DvQ6o0aJyAjW+pSC4qxsDmfB3AGQOEFYnLzbX4myPObJ+wHjYcR7K8F1AEaDf7tmbkjJGkYOpHbxv0fe5Z5A1XZ7Hz+QQ1TQ5lG8kG69UWSeCuFwBQom+O/kduFfhFxsP9q/HfQicEZEMHL3mvpn9w+Soi314YlZ2TQ01NZQJEvy3Sdja/Ql+epNVoYVnh5BIK9pxA00e/m/jPQar7oyiR0Kd3HLAk2Xe/pfqW3DaJSleaAF5C6erIpJY X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(36860700001)(5660300002)(186003)(16526019)(6666004)(83380400001)(4326008)(316002)(47076005)(8936002)(36756003)(81166007)(356005)(1076003)(508600001)(26005)(8676002)(70586007)(70206006)(2616005)(44832011)(54906003)(4744005)(336012)(6916009)(82310400003)(86362001)(426003)(2906002)(17423001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 14:36:52.7131 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4665dac9-0811-4f15-c8fa-08d9930de48d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5379 Received-SPF: softfail client-ip=40.107.236.78; envelope-from=Michael.Roth@amd.com; helo=NAM11-BN8-obe.outbound.protection.outlook.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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 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 At minimum, wrmsr can change efer, which affects HF_LMA. Cc: qemu-stable@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Paolo Bonzini Message-Id: <20210514151342.384376-46-richard.henderson@linaro.org> (cherry picked from commit 244843b757220c432e0e9ae8d2210218c034730d) Signed-off-by: Michael Roth --- target/i386/tcg/translate.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.25.1 diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 880bc45561..6b713b4fff 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -7198,6 +7198,8 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) gen_helper_rdmsr(cpu_env); } else { gen_helper_wrmsr(cpu_env); + gen_jmp_im(s, s->pc - s->cs_base); + gen_eob(s); } } break; From patchwork Tue Oct 19 14:09:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 515956 Delivered-To: patch@linaro.org Received: by 2002:ac0:cd8c:0:0:0:0:0 with SMTP id d12csp738761imp; Tue, 19 Oct 2021 08:01:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyQqasg5PIUgbHWEuH+RRkHFFpIrUWgWyG0EvvCtRnOTkBc4o73UR75gCfBlAxw+2+inHh X-Received: by 2002:a17:902:7106:b0:13f:aaf4:3e91 with SMTP id a6-20020a170902710600b0013faaf43e91mr18457746pll.84.1634655708430; Tue, 19 Oct 2021 08:01:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634655708; cv=pass; d=google.com; s=arc-20160816; b=R4UfpF9cdf3YQ2W43mdPSSB1v7/8VDNGVrGOBDfQ2+ko5Yv99+hTDHTnpVz0dqw0Vh xnbpdWNja0Yi6RKQxJlUgVMoH7GUcPKlkpTvoLIvvOq/ukhiRLE+bKmGJvM97duS0dxx DguEFHCuLws/h0Igx2iw90WA1q6ktV1+wireiIvKkh2oRsXQtf/AhinGmrodJhXuhxac yyi1Velns2XmwLjQF0SnwXkpePNniPHVfoBwuV2smgHssKg1ceNjKUO5qJhB5BYWxMJn jnPbq+R8jGdzCPWO5ZXffkTXvkmyMzpVI7+V860x9e/kY9JlSju0QqWppEQdf9CJK8U7 kuMA== ARC-Message-Signature: i=2; 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:cc:to :from:dkim-signature; bh=ZneDv9v/wgTpdLKFiCQyDzLIEnp4jb7OieCyJfWdLYU=; b=gpw/q7rDD2IdBnaSIW2nUdTcDPPQPkTBAkvuTWA/MXAjFDVD4xdBestgyRei7OwB3z SPaLemdfcpdx9//7Bh1UWr//IH4gs3LK9r3scxKLSDhAx7QsiC3kiZnRs596dbquKbrQ 95SBd0oIPbzdZgHrgSCZesAVfrw+/hYjC0QVOl1lhN2/G3FsT22MrJWNLcTy2WbPqB+9 0LbOMD8thDtgH/m9+d0dIxxBU85XqXbYdbekmhMBC7zQYdZPXdKIFFyetyaYgfkT05KP jWX0CvesbWKjsPXO+N9XRZoLnhCLtBwSOn61lTX4SKlxTmvwLoZN1JHfvA62vLDQ7mqW sTAQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=DkCPEFzS; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v5si11293838uar.190.2021.10.19.08.01.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 08:01:48 -0700 (PDT) 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=@amd.com header.s=selector1 header.b=DkCPEFzS; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from localhost ([::1]:44394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcqcd-0003mP-Cz for patch@linaro.org; Tue, 19 Oct 2021 11:01:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcpye-0008Fx-PA; Tue, 19 Oct 2021 10:20:28 -0400 Received: from mail-dm6nam10on2083.outbound.protection.outlook.com ([40.107.93.83]:29965 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcpyc-00083V-RT; Tue, 19 Oct 2021 10:20:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MY3YgZCTA4UZ2PyC3QznGV8QFUZYFl4+osyPCnw8AQqMILezWGV1LUS89Acdv6fhJYUBnrnguv8Ex7HpKa9IioNQUqn8yncWvoCTZFfWFDCETBMtsRxhiNtCHTnu194o3jfAFeQoOG8GrzTgQdZ+esk/m296F5FnKl1em4v7pNhDwxQCC2kxlI1fDZehrvK2vfLIV23GYV6tQduYEudmgpPSb8eusXq8fXrRcy4ZlSX43gcPx1dsDJ8VzLJKIuuaotmJuhg95EHdlHGoz8oLgfMFcD5udioc7KTl9iknHaBG/Wbf8zfeDjdlJWrdCGJcIBlyjfeghp0TgixC9KAOtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZneDv9v/wgTpdLKFiCQyDzLIEnp4jb7OieCyJfWdLYU=; b=ed8x8/d+JpChQDfmUc3dvew8F3pkj5l2Y6muX7O+OJs7DqAsKt8hz19skVEa/pzaXrxLu0sP/JafsD12deGwrYjid6vvcsWYIcOIsk9mKcOmbJrG79iBLI4akFIBL0Rz6R/afH0i5tuZ28MhfXaohkG9r1W0cSq1KQqohZwOqVyM0s7gHx/ppPN1LYOlzLDr9uInMlZ7SvzZzBEOSO+RyjsSlcyhYAdwy5uYsFTqqyF3Pb5h3f+Vn+eFyZRQeVggiIR/gHgk3sVFkh94EhB7NyAuBHwS8ngZx6Gwshy26jfMixO7ghHPNX87ktq1oriT/TBVRLE8fHz1u6I5+UgKpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZneDv9v/wgTpdLKFiCQyDzLIEnp4jb7OieCyJfWdLYU=; b=DkCPEFzSV+c7Al0Dwo3s/U1PIZ9+sCfz7lo/wcEWIEGJ85ghGuopIn19FTNzejNY2ZFbGvV1qljN7C5PKe+m0WopA5G0YJynW8Q+jfQ5lgtLqjZh2ZH3aGp+LwKBNV8HIWRANkyyh7bPGEhhqd8aCdojHNPGtAkoQWYbe966fL4= Received: from BN9PR03CA0936.namprd03.prod.outlook.com (2603:10b6:408:108::11) by MWHPR12MB1199.namprd12.prod.outlook.com (2603:10b6:300:10::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Tue, 19 Oct 2021 14:20:20 +0000 Received: from BN8NAM11FT038.eop-nam11.prod.protection.outlook.com (2603:10b6:408:108:cafe::9a) by BN9PR03CA0936.outlook.office365.com (2603:10b6:408:108::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Tue, 19 Oct 2021 14:20:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT038.mail.protection.outlook.com (10.13.176.246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 14:20:20 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Tue, 19 Oct 2021 09:20:19 -0500 From: Michael Roth To: CC: , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 24/64] tcg/sparc: Fix temp_allocate_frame vs sparc stack bias Date: Tue, 19 Oct 2021 09:09:04 -0500 Message-ID: <20211019140944.152419-25-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019140944.152419-1-michael.roth@amd.com> References: <20211019140944.152419-1-michael.roth@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6a0c0e23-d304-4e5a-602e-08d9930b953e X-MS-TrafficTypeDiagnostic: MWHPR12MB1199: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:227; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t5tlf4I8wV0fJ1z+JH68boV+RWeqXWz/RiUt8WYbZoY+KHAT5dahATxDI+aMFmyW11JlUAN0K8zhsR37qDfYFUkBJAxn8H8uVl27wWPVcFl080oJxn7GCYaFe7w5kwiaUhqWZ4iml5hd+gbaupu/PctUr0zwO0ASvprEdFOZGgbOH9IVkETXSXiKwPPJSvJ8x08xmdNEXPV3K58emKsyOYhQk7f7RkywBw1+SK1OqKZFAfLqMoabXyjaCMj7vWIaPGK1MKh1WFJkmFvdqhrdygP5z3Jzd5+BvLr27YSHgmTNKEAmBmRGk4xwe7VRgcmJA1tVa+zN0Ip16TjS/Lhdn3+9apVizlkOfqW8qShEpierlfV92Iue0X9kwxiVyNIPs9/gRBM+ur+qPqPblnxXP5WqwbWXPKNJ7kzn7SnQOf6571jAUkasdQsHFml+t3OJfIZ3SLlnTmjKi405guIOuvT733jC6/jL57tQncioaYhFO5wOz8KW3+0mSWYNQcDzU41Yr/+bnbQPUaArUzg38MDTTr7J5am9A1yUXF6oWbEWW9bAl9nsAgx33z+s88jdg0IHBFrgOb0/8/XDjYK5xmO7kvKQxCYbbkpfiDOuX2PdipGzgFL3zHQdGr1EiV46Mfq/k9GvbrBZVVlHb/dvx6BSUCPIK5oHMp2AmUFNJgtGkOivpHGo5YwcSY9zq6vYlBP2QH5KIWQ9zPIIZWsSzgUa7i/nNIRAvkiN5IdBCIw= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(426003)(26005)(336012)(47076005)(36860700001)(16526019)(8676002)(36756003)(82310400003)(186003)(316002)(2616005)(5660300002)(4326008)(1076003)(8936002)(83380400001)(70206006)(6666004)(70586007)(2906002)(356005)(44832011)(508600001)(6916009)(86362001)(54906003)(81166007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 14:20:20.6993 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6a0c0e23-d304-4e5a-602e-08d9930b953e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT038.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1199 Received-SPF: softfail client-ip=40.107.93.83; envelope-from=Michael.Roth@amd.com; helo=NAM10-DM6-obe.outbound.protection.outlook.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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 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 We should not be aligning the offset in temp_allocate_frame, because the odd offset produces an aligned address in the end. Instead, pass the logical offset into tcg_set_frame and add the stack bias last. Cc: qemu-stable@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit 9defd1bdfb0f2ddb3ca9863e39577f3a9929d58c) Signed-off-by: Michael Roth --- tcg/sparc/tcg-target.c.inc | 16 ++++++++++------ tcg/tcg.c | 9 +++------ 2 files changed, 13 insertions(+), 12 deletions(-) -- 2.25.1 diff --git a/tcg/sparc/tcg-target.c.inc b/tcg/sparc/tcg-target.c.inc index 3d50f985c6..c046d1cc60 100644 --- a/tcg/sparc/tcg-target.c.inc +++ b/tcg/sparc/tcg-target.c.inc @@ -987,14 +987,18 @@ static void tcg_target_qemu_prologue(TCGContext *s) { int tmp_buf_size, frame_size; - /* The TCG temp buffer is at the top of the frame, immediately - below the frame pointer. */ + /* + * The TCG temp buffer is at the top of the frame, immediately + * below the frame pointer. Use the logical (aligned) offset here; + * the stack bias is applied in temp_allocate_frame(). + */ tmp_buf_size = CPU_TEMP_BUF_NLONGS * (int)sizeof(long); - tcg_set_frame(s, TCG_REG_I6, TCG_TARGET_STACK_BIAS - tmp_buf_size, - tmp_buf_size); + tcg_set_frame(s, TCG_REG_I6, -tmp_buf_size, tmp_buf_size); - /* TCG_TARGET_CALL_STACK_OFFSET includes the stack bias, but is - otherwise the minimal frame usable by callees. */ + /* + * TCG_TARGET_CALL_STACK_OFFSET includes the stack bias, but is + * otherwise the minimal frame usable by callees. + */ frame_size = TCG_TARGET_CALL_STACK_OFFSET - TCG_TARGET_STACK_BIAS; frame_size += TCG_STATIC_CALL_ARGS_SIZE + tmp_buf_size; frame_size += TCG_TARGET_STACK_ALIGN - 1; diff --git a/tcg/tcg.c b/tcg/tcg.c index 1fbe0b686d..a9cf55531e 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3489,17 +3489,14 @@ static void check_regs(TCGContext *s) static void temp_allocate_frame(TCGContext *s, TCGTemp *ts) { -#if !(defined(__sparc__) && TCG_TARGET_REG_BITS == 64) - /* Sparc64 stack is accessed with offset of 2047 */ - s->current_frame_offset = (s->current_frame_offset + - (tcg_target_long)sizeof(tcg_target_long) - 1) & - ~(sizeof(tcg_target_long) - 1); -#endif if (s->current_frame_offset + (tcg_target_long)sizeof(tcg_target_long) > s->frame_end) { tcg_abort(); } ts->mem_offset = s->current_frame_offset; +#if defined(__sparc__) + ts->mem_offset += TCG_TARGET_STACK_BIAS; +#endif ts->mem_base = s->frame_temp; ts->mem_allocated = 1; s->current_frame_offset += sizeof(tcg_target_long); From patchwork Tue Oct 19 14:09:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 515957 Delivered-To: patch@linaro.org Received: by 2002:ac0:cd8c:0:0:0:0:0 with SMTP id d12csp742732imp; Tue, 19 Oct 2021 08:05:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJza8BfdkmD+U/Wd5WabvqBTHsiqTfsydMomsxjPNdpCHQcU6FkUd01EAziW1W33lYfyBAsF X-Received: by 2002:adf:9b97:: with SMTP id d23mr44191653wrc.135.1634655902736; Tue, 19 Oct 2021 08:05:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634655902; cv=pass; d=google.com; s=arc-20160816; b=dr2o39FeziZgogW0fldsjENXS3OHKn0rEf2W9vgce2kvsV/nxLXJ7nTCoyiLzFGjRx bgTbqXpeul9ey5f/MHF72qCrr7W74Ut+gnS7q52c3FdFvObDbaXYd+Pu/9YP9euHErmY gPG1h0+eEQseJWJzUlahEdTmORzdLgYoHVxfJv4vRY5HnmwppbmTyclm8YROD0IVRNRK KHDBMSWsk3oikHsBKYiilxByqpS2oGfEc17DoGr/TyFiquo2v7tovHcTQ0aud1lXlLHa gTJeXrzAB8leqZyhom0FzQDyCZ+pYJ5UhlyNWSV5V78P+ugXCOKoCVmQgZ3YMD+FXy+F 91wQ== ARC-Message-Signature: i=2; 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:cc:to :from:dkim-signature; bh=04Eb/0pxQsQAj0lMej8dK82MEmvta54bVAU9g7aKanw=; b=U4nZFhGVwMsynT1BoMZE09vOvfSit+M1M20kESpldEOX6sg0o/vp+PhbDHRtx17ody Xlgd1rcl0hZKukzgdGE9x7oVFHS/kglnKl2nmn0KQUmeMmUWH5XWmN0vpRRUrcq2DoCh B+HNECIShGVgiM7bJO8EJNe5X1RGAv57v5dQXqRthoq5JBECSPB/Y66WOBX5TVNjYgyb fY2PoMz0VFk8G3RSpzSV/Xqj2TsI4QCpfPjFleLHw/BfO6XEFOkCCxWLPE31BzF7E+WG W+eXYUqzyFHsKHLcy1OJmBqEt/Mj/dBZTf5wP9Ozu2K+Jj+PBUuEZ8EWHm+O1lhQ52fD pMvQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=zamlsLOE; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l1si26093860wrs.187.2021.10.19.08.05.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 08:05:02 -0700 (PDT) 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=@amd.com header.s=selector1 header.b=zamlsLOE; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from localhost ([::1]:52958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcqfl-0001B0-L7 for patch@linaro.org; Tue, 19 Oct 2021 11:05:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcpyw-00007C-Rx; Tue, 19 Oct 2021 10:20:46 -0400 Received: from mail-bn8nam12on2061.outbound.protection.outlook.com ([40.107.237.61]:29519 helo=NAM12-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcpyu-0008Le-QH; Tue, 19 Oct 2021 10:20:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hJIuSrjm/hPOzEWs71XGktwCBQ3J1DMtZcnkj/ENUDx43gTX62dp7Bz0PKn0IJDEjsmgyJVvRiAIGm7yw1sWJIl5ayfxV67zohdVI/XSw1o4vicrlCkkFGx/6/g6BWdn4L3yvRUDebu1Sz2f4FgEsxFghmpGiY5DqrmPUiUhieCATV+jT3+/doBTM7o/Unuqx4Wr/yWdo00r/Xht6N1qOefuTjzHjmcW/a1gMtoZNWx+nbq+l6x2+ACY85Kh2e+TbAkP0tzBOoE5m9GBV6GrgIe8WYhhPZBkDUvK/zUpTtMxEU30Qnx8C6moxkD0alNG83BHZtEnO55CDnxJaRmvAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=04Eb/0pxQsQAj0lMej8dK82MEmvta54bVAU9g7aKanw=; b=iJh0aCqKkaw7pIgjAHCPeEEEY8ppEeLf8IxKWZgQBBPwF4FQHVtVZk43SqCBWJfCKp21MvMM95DrS4QdTIASLAPdDDocf3MwHoEbBJ0VBeiMImEvr30MEDQZbVmAoZIQcnk3fNAUQjY6FE3aPVBtY8AivahaNO+lE9mhhf0qcZpaiT55vVtbyKasjm8frVnc0ZC/2n7+yqwuqf613pvzA29DDcBESqBpSLTftqzIko3O7lSAm14K5q7i9gjbXg+zhyg4Z4mXrq30K0/bHoRJS7EBb3Gd90kpRlzL+7Md34DohRmprFLFmNVPsVFk5+91pRWLg60RI/2Mb/E2BrpvGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=04Eb/0pxQsQAj0lMej8dK82MEmvta54bVAU9g7aKanw=; b=zamlsLOE8hjgviPUg/FPCBUkk3jGGMb55ULF8sU/mJwZU3ZabI/d7dp0YI/JW0l7UqTBIfTMw2zVl6lRukMvzBXwWExzJv5eBrvsOoNIcQYd8o3B3P/XF8qlHjDcsNL9QVaq1vPFVPsldddjtDBB6ghWuEpZNHBKMhaYRDvIXMk= Received: from BN0PR04CA0085.namprd04.prod.outlook.com (2603:10b6:408:ea::30) by DM6PR12MB4926.namprd12.prod.outlook.com (2603:10b6:5:1bb::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Tue, 19 Oct 2021 14:20:41 +0000 Received: from BN8NAM11FT045.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ea:cafe::c6) by BN0PR04CA0085.outlook.office365.com (2603:10b6:408:ea::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 14:20:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT045.mail.protection.outlook.com (10.13.177.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 14:20:41 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Tue, 19 Oct 2021 09:20:41 -0500 From: Michael Roth To: CC: , Richard Henderson , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 25/64] tcg: Allocate sufficient storage in temp_allocate_frame Date: Tue, 19 Oct 2021 09:09:05 -0500 Message-ID: <20211019140944.152419-26-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019140944.152419-1-michael.roth@amd.com> References: <20211019140944.152419-1-michael.roth@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 869de57a-4a65-4bcd-28d8-08d9930ba1aa X-MS-TrafficTypeDiagnostic: DM6PR12MB4926: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:46; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1ElWBNNGRkKF6JHGT3TKqe1VgMdz3ABWF45S6PEL9c+cJvNSxAQRoBDZxg1/UHuZpA91wn13xiJta+Flxo11moJaLJvhUWuSTH85iMlIYa+v/YYgI3m256daP2lrGNQVuK+xuoyTIG8B0J0zFrMaB8TQH6vZT8NjgOjFkstovkGMNk91dTLikhK+Ykmu0wLA4bKxorZYb+FpPPsAoK6hBivTw7EN7u11Da1AElg+q0NOomov8lVZWfsL5S6dzmh2mFpOY/nO2hLA041/PiQ33u/emX6XtedhzWf5rMHxZk/IhfZ39ZmTj9aWFxERfjDWd/7JOp28uQIz0GaMIQcd20kQFZ7Ce1vx4Ppl0YPannijtaSCIKB5AFMGK/6yfLJpAuTkYTYHTNdJ9XktcaexdIT2vSlvhp6Q/fyYzj6B81XfzdBwR5RUD+T5LxSF9k95TWcbiHIre9Rr1SQNOXKuYcYbB7PvwMEWQH23C8Oqx/w5/M4TtQ7i9czjeIMghvDbbJXCCd5rVBZKjtvHM4aFIaA3f/vG99f5NrpaD8ylorQXpDgUxvb2qGHu8bP0olfMZbKKPhg+jFYrQcAagM+O8aWNNFfKbNYuyGRcrNcJOOTsEcybhQSK4E9Az9HrY2fxjXyV6bhnqCRTv8znvHxCgOFm5KnXB7bKpRGdGaSiBvUzWePI8sCuHGhmERxNVPOzI3Wn2wvLQFPuspNBoexr/WIcYAS+HANow9mpHlTJffPlnSE/9hoUVKn8in16hzRBdRvZX/RfL943Rh2m3Qtm1pSMbIhAOWIYmji7aaALITVq65M1Wb0VGm/9GFO/HrtB X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(16526019)(186003)(6666004)(2616005)(1076003)(8676002)(426003)(316002)(4326008)(47076005)(82310400003)(36756003)(83380400001)(8936002)(70206006)(44832011)(86362001)(6916009)(356005)(36860700001)(2906002)(70586007)(54906003)(26005)(5660300002)(508600001)(336012)(966005)(81166007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 14:20:41.5412 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 869de57a-4a65-4bcd-28d8-08d9930ba1aa X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT045.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4926 Received-SPF: softfail client-ip=40.107.237.61; envelope-from=Michael.Roth@amd.com; helo=NAM12-BN8-obe.outbound.protection.outlook.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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 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 This function should have been updated for vector types when they were introduced. Fixes: d2fd745fe8b Resolves: https://gitlab.com/qemu-project/qemu/-/issues/367 Cc: qemu-stable@nongnu.org Tested-by: Stefan Weil Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit c1c091948ae4a73c1a80b5005f6204d0e665ce52) Signed-off-by: Michael Roth --- tcg/tcg.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) -- 2.25.1 diff --git a/tcg/tcg.c b/tcg/tcg.c index a9cf55531e..21d65969be 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3489,17 +3489,38 @@ static void check_regs(TCGContext *s) static void temp_allocate_frame(TCGContext *s, TCGTemp *ts) { - if (s->current_frame_offset + (tcg_target_long)sizeof(tcg_target_long) > - s->frame_end) { - tcg_abort(); + intptr_t off, size, align; + + switch (ts->type) { + case TCG_TYPE_I32: + size = align = 4; + break; + case TCG_TYPE_I64: + case TCG_TYPE_V64: + size = align = 8; + break; + case TCG_TYPE_V128: + size = align = 16; + break; + case TCG_TYPE_V256: + /* Note that we do not require aligned storage for V256. */ + size = 32, align = 16; + break; + default: + g_assert_not_reached(); } - ts->mem_offset = s->current_frame_offset; + + assert(align <= TCG_TARGET_STACK_ALIGN); + off = ROUND_UP(s->current_frame_offset, align); + assert(off + size <= s->frame_end); + s->current_frame_offset = off + size; + + ts->mem_offset = off; #if defined(__sparc__) ts->mem_offset += TCG_TARGET_STACK_BIAS; #endif ts->mem_base = s->frame_temp; ts->mem_allocated = 1; - s->current_frame_offset += sizeof(tcg_target_long); } static void temp_load(TCGContext *, TCGTemp *, TCGRegSet, TCGRegSet, TCGRegSet); From patchwork Tue Oct 19 14:09:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 515958 Delivered-To: patch@linaro.org Received: by 2002:ac0:cd8c:0:0:0:0:0 with SMTP id d12csp761152imp; Tue, 19 Oct 2021 08:20:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKgPgwbXDdS20hHE+BefLzBxIiR2YbS1bbNkzcDKnKloKj+JUcEe8J55tdXvV0aTGNo0NB X-Received: by 2002:a05:6830:2429:: with SMTP id k9mr5874930ots.61.1634656853200; Tue, 19 Oct 2021 08:20:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634656853; cv=pass; d=google.com; s=arc-20160816; b=m10j4XgLOTnAzfCk6QwqWDppHXzNg+rtUyzzvJmrLDWEDC8lucLvQx3Niy5rOYDTT8 GCpQ2/8DtWJtCX9eTJUs+1AaXpgBiON+UlwkRG6ARflChLE8MJFKvoCWTTZ+KS6DhMRh XAr9AyE5B3lcYiGWegzchDWt0519s/yI8tosXIDWss/OdW8Bo9upnVVu+jHUONgaIteU BXs9e8j+SxzSmQ3+GVolNkxY2DYfEFI3YeEWOevJlIHyeDbgd9KbWPkfJ8DgGmWIsAUG arH2HbBsnkh+6GZBGQTYgAHiTQgoBEg4LnmTGrU9kNdnDY43LssEH5KUtjWf4juPsRdL 3rBw== ARC-Message-Signature: i=2; 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:cc:to :from:dkim-signature; bh=GfQ+H/xpPCSSJRn737zt7+p9SVApowO2Em6kFD/nCzA=; b=o3z/TwC8SqDm8oVa5b7MWt+6LEx061IsJr8Kpf7uQLerr4/+cWac3Os810gim+6M3q Tbm0K78HU5BgroeJmdLYrOTjd0TucNUFS9yXhDLk8JehHiups6wp3hA+4mbN1HbnZA2z mvQ4vYXqQ8s7I2Z56t0N7k9ZJwimaqyN0ECvgj/BXZ/lJz7CzmxxEpSzGAwcPm9GlfNi 81sXjKo7MvO+9NVZjQO4fy2Jq4G4VmI3AkJ7ea/P9iFn9o0BvmGP01xE06wBjSrMtzxS 8IIzZQn4hq/KrJJKQzbwil6Of+gBxjQGJeO6BqhHkCxqQ/sxIO2e3aYtXJ2Kode+0jXB 3eDA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=nMkAPDPS; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e62si18829840ote.216.2021.10.19.08.20.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 08:20:53 -0700 (PDT) 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=@amd.com header.s=selector1 header.b=nMkAPDPS; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from localhost ([::1]:36992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcqv6-0003HU-AS for patch@linaro.org; Tue, 19 Oct 2021 11:20:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcq7k-0005Gx-41; Tue, 19 Oct 2021 10:29:52 -0400 Received: from mail-mw2nam12on2046.outbound.protection.outlook.com ([40.107.244.46]:22968 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcq7h-0007zC-W2; Tue, 19 Oct 2021 10:29:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZyJn9thatxHCu4nGUxdFgXcokbtz1zOBDguEdJeUbpPl4TwGFJxuNSjlc6cqpaeMGQd5hlkKwUdA27ZeyDEHSPJi3lhLZzG1Vbr1swuXEHbHq7/SBqPeagsj+K8uJxOM6yfpWqIZhqJGYr50jAkBl9ENeRKdo0QlGi/LvSmWSLP3pAQ8vNLDoG2Ng+RWNg5mMwtKa89VXkd5rqIOPVZDUNH++l1CmagNyAvLeEkmXOawHYDI7ofjnpPBJOkevS14MxdZw6M3lairNMfHsutCUJo/uzwbcXf1UAuHHQws2M19lGvloaFhm0g5TdaUNr32xY01ERs2TTJINPlk0wZmig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GfQ+H/xpPCSSJRn737zt7+p9SVApowO2Em6kFD/nCzA=; b=KJM22b83nXNL1N4nwPDrQXIVgONtES2EJre04BBKk0oRu2eCcsSh4mdvqjCpbm7QTJf8w0Ad30xnJxTvv5m5Jwzv7tqVYs0A+IZG8vaIi31e35LeCmhL/i+SczxgN1jofdriHwTRhdPnH3wCAGp3pDx765pZdJ+PSQxOy5VBjAnWBUEiNGAcx3COgsssDpQJz9tv/aT3vDcpakQdk8ebXSrPdE6jvkEtLwJcdsNdFkCCRfMVcfzhX1h0Mb49k3nP9N/0VSDvdwHQsooVn4Djrg04Ao0YhJuT93vRn4h2mGauQrp/zSFoIYX1vSa0mudspIOlzQs37nzHz1MNGRx3nA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GfQ+H/xpPCSSJRn737zt7+p9SVApowO2Em6kFD/nCzA=; b=nMkAPDPSYl2b8h15+qpxdjwmvM46GSCKHsQucwLnmAYY44pj+cayRW7lVohYV5USbUzodGq+qN9J22BFvAp/5vHz1PYii7A3UDiPI40qFWkxg+GhhZdBsJO9eZotNnXt1HDpssc0Ecw+rTZ0bS/KnkTOUvWpn4wUrJImALVAaUs= Received: from DM5PR04CA0048.namprd04.prod.outlook.com (2603:10b6:3:12b::34) by MW2PR12MB2490.namprd12.prod.outlook.com (2603:10b6:907:9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Tue, 19 Oct 2021 14:29:44 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:3:12b:cafe::cf) by DM5PR04CA0048.outlook.office365.com (2603:10b6:3:12b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15 via Frontend Transport; Tue, 19 Oct 2021 14:29:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 14:29:44 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Tue, 19 Oct 2021 09:29:40 -0500 From: Michael Roth To: CC: , Peter Maydell , Richard Henderson Subject: [PATCH 47/64] target/arm: Don't skip M-profile reset entirely in user mode Date: Tue, 19 Oct 2021 09:09:27 -0500 Message-ID: <20211019140944.152419-48-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019140944.152419-1-michael.roth@amd.com> References: <20211019140944.152419-1-michael.roth@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0e082f2a-e587-4255-8e0a-08d9930ce544 X-MS-TrafficTypeDiagnostic: MW2PR12MB2490: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NvP2qrNq+mnUh8iMU7Nbq9USkTqhmAXiYHrO3TWyq6Ki/AR/8L9AgWzL7VTRsz7z+JKzf2GTFaRV8TtBBuJPLTJBpB41VEcm2/NK7J7ppe4hDkfW1oXEGiuoS7MdE8orF7zHWDwfGL/XCWwYf9Ui+O13drBXFS+LICGSVDR30l8BPzbXoP12GzH1fPNLoxax8RjkysfcG/D1LMiGqVv1i1bZnkCm+YiNGLPkZ9HPLqPlWF+zBPOd0G2uVUOXn+uB7sZL65i5hls4D8zkXqEW87TvVm8CJwcw1V1rO5uk4rqMu4a1OteVTGfoCYMpo2JajXZbj8eK/wgECefiIy3lKjdDNYoEe9hF2DmEOtXKAAGfNu2CaJRylZQBPrUCx+Irbyu3MIB8qlEyL5hPuuW6S7cnIxnS7CC2lzo6eHSEokus0ovZUQY2pOogCmIS8LUVf0rVJvnA7QE+sifqDPL99gy22NyEzy+W3FAF9dovGU9Q8udzWVumAAjUN7FEn5m1D/7wYu2oZa/9TJ+tMCn2u3VoarKqEF8AIqr1O4M8xgdEdE/bqmWo5eAb5W83HGa7YMcOKVsAggJbaIhIMpFJx4LGWgUPgPnRuRRrJ4zK1kZxFk+mkperPMM5Pqdv1/pn3Rji9w//49XJHkMbOCzQ5AGxelOcQfXLTSN/tnPjvozx/xlX4S2Uytrovkvznl5PksX+WXYRJAL64W4ZoJ7VyYMeqKDM436adILeQxkiKz6TmC8nul6IzDEbUIGLpieo02GjAGUNqN71PZdhap1ISMU2jHN+Gq/csF17nxgbJ8wyfei9xLfbI4a1umxf9mUW X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(8676002)(5660300002)(2616005)(2906002)(36860700001)(86362001)(16526019)(4326008)(44832011)(186003)(81166007)(966005)(70206006)(47076005)(1076003)(70586007)(26005)(426003)(6916009)(82310400003)(36756003)(6666004)(8936002)(356005)(54906003)(83380400001)(336012)(508600001)(316002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 14:29:44.4123 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e082f2a-e587-4255-8e0a-08d9930ce544 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2490 Received-SPF: softfail client-ip=40.107.244.46; envelope-from=Michael.Roth@amd.com; helo=NAM12-MW2-obe.outbound.protection.outlook.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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 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: Peter Maydell Currently all of the M-profile specific code in arm_cpu_reset() is inside a !defined(CONFIG_USER_ONLY) ifdef block. This is unintentional: it happened because originally the only M-profile-specific handling was the setup of the initial SP and PC from the vector table, which is system-emulation only. But then we added a lot of other M-profile setup to the same "if (ARM_FEATURE_M)" code block without noticing that it was all inside a not-user-mode ifdef. This has generally been harmless, but with the addition of v8.1M low-overhead-loop support we ran into a problem: the reset of FPSCR.LTPSIZE to 4 was only being done for system emulation mode, so if a user-mode guest tried to execute the LE instruction it would incorrectly take a UsageFault. Adjust the ifdefs so only the really system-emulation specific parts are covered. Because this means we now run some reset code that sets up initial values in the FPCCR and similar FPU related registers, explicitly set up the registers controlling FPU context handling in user-emulation mode so that the FPU works by design and not by chance. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/613 Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20210914120725.24992-2-peter.maydell@linaro.org (cherry picked from commit b62ceeaf8096fdbbbfdc6087da0028bc4a4dd77e) Signed-off-by: Michael Roth --- target/arm/cpu.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -- 2.25.1 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 0dd623e590..4f03e74664 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -265,12 +265,15 @@ static void arm_cpu_reset(DeviceState *dev) env->uncached_cpsr = ARM_CPU_MODE_SVC; } env->daif = PSTATE_D | PSTATE_A | PSTATE_I | PSTATE_F; +#endif if (arm_feature(env, ARM_FEATURE_M)) { +#ifndef CONFIG_USER_ONLY uint32_t initial_msp; /* Loaded from 0x0 */ uint32_t initial_pc; /* Loaded from 0x4 */ uint8_t *rom; uint32_t vecbase; +#endif if (cpu_isar_feature(aa32_lob, cpu)) { /* @@ -324,6 +327,8 @@ static void arm_cpu_reset(DeviceState *dev) env->v7m.fpccr[M_REG_S] = R_V7M_FPCCR_ASPEN_MASK | R_V7M_FPCCR_LSPEN_MASK | R_V7M_FPCCR_S_MASK; } + +#ifndef CONFIG_USER_ONLY /* Unlike A/R profile, M profile defines the reset LR value */ env->regs[14] = 0xffffffff; @@ -351,8 +356,22 @@ static void arm_cpu_reset(DeviceState *dev) env->regs[13] = initial_msp & 0xFFFFFFFC; env->regs[15] = initial_pc & ~1; env->thumb = initial_pc & 1; +#else + /* + * For user mode we run non-secure and with access to the FPU. + * The FPU context is active (ie does not need further setup) + * and is owned by non-secure. + */ + env->v7m.secure = false; + env->v7m.nsacr = 0xcff; + env->v7m.cpacr[M_REG_NS] = 0xf0ffff; + env->v7m.fpccr[M_REG_S] &= + ~(R_V7M_FPCCR_LSPEN_MASK | R_V7M_FPCCR_S_MASK); + env->v7m.control[M_REG_S] |= R_V7M_CONTROL_FPCA_MASK; +#endif } +#ifndef CONFIG_USER_ONLY /* AArch32 has a hard highvec setting of 0xFFFF0000. If we are currently * executing as AArch32 then check if highvecs are enabled and * adjust the PC accordingly.