Skip to content

Commit 3c31ff2

Browse files
Florian Westphaldavem330
authored andcommitted
drivers: mellanox: use netdev_xmit_more() helper
skb->xmit_more hint is now always 0. This switches the mellanox drivers to the netdev_xmit_more() helper. Cc: Saeed Mahameed <[email protected]> Cc: Leon Romanovsky <[email protected]> Cc: Boris Pismenny <[email protected]> Cc: Ilya Lesokhin <[email protected]> Cc: Eran Ben Elisha <[email protected]> Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 6b16f9e commit 3c31ff2

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

drivers/net/ethernet/mellanox/mlx4/en_tx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
10421042

10431043
send_doorbell = __netdev_tx_sent_queue(ring->tx_queue,
10441044
tx_info->nr_bytes,
1045-
skb->xmit_more);
1045+
netdev_xmit_more());
10461046

10471047
real_size = (real_size / 16) & 0x3f;
10481048

drivers/net/ethernet/mellanox/mlx5/core/en.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,
772772
struct net_device *sb_dev);
773773
netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev);
774774
netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
775-
struct mlx5e_tx_wqe *wqe, u16 pi);
775+
struct mlx5e_tx_wqe *wqe, u16 pi, bool xmit_more);
776776

777777
void mlx5e_completion_event(struct mlx5_core_cq *mcq);
778778
void mlx5e_cq_error_event(struct mlx5_core_cq *mcq, enum mlx5_event event);

drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ static void mlx5e_tls_complete_sync_skb(struct sk_buff *skb,
181181
*/
182182
nskb->ip_summed = CHECKSUM_PARTIAL;
183183

184-
nskb->xmit_more = 1;
185184
nskb->queue_mapping = skb->queue_mapping;
186185
}
187186

@@ -248,7 +247,7 @@ mlx5e_tls_handle_ooo(struct mlx5e_tls_offload_context_tx *context,
248247
sq->stats->tls_resync_bytes += nskb->len;
249248
mlx5e_tls_complete_sync_skb(skb, nskb, tcp_seq, headln,
250249
cpu_to_be64(info.rcd_sn));
251-
mlx5e_sq_xmit(sq, nskb, *wqe, *pi);
250+
mlx5e_sq_xmit(sq, nskb, *wqe, *pi, true);
252251
mlx5e_sq_fetch_wqe(sq, wqe, pi);
253252
return skb;
254253

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@ static inline void mlx5e_fill_sq_frag_edge(struct mlx5e_txqsq *sq,
297297
static inline void
298298
mlx5e_txwqe_complete(struct mlx5e_txqsq *sq, struct sk_buff *skb,
299299
u8 opcode, u16 ds_cnt, u8 num_wqebbs, u32 num_bytes, u8 num_dma,
300-
struct mlx5e_tx_wqe_info *wi, struct mlx5_wqe_ctrl_seg *cseg)
300+
struct mlx5e_tx_wqe_info *wi, struct mlx5_wqe_ctrl_seg *cseg,
301+
bool xmit_more)
301302
{
302303
struct mlx5_wq_cyc *wq = &sq->wq;
303304

@@ -320,14 +321,14 @@ mlx5e_txwqe_complete(struct mlx5e_txqsq *sq, struct sk_buff *skb,
320321
sq->stats->stopped++;
321322
}
322323

323-
if (!skb->xmit_more || netif_xmit_stopped(sq->txq))
324+
if (!xmit_more || netif_xmit_stopped(sq->txq))
324325
mlx5e_notify_hw(wq, sq->pc, sq->uar_map, cseg);
325326
}
326327

327328
#define INL_HDR_START_SZ (sizeof(((struct mlx5_wqe_eth_seg *)NULL)->inline_hdr.start))
328329

329330
netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
330-
struct mlx5e_tx_wqe *wqe, u16 pi)
331+
struct mlx5e_tx_wqe *wqe, u16 pi, bool xmit_more)
331332
{
332333
struct mlx5_wq_cyc *wq = &sq->wq;
333334
struct mlx5_wqe_ctrl_seg *cseg;
@@ -360,7 +361,7 @@ netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
360361
}
361362

362363
stats->bytes += num_bytes;
363-
stats->xmit_more += skb->xmit_more;
364+
stats->xmit_more += netdev_xmit_more();
364365

365366
headlen = skb->len - ihs - skb->data_len;
366367
ds_cnt += !!headlen;
@@ -423,7 +424,7 @@ netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
423424
goto err_drop;
424425

425426
mlx5e_txwqe_complete(sq, skb, opcode, ds_cnt, num_wqebbs, num_bytes,
426-
num_dma, wi, cseg);
427+
num_dma, wi, cseg, xmit_more);
427428

428429
return NETDEV_TX_OK;
429430

@@ -449,7 +450,7 @@ netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev)
449450
if (unlikely(!skb))
450451
return NETDEV_TX_OK;
451452

452-
return mlx5e_sq_xmit(sq, skb, wqe, pi);
453+
return mlx5e_sq_xmit(sq, skb, wqe, pi, netdev_xmit_more());
453454
}
454455

455456
static void mlx5e_dump_error_cqe(struct mlx5e_txqsq *sq,
@@ -659,7 +660,7 @@ netdev_tx_t mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
659660
}
660661

661662
stats->bytes += num_bytes;
662-
stats->xmit_more += skb->xmit_more;
663+
stats->xmit_more += netdev_xmit_more();
663664

664665
headlen = skb->len - ihs - skb->data_len;
665666
ds_cnt += !!headlen;
@@ -704,7 +705,7 @@ netdev_tx_t mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,
704705
goto err_drop;
705706

706707
mlx5e_txwqe_complete(sq, skb, opcode, ds_cnt, num_wqebbs, num_bytes,
707-
num_dma, wi, cseg);
708+
num_dma, wi, cseg, false);
708709

709710
return NETDEV_TX_OK;
710711

0 commit comments

Comments
 (0)