From nobody Mon Feb 9 20:35:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1676656172; cv=none; d=zohomail.com; s=zohoarc; b=niYjIBbIxJPbCFQiEAiFOWcjJ5wtBZnsM91IlIsxRJXj7oCXAM7BULD94lBTCzuCDQ0jPx8DsLtHayhl3IiuPphdxHlKRKzNwdhEpsI6owIiKIFvpyLMoypMDjNBpyf/vxsASpNYJCQu7FNOk6B2MtxUczYf1iZbIDIXCskRuNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676656172; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0NIWWVlKmfFGWoxNfAz5kxo9idQbtcMAD6qZ0TXarhk=; b=TWtuFT6pKblih2VALtDQ7PjpTZfhynof3M0+5DsesYxxE8bAtWitxebROY5Ebs49sWbFYO5y4bvYLyLjMFeudRi0DIweDW24O0tHV3QxcKcHoNCWBh4B8Z+EBaZevAUrEdMOLx6VTB68ZIDOi/ymz1WjEt9WGPsztz5si6euXDU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1676656172416502.65645593454974; Fri, 17 Feb 2023 09:49:32 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.497213.768102 (Exim 4.92) (envelope-from ) id 1pT4qd-0002s6-E1; Fri, 17 Feb 2023 17:48:39 +0000 Received: by outflank-mailman (output) from mailman id 497213.768102; Fri, 17 Feb 2023 17:48:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pT4qd-0002rz-AR; Fri, 17 Feb 2023 17:48:39 +0000 Received: by outflank-mailman (input) for mailman id 497213; Fri, 17 Feb 2023 17:48:38 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pT4qc-0002rh-E7 for xen-devel@lists.xenproject.org; Fri, 17 Feb 2023 17:48:38 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4c015a78-aeeb-11ed-933d-83870f6b2ba8; Fri, 17 Feb 2023 18:48:35 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 4c015a78-aeeb-11ed-933d-83870f6b2ba8 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1676656115; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pQkR+t2gNbGqRxj7fNmsb+K2rgz5dHlSLHWFbF6Ydbw=; b=B9EhBZtg13lP1HYjlI50/jpjSxhHBocxQpB5dq62keTMAI01I89nJ23y tPd6OHMGd5jx0+ZPOYT/fBQYKkS0XDOjcWvTWn1DUZCEfg/p4BQe6zDsb n2WBckDPE3PTBLyit56nYuQWKvJFDi+Tks7gS8CD9kvprcaNeFEeBM3ud 8=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 4.0 X-MesageID: 96897979 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.123 X-Policy: $RELAYED IronPort-Data: A9a23:6pGO3a9+L3jit0PR2HqfDrUDln6TJUtcMsCJ2f8bNWPcYEJGY0x3n GsYXGuDMqmLNzfxct53b4u//E5U6JXUn941GgBs/yE8E34SpcT7XtnIdU2Y0wF+jCHgZBk+s 5hBMImowOQcFCK0SsKFa+C5xZVE/fjUAOG6UKicYXoZqTZMEE8JkQhkl/MynrlmiN24BxLlk d7pqojUNUTNNwRcawr40Ire7kIw1BjOkGlA5AdmP6kU5AW2e0Q9V/rzG4ngdxMUfaEMdgKKb 76r5K20+Grf4yAsBruN+losWhRXKlJ6FVHmZkt+A8BOsDAbzsAB+v9T2M4nQVVWk120c+VZk 72hg3ASpTABZcUgkMxFO/VR/roX0aduoNcrKlDn2SCfItGvn9IBDJyCAWlvVbD09NqbDklB+ sA8MDxdMSuTmvyUnr28CbdMlPwseZyD0IM34hmMzBncBPciB5vCX7/L9ZlT2zJYasJmRKiEI ZBDMHw2MUqGOkcUUrsUIMtWcOOAr3/zaTBH7nmSorI6+TP7xw1tyrn9dtHSf7RmQO0EwBbJ+ TOZrgwVBDkrLNbGwn2I4kj3l7H9pBPaZN4CGu2Bo6sCbFq7mTVIVUx+uUGAiem0jAuyVsxSL 2QQ+zEytu4i+UqzVN7/Uhak5nmesXY0efBdDuk74wGl0bfP7kCSAW1sZiFFQMwrsokxXzNC6 7OSt4q3X3o16uTTEC/DsO7O9lteJBT5M0cNahMgVQdVvOLzvZ8R0B3IDYhDApa624id9S7L/ xiGqy03hrM2hMEN1rmm8V2vvw9AtqQlXSZuuFyJAzvNAhdRIdf8Otf2sQSzAeNodt7xc7WXg JQTdyFyBsgqBIrFqiGCSf5l8FqBt6fca220bbKC8vAcG9WRF5yLJ9w4DNJWfh0B3iM4ldjBO Ra7hO+pzMUPVEZGlIcuC25LN+wkzLL7CfPuXe3OY9xFb/BZLVHYonwxPxLIjzu2wCDAdJ3T3 r/BLK6R4YsyU/w7nFJauc9DuVPU+szO7TyKHs2qp/hW+bGfeGSUWd843KimN4gEAFe/iFyNq b53bpLaoyizpcWiOkE7B6ZPdwFVRZX6bLiqw/FqmhmreVY3RjhxU6WKntvMueVNxsxoqwsBx VnlMmcw9bY1rSevxdmiApy7VI7SYA== IronPort-HdrOrdr: A9a23:1N5Kzao2CEnA+oDbgt0Dg3oaV5oUeYIsimQD101hICG9vPbo7v xG/c5rrSMc7Qx6ZJhOo6HkBEDtewK/yXcx2/hzAV7AZmjbUQmTXeVfBOLZqlWKJ8S9zI5gPM xbAs9D4bPLfD5HZAXBjDVQ0exM/DBKys+VbC7loUtQcQ== X-IronPort-AV: E=Sophos;i="5.97,306,1669093200"; d="scan'208";a="96897979" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH 3/3] x86/kexec: Annotate functions with ELF metadata Date: Fri, 17 Feb 2023 17:48:14 +0000 Message-ID: <20230217174814.1006961-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230217174814.1006961-1-andrew.cooper3@citrix.com> References: <20230217174814.1006961-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1676656174150100005 All of kexec_reloc(), relocate_pages() and compatibility_mode() are function-like. Annotate them appropriately. Furthermore, move the data into a different cacheline from the code, so the relocation of compat_mode_gdt_desc doesn't trigger self-modifying safety lo= gic in the pipeline. No functional change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu --- xen/arch/x86/x86_64/kexec_reloc.S | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/x86_64/kexec_reloc.S b/xen/arch/x86/x86_64/kexec_= reloc.S index a81f64146190..c7fc11fa5868 100644 --- a/xen/arch/x86/x86_64/kexec_reloc.S +++ b/xen/arch/x86/x86_64/kexec_reloc.S @@ -13,6 +13,7 @@ =20 .file __FILE__ =20 +#include #include =20 #include @@ -90,7 +91,10 @@ ENTRY(kexec_reloc) push %rax lretq =20 -relocate_pages: + .type kexec_reloc, @function + .size kexec_reloc, . - kexec_reloc + +ENTRY(relocate_pages) /* %rdi - indirection page maddr */ pushq %rbx =20 @@ -137,9 +141,12 @@ relocate_pages: popq %rbx ret =20 + .type relocate_pages, @function + .size relocate_pages, . - relocate_pages + .code32 =20 -compatibility_mode: +ENTRY(compatibility_mode) /* Setup some sane segments. */ movl $0x0008, %eax movl %eax, %ds @@ -167,7 +174,14 @@ compatibility_mode: call *%ebp ud2 =20 - .align 4 + .type compatibility_mode, @function + .size compatibility_mode, . - compatibility_mode + + /* + * Ensure data is in a different cache line to code. + */ + .align SMP_CACHE_BYTES, 0 + compat_mode_gdt_desc: .word .Lcompat_mode_gdt_end - compat_mode_gdt -1 .quad . - kexec_reloc /* Relocated before use */ --=20 2.30.2