Wen Gong <wgong@xxxxxxxxxxxxxx> writes:
> On 2020-08-15 01:19, Kalle Valo wrote:
>> Wen Gong <wgong@xxxxxxxxxxxxxx> writes:
>>
> ...
>>> diff --git a/drivers/net/wireless/ath/ath10k/core.c
>>> b/drivers/net/wireless/ath/ath10k/core.c
>>> index 91f131b87efc..0e31846e6c89 100644
>>> --- a/drivers/net/wireless/ath/ath10k/core.c
>>> +++ b/drivers/net/wireless/ath/ath10k/core.c
>>> @@ -2199,6 +2199,14 @@ static void ath10k_core_restart(struct
>>> work_struct *work)
>>> {
>>> struct ath10k *ar = container_of(work, struct ath10k, restart_work);
>>> int ret;
>>> + int restart_count;
>>> +
>>> + restart_count = atomic_add_return(1, &ar->restart_count);
>>> + if (restart_count > 1) {
>>> + ath10k_warn(ar, "can not restart, count: %d\n", restart_count);
>>> + atomic_dec(&ar->restart_count);
>>> + return;
>>> + }
>>
>> I have been thinking a different approach for this. I think another
>> option is to have a function like this:
>>
>> ath10k_core_firmware_crashed()
>> {
>> queue_work(ar->workqueue, &ar->restart_work);
>> }
>>
>> In patch 1 we would convert all existing callers to call that
>> function instead of queue_work() directly.
>>
>> In patch 2 we would add a new flag to enum ath10k_dev_flags, or maybe
>> should actually use existing ATH10K_FLAG_CRASH_FLUSH? Don't know yet
>> which one is better. Now the function would do:
>>
>> ath10k_core_firmware_crashed()
>> {
>> if (test_bit(flag))
>> return
>>
>> set_bit(flag)
>> queue_work(ar->workqueue, &ar->restart_work);
>> }
>>
>> That way restart_work queue would be called only one time.
>
> This is not muti-thread-safe, for example, if 2 thread entered to the
> test_bit(flag) meanwhile and both check pass, then it will have 2
> restart.
Good point, this was racy. And I see that you found test_and_set_bit()
already to fix the race.
> atomic_add_return is muti-thread-safe, if 2 thread entered it, only 1
> thread can pass the check, another will fail and return.
I'm not going to add new state variables unless the justification is
REALLY strong and sound. This firmware restart is complicated as is
already, there's no reason to complicate it even more.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
