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: 13529413 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5FDB4C46CD2 for ; Wed, 24 Jan 2024 16:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Et9CviQAj6+1NtQJJsQCHbP6lE9dQ8zdz+bOVHzmN/k=; b=lgc2xDnwXvVXYU 3YX3eKQgjV25hItN7b3LBOFlLd7oNIA7VqJKcwQs9JOW9aYvbbjd1+HqDnCaTKmciQsNqcaEHJYx+ vPjFPLf3m/CcftVbfwPmaKPz5lLJgwmQoGZdd8f//84g1l5TXiSZ6cqX1srcQxc/Y/bTIuWSdfjS6 x3ygUDaiFNQf1DtoO+iMzHdc80NrD3Peku79QFI2sIGnKMdYTxkj+gyaXoR1/yrESVnd8iMp4ORgX xQLloPOM+78aOhrFiGjmbuiJO6Gs5ngcCwiAo6NPJFxM4eKz4qsex5/RE1XQNtpHrWeAvnLUPCm8Y qQPWm6PlfbM1xEH3iK/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSgS2-004H33-0m; Wed, 24 Jan 2024 16:50:10 +0000 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSgRt-004Gzi-1l for linux-arm-kernel@lists.infradead.org; Wed, 24 Jan 2024 16:50:03 +0000 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40e8d3b29f2so67528385e9.1 for ; Wed, 24 Jan 2024 08:49:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706114997; x=1706719797; darn=lists.infradead.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=jUwQ7PkWTUeFpX1LN1CANvuG/STowivKrrRpIVkkdOgWm7ns5SYsiJLn5Xy4AsIHlw sFugJG1vYvpDhPoXMG1GlrTYfpTns1BMRm2jT4sieYjpLCAkkQEK8FFL/NcHhNMje7nA qgMgFviYmZ5FJ2VKS0Yrv5lYgmxm87ksU9cvzdu7isVfS0qZNfRFXyLBgckBLFaWhinB tKaZ46oGIMlWnD4XrvsiNnAOO1gV6k9+8NgpoYh+4lYD0xHd+oiWO7Z4F2Yk0X/rJmHu FQpbQgNABz112/h+nQVZnBrDKYO1ZLEwVY/dR1bL8m/NLRofWV7qSIxNHesztph6niHu f8rg== 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=SH/1aeHcknnGlq+OEtBxD94Xw+c4aBphpCmMcAqdGPWFLXU1T+X+SEdcExZ5H56DFX XzHGn3QYcWWuUiNqQVIJCe1Dj38d5SlvFw3DkSqG2uemjLA90vpYrw4g+/4pp3yEJBvk 3vyeVj8Qx7Z3xQFhg77Z36LwZ84GJp5mxu+XGSK9g73uwD7KaPseANtyA5wdCqUozIz3 4cccpuPSX8WmhP8+pX8q526Z76KO4eov63yQaioztQPltrieYe0L9cO/Hr6DWn5h9XJ9 eVwNwGjzA9FsOP1/kn99gqXeyn9+xBv952o8Zz+15IWhMaQel24mnJdzLx5uRC5Xmc89 Wb5w== X-Gm-Message-State: AOJu0Ywj/60+pHRigzpYCHtwkPSUmzB42Tfl2uqqGY0PL++IgP8PiClI OHULENIrWzL+LGDRLnTTjNJfk504Gv36rOZ4yR3iU9e+xiN5edJE1/HDk7gYyr76qw== X-Google-Smtp-Source: AGHT+IFCSFu0iKmzYfp54IeJH4ezMu880YeBMyFrPL0tYXcvZVSKNQnTOFuJLDPFKRl5i9eqgJYChg== 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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240124_085001_607986_E5CE73A7 X-CRM114-Status: GOOD ( 17.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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;