From patchwork Tue Jul 12 12:04:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 1655353 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=dRFLGyn1; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lhzwd0g1Hz9sB4 for ; Tue, 12 Jul 2022 22:05:37 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oBEds-0004Fk-4d; Tue, 12 Jul 2022 12:05:28 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdO-0003XP-OK for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:58 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 9D2D93FC18 for ; Tue, 12 Jul 2022 12:04:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627497; bh=2SKzkrFvGytVhqjQk6UKequGQIgrfKzVfKOJ6e0ruwg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dRFLGyn1AkKa9ui8qSKrAL0xyg+pXl1ba8h7vq/tEoOsPkT905MATiBaNFHICBySO njFn51zlxPDCC5PRBeX+DYYosJGx2KfN9ZTlxuX/soR4WP261rtO9BKnMpw2LN197/ LiClRcfb3Hi26ISbEXyFMGHCmVT+g+m/Jo8th3VX4Ygtmzxwi8gnboVUhjFs0c6xIV KTVoCBP876fWQk13G/g4H813YxgCjBcDjKk7MQh08jKADvwSLi4w6uv97fHHMaNaA5 nP3FL/ySsCB85fkpiLGfTw16vNv3MTbVsxd4XTZyrCRT1aevgqSZ9X/NATX2Hbo1+B 7kArq1YSsgiMw== Received: by mail-wm1-f72.google.com with SMTP id 2-20020a1c0202000000b003a2cfab44eeso6626781wmc.6 for ; Tue, 12 Jul 2022 05:04:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2SKzkrFvGytVhqjQk6UKequGQIgrfKzVfKOJ6e0ruwg=; b=IMBsBK/apboJ4vE2FsbghhKSWr1Q2MyYNPlvwpyTR3pJlilpD5Mrs7RHswy52lEwSI apmSbzG4nk9UhLplreRbtVoU9sTiwB8mOzY1YktwIiI+Bp5t6nzZEeRCxNrmk39vJjVv 5bRf23RKDIO1hBtPPeBq44UjvCgHEDe5NeU8SRkz+56exJJTj8+kK1YgHCR2/fY5ZD0T GHDPaMxXnOyBb3p+z/ea2z5C7JG+W050mEhGyVobpytqbeWO3B+JAjj/XzzOEpQVdr1h 1qh1eqU+mKZXluhRppaWGTVeYa4hyFtxNmcJ2YpMWT7IFKuK4EVj18wdWbkSolVrpYWt XuXg== X-Gm-Message-State: AJIora92ehEQtXiKicAUUNuAORgUp35Qsop+rC75Mw+aSaA/40HTqxII GHISZtPaRkFx7HtnWbB6/9k3LoxeoSfBc7PwcQ8MXmlyNm0C1V9856bk6sRRGndYqPq7hOuCB9H rivXocCQhtZj+a2X+dsF4PZFywZ/8H5LHi8/8ZKzqBw== X-Received: by 2002:a5d:5087:0:b0:21d:9925:e15a with SMTP id a7-20020a5d5087000000b0021d9925e15amr15186304wrt.43.1657627497098; Tue, 12 Jul 2022 05:04:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uQZkBK4deBgFE40CXtOXzXpAsum+sJNzTjHCnFyQP5H2Ud+Ubyg3LlwiIUFQqagKsrcP7sgA== X-Received: by 2002:a5d:5087:0:b0:21d:9925:e15a with SMTP id a7-20020a5d5087000000b0021d9925e15amr15186241wrt.43.1657627496384; Tue, 12 Jul 2022 05:04:56 -0700 (PDT) Received: from stitch.. (80.71.140.73.ipv4.parknet.dk. [80.71.140.73]) by smtp.gmail.com with ESMTPSA id i15-20020adfefcf000000b0021d82a6095bsm7992246wrp.95.2022.07.12.05.04.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:55 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 09/16] UBUNTU: [Config] Enable CONFIG_BPF_KPROBE_OVERRIDE on riscv64 Date: Tue, 12 Jul 2022 14:04:40 +0200 Message-Id: <20220712120447.355124-10-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220712120447.355124-1-emil.renner.berthing@canonical.com> References: <20220712120447.355124-1-emil.renner.berthing@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1981437 This option was not annotated in the linux-riscv tree, so let's align it with the other architectures. Signed-off-by: Emil Renner Berthing --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 1 - debian.master/config/s390x/config.common.s390x | 1 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 409ccffea6d9..df5cba5ec03b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -53,7 +53,6 @@ CONFIG_BFS_FS=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m -CONFIG_BPF_KPROBE_OVERRIDE=y CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m CONFIG_CACHEFILES_ERROR_INJECTION=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index a2f2f146ee7d..130551ffdba0 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11889,7 +11889,7 @@ CONFIG_BLK_DEV_IO_TRACE policy<{'amd64': 'y', 'arm64': ' CONFIG_KPROBE_EVENTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_KPROBE_EVENTS_ON_NOTRACE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_UPROBE_EVENTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_BPF_KPROBE_OVERRIDE policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}> +CONFIG_BPF_KPROBE_OVERRIDE policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_SYNTH_EVENTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_HIST_TRIGGERS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_TRACE_EVENT_INJECT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 44ad0428c1ec..20c1940d427f 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -55,7 +55,6 @@ CONFIG_BFS_FS=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m -CONFIG_BPF_KPROBE_OVERRIDE=y CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m CONFIG_CACHEFILES_ERROR_INJECTION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f62bcc773bbd..37ab5fd465fb 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1336,6 +1336,7 @@ CONFIG_BPF_EVENTS=y CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_BPF_JIT_DEFAULT_ON=y +CONFIG_BPF_KPROBE_OVERRIDE=y CONFIG_BPF_LSM=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_STREAM_PARSER=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index a351d076c521..e29ed7a88329 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -49,7 +49,6 @@ CONFIG_BFS_FS=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m -CONFIG_BPF_KPROBE_OVERRIDE=y CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m CONFIG_CACHEFILES_ERROR_INJECTION=y diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index df06b262103b..fb3c9688c3d2 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -48,7 +48,6 @@ CONFIG_BFS_FS=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BPF_KPROBE_OVERRIDE is not set CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m # CONFIG_CACHEFILES_ERROR_INJECTION is not set diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index c2a3f8be1fd7..10e6de6fcfe7 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -39,7 +39,6 @@ CONFIG_AUTOFS_FS=y # CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_BLK_DEV_SX8 is not set -CONFIG_BPF_KPROBE_OVERRIDE=y # CONFIG_BSD_DISKLABEL is not set # CONFIG_C2PORT is not set CONFIG_CACHEFILES_ERROR_INJECTION=y