samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
程式碼 問題 合併請求 Actions 套件 專案 版本發布 Wiki 動態

qcacmn: Replace blacklist/whitelist with denylist/allowlist

瀏覽代碼 
Replace blacklist/whitelist with denylist/allowlist
in qca-wifi-host-cmn.

Change-Id: I1a27d025ccb9d5fcc3c573d47a84f9667a229c9b
CRs-Fixed: 3098934
此提交包含在：
chunquan
2022-01-17 16:51:01 +08:00
提交者 Madan Koyyalamudi
父節點 24174b7be8
當前提交 19cc13911c
共有 19 個檔案被更改，包括 243 行新增 和 230 行删除
下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

71
hif/src/hif_irq_affinity.c
查看文件

@@ -1,5 +1,6 @@
/*
* Copyright (c) 2015-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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
@@ -80,10 +81,10 @@ static void hnc_dump_cpus(struct qca_napi_data *napid) { /* no-op */ };
* + In some cases (roaming peer management is the only case so far), a
* a client can trigger a "SERIALIZE" event. Basically, this means that the
* users is asking NAPI to go into a truly single execution context state.
* So, NAPI indicates to msm-irqbalancer that it wants to be blacklisted,
* So, NAPI indicates to msm-irqbalancer that it wants to be denylisted,
* (if called for the first time) and then moves all IRQs (for NAPI
* instances) to be collapsed to a single core. If called multiple times,
* it will just re-collapse the CPUs. This is because blacklist-on() API
* it will just re-collapse the CPUs. This is because denylist-on() API
* is reference-counted, and because the API has already been called.
*
* Such a user, should call "DESERIALIZE" (NORMAL) event, to set NAPI to go
@@ -106,10 +107,10 @@ int hif_exec_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
struct qca_napi_data *napid = &(hif->napi_data);
enum qca_napi_tput_state tput_mode = QCA_NAPI_TPUT_UNINITIALIZED;
enum {
BLACKLIST_NOT_PENDING,
BLACKLIST_ON_PENDING,
BLACKLIST_OFF_PENDING
} blacklist_pending = BLACKLIST_NOT_PENDING;
DENYLIST_NOT_PENDING,
DENYLIST_ON_PENDING,
DENYLIST_OFF_PENDING
} denylist_pending = DENYLIST_NOT_PENDING;
NAPI_DEBUG("%s: -->(event=%d, aux=%pK)", __func__, event, data);
@@ -150,7 +151,7 @@ int hif_exec_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
/* from TPUT_HI -> TPUT_LO */
NAPI_DEBUG("%s: Moving to napi_tput_LO state",
__func__);
blacklist_pending = BLACKLIST_OFF_PENDING;
denylist_pending = DENYLIST_OFF_PENDING;
/*
* Ideally we should "collapse" interrupts here, since
* we are "dispersing" interrupts in the "else" case.
@@ -158,7 +159,7 @@ int hif_exec_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
* still be on the perf cluster the next time we enter
* high tput mode. However, the irq_balancer is free
* to move our interrupts to power cluster once
* blacklisting has been turned off in the "else" case.
* denylisting has been turned off in the "else" case.
*/
} else {
/* from TPUT_LO -> TPUT->HI */
@@ -168,7 +169,7 @@ int hif_exec_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
HNC_ANY_CPU,
HNC_ACT_DISPERSE);
blacklist_pending = BLACKLIST_ON_PENDING;
denylist_pending = DENYLIST_ON_PENDING;
}
napid->napi_mode = tput_mode;
break;
@@ -184,13 +185,13 @@ int hif_exec_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
HNC_ANY_CPU,
HNC_ACT_COLLAPSE);
if ((users == 0) && (rc == 0))
blacklist_pending = BLACKLIST_ON_PENDING;
denylist_pending = DENYLIST_ON_PENDING;
break;
}
case NAPI_EVT_USR_NORMAL: {
NAPI_DEBUG("%s: User forced DE-SERIALIZATION", __func__);
if (!napid->user_cpu_affin_mask)
blacklist_pending = BLACKLIST_OFF_PENDING;
denylist_pending = DENYLIST_OFF_PENDING;
/*
* Deserialization timeout is handled at hdd layer;
* just mark current mode to uninitialized to ensure
@@ -207,18 +208,18 @@ int hif_exec_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
}; /* switch */
switch (blacklist_pending) {
case BLACKLIST_ON_PENDING:
switch (denylist_pending) {
case DENYLIST_ON_PENDING:
/* assume the control of WLAN IRQs */
hif_napi_cpu_blacklist(napid, BLACKLIST_ON);
hif_napi_cpu_denylist(napid, DENYLIST_ON);
break;
case BLACKLIST_OFF_PENDING:
case DENYLIST_OFF_PENDING:
/* yield the control of WLAN IRQs */
hif_napi_cpu_blacklist(napid, BLACKLIST_OFF);
hif_napi_cpu_denylist(napid, DENYLIST_OFF);
break;
default: /* nothing to do */
break;
} /* switch blacklist_pending */
} /* switch denylist_pending */
qdf_spin_unlock_bh(&(napid->lock));
@@ -425,11 +426,11 @@ hncm_return:
/**
* hif_exec_bl_irq() - calls irq_modify_status to enable/disable blacklisting
* hif_exec_bl_irq() - calls irq_modify_status to enable/disable denylisting
* @napid: pointer to qca_napi_data structure
* @bl_flag: blacklist flag to enable/disable blacklisting
* @bl_flag: denylist flag to enable/disable denylisting
*
* The function enables/disables blacklisting for all the copy engine
* The function enables/disables denylisting for all the copy engine
* interrupts on which NAPI is enabled.
*
* Return: None
@@ -464,23 +465,23 @@ static inline void hif_exec_bl_irq(struct qca_napi_data *napid, bool bl_flag)
}
/**
* hif_napi_cpu_blacklist() - en(dis)ables blacklisting for NAPI RX interrupts.
* hif_napi_cpu_denylist() - en(dis)ables denylisting for NAPI RX interrupts.
* @napid: pointer to qca_napi_data structure
* @op: blacklist operation to perform
* @op: denylist operation to perform
*
* The function enables/disables/queries blacklisting for all CE RX
* interrupts with NAPI enabled. Besides blacklisting, it also enables/disables
* The function enables/disables/queries denylisting for all CE RX
* interrupts with NAPI enabled. Besides denylisting, it also enables/disables
* core_ctl_set_boost.
* Once blacklisting is enabled, the interrupts will not be managed by the IRQ
* Once denylisting is enabled, the interrupts will not be managed by the IRQ
* balancer.
*
* Return: -EINVAL, in case IRQ_BLACKLISTING and CORE_CTL_BOOST is not enabled
* for BLACKLIST_QUERY op - blacklist refcount
* for BLACKLIST_ON op - return value from core_ctl_set_boost API
* for BLACKLIST_OFF op - return value from core_ctl_set_boost API
* Return: -EINVAL, in case IRQ_DENYLISTING and CORE_CTL_BOOST is not enabled
* for DENYLIST_QUERY op - denylist refcount
* for DENYLIST_ON op - return value from core_ctl_set_boost API
* for DENYLIST_OFF op - return value from core_ctl_set_boost API
*/
int hif_exec_cpu_blacklist(struct qca_napi_data *napid,
enum qca_blacklist_op op)
int hif_exec_cpu_denylist(struct qca_napi_data *napid,
enum qca_denylist_op op)
{
int rc = 0;
static int ref_count; /* = 0 by the compiler */
@@ -496,10 +497,10 @@ int hif_exec_cpu_blacklist(struct qca_napi_data *napid,
}
switch (op) {
case BLACKLIST_QUERY:
case DENYLIST_QUERY:
rc = ref_count;
break;
case BLACKLIST_ON:
case DENYLIST_ON:
ref_count++;
rc = 0;
if (ref_count == 1) {
@@ -509,7 +510,7 @@ int hif_exec_cpu_blacklist(struct qca_napi_data *napid,
hif_exec_bl_irq(napid, true);
}
break;
case BLACKLIST_OFF:
case DENYLIST_OFF:
if (ref_count)
ref_count--;
rc = 0;
@@ -521,7 +522,7 @@ int hif_exec_cpu_blacklist(struct qca_napi_data *napid,
}
break;
default:
NAPI_DEBUG("Invalid blacklist op: %d", op);
NAPI_DEBUG("Invalid denylist op: %d", op);
rc = -EINVAL;
} /* switch */
out:

7
hif/src/hif_irq_affinity.h
查看文件

@@ -1,5 +1,6 @@
/*
* Copyright (c) 2015-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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
@@ -29,12 +30,12 @@
#include <hif.h> /* struct hif_opaque_softc; */
#include <hif_napi.h>
struct hif_opaque_softc;
enum qca_blacklist_op;
enum qca_denylist_op;
int hif_exec_cpu_migrate(struct qca_napi_data *napid, int cpu, int action);
int hif_exec_cpu_blacklist(struct qca_napi_data *napid,
enum qca_blacklist_op op);
int hif_exec_cpu_denylist(struct qca_napi_data *napid,
enum qca_denylist_op op);
#ifdef HIF_IRQ_AFFINITY
int hif_exec_event(struct hif_opaque_softc *hif,

79
hif/src/hif_napi.c
查看文件

@@ -1,5 +1,6 @@
/*
* Copyright (c) 2015-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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
@@ -480,10 +481,10 @@ struct qca_napi_info *hif_get_napi(int napi_id, struct qca_napi_data *napid)
* + In some cases (roaming peer management is the only case so far), a
* a client can trigger a "SERIALIZE" event. Basically, this means that the
* users is asking NAPI to go into a truly single execution context state.
* So, NAPI indicates to msm-irqbalancer that it wants to be blacklisted,
* So, NAPI indicates to msm-irqbalancer that it wants to be denylisted,
* (if called for the first time) and then moves all IRQs (for NAPI
* instances) to be collapsed to a single core. If called multiple times,
* it will just re-collapse the CPUs. This is because blacklist-on() API
* it will just re-collapse the CPUs. This is because denylist-on() API
* is reference-counted, and because the API has already been called.
*
* Such a user, should call "DESERIALIZE" (NORMAL) event, to set NAPI to go
@@ -509,10 +510,10 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
struct qca_napi_data *napid = &(hif->napi_data);
enum qca_napi_tput_state tput_mode = QCA_NAPI_TPUT_UNINITIALIZED;
enum {
BLACKLIST_NOT_PENDING,
BLACKLIST_ON_PENDING,
BLACKLIST_OFF_PENDING
} blacklist_pending = BLACKLIST_NOT_PENDING;
DENYLIST_NOT_PENDING,
DENYLIST_ON_PENDING,
DENYLIST_OFF_PENDING
} denylist_pending = DENYLIST_NOT_PENDING;
NAPI_DEBUG("%s: -->(event=%d, aux=%pK)", __func__, event, data);
@@ -580,7 +581,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
/* from TPUT_HI -> TPUT_LO */
NAPI_DEBUG("%s: Moving to napi_tput_LO state",
__func__);
blacklist_pending = BLACKLIST_OFF_PENDING;
denylist_pending = DENYLIST_OFF_PENDING;
/*
* Ideally we should "collapse" interrupts here, since
* we are "dispersing" interrupts in the "else" case.
@@ -588,7 +589,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
* still be on the perf cluster the next time we enter
* high tput mode. However, the irq_balancer is free
* to move our interrupts to power cluster once
* blacklisting has been turned off in the "else" case.
* denylisting has been turned off in the "else" case.
*/
} else {
/* from TPUT_LO -> TPUT->HI */
@@ -598,7 +599,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
HNC_ANY_CPU,
HNC_ACT_DISPERSE);
blacklist_pending = BLACKLIST_ON_PENDING;
denylist_pending = DENYLIST_ON_PENDING;
}
napid->napi_mode = tput_mode;
break;
@@ -614,13 +615,13 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
HNC_ANY_CPU,
HNC_ACT_COLLAPSE);
if ((users == 0) && (rc == 0))
blacklist_pending = BLACKLIST_ON_PENDING;
denylist_pending = DENYLIST_ON_PENDING;
break;
}
case NAPI_EVT_USR_NORMAL: {
NAPI_DEBUG("%s: User forced DE-SERIALIZATION", __func__);
if (!napid->user_cpu_affin_mask)
blacklist_pending = BLACKLIST_OFF_PENDING;
denylist_pending = DENYLIST_OFF_PENDING;
/*
* Deserialization timeout is handled at hdd layer;
* just mark current mode to uninitialized to ensure
@@ -637,18 +638,18 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
}; /* switch */
switch (blacklist_pending) {
case BLACKLIST_ON_PENDING:
switch (denylist_pending) {
case DENYLIST_ON_PENDING:
/* assume the control of WLAN IRQs */
hif_napi_cpu_blacklist(napid, BLACKLIST_ON);
hif_napi_cpu_denylist(napid, DENYLIST_ON);
break;
case BLACKLIST_OFF_PENDING:
case DENYLIST_OFF_PENDING:
/* yield the control of WLAN IRQs */
hif_napi_cpu_blacklist(napid, BLACKLIST_OFF);
hif_napi_cpu_denylist(napid, DENYLIST_OFF);
break;
default: /* nothing to do */
break;
} /* switch blacklist_pending */
} /* switch denylist_pending */
/* we want to perform the comparison in lock:
* there is a possiblity of hif_napi_event get called
@@ -810,9 +811,9 @@ bool hif_napi_correct_cpu(struct qca_napi_info *napi_info)
if (napid->flags & QCA_NAPI_FEATURE_CPU_CORRECTION) {
cpu = qdf_get_cpu();
if (unlikely((hif_napi_cpu_blacklist(napid,
BLACKLIST_QUERY) > 0) &&
(cpu != napi_info->cpu))) {
if (unlikely((hif_napi_cpu_denylist(napid,
DENYLIST_QUERY) > 0) &&
cpu != napi_info->cpu)) {
right_cpu = false;
NAPI_DEBUG("interrupt on wrong CPU, correcting");
@@ -1633,11 +1634,11 @@ hncm_return:
/**
* hif_napi_bl_irq() - calls irq_modify_status to enable/disable blacklisting
* hif_napi_bl_irq() - calls irq_modify_status to enable/disable denylisting
* @napid: pointer to qca_napi_data structure
* @bl_flag: blacklist flag to enable/disable blacklisting
* @bl_flag: denylist flag to enable/disable denylisting
*
* The function enables/disables blacklisting for all the copy engine
* The function enables/disables denylisting for all the copy engine
* interrupts on which NAPI is enabled.
*
* Return: None
@@ -1668,23 +1669,23 @@ static inline void hif_napi_bl_irq(struct qca_napi_data *napid, bool bl_flag)
}
/**
* hif_napi_cpu_blacklist() - en(dis)ables blacklisting for NAPI RX interrupts.
* hif_napi_cpu_denylist() - en(dis)ables denylisting for NAPI RX interrupts.
* @napid: pointer to qca_napi_data structure
* @op: blacklist operation to perform
* @op: denylist operation to perform
*
* The function enables/disables/queries blacklisting for all CE RX
* interrupts with NAPI enabled. Besides blacklisting, it also enables/disables
* The function enables/disables/queries denylisting for all CE RX
* interrupts with NAPI enabled. Besides denylisting, it also enables/disables
* core_ctl_set_boost.
* Once blacklisting is enabled, the interrupts will not be managed by the IRQ
* Once denylisting is enabled, the interrupts will not be managed by the IRQ
* balancer.
*
* Return: -EINVAL, in case IRQ_BLACKLISTING and CORE_CTL_BOOST is not enabled
* for BLACKLIST_QUERY op - blacklist refcount
* for BLACKLIST_ON op - return value from core_ctl_set_boost API
* for BLACKLIST_OFF op - return value from core_ctl_set_boost API
* Return: -EINVAL, in case IRQ_DENYLISTING and CORE_CTL_BOOST is not enabled
* for DENYLIST_QUERY op - denylist refcount
* for DENYLIST_ON op - return value from core_ctl_set_boost API
* for DENYLIST_OFF op - return value from core_ctl_set_boost API
*/
int hif_napi_cpu_blacklist(struct qca_napi_data *napid,
enum qca_blacklist_op op)
int hif_napi_cpu_denylist(struct qca_napi_data *napid,
enum qca_denylist_op op)
{
int rc = 0;
static int ref_count; /* = 0 by the compiler */
@@ -1700,10 +1701,10 @@ int hif_napi_cpu_blacklist(struct qca_napi_data *napid,
}
switch (op) {
case BLACKLIST_QUERY:
case DENYLIST_QUERY:
rc = ref_count;
break;
case BLACKLIST_ON:
case DENYLIST_ON:
ref_count++;
rc = 0;
if (ref_count == 1) {
@@ -1713,7 +1714,7 @@ int hif_napi_cpu_blacklist(struct qca_napi_data *napid,
hif_napi_bl_irq(napid, true);
}
break;
case BLACKLIST_OFF:
case DENYLIST_OFF:
if (ref_count) {
ref_count--;
rc = 0;
@@ -1726,7 +1727,7 @@ int hif_napi_cpu_blacklist(struct qca_napi_data *napid,
}
break;
default:
NAPI_DEBUG("Invalid blacklist op: %d", op);
NAPI_DEBUG("Invalid denylist op: %d", op);
rc = -EINVAL;
} /* switch */
out:
@@ -1742,7 +1743,7 @@ out:
* hif_napi_serialize(hif, 1) can be called multiple times. It will perform the
* following steps (see hif_napi_event for code):
* - put irqs of all NAPI instances on the same CPU
* - only for the first serialize call: blacklist
* - only for the first serialize call: denylist
*
* hif_napi_serialize(hif, 0):
* - start a timer (multiple of BusBandwidthTimer -- default: 100 msec)

19
hif/src/hif_napi.h
查看文件

@@ -1,5 +1,6 @@
/*
* Copyright (c) 2015-2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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
@@ -74,7 +75,7 @@ enum qca_napi_event {
* These flags need to be enabled in the qca_napi_data->flags variable for the
* feature to kick in.
.* QCA_NAPI_FEATURE_CPU_CORRECTION - controls CPU correction logic
.* QCA_NAPI_FEATURE_IRQ_BLACKLISTING - controls call to irq_blacklist_on API
.* QCA_NAPI_FEATURE_IRQ_BLACKLISTING - controls call to irq_denylist_on API
.* QCA_NAPI_FEATURE_CORE_CTL_BOOST - controls call to core_ctl_set_boost API
*/
#define QCA_NAPI_FEATURE_CPU_CORRECTION BIT(1)
@@ -120,10 +121,10 @@ void hif_napi_rx_offld_flush_cb_deregister(struct hif_opaque_softc *hif_hdl);
*/
void *hif_napi_get_lro_info(struct hif_opaque_softc *hif_hdl, int napi_id);
enum qca_blacklist_op {
BLACKLIST_QUERY,
BLACKLIST_OFF,
BLACKLIST_ON
enum qca_denylist_op {
DENYLIST_QUERY,
DENYLIST_OFF,
DENYLIST_ON
};
#ifdef FEATURE_NAPI
@@ -289,8 +290,8 @@ int hif_napi_cpu_deinit(struct hif_opaque_softc *hif);
int hif_napi_cpu_migrate(struct qca_napi_data *napid, int cpu, int action);
int hif_napi_serialize(struct hif_opaque_softc *hif, int is_on);
int hif_napi_cpu_blacklist(struct qca_napi_data *napid,
enum qca_blacklist_op op);
int hif_napi_cpu_denylist(struct qca_napi_data *napid,
enum qca_denylist_op op);
/* not directly related to irq affinity, but oh well */
void hif_napi_stats(struct qca_napi_data *napid);
@@ -317,8 +318,8 @@ static inline void hif_napi_update_yield_stats(struct CE_state *ce_state,
bool time_limit_reached,
bool rxpkt_thresh_reached) { }
static inline int hif_napi_cpu_blacklist(struct qca_napi_data *napid,
enum qca_blacklist_op op)
static inline int hif_napi_cpu_denylist(struct qca_napi_data *napid,
enum qca_denylist_op op)
{ return 0; }
#endif /* HIF_IRQ_AFFINITY */