Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 712DCC433FE for ; Thu, 10 Dec 2020 13:42:56 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E27E12311B for ; Thu, 10 Dec 2020 13:42:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E27E12311B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knMDe-0004ce-Sg for qemu-devel@archiver.kernel.org; Thu, 10 Dec 2020 08:42:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knLiH-0001GK-Nc for qemu-devel@nongnu.org; Thu, 10 Dec 2020 08:10:31 -0500 Received: from mx2.suse.de ([195.135.220.15]:49822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knLiC-000717-1R for qemu-devel@nongnu.org; Thu, 10 Dec 2020 08:10:29 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 96042AB91; Thu, 10 Dec 2020 13:10:21 +0000 (UTC) Subject: Re: [PATCH v10 24/32] cpu: move cc->transaction_failed to tcg_ops To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Paolo Bonzini , Thomas Huth , Richard Henderson , Stefano Stabellini , Wenchao Wang , Roman Bolshakov , Sunil Muthuswamy References: <20201210121226.19822-1-cfontana@suse.de> <20201210121226.19822-25-cfontana@suse.de> From: Claudio Fontana Message-ID: <7e65bd12-4fba-e7c1-87a2-1fa5cdfc0f7b@suse.de> Date: Thu, 10 Dec 2020 14:10:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Eduardo Habkost , Paul Durrant , =?UTF-8?Q?Alex_Benn=c3=a9e?= , Jason Wang , Marcelo Tosatti , qemu-devel@nongnu.org, Peter Xu , Dario Faggioli , Cameron Esfahani , haxm-team@intel.com, Colin Xu , Anthony Perard , Bruce Rogers , Olaf Hering , "Emilio G . Cota" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 12/10/20 1:59 PM, Philippe Mathieu-Daudé wrote: > On 12/10/20 1:12 PM, Claudio Fontana wrote: >> Signed-off-by: Claudio Fontana >> Reviewed-by: Alex Bennée >> --- >> include/hw/core/cpu.h | 18 +++++++----------- >> include/hw/core/tcg-cpu-ops.h | 10 ++++++++++ >> hw/mips/jazz.c | 9 +++++++-- >> target/alpha/cpu.c | 2 +- >> target/arm/cpu.c | 4 ++-- >> target/m68k/cpu.c | 2 +- >> target/microblaze/cpu.c | 2 +- >> target/mips/cpu.c | 2 +- >> target/riscv/cpu.c | 2 +- >> target/sparc/cpu.c | 2 +- >> target/xtensa/cpu.c | 2 +- >> 11 files changed, 33 insertions(+), 22 deletions(-) > ... > >> diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h >> index a7387b5c39..3cc2733410 100644 >> --- a/include/hw/core/tcg-cpu-ops.h >> +++ b/include/hw/core/tcg-cpu-ops.h >> @@ -11,6 +11,7 @@ >> #define TCG_CPU_OPS_H >> >> #include "hw/core/cpu.h" >> +#include "exec/memattrs.h" >> >> /** >> * struct TcgCpuOperations: TCG operations specific to a CPU class >> @@ -41,6 +42,15 @@ typedef struct TcgCpuOperations { >> /** @do_interrupt: Callback for interrupt handling. */ >> void (*do_interrupt)(CPUState *cpu); >> > > Do we want to restrict this handler to system-mode? maybe we should check them all... do_interrupt is sometimes also user mode, but do_transaction_failed seems to be system only. > > #ifdef CONFIG_SOFTMMU This could be either #ifndef CONFIG_USER_ONLY or #ifdef NEED_CPU_H #define CONFIG_SOFTMMU as discussed previously (Richard), issue is, in the header files here we tend to see #ifdef NEED_CPU_H #define CONFIG_SOFTMMU while the target/ files we consistently see #ifndef CONFIG_USER_ONLY so this is an inconsistency. If you are ok with it I would wrap everywhere consistently with CONFIG_USER_ONLY for now? >> + /** >> + * @do_transaction_failed: Callback for handling failed memory transactions >> + * (ie bus faults or external aborts; not MMU faults) >> + */ >> + void (*do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, >> + unsigned size, MMUAccessType access_type, >> + int mmu_idx, MemTxAttrs attrs, >> + MemTxResult response, uintptr_t retaddr); > > #endif > >> /** >> * @tlb_fill: Handle a softmmu tlb miss or user-only address fault >> * > ... >