From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD69DC433B4 for ; Mon, 12 Apr 2021 14:09:29 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7848261244 for ; Mon, 12 Apr 2021 14:09:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7848261244 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.109191.208404 (Exim 4.92) (envelope-from ) id 1lVxFh-0005B2-6W; Mon, 12 Apr 2021 14:09:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 109191.208404; Mon, 12 Apr 2021 14:09:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lVxFh-0005Av-1a; Mon, 12 Apr 2021 14:09:21 +0000 Received: by outflank-mailman (input) for mailman id 109191; Mon, 12 Apr 2021 14:09:20 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lVxFg-0005Ap-Jo for xen-devel@lists.xenproject.org; Mon, 12 Apr 2021 14:09:20 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ee05faa5-6ba0-476e-a373-1c4c7cea959e; Mon, 12 Apr 2021 14:09:19 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 28B6AB01E; Mon, 12 Apr 2021 14:09:19 +0000 (UTC) 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: ee05faa5-6ba0-476e-a373-1c4c7cea959e 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=1618236559; 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: in-reply-to:in-reply-to:references:references; bh=sLQCZKCYhX92fi1Kjl5wzB13m0sMbygMCSvUFAynd98=; b=daV9fvpdreJ4xwHh79Ez2/VrQA+LdFcIcP8ywe/TezlUh/j3Xq8Hg4Mig2DwNZ5fa9CBSI DPKLK/SfGkBo/tMOzFjWlJrNWCUv2qcyE9j6tRj5HB0UWeCdbi8nGjdHh0cIqRM0rKdEnE FiHoTuVpx21Y3Znkg8TPe1zgg/RnIvg= Subject: [PATCH v2 07/12] x86/p2m: the recalc hook is HVM-only From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , George Dunlap References: <3cf73378-b9d6-0eca-12b6-0f628518bebf@suse.com> Message-ID: Date: Mon, 12 Apr 2021 16:09:18 +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 In-Reply-To: <3cf73378-b9d6-0eca-12b6-0f628518bebf@suse.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Exclude functions involved in its use from !HVM builds, thus making it possible to exclude the hook as well. Signed-off-by: Jan Beulich --- v2: New. --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -1173,8 +1173,8 @@ void p2m_pt_init(struct p2m_domain *p2m) { p2m->set_entry = p2m_pt_set_entry; p2m->get_entry = p2m_pt_get_entry; - p2m->recalc = do_recalc; #ifdef CONFIG_HVM + p2m->recalc = do_recalc; p2m->change_entry_type_global = p2m_pt_change_entry_type_global; p2m->change_entry_type_range = p2m_pt_change_entry_type_range; #endif --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1182,8 +1182,6 @@ void p2m_change_type_range(struct domain p2m_unlock(hostp2m); } -#endif /* CONFIG_HVM */ - /* * Finish p2m type change for gfns which are marked as need_recalc in a range. * Uses the current p2m's max_mapped_pfn to further clip the invalidation @@ -1234,7 +1232,6 @@ int p2m_finish_type_change(struct domain if ( rc < 0 ) goto out; -#ifdef CONFIG_HVM if ( unlikely(altp2m_active(d)) ) { unsigned int i; @@ -1252,7 +1249,6 @@ int p2m_finish_type_change(struct domain goto out; } } -#endif out: p2m_unlock(hostp2m); @@ -1260,8 +1256,6 @@ int p2m_finish_type_change(struct domain return rc; } -#ifdef CONFIG_HVM - /* * Returns: * 0 for success --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -259,9 +259,9 @@ struct p2m_domain { p2m_query_t q, unsigned int *page_order, bool_t *sve); +#ifdef CONFIG_HVM int (*recalc)(struct p2m_domain *p2m, unsigned long gfn); -#ifdef CONFIG_HVM void (*enable_hardware_log_dirty)(struct p2m_domain *p2m); void (*disable_hardware_log_dirty)(struct p2m_domain *p2m); void (*flush_hardware_cached_dirty)(struct p2m_domain *p2m);