diff --git a/Kbuild b/Kbuild
index 375bd98..d68799c 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1923,6 +1923,32 @@
 #Flag to enable NUD tracking
 cppflags-$(CONFIG_WLAN_NUD_TRACKING) += -DWLAN_NUD_TRACKING
 
+# configure log buffer size
+ifdef CONFIG_CFG_NUM_DP_TRACE_RECORD
+ccflags-y += -DMAX_QDF_DP_TRACE_RECORDS=$(CONFIG_CFG_NUM_DP_TRACE_RECORD)
+endif
+
+ifdef CONFIG_CFG_NUM_HTC_CREDIT_HISTORY
+ccflags-y += -DHTC_CREDIT_HISTORY_MAX=$(CONFIG_CFG_NUM_HTC_CREDIT_HISTORY)
+endif
+
+ifdef CONFIG_CFG_NUM_WMI_EVENT_HISTORY
+ccflags-y += -DWMI_EVENT_DEBUG_MAX_ENTRY=$(CONFIG_CFG_NUM_WMI_EVENT_HISTORY)
+endif
+
+ifdef CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY
+ccflags-y += -DWMI_MGMT_EVENT_DEBUG_MAX_ENTRY=$(CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY)
+endif
+
+ifdef CONFIG_CFG_NUM_TX_RX_HISTOGRAM
+ccflags-y += -DNUM_TX_RX_HISTOGRAM=$(CONFIG_CFG_NUM_TX_RX_HISTOGRAM)
+endif
+
+ifdef CONFIG_CFG_NUM_RX_IND_RECORD
+ccflags-y += -DOL_RX_INDICATION_MAX_RECORDS=$(CONFIG_CFG_NUM_RX_IND_RECORD)
+endif
+
+
 KBUILD_CPPFLAGS += $(cppflags-y)
 
 # Currently, for versions of gcc which support it, the kernel Makefile
diff --git a/configs/genoa.snoc.perf_defconfig b/configs/genoa.snoc.perf_defconfig
index 7415ee0..be2a0bd 100644
--- a/configs/genoa.snoc.perf_defconfig
+++ b/configs/genoa.snoc.perf_defconfig
@@ -172,4 +172,12 @@
 endif
 endif
 
+# configure log buffer size
+CONFIG_CFG_NUM_DP_TRACE_RECORD := 1000
+CONFIG_CFG_NUM_HTC_CREDIT_HISTORY := 16
+CONFIG_CFG_NUM_WMI_EVENT_HISTORY := 16
+CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY := 16
+CONFIG_CFG_NUM_TX_RX_HISTOGRAM := 16
+CONFIG_CFG_NUM_RX_IND_RECORD := 1024
+
 ###################################
diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c
index 491efab..49bcf63 100644
--- a/core/dp/txrx/ol_rx.c
+++ b/core/dp/txrx/ol_rx.c
@@ -55,8 +55,9 @@
 #include <cdp_txrx_handle.h>
 #include <pld_common.h>
 
-
+#ifndef OL_RX_INDICATION_MAX_RECORDS
 #define OL_RX_INDICATION_MAX_RECORDS 2048
+#endif
 
 /**
  * enum ol_rx_ind_record_type - OL rx indication events
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index a44339c..ec8ebf9 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -434,7 +434,10 @@
 #define WLAN_SAP_HDD_TX_FLOW_CONTROL_OS_Q_BLOCK_TIME 100
 #define WLAN_HDD_TX_FLOW_CONTROL_MAX_24BAND_CH   14
 
+#ifndef NUM_TX_RX_HISTOGRAM
 #define NUM_TX_RX_HISTOGRAM 128
+#endif
+
 #define NUM_TX_RX_HISTOGRAM_MASK (NUM_TX_RX_HISTOGRAM - 1)
 
 /**