From patchwork Wed Jun 7 09:18:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13270276 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 C9310C77B7A for ; Wed, 7 Jun 2023 09:18:52 +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=V3ZOZNteu8kj7T2e78TygFGdPSKblVh1diaE7KWo7mk=; b=EWJ0ai7/a/RegB fzQ+2a3YG96ARPBQjmZGFMlrkIw6xQRFQDyO+LBm6KHJtWh9NPcuJMbFWo38FFb8KOl0VaAT/BYt/ 0bEQ+33PMZ0g4QUYjjckge7I827xVeY0BjsqnJg7GLFBKpLbJE/4eokahHm4L6vLmkyuZD5hPS91p 9P10uYjfFrQMrULOnpAx1wFFEMGvdt8aIYbWGpp7y6euMgkaobJEFKI3ZtW8MvLwDGkko5rhMp7ZN d3Ssrk6MEaO3HkJmHT+WfEdMsZ+FET0I+im+nQBj0+O0TSq1ukUfS+s943rDDLLlwjNx7O9wQozC8 tugGj1OpglANR+sabBsA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6pJH-005CZh-16; Wed, 07 Jun 2023 09:18:31 +0000 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6pJB-005CU8-1f for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2023 09:18:27 +0000 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-30aebe2602fso5629963f8f.3 for ; Wed, 07 Jun 2023 02:18:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686129497; x=1688721497; 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=/lkLOrfbLwxQBuKCgg2v6eUJGy7ljmtUTJaDjGst/PI=; b=ioemZU0vs4s2VNh5psWt9NncrDXdRyMwFpmB2vQSg/pzC5pqoKTYpw0ulo18s7d9Gt M2mtR68XGo+5O++/vXHwI6YEVPmvH9rYSyijzzPdCy2lJj94RwE2OkLwooNLTurj+yhr twTFNtPW7z/sd/vYEslIi3NtEZvFyS78g/lI1WoYmbSzGPIQ9uABsxb1izO+iu01fx0q HmKFipQuLMvRMGILVBVaAts5rP8TjVpvjZJBcr8Jcbh/eEXCyWwuWRVrL2m/m5hoGSy8 P5CEIJQX7iHkR09yz1E0kNxF8GiO1FxmkGxfPdw1wBONI8H54093CdH7dz3KCUNXF5+H eD7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686129497; x=1688721497; 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=/lkLOrfbLwxQBuKCgg2v6eUJGy7ljmtUTJaDjGst/PI=; b=BpDDe4UcqOUP44MsOdEzfbmsBd+cyeCE/RoV//uC4mTLomyCzUz5lqMoemjZCsdowL m444K8KeU8Kpxfk1n8x7a2ioUBI8l0+wub+B7SXYtGVT8paOFy26IbRheCF85EewS9vB ib04Pr1mj2IAFSxk8NdBb9FZxHJ7JEICc6D7Y9eNWZpxZ4NiXwM4OWzCIbIMDCNbol/M Xu1+C29EjGNnJEcWh+IX+rwHMhJ3qkxAOuPqP2tM56fMwXGIVTCxGGrtNS0CefCqhw4b zX7AlnZdwkR0ML7zq6RZKyJQ5vWZgG3+DOTRe7gH5s1zR7cahDpLU5XrGGsPG/Qfh/5O KexA== X-Gm-Message-State: AC+VfDx5J57azMEuJQI9SCLr4ffSZVpETTN2BJB9rS11nZMY8XQPfWYI SV0VwIXM5vAWPIFE4rjZs6Y= X-Google-Smtp-Source: ACHHUZ5EnXF/NBVW4zZT1KeJPuaUv9qX/SlLTHEQB20HcWrVNWCm2ugTxoJhyB24jDt8yZY9pGDAxw== X-Received: by 2002:a5d:614b:0:b0:306:2b40:1258 with SMTP id y11-20020a5d614b000000b003062b401258mr3249305wrt.21.1686129496853; Wed, 07 Jun 2023 02:18:16 -0700 (PDT) Received: from ip-172-31-22-112.eu-west-1.compute.internal (ec2-54-74-169-43.eu-west-1.compute.amazonaws.com. [54.74.169.43]) by smtp.gmail.com with ESMTPSA id cx14-20020a056000092e00b003078681a1e8sm15141958wrb.54.2023.06.07.02.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 02:18:16 -0700 (PDT) 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 Cc: puranjay12@gmail.com Subject: [PATCH bpf-next v2 2/3] arm64: patching: Add aarch64_insn_copy() Date: Wed, 7 Jun 2023 09:18:13 +0000 Message-Id: <20230607091814.46080-3-puranjay12@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230607091814.46080-1-puranjay12@gmail.com> References: <20230607091814.46080-1-puranjay12@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230607_021825_561655_837B8B5C X-CRM114-Status: GOOD ( 16.34 ) 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 This will be used by BPF JIT compiler to dump JITed binary to a RX huge page, and thus allow multiple BPF programs sharing the a huge (2MB) page. The bpf_prog_pack allocator that implements the above feature allocates a RX/RW buffer pair. The JITed code is written to the RW buffer and then this function will be used to copy the code from RW to RX buffer. Signed-off-by: Puranjay Mohan Acked-by: Song Liu --- Changes in v1 => v2: - Renamed addr/opcode to dst/src. - Added Acked-by: Song Liu arch/arm64/include/asm/patching.h | 1 + arch/arm64/kernel/patching.c | 39 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/arch/arm64/include/asm/patching.h b/arch/arm64/include/asm/patching.h index 68908b82b168..f78a0409cbdb 100644 --- a/arch/arm64/include/asm/patching.h +++ b/arch/arm64/include/asm/patching.h @@ -8,6 +8,7 @@ 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_copy(void *dst, const 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..419a9428402e 100644 --- a/arch/arm64/kernel/patching.c +++ b/arch/arm64/kernel/patching.c @@ -105,6 +105,45 @@ noinstr int aarch64_insn_write_literal_u64(void *addr, u64 val) return ret; } +/** + * 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, const 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 = dst + patched; + size = min_t(size_t, PAGE_SIZE - offset_in_page(ptr), + len - patched); + + waddr = patch_map(ptr, FIX_TEXT_POKE0); + ret = copy_to_kernel_nofault(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); + + return dst; +} + int __kprobes aarch64_insn_patch_text_nosync(void *addr, u32 insn) { u32 *tp = addr;