linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: x86@kernel.org, jgross@suse.com, mbenes@suze.cz,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 5/9] objtool: Rework rebuild_reloc logic
Date: Tue, 16 Mar 2021 22:34:17 -0500	[thread overview]
Message-ID: <20210317033417.lbwemc2j2cpsdlzd@treble> (raw)
In-Reply-To: <20210312171653.649709484@infradead.org>

On Fri, Mar 12, 2021 at 06:16:18PM +0100, Peter Zijlstra wrote:
> --- a/tools/objtool/elf.c
> +++ b/tools/objtool/elf.c
> @@ -479,6 +479,8 @@ void elf_add_reloc(struct elf *elf, stru
>  
>  	list_add_tail(&reloc->list, &sec->reloc_list);
>  	elf_hash_add(elf->reloc_hash, &reloc->hash, reloc_hash(reloc));
> +
> +	sec->rereloc = true;
>  }

Can we just reuse sec->changed for this?  Something like this on top
(untested of course):

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index addcec88ac9f..b9cb74a54681 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -480,7 +480,7 @@ void elf_add_reloc(struct elf *elf, struct reloc *reloc)
 	list_add_tail(&reloc->list, &sec->reloc_list);
 	elf_hash_add(elf->reloc_hash, &reloc->hash, reloc_hash(reloc));
 
-	sec->rereloc = true;
+	sec->changed = true;
 }
 
 static int read_rel_reloc(struct section *sec, int i, struct reloc *reloc, unsigned int *symndx)
@@ -882,9 +882,6 @@ int elf_rebuild_reloc_section(struct elf *elf, struct section *sec)
 	struct reloc *reloc;
 	int nr;
 
-	sec->changed = true;
-	elf->changed = true;
-
 	nr = 0;
 	list_for_each_entry(reloc, &sec->reloc_list, list)
 		nr++;
@@ -894,8 +891,6 @@ int elf_rebuild_reloc_section(struct elf *elf, struct section *sec)
 	case SHT_RELA: return elf_rebuild_rela_reloc_section(sec, nr);
 	default:       return -1;
 	}
-
-	sec->rereloc = false;
 }
 
 int elf_write_insn(struct elf *elf, struct section *sec,
@@ -950,14 +945,15 @@ int elf_write(struct elf *elf)
 	struct section *sec;
 	Elf_Scn *s;
 
-	list_for_each_entry(sec, &elf->sections, list) {
-		if (sec->reloc && sec->reloc->rereloc)
-			elf_rebuild_reloc_section(elf, sec->reloc);
-	}
-
-	/* Update section headers for changed sections: */
+	/* Update changed relocation sections and section headers: */
 	list_for_each_entry(sec, &elf->sections, list) {
 		if (sec->changed) {
+			if (sec->reloc &&
+			    elf_rebuild_reloc_section(elf, sec->reloc)) {
+				WARN_ELF("elf_rebuild_reloc_section");
+				return -1;
+			}
+
 			s = elf_getscn(elf->elf, sec->idx);
 			if (!s) {
 				WARN_ELF("elf_getscn");
@@ -969,6 +965,7 @@ int elf_write(struct elf *elf)
 			}
 
 			sec->changed = false;
+			elf->changed = true;
 		}
 	}
 
diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h
index 9fdd4c5f9f32..e6890cc70a25 100644
--- a/tools/objtool/include/objtool/elf.h
+++ b/tools/objtool/include/objtool/elf.h
@@ -39,7 +39,7 @@ struct section {
 	char *name;
 	int idx;
 	unsigned int len;
-	bool changed, text, rodata, noinstr, rereloc;
+	bool changed, text, rodata, noinstr;
 };
 
 struct symbol {


  reply	other threads:[~2021-03-17  3:35 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-12 17:16 [PATCH 0/9] x86,objtool: Optimize !RETPOLINE Peter Zijlstra
2021-03-12 17:16 ` [PATCH 1/9] x86/retpoline: Simplify retpolines Peter Zijlstra
2021-03-12 17:16 ` [PATCH 2/9] objtool: Correctly handle retpoline thunk calls Peter Zijlstra
2021-03-16 21:19   ` Josh Poimboeuf
2021-03-12 17:16 ` [PATCH 3/9] objtool: Per arch retpoline naming Peter Zijlstra
2021-03-12 17:16 ` [PATCH 4/9] objtool: Fix static_call list generation Peter Zijlstra
2021-03-17  3:18   ` Josh Poimboeuf
2021-03-12 17:16 ` [PATCH 5/9] objtool: Rework rebuild_reloc logic Peter Zijlstra
2021-03-17  3:34   ` Josh Poimboeuf [this message]
2021-03-17  8:12     ` Peter Zijlstra
2021-03-18  0:49       ` Josh Poimboeuf
2021-03-18 12:57         ` Peter Zijlstra
2021-03-18 16:36           ` Josh Poimboeuf
2021-03-18 17:04             ` Peter Zijlstra
2021-03-18 17:38               ` Josh Poimboeuf
2021-03-19  0:19                 ` Josh Poimboeuf
2021-03-19  9:22                 ` Peter Zijlstra
2021-03-19 15:15                   ` Josh Poimboeuf
2021-03-12 17:16 ` [PATCH 6/9] objtool: Add elf_create_undef_symbol() Peter Zijlstra
2021-03-17 13:52   ` Miroslav Benes
2021-03-17 14:13     ` Peter Zijlstra
2021-03-17 14:39       ` Miroslav Benes
2021-03-17 15:08         ` Sami Tolvanen
2021-03-18  0:46       ` Josh Poimboeuf
2021-03-18  7:56         ` Peter Zijlstra
2021-03-12 17:16 ` [PATCH 7/9] objtool: Allow archs to rewrite retpolines Peter Zijlstra
2021-03-12 17:16 ` [PATCH 8/9] objtool: Skip magical retpoline .altinstr_replacement Peter Zijlstra
2021-03-12 17:16 ` [PATCH 9/9] objtool,x86: Rewrite retpoline thunk calls Peter Zijlstra

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=20210317033417.lbwemc2j2cpsdlzd@treble \
    --to=jpoimboe@redhat.com \
    --cc=jgross@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mbenes@suze.cz \
    --cc=peterz@infradead.org \
    --cc=x86@kernel.org \
    /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 NNTP newsgroup(s).