From nobody Sat Nov 30 03:55:26 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; 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=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1618224805; cv=none; d=zohomail.com; s=zohoarc; b=hZumK4baAbiKW5DyuYzz8kt3wLI98W6Ef0HlkDEXzqSnNdROJu5Cw9FN7muxeuuQce9xl4AVIAZvaT2wBRqNxGqEqPw0qovko9hPPWiVKZOt/4Bf/EltuhbGLOxA+7GY+9Rj1tRjhg0qBwCsEhYtAs1eRTgBBAHWqkZxN1blR0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618224805; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UWJcgx2d+vTlFT/q1L5wxBraeNqMzqJrKBbhz6ONzRI=; b=FVb7JBGyDytQZ31xEuErLx1Xv8LqbVZX6OekaczOjkGdc5nmluqA6/1ARHZeKSCDD4lZx/4EIBGADLGrwoUuxIQg9ip2+IRCs3zkYw7Y58QwuIap/t2HhlE2eJrP8u2Wk5LF3DBGmjBNBBfn5kyUppQ+sbZNqIEb71S0cIpOi0M= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=fail header.from= (p=none 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 1618224805091890.9365106088841; Mon, 12 Apr 2021 03:53:25 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.108960.207950 (Exim 4.92) (envelope-from ) id 1lVuBn-0000js-BD; Mon, 12 Apr 2021 10:53:07 +0000 Received: by outflank-mailman (output) from mailman id 108960.207950; Mon, 12 Apr 2021 10:53:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lVuBn-0000jl-7h; Mon, 12 Apr 2021 10:53:07 +0000 Received: by outflank-mailman (input) for mailman id 108960; Mon, 12 Apr 2021 10:53:05 +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 1lVuBl-0000jA-MG for xen-devel@lists.xenproject.org; Mon, 12 Apr 2021 10:53:05 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 36946a84-f473-4f29-99fd-a68ce6a6bc01; Mon, 12 Apr 2021 10:53:04 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0130EED1; Mon, 12 Apr 2021 03:53:04 -0700 (PDT) Received: from e125770.cambridge.arm.com (e125770.cambridge.arm.com [10.1.197.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6EE903F694; Mon, 12 Apr 2021 03:53:02 -0700 (PDT) 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: 36946a84-f473-4f29-99fd-a68ce6a6bc01 From: Luca Fancellu To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, wei.chen@arm.com, Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Wei Liu , Rahul Singh Subject: [PATCH v3 2/4] xen/arm: Handle cases when hardware_domain is NULL Date: Mon, 12 Apr 2021 11:52:41 +0100 Message-Id: <20210412105243.23354-3-luca.fancellu@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210412105243.23354-1-luca.fancellu@arm.com> References: <20210412105243.23354-1-luca.fancellu@arm.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The function is_hardware_domain() returns true if the hardware_domain and the passed domain is NULL, here we add a check to return false if there is no hardware_domain. Among the common and arm codebase there are few cases where the hardware_domain variable is checked to see if the current domain is equal to the hardware_domain, change this cases to use is_hardware_domain() function instead. Signed-off-by: Luca Fancellu --- v3 changes: - removed unneeded parenthesis for macro is_domain_direct_mapped - is_hardware_domain() checks for the passed domain and if it is NULL, it returns false. - reverted back checks in the function late_hwdom_init --- xen/arch/arm/irq.c | 2 +- xen/drivers/passthrough/arm/ipmmu-vmsa.c | 2 +- xen/drivers/passthrough/arm/smmu-v3.c | 2 +- xen/drivers/passthrough/arm/smmu.c | 2 +- xen/include/asm-arm/domain.h | 2 +- xen/include/xen/sched.h | 3 +++ 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index b71b099e6f..b761d90c40 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -412,7 +412,7 @@ bool is_assignable_irq(unsigned int irq) */ bool irq_type_set_by_domain(const struct domain *d) { - return (d =3D=3D hardware_domain); + return is_hardware_domain(d); } =20 /* diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c b/xen/drivers/passthr= ough/arm/ipmmu-vmsa.c index aef358d880..8b8e3a00ba 100644 --- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c +++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c @@ -1168,7 +1168,7 @@ static int ipmmu_reassign_device(struct domain *s, st= ruct domain *t, int ret =3D 0; =20 /* Don't allow remapping on other domain than hwdom */ - if ( t && t !=3D hardware_domain ) + if ( t && !is_hardware_domain(t) ) return -EPERM; =20 if ( t =3D=3D s ) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthroug= h/arm/smmu-v3.c index 53d150cdb6..d115df7320 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -3366,7 +3366,7 @@ static int arm_smmu_reassign_dev(struct domain *s, st= ruct domain *t, int ret =3D 0; =20 /* Don't allow remapping on other domain than hwdom */ - if (t && t !=3D hardware_domain) + if ( t && !is_hardware_domain(t) ) return -EPERM; =20 if (t =3D=3D s) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/a= rm/smmu.c index 3e8aa37866..932fdfd6dd 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -2670,7 +2670,7 @@ static int arm_smmu_reassign_dev(struct domain *s, st= ruct domain *t, int ret =3D 0; =20 /* Don't allow remapping on other domain than hwdom */ - if (t && t !=3D hardware_domain) + if ( t && !is_hardware_domain(t) ) return -EPERM; =20 if (t =3D=3D s) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 1da90f207d..0a74df9931 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -30,7 +30,7 @@ enum domain_type { #endif =20 /* The hardware domain has always its memory direct mapped. */ -#define is_domain_direct_mapped(d) ((d) =3D=3D hardware_domain) +#define is_domain_direct_mapped(d) is_hardware_domain(d) =20 struct vtimer { struct vcpu *v; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 5485d08afb..5ba90f1214 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -1022,6 +1022,9 @@ static always_inline bool is_hardware_domain(const st= ruct domain *d) if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) ) return false; =20 + if ( !d ) + return false; + return evaluate_nospec(d =3D=3D hardware_domain); } =20 --=20 2.17.1