From nobody Sat Nov 30 02:51:15 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=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1618227258; cv=none; d=zohomail.com; s=zohoarc; b=aCVeE8n4BpJj7rtrtj8PexG7d1II3NK7LL54YDxEwQ8VghOLSIfgvxikp8yeMoRf2tIfVfzwVu9TPDZ4rDiUcdPovNaseENA9tj7SBGXteOM8c2pLk3m8/o3ObfgEoFWfTrupWkzYPm4cxscBh7OyHr92gOVu6nZMxvPs1him7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618227258; 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=sQ4lVi2o4tchc7YFjCdNdXGvwL77JuReQE511bjCYZY=; b=JkXCJ2V6bxZaTGd74xs7BvE0uzOdCerLkxQP8QjIuMqcwLXx+SSrZW5sKdbtvAR2zxhB4eMLTkba3c/u07AhMNYA2lMDBvVHFQtPZ4lj92onvkIaNHrQW7Rx2MpAp0w6oax3+cCiSuobcmOUMt6N70E4fLbX2tSKqofdHJThDqE= 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=quarantine 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 1618227258646378.861394182921; Mon, 12 Apr 2021 04:34:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.109007.208047 (Exim 4.92) (envelope-from ) id 1lVupE-00059z-OJ; Mon, 12 Apr 2021 11:33:52 +0000 Received: by outflank-mailman (output) from mailman id 109007.208047; Mon, 12 Apr 2021 11:33: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 1lVupE-00059s-KS; Mon, 12 Apr 2021 11:33:52 +0000 Received: by outflank-mailman (input) for mailman id 109007; Mon, 12 Apr 2021 11:33:51 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lVupD-00059n-Jv for xen-devel@lists.xenproject.org; Mon, 12 Apr 2021 11:33:51 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 932780d3-1912-464c-b74e-690e0ada95cb; Mon, 12 Apr 2021 11:33:50 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id F23A0B2EE; Mon, 12 Apr 2021 11:33:49 +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: 932780d3-1912-464c-b74e-690e0ada95cb X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1618227230; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQ4lVi2o4tchc7YFjCdNdXGvwL77JuReQE511bjCYZY=; b=obepuhsUzBTeARZ39AYZAT6nTmNuA4wXsvGB6Wn3pWlBEjHdggUHbnlMcgbeOLNtFjBYZA waxTI219U1b/W/vg6WPwAdBJ2SxiWAOU8vHTrzCG510D2WKqqwjs7cyF5xG5BGzaZb/F49 5rFuB+v22Pjrbhi2tIAUXm5hpfN5gUE= To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian , Jun Nakajima , Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= From: Jan Beulich Subject: [PATCH] x86/EPT: minor local variable adjustment in ept_set_entry() Message-ID: Date: Mon, 12 Apr 2021 13:33:50 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Not having direct_mmio (used only once anyway) as a local variable gets the epte_get_entry_emt() invocation here in better sync with the other ones. While at it also reduce ipat's scope. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Reviewed-by: Roger Pau Monn=C3=A9 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -677,8 +677,6 @@ ept_set_entry(struct p2m_domain *p2m, gf unsigned long fn_mask =3D !mfn_eq(mfn, INVALID_MFN) ? (gfn | mfn_x(mfn= )) : gfn; int ret, rc =3D 0; bool_t entry_written =3D 0; - bool_t direct_mmio =3D (p2mt =3D=3D p2m_mmio_direct); - uint8_t ipat =3D 0; bool_t need_modify_vtd_table =3D 1; bool_t vtd_pte_present =3D 0; unsigned int iommu_flags =3D p2m_get_iommu_flags(p2mt, mfn); @@ -790,8 +788,10 @@ ept_set_entry(struct p2m_domain *p2m, gf =20 if ( mfn_valid(mfn) || p2m_allows_invalid_mfn(p2mt) ) { + uint8_t ipat =3D 0; int emt =3D epte_get_entry_emt(p2m->domain, gfn, mfn, - i * EPT_TABLE_ORDER, &ipat, direct_mm= io); + i * EPT_TABLE_ORDER, &ipat, + p2mt =3D=3D p2m_mmio_direct); =20 if ( emt >=3D 0 ) new_entry.emt =3D emt;