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

Commit 22fe5715 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: add new IP filtering bitmaps"

parents e0719890 a308cc38

drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c

+6 −0
Original line number Diff line number Diff line
@@ -505,6 +505,12 @@ static int ipa3_attrib_dump(struct ipa_rule_attrib *attrib, 
	if (attrib->attrib_mask & IPA_FLT_MAC_ETHER_TYPE)

		pr_err("ether_type:%x ", attrib->ether_type);



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN)

		pr_err("tcp syn ");



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN_L2TP)

		pr_err("tcp syn l2tp ");



	pr_err("\n");

	return 0;

}

drivers/platform/msm/ipa/ipa_v3/ipa_utils.c

+170 −0
Original line number Diff line number Diff line
@@ -2332,6 +2332,19 @@ static int ipa3_generate_hw_rule_ip4(u16 *en_rule, 
		ihl_ofst_meq32 += 2;

	}



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN) {

		if (ipa_ihl_ofst_meq32[ihl_ofst_meq32] == -1) {

			IPAERR("ran out of ihl_meq32 eq\n");

			goto err;

		}

		*en_rule |= ipa_ihl_ofst_meq32[ihl_ofst_meq32];

		/* 12  => offset of SYN after v4 header */

		extra = ipa3_write_8(12, extra);

		rest = ipa3_write_32(0x20000, rest);

		rest = ipa3_write_32(0x20000, rest);

		ihl_ofst_meq32++;

	}



	if (attrib->attrib_mask & IPA_FLT_META_DATA) {

		*en_rule |= IPA_METADATA_COMPARE;

		rest = ipa3_write_32(attrib->meta_data_mask, rest);
@@ -2653,6 +2666,52 @@ static int ipa3_generate_hw_rule_ip6(u16 *en_rule, 
		ihl_ofst_meq32 += 2;

	}



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN) {

		if (ipa_ihl_ofst_meq32[ihl_ofst_meq32] == -1) {

			IPAERR("ran out of ihl_meq32 eq\n");

			goto err;

		}

		*en_rule |= ipa_ihl_ofst_meq32[ihl_ofst_meq32];

		/* 12  => offset of SYN after v6 header */

		extra = ipa3_write_8(12, extra);

		rest = ipa3_write_32(0x20000, rest);

		rest = ipa3_write_32(0x20000, rest);

		ihl_ofst_meq32++;

	}



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN_L2TP) {

		if (ipa_ihl_ofst_meq32[ihl_ofst_meq32] == -1 ||

			ipa_ihl_ofst_meq32[ihl_ofst_meq32 + 1] == -1) {

			IPAERR("ran out of ihl meq32 eq\n");

			goto err;

		}

		*en_rule |= ipa_ihl_ofst_meq32[ihl_ofst_meq32];

		*en_rule |= ipa_ihl_ofst_meq32[ihl_ofst_meq32 + 1];



		/* populate TCP protocol eq */

		if (attrib->ether_type == 0x0800) {

			extra = ipa3_write_8(30, extra);

			rest = ipa3_write_32(0xFF0000, rest);

			rest = ipa3_write_32(0x60000, rest);

		} else {

			extra = ipa3_write_8(26, extra);

			rest = ipa3_write_32(0xFF00, rest);

			rest = ipa3_write_32(0x600, rest);

		}



		/* populate TCP SYN eq */

		if (attrib->ether_type == 0x0800) {

			extra = ipa3_write_8(54, extra);

			rest = ipa3_write_32(0x20000, rest);

			rest = ipa3_write_32(0x20000, rest);

		} else {

			extra = ipa3_write_8(74, extra);

			rest = ipa3_write_32(0x20000, rest);

			rest = ipa3_write_32(0x20000, rest);

		}

		ihl_ofst_meq32 += 2;

	}



	if (attrib->attrib_mask & IPA_FLT_META_DATA) {

		*en_rule |= IPA_METADATA_COMPARE;

		rest = ipa3_write_32(attrib->meta_data_mask, rest);
@@ -2719,6 +2778,25 @@ static int ipa3_generate_hw_rule_ip6(u16 *en_rule, 
		ihl_ofst_rng16++;

	}



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN_L2TP) {

		if (ipa_ihl_ofst_rng16[ihl_ofst_rng16] == -1) {

			IPAERR("ran out of ihl_rng16 eq\n");

			goto err;

		}

		*en_rule |= ipa_ihl_ofst_rng16[ihl_ofst_rng16];



		if (attrib->ether_type == 0x0800) {

			extra = ipa3_write_8(21, extra);

			rest = ipa3_write_16(0x0045, rest);

			rest = ipa3_write_16(0x0045, rest);

		} else {

			extra = ipa3_write_8(20, extra);

			rest = ipa3_write_16(attrib->ether_type, rest);

			rest = ipa3_write_16(attrib->ether_type, rest);

		}

		ihl_ofst_rng16++;

	}



	if (attrib->attrib_mask & IPA_FLT_FLOW_LABEL) {

		*en_rule |= IPA_FL_EQ;

		rest = ipa3_write_32(attrib->u.v6.flow_label & 0xFFFFF,
@@ -3011,6 +3089,19 @@ int ipa3_generate_flt_eq_ip4(enum ipa_ip_type ip, 
		ihl_ofst_meq32 += 2;

	}



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN) {

		if (ipa_ihl_ofst_meq32[ihl_ofst_meq32] == -1) {

			IPAERR("ran out of ihl_meq32 eq\n");

			return -EPERM;

		}

		*en_rule |= ipa_ihl_ofst_meq32[ihl_ofst_meq32];

		/* 12  => offset of SYN after v4 header */

		eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].offset = 12;

		eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].mask = 0x20000;

		eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].value = 0x20000;

		ihl_ofst_meq32++;

	}



	if (attrib->attrib_mask & IPA_FLT_TOS_MASKED) {

		if (ipa_ofst_meq32[ofst_meq32] == -1) {

			IPAERR("ran out of meq32 eq\n");
@@ -3386,6 +3477,60 @@ int ipa3_generate_flt_eq_ip6(enum ipa_ip_type ip, 
		ihl_ofst_meq32 += 2;

	}



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN) {

		if (ipa_ihl_ofst_meq32[ihl_ofst_meq32] == -1) {

			IPAERR("ran out of ihl_meq32 eq\n");

			return -EPERM;

		}

		*en_rule |= ipa_ihl_ofst_meq32[ihl_ofst_meq32];

		/* 12  => offset of SYN after v4 header */

		eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].offset = 12;

		eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].mask = 0x20000;

		eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].value = 0x20000;

		ihl_ofst_meq32++;

	}



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN_L2TP) {

		if (ipa_ihl_ofst_meq32[ihl_ofst_meq32] == -1 ||

			ipa_ihl_ofst_meq32[ihl_ofst_meq32 + 1] == -1) {

			IPAERR("ran out of ihl meq32 eq\n");

			return -EPERM;

		}

		*en_rule |= ipa_ihl_ofst_meq32[ihl_ofst_meq32];

		*en_rule |= ipa_ihl_ofst_meq32[ihl_ofst_meq32 + 1];



		/* populate TCP protocol eq */

		if (attrib->ether_type == 0x0800) {

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].offset = 30;

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].mask =

				0xFF0000;

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].value =

				0x60000;

		} else {

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].offset = 26;

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].mask =

				0xFF00;

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].value =

				0x600;

		}



		/* populate TCP SYN eq */

		if (attrib->ether_type == 0x0800) {

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].offset = 54;

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].mask =

				0x20000;

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].value =

				0x20000;

		} else {

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].offset = 74;

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].mask =

				0x20000;

			eq_atrb->ihl_offset_meq_32[ihl_ofst_meq32].value =

				0x20000;

		}

		ihl_ofst_meq32 += 2;

	}



	if (attrib->attrib_mask & IPA_FLT_MAC_ETHER_TYPE) {

		if (ipa_ofst_meq32[ofst_meq32] == -1) {

			IPAERR("ran out of meq128 eq\n");
@@ -3512,6 +3657,31 @@ int ipa3_generate_flt_eq_ip6(enum ipa_ip_type ip, 
		ihl_ofst_rng16++;

	}



	if (attrib->attrib_mask & IPA_FLT_TCP_SYN_L2TP) {

		if (ipa_ihl_ofst_rng16[ihl_ofst_rng16] == -1) {

			IPAERR("ran out of ihl_rng16 eq\n");

			return -EPERM;

		}



		*en_rule |= ipa_ihl_ofst_rng16[ihl_ofst_rng16];

		if (attrib->ether_type == 0x0800) {

			eq_atrb->ihl_offset_range_16[ihl_ofst_rng16].offset

				= 21;

			eq_atrb->ihl_offset_range_16[ihl_ofst_rng16].range_low

				= 0x0045;

			eq_atrb->ihl_offset_range_16[ihl_ofst_rng16].range_high

				= 0x0045;

		} else {

			eq_atrb->ihl_offset_range_16[ihl_ofst_rng16].offset =

				20;

			eq_atrb->ihl_offset_range_16[ihl_ofst_rng16].range_low

				= attrib->ether_type;

			eq_atrb->ihl_offset_range_16[ihl_ofst_rng16].range_high

				= attrib->ether_type;

		}

		ihl_ofst_rng16++;

	}



	if (attrib->attrib_mask & IPA_FLT_FLOW_LABEL) {

		*en_rule |= IPA_FLT_FLOW_LABEL;

		eq_atrb->fl_eq_present = 1;

include/uapi/linux/msm_ipa.h

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ 
#define IPA_FLT_MAC_DST_ADDR_802_3	(1ul << 20)

#define IPA_FLT_MAC_ETHER_TYPE		(1ul << 21)

#define IPA_FLT_MAC_DST_ADDR_L2TP	(1ul << 22)

#define IPA_FLT_TCP_SYN			(1ul << 23)

#define IPA_FLT_TCP_SYN_L2TP		(1ul << 24)



/**

 * maximal number of NAT PDNs in the PDN config table