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 1A912C4361B for ; Thu, 10 Dec 2020 13:44:59 +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 6478A23119 for ; Thu, 10 Dec 2020 13:44:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6478A23119 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]:54436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knMFd-0007Dd-AA for qemu-devel@archiver.kernel.org; Thu, 10 Dec 2020 08:44:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knLlz-0004BU-I3 for qemu-devel@nongnu.org; Thu, 10 Dec 2020 08:14:19 -0500 Received: from mx2.suse.de ([195.135.220.15]:52116) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knLlx-0008B4-IT for qemu-devel@nongnu.org; Thu, 10 Dec 2020 08:14:19 -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 BFF2FAB91; Thu, 10 Dec 2020 13:14:14 +0000 (UTC) Subject: Re: [PATCH v10 25/32] cpu: move do_unaligned_access 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-26-cfontana@suse.de> From: Claudio Fontana Message-ID: Date: Thu, 10 Dec 2020 14:14:13 +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 2:01 PM, Philippe Mathieu-Daudé wrote: > On 12/10/20 1:12 PM, Claudio Fontana wrote: >> make it consistently SOFTMMU-only. >> >> Signed-off-by: Claudio Fontana >> Reviewed-by: Alex Bennée >> --- >> include/hw/core/cpu.h | 17 +++-------------- >> include/hw/core/tcg-cpu-ops.h | 7 +++++++ >> target/alpha/cpu.c | 2 +- >> target/arm/cpu.c | 2 +- >> target/hppa/cpu.c | 4 +++- >> target/microblaze/cpu.c | 2 +- >> target/mips/cpu.c | 3 ++- >> target/nios2/cpu.c | 2 +- >> target/riscv/cpu.c | 2 +- >> target/s390x/cpu.c | 2 +- >> target/sh4/cpu.c | 2 +- >> target/sparc/cpu.c | 2 +- >> target/xtensa/cpu.c | 2 +- >> target/ppc/translate_init.c.inc | 2 +- >> 14 files changed, 25 insertions(+), 26 deletions(-) > ... > >> -#ifdef CONFIG_SOFTMMU >> +#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG) >> static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr, >> MMUAccessType access_type, >> int mmu_idx, uintptr_t retaddr) >> { >> CPUClass *cc = CPU_GET_CLASS(cpu); >> >> - cc->do_unaligned_access(cpu, addr, access_type, mmu_idx, retaddr); >> + cc->tcg_ops.do_unaligned_access(cpu, addr, access_type, mmu_idx, retaddr); >> } >> -#ifdef CONFIG_TCG >> static inline void cpu_transaction_failed(CPUState *cpu, hwaddr physaddr, >> vaddr addr, unsigned size, >> MMUAccessType access_type, >> @@ -858,10 +850,7 @@ static inline void cpu_transaction_failed(CPUState *cpu, hwaddr physaddr, >> mmu_idx, attrs, response, retaddr); >> } >> } >> -#endif /* CONFIG_TCG */ >> -#endif /* CONFIG_SOFTMMU */ >> - >> -#endif /* NEED_CPU_H */ >> +#endif /* !CONFIG_USER_ONLY && CONFIG_TCG */ >> >> /** >> * cpu_set_pc: >> diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h >> index 3cc2733410..bac0165db6 100644 >> --- a/include/hw/core/tcg-cpu-ops.h >> +++ b/include/hw/core/tcg-cpu-ops.h >> @@ -50,6 +50,13 @@ typedef struct TcgCpuOperations { >> unsigned size, MMUAccessType access_type, >> int mmu_idx, MemTxAttrs attrs, >> MemTxResult response, uintptr_t retaddr); >> + /** >> + * @do_unaligned_access: Callback for unaligned access handling, if >> + * the target defines #TARGET_ALIGNED_ONLY. >> + */ >> + void (*do_unaligned_access)(CPUState *cpu, vaddr addr, >> + MMUAccessType access_type, >> + int mmu_idx, uintptr_t retaddr); > > Similarly to previous patch, don't we want to restrict this > to system-mode? In theory yes, (and what about exec_interrupt..?) but we need to triple check the targets, because they tend to set these unconditionally. Same concern about CONFIG_USER_ONLY vs NEED_CPU_H / CONFIG_SOFTMMU, would use CONFIG_USER_ONLY for consistency with the other targets? > >> >> /** >> * @tlb_fill: Handle a softmmu tlb miss or user-only address fault >