Merge "ipacm: add dynamic support for ipa coalesce"
diff --git a/ipacm/inc/IPACM_Defs.h b/ipacm/inc/IPACM_Defs.h
index 6157d1f..65d5ce4 100644
--- a/ipacm/inc/IPACM_Defs.h
+++ b/ipacm/inc/IPACM_Defs.h
@@ -122,6 +122,7 @@
#define IPA_MAX_NUM_ETH_CLIENTS 15
#define IPA_MAX_NUM_AMPDU_RULE 15
#define IPA_MAC_ADDR_SIZE 6
+#define IPA_MAX_NUM_SW_PDNS 15
/*===========================================================================
GLOBAL DEFINITIONS AND DECLARATIONS
@@ -186,7 +187,8 @@
IPA_ETH_BRIDGE_CLIENT_ADD, /* ipacm_event_eth_bridge */
IPA_ETH_BRIDGE_CLIENT_DEL, /* ipacm_event_eth_bridge*/
IPA_ETH_BRIDGE_WLAN_SCC_MCC_SWITCH, /* ipacm_event_eth_bridge*/
- IPA_SSR_NOTICE, /* NULL*/
+ IPA_SSR_NOTICE, /* NULL*/
+ IPA_COALESCE_NOTICE, /* NULL*/
#ifdef FEATURE_L2TP
IPA_ADD_VLAN_IFACE, /* ipa_ioc_vlan_iface_info */
IPA_DEL_VLAN_IFACE, /* ipa_ioc_vlan_iface_info */
diff --git a/ipacm/inc/IPACM_Wan.h b/ipacm/inc/IPACM_Wan.h
index b9456c1..d66224a 100644
--- a/ipacm/inc/IPACM_Wan.h
+++ b/ipacm/inc/IPACM_Wan.h
@@ -89,6 +89,12 @@
wan_client_rt_hdl wan_rt_hdl[0]; /* depends on number of tx properties */
}ipa_wan_client;
+typedef struct
+{
+ bool coalesce_tcp_enable;
+ bool coalesce_udp_enable;
+}ipacm_coalesce;
+
/* wan iface */
class IPACM_Wan : public IPACM_Iface
{
@@ -215,6 +221,32 @@
return IPACM_SUCCESS;
}
#endif
+ static void coalesce_config(uint8_t qmap_id, bool tcp_enable, bool udp_enable)
+ {
+ if (qmap_id >= IPA_MAX_NUM_SW_PDNS)
+ {
+ IPACMERR("qmap_id (%d) beyond the Max range (%d), abort\n",
+ qmap_id, IPA_MAX_NUM_SW_PDNS);
+ return ;
+ }
+
+ IPACM_Wan::coalesce_enable_info[qmap_id].coalesce_tcp_enable = tcp_enable;
+ IPACM_Wan::coalesce_enable_info[qmap_id].coalesce_udp_enable = udp_enable;
+ IPACMDBG_H(" Updated qmap(%d) coalesce enable TCP:%d UDP:%d\n",
+ qmap_id,
+ IPACM_Wan::coalesce_enable_info[qmap_id].coalesce_tcp_enable,
+ IPACM_Wan::coalesce_enable_info[qmap_id].coalesce_udp_enable);
+ return ;
+ }
+
+ static void coalesce_config_reset()
+ {
+ int i;
+ /* reset coalesce settings on all modem interfaces */
+ for (i = 0; i < IPA_MAX_NUM_SW_PDNS; i++)
+ IPACM_Wan::coalesce_config(i, false, false);
+ return ;
+ }
static uint32_t getWANIP()
{
@@ -268,6 +300,9 @@
}
#endif
+ /* indicate coalesce support on tcp or udp*/
+ static ipacm_coalesce coalesce_enable_info[IPA_MAX_NUM_SW_PDNS];
+
private:
bool is_ipv6_frag_firewall_flt_rule_installed;
@@ -298,6 +333,8 @@
bool header_partial_default_wan_v6;
uint8_t ext_router_mac_addr[IPA_MAC_ADDR_SIZE];
uint8_t netdev_mac[IPA_MAC_ADDR_SIZE];
+ /* create additional set of v4 Coalesce RT-rules: tcp udp */
+ uint32_t dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES+ 2*MAX_DEFAULT_v6_ROUTE_RULES];
static int num_ipv4_modem_pdn;
@@ -583,6 +620,8 @@
/* construct dummy ethernet header */
int add_dummy_rx_hdr();
+
+ int handle_coalesce_evt();
};
#endif /* IPACM_WAN_H */
diff --git a/ipacm/src/IPACM_IfaceManager.cpp b/ipacm/src/IPACM_IfaceManager.cpp
index 1c7dfc4..3e825dd 100644
--- a/ipacm/src/IPACM_IfaceManager.cpp
+++ b/ipacm/src/IPACM_IfaceManager.cpp
@@ -484,6 +484,7 @@
}
else
{
+ IPACM_EvtDispatcher::registr(IPA_COALESCE_NOTICE, w);
IPACM_EvtDispatcher::registr(IPA_LINK_DOWN_EVENT, w);
}
diff --git a/ipacm/src/IPACM_Main.cpp b/ipacm/src/IPACM_Main.cpp
index 04f8a89..eef15d9 100644
--- a/ipacm/src/IPACM_Main.cpp
+++ b/ipacm/src/IPACM_Main.cpp
@@ -240,6 +240,10 @@
#endif
struct ipa_get_data_stats_resp_msg_v01 event_data_stats;
struct ipa_get_apn_data_stats_resp_msg_v01 event_network_stats;
+#ifdef IPA_RT_SUPPORT_COAL
+ struct ipa_coalesce_info coalesce_info;
+#endif
+
#ifdef FEATURE_IPACM_HAL
IPACM_OffloadManager* OffloadMng;
#endif
@@ -821,6 +825,40 @@
evt_data.evt_data = mapping;
break;
#endif
+#ifdef IPA_RT_SUPPORT_COAL
+ case IPA_COALESCE_ENABLE:
+ memcpy(&coalesce_info, buffer + sizeof(struct ipa_msg_meta), sizeof(struct ipa_coalesce_info));
+ IPACMDBG_H("Received IPA_COALESCE_ENABLE qmap-id:%d tcp:%d, udp%d\n",
+ coalesce_info.qmap_id, coalesce_info.tcp_enable, coalesce_info.udp_enable);
+ if (coalesce_info.qmap_id >=IPA_MAX_NUM_SW_PDNS)
+ {
+ IPACMERR("qmap_id (%d) beyond the Max range (%d), abort\n",
+ coalesce_info.qmap_id, IPA_MAX_NUM_SW_PDNS);
+ return NULL;
+ }
+ IPACM_Wan::coalesce_config(coalesce_info.qmap_id, coalesce_info.tcp_enable, coalesce_info.udp_enable);
+ /* Notify all LTE instance to do RSC configuration */
+ evt_data.event = IPA_COALESCE_NOTICE;
+ evt_data.evt_data = NULL;
+ break;
+
+ case IPA_COALESCE_DISABLE:
+ memcpy(&coalesce_info, buffer + sizeof(struct ipa_msg_meta), sizeof(struct ipa_coalesce_info));
+ IPACMDBG_H("Received IPA_COALESCE_DISABLE qmap-id:%d tcp:%d, udp%d\n",
+ coalesce_info.qmap_id, coalesce_info.tcp_enable, coalesce_info.udp_enable);
+ if (coalesce_info.qmap_id >=IPA_MAX_NUM_SW_PDNS)
+ {
+ IPACMERR("qmap_id (%d) beyond the Max range (%d), abort\n",
+ coalesce_info.qmap_id, IPA_MAX_NUM_SW_PDNS);
+ return NULL;
+ }
+ IPACM_Wan::coalesce_config(coalesce_info.qmap_id, false, false);
+ /* Notify all LTE instance to do RSC configuration */
+ evt_data.event = IPA_COALESCE_NOTICE;
+ evt_data.evt_data = NULL;
+ break;
+#endif
+
default:
IPACMDBG_H("Unhandled message type: %d\n", event_hdr.msg_type);
continue;
@@ -912,6 +950,8 @@
IPACMDBG_H("Staring IPA main\n");
IPACMDBG_H("ipa_cmdq_successful\n");
+ /* reset coalesce settings */
+ IPACM_Wan::coalesce_config_reset();
RegisterForSignals();
diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index 3447207..6f46f70 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -79,6 +79,8 @@
bool IPACM_Wan::backhaul_is_wan_bridge = false;
bool IPACM_Wan::is_xlat = false;
+ipacm_coalesce IPACM_Wan::coalesce_enable_info[IPA_MAX_NUM_SW_PDNS];
+
uint32_t IPACM_Wan::backhaul_ipv6_prefix[2];
#ifdef FEATURE_IPA_ANDROID
@@ -270,29 +272,11 @@
rt_rule->commit = 1;
rt_rule->num_rules = NUM_RULES;
rt_rule->ip = data->iptype;
+ /* setup RT rule for v6_lan table*/
strlcpy(rt_rule->rt_tbl_name, IPACM_Iface::ipacmcfg->rt_tbl_v6.name, sizeof(rt_rule->rt_tbl_name));
rt_rule_entry = &rt_rule->rules[0];
- if(m_is_sta_mode == Q6_WAN)
- {
- strlcpy(hdr.name, tx_prop->tx[0].hdr_name, sizeof(hdr.name));
- hdr.name[IPA_RESOURCE_NAME_MAX-1] = '\0';
- if(m_header.GetHeaderHandle(&hdr) == false)
- {
- IPACMERR("Failed to get QMAP header.\n");
- return IPACM_FAILURE;
- }
- rt_rule_entry->rule.hdr_hdl = hdr.hdl;
- }
rt_rule_entry->at_rear = false;
- if(m_is_sta_mode == Q6_WAN)
- {
- rt_rule_entry->rule.dst = IPA_CLIENT_APPS_WAN_CONS;
- }
- else
- {
- rt_rule_entry->rule.dst = IPA_CLIENT_APPS_LAN_CONS;
- }
rt_rule_entry->rule.attrib.attrib_mask = IPA_FLT_DST_ADDR;
rt_rule_entry->rule.attrib.u.v6.dst_addr[0] = data->ipv6_addr[0];
rt_rule_entry->rule.attrib.u.v6.dst_addr[1] = data->ipv6_addr[1];
@@ -309,6 +293,90 @@
#ifdef FEATURE_IPA_V3
rt_rule_entry->rule.hashable = false;
#endif
+ if(m_is_sta_mode == Q6_WAN)
+ {
+ strlcpy(hdr.name, tx_prop->tx[0].hdr_name, sizeof(hdr.name));
+ hdr.name[IPA_RESOURCE_NAME_MAX-1] = '\0';
+ if(m_header.GetHeaderHandle(&hdr) == false)
+ {
+ IPACMERR("Failed to get QMAP header.\n");
+ return IPACM_FAILURE;
+ }
+ rt_rule_entry->rule.hdr_hdl = hdr.hdl;
+ rt_rule_entry->rule.dst = IPA_CLIENT_APPS_WAN_CONS;
+ /* legacy default v4 rt-rule */
+#ifdef IPA_RT_SUPPORT_COAL
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ /* legacy default v6 rt-rule */
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6] = rt_rule_entry->rt_rule_hdl;
+
+ /* setup same rule for v6_wan table*/
+ strlcpy(rt_rule->rt_tbl_name, IPACM_Iface::ipacmcfg->rt_tbl_wan_v6.name, sizeof(rt_rule->rt_tbl_name));
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1] = rt_rule_entry->rt_rule_hdl;
+
+ IPACMDBG_H("ipv6 wan iface rt-rule hdl=0x%x hdl=0x%x, entry: %d %d\n",
+ dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6],
+ dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1],
+ MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6,
+ MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1);
+ /* RSC TCP rule*/
+ rt_rule_entry->rule.attrib.attrib_mask |= IPA_FLT_NEXT_HDR;
+ rt_rule_entry->rule.attrib.u.v6.next_hdr = (uint8_t)IPACM_FIREWALL_IPPROTO_TCP;
+#ifdef IPA_RT_SUPPORT_COAL
+ if (IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_tcp_enable)
+ rt_rule_entry->rule.coalesce = true;
+ else
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rsc tcp rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv6 wan iface rsc tcp rt-rule hdll=0x%x\n enable(%d), entry %d", dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6],
+ IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_tcp_enable,
+ 2*MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6);
+ /* RSB UDP rule*/
+ rt_rule_entry->rule.attrib.u.v6.next_hdr = (uint8_t)IPACM_FIREWALL_IPPROTO_UDP;
+#ifdef IPA_RT_SUPPORT_COAL
+ if (IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_udp_enable)
+ rt_rule_entry->rule.coalesce = true;
+ else
+ rt_rule_entry->rule.coalesce = false;
+#endif
if (false == m_routing.AddRoutingRule(rt_rule))
{
IPACMERR("Routing rule addition failed!\n");
@@ -317,6 +385,27 @@
}
else if (rt_rule_entry->status)
{
+ IPACMERR("rsb udp rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv6 wan iface rsb udp rt-rule hdll=0x%x\n enable(%d) entry %d", dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1],
+ IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_udp_enable,
+ 2*MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1);
+ }
+ else
+ {
+ rt_rule_entry->rule.dst = IPA_CLIENT_APPS_LAN_CONS;
+ /* legacy default v6 rt-rule */
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
res = rt_rule_entry->status;
goto fail;
@@ -339,9 +428,12 @@
}
dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1] = rt_rule_entry->rt_rule_hdl;
- IPACMDBG_H("ipv6 wan iface rt-rule hdl=0x%x hdl=0x%x, num_dft_rt_v6: %d \n",
+ IPACMDBG_H("ipv6 wan iface rt-rule hdl=0x%x hdl=0x%x, entry: %d %d\n",
dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6],
- dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1],num_dft_rt_v6);
+ dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1],
+ MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6,
+ MAX_DEFAULT_v4_ROUTE_RULES + 2*num_dft_rt_v6+1);
+ }
/* add default filtering rules when wan-iface get global v6-prefix */
if (num_dft_rt_v6 == 1)
@@ -444,6 +536,21 @@
else
{
IPACMDBG_H(" device (%s) ipv4 addr is changed\n", dev_name);
+ /* Delete default Coalese v4 RT rule */
+ if (m_is_sta_mode == Q6_WAN) {
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[0], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing old RSC TCP RT rule deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[1], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing old RSB UDP RT rule deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ }
/* Delete default v4 RT rule */
IPACMDBG_H("Delete default v4 routing rules\n");
if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[0], IPA_IP_v4) == false)
@@ -469,22 +576,6 @@
rt_rule->num_rules = NUM_RULES;
rt_rule->ip = data->iptype;
rt_rule_entry = &rt_rule->rules[0];
- if(m_is_sta_mode == Q6_WAN)
- {
- strlcpy(hdr.name, tx_prop->tx[0].hdr_name, sizeof(hdr.name));
- hdr.name[IPA_RESOURCE_NAME_MAX-1] = '\0';
- if(m_header.GetHeaderHandle(&hdr) == false)
- {
- IPACMERR("Failed to get QMAP header.\n");
- return IPACM_FAILURE;
- }
- rt_rule_entry->rule.hdr_hdl = hdr.hdl;
- rt_rule_entry->rule.dst = IPA_CLIENT_APPS_WAN_CONS;
- }
- else
- {
- rt_rule_entry->rule.dst = IPA_CLIENT_APPS_LAN_CONS;
- }
rt_rule_entry->at_rear = false;
rt_rule_entry->rule.attrib.attrib_mask = IPA_FLT_DST_ADDR;
/* still need setup v4 default routing rule to A5*/
@@ -494,6 +585,72 @@
#ifdef FEATURE_IPA_V3
rt_rule_entry->rule.hashable = false;
#endif
+ if(m_is_sta_mode == Q6_WAN)
+ {
+ /* query qmap header*/
+ strlcpy(hdr.name, tx_prop->tx[0].hdr_name, sizeof(hdr.name));
+ hdr.name[IPA_RESOURCE_NAME_MAX-1] = '\0';
+ if(m_header.GetHeaderHandle(&hdr) == false)
+ {
+ IPACMERR("Failed to get QMAP header.\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ rt_rule_entry->rule.hdr_hdl = hdr.hdl;
+ rt_rule_entry->rule.dst = IPA_CLIENT_APPS_WAN_CONS;
+ /* legacy default v4 rt-rule */
+#ifdef IPA_RT_SUPPORT_COAL
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ /* legacy default v4 rt-rule */
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_rt_rule_hdl[0] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv4 wan iface rt-rule hdll=0x%x\n", dft_rt_rule_hdl[0]);
+ /* RSC TCP rule*/
+ rt_rule_entry->rule.attrib.attrib_mask |= IPA_FLT_PROTOCOL;
+ rt_rule_entry->rule.attrib.u.v4.protocol = (uint8_t)IPACM_FIREWALL_IPPROTO_TCP;
+
+#ifdef IPA_RT_SUPPORT_COAL
+ if (IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_tcp_enable)
+ rt_rule_entry->rule.coalesce = true;
+ else
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rsc tcp rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_coalesce_rt_rule_hdl[0] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv4 wan iface rsc tcp rt-rule hdll=0x%x\n enable(%d)", dft_coalesce_rt_rule_hdl[0],
+ IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_tcp_enable);
+
+ /* RSB UDP rule*/
+ rt_rule_entry->rule.attrib.u.v4.protocol = (uint8_t)IPACM_FIREWALL_IPPROTO_UDP;
+#ifdef IPA_RT_SUPPORT_COAL
+ if (IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_udp_enable)
+ rt_rule_entry->rule.coalesce = true;
+ else
+ rt_rule_entry->rule.coalesce = false;
+#endif
if (false == m_routing.AddRoutingRule(rt_rule))
{
IPACMERR("Routing rule addition failed!\n");
@@ -502,14 +659,35 @@
}
else if (rt_rule_entry->status)
{
+ IPACMERR("rsb udp rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_coalesce_rt_rule_hdl[1] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv4 wan iface rsb udp rt-rule hdll=0x%x\n enable(%d)", dft_coalesce_rt_rule_hdl[1],
+ IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_udp_enable);
+ }
+ else
+ {
+ rt_rule_entry->rule.dst = IPA_CLIENT_APPS_LAN_CONS;
+ /* legacy default v4 rt-rule */
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
res = rt_rule_entry->status;
goto fail;
}
dft_rt_rule_hdl[0] = rt_rule_entry->rt_rule_hdl;
IPACMDBG_H("ipv4 wan iface rt-rule hdll=0x%x\n", dft_rt_rule_hdl[0]);
- /* initial multicast/broadcast/fragment filter rule */
+ }
+ /* initial multicast/broadcast/fragment filter rule */
/* only do one time */
if(!wan_v4_addr_set)
{
@@ -913,6 +1091,15 @@
}
break;
+ case IPA_COALESCE_NOTICE:
+ {
+ if (m_is_sta_mode == Q6_WAN)
+ {
+ IPACMDBG_H("Received IPA_COALESCE_NOTICE (wan_mode:%d)\n", m_is_sta_mode);
+ handle_coalesce_evt();
+ }
+ }
+ break;
case IPA_LINK_DOWN_EVENT:
{
ipacm_event_data_fid *data = (ipacm_event_data_fid *)param;
@@ -4888,6 +5075,7 @@
/* Delete default v4 RT rule */
if (ip_type != IPA_IP_v6)
{
+ /* no need delete v4 RSC routing rules */
IPACMDBG_H("Delete default v4 routing rules\n");
if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[0], IPA_IP_v4) == false)
{
@@ -5149,6 +5337,21 @@
install_wan_filtering_rule(false);
}
+ IPACMDBG_H("Delete default v4 coalesce routing rules\n");
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[0], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing rule RSC TCP deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[1], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing rule RSB UDP deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[0], IPA_IP_v4) == false)
{
IPACMERR("Routing rule deletion failed!\n");
@@ -5207,6 +5410,13 @@
for (i = 0; i < 2*num_dft_rt_v6; i++)
{
+ /* delete v6 colasce rules */
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES+i], IPA_IP_v6) == false)
+ {
+ IPACMERR("Colasce Routing rule deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES+i], IPA_IP_v6) == false)
{
IPACMERR("Routing rule deletion failed!\n");
@@ -5291,6 +5501,21 @@
install_wan_filtering_rule(false);
}
+ IPACMDBG_H("Delete default v4 coalesce routing rules\n");
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[0], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing rule RSC TCP deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[1], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing rule RSB UDP deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+
if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[0], IPA_IP_v4) == false)
{
IPACMERR("Routing rule deletion failed!\n");
@@ -5300,6 +5525,13 @@
for (i = 0; i < 2*num_dft_rt_v6; i++)
{
+ /* delete v6 colasce rules */
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES+i], IPA_IP_v6) == false)
+ {
+ IPACMERR("Colasce Routing rule deletion failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES+i], IPA_IP_v6) == false)
{
IPACMERR("Routing rule deletion failed!\n");
@@ -6683,3 +6915,289 @@
}
return IPACM_SUCCESS;
}
+
+int IPACM_Wan::handle_coalesce_evt()
+{
+ struct ipa_ioc_add_rt_rule *rt_rule = NULL;
+ struct ipa_rt_rule_add *rt_rule_entry;
+ const int NUM_RULES = 1;
+ int res = IPACM_SUCCESS;
+ struct ipa_ioc_get_hdr hdr;
+ uint32_t i;
+
+ if(wan_v4_addr_set)
+ {
+ /* Delete default RSC v4 RT rule */
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[0], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing old RSC TCP RT rule deletion failed!\n");
+ return IPACM_FAILURE;
+ }
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[1], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing old RSB UDP RT rule deletion failed!\n");
+ return IPACM_FAILURE;
+ }
+ /* Delete default v4 RT rule */
+ IPACMDBG_H("Delete default v4 routing rules\n");
+ if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[0], IPA_IP_v4) == false)
+ {
+ IPACMERR("Routing old RT rule deletion failed!\n");
+ return IPACM_FAILURE;
+ }
+
+ /* apply the new coalesce configuration */
+ rt_rule = (struct ipa_ioc_add_rt_rule *)
+ calloc(1, sizeof(struct ipa_ioc_add_rt_rule) +
+ NUM_RULES * sizeof(struct ipa_rt_rule_add));
+ if (!rt_rule)
+ {
+ IPACMERR("Error Locate ipa_ioc_add_rt_rule memory...\n");
+ return IPACM_FAILURE;
+ }
+ rt_rule->commit = 1;
+ rt_rule->num_rules = NUM_RULES;
+ rt_rule->ip = IPA_IP_v4;
+ rt_rule_entry = &rt_rule->rules[0];
+ rt_rule_entry->at_rear = false;
+ rt_rule_entry->rule.attrib.attrib_mask = IPA_FLT_DST_ADDR;
+ /* still need setup v4 default routing rule to APPs*/
+ strlcpy(rt_rule->rt_tbl_name, IPACM_Iface::ipacmcfg->rt_tbl_lan_v4.name, sizeof(rt_rule->rt_tbl_name));
+ rt_rule_entry->rule.attrib.u.v4.dst_addr = wan_v4_addr;
+ rt_rule_entry->rule.attrib.u.v4.dst_addr_mask = 0xFFFFFFFF;
+#ifdef FEATURE_IPA_V3
+ rt_rule_entry->rule.hashable = false;
+#endif
+ /* query qmap header*/
+ memset(&hdr, 0, sizeof(hdr));
+ strlcpy(hdr.name, tx_prop->tx[0].hdr_name, sizeof(hdr.name));
+ hdr.name[IPA_RESOURCE_NAME_MAX-1] = '\0';
+ if(m_header.GetHeaderHandle(&hdr) == false)
+ {
+ IPACMERR("Failed to get QMAP header.\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ rt_rule_entry->rule.hdr_hdl = hdr.hdl;
+ rt_rule_entry->rule.dst = IPA_CLIENT_APPS_WAN_CONS;
+ /* default v4 rt-rule */
+#ifdef IPA_RT_SUPPORT_COAL
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ /* default v4 rt-rule */
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_rt_rule_hdl[0] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv4 wan iface rt-rule hdll=0x%x\n", dft_rt_rule_hdl[0]);
+
+ /* RSC TCP rule*/
+ rt_rule_entry->rule.attrib.attrib_mask |= IPA_FLT_PROTOCOL;
+ rt_rule_entry->rule.attrib.u.v4.protocol = (uint8_t)IPACM_FIREWALL_IPPROTO_TCP;
+#ifdef IPA_RT_SUPPORT_COAL
+ if (IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_tcp_enable)
+ rt_rule_entry->rule.coalesce = true;
+ else
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rsc tcp rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_coalesce_rt_rule_hdl[0] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv4 wan iface rsc tcp rt-rule hdll=0x%x\n enable(%d)", dft_coalesce_rt_rule_hdl[0],
+ IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_tcp_enable);
+
+ /* RSB UDP rule*/
+ rt_rule_entry->rule.attrib.u.v4.protocol = (uint8_t)IPACM_FIREWALL_IPPROTO_UDP;
+#ifdef IPA_RT_SUPPORT_COAL
+ if (IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_tcp_enable)
+ rt_rule_entry->rule.coalesce = true;
+ else
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rsb udp rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail;
+ }
+ dft_coalesce_rt_rule_hdl[1] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv4 wan iface rsb udp rt-rule hdll=0x%x enable(%d)\n", dft_coalesce_rt_rule_hdl[1],
+ IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_udp_enable);
+fail:
+ free(rt_rule);
+ }
+ /* v6 */
+ if (num_dft_rt_v6 !=0)
+ {
+ for (i = 0; i < 2*num_dft_rt_v6; i++)
+ {
+ /* delete v6 colasce rules */
+ if (m_routing.DeleteRoutingHdl(dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES+i], IPA_IP_v6) == false)
+ {
+ IPACMERR("Colasce Routing rule deletion failed!\n");
+ return IPACM_FAILURE;
+ }
+ /* delete v6 default rules */
+ if (m_routing.DeleteRoutingHdl(dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES+i], IPA_IP_v6) == false)
+ {
+ IPACMERR("Routing rule deletion failed!\n");
+ return IPACM_FAILURE;
+ }
+ }
+
+ rt_rule = (struct ipa_ioc_add_rt_rule *)
+ calloc(1, sizeof(struct ipa_ioc_add_rt_rule) +
+ NUM_RULES * sizeof(struct ipa_rt_rule_add));
+ if (!rt_rule)
+ {
+ IPACMERR("Error Locate ipa_ioc_add_rt_rule memory...\n");
+ return IPACM_FAILURE;
+ }
+ rt_rule->commit = 1;
+ rt_rule->num_rules = NUM_RULES;
+ rt_rule->ip = IPA_IP_v6;
+
+ for (i = 0; i < num_dft_rt_v6; i++)
+ {
+ /* setup same rule for v6_wan table */
+ strlcpy(rt_rule->rt_tbl_name, IPACM_Iface::ipacmcfg->rt_tbl_v6.name, sizeof(rt_rule->rt_tbl_name));
+ rt_rule_entry = &rt_rule->rules[0];
+ rt_rule_entry->at_rear = false;
+ rt_rule_entry->rule.attrib.attrib_mask = IPA_FLT_DST_ADDR;
+ rt_rule_entry->rule.attrib.u.v6.dst_addr[0] = ipv6_addr[num_dft_rt_v6][0];
+ rt_rule_entry->rule.attrib.u.v6.dst_addr[1] = ipv6_addr[num_dft_rt_v6][1];
+ rt_rule_entry->rule.attrib.u.v6.dst_addr[2] = ipv6_addr[num_dft_rt_v6][2];
+ rt_rule_entry->rule.attrib.u.v6.dst_addr[3] = ipv6_addr[num_dft_rt_v6][3];
+ rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[0] = 0xFFFFFFFF;
+ rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[1] = 0xFFFFFFFF;
+ rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[2] = 0xFFFFFFFF;
+ rt_rule_entry->rule.attrib.u.v6.dst_addr_mask[3] = 0xFFFFFFFF;
+#ifdef FEATURE_IPA_V3
+ rt_rule_entry->rule.hashable = false;
+#endif
+ strlcpy(hdr.name, tx_prop->tx[0].hdr_name, sizeof(hdr.name));
+ hdr.name[IPA_RESOURCE_NAME_MAX-1] = '\0';
+ if(m_header.GetHeaderHandle(&hdr) == false)
+ {
+ IPACMERR("Failed to get QMAP header.\n");
+ return IPACM_FAILURE;
+ }
+ rt_rule_entry->rule.hdr_hdl = hdr.hdl;
+ rt_rule_entry->rule.dst = IPA_CLIENT_APPS_WAN_CONS;
+ /* legacy default v4 rt-rule */
+#ifdef IPA_RT_SUPPORT_COAL
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ /* legacy default v6 rt-rule */
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail2;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail2;
+ }
+ dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*i] = rt_rule_entry->rt_rule_hdl;
+
+ /* setup same rule for v6_lan table*/
+ strlcpy(rt_rule->rt_tbl_name, IPACM_Iface::ipacmcfg->rt_tbl_wan_v6.name, sizeof(rt_rule->rt_tbl_name));
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail2;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail2;
+ }
+ dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*i+1] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv6 wan iface rt-rule hdl=0x%x hdl=0x%x, entry: %d %d\n",
+ dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*i],
+ dft_rt_rule_hdl[MAX_DEFAULT_v4_ROUTE_RULES + 2*i+1],
+ MAX_DEFAULT_v4_ROUTE_RULES + 2*i,
+ MAX_DEFAULT_v4_ROUTE_RULES + 2*i+1);
+ /* RSC TCP rule*/
+ rt_rule_entry->rule.attrib.attrib_mask |= IPA_FLT_NEXT_HDR;
+ rt_rule_entry->rule.attrib.u.v6.next_hdr = (uint8_t)IPACM_FIREWALL_IPPROTO_TCP;
+#ifdef IPA_RT_SUPPORT_COAL
+ if (IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_tcp_enable)
+ rt_rule_entry->rule.coalesce = true;
+ else
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail2;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rsc tcp rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail2;
+ }
+ dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES + 2*i] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv6 wan iface rsc tcp rt-rule hdll=0x%x\n enable(%d)", dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES + 2*i],
+ IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_tcp_enable);
+ /* RSB UDP rule*/
+ rt_rule_entry->rule.attrib.u.v6.next_hdr = (uint8_t)IPACM_FIREWALL_IPPROTO_UDP;
+#ifdef IPA_RT_SUPPORT_COAL
+ if (IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_udp_enable)
+ rt_rule_entry->rule.coalesce = true;
+ else
+ rt_rule_entry->rule.coalesce = false;
+#endif
+ if (false == m_routing.AddRoutingRule(rt_rule))
+ {
+ IPACMERR("Routing rule addition failed!\n");
+ res = IPACM_FAILURE;
+ goto fail2;
+ }
+ else if (rt_rule_entry->status)
+ {
+ IPACMERR("rsb udp rt rule adding failed. Result=%d\n", rt_rule_entry->status);
+ res = rt_rule_entry->status;
+ goto fail2;
+ }
+ dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES + 2*i+1] = rt_rule_entry->rt_rule_hdl;
+ IPACMDBG_H("ipv6 wan iface rsb udp rt-rule hdll=0x%x\n enable(%d)", dft_coalesce_rt_rule_hdl[2*MAX_DEFAULT_v4_ROUTE_RULES + 2*i+1],
+ IPACM_Wan::coalesce_enable_info[ext_prop->ext[0].mux_id].coalesce_udp_enable);
+ }
+fail2:
+ free(rt_rule);
+ }
+ return res;
+}