Skip to content

Commit

Permalink
igb: Implement Rx SCTP CSO
Browse files Browse the repository at this point in the history
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
  • Loading branch information
akihikodaki committed Apr 4, 2023
1 parent 0ac60d1 commit bee0bf5
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 13 deletions.
5 changes: 5 additions & 0 deletions hw/net/e1000e_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,11 @@ e1000e_verify_csum_in_sw(E1000ECore *core,
return;
}

if (l4hdr_proto != ETH_L4_HDR_PROTO_TCP &&
l4hdr_proto != ETH_L4_HDR_PROTO_UDP) {
return;
}

if (!net_rx_pkt_validate_l4_csum(pkt, &csum_valid)) {
trace_e1000e_rx_metadata_l4_csum_validation_failed();
return;
Expand Down
15 changes: 14 additions & 1 deletion hw/net/igb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ igb_build_rx_metadata(IGBCore *core,
uint16_t *vlan_tag)
{
struct virtio_net_hdr *vhdr;
bool hasip4, hasip6;
bool hasip4, hasip6, csum_valid;
EthL4HdrProto l4hdr_proto;

*status_flags = E1000_RXD_STAT_DD;
Expand Down Expand Up @@ -1282,6 +1282,10 @@ igb_build_rx_metadata(IGBCore *core,
*pkt_info |= BIT(9);
break;

case ETH_L4_HDR_PROTO_SCTP:
*pkt_info |= BIT(10);
break;

default:
break;
}
Expand Down Expand Up @@ -1314,6 +1318,15 @@ igb_build_rx_metadata(IGBCore *core,

if (igb_rx_l4_cso_enabled(core)) {
switch (l4hdr_proto) {
case ETH_L4_HDR_PROTO_SCTP:
if (!net_rx_pkt_validate_l4_csum(pkt, &csum_valid)) {
trace_e1000e_rx_metadata_l4_csum_validation_failed();
goto func_exit;
}
if (!csum_valid) {
*status_flags |= E1000_RXDEXT_STATERR_TCPE;
}
/* fall through */
case ETH_L4_HDR_PROTO_TCP:
*status_flags |= E1000_RXD_STAT_TCPCS;
break;
Expand Down
62 changes: 51 additions & 11 deletions hw/net/net_rx_pkt.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/

#include "qemu/osdep.h"
#include "qemu/crc32c.h"
#include "trace.h"
#include "net_rx_pkt.h"
#include "net/checksum.h"
Expand Down Expand Up @@ -558,32 +559,71 @@ _net_rx_pkt_calc_l4_csum(struct NetRxPkt *pkt)
return csum;
}

bool net_rx_pkt_validate_l4_csum(struct NetRxPkt *pkt, bool *csum_valid)
static bool
_net_rx_pkt_validate_sctp_sum(struct NetRxPkt *pkt)
{
uint16_t csum;
size_t csum_off;
size_t off = pkt->l4hdr_off;
size_t vec_len = pkt->vec_len;
struct iovec *vec;
uint32_t calculated = 0;
uint32_t original;
bool valid;

trace_net_rx_pkt_l4_csum_validate_entry();
for (vec = pkt->vec; vec->iov_len < off; vec++) {
off -= vec->iov_len;
vec_len--;
}

if (pkt->l4hdr_info.proto != ETH_L4_HDR_PROTO_TCP &&
pkt->l4hdr_info.proto != ETH_L4_HDR_PROTO_UDP) {
trace_net_rx_pkt_l4_csum_validate_not_xxp();
csum_off = off + 8;

if (!iov_to_buf(vec, vec_len, csum_off, &original, sizeof(original))) {
return false;
}

if (pkt->l4hdr_info.proto == ETH_L4_HDR_PROTO_UDP &&
pkt->l4hdr_info.hdr.udp.uh_sum == 0) {
trace_net_rx_pkt_l4_csum_validate_udp_with_no_checksum();
if (!iov_from_buf(vec, vec_len, csum_off, &calculated, sizeof(calculated))) {
return false;
}

calculated = crc32c(0xffffffff, (uint8_t *)vec->iov_base + off, vec->iov_len - off);
calculated = iov_crc32c(calculated ^ 0xffffffff, vec + 1, vec_len - 1);
valid = calculated == le32_to_cpu(original);
iov_from_buf(vec, vec_len, csum_off, &original, sizeof(original));

return valid;
}

bool net_rx_pkt_validate_l4_csum(struct NetRxPkt *pkt, bool *csum_valid)
{
uint32_t csum;

trace_net_rx_pkt_l4_csum_validate_entry();

if (pkt->hasip4 && pkt->ip4hdr_info.fragment) {
trace_net_rx_pkt_l4_csum_validate_ip4_fragment();
return false;
}

csum = _net_rx_pkt_calc_l4_csum(pkt);
switch (pkt->l4hdr_info.proto) {
case ETH_L4_HDR_PROTO_UDP:
if (pkt->l4hdr_info.hdr.udp.uh_sum == 0) {
trace_net_rx_pkt_l4_csum_validate_udp_with_no_checksum();
return false;
}
/* fall through */
case ETH_L4_HDR_PROTO_TCP:
csum = _net_rx_pkt_calc_l4_csum(pkt);
*csum_valid = ((csum == 0) || (csum == 0xFFFF));
break;

case ETH_L4_HDR_PROTO_SCTP:
*csum_valid = _net_rx_pkt_validate_sctp_sum(pkt);
break;

*csum_valid = ((csum == 0) || (csum == 0xFFFF));
default:
trace_net_rx_pkt_l4_csum_validate_not_xxp();
return false;
}

trace_net_rx_pkt_l4_csum_validate_csum(*csum_valid);

Expand Down
4 changes: 3 additions & 1 deletion include/net/eth.h
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ struct tcp_hdr {
#define IP_HEADER_VERSION_6 (6)
#define IP_PROTO_TCP (6)
#define IP_PROTO_UDP (17)
#define IP_PROTO_SCTP (132)
#define IPTOS_ECN_MASK 0x03
#define IPTOS_ECN(x) ((x) & IPTOS_ECN_MASK)
#define IPTOS_ECN_CE 0x03
Expand Down Expand Up @@ -377,7 +378,8 @@ typedef struct eth_ip4_hdr_info_st {
typedef enum EthL4HdrProto {
ETH_L4_HDR_PROTO_INVALID,
ETH_L4_HDR_PROTO_TCP,
ETH_L4_HDR_PROTO_UDP
ETH_L4_HDR_PROTO_UDP,
ETH_L4_HDR_PROTO_SCTP
} EthL4HdrProto;

typedef struct eth_l4_hdr_info_st {
Expand Down
1 change: 1 addition & 0 deletions include/qemu/crc32c.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@


uint32_t crc32c(uint32_t crc, const uint8_t *data, unsigned int length);
uint32_t iov_crc32c(uint32_t crc, const struct iovec *iov, size_t iov_cnt);

#endif
4 changes: 4 additions & 0 deletions net/eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ void eth_get_protocols(const struct iovec *iov, int iovcnt,
*l5hdr_off = *l4hdr_off + sizeof(l4hdr_info->hdr.udp);
}
break;

case IP_PROTO_SCTP:
l4hdr_info->proto = ETH_L4_HDR_PROTO_SCTP;
break;
}
}

Expand Down
8 changes: 8 additions & 0 deletions util/crc32c.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,11 @@ uint32_t crc32c(uint32_t crc, const uint8_t *data, unsigned int length)
return crc^0xffffffff;
}

uint32_t iov_crc32c(uint32_t crc, const struct iovec *iov, size_t iov_cnt)
{
while (iov_cnt--) {
crc = crc32c(crc, iov->iov_base, iov->iov_len) ^ 0xffffffff;
iov++;
}
return crc ^ 0xffffffff;
}

0 comments on commit bee0bf5

Please sign in to comment.