All of lore.kernel.org
 help / color / mirror / Atom feed
From: Larry Finger <Larry.Finger@lwfinger.net>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	pkshih@realtek.com, kvalo@codeaurora.org, davem@davemloft.net,
	kuba@kernel.org
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] rtlwifi: Simplify locking of a skb list accesses
Date: Mon, 5 Apr 2021 11:34:21 -0500	[thread overview]
Message-ID: <347e6042-2964-7037-b57f-5dd84aa4bf14@lwfinger.net> (raw)
In-Reply-To: <99cf8894fd52202cb7ce2ec6e3200eef400bc071.1617609346.git.christophe.jaillet@wanadoo.fr>

On 4/5/21 2:57 AM, Christophe JAILLET wrote:
> The 'c2hcmd_lock' spinlock is only used to protect some __skb_queue_tail()
> and __skb_dequeue() calls.
> Use the lock provided in the skb itself and call skb_queue_tail() and
> skb_dequeue(). These functions already include the correct locking.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>   drivers/net/wireless/realtek/rtlwifi/base.c | 15 ++-------------
>   drivers/net/wireless/realtek/rtlwifi/wifi.h |  1 -
>   2 files changed, 2 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
> index 6e8bd99e8911..2a7ee90a3f54 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/base.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/base.c
> @@ -551,7 +551,6 @@ int rtl_init_core(struct ieee80211_hw *hw)
>   	spin_lock_init(&rtlpriv->locks.rf_lock);
>   	spin_lock_init(&rtlpriv->locks.waitq_lock);
>   	spin_lock_init(&rtlpriv->locks.entry_list_lock);
> -	spin_lock_init(&rtlpriv->locks.c2hcmd_lock);
>   	spin_lock_init(&rtlpriv->locks.scan_list_lock);
>   	spin_lock_init(&rtlpriv->locks.cck_and_rw_pagea_lock);
>   	spin_lock_init(&rtlpriv->locks.fw_ps_lock);
> @@ -2269,7 +2268,6 @@ static bool rtl_c2h_fast_cmd(struct ieee80211_hw *hw, struct sk_buff *skb)
>   void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, struct sk_buff *skb)
>   {
>   	struct rtl_priv *rtlpriv = rtl_priv(hw);
> -	unsigned long flags;
>   
>   	if (rtl_c2h_fast_cmd(hw, skb)) {
>   		rtl_c2h_content_parsing(hw, skb);
> @@ -2278,11 +2276,7 @@ void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, struct sk_buff *skb)
>   	}
>   
>   	/* enqueue */
> -	spin_lock_irqsave(&rtlpriv->locks.c2hcmd_lock, flags);
> -
> -	__skb_queue_tail(&rtlpriv->c2hcmd_queue, skb);
> -
> -	spin_unlock_irqrestore(&rtlpriv->locks.c2hcmd_lock, flags);
> +	skb_queue_tail(&rtlpriv->c2hcmd_queue, skb);
>   
>   	/* wake up wq */
>   	queue_delayed_work(rtlpriv->works.rtl_wq, &rtlpriv->works.c2hcmd_wq, 0);
> @@ -2340,16 +2334,11 @@ void rtl_c2hcmd_launcher(struct ieee80211_hw *hw, int exec)
>   {
>   	struct rtl_priv *rtlpriv = rtl_priv(hw);
>   	struct sk_buff *skb;
> -	unsigned long flags;
>   	int i;
>   
>   	for (i = 0; i < 200; i++) {
>   		/* dequeue a task */
> -		spin_lock_irqsave(&rtlpriv->locks.c2hcmd_lock, flags);
> -
> -		skb = __skb_dequeue(&rtlpriv->c2hcmd_queue);
> -
> -		spin_unlock_irqrestore(&rtlpriv->locks.c2hcmd_lock, flags);
> +		skb = skb_dequeue(&rtlpriv->c2hcmd_queue);
>   
>   		/* do it */
>   		if (!skb)
> diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
> index 9119144bb5a3..877ed6a1589f 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
> +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
> @@ -2450,7 +2450,6 @@ struct rtl_locks {
>   	spinlock_t waitq_lock;
>   	spinlock_t entry_list_lock;
>   	spinlock_t usb_lock;
> -	spinlock_t c2hcmd_lock;
>   	spinlock_t scan_list_lock; /* lock for the scan list */
>   
>   	/*FW clock change */
> 

Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Thanks,

Larry

  reply	other threads:[~2021-04-05 16:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-05  7:57 [PATCH] rtlwifi: Simplify locking of a skb list accesses Christophe JAILLET
2021-04-05 16:34 ` Larry Finger [this message]
2021-04-17 17:33 ` Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=347e6042-2964-7037-b57f-5dd84aa4bf14@lwfinger.net \
    --to=larry.finger@lwfinger.net \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=davem@davemloft.net \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=kuba@kernel.org \
    --cc=kvalo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pkshih@realtek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.