From patchwork Fri Dec 16 16:33:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 706482 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tgG8y3569z9tB1 for ; Sat, 17 Dec 2016 03:33:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761951AbcLPQdu (ORCPT ); Fri, 16 Dec 2016 11:33:50 -0500 Received: from mail.kernel.org ([198.145.29.136]:51594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755562AbcLPQds (ORCPT ); Fri, 16 Dec 2016 11:33:48 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C59E204F6; Fri, 16 Dec 2016 16:33:47 +0000 (UTC) Received: from localhost (c-71-202-137-17.hsd1.ca.comcast.net [71.202.137.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6FC3D20375; Fri, 16 Dec 2016 16:33:46 +0000 (UTC) From: Andy Lutomirski To: Alexei Starovoitov , Daniel Mack Cc: Network Development , Andy Lutomirski Subject: [PATCH] cgroup: Fix CGROUP_BPF config Date: Fri, 16 Dec 2016 08:33:45 -0800 Message-Id: <8d48c3940f8d0275da6398ea5bcef14e20233db5.1481905995.git.luto@kernel.org> X-Mailer: git-send-email 2.9.3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org CGROUP_BPF depended on SOCK_CGROUP_DATA which can't be manually enabled, making it rather challenging to turn CGROUP_BPF on. Signed-off-by: Andy Lutomirski Acked-by: Alexei Starovoitov --- init/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index aafafeb0c117..223b734abccd 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1156,7 +1156,8 @@ config CGROUP_PERF config CGROUP_BPF bool "Support for eBPF programs attached to cgroups" - depends on BPF_SYSCALL && SOCK_CGROUP_DATA + depends on BPF_SYSCALL + select SOCK_CGROUP_DATA help Allow attaching eBPF programs to a cgroup using the bpf(2) syscall command BPF_PROG_ATTACH.