From: Stephen Rothwell <sfr@canb.auug.org.au> To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>, David Miller <davem@davemloft.net>, <netdev@vger.kernel.org> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>, Alexei Starovoitov <ast@plumgrid.com> Subject: linux-next: manual merge of the tip tree with the net-next tree Date: Tue, 7 Apr 2015 17:11:48 +1000 [thread overview] Message-ID: <20150407171148.7a41ee90@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 3528 bytes --] Hi all, Today's linux-next merge of the tip tree got a conflict in include/uapi/linux/bpf.h between commit 96be4325f443 ("ebpf: add sched_cls_type and map it to sk_filter's verifier ops"), 03e69b508b6f ("ebpf: add prandom helper for packet sampling"), c04167ce2ca0 ("ebpf: add helper for obtaining current processor id"), 94caee8c312d ("ebpf: add sched_act_type and map it to sk_filter's verifier ops"), 608cd71a9c7c ("tc: bpf: generalize pedit action") and 91bc4822c3d6 ("tc: bpf: add checksum helpers") from the net-next tree and commit 2541517c32be ("tracing, perf: Implement BPF programs attached to kprobes"), d9847d310ab4 ("tracing: Allow BPF programs to call bpf_ktime_get_ns()") and 9c959c863f82 ("tracing: Allow BPF programs to call bpf_trace_printk()") from the tip tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc include/uapi/linux/bpf.h index 23df3e7f8e7d,cc47ef41076a..000000000000 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@@ -118,12 -118,9 +118,13 @@@ enum bpf_map_type enum bpf_prog_type { BPF_PROG_TYPE_UNSPEC, BPF_PROG_TYPE_SOCKET_FILTER, + BPF_PROG_TYPE_SCHED_CLS, + BPF_PROG_TYPE_SCHED_ACT, + BPF_PROG_TYPE_KPROBE, }; +#define BPF_PSEUDO_MAP_FD 1 + /* flags for BPF_MAP_UPDATE_ELEM command */ #define BPF_ANY 0 /* create new element or update existing */ #define BPF_NOEXIST 1 /* create new element if it didn't exist */ @@@ -166,45 -164,9 +168,48 @@@ enum bpf_func_id BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */ BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */ BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */ + BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */ + BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */ + + /** + * skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet + * @skb: pointer to skb + * @offset: offset within packet from skb->data + * @from: pointer where to copy bytes from + * @len: number of bytes to store into packet + * @flags: bit 0 - if true, recompute skb->csum + * other bits - reserved + * Return: 0 on success + */ + BPF_FUNC_skb_store_bytes, + + /** + * l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum + * @skb: pointer to skb + * @offset: offset within packet where IP checksum is located + * @from: old value of header field + * @to: new value of header field + * @flags: bits 0-3 - size of header field + * other bits - reserved + * Return: 0 on success + */ + BPF_FUNC_l3_csum_replace, + + /** + * l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum + * @skb: pointer to skb + * @offset: offset within packet where TCP/UDP checksum is located + * @from: old value of header field + * @to: new value of header field + * @flags: bits 0-3 - size of header field + * bit 4 - is pseudo header + * other bits - reserved + * Return: 0 on success + */ + BPF_FUNC_l4_csum_replace, + BPF_FUNC_probe_read, /* int bpf_probe_read(void *dst, int size, void *src) */ + BPF_FUNC_ktime_get_ns, /* u64 bpf_ktime_get_ns(void) */ + BPF_FUNC_trace_printk, /* int bpf_trace_printk(const char *fmt, int fmt_size, ...) */ __BPF_FUNC_MAX_ID, }; [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>, David Miller <davem@davemloft.net>, netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>, Alexei Starovoitov <ast@plumgrid.com> Subject: linux-next: manual merge of the tip tree with the net-next tree Date: Tue, 7 Apr 2015 17:11:48 +1000 [thread overview] Message-ID: <20150407171148.7a41ee90@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 3528 bytes --] Hi all, Today's linux-next merge of the tip tree got a conflict in include/uapi/linux/bpf.h between commit 96be4325f443 ("ebpf: add sched_cls_type and map it to sk_filter's verifier ops"), 03e69b508b6f ("ebpf: add prandom helper for packet sampling"), c04167ce2ca0 ("ebpf: add helper for obtaining current processor id"), 94caee8c312d ("ebpf: add sched_act_type and map it to sk_filter's verifier ops"), 608cd71a9c7c ("tc: bpf: generalize pedit action") and 91bc4822c3d6 ("tc: bpf: add checksum helpers") from the net-next tree and commit 2541517c32be ("tracing, perf: Implement BPF programs attached to kprobes"), d9847d310ab4 ("tracing: Allow BPF programs to call bpf_ktime_get_ns()") and 9c959c863f82 ("tracing: Allow BPF programs to call bpf_trace_printk()") from the tip tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc include/uapi/linux/bpf.h index 23df3e7f8e7d,cc47ef41076a..000000000000 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@@ -118,12 -118,9 +118,13 @@@ enum bpf_map_type enum bpf_prog_type { BPF_PROG_TYPE_UNSPEC, BPF_PROG_TYPE_SOCKET_FILTER, + BPF_PROG_TYPE_SCHED_CLS, + BPF_PROG_TYPE_SCHED_ACT, + BPF_PROG_TYPE_KPROBE, }; +#define BPF_PSEUDO_MAP_FD 1 + /* flags for BPF_MAP_UPDATE_ELEM command */ #define BPF_ANY 0 /* create new element or update existing */ #define BPF_NOEXIST 1 /* create new element if it didn't exist */ @@@ -166,45 -164,9 +168,48 @@@ enum bpf_func_id BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */ BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */ BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */ + BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */ + BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */ + + /** + * skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet + * @skb: pointer to skb + * @offset: offset within packet from skb->data + * @from: pointer where to copy bytes from + * @len: number of bytes to store into packet + * @flags: bit 0 - if true, recompute skb->csum + * other bits - reserved + * Return: 0 on success + */ + BPF_FUNC_skb_store_bytes, + + /** + * l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum + * @skb: pointer to skb + * @offset: offset within packet where IP checksum is located + * @from: old value of header field + * @to: new value of header field + * @flags: bits 0-3 - size of header field + * other bits - reserved + * Return: 0 on success + */ + BPF_FUNC_l3_csum_replace, + + /** + * l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum + * @skb: pointer to skb + * @offset: offset within packet where TCP/UDP checksum is located + * @from: old value of header field + * @to: new value of header field + * @flags: bits 0-3 - size of header field + * bit 4 - is pseudo header + * other bits - reserved + * Return: 0 on success + */ + BPF_FUNC_l4_csum_replace, + BPF_FUNC_probe_read, /* int bpf_probe_read(void *dst, int size, void *src) */ + BPF_FUNC_ktime_get_ns, /* u64 bpf_ktime_get_ns(void) */ + BPF_FUNC_trace_printk, /* int bpf_trace_printk(const char *fmt, int fmt_size, ...) */ __BPF_FUNC_MAX_ID, }; [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-04-07 7:12 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-07 7:11 Stephen Rothwell [this message] 2015-04-07 7:11 ` linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell 2015-04-07 7:32 ` Daniel Borkmann 2015-04-07 16:10 ` Alexei Starovoitov -- strict thread matches above, loose matches on Subject: below -- 2022-03-15 2:13 Stephen Rothwell 2022-01-10 1:12 Stephen Rothwell 2019-10-18 2:31 Stephen Rothwell 2019-10-18 5:00 ` Alexei Starovoitov 2019-02-15 2:20 Stephen Rothwell 2017-11-01 7:15 Stephen Rothwell 2017-11-01 8:18 ` Peter Zijlstra 2017-11-01 8:27 ` Ingo Molnar 2017-11-01 8:55 ` Peter Zijlstra 2017-11-01 9:04 ` Ingo Molnar 2017-11-01 10:57 ` Stephen Rothwell 2017-11-01 16:27 ` Alexei Starovoitov 2017-11-05 2:12 ` Stephen Rothwell 2017-11-01 7:10 Stephen Rothwell 2017-10-30 20:55 Mark Brown 2017-11-13 6:00 ` Stephen Rothwell 2017-08-31 3:47 Stephen Rothwell 2017-09-05 0:05 ` Stephen Rothwell 2017-02-20 1:22 Stephen Rothwell 2017-02-20 9:02 ` Daniel Borkmann 2016-12-12 2:30 Stephen Rothwell 2016-12-01 3:46 Stephen Rothwell 2016-11-17 3:04 Stephen Rothwell 2015-04-07 7:04 Stephen Rothwell 2015-04-07 7:04 ` Stephen Rothwell 2015-04-07 16:11 ` Alexei Starovoitov 2015-04-07 7:00 Stephen Rothwell 2015-04-07 7:00 ` Stephen Rothwell 2015-04-07 7:30 ` Daniel Borkmann 2014-07-25 4:38 Stephen Rothwell 2014-07-25 4:38 ` Stephen Rothwell 2014-05-05 4:29 Stephen Rothwell 2014-05-05 4:29 ` Stephen Rothwell 2014-01-13 3:18 Stephen Rothwell 2014-01-13 3:18 ` Stephen Rothwell 2014-01-13 3:20 ` Stephen Rothwell 2014-01-13 3:20 ` Stephen Rothwell 2014-01-14 3:02 ` Stephen Rothwell 2014-01-14 3:02 ` Stephen Rothwell 2014-01-14 4:51 ` H. Peter Anvin 2014-01-14 5:19 ` Stephen Rothwell 2014-01-14 5:19 ` David Miller 2014-01-14 5:44 ` Stephen Rothwell 2014-01-14 5:48 ` David Miller 2014-01-14 6:10 ` Stephen Rothwell 2013-11-08 4:58 Stephen Rothwell 2013-11-08 4:58 ` Stephen Rothwell 2013-04-11 4:03 Stephen Rothwell 2013-04-11 4:03 ` Stephen Rothwell
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=20150407171148.7a41ee90@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=ast@plumgrid.com \ --cc=daniel@iogearbox.net \ --cc=davem@davemloft.net \ --cc=hpa@zytor.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=mingo@elte.hu \ --cc=netdev@vger.kernel.org \ --cc=peterz@infradead.org \ --cc=tglx@linutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.