From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id 8321F3857C46 for ; Wed, 6 Mar 2024 20:47:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8321F3857C46 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8321F3857C46 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::632 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709758066; cv=none; b=r4pMV/2+pZXNB981kGXV5OsVHkWlUYa8C+0n/MdzSpoUUTV4pG4g93yaCc6y/lEky1TBVmt2jtYwZIfeqyfk/3lLk3IDtIQuEnedGxSOiJGlWgfRSazL/wENtdaUtIfqOJ1XgQ4U4UWx/NFgtlaXAEGnYZf1/mzmnVzT2OCcEKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709758066; c=relaxed/simple; bh=JQ2XngE9UNEH9uwBhIYYSdK+cj+7mf6f8smbXv1UkOI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=N9PIuhnj+geotMG53WA/Fj1F46nXzMecE7k9batmCvksisu+K6TgT9drPuqOhN1LDFyDkWyIAjLe24h7cHa7k5m96uAYt52rT2+VOybldzvOhE1gT8KmG2/gGyr9BKsHlSEjG+x+JEv9irwhI5czG6TlglXnseV/756gXlB8/tU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1dc49b00bdbso1255915ad.3 for ; Wed, 06 Mar 2024 12:47:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709758057; x=1710362857; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=edhaBk6CZaUIonBJK7Pz9G2gEsrFhSW0JR5zDlCHjdE=; b=ZDYyAk0F7lgLl/QlrWmj3gFAMKjTfpeunpw29XngoVXzeGr9hsjop8X2n2ckd9n+Zo dLpDgRElrFMtZxYw2MV7kUxQOBGCLwiFGw4n++3jhQL+OpJGU0TDaJXjI4waOpuOYAFB WSzN+O4Mw7PLx7iHIU6VUWe1noCyCzk8UtZmoRgAIjDkMTNyb96ixWH7luISasQROdmn Q+hXqVfkRnzSt9F65AzGkBBG49A83RQtCq3CV7bucmA02/uNPyA1RbCc30GlJUF2hSAF vPQ+c+W1Vpkl2uzCCFJfcNotsbwSjKidRHoE/FC1Ngzq3Km3WlQoRxv00KeCPMy+5vRo 9irg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709758057; x=1710362857; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=edhaBk6CZaUIonBJK7Pz9G2gEsrFhSW0JR5zDlCHjdE=; b=iQXZGjs21J2HEoBIgfkE5b8BHsk/IDd+6tWY5cJGaq6yDgKFJZoiyKPmkpWpFjJwXF Yf10q81jdYnS6BEe4wLZFsIRL5TYzoIUwd4cs4VV2az+tboTdjMKYPi/64f0O9goe3KI 9PUDQ9JENg459i/MonuacqRFpdjzkhid83QAQk59JTWSKhptLYXzfWWodfa/vAMCRFQp Y5CByUvhuae62OP7pCYZo6iK0lwXZg/QcxzZ3Db+CEhmlgeXanOi8btF7DsKFOrCDKup jDvxO0Ey5lzJJgPMIUbWhKZYwy4EcCy5Gq8pE6ku7nBEahRZ8X1NQTEtwkn0lysWY4nb I2hQ== X-Gm-Message-State: AOJu0YyJQjBZmPtlZeBhfXv8YUNKH6SnZt9SjRBmhHf/C8kvDSMvlwFn YSssBN6tE6PeUQgSRXPoM8Ebe683DZ798AyKkhrOxLuq/yJRsYia X-Google-Smtp-Source: AGHT+IEXoCX/+f490yNeGSv9L4igCETri0uweQ2jbW8EVCIM5s7vARj56lc2oA91XRsWR2b29UHJOQ== X-Received: by 2002:a17:902:f802:b0:1d9:9c96:673c with SMTP id ix2-20020a170902f80200b001d99c96673cmr5460156plb.46.1709758057429; Wed, 06 Mar 2024 12:47:37 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.58.89.72]) by smtp.gmail.com with ESMTPSA id f14-20020a170902684e00b001dd47b663ebsm303079pln.80.2024.03.06.12.47.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 12:47:35 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id DABC07406D7; Wed, 6 Mar 2024 12:47:31 -0800 (PST) From: "H.J. Lu" To: binutils@sourceware.org Cc: goldstein.w.n@gmail.com, amodra@gmail.com Subject: [PATCH v3 6/6] elf: Don't cache symbol nor relocation tables with mmap Date: Wed, 6 Mar 2024 12:47:31 -0800 Message-ID: <20240306204731.1098405-7-hjl.tools@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240306204731.1098405-1-hjl.tools@gmail.com> References: <20240306204731.1098405-1-hjl.tools@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3019.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_ABUSEAT,RCVD_IN_DNSWL_NONE,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: During a "-j 8" LLVM 17 debug build on a machine with 32GB RAM and 16GB swap, ld was killed by kernel because of out of memory: [79437.949336] oom-kill:constraint=CONSTRAINT_NONE,nodemask=(null),cpuset=/,mems_allowed=0,global_oom,task_memcg=/user.slice/user-1000.slice/session-9.scope,task=ld,pid=797431,uid=1000 [79437.949349] Out of memory: Killed process 797431 (ld) total-vm:9219600kB, anon-rss:6558156kB, file-rss:1792kB, shmem-rss:0kB, UID:1000 pgtables:17552kB oom_score_adj:0 Don't cache symbol nor relocation tables if they are mapped in. Data to link the 3.5GB clang executable in LLVM 17 debug build on Linux/x86-64 with 32GB RAM is: stdio mmap improvement user 86.73 87.02 -0.3% system 9.55 9.21 3.6% total 100.40 97.66 0.7% maximum set(GB) 17.34 13.14 24% page faults 4047667 3042877 25% and data to link the 275M cc1plus executable in GCC 14 stage 1 build is: user 5.41 5.44 -0.5% system 0.80 0.76 5% total 6.25 6.26 -0.2% maximum set(MB) 1323 968 27% page faults 323451 236371 27% These improve the overall system performance for parallel build by reducing memory usage and page faults. Also rename _bfd_link_keep_memory to _bfd_elf_link_keep_memory. * elf-bfd.h (_bfd_elf_link_keep_memory): New. * elf32-i386.c (elf_i386_scan_relocs): Replace _bfd_link_keep_memory with _bfd_elf_link_keep_memory. * elf64-x86-64.c (elf_x86_64_scan_relocs): Likewise. * elflink.c (_bfd_elf_link_iterate_on_relocs): Likewise. (elf_link_add_object_symbols): Likewise. (init_reloc_cookie): Likewise. (_bfd_elf_link_keep_memory): New. * libbfd-in.h (_bfd_link_keep_memory): Removed. * linker.c (_bfd_link_keep_memory): Likewise. * libbfd.h: Regenerated. --- bfd/elf-bfd.h | 3 +++ bfd/elf32-i386.c | 2 +- bfd/elf64-x86-64.c | 2 +- bfd/elflink.c | 62 +++++++++++++++++++++++++++++++++++++--------- bfd/libbfd-in.h | 3 --- bfd/libbfd.h | 3 --- bfd/linker.c | 35 -------------------------- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index da7c5208017..6ed6f13cba2 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -3144,6 +3144,9 @@ extern bool _bfd_elf_mmap_section extern void _bfd_elf_munmap_section_contents (asection *, void *); +extern bool _bfd_elf_link_keep_memory + (struct bfd_link_info *); + /* Large common section. */ extern asection _bfd_elf_large_com_section; diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 8aa1533d0ba..606e38b472c 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -1932,7 +1932,7 @@ elf_i386_scan_relocs (bfd *abfd, if (elf_section_data (sec)->this_hdr.contents != contents) { - if (!converted && !_bfd_link_keep_memory (info)) + if (!converted && !_bfd_elf_link_keep_memory (info)) _bfd_elf_munmap_section_contents (sec, contents); else { diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index f1e06040a5a..e52fa932ffc 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2590,7 +2590,7 @@ elf_x86_64_scan_relocs (bfd *abfd, struct bfd_link_info *info, if (elf_section_data (sec)->this_hdr.contents != contents) { - if (!converted && !_bfd_link_keep_memory (info)) + if (!converted && !_bfd_elf_link_keep_memory (info)) _bfd_elf_munmap_section_contents (sec, contents); else { diff --git a/bfd/elflink.c b/bfd/elflink.c index 4602fb3d10f..019d033805d 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -4205,10 +4205,9 @@ _bfd_elf_link_iterate_on_relocs || bfd_is_abs_section (o->output_section)) continue; - internal_relocs = _bfd_elf_link_info_read_relocs (abfd, info, - o, NULL, - NULL, - _bfd_link_keep_memory (info)); + internal_relocs = _bfd_elf_link_info_read_relocs + (abfd, info, o, NULL, NULL, + _bfd_elf_link_keep_memory (info)); if (internal_relocs == NULL) return false; @@ -5574,10 +5573,9 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) && (s->flags & SEC_DEBUGGING) != 0)) continue; - internal_relocs = _bfd_elf_link_info_read_relocs (abfd, info, - s, NULL, - NULL, - _bfd_link_keep_memory (info)); + internal_relocs = _bfd_elf_link_info_read_relocs + (abfd, info, s, NULL, NULL, + _bfd_elf_link_keep_memory (info)); if (internal_relocs == NULL) goto error_free_vers; @@ -13630,7 +13628,7 @@ init_reloc_cookie (struct elf_reloc_cookie *cookie, info->callbacks->einfo (_("%P%X: can not read symbols: %E\n")); return false; } - if (_bfd_link_keep_memory (info) ) + if (_bfd_elf_link_keep_memory (info) ) { symtab_hdr->contents = (bfd_byte *) cookie->locsyms; info->cache_size += (cookie->locsymcount @@ -13667,9 +13665,9 @@ init_reloc_cookie_rels (struct elf_reloc_cookie *cookie, } else { - cookie->rels = _bfd_elf_link_info_read_relocs (abfd, info, sec, - NULL, NULL, - _bfd_link_keep_memory (info)); + cookie->rels = _bfd_elf_link_info_read_relocs + (abfd, info, sec, NULL, NULL, + _bfd_elf_link_keep_memory (info)); if (cookie->rels == NULL) return false; cookie->rel = cookie->rels; @@ -15599,3 +15597,43 @@ _bfd_elf_add_dynamic_tags (bfd *output_bfd, struct bfd_link_info *info, return true; } + +/* Return false if linker should avoid caching relocation information + and symbol tables of input files in memory. */ + +bool +_bfd_elf_link_keep_memory (struct bfd_link_info *info ATTRIBUTE_UNUSED) +{ +#ifdef USE_MMAP + /* Don't cache symbol nor relocation tables if they are mapped in. */ + return false; +#else + bfd *abfd; + bfd_size_type size; + + if (!info->keep_memory) + return false; + + if (info->max_cache_size == (bfd_size_type) -1) + return true; + + abfd = info->input_bfds; + size = info->cache_size; + do + { + if (size >= info->max_cache_size) + { + /* Over the limit. Reduce the memory usage. */ + info->keep_memory = false; + return false; + } + if (!abfd) + break; + size += abfd->alloc_size; + abfd = abfd->link.next; + } + while (1); + + return true; +#endif +} diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index effe1b86b53..f89de00b551 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -848,9 +848,6 @@ extern bfd_byte * _bfd_write_unsigned_leb128 extern struct bfd_link_info *_bfd_get_link_info (bfd *) ATTRIBUTE_HIDDEN; -extern bool _bfd_link_keep_memory (struct bfd_link_info *) - ATTRIBUTE_HIDDEN; - extern uintptr_t _bfd_pagesize ATTRIBUTE_HIDDEN; extern uintptr_t _bfd_pagesize_m1 ATTRIBUTE_HIDDEN; extern uintptr_t _bfd_minimum_mmap_size ATTRIBUTE_HIDDEN; diff --git a/bfd/libbfd.h b/bfd/libbfd.h index c80f5a86ed1..3ed2e55a34b 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -854,9 +854,6 @@ extern bfd_byte * _bfd_write_unsigned_leb128 extern struct bfd_link_info *_bfd_get_link_info (bfd *) ATTRIBUTE_HIDDEN; -extern bool _bfd_link_keep_memory (struct bfd_link_info *) - ATTRIBUTE_HIDDEN; - extern uintptr_t _bfd_pagesize ATTRIBUTE_HIDDEN; extern uintptr_t _bfd_pagesize_m1 ATTRIBUTE_HIDDEN; extern uintptr_t _bfd_minimum_mmap_size ATTRIBUTE_HIDDEN; diff --git a/bfd/linker.c b/bfd/linker.c index 36cca9624c2..eb42a78b622 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -3556,38 +3556,3 @@ _bfd_nolink_bfd_define_start_stop (struct bfd_link_info *info ATTRIBUTE_UNUSED, { return (struct bfd_link_hash_entry *) _bfd_ptr_bfd_null_error (sec->owner); } - -/* Return false if linker should avoid caching relocation infomation - and symbol tables of input files in memory. */ - -bool -_bfd_link_keep_memory (struct bfd_link_info * info) -{ - bfd *abfd; - bfd_size_type size; - - if (!info->keep_memory) - return false; - - if (info->max_cache_size == (bfd_size_type) -1) - return true; - - abfd = info->input_bfds; - size = info->cache_size; - do - { - if (size >= info->max_cache_size) - { - /* Over the limit. Reduce the memory usage. */ - info->keep_memory = false; - return false; - } - if (!abfd) - break; - size += abfd->alloc_size; - abfd = abfd->link.next; - } - while (1); - - return true; -} -- 2.44.0