Received: by 2002:a25:f815:0:0:0:0:0 with SMTP id u21csp4030541ybd; Tue, 25 Jun 2019 12:46:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+mO7bqz44YQA79Ymrpl1sCWjinoo1uzExWGd9sKExCvnLmWiW0thsk6p2ohc/GknxE2HO X-Received: by 2002:a63:9a51:: with SMTP id e17mr3400511pgo.212.1561491997367; Tue, 25 Jun 2019 12:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561491997; cv=none; d=google.com; s=arc-20160816; b=U8nMUHsSwnYvlAqTbUaQRg5IfOi9+p42ZuT8dbRDGuWC0joX14PvZVDEgERVXZK3BP PLb85SFFPwJDp9lYSTu6HDxQnFgwsEltX25V4bWBIY/4Dr149224ffWue/DghYZq5Vt7 tXse7TmSnUbGsi8XyIe1ZCTsCl5hdm0hyRpo2mcPAF3jczA5S4TOG74mKeTZIAUvcjpz yaI0FOchBO83b1TZs4NV6UpTpvXjlcwBq9q7G0MixlAzYFdQK1h6kn1bF6R525/NYSo5 IyuigCUDXqFoYn3lG0usQ+qa3rXHXCQYJ1KQLTyf7fuJefmXNz+CB6FIbCZ1pvwKqmnu HJNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=OrSuOd+WNpFgQwSR9WKVx5FNekFAq6HSf190FB+gMtQ=; b=dbfXFTvypl/Vp/Ep1YIcJsOs2wHivAomqIKJdaLfdTUgMioaDXJbV+sNXxcsann3Ls dpFjDt2qtFnQbFlA19dvmMsrxadfQJKxfZ1PAIYaIQki0iFQfRTyPkHJegExbynyzENJ VzNjMyFjnyuZ6topC7XZs1Al/wJO1DZOpMyNWVW+nGd6eAvi2FsH2m/OSG5ogGDpD5jT ElyjkpbBnU5UjYkZcGCeZxpNFEns9tnw2gPtoeHk87/9unRkXR9B7PPMu8WyLgUMyIam y+GRYvVaId37kPJ/1woxCyQEcuWAX/KtpW2sIULcRgtIk7KTgEC0tkWVGx7tAxonrt/4 Jvcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=lW8e8Rry; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y21si1025884plp.332.2019.06.25.12.46.21; Tue, 25 Jun 2019 12:46:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=lW8e8Rry; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731835AbfFYR1b (ORCPT + 99 others); Tue, 25 Jun 2019 13:27:31 -0400 Received: from mail-pl1-f201.google.com ([209.85.214.201]:41927 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731648AbfFYR11 (ORCPT ); Tue, 25 Jun 2019 13:27:27 -0400 Received: by mail-pl1-f201.google.com with SMTP id i3so9575577plb.8 for ; Tue, 25 Jun 2019 10:27:26 -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=OrSuOd+WNpFgQwSR9WKVx5FNekFAq6HSf190FB+gMtQ=; b=lW8e8RryfQuAmv5fQ1SWrNfxFkkNyss+D6GlgfN04Vt0TaV58tp2d9Ad247IhL75FD qvmHxi8su2RCbQ6URj/1+0jkjis3urS9MJ+aL/veYgsmaj/7p4JKZfBJmKIlY1RmL1C+ 5s+xcGaUuZup0/tjZq1OINg8e4Mqcxp+z00WO/NJlTivQ6k3D+KyVlrGeN/NX4Brx7z3 8AV/MDvXzBg9/sPy8IyJ7cf5JrLju/zVk149tBj+1LGYhIyzDy4gMgiRUTwzcyDEKt5b Pu4PS53yb8TYj2L5UxubPtq1a4g7yjIHgmhnKQsZNZc4T7ZHmmKBuDhLYv3ROggDviJU mMSQ== 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=OrSuOd+WNpFgQwSR9WKVx5FNekFAq6HSf190FB+gMtQ=; b=rzHiKZDYJOEOCDHc4iwVkvnKAeXsCoyMIw0yKQvgirQM2fQsJ1BYhUB00qWjLjsgbd mGKshwZjaVEY3DSbT9L+pwt+4bJN9YFZI7H4asgPnkKhJxzVn3D3xuXfAJ+wMfb3l2Nh RntgGM13tp7RPPSz9Raorgki0Fsgm2LW/IcBHhxn0wGFu3TNbCUVG4ZlzuFeiddWElzz mMjlgDdECWPMY/qzoPEOpWhkIPAHfn8ySbuSATAQatgmLeIPqAJq6SKKjNmt+Nrh9LB6 2Do1aG4lwF9yIPz1vQebRXeeTAe9MlFdv6zHiin9ZGTeO5hiQsS4AnLPFihy72ZYR3DK n6bw== X-Gm-Message-State: APjAAAW/+KtOjfc2qNYvXqlM68Nmaqjjb4wRBvDTowwdgFXxyISw0WvC pOHEnoLUkLtbgQ4dB0h9yn5ytz1rHH8xANpA X-Received: by 2002:a63:52:: with SMTP id 79mr39594167pga.381.1561483645880; Tue, 25 Jun 2019 10:27:25 -0700 (PDT) Date: Tue, 25 Jun 2019 10:27:16 -0700 In-Reply-To: <20190625172717.158613-1-allanzhang@google.com> Message-Id: <20190625172717.158613-2-allanzhang@google.com> Mime-Version: 1.0 References: <20190625172717.158613-1-allanzhang@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH bpf-next v4 1/2] bpf: Allow bpf_skb_event_output for a few prog types From: allanzhang To: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , "David S. Miller" , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Cc: allanzhang Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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: allanzhang v4: * Reformating log message v3: * Reformating log message v2: * Reformating log message --- net/core/filter.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index 2014d76e0d2a..b75fcf412628 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5958,6 +5958,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); } @@ -5978,6 +5980,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; @@ -6226,6 +6230,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.410.gd8fdbe21b5-goog