From: Flavio Leitner <[email protected]> This helps to identify when it is about the flags or the packet itself.
Signed-off-by: Flavio Leitner <[email protected]> Co-authored-by: Mike Pattrick <[email protected]> Signed-off-by: Mike Pattrick <[email protected]> Acked-by: Maxime Coquelin <[email protected]> Reviewed-by: David Marchand <[email protected]> --- lib/conntrack.c | 8 ++++---- lib/dp-packet.c | 2 +- lib/dp-packet.h | 10 +++++----- lib/ipf.c | 4 ++-- lib/netdev-native-tnl.c | 4 ++-- lib/netdev-offload-dpdk.c | 2 +- lib/netdev.c | 2 +- lib/packets.c | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index 52592301a..290560ab6 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -2089,12 +2089,12 @@ conn_key_extract(struct conntrack *ct, struct dp_packet *pkt, ovs_be16 dl_type, ctx->key.dl_type = dl_type; if (ctx->key.dl_type == htons(ETH_TYPE_IP)) { - bool hwol_bad_l3_csum = dp_packet_ip_checksum_bad(pkt); + bool hwol_bad_l3_csum = dp_packet_ol_ip_checksum_bad(pkt); if (hwol_bad_l3_csum) { ok = false; COVERAGE_INC(conntrack_l3csum_err); } else { - bool hwol_good_l3_csum = dp_packet_ip_checksum_valid(pkt) + bool hwol_good_l3_csum = dp_packet_ol_ip_checksum_good(pkt) || dp_packet_ol_tx_ipv4(pkt); /* Validate the checksum only when hwol is not supported. */ ok = extract_l3_ipv4(&ctx->key, l3, dp_packet_l3_size(pkt), NULL, @@ -2107,9 +2107,9 @@ conn_key_extract(struct conntrack *ct, struct dp_packet *pkt, ovs_be16 dl_type, } if (ok) { - bool hwol_bad_l4_csum = dp_packet_l4_checksum_bad(pkt); + bool hwol_bad_l4_csum = dp_packet_ol_l4_checksum_bad(pkt); if (!hwol_bad_l4_csum) { - bool hwol_good_l4_csum = dp_packet_l4_checksum_valid(pkt) + bool hwol_good_l4_csum = dp_packet_ol_l4_checksum_good(pkt) || dp_packet_ol_tx_l4_checksum(pkt); /* Validate the checksum only when hwol is not supported. */ if (extract_l4(&ctx->key, l4, dp_packet_l4_size(pkt), diff --git a/lib/dp-packet.c b/lib/dp-packet.c index d390abbc3..9728565dc 100644 --- a/lib/dp-packet.c +++ b/lib/dp-packet.c @@ -33,7 +33,7 @@ dp_packet_init__(struct dp_packet *p, size_t allocated, dp_packet_reset_offsets(p); pkt_metadata_init(&p->md, 0); dp_packet_reset_cutlen(p); - dp_packet_reset_offload(p); + dp_packet_ol_reset(p); /* Initialize implementation-specific fields of dp_packet. */ dp_packet_init_specific(p); /* By default assume the packet type to be Ethernet. */ diff --git a/lib/dp-packet.h b/lib/dp-packet.h index bf09e2646..633b4ef38 100644 --- a/lib/dp-packet.h +++ b/lib/dp-packet.h @@ -935,7 +935,7 @@ dp_packet_rss_valid(const struct dp_packet *p) } static inline void -dp_packet_reset_offload(struct dp_packet *p) +dp_packet_ol_reset(struct dp_packet *p) { *dp_packet_ol_flags_ptr(p) &= ~DP_PACKET_OL_SUPPORTED_MASK; } @@ -1058,28 +1058,28 @@ dp_packet_ol_set_tcp_seg(struct dp_packet *a) } static inline bool -dp_packet_ip_checksum_valid(const struct dp_packet *p) +dp_packet_ol_ip_checksum_good(const struct dp_packet *p) { return (*dp_packet_ol_flags_ptr(p) & DP_PACKET_OL_RX_IP_CSUM_MASK) == DP_PACKET_OL_RX_IP_CSUM_GOOD; } static inline bool -dp_packet_ip_checksum_bad(const struct dp_packet *p) +dp_packet_ol_ip_checksum_bad(const struct dp_packet *p) { return (*dp_packet_ol_flags_ptr(p) & DP_PACKET_OL_RX_IP_CSUM_MASK) == DP_PACKET_OL_RX_IP_CSUM_BAD; } static inline bool -dp_packet_l4_checksum_valid(const struct dp_packet *p) +dp_packet_ol_l4_checksum_good(const struct dp_packet *p) { return (*dp_packet_ol_flags_ptr(p) & DP_PACKET_OL_RX_L4_CSUM_MASK) == DP_PACKET_OL_RX_L4_CSUM_GOOD; } static inline bool -dp_packet_l4_checksum_bad(const struct dp_packet *p) +dp_packet_ol_l4_checksum_bad(const struct dp_packet *p) { return (*dp_packet_ol_flags_ptr(p) & DP_PACKET_OL_RX_L4_CSUM_MASK) == DP_PACKET_OL_RX_L4_CSUM_BAD; diff --git a/lib/ipf.c b/lib/ipf.c index 0e875f509..4f635de11 100644 --- a/lib/ipf.c +++ b/lib/ipf.c @@ -574,7 +574,7 @@ ipf_list_state_transition(struct ipf *ipf, struct ipf_list *ipf_list, static bool ipf_is_valid_v4_frag(struct ipf *ipf, struct dp_packet *pkt) { - if (OVS_UNLIKELY(dp_packet_ip_checksum_bad(pkt))) { + if (OVS_UNLIKELY(dp_packet_ol_ip_checksum_bad(pkt))) { COVERAGE_INC(ipf_l3csum_err); goto invalid_pkt; } @@ -608,7 +608,7 @@ ipf_is_valid_v4_frag(struct ipf *ipf, struct dp_packet *pkt) goto invalid_pkt; } - if (OVS_UNLIKELY(!dp_packet_ip_checksum_valid(pkt) + if (OVS_UNLIKELY(!dp_packet_ol_ip_checksum_good(pkt) && !dp_packet_ol_tx_ipv4(pkt) && csum(l3, ip_hdr_len) != 0)) { COVERAGE_INC(ipf_l3csum_err); diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index b89dfdd52..8a0b34fc4 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -88,7 +88,7 @@ netdev_tnl_ip_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, ovs_be32 ip_src, ip_dst; - if (OVS_UNLIKELY(!dp_packet_ip_checksum_valid(packet))) { + if (OVS_UNLIKELY(!dp_packet_ol_ip_checksum_good(packet))) { if (csum(ip, IP_IHL(ip->ip_ihl_ver) * 4)) { VLOG_WARN_RL(&err_rl, "ip packet has invalid checksum"); return NULL; @@ -190,7 +190,7 @@ udp_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, } if (udp->udp_csum) { - if (OVS_UNLIKELY(!dp_packet_l4_checksum_valid(packet))) { + if (OVS_UNLIKELY(!dp_packet_ol_l4_checksum_good(packet))) { uint32_t csum; if (netdev_tnl_is_header_ipv6(dp_packet_data(packet))) { csum = packet_csum_pseudoheader6(dp_packet_l3(packet)); diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index 12d299603..2b83d6c44 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -2688,7 +2688,7 @@ netdev_offload_dpdk_hw_miss_packet_recover(struct netdev *netdev, * processing in SW. */ md->in_port.odp_port = vport_odp; - dp_packet_reset_offload(packet); + dp_packet_ol_reset(packet); close_vport_netdev: netdev_close(vport_netdev); diff --git a/lib/netdev.c b/lib/netdev.c index 5c3751fe6..1219ddbb9 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -913,7 +913,7 @@ netdev_pop_header(struct netdev *netdev, struct dp_packet_batch *batch) /* Reset the offload flags if present, to avoid wrong * interpretation in the further packet processing when * recirculated.*/ - dp_packet_reset_offload(packet); + dp_packet_ol_reset(packet); pkt_metadata_init_conn(&packet->md); dp_packet_batch_refill(batch, packet, i); } diff --git a/lib/packets.c b/lib/packets.c index a1698d65b..d564c9dbe 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -473,7 +473,7 @@ pop_mpls(struct dp_packet *packet, ovs_be16 ethtype) /* Invalidate offload flags as they are not valid after * decapsulation of MPLS header. */ - dp_packet_reset_offload(packet); + dp_packet_ol_reset(packet); /* packet_type must be reset for the MPLS packets with no l2 header */ if (!len) { -- 2.31.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
