bpf: Allow __sk_buff tstamp in BPF_PROG_TEST_RUN (ba940948) · Commits · 戴 / test

It's useful for implementing EDT related tests (set tstamp, run the test, see how the tstamp is changed or observe some other parameter). Note that bpf_ktime_get_ns() helper is using monotonic clock, so for the BPF programs that compare tstamp against it, tstamp should be derived from clock_gettime(CLOCK_MONOTONIC, ...). Signed-off-by:

Stanislav Fomichev <sdf@google.com> Signed-off-by:

Alexei Starovoitov <ast@kernel.org> Acked-by:

Martin KaFai Lau <kafai@fb.com> Link: https://lore.kernel.org/bpf/20191015183125.124413-1-sdf@google.com

net/bpf/test_run.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -218,10 +218,18 @@ static int convert___skb_to_skb(struct sk_buff skb, struct __sk_buff __skb)

		if (!range_is_zero(__skb, offsetof(struct __sk_buff, cb) +
		FIELD_SIZEOF(struct __sk_buff, cb),
		offsetof(struct __sk_buff, tstamp)))
		return -EINVAL;

		/* tstamp is allowed */

		if (!range_is_zero(__skb, offsetof(struct __sk_buff, tstamp) +
		FIELD_SIZEOF(struct __sk_buff, tstamp),
		sizeof(struct __sk_buff)))
		return -EINVAL;

		skb->priority = __skb->priority;
		skb->tstamp = __skb->tstamp;
		memcpy(&cb->data, __skb->cb, QDISC_CB_PRIV_LEN);

		return 0;
		@@ -235,6 +243,7 @@ static void convert_skb_to___skb(struct sk_buff skb, struct __sk_buff __skb)
		return;

		__skb->priority = skb->priority;
		__skb->tstamp = skb->tstamp;
		memcpy(__skb->cb, &cb->data, QDISC_CB_PRIV_LEN);
		}

Admin message