From 4575f41b70b59e87c273bf6074b9159fa5d082d4 Mon Sep 17 00:00:00 2001 From: Pragaspapthi Thilagaraj Date: Tue, 29 Dec 2020 12:44:04 +0530 Subject: [PATCH] qcacld-3.0: Reduce excessive kmsg logging in roaming path Reduce excessive logging for roaming path to reduce latency. Also remove function and line prints in roam debug related logging. Change-Id: Ida6fc55886c944126720f8bdd4b944765426ccc6 CRs-Fixed: 2847773 --- .../dispatcher/src/wlan_cp_stats_mc_tgt_api.c | 13 +++--- core/hdd/inc/wlan_hdd_main.h | 4 +- core/hdd/src/wlan_hdd_main.c | 2 +- core/sme/src/csr/csr_api_scan.c | 2 - core/wma/src/wma_scan_roam.c | 42 ++++++++++--------- .../cp_stats/src/wlan_cfg80211_mc_cp_stats.c | 4 +- 6 files changed, 33 insertions(+), 34 deletions(-) diff --git a/components/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c b/components/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c index 06ab24735e8f..31045b0a130d 100644 --- a/components/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c +++ b/components/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -180,7 +180,7 @@ tgt_mc_cp_stats_prepare_raw_peer_rssi(struct wlan_objmgr_psoc *psoc, get_peer_rssi_cb = last_req->u.get_peer_rssi_cb; if (!get_peer_rssi_cb) { - cp_stats_err("get_peer_rssi_cb is null"); + cp_stats_debug("get_peer_rssi_cb is null"); return; } @@ -213,8 +213,8 @@ tgt_mc_cp_stats_prepare_raw_peer_rssi(struct wlan_objmgr_psoc *psoc, peer = wlan_objmgr_get_peer(psoc, last_req->pdev_id, mac_addr, WLAN_CP_STATS_ID); if (!peer) { - cp_stats_err("peer["QDF_MAC_ADDR_FMT"] is null", - QDF_MAC_ADDR_REF(mac_addr)); + cp_stats_debug("peer[" QDF_MAC_ADDR_FMT "] is null", + QDF_MAC_ADDR_REF(mac_addr)); goto end; } @@ -505,9 +505,8 @@ static void tgt_mc_cp_stats_extract_peer_stats(struct wlan_objmgr_psoc *psoc, /* no matched peer */ if (!QDF_IS_ADDR_BROADCAST(last_req.peer_mac_addr) && - selected == ev->num_peer_stats) { - cp_stats_rl_err("peer not found for stats"); - } + selected == ev->num_peer_stats) + cp_stats_debug("peer not found for stats"); extd2_stats: diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index ac035e72c546..67e6077caf90 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -2773,8 +2773,8 @@ hdd_add_latency_critical_client(struct hdd_adapter *adapter, if (adapter->device_mode == QDF_STA_MODE) qdf_atomic_inc(&hdd_ctx->num_latency_critical_clients); - hdd_info("Adding latency critical connection for vdev %d", - adapter->vdev_id); + hdd_debug("Adding latency critical connection for vdev %d", + adapter->vdev_id); cdp_vdev_inform_ll_conn(cds_get_context(QDF_MODULE_ID_SOC), adapter->vdev_id, CDP_VDEV_LL_CONN_ADD); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 9c8e2931b05f..ed7997192bdc 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -18215,7 +18215,7 @@ int hdd_get_rssi_snr_by_bssid(struct hdd_adapter *adapter, const uint8_t *bssid, roam_profile, bssid, rssi, snr, adapter->vdev_id); if (QDF_STATUS_SUCCESS != status) { - hdd_warn("sme_get_rssi_snr_by_bssid failed"); + hdd_debug("sme_get_rssi_snr_by_bssid failed"); return -EINVAL; } diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 3b3a9992f2a9..b6f1042d13c3 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -2666,8 +2666,6 @@ void csr_init_occupied_channels_list(struct mac_context *mac_ctx, &mac_ctx->scan.occupiedChannels[sessionId], true); list = ucfg_scan_get_result(pdev, filter); - if (list) - sme_debug("num_entries %d", qdf_list_size(list)); if (!list || (list && !qdf_list_size(list))) { goto err; } diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 25bf692e2073..0c8ad68f768d 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -3655,7 +3655,7 @@ wma_rso_print_trigger_info(struct wmi_roam_trigger_info *data, uint8_t vdev_id) wma_get_trigger_detail_str(data, buf); mlme_get_converted_timestamp(data->timestamp, time); - wma_info("%s [ROAM_TRIGGER]: VDEV[%d] %s", time, vdev_id, buf); + wma_nofl_info("%s [ROAM_TRIGGER]: VDEV[%d] %s", time, vdev_id, buf); qdf_mem_free(buf); } @@ -3676,9 +3676,9 @@ wma_rso_print_btm_rsp_info(struct roam_btm_response_data *data, char time[TIME_STRING_LEN]; mlme_get_converted_timestamp(data->timestamp, time); - wma_info("%s [BTM RSP]: VDEV[%d], Status: %d, VSIE reason: %d, BSSID: "QDF_MAC_ADDR_FMT, - time, vdev_id, data->btm_status, data->vsie_reason, - QDF_MAC_ADDR_REF(data->target_bssid.bytes)); + wma_nofl_info("%s [BTM RSP]: VDEV[%d], Status: %d, VSIE reason: %d, BSSID: " QDF_MAC_ADDR_FMT, + time, vdev_id, data->btm_status, data->vsie_reason, + QDF_MAC_ADDR_REF(data->target_bssid.bytes)); } /** @@ -3695,9 +3695,9 @@ static void wma_rso_print_roam_initial_info(struct roam_initial_data *data, uint8_t vdev_id) { - wma_info("[ROAM INIT INFO]: VDEV[%d], roam_full_scan_count: %d, rssi_th: %d, cu_th: %d, fw_cancel_timer_bitmap: %d", - vdev_id, data->roam_full_scan_count, data->rssi_th, - data->cu_th, data->fw_cancel_timer_bitmap); + wma_nofl_info("[ROAM INIT INFO]: VDEV[%d], roam_full_scan_count: %d, rssi_th: %d, cu_th: %d, fw_cancel_timer_bitmap: %d", + vdev_id, data->roam_full_scan_count, data->rssi_th, + data->cu_th, data->fw_cancel_timer_bitmap); } /** @@ -3800,9 +3800,9 @@ wma_rso_print_scan_info(struct wmi_roam_scan_data *scan, uint8_t vdev_id, scan->next_rssi_threshold); mlme_get_converted_timestamp(timestamp, time); - wma_info("%s [ROAM_SCAN]: VDEV[%d] Scan_type: %s %s %s", - time, vdev_id, mlme_get_roam_scan_type_str(scan->type), - buf1, buf); + wma_nofl_info("%s [ROAM_SCAN]: VDEV[%d] Scan_type: %s %s %s", + time, vdev_id, mlme_get_roam_scan_type_str(scan->type), + buf1, buf); wma_log_roam_scan_candidates(scan->ap, scan->num_ap); qdf_mem_free(buf); @@ -3834,8 +3834,9 @@ wma_rso_print_roam_result(struct wmi_roam_result *res, mlme_get_roam_fail_reason_str(res->fail_reason)); mlme_get_converted_timestamp(res->timestamp, time); - wma_info("%s [ROAM_RESULT]: VDEV[%d] %s %s", - time, vdev_id, mlme_get_roam_status_str(res->status), buf); + wma_nofl_info("%s [ROAM_RESULT]: VDEV[%d] %s %s", + time, vdev_id, mlme_get_roam_status_str(res->status), + buf); qdf_mem_free(buf); } @@ -3886,17 +3887,18 @@ wma_rso_print_11kv_info(struct wmi_neighbor_report_data *neigh_rpt, } mlme_get_converted_timestamp(neigh_rpt->req_time, time); - wma_info("%s [%s] VDEV[%d]", time, - (type == 1) ? "BTM_QUERY" : "NEIGH_RPT_REQ", vdev_id); + wma_nofl_info("%s [%s] VDEV[%d]", time, + (type == 1) ? "BTM_QUERY" : "NEIGH_RPT_REQ", vdev_id); if (neigh_rpt->resp_time) { mlme_get_converted_timestamp(neigh_rpt->resp_time, time1); - wma_info("%s [%s] VDEV[%d] %s", time1, - (type == 1) ? "BTM_REQ" : "NEIGH_RPT_RSP", vdev_id, - (num_ch > 0) ? buf : "NO Ch update"); + wma_nofl_info("%s [%s] VDEV[%d] %s", time1, + (type == 1) ? "BTM_REQ" : "NEIGH_RPT_RSP", + vdev_id, + (num_ch > 0) ? buf : "NO Ch update"); } else { - wma_info("%s No response received from AP", - (type == 1) ? "BTM" : "NEIGH_RPT"); + wma_nofl_info("%s No response received from AP", + (type == 1) ? "BTM" : "NEIGH_RPT"); } qdf_mem_free(buf); } diff --git a/os_if/cp_stats/src/wlan_cfg80211_mc_cp_stats.c b/os_if/cp_stats/src/wlan_cfg80211_mc_cp_stats.c index 2b1733b62f55..7058358f7b43 100644 --- a/os_if/cp_stats/src/wlan_cfg80211_mc_cp_stats.c +++ b/os_if/cp_stats/src/wlan_cfg80211_mc_cp_stats.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -429,7 +429,7 @@ wlan_cfg80211_mc_cp_stats_get_peer_rssi(struct wlan_objmgr_vdev *vdev, *errno = osif_request_wait_for_response(request); if (*errno) { - osif_err("wait failed or timed out ret: %d", *errno); + osif_debug("wait failed or timed out ret: %d", *errno); goto get_peer_rssi_fail; }