From:   Song Liu <songliubraving@fb.com>
To:     Peter Zijlstra <peterz@infradead.org>
CC:     Song Liu <song@kernel.org>, bpf <bpf@vger.kernel.org>,
        Networking <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "ast@kernel.org" <ast@kernel.org>,
        "daniel@iogearbox.net" <daniel@iogearbox.net>,
        "andrii@kernel.org" <andrii@kernel.org>,
        Kernel Team <Kernel-team@fb.com>,
        "x86@kernel.org" <x86@kernel.org>
Subject: Re: [PATCH v3 bpf-next 7/7] bpf, x86_64: use bpf_prog_pack allocator
Thread-Topic: [PATCH v3 bpf-next 7/7] bpf, x86_64: use bpf_prog_pack allocator
Thread-Index: AQHYAqTI9fXucKh4qEa4ZUFl2xLE9KxdwWcAgABaKQA=
Date:   Tue, 11 Jan 2022 17:26:55 +0000
Message-ID: <F8E1FCB9-C168-454D-B765-DF1F65370ABF@fb.com>
References: <20220106022533.2950016-1-song@kernel.org>
 <20220106022533.2950016-8-song@kernel.org>
 <Yd1yPATp1viijqbi@hirez.programming.kicks-ass.net>
In-Reply-To: <Yd1yPATp1viijqbi@hirez.programming.kicks-ass.net>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?6XTyoEIX1NG16vzgtO1zuyp7TtSi9CkP+6NXJvMfAi1rSmOZE48Sej5kKmdj?=
 =?us-ascii?Q?g2M5SqPPlgHT8OCj9V5qXFmGetNztpRzDj+4c8zw7moUabdlFri5FI8zXYdh?=
 =?us-ascii?Q?3PzBf9BQXIk6h5CdiUqHDcgjBCVKRbBXQfEqgoC6kDAJ6mHbiZfAX0lTV3xI?=
 =?us-ascii?Q?A9WQb+i7nTPX539pFOFsG+oVSsBONBCkywRKeIIj50hpkAytc5aXAUxBCAnW?=
 =?us-ascii?Q?cYdzRku9sS9j8gNquN0Q/Wya9/5D9cpF7YNIkZKVKM3CqV93oq7buDPNc4Lk?=
 =?us-ascii?Q?70zXzF5FNJXwagUIed+vs8aTUsCD6F5boJtpgjKdaxGy2wDsHBqIpxlmfP0B?=
 =?us-ascii?Q?cEURGLu+BUOrQ51AsKnEyVe9xp6fXTw2m7NCEBN2haOj8z+Mzgh34eWcLgOH?=
 =?us-ascii?Q?VHK2pp18tTeJl/9eZJIXHbX9o1rVfA1hIf1XSryOt0AVzzhDci7CTCkzAa2k?=
 =?us-ascii?Q?4ZOVx9cRjXxk/LyugMdSCp6GzimDOKApQJU49HtYRk5BEQijWREnS+z+nshm?=
 =?us-ascii?Q?9RL9/ELbuR2iOnSlxsyFUtFmmDtuePg1OR3fAnuNOBhT63XonDOL+nxmn0QG?=
 =?us-ascii?Q?tW+F0a4WTzFPQcvm0O+xc5GfxLQ3K1XPhZ1+fpz6ivOv7jksPxWQkFpizreG?=
 =?us-ascii?Q?NdiuzQV7EaYnNqc0GbmB3oUmGLzgyQNGAaHOuoa8nWCMK0k3XtOfJqGEi6kw?=
 =?us-ascii?Q?OfPlgyjPjvErVtyLLMlFaRGmxerWh9P5zvVelFAb8HhQp64/13Hn6MZ+6vV2?=
 =?us-ascii?Q?LPK4A5buomK1+XXzPoi4UbS7/h+K/sDxQ0UyY0t6c3GwMdyoolv220bTVdVa?=
 =?us-ascii?Q?9/KQsFed8LEj86KZirMtnjtDK9TMUZ+KO0v92vcJw6LWIQYqVBrsNN8YDZ+R?=
 =?us-ascii?Q?J+CbYRKZv7koJS98Fd4H1EJu2Z72UQf5ysFl+1F01THrWU9kYE8OuDHTLy3j?=
 =?us-ascii?Q?HzHCUyvvu/ZlG6T3YL047xsVbQ8aCtM6KWDmwcGf6NAMyDL9JNL3o4BRdZ8j?=
 =?us-ascii?Q?j8LLn1Dhc4qwlIBv/RGyrArwmL3Wnu7xt4La7vyyhXxWftbiO7xtO2icxgep?=
 =?us-ascii?Q?YNBJoYZJYCd2qNeOFOZgxo88OOrMcBfDP650gGKhOabEyDM1vMdYOw9KNMmH?=
 =?us-ascii?Q?BCPLZQbA+cIIjLdtVDU/t19S51ajCJqRIB9Mswb/hpmJdodxJdnmxr5kyHfV?=
 =?us-ascii?Q?w+QeMj5Zpb95JnzZ4cNwzF0uuN7B8x0ll6UmXB+CmX/QUnmXql6R5EnDgON4?=
 =?us-ascii?Q?VJkYqC+NoI1E04QV/h8PqmLycNeKSJqO5YP5ef02LxpMjQjpsTsDaPJfPTci?=
 =?us-ascii?Q?TBxydkRKGJw/FTtppZv6Kldw7zwgKeQSuUHtoQMDlRbI4uvclM8bvyV3iW1l?=
 =?us-ascii?Q?FkmoqbL4CAw92fb1EzU0JX/uNU0/tyK9RdWA732Mjc8njIBgjiWk1wdDqlMZ?=
 =?us-ascii?Q?ezQAsi7omTApoKFBbksL0HUOcbvBCb1b5iYN3V+jIG3IH8g3a+5BPWXcxO9b?=
 =?us-ascii?Q?vj6B2J/b6MMH0jm7XcauyABJ6CJ0hWPLVc+bBIArNHyFePDMBgj0dYSZUIGI?=
 =?us-ascii?Q?F4bTMOG4m7yYMHqv4o4Q7DvpdkVlT/uLRsUw4nr3izltFWbuBtpK9qrnSd9d?=
 =?us-ascii?Q?UsQT0ol7RFXcVmb4n1TootINUV9pr7vgLgtomraKIv5osH3HQf8ovucIDRxT?=
 =?us-ascii?Q?uau0MA=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <469144ACB9848C4CAE8A6138596FCE2B@namprd15.prod.outlook.com>
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SA1PR15MB5109.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 095b1b27-ce66-4f82-99d9-08d9d5279066
X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2022 17:26:55.2094
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: d+5Jee4rYqYYLJSzD6oaeqlDz658+h6AavdDiLeOhv+1OB/DCyZPPEsuKMiynqdQphwpd14RUd6s2hZkZmdU2g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR15MB5187
X-OriginatorOrg: fb.com
X-Proofpoint-GUID: B5GJoVHWW3pUqMl9lHwnqnz5dyN55ul2
X-Proofpoint-ORIG-GUID: B5GJoVHWW3pUqMl9lHwnqnz5dyN55ul2
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513
 definitions=2022-01-11_04,2022-01-11_01,2021-12-02_01
X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 bulkscore=0
 priorityscore=1501 malwarescore=0 adultscore=0 mlxscore=0 suspectscore=0
 mlxlogscore=981 impostorscore=0 spamscore=0 lowpriorityscore=0
 clxscore=1011 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2110150000 definitions=main-2201110095
X-FB-Internal: deliver
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Jan 11, 2022, at 4:04 AM, Peter Zijlstra <peterz@infradead.org> wrote:
> 
> On Wed, Jan 05, 2022 at 06:25:33PM -0800, Song Liu wrote:
>> From: Song Liu <songliubraving@fb.com>
>> 
>> Use bpf_prog_pack allocator in x86_64 jit.
>> 
>> The program header from bpf_prog_pack is read only during the jit process.
>> Therefore, the binary is first written to a temporary buffer, and later
>> copied to final location with text_poke_jit().
>> 
>> Similarly, jit_fill_hole() is updated to fill the hole with 0xcc using
>> text_poke_jit().
>> 
>> Signed-off-by: Song Liu <songliubraving@fb.com>
>> ---
>> arch/x86/net/bpf_jit_comp.c | 131 +++++++++++++++++++++++++++---------
>> 1 file changed, 100 insertions(+), 31 deletions(-)
>> 
>> diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
>> index fe4f08e25a1d..ad69a64ee4fe 100644
>> --- a/arch/x86/net/bpf_jit_comp.c
>> +++ b/arch/x86/net/bpf_jit_comp.c
>> @@ -216,11 +216,33 @@ static u8 simple_alu_opcodes[] = {
>> 	[BPF_ARSH] = 0xF8,
>> };
>> 
>> +static char jit_hole_buffer[PAGE_SIZE] = {};
>> +
>> static void jit_fill_hole(void *area, unsigned int size)
>> +{
>> +	struct bpf_binary_header *hdr = area;
>> +	int i;
>> +
>> +	for (i = 0; i < roundup(size, PAGE_SIZE); i += PAGE_SIZE) {
>> +		int s;
>> +
>> +		s = min_t(int, PAGE_SIZE, size - i);
>> +		text_poke_jit(area + i, jit_hole_buffer, s);
>> +	}
>> +
>> +	/* bpf_jit_binary_alloc_pack cannot write size directly to the ro
>> +	 * mapping. Write it here with text_poke_jit().
>> +	 */
> 
> Could we move this file towards regular comment style please? It's
> already mixed style, let's take the opportunity and not add more
> net-style comments.

Aha, I didn't realize the file is about 50:50 with the two styles. I can 
change it in v4. 

Thanks,
Song