From patchwork Tue Mar 11 04:08:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011080 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 9C27DC28B2E for ; Tue, 11 Mar 2025 04:10:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqvv-0003Ve-Ub; Tue, 11 Mar 2025 00:09:36 -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 1trqvP-0003Hu-TT for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:04 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvM-0006OK-7S for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:02 -0400 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-2ff694d2d4dso7130739a91.0 for ; Mon, 10 Mar 2025 21:08:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666138; x=1742270938; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=949DeBQijWmgHqYCdDdupcSTn3rDdND8nLqwkILEwEI=; b=bIDzTMg5oXhqPdANqq0yUjjZcrN5rnVdj5/OPG7J0z3Tp1I2k2OsPHREKF+XcXXKSi 6bhP/DSrYWmfgAesqrnFQvxJk9IeIK/M4aD/tKOCBUSVofuM6hUBxXHlkOicNe4xDVnm JlIWFPBHWaJjWKt9egYp/OGnzHJ3HpZjcCl3BZrM1Yg85E9qk5ZyTju/TkTL2jOy9h6Q Li4LEGcWCmVqZD5Ts6CWjai8eA+zMuAu+QPm0394J3oDd903sUqX3GKcmLzFq88/BTOH KDxl943sIBM6mZeP0uKsCG5UMD2Ux+H8ntFFgVADYVfzFilkzMDzjFoKKE9EfDb7lE+U fVWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666138; x=1742270938; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=949DeBQijWmgHqYCdDdupcSTn3rDdND8nLqwkILEwEI=; b=h0EqpQ+c1KK2hQ6NZrJGHeJ37BZgn+s+0ssYjTOfEE8cRv8jaorE1etMyyrHW47QBc OHK5GPOxM3tS4GAQp439mhivFw5JAf/WfZXie+5y0+RI0L976YBnKtb3xQ+H94ZynSaJ VcpAfZwAL5juJeebE//gvL4cpOLUKaLMzmJ9GQ2bSav7HVOT6D/rU2cJMCYWZ+YH2Utg JGB9YZ+zz+cCQxuWnUNhgKERAoaDSL1UrVW0dCtHtlkjJE4ZBINxVjga1JkDlf+wdMu+ mGNNqyktoL/ukOAM57IdWXwuBNFsI1SmhhTmqpJXvg7XRSAb66+kLwx6Hv5Po8GOKKa4 nlxQ== X-Gm-Message-State: AOJu0YxXEAGkrrkrHBISEGWXynK2mIYCdAw+iV9I67T030mdARpqiwQI Z6NR7O3EkCIJz+W5rBIQGvkVKapXiUJmB+ELpATUD4cpINSgfrqsSPhHcn7RlBItsnG/XkWbKk5 hpEY= X-Gm-Gg: ASbGnct4X7IP8v7VgFtopIsqAH/u6G2NaRg6RKdFZSOl51J90n1ItjFPWL7LG37z/uk XhLlTwmJcsrcI2sA63ptBR0dm5PIqA127xJNEvCscP85CEAeRh4CV05NjCNWZm2Nj4fF2o5SFxz XSO4MUOHOc1gYjoqkHCRFRdEuA4K8a7/nybO1zuZ+/3pLvKoK99Q5fFfxU6Gw9GGkAEpZRccZEN itGplmx2+xSlFaW400x8k4JL3QTmuaFoyeRublglTd8wKPE9AaVWVOMDRkDsnvmN0LLwOdd/1f+ Hcm3eT2XdOGREFq2TwjOqtSMpzZ7M7j24rqxDPBTB3fJ X-Google-Smtp-Source: AGHT+IEzBJ4Y504tWVEKTLiAl14rUz4i3nUGGoyaKrgK43oaArjDd5np2LA5f1JQHmiuxtYBHKlEDg== X-Received: by 2002:a05:6a21:b97:b0:1f5:889c:3cdb with SMTP id adf61e73a8af0-1f5889c6dc7mr5899820637.8.1741666138527; Mon, 10 Mar 2025 21:08:58 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:08:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 01/16] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Mon, 10 Mar 2025 21:08:23 -0700 Message-Id: <20250311040838.3937136-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102d.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=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/tswap.h | 11 ++++++----- cpu-target.c | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index ecd4faef015..2683da0adb7 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -13,13 +13,14 @@ /** * target_words_bigendian: * Returns true if the (default) endianness of the target is big endian, - * false otherwise. Note that in target-specific code, you can use - * TARGET_BIG_ENDIAN directly instead. On the other hand, common - * code should normally never need to know about the endianness of the - * target, so please do *not* use this function unless you know very well - * what you are doing! + * false otherwise. Common code should normally never need to know about the + * endianness of the target, so please do *not* use this function unless you + * know very well what you are doing! */ bool target_words_bigendian(void); +#ifdef COMPILING_PER_TARGET +#define target_words_bigendian() TARGET_BIG_ENDIAN +#endif /* * If we're in target-specific code, we can hard-code the swapping diff --git a/cpu-target.c b/cpu-target.c index cae77374b38..519b0f89005 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -155,6 +155,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) abort(); } +#undef target_words_bigendian bool target_words_bigendian(void) { return TARGET_BIG_ENDIAN; From patchwork Tue Mar 11 04:08:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011111 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 C6807C28B2E for ; Tue, 11 Mar 2025 04:12:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqxl-0005Rd-Al; Tue, 11 Mar 2025 00:11:29 -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 1trqvT-0003J9-2K for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:08 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvO-0006PP-CH for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:05 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-225477548e1so45549665ad.0 for ; Mon, 10 Mar 2025 21:09:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666139; x=1742270939; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p9XKPWEC1FDWwfXw4amuYrHiaWnSduBZ0xkgSDXw7jg=; b=Pp1t1nw0qvDhSrMhb9aSFJeSYS0LU4LsTCz1ZQZPgNUvo/aaJj8InVdA/OkXOCBLm2 QZthCfV8oHsqGocvb6En0Dj/FMsuxhytXbSSXGkhx8toEPqhfhyS6wpRGDQyDW/SG/Gq +AbvGDu3Y1xB2r3g5eB7VQYsKyoryNycQRTVDAr3kKTNqkIt2tUI5iygL8Sbem/5HoEG UM3ApLHFc0NbZ0ZgBtYPbxeJG5ZWbxPFdpSDpL6nQkFea6Y81AcGJuxN8fk+oOjI+3MG oP/imM5IGNevwk4lRmgi5uZ14zqgSzVeezoeC57cR69torE05tlDwmep+ZaImvZ2fVGW PRhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666139; x=1742270939; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p9XKPWEC1FDWwfXw4amuYrHiaWnSduBZ0xkgSDXw7jg=; b=T2yXJtJhmQ5dpTrYxYXozyjmetiyiJQYLXEFIZkgY7UjdTvEXsOywVv/zQu18sg5IY bCrV4FvubNbhE1P9vpODSkJTztMAD85f4yLs4cip+hacEHMF9tmUkAnzZlr7uNPB109f F0o6Eu5Z/G0KoNJsacYGFaadkUjvUmb4QQhBQj/chVXCHjQ4CHG+lZiIwSpZK3veWHAQ YmMX2EWXYgWmhcInNNIYyODfc9altiDKOvXKdO6PZEch5roosriBdI6ubyhEqL/1jnhq joY3sPfxB6+FxIrCCKQ3FHYaiuq4w0G4ca5fC6W0i95C0dbDof/SyTirNJyC29tWkn5x WosQ== X-Gm-Message-State: AOJu0YwaGN0/c5MvWeF6Ff72pMlSDOqjMzaj4+FCvo6xGnvvzXh/Yh4N ILu9lPoEKHDHScHZNMpuO//jrfZWUkj4sItiWToM2L8lAZ0r3eV3Ei4XO71Q5MWybDjBKTsShJn 7tpM= X-Gm-Gg: ASbGncvdKeloC83Y45IQtIomqALFQ1KIEwXW5eSZOi/5+qgJpjpfbTHdIQEEDQlcFvx 4Y2MDH+JrgE5LNTByZSy4fRqD+0POCSxddMlEo6EcxF1p7Pmi7rpiN6geV0da1PUUHb2qAFWfKR 3GHsB4Nf3woDX9NEO8JUa6vK698Iga6EEYw4HNqYIdiiRPM6QJrFjLaQ3ucJqt2t4BEPUvEDc3f 7Gu468iYAdDAl7WxFypw3Q1d8F9ZJXqUzwBmhVVqnJ7dimx1u5HpqHy/R1AL0QzDiaOcnxEnMTK ds9F/vqjvJy4P992zH+w05h6EY4l1yhwGWGb1j/naVa4 X-Google-Smtp-Source: AGHT+IFULxKXKLSRt6Qs0nLWBVqgQyDOkjRhSbU6XrRQVwLJue3Ph3bi7X9tYlurUTD8KJTtNJkwJQ== X-Received: by 2002:a05:6a20:2d24:b0:1f5:7007:9eb7 with SMTP id adf61e73a8af0-1f57008366dmr14192716637.37.1741666139634; Mon, 10 Mar 2025 21:08:59 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:08:59 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 02/16] exec/tswap: implement {ld, st}.*_p as functions instead of macros Date: Mon, 10 Mar 2025 21:08:24 -0700 Message-Id: <20250311040838.3937136-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x630.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=unavailable 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 Defining functions allows to use them from common code, by not depending on TARGET_BIG_ENDIAN. Remove previous macros from exec/cpu-all.h. By moving them out of cpu-all.h, we'll be able to break dependency on cpu.h for memory related functions coming in next commits. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/exec/cpu-all.h | 25 --------------- include/exec/tswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..e56c064d46f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,31 +38,6 @@ #define BSWAP_NEEDED #endif -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ #if !defined(CONFIG_USER_ONLY) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index 2683da0adb7..84060a49994 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -80,4 +80,74 @@ static inline void tswap64s(uint64_t *s) } } +/* Return ld{word}_{le,be}_p following target endianness. */ +#define LOAD_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + return glue(glue(ld, word), _be_p)(args); \ + } else { \ + return glue(glue(ld, word), _le_p)(args); \ + } \ +} while (0) + +static inline int lduw_p(const void *ptr) +{ + LOAD_IMPL(uw, ptr); +} + +static inline int ldsw_p(const void *ptr) +{ + LOAD_IMPL(sw, ptr); +} + +static inline int ldl_p(const void *ptr) +{ + LOAD_IMPL(l, ptr); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + LOAD_IMPL(q, ptr); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + LOAD_IMPL(n, ptr, sz); +} + +#undef LOAD_IMPL + +/* Call st{word}_{le,be}_p following target endianness. */ +#define STORE_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + glue(glue(st, word), _be_p)(args); \ + } else { \ + glue(glue(st, word), _le_p)(args); \ + } \ +} while (0) + + +static inline void stw_p(void *ptr, uint16_t v) +{ + STORE_IMPL(w, ptr, v); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + STORE_IMPL(l, ptr, v); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + STORE_IMPL(q, ptr, v); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + STORE_IMPL(n, ptr, sz, v); +} + +#undef STORE_IMPL + #endif /* TSWAP_H */ From patchwork Tue Mar 11 04:08:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011082 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 45C3DC35FF3 for ; Tue, 11 Mar 2025 04:10:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqwT-0003nt-8g; Tue, 11 Mar 2025 00:10:10 -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 1trqvT-0003J8-23 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:08 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvO-0006Q2-Ui for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:05 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-2fec13a4067so7695675a91.2 for ; Mon, 10 Mar 2025 21:09:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666141; x=1742270941; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KTcsPgfp4qWHKI5IiGC/xRJnn7HmZtcbIn5ZIF7f/ys=; b=MeHZdvfcVoAs6k4sTWtn1uowH9CceIKI0ogUH4PNDDE4OnT+rchLrvBg3rIlJc+/td WSg1Ap4MbjmryKSLVQJW2mWcelxtiqosYMgFVq4qKPDTBlzchJE33ZuB7CqhR1obZNA0 fQZSqpWyU1t9sDT5uyWLMr25fIqM5PxRaRWPN3rmbuMp+ee2pxChX6AylG7C8N/nQEhM 5cgPvSCrifmoBJ9Fqlcrmty7m7v8yVt/ETv6tSqHbHMwFUg4expI36Il/p8DfQFCUuGy rptfBgyncV8fuDB7qgNj78Jl5vOJYkirh6/+e3IwTjIhKrGpbeM00T2SN/4aCdPNRviX r/uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666141; x=1742270941; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KTcsPgfp4qWHKI5IiGC/xRJnn7HmZtcbIn5ZIF7f/ys=; b=i87gViZnK7h2ReikT1kPo18RYZQtwWAZREVFAvF95QUbObBmdy8lWQtBOMXOO5axBG fiAAAEMXu2C91fo4VZfhvvsvthvFWqGZhQJgsBNClOdfzRGrxkzCAS4uWNMqsYX0coNt fyWWNfXT6eIrw25M0iUJkPrP5NSri3pbtgSskOSatlz8Mi8iRQKie/zsDv5wHJNR/f6F Pp1L7Q+idj/PAvUORd/DQ9hK7R4vRgBPynwXno5YwcRa5+cRogkj9JKcOvtvUxW4ynFU YTcqa/4+wuhZxV3SAntpAvxs1M17gOG6sdEcZoDKsXmw92inH5ipuGkV93mKJQB13tGa loMA== X-Gm-Message-State: AOJu0YyFmZPXgk/MMuY0PS4nWQ7FvZM/GBMgqlp1n7lRZ5LKNUeBIq+1 3YSfuyASBNRoAdSVgoKLLWZV+wtPUb/ks+s0tZh+ZKGisy2GDy/q80za8xoO4wsm8/MhsRmj5dU aOtw= X-Gm-Gg: ASbGncu/L2dB0jvmGVYQm5KF9rIGxnZEH1ZIfuGIwPQkxO+bPfD8m8nCuTwHAp7y09M cezZnhHxznka5vumzdCI/OHMlsk6et14j4iidbYWeaOobFF4cGd3g/3GXPjf2SqFhjsUlnvzxGO mWFs9ss/0/PvwNJ9lMLqcxCDFjOWW2YyfILIu/Fvs2Gejb4P1efZ8Rpvp5vwIDzJ9ashy1u0C20 zZjVuC2oCs2l3WTIfbS3HQYebKK08BGrNOJQKNFkLVxm/R/yP62khvLLkj2lRdD6QnyRtPCv/SF oszjrDo/E4LcovFs4PcVlGNwJLTb6Vo9VyPpHUQfRgc6mGlvd+NjE1U= X-Google-Smtp-Source: AGHT+IFvmMV6FR9w9HRJlmca+n7Q/Lcb7qpOce3I31boqIZsCEXwR+2F1i3uigVa31tDctZYbS6W9g== X-Received: by 2002:a05:6a21:6b18:b0:1ee:c7c8:ca4 with SMTP id adf61e73a8af0-1f58cbef8a4mr4223140637.36.1741666140734; Mon, 10 Mar 2025 21:09:00 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:00 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 03/16] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Mon, 10 Mar 2025 21:08:25 -0700 Message-Id: <20250311040838.3937136-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1031.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 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Richard Henderson --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 4 ---- 2 files changed, 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e56c064d46f..0e8205818a4 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -44,18 +44,6 @@ #include "exec/hwaddr.h" -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - -#define SUFFIX _cached_slow -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) { address_space_stl_notdirty(as, addr, val, diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 92ad74e9560..7270235c600 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -34,7 +33,6 @@ void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#else uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, @@ -63,9 +61,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 04:08:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011105 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 CF57EC28B2F for ; Tue, 11 Mar 2025 04:12:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqvX-0003MV-WC; Tue, 11 Mar 2025 00:09:12 -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 1trqvT-0003JA-24 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:08 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvP-0006QM-Nb for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:06 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-22337bc9ac3so94536135ad.1 for ; Mon, 10 Mar 2025 21:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666142; x=1742270942; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GZg0/as8vJD+8Um7sy7JKxAjMVLEtPUz9ZnXYeX+5Ko=; b=tlVX2CDQ5mh+81V3E23t5f9+hEaQu8mxlHmT4z8uDT87K65bhDW8etuCveUYDHqCFV hXUIhXIsCve9Eo5JlTOrvR/i597rhVPjgwMzDtDeVi97EqVJ201B1IQetKml4r79LZdJ wbeKcrnIyhmX7siAbOJPCGTjn5ctZai6nSdc3Qytcz26NOzDZAlfFy9HGNLy1SnDfOiv B+drfOoC/EnhjDfYFz4W6A1WSFfh357NX6Et+Bt3l1DwSVoMHB8AwrnY0XV5sKt4PeQ2 aUhHMsnjRoEtFeH9z9sjAJEKI/YLOrybrD16yto8X9UVe3PFTnRzx/BGkMAkjk5g01mt VCxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666142; x=1742270942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GZg0/as8vJD+8Um7sy7JKxAjMVLEtPUz9ZnXYeX+5Ko=; b=ZsMhP6L+z9H89QgAZk+eiFx1+vkq6QfVtOjI6yHxY6sQf97y5bADMNfZhww+KmUYCH 6aqxr2qPSSKATKpwfNLqHA4kd6kio5Vo1p2Ffq1rnfyLKdEo7Co2nFkVqVtEMprWM+xc AdCNNSx3R9d9lX8grza3aCtqo8MhtIpXN+/Vt36HtkMzZ+8V2bmBYXrdnejzUJTEUjOa TFPkDyrD+qXW3GKMgwaIWngCttrdvPKaiLzG9XdBiEapC2gcNEpomfGAD/jrdh8X4GMR 9My81EdA0dulnCqUQc72B0iJ9jPYyGSxmyhLqVSqSyrp9KhgK6W5AK+V4MX23SRpceNw CThA== X-Gm-Message-State: AOJu0Yyi3aQd5QWunPSp6YvrLsfUubLphCf3QgpUdoyEqXvJqKNiAS7x UHrnDYTgqsVjkGUYp/95ObnmXM2dprDK1j7IUqoHHHfO14i7BV836Qyn15nV8SmsE8rwqEUagPv QlFI= X-Gm-Gg: ASbGnctaiB+F9Dn+K/JLiTw6m70LtktOl8AS28zVSMi+B+C/UM8q6ndeTyug1BBbqNT 6gVcTzVbdbj+pvCpSyU1HcZoWSyISfPLuVXTp+AVFCdSALCJ8i6J/qYTwRFK9/AgE3tU8e59mXf KdnIOvu8UesiTgUYwWlBQ3/PbHZUMh+vTiL7kUg0UJ9G3u0nw7PVn53NYfvpPBm0+S0BhXAgSE8 UblIq78/GxCNCSbuQ/gmUdNTnDsq82TlvNUa7VleaCqVurKhk5WbqumdRubzL+sFdrj2LHpjO3Q FEewi1VDFvhLhF4FXe2Ji2GzBGE/FcJ7r/qc3JsFNQut X-Google-Smtp-Source: AGHT+IEv6pfYhMlZcVFtUT8KTCc1zYGaqiUcLOn7dx2sPDPFPmpFWZtYBaUHHMwx5Ykg9mMF6L42zQ== X-Received: by 2002:a05:6a21:7002:b0:1f5:7fcb:397d with SMTP id adf61e73a8af0-1f58cb1bea7mr3411754637.16.1741666141836; Mon, 10 Mar 2025 21:09:01 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:01 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 04/16] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Mon, 10 Mar 2025 21:08:26 -0700 Message-Id: <20250311040838.3937136-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62a.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=unavailable 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 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Move stl_phys_notdirty function as well. Cached endianness agnostic version rely on st/ld*_p, which is available through tswap.h. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/exec/cpu-all.h | 29 ----------------------------- include/exec/memory.h | 10 ++++++++++ include/exec/memory_ldst_phys.h.inc | 5 +---- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 0e8205818a4..902ca1f3c7b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,35 +38,6 @@ #define BSWAP_NEEDED #endif -/* MMU memory access macros */ - -#if !defined(CONFIG_USER_ONLY) - -#include "exec/hwaddr.h" - -static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) -{ - address_space_stl_notdirty(as, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" - -/* Inline fast path for direct RAM access. */ -#define ENDIANNESS -#include "exec/memory_ldst_cached.h.inc" - -#define SUFFIX _cached -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" -#endif - /* page related stuff */ #include "exec/cpu-defs.h" #include "exec/target_page.h" diff --git a/include/exec/memory.h b/include/exec/memory.h index 78c4e0aec8d..ff3a06e6ced 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -21,6 +21,7 @@ #include "exec/memattrs.h" #include "exec/memop.h" #include "exec/ramlist.h" +#include "exec/tswap.h" #include "qemu/bswap.h" #include "qemu/queue.h" #include "qemu/int128.h" @@ -2732,6 +2733,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, #define ARG1_DECL AddressSpace *as #include "exec/memory_ldst.h.inc" +static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) +{ + address_space_stl_notdirty(as, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); +} + #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as @@ -2798,6 +2805,9 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache, } } +#define ENDIANNESS +#include "exec/memory_ldst_cached.h.inc" + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst_phys.h.inc index ecd678610d1..db67de75251 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, @@ -55,7 +54,7 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val) glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#else + static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, @@ -139,9 +138,7 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va glue(address_space_stq_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 04:08:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011081 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 2F31FC2BA1B for ; Tue, 11 Mar 2025 04:10:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqwM-0003gV-Tz; Tue, 11 Mar 2025 00:10:03 -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 1trqvV-0003Kw-Hb for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:10 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvS-0006R2-PE for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:09 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2fec13a4067so7695711a91.2 for ; Mon, 10 Mar 2025 21:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666143; x=1742270943; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=igRm5DauylZU7kF6A9LJbRIXn+glPoGkFsEjcODvlvM=; b=LaAhm2BVRNUDJAYX00fcWJKDpIVK4g+BjUmoxtIXm6ldMF5aSksYUBkz+CQ4eVqIgY lv3RxX3+cBQY9SDKwqDcNc/SihQ7UV7/a6WTkoCraOiiLO4HOM1IQy6qKQDHda4PZZa/ TzJYUuIxt5rXw7UjqoqGr66iZ7+zLw1eeK53I0QseZuwdiRj8XZkdQPyyqu2j/phsix4 TimnQ512Boc1dSmtw2vj2xpwW9OZfvdp8c3OWGv9qfw8B1CvR+N0V5VL4DAF626E2YyA eK32QV+JzmvE/9lMzHmi1RKyum5mPh/CSJHXnxANTVyZSVp37XpBbCCkHNTMwXh54qrH o+uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666143; x=1742270943; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=igRm5DauylZU7kF6A9LJbRIXn+glPoGkFsEjcODvlvM=; b=VxeZAPtRTU1kAaF/PuMtr2R72OVeC3ZF4MmGFu38T+AKyHw3U6tLlbaE1sBologciw y0wAfoKPQgaZpPNltS+H47aJA79ZNkooA4i6AmayNwSfnmvWPFNMCXdGR/J3qFA4GH+i tK5QNvM79pDvBcundXsMftkAMASTsuFJV6mD4jfmTL6d+m/H68E4F0DANT/kvd87QzSy X5JsG1jgRMePoDsYC1nvF9d3gdYsuB9REsPgA2efkB3gfm+k0v1//+SOYXiczg5LkkNV xwsjIUHw70PIh4cBNaktE2mEX0KbdTrEKu2Cn4Op72G9zyuWl8DS1+Nk5tBANC527lXA rSVQ== X-Gm-Message-State: AOJu0Yy6w0uEWTAZLBG5C+6zlGwhEuEkciQ3ci3mz/furFdm9MAbLoHZ 3/Q37iIfu2yecv6n5CRmnBvP9H8ZSTJBA4jC1sOTCUyGXh3PjYygZsZ4iCwzeICqjAVXBPs+dnX NlMY= X-Gm-Gg: ASbGncu4cVZW1eJMHgdaSwMEm2TkpW3Wf4hElvgruoGp60/nB7DzJGeIHSpbRTAAZXh N+P/BJIuPWWNV3iGcwYec6FwVkSUKCL2pqlu6FHOXz5CbbZFhMt3WdnzrJId8F49v4uoH1NpuQ5 +svT/PlaszQKhGBC5HYvuLkVH0UnR4w6E9+CueV2cWCfIcsGzFk5PTn1pV/A1iUoSzVAe0+6X0j yBRNOR2GwigP/QJre6U9kIBitOkX95qB/TOE9mTchYyTL9UrxqHDp9PN5KLAY+yIZWfXi9ys7WM cB0IGFuZZLaCTBwN9yDQB9LnyMPj/8UxcCl9HPGCjOEF X-Google-Smtp-Source: AGHT+IHqGisSQCK+iGHuI44FF+Puo0WshM2hC7DuGryTfuE/I3BKO7cRhsCQCZNyA9pqBEuzvyba5w== X-Received: by 2002:a05:6a21:3a85:b0:1f3:40a9:2c36 with SMTP id adf61e73a8af0-1f58cb20502mr3303668637.10.1741666142929; Mon, 10 Mar 2025 21:09:02 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:02 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 05/16] exec/memory.h: make devend_memop "target defines" agnostic Date: Mon, 10 Mar 2025 21:08:27 -0700 Message-Id: <20250311040838.3937136-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102c.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=unavailable 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 Will allow to make system/memory.c common later. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/exec/memory.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index ff3a06e6ced..60c0fb6ccd4 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,25 +3138,17 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -#ifdef COMPILING_PER_TARGET /* enum device_endian to MemOp. */ static inline MemOp devend_memop(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); -#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN - /* Swap if non-host endianness or native (target) endianness */ - return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; -#else - const int non_host_endianness = - DEVICE_LITTLE_ENDIAN ^ DEVICE_BIG_ENDIAN ^ DEVICE_HOST_ENDIAN; - - /* In this case, native (target) endianness needs no swap. */ - return (end == non_host_endianness) ? MO_BSWAP : 0; -#endif + bool big_endian = (end == DEVICE_NATIVE_ENDIAN + ? target_words_bigendian() + : end == DEVICE_BIG_ENDIAN); + return big_endian ? MO_BE : MO_LE; } -#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., From patchwork Tue Mar 11 04:08:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011106 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 18AABC2BA1B for ; Tue, 11 Mar 2025 04:12:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqwv-0004UB-QI; Tue, 11 Mar 2025 00:10:41 -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 1trqvW-0003Ly-OT for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:10 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvS-0006Rr-QL for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:10 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-300fefb8e06so1239094a91.0 for ; Mon, 10 Mar 2025 21:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666144; x=1742270944; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=dqrKt4t8ywULc1vraOKV/Oswe2/0MW4056PZgs1PAne8kd7+Q4apy7h/4wQaZgpYVJ cx74zQAVUTejQL+bz33ZSNB9lljgmmo6hWEfQ+YewLQ9otZOg+/L16dZWXlJOQYrOToj Re4AEF64XY/EQbzYdkivo3VZOqtWE5sLsi4o7szCI/gCC2ryFdJnxQdrxFXFxwNWmQzD aVFicgEfBoLmk/VkD9RXoeFDnYE20P8Wix1fH2mf/EWoxSJcnzzEBH1g24WaOiYaKEaK mRFXhgckp/687nHdSi7TK2QgURgfUMuxmTRsDeFKEm7IzASBDfIwXGu1pilRxdgazEbV kYvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666144; x=1742270944; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=Msc2/AHc93rIWlHk+F8ziCaAVdZJBRdkB+1XvO+SsEQNkC7Ho65A2XbGhxkWcXb3NR +3O70nyvKwmBrnBhNpwk9zYUUmUwFLe3blGi6gBv4KWzYQ/klHIvWs2q9hmLVylhkzvM XBUagx2POOzrg9BQ0Cd1I0c9qbwBomjguRr33SpD1ZUPHEVigBinZgjsPWSZr5ZFxR9+ rheIk2MkfRsv+h7J4ujF++tBSrTlENl8zh68bJxDCbyBPVfa/3UKeNZkCJ93KReW7TnX LvQ3nL/FMFJjEkbq6Htm6/KYH+xtA9BAsLpX76/yxskmaYRo/Lk0JObLS41ZvOsrrzT6 iDow== X-Gm-Message-State: AOJu0YwdxvpJYA+ncQbL0OigCzb+iIg/JApJ0FPwalFBoAohYmntjVVW k4LuUiEbA2GjsZMz69jbyo7EZfhgiiJSkOOBWygOgfzRaDrupuQly4yo03mHmwzwGk4v0s8h3X5 DKMw= X-Gm-Gg: ASbGncs5/2a4m/Fe9fY/tc/Mub/YBvgCPuYTp8U8qKvuFxDoWKeqwLrU7r26uaMcxy+ ++4x5E2/f/Kz/njDzKC+H0on3mkdzeHjTd2W7o45oKvphkvQ7kKL3hWbZ8zLwJRnOl1Dbqlle9h Ynff3+TUen7oG3D5zAm/lFAtetxunPWwB+bs9BLN+m0UkTYFdbcOO04UnX1Gdi+DtlAeXcp6OjQ aSBeVXKgCK9X0ltwE7lL8FFGhjNyINzPGxfRJReCaNlm+REi6dVZCy/9g33J8Vf4aqNhPhmKjnM Q0jU1U7JkuBs9Xt8d7OTrCeRfQZPhdppdXgpdMlnGgrk X-Google-Smtp-Source: AGHT+IG1r91N/pZj/+/h4MYPAOLJfFbK6eObEmS4IiEzuC9Hkmi66055HrrfvkPljzn8i/+Wegt/7g== X-Received: by 2002:a05:6a21:4cc7:b0:1f3:36f7:c0d2 with SMTP id adf61e73a8af0-1f58cbf3befmr3240926637.41.1741666144062; Mon, 10 Mar 2025 21:09:04 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:03 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 06/16] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Mon, 10 Mar 2025 21:08:28 -0700 Message-Id: <20250311040838.3937136-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102e.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=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/tcg/tcg-op.h | 1 + target/ppc/helper_regs.h | 2 ++ hw/ppc/spapr_nested.c | 1 + hw/sh4/sh7750.c | 1 + page-vary-target.c | 2 +- target/riscv/bitmanip_helper.c | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index a02850583bd..bc46b5570c4 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H #include "tcg/tcg-op-common.h" +#include "exec/target_long.h" #ifndef TARGET_LONG_BITS #error must include QEMU headers diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h index 8196c1346dc..b928c2c452d 100644 --- a/target/ppc/helper_regs.h +++ b/target/ppc/helper_regs.h @@ -20,6 +20,8 @@ #ifndef HELPER_REGS_H #define HELPER_REGS_H +#include "target/ppc/cpu.h" + void hreg_swap_gpr_tgpr(CPUPPCState *env); void hreg_compute_hflags(CPUPPCState *env); void hreg_update_pmu_hflags(CPUPPCState *env); diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index 23958c6383a..18bbb1403c6 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -2,6 +2,7 @@ #include "qemu/cutils.h" #include "exec/exec-all.h" #include "exec/cputlb.h" +#include "exec/target_long.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" #include "hw/ppc/spapr.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6faf0e3ca8b..41306fb6008 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" +#include "target/sh4/cpu.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" diff --git a/page-vary-target.c b/page-vary-target.c index 3f81144cda8..84ddeb7c26a 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/exec-all.h" +#include "exec/target_page.h" bool set_preferred_target_page_bits(int bits) { diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/bitmanip_helper.c index b99c4a39a1f..e9c8d7f7780 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Tue Mar 11 04:08:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011109 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 ABC47C28B2F for ; Tue, 11 Mar 2025 04:12:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqwa-0003vi-37; Tue, 11 Mar 2025 00:10:16 -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 1trqvV-0003Kt-6p for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:10 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvS-0006SV-PZ for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:08 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-224191d92e4so86286465ad.3 for ; Mon, 10 Mar 2025 21:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666145; x=1742270945; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JJTMw6tkQg2gyyv9VopXfGbD8re6/gGFQNon8Npv7Ak=; b=Otz9/smOaGLqXsY92KOsYixd8d8OhNs8pfdO9+gdcHa3Pr9Z2vdLd1ahh/A3IMq4lx IdM0CBHGouOsFtEXJHHeojn3YWIvkj3IBgnMn4xdn465yaRZcRT6FOENF7S+MNCzUWnG vjSJpDaLH5YysTkM0qrbCHKwV+pbHHvmcvP4WW2OpRMB2S/K84R4rmGil/XnD9xK1RyA 1uEY/e49825ik2T26rzmhbklovh6ndcArHh99O94oqN5UknDu6W6GuaB8LdKbS9UIOPA 3BaDUqze6XZgKWR/QOhAx80dENNiIYzNXm9IGJP8rV0McwK+d9f8ABfY0X60o7O9IVkT 1C0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666145; x=1742270945; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JJTMw6tkQg2gyyv9VopXfGbD8re6/gGFQNon8Npv7Ak=; b=gF71uGDhSG5Op20S0u0/QFludpMVEH86oxIaLnHZIM8gnLcCpaBLtYIyCbRqxGofA1 zuIZay/pbybSee71VqxDUUFkPXD63qWJeFC8IYPcHlt9U1kpWSABtlOBEtidVFzd8h+P whT7sdi75H/3XXNZ5YPt2flPRN+idtoYMS/uDReuWIOoZMsT2WUO7o3mjKix3gOfv2GV pv5m2XoTrwpCc70cMB7lk0018HuIO6wQfNYC2FOj8APfu8rkyrXlgWKWv48oe0L6BNbZ 7+qFI/BynlN7zKNjmGkonmT7D00+JT/IsXmzDHIcrZ6AqfU0YA0bymJ5XI0ZU41eqgHr bdLg== X-Gm-Message-State: AOJu0YzY6Dkczix4bAJOHQXD8PmidPp91BqIq6hqWEMtf5bx2Aq/KRV+ 2b5tVN/8JQpnIry878arrrCeerJhAJ/BANYrW6Q/XMRtGQHh2rF7o1Ux+C0gOF9Rhqq49t6Qa9U /GLo= X-Gm-Gg: ASbGnct+ykjJJ9jFhPe7Yel867kfRgnmxRmQNzxoY3usjVskR3faHHyrrZxs91SrCM1 1Jeb+bvbftQMi90b4a+73AbnNhpmgjdUAa1Wy3mRoSjqWhLmnoNPndJhsNvGWWTFYi0JonsoxTg aJqE9n0cNckHEZ95lD4kuUWawElWcVwYxRo6O0mE/+urDk7fjhE2l+wIM6XL3TgQEPZEQ3n/vYZ gxmKpa7HAVVlTstZGtf7Ddwx5eUkIf/z+yAn7YtbDTC3KgJb6xd86reqiJPLS9G8mznnv8Ct+qa rVYDRI4YWklARNsR9esYSND+vynut2xoWo8+i+4eNLIk3diV26lTNqI= X-Google-Smtp-Source: AGHT+IEZQz4PbmDcJ14zbyjAyAYIBXfqlvYCPkEDTZUS00hzo0yd+SRkwBCunP0Y6iJa+tBGNAcErA== X-Received: by 2002:a05:6a20:2d2c:b0:1f5:8221:d68c with SMTP id adf61e73a8af0-1f58221fee5mr8742647637.3.1741666145118; Mon, 10 Mar 2025 21:09:05 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:04 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 07/16] exec/exec-all: remove dependency on cpu.h Date: Mon, 10 Mar 2025 21:08:29 -0700 Message-Id: <20250311040838.3937136-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62d.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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/exec-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dd5c40f2233..19b0eda44a7 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,7 +20,6 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "cpu.h" #if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif From patchwork Tue Mar 11 04:08:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011112 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 E14A7C28B2E for ; Tue, 11 Mar 2025 04:13:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqxK-0004uv-3X; Tue, 11 Mar 2025 00:11:02 -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 1trqvY-0003NV-R5 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:13 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvU-0006T2-95 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:12 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2fecba90cc3so9690439a91.2 for ; Mon, 10 Mar 2025 21:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666146; x=1742270946; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S847jAMJoPTCQP5Yv6FtgKXIrkXeVt152gZ92AA3GhI=; b=En091zUcUq2wFkM4FtPgi25dOV608NcfWBcALngG7UztzSXGwc90rAL5IG7yJh8dwS oGrU71fhSwASTbIrC01s/gj41rJHHZ7C/0EQE8KzMcntFbHSzDmMRJHyx2asNla3OAtl dYy5uBR/EyFNuPq5abm522cH1VqhW4x2lH0zVL/kF7kZjGl8uYuOKFO86XLLVA5Hqx8d mkIGvQFTsOfGv93oU2Ox7VSJ8TvbDJpB1RqEH/9aWio+ytsua/MCFOBNl9m7acS6GCRe FVdztQaGU3fX50/Jc7bxCZFBNAA28NBMA76Cv/m58/aTDjIepbOb/myXurxPYzq8sfjf xJyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666146; x=1742270946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S847jAMJoPTCQP5Yv6FtgKXIrkXeVt152gZ92AA3GhI=; b=kqutFED8Pnmgueg9ohriQ/FIc00EI1dFRhK7y3hHAcrAT/xanY/oU3fgLE0XOEZ07A j5aop8eeZwktHFF8QOxvfEPKfudFXpGmcrz9o514o5REsw0Z9+S4rY31MnMazI9kRXN6 H7PPW0MWXop3yQW2mDjHO+hiDS6mHOjx3re5YaExPm0F8HSEQ/2x/EB9m5TP4GE4hOrJ SzZYU3MOvM5i63n/sYWAh7HIXp2vhreEJStttOgARw2L7SAHjs8mvB/erWbvNPlx+MlU sHOartUpOEGeXtXpn8QAxH/3sHJ+Qhvnf18n6fhETyMuUOERsllTwpACvYL4VOzZBCPE EXXA== X-Gm-Message-State: AOJu0YyC5Y02JmVu5uigWA4seUSSyAhd2dVpuc7Fdc/zYa5/GK0DRoor 6aXvl0IEUr3kxNA8H6UkD1oApg9rGL8u0/i0rqtqUlHLmGpCsqWM9/CF9F2dw1hOzqCkje6mVnE xuF4= X-Gm-Gg: ASbGncvhJiDsbH7ZcinnGQ/1DM0fqhN+pXx8Tq4hSvaqx9XmRJXFBz/OZm5ZoCze4Ia HsOCMp3BLV3JGEK5xVA+ws2EE99dYdwuUXp2+iiPtmr0WHhwm0b9IXJTXsyAw27ZL6Q07yI5n/R Ew3bLt/EouzqdBuzBV60mIUr3tBshk5f6BKY8pBCMoHeGU3mhg4ORzzMiMhAmItShmin+fBZbHm b7tKuzgPiw5TMVHZtaY7/fFnCn4lHTWBtr43+XbpqMKv1qUOkZ6+eDWmBCquTljnUdX+jiV4RyC JrAL01kpGzaP1eO43Ov37ErhQ+hNdyCVjCEGZFPxHDTg X-Google-Smtp-Source: AGHT+IE3Vl9B86Ve/DQiaAua/ITAo7nczT+bEsdawDqXZ5VAclVm0x5zL+4TIfw0f3xRMRf28fdfZw== X-Received: by 2002:a05:6a21:516:b0:1f5:709d:e0c6 with SMTP id adf61e73a8af0-1f5709de3e1mr11267027637.42.1741666146178; Mon, 10 Mar 2025 21:09:06 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:05 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 08/16] exec/memory-internal: remove dependency on cpu.h Date: Mon, 10 Mar 2025 21:08:30 -0700 Message-Id: <20250311040838.3937136-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102c.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=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 100c1237ac2..b729f3b25ad 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,8 +20,6 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H -#include "cpu.h" - #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { From patchwork Tue Mar 11 04:08:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011114 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 A11E7C35FF1 for ; Tue, 11 Mar 2025 04:13:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqy3-0005vI-N4; Tue, 11 Mar 2025 00:11: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 1trqvb-0003Ow-Gz for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:16 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvW-0006UW-4e for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:15 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-22398e09e39so91373195ad.3 for ; Mon, 10 Mar 2025 21:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666149; x=1742270949; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lSQnGpOqRDw3w//OvJparnGxlKjvigYzwQgvxmVvIU4=; b=wooyaybViqP1byEs+hy1w62H6jLG4fvt8jvtS9DSxYc/ObvZSK3umAEpygexHXlIKV gZrp5lhSXBfHfxCW7HOJp9zg9rCdNhDSRFBKAFnePSfsoI92AUf/Vb82OFlupwRqtptG rU2U4ogDbMgKByU47wiG9yZMP3pXN2IaZcX33VSzX85d9spQD7IrY0CTYAseRv1zX+WI FZqzKQn6Fd83Oxl9mN4rcs7v8Dam+zVMj2K99vjqbTOepujSugVLWl57TgaCmHfQdx0L rprQqGm+6JGY78ienR2mwlwEkjK+nwfyn9WSci/SFbLhChq9GuXjXsBnn36Ds411VkPl pgbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666149; x=1742270949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lSQnGpOqRDw3w//OvJparnGxlKjvigYzwQgvxmVvIU4=; b=Qi/WVo52AaP7K1MV52wGSG/sPM+tskQgHYxfujH4lcPayy5yZ33Hz/JZxEabPoV8Zd dkCeMgcHB0U4Ul5zcxuxkPKF2VcFlNFnJrBz+xdwMTGNki1+o6+gyy+FcNdFDXLAV2fn cVQaiAWmAdrbanX2Qgi4LR3/HX3SsGTyFxzYddI/GJQjQiBdeCJsZ0O+oEXTtqOmfJBq rYgerwPy5PEACGzl8uQ03WVI8TLXPZp0ZVuM6gw5S9/R9bg034yVcnoyBtFtNXqsg4fC R83v1ipDR6qn41VkndeKb3YFzT7sve0tI/4+sVpAJWVxoNdZsHgOBmnX7bm9/JFFkWwN AoEw== X-Gm-Message-State: AOJu0Yzvq+HhZgewG/c4n8tUSY62KiCqNlhtY6MivoktxJKFMAQ47b5z oEh4xPns1ocMTGhdoxlcUO36P8LyWmue2q/aDwrR7IcS6OAbKXnIVslNMBcCVj2iY/mPip0Mrv6 /jQk= X-Gm-Gg: ASbGncvOIS1cDeKB7bpu+qy8asb24PBwaSpUvM0j/gIxqOXW1PSCBJDVZRRDXANee2F S7iT6ZI1Xheo4hyw9Yj1reLPD8bNagB0NevfJR3qAMmhGVwyVjczWRXePEJCb2rUPmfzK2U1lOU sTwcXxD25onurL4eiH3hZ2ucSwQqeXyBbTe2iMCWeDMBzdo2hobbQkQ3EPnnZn/quPG4GKjBH1s 2NUKVGNbPJzsWaW1yonjhBrCRx1/l9GM5kJ7v0r8n+lqgByDicagqOHjB35BiOChra4LT+9xGgn Q8bk5uK61XwScDO9gsyYpY+RT8c7G2ctZwcyHrCI8D0vMeE3tS6ylDw= X-Google-Smtp-Source: AGHT+IGAtyqJ8JwUWzZUpShXBSvpRNbrwAinE/LFxHiM0RsFVnA1TPY911KWPkY4EkoTDg/0IjRi5A== X-Received: by 2002:a05:6a00:23cb:b0:736:55ec:ea8b with SMTP id d2e1a72fcca58-736e1b3e670mr7549220b3a.24.1741666147270; Mon, 10 Mar 2025 21:09:07 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:06 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 09/16] exec/ram_addr: remove dependency on cpu.h Date: Mon, 10 Mar 2025 21:08:31 -0700 Message-Id: <20250311040838.3937136-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x632.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=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3d8df4edf15..7c011fadd11 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,13 +20,14 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY -#include "cpu.h" #include "system/xen.h" #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "exec/memory.h" +#include "exec/target_page.h" #include "qemu/rcu.h" #include "exec/hwaddr.h" From patchwork Tue Mar 11 04:08:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011116 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 D2AA5C28B2E for ; Tue, 11 Mar 2025 04:14:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqxu-0005g0-Gg; Tue, 11 Mar 2025 00:11:40 -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 1trqvd-0003Qa-47 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:19 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvV-0006U7-QJ for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:16 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-2fec3176ef3so7270646a91.1 for ; Mon, 10 Mar 2025 21:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666148; x=1742270948; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BsftdeZcZ0LsVJ43Vlgc1kB7SrUHDvnjwuIeYSteybs=; b=xCaQ89OFmb1SeBnhjTwZR6YZRV6CH4QIwtAwND9IPQZSF2qZEGjWde5uz5jlGwsEa2 Lzg5BJzWveA1MD76S2iIMYA8RA3RqcYjWuonnclkRkgxRJWgyfV1xhoLiHkvDgN9stR/ 4/HOe7l9jKawRxiXdWARXnF+L/iX2s+J4/221wJTx6PYY2OlasfCabB/ZD9dPDxFVKfW /avHPfl/ZzFI9h4cIn4sTIAo0KZcw6QuWE0UHysj4bwlxhrRn5cQK2DjxCfX7IKnlOSY ILgkOhja1tiRu9bC3xN8nDv0yjkzuM/wX5kHws53cTat66HaPylZqJF7OvS96oMk3uku USoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666148; x=1742270948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BsftdeZcZ0LsVJ43Vlgc1kB7SrUHDvnjwuIeYSteybs=; b=MxF239MMMPvffKeGoDzb6toxYI40lAuM9lklpHMfTeMl/Mn6S5ozbgA6OgCt63SmTi SgBGvLNeoxhXmlt+/Fy0qC54aKK4okJCefpPgGfuZ08135bUCrmx+IGqHK45ToGFPZMG gE29LCHeZagsF5T4bh7rysRtZe6LB8oonjNulMvyGCTgFKc5d3HDT5LmeY+wkBbUgqbQ xjFEXYwMfZAFEvojBGKZroLJlmwkLIQzip9INRri7QedqRaLhPN/6v74IfHgZ/IzZgmG 4WuCjvwePhsVFk1kykSmnjrplwBn/UKAfYKj0OjzZNPwl98NEdl5VgTHKF6t2iYhppGN JhIw== X-Gm-Message-State: AOJu0YybbDgHOKsDIPSgV8dWXJB9skB+mp+pAAf9TfDxmp0I19+cEqH2 plDfPRn6YM1soiwcE3TP+IzPzCl+F5OyAb8C7MR6XuqFvZpo0ANXTjIymX01SGKZQnfvb2Uc99c SXVo= X-Gm-Gg: ASbGnctJS8cLZ40zNBers7yF/nnayMP++1pGayPRO21Jp+aK4PHDzH6HCuUdvOJ85VK Y5vopOk+9+oaOi6/bQaU55rgLKa89lVBjf+X/jbW8o3NcD5Sa7jyeKiT7OGrmMeyKwLwuSdvU/T o/SFqNC/Kv44RW9LyF7AbYqGl3itlTyaHb54UU5jx2H0KCBUYzFe3BIghZmfqFZ6/B9TtcNSCSj NFxGIX5Z0F8e67gTlYEZ3AUUSYqTp03FqOCZLE4IBpv1/tEAdeADgkUTZDSVg5XywKFYoLip1vB tIKqkej/uddAbwvNGIyQfoK2wqFJNP8uGfaX7L7Faj7W X-Google-Smtp-Source: AGHT+IHS2PJ+/kxwhPkSsqZSy1Lcoi2dOdo4gLmR9Sx1nH5mZxTPaitClYNterYld+kjauOZ34q9lw== X-Received: by 2002:a05:6a21:164a:b0:1f5:60fb:8d9 with SMTP id adf61e73a8af0-1f560fb098fmr15311166637.33.1741666148378; Mon, 10 Mar 2025 21:09:08 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:08 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 10/16] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Mon, 10 Mar 2025 21:08:32 -0700 Message-Id: <20250311040838.3937136-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1031.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, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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 This function is used by system/physmem.c will be turn into common code in next commit. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/system/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index ab17c09a551..21da3b8b052 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -210,11 +210,11 @@ bool kvm_arm_supports_user_irq(void); int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); int kvm_on_sigbus(int code, void *addr); -#ifdef COMPILING_PER_TARGET -#include "cpu.h" - void kvm_flush_coalesced_mmio_buffer(void); +#ifdef COMPILING_PER_TARGET +#include "cpu.h" + /** * kvm_update_guest_debug(): ensure KVM debug structures updated * @cs: the CPUState for this cpu From patchwork Tue Mar 11 04:08:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011108 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 B8F6FC2BA1B for ; Tue, 11 Mar 2025 04:12:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqxK-0004w8-QO; Tue, 11 Mar 2025 00:11:03 -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 1trqvd-0003QY-2B for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:19 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvW-0006VJ-Ta for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:16 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-224341bbc1dso60931745ad.3 for ; Mon, 10 Mar 2025 21:09:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666149; x=1742270949; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=HplIzsYFheD7G2bIbHaHKjetAU4JyioxlWzenrbz2kE2GUDihxdPnRjFFmAZ4pdZd5 ziXWXaTPSZKXSCVKU0+yb2YokCyzbQsEnXP14UbroY/hypYSSTjf4GAHmZKyliq/FLZf ZCyjyZgI8gjWom/pFle53hrbAWe+WNqXwZQYllToYT29ThYt7BhfKQ0KUz4edxypOdXq VmGr++FrgtV7hJsGeuMPmsr5Nzx7v0qxYmwtQEoPKVB3t6zuNFvvd2MLXTSW8eEzwzdE 5PIUAfGSZPravGwnQnqmD2HgcmKdMMPVGwMHeYg9vAPRePDimGSq+bvwFqD9YWW7QSLk LQBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666149; x=1742270949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=LZ2qv9Zk0FhnApCt4b+PT42cC+XMgZVu0mW15e0j98UcywCV3TW5lXSFWk1it2hBn5 Bb78hRguql22ZMqSwnL1W3v7aEArzX4BY1yTn6cn+IGCSL8DeTh5skgf3RtL/CISZHzX uEgzsQb7tJhWNK54uCPM2kbNsTCSR+DGE1ukCjSMbyLD5pljhxDNE+pt6cTwYjOYA7So mm4XIt5hLGhyPiytkLVVrCN1hRiqNrv9iERTVMvLpFM88F7Xn8MxWGP985dQfxut1Vm4 Verai/7F0RYBpdXZGINZ2I3LagDf0OfnXVKjP/kqZ/Ys9IBNUiGl8AuXdC2+/O7Yqg42 pXfQ== X-Gm-Message-State: AOJu0YwnSdTbGyFyUENcq0fBkN6nA4EbH7WdomjYotdKrhL85yv1BH6R BWKcmx1TiZe1JTBM9frvEvtTIa8E3FaqEalXmvN7yApX7rj4aN0VfABqAjuOHmCcCrXJBuq1mA5 6FEg= X-Gm-Gg: ASbGncuXLZzvP5rJUgMupgQeM6/4hWA3hNSopwWltuCwZAEw4dFfKlbR4si37i1Is0f mr+Gza7WQWugdsjmgqbH5FEV2eMmFmWF5vS3MxIKJnn23UOTBMDnwdzPes1aRUhOrgf+p6YFsHC aBySaVQI0dBvGhwU+5pdc0p6TZnUnP67ZKiT6Nw96Gih06ff3z9Iuirl+aUYV1cAcb9lk5KL5cU UQN8vIgELGD41C7EZvF1CTNOwhaRdL2N23d458+9pqW1KxNLYp53+TboYvrc4qa24J9WZOWY7+U bmXnioO3R0tkWIRN+9Zq+6XpaiWz1LbY6e/0BJ+Edr76QoExl2hlYM4= X-Google-Smtp-Source: AGHT+IFhjhUd2vTxqYR3Z5nzc5K52WwhbsgB0wgjWXiu+XeofP+aLrA4dkvuyGbgnmdnOjVQzIEANg== X-Received: by 2002:a05:6a20:160c:b0:1f5:75a9:5257 with SMTP id adf61e73a8af0-1f58cb1ba63mr3462589637.13.1741666149439; Mon, 10 Mar 2025 21:09:09 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:09 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 11/16] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Mon, 10 Mar 2025 21:08:33 -0700 Message-Id: <20250311040838.3937136-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.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=unavailable 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 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 7c011fadd11..098fccb5835 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -342,7 +342,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); + } } #if !defined(_WIN32) @@ -418,7 +420,9 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, } } - xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + if (xen_enabled()) { + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + } } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; From patchwork Tue Mar 11 04:08:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011107 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 EAAC2C35FF1 for ; Tue, 11 Mar 2025 04:12:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqxo-0005X0-8c; Tue, 11 Mar 2025 00:11:32 -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 1trqvd-0003Qb-5E for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:19 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvY-0006WL-30 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:16 -0400 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-2f42992f608so8373666a91.0 for ; Mon, 10 Mar 2025 21:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666150; x=1742270950; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=g1IZNUjnq36g2EP+lzfCwYWVFUAy3fM0/Pvz3UtxxPlutccXo0EadWlw7L9rlno8g0 4g7O6cYMje+k9dkI3rZZtcyL9h2ugaGC/wuDFGWI3u9fqN5O889nv7gQe3Nl9iOflL6M vQsg4uqP/QtGkHcjQKNCQu4glCKMgNdTn7+XTJpCaSgqJy2k9GYSvOGtw83IMBy/kCBd hB/zBMY8/UGXFDF+e3V6W7H4w1m+vDsjVuGQNwhSHRzd1kNQJBVm0SZ+amxuW8YVm0gY KMAe+PqVrB9olSJ4eiO5kK4+hJw9i3rv3jtGeHsg9xSDWWfi6zkNKa1xW5F9uMUGezVk aPgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666150; x=1742270950; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=vTOLY1D1wwx51uzTfNtJzi5h9wYyS79KbrlipSvaNxIY/07Fn9INhLsNlXCU3XVIAS dOpoG+V6rpif8TYQXlxQIMvV+SENBLJ4B3oAVV3+dH2nIpej76mf2AfKzN3BRAeuZBD3 D7cVZ7H0wavKeWgU6VDcW+uk2UwwcZ02PIH3rVLrxst5F8FWV5VzATmfPMPGLqZ4t67R bbmCzC2LQxKZKKaLTudmWLfAHWj59aGJJDPzHZ+YUoIh836xE8R0sha8kKG029AvBwbs qGl05zVNPDP17sRG1GWH6UvafFlonyWMDT43exKlQwdw2I7p0NDdtSaoVQQE/ZBTaXNF kjGw== X-Gm-Message-State: AOJu0YwrlzXehQGV+3iG4PgQ/siWM8ZSZfJ1+VxrvVPXIR8bvLy03GoE vOTbkHEAAqTF3S9WSj5Gp4cwDyCkPtRY5Wyal/V0i6NxDN0w/VeaXL0TR9b/sZirBNZgdR7Jiva tymE= X-Gm-Gg: ASbGncvw5fUgZ4t42zJcui7JugB/BGo66zFZI9p5ih0aos/e5ix0ZyQY/I6vHMGIe33 euOQzA41dyFFCCrgBFHR8K5l2RJv8B1XL6OLMnJuebgXXsslQsrQtoZrztiPaACAJHtnXnfswP+ pgfHdueJF8l1W0MeiN7+vKg6zWPPMe5VMu3tbRJFR+w5DqXouZ9bRrL6CUDHAuZ1OcuQh5JATi6 cjvCg5SyO6NcpYi5Rj8wzUk0Y9LVtxoo9DseyZA1E9wZZLDIrXzrs1HNiWC+9A3FbOmwXC66Zgv 4bISmt6GJf27HEfbUod8ipLOgXs8tD9+ft5/RvptCWaA X-Google-Smtp-Source: AGHT+IHJmCe2dJrkKZuUg8Hp5UUMBrSHtlgnmpF6Gn789stb7ihIio5wxKC4BVHFee5F9pMJvA7mBw== X-Received: by 2002:a05:6a21:3941:b0:1f0:e42e:fb1d with SMTP id adf61e73a8af0-1f544c7fc7fmr33091101637.36.1741666150581; Mon, 10 Mar 2025 21:09:10 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:10 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 12/16] hw/xen: add stubs for various functions Date: Mon, 10 Mar 2025 21:08:34 -0700 Message-Id: <20250311040838.3937136-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102b.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 Those functions are used by system/physmem.c, and are called only if xen is enabled (which happens only if CONFIG_XEN is not set). So we can crash in case those are called. Acked-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/xen/xen_stubs.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 59 insertions(+) create mode 100644 hw/xen/xen_stubs.c diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c new file mode 100644 index 00000000000..19cee84bbb4 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,56 @@ +/* + * Various stubs for xen functions + * + * Those functions are used only if xen_enabled(). This file is linked only if + * CONFIG_XEN is not set, so they should never be called. + * + * Copyright (c) 2025 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" + +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + g_assert_not_reached(); +} + +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} + +bool xen_mr_is_memory(MemoryRegion *mr) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache_entry(uint8_t *buffer) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache(void) +{ + g_assert_not_reached(); +} + +ram_addr_t xen_ram_addr_from_mapcache(void *ptr) +{ + g_assert_not_reached(); +} + +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) +{ + g_assert_not_reached(); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 4a486e36738..a1850e76988 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -9,6 +9,9 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-operations.c', +), +if_false: files( + 'xen_stubs.c', )) xen_specific_ss = ss.source_set() From patchwork Tue Mar 11 04:08:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011113 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 D604DC35FF2 for ; Tue, 11 Mar 2025 04:13:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqyB-0006O5-St; Tue, 11 Mar 2025 00:11:56 -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 1trqvf-0003Qs-8j for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:19 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqva-0006Wy-9T for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:19 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2239c066347so87018755ad.2 for ; Mon, 10 Mar 2025 21:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666152; x=1742270952; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=SBSchH1wFYSblBRzjqFbKV+ImaydQIrBXIru2vNcU9gIm6GMmeIFB/DfsBeh3opStr icHRRkgtrnEY4ZFHZwfIUgubNY1xSI9Bzx9SM4JzV+ca2T0eyTiaftovlQbJIDLePHb6 F17TTwAf8dlctqnLy3kumxpGOo8hjgz5swgx/L9PvHFcT9qYwdVGarh6nVeECOIe1FRG 44StW7pkSpDys3w1iyzTOtes6s2gvZlfT9DJ07ra69o7aCeQjfjM2jD2X9bS/EGw7CLT As0uJ/IiLEHyFZYM0u1w3oHM58XoqCVWfa1gYXdnFSro+0NHypObW9ZL8prXyuG6kY07 6KFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666152; x=1742270952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=Ix+LEfHahOYTraGclUq3bvDR3J/RwdYTDPWyxftzJXJnEb8hBAe4N4o42EPd4Tf7Pv iLQM5vFnWp3ZVy7M9kR+YyB4ffKvQJ4R2v8C0ic3l1H/Ir/3kAzfADvAkDpcd9rmTY+B 9xsa3tLwqzdMiHPO1oe8R5NmkxB/FZjIVJo2B0Ea6rJZPKDvCrBUNFpOL7ExNdvNLUyf 43/BoJPw/GwyWq4XI4JBl9Ark1f1fdU3qjOFNQgwqcNGfMEfgZMFzC8r8VL/RNLLY4zO 5UtCfZsPNIvRwaaXn5QeZ2LOIl9YY/xnsWbMyfjDWyQJgx+hw3HSG5eaJTs4uOpHpwTp hRew== X-Gm-Message-State: AOJu0Yx0MeGFfeOPkVY1FsRTk2r0DrUY68ajhldxwo9nCBHr33Gd6brv QswFYePOXDp5GLLnNV7JFlFL00XXzOmLfsn4ZNLOgb37CUaCv5vXOx24iF+WweDKUCRqET0wrlb zyTw= X-Gm-Gg: ASbGncuaYery3UF2d49FE7KEAh/ZIqUp/kyEeeRvY9IciGEuLWXMWZcBlBr9WTy1H8r 5wnfl2Gk/i3pYDChcKk09SBtJIsbKnxUZ/Z0f+D3HgxTZCyYNXXCTaIqTHYQevEP4jZYhRdvmNj wDSvP6eapz7V/C64sLqI39XnoM70yp2DtaiQ6BJQQESSMoQmNvqxpll9i5m/HEOLafn5gBkMeDD d3ARO3Sr9R7P65GCbqbyFOR0Z1EZfz9LQjRzQajLItDheCqJ8MIsdcethyDmi7I9bfkjPCATufc i2AYZ118gkAeW5rUmauQIJxU2OPLhVn7Ds1xeYDvTl6Z X-Google-Smtp-Source: AGHT+IE7G7QimFDknOZtg96uV2bamM0fTFqFZY88Y5t1E8IfrTFu2U6cjPQap3/Vq7WYgH3pY/scbA== X-Received: by 2002:a05:6a21:3944:b0:1f3:321b:4f8b with SMTP id adf61e73a8af0-1f544b190edmr25270834637.19.1741666151748; Mon, 10 Mar 2025 21:09:11 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:11 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 13/16] system/physmem: compilation unit is now common to all targets Date: Mon, 10 Mar 2025 21:08:35 -0700 Message-Id: <20250311040838.3937136-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62f.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=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/meson.build b/system/meson.build index c83d80fa248..9d0b0122e54 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Tue Mar 11 04:08:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011110 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 1D1A1C35FF1 for ; Tue, 11 Mar 2025 04:12:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqy0-0005pJ-2Y; Tue, 11 Mar 2025 00:11:44 -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 1trqvg-0003R0-LM for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:23 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqva-0006Xh-A4 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:19 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-224019ad9edso113005515ad.1 for ; Mon, 10 Mar 2025 21:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666153; x=1742270953; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LEAQ9wvxViIwfRRF7MZBxVkXSE0tKicEinIFunB945A=; b=jStkEORuEiUx7wAf2U+aA1KCiAkV6cwUHHiOrEnRDmgGKSVJb2UZe1Fg9DPyRsDI/a jKDVa79CAjEfLG8XxrD+bQHfeCVeh11s9p5upgfLfagSNBVyKwawk/9o7Zy/CLZ/Xkoh vbAQjlHuOJUI+sqLN+whnkzlx0/nYeBDKtwI1TT/twzJpDKqo6vwW4ykI74SAYHdc2K1 iNlKWfFRLynnOtOmaIBksiDrWrF3kIWVgQH6GOHCrDp6Cbs+8DZp1GIpXytPoqARRcpb zK86xkeTlXZJEd8S7gAaXIeGcnSbHd3cgOaPCL6eocpPJF6NxOJJrR/BqqXiq7nkC6ua QtWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666153; x=1742270953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LEAQ9wvxViIwfRRF7MZBxVkXSE0tKicEinIFunB945A=; b=Y6k8IwuH3pyhLO1O722xJFBco7QS0eAieJoshENzUaR8rsb5uWr4Ks23XRDlg6c/ow RgqKXLRKKpOLv1JHhV7rvlyswojEWSoJ7bnKdTRFabiAYlUiGT2VgzjRlWQCZDwnnf6P uhUgJt6uSgWrZlpynWwtPeEhEUv5DgZSjA83ziCCBNYH8aa5kakTb7bEFLeqjvQl2EIm PMJ3V8NbvOqos7nJdekwCJOr4EdOIUub3yOLwM5h35yNvmIB34aXkDpxYMVZAqWQJfuu hqVNmmoNCvpr2jxvttYVpau0D8Ax4JsgKZstGz3MCU2hzCtBwVaytSbDFQG7VfXAGrBy IgeA== X-Gm-Message-State: AOJu0Yy8MXt/9JS4xmY9MPLYcbomL5eHRg8Kk/b6DJ7X1jrSx+guyvnA RFrrclEKBwjtop36D2V49kJ41NRX+J1X58ithaCKguaATrIgQLXnEF9CZq11OPEPqH4aAVSVfBn KwD0= X-Gm-Gg: ASbGncu/zrn9zmuDIL6ropdGMR4dJzhPIOFUWp3HAj2zCvIOJ7/r+6N9TK3idsFbqqw 5ESCsaQoEbZJyUxRuFnIpF+RRC0tVTLR5kzDfU6hLR8QKLNSIbZW9yQPWimQ0O1FV5u56mLut4L pvx8ybK1QlmGS/8D7cog1gRfCDBhbZ/Sk+ueWuBPUk0ooC135+UiumlJ6SP8PRnQGpG/8es/Fy0 CJqBDJ0i65JYHQZuMxXIMX/bkpTbJJGRfPwkpTp/y1jjDGLAozkkgGKgrBmh8BYYJXwhn4GeNMY 7Zswbrl7xd2tJhXjPulxsFrM8NkwWIE1dw8L5+aPaJ2Y X-Google-Smtp-Source: AGHT+IEEBIqVh4ZJ8rHFVsra/zLBqrrO/2Z7wqCz/tbRxr6Sh6SkveOkvqyI/KznC/OO1HDpbbusNw== X-Received: by 2002:a05:6a21:4d17:b0:1f5:6e71:e55 with SMTP id adf61e73a8af0-1f56e71100cmr14244196637.6.1741666152825; Mon, 10 Mar 2025 21:09:12 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:12 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 14/16] include/exec/memory: extract devend_big_endian from devend_memop Date: Mon, 10 Mar 2025 21:08:36 -0700 Message-Id: <20250311040838.3937136-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x633.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=unavailable 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 we'll use it in system/memory.c. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/exec/memory.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 60c0fb6ccd4..57661283684 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,16 +3138,22 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - bool big_endian = (end == DEVICE_NATIVE_ENDIAN - ? target_words_bigendian() - : end == DEVICE_BIG_ENDIAN); - return big_endian ? MO_BE : MO_LE; + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; } /* From patchwork Tue Mar 11 04:08:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011115 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 9BD19C28B2F for ; Tue, 11 Mar 2025 04:13:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqy4-0005wg-7n; Tue, 11 Mar 2025 00:11:48 -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 1trqvg-0003Qz-KH for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:23 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvb-0006YT-5m for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:19 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2ff4a4f901fso7397718a91.2 for ; Mon, 10 Mar 2025 21:09:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666154; x=1742270954; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v3CzVNwffqVfXfk4NE2Z+/4EFEG8FprDV2OFnBt+VLQ=; b=gsZx0LaSkfehRQBaUSGoBk2kGCqDwoBmXlnZPgHqtGtI/36h3+larrt+Ab3zq0PDCT RG565/Nx0NJasSE8xe/Y/EYgtKDRmYOUvF3QNpfygcPqtsgc0u0p3L7ED4OKqsqCKBpX l3Ja2atNlRSrImZGiS4fLa95uGi4l7lhBYzVNMVRxa7dF1hhiVgv0zbcbdkP2sJjGMSw qOZIcdp+eQTNu0vqhorreLm9cEiifytoMk6PbyBSI5UndcPIaPlMiCUzz1J4SpQfP4pD T5QM758cNx16v0CvHjTYxeF7HCyWUXeU/N636rwNfa9ch+r6d+F0eBtkO9nwog5as01x DP8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666154; x=1742270954; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v3CzVNwffqVfXfk4NE2Z+/4EFEG8FprDV2OFnBt+VLQ=; b=N6hUHbi3jPB78g5RJv8P71EA4UaGEdOnRK2BfvFvf8LXon+Ed7EFttJI+cqQUH+r05 40VtBMgJiN+VFQolUsUlLaygcMa/0fXFqoFCKK1IGGHz3AGIMErHsZw0TmRZZRHy4alf 4MUGm19O5NSK/S7dQx854x1a7Q8ugRrN80jNQje8QxI4yeBfs0iUB15veumWW/wwG6cv yw1ngfe30ldSLnFxbS21Xo4miIi0sA1T87qvW7rpZwWKskiXagXDduJUNIlJNph/omvG oBN9azf9yChIUAQiACKT/ywqKSdVT+3Ynarhb12Lb80Y6sn8S5PCV2fpMaZXhYOtkAvi L+Gw== X-Gm-Message-State: AOJu0Yyt6bFKkNThD5ETeJIZ17LKERYRulMS4STSa/YZIyrPs/GgbRxt pnlHd1u7KbAtj2OSu9djX+6j6qBnAQhb1V09Z8hM6M/KoH1et3L1TCUVEbdNmo1y0n0FH8tIipX rhuE= X-Gm-Gg: ASbGncsMvuLPZiqHq+Og397h3ZoMKKFHeaaShF06wu/zV0yovNDYEi3CvjIA6fopTvZ 8j8FNEKDTwoS2WfqbN/E+QKOdPDGEEe/Vc6x7fDfn5y1QYNAgaPHzSJnMEiwZdH+4y+OnHyJvkC NqYPVfZTNpTiOi4m+XkHq6AUaM2OkdCr2KrfCYJ9dYMtyuBgB82Xr+tOOO9Oy60LbxJVePDIgOa O3XlbYiuPYhQsVWvl3cICF0V5SNGl6/IN1XYYYTN+g805PLz8LAeM6MKrBmDPvwkRWqQ9oLcT9t /wr9BsJAAb1t6DUbadm8su2l4OMAVidhhHJhLMW37eq6 X-Google-Smtp-Source: AGHT+IFvXFjaslvNGXJjltHn8NjSjDrKRDjnKt7uWKtRausP/KT3hgu5XPa6ctrl8hlKzv3rih4ocw== X-Received: by 2002:a05:6a20:c6c1:b0:1f5:59e5:8ad2 with SMTP id adf61e73a8af0-1f58cb40fa8mr3753307637.24.1741666153903; Mon, 10 Mar 2025 21:09:13 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:13 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 15/16] system/memory: make compilation unit common Date: Mon, 10 Mar 2025 21:08:37 -0700 Message-Id: <20250311040838.3937136-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102e.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 Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- system/memory.c | 17 +++++------------ system/meson.build | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..eddd21a6cdb 100644 --- a/system/memory.c +++ b/system/memory.c @@ -353,15 +353,6 @@ static void flatview_simplify(FlatView *view) } } -static bool memory_region_big_endian(MemoryRegion *mr) -{ -#if TARGET_BIG_ENDIAN - return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; -#else - return mr->ops->endianness == DEVICE_BIG_ENDIAN; -#endif -} - static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) { if ((op & MO_BSWAP) != devend_memop(mr->ops->endianness)) { @@ -563,7 +554,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr, /* FIXME: support unaligned access? */ access_size = MAX(MIN(size, access_size_max), access_size_min); access_mask = MAKE_64BIT_MASK(0, access_size * 8); - if (memory_region_big_endian(mr)) { + if (devend_big_endian(mr->ops->endianness)) { for (i = 0; i < size; i += access_size) { r |= access_fn(mr, addr + i, value, access_size, (size - access_size - i) * 8, access_mask, attrs); @@ -2584,7 +2575,8 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2611,8 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { diff --git a/system/meson.build b/system/meson.build index 9d0b0122e54..881cb2736fe 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,7 +1,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', - 'memory.c', )]) system_ss.add(files( @@ -14,6 +13,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Tue Mar 11 04:08:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011104 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 98D88C28B2E for ; Tue, 11 Mar 2025 04:12:25 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trqyE-0006gb-C1; Tue, 11 Mar 2025 00:11:58 -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 1trqvg-0003R2-SM for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:23 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trqvc-0006ZI-Q9 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 00:09:20 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-223fd89d036so97389785ad.1 for ; Mon, 10 Mar 2025 21:09:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666155; x=1742270955; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=JEXakf51zH+inLHyfuDwVlhg3gy1ic9uQZGDTUNm0Ye4yqdgKPfJ4DtmwchOUJ/Pw0 CBaCxiRVo37JBgkYpNq4LnDA9n44kssWDt5igXLZ7mRQ8KxRrgrStwGrVuSPBFZfsO09 PqWn1z7Exzeni4PBeodzbsGvPlnMMb1iV9EeoskQ7wgcPD1HvnUFa8+6FNhn/XDv/RRs 4VCg+DofUFtIMT6FC96akOpFd91QctdvRpy5/csjSL+wbQ3XhgDbKzeCLoo4/ST7a0ss YhH4d8WC9wjiLz7y1Fe0zVQ5HM+T8ZWgi+ZiNPN0Pl6mbHV89cloAumMmVYA6ZuCklL8 TFrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666155; x=1742270955; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=YYIXSmG9XQCsgkFZ6IMaicH5iuZIA/f6/HppEnd35xl2HNJnuZd29ImYeil7Judqck /Z/3CGQQPu0HoWoZmZBLPg2AzP4H6otMHaXRzxlQhBben3pcvndEduId9NNWlz9nODCN F2bqeU7M8SlWaiwSc2nZ5YkrtWNutcowSLs5jIiY5kW6VOQMyb3yC5li4YlPuf/JB8J8 q7AZr4wPbkY3ly2DBhrVb3AS0dBAbIfDPO3phdULmASNWa49F4hXgKay3TSgFyoJ7jM3 3W6PcXKg7Pc6yyu2Z2EdRqxkg+4JzTTOr+3LbwfESDl2Rkw5uVtI3zDIIC4Wi7DRiIdq H0lg== X-Gm-Message-State: AOJu0YwNiCChrhwipbFy++WFRsdgnrBVrhCgMyIfBSCbhwxQq+PmnKQD 7Ecp1GVZ8HqtrTSiyZyLxK2K+mYCf6cGgvcGYam6Lfwd0lUcF4/YAG2XTN9dJZ2EHXDmFreRDdc g3vM= X-Gm-Gg: ASbGncuAnntf0hYJFFsHiSU50NlhzsdLWtpVuyT8qDojhftHQHGsXHPnAn2cN0wJepY rO1iCpw3luUta1wdVAqNHpbgrwd9XxMWiljvEzd5Yc8arvbUuxYaJZ/6dKsAOqnj1fUMz3NpI3j j6TT1UcJHEhCJrUhHWFPqg93bgoLr14gsZHt/8vl6IJrIclXnLDWxIFbhl52Q/Jb22znSV9B99m zYu2KkDiGRRLvZCkRdfDw2sSpqPyALfWb1RbMW5+NNNj4lZO09nT1itmuqbX7Y96xNuuNV+oHrk CDDJW1OSFqeZergl0vfgnNXvtAaDKVYT7IlYnPbr8c4H X-Google-Smtp-Source: AGHT+IHyNZlPl+mr9I1Abk1OGoyMfz7g2vsqkJBEqYSKDsIrZops7PpVKyQRnmB7QqPJXfOnNuaTjA== X-Received: by 2002:a05:6a21:6f8b:b0:1f5:8b9b:ab56 with SMTP id adf61e73a8af0-1f58b9bb025mr4529566637.18.1741666154964; Mon, 10 Mar 2025 21:09:14 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:14 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 16/16] system/ioport: make compilation unit common Date: Mon, 10 Mar 2025 21:08:38 -0700 Message-Id: <20250311040838.3937136-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62e.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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/ioport.c | 1 - system/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/system/ioport.c b/system/ioport.c index 55c2a752396..89daae9d602 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "cpu.h" #include "exec/ioport.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/system/meson.build b/system/meson.build index 881cb2736fe..3faec7e4dfb 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', - 'ioport.c', )]) system_ss.add(files( @@ -12,6 +11,7 @@ system_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'memory.c', 'physmem.c',