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

Commit 9882e91e authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan
Browse files

dfc: add stall recovery timer 



Add watchdog timer to recover potential data stall when data is
not going to the expected DRB and no DFC indication is received.

Change-Id: Iaa4b4814967cf9400c36115a083922376d23928d
Acked-by: default avatarWeiyi Chen <weiyic@qti.qualcomm.com>
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parent 5762dd39

drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 *

 * RMNET Data virtual network driver

 *
@@ -373,7 +373,7 @@ int rmnet_vnd_newlink(u8 id, struct net_device *rmnet_dev, 
		rmnet_dev->rtnl_link_ops = &rmnet_link_ops;



		priv->mux_id = id;

		priv->qos_info = qmi_rmnet_qos_init(real_dev, id);

		priv->qos_info = qmi_rmnet_qos_init(real_dev, rmnet_dev, id);



		netdev_dbg(rmnet_dev, "rmnet dev created\n");

	}

drivers/soc/qcom/dfc_qmi.c

+8 −3
Original line number Diff line number Diff line
@@ -1026,14 +1026,18 @@ static int dfc_update_fc_map(struct net_device *dev, struct qos_info *qos, 
		itm->grant_size = adjusted_grant;



		/* No further query if the adjusted grant is less

		 * than 20% of the original grant

		 * than 20% of the original grant. Add to watch to

		 * recover if no indication is received.

		 */

		if (dfc_qmap && is_query &&

		    itm->grant_size < (fc_info->num_bytes / 5))

		    itm->grant_size < (fc_info->num_bytes / 5)) {

			itm->grant_thresh = itm->grant_size;

		else

			qmi_rmnet_watchdog_add(itm);

		} else {

			itm->grant_thresh =

				qmi_rmnet_grant_per(itm->grant_size);

			qmi_rmnet_watchdog_remove(itm);

		}



		itm->seq = fc_info->seq_num;

		itm->ack_req = ack_req;
@@ -1135,6 +1139,7 @@ static void dfc_update_tx_link_status(struct net_device *dev, 
		itm->grant_size = 0;

		itm->tcp_bidir = false;

		itm->bytes_in_flight = 0;

		qmi_rmnet_watchdog_remove(itm);

		dfc_bearer_flow_ctl(dev, itm, qos);

	} else if (itm->grant_size == 0 && tx_status && !itm->rat_switch) {

		itm->grant_size = DEFAULT_GRANT;

drivers/soc/qcom/qmi_rmnet.c

+107 −3
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ unsigned int rmnet_wq_frequency __read_mostly = 1000; 
					1 : rmnet_wq_frequency/10) * (HZ/100))

#define NO_DELAY (0x0000 * HZ)

#define PS_INTERVAL_KT (ms_to_ktime(1000))

#define WATCHDOG_EXPIRE_JF (msecs_to_jiffies(50))



#ifdef CONFIG_QCOM_QMI_DFC

static unsigned int qmi_rmnet_scale_factor = 5;
@@ -225,6 +226,89 @@ static void qmi_rmnet_reset_txq(struct net_device *dev, unsigned int txq) 
	}

}



/**

 * qmi_rmnet_watchdog_fn - watchdog timer func

 */

static void qmi_rmnet_watchdog_fn(struct timer_list *t)

{

	struct rmnet_bearer_map *bearer;



	bearer = container_of(t, struct rmnet_bearer_map, watchdog);



	trace_dfc_watchdog(bearer->qos->mux_id, bearer->bearer_id, 2);



	spin_lock_bh(&bearer->qos->qos_lock);



	if (bearer->watchdog_quit)

		goto done;



	/*

	 * Possible stall, try to recover. Enable 80% query and jumpstart

	 * the bearer if disabled.

	 */

	bearer->watchdog_expire_cnt++;

	bearer->bytes_in_flight = 0;

	if (!bearer->grant_size) {

		bearer->grant_size = DEFAULT_CALL_GRANT;

		bearer->grant_thresh = qmi_rmnet_grant_per(bearer->grant_size);

		dfc_bearer_flow_ctl(bearer->qos->vnd_dev, bearer, bearer->qos);

	} else {

		bearer->grant_thresh = qmi_rmnet_grant_per(bearer->grant_size);

	}



done:

	bearer->watchdog_started = false;

	spin_unlock_bh(&bearer->qos->qos_lock);

}



/**

 * qmi_rmnet_watchdog_add - add the bearer to watch

 * Needs to be called with qos_lock

 */

void qmi_rmnet_watchdog_add(struct rmnet_bearer_map *bearer)

{

	bearer->watchdog_quit = false;



	if (bearer->watchdog_started)

		return;



	bearer->watchdog_started = true;

	mod_timer(&bearer->watchdog, jiffies + WATCHDOG_EXPIRE_JF);



	trace_dfc_watchdog(bearer->qos->mux_id, bearer->bearer_id, 1);

}



/**

 * qmi_rmnet_watchdog_remove - remove the bearer from watch

 * Needs to be called with qos_lock

 */

void qmi_rmnet_watchdog_remove(struct rmnet_bearer_map *bearer)

{

	bearer->watchdog_quit = true;



	if (!bearer->watchdog_started)

		return;



	if (try_to_del_timer_sync(&bearer->watchdog) >= 0)

		bearer->watchdog_started = false;



	trace_dfc_watchdog(bearer->qos->mux_id, bearer->bearer_id, 0);

}



/**

 * qmi_rmnet_bearer_clean - clean the removed bearer

 * Needs to be called with rtn_lock but not qos_lock

 */

static void qmi_rmnet_bearer_clean(struct qos_info *qos)

{

	if (qos->removed_bearer) {

		qos->removed_bearer->watchdog_quit = true;

		del_timer_sync(&qos->removed_bearer->watchdog);

		kfree(qos->removed_bearer);

		qos->removed_bearer = NULL;

	}

}



static struct rmnet_bearer_map *__qmi_rmnet_bearer_get(

				struct qos_info *qos_info, u8 bearer_id)

{
@@ -244,6 +328,8 @@ static struct rmnet_bearer_map *__qmi_rmnet_bearer_get( 
		bearer->grant_thresh = qmi_rmnet_grant_per(bearer->grant_size);

		bearer->mq_idx = INVALID_MQ;

		bearer->ack_mq_idx = INVALID_MQ;

		bearer->qos = qos_info;

		timer_setup(&bearer->watchdog, qmi_rmnet_watchdog_fn, 0);

		list_add(&bearer->list, &qos_info->bearer_head);

	}
@@ -279,7 +365,7 @@ static void __qmi_rmnet_bearer_put(struct net_device *dev, 


		/* Remove from bearer map */

		list_del(&bearer->list);

		kfree(bearer);

		qos_info->removed_bearer = bearer;

	}

}
@@ -410,6 +496,9 @@ static int qmi_rmnet_add_flow(struct net_device *dev, struct tcmsg *tcm, 


done:

	spin_unlock_bh(&qos_info->qos_lock);



	qmi_rmnet_bearer_clean(qos_info);



	return rc;

}
@@ -453,6 +542,9 @@ qmi_rmnet_del_flow(struct net_device *dev, struct tcmsg *tcm, 
		netif_tx_wake_all_queues(dev);



	spin_unlock_bh(&qos_info->qos_lock);



	qmi_rmnet_bearer_clean(qos_info);



	return 0;

}
@@ -721,6 +813,8 @@ void qmi_rmnet_enable_all_flows(struct net_device *dev) 
		bearer->tcp_bidir = false;

		bearer->rat_switch = false;



		qmi_rmnet_watchdog_remove(bearer);



		if (bearer->tx_off)

			continue;
@@ -883,7 +977,8 @@ inline unsigned int qmi_rmnet_grant_per(unsigned int grant) 
}

EXPORT_SYMBOL(qmi_rmnet_grant_per);



void *qmi_rmnet_qos_init(struct net_device *real_dev, u8 mux_id)

void *qmi_rmnet_qos_init(struct net_device *real_dev,

			 struct net_device *vnd_dev, u8 mux_id)

{

	struct qos_info *qos;
@@ -893,6 +988,7 @@ void *qmi_rmnet_qos_init(struct net_device *real_dev, u8 mux_id) 


	qos->mux_id = mux_id;

	qos->real_dev = real_dev;

	qos->vnd_dev = vnd_dev;

	qos->tran_num = 0;

	INIT_LIST_HEAD(&qos->flow_head);

	INIT_LIST_HEAD(&qos->bearer_head);
@@ -904,10 +1000,18 @@ EXPORT_SYMBOL(qmi_rmnet_qos_init); 


void qmi_rmnet_qos_exit_pre(void *qos)

{

	struct qos_info *qosi = (struct qos_info *)qos;

	struct rmnet_bearer_map *bearer;



	if (!qos)

		return;



	list_add(&((struct qos_info *)qos)->list, &qos_cleanup_list);

	list_for_each_entry(bearer, &qosi->bearer_head, list) {

		bearer->watchdog_quit = true;

		del_timer_sync(&bearer->watchdog);

	}



	list_add(&qosi->list, &qos_cleanup_list);

}

EXPORT_SYMBOL(qmi_rmnet_qos_exit_pre);

drivers/soc/qcom/qmi_rmnet_i.h

+19 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/netdevice.h>

#include <linux/skbuff.h>

#include <linux/timer.h>



#define MAX_MQ_NUM 16

#define MAX_CLIENT_NUM 2
@@ -26,6 +27,8 @@ 
extern int dfc_mode;

extern int dfc_qmap;



struct qos_info;



struct rmnet_bearer_map {

	struct list_head list;

	u8 bearer_id;
@@ -44,6 +47,11 @@ struct rmnet_bearer_map { 
	u32 ack_txid;

	u32 mq_idx;

	u32 ack_mq_idx;

	struct qos_info *qos;

	struct timer_list watchdog;

	bool watchdog_started;

	bool watchdog_quit;

	u32 watchdog_expire_cnt;

};



struct rmnet_flow_map {
@@ -69,11 +77,13 @@ struct qos_info { 
	struct list_head list;

	u8 mux_id;

	struct net_device *real_dev;

	struct net_device *vnd_dev;

	struct list_head flow_head;

	struct list_head bearer_head;

	struct mq_map mq[MAX_MQ_NUM];

	u32 tran_num;

	spinlock_t qos_lock;

	struct rmnet_bearer_map *removed_bearer;

};



struct qmi_info {
@@ -144,6 +154,11 @@ void dfc_qmap_send_ack(struct qos_info *qos, u8 bearer_id, u16 seq, u8 type); 


struct rmnet_bearer_map *qmi_rmnet_get_bearer_noref(struct qos_info *qos_info,

						    u8 bearer_id);



void qmi_rmnet_watchdog_add(struct rmnet_bearer_map *bearer);



void qmi_rmnet_watchdog_remove(struct rmnet_bearer_map *bearer);



#else

static inline struct rmnet_flow_map *

qmi_rmnet_get_flow_map(struct qos_info *qos_info,
@@ -187,6 +202,10 @@ dfc_qmap_client_init(void *port, int index, struct svc_info *psvc, 
static inline void dfc_qmap_client_exit(void *dfc_data)

{

}



static inline void qmi_rmnet_watchdog_remove(struct rmnet_bearer_map *bearer)

{

}

#endif



#ifdef CONFIG_QCOM_QMI_POWER_COLLAPSE

include/soc/qcom/qmi_rmnet.h

+5 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _QMI_RMNET_H
@@ -44,7 +44,8 @@ qmi_rmnet_all_flows_enabled(struct net_device *dev) 
#endif



#ifdef CONFIG_QCOM_QMI_DFC

void *qmi_rmnet_qos_init(struct net_device *real_dev, u8 mux_id);

void *qmi_rmnet_qos_init(struct net_device *real_dev,

			 struct net_device *vnd_dev, u8 mux_id);

void qmi_rmnet_qos_exit_pre(void *qos);

void qmi_rmnet_qos_exit_post(void);

void qmi_rmnet_burst_fc_check(struct net_device *dev,
@@ -52,7 +53,8 @@ void qmi_rmnet_burst_fc_check(struct net_device *dev, 
int qmi_rmnet_get_queue(struct net_device *dev, struct sk_buff *skb);

#else

static inline void *

qmi_rmnet_qos_init(struct net_device *real_dev, u8 mux_id)

qmi_rmnet_qos_init(struct net_device *real_dev,

		   struct net_device *vnd_dev, u8 mux_id)

{

	return NULL;

}