Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 180fbf10 authored by Rahul Lakkireddy's avatar Rahul Lakkireddy Committed by Greg Kroah-Hartman
Browse files

cxgb4: parse TC-U32 key values and masks natively 



[ Upstream commit 27f78cb245abdb86735529c13b0a579f57829e71 ]

TC-U32 passes all keys values and masks in __be32 format. The parser
already expects this and hence pass the value and masks in __be32
natively to the parser.

Fixes following sparse warnings in several places:
cxgb4_tc_u32.c:57:21: warning: incorrect type in assignment (different base
types)
cxgb4_tc_u32.c:57:21:    expected unsigned int [usertype] val
cxgb4_tc_u32.c:57:21:    got restricted __be32 [usertype] val
cxgb4_tc_u32_parse.h:48:24: warning: cast to restricted __be32

Fixes: 2e8aad7b ("cxgb4: add parser to translate u32 filters to internal spec")
Signed-off-by: default avatarRahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0dc4dd43

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c

+9 −9
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static int fill_match_fields(struct adapter *adap, 
			     bool next_header)

{

	unsigned int i, j;

	u32 val, mask;

	__be32 val, mask;

	int off, err;

	bool found;
@@ -216,7 +216,7 @@ int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls) 
		const struct cxgb4_next_header *next;

		bool found = false;

		unsigned int i, j;

		u32 val, mask;

		__be32 val, mask;

		int off;



		if (t->table[link_uhtid - 1].link_handle) {
@@ -230,10 +230,10 @@ int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls) 


		/* Try to find matches that allow jumps to next header. */

		for (i = 0; next[i].jump; i++) {

			if (next[i].offoff != cls->knode.sel->offoff ||

			    next[i].shift != cls->knode.sel->offshift ||

			    next[i].mask != cls->knode.sel->offmask ||

			    next[i].offset != cls->knode.sel->off)

			if (next[i].sel.offoff != cls->knode.sel->offoff ||

			    next[i].sel.offshift != cls->knode.sel->offshift ||

			    next[i].sel.offmask != cls->knode.sel->offmask ||

			    next[i].sel.off != cls->knode.sel->off)

				continue;



			/* Found a possible candidate.  Find a key that
@@ -245,9 +245,9 @@ int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls) 
				val = cls->knode.sel->keys[j].val;

				mask = cls->knode.sel->keys[j].mask;



				if (next[i].match_off == off &&

				    next[i].match_val == val &&

				    next[i].match_mask == mask) {

				if (next[i].key.off == off &&

				    next[i].key.val == val &&

				    next[i].key.mask == mask) {

					found = true;

					break;

				}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h

+82 −40
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ 
struct cxgb4_match_field {

	int off; /* Offset from the beginning of the header to match */

	/* Fill the value/mask pair in the spec if matched */

	int (*val)(struct ch_filter_specification *f, u32 val, u32 mask);

	int (*val)(struct ch_filter_specification *f, __be32 val, __be32 mask);

};



/* IPv4 match fields */

static inline int cxgb4_fill_ipv4_tos(struct ch_filter_specification *f,

				      u32 val, u32 mask)

				      __be32 val, __be32 mask)

{

	f->val.tos  = (ntohl(val)  >> 16) & 0x000000FF;

	f->mask.tos = (ntohl(mask) >> 16) & 0x000000FF;
@@ -52,7 +52,7 @@ static inline int cxgb4_fill_ipv4_tos(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv4_frag(struct ch_filter_specification *f,

				       u32 val, u32 mask)

				       __be32 val, __be32 mask)

{

	u32 mask_val;

	u8 frag_val;
@@ -74,7 +74,7 @@ static inline int cxgb4_fill_ipv4_frag(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv4_proto(struct ch_filter_specification *f,

					u32 val, u32 mask)

					__be32 val, __be32 mask)

{

	f->val.proto  = (ntohl(val)  >> 16) & 0x000000FF;

	f->mask.proto = (ntohl(mask) >> 16) & 0x000000FF;
@@ -83,7 +83,7 @@ static inline int cxgb4_fill_ipv4_proto(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv4_src_ip(struct ch_filter_specification *f,

					 u32 val, u32 mask)

					 __be32 val, __be32 mask)

{

	memcpy(&f->val.fip[0],  &val,  sizeof(u32));

	memcpy(&f->mask.fip[0], &mask, sizeof(u32));
@@ -92,7 +92,7 @@ static inline int cxgb4_fill_ipv4_src_ip(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv4_dst_ip(struct ch_filter_specification *f,

					 u32 val, u32 mask)

					 __be32 val, __be32 mask)

{

	memcpy(&f->val.lip[0],  &val,  sizeof(u32));

	memcpy(&f->mask.lip[0], &mask, sizeof(u32));
@@ -111,7 +111,7 @@ static const struct cxgb4_match_field cxgb4_ipv4_fields[] = { 


/* IPv6 match fields */

static inline int cxgb4_fill_ipv6_tos(struct ch_filter_specification *f,

				      u32 val, u32 mask)

				      __be32 val, __be32 mask)

{

	f->val.tos  = (ntohl(val)  >> 20) & 0x000000FF;

	f->mask.tos = (ntohl(mask) >> 20) & 0x000000FF;
@@ -120,7 +120,7 @@ static inline int cxgb4_fill_ipv6_tos(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv6_proto(struct ch_filter_specification *f,

					u32 val, u32 mask)

					__be32 val, __be32 mask)

{

	f->val.proto  = (ntohl(val)  >> 8) & 0x000000FF;

	f->mask.proto = (ntohl(mask) >> 8) & 0x000000FF;
@@ -129,7 +129,7 @@ static inline int cxgb4_fill_ipv6_proto(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv6_src_ip0(struct ch_filter_specification *f,

					  u32 val, u32 mask)

					  __be32 val, __be32 mask)

{

	memcpy(&f->val.fip[0],  &val,  sizeof(u32));

	memcpy(&f->mask.fip[0], &mask, sizeof(u32));
@@ -138,7 +138,7 @@ static inline int cxgb4_fill_ipv6_src_ip0(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv6_src_ip1(struct ch_filter_specification *f,

					  u32 val, u32 mask)

					  __be32 val, __be32 mask)

{

	memcpy(&f->val.fip[4],  &val,  sizeof(u32));

	memcpy(&f->mask.fip[4], &mask, sizeof(u32));
@@ -147,7 +147,7 @@ static inline int cxgb4_fill_ipv6_src_ip1(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv6_src_ip2(struct ch_filter_specification *f,

					  u32 val, u32 mask)

					  __be32 val, __be32 mask)

{

	memcpy(&f->val.fip[8],  &val,  sizeof(u32));

	memcpy(&f->mask.fip[8], &mask, sizeof(u32));
@@ -156,7 +156,7 @@ static inline int cxgb4_fill_ipv6_src_ip2(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv6_src_ip3(struct ch_filter_specification *f,

					  u32 val, u32 mask)

					  __be32 val, __be32 mask)

{

	memcpy(&f->val.fip[12],  &val,  sizeof(u32));

	memcpy(&f->mask.fip[12], &mask, sizeof(u32));
@@ -165,7 +165,7 @@ static inline int cxgb4_fill_ipv6_src_ip3(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv6_dst_ip0(struct ch_filter_specification *f,

					  u32 val, u32 mask)

					  __be32 val, __be32 mask)

{

	memcpy(&f->val.lip[0],  &val,  sizeof(u32));

	memcpy(&f->mask.lip[0], &mask, sizeof(u32));
@@ -174,7 +174,7 @@ static inline int cxgb4_fill_ipv6_dst_ip0(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv6_dst_ip1(struct ch_filter_specification *f,

					  u32 val, u32 mask)

					  __be32 val, __be32 mask)

{

	memcpy(&f->val.lip[4],  &val,  sizeof(u32));

	memcpy(&f->mask.lip[4], &mask, sizeof(u32));
@@ -183,7 +183,7 @@ static inline int cxgb4_fill_ipv6_dst_ip1(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv6_dst_ip2(struct ch_filter_specification *f,

					  u32 val, u32 mask)

					  __be32 val, __be32 mask)

{

	memcpy(&f->val.lip[8],  &val,  sizeof(u32));

	memcpy(&f->mask.lip[8], &mask, sizeof(u32));
@@ -192,7 +192,7 @@ static inline int cxgb4_fill_ipv6_dst_ip2(struct ch_filter_specification *f, 
}



static inline int cxgb4_fill_ipv6_dst_ip3(struct ch_filter_specification *f,

					  u32 val, u32 mask)

					  __be32 val, __be32 mask)

{

	memcpy(&f->val.lip[12],  &val,  sizeof(u32));

	memcpy(&f->mask.lip[12], &mask, sizeof(u32));
@@ -216,7 +216,7 @@ static const struct cxgb4_match_field cxgb4_ipv6_fields[] = { 


/* TCP/UDP match */

static inline int cxgb4_fill_l4_ports(struct ch_filter_specification *f,

				      u32 val, u32 mask)

				      __be32 val, __be32 mask)

{

	f->val.fport  = ntohl(val)  >> 16;

	f->mask.fport = ntohl(mask) >> 16;
@@ -237,19 +237,13 @@ static const struct cxgb4_match_field cxgb4_udp_fields[] = { 
};



struct cxgb4_next_header {

	unsigned int offset; /* Offset to next header */

	/* offset, shift, and mask added to offset above

	/* Offset, shift, and mask added to beginning of the header

	 * to get to next header.  Useful when using a header

	 * field's value to jump to next header such as IHL field

	 * in IPv4 header.

	 */

	unsigned int offoff;

	u32 shift;

	u32 mask;

	/* match criteria to make this jump */

	unsigned int match_off;

	u32 match_val;

	u32 match_mask;

	struct tc_u32_sel sel;

	struct tc_u32_key key;

	/* location of jump to make */

	const struct cxgb4_match_field *jump;

};
@@ -258,26 +252,74 @@ struct cxgb4_next_header { 
 * IPv4 header.

 */

static const struct cxgb4_next_header cxgb4_ipv4_jumps[] = {

	{ .offset = 0, .offoff = 0, .shift = 6, .mask = 0xF,

	  .match_off = 8, .match_val = 0x600, .match_mask = 0xFF00,

	  .jump = cxgb4_tcp_fields },

	{ .offset = 0, .offoff = 0, .shift = 6, .mask = 0xF,

	  .match_off = 8, .match_val = 0x1100, .match_mask = 0xFF00,

	  .jump = cxgb4_udp_fields },

	{ .jump = NULL }

	{

		/* TCP Jump */

		.sel = {

			.off = 0,

			.offoff = 0,

			.offshift = 6,

			.offmask = cpu_to_be16(0x0f00),

		},

		.key = {

			.off = 8,

			.val = cpu_to_be32(0x00060000),

			.mask = cpu_to_be32(0x00ff0000),

		},

		.jump = cxgb4_tcp_fields,

	},

	{

		/* UDP Jump */

		.sel = {

			.off = 0,

			.offoff = 0,

			.offshift = 6,

			.offmask = cpu_to_be16(0x0f00),

		},

		.key = {

			.off = 8,

			.val = cpu_to_be32(0x00110000),

			.mask = cpu_to_be32(0x00ff0000),

		},

		.jump = cxgb4_udp_fields,

	},

	{ .jump = NULL },

};



/* Accept a rule with a jump directly past the 40 Bytes of IPv6 fixed header

 * to get to transport layer header.

 */

static const struct cxgb4_next_header cxgb4_ipv6_jumps[] = {

	{ .offset = 0x28, .offoff = 0, .shift = 0, .mask = 0,

	  .match_off = 4, .match_val = 0x60000, .match_mask = 0xFF0000,

	  .jump = cxgb4_tcp_fields },

	{ .offset = 0x28, .offoff = 0, .shift = 0, .mask = 0,

	  .match_off = 4, .match_val = 0x110000, .match_mask = 0xFF0000,

	  .jump = cxgb4_udp_fields },

	{ .jump = NULL }

	{

		/* TCP Jump */

		.sel = {

			.off = 40,

			.offoff = 0,

			.offshift = 0,

			.offmask = 0,

		},

		.key = {

			.off = 4,

			.val = cpu_to_be32(0x00000600),

			.mask = cpu_to_be32(0x0000ff00),

		},

		.jump = cxgb4_tcp_fields,

	},

	{

		/* UDP Jump */

		.sel = {

			.off = 40,

			.offoff = 0,

			.offshift = 0,

			.offmask = 0,

		},

		.key = {

			.off = 4,

			.val = cpu_to_be32(0x00001100),

			.mask = cpu_to_be32(0x0000ff00),

		},

		.jump = cxgb4_udp_fields,

	},

	{ .jump = NULL },

};



struct cxgb4_link {