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;
From:   David Laight <David.Laight@ACULAB.COM>
To:     'Peter Zijlstra' <peterz@infradead.org>,
        Alexei Starovoitov <alexei.starovoitov@gmail.com>
CC:     bpf <bpf@vger.kernel.org>, Steven Rostedt <rostedt@goodmis.org>,
        "H. Peter Anvin" <hpa@zytor.com>, X86 ML <x86@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>
Subject: RE: The killing of ideal_nops[]
Thread-Topic: The killing of ideal_nops[]
Thread-Index: AQHXFcc39lSrY3Kgm0WONtWbUmlAY6p+hE6A
Date:   Thu, 11 Mar 2021 09:28:46 +0000
Message-ID: <3913a992a9384fe083a5f24e4ef86fdc@AcuMS.aculab.com>
References: <20210309120519.7c6bbb97@gandalf.local.home>
 <YEfnnFUbizbJUQig@hirez.programming.kicks-ass.net>
 <362BD2A4-016D-4F6B-8974-92C84DC0DDB4@zytor.com>
 <YEiN+/Zp4uE/ISWD@hirez.programming.kicks-ass.net>
 <YEiS8Xws0tTFmMJp@hirez.programming.kicks-ass.net>
 <YEiZXtB74cnsLTx/@hirez.programming.kicks-ass.net>
 <YEid+HQnqgnt3iyY@hirez.programming.kicks-ass.net>
 <20210310091324.0c346d5f@oasis.local.home>
 <YEjWryS/9uB2y62O@hirez.programming.kicks-ass.net>
 <CAADnVQKMRWMuAJEJBPADactdKaGx4opg3y82m7fy59rRmA9Cog@mail.gmail.com>
 <YEjuArPJsSYDaYeI@hirez.programming.kicks-ass.net>
In-Reply-To: <YEjuArPJsSYDaYeI@hirez.programming.kicks-ass.net>
Accept-Language: en-GB, en-US
MIME-Version: 1.0
Content-Language: en-US
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8BIT
Precedence: bulk

From: Peter Zijlstra <peterz@infradead.org>
...
> Below is the latest version which I just pushed out to my git tree so
> that the robots can have a go at it.

Why not delete the indirection table?
So you end up with:

> +#ifndef CONFIG_64BIT
> +
> +/*
> + * Generic 32bit nops from GAS:
> + *
> + * 1: nop
> + * 2: movl %esi,%esi
> + * 3: leal 0x00(%esi),%esi
> + * 4: leal 0x00(,%esi,1),%esi
> + * 5: leal %ds:0x00(,%esi,1),%esi
> + * 6: leal 0x00000000(%esi),%esi
> + * 7: leal 0x00000000(,%esi,1),%esi
> + * 8: leal %ds:0x00000000(,%esi,1),%esi
>   *
> - * *_NOP5_ATOMIC must be a single instruction.
> + * Except 5 and 8, which are DS prefixed 4 and 7 resp, where GAS would emit 2
> + * nop instructions.
>   */
> +#define BYTES_NOP1	0x90
> +#define BYTES_NOP2	0x89,0xf6
> +#define BYTES_NOP3	0x8d,0x76,0x00
> +#define BYTES_NOP4	0x8d,0x74,0x26,0x00
> +#define BYTES_NOP5	0x3e,BYTES_NOP4
> +#define BYTES_NOP6	0x8d,0xb6,0x00,0x00,0x00,0x00
> +#define BYTES_NOP7	0x8d,0xb4,0x26,0x00,0x00,0x00,0x00
> +#define BYTES_NOP8	0x3e,BYTES_NOP7

const unsigned char const x86_nops[8][8] = {
	{ BYTES_NOP1 },
	{ BYTES_NOP2 },
	{ BYTES_NOP3 },
	{ BYTES_NOP4 },
	{ BYTES_NOP5 },
	{ BYTES_NOP6 },
	{ BYTES_NOP7 },
	{ BYTES_NOP8 }
};

The rest of the patch may not need changing.

	David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)