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

Unverified Commit 81c6b026 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of... 

Merge tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom/opensource/datarmnet into android12-5.4-lahaina

"LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0"

* tag 'LA.UM.9.14.r1-19500-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom/opensource/datarmnet:
  datarmnet: Remove monaco_go and monaco_go_aon from BOARD_PLATFORM_LIST
  rmnet_core: fix race condition in rmnet_get_packets
  dfc: fix use-after-free
  dfc: reset tx queue
  dfc: not caching grant for removed bearers
  datarmnet: compilation fix for ks sync path

Change-Id: I0dd004839cd3afd62a4a2b691e7b58efa17876cf
parents 82f29542 6478baf6

techpack/datarmnet/core/Android.mk

+6 −4
Original line number Diff line number Diff line
@@ -2,14 +2,16 @@ ifneq ($(TARGET_PRODUCT),qssi) 
RMNET_CORE_DLKM_PLATFORMS_LIST := lahaina

RMNET_CORE_DLKM_PLATFORMS_LIST += holi

RMNET_CORE_DLKM_PLATFORMS_LIST += monaco

RMNET_CORE_DLKM_PLATFORMS_LIST += monaco_go

RMNET_CORE_DLKM_PLATFORMS_LIST += monaco_go_aon



ifeq ($(call is-board-platform-in-list, $(RMNET_CORE_DLKM_PLATFORMS_LIST)),true)

#Make file to create RMNET_CORE DLKM

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



ifeq ($(BOARD_COMMON_DIR),)

    BOARD_COMMON_DIR := device/qcom/common

endif



LOCAL_CFLAGS := -Wno-macro-redefined -Wno-unused-function -Wall -Werror

LOCAL_CLANG :=true
@@ -30,7 +32,7 @@ LOCAL_SRC_FILES := \ 
	wda_qmi.c



RMNET_BLD_DIR := ../../vendor/qcom/opensource/datarmnet/core

DLKM_DIR := $(TOP)/device/qcom/common/dlkm

DLKM_DIR := $(TOP)/$(BOARD_COMMON_DIR)/dlkm



KBUILD_OPTIONS := $(RMNET_BLD_DIR)
@@ -51,7 +53,7 @@ LOCAL_SRC_FILES := \ 
	rmnet_ctl_ipa.c



RMNET_BLD_DIR := ../../vendor/qcom/opensource/datarmnet/core

DLKM_DIR := $(TOP)/device/qcom/common/dlkm

DLKM_DIR := $(TOP)/$(BOARD_COMMON_DIR)/dlkm



KBUILD_OPTIONS := $(RMNET_BLD_DIR)

techpack/datarmnet/core/dfc_qmap.c

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

/*

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

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <net/pkt_sched.h>
@@ -139,11 +140,13 @@ static void dfc_qmap_send_cmd(struct sk_buff *skb) 
{

	trace_dfc_qmap(skb->data, skb->len, false);



	if (unlikely(!rmnet_ctl || !rmnet_ctl->send) ||

	    rmnet_ctl->send(rmnet_ctl_handle, skb)) {

		pr_err("Failed to send to rmnet ctl\n");

	if (unlikely(!rmnet_ctl || !rmnet_ctl->send)) {

		kfree_skb(skb);

		return;

	}



	if (rmnet_ctl->send(rmnet_ctl_handle, skb))

		pr_err("Failed to send to rmnet ctl\n");

}



static void dfc_qmap_send_inband_ack(struct dfc_qmi_data *dfc,

techpack/datarmnet/core/dfc_qmi.c

+4 −1
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1003,7 +1004,9 @@ static int dfc_update_fc_map(struct net_device *dev, struct qos_info *qos, 
	u32 adjusted_grant;



	itm = qmi_rmnet_get_bearer_map(qos, fc_info->bearer_id);

	if (!itm)



	/* cache the bearer assuming it is a new bearer */

	if (unlikely(!itm && !is_query && fc_info->num_bytes))

		itm = qmi_rmnet_get_bearer_noref(qos, fc_info->bearer_id);



	if (itm) {

techpack/datarmnet/core/qmi_rmnet.c

+39 −30
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -221,21 +222,6 @@ int qmi_rmnet_flow_control(struct net_device *dev, u32 mq_idx, int enable) 
	return 0;

}



static void qmi_rmnet_reset_txq(struct net_device *dev, unsigned int txq)

{

	struct Qdisc *qdisc;



	if (unlikely(txq >= dev->num_tx_queues))

		return;



	qdisc = rtnl_dereference(netdev_get_tx_queue(dev, txq)->qdisc);

	if (qdisc) {

		spin_lock_bh(qdisc_lock(qdisc));

		qdisc_reset(qdisc);

		spin_unlock_bh(qdisc_lock(qdisc));

	}

}



/**

 * qmi_rmnet_watchdog_fn - watchdog timer func

 */
@@ -361,17 +347,15 @@ static void __qmi_rmnet_bearer_put(struct net_device *dev, 
				continue;



			mq->bearer = NULL;

			if (reset) {

				qmi_rmnet_reset_txq(dev, i);

				qmi_rmnet_flow_control(dev, i, 1);

			mq->drop_on_remove = reset;

			smp_mb();



			qmi_rmnet_flow_control(dev, i, 1);

			if (dfc_mode == DFC_MODE_SA) {

				j = i + ACK_MQ_OFFSET;

					qmi_rmnet_reset_txq(dev, j);

				qmi_rmnet_flow_control(dev, j, 1);

			}

		}

		}



		/* Remove from bearer map */

		list_del(&bearer->list);
@@ -393,6 +377,8 @@ static void __qmi_rmnet_update_mq(struct net_device *dev, 
	mq = &qos_info->mq[itm->mq_idx];

	if (!mq->bearer) {

		mq->bearer = bearer;

		mq->drop_on_remove = false;

		smp_mb();



		if (dfc_mode == DFC_MODE_SA) {

			bearer->mq_idx = itm->mq_idx;
@@ -401,12 +387,15 @@ static void __qmi_rmnet_update_mq(struct net_device *dev, 
			bearer->mq_idx = itm->mq_idx;

		}



		qmi_rmnet_flow_control(dev, itm->mq_idx,

				       bearer->grant_size > 0 ? 1 : 0);



		/* Always enable flow for the newly associated bearer */

		if (!bearer->grant_size) {

			bearer->grant_size = DEFAULT_GRANT;

			bearer->grant_thresh =

				qmi_rmnet_grant_per(DEFAULT_GRANT);

		}

		qmi_rmnet_flow_control(dev, itm->mq_idx, 1);

		if (dfc_mode == DFC_MODE_SA)

			qmi_rmnet_flow_control(dev, bearer->ack_mq_idx,

					bearer->grant_size > 0 ? 1 : 0);

			qmi_rmnet_flow_control(dev, bearer->ack_mq_idx, 1);

	}

}
@@ -873,6 +862,26 @@ bool qmi_rmnet_all_flows_enabled(struct net_device *dev) 
EXPORT_SYMBOL(qmi_rmnet_all_flows_enabled);



#ifdef CONFIG_QTI_QMI_DFC

bool qmi_rmnet_get_flow_state(struct net_device *dev, struct sk_buff *skb,

			      bool *drop)

{

	struct qos_info *qos = rmnet_get_qos_pt(dev);

	int txq = skb->queue_mapping;



	if (txq > ACK_MQ_OFFSET)

		txq -= ACK_MQ_OFFSET;



	if (unlikely(!qos || txq >= MAX_MQ_NUM))

		return false;



	/* If the bearer is gone, packets may need to be dropped */

	*drop = (txq != DEFAULT_MQ_NUM && !READ_ONCE(qos->mq[txq].bearer) &&

		 READ_ONCE(qos->mq[txq].drop_on_remove));



	return true;

}

EXPORT_SYMBOL(qmi_rmnet_get_flow_state);



void qmi_rmnet_burst_fc_check(struct net_device *dev,

			      int ip_type, u32 mark, unsigned int len)

{

techpack/datarmnet/core/qmi_rmnet.h

+10 −0
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -59,6 +60,8 @@ 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);

bool qmi_rmnet_get_flow_state(struct net_device *dev, struct sk_buff *skb,

			      bool *drop);

void qmi_rmnet_burst_fc_check(struct net_device *dev,

			      int ip_type, u32 mark, unsigned int len);

int qmi_rmnet_get_queue(struct net_device *dev, struct sk_buff *skb);
@@ -78,6 +81,13 @@ static inline void qmi_rmnet_qos_exit_post(void) 
{

}



static inline bool qmi_rmnet_get_flow_state(struct net_device *dev,

					    struct sk_buff *skb,

					    bool *drop)

{

	return false;

}



static inline void

qmi_rmnet_burst_fc_check(struct net_device *dev,

			 int ip_type, u32 mark, unsigned int len)