Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 04:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gue: Use checksum partial with remote checksum offload

Browse Source 
Change remote checksum handling to set checksum partial as default
behavior. Added an iflink parameter to configure not using
checksum partial (calling csum_partial to update checksum).

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tom Herbert 2015-02-10 16:30:33 -08:00 committed by David S. Miller
parent 0ace2ca89c
commit fe881ef11c
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/uapi/linux/fou.h
View File

@ -14,6 +14,7 @@ enum {
FOU_ATTR_AF, /* u8 */ FOU_ATTR_AF, /* u8 */
FOU_ATTR_IPPROTO, /* u8 */ FOU_ATTR_IPPROTO, /* u8 */
FOU_ATTR_TYPE, /* u8 */ FOU_ATTR_TYPE, /* u8 */
FOU_ATTR_REMCSUM_NOPARTIAL, /* flag */
__FOU_ATTR_MAX, __FOU_ATTR_MAX,
}; };

28
net/ipv4/fou.c
View File

@ -22,14 +22,18 @@ static LIST_HEAD(fou_list);
struct fou { struct fou {
struct socket *sock; struct socket *sock;
u8 protocol; u8 protocol;
u8 flags;
u16 port; u16 port;
struct udp_offload udp_offloads; struct udp_offload udp_offloads;
struct list_head list; struct list_head list;
}; };
#define FOU_F_REMCSUM_NOPARTIAL BIT(0)
struct fou_cfg { struct fou_cfg {
u16 type; u16 type;
u8 protocol; u8 protocol;
u8 flags;
struct udp_port_cfg udp_config; struct udp_port_cfg udp_config;
}; };
@ -64,7 +68,8 @@ static int fou_udp_recv(struct sock *sk, struct sk_buff *skb)
} }
static struct guehdr *gue_remcsum(struct sk_buff *skb, struct guehdr *guehdr, static struct guehdr *gue_remcsum(struct sk_buff *skb, struct guehdr *guehdr,
void *data, size_t hdrlen, u8 ipproto) void *data, size_t hdrlen, u8 ipproto,
bool nopartial)
{ {
__be16 *pd = data; __be16 *pd = data;
size_t start = ntohs(pd[0]); size_t start = ntohs(pd[0]);
@ -75,7 +80,8 @@ static struct guehdr *gue_remcsum(struct sk_buff *skb, struct guehdr *guehdr,
return NULL; return NULL;
guehdr = (struct guehdr *)&udp_hdr(skb)[1]; guehdr = (struct guehdr *)&udp_hdr(skb)[1];
skb_remcsum_process(skb, (void *)guehdr + hdrlen, start, offset, true); skb_remcsum_process(skb, (void *)guehdr + hdrlen,
start, offset, nopartial);
return guehdr; return guehdr;
} }
@ -136,7 +142,9 @@ static int gue_udp_recv(struct sock *sk, struct sk_buff *skb)
if (flags & GUE_PFLAG_REMCSUM) { if (flags & GUE_PFLAG_REMCSUM) {
guehdr = gue_remcsum(skb, guehdr, data + doffset, guehdr = gue_remcsum(skb, guehdr, data + doffset,
hdrlen, guehdr->proto_ctype); hdrlen, guehdr->proto_ctype,
!!(fou->flags &
FOU_F_REMCSUM_NOPARTIAL));
if (!guehdr) if (!guehdr)
goto drop; goto drop;
@ -209,7 +217,7 @@ static int fou_gro_complete(struct sk_buff *skb, int nhoff,
static struct guehdr *gue_gro_remcsum(struct sk_buff *skb, unsigned int off, static struct guehdr *gue_gro_remcsum(struct sk_buff *skb, unsigned int off,
struct guehdr *guehdr, void *data, struct guehdr *guehdr, void *data,
size_t hdrlen, u8 ipproto, size_t hdrlen, u8 ipproto,
struct gro_remcsum *grc) struct gro_remcsum *grc, bool nopartial)
{ {
__be16 *pd = data; __be16 *pd = data;
size_t start = ntohs(pd[0]); size_t start = ntohs(pd[0]);
@ -230,7 +238,7 @@ static struct guehdr *gue_gro_remcsum(struct sk_buff *skb, unsigned int off,
} }
skb_gro_remcsum_process(skb, (void *)guehdr + hdrlen, skb_gro_remcsum_process(skb, (void *)guehdr + hdrlen,
start, offset, grc, true); start, offset, grc, nopartial);
skb->remcsum_offload = 1; skb->remcsum_offload = 1;
@ -250,6 +258,7 @@ static struct sk_buff **gue_gro_receive(struct sk_buff **head,
void *data; void *data;
u16 doffset = 0; u16 doffset = 0;
int flush = 1; int flush = 1;
struct fou *fou = container_of(uoff, struct fou, udp_offloads);
struct gro_remcsum grc; struct gro_remcsum grc;
skb_gro_remcsum_init(&grc); skb_gro_remcsum_init(&grc);
@ -294,7 +303,9 @@ static struct sk_buff **gue_gro_receive(struct sk_buff **head,
if (flags & GUE_PFLAG_REMCSUM) { if (flags & GUE_PFLAG_REMCSUM) {
guehdr = gue_gro_remcsum(skb, off, guehdr, guehdr = gue_gro_remcsum(skb, off, guehdr,
data + doffset, hdrlen, data + doffset, hdrlen,
guehdr->proto_ctype, &grc); guehdr->proto_ctype, &grc,
!!(fou->flags &
FOU_F_REMCSUM_NOPARTIAL));
if (!guehdr) if (!guehdr)
goto out; goto out;
@ -455,6 +466,7 @@ static int fou_create(struct net *net, struct fou_cfg *cfg,
sk = sock->sk; sk = sock->sk;
fou->flags = cfg->flags;
fou->port = cfg->udp_config.local_udp_port; fou->port = cfg->udp_config.local_udp_port;
/* Initial for fou type */ /* Initial for fou type */
@ -541,6 +553,7 @@ static struct nla_policy fou_nl_policy[FOU_ATTR_MAX + 1] = {
[FOU_ATTR_AF] = { .type = NLA_U8, }, [FOU_ATTR_AF] = { .type = NLA_U8, },
[FOU_ATTR_IPPROTO] = { .type = NLA_U8, }, [FOU_ATTR_IPPROTO] = { .type = NLA_U8, },
[FOU_ATTR_TYPE] = { .type = NLA_U8, }, [FOU_ATTR_TYPE] = { .type = NLA_U8, },
[FOU_ATTR_REMCSUM_NOPARTIAL] = { .type = NLA_FLAG, },
}; };
static int parse_nl_config(struct genl_info *info, static int parse_nl_config(struct genl_info *info,
@ -571,6 +584,9 @@ static int parse_nl_config(struct genl_info *info,
if (info->attrs[FOU_ATTR_TYPE]) if (info->attrs[FOU_ATTR_TYPE])
cfg->type = nla_get_u8(info->attrs[FOU_ATTR_TYPE]); cfg->type = nla_get_u8(info->attrs[FOU_ATTR_TYPE]);
if (info->attrs[FOU_ATTR_REMCSUM_NOPARTIAL])
cfg->flags |= FOU_F_REMCSUM_NOPARTIAL;
return 0; return 0;
} }