Skip to content

Commit

Permalink
net: mvneta: reduce smp_processor_id() calling in mvneta_tx_done_gbe
Browse files Browse the repository at this point in the history
In the loop of mvneta_tx_done_gbe(), we call the smp_processor_id()
each time, move the call out of the loop to optimize the code a bit.

Before the patch, the loop looks like(under arm64):

        ldr     x1, [x29,torvalds#120]
        ...
        ldr     w24, [x1,torvalds#36]
        ...
        bl      0 <_raw_spin_lock>
        str     w24, [x27,torvalds#132]
        ...

After the patch, the loop looks like(under arm64):

        ...
        bl      0 <_raw_spin_lock>
        str     w23, [x28,torvalds#132]
        ...
where w23 is loaded so be ready before the loop.

>From another side, mvneta_tx_done_gbe() is called from mvneta_poll()
which is in non-preemptible context, so it's safe to call the
smp_processor_id() function once.

Signed-off-by: Jisheng Zhang <[email protected]>
Reviewed-by: Gregory CLEMENT <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Jisheng Zhang authored and davem330 committed Sep 2, 2018
1 parent 7772988 commit bd9f1ee
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/ethernet/marvell/mvneta.c
Original file line number Diff line number Diff line change
Expand Up @@ -2507,12 +2507,13 @@ static void mvneta_tx_done_gbe(struct mvneta_port *pp, u32 cause_tx_done)
{
struct mvneta_tx_queue *txq;
struct netdev_queue *nq;
int cpu = smp_processor_id();

while (cause_tx_done) {
txq = mvneta_tx_done_policy(pp, cause_tx_done);

nq = netdev_get_tx_queue(pp->dev, txq->id);
__netif_tx_lock(nq, smp_processor_id());
__netif_tx_lock(nq, cpu);

if (txq->count)
mvneta_txq_done(pp, txq);
Expand Down

0 comments on commit bd9f1ee

Please sign in to comment.