From mboxrd@z Thu Jan  1 00:00:00 1970
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1750862AbeAOSet (ORCPT <rfc822;ralf@linux-mips.org> + 1 other);
        Mon, 15 Jan 2018 13:34:49 -0500
Received: from mx1.redhat.com ([209.132.183.28]:58704 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750704AbeAOSes (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 15 Jan 2018 13:34:48 -0500
Date: Mon, 15 Jan 2018 12:34:17 -0600
From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: David Woodhouse <dwmw2@infradead.org>,
        linux-kernel@vger.kernel.org, Dave Hansen <dave.hansen@intel.com>,
        Ashok Raj <ashok.raj@intel.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Tim Chen <tim.c.chen@linux.intel.com>,
        Andy Lutomirski <luto@kernel.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Greg KH <gregkh@linuxfoundation.org>,
        Andrea Arcangeli <aarcange@redhat.com>,
        Andi Kleen <ak@linux.intel.com>,
        Arjan Van De Ven <arjan.van.de.ven@intel.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Jun Nakajima <jun.nakajima@intel.com>,
        Asit Mallick <asit.k.mallick@intel.com>,
        Borislav Petkov <bp@alien8.de>
Subject: Re: [PATCH 2/4] objtool: Implement jump_assert for _static_cpu_has()
Message-ID: <20180115183417.myyorkvsbte3tnrw@treble>
References: <20180115164428.498966552@infradead.org>
 <20180115164909.836510626@infradead.org>
 <20180115180405.cdzdgw6tocbsmbrf@treble>
 <20180115181230.GD2228@hirez.programming.kicks-ass.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20180115181230.GD2228@hirez.programming.kicks-ass.net>
User-Agent: Mutt/1.6.0.1 (2016-04-01)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 15 Jan 2018 18:34:48 +0000 (UTC)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>

On Mon, Jan 15, 2018 at 07:12:30PM +0100, Peter Zijlstra wrote:
> > b) Add another special annotation to tell objtool where
> > _static_cpu_has() locations are?
> 
> Almost did that, but I figured I'd give this a try first. But yes I
> agree it is somewhat ugly.

I'm thinking this is the way to go.  Create an ANNOTATE_STATIC_JUMP
macro, which is used in both _static_cpu_has() and
arch_static_branch[_jump]().  Then it's very generalized and all the
special-casing for both alternatives and jump tables will go away.

-- 
Josh