| Message ID | 20231012091429.2048-1-ansuelsmth@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 101c6032031f4dba72b91e6c766e958a5e429622 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: cxgb3: simplify logic for rspq_check_napi | expand |
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 12 Oct 2023 11:14:29 +0200 you wrote: > Simplify logic for rspq_check_napi. > Drop redundant and wrong napi_is_scheduled call as it's not race free > and directly use the output of napi_schedule to understand if a napi is > pending or not. > > rspq_check_napi main logic is to check if is_new_response is true and > check if a napi is not scheduled. The result of this function is then > used to detect if we are missing some interrupt and act on top of > this... With this knowing, we can rework and simplify the logic and make > it less problematic with testing an internal bit for napi. > > [...] Here is the summary with links: - [net-next] net: cxgb3: simplify logic for rspq_check_napi https://git.kernel.org/netdev/net-next/c/101c6032031f You are awesome, thank you!
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c index 2e9a74fe0970..dfe4e0102960 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c @@ -2674,12 +2674,7 @@ static int rspq_check_napi(struct sge_qset *qs) { struct sge_rspq *q = &qs->rspq; - if (!napi_is_scheduled(&qs->napi) && - is_new_response(&q->desc[q->cidx], q)) { - napi_schedule(&qs->napi); - return 1; - } - return 0; + return is_new_response(&q->desc[q->cidx], q) && napi_schedule(&qs->napi); } /*
Simplify logic for rspq_check_napi. Drop redundant and wrong napi_is_scheduled call as it's not race free and directly use the output of napi_schedule to understand if a napi is pending or not. rspq_check_napi main logic is to check if is_new_response is true and check if a napi is not scheduled. The result of this function is then used to detect if we are missing some interrupt and act on top of this... With this knowing, we can rework and simplify the logic and make it less problematic with testing an internal bit for napi. Suggested-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> --- drivers/net/ethernet/chelsio/cxgb3/sge.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)