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=-17.4 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_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 B9339C76194 for ; Wed, 24 Jul 2019 00:07:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DABA2184B for ; Wed, 24 Jul 2019 00:07:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="FawtaYux" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727467AbfGXAHd (ORCPT ); Tue, 23 Jul 2019 20:07:33 -0400 Received: from mail-qt1-f202.google.com ([209.85.160.202]:40767 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727461AbfGXAHd (ORCPT ); Tue, 23 Jul 2019 20:07:33 -0400 Received: by mail-qt1-f202.google.com with SMTP id e32so39818156qtc.7 for ; Tue, 23 Jul 2019 17:07:32 -0700 (PDT) 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=dvM0oMSPCj5UyjAMcKrkrGFrIFYWKvF2DUDR7yoEcJA=; b=FawtaYuxGKrAPTWB6bApVLEBtQfdjpvYNz6Dajd1VYSqxB/J3165GHUb53VJ3C5WxB rlJgNlOWx86Kagh+BuvCa1jYX8IhZM4c+lEWZ2CbzMvzrDjgnI2OHAHj35ZzOvnTt4iG 05V9LscZpZnoyMxGjuThemZmqNb6eqn98DGpOqMleDzt2RqqgVyjP1ggGg6a3CvlN3IZ 0iL51FXuIClXwZt1XjKNosYHzFl51anE1UqWA7VZ/z7AlxYaN68WtukOYmuQWr/fqDlH IqdRMozNaLVW7+DoQNNmOkyvTI6RzNtyQ6rCL3yxO/PRJMj/rFuFc+Z1mHFoxRSyx3r9 XxHA== 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=dvM0oMSPCj5UyjAMcKrkrGFrIFYWKvF2DUDR7yoEcJA=; b=ltKJIeoKhpXIUhVqNe5mwO3n56mrXjbhBAujIu6FalxBHd39yqk/3VZ06pAPJJddol 8NkwIfsU2XY3Ht4JKJ50ykrheklaaiZC+bwmWg5qQAevuCsZ1wOsF7AL3QvqbgCFwa6h X2BA6fBEQaRRNw0OqbPTw2lUCmK7FX/1qjTJ9QrRptlJRT5zyays7nRfeY8gph7EkX+L KGkWl5ZiSG8uCTwhhd9oYuXfGBSDQKDrGqXyRoemR8bxZG7rwfDWQ3iMhaDP4lHb1sCw rb74s/FyWZ+V1w1lAt+YkfWwndX7+p1Rz1KGsG/VZsuPqY7I1xvm0wMpicn4NZKAqGwo 4SNQ== X-Gm-Message-State: APjAAAUKuRcSqidtfkZDFrNiy/QiUJvs28SgKqetVSm6F7qUOlY/mg8P PBXMiEXjpV4q20QziPj/UTVlDrMm/Y/GIerKv3gLQLu+oL8DeM0cnq/ExoYzTprlv2vO8LacR5M a76qW2nIfnbo7gvXT2oM2SwLssZUZ+dJUxh2ukUIffJ8KgAfywo2TZ5PrVETLgCqS3DrOjAfY X-Google-Smtp-Source: APXvYqzzB8JH73VE761HLmAP7Yk9ptviUt4dTTiTjceQIvik/2HxitrwFp0k6FoRglGHwy2bDGRcpCE6GsSVKCh4 X-Received: by 2002:a37:b843:: with SMTP id i64mr49775055qkf.77.1563926852226; Tue, 23 Jul 2019 17:07:32 -0700 (PDT) Date: Tue, 23 Jul 2019 17:07:24 -0700 In-Reply-To: <20190724000725.15634-1-allanzhang@google.com> Message-Id: <20190724000725.15634-2-allanzhang@google.com> Mime-Version: 1.0 References: <20190724000725.15634-1-allanzhang@google.com> X-Mailer: git-send-email 2.22.0.709.g102302147b-goog Subject: [PATCH bpf-next v10 1/2] bpf: Allow bpf_skb_event_output for a few prog types From: Allan Zhang To: netdev@vger.kernel.org, bpf@vger.kernel.org, songliubraving@fb.com, daniel@iogearbox.net, andrii.nakryiko@gmail.com Cc: ast@kernel.org, Allan Zhang Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Software event output is only enabled by a few prog types right now (TC, LWT out, XDP, sockops). Many other skb based prog types need bpf_skb_event_output to produce software event. Added socket_filter, cg_skb, sk_skb prog types to generate sw event. Test bpf code is generated from code snippet: struct TMP { uint64_t tmp; } tt; tt.tmp = 5; bpf_perf_event_output(skb, &connection_tracking_event_map, 0, &tt, sizeof(tt)); return 1; the bpf assembly from llvm is: 0: b7 02 00 00 05 00 00 00 r2 = 5 1: 7b 2a f8 ff 00 00 00 00 *(u64 *)(r10 - 8) = r2 2: bf a4 00 00 00 00 00 00 r4 = r10 3: 07 04 00 00 f8 ff ff ff r4 += -8 4: 18 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 r2 = 0ll 6: b7 03 00 00 00 00 00 00 r3 = 0 7: b7 05 00 00 08 00 00 00 r5 = 8 8: 85 00 00 00 19 00 00 00 call 25 9: b7 00 00 00 01 00 00 00 r0 = 1 10: 95 00 00 00 00 00 00 00 exit Signed-off-by: Allan Zhang Acked-by: Song Liu --- net/core/filter.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index 4e2a79b2fd77..3961437ccc50 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5999,6 +5999,8 @@ sk_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_get_socket_cookie_proto; case BPF_FUNC_get_socket_uid: return &bpf_get_socket_uid_proto; + case BPF_FUNC_perf_event_output: + return &bpf_skb_event_output_proto; default: return bpf_base_func_proto(func_id); } @@ -6019,6 +6021,8 @@ cg_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_sk_storage_get_proto; case BPF_FUNC_sk_storage_delete: return &bpf_sk_storage_delete_proto; + case BPF_FUNC_perf_event_output: + return &bpf_skb_event_output_proto; #ifdef CONFIG_SOCK_CGROUP_DATA case BPF_FUNC_skb_cgroup_id: return &bpf_skb_cgroup_id_proto; @@ -6267,6 +6271,8 @@ sk_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_sk_redirect_map_proto; case BPF_FUNC_sk_redirect_hash: return &bpf_sk_redirect_hash_proto; + case BPF_FUNC_perf_event_output: + return &bpf_skb_event_output_proto; #ifdef CONFIG_INET case BPF_FUNC_sk_lookup_tcp: return &bpf_sk_lookup_tcp_proto; -- 2.22.0.709.g102302147b-goog