linux.git/drivers/net/wireless/intel, branch v4.20-rc2

iwlegacy: Add a lock assertion in il4965_send_rxon_assoc()

2018-10-13T17:02:29+00:00

The variables il->staging.filter_flags, rxon1->filter_flags and
rxon2->filter_flags need to be protected by the mutex lock il->mutex.
This patch adds a lock assertion of il->mutex to check whether
this lock is held.

Signed-off-by: Jia-Ju Bai 
Acked-by: Stanislaw Gruszka 
Signed-off-by: Kalle Valo

iwlwifi: mvm: check return value of rs_rate_from_ucode_rate()

2018-10-13T11:48:44+00:00

The rs_rate_from_ucode_rate() function may return -EINVAL if the rate
is invalid, but none of the callsites check for the error, potentially
making us access arrays with index IWL_RATE_INVALID, which is larger
than the arrays, causing an out-of-bounds access.  This will trigger
KASAN warnings, such as the one reported in the bugzilla issue
mentioned below.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=200659

Cc: stable@vger.kernel.org
Signed-off-by: Luca Coelho 
Signed-off-by: Kalle Valo

iwlwifi: mvm: kill INACTIVE queue state

2018-10-08T07:49:22+00:00

We don't really need this state: instead of having an inactive
state where we can awaken zombie queues again if needed, just
keep them in their normal state unless a new queue is actually
needed and there's no other way of getting one.

We do this here by making the inactivity check not free queues
unless instructed that we now really need to allocate one to a
specific station, and in that case it'll just free the queue
immediately, without doing any inactivity step inbetween.

The only downside is a little bit more processing in this case,
but the code complexity is lower.

Additionally, this fixes a corner case: due to the way the code
worked, we could only ever reuse an inactive queue if it was
the reserved queue for a station, as iwl_mvm_find_free_queue()
would never consider returning an inactive queue.

Signed-off-by: Johannes Berg 
Signed-off-by: Luca Coelho

iwlwifi: mvm: move iwl_mvm_sta_alloc_queue() down

2018-10-08T07:49:08+00:00

We want to call iwl_mvm_inactivity_check() from here in the
next patch, so need to move the code down to be able to.

Fix a minor checkpatch complaint while at it.

Signed-off-by: Johannes Berg 
Signed-off-by: Luca Coelho

iwlwifi: mvm: make iwl_mvm_scd_queue_redirect() static

2018-10-08T07:48:55+00:00

This function is only used in the file where it's declared,
so just make it static.

Signed-off-by: Johannes Berg 
Signed-off-by: Luca Coelho

iwlwifi: mvm: make queue TID change more explicit

2018-10-08T07:48:43+00:00

Instead of iterating all the queues after having potentially
changed some queue configurations, rechecking if that was done,
mark the ones that do need a TID change explicitly in a bitmap
and use that to send the change to the firmware.

While at it, also rename iwl_mvm_change_queue_owner() to
iwl_mvm_change_queue_tid() since that's more obvious - the
"kind" of owner isn't immediately clear right now.

Signed-off-by: Johannes Berg 
Signed-off-by: Luca Coelho

iwlwifi: mvm: remove RECONFIGURING queue state

2018-10-08T07:48:28+00:00

We set the queue to this state, only to pretty much immediately
move it out of it again. However, we can't even hit any of the
code that checks if the queue is reconfiguring, because all of
this happens under mvm->mutex and we hold the all the way from
marking the queue as RECONFIGURING to marking it as READY again.

Additionally, the queue that became RECONFIGURING would've been
in SHARED state before, and it can safely stay in that state. In
case of errors, it previously would have stayed in RECONFIGURING
which it could never have left again.

Remove the state entirely and just track the queues that need to
be reconfigured in a separate, local, bitmap.

Signed-off-by: Johannes Berg 
Signed-off-by: Luca Coelho

iwlwifi: mvm: reconfigure queues during inactivity check

2018-10-08T07:48:15+00:00

We currently reconfigure the queues after the inactivity check,
but only in one of the two callers. This might leave queues in
a state where the TID owner is wrong, if called when reserving
a queue for a new station.

Clean this up and do the reconfiguration inside the inactivity
check function. This requires changing the locking, but one of
the two places already holds the mvm mutex and the other easily
can.

Signed-off-by: Johannes Berg 
Signed-off-by: Luca Coelho

iwlwifi: mvm: move queue reconfiguration into new function

2018-10-08T07:48:02+00:00

If TVQM is used we skip over this, move the code into a new
function to get rid of the label.

Signed-off-by: Johannes Berg 
Signed-off-by: Luca Coelho

iwlwifi: mvm: clean up iteration in iwl_mvm_inactivity_check()

2018-10-08T07:47:48+00:00

There's no need to build a bitmap first and then iterate,
just do the iteration with the right locking directly.

Signed-off-by: Johannes Berg 
Signed-off-by: Luca Coelho