From patchwork Wed Jun 7 09:18:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13270277 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 EA1BEC7EE2F for ; Wed, 7 Jun 2023 09:18:54 +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=CqMpAA9r1AHCC1hK+wKf28DDbVZTTk2ogbDFIUn/exg=; b=fissBexCURKr0G tzPQ2erapF/kAYZSXSOv2d2wQYNPAOt8AKLfMzQsayh3njBFgCqtTeTuSI6sY/quPXh7gAK1eU7OO A9PDgyGrCVrbN+76VGj/sY49EneSaDq2xj/bq7NYhEwL/JEr6yXpZMwC95LtT6JLUMOFUNpk1PK+Q ruGZJny3sMPCdy/dMVW1poLpTcOqqrQkAknYLdQkgqSI/Xk1hM/oHcJGZfZ/LXzVw2yfd+7R3Aq/6 nH79P1gXkGgqLuTR/XInp7bUPWxbPCM+9z4xt1aXsyva9Kwebqw+87qU4GgNewzum0F4bQI1UA9rV rsUo8optJjrJRQhhyqZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6pJD-005CX7-0R; Wed, 07 Jun 2023 09:18:27 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6pJB-005CTx-0E for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2023 09:18:26 +0000 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f7368126a6so31151175e9.0 for ; Wed, 07 Jun 2023 02:18:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686129496; x=1688721496; 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=F6Uppj2L6gcNwq0WUQbsPWgkus8exJN5v10BeGre/uY=; b=LkdeFZV14HqmY7jjdKucV4Ug1wKVdn6BKJ6VT2TsWcNkAzbMV/4uVxeur1uXrcccZA p4R+hxApHksn6Sl7gS6C7xyGa37wg+Va7LWIXh3c2U2GNY3TQaf+448yIXMxuzPi6x7a x8erRK9jXNL5MfSZP/R6In7v92OY9c8xRIQY6zMyBITN0fvmrhn25qKSLhpsIvWwXNVc h2kR4lLpvYixrEC6AeQxSG5KbFXFBNiNJa1tscBtEv92Re4YtFoX6QwTBC7zzqq1lNDb dlK6YMd8F0y3YaKtA/uVot3nFlrDnoKJosfd66W4/dkNHzPJv0y7wk4Fcs45/ttcRnCu PuYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686129496; x=1688721496; 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=F6Uppj2L6gcNwq0WUQbsPWgkus8exJN5v10BeGre/uY=; b=hJfWbUszJUlf5pImYldraeuPdNi1gbw1rMFKaR8XkmHQSjTGfF/DfQB26KT/UivCfH uS5TmwmF1fHMs+VC87HoETV4/rde1kNMhEGjNEz07kRWUKdeB8aCrqvJCzwEp3daRRDx nISDHOwq2mEWiXXDtUkl7YZJKrOFgQfFQ41jyD9snhtAcsUXJ5K/BnSIqqDcDB8T3Tyo snO0kHDv6Wydx8E120xyTJpov7+SLoKlKdpL8q6EnNgZfdDFX2C+fvAR8k9YX+EQkpQ3 AJzUgStpuxXbUib3payAPqPEsck6vl7dA9KNRnycSw7YsafHPyOId9+/HcRNiPXWI6sr haHw== X-Gm-Message-State: AC+VfDxHvsoFMqwsp6+eHT4aY+CIpyuvoCeteuOxWbc4bCCmRHdfVISZ pAQQvuL7oUJRZEsK8xQQ6Gk= X-Google-Smtp-Source: ACHHUZ6fWYdp7Lua7CKdp+yQFwnOkFtOA2YLDXvuvLbB9rpyF1l73XYHBMSPmnzPLur7GbEFH44EhA== X-Received: by 2002:a05:6000:12c4:b0:306:2d15:fc35 with SMTP id l4-20020a05600012c400b003062d15fc35mr4048090wrx.37.1686129496225; 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.15 (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 1/3] bpf: make bpf_prog_pack allocator portable Date: Wed, 7 Jun 2023 09:18:12 +0000 Message-Id: <20230607091814.46080-2-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_105254_73F4729D X-CRM114-Status: GOOD ( 14.81 ) 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 bpf_prog_pack allocator currently uses module_alloc() and module_memfree() to allocate and free memory. This is not portable because different architectures use different methods for allocating memory for BPF programs. Like ARM64 uses vmalloc()/vfree(). Use bpf_jit_alloc_exec() and bpf_jit_free_exec() for memory management in bpf_prog_pack allocator. Other architectures can override these with their implementation and will be able to use bpf_prog_pack directly. Signed-off-by: Puranjay Mohan Acked-by: Song Liu --- Changes in v1 => v2: - No code changes. - Added Acked-by: Song Liu kernel/bpf/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 7421487422d4..2bc9092bf9be 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -860,7 +860,7 @@ static struct bpf_prog_pack *alloc_new_pack(bpf_jit_fill_hole_t bpf_fill_ill_ins GFP_KERNEL); if (!pack) return NULL; - pack->ptr = module_alloc(BPF_PROG_PACK_SIZE); + pack->ptr = bpf_jit_alloc_exec(BPF_PROG_PACK_SIZE); if (!pack->ptr) { kfree(pack); return NULL; @@ -884,7 +884,7 @@ void *bpf_prog_pack_alloc(u32 size, bpf_jit_fill_hole_t bpf_fill_ill_insns) mutex_lock(&pack_mutex); if (size > BPF_PROG_PACK_SIZE) { size = round_up(size, PAGE_SIZE); - ptr = module_alloc(size); + ptr = bpf_jit_alloc_exec(size); if (ptr) { bpf_fill_ill_insns(ptr, size); set_vm_flush_reset_perms(ptr); @@ -922,7 +922,7 @@ void bpf_prog_pack_free(struct bpf_binary_header *hdr) mutex_lock(&pack_mutex); if (hdr->size > BPF_PROG_PACK_SIZE) { - module_memfree(hdr); + bpf_jit_free_exec(hdr); goto out; } @@ -946,7 +946,7 @@ void bpf_prog_pack_free(struct bpf_binary_header *hdr) if (bitmap_find_next_zero_area(pack->bitmap, BPF_PROG_CHUNK_COUNT, 0, BPF_PROG_CHUNK_COUNT, 0) == 0) { list_del(&pack->list); - module_memfree(pack->ptr); + bpf_jit_free_exec(pack->ptr); kfree(pack); } out: 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; From patchwork Wed Jun 7 09:18:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13270279 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 214A7C77B7A for ; Wed, 7 Jun 2023 09:18:59 +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=ymvv73twtqtW/xkInzmhx1Gbao9iJSG4yFeZNqSqfS4=; b=egwAkGhGWPuxH/ PClpLWcjreQNqvMpV+N1OmzxPgbUCVeio5+W73VpR6sdQAWzcgFAdN8KwJLcngTfIL7fofDPj/7qf HoIsmz66RXoogH7x2BpsuyWeRW39+HnLPE/TzWS4sE/nAYKWtbY7ZXy/OYnAUONe8/0wHK/lphFBP m/DK5twd+fA92PbocipDqqneStGH/H7vkVbrKuA4e4/tvIGR8n65EQxoTkMXjEJPh7H7NNI/H4RAp iI/IUglk6GVqY6rPMJ3fVMh1GZOU76TcXjTIkVm+bSSsK+ZmL/2fOLvSYIVRgGuRgmM2BpPoTBNbM AnhT9xPvSMDnUEfedzyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6pJH-005CaC-34; Wed, 07 Jun 2023 09:18:31 +0000 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6pJB-005CUG-1t for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2023 09:18:27 +0000 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-30c55d2b9f3so5110745f8f.2 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=1686129498; x=1688721498; 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=NQpeinNjTN0IF7+hO8InCuCzwrWYn1/vH2w52Qt2rd4=; b=VzqHDl6lOMD3HiwAyg8OxPey2tZxHaf1steCEenzmBRJl8OVFpjV2Ot/ev4ZbqCxvz DXkXkC0Go/j5oqs5kV158udvvw76vh/FfYVcRetNazxf48QldJ1DuOVpdpw0oVlS0ayd HWDq/UxiRPpX8fvx6Mwo5FaMbc5RDF9KoklcIgR19NevlXK1S9U3Y4rVyUJSoFtNfMVo RSBVBrua30Y0Wt864k/etgs247zGnSFHmS4A2n/C/LTEJJxH/6uLkkSr/+N4ft1VQiJB 6/t88SyMh5K0MbPWtoE1VlMH3i+hhDxL/94Sj2MU1V+E4hhNz9AWcR3/wZWSO1NmoxTg bUeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686129498; x=1688721498; 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=NQpeinNjTN0IF7+hO8InCuCzwrWYn1/vH2w52Qt2rd4=; b=JhVEdG2ZV23UhPYmUYeejR3cYg7qqFUv4Dj0XcBD/gJwS0sIymh2fNEzkq857N/G/W 4FTpIH/qp6v/yunJJtGeuz8U+4YG4hWP3G0dRyFUO1l6fyadV5I/XAAqidu3RDqP3XrO GUNdnFeWJeHaeLieavEfNWuCD5+S8W4VxYPCp2QI8d3nteT3APkK3szdcDjAx6JibSwp 0Tl5ELkyUndRk+zIJki0Gtzdovot8PRhSgYpCXI/V5CcM0R6jToCf/giqnbkkQF60yvq JKVgN1C3BzW0enqiX6STbUqiYL9VEW/agZPpLR6Daa+Mqs52P/djgOI+f0+k00/ujyMH 14xw== X-Gm-Message-State: AC+VfDxEyu1i0D/M0BIbDYA05sRL57uEnSv0lLoguB3gkiz0RJ2f0mHG zB9TeWLw8u3NMJmw3IYNM9Q= X-Google-Smtp-Source: ACHHUZ6AEdjKTyzCwtUFuQ2E095E6XSGXJ158xUnhKThyKAJY7Bn3UJugtNyXWJZsbekPMv2hN6LVg== X-Received: by 2002:a5d:4990:0:b0:30a:e8e8:c172 with SMTP id r16-20020a5d4990000000b0030ae8e8c172mr3496896wrq.26.1686129497527; Wed, 07 Jun 2023 02:18:17 -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:17 -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 3/3] bpf, arm64: use bpf_jit_binary_pack_alloc Date: Wed, 7 Jun 2023 09:18:14 +0000 Message-Id: <20230607091814.46080-4-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_624612_53620E73 X-CRM114-Status: GOOD ( 25.26 ) 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 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 --- Changes in v1 => v2: - Made the naming of ro_ prefix consistent. Now image/header/image_ptr are read/write and ro_image/ro_header/ro_image_ptr are read-only. arch/arm64/net/bpf_jit_comp.c | 126 +++++++++++++++++++++++++++------- 1 file changed, 103 insertions(+), 23 deletions(-) diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c index 145b540ec34f..0e38fa63b551 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,20 @@ 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) +{ + __le32 *ptr; + int ret; + + for (ptr = dst; len >= sizeof(u32); len -= sizeof(u32)) { + ret = aarch64_insn_patch_text_nosync(ptr++, AARCH64_BREAK_FAULT); + if (ret) + return ret; + } + + return 0; +} + static inline int epilogue_offset(const struct jit_ctx *ctx) { int to = ctx->epilogue_offset; @@ -701,7 +716,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; @@ -717,12 +733,11 @@ 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)) + 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 @@ -732,11 +747,20 @@ static int add_exception_handler(const struct bpf_insn *insn, * modifying the upper bits because the table is already sorted, and * isn't part of the main exception table. */ - 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; @@ -1446,7 +1470,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; }; @@ -1455,12 +1480,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; @@ -1487,8 +1514,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; @@ -1533,18 +1563,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; @@ -1552,9 +1591,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) build_prologue(&ctx, was_classic); if (build_body(&ctx, extra_pass)) { - bpf_jit_binary_free(header); prog = orig_prog; - goto out_off; + goto out_free_hdr; } build_epilogue(&ctx); @@ -1562,34 +1600,37 @@ 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); + bpf_flush_icache(ro_header, ctx.ro_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 = NULL; goto out_off; } - bpf_jit_binary_lock_ro(header); } 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; @@ -1610,6 +1651,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) @@ -1617,6 +1666,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; @@ -2221,3 +2277,27 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type poke_type, return ret; } + +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_jit_binary_pack_finalize(prog, jit_data->ro_header, + jit_data->header); + 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); +}