From patchwork Wed Feb 28 14:18:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13575590 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 8C32AC5478C for ; Wed, 28 Feb 2024 14:19:12 +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=B9vdpzeCIaKB9ouAhRbZHO1kT2QuJc6pwkL6Fw0CMr4=; b=H/Itl6zmXvEBSb g5bjBfXz00UkVhyjGmxe3fLP1s6cLqb+Gdp1vBpQNHni4hdXSnj28QDmHf5nD9oJZDI3Fe5tzpE1x upuJEUBAmF2m4Yk4wS14ii0BT9/hLD2LyPw92u/hRSePsNG63V5PNLF9zaLGuMxwKqrA463Q/5l0b P/aahKajzeEZPxeDnpSi/AbSVeZTmE+KyiUCeHhYgEMSKmSOf5Kdat6J4HKbv5+aIJNDsRHujGi0H tGe06S781UI/C+z6TgVQoR9Y0ZDDErPbFEGZVwz9OgRCJ7Rc63piomOy4cF/6jjBvmeqGPREW6kbU fbUS8/7f2iKTedtCdI8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rfKlt-00000009fRO-2861; Wed, 28 Feb 2024 14:18:57 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rfKll-00000009fNh-1UdG for linux-arm-kernel@lists.infradead.org; Wed, 28 Feb 2024 14:18:50 +0000 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-33d6cc6d2fcso3370176f8f.2 for ; Wed, 28 Feb 2024 06:18:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709129927; x=1709734727; 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=bJut5fiJS301DH5MoBc/mIfNczO2XYfdN68aAnP3/sk=; b=iln8ub+yH7wh9z/+82pTaU3/SGci842kqL+5CSBmJnGjv+ZAqUBdk5cWOiO1ZLLPbZ PpzEJlEcZs91s0h4/U9MiVTlnXhDqHoBLkUV/Fii+9WsR1FrdoeS1OP6Xut7ehlFxA/d 6Ouj5zxUWWz5XgTI67aq3XGpk57m1kuAXMosD7JNj3+fLCHycDrEmqEpT0OPeCGT7bSs FE2lZpYpjix5XEBfG3X1HZaI2XakYVGMqMxmatVJ6shhkokYBYC9b6auvGJi5rtMVgr9 U/u28P/xLuduDUj6sDAn+D3hj8eIGtxRakAi0GgRMdy0r/FHQzqK6fEaTF8ZdiDVE8Ln OrCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709129927; x=1709734727; 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=bJut5fiJS301DH5MoBc/mIfNczO2XYfdN68aAnP3/sk=; b=sxVf9D8DMxzWce646dA0J1A5/ksJ8O9lh+RpFJgel9almJ4BIRDKW6B+NQTCFlzwdf 3sluZGCmOaua0JhR/UBGLDK5v+ybjkv6FHX0mitZ1H8OkcY40ZVbi0GdEkEr7krOaz7v Xb9TGM6ZyJNlDMe407u6Uifk6JHL82Dy3DzVsqhJbnQfZwCwkCpWPlWnaSw6uNFH3bv2 HD0OC9O4n2e6fhk8VyseY3A+QP1Dyln/BOQ7slTsA1cwE6do07J6Y/YHZGfIO2IQGbQx M5rN0dOjS6Gk9BTXKNi7LHczfG0h5xB1O6QRlgK2MCIrJ1NcwDGD6WT7565MiluAjLUL HwTQ== X-Forwarded-Encrypted: i=1; AJvYcCU6ok6VBGhSUX0RawNSuUBWoCkypbYCHP5CqhjkqR7PdGbx3ISq4aLhe6eOkP2EoYjpPcy9oMgzIk0Ui/0aQ8CGuvPdNy350KDqdRyY+qoo5UOOdn8= X-Gm-Message-State: AOJu0YyJjfg2Wk2DQbIyK8g1sW8qxPEE3eiMKUAHvqHmwcM0SggU/o8x +k85wy0Ix4jDWd17m4Lt0g/pDkHPYe7W7N3nB6CMSQJGRSStRyNW X-Google-Smtp-Source: AGHT+IGZKCeHbdpZnC4EweEwQmwtBWRZ+S4sbJW/37Uh5PCThKo1erX7w5/3y46PUkfco7QUlVNAYg== X-Received: by 2002:adf:f44f:0:b0:33d:2b46:3ee3 with SMTP id f15-20020adff44f000000b0033d2b463ee3mr8723764wrp.22.1709129927170; Wed, 28 Feb 2024 06:18:47 -0800 (PST) Received: from localhost (54-240-197-231.amazon.com. [54.240.197.231]) by smtp.gmail.com with ESMTPSA id j10-20020a5d564a000000b0033e0523b829sm549869wrw.13.2024.02.28.06.18.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2024 06:18:46 -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 v9 1/2] arm64: patching: implement text_poke API Date: Wed, 28 Feb 2024 14:18:23 +0000 Message-ID: <20240228141824.119877-2-puranjay12@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240228141824.119877-1-puranjay12@gmail.com> References: <20240228141824.119877-1-puranjay12@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240228_061849_534888_C8DB45B8 X-CRM114-Status: GOOD ( 16.32 ) 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 Acked-by: Catalin Marinas --- arch/arm64/include/asm/patching.h | 2 + arch/arm64/kernel/patching.c | 75 +++++++++++++++++++++++++++++++ 2 files changed, 77 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..255534930368 100644 --- a/arch/arm64/kernel/patching.c +++ b/arch/arm64/kernel/patching.c @@ -105,6 +105,81 @@ 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; + + 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); + + 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;