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 2BC69C433FE for ; Wed, 9 Dec 2020 20:06:44 +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 82A49239D1 for ; Wed, 9 Dec 2020 20:06:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82A49239D1 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]:38362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn5jW-0006O4-E2 for qemu-devel@archiver.kernel.org; Wed, 09 Dec 2020 15:06:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn57e-0004PA-SG for qemu-devel@nongnu.org; Wed, 09 Dec 2020 14:27:34 -0500 Received: from mx2.suse.de ([195.135.220.15]:34442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn57b-0007Ri-Ul for qemu-devel@nongnu.org; Wed, 09 Dec 2020 14:27:34 -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 39A43AE2E; Wed, 9 Dec 2020 19:27:30 +0000 (UTC) Subject: Re: [RFC v9 27/32] accel: replace struct CpusAccel with AccelOpsClass To: =?UTF-8?Q?Alex_Benn=c3=a9e?= References: <20201208194839.31305-1-cfontana@suse.de> <20201208194839.31305-28-cfontana@suse.de> <87sg8fcf3z.fsf@linaro.org> <87blf2de58.fsf@linaro.org> From: Claudio Fontana Message-ID: Date: Wed, 9 Dec 2020 20:27:28 +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: <87blf2de58.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 7:30 PM, Alex Bennée wrote: > > Claudio Fontana writes: > >> On 12/9/20 1:54 PM, Alex Bennée wrote: >>> >>> Claudio Fontana writes: >>> >>>> centralize the registration of the cpus.c module >>>> accelerator operations in accel/accel-softmmu.c >>>> >>>> Signed-off-by: Claudio Fontana >>> >>>> diff --git a/accel/tcg/tcg-cpus.c b/accel/tcg/tcg-cpus.c >>>> index e335f9f155..38a58ab271 100644 >>>> --- a/accel/tcg/tcg-cpus.c >>>> +++ b/accel/tcg/tcg-cpus.c >>>> @@ -35,6 +35,9 @@ >>>> #include "hw/boards.h" >>>> >>>> #include "tcg-cpus.h" >>>> +#include "tcg-cpus-mttcg.h" >>>> +#include "tcg-cpus-rr.h" >>>> +#include "tcg-cpus-icount.h" >>>> >>>> /* common functionality among all TCG variants */ >>>> >>>> @@ -80,3 +83,43 @@ void tcg_cpus_handle_interrupt(CPUState *cpu, int mask) >>>> qatomic_set(&cpu_neg(cpu)->icount_decr.u16.high, -1); >>>> } >>>> } >>>> + >>>> +static void tcg_cpus_ops_init(AccelOpsClass *ops) >>>> +{ >>>> + if (qemu_tcg_mttcg_enabled()) { >>>> + ops->create_vcpu_thread = mttcg_start_vcpu_thread; >>>> + ops->kick_vcpu_thread = mttcg_kick_vcpu_thread; >>>> + ops->handle_interrupt = tcg_cpus_handle_interrupt; >>>> + >>>> + } else if (icount_enabled()) { >>>> + ops->create_vcpu_thread = rr_start_vcpu_thread; >>>> + ops->kick_vcpu_thread = rr_kick_vcpu_thread; >>>> + ops->handle_interrupt = icount_handle_interrupt; >>>> + ops->get_virtual_clock = icount_get; >>>> + ops->get_elapsed_ticks = icount_get; >>>> + >>>> + } else { >>>> + ops->create_vcpu_thread = rr_start_vcpu_thread; >>>> + ops->kick_vcpu_thread = rr_kick_vcpu_thread; >>>> + ops->handle_interrupt = tcg_cpus_handle_interrupt; >>>> + } >>>> +} >>> >>> Aren't we going backwards here by having a global function aware of the >>> different accelerator types rather than encapsulating this is the >>> particular accelerator machinery? >>> >>> >>> >> >> Now I got your point. >> >> The ideal would be to have three classes. One called tcg-mttcg, one tcg-icount, one tcg-rr. >> The problem: backward compatibility I think, since currently we have only one accel, "tcg". >> >> But, hmm maybe fixable, I'll take a look. > > Yeah I was wondering if we were going to have subclasses for each "type" > of TCG. But now I'm wondering if that even makes sense. Will we ever > want to built a TCG enabled binary that say doesn't do icount? Maybe > not - having a single AccelOpsClass which runs in 3 modes will probably > do for now. Ok, I think you have a point there, so if you find a way we could subclass and not break backward compatibility in a non-super-convoluted way, I am all ears, thanks a lot! Ciao, Claudio