Commit 8050c0f0 authored Mar 04, 2016 by Daniel Borkmann Committed by David S. Miller Mar 08, 2016

bpf: allow bpf_csum_diff to feed bpf_l3_csum_replace as well



Commit 7d672345 ("bpf: add generic bpf_csum_diff helper") added a
generic checksum diff helper that can feed bpf_l4_csum_replace() with
a target __wsum diff that is to be applied to the L4 checksum. This
facility is very flexible, can be cascaded, allows for adding, removing,
or diffing data, or for calculating the pseudo header checksum from
scratch, but it can also be reused for working with the IPv4 header
checksum.

Thus, analogous to bpf_l4_csum_replace(), add a case for header field
value of 0 to change the checksum at a given offset through a new helper
csum_replace_by_diff(). Also, in addition to that, this provides an
easy to use interface for feeding precalculated diffs f.e. coming from
a map. It nicely complements bpf_l3_csum_replace() that currently allows
only for csum updates of 2 and 4 byte diffs.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 810813c4

include/net/checksum.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,11 @@ static inline __wsum csum_partial_ext(const void *buff, int len, __wsum sum)

		#define CSUM_MANGLED_0 ((__force __sum16)0xffff)

		static inline void csum_replace_by_diff(__sum16 *sum, __wsum diff)
		{
		sum = csum_fold(csum_add(diff, ~csum_unfold(sum)));
		}

		static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to)
		{
		__wsum tmp = csum_sub(~csum_unfold(*sum), (__force __wsum)from);

net/core/filter.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1447,6 +1447,12 @@ static u64 bpf_l3_csum_replace(u64 r1, u64 r2, u64 from, u64 to, u64 flags)
		return -EFAULT;

		switch (flags & BPF_F_HDR_FIELD_MASK) {
		case 0:
		if (unlikely(from != 0))
		return -EINVAL;

		csum_replace_by_diff(ptr, to);
		break;
		case 2:
		csum_replace2(ptr, from, to);
		break;

Admin message