From patchwork Fri Mar 31 13:07:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Chen X-Patchwork-Id: 9656373 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5D7D060351 for ; Fri, 31 Mar 2017 13:11:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BA3A27F93 for ; Fri, 31 Mar 2017 13:11:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4060228669; Fri, 31 Mar 2017 13:11:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DAC4627F93 for ; Fri, 31 Mar 2017 13:11:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ctwIH-00087l-RL; Fri, 31 Mar 2017 13:08:45 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ctwIF-00086G-Tl for xen-devel@lists.xen.org; Fri, 31 Mar 2017 13:08:44 +0000 Received: from [193.109.254.147] by server-5.bemta-6.messagelabs.com id C3/16-27545-BD45ED85; Fri, 31 Mar 2017 13:08:43 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA1VSbUhTYRj1vfduXoeT61R8NBVcSBJMNKikoKI f5h8/sCCVIO/WbVtuU+6dYvWjmVK5MjRKm4SWRuLUJiJmfmRZhlrOj8oydIRlyZSgyNIM6V7v NHt/nfOe85z3vPCQuKJQGkoyBWaGNdEGpVRGRGfjyar3R1zpsfZeLP7utzriAErs71rBUlGmR G9S5xRkSXSrDZ+lua6IguJ3zZgFNQdZkYwkKAsOM7YpiUAUlA0D58J1XCT9GFTebPQWCKLGEX T12zzKIwSFXwY8pJy3OV57SA2CzmejUivyIaVUJJSWFxICDqTCodF6y1vAOFWE4P5ygoADqAx Yqn6x5iGoKPjz4ysSsJzaD2OOp2v3QEXApLMEF7APfz8+XIsJWEHtg2XLQ2/R7w+Dtk+EmA/w ZG4OFz3hUDk1jMScEJiYHOX9JI+3wlBxstAZqFcE1FeU4yJpk8DsvN0zkARN5y9jolCNYKKj3 UNGCGgYapGKpEkKlfNVayN+lAIefOj2uDowqK5yI/HBXFgqCxZj98JYRY1n+CIO3XUrkjKkqt r0j6pN/7iNMDuK5hg2n2FVcTtj1KxeqzMbab1BFRe7K8bIcBytZQy0movR5BhbEb8OXvzpQD/ vpfahEBJTBsl/fZxOV/ipc06c1tGc7jibZ2C4PhRGkkqQXz3sSlf4s4yWKTipN/A7tS4D6asM lM+m8bKcy6WNnF4rSkNIRa5+f7yAKQhTjokJDZaXCBmUYNLlmTYi1jdzHIWHBsgRX0rhm8uwR r35f92NgkmkDJBHCSm+epN54yU3XwLjS8QvTgslzPQ/KdSCNM4UTbMmux79ZpkWR0+M0qU6g7 cnYLKpbdYFtS5l8kp7mir66GjngFfmG7Ux41Dv81OLW4+tJHLntFnXepS1N+YjndryPUnVB7c Mvs27tNvhF2Arq5Vl5Oe1x6lGFtscsS8HDWGD7ib1WVO/+86wK8henz8TWVRq3dF6oW1VSXA6 Om47znL0XxGtjFyUAwAA X-Env-Sender: Wei.Chen@arm.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1490965721!42013347!1 X-Originating-IP: [40.107.3.78] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30762 invoked from network); 31 Mar 2017 13:08:42 -0000 Received: from mail-eopbgr30078.outbound.protection.outlook.com (HELO EUR03-AM5-obe.outbound.protection.outlook.com) (40.107.3.78) by server-15.tower-27.messagelabs.com with AES256-SHA256 encrypted SMTP; 31 Mar 2017 13:08:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=wY44jWN1ntM0DZraYJPwsmpN9fxYFnRuKHq97qITI8g=; b=M7VHpr0ggLumS0UBPCOmsMqLaHuVWmyNGhXA6sD7rMQUNzTbCmc+L0/aoQ3IJMP3qhXm4d2RJATwsHiXdQvbgxJyIeK/Qc0+RmH83BOwdh1LxUg2UQEluAQpZq51A5QKlAZqUCPolGY2LfGyY3+pcZKOdx0NAhEcVGv/GwAwUwc= Received: from DB6PR0802CA0036.eurprd08.prod.outlook.com (10.172.252.150) by DB6PR0801MB1670.eurprd08.prod.outlook.com (10.169.226.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Fri, 31 Mar 2017 13:08:40 +0000 Received: from DB5EUR03FT029.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::207) by DB6PR0802CA0036.outlook.office365.com (2603:10a6:4:a3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10 via Frontend Transport; Fri, 31 Mar 2017 13:08:41 +0000 Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 217.140.96.140 as permitted sender) receiver=protection.outlook.com; client-ip=217.140.96.140; helo=nebula.arm.com; Received: from nebula.arm.com (217.140.96.140) by DB5EUR03FT029.mail.protection.outlook.com (10.152.20.131) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1005.5 via Frontend Transport; Fri, 31 Mar 2017 13:08:40 +0000 Received: from P300.p300.shanghai.arm.com (10.1.2.79) by mail.arm.com (10.1.106.66) with Microsoft SMTP Server id 14.3.294.0; Fri, 31 Mar 2017 14:08:25 +0100 From: Wei Chen To: Date: Fri, 31 Mar 2017 21:07:49 +0800 Message-ID: <1490965679-619-10-git-send-email-Wei.Chen@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490965679-619-1-git-send-email-Wei.Chen@arm.com> References: <1490965679-619-1-git-send-email-Wei.Chen@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:217.140.96.140; IPV:CAL; SCL:-1; CTRY:GB; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39840400002)(39450400003)(39850400002)(39400400002)(39410400002)(39860400002)(2980300002)(438002)(189002)(199003)(86362001)(50226002)(305945005)(5003940100001)(8936002)(50986999)(8676002)(356003)(2906002)(36756003)(5660300001)(54906002)(76176999)(2351001)(189998001)(47776003)(77096006)(104016004)(106466001)(4326008)(38730400002)(110136004)(48376002)(6666003)(2950100002)(6916009); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0801MB1670; H:nebula.arm.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR03FT029; 1:gJKuh5ekJZrGf6nnhkyY2jsG1NqMJ/z9rpZgkcj18NeK6J2130TMfNVN3oHmYMlPgCM/tbh0ECL7VwobdcCPNTlguiMy0/qACOi2szNKwzPpWV5Lg5mxBHg8yQuzJKiUsLQwnucvoNPJkr7oLofuwEK1q44Nps5vkjN7kzQrQEis/bthf/kK8/tA+d6Ex7Fy/a0bax4djXaP6eYk+vc9eKTg8KEg+xawCH1cRuLESF0/ZFQ3fgGzoQpP8Uk42oZtvE67jtS87YI7xIeMPk4zBZFp9w2432DztIVYdPkH7TV1s4FxRuxBTAyjMCgxTv1XKTBRPOvSrG8nQzARhk4q1gwOATJVLRtm5jYywWqFc2FHkzZ/lnGeTLF/pq/8rzjQ24cjPVyFcMRGRwdhlqYFLmi8veDKPQc6+5jsDAVhoaRpKa8+PSDf+fe96//p30n8/+gesIULQHhvZ1TX76+1tKpEAyPqxIza+HiIOcKn0iMOBVkhVZIpychgMmRYgGvdB0zTJjSSbXHmb7bgJxSnBbz7htvf3iU0eU7HR5hD4vtOcRocPh4Vs1Rkwe4RI3jcva+zVS5wlfBPLP0m7Mc6cxZIVVYSKCsQqRAfui7nU8LOYWhpxuPTv//HIlpJHKDI X-MS-Office365-Filtering-Correlation-Id: 6601ff2e-f740-4d90-8cd4-08d478370d69 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:DB6PR0801MB1670; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1670; 3:7lt5Zl9GYesH4zEdwX4iMjvS+JS9StacOOMvnIqFRUycY7qWInWi+oVWtMBSBWWMWEhZomOxqC2dpuQpQCOTPP8qNxxdkmCnB6hdUujtgZfDYP4+VCVJm3N5EFj3Mtd8zsBZfQ6vfYOajDP0q2opOlE0UTc6ecdsONtxKJHT9tQ+XmsiKUlV0MCfCm0m+KJwxR8mEdP6/LlA97glqbsMZHyLNLlT+0XYbeivGuPwDzZRIxFOcJBfe/B31mVsIXMf1lUr6mvllW/cMCzRxLVbUgqX/zOPLjdwTQvsMIpdt4xUoDg+HUihCd4IlKDI1R8vKeE5zFq5zfz1pa1y37983k8MfTWOUYnOchp5uB5BkrzKotecMgVvxRFuQFuHNO+E6K0MrXodztpOdrFgCxdEGTels4okrNfzxO2SgVVMQT+biHwMpMUKCsVz8zYVOyhvV0i64E/QJkio46qM5S3yCL9FlUCSwFxQkWl679vXmcDvNjnmaxnUYWL7E1xMKySHjgQtG7vbWKaS/kF9mTkFAQ== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1670; 25:sFuuO1Sax4DFGiVrkHGbizZH8YzHw7s7IuXCPRtCD6q2bW5gzB8kzXm8cR2m7wvlPYFwWJajAoyukBiLUbx3dmG3tyx82FvxYVxkNghGDixUdRuP/XPQgj+cKYrKXkLcXurYS6PfY05F8pe/MqyQ2AnLGPNGfYt+64a1pgz1h1c9Mhv0iLkIpWMvPHynih7dLh+gSvudQmxCabB3F50LMFTGQeEvc4S7ItMiBNCwszq1qfaomeqG+cRX/YImOpdeFtj8A2uaSKdCK4M2tW9YcTf162DRGGpovZdV1s0m+DZib5x2BIhjgsRgT4+uKHIL/K/5M/md9SpJYJAwLuIyOaY3UMAP644WlvVx2gr8+sl9TS4OaaNmJiMKjOVnGn/mow7Tgc8BWMEZ/i0U6nan0mjo1+IYSk0i9X+1paQl3FWRRMb1kxxTooCVSXphP/5jVRuG3VAvlyxZ8fT91lUstA==; 31:LemENflRwuuznnarrKSiIVCLre+TUQ3cFK2/mmbTXltAXLF5jvlAbXO2M7IEAy8hHSrdXEGMJtCIRJRV1iPNEa4k52yMGi9jdcN4mLhsaJSxJ87xEt0VFF9DSg+O+ROyrcfHMMMfLl9KrcL8CHJauvdb7jDmrL/xWRZEKsE8BRpj+EgGYEBxiwLECCiXTQGGygTpo89PeqjEXH//ALsy2cZ4bP3N0ooNT0iW0QZ1JNHl+RnOqlmrri6T1cVXg/fc0rfTEoWsukXpdiLElHYK3Q== NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1670; 20:7a6m4ydRVahUGTZp9JVJ+Vzxhj9PALSH5SfQE6RnuSRcaLZkdxtvrnIF0RUlFv3CaVAlJHRa/zngm5yEn4FTPZPid1XA1LD4z5FvQZpnfpdfxBRdhe6RfWkD76wKdA2EqAoGW4B1MmAft0M33ztcHs6ToIrYf+9NDwmrMD1axpkCKlTgPIUfxGl8LhqsJ1PZcqd/Zn26wd0Cv+dNtkYC6NlZsODMk7FGKAax7cAhZkhb3A7BsjV/doCvWIhV7bQF X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13013025)(5005006)(13023025)(8121501046)(13024025)(13020025)(10201501046)(93006095)(93004095)(3002001)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(20161123562025)(20161123555025)(6072148); SRVR:DB6PR0801MB1670; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0801MB1670; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1670; 4:nY5Th1z29beB57l/O3Ehwhl9QIsk99FSYLxHCN4clWQexcW3DrPnuuhXWElx0L8Y3BDANJPZ6dMZalM/g5k0OKiAPkRJHwy2mJxYAnbydLVL7/oBbShXAvq3u8s4wsCn6dG0lT6BaeUa/6GUMc4vQKO01/ZNYZOHzxXvWsg9Lp+qQv/kY67KFhNT4OdMDPzjimkS5dLOHyQFyCD4/NfynbZk7wY+nWvig1LHoH1fOPz1SriMGZSpzfBms+Bnz2RMaY8UiAqjzW0nUE+By40meB4i5uoBMYTEg/XQBhhu06/F+euvMXMZSaBnpZ1sfBLXmPHPrv36BsrHP3eF8i+3Mvao6XvO9FyW5y/INg/culF+u/1cNQnSiRNQEcQzfvnAMx0Qjp/AHl4VTQXGBCtwJC+fLO5utQurLmc8/1HGitUDY85yn+7dgrR+7wiXm8G3KMezMG6mDltsH0QVSfZLc6doqkxE7vINc09aD06NVHoFOpESBr0Q3fJUbuYs/R4xk7MYwBTUMkpTlz7giHfD/xwTW124rf1PlzKr26/ql9sldXpL4EgVPvOcA8mVzztnWNQQIDok6B1ebGjvgHrUNEhiWufnrGoaXCRD+zUsRzPv+inEodlqEn0meQCghBCa4E8JYRP+mWNzGPdYQYLk5f148b4mCBNvmIJon+7IcuW/yWQqpBr4Hm5AgPiqnLrrT9StJm8coA6QqTt6bFKgWMaIpstsR7p6JznTTKc+5ZG6uw10JQk1NVcLrnzOZ4XsTNqLK1cCnNACIpWFgUoTSQ66P8dOaPBXMUbXzmfAgwVAa9KxMgxqgB64IxVWJWjYXFwF6ukRvI3QNv5tUNrbwW/Wa6N9yQKF4Vu21KadnEg= X-Forefront-PRVS: 02638D901B X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1670; 23:RhPNzrbH2bEcO9NX1axMZ+/nmgkH6Vwcl9nr8ikvXTDzX60eBvNJxse0Cf7NtI2afJMak8Gs/TUxkof9/6PVxYsJr1L2Ik4UwlgDjvNCqh2nof3axW5REbSnigcnFTCn5/fXPK0Vqn1VK3OUn0aQh+WFtnCGLRnxrO8BqUDBDWI8nVjjvTq7LCZkP5FohP7kMnmyY0a0FpRe34D1iXw5PRSzPFH2iotkmR/A8tLMPEVCT8hRP41YuF0r2wbMFF/gjA1FxoyAoanQyajwKZ4Da/nEBFtO6KXusi6MNW2cIInr6Fk9dasR/21RXJM+hLEopR+WnZv6EHQVktDoEd42arsTKI5DPmgTh+6+lzcRWUweT0iMyA25BHWZnFdhPtd6DFASt2baDw3bkJyRyKQDnEq5t7DqFvdE5Qqzm+cHV4V0Mn+DNhlkHM//CQU51AQu0tQ7h/cOd0tu2a/Ga+8sEl0NEzF23Mip90NT2DWEqEEOr4oYsApo5ZB0We6CAOgJrr6Vacw3mf1LdlOpiz0ZdMwe6hg1seLtGIdC0jkQmmJ85gcNQaWrdkKs1bgx8NM+MpiOYvEslGauiUe7dW0iV7+7M76g1VPJsukKaqOPrWsh1UGtu9wVleFgLac7Y+dGjDW/YihBTALB8rvYj+vVjFY+bOKnxKjmi2Wn6bOnkLiW//ro9vGRuKEHn7v8X2YM1yL4SUFZnQadR7LnZCgQgkaqd7yFvBP7HYJ4YsbVEPSPKHfB+A93kHI2OGcb8ugE1MnuVyPBsH6GSTWI/z8jwXaz+1Eq61EIS90oiJGMp904PTS4ABrd6qKewoUqcxWAHax3qJHQMokd5In9e4GQHErjURGcxcGlLJP5mkf/E2hznmNP+Np5Gzld0AlvC+tcra6m8jT7/Mw8dtgadt2yXj4ukS/jrvN/KTCHpTzFl5GkAKjYnHDCgK8UkG8HWdGQ X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1670; 6:uYnkkkR7olmmAfgOKHHCSAG7J/H4Fd3UD0WzNzjV7TuJIVCurzqx6610JvOd1CUGOtbSC8RakNyIJw3cW3i5NbBonK9wLn2oA86cXIeZij7HIJsdaRZ0ioGHkvdiKPLp1EjL5Vs1BQ+xSuRqme64MnGe654SkZQnhCQNGLoDfJ9/In9oy9XqjHR5EYQtMSezUn0l4E8MpMq26KS7QGd2kctRiBN9wg3ThRXsF/MgbI+LKbUTJfQCF90f3LO/aGQgU6p6BFc8We5pbK0Amo0WP3GeYa9CuiIypCDRqFvkCLT/yrKzkRgZb6oTKh/w0+9j1snOrqDayO8De5MZKJfYby7QjAbWX/Rkmac55slikGRh0rz9jzjv2zO0p+aXdA11Cj0HX2jeRJoGetI/BMdI2BD8wKL7UW/jBnFFQKaeoMg=; 5:Mq3qjChVgqcyD3RxWoRQaddCPjgxN2m+DHFbC1pWohx1jI0y3kzFbYUN4KzpLMGZLnp5AX/lNjKazpSIU+Poi8nlbudlOuK0M/VR2nOMlhw7lpgxZNDQyw8mu7s3rrV8tbMsQYwNyGSGKjsquEURKIkiTWfeT06k6/3TCa0FesU=; 24:HTNULk25lpIS3n13wAUKehsmAuYkBG+Vew0cQHi3cNPlTf+xI3CvFNRonkZbxtNKqQDwwtqg4hAt55TJO2b0o6pEV8Oqj7KaEvT6myZNE6Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1670; 7:1CqTnvMUm2i7LXPIXrng2KVsIQAcWTKRWYfDbxnvY3iJ2RqzV4pdtTSIu7vlQ64um0GCi03kKd1McnQeOj2BG93croTwnDGW92cn3JuhSyS7UmGsIsLBwfiY43DZ8jmFCdkJVz7YxVi5wf2tVYQLPD/NdHyPnOSv5khQ3EkYbrwEELdeH5cJc9/KJDKiNWZozZDvO5PuVShl8o9UUT8m7nRNdcyV//JtfqviJrjJMaPl8FFX0Fwtd5RvXB6pKdySfgYqoQJaueDJ7U1u0xoUo//kYZ/z+L4mUSEZTkYwBjC3U4C5c60TAXZpp7nrkeFt7kjlC3hMbVeZBzimZAXKNQ== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2017 13:08:40.7294 (UTC) X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[217.140.96.140]; Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1670 Cc: sstabellini@kernel.org, wei.chen@arm.com, steve.capper@arm.com, Kaly.Xin@arm.com, julien.grall@arm.com, nd@arm.com Subject: [Xen-devel] [PATCH v3 09/19] xen/arm64: Use alternative to skip the check of pending serrors X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP We have provided an option to administrator to determine how to handle the SErrors. In order to skip the check of pending SError, in conventional way, we have to read the option every time before we try to check the pending SError. This will add overhead to check the option at every trap. The ARM64 supports the alternative patching feature. We can use an ALTERNATIVE to avoid checking option at every trap. We added a new cpufeature named "SKIP_CHECK_PENDING_VSERROR". This feature will be enabled when the option is not diverse. Signed-off-by: Wei Chen Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/entry.S | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index 02802c0..4baa3cb 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -1,5 +1,6 @@ #include #include +#include #include /* @@ -229,12 +230,14 @@ hyp_irq: guest_sync: entry hyp=0, compat=0 - bl check_pending_vserror /* - * If x0 is Non-zero, a vSError took place, the initial exception - * doesn't have any significance to be handled. Exit ASAP + * The vSError will be checked while SKIP_CHECK_PENDING_VSERROR is + * not set. If a vSError took place, the initial exception will be + * skipped. Exit ASAP */ - cbnz x0, 1f + ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f", + "nop; nop", + SKIP_CHECK_PENDING_VSERROR) msr daifclr, #2 mov x0, sp bl do_trap_hypervisor @@ -243,12 +246,14 @@ guest_sync: guest_irq: entry hyp=0, compat=0 - bl check_pending_vserror /* - * If x0 is Non-zero, a vSError took place, the initial exception - * doesn't have any significance to be handled. Exit ASAP + * The vSError will be checked while SKIP_CHECK_PENDING_VSERROR is + * not set. If a vSError took place, the initial exception will be + * skipped. Exit ASAP */ - cbnz x0, 1f + ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f", + "nop; nop", + SKIP_CHECK_PENDING_VSERROR) mov x0, sp bl do_trap_irq 1: @@ -267,12 +272,14 @@ guest_error: guest_sync_compat: entry hyp=0, compat=1 - bl check_pending_vserror /* - * If x0 is Non-zero, a vSError took place, the initial exception - * doesn't have any significance to be handled. Exit ASAP + * The vSError will be checked while SKIP_CHECK_PENDING_VSERROR is + * not set. If a vSError took place, the initial exception will be + * skipped. Exit ASAP */ - cbnz x0, 1f + ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f", + "nop; nop", + SKIP_CHECK_PENDING_VSERROR) msr daifclr, #2 mov x0, sp bl do_trap_hypervisor @@ -281,12 +288,14 @@ guest_sync_compat: guest_irq_compat: entry hyp=0, compat=1 - bl check_pending_vserror /* - * If x0 is Non-zero, a vSError took place, the initial exception - * doesn't have any significance to be handled. Exit ASAP + * The vSError will be checked while SKIP_CHECK_PENDING_VSERROR is + * not set. If a vSError took place, the initial exception will be + * skipped. Exit ASAP */ - cbnz x0, 1f + ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f", + "nop; nop", + SKIP_CHECK_PENDING_VSERROR) mov x0, sp bl do_trap_irq 1: