From:   Song Liu <songliubraving@fb.com>
To:     Andrii Nakryiko <andrii.nakryiko@gmail.com>
CC:     Song Liu <song@kernel.org>, bpf <bpf@vger.kernel.org>,
        Networking <netdev@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        "Alexei Starovoitov" <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        "Andrii Nakryiko" <andrii@kernel.org>,
        Kernel Team <Kernel-team@fb.com>,
        "Peter Ziljstra" <peterz@infradead.org>, X86 ML <x86@kernel.org>
Subject: Re: [PATCH v2 bpf-next 0/7] bpf_prog_pack allocator
Thread-Topic: [PATCH v2 bpf-next 0/7] bpf_prog_pack allocator
Thread-Index: AQHX8Xkz/fv1YJcIlkCbgavAsgZfuqw1jcSAgABhLIA=
Date:   Fri, 17 Dec 2021 01:53:56 +0000
Message-ID: <DC857926-ECDA-4DF0-8058-C53DD15226AE@fb.com>
References: <20211215060102.3793196-1-song@kernel.org>
 <CAEf4BzaFYPWCycTx+pHefhRHgD2n1WPyy9-L9TDJ8rHyGTaQSQ@mail.gmail.com>
In-Reply-To: <CAEf4BzaFYPWCycTx+pHefhRHgD2n1WPyy9-L9TDJ8rHyGTaQSQ@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?snt/xZkQX/r60Si9COxGVyyfkcqOD1Spg4NizQi0wSpRJiGJ2F80YFQkhF9z?=
 =?us-ascii?Q?+EUwYE9o9+31QEJ38xi7iP6pjyv53yd3vh9GcA6sB2p3rnP+YlE3EKzV+3LR?=
 =?us-ascii?Q?LAuTL0imUe6B46TOLifVU5zgodiODKovckssxbR34xKl/Sl53oTtA3ZinTC/?=
 =?us-ascii?Q?F2MxH2Pbx9G0c0gQvc/ZBZynV9gXYHDro0yjoL1QbXermtGxoRymDqi2rauj?=
 =?us-ascii?Q?ZFPMASdTHoHcY9QM2NT8ISLEhZayUiZtzdIw4wxPk8EDW6zwNnCuCcTvfRFk?=
 =?us-ascii?Q?0gnjsHY6U4DaGd9M1gTM0RJBLsEjzEJpnqSmEa/mIejtXKlwZrrr0Oy3m78k?=
 =?us-ascii?Q?RDpZrvwlbosubvZTYqG708cP7YOexTAqwux+0LrYH3ZhC7ZA85FNefzi6KS6?=
 =?us-ascii?Q?ooOyWx9sktkmtkidM0AnJChKBv1EY+R0mT5z+spQPm6/vyDjaJYdcKVOibNq?=
 =?us-ascii?Q?6dDIDPuGzn2LujiKsYQ0dq/hlPe/BdfZ9LG+bhQ62WjHeAWmLnozorBu7NDk?=
 =?us-ascii?Q?nDO2CJ7qLk1jABkruDyt6RGfH/E8VF3kqxVqw8p1SDqPmiuMT+1gb9jCOLTt?=
 =?us-ascii?Q?ZjyRbiRBQUqvSG4w6K9AeInhrmKoLoJ6XUSB+EZlhjpQzQdAWDlW417pscsD?=
 =?us-ascii?Q?Vb0guVpzIR7M1Wb9fyxiNW6t/HIGJ47ohhw4XarAwss9sav4RziKVISIJ8VM?=
 =?us-ascii?Q?TP8wg+hxGUAWri19Ho14jAh8NcXPIBu3tJ7vIPi1RCgOgSO/wlv4TRkBiD3y?=
 =?us-ascii?Q?MW/1sYBZWxFQFgHxfSain9AJEmpebdfzBshFumVgf6DF5Ob+lWdKIARZ5R7G?=
 =?us-ascii?Q?OllfFnEEpY8JEu8vw5OQ9qTcU/92LSoF2JYoEtPxf2wNhZD3ZqJJ2i/44RoV?=
 =?us-ascii?Q?ziAiRD4AuBc0gp5GylLrSi691qbC8AOk/44D6CBC+2mE+/DRZnrjht/Al97b?=
 =?us-ascii?Q?OWt/boWcrX+1wD914Bfpcbrq3+FsLO3Vy6Uu9gc2STgwHUgFbmlvKkggNx62?=
 =?us-ascii?Q?fKFpOm8wk/aw5MiDMX9mzUPnvBOZIDuNZm09ca66lO6u/b4YXUW5Q+FGsxwp?=
 =?us-ascii?Q?X/MU8BtCudruRxaMM1+wXTKJyMKBsaZuUTT1/z+ZoHtUwDCENGwVCT8dPDcy?=
 =?us-ascii?Q?09WtBIKr0jAFY1PACiZpbg4vrsBgjUx/SBpbEgGwKjmyfcPikb4pCysIcbRS?=
 =?us-ascii?Q?QoMxlQpJQhDUonpf59RZsA+MXjTx6jJcjRa8dxB2vgvhnqoT1Uj7DXqZJmVb?=
 =?us-ascii?Q?dVF//LGY86pos1+/bt6riVjBQjqWiM+9sj0p05NwpYyNTHM7rHSYsFmuw2Jb?=
 =?us-ascii?Q?3us/fvgJ0rnPM1zxcAkFDqG7FIyNgBtoZZw+d8em1lqClqem4zvQ4Bs6s2sR?=
 =?us-ascii?Q?c8Wfrr/5hYNsffFLcqZTs62WA62sZR1bLzylFma21YSHmAbTakcqbxILRC9G?=
 =?us-ascii?Q?S4ti0NosUCK7/J2ZQq7qDeVDxKZenoI9iJbeuKezxbyak1KL61g+XCFbbrXG?=
 =?us-ascii?Q?a/qsbktHzfwsXrNoSxtbqaaSRpjIhtqaXfW0fYY2oymIl/ErzunxC4Y6whxO?=
 =?us-ascii?Q?YdSccy1usYRPryg3SWVF/cR7P70cS11O1q/oeq8cpqMdY3odY5uTHufohE3O?=
 =?us-ascii?Q?8krtNO05PXY4BLEgRzaWsoGdRio/qKYWJUwotgxxDvPctC190V9bSoR+J67n?=
 =?us-ascii?Q?CDgowg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <E4CBFAED1DE0F5479CCF3C9C7B97EE61@namprd15.prod.outlook.com>
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SA1PR15MB5109.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: efdf04ef-2e3a-465a-9516-08d9c100165a
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Dec 2021 01:53:56.7875
 (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: KlzZizBh0v0NOCcSUihxFFIQPvTZjn+by+V1TfY9KYNVD6IFlfwvWT2JdeR6ta2Al/nALq+k77/Euw23Foeo8g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR15MB5283
X-OriginatorOrg: fb.com
X-Proofpoint-ORIG-GUID: L95gel4FS8goozTbleMSLvxI-Cg0OvjF
X-Proofpoint-GUID: L95gel4FS8goozTbleMSLvxI-Cg0OvjF
X-Proofpoint-UnRewURL: 0 URL was un-rewritten
MIME-Version: 1.0
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=2021-12-16_09,2021-12-16_01,2021-12-02_01
X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 spamscore=0
 mlxlogscore=999 mlxscore=0 lowpriorityscore=0 suspectscore=0
 malwarescore=0 adultscore=0 clxscore=1015 impostorscore=0
 priorityscore=1501 phishscore=0 bulkscore=0 classifier=spam adjust=0
 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2112170007
X-FB-Internal: deliver
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Dec 16, 2021, at 12:06 PM, Andrii Nakryiko <andrii.nakryiko@gmail.com> wrote:
> 
> On Tue, Dec 14, 2021 at 10:01 PM Song Liu <song@kernel.org> wrote:
>> 
>> Changes v1 => v2:
>> 1. Use text_poke instead of writing through linear mapping. (Peter)
>> 2. Avoid making changes to non-x86_64 code.
>> 
>> Most BPF programs are small, but they consume a page each. For systems
>> with busy traffic and many BPF programs, this could also add significant
>> pressure to instruction TLB.
>> 
>> This set tries to solve this problem with customized allocator that pack
>> multiple programs into a huge page.
>> 
>> Patches 1-5 prepare the work. Patch 6 contains key logic of the allocator.
>> Patch 7 uses this allocator in x86_64 jit compiler.
>> 
> 
> There are test failures, please see [0]. But I was also wondering if
> there could be an explicit selftest added to validate that all this
> huge page machinery is actually activated and working as expected?

We can enable some debug option that dumps the page table. Then from the
page table, we can confirm the programs are running on a huge page. This 
only works on x86_64 though. WDYT?

Thanks,
Song


> 
>  [0] https://github.com/kernel-patches/bpf/runs/4530372387?check_suite_focus=true
> 
>> Song Liu (7):
>>  x86/Kconfig: select HAVE_ARCH_HUGE_VMALLOC with HAVE_ARCH_HUGE_VMAP
>>  bpf: use bytes instead of pages for bpf_jit_[charge|uncharge]_modmem
>>  bpf: use size instead of pages in bpf_binary_header
>>  bpf: add a pointer of bpf_binary_header to bpf_prog
>>  x86/alternative: introduce text_poke_jit
>>  bpf: introduce bpf_prog_pack allocator
>>  bpf, x86_64: use bpf_prog_pack allocator
>> 
>> arch/x86/Kconfig                     |   1 +
>> arch/x86/include/asm/text-patching.h |   1 +
>> arch/x86/kernel/alternative.c        |  28 ++++
>> arch/x86/net/bpf_jit_comp.c          |  93 ++++++++++--
>> include/linux/bpf.h                  |   4 +-
>> include/linux/filter.h               |  23 ++-
>> kernel/bpf/core.c                    | 213 ++++++++++++++++++++++++---
>> kernel/bpf/trampoline.c              |   6 +-
>> 8 files changed, 328 insertions(+), 41 deletions(-)
>> 
>> --
>> 2.30.2