[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] x86/livepatch: Fix livepatch application when CET is active
- To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Mon, 17 Apr 2023 10:34:40 +0100
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- 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=nGDmXLLZfnd90PTseAF0OPUHPoRFvm7qxvzmE5AZKkY=; b=n1gCg2RpKv072Vyrah2iLPjRpnWUEAmf+IYcFVvYFyPw7yKr0NAY8h9D0X9J+F6vwB9BPTWX+YtXhNnhs9a/HBEZce9TCpNmwxp0FDYQWa7hG6Wjrle/hMsGJpQ/GGZmnoaAnk+5i7W6++YvVdwSytqJVxuztRHvJzX1dEHyjLXGCVdWvZJP1Uu+22w9soJpeu0QrDXLjDfcOAwVBHg8P0CBvxbqIvKOx6Q3v7BF6e+E/9z837eM8iTC5fpHvzDFhm9nu2pLn7U9gkz4RDmWK+/VL5igJMkKENLlBVIM9qeJ7+bvICm4Hpr88YGt8Eqt8QGwrVfkI7UohCeyPh4fbw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JlP52K8tBWrd0CRfEEdtDO/fGUtV/jqS35HN2m/7Ywv+B00I7/2MMn9FYrlhsoxr2WPF9tTEMtHD7VLya5izjacnhB0kLAoaLIwaE+2RAtR4LxqjWL4tanZQabn0v4YT3Sx6AgcSmu/46xdbKnudgpkR5Ux8TFCNmBGrd32Z0tqrwF6b0E9VpulllfT54pZxbQ5GA4vsNoyHT5/Bp9VTN1Ot1nvqHiiuQ5YGTi+dIdD197nk5Os/t2f3karWZztP8JlG1cPV+QXmFJMymAkUe/+FCKiFIASgBim12bDX7lNUX7z6q2/IyP9ou3v+gEcDPzurJGHFZe5XYPlPovkCDw==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Jan Beulich <JBeulich@xxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>, Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
- Delivery-date: Mon, 17 Apr 2023 09:35:24 +0000
- Ironport-data: A9a23:yO70BaDF1lBPlxVW/xPiw5YqxClBgxIJ4kV8jS/XYbTApGh31WNRz GIeDGmDPvmKYWP9KNB2aYXl8k0Hv5TSyd8wQQY4rX1jcSlH+JHPbTi7wuUcHAvJd5GeExg3h yk6QoOdRCzhZiaE/n9BCpC48T8nk/nOHuGmYAL9EngZbRd+Tys8gg5Ulec8g4p56fC0GArIs t7pyyHlEAbNNwVcbyRFuspvlDs15K6p4G9B4ARkDRx2lAS2e0c9Xcp3yZ6ZdxMUcqEMdsamS uDKyq2O/2+x13/B3fv8z94X2mVTKlLjFVDmZkh+AsBOsTAbzsAG6Y4pNeJ0VKtio27hc+ada jl6ncfYpQ8BZsUgkQmGOvVSO3kW0aZuoNcrLZUj2CA6IoKvn3bEmp1T4E8K0YIwpMJWK1Nt6 KEhCTU9TU6unuG/5oykRbw57igjBJGD0II3nFhFlW2cIdN4BJfJTuPN+MNS2yo2ioZWB/HCa sEFaD1pKhPdfxlIPVRRA5U79AuqriCnL3sE9xTK/uxrswA/zyQouFTpGPPTdsaHWoN+mUGAq 3id12/4HgsbJJqUzj/tHneE37eTwH2hCdxPfFG+3vFL33DCmkEwMSExahi5nvr+2nK6f90Kf iT4/QJr98De7neDXtT7GhG1vnOAlhodQMZLVf037hmXzajZ6BrfAXILJhZjQtE7sM49RRQxy 0SE2djuAFRHr7m9WX+bsLCOoluaOi8TN2YOIzAFSQgt5MPqq4U+yBnIS75e/LWdi9T0HXT8x m6MpS1m27EL15ZXh+O84EzNhC+qqt7RVAkp6w7LX2WjqARkeIqiYI/u4l/ehRpdELukopC6l CBss6CjAComVPlhSATlrD0xIYyU
- Ironport-hdrordr: A9a23:pEyRXa0f1SfiqsBcD8kioAqjBI0kLtp133Aq2lEZdPWaSL3gqy nOpoVi6faQslwssR4b6LW90cW7MBHhHNtOkOos1NSZPTUO2lHYSL2KhLGKq1bd8m/FltK1vp 0QFJSWZueAa2SSTvyX3OB7KbsdKRW8n5xATN2x80tQ
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On 15/04/2023 8:58 pm, Andrew Cooper wrote:
> diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
> index 36a07ef77eae..1707bcd2d15c 100644
> --- a/xen/arch/x86/mm.c
> +++ b/xen/arch/x86/mm.c
> @@ -5879,6 +5879,77 @@ int destroy_xen_mappings(unsigned long s, unsigned
> long e)
> return modify_xen_mappings(s, e, _PAGE_NONE);
> }
>
> +#if defined(CONFIG_LIVEPATCH) && defined(CONFIG_HAS_ALTERNATIVE)
Gitlab testing highlighted that this should be || not &&.
I've fixed up locally, but won't repost just for this change.
~Andrew
|
