From mboxrd@z Thu Jan 1 00:00:00 1970 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 190FEC54EE9 for ; Tue, 20 Sep 2022 05:16:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.409143.652061 (Exim 4.92) (envelope-from ) id 1oaVc0-000644-Jl; Tue, 20 Sep 2022 05:16:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 409143.652061; Tue, 20 Sep 2022 05:16:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oaVc0-00063x-G0; Tue, 20 Sep 2022 05:16:00 +0000 Received: by outflank-mailman (input) for mailman id 409143; Tue, 20 Sep 2022 05:15:59 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oaVbz-00063r-BC for xen-devel@lists.xenproject.org; Tue, 20 Sep 2022 05:15:59 +0000 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [2a00:1450:4864:20::42c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4f5f1732-38a3-11ed-9647-05401a9f4f97; Tue, 20 Sep 2022 07:15:58 +0200 (CEST) Received: by mail-wr1-x42c.google.com with SMTP id y5so2411586wrh.3 for ; Mon, 19 Sep 2022 22:15:58 -0700 (PDT) Received: from [192.168.1.115] ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id t1-20020adfdc01000000b002252ec781f7sm480793wri.8.2022.09.19.22.15.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Sep 2022 22:15:55 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list X-Inumbo-ID: 4f5f1732-38a3-11ed-9647-05401a9f4f97 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date; bh=zoCj17/FoLXwtexZcC8HC08ap2gyp0m31eL5ZvThkKo=; b=R32rY7NSj7Fx9wnIFsIakEDibCO9xnK1hZUIT2HKqPdw/Ary8UunlhchQEe50uZAKt IcHwDoHg8BNyr+4XdYGESfHcm//PXvOEVjvXhZPD7y8P5Fpsvk8XUpPTrNV902a8L/l1 kcrrndYyNFP2f9XhMPsIOO8AQ/iM1BglRxvcvsKItT0E660ecmBZDaSsn0HIoqSf61pq K8m/cNkANRYMDuR3+HLK4MzuEAvEdEvPrSnSDqRQAwpf1NMYx6hw3Df9VJdBqPRBqe1C BtFe2Lxkcsnodwk0vjI79xEIH7dEOtyIxG8EM0q8g5XNnP9vD2TPzFgVglIz9uW5QTr9 RzWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date; bh=zoCj17/FoLXwtexZcC8HC08ap2gyp0m31eL5ZvThkKo=; b=fqI1r7pxLd/ffzC8/XlcYmdYreNlKpJQV03cBYiqFy9MYc7ml3WlVJg4BeQyvWtKx6 0jZ2MGydJMi5gT5RQf65wXl+9w5EuMbK19qAbzmBRilXeS4k2Pwbq0hbjM107w2TrVZa SgrvWP/qCi6GOVsE8bBGUwizROQWUlUTKM4hs5TuaH0ihxmpOFOAzEIRaOPECj9vig/z d8cKHfrgxf1JzJgxxuskJ56TF/bDDgZdTNG9ETnwEAd4L69Ccc0i7lc2WH2jXO8nmudH H/7rrXqVIp5tqXJk5YjHhleb8It5V7N31E5qAVqgTEJJc2sqY+s8LYq/K5FVnj2aTpC2 83bg== X-Gm-Message-State: ACrzQf22F7hDbb776Sq2E7EN0QvJN8n+XbE+IZ0nVxqWrIyl42Z1Tjfe uhCC8fIQEQC2vVIA5B3QkU8= X-Google-Smtp-Source: AMsMyM765pemA7LP3GGPKGAEZ4snxehIWXXseDoYmmmzhMIFFSLEBCiGTStpb6E6ujtqvUpeq7Gp3g== X-Received: by 2002:a05:6000:2a7:b0:22a:f98f:b75f with SMTP id l7-20020a05600002a700b0022af98fb75fmr6627886wry.373.1663650957809; Mon, 19 Sep 2022 22:15:57 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Message-ID: Date: Tue, 20 Sep 2022 07:15:50 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Subject: Re: [PATCH 9/9] exec/address-spaces: Inline legacy functions Content-Language: en-US To: Bernhard Beschow , qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Magnus Damm , Aleksandar Rikalo , Bandan Das , Matthew Rosato , Daniel Henrique Barboza , Sergio Lopez , Alexey Kardashevskiy , Xiaojuan Yang , Cameron Esfahani , Michael Rolnik , Song Gao , Jagannathan Raman , Greg Kurz , Kamil Rytarowski , Peter Xu , Joel Stanley , Alistair Francis , "Dr. David Alan Gilbert" , Paolo Bonzini , haxm-team@intel.com, Roman Bolshakov , Markus Armbruster , Eric Auger , David Gibson , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Christian Borntraeger , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Stefan Hajnoczi , qemu-block@nongnu.org, Eduardo Habkost , =?UTF-8?Q?Herv=c3=a9_Poussineau?= , qemu-ppc@nongnu.org, Cornelia Huck , Palmer Dabbelt , Helge Deller , Stefano Stabellini , qemu-riscv@nongnu.org, Stafford Horne , Paul Durrant , Havard Skinnemoen , Elena Ufimtseva , Alexander Graf , Thomas Huth , Alex Williamson , Wenchao Wang , Tony Krowiak , Marcel Apfelbaum , qemu-s390x@nongnu.org, =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Mark Cave-Ayland , Eric Farman , Reinoud Zandijk , Alexander Bulekov , Yanan Wang , "Edgar E. Iglesias" , Gerd Hoffmann , Tyrone Ting , xen-devel@lists.xenproject.org, Yoshinori Sato , John Snow , Richard Henderson , Darren Kenny , kvm@vger.kernel.org, Qiuhao Li , John G Johnson , Bin Meng , Sunil Muthuswamy , Max Filippov , qemu-arm@nongnu.org, Marcelo Tosatti , Peter Maydell , Anthony Perard , Andrew Jeffery , Artyom Tarasenko , Halil Pasic , "Maciej S. Szmigiero" , Jason Wang , David Hildenbrand , Laurent Vivier , Alistair Francis , Jason Herne References: <20220919231720.163121-1-shentey@gmail.com> <20220919231720.163121-10-shentey@gmail.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= In-Reply-To: <20220919231720.163121-10-shentey@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 20/9/22 01:17, Bernhard Beschow wrote: > The functions just access a global pointer and perform some pointer > arithmetic on top. Allow the compiler to see through this by inlining. I thought about this while reviewing the previous patch, ... > Signed-off-by: Bernhard Beschow > --- > include/exec/address-spaces.h | 30 ++++++++++++++++++++++++++---- > softmmu/physmem.c | 28 ---------------------------- > 2 files changed, 26 insertions(+), 32 deletions(-) > > diff --git a/include/exec/address-spaces.h b/include/exec/address-spaces.h > index b31bd8dcf0..182af27cad 100644 > --- a/include/exec/address-spaces.h > +++ b/include/exec/address-spaces.h > @@ -23,29 +23,51 @@ > > #ifndef CONFIG_USER_ONLY > > +#include "hw/boards.h" ... but I'm not a fan of including this header here. It is restricted to system emulation, but still... Let see what the others think. > /** > * Get the root memory region. This is a legacy function, provided for > * compatibility. Prefer using SysBusState::system_memory directly. > */ > -MemoryRegion *get_system_memory(void); > +inline MemoryRegion *get_system_memory(void) > +{ > + assert(current_machine); > + > + return ¤t_machine->main_system_bus.system_memory; > +} > > /** > * Get the root I/O port region. This is a legacy function, provided for > * compatibility. Prefer using SysBusState::system_io directly. > */ > -MemoryRegion *get_system_io(void); > +inline MemoryRegion *get_system_io(void) > +{ > + assert(current_machine); > + > + return ¤t_machine->main_system_bus.system_io; > +} > > /** > * Get the root memory address space. This is a legacy function, provided for > * compatibility. Prefer using SysBusState::address_space_memory directly. > */ > -AddressSpace *get_address_space_memory(void); > +inline AddressSpace *get_address_space_memory(void) > +{ > + assert(current_machine); > + > + return ¤t_machine->main_system_bus.address_space_memory; > +} > > /** > * Get the root I/O port address space. This is a legacy function, provided > * for compatibility. Prefer using SysBusState::address_space_io directly. > */ > -AddressSpace *get_address_space_io(void); > +inline AddressSpace *get_address_space_io(void) > +{ > + assert(current_machine); > + > + return ¤t_machine->main_system_bus.address_space_io; > +} > > #endif > > diff --git a/softmmu/physmem.c b/softmmu/physmem.c > index 07e9a9171c..dce088f55c 100644 > --- a/softmmu/physmem.c > +++ b/softmmu/physmem.c > @@ -2674,34 +2674,6 @@ static void memory_map_init(SysBusState *sysbus) > address_space_init(&sysbus->address_space_io, system_io, "I/O"); > } > > -MemoryRegion *get_system_memory(void) > -{ > - assert(current_machine); > - > - return ¤t_machine->main_system_bus.system_memory; > -} > - > -MemoryRegion *get_system_io(void) > -{ > - assert(current_machine); > - > - return ¤t_machine->main_system_bus.system_io; > -} > - > -AddressSpace *get_address_space_memory(void) > -{ > - assert(current_machine); > - > - return ¤t_machine->main_system_bus.address_space_memory; > -} > - > -AddressSpace *get_address_space_io(void) > -{ > - assert(current_machine); > - > - return ¤t_machine->main_system_bus.address_space_io; > -} > - > static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr, > hwaddr length) > {