From patchwork Mon Jun 5 07:40:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13267034 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 A4498C7EE23 for ; Mon, 5 Jun 2023 07:41:00 +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=yKWAzVq58X2uMx8GOKdX0kADf63rMfArLAbg5g/XBeg=; b=QOTo6ED4h1lWEp 75dpDTaoAhOydOf94dBm/VOpjNX7Uc7Gof3tqp/opm/dFvCqALwJNMpzDbqt6jFdQHbQj50NNAHC6 h/PVOKw2ZTf5L9HDp8rHLqrcYnY1WGAaYEUPCG/Xfim4aXCu3822mrD8HHA7SW5a0Ih+d8ymYJBp5 1L0W2sbt3b/rciTe7kaZWEGeXH4uM/zi+iG2HHGnba45ARtwhM370HSv03ovSupfCTxx4x+rbZZSB wUcVnuguImkyCdnM8sYhIvbK+fKVV6pt3mx/Ect2vzgOdXxN5MiJqYvvFzA+ForCZ1NqVln/voVmL GTXL3TEI4t4B7pomEYuA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q64pP-00Ea4L-2C; Mon, 05 Jun 2023 07:40:35 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q64pJ-00Ea0V-06 for linux-arm-kernel@lists.infradead.org; Mon, 05 Jun 2023 07:40:31 +0000 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3063433fa66so3951902f8f.3 for ; Mon, 05 Jun 2023 00:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685950826; x=1688542826; 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=+pHD5vwavBvGsj8sNf9HQSglXSh8RHVyAD0WLni3C3s=; b=bu/NBxKUkF9CtjVI3uj8QZ1QwcCrIKeKY/dligJ87i9pSlv0nvmonF8zPHIXLwSpEk OYfpRhP0PUx2rSrf+PRN+XTnycoZzlGUkdnFDnmo90xU3LLRfp0K4AaJYxyKdiMNn51t UrkosQlFVB1IhXcanqQXDBfBylBmut/9yIpxUkiHZN8d9k9tQ1/IQrqiL9Iw/Vvja9xk /O/G4CBFAbkYM73sXL1ercfyUatJKHQ136/R464/dbRsHlEtIXJUiAKbtvVF3cCiW+8G sEeOe+lFLwyCDqoqIscA9bo3vneH40uzwhO/f8+4CWO+q/dbx3glsY9wxzgCxtqd2QwU Gqmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685950826; x=1688542826; 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=+pHD5vwavBvGsj8sNf9HQSglXSh8RHVyAD0WLni3C3s=; b=jeM0Dlbgvgfr1saaDEwHQwnITApWlH0XQvoh4fO3jPACSvmoHFXhL3qm+enqiOmO2T cWXtHwpdu+u9Lu7UKb5WThektOAGnyCueM3qacLj/qJO5p8fwDnEmtx/o+ff9Qgo4a3k 8LktulaxB6Q16QyExDGpNCXNXbGOcSaJ/dpvEWEL8cUFD+sFbliimBQJy37JEj7HORnj qPQkZ5pvtlsYsXiRnOyXXXysrWjMLdMByUQkqK0V8S2BYpO4I72t4j/Nvh4lgT5Nk2b8 ps6jlMjYuMjZzjOVtsq/98sHUDs3TGEsFj/6nWslg1cLPL6N5AnBjDSOWHHSGuXv9RQv tjwA== X-Gm-Message-State: AC+VfDzZbhwUxt4o7FmsrH3xHOR8kpoJSK7iQnwypyU1pGpYdNWC3xZ6 y4TWivXnQ5Nb6Jg6MxiP//Q= X-Google-Smtp-Source: ACHHUZ6t1xZUQz6H8XdTyrJFyOohGdCQm57CG3WkeJlZ7Wilz4FOVCI9Y6y8nAhi7n6LNBLf3p9HkQ== X-Received: by 2002:a05:6000:108b:b0:30a:f143:25d2 with SMTP id y11-20020a056000108b00b0030af14325d2mr4232918wrw.5.1685950826210; Mon, 05 Jun 2023 00:40:26 -0700 (PDT) Received: from ip-172-31-22-112.eu-west-1.compute.internal (ec2-34-244-49-215.eu-west-1.compute.amazonaws.com. [34.244.49.215]) by smtp.gmail.com with ESMTPSA id c18-20020adfed92000000b0030ae499da59sm8882103wro.111.2023.06.05.00.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 00:40:26 -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 1/3] bpf: make bpf_prog_pack allocator portable Date: Mon, 5 Jun 2023 07:40:22 +0000 Message-Id: <20230605074024.1055863-2-puranjay12@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230605074024.1055863-1-puranjay12@gmail.com> References: <20230605074024.1055863-1-puranjay12@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230605_004029_070071_092583A3 X-CRM114-Status: GOOD ( 14.35 ) 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 --- 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: