From patchwork Wed Jan 24 16:49:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 191654 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1116444dyi; Wed, 24 Jan 2024 08:50:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IGzZdFCx/LjCElttAmLYiMB52GRfQdzldhOx70bA2zbREGpCiTxMGcuPLBd35y5kkbDAVgF X-Received: by 2002:a17:906:af89:b0:a2e:cebf:5f08 with SMTP id mj9-20020a170906af8900b00a2ecebf5f08mr758832ejb.13.1706115039777; Wed, 24 Jan 2024 08:50:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706115039; cv=pass; d=google.com; s=arc-20160816; b=l0RLjzGeZAkMBUmBqAkXFDllarF2eTxuwG6VQndXSL7+pOvwrfiZiVmNhrfHcw5W+z xQAWvfeYEg74aAaN/vEmx4PaYNECKCvORDYQztSzvAk2lIKi0JQNCBYOrWcRCfK06kR8 2E1ljNSVViAiuK35/oM1QSZ30W5tINKMgViqRwT+jZq8kTMrcPL6NBR9xicT0qPuZWhv Q07gsi4at37adF7NFCnUj4Cf47Ik4NL8GDe0fMTOoUsohrwF4jgVbJJqhVOE0+btyUL8 K+O0P75ObI32sHSrRXgbTJUous0opoYmJMvUH2E2b8vlASuCHgYaZu8lBF7WHo3OwAuK auRQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=FI4++Tri0XwJHgi/SwI3tIuIhoPqQHm+YqaSOpS3kwM=; fh=6T+NIsJaADDva4Mhm0u6AQLyVhrdmhpxfc6z2znUEcY=; b=x7otvJCrVTdTfc1pXvdHUO5pMN8OrhjOEZQFhQsH9EUf9/ACxYICKGrMnN83A8xboi pSgR6xtrCf1dGxj1FN4OaSHwSLU//jRO9q+BvLBT4PveUcLli/ZZJTyPGfpyD+YlpAld xxIJfAd8jFPFloEN56DsZfl3L232H5uqshGds/sgmwZQMn8nXfXFLRTQYta5a0+QVjTg 8w1RQpv+gNanZXIJkE6LxfqHjwtHzkoKc1cOCKar56XK3ZIrP9HEPawVeyK/e0/YTtY/ xXz5lMXtyWP6vZq9Pk+l4C+0+FmDcJvSZrp4+3Ontwi3j7Eg+I902eJDeS2fcc2CH6nY 6WHw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=P7TAgAkx; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-37357-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37357-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id g27-20020a170906349b00b00a3079648570si56417ejb.653.2024.01.24.08.50.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 08:50:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37357-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=P7TAgAkx; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-37357-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37357-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 35C8C1F2184D for ; Wed, 24 Jan 2024 16:50:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 251A37E77A; Wed, 24 Jan 2024 16:50:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P7TAgAkx" Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61C997E56D; Wed, 24 Jan 2024 16:49:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706115001; cv=none; b=qLdN9jp9NqmQ7mU9a4CAFwMjXGCmx+bLwxRn0EkfgCjTYRMwDta0Q1CC4s2EUFkxqcX5hyVlbww2fPQtw1YUE/LMzH/4Cfrbjlun0urepGfjaHDY+kxMOCc3TmQpVpZwIFe9V0Tmq/J0SynIkU8OuNI4xLp5qGBJAfMC0Hr3KpE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706115001; c=relaxed/simple; bh=jZDJv0ysjPvVF3fqpYH9nGSFDwIoB/LyXOKFUfIztt8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=chhTbkd4cO9DfcHzC28TCOAyRb/dBEuQofuv5Jf3vHXc/qieaaXZqLaUsRO5UzPwl8pO7l5zL5ujEGyrdQAzf3tTqLytTdGMuscEb6aZwlMAy9MARrW6dC0POJkcTZZ3eelHZMldgtwdUEKU4cQWKYSlaxoZvg3K9t3Db3aY3H4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P7TAgAkx; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40ec6a002a7so8928195e9.2; Wed, 24 Jan 2024 08:49:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706114997; x=1706719797; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FI4++Tri0XwJHgi/SwI3tIuIhoPqQHm+YqaSOpS3kwM=; b=P7TAgAkxUBola3IQZI4pD+iw/bu0Jx2DrOEe4ToVS40hXeJM1RZdlstw0UFXDcol6A bnI6gKA5/3x6B/GfN1xdh9GmVVCxDM+jvk+y5Eoh6tdP8WOaXLcF7SHHdU7PomQABvn0 vzax+9fMThDF95IsRiHWd2o4wYH6fMwMkWyIWqbph7GkbixS/zFYIRJuuOoqK1JA3+1u cGfnIhVQ03sGi+a/W9waoLvJUglhDSpKNCqOD1Uqbz6G6oiA3OeXSFB/RUuqHIRkziXJ b6/+WUkXt8FxoQYzeiPI3qtqWN7bFEXf8NCVKgAFnZB4cHAz27X1Fi97L2HJ8M2ro8w+ H5KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706114997; x=1706719797; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FI4++Tri0XwJHgi/SwI3tIuIhoPqQHm+YqaSOpS3kwM=; b=kJWN7WmImSDU7BBDKu3jaSYJCWKcaplLMtOFCswY0BoyPwro6nTrM+j5oQlvyvOJ0F rfW6JTA6zl2gBQoN1pl5ZzWCUeNJb4zhqrJDGsTZYOGygRvljw7VSQS1WyCNgv9XBQnf LelaeqL/NTAe7bNJxS6rrL4unbLjKNawbjp3xom9TKEIk7fbuPkIJe45ux7cDF8OZW3S o/D9hHwaF7e+3s8mE0el9DWTt2cpeDEzYVFiUIN2g+guMQcSUJdADWJc3vBVDI7PD1J4 uuMasW485+DCRWLsuSQ1JB8FhgmR4yUVg6zqOeXnzOR/bmq4Oot9CSaiTjVFGbm7V2yx jopg== X-Gm-Message-State: AOJu0YzHHT0CJP75QGEeHzSc9k+JegKeozdVoc5Eo/GLDR7OkPKv14dA ZRGzqQw7/SM1SBG6maizLWgxdW/G6q9FFl05ZSYUARC3MQ1GXboI X-Received: by 2002:a05:600c:4aa9:b0:40e:877e:50e3 with SMTP id b41-20020a05600c4aa900b0040e877e50e3mr850305wmp.264.1706114997434; Wed, 24 Jan 2024 08:49:57 -0800 (PST) Received: from localhost (54-240-197-231.amazon.com. [54.240.197.231]) by smtp.gmail.com with ESMTPSA id bk19-20020a0560001d9300b00339559262e5sm450339wrb.12.2024.01.24.08.49.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2024 08:49:57 -0800 (PST) From: Puranjay Mohan To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, bpf@vger.kernel.org, kpsingh@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, xukuohai@huaweicloud.com Cc: puranjay12@gmail.com Subject: [PATCH bpf-next v6 1/2] arm64: patching: implement text_poke API Date: Wed, 24 Jan 2024 16:49:16 +0000 Message-Id: <20240124164917.119997-2-puranjay12@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240124164917.119997-1-puranjay12@gmail.com> References: <20240124164917.119997-1-puranjay12@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788991284051231813 X-GMAIL-MSGID: 1788991284051231813 The text_poke API is used to implement functions like memcpy() and memset() for instruction memory (RO+X). The implementation is similar to the x86 version. This will be used by the BPF JIT to write and modify BPF programs. There could be more users of this in the future. Signed-off-by: Puranjay Mohan --- arch/arm64/include/asm/patching.h | 2 + arch/arm64/kernel/patching.c | 80 +++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/arch/arm64/include/asm/patching.h b/arch/arm64/include/asm/patching.h index 68908b82b168..587bdb91ab7a 100644 --- a/arch/arm64/include/asm/patching.h +++ b/arch/arm64/include/asm/patching.h @@ -8,6 +8,8 @@ int aarch64_insn_read(void *addr, u32 *insnp); int aarch64_insn_write(void *addr, u32 insn); int aarch64_insn_write_literal_u64(void *addr, u64 val); +void *aarch64_insn_set(void *dst, u32 insn, size_t len); +void *aarch64_insn_copy(void *dst, void *src, size_t len); int aarch64_insn_patch_text_nosync(void *addr, u32 insn); int aarch64_insn_patch_text(void *addrs[], u32 insns[], int cnt); diff --git a/arch/arm64/kernel/patching.c b/arch/arm64/kernel/patching.c index b4835f6d594b..5c2d34d890cf 100644 --- a/arch/arm64/kernel/patching.c +++ b/arch/arm64/kernel/patching.c @@ -105,6 +105,86 @@ noinstr int aarch64_insn_write_literal_u64(void *addr, u64 val) return ret; } +typedef void text_poke_f(void *dst, void *src, size_t patched, size_t len); + +static void *__text_poke(text_poke_f func, void *addr, void *src, size_t len) +{ + unsigned long flags; + size_t patched = 0; + size_t size; + void *waddr; + void *ptr; + int ret; + + raw_spin_lock_irqsave(&patch_lock, flags); + + while (patched < len) { + ptr = addr + patched; + size = min_t(size_t, PAGE_SIZE - offset_in_page(ptr), + len - patched); + + waddr = patch_map(ptr, FIX_TEXT_POKE0); + func(waddr, src, patched, size); + patch_unmap(FIX_TEXT_POKE0); + + if (ret < 0) { + raw_spin_unlock_irqrestore(&patch_lock, flags); + return NULL; + } + patched += size; + } + raw_spin_unlock_irqrestore(&patch_lock, flags); + + flush_icache_range((uintptr_t)addr, (uintptr_t)addr + len); + + return addr; +} + +static void text_poke_memcpy(void *dst, void *src, size_t patched, size_t len) +{ + copy_to_kernel_nofault(dst, src + patched, len); +} + +static void text_poke_memset(void *dst, void *src, size_t patched, size_t len) +{ + u32 c = *(u32 *)src; + + memset32(dst, c, len / 4); +} + +/** + * aarch64_insn_copy - Copy instructions into (an unused part of) RX memory + * @dst: address to modify + * @src: source of the copy + * @len: length to copy + * + * Useful for JITs to dump new code blocks into unused regions of RX memory. + */ +noinstr void *aarch64_insn_copy(void *dst, void *src, size_t len) +{ + /* A64 instructions must be word aligned */ + if ((uintptr_t)dst & 0x3) + return NULL; + + return __text_poke(text_poke_memcpy, dst, src, len); +} + +/** + * aarch64_insn_set - memset for RX memory regions. + * @dst: address to modify + * @insn: value to set + * @len: length of memory region. + * + * Useful for JITs to fill regions of RX memory with illegal instructions. + */ +noinstr void *aarch64_insn_set(void *dst, u32 insn, size_t len) +{ + if ((uintptr_t)dst & 0x3) + return NULL; + + return __text_poke(text_poke_memset, dst, &insn, len); +} + int __kprobes aarch64_insn_patch_text_nosync(void *addr, u32 insn) { u32 *tp = addr; From patchwork Wed Jan 24 16:56:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 191657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1119668dyi; Wed, 24 Jan 2024 08:57:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHMKDVHp4bS8O813Yq+ZAwauQMVbPz1QOCuPgqNJfiWiIjcq3XjjfZLNc67qEFofz4WCO58 X-Received: by 2002:a05:622a:1114:b0:42a:5a70:6cf1 with SMTP id e20-20020a05622a111400b0042a5a706cf1mr2263304qty.4.1706115390346; Wed, 24 Jan 2024 08:56:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706115390; cv=pass; d=google.com; s=arc-20160816; b=IbmP8WqhryftPu7v+D4Ebe/rYnu+s8w5CBNhqp5ZyhvOBzDYwipSBX5ajfIjEN/mvh Hu4YzMMMCGnU8iY/DLg1k5/nEzJEgHFOtV+QOoxtJXhzXPPvr1PDN2xyqdHXLoGLfGOZ 11YTdocq6MrR1U2yvJ2b4h5s9T3h0d1XV8QmFN+/7IA/fRaxCp7K9WMzP5RGWsga0DNN 4Ydc9GSLKiO1YdyKQEbv+Jo46XBooY+VAXMm6wb0q1TwG5arWNMqzEKDgwoe6Geq1MUE rhpbIYFvA7mBO4kvukt1K3k98q6zk2sn0yB/nuyLaWcdaKvoyI4YwzJ2LdOk4CpU7/uU 70Zw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=AnDGusC0kVELZVT5LItnZ7/m8XUaVwQLe9Ha3b7wlIA=; fh=6T+NIsJaADDva4Mhm0u6AQLyVhrdmhpxfc6z2znUEcY=; b=ctxf2qpLeEmzBqDBv90kiABwTq4Gs+7REwF9XZZVpcTd7P7RoDTkW9q5J+INteRsRx GylMVgktqMApC5AS/fOJ0pf3NT0JAwyMC1KClPf7m+L3lOYgrB6vTmwkw9Ja2zCHh+9F HTICkawWHTms3w240LAqbzAFZmbbc3qfX2p78oYJIuk8borOABmIXc6xrJiwqP3ikVtS EG6C0MXGtYRnZTOkUbYyBnFn7QGNRq0ZGRQiQqjXjGlvteCe3VvoMOhYlIGCQ2lSjBoX rLa/5xG61iDx3c9fJCZHjHDsp0tL+kFIQd5pq455ko7cAjwavW+bYaUv5QaLcktspvEc /Oow== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=K27mWbZf; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-37364-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37364-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id e12-20020ac84e4c000000b0042a64074511si797972qtw.524.2024.01.24.08.56.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 08:56:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37364-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=K27mWbZf; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-37364-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37364-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 1AC811C21532 for ; Wed, 24 Jan 2024 16:56:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 610B27E77D; Wed, 24 Jan 2024 16:56:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K27mWbZf" Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 454687CF06; Wed, 24 Jan 2024 16:56:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706115369; cv=none; b=QKr6G5bdf9l0xQ0tZ4qDize2QaA/n/A62UXxJs/Uj8sugIFzCPONRfrerIkXfFjAFyGiRTj9RoYOmp7VFAa2Arx8UMwRQ/2G/3Qfz0W98rElwrdywsrKXaTy8JrpSBvNg1aYPJJLBZv5Zf3aaZ5nTd/Db/1O0yNUnUU5aC1VONM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706115369; c=relaxed/simple; bh=SblwPCXq9ATAGCQD9awf5x7DhwOuEfl9Q7eKX4u/nnM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Du2dwdfZqUCFvdEawG5PVYF1IUltapuUqFnIlQNlE1MzbwLys0XXJJ3LOfNVQE0Oc3u34v1ZiY+4dasVskrcu6SABh4Jx9jF/EDUQbNAkVF6IQhjyzqO0wcu9yqbZzUckfMrnUCLzK68Y/tXxOEOZB1Vf0kEWUnG6RXp7H6UYAE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K27mWbZf; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-40e60e135a7so55634515e9.0; Wed, 24 Jan 2024 08:56:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706115365; x=1706720165; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AnDGusC0kVELZVT5LItnZ7/m8XUaVwQLe9Ha3b7wlIA=; b=K27mWbZffCNW/9krIzKAbNekpG72krZYjNjJT0+dDc5thIkwWj1oWdhaLftTeWrhMo SJAch9zJLMvztpf5ZZWi0o4lKeL7qztzGPx4nCor6270JP08wdU/w30AdOniJQKeVv11 GiLZyNonJsQDDquQSOFMi10bEg4852E1rXE4VO7tGuBWxy+iK6HTDHu4FenQjYcSkb0c 6zJ47b0bT/twR6wsQjp34KXnorpbie48aXX8wjw6tvCa6iEoKbbiVdQ0IXF8SjruM7Br 343uCFLyb52VjEjomMLR++TlR9ZxhB512eVFljAajS4U24AND4oTT9EZMzXXZ5LfXD9K ayFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706115365; x=1706720165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AnDGusC0kVELZVT5LItnZ7/m8XUaVwQLe9Ha3b7wlIA=; b=bk7FtAwJRyi0WOrtdunL6cLVaq8oHpJjjcEOxusxjjaWW54VkaGMHcvTu6wLhb/V2r g7itWAUQutDKV9umIFe0L+mjBaYjx5qtwlYE7nrIGEfyUfbJOoLoyDaLuByMmVdUvkiP XX26fIWluQjDlc+J6c2n/G7AVcSOLG32LKbXZA/vsx0MkgFJorUx2n92JE0GmAH665BQ dP/4LW3hvJwJKTThm88DVGpScludtvpuRNRCJE+DR2rYC82AFqpBqw6LYyU16iwkHzLH f0mVChuju7GdCyPHH0M/nKQ7ajRR8cDkAR73ojeBVvfCZKA59CE99Lshy4cr+1GazYax nHIQ== X-Gm-Message-State: AOJu0Yy/R2M0ENAoG/yjq3Ql/D2+y8q36XJXP9CDNE16eQfYNGCQ4DwE IuzASVpTuBLgvwBGM0p5KKGUL3p84WCaxcavyTGKbZiC2UlP9L4U X-Received: by 2002:adf:e848:0:b0:337:d932:4980 with SMTP id d8-20020adfe848000000b00337d9324980mr589255wrn.143.1706115365326; Wed, 24 Jan 2024 08:56:05 -0800 (PST) Received: from localhost (54-240-197-231.amazon.com. [54.240.197.231]) by smtp.gmail.com with ESMTPSA id w14-20020a5d404e000000b00337d9a717bcsm14649755wrp.52.2024.01.24.08.56.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2024 08:56:05 -0800 (PST) From: Puranjay Mohan To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, bpf@vger.kernel.org, kpsingh@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, xukuohai@huaweicloud.com Cc: puranjay12@gmail.com Subject: [PATCH bpf-next v6 2/2] bpf, arm64: use bpf_prog_pack for memory management Date: Wed, 24 Jan 2024 16:56:00 +0000 Message-Id: <20240124165600.128054-1-puranjay12@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240124164917.119997-1-puranjay12@gmail.com> References: <20240124164917.119997-1-puranjay12@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788991651582121662 X-GMAIL-MSGID: 1788991651582121662 Use bpf_jit_binary_pack_alloc for memory management of JIT binaries in ARM64 BPF JIT. The bpf_jit_binary_pack_alloc creates a pair of RW and RX buffers. The JIT writes the program into the RW buffer. When the JIT is done, the program is copied to the final RX buffer with bpf_jit_binary_pack_finalize. Implement bpf_arch_text_copy() and bpf_arch_text_invalidate() for ARM64 JIT as these functions are required by bpf_jit_binary_pack allocator. Signed-off-by: Puranjay Mohan Acked-by: Song Liu --- arch/arm64/net/bpf_jit_comp.c | 139 ++++++++++++++++++++++++++++------ 1 file changed, 115 insertions(+), 24 deletions(-) diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c index 8955da5c47cf..52308de56a02 100644 --- a/arch/arm64/net/bpf_jit_comp.c +++ b/arch/arm64/net/bpf_jit_comp.c @@ -76,6 +76,7 @@ struct jit_ctx { int *offset; int exentry_idx; __le32 *image; + __le32 *ro_image; u32 stack_size; int fpb_offset; }; @@ -205,6 +206,14 @@ static void jit_fill_hole(void *area, unsigned int size) *ptr++ = cpu_to_le32(AARCH64_BREAK_FAULT); } +int bpf_arch_text_invalidate(void *dst, size_t len) +{ + if (!aarch64_insn_set(dst, AARCH64_BREAK_FAULT, len)) + return -EINVAL; + + return 0; +} + static inline int epilogue_offset(const struct jit_ctx *ctx) { int to = ctx->epilogue_offset; @@ -707,7 +716,8 @@ static int add_exception_handler(const struct bpf_insn *insn, struct jit_ctx *ctx, int dst_reg) { - off_t offset; + off_t ins_offset; + off_t fixup_offset; unsigned long pc; struct exception_table_entry *ex; @@ -724,12 +734,17 @@ static int add_exception_handler(const struct bpf_insn *insn, return -EINVAL; ex = &ctx->prog->aux->extable[ctx->exentry_idx]; - pc = (unsigned long)&ctx->image[ctx->idx - 1]; + pc = (unsigned long)&ctx->ro_image[ctx->idx - 1]; - offset = pc - (long)&ex->insn; - if (WARN_ON_ONCE(offset >= 0 || offset < INT_MIN)) + /* + * This is the relative offset of the instruction that may fault from + * the exception table itself. This will be written to the exception + * table and if this instruction faults, the destination register will + * be set to '0' and the execution will jump to the next instruction. + */ + ins_offset = pc - (long)&ex->insn; + if (WARN_ON_ONCE(ins_offset >= 0 || ins_offset < INT_MIN)) return -ERANGE; - ex->insn = offset; /* * Since the extable follows the program, the fixup offset is always @@ -738,12 +753,25 @@ static int add_exception_handler(const struct bpf_insn *insn, * bits. We don't need to worry about buildtime or runtime sort * modifying the upper bits because the table is already sorted, and * isn't part of the main exception table. + * + * The fixup_offset is set to the next instruction from the instruction + * that may fault. The execution will jump to this after handling the + * fault. */ - offset = (long)&ex->fixup - (pc + AARCH64_INSN_SIZE); - if (!FIELD_FIT(BPF_FIXUP_OFFSET_MASK, offset)) + fixup_offset = (long)&ex->fixup - (pc + AARCH64_INSN_SIZE); + if (!FIELD_FIT(BPF_FIXUP_OFFSET_MASK, fixup_offset)) return -ERANGE; - ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) | + /* + * The offsets above have been calculated using the RO buffer but we + * need to use the R/W buffer for writes. + * switch ex to rw buffer for writing. + */ + ex = (void *)ctx->image + ((void *)ex - (void *)ctx->ro_image); + + ex->insn = ins_offset; + + ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, fixup_offset) | FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg); ex->type = EX_TYPE_BPF; @@ -1511,7 +1539,8 @@ static inline void bpf_flush_icache(void *start, void *end) struct arm64_jit_data { struct bpf_binary_header *header; - u8 *image; + u8 *ro_image; + struct bpf_binary_header *ro_header; struct jit_ctx ctx; }; @@ -1520,12 +1549,14 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) int image_size, prog_size, extable_size, extable_align, extable_offset; struct bpf_prog *tmp, *orig_prog = prog; struct bpf_binary_header *header; + struct bpf_binary_header *ro_header; struct arm64_jit_data *jit_data; bool was_classic = bpf_prog_was_classic(prog); bool tmp_blinded = false; bool extra_pass = false; struct jit_ctx ctx; u8 *image_ptr; + u8 *ro_image_ptr; if (!prog->jit_requested) return orig_prog; @@ -1552,8 +1583,11 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) } if (jit_data->ctx.offset) { ctx = jit_data->ctx; - image_ptr = jit_data->image; + ro_image_ptr = jit_data->ro_image; + ro_header = jit_data->ro_header; header = jit_data->header; + image_ptr = (void *)header + ((void *)ro_image_ptr + - (void *)ro_header); extra_pass = true; prog_size = sizeof(u32) * ctx.idx; goto skip_init_ctx; @@ -1598,18 +1632,27 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) /* also allocate space for plt target */ extable_offset = round_up(prog_size + PLT_TARGET_SIZE, extable_align); image_size = extable_offset + extable_size; - header = bpf_jit_binary_alloc(image_size, &image_ptr, - sizeof(u32), jit_fill_hole); - if (header == NULL) { + ro_header = bpf_jit_binary_pack_alloc(image_size, &ro_image_ptr, + sizeof(u32), &header, &image_ptr, + jit_fill_hole); + if (!ro_header) { prog = orig_prog; goto out_off; } /* 2. Now, the actual pass. */ + /* + * Use the image(RW) for writing the JITed instructions. But also save + * the ro_image(RX) for calculating the offsets in the image. The RW + * image will be later copied to the RX image from where the program + * will run. The bpf_jit_binary_pack_finalize() will do this copy in the + * final step. + */ ctx.image = (__le32 *)image_ptr; + ctx.ro_image = (__le32 *)ro_image_ptr; if (extable_size) - prog->aux->extable = (void *)image_ptr + extable_offset; + prog->aux->extable = (void *)ro_image_ptr + extable_offset; skip_init_ctx: ctx.idx = 0; ctx.exentry_idx = 0; @@ -1617,9 +1660,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) build_prologue(&ctx, was_classic); if (build_body(&ctx, extra_pass)) { - bpf_jit_binary_free(header); prog = orig_prog; - goto out_off; + goto out_free_hdr; } build_epilogue(&ctx); @@ -1627,34 +1669,44 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) /* 3. Extra pass to validate JITed code. */ if (validate_ctx(&ctx)) { - bpf_jit_binary_free(header); prog = orig_prog; - goto out_off; + goto out_free_hdr; } /* And we're done. */ if (bpf_jit_enable > 1) bpf_jit_dump(prog->len, prog_size, 2, ctx.image); - bpf_flush_icache(header, ctx.image + ctx.idx); - if (!prog->is_func || extra_pass) { if (extra_pass && ctx.idx != jit_data->ctx.idx) { pr_err_once("multi-func JIT bug %d != %d\n", ctx.idx, jit_data->ctx.idx); - bpf_jit_binary_free(header); prog->bpf_func = NULL; prog->jited = 0; prog->jited_len = 0; + goto out_free_hdr; + } + if (WARN_ON(bpf_jit_binary_pack_finalize(prog, ro_header, + header))) { + /* ro_header has been freed */ + ro_header = NULL; + prog = orig_prog; goto out_off; } - bpf_jit_binary_lock_ro(header); + /* + * The instructions have now been copied to the ROX region from + * where they will execute. Now the data cache has to be cleaned to + * the PoU and the I-cache has to be invalidated for the VAs. + */ + bpf_flush_icache(ro_header, ctx.ro_image + ctx.idx); } else { jit_data->ctx = ctx; - jit_data->image = image_ptr; + jit_data->ro_image = ro_image_ptr; jit_data->header = header; + jit_data->ro_header = ro_header; } - prog->bpf_func = (void *)ctx.image; + + prog->bpf_func = (void *)ctx.ro_image; prog->jited = 1; prog->jited_len = prog_size; @@ -1675,6 +1727,14 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) bpf_jit_prog_release_other(prog, prog == orig_prog ? tmp : orig_prog); return prog; + +out_free_hdr: + if (header) { + bpf_arch_text_copy(&ro_header->size, &header->size, + sizeof(header->size)); + bpf_jit_binary_pack_free(ro_header, header); + } + goto out_off; } bool bpf_jit_supports_kfunc_call(void) @@ -1682,6 +1742,13 @@ bool bpf_jit_supports_kfunc_call(void) return true; } +void *bpf_arch_text_copy(void *dst, void *src, size_t len) +{ + if (!aarch64_insn_copy(dst, src, len)) + return ERR_PTR(-EINVAL); + return dst; +} + u64 bpf_jit_alloc_exec_limit(void) { return VMALLOC_END - VMALLOC_START; @@ -2305,3 +2372,27 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type poke_type, return ret; } + +void bpf_jit_free(struct bpf_prog *prog) +{ + if (prog->jited) { + struct arm64_jit_data *jit_data = prog->aux->jit_data; + struct bpf_binary_header *hdr; + + /* + * If we fail the final pass of JIT (from jit_subprogs), + * the program may not be finalized yet. Call finalize here + * before freeing it. + */ + if (jit_data) { + bpf_arch_text_copy(&jit_data->ro_header->size, &jit_data->header->size, + sizeof(jit_data->header->size)); + kfree(jit_data); + } + hdr = bpf_jit_binary_pack_hdr(prog); + bpf_jit_binary_pack_free(hdr, NULL); + WARN_ON_ONCE(!bpf_prog_kallsyms_verify_off(prog)); + } + + bpf_prog_unlock_free(prog); +}