From patchwork Thu Mar 30 09:13:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Chen X-Patchwork-Id: 9653365 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 461AD6034C for ; Thu, 30 Mar 2017 09:17:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B2D72857B for ; Thu, 30 Mar 2017 09:17:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C41A2857E; Thu, 30 Mar 2017 09:17:45 +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=BAD_ENC_HEADER,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 8E9F22857B for ; Thu, 30 Mar 2017 09:17:44 +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 1ctWAw-0006L9-BJ; Thu, 30 Mar 2017 09:15:26 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ctWAu-0006J1-Oy for xen-devel@lists.xen.org; Thu, 30 Mar 2017 09:15:24 +0000 Received: from [193.109.254.147] by server-5.bemta-6.messagelabs.com id A5/B8-27545-CACCCD85; Thu, 30 Mar 2017 09:15:24 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA1VSbSxVcRz2P+fc6zDXjkvzc4fmms1qjCyr1Qe 2aqolfcrUqiPHvZd7L51zb9OXciOTJrFu8ppKKtLaJS9TkqHy0pDM26SVyJRIWi/SOc4l/T89 z+959vye//YjcXmKVEEySQaG1dNapdSe8I3HIvwqOkciAzpqFVtKZ28SISisteEXFoGiJBp9d ELSMYm66MktLPGrd5LZMoclo3lFBrInCSoZhzs56dIMZEfKqVIM7t09IAhyqhWD1IFKXCCI6k XQ0JqHi0ojAtPEcyvJwuDZ0qiVXEPwu9liK4RJKS/IzDYRAnahPKAio3B5jlMpCO7/2CVgZyo C+isvLi8nKB+oGD6LCVhGhcJMVgEuYKA8YfDl+WVsx89N+W+tZUOg+GePRPQ7wYu894SYD/B0 chIXPR6QO9KFxBw36B/s5juQPPaG9tRwoTNQHwhIqTqHiaREAq8ftyHRtA/ejSvF+QUEw2mLt mLQQwJu14eLuFEKb6p9BexIyaF27JE1qAaD9L4F6zYt5NZSon83zH1rQaJnBoP8pRrbS8gvf8 0n8td8ogRh5ciXY9iTDOsXuNk/mtWo1AYdrdH6BQYE++sYjqNVjJaO5vyPJ+gsiD8FG/7VoYW yiGbkRmLKdbKqopFIuWN0QswpNc2pj7JGLcM1I3eSVIJsUwevObGMikmK1Wj5e1qRgXRQusi2 CrKMS6R1nEYlSu0oiPwz1zSNkXWtLdOYnNAn6BmFqyxOsFKCVW3Urwat3GYv8lA4yxBfTe6Qy LA6jeF/fQq5kkjpLFtq51McNHrD6r4pvgrGV3HdPiRUMdD/JEUy8roSfDkx7JCjdjJotqlMVc janO6O3BkYPhcb83noS5tTdrnRvjgT7yhgN358YI6LOjxkkRIONqTPorp6R+gZ456uq+aeoXj 8u8pj7OCE0auy3hzXWXTE5D7uLMEz+kxVJ+bX1+/dlsqkvdLtN/dfH8VnFvsGPL3rwj/lZN5o GVASnJoO3ICzHP0Xku4waZYDAAA= X-Env-Sender: Wei.Chen@arm.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1490865322!89017534!1 X-Originating-IP: [40.107.2.80] 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 6684 invoked from network); 30 Mar 2017 09:15:23 -0000 Received: from mail-eopbgr20080.outbound.protection.outlook.com (HELO EUR02-VE1-obe.outbound.protection.outlook.com) (40.107.2.80) by server-5.tower-27.messagelabs.com with AES256-SHA256 encrypted SMTP; 30 Mar 2017 09:15:23 -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=fWQNDqEJjAqvZWh5vR4EZ1pTbichG6gOF2Kipj48Dig=; b=D9cP9DBhYqWxUM6lao/35rScI1HnImtC/iFJ/96uODxyuXMu8HPV8a1BBnjpGggMDvNuCOp4RtNnXWuVtU1zZj9Gfh6wdKSGcFkygbK/Wd+hHitNBixF9XK8d8sQiHN2FMMetNaJwvCPjDBmMFRVDh4Mx6egfoKjwOLit3uUtpQ= Received: from AM4PR08CA0021.eurprd08.prod.outlook.com (2603:10a6:200:1a::31) by DB5PR08MB0887.eurprd08.prod.outlook.com (2a01:111:e400:599d::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Thu, 30 Mar 2017 09:15:02 +0000 Received: from VE1EUR03FT028.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::202) by AM4PR08CA0021.outlook.office365.com (2603:10a6:200:1a::31) 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; Thu, 30 Mar 2017 09:15:02 +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 VE1EUR03FT028.mail.protection.outlook.com (10.152.18.88) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.977.7 via Frontend Transport; Thu, 30 Mar 2017 09:15:02 +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; Thu, 30 Mar 2017 10:14:06 +0100 From: Wei Chen To: Date: Thu, 30 Mar 2017 17:13:24 +0800 Message-ID: <1490865209-18283-15-git-send-email-Wei.Chen@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490865209-18283-1-git-send-email-Wei.Chen@arm.com> References: <1490865209-18283-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)(39400400002)(39450400003)(39410400002)(39850400002)(39840400002)(39860400002)(2980300002)(438002)(189002)(199003)(104016004)(305945005)(50226002)(77096006)(8676002)(2950100002)(6916009)(54906002)(6666003)(36756003)(8936002)(356003)(5003940100001)(4326008)(76176999)(5660300001)(38730400002)(110136004)(50986999)(2906002)(86362001)(575784001)(2351001)(189998001)(106466001)(47776003)(48376002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR08MB0887; H:nebula.arm.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR03FT028; 1:qtoVyVI/AgDXZ4nO7xgnOsw1yBBa589qG9cXLED3EUcNfRhDldsZ/ADIE5csAi2N6FOXk9C9MmmtfjI2zOGNZ66eDOEq2nt9iGawAHbAnAd6IsPz+f27dY5lR7wKCnd9rBoLDgFC2ZD7RMJWbKo1gYzWZr8BBPJbRiZ3CGihps1YKB1tDG0yfeetfGVSvQploB7MiwW8Z24F45od1GvEarcdN+lDLlL0f+1p4WrWpr8WWtbNzhDou8blPDF/SCdej5Qs1DlmVeD5IiLlKwCklT6DYR8f+lvo1k7eULNdOK5QL8v/Pu8ScHzTtTl9w59yivDM5d+MbSh9rUxp/CbKjPIZg4OQmyKYsPWKr9xygXb5eLcVCTvnaUkQ2jj9F3RDrH9guzo9Y72q9+bCm8K/fKnXHHf1PsB+gZxbxCvvn/340hTeWwWMwDhZUOTGgrctnIQISRwbPigCuhlE7AVb0y+UAzU7u1dMjQ2r8E13/srSghYDD6ZeCBQisyJD9XqX11bEbYVd4WnozS6Ndch6XJqTPPuDBf66v/p9zzW6S06fKpDg5jkCuaO3IpBF1Ae/byw1RjQSor6YGXsKW39279F5xF7IAE1Oii/ku4MeW+w= X-MS-Office365-Filtering-Correlation-Id: 97f0dc2e-19f6-42af-82ab-08d4774d3f72 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:DB5PR08MB0887; X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0887; 3:ttTBF1dGZlv34X5dszK92SMlKfwILLxsXM6NUgG62reDWFVVttVNsfVTAF/8dRh3s+SIBfeHcpEutiPROVMlM98aatR48FnCcSSKoOzf4JRZHJO3IxR3uVJpzTIJrmV93mxvYAJjnV4HGyRiuXy5lAwFs8AhLBekDEIJNyJeMWQAJR41Jz3DtjmT3y7GEJPFdGmksZVPZYaFmLmMa2aH4fXbBBXrUT64q+nmcgbHZN5yvBbtcdwnXokLt0BLXQqbanu2lTG9ASgHA+QlTxRZDepGoKeblTGqN/6/s0M4D8kStcpBn87lpHqad8/gOzk70NvujAaPKE1jxKwP+j8nTs+F/H/Q1y0NYL+Muw3QwKZA4AKj1Xi9JTMv0KmBPNItEWF3nK9eLt+fMBMOM5E3wqIAtWAEkPfBRGs+TnSj7X48gN6g3HTYyBZckD9fxdLUSDsT4K6ZN5+q0/igamFl4D8CfOADn4If4VtwF3IPnZtMnM5YEeJ8y4eFhJ7vSDIT X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0887; 25:g153Q+ERcbfK51yLbN+f80HUK3Z7M7Q9zWvaI91vxvn7gsObRYRCoPnujk1srwUvYPM7pDxw4I1W5/3AJoboOfrvYYcbF79vePZpDhA3PY+d9sMy45ENbz4Ec4YPBUU/0LpRv/MeYwnYhgzf8rBbeSiDJC8Ylt3XTsXpVGd4sCkstNOFTVsa+A1k1x64fkSsJbdXH/hbSMkofk0ROws+ku25SDyPTy07Kovq8nfxYXOzflifw1iBmRT5/XWuabaatCSfbtutpIVHtAtMoxkgmpV6gFmMPp5YHj8WXbqqhBZjqreJMGTjGAH4aZT8Bs4SAfiwnKHenY3Fy04CP4QaqVgUXX411y6nzPhuhJAviOuU2UfBYw0jlPstpycsARnXGGwKDe9YBHAEs9o201QlTOw4ZsB8hZfHImsEo6ztJFCE1Pfuo+6Sj+z1qSyRNP0hPRHmiK4yoAV0rblfqfW/EQ==; 31:c8V9+vgkFGnV0gc4c+uG7fPUi9eChwZ85D32o910notUEVSrhB6XtMFFlD31gDPVM69JMgksUaWraPuAILPyxsLx6i1vqkHg6fXbDH84IJBsRI9VDPlfMOM4RAxiFEgdbD2+zrdYHGAhxM/FUJ3zJbXOWT6NezVJDgPEth3fLDj59xNJm0XUGzd3RfsjDg6VaWFbkodFaZSRR5RR2+5gPlNjYn3taw6+5dYgiMez/S94766tSkCVlnB1PETeBN8mWxwO+OIoxTM/EeJQaj9kCkKjZJbIDhoVhYmnQ5QRDMQ= NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0887; 20:f2yUzIVuHDcq/8hdrGbRXI+zRCgYq/r7D2nqCdZ9zMcbkDTJICqZp6VugRKEtwFXuJXMxGQcxBfSGhLLdE5g1g/dySdUKDiRZQ9h/WRrJy30oZhR9pmTVLv1zxmdtBDLK4xvQ3WnCek1nTD2I5d/oYEZuVfCAU8hJMgeujaXWqd6NCodsmN5+CrZaVRd7jD0DYKVgiiq4swhdC/TNeT/AMs1aGEBxxQIAVb5aPcViLmYofWszTRzAeOS+r8xxj2A X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917)(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13013025)(8121501046)(5005006)(13024025)(13020025)(13023025)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:DB5PR08MB0887; BCL:0; PCL:0; RULEID:; SRVR:DB5PR08MB0887; X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0887; 4:ZorGkukXymiKYlU/8uhBJvJeLdf2OvLOeXNMvKB1HZMyFfLjApFDo5CHv36iCoRQagj+Tz2pZNg335lDbHK+ODQ6umz8hkyylzvqf7YUXIbyNq8FQmDh4bcfagRlQgX5dIzLJ/FbxUoOVJw9mRBmPDa2+ymDX6UiaGGFayKNrcoLs6xzeyJuqVt1H6bhBZq3C/5cNwj3CLFU7yNkMgGYh74zl/s2evsGgCMQXANlJz9VnLePLlQjB/8nUV2DGIVf/D2hW4x37RX5P9Ta6WitlHXPXKLOyH59Yaschpi/9wCJPMsuMECidSdOqAsVmm97tBpV2jIWhOlMydD+CtGsxlUGNL1JhNd+eNkfxEcg9iSrX1jR+xLUCm9Vs/tLL0+bSea8yFxKYe2bRizuxC70oG71xvWC+vXCoMIUT17RQb7G2aCgGMoiKug0GA+rPunjtIoGdnP3K+WVO6DqtMGloIH9Sn2f+jJV99t08Ca7yHhIrpDM46T5JiBc5kSThNAeApfujfHqOfIgEQF8gbaFhZxyeQkX5EERNOqWxsBu72aGnAF1oSdwqA1wygzBX6z9jMj/Efsd9KjXpk5a+GGNnA4wnYuc4lV31rfIr+k3x8L9iiULPlCa1SQN4MMwSYlTi2pmYyCRjJfjCcVfH+xQ4SJyJIlXemphtzB2C76AJqDy2ho0J5JMou5yh3v8jptbG0zGO6BgZ2Z3L9ewPXpFb5/3pWPIVxEHgC2V//jmsYHVgia1lxYwJxaVamBSYjh43LeAeXOJglq8HBXhQe/ZJKLuQuIYXcHZzigUm3K39bc0e+s2ocktegLuHD16Je0s8in7AdOq3hbKTY3fDgAljg== X-Forefront-PRVS: 02622CEF0A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR08MB0887; 23:npRLNvKC7nrcSaPs9RlZKsk0XqWNEdvDJYqAmr8EG?= =?us-ascii?Q?viSdIu208lIK4p7XIs/rISSyOTA38ZE1GLrDValou+YVu/Dv0FjznSRYzKD1?= =?us-ascii?Q?derkIJqmrvG3iN7cEc3sr/PF/eC5FByG57n3yyxYwhZpkZr+12qSqrxDuT2x?= =?us-ascii?Q?s0mnQg/z2HV7KgTjGTybrSCrz8JiRUywgEHh3EfB0c5EAFmFoyqPTgXNoa9z?= =?us-ascii?Q?QP2N4huLcs1HaBTldW0sBXZhQDBv6cg9K9fkr/WV9oCo4Kl/TEYo/9bL8+So?= =?us-ascii?Q?VqpgTwRCHEC0OhSK/x4hgRtAFBaCJSxBEiO2sUHsIE+xnuPquq+941zCn3vR?= =?us-ascii?Q?Tn262KM6UdUlxpj/NtDa2ZvWXXPVsomfD17qo5WreQBdoV/+HhDWIwhJ6m7S?= =?us-ascii?Q?1NMzotR+cF3ubz1cPi0KmvvSg3Wi75ZLUcj87uBFnFt/5+M3eaUeURY+ew10?= =?us-ascii?Q?F7uBXk2jhTeglGkoPhSs3AwQiOTukDd8bzefcvHxpi73GgoDkY6w1+lvXo2p?= =?us-ascii?Q?+EBmfXkXlVOhdvqBoqoXsQPfOTjB8WSYjy4KUmEHOyuPEFuyhDv6J8BhB7qF?= =?us-ascii?Q?7AwKTcY0JUR0Opd5zTNP8P3gUmzEB9foIKNrhQImqK2cVR+rhh3LiYDl7J1O?= =?us-ascii?Q?u5t2yis0Ld0SC5V6wNFY5SfHTrTL1DWLHrkSgGivi0NFOAenEn3xHOJ4U588?= =?us-ascii?Q?ho7+m4/e1+kUdxdBxG9oIIV/aPFLwFQviltFbErSjAQvIC889kdUWYflnjtX?= =?us-ascii?Q?kjpVsq2lWmVBvPiK3ZPuhFsnr2F5I270UBD0rKeYYj8wkJQtM0tnmty2S1Hm?= =?us-ascii?Q?ZNTI6tfghQ0tccL/7HM3d7eqRv4Z94PVqs7p/HG7+54Tkx5YnCl3Myc1CtpJ?= =?us-ascii?Q?4NWtX+Bpp7gpSIyjg9k9cNp8AKaZJNiAvInDQDxrOhZWgEdkxMbT8ej9ShtD?= =?us-ascii?Q?zg7dPL6EI0BDfvp4Gf0M2Y0mmDyfbp7TWOPP2Cou2fx2oP+W/pr0w9JIVoAQ?= =?us-ascii?Q?WU=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0887; 6:u1nGZKlDMUvcXRKVHVT6dtyoR1l/0+KOKeOmFArG3I+23oISuhMt/k9BEA9oWZGnnVy6myJxB1bw9a6mwNUNlyDu9vmpBJdUgqxv/k2HBZVcqI21uOTLFNOJL1r+AoLyUj2EcM+6EFK8tSOVTfYPiPkfsmS3v/YCU8/X+ZGUEIF7vm8Z8wTKKJnc3cirsMqpp4pJa0rFVkSA1GLWqRgNoV/FtGAYj3Cd8HyqTbS9oIaIpKtKI8sUv+mJdTFKtTyYR3iK+q+R/7AwL1V24XBptSPPiSGni/HzSdY0Mwu7fOgUIKTOrEF/ev9WLOdNpwcmI9v0J054aTTyY7Og9PAIxNkW7J5Aj6JJK4+NoqX06YMtQSVBtkk1c0bM8cjaujPGb/3s/UnZA6GceurqcUpPfkJPREaoBTHaAj69r+wpq5Q=; 5:rClsNw2gAnlVJKJOK/jPeNAsBw0SgcMTknKpG20zYQzPFoigSts3RmcBP30MKACXWDDiJKa+d4Zc5a4X/OC1u97lviVcD2BEIQ8JoGRaptODDnZF9mbnvX4x7/Z5nWvl1Wrg4blIvTYBp2hcOBR33Q==; 24:3fl+H3oXRAfDJjQKfzQG23YKoWh8lnPZTtb0pE9kgJ+2ZWWRAKNPvgYRhF+4nLVyevrC9VaTNGfMUi0k0C/T+B2bks1ltxiX3OQolucbi94= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0887; 7:S2sfmD3/5yGniGQYO2C2XnF+//j9sFjOnMlR/I649N1N2m69Vq1Qljmy32ht9wbHaNvspRbZDU3AMDAlV48N1fb5dU2fdqacdsfIMj8yK64Dcc/mvg0Mx/BWtZOJrCr/YB1r093eqBWPo/PCCOQHRF3qOX3YuKSfQ2cfgPTtRrulhBtqlVteJK57mOfYT3TWYQTaqVyHvQ7vr/6OhIk53o05da11TI5aG35kpfQfQFvaGVy3gItiLRNwr11fsN451Vi/7020fG5kl4PJfi/Ko3WisZ9nq/2quJfE8FwfKRcUHDiDyoAK4b4KqkQmFhpJ6mxfSLSwjx6eb0q3L+q8ig== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2017 09:15:02.4082 (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: DB5PR08MB0887 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 v2 14/19] xen/arm: Replace do_trap_guest_serror with new helpers 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 introduced two helpers to handle the guest/hyp SErrors: do_trap_guest_serror and do_trap_guest_hyp_serror. These handlers can take the role of do_trap_guest_serror and reduce the assembly code in the same time. So we use these two helpers to replace it and drop it now. Signed-off-by: Wei Chen Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm32/traps.c | 5 +---- xen/arch/arm/arm64/entry.S | 36 +++--------------------------------- xen/arch/arm/traps.c | 15 --------------- xen/include/asm-arm/processor.h | 2 -- 4 files changed, 4 insertions(+), 54 deletions(-) diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c index 4176f0e..5bc5f64 100644 --- a/xen/arch/arm/arm32/traps.c +++ b/xen/arch/arm/arm32/traps.c @@ -62,10 +62,7 @@ asmlinkage void do_trap_prefetch_abort(struct cpu_user_regs *regs) asmlinkage void do_trap_data_abort(struct cpu_user_regs *regs) { - if ( VABORT_GEN_BY_GUEST(regs) ) - do_trap_guest_error(regs); - else - do_unexpected_trap("Data Abort", regs); + do_trap_hyp_serror(regs); } /* diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index 113e1c3..8d5a890 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -178,40 +178,10 @@ hyp_error_invalid: invalid BAD_ERROR hyp_error: - /* - * Only two possibilities: - * 1) Either we come from the exit path, having just unmasked - * PSTATE.A: change the return code to an EL2 fault, and - * carry on, as we're already in a sane state to handle it. - * 2) Or we come from anywhere else, and that's a bug: we panic. - */ entry hyp=1 msr daifclr, #2 - - /* - * The ELR_EL2 may be modified by an interrupt, so we have to use the - * saved value in cpu_user_regs to check whether we come from 1) or - * not. - */ - ldr x0, [sp, #UREGS_PC] - adr x1, abort_guest_exit_start - cmp x0, x1 - adr x1, abort_guest_exit_end - ccmp x0, x1, #4, ne mov x0, sp - mov x1, #BAD_ERROR - - /* - * Not equal, the exception come from 2). It's a bug, we have to - * panic the hypervisor. - */ - b.ne do_bad_mode - - /* - * Otherwise, the exception come from 1). It happened because of - * the guest. Crash this guest. - */ - bl do_trap_guest_error + bl do_trap_hyp_serror exit hyp=1 /* Traps taken in Current EL with SP_ELx */ @@ -267,7 +237,7 @@ guest_error: entry hyp=0, compat=0 msr daifclr, #2 mov x0, sp - bl do_trap_guest_error + bl do_trap_guest_serror exit hyp=0, compat=0 guest_sync_compat: @@ -309,7 +279,7 @@ guest_error_compat: entry hyp=0, compat=1 msr daifclr, #2 mov x0, sp - bl do_trap_guest_error + bl do_trap_guest_serror exit hyp=0, compat=1 ENTRY(return_to_new_vcpu32) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index a6f6e24..f454fb5 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2881,21 +2881,6 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) } } -asmlinkage void do_trap_guest_error(struct cpu_user_regs *regs) -{ - enter_hypervisor_head(regs); - - /* - * Currently, to ensure hypervisor safety, when we received a - * guest-generated vSerror/vAbort, we just crash the guest to protect - * the hypervisor. In future we can better handle this by injecting - * a vSerror/vAbort to the guest. - */ - gdprintk(XENLOG_WARNING, "Guest(Dom-%u) will be crashed by vSError\n", - current->domain->domain_id); - domain_crash_synchronous(); -} - asmlinkage void do_trap_hyp_serror(struct cpu_user_regs *regs) { enter_hypervisor_head(regs); diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 2db2370..ead6ad3 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -707,8 +707,6 @@ void vcpu_regs_user_to_hyp(struct vcpu *vcpu, int call_smc(register_t function_id, register_t arg0, register_t arg1, register_t arg2); -void do_trap_guest_error(struct cpu_user_regs *regs); - void do_trap_hyp_serror(struct cpu_user_regs *regs); void do_trap_guest_serror(struct cpu_user_regs *regs);