From patchwork Wed Feb 21 14:51:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13565641 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 3AFC7C48BF6 for ; Wed, 21 Feb 2024 14:51:50 +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=0gxK9BnK5Z2ymNVjTdvdncusvyLKEtHgOftWI9oq+SU=; b=m69Phsr1JAXxuX AfjQ8gUfLP9OPhZjjrN//XWg9erIJxYiYh8zeYloIBmW/ZJxvgjV3kYOALfkD2+l0W01TcKVqg3Sx rt9mufZCmNWpEH1c/Xbb+0qw07ZkATT7l0o7iQNvuQ18IoMPUnG/gBsbLZrsz/PxOv6z9hOE9N7ck G0wsxFWhKJ9cZFyjmyPhKDUD0gmRl/HcCFtkJrslQBlNkWDw9WDiYs/hseVW0RU6r0ada5FNtpZRC y4W5Up8A+VURfvFO9/zl+8OUJePHkpF46hJOsEuc+qhHLRIgw3cwubq+haVayFtCzYQWPMkNto35a xMEWZTQf/xrpe5FfLUQQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcnwg-00000001MFe-3I5v; Wed, 21 Feb 2024 14:51:38 +0000 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcnwZ-00000001MDe-3Umz for linux-arm-kernel@lists.infradead.org; Wed, 21 Feb 2024 14:51:33 +0000 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2d21a68dd3bso68080521fa.1 for ; Wed, 21 Feb 2024 06:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708527090; x=1709131890; 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=l3fBbYBgwlF8mrXgT4JE//eUjXOu+3UQk4fgbjSlcgs=; b=DFR5lghf5kuifzsrxqdnuGTQZlx/CtPnbY+FoSKY2ofsVzwkZCzfR3HmDMefwwep+P SJNyjLtXmcsmcQLPlIsktavyZD+BC+KQ98bKw45+bptJHwjACGoS2SEJCLluXxdAylBl qX1kuMPtnOMbU94N+qyS2Mw+a4WRvIrGgq7coMpC0vkyW5flot/2TVfo0+MasdIZo2mH Q1AAfso1ur8lmkYdI629BqgdjV4Iw28S8JVXL/sEOXd93CetIxfn3/MNB1wRO/Muga6s xBwtlLljTtho50JWszDvm76VHIWyZNLsUwmzZJg7ilwAcEqgjrpgBN2h8PnMpVwZLJSB sSLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708527090; x=1709131890; 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=l3fBbYBgwlF8mrXgT4JE//eUjXOu+3UQk4fgbjSlcgs=; b=BqrgPdLz9v/rUUlQtpyvO1Z2xPy1ZD3Tf++DbPdT/uZfCJIWJR8dvHQ6K/2GTBYJtp 1qe1vE5TQr3+XuQRGV2FAlLXC/UbR65nfN2MjLMmgcg50hkD7lT4dlwPuNnCpciEyqMi /mEG/VQcEScEKCliyuw5g+c3ASSGD38Q/HWehNQ1uNZ+ZckmYJ/f4d+bCWf+YissSGp+ hVpAd3bKQjA+lk69DgJlLGn9eioCXqexoRvP0xrShgL0DWNjMxonVSZz8rQofFtbskPj vbooUBUVHAewhfaNJJ7xJ+fEgpvZ0Nh/04i/+7RMLu/Pnn+XhSrHYXTYKUGsAOzykACC fe1Q== X-Forwarded-Encrypted: i=1; AJvYcCUt0F8ejLRHEnsWNRh1dMMSlihqE4Ef+SpvYdU9+RT6xYWz2Y51mUKaApGI4vMHrSqTnbXZLznj3dvRZ/OJRkx8Y39b9aNTIBSG92fu83hwWYihh8o= X-Gm-Message-State: AOJu0YyuRTDW94EElYEu9+jrSumE7kKitUVW3wDukY/2oc/y9idsPRI7 SEG9Nia1rQw6619RQTKVxG9xWIc1O1RQ2czc0vcVs6hnz7X6HR65 X-Google-Smtp-Source: AGHT+IE74i5KM/mL0gIjIZOJQvTSzd02fZpQK72KtRDA5UZnuZl0x4Sf7VNqb2l/lp4LqmgThu9zMw== X-Received: by 2002:a05:651c:220c:b0:2d2:3129:3d93 with SMTP id y12-20020a05651c220c00b002d231293d93mr9476674ljq.51.1708527089520; Wed, 21 Feb 2024 06:51:29 -0800 (PST) Received: from localhost (54-240-197-231.amazon.com. [54.240.197.231]) by smtp.gmail.com with ESMTPSA id v15-20020a5d610f000000b0033d4cf751b2sm10441233wrt.33.2024.02.21.06.51.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2024 06:51:29 -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 v8 1/2] arm64: patching: implement text_poke API Date: Wed, 21 Feb 2024 14:51:05 +0000 Message-Id: <20240221145106.105995-2-puranjay12@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240221145106.105995-1-puranjay12@gmail.com> References: <20240221145106.105995-1-puranjay12@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240221_065131_907873_485031FF X-CRM114-Status: GOOD ( 16.36 ) 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 | 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;