Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 20 Oct 2021 10:30:37 +0200
From:   Peter Zijlstra <peterz@infradead.org>
To:     Josh Poimboeuf <jpoimboe@redhat.com>
Cc:     x86@kernel.org, andrew.cooper3@citrix.com,
        linux-kernel@vger.kernel.org, alexei.starovoitov@gmail.com,
        ndesaulniers@google.com
Subject: Re: [PATCH 4/9] x86/alternative: Implement .retpoline_sites support
Message-ID: <YW/TrQ4MFjz8yTWC@hirez.programming.kicks-ass.net>
References: <20211013122217.304265366@infradead.org>
 <20211013123645.002402102@infradead.org>
 <20211013205259.44cvvaxiexiff5w5@treble>
 <YW6t5catO1mx+eCZ@hirez.programming.kicks-ass.net>
 <20211019164659.dybir4wgfmdt4r47@treble>
 <20211019164913.2dsyyethdeblqjlq@treble>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211019164913.2dsyyethdeblqjlq@treble>
Precedence: bulk

On Tue, Oct 19, 2021 at 09:49:13AM -0700, Josh Poimboeuf wrote:

> @@ -1087,9 +1109,7 @@ static int add_jump_destinations(struct objtool_file *file)
>  			else
>  				insn->type = INSN_JUMP_DYNAMIC_CONDITIONAL;
>  
> -			list_add_tail(&insn->call_node,
> -				      &file->retpoline_call_list);
> -
> +			add_call_dest(file, insn, reloc->sym, true);
>  			insn->retpoline_safe = true;
>  			continue;
>  		} else if (insn->func) {
> @@ -1218,20 +1238,14 @@ static int add_call_destinations(struct objtool_file *file)
>  
>  			add_call_dest(file, insn, dest, false);
>  
> -		} else if (arch_is_retpoline(reloc->sym)) {
> +		} else if (reloc->sym->retpoline) {
>  			/*
>  			 * Retpoline calls are really dynamic calls in
>  			 * disguise, so convert them accordingly.
>  			 */
>  			insn->type = INSN_CALL_DYNAMIC;
> +			add_call_dest(file, insn, reloc->sym, false);
>  			insn->retpoline_safe = true;
> -
> -			list_add_tail(&insn->call_node,
> -				      &file->retpoline_call_list);
> -
> -			remove_insn_ops(insn);
> -			continue;
> -
>  		} else
>  			add_call_dest(file, insn, reloc->sym, false);
>  	}

So the problem with add_call_dest() like this, is that the instructions
now get to have ->call_dest set, which is really strange for
INSN_CALL_DYNAMIC etc.. At the very least it makes call_dest_name()
misbehave.

I've added add_retpoline_call() that also does the ->type frobbing and
->retpoline_safe marking instead.