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 115D4C433FE for ; Wed, 9 Dec 2020 13:02:35 +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 8F1D023B45 for ; Wed, 9 Dec 2020 13:02:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F1D023B45 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]:36314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmz73-0000Xd-Bt for qemu-devel@archiver.kernel.org; Wed, 09 Dec 2020 08:02:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmz2y-0007lF-07 for qemu-devel@nongnu.org; Wed, 09 Dec 2020 07:58:20 -0500 Received: from mx2.suse.de ([195.135.220.15]:39784) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmz2u-0006RX-L2 for qemu-devel@nongnu.org; Wed, 09 Dec 2020 07:58: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 F37EDADE1; Wed, 9 Dec 2020 12:58:13 +0000 (UTC) Subject: Re: [RFC v9 26/32] accel: extend AccelState and AccelClass to user-mode To: =?UTF-8?Q?Alex_Benn=c3=a9e?= References: <20201208194839.31305-1-cfontana@suse.de> <20201208194839.31305-27-cfontana@suse.de> <87v9dbcfas.fsf@linaro.org> From: Claudio Fontana Message-ID: Date: Wed, 9 Dec 2020 13:58:11 +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: <87v9dbcfas.fsf@linaro.org> 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: Paul Durrant , Jason Wang , qemu-devel@nongnu.org, Peter Xu , haxm-team@intel.com, Colin Xu , Olaf Hering , Stefano Stabellini , Bruce Rogers , "Emilio G . Cota" , Anthony Perard , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , Cameron Esfahani , Dario Faggioli , Roman Bolshakov , Sunil Muthuswamy , Marcelo Tosatti , Wenchao Wang , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 12/9/20 1:51 PM, Alex Bennée wrote: > > Claudio Fontana writes: > >> Signed-off-by: Claudio Fontana >> --- >> MAINTAINERS | 2 +- >> accel/accel-common.c | 50 ++++++++++++++++++++++++++++++ >> accel/{accel.c => accel-softmmu.c} | 27 ++-------------- >> accel/accel-user.c | 24 ++++++++++++++ >> accel/meson.build | 4 ++- >> accel/qtest/qtest.c | 2 +- >> accel/tcg/meson.build | 2 +- >> accel/tcg/tcg-all.c | 13 ++++++-- >> accel/xen/xen-all.c | 2 +- >> bsd-user/main.c | 6 +++- >> include/hw/boards.h | 2 +- >> include/{sysemu => qemu}/accel.h | 14 +++++---- >> include/sysemu/hvf.h | 2 +- >> include/sysemu/kvm.h | 2 +- >> include/sysemu/kvm_int.h | 2 +- >> linux-user/main.c | 6 +++- >> softmmu/memory.c | 2 +- >> softmmu/qtest.c | 2 +- >> softmmu/vl.c | 2 +- >> target/i386/hax/hax-all.c | 2 +- >> target/i386/hvf/hvf-i386.h | 2 +- >> target/i386/hvf/hvf.c | 2 +- >> target/i386/hvf/x86_task.c | 2 +- >> target/i386/whpx/whpx-all.c | 2 +- >> 24 files changed, 124 insertions(+), 52 deletions(-) >> create mode 100644 accel/accel-common.c >> rename accel/{accel.c => accel-softmmu.c} (75%) >> create mode 100644 accel/accel-user.c >> rename include/{sysemu => qemu}/accel.h (95%) >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index d876f504a6..6235dd3a9f 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -434,7 +434,7 @@ Overall >> M: Richard Henderson >> R: Paolo Bonzini >> S: Maintained >> -F: include/sysemu/accel.h >> +F: include/qemu/accel.h >> F: accel/accel.c >> F: accel/Makefile.objs >> F: accel/stubs/Makefile.objs >> diff --git a/accel/accel-common.c b/accel/accel-common.c >> new file mode 100644 >> index 0000000000..ddec8cb5ae >> --- /dev/null >> +++ b/accel/accel-common.c >> @@ -0,0 +1,50 @@ >> +/* >> + * QEMU accel class, components common to system emulation and user mode >> + * >> + * Copyright (c) 2003-2008 Fabrice Bellard >> + * Copyright (c) 2014 Red Hat Inc. >> + * >> + * Permission is hereby granted, free of charge, to any person obtaining a copy >> + * of this software and associated documentation files (the "Software"), to deal >> + * in the Software without restriction, including without limitation the rights >> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell >> + * copies of the Software, and to permit persons to whom the Software is >> + * furnished to do so, subject to the following conditions: >> + * >> + * The above copyright notice and this permission notice shall be included in >> + * all copies or substantial portions of the Software. >> + * >> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR >> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, >> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL >> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER >> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, >> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN >> + * THE SOFTWARE. >> + */ >> + >> +#include "qemu/osdep.h" >> +#include "qemu/accel.h" >> + >> +static const TypeInfo accel_type = { >> + .name = TYPE_ACCEL, >> + .parent = TYPE_OBJECT, >> + .class_size = sizeof(AccelClass), >> + .instance_size = sizeof(AccelState), >> +}; >> + >> +/* Lookup AccelClass from opt_name. Returns NULL if not found */ >> +AccelClass *accel_find(const char *opt_name) >> +{ >> + char *class_name = g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name); >> + AccelClass *ac = ACCEL_CLASS(object_class_by_name(class_name)); >> + g_free(class_name); >> + return ac; >> +} >> + >> +static void register_accel_types(void) >> +{ >> + type_register_static(&accel_type); >> +} >> + >> +type_init(register_accel_types); >> diff --git a/accel/accel.c b/accel/accel-softmmu.c >> similarity index 75% >> rename from accel/accel.c >> rename to accel/accel-softmmu.c >> index cb555e3b06..f89da8f9d1 100644 >> --- a/accel/accel.c >> +++ b/accel/accel-softmmu.c >> @@ -1,5 +1,5 @@ >> /* >> - * QEMU System Emulator, accelerator interfaces >> + * QEMU accel class, system emulation components >> * >> * Copyright (c) 2003-2008 Fabrice Bellard >> * Copyright (c) 2014 Red Hat Inc. >> @@ -24,28 +24,12 @@ >> */ >> >> #include "qemu/osdep.h" >> -#include "sysemu/accel.h" >> +#include "qemu/accel.h" >> #include "hw/boards.h" >> #include "sysemu/arch_init.h" >> #include "sysemu/sysemu.h" >> #include "qom/object.h" >> >> -static const TypeInfo accel_type = { >> - .name = TYPE_ACCEL, >> - .parent = TYPE_OBJECT, >> - .class_size = sizeof(AccelClass), >> - .instance_size = sizeof(AccelState), >> -}; >> - >> -/* Lookup AccelClass from opt_name. Returns NULL if not found */ >> -AccelClass *accel_find(const char *opt_name) >> -{ >> - char *class_name = g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name); >> - AccelClass *ac = ACCEL_CLASS(object_class_by_name(class_name)); >> - g_free(class_name); >> - return ac; >> -} >> - >> int accel_init_machine(AccelState *accel, MachineState *ms) >> { >> AccelClass *acc = ACCEL_GET_CLASS(accel); >> @@ -76,10 +60,3 @@ void accel_setup_post(MachineState *ms) >> acc->setup_post(ms, accel); >> } >> } >> - >> -static void register_accel_types(void) >> -{ >> - type_register_static(&accel_type); >> -} >> - >> -type_init(register_accel_types); >> diff --git a/accel/accel-user.c b/accel/accel-user.c >> new file mode 100644 >> index 0000000000..26bdda6236 >> --- /dev/null >> +++ b/accel/accel-user.c >> @@ -0,0 +1,24 @@ >> +/* >> + * QEMU accel class, user-mode components >> + * >> + * Copyright 2020 SUSE LLC >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2 or later. >> + * See the COPYING file in the top-level directory. >> + */ >> + >> +#include "qemu/osdep.h" >> +#include "qemu/accel.h" >> + >> +AccelState *current_accel(void) >> +{ >> + static AccelState *accel; >> + >> + if (!accel) { >> + AccelClass *ac = accel_find("tcg"); >> + >> + g_assert(ac != NULL); >> + accel = ACCEL(object_new_with_class(OBJECT_CLASS(ac))); >> + } >> + return accel; >> +} >> diff --git a/accel/meson.build b/accel/meson.build >> index b26cca227a..b44ba30c86 100644 >> --- a/accel/meson.build >> +++ b/accel/meson.build >> @@ -1,4 +1,6 @@ >> -softmmu_ss.add(files('accel.c')) >> +specific_ss.add(files('accel-common.c')) >> +softmmu_ss.add(files('accel-softmmu.c')) >> +user_ss.add(files('accel-user.c')) >> >> subdir('qtest') >> subdir('kvm') >> diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c >> index b282cea5cf..b4e731cb2b 100644 >> --- a/accel/qtest/qtest.c >> +++ b/accel/qtest/qtest.c >> @@ -17,7 +17,7 @@ >> #include "qemu/module.h" >> #include "qemu/option.h" >> #include "qemu/config-file.h" >> -#include "sysemu/accel.h" >> +#include "qemu/accel.h" >> #include "sysemu/qtest.h" >> #include "sysemu/cpus.h" >> #include "sysemu/cpu-timers.h" >> diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build >> index f39aab0a0c..424d9bb1fc 100644 >> --- a/accel/tcg/meson.build >> +++ b/accel/tcg/meson.build >> @@ -1,5 +1,6 @@ >> tcg_ss = ss.source_set() >> tcg_ss.add(files( >> + 'tcg-all.c', >> 'cpu-exec-common.c', >> 'cpu-exec.c', >> 'tcg-runtime-gvec.c', >> @@ -13,7 +14,6 @@ tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c'), libdl]) >> specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) >> >> specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files( >> - 'tcg-all.c', >> 'cputlb.c', >> 'tcg-cpus.c', >> 'tcg-cpus-mttcg.c', >> diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c >> index 1ac0b76515..7125d0cc29 100644 >> --- a/accel/tcg/tcg-all.c >> +++ b/accel/tcg/tcg-all.c >> @@ -30,9 +30,12 @@ >> #include "tcg/tcg.h" >> #include "qapi/error.h" >> #include "qemu/error-report.h" >> -#include "hw/boards.h" >> +#include "qemu/accel.h" >> #include "qapi/qapi-builtin-visit.h" >> + >> +#ifndef CONFIG_USER_ONLY >> #include "tcg-cpus.h" >> +#endif /* CONFIG_USER_ONLY */ >> >> struct TCGState { >> AccelState parent_obj; >> @@ -106,8 +109,12 @@ static int tcg_init(MachineState *ms) >> mttcg_enabled = s->mttcg_enabled; >> >> /* >> - * Initialize TCG regions >> + * Initialize TCG regions only for softmmu. >> + * >> + * This needs to be done later for user mode, because the prologue >> + * generation needs to be delayed so that GUEST_BASE is already set. >> */ >> +#ifndef CONFIG_USER_ONLY >> tcg_region_init(); > > This implies we broke bisectability with: > > accel/tcg: split tcg_start_vcpu_thread Hi Alex, I don't think so, this is only an issue after applying this patch, because tcg_init is only called by softmmu code up and until this very patch, bisect should be ok.. Ciao, Claudio > > > > Otherwise with that fixed: > > Reviewed-by: Alex Bennée >