From: Tushar Dave <tushar.n.dave@oracle.com>
To: ast@kernel.org, daniel@iogearbox.net, davem@davemloft.net,
santosh.shilimkar@oracle.com, jakub.kicinski@netronome.com,
quentin.monnet@netronome.com, jiong.wang@netronome.com,
sandipan@linux.vnet.ibm.com, john.fastabend@gmail.com,
kafai@fb.com, rdna@fb.com, yhs@fb.com, netdev@vger.kernel.org,
rds-devel@oss.oracle.com, sowmini.varadhan@oracle.com
Subject: [PATCH net-next 3/5] ebpf: Add sg_filter_run()
Date: Tue, 11 Sep 2018 21:38:02 +0200 [thread overview]
Message-ID: <1536694684-3200-4-git-send-email-tushar.n.dave@oracle.com> (raw)
In-Reply-To: <1536694684-3200-1-git-send-email-tushar.n.dave@oracle.com>
When sg_filter_run() is invoked it runs the attached eBPF
prog of type BPF_PROG_TYPE_SOCKET_SG_FILTER which deals with
struct scatterlist.
Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
---
include/linux/filter.h | 8 ++++++++
include/uapi/linux/bpf.h | 6 ++++++
net/core/filter.c | 35 +++++++++++++++++++++++++++++++++++
tools/include/uapi/linux/bpf.h | 6 ++++++
4 files changed, 55 insertions(+)
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 6791a0a..ae664a9 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -1113,4 +1113,12 @@ struct bpf_sock_ops_kern {
*/
};
+enum __socksg_action {
+ __SOCKSG_PASS = 0,
+ __SOCKSG_DROP,
+ __SOCKSG_REDIRECT,
+};
+
+int sg_filter_run(struct sock *sk, struct scatterlist *sg);
+
#endif /* __LINUX_FILTER_H__ */
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 6ec1e32..1e11789 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2428,6 +2428,12 @@ enum sk_action {
SK_PASS,
};
+enum socksg_action {
+ SOCKSG_PASS = 0,
+ SOCKSG_DROP,
+ SOCKSG_REDIRECT,
+};
+
/* user accessible metadata for SK_MSG packet hook, new fields must
* be added to the end of this structure
*/
diff --git a/net/core/filter.c b/net/core/filter.c
index 469c488..a3afc61 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -121,6 +121,41 @@ int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap)
}
EXPORT_SYMBOL(sk_filter_trim_cap);
+int sg_filter_run(struct sock *sk, struct scatterlist *sg)
+{
+ struct sk_filter *filter;
+ int result = 0;
+
+ if (!sg)
+ return result;
+
+ rcu_read_lock();
+ filter = rcu_dereference(sk->sk_filter);
+ if (filter) {
+ struct sk_msg_buff mb = {0};
+
+ memcpy(mb.sg_data, sg, sizeof(*sg) * MAX_SKB_FRAGS);
+ mb.sg_start = 0;
+ mb.sg_end = sg_nents(sg);
+ mb.data = sg_virt(sg);
+ mb.data_end = mb.data + sg->length;
+ mb.sg_copy[mb.sg_end - 1] = true;
+
+ result = BPF_PROG_RUN(filter->prog, &mb);
+
+ /* BPF prog may have changed mb.sg_data e.g. may linearize
+ * multiple scatterlist entries into one. Therefore, make sure
+ * to update original sg and mark the sg end.
+ */
+ memcpy(sg, mb.sg_data, sizeof(*sg) * MAX_SKB_FRAGS);
+ sg_mark_end(&sg[mb.sg_end - 1]);
+ }
+ rcu_read_unlock();
+
+ return result;
+}
+EXPORT_SYMBOL(sg_filter_run);
+
BPF_CALL_1(bpf_skb_get_pay_offset, struct sk_buff *, skb)
{
return skb_get_poff(skb);
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 6ec1e32..1e11789 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -2428,6 +2428,12 @@ enum sk_action {
SK_PASS,
};
+enum socksg_action {
+ SOCKSG_PASS = 0,
+ SOCKSG_DROP,
+ SOCKSG_REDIRECT,
+};
+
/* user accessible metadata for SK_MSG packet hook, new fields must
* be added to the end of this structure
*/
--
1.8.3.1
next prev parent reply other threads:[~2018-09-12 0:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 19:37 [PATCH net-next 0/5] eBPF and struct scatterlist Tushar Dave
2018-09-11 19:38 ` [PATCH net-next 1/5] bpf: use __GFP_COMP while allocating page Tushar Dave
2018-09-12 16:21 ` Tushar Dave
2018-09-12 16:51 ` John Fastabend
2018-09-12 20:15 ` Tushar Dave
2018-09-11 19:38 ` [PATCH net-next 2/5] eBPF: Add new eBPF prog type BPF_PROG_TYPE_SOCKET_SG_FILTER Tushar Dave
2018-09-12 3:57 ` Alexei Starovoitov
2018-09-12 19:25 ` Tushar Dave
2018-09-11 19:38 ` Tushar Dave [this message]
2018-09-12 3:58 ` [PATCH net-next 3/5] ebpf: Add sg_filter_run() Alexei Starovoitov
2018-09-12 19:27 ` Tushar Dave
2018-09-11 19:38 ` [PATCH net-next 4/5] rds: invoke socket sg filter attached to rds socket Tushar Dave
2018-09-11 21:06 ` santosh.shilimkar
2018-09-11 19:38 ` [PATCH net-next 5/5] ebpf: Add sample ebpf program for SOCKET_SG_FILTER Tushar Dave
2018-09-12 4:00 ` Alexei Starovoitov
2018-09-12 19:32 ` Tushar Dave
2018-09-13 0:59 ` Sowmini Varadhan
2018-09-13 2:07 ` Alexei Starovoitov
2018-09-13 10:10 ` Sowmini Varadhan
2018-09-17 23:15 ` Alexei Starovoitov
2018-09-17 23:23 ` Sowmini Varadhan
2018-09-17 23:26 ` Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1536694684-3200-4-git-send-email-tushar.n.dave@oracle.com \
--to=tushar.n.dave@oracle.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=jakub.kicinski@netronome.com \
--cc=jiong.wang@netronome.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=quentin.monnet@netronome.com \
--cc=rdna@fb.com \
--cc=rds-devel@oss.oracle.com \
--cc=sandipan@linux.vnet.ibm.com \
--cc=santosh.shilimkar@oracle.com \
--cc=sowmini.varadhan@oracle.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).