From nobody Tue May 7 07:19:50 2024 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=1618843574; cv=none; d=zohomail.com; s=zohoarc; b=gsEbFm0AhI46mpcaMhPwA3D4nCYhWnrY0BQawi3DjK7CC+JL57Id7JIXGWJqkK1pUkmmMbGCxt1anfHWADuKCXMoUAGGsLrUnLQDz9quv1/32OuRvp0Cowsq63NNtZKHhsObdRKe9rMRvkXD1/QBibDufdgpDnKA7ZpZqPTZ6uY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618843574; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Qw+5JeLB06T6chu0XFfjGjcX44Q0CNcCuCiCd9hFQ6c=; b=L1copO2x4wjwYN0gxHToLS30J+ATonbPVMeiqy2Z9rYieC+VKZqLZs45UfjcahIbfzN6dR3It2CL4FAGrNl0dmonkJxvS7o9kKJMT5zQn9TBqcRjqvaVtBhnauoWOZctDmtQr2AiYAf4grJfQllhwmko9bKnsa6b9iCAs94UyDI= 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) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1618843574540990.3709620381904; Mon, 19 Apr 2021 07:46:14 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.113024.215396 (Exim 4.92) (envelope-from ) id 1lYV9s-0002EQ-Ax; Mon, 19 Apr 2021 14:45:52 +0000 Received: by outflank-mailman (output) from mailman id 113024.215396; Mon, 19 Apr 2021 14:45:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lYV9s-0002EJ-7r; Mon, 19 Apr 2021 14:45:52 +0000 Received: by outflank-mailman (input) for mailman id 113024; Mon, 19 Apr 2021 14:45:50 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lYV9q-0002EE-Te for xen-devel@lists.xenproject.org; Mon, 19 Apr 2021 14:45:50 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 40005a1f-10d4-45cc-91bb-1baa02fb3e09; Mon, 19 Apr 2021 14:45:50 +0000 (UTC) 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: 40005a1f-10d4-45cc-91bb-1baa02fb3e09 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1618843549; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Ty0T50ZwLIJw8cIZQrlAqYvyqKtKe+HTjC7QJM0MA1Y=; b=fWpwuLaf5tgOcPbkxxRSOs+8d7/SKEmeJEVVO3/tOP90+WebzPg9d0bm O/g4SX1KTTaSqUGelT7kyATcXVENOMzUh0uQ02bXAk1GJBAmSHLSYgUuo TWWQi78bQe+aKWhCSOBlc7TLUzkxrgrWp9dPPbbK/pUNE9cKLfJ5m5HLw I=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: JqQVed7TemJvuZL8HoVTxIOoU/YNzr5MICt/7gf1H5ciFYPibWlSQ6LNLLpqJI0p+r4H5lLFqb 6im0kdC4CldH0N5lXBtYXLW5sELPW6hEE5c9P1Hn1KFdnWQV517et94x/M61FPLTOaq9+PYF2C iMTfXg7OzpjIrRg+CgO3K2W3ZYZZ9+hW8yHZg4Udk2/MilaW7c8f8EosTf2OW1hUzfIpFX0/qU iwgYRBaWL2EoxVABJnS3z6RQziNEnEaIdnmfowAeoxrdJdpgy8lVAzbMSKq69lJsn2pTuxgcpC fDY= X-SBRS: 5.1 X-MesageID: 41896375 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:3JbJnaCImuQccivlHeh2sceALOonbusQ8zAX/mhsVB1YddGZnc iynPIdkST5kioVRWtIo729EYOHRm7R8oMw3JkJMd6ZLWzbkUaLDKUn14vtxDX8Bzbzn9Q26Y 5Me7VzYeeeMXFUlsD/iTPXL/8F4P2qtJ+lnv3fyXAFd3AJV4hF4x1iAgiWVm1aLTMnObMDGJ CR5tVKqlObEBx6Uu2BCmQYRO+GntXXlfvdCiIuPQIt6wWFkFqTmd3HOiWfty1+bxp/hY0M3E KAuAz/66WlvZiAu2Xh/l6W1bt6sp/MztNCAeaFl8QaLC794zzYGbhJavm5kx0e5M2p9VY2gP nAyi1QQ/hb2jfqUUye5TvrxgX63z4l5xbZuCClqEqmm+PVbnYeKaN69OZkWyqc0WUMlpVA9Z gO+GSju59eHXr77VzAzumNbT5GvA6Ju3Y4+NRj6EB3YM8lR5J6i5cQx09RGIdoJlOA1KkXVN NjC8zR/59tADWnRkGcumFuxeqlVWgoEiGHRVAfuteU3yI+pgEB83cl X-IronPort-AV: E=Sophos;i="5.82,234,1613451600"; d="scan'208";a="41896375" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH] x86/shim: Simplify compat handling in write_start_info() Date: Mon, 19 Apr 2021 15:45:24 +0100 Message-ID: <20210419144524.32608-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) Factor out a compat boolean to remove the lfence overhead from multiple is_pv_32bit_domain() calls. For a compat guest, the upper 32 bits of rdx are zero, so there is no need = to have any conditional logic at all when mapping the start info page. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu --- xen/arch/x86/pv/shim.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c index d16c0048c0..533c194eef 100644 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -280,12 +280,12 @@ void __init pv_shim_setup_dom(struct domain *d, l4_pg= entry_t *l4start, static void write_start_info(struct domain *d) { struct cpu_user_regs *regs =3D guest_cpu_user_regs(); - start_info_t *si =3D map_domain_page(_mfn(is_pv_32bit_domain(d) ? regs= ->edx - : regs->= rdx)); + bool compat =3D is_pv_32bit_domain(d); + start_info_t *si =3D map_domain_page(_mfn(regs->rdx)); uint64_t param; =20 snprintf(si->magic, sizeof(si->magic), "xen-3.0-x86_%s", - is_pv_32bit_domain(d) ? "32p" : "64"); + compat ? "32p" : "64"); si->nr_pages =3D domain_tot_pages(d); si->shared_info =3D virt_to_maddr(d->shared_info); si->flags =3D 0; @@ -300,7 +300,7 @@ static void write_start_info(struct domain *d) &si->console.domU.mfn) ) BUG(); =20 - if ( is_pv_32bit_domain(d) ) + if ( compat ) xlat_start_info(si, XLAT_start_info_console_domU); =20 unmap_domain_page(si); --=20 2.11.0