From nobody Sun May 5 07:22:45 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=1618843576; cv=none; d=zohomail.com; s=zohoarc; b=kbsEfNuP8LTN+Vl2sMXw+kKk43abbNEAjJrSELcJxhmexB5iCohMPwOc7zwTuTEma+xltMtWPRnzzZ6jxgUYGQXnBgXsvB4QKaNcO7C3pggNeMqBO/prUBvgX7KW7k5GDilNB9l5wWSrKq8KlRXlYVemlVDWQ627d8620VE+f5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618843576; 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=lH+rviyr6Pw9V7nSMopkRzR/UWkacerU2XtmkssR/8I=; b=bGkNxnIGGhJ7Kx0uTGuLob1ej7bWdRaW1stHC8iP6IUliXc8MxKvWHKsIVWo6ZdIa5oK/1ITzLGiAedhbLnt03ETYEQvGrhYRmwynoimFWw98u8purQTeRWvd9Oxq+xQnRdephzVCQ7iV2jUS73XI+txzd5+Jq0Qa934ciy9O+Q= 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 1618843576074725.9412936447172; Mon, 19 Apr 2021 07:46:16 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.113025.215408 (Exim 4.92) (envelope-from ) id 1lYV9x-0002GD-K9; Mon, 19 Apr 2021 14:45:57 +0000 Received: by outflank-mailman (output) from mailman id 113025.215408; Mon, 19 Apr 2021 14:45:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lYV9x-0002Fw-Fm; Mon, 19 Apr 2021 14:45:57 +0000 Received: by outflank-mailman (input) for mailman id 113025; Mon, 19 Apr 2021 14:45:55 +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 1lYV9v-0002EE-SH for xen-devel@lists.xenproject.org; Mon, 19 Apr 2021 14:45:55 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bcd3ca13-4f37-475a-9f8d-1e47120a74bc; 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: bcd3ca13-4f37-475a-9f8d-1e47120a74bc DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1618843550; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=nOQSoQs1TITAXQmOKdz/0x9ELGXH9h+Z3/1L3J87LV0=; b=htRE/+2ZyEt6LPHJCye49qBiCA/RBO1FsRrGUZ83+HMo4vPPgFLc1Vjg h+ouAYNFkhlXkK7vRN4rTDxUTzszJ1POFrpowDqpGdGLx4eJrFS4TkZ0H RQlOIbosbg2ZU7aAVr+nGiVU+aHBHcqXePFyV6fg0PNry5vIL8Z1TsYgj 8=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: lmefLMuL0TWaSLNn1CmkCHo/heNOMhdehFGMFTk3fL0AGWjO/ypUVFnX3L9Z29NcV1HGFykjDU /FQCdATxDkRUPwoOkRu9Do7yUMa4crmEeDkETeb29Ss1Gfrhsm2D+KZARpbi2wYxc7bCiZJYPw 49uMmbRJHnU1FvAxdBtQjawxmAk+H9Sh1ZpbscuppUeYk5sAerRzxYVnltWEMkrUlBfdn1k3f4 2b8ULalUCc9ysXLBRhWQ3mtExvkb726pbfacSi69l63WQmhDgxFD+rvyNwVyvBA/qNep5kOI4Y gmo= X-SBRS: 5.1 X-MesageID: 41896377 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:4tO3i6Gau51hla97pLqEDseALOonbusQ8zAX/mpaICY1TuWzkc eykPMHkSLugDEKV3063fyGMq+MQXTTnKQFh7U5F7GkQQXgpS+UPJhvhLGSpAHINiXi+odmpM RdWodkDtmYNzdHpOLbxCX9LNo62tmA98mT9IPj5lNgVxtjZa0lzyoRMHf4LmRMSANLBYU0Gf Onj6ItzVfNRV0tYtmmHX5AZuDfprTw5evbSCQbDB0q4hTmt1OVwYP9eiL34j4uFxdGwbIv6g H+4mnE2pk= X-IronPort-AV: E=Sophos;i="5.82,234,1613451600"; d="scan'208";a="41896377" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH] x86/pv: Fold adjacent paths in dom0_construct_pv() Date: Mon, 19 Apr 2021 15:45:40 +0100 Message-ID: <20210419144540.546-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) This removes a visually-werid layout of conditionals. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu --- xen/arch/x86/pv/dom0_build.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index e0801a9e6d..0ea906d6f8 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -615,9 +615,14 @@ int __init dom0_construct_pv(struct domain *d, { v->arch.pv.failsafe_callback_cs =3D FLAT_COMPAT_KERNEL_CS; v->arch.pv.event_callback_cs =3D FLAT_COMPAT_KERNEL_CS; - } =20 - if ( !compat ) + /* Monitor table already created by switch_compat(). */ + l4start =3D l4tab =3D __va(pagetable_get_paddr(v->arch.guest_table= )); + /* See public/xen.h on why the following is needed. */ + maddr_to_page(mpt_alloc)->u.inuse.type_info =3D PGT_l3_page_table; + l3start =3D __va(mpt_alloc); mpt_alloc +=3D PAGE_SIZE; + } + else { maddr_to_page(mpt_alloc)->u.inuse.type_info =3D PGT_l4_page_table; l4start =3D l4tab =3D __va(mpt_alloc); mpt_alloc +=3D PAGE_SIZE; @@ -626,14 +631,6 @@ int __init dom0_construct_pv(struct domain *d, d, INVALID_MFN, true); v->arch.guest_table =3D pagetable_from_paddr(__pa(l4start)); } - else - { - /* Monitor table already created by switch_compat(). */ - l4start =3D l4tab =3D __va(pagetable_get_paddr(v->arch.guest_table= )); - /* See public/xen.h on why the following is needed. */ - maddr_to_page(mpt_alloc)->u.inuse.type_info =3D PGT_l3_page_table; - l3start =3D __va(mpt_alloc); mpt_alloc +=3D PAGE_SIZE; - } =20 l4tab +=3D l4_table_offset(v_start); pfn =3D alloc_spfn; --=20 2.11.0