From patchwork Fri Mar 31 13:07:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Chen X-Patchwork-Id: 9656383 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 39FDD60351 for ; Fri, 31 Mar 2017 13:11:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BDF827F93 for ; Fri, 31 Mar 2017 13:11:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2080328669; Fri, 31 Mar 2017 13:11:20 +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 86C4C27F93 for ; Fri, 31 Mar 2017 13:11:18 +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 1ctwIP-0008HI-CA; Fri, 31 Mar 2017 13:08:53 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ctwIN-0008Ep-Md for xen-devel@lists.xen.org; Fri, 31 Mar 2017 13:08:51 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id AB/0A-03012-3E45ED85; Fri, 31 Mar 2017 13:08:51 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA1VSfSxVYRz2nnNch7l2HMzPXfq4pja6ohRbW1k 1UpKVNdlaHTk5t9176Z7Lbq0tRhNLZYmiFCFiKmwpH0MszNduq6a4+ejDTJ9Sk9k65x6k96/n eZ/nfX7Pu/1InE6RKUjWaGD1OkajlNkR3AarINVYpDnKd2xIFljy/S4RhHZ3NMxhESjaWq2Li Tces+YKiiuJhGkPY1vtQ1ky+qnIRHYkQSXj0DTSjouEpnIxyKmZsZHIcwwefO2xEESZEDR03F iwNSNI+dS5QLIxqHjZSEjkNoL2lnIsE9mSMmoNZGWnECJ2ptyhMvOmjYhxKhVB9WywiJ2oCBi YKrP4CcoTKpqfWbCc2g5PL2cjEQO1Egb7MnAR2wr3pt5ii4emtsFs8hMbye8IXTfeE1I+QOvE BC553CFvqHchxw1eDQ4IflLAHtCdFi52BspMQOfnUkIiddbQV9tPSA/2QUvdN5kkFCIovNe5Q PoJyDLn20ikSgYfR99a5jlQNDweacQkoR6DIrMZl7ISoGysQCbhUPgx044kUzoO2X/SiCtIlb /sI/nLPnIHYffROp7VJ7F61UafGL06jjNoGbVG5ee7xUfL8jwTx2qYGN7neLy2BgnrYCWcelQ 2v6MNuZGY0kX+e3w4inaIiY89zTE8d1SfqGH5NrSCJJUgv3TQHEU76tk41nhCrRF2alEG0l7p LP9wQJDlfAKj5dVxktSNVGR9R/sURhO6eB2rcJV/ETMo0cQl6pYiFjfThNwVTnIklKLtE1i9V m34X59EriRSOslBWGDaXq0zLE2aFEpgQonAmWGxhIH5JymSkeKMMc8UEPvGUb038pFthgNy+u XiHz4/er2R5y6uqu6pStt07WzwWk306vpDp8aKOgaLD2OpW9fXBF1o7Qxq4l7sSenZVWI/0FU clpN+y3suqVRzfr85oK5vPL/X28s/hHyX6+1+tTw9afrc6xBT2M5QEos6ybV5tmye8zId6XH1 UhI8x/h54Xqe+Qu4EqyflAMAAA== X-Env-Sender: Wei.Chen@arm.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1490965729!42393466!1 X-Originating-IP: [104.47.0.64] 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 34775 invoked from network); 31 Mar 2017 13:08:50 -0000 Received: from mail-he1eur01on0064.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (104.47.0.64) by server-2.tower-27.messagelabs.com with AES256-SHA256 encrypted SMTP; 31 Mar 2017 13:08:49 -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=HBL2BwYNMP3Vo0KzRqJcpx6aUYK4byD/XVrD5X1qnX0=; b=kuKwafYakMZW7EYyLvB7vpUlTutt6JdCC3IT2xoqvg9NbqcYFcqp34l7yHSczYGRXaZx4ByVAiWwNcRGkd/9ytaVfTW8sdOudbgX7/ttuyl3/tu/67phDZmpl0Hsmh+AFDXyx2zQXV7Bh5zUGFp07+aEDjmCJfmVdDdRQg33agU= Received: from DB3PR08CA0027.eurprd08.prod.outlook.com (10.161.51.165) by VI1PR0801MB1677.eurprd08.prod.outlook.com (10.168.66.148) 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:48 +0000 Received: from DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::203) by DB3PR08CA0027.outlook.office365.com (2a01:111:e400:503c::37) 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:48 +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 DB5EUR03FT012.mail.protection.outlook.com (10.152.20.161) 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:47 +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:36 +0100 From: Wei Chen To: Date: Fri, 31 Mar 2017 21:07:53 +0800 Message-ID: <1490965679-619-14-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)(39400400002)(39840400002)(39860400002)(39410400002)(39850400002)(39450400003)(2980300002)(438002)(189002)(199003)(110136004)(38730400002)(50226002)(48376002)(5660300001)(8676002)(8936002)(5003940100001)(6916009)(6666003)(575784001)(86362001)(4326008)(36756003)(2950100002)(54906002)(47776003)(305945005)(76176999)(189998001)(106466001)(50986999)(2351001)(2906002)(77096006)(356003)(104016004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0801MB1677; H:nebula.arm.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR03FT012; 1:kCC8zjctO8B8zel17044IgtTCeIxtG0t7GjrcfJUr+1/f6gEkON7Xwfj6B8QSt0FHbdJ/KysEakvMYPU9KUYoaH5hRj+o1dAIB818JzVqV5b9Qu9oUOKQ35X2u54Cdl+lvaZ5xkFhVdjA9U3mmaQ51CLLTZF/NkjuAvIFovw75c8x/U/irU+EoyI/3siEkb8ncgsbtbtrMK4F5zSH8KzNdTQ4xO5xGTdbUZRbkUtKG5G53HQ6FZSQhlksAeJPuHQ+LIj7JKYuO02dZmQcN9QaHTrUtuKra+LEinet8bVgFg9/CnGFIoMPo3gRnzYS6qJ6DUJb1MrSbrJUcsHxEcYTNJirUe3DRz49Y+npRmFIzRzPJyuHG1UXFvqAiCp0SVYd49QGtbSkNGnHEFwFb8mybAP2OK0j9wSvXAK9caMU3L1NdOiXyG65n3BziiKVVHfNXlhuBspzthCG1o7hQ+zc0jjUhjS8i8w+HeqhnKx136ngGuJ11ZG7LaB1C4gkJ8D1Nfe57fhapBBtbFGB6CSTOgHjj66pWmIcV+BXjr99PhTbMomQKsSxtPTAb8EakF6/myo35IpdSOC9id+A/admKWV8usZwMqCZSFh4uurv5yWCSPwFG2JXVkWx+bopnd7 X-MS-Office365-Filtering-Correlation-Id: 530240a8-2f04-41b3-7173-08d4783711a5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:VI1PR0801MB1677; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1677; 3:OacrkOaV4Rse+BxTXyuMGb5srK5jA/9LXad9CRIEEVN1W54VmlpUDI8fvcALLeErpdDtowNsLROMpC+QL023brB81c1yiuG4y9b9Pzm664IzRI51pWfxHuufoyAiAnYuExloaidiMzOY8ngB1n1yvUeid4y2v3fSGX4tRdAiGGY1GbEM/Gvv5yZolfWP1NcD+6QutQu7tGX5lSUBvpbWSSZZBCBO8GKKbdQVKUzGCjB99XzeaC3DuZ5VIgU5Md2DqcrUC9vtloVB90LUA4VJCa3ZiX21hLVW0AIqQaj/kQpmNdk9a16we19Jo5Gv3joZeyMVY8JqTqxhqaiyyTJOU3Hom73WlAYZAgs/Os68M49S+GeswiEPKWUc09jPoZveN+zoVm13EMOJxWwnKJxDDxN4nFUoqLFsXxpDU6VgashwP/lNyb9RWrjr0T801nBrlWqj+6RhNCaMlVwNQYPAc9cZll5fIVY3H4ZUeeOMX5//tDbkx/dIisv5OESDmuTf0Qg3Ti3CzUKuIOeQYtucfg== X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1677; 25:F701QkwenJMhqgsp6FssCs4tF2ykKltkN8isvyfrt665ODnhYAF3IvqxUlqvRsFdhh9nYqcqDuO/rAaWpSGQkQQ4dNB4HUCCqg4Kvhej+KykQKL4Xp61nGy6eflg/0OPslJ3yukxoQ4LFxaSAQBYp+oBLz6IOlaGwTvKbZqzA71kFRjYkUFQNzBunkeKdYfqXDlPv7fmzMhNsfq1B1cp0nIjE8SlYHJo6yL+Ht8yYQJZOjzKRiWbWyt9mK7ddidtPaa+Mlos0caJzWIuXpChz2yIpd8AQfKYScDa0mXNNu8LK/Y7ekT1JF4wikvco3RKoLa50f49TIT6HwH28l8PgnjWxDCSkhVIDXL7xwSalqqUqMQBzCWctYM3usvpuvDSCr7p+9E4EnsWQ/vjv68EiQ07jM+B4AHxAirSm7LeFLaiw4ctsIs1+Wz066nLn2cCHcx8wG7FRresiuChDC240A==; 31:F7PUovhQBvr5w1Vy0PBvrlSZJijFOncto9MzZ0g+klljcwn6mYwEdJOXLG7f4fo2x+lKP8d43hRUl7FxM3VRQi5GXx/jbU+QwQxx4spNgIRKjCbD5Vf7Jr6UgDsZoEWAcxd35Cp3tBv46RvquCbWzwVDfe8kCNga4RAvPa0r3VVD84uQGvuO+03TteiGyOjGKL1Lq6VYwcBcIFfZAgsQ+1rPQ9q69kCOXRea6Pm7z+13AZARH8GoR/NA+r/U8ajAARzBk9X9/JuQ9HpMw1xoPA== NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1677; 20:e+DSx99pJ8G+U7oYkNf04XnKBaXwfJUrR6d7vHEbMjZ+4zQYRhnrgOkjdb7QvAwNmbhzi83JAfpXPpeoY5Qbd9Je6dW7xxu8fcmVR3VnVxfa+n+bi3JSWoJCTScIczAx20fyVoLlR+1qlBTsFWI7IWRwN9LgO0J1P2aaUJvlnDR7PnvzeGmEENmIPGrY3t+BUV2GjwJBkBJXeW+0isdajt8RSuOGr8GN33DTn7kZoBEgqorjwxPjoYDPRqzlcVNX 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)(13023025)(13020025)(13013025)(13024025)(5005006)(8121501046)(3002001)(93006095)(93004095)(10201501046)(6055026)(6041248)(20161123564025)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(6072148); SRVR:VI1PR0801MB1677; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0801MB1677; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1677; 4:vslddfup1isT6qS2iCl0mEulQbjb711VXndEr8gL3YoHBMV5PgzqGk2SLNYXm1SpqSetjAy2IOqvC/54A9CDaDCtdmlIsMAJB2AQXbR0rUhrH99vmxY5H4CS0CTEBMxxQO2O6sCg1N8EU8WAY8+3ajC8/ND410vb2Wk8zwsBArLMRRIk6ngLz1a9vN7RKuaC7cdnhF86YQYUonN9ES9W82UwFC1Zoky1Ww7ApbxZ73CIDk/1nTvzGJ8Rh+C38igBXxEvUXTruZ7+t+9YEwfMnYVMwp8qShJz6vimkAXU8h8BHSR4xEROREHNRXtbXyf2ljt+o3pGtS6FvMNg/AnrAsuPxU3XYlJmlWaOPncJ4GjyJGbJp8Fc/IKC/YnzBjYyjHUu1qIelAD2IjPeEgRUNp+vT12G4J9NhCxQLrmt64FKMc4wALDd/hC5Xl0BbHSM/6LD2WVJZ5T7T7VcZN84MwSMCX4FEaPZaE6XVvQgBkfbtKjRM+vPu4ZpVcrFZtzzhFFjZ7PKq0ooWmBKvZHkxsuewV4LKF04+TJ43PBr9MNQY3W4L/HkHdv45brW+pePzjvrvTttA65GSC1VW1mRG9+rmE/tYckeysQ5VVzOD7E+orSuzMfSUGNrzzeCKj51xwC3C3MrSe7rK/scMHRJL8vxreLWQKAtJ1VCWoe7fYkuraxz2lVWT1mJgcgbG8jdAXZHhaYHUfdieHuWcx2qggcUKYhvXR3f+xoEh2SZQLEYVc40+HD0hWmzc/lx9RYGmDEl0I83HgkXpVICL0RQZkiAnVVdevovFL30Y6nb56n7DjSSJ2Blm8AEXvnsMk5PJ+64XdIcVElHrUOUxygFtOPRvuOQSQrxRR6RWbxOK8onWVXjqmB0LfiLi+zjY+BF X-Forefront-PRVS: 02638D901B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0801MB1677; 23:9zjIiBf/Sgmi1KghGA8p1qe7/tpthMkqc2u1kiV?= =?us-ascii?Q?DogHGuC4XgtbV5Q2zwQlMLrhLl/zpEBc0RPPGDoMt9pBdn+MjgVrIADO3TX2?= =?us-ascii?Q?DnD9qC1MN1usfLKdluty/iZFsGaYw7msCngoDPFFaLMoot8ycRPHJhTeXcSM?= =?us-ascii?Q?9JswSQ00WbPu58GkiQzeID0DX4e00IqwtZVg3ox06JfvrJ7eGfAkSC+mHTWy?= =?us-ascii?Q?auebM/mlTntu7nDH94KpFfvrhmeLq05KubeaKT0HB03cFKLhpKoD/xmZD0Yz?= =?us-ascii?Q?MSDn0//FQfUoWFiMyJ2wszUdwTwP0WPcVgHdyi2fGqTwuIZDWQoZKZWGrV0R?= =?us-ascii?Q?z1XJfzoEGoiwlu6e0w8LW2b+TzJDjS2a2D6cm7F0Xk0qPxWo5Pc/tDklmR9/?= =?us-ascii?Q?RghK7rCeo4t5P+usWXQ4l/CaHrfwRhzYShTWiveAsk9MMFEqjwUrdA2D/fCt?= =?us-ascii?Q?brwlrbEEpY1wQo4k2KkD2S93a8rdRI560wix1PKI+MP5Bp2si6HqfKp/M2hl?= =?us-ascii?Q?8vfFeiAxCDX4QWUmvrUBojwNXx3JuI3+89wDsjW7ryEQJYcLYVgz8lNOMeTi?= =?us-ascii?Q?/OlPAugR5GcwNoYGEvTOb5eqgeWXp16utRJhIX6MRxvI8e9/xYPTwj6+qb3f?= =?us-ascii?Q?drMpzXGJLP7vwSwSJhSf/lh4N7Fn6xidy3t/s07LqyxadUtj+/O5CzxdO4gW?= =?us-ascii?Q?q9USTiAD7gbAtfXfXu9ZVyGSDd2ECN6Os3pfpcbcxpbqIl+hlcDSn6hOHd0S?= =?us-ascii?Q?hNnfO3Cnh14faFyuzJc/7Q6kzsdJV9Gty6FP1Z+ID6oaSdjyUjGVddvLphd/?= =?us-ascii?Q?EzEXDc8UVPw3l7JOpB1cALweN6SAJzCfUJhj7hrhjUXjQpimsot0VqAvITUk?= =?us-ascii?Q?Gp8P9bTqSgw2ILwZoKK4iJdpfv8b24ny8XJ82D/PVcjx6oD279oWGhF9gETQ?= =?us-ascii?Q?WP03GV5GNr0+IOYm4gsYGNnlrELCjHTHc6/cDJHpnZA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1677; 6:TPCQUpMBP2+UqeGN1ePk4aNzQ0BBYG0BboTTw6Fj3/WkVnC1mo3ygg8O1CAcur9vUfHHqfMTtuEeravsH0uQzDEqitHvcIy0xL1vIbCaawQLeU6UCOcQJQ3E1JnChll3Am5mvtLwRQoPz/g+w6spzp+sUOEEZPhBPQG3jHnSZk1QSRtv/7unk6v6B3E2SZk7yl7O6c8k2bUzKTZyEFQ18hFLIi5UAOohWey285Q2K4+NTpTSeqWvtHdgPuxTFxAAyaSjykR3NYlh8hQwAK4puzbDkL+8DVYGlYETrk153e+gURpFmoWAscuPPvQhEx3K6pYGdqzoImGtevLyMw8reiANRPXhIsVAXoG5Nbh8Jtj2oZ5T5J20DHVMGE6304Xd8hMxUqIfXSM5DkN06ae9xG2MvYLGKm/pZL8ZQIB6oT0=; 5:/vpxqsqcTjqtruOH03J/6LkSVQzZXXlPVvWPYZl6X/c9PiF88qCT+rbSjGvIyjApQoh63Id9N+popWHjpdQm9c1uE3R+/J492bBB9AYvy354YiWXi1v/qf6rS52pBYLtc1uX9b2IFaxrQj+oHxwgA+9jrm/ZwfUGJbV98r4oV04=; 24:kUbNmRmJ3yFj/r7KomUPYRR2ij1/nrqaFiNzP3ybTkS98vuoPP8DKHb/7iiL0KCqlVq0otJwX4HiFEVfOAaoI13gl6b8jbK6PgdsLexNFoc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1677; 7:+9SI0HVEdSY5eYAZVE8XJU41nQ5BhnQzcLLi6pyg7Cc53o02IXPFaVhSU45FK9jOFAXOJ5xYnRSbFpgDwsC4/xir2lakgHanE/B2+occ0qHoByXGTDR2Ckmg5tPMM1Erm4+KBbyvHhUS1aNTcFuQ8IVWZLUh7mSP+IuIahuzBm5IpYJ14tq0y3uYRD8UBxXtXDH5gHxL2zIXMPh6VTVedXgH+lKo3jv223kbSoRpoVHbhNLF1pskqs2MuK8oW711SV81hyX6QIBGRZYDQ50+thnLVV8i1/CFzv1ganwWxssjhZHhrKe2q3YhLuVc0GCktp1ofGAc6Oc2ysKg1oDuNw== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2017 13:08:47.8328 (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: VI1PR0801MB1677 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 13/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 4b53b7e..1c5cfb8 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2900,21 +2900,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 81227aa..bb24bee 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);