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: 13575576 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 31290159583; Wed, 28 Feb 2024 14:18:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709129930; cv=none; b=hl86C4AHcUzQtAyh41oe/YB+ki9KZuVKRpaTwwt3HEonscwmP0630kSGo9s0sO/kUFq5RZ98dM7h+VrRCMimIvrA8LUHFu3nV3fYpk4Z4yh6GI2FThlkXnxeVr7ni+8LmJnRAPEURc271xcJCxJJChrWjATLB9fX9S4gbJvF6QM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709129930; c=relaxed/simple; bh=ji9XrjR2l6IynyyqHZa6QyN4+F+AU1KRVcNv88MANkg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ikzhsRjb+rMnzllB/phMKlInXnh4l3L+tamM7F6CNk5ABdKOEyUegZI/RRpcQ5F/haO307AO4WKfgbTRdyUl7b8tqf2sMnLeHRWI7k6Oq10fIYPwo+pAea7DQExV5uA6q08iCBm07oXfUnuZ+xdGawXV8hoDjwvjY1nsqyPqV38= 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=cEToAbZY; arc=none smtp.client-ip=209.85.221.50 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cEToAbZY" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-33d28468666so4672661f8f.0; 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=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=bJut5fiJS301DH5MoBc/mIfNczO2XYfdN68aAnP3/sk=; b=cEToAbZYbRM8BpgnLJner5ASYxqgjAMEXsEGRQXKDgJN4d4NyZWRbGiyKo9jqj4r6O N/dvOpGAfEJrgHfy9PRcN6uVw4uXlkowWaAimcHjzaQbdBrHd8Ut728iLOsFXqnHIceq 5SXesbH0F8c2+RGEJHnQusXnYsnWMIWFtAQ6Ndem+hfGbnhQWpBr3oZ6LfqHH1J4ckCs WGC7ZUMUfPKxxyuIbMNqgrvJD3KpGjUY2cIwVqq0isuCCwXg8+wuvR2pQa/mFsBTaxhu Fo6cxKLGxrFnm1VOtTqpQHRNqJbmufRFA499Mo6wDXVxZ3xEQhbTrZ/5Mz4E1G0StRY3 eVAA== 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=K+KMVLYKe9R7yOUxC5Ye+BhYLgSdevA6NvMMsC541I19kthov5OOIcjIafU/IaJw4J OA0xWE84tvviSBKTJTq/krKnH/ZNu6g5t170Xi22YOtxJsCq5M4qRGfoiMviY4K+Icr9 r6c0lcwua8WZmWfMBDmuTZ+jKn2ttF7ELNlsVZxElg9XV5Y8DJdQZVILPb+aExEJr9Vl 9n3Yag1p/ZLKGKx+Y85o4Ha762MCE+kCUTMDdmPCUwGL9hSCLvwfjtwaI6WmzL2cQr/9 pmCLRzHxLerusn6Zjc5RmF8jnnK+MU5ATpQlg9TjMdnPwGHBu6rEbfj9kpkorj1QVMCr 5bMw== X-Forwarded-Encrypted: i=1; AJvYcCVKd8wPuLVq0YKhUj+tgliIn2VPKEgRAL6Cv9qekpL0iMUr/TEkJRdYSMuTtGj+KFc8nmlCSAZA+uIqk4CwRtZwxrE9saGetC91GpaNalTwnoQ8lQBIXJ/BzjXE7uUQJMD9 X-Gm-Message-State: AOJu0YzZb9hAdQX/TW+Mrl8/B30Kc+GZv1svVnc65CHHG5BQGnZod+hE 4Z6yklnDJd4/V1iVJ/gbL5nrA5BM7D3o8fsfDqWzfl4+3SPLM6QE 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> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net 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; From patchwork Wed Feb 28 14:18:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13575577 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 2A9D215A483; Wed, 28 Feb 2024 14:18:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709129934; cv=none; b=AKF7kv93UuzpzWqtboKIBFJrtIurXbHR+Nggb94dFXus1EZZVimFyUKgYDunjexcikMoKtkdQorvoJPaZPgJQGW2x1eOIBKT9TM6PPd/9+EKC8NR0mQ/kxiKIUZfgsEUv0d6WfJiGt4z9+2IvBdh9sM+GD4xSrpAuLPTecBgxoM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709129934; c=relaxed/simple; bh=Lb6WOJpmbL6yhWca7DMvH3EzVEOAne9WFdlf8/NrqmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FoP2g77wuBlZk0WCtom4ywoP50uxRpatvhgNT0dJRJg4JNd1dJV5ZcfbG90hj7n7IAuXbtXSOADaRyiv94/SYEHVaEbGX05kOccxFLYva6Cd71JqaNL947PBnfMgZvu4rRJQpJ7M2nGG4n2t11Q6XefLO9erNKnGIAOIt9b+CNs= 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=mAbjkqjk; arc=none smtp.client-ip=209.85.208.178 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mAbjkqjk" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2d204e102a9so66850281fa.0; Wed, 28 Feb 2024 06:18:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709129930; x=1709734730; 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=csDUbH6X7CXbrjicyKn5ESv6sROaHr3N3blVKrUn1e4=; b=mAbjkqjku6Jj5j+aIqmI7XaeBpTghIBVX5f9NCaV7+wWwryNsQOVdqsF3J7cVRxXBn KCAdd5KCL86qaoH2/F+pBa03kV+aRuRNcd7AS5NtfTTiP/1KUp+o12wRG4vRx44m70IK /vmn/NWq8bK7k/GR0p1mbJndCNWANvdfNYuTvqA6zl/9FE49Y04PLs1qtyCQsweKWj2Z 7ifNyypcOVTWCc9gaqNAEaExMBE5mPpUReWTZw9lxfR2G63qKD7CqyyAI5ZE/PucnVTk bx+O39mx2z4ZZwwXrRhIMoj274++qVUh5NqrMeIPsR9eA1Sc3bOBtCSzEPbfNDUOAHMm vQ6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709129930; x=1709734730; 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=csDUbH6X7CXbrjicyKn5ESv6sROaHr3N3blVKrUn1e4=; b=l/geP1d235GV574Kg3ygb+gLOG0tklFHOKM62DAUSfc2jq3uQZuCVzVEEX01TR+oHn I/7QVBMhfzmOd15oLVzUH5YUt5LRfPjZE/kkjIJPk5moVwxV5r5+Tzvae2HT23sQWQFG rLw+qhRuN5hmsBPhX3/R/dPCjdvS0oR1VSmsHl6qIkZKH3t7oPMq6C46dEgUVy0nK21Z OQ1qlkP9O3tli9X3kHC76XX4MUuVnwk+nlwH/sx8Dz49La8s5HIqyjyzMNDGAz7qEzTZ 6W3DYhYUeDLS0mmT1VxLLLp7V4l9H8ewjLzk2JeRGN0Y4vYHWaoQA8LiHiwMLD115h5J a4bQ== X-Forwarded-Encrypted: i=1; AJvYcCVIGmsLpn167q3/WKEgpKoykNXUyMGAGnWaHuvDI+oueWiYGcgVVWZfGfKnC5lVDOGyRPaTBAeJRysMKWrjnKZTvf4ILRvSuY0rl75x27l59zvu9w7ULIms1tQf1WpsRX4p X-Gm-Message-State: AOJu0YylX27mmhdXfDqJi+OYb/Gfo6Uz4sQinKh6pfULI5Vrx2bTvAtQ oHFOPLapEO90BzFIgjdnvndSP+RcR6jDc5lAMZpbep0byMY4MyNA X-Google-Smtp-Source: AGHT+IEoBh3+E8uW0ih+CZJ6IjNtkYpvRl9LMI9vBUTSgWVU2GZgI6m5wq23O4bP2YXRShzoINEsxg== X-Received: by 2002:a2e:b0c8:0:b0:2d2:7781:382e with SMTP id g8-20020a2eb0c8000000b002d27781382emr8253117ljl.32.1709129929840; Wed, 28 Feb 2024 06:18:49 -0800 (PST) Received: from localhost (54-240-197-231.amazon.com. [54.240.197.231]) by smtp.gmail.com with ESMTPSA id p26-20020a05600c205a00b00412b62f6e35sm1458437wmg.15.2024.02.28.06.18.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2024 06:18:49 -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 2/2] bpf, arm64: use bpf_prog_pack for memory management Date: Wed, 28 Feb 2024 14:18:24 +0000 Message-ID: <20240228141824.119877-3-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> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net 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 Acked-by: Catalin Marinas --- 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 20720ec346b8..5afc7a525eca 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; @@ -746,7 +755,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; @@ -763,12 +773,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 @@ -777,12 +792,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; @@ -1550,7 +1578,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; }; @@ -1559,12 +1588,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; @@ -1591,8 +1622,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; @@ -1637,18 +1671,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; @@ -1656,9 +1699,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) build_prologue(&ctx, was_classic, prog->aux->exception_cb); if (build_body(&ctx, extra_pass)) { - bpf_jit_binary_free(header); prog = orig_prog; - goto out_off; + goto out_free_hdr; } build_epilogue(&ctx, prog->aux->exception_cb); @@ -1666,34 +1708,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; @@ -1714,6 +1766,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) @@ -1721,6 +1781,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; @@ -2359,3 +2426,27 @@ bool bpf_jit_supports_exceptions(void) */ return true; } + +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); +}