From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C406C282CD for ; Mon, 28 Jan 2019 17:21:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB23520989 for ; Mon, 28 Jan 2019 17:21:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RDQdh01D" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731678AbfA1RVj (ORCPT ); Mon, 28 Jan 2019 12:21:39 -0500 Received: from mail-qt1-f201.google.com ([209.85.160.201]:34201 "EHLO mail-qt1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731312AbfA1RVf (ORCPT ); Mon, 28 Jan 2019 12:21:35 -0500 Received: by mail-qt1-f201.google.com with SMTP id u32so21517282qte.1 for ; Mon, 28 Jan 2019 09:21:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=vMXHzfqcMfMNbqcQLReMaokr8AC6yVJ1/CnCmXh5Gy0=; b=RDQdh01Dkh4SjVWvrNnVKqCTC6pSu64kF2+YaiLyeKMqT1Loc55GssOioTxzSjDD70 pZBIVv3jvMQdq9hQQ5ZuSE9F3dGpoVyBIswtKjn/gqFuec7LMXwZEq3Cbk3pjG9ZlWB9 Y8psoY5JtChlGVBiIE+bF978jAxqU0mWsK/jJEYEW5W+roPoz82CqnUuIRI+2GOghUTc QG7aFOht4rVr6hn1ChGT89IGo6wsVqPdGd2+L0ro8Q7eirOhfdvyDfCmWPad0kT1Pwmi gSKOa/2YTNb0w6YGW3KWyCwvfazSFwTAnlS+1kL3qWQsSnXyKUH4EkxXurpOrxpX2j1R dmVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=vMXHzfqcMfMNbqcQLReMaokr8AC6yVJ1/CnCmXh5Gy0=; b=YunDkMzmRbBXAM93tDLP8mi3S6oIXheUwsjvMhuB+y1nmifeIpb6mMbIgsa2+XEQGD 3Hdk3e+Pu4lFZeCTPCktgcQF0KxSrWO3908RMiSWzrxS4nBA2z5vz45giQ9j5yGfv7Of p31nXZwturRr/8PaeB/9xU1kST3f0+SJhMwD2CkfaowlTP9tW/vbUbLwEgEDcdkRemlV b8TBerQYmN0ZBoeb/qxfGOxtvEDIvi/rCi+TTbdz6paIgxzsbvhpsuOE8e2WnyqK2Rd6 0vzQEHRvRn0NWmeAgLF7lErHMqsHgg66MSN6ino4KrX1NS7nQt6dlLhvTRcD/XKQSxGN cTNw== X-Gm-Message-State: AHQUAubB30S7VddbmPaNBPPGEsfHD5lZzBZmH0Em4vQp0S28bVLYrtlB ZZ4KHwlGKXetWN50DstNVefPLMEWgAJa2Smye0NwMVQl5sE0qBhehMUg3EHZ0EPgB0Irv7cnva5 VX0L0bcz9HopiqoqgmzyT7pFT7teXDTro2Y9o4VqyE4V1/DkQHTZY1A== X-Google-Smtp-Source: AHgI3Ibijv1TsMp2vvg/7FZB2CpMsKcpeJse+tE5PyYdaAYSCj04wMULqYqyveTCJNUVHpRidBlOpX4= X-Received: by 2002:a37:a14e:: with SMTP id k75mr449570qke.46.1548696094127; Mon, 28 Jan 2019 09:21:34 -0800 (PST) Date: Mon, 28 Jan 2019 09:21:19 -0800 In-Reply-To: <20190128172119.12105-1-sdf@google.com> Message-Id: <20190128172119.12105-6-sdf@google.com> Mime-Version: 1.0 References: <20190128172119.12105-1-sdf@google.com> X-Mailer: git-send-email 2.20.1.495.gaa96b0ce6b-goog Subject: [PATCH bpf-next v3 5/5] bpf: BPF_PROG_TYPE_CGROUP_{SKB,SOCK,SOCK_ADDR} require cgroups enabled From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no way to exercise appropriate attach points without cgroups enabled. This lets test_verifier correctly skip tests for these prog_types if kernel was compiled without BPF cgroup support. Signed-off-by: Stanislav Fomichev --- include/linux/bpf_types.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/bpf_types.h b/include/linux/bpf_types.h index 44d9ab4809bd..08bf2f1fe553 100644 --- a/include/linux/bpf_types.h +++ b/include/linux/bpf_types.h @@ -6,9 +6,11 @@ BPF_PROG_TYPE(BPF_PROG_TYPE_SOCKET_FILTER, sk_filter) BPF_PROG_TYPE(BPF_PROG_TYPE_SCHED_CLS, tc_cls_act) BPF_PROG_TYPE(BPF_PROG_TYPE_SCHED_ACT, tc_cls_act) BPF_PROG_TYPE(BPF_PROG_TYPE_XDP, xdp) +#ifdef CONFIG_CGROUP_BPF BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SKB, cg_skb) BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SOCK, cg_sock) BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SOCK_ADDR, cg_sock_addr) +#endif BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_IN, lwt_in) BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_OUT, lwt_out) BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_XMIT, lwt_xmit) -- 2.20.1.495.gaa96b0ce6b-goog