From: Alan Modra <amodra@gmail.com>
To: "Martin Liška" <mliska@suse.cz>
Cc: Fangrui Song <maskray@google.com>, binutils@sourceware.org
Subject: Re: [PATCH] readelf: support zstd compressed debug sections [PR 29640]
Date: Sun, 16 Oct 2022 15:12:09 +1030 [thread overview]
Message-ID: <Y0uLoT+kABkzepCG@squeak.grove.modra.org> (raw)
In-Reply-To: <Y0lRbWe0tVzEQCwG@squeak.grove.modra.org>
On Fri, Oct 14, 2022 at 10:39:17PM +1030, Alan Modra wrote:
> On Fri, Oct 14, 2022 at 09:58:41PM +1030, Alan Modra wrote:
> > So we have a zlib-gabi .debug_info section that increases in size with
> > zstd, so much so that it's better to leave the section uncompressed.
> > Things go horribly wrong due to leaving compress_status as
> > COMPRESS_SECTION_NONE. The section is read again off disk using the
> > uncompressed size. So you get the zlib section again with some
> > garbage at the end.
> >
> > Also, if the section is to be left uncompressed, the input
> > SHF_COMPRESSED flag needs to be reset otherwise it is copied to
> > output.
> >
> > I'm not ready to commit this, just thought I'd post the results of a
> > bit of debugging.
>
> And if I'd run the testsuite before posting, I may have posted a
> better patch.. Using COMPRESS_SECTION_DONE led to .debug -> .zdebug
> renaming of sections, so it appears we want another compress_status
> that says the final section contents are in sec->contents.
Another compress_status isn't elegant. I'm about to commit this:
* bfd.c (bfd_convert_section_contents): Handle zstd.
* compress.c (bfd_compress_section_contents): When section
contents are uncompressed set SEC_IN_MEMORY flag,
compress_status to COMRESS_SECTION_NONE, and clear
SHF_COMPRESSED. Set SEC_IN_MEMORY for compressed contents.
(bfd_get_full_section_contents): Don't check section size
against file size when SEC_IN_MEMORY.
(bfd_cache_section_contents): Delete function.
* elf32-arm.c (elf32_arm_get_synthetic_symtab): Expand
bfd_cache_section_contents here.
* bfd-in2.h: Regenerate.
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 25e1806e689..534a46439fc 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -7964,9 +7964,6 @@ bfd_byte *bfd_simple_get_relocated_section_contents
bool bfd_get_full_section_contents
(bfd *abfd, asection *section, bfd_byte **ptr);
-void bfd_cache_section_contents
- (asection *sec, void *contents);
-
bool bfd_is_section_compressed_info
(bfd *abfd, asection *section,
int *compression_header_size_p,
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 5f2033bee7a..4fca8250082 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -2801,14 +2801,14 @@ bfd_convert_section_contents (bfd *ibfd, sec_ptr isec, bfd *obfd,
if (ohdr_size == sizeof (Elf32_External_Chdr))
{
Elf32_External_Chdr *echdr = (Elf32_External_Chdr *) contents;
- bfd_put_32 (obfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
+ bfd_put_32 (obfd, chdr.ch_type, &echdr->ch_type);
bfd_put_32 (obfd, chdr.ch_size, &echdr->ch_size);
bfd_put_32 (obfd, chdr.ch_addralign, &echdr->ch_addralign);
}
else
{
Elf64_External_Chdr *echdr = (Elf64_External_Chdr *) contents;
- bfd_put_32 (obfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
+ bfd_put_32 (obfd, chdr.ch_type, &echdr->ch_type);
bfd_put_32 (obfd, 0, &echdr->ch_reserved);
bfd_put_64 (obfd, chdr.ch_size, &echdr->ch_size);
bfd_put_64 (obfd, chdr.ch_addralign, &echdr->ch_addralign);
diff --git a/bfd/compress.c b/bfd/compress.c
index 364df14142b..9608a0a6341 100644
--- a/bfd/compress.c
+++ b/bfd/compress.c
@@ -151,7 +151,8 @@ bfd_compress_section_contents (bfd *abfd, sec_ptr sec)
free (input_buffer);
bfd_set_section_alignment (sec, uncompressed_alignment_pow);
sec->contents = buffer;
- sec->compress_status = COMPRESS_SECTION_DONE;
+ sec->flags |= SEC_IN_MEMORY;
+ sec->compress_status = COMPRESS_SECTION_NONE;
sec->size = uncompressed_size;
input_buffer = buffer;
}
@@ -206,6 +207,7 @@ bfd_compress_section_contents (bfd *abfd, sec_ptr sec)
if (compressed_size >= uncompressed_size)
{
memcpy (buffer, input_buffer, uncompressed_size);
+ elf_section_flags (sec) &= ~SHF_COMPRESSED;
sec->compress_status = COMPRESS_SECTION_NONE;
}
else
@@ -216,6 +218,7 @@ bfd_compress_section_contents (bfd *abfd, sec_ptr sec)
sec->compress_status = COMPRESS_SECTION_DONE;
}
sec->contents = buffer;
+ sec->flags |= SEC_IN_MEMORY;
free (input_buffer);
return uncompressed_size;
}
@@ -268,6 +271,7 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr)
ufile_ptr filesize = bfd_get_file_size (abfd);
if (filesize > 0
&& filesize < sz
+ && (bfd_section_flags (sec) & SEC_IN_MEMORY) == 0
/* PR 24753: Linker created sections can be larger than
the file size, eg if they are being used to hold stubs. */
&& (bfd_section_flags (sec) & SEC_LINKER_CREATED) == 0
@@ -380,29 +384,6 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr)
}
}
-/*
-FUNCTION
- bfd_cache_section_contents
-
-SYNOPSIS
- void bfd_cache_section_contents
- (asection *sec, void *contents);
-
-DESCRIPTION
- Stash @var(contents) so any following reads of @var(sec) do
- not need to decompress again.
-*/
-
-void
-bfd_cache_section_contents (asection *sec, void *contents)
-{
- if (sec->compress_status == DECOMPRESS_SECTION_ZLIB
- || sec->compress_status == DECOMPRESS_SECTION_ZSTD)
- sec->compress_status = COMPRESS_SECTION_DONE;
- sec->contents = contents;
- sec->flags |= SEC_IN_MEMORY;
-}
-
/*
FUNCTION
bfd_is_section_compressed_info
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 0852b38ae4c..ec18a8ab362 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -20020,9 +20020,11 @@ elf32_arm_get_synthetic_symtab (bfd *abfd,
data = plt->contents;
if (data == NULL)
{
- if (!bfd_get_full_section_contents (abfd, (asection *) plt, &data) || data == NULL)
+ if (!bfd_get_full_section_contents (abfd, plt, &data)
+ || data == NULL)
return -1;
- bfd_cache_section_contents ((asection *) plt, data);
+ plt->contents = data;
+ plt->flags |= SEC_IN_MEMORY;
}
count = relplt->size / hdr->sh_entsize;
--
Alan Modra
Australia Development Lab, IBM
next prev parent reply other threads:[~2022-10-16 4:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-01 6:20 Fangrui Song
2022-10-06 2:20 ` Fangrui Song
2022-10-20 8:04 ` Martin Liška
2022-10-20 8:05 ` Martin Liška
2022-10-13 11:38 ` Martin Liška
2022-10-14 3:35 ` Fangrui Song
2022-10-14 7:47 ` Martin Liška
2022-10-14 8:26 ` Martin Liška
2022-10-14 11:28 ` Alan Modra
2022-10-14 12:09 ` Alan Modra
2022-10-16 4:42 ` Alan Modra [this message]
2022-10-16 20:46 ` Fangrui Song
2022-10-21 9:16 ` Alan Modra
2022-10-17 7:52 ` Martin Liška
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y0uLoT+kABkzepCG@squeak.grove.modra.org \
--to=amodra@gmail.com \
--cc=binutils@sourceware.org \
--cc=maskray@google.com \
--cc=mliska@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).