From patchwork Wed May 15 16:57:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 27510 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 412B927BBE9; Wed, 15 May 2024 18:01:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CBE1927BBEA for ; Wed, 15 May 2024 18:01:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7HzH-0001to-4L; Wed, 15 May 2024 13:00:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s7Hz5-0001pB-RY for guix-patches@gnu.org; Wed, 15 May 2024 13:00:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s7Hz5-0007GO-Dd for guix-patches@gnu.org; Wed, 15 May 2024 13:00:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s7Hz5-0007Cy-Tr; Wed, 15 May 2024 13:00:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70962] [PATCH 14/14] gnu: linux-libre-with-bpf: Deprecate in favor of linux-libre. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Wed, 15 May 2024 17:00:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70962 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70962@debbugs.gnu.org Cc: Maxim Cournoyer , Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by 70962-submit@debbugs.gnu.org id=B70962.171579238127560 (code B ref 70962); Wed, 15 May 2024 17:00:07 +0000 Received: (at 70962) by debbugs.gnu.org; 15 May 2024 16:59:41 +0000 Received: from localhost ([127.0.0.1]:43182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7Hye-0007AL-L2 for submit@debbugs.gnu.org; Wed, 15 May 2024 12:59:41 -0400 Received: from mail-yb1-f172.google.com ([209.85.219.172]:48326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7HyW-00079I-US for 70962@debbugs.gnu.org; Wed, 15 May 2024 12:59:33 -0400 Received: by mail-yb1-f172.google.com with SMTP id 3f1490d57ef6-dee9943a293so3282009276.0 for <70962@debbugs.gnu.org>; Wed, 15 May 2024 09:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715792305; x=1716397105; darn=debbugs.gnu.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=cJ7qdwMYvo8B580eFh3gMGb0hMbjBsQmFxXAwFf70Mo=; b=Diip9jsNbQz7fWpkjhHApXgSi8owKQk68As/Oj6f/3w2mSRRWD4PrZNg4NK3LTUl5K D8dLdmi16BamuRUuxeOCvJGbigvAgneFn8keiH+Qc92xb3Lr5hwRwLS1T/9QwnmYbeZm vsEoLwaR5RCABN4yu6HQA6rrwPkkrIIN+OlUuObh7bMFSAcrrUM/Z1J/PtX5ioG4jOWt 4nCIka3xk0bUv0Glj1Hca9MGB0NApJpXpNUW58ZKEYk1AiXkzu8gjELvDy1IVJJDoFKO rkJlxP135R3IPIULGkhGQwIAYd7b4RGSH5+dx9OAPm4VmeLHvSe1nO7zFW0+qwsLCdzt cU/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715792305; x=1716397105; 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=cJ7qdwMYvo8B580eFh3gMGb0hMbjBsQmFxXAwFf70Mo=; b=xTJfIm1kxmAK2zmOdq3BxrnPONZcJuCx6oT2WHd38YNVgYI/xzEct2mAaFKinT6Zwg n+BJs7Iawvu688skqyw4nWfHaTovY0m7jmK0RkyR0gRA/MNiuQlZC64ts0KiPkq3A2He vXw8lbqXFBF8BEaOffEMlzAUlHlGkelF0kuXE1UyFsBjM0wzRHWdZI9NSjBmh5yseiJk CZTBygrkkHrImMtR1AEmRTK1qkn/5trTbr5Z5GHT/w7TSyLxMfzsyecFNiLThSBcFDlI 10dvjgQnP5qg/VWujm39e6U/887cov+IT8fa2Ar26zjbc8uglhgv/zGwjb2P0/zeYoN/ IPAw== X-Gm-Message-State: AOJu0Yym6sJNbHiRKDSR416/J7r1esSTNZVV/ROuSgwH9VCTTpEF4BSr AfWmxvVetQVrNSH/YWqbegreiRxpTC0LF+VkGjPKwLxAF/YZ+Dskuuqhdg== X-Google-Smtp-Source: AGHT+IHkg7HVmLR4GLCzvyAOD5pA+3k0OqtCcmTJOimk4ZB2mZLfHasnsC0NZFn/NZFU8jvNMDz+2Q== X-Received: by 2002:a25:cd44:0:b0:de6:437:2df5 with SMTP id 3f1490d57ef6-dee4f1b0e6bmr13473684276.26.1715792305279; Wed, 15 May 2024 09:58:25 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-125-107.b2b2c.ca. [205.233.125.107]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6a15f194871sm66068896d6.59.2024.05.15.09.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 09:58:24 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 15 May 2024 12:57:24 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <7cf609dcf83c85b6897c9fb9af46ce8a854a15c8.1715791830.git.maxim.cournoyer@gmail.com> References: <7cf609dcf83c85b6897c9fb9af46ce8a854a15c8.1715791830.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The kernel has progressively enabled the BPF settings, to the point where having a separate kernel for it makes little sense, so repatriate the few non-default BPF-related configs to our main kernel. * gnu/packages/linux.scm (%bpf-extra-linux-options): Delete variable. (default-extra-linux-options): Enable CONFIG_NET_CLS_BPF and CONFIG_NET_ACT_BPF. CONFIG_IKHEADERS is dropped as it adds 4 MiB to the kernel image and appears somewhat redundant with BTF debug info. (linux-libre-with-bpf): Deprecate to linux-libre. Change-Id: Id672241916dcbcdca7cbc16d869d00223446cd3d --- gnu/packages/linux.scm | 46 +++--------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7147a6b41a..96921805db 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -847,6 +847,8 @@ (define (default-extra-linux-options version) ,@(if (version>=? version "5.13") '(("BPF_UNPRIV_DEFAULT_OFF" . #t)) '()) + ("CONFIG_NET_CLS_BPF" . m) ;classify packets based on BPF filters + ("CONFIG_NET_ACT_BPF" . m) ;to execute BPF code on packets ;; Compress kernel modules via Zstd. ,(if (version>=? version "5.13") '("CONFIG_MODULE_COMPRESS_ZSTD" . #t) @@ -903,30 +905,6 @@ (define (default-extra-linux-options version) ("CONFIG_CIFS" . m) ("CONFIG_9P_FS" . m))) -;; See https://github.com/iovisor/bcc/blob/master/INSTALL.md#kernel-configuration -(define %bpf-extra-linux-options - `(;; Needed for probes - ("CONFIG_UPROBE_EVENTS" . #t) - ("CONFIG_KPROBE_EVENTS" . #t) - ;; kheaders module also helpful for tracing - ("CONFIG_IKHEADERS" . #t) - ("CONFIG_BPF" . #t) - ("CONFIG_BPF_SYSCALL" . #t) - ("CONFIG_BPF_JIT_ALWAYS_ON" . #t) - ;; optional, for tc filters - ("CONFIG_NET_CLS_BPF" . m) - ;; optional, for tc actions - ("CONFIG_NET_ACT_BPF" . m) - ("CONFIG_BPF_JIT" . #t) - ;; for Linux kernel versions 4.1 through 4.6 - ;; ("CONFIG_HAVE_BPF_JIT" . y) - ;; for Linux kernel versions 4.7 and later - ("CONFIG_HAVE_EBPF_JIT" . #t) - ;; optional, for kprobes - ("CONFIG_BPF_EVENTS" . #t) - ;; kheaders module - ("CONFIG_IKHEADERS" . #t))) - (define (config->string options) (string-join (map (match-lambda ((option . 'm) @@ -1396,25 +1374,7 @@ (define-public linux-libre-mips64el-fuloong2e (default-extra-linux-options linux-libre-version)))) (define-public linux-libre-with-bpf - (let ((base-linux-libre - (make-linux-libre* - linux-libre-6.8-version - linux-libre-6.8-gnu-revision - linux-libre-6.8-source - '("x86_64-linux" "i686-linux" "armhf-linux" - "aarch64-linux" "powerpc64le-linux" "riscv64-linux") - #:extra-version "bpf" - #:configuration-file kernel-config - #:extra-options - (append %bpf-extra-linux-options - (default-extra-linux-options linux-libre-6.8-version))))) - (package - (inherit base-linux-libre) - (inputs (modify-inputs (package-inputs base-linux-libre) - (prepend cpio))) - (synopsis "Linux-libre with BPF support") - (description "This package provides GNU Linux-Libre with support -for @acronym{BPF, the Berkeley Packet Filter}.")))) + (deprecated-package "linux-libre-with-bpf" linux-libre)) ;;;