diff options
| author | Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> | 2018-10-09 15:30:41 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-14 17:34:44 -0800 |
| commit | 2cf592518f41919bc55d61670cb91a6239864367 (patch) | |
| tree | a193d574cbab6313e549a756f0a1d9eb003e3065 /drivers/rmnet/shs/rmnet_shs.h | |
| parent | 4f36ca5fa529e9774b4eb37115ff5b9a2e1cf4f2 (diff) | |
| download | data-kernel-2cf592518f41919bc55d61670cb91a6239864367.tar.gz | |
drivers: rmnet_shs: Reduce switching OOO packets
Previously we only switch at the request of the core monitoring
workqueu. This adds an option to switch in rx context based on the
an instant rate measure on the core. Based on this we will mark core
as loaded and move flows from that core after a delay. This reduces
OOO packets by reacting quicker to lower the pending backlog and by
waiting longer between a switch.
Change-Id: I09b6f01fa1cda982728dc8d5e8004c6323d0612b
Acked-by: Raul Martinez <mraul@qti.qualcomm.com>
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Diffstat (limited to 'drivers/rmnet/shs/rmnet_shs.h')
| -rw-r--r-- | drivers/rmnet/shs/rmnet_shs.h | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/drivers/rmnet/shs/rmnet_shs.h b/drivers/rmnet/shs/rmnet_shs.h index 7f6336a..ee12024 100644 --- a/drivers/rmnet/shs/rmnet_shs.h +++ b/drivers/rmnet/shs/rmnet_shs.h @@ -16,6 +16,9 @@ #include <linux/skbuff.h> #include "rmnet_shs_wq.h" +#ifndef _RMNET_SHS_H_ +#define _RMNET_SHS_H_ + #include <../drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h> #include <../drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h> #include <../drivers/net/ethernet/qualcomm/rmnet/rmnet_private.h> @@ -24,14 +27,11 @@ #include <../include/soc/qcom/qmi_rmnet.h> - -#ifndef _RMNET_SHS_H_ -#define _RMNET_SHS_H_ - #define RMNET_SHS_HT rmnet_shs_ht #define RMNET_SHS_HT_SIZE 9 #define RMNET_SHS_MAX_SKB_INACTIVE_TSEC 30 #define MAX_SILVER_CORES 4 +#define MAX_CPUS 8 //#define RMNET_SHS_MAX_UDP_SILVER_CORE_DATA_RATE 1073741824 //1.0Gbps //#define RMNET_SHS_MAX_UDP_SILVER_CORE_DATA_RATE 320787200 //320 Mbps @@ -53,18 +53,26 @@ #define RMNET_SHS_UDP_PPS_PERF_CPU_LTHRESH 40000 #define RMNET_SHS_TCP_PPS_PERF_CPU_LTHRESH (40000*RMNET_SHS_TCP_COALESCING_RATIO) +struct core_flush_s { + struct hrtimer core_timer; + struct work_struct work; + struct timespec coretime; + int coresum; + u8 core; +}; + struct rmnet_shs_cfg_s { struct hrtimer hrtimer_shs; - struct rps_map *map; struct rmnet_map_dl_ind dl_mrk_ind_cb; struct qmi_rmnet_ps_ind rmnet_idl_ind_cb; struct rmnet_port *port; + struct core_flush_s core_flush[MAX_CPUS]; + u64 core_skbs[MAX_CPUS]; long int num_bytes_parked; long int num_pkts_parked; u32 is_reg_dl_mrk_ind; u8 is_pkt_parked; u8 is_timer_init; - u8 high_prio; u8 force_flush_state; }; @@ -93,8 +101,6 @@ struct rmnet_shs_skbn_s { /* n/w stack CPU pkt processing queue head */ u32 hash; /*incoming hash*/ - u32 parked_skbs; - /*num skbs parked per flow*/ u16 map_index; /* rps map index assigned*/ u16 map_cpu; @@ -132,6 +138,10 @@ struct rmnet_shs_cpu_node_s { struct list_head node_list_id; u32 qhead; u32 qtail; + u32 qdiff; + u32 parkedlen; + u8 prio; + u8 wqprio; }; enum rmnet_shs_trace_func { @@ -215,6 +225,7 @@ enum rmnet_shs_trace_evt { RMNET_SHS_DL_MRK_END, }; +extern struct rmnet_shs_flush_work shs_delayed_work; extern spinlock_t rmnet_shs_ht_splock; extern struct hlist_head RMNET_SHS_HT[1 << (RMNET_SHS_HT_SIZE)]; @@ -225,8 +236,9 @@ extern int (*rmnet_shs_skb_entry)(struct sk_buff *skb, struct rmnet_port *port); int rmnet_shs_is_lpwr_cpu(u16 cpu); void rmnet_shs_cancel_table(void); - void rmnet_shs_aggregate_init(void); + +int rmnet_shs_chk_and_flush_node(struct rmnet_shs_skbn_s *node, u8 force_flush); void rmnet_shs_dl_hdr_handler(struct rmnet_map_dl_ind_hdr *dlhdr); void rmnet_shs_dl_trl_handler(struct rmnet_map_dl_ind_trl *dltrl); void rmnet_shs_assign(struct sk_buff *skb, struct rmnet_port *port); @@ -236,5 +248,5 @@ void rmnet_shs_init(struct net_device *dev); void rmnet_shs_exit(void); void rmnet_shs_ps_on_hdlr(void *port); void rmnet_shs_ps_off_hdlr(void *port); - +void rmnet_shs_update_cpu_proc_q_all_cpus(void); #endif /* _RMNET_SHS_H_ */ |