[v3,net-next,2/3] net: dsa: mv88e6xxx: shorten the locked section in mv88e6xxx_g1_atu_prob_irq_thread_fn()
Commit Message
As only the hardware access functions up til and including
mv88e6xxx_g1_atu_mac_read() called under the interrupt handler
need to take the chip lock, we release the chip lock after this call.
The follow up code that handles the violations can run without the
chip lock held.
In further patches, the violation handler function will even be
incompatible with having the chip lock held. This due to an AB/BA
ordering inversion with rtnl_lock().
Signed-off-by: Hans J. Schultz <netdev@kapio-technology.com>
---
drivers/net/dsa/mv88e6xxx/global1_atu.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
Comments
On Fri, Jan 06, 2023 at 05:05:28PM +0100, Hans J. Schultz wrote:
> As only the hardware access functions up til and including
> mv88e6xxx_g1_atu_mac_read() called under the interrupt handler
> need to take the chip lock, we release the chip lock after this call.
> The follow up code that handles the violations can run without the
> chip lock held.
> In further patches, the violation handler function will even be
> incompatible with having the chip lock held. This due to an AB/BA
> ordering inversion with rtnl_lock().
>
> Signed-off-by: Hans J. Schultz <netdev@kapio-technology.com>
> ---
Needs to compile without new warnings patch by patch.
../drivers/net/dsa/mv88e6xxx/global1_atu.c: In function ‘mv88e6xxx_g1_atu_prob_irq_thread_fn’:
../drivers/net/dsa/mv88e6xxx/global1_atu.c:460:1: warning: label ‘out’ defined but not used [-Wunused-label]
460 | out:
| ^~~
../drivers/net/dsa/mv88e6xxx/global1_atu.c:460:1: warning: unused label 'out'
On 2023-01-06 17:37, Vladimir Oltean wrote:
> On Fri, Jan 06, 2023 at 05:05:28PM +0100, Hans J. Schultz wrote:
>> As only the hardware access functions up til and including
>> mv88e6xxx_g1_atu_mac_read() called under the interrupt handler
>> need to take the chip lock, we release the chip lock after this call.
>> The follow up code that handles the violations can run without the
>> chip lock held.
>> In further patches, the violation handler function will even be
>> incompatible with having the chip lock held. This due to an AB/BA
>> ordering inversion with rtnl_lock().
>>
>> Signed-off-by: Hans J. Schultz <netdev@kapio-technology.com>
>> ---
>
> Needs to compile without new warnings patch by patch.
>
> ../drivers/net/dsa/mv88e6xxx/global1_atu.c: In function
> ‘mv88e6xxx_g1_atu_prob_irq_thread_fn’:
> ../drivers/net/dsa/mv88e6xxx/global1_atu.c:460:1: warning: label ‘out’
> defined but not used [-Wunused-label]
> 460 | out:
> | ^~~
> ../drivers/net/dsa/mv88e6xxx/global1_atu.c:460:1: warning: unused label
> 'out'
Can I fix it and resend the same version?
On Sat, Jan 07, 2023 at 10:44:33AM +0100, netdev@kapio-technology.com wrote:
> Can I fix it and resend the same version?
From my perspective, yes. But not sure what you mean by "the same version".
It will have to be v4.
@@ -409,23 +409,25 @@ static irqreturn_t mv88e6xxx_g1_atu_prob_irq_thread_fn(int irq, void *dev_id)
err = mv88e6xxx_g1_read_atu_violation(chip);
if (err)
- goto out;
+ goto out_unlock;
err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_OP, &val);
if (err)
- goto out;
+ goto out_unlock;
err = mv88e6xxx_g1_atu_fid_read(chip, &fid);
if (err)
- goto out;
+ goto out_unlock;
err = mv88e6xxx_g1_atu_data_read(chip, &entry);
if (err)
- goto out;
+ goto out_unlock;
err = mv88e6xxx_g1_atu_mac_read(chip, &entry);
if (err)
- goto out;
+ goto out_unlock;
+
+ mv88e6xxx_reg_unlock(chip);
spid = entry.state;
@@ -449,13 +451,13 @@ static irqreturn_t mv88e6xxx_g1_atu_prob_irq_thread_fn(int irq, void *dev_id)
fid);
chip->ports[spid].atu_full_violation++;
}
- mv88e6xxx_reg_unlock(chip);
return IRQ_HANDLED;
-out:
+out_unlock:
mv88e6xxx_reg_unlock(chip);
+out:
dev_err(chip->dev, "ATU problem: error %d while handling interrupt\n",
err);
return IRQ_HANDLED;