[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2] livepatch: apply_alternatives() is only used for livepatch
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Wed, 7 Jun 2023 11:01:20 +0200
- 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=k+APwtEMbwH8K+zNBUg7BHZBWWxyyOMBtV/ndUDuzRQ=; b=EFQAGIl3iMMztXdnlvMzcZJkQH7ly3GGF9eJ1rBKjoTnsec8t7rpCghxEZSBJ3fytZ9IFc8JcO6Xx5q9R0Fr0zGSjmCJA0jsETwrV84R5jE7jcJKxa5+mBlGdDNinkRR8KEglmz0qmZy+5YbJixyiWWA07wC96UAy9B/naMKTohV1CcJAgRFUiM6lgscCCFnauoUcpOffg3saBH+xi/mlv+aRo5er2rBXdQJo7i+/VQiQKaULIzUKlk98/Jhsm2eswlhWA4JOXUBnrOrvzl0Wg+xl7ZHBo1fUtrO/vnY4PSYYqR+vI6PAQW4muZ7SBFBoSOZjINCaKAahlQfk/g/cQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EDyfLN1Kj7WFdfN+aUBmS5Zj0XN0b6+hpqCYASK+58G6/2JWxL7Oijn66AkpwStbMsu1YLc5chxaCbXwqq4TnadsinGSCxtTXRxmMn2eQPiArOQe4bpfhi/po7L1nyqjwRZpy03c0A37KSW5rzjkv9lwLreZfvJVrl/BQyWMwCExsv0lz8gvSVn+SSk8VRsk1K77JAas/krL/imvpzs1l55v3QbkbMtdLhkoitL4YTH+rXcAH6lwXJdioT3FcaxGU9yxATU/EHVvjWp84115g+lrT3ABET1wO1hCIpDQCzON1TAmQbZvDNbNntpC+CQ/kfHUGNAjr0IQy/Q8+YYCAQ==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Bertrand Marquis <bertrand.marquis@xxxxxxx>, Volodymyr Babchuk <Volodymyr_Babchuk@xxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Julien Grall <jgrall@xxxxxxxxxx>
- Delivery-date: Wed, 07 Jun 2023 09:01:55 +0000
- Ironport-data: A9a23:pnFtQKwjbOMgwcAwNd56t+enxyrEfRIJ4+MujC+fZmUNrF6WrkUFn 2RMUGqOa/aCamX3ft1ybou2/UwBvcDXzdBlSgQ+rSAxQypGp/SeCIXCJC8cHc8wwu7rFxs7s ppEOrEsCOhuExcwcz/0auCJQUFUjP3OHfykTrafYEidfCc8IA85kxVvhuUltYBhhNm9Emult Mj75sbSIzdJ4RYtWo4vw/zF8EsHUMja4mtC5QRgPa8T5TcyqlFOZH4hDfDpR5fHatE88t6SH 47r0Ly/92XFyBYhYvvNfmHTKxBirhb6ZGBiu1IOM0SQqkEqSh8ai87XAME0e0ZP4whlqvgqo Dl7WT5cfi9yVkHEsLx1vxC1iEiSN4UekFPMCSDXXcB+UyQq2pYjqhljJBheAGEWxgp4KVoW7 tEhFA08VQvAt/ya77SJasBHpP12eaEHPKtH0p1h5RfwKK9/BLzmHeDN79Ie2yosjMdTG/qYf 9AedTdkcBXHZVtIJ0sTD5U92uyvgxETcRUB8A7T+fVxvjeVlVMvuFTuGIO9ltiiX8Jak1zev mvb12/4HgsbJJqUzj/tHneE37aTxnKjBNtPfFG+3t41pkzC/FENMSMbbmqhp+GjzX+VB90Kf iT4/QJr98De7neDXtT7GhG1vnOAlhodQMZLVf037hmXzajZ6BrfAXILJhZac8AvvsIyQT0s1 3eKksnvCDgpt6eaIVqf67OVoDWaKSUTa2gYakcsRwYf/8Pqpo11ixvVV8tiC4a8lNizEjb1q xi0qyw5i6QWnNQ8/ayx9lDagBqhvpHMCAUy423/XGio8wd4b46NfJGz5B7Q6vMoBJmdZkmMu j4Dgcf2xOIBF5iJkASERewfG7fv7PGAWAAwmnZqFpglsjiopXiqeNkJ5CkkfRg3dMEZZTXuf Unf/xtL44NeN2eraqkxZJ+tD8Mtzu7rEtGNuu3oU+eiq6NZLGevlByCr2bJhwgBTGBEfXkDB Kqm
- Ironport-hdrordr: A9a23:RSVOf6iOwJqV4kCC2Te/n1e9s3BQX7F23DAbv31ZSRFFG/FwyP rCoB1L73XJYWgqM03I+eruBEBPewK/yXcT2/hoAV7CZniehILMFu1fBOTZslnd8kHFltK1tp 0QDpSWdueAamSS5PySiGfYLz9J+qj8zEnCv5a6854Cd3AIV0k2hD0JcTpzX3cGMzWvQvECZe uhz/sCgwDlVWUcb8y9CHVAd+/fp+fTnJajTQ8aCwUh4AyuiyrtzLLhCRCX0joXTjsKmN4ZgC P4uj28wp/mn+Cwyxfa2WOWx5NKmOH5wt8GKN2QhtMTIjDMjB/tQIh6QbWNsB08venqwlc3l9 vnpQsmIq1ImjvsV1DwhSGo9xjr0T4o5XOn4ViEgUH7qci8YD4hEcJOia9QbxOcsiMbzZhB+Z MO+1jcm4tcDBvGkii4z9/UVytynk7xhXY5i+Ycg1FWTINbQr5Mqo40+l9TDf47bVTHwbFiNN MrINDX5f5Qf1/fR3fFvlN3yNjpZXg3FgfueDlxhuWllxxt2FxpxUoRw8IS2l0a8ogmdpVC7+ PYdox1ibBnVKYtHO1ALdZEZfHyJn3GQBrKPm7XC0/gDrs7N3XErIOyyKkp5dutZIcDwPIJ6d j8uWtjxC8Pkn/VeI2zNMUhyGGPfIz9Z0Wh9ihm3ek2hlWmL4CbcxFqSzgV4ridSrskc4jmss 2ISexr6s/YXBfT8LlyrnLDsuFpWB8jue0uy6MGsgG107b2A7yvkNDnW9DuA5eoOQoYewrEcw s+tX7IVY990nw=
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Guard it with CONFIG_LIVEPATCH. Note alternatives are applied at boot
using _apply_alternatives().
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
Reviewed-by: Julien Grall <jgrall@xxxxxxxxxx>
---
Changes since v1:
- Do not guard function prototypes.
---
Andrew raised a valid point of moving the prototype to a common
header, but since I'm not longer touching the prototypes I'm not
introducing such header here.
---
xen/arch/arm/alternative.c | 2 ++
xen/arch/x86/alternative.c | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/xen/arch/arm/alternative.c b/xen/arch/arm/alternative.c
index 7366af4ea646..016e66978b6d 100644
--- a/xen/arch/arm/alternative.c
+++ b/xen/arch/arm/alternative.c
@@ -223,6 +223,7 @@ void __init apply_alternatives_all(void)
vunmap(xenmap);
}
+#ifdef CONFIG_LIVEPATCH
int apply_alternatives(const struct alt_instr *start, const struct alt_instr
*end)
{
const struct alt_region region = {
@@ -232,6 +233,7 @@ int apply_alternatives(const struct alt_instr *start, const
struct alt_instr *en
return __apply_alternatives(®ion, 0);
}
+#endif
/*
* Local variables:
diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c
index 99482766b51f..21af0e825822 100644
--- a/xen/arch/x86/alternative.c
+++ b/xen/arch/x86/alternative.c
@@ -358,11 +358,12 @@ static void init_or_livepatch _apply_alternatives(struct
alt_instr *start,
}
}
-void init_or_livepatch apply_alternatives(struct alt_instr *start,
- struct alt_instr *end)
+#ifdef CONFIG_LIVEPATCH
+void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
{
_apply_alternatives(start, end, true);
}
+#endif
static unsigned int __initdata alt_todo;
static unsigned int __initdata alt_done;
--
2.40.0
|
