Skip to content

Commit 2fb1cf4

Browse files
iamkafaiNobody
authored andcommitted
bpf: selftests: Update tests after s/delivery_time/tstamp/ change in bpf.h
The previous patch made the follow changes: - s/delivery_time_type/tstamp_type/ - s/bpf_skb_set_delivery_time/bpf_skb_set_tstamp/ - BPF_SKB_DELIVERY_TIME_* to BPF_SKB_TSTAMP_* This patch is to change the test_tc_dtime.c to reflect the above. Signed-off-by: Martin KaFai Lau <[email protected]>
1 parent 330159d commit 2fb1cf4

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

tools/testing/selftests/bpf/progs/test_tc_dtime.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ int egress_host(struct __sk_buff *skb)
174174
return TC_ACT_OK;
175175

176176
if (skb_proto(skb_type) == IPPROTO_TCP) {
177-
if (skb->delivery_time_type == BPF_SKB_DELIVERY_TIME_MONO &&
177+
if (skb->tstamp_type == BPF_SKB_TSTAMP_DELIVERY_MONO &&
178178
skb->tstamp)
179179
inc_dtimes(EGRESS_ENDHOST);
180180
else
181181
inc_errs(EGRESS_ENDHOST);
182182
} else {
183-
if (skb->delivery_time_type == BPF_SKB_DELIVERY_TIME_UNSPEC &&
183+
if (skb->tstamp_type == BPF_SKB_TSTAMP_UNSPEC &&
184184
skb->tstamp)
185185
inc_dtimes(EGRESS_ENDHOST);
186186
else
@@ -204,7 +204,7 @@ int ingress_host(struct __sk_buff *skb)
204204
if (!skb_type)
205205
return TC_ACT_OK;
206206

207-
if (skb->delivery_time_type == BPF_SKB_DELIVERY_TIME_MONO &&
207+
if (skb->tstamp_type == BPF_SKB_TSTAMP_DELIVERY_MONO &&
208208
skb->tstamp == EGRESS_FWDNS_MAGIC)
209209
inc_dtimes(INGRESS_ENDHOST);
210210
else
@@ -226,7 +226,7 @@ int ingress_fwdns_prio100(struct __sk_buff *skb)
226226
return TC_ACT_OK;
227227

228228
/* delivery_time is only available to the ingress
229-
* if the tc-bpf checks the skb->delivery_time_type.
229+
* if the tc-bpf checks the skb->tstamp_type.
230230
*/
231231
if (skb->tstamp == EGRESS_ENDHOST_MAGIC)
232232
inc_errs(INGRESS_FWDNS_P100);
@@ -250,7 +250,7 @@ int egress_fwdns_prio100(struct __sk_buff *skb)
250250
return TC_ACT_OK;
251251

252252
/* delivery_time is always available to egress even
253-
* the tc-bpf did not use the delivery_time_type.
253+
* the tc-bpf did not use the tstamp_type.
254254
*/
255255
if (skb->tstamp == INGRESS_FWDNS_MAGIC)
256256
inc_dtimes(EGRESS_FWDNS_P100);
@@ -278,9 +278,9 @@ int ingress_fwdns_prio101(struct __sk_buff *skb)
278278
if (skb_proto(skb_type) == IPPROTO_UDP)
279279
expected_dtime = 0;
280280

281-
if (skb->delivery_time_type) {
281+
if (skb->tstamp_type) {
282282
if (fwdns_clear_dtime() ||
283-
skb->delivery_time_type != BPF_SKB_DELIVERY_TIME_MONO ||
283+
skb->tstamp_type != BPF_SKB_TSTAMP_DELIVERY_MONO ||
284284
skb->tstamp != expected_dtime)
285285
inc_errs(INGRESS_FWDNS_P101);
286286
else
@@ -290,14 +290,14 @@ int ingress_fwdns_prio101(struct __sk_buff *skb)
290290
inc_errs(INGRESS_FWDNS_P101);
291291
}
292292

293-
if (skb->delivery_time_type == BPF_SKB_DELIVERY_TIME_MONO) {
293+
if (skb->tstamp_type == BPF_SKB_TSTAMP_DELIVERY_MONO) {
294294
skb->tstamp = INGRESS_FWDNS_MAGIC;
295295
} else {
296-
if (bpf_skb_set_delivery_time(skb, INGRESS_FWDNS_MAGIC,
297-
BPF_SKB_DELIVERY_TIME_MONO))
296+
if (bpf_skb_set_tstamp(skb, INGRESS_FWDNS_MAGIC,
297+
BPF_SKB_TSTAMP_DELIVERY_MONO))
298298
inc_errs(SET_DTIME);
299-
if (!bpf_skb_set_delivery_time(skb, INGRESS_FWDNS_MAGIC,
300-
BPF_SKB_DELIVERY_TIME_UNSPEC))
299+
if (!bpf_skb_set_tstamp(skb, INGRESS_FWDNS_MAGIC,
300+
BPF_SKB_TSTAMP_UNSPEC))
301301
inc_errs(SET_DTIME);
302302
}
303303

@@ -320,9 +320,9 @@ int egress_fwdns_prio101(struct __sk_buff *skb)
320320
/* Should have handled in prio100 */
321321
return TC_ACT_SHOT;
322322

323-
if (skb->delivery_time_type) {
323+
if (skb->tstamp_type) {
324324
if (fwdns_clear_dtime() ||
325-
skb->delivery_time_type != BPF_SKB_DELIVERY_TIME_MONO ||
325+
skb->tstamp_type != BPF_SKB_TSTAMP_DELIVERY_MONO ||
326326
skb->tstamp != INGRESS_FWDNS_MAGIC)
327327
inc_errs(EGRESS_FWDNS_P101);
328328
else
@@ -332,14 +332,14 @@ int egress_fwdns_prio101(struct __sk_buff *skb)
332332
inc_errs(EGRESS_FWDNS_P101);
333333
}
334334

335-
if (skb->delivery_time_type == BPF_SKB_DELIVERY_TIME_MONO) {
335+
if (skb->tstamp_type == BPF_SKB_TSTAMP_DELIVERY_MONO) {
336336
skb->tstamp = EGRESS_FWDNS_MAGIC;
337337
} else {
338-
if (bpf_skb_set_delivery_time(skb, EGRESS_FWDNS_MAGIC,
339-
BPF_SKB_DELIVERY_TIME_MONO))
338+
if (bpf_skb_set_tstamp(skb, EGRESS_FWDNS_MAGIC,
339+
BPF_SKB_TSTAMP_DELIVERY_MONO))
340340
inc_errs(SET_DTIME);
341-
if (!bpf_skb_set_delivery_time(skb, EGRESS_FWDNS_MAGIC,
342-
BPF_SKB_DELIVERY_TIME_UNSPEC))
341+
if (!bpf_skb_set_tstamp(skb, INGRESS_FWDNS_MAGIC,
342+
BPF_SKB_TSTAMP_UNSPEC))
343343
inc_errs(SET_DTIME);
344344
}
345345

0 commit comments

Comments
 (0)