{"id":818021,"url":"http://patchwork.ozlabs.org/api/patches/818021/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/9ab7611469e6314f35ae85a274308064417f3be2.1506297988.git.daniel@iogearbox.net/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<9ab7611469e6314f35ae85a274308064417f3be2.1506297988.git.daniel@iogearbox.net>","list_archive_url":null,"date":"2017-09-25T00:25:50","name":"[net-next,1/6] bpf: rename bpf_compute_data_end into bpf_compute_data_pointers","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"2e8624997f671f334393d46136b1c10977e87774","submitter":{"id":65705,"url":"http://patchwork.ozlabs.org/api/people/65705/?format=json","name":"Daniel Borkmann","email":"daniel@iogearbox.net"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/9ab7611469e6314f35ae85a274308064417f3be2.1506297988.git.daniel@iogearbox.net/mbox/","series":[{"id":4860,"url":"http://patchwork.ozlabs.org/api/series/4860/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4860","date":"2017-09-25T00:25:49","name":"BPF metadata for direct access","version":1,"mbox":"http://patchwork.ozlabs.org/series/4860/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818021/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818021/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y0lK92tqhz9s82\n\tfor ;\n\tMon, 25 Sep 2017 10:27:25 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S933349AbdIYA1T (ORCPT );\n\tSun, 24 Sep 2017 20:27:19 -0400","from www62.your-server.de ([213.133.104.62]:37229 \"EHLO\n\twww62.your-server.de\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S933040AbdIYA1H (ORCPT\n\t); Sun, 24 Sep 2017 20:27:07 -0400","from [85.7.161.218] (helo=localhost)\n\tby www62.your-server.de with esmtpsa\n\t(TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.85_2)\n\t(envelope-from )\n\tid 1dwHEk-0000Hb-E9; Mon, 25 Sep 2017 02:27:02 +0200"],"From":"Daniel Borkmann ","To":"davem@davemloft.net","Cc":"alexei.starovoitov@gmail.com, john.fastabend@gmail.com,\n\tpeter.waskiewicz.jr@intel.com, jakub.kicinski@netronome.com,\n\tnetdev@vger.kernel.org, Daniel Borkmann ","Subject":"[PATCH net-next 1/6] bpf: rename bpf_compute_data_end into\n\tbpf_compute_data_pointers","Date":"Mon, 25 Sep 2017 02:25:50 +0200","Message-Id":"<9ab7611469e6314f35ae85a274308064417f3be2.1506297988.git.daniel@iogearbox.net>","X-Mailer":"git-send-email 1.9.3","In-Reply-To":["",""],"References":["",""],"X-Authenticated-Sender":"daniel@iogearbox.net","X-Virus-Scanned":"Clear (ClamAV 0.99.2/23869/Sun Sep 24 18:45:57 2017)","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Just do the rename into bpf_compute_data_pointers() as we'll add\none more pointer here to recompute.\n\nSigned-off-by: Daniel Borkmann \nAcked-by: Alexei Starovoitov \nAcked-by: John Fastabend \n---\n include/linux/filter.h | 9 ++++++---\n kernel/bpf/sockmap.c | 4 ++--\n net/bpf/test_run.c | 2 +-\n net/core/filter.c | 14 +++++++-------\n net/core/lwt_bpf.c | 2 +-\n net/sched/act_bpf.c | 4 ++--\n net/sched/cls_bpf.c | 4 ++--\n 7 files changed, 21 insertions(+), 18 deletions(-)","diff":"diff --git a/include/linux/filter.h b/include/linux/filter.h\nindex d29e58f..052bab3 100644\n--- a/include/linux/filter.h\n+++ b/include/linux/filter.h\n@@ -496,10 +496,13 @@ struct xdp_buff {\n \tvoid *data_hard_start;\n };\n \n-/* compute the linear packet data range [data, data_end) which\n- * will be accessed by cls_bpf, act_bpf and lwt programs\n+/* Compute the linear packet data range [data, data_end) which\n+ * will be accessed by various program types (cls_bpf, act_bpf,\n+ * lwt, ...). Subsystems allowing direct data access must (!)\n+ * ensure that cb[] area can be written to when BPF program is\n+ * invoked (otherwise cb[] save/restore is necessary).\n */\n-static inline void bpf_compute_data_end(struct sk_buff *skb)\n+static inline void bpf_compute_data_pointers(struct sk_buff *skb)\n {\n \tstruct bpf_skb_data_end *cb = (struct bpf_skb_data_end *)skb->cb;\n \ndiff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c\nindex 6424ce0..a298d66 100644\n--- a/kernel/bpf/sockmap.c\n+++ b/kernel/bpf/sockmap.c\n@@ -102,7 +102,7 @@ static int smap_verdict_func(struct smap_psock *psock, struct sk_buff *skb)\n \n \tskb_orphan(skb);\n \tskb->sk = psock->sock;\n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \trc = (*prog->bpf_func)(skb, prog->insnsi);\n \tskb->sk = NULL;\n \n@@ -369,7 +369,7 @@ static int smap_parse_func_strparser(struct strparser *strp,\n \t * any socket yet.\n \t */\n \tskb->sk = psock->sock;\n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \trc = (*prog->bpf_func)(skb, prog->insnsi);\n \tskb->sk = NULL;\n \trcu_read_unlock();\ndiff --git a/net/bpf/test_run.c b/net/bpf/test_run.c\nindex 6be41a4..df67251 100644\n--- a/net/bpf/test_run.c\n+++ b/net/bpf/test_run.c\n@@ -133,7 +133,7 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,\n \tif (is_l2)\n \t\t__skb_push(skb, ETH_HLEN);\n \tif (is_direct_pkt_access)\n-\t\tbpf_compute_data_end(skb);\n+\t\tbpf_compute_data_pointers(skb);\n \tretval = bpf_test_run(prog, skb, repeat, &duration);\n \tif (!is_l2)\n \t\t__skb_push(skb, ETH_HLEN);\ndiff --git a/net/core/filter.c b/net/core/filter.c\nindex 82edad5..c468e7c 100644\n--- a/net/core/filter.c\n+++ b/net/core/filter.c\n@@ -1402,7 +1402,7 @@ static inline int bpf_try_make_writable(struct sk_buff *skb,\n {\n \tint err = __bpf_try_make_writable(skb, write_len);\n \n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \treturn err;\n }\n \n@@ -1962,7 +1962,7 @@ struct sock *do_sk_redirect_map(void)\n \tret = skb_vlan_push(skb, vlan_proto, vlan_tci);\n \tbpf_pull_mac_rcsum(skb);\n \n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \treturn ret;\n }\n \n@@ -1984,7 +1984,7 @@ struct sock *do_sk_redirect_map(void)\n \tret = skb_vlan_pop(skb);\n \tbpf_pull_mac_rcsum(skb);\n \n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \treturn ret;\n }\n \n@@ -2178,7 +2178,7 @@ static int bpf_skb_proto_xlat(struct sk_buff *skb, __be16 to_proto)\n \t * need to be verified first.\n \t */\n \tret = bpf_skb_proto_xlat(skb, proto);\n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \treturn ret;\n }\n \n@@ -2303,7 +2303,7 @@ static int bpf_skb_adjust_net(struct sk_buff *skb, s32 len_diff)\n \tret = shrink ? bpf_skb_net_shrink(skb, len_diff_abs) :\n \t\t bpf_skb_net_grow(skb, len_diff_abs);\n \n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \treturn ret;\n }\n \n@@ -2394,7 +2394,7 @@ static int bpf_skb_trim_rcsum(struct sk_buff *skb, unsigned int new_len)\n \t\t\tskb_gso_reset(skb);\n \t}\n \n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \treturn ret;\n }\n \n@@ -2434,7 +2434,7 @@ static int bpf_skb_trim_rcsum(struct sk_buff *skb, unsigned int new_len)\n \t\tskb_reset_mac_header(skb);\n \t}\n \n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \treturn 0;\n }\n \ndiff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c\nindex 1307731..e7e626f 100644\n--- a/net/core/lwt_bpf.c\n+++ b/net/core/lwt_bpf.c\n@@ -51,7 +51,7 @@ static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt,\n \t */\n \tpreempt_disable();\n \trcu_read_lock();\n-\tbpf_compute_data_end(skb);\n+\tbpf_compute_data_pointers(skb);\n \tret = bpf_prog_run_save_cb(lwt->prog, skb);\n \trcu_read_unlock();\n \ndiff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c\nindex c0c707e..5ef8ce8 100644\n--- a/net/sched/act_bpf.c\n+++ b/net/sched/act_bpf.c\n@@ -49,11 +49,11 @@ static int tcf_bpf(struct sk_buff *skb, const struct tc_action *act,\n \tfilter = rcu_dereference(prog->filter);\n \tif (at_ingress) {\n \t\t__skb_push(skb, skb->mac_len);\n-\t\tbpf_compute_data_end(skb);\n+\t\tbpf_compute_data_pointers(skb);\n \t\tfilter_res = BPF_PROG_RUN(filter, skb);\n \t\t__skb_pull(skb, skb->mac_len);\n \t} else {\n-\t\tbpf_compute_data_end(skb);\n+\t\tbpf_compute_data_pointers(skb);\n \t\tfilter_res = BPF_PROG_RUN(filter, skb);\n \t}\n \trcu_read_unlock();\ndiff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c\nindex 520c502..36671b0 100644\n--- a/net/sched/cls_bpf.c\n+++ b/net/sched/cls_bpf.c\n@@ -99,11 +99,11 @@ static int cls_bpf_classify(struct sk_buff *skb, const struct tcf_proto *tp,\n \t\t} else if (at_ingress) {\n \t\t\t/* It is safe to push/pull even if skb_shared() */\n \t\t\t__skb_push(skb, skb->mac_len);\n-\t\t\tbpf_compute_data_end(skb);\n+\t\t\tbpf_compute_data_pointers(skb);\n \t\t\tfilter_res = BPF_PROG_RUN(prog->filter, skb);\n \t\t\t__skb_pull(skb, skb->mac_len);\n \t\t} else {\n-\t\t\tbpf_compute_data_end(skb);\n+\t\t\tbpf_compute_data_pointers(skb);\n \t\t\tfilter_res = BPF_PROG_RUN(prog->filter, skb);\n \t\t}\n \n","prefixes":["net-next","1/6"]}