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 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C005AC282EC for ; Mon, 17 Mar 2025 16:22:55 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuDEk-0000KW-Pa; Mon, 17 Mar 2025 12:22:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuDEP-0000BP-LA for qemu-devel@nongnu.org; Mon, 17 Mar 2025 12:22:25 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuDEN-0005Hi-G7 for qemu-devel@nongnu.org; Mon, 17 Mar 2025 12:22:25 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so24243815e9.3 for ; Mon, 17 Mar 2025 09:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742228541; x=1742833341; darn=nongnu.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=WBWphq/OPjakrsPO4SntQfTseOUfZZyLOvc4sgW9R8E=; b=SlPo+u7cy6zkKYkP2Jkj+wBcXPNwXg+34VDEzE9SwdjfuUKpfCw1otuSYeJzclmTII RhKlkXB5xctOrrS5L1ss8f0ko9XtC2RbbS0BQNf0hwixTuT8PePvSK9gzuTbyjhJolhN JzkaYEmfBGhRiN6lpCubNOzvMgtsqDoKhGWh18esl2jiQo1gnJJpnvx8qKcm5GfIUh8i ZnenDdZJP1BJ4WdIpbBf+xq5Cb+7m7/PlbYesP9/CIWE2YCrffvyxBZYy7iiYfb81KlD 9S6zfZWMxym1lh4gO1IFrhSLaHZEcyI0qmxW6zjqq9rZTJXzI3WNaRd3ssQ/rSxxMeP0 kFig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742228541; x=1742833341; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WBWphq/OPjakrsPO4SntQfTseOUfZZyLOvc4sgW9R8E=; b=skk+CWqAPnAZNS6pGOcUnLv/cRQc1bOWh/X1RH3hHIjEOCRp42vvBm4Vh6JY+eeT0A iuvApbcbPdoZJ4U4I8B6Txr2La8b1Dt/WMQXpMHcpCMBSQwMBDuKlCL+NMUB2WIuZNF1 G92MSoBR/apyKta26CGscqmls2t6LPXiyEdCZrAACVMlBk7hJmii5l5Yb428J0WzwrBu MB/t7jxMQB3SAeT8ar5Cj8K530WQTJ8sqKHy/G611pnuku6r7ttGLCTO8ddzt0T9ekHI afD2wV1AEPB0DJkFW7BvMUGEqHsskuXYOE3Q3qMKJCdq1s7kmCYpQRESSY0yu1OcMn2P 7tgw== X-Forwarded-Encrypted: i=1; AJvYcCUpHsCgi2lWBCjVuIdRAvqq1pk3mSaquPrkglHrcTHNhTWRarw8JBg5TZH4ogNv14yYgmwN7oBPJ30k@nongnu.org X-Gm-Message-State: AOJu0YyhnlIDnGTctPvBhf+Wd08rs21v8zAZt1+MWLgdwkzpibUk0Ak2 dyXM/nfdtbMmwbjpQsFA9oHOph/y4vX99WmsNERc281SBAwMQKuwdUhkm7vKQApMEIvWJG8Ma+L j X-Gm-Gg: ASbGncuixiEJXfyz+GQCZQ2s20/0ao5sAFu+LTWQNEHV4rxCRQtyvIWvACCEsU60nf8 YbeF6DmSF1MMN6QRDJM6MXI6ysp3m0mz9t3WK6sPJx6LK15K3qiTEShgSgNKNjTnDYKdY11eX1Y JgUTibHVIQUDOT7IVjudMN+8XEpwOb9SZ/AMvp4WOzoKaWPj12JUaoyvbxfEV2A59VRbkEueCrt A6POWufFxnyC1vUBs71CMXrwUSRfjFmwdnitWx5LBp5kuh4PdokcOJBh/ksvGZP5nAaKU0//zAv NsGUu4pYoCKesgqDhKGmN74sPeG2Mo4ToCdXxrVZqmJRkRA/a8IX7ndxwAYpI/gzwbCtVCw4QGK 0UkNs1xFfaQ== X-Google-Smtp-Source: AGHT+IFVNxcAnyCyAJ8pmBaH3OaDkbaFSIvHPQaBVVLvnxipFVeLkYJbNl97a+qtcZml3R72Eig+Jw== X-Received: by 2002:a05:600c:46c8:b0:43c:ebc4:36a5 with SMTP id 5b1f17b1804b1-43d1ec6946cmr141436605e9.7.1742228541177; Mon, 17 Mar 2025 09:22:21 -0700 (PDT) Received: from [192.168.1.74] (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fdbc36dsm69896975e9.0.2025.03.17.09.22.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Mar 2025 09:22:20 -0700 (PDT) Message-ID: <9c55662e-0c45-4bb6-83bf-54b131e30f48@linaro.org> Date: Mon, 17 Mar 2025 17:22:19 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 11/17] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled To: Pierrick Bouvier , qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> <20250314173139.2122904-12-pierrick.bouvier@linaro.org> Content-Language: en-US From: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 17/3/25 17:07, Pierrick Bouvier wrote: > On 3/17/25 08:50, Philippe Mathieu-Daudé wrote: >> On 14/3/25 18:31, Pierrick Bouvier wrote: >>> Reviewed-by: Richard Henderson >>> Signed-off-by: Pierrick Bouvier >>> --- >>>    include/exec/ram_addr.h | 8 ++++++-- >>>    1 file changed, 6 insertions(+), 2 deletions(-) >>> >>> diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h >>> index f5d574261a3..92e8708af76 100644 >>> --- a/include/exec/ram_addr.h >>> +++ b/include/exec/ram_addr.h >>> @@ -339,7 +339,9 @@ static inline void >>> cpu_physical_memory_set_dirty_range(ram_addr_t start, >>>            } >>>        } >>> -    xen_hvm_modified_memory(start, length); >>> +    if (xen_enabled()) { >>> +        xen_hvm_modified_memory(start, length); >> >> Please remove the stub altogether. >> > > We can eventually ifdef this code under CONFIG_XEN, but it may still be > available or not. The matching stub for xen_hvm_modified_memory() will > assert in case it is reached. > > Which change would you expect precisely? -- >8 -- diff --git a/include/system/xen-mapcache.h b/include/system/xen-mapcache.h index b68f196ddd5..bb454a7c96c 100644 --- a/include/system/xen-mapcache.h +++ b/include/system/xen-mapcache.h @@ -14,8 +14,6 @@ typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset, ram_addr_t size); -#ifdef CONFIG_XEN_IS_POSSIBLE - void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque); uint8_t *xen_map_cache(MemoryRegion *mr, hwaddr phys_addr, hwaddr size, @@ -28,44 +26,5 @@ void xen_invalidate_map_cache(void); uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr, hwaddr new_phys_addr, hwaddr size); -#else - -static inline void xen_map_cache_init(phys_offset_to_gaddr_t f, - void *opaque) -{ -} - -static inline uint8_t *xen_map_cache(MemoryRegion *mr, - hwaddr phys_addr, - hwaddr size, - ram_addr_t ram_addr_offset, - uint8_t lock, - bool dma, - bool is_write) -{ - abort(); -} - -static inline ram_addr_t xen_ram_addr_from_mapcache(void *ptr) -{ - abort(); -} - -static inline void xen_invalidate_map_cache_entry(uint8_t *buffer) -{ -} - -static inline void xen_invalidate_map_cache(void) -{ -} - -static inline uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr, - hwaddr new_phys_addr, - hwaddr size) -{ - abort(); -} - -#endif #endif /* XEN_MAPCACHE_H */ diff --git a/include/system/xen.h b/include/system/xen.h index 990c19a8ef0..04fe30cca50 100644 --- a/include/system/xen.h +++ b/include/system/xen.h @@ -30,25 +30,16 @@ extern bool xen_allowed; #define xen_enabled() (xen_allowed) -void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length); -void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, - struct MemoryRegion *mr, Error **errp); - #else /* !CONFIG_XEN_IS_POSSIBLE */ #define xen_enabled() 0 -static inline void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) -{ - /* nothing */ -} -static inline void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, - MemoryRegion *mr, Error **errp) -{ - g_assert_not_reached(); -} #endif /* CONFIG_XEN_IS_POSSIBLE */ +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length); +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + MemoryRegion *mr, Error **errp); + bool xen_mr_is_memory(MemoryRegion *mr); bool xen_mr_is_grants(MemoryRegion *mr); #endif ---