From patchwork Wed Oct 23 15:45:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 177334 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp1008660ill; Wed, 23 Oct 2019 10:07:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwrkTaEjvtqYDjy52/99tCt1cVOyZ8ZKa32hpSQ/kPeKatRyY1KZ/mL9J0+BGTcJ6CTphPz X-Received: by 2002:a05:6402:1acd:: with SMTP id ba13mr21112261edb.141.1571850437373; Wed, 23 Oct 2019 10:07:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571850437; cv=none; d=google.com; s=arc-20160816; b=JwFKh9EfzJ2hUe/SYZkXEHxKStDv4MuBP4ceWvtpO9KiUuNwMw7aLh6OrfIdlihhmO B1ssYBCZ//SsIhqs8zspn8P3gY10fmEXtpI4FRO4Ta4JJqbBuWZgF4G1nLVsk+infzOz BN4UVNPdtjJLq+Cid3rt3jAM7t/NlKVtDVPE/FOOK/uKUl00M0YPOxy4gb0dogfqo1Vs LxLXOpOsltd+Ce/FSUQjW/6vYVzkP9lpK17+j9P6hNxUery5p+kNEKNdwEGd5/pQ6vxl 0DrpLWBl73N0WkU7gZQ/0ER7PNOWu7J6H/qqEkFPF31534HCeRmcB8i+rkg2yVqg6BYO 8Qzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=GvLqP4YBrj+nrlStAyuwbfcMGIRPPiTu+vJ+23TQgAw=; b=wyY120PUynzWkjujqL8CXA2Tt86dZrYnCEhRLobK8buLMKK2Ux6jTFKgvX/9VFzIUa XfyCMjUt6E6AjoCgTWBe2RPXQzMQ7v0ZP7RH+cgKOOwl8HE7oQDZv+/KRprj7B7IAhOL 6Uh1kM05Y/3oC/q7rp5VgGjWZU4qumJJm9RzhS2bDvd1QQsqp7NWcIkLX2vaylf3vefC Cva3XQKrYV8M5CfZnHCuGDJ0skJNfJmvW9CiV1WtCRQWSUh2j8vRmqhkV4W8b8H+/Ub2 I7nkqjDmnV0LZ6XkIQnj+2mMBPFhnuiES3ErbUCAKdbeJ+SFmBSxa2TMKBAK5orAemth a2/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aEmAmX23; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h56si2743369edh.363.2019.10.23.10.07.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Oct 2019 10:07:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aEmAmX23; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNK6N-0005fM-Je for patch@linaro.org; Wed, 23 Oct 2019 13:07:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42577) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNIp4-0004mb-PT for qemu-devel@nongnu.org; Wed, 23 Oct 2019 11:45:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNIp2-0005Z8-Un for qemu-devel@nongnu.org; Wed, 23 Oct 2019 11:45:18 -0400 Received: from mail-qt1-x843.google.com ([2607:f8b0:4864:20::843]:42859) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNIp1-0005R8-1L for qemu-devel@nongnu.org; Wed, 23 Oct 2019 11:45:15 -0400 Received: by mail-qt1-x843.google.com with SMTP id w14so32933492qto.9 for ; Wed, 23 Oct 2019 08:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GvLqP4YBrj+nrlStAyuwbfcMGIRPPiTu+vJ+23TQgAw=; b=aEmAmX23InlnUT2icHg3aEvWcd49dzoz4tbuKp+wnSiTzBvcUrDLYrPrMHv9kwvBoR b9WlmgYjlZNXvCaej6FvgZSEcjkfVLvTg0I2djVAFWAo0wCkqt0x/I/MGRu5n0mKdczy EgPCoqsGfSzTt6VKsxkEkJndlPDk6k+3KNgacLCS2Ybu495vzIGN4JYK05cRLjoQZ76+ cNKnvW5Q21wIaLH1lFYI589K+Sx2g3Eq9EJ68KivWEP/s/pI9xrm6vTjbjMKjlnm7zjK G/5Nh2kpQH5y7DvVUzICh0Vt4VXFkQV0U2P63J1fm3dAzE8v/SkuOHN0HXK/YHErMhkM vuug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GvLqP4YBrj+nrlStAyuwbfcMGIRPPiTu+vJ+23TQgAw=; b=bsiBlAs5Cc30BerFvt6cBckN5g5tX5K61GIRRkUDZAxC4GCXk9wW+IsujyEOIkSvU/ WfNSplOqd1SHGK5u+AxAYZvyn43sPN+Vw+dY57VCxxThbSI2o9kWc0VnZ18wIIJXTrw+ E/y66wF4tO1NSfsL8SJmOF+BEW13bsdhgc1mc4tvsqZmm19j6QzdxUZU1XrCvu33UDiv nv0Va0ntohc8F2iNSq/YM2nJycx5iKmDCZ4cnGGJ2k8KHqzPVsDNQgQxLrYE2kJHLQlI cnPwvULRxcpHnKjinb77md85PFRnj6ST51M8V9toFHatcFT9fxORhu4RHD8vqVAl0UWT ltnw== X-Gm-Message-State: APjAAAVIWCbhcTswvbxCXC/zL6hqs4Xc4fnK+iXDbAuBqNXO1x5F/ROr lxmPEcM6XDWjaw7d+8MnzrksswKVnZk= X-Received: by 2002:aed:2687:: with SMTP id q7mr9746711qtd.382.1571845512179; Wed, 23 Oct 2019 08:45:12 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-50.nyc.biz.rr.com. [172.254.253.50]) by smtp.gmail.com with ESMTPSA id o1sm2456272qtb.82.2019.10.23.08.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 08:45:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 4/7] exec: Use const alias for TARGET_PAGE_BITS_VARY Date: Wed, 23 Oct 2019 11:45:02 -0400 Message-Id: <20191023154505.30521-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191023154505.30521-1-richard.henderson@linaro.org> References: <20191023154505.30521-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::843 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: pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Using a variable that is declared "const" for this tells the compiler that it may read the value once and assume that it does not change across function calls. For target_page_size, this means we have only one assert per function, and one read of the variable. This reduces the size of qemu-system-aarch64 by 8k. Reviewed-by: Paolo Bonzini Signed-off-by: Richard Henderson --- v2: Notice CONFIG_ATTRIBUTE_ALIAS, and work around Xcode 9 lossage. --- include/exec/cpu-all.h | 14 +++++++--- exec-vary.c | 60 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 12 deletions(-) -- 2.17.1 Reviewed-by: Alex Bennée diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 255bb186ac..76515dc8d9 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -210,10 +210,16 @@ static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val /* page related stuff */ #ifdef TARGET_PAGE_BITS_VARY -extern bool target_page_bits_decided; -extern int target_page_bits; -#define TARGET_PAGE_BITS ({ assert(target_page_bits_decided); \ - target_page_bits; }) +typedef struct { + bool decided; + int bits; +} TargetPageBits; +# if defined(CONFIG_ATTRIBUTE_ALIAS) || !defined(IN_EXEC_VARY) +extern const TargetPageBits target_page; +#else +extern TargetPageBits target_page; +# endif +#define TARGET_PAGE_BITS (assert(target_page.decided), target_page.bits) #else #define TARGET_PAGE_BITS_MIN TARGET_PAGE_BITS #endif diff --git a/exec-vary.c b/exec-vary.c index 48c0ab306c..e0befd502a 100644 --- a/exec-vary.c +++ b/exec-vary.c @@ -19,11 +19,55 @@ #include "qemu/osdep.h" #include "qemu-common.h" + +#define IN_EXEC_VARY 1 + #include "exec/exec-all.h" #ifdef TARGET_PAGE_BITS_VARY -int target_page_bits; -bool target_page_bits_decided; +# ifdef CONFIG_ATTRIBUTE_ALIAS +/* + * We want to declare the "target_page" variable as const, which tells + * the compiler that it can cache any value that it reads across calls. + * This avoids multiple assertions and multiple reads within any one user. + * + * This works because we initialize the target_page data very early, in a + * location far removed from the functions that require the final results. + * + * This also requires that we have a non-constant symbol by which we can + * perform the actual initialization, and which forces the data to be + * allocated within writable memory. Thus "init_target_page", and we use + * that symbol exclusively in the two functions that initialize this value. + * + * The "target_page" symbol is created as an alias of "init_target_page". + */ +static TargetPageBits init_target_page; + +/* + * Note that this is *not* a redundant decl, this is the definition of + * the "target_page" symbol. The syntax for this definition requires + * the use of the extern keyword. This seems to be a GCC bug in + * either the syntax for the alias attribute or in -Wredundant-decls. + * + * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91765 + */ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wredundant-decls" + +extern const TargetPageBits target_page + __attribute__((alias("init_target_page"))); + +# pragma GCC diagnostic pop +# else +/* + * When aliases are not supported then we force two different declarations, + * by way of suppressing the header declaration with IN_EXEC_VARY. + * We assume that on such an old compiler, LTO cannot be used, and so the + * compiler cannot not detect the mismatched declarations, and all is well. + */ +TargetPageBits target_page; +# define init_target_page target_page +# endif #endif bool set_preferred_target_page_bits(int bits) @@ -36,11 +80,11 @@ bool set_preferred_target_page_bits(int bits) */ #ifdef TARGET_PAGE_BITS_VARY assert(bits >= TARGET_PAGE_BITS_MIN); - if (target_page_bits == 0 || target_page_bits > bits) { - if (target_page_bits_decided) { + if (init_target_page.bits == 0 || init_target_page.bits > bits) { + if (init_target_page.decided) { return false; } - target_page_bits = bits; + init_target_page.bits = bits; } #endif return true; @@ -49,9 +93,9 @@ bool set_preferred_target_page_bits(int bits) void finalize_target_page_bits(void) { #ifdef TARGET_PAGE_BITS_VARY - if (target_page_bits == 0) { - target_page_bits = TARGET_PAGE_BITS_MIN; + if (init_target_page.bits == 0) { + init_target_page.bits = TARGET_PAGE_BITS_MIN; } - target_page_bits_decided = true; + init_target_page.decided = true; #endif }