net: add skb frag size accessors

To ease skb->truesize sanitization, its better to be able to localize
all references to skb frags size.

Define accessors : skb_frag_size() to fetch frag size, and
skb_frag_size_{set|add|sub}() to manipulate it.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 17 insertions, 17 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 6ff7636e73a2..965c7235804d 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -2871,7 +2871,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                                 dma_unmap_addr(
                                         &txr->tx_buf_ring[TX_RING_IDX(sw_cons)],
                                         mapping),
-                                skb_shinfo(skb)->frags[i].size,
+                                skb_frag_size(&skb_shinfo(skb)->frags[i]),
                                 PCI_DMA_TODEVICE);
                 }
 
@@ -3049,7 +3049,7 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb,
                                 } else {
                                         skb_frag_t *frag =
                                                 &skb_shinfo(skb)->frags[i - 1];
-                                        frag->size -= tail;
+                                        skb_frag_size_sub(frag, tail);
                                         skb->data_len -= tail;
                                 }
                                 return 0;
@@ -5395,7 +5395,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
                                 tx_buf = &txr->tx_buf_ring[TX_RING_IDX(j)];
                                 dma_unmap_page(&bp->pdev->dev,
                                         dma_unmap_addr(tx_buf, mapping),
-                                        skb_shinfo(skb)->frags[k].size,
+                                        skb_frag_size(&skb_shinfo(skb)->frags[k]),
                                         PCI_DMA_TODEVICE);
                         }
                         dev_kfree_skb(skb);
@@ -6530,13 +6530,13 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tx_buf->is_gso = skb_is_gso(skb);
 
         for (i = 0; i < last_frag; i++) {
-                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+                const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
                 prod = NEXT_TX_BD(prod);
                 ring_prod = TX_RING_IDX(prod);
                 txbd = &txr->tx_desc_ring[ring_prod];
 
-                len = frag->size;
+                len = skb_frag_size(frag);
                 mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, len,
                                            DMA_TO_DEVICE);
                 if (dma_mapping_error(&bp->pdev->dev, mapping))
@@ -6594,7 +6594,7 @@ dma_error:
                 ring_prod = TX_RING_IDX(prod);
                 tx_buf = &txr->tx_buf_ring[ring_prod];
                 dma_unmap_page(&bp->pdev->dev, dma_unmap_addr(tx_buf, mapping),
-                               skb_shinfo(skb)->frags[i].size,
+                               skb_frag_size(&skb_shinfo(skb)->frags[i]),
                                PCI_DMA_TODEVICE);
         }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index e575e89c7d46..dd8ee56396b2 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2363,7 +2363,7 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,
                         /* Calculate the first sum - it's special */
                         for (frag_idx = 0; frag_idx < wnd_size - 1; frag_idx++)
                                 wnd_sum +=
-                                        skb_shinfo(skb)->frags[frag_idx].size;
+                                        skb_frag_size(&skb_shinfo(skb)->frags[frag_idx]);
 
                         /* If there was data on linear skb data - check it */
                         if (first_bd_sz > 0) {
@@ -2379,14 +2379,14 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,
                            check all windows */
                         for (wnd_idx = 0; wnd_idx <= num_wnds; wnd_idx++) {
                                 wnd_sum +=
-                          skb_shinfo(skb)->frags[wnd_idx + wnd_size - 1].size;
+                          skb_frag_size(&skb_shinfo(skb)->frags[wnd_idx + wnd_size - 1]);
 
                                 if (unlikely(wnd_sum < lso_mss)) {
                                         to_copy = 1;
                                         break;
                                 }
                                 wnd_sum -=
-                                        skb_shinfo(skb)->frags[wnd_idx].size;
+                                        skb_frag_size(&skb_shinfo(skb)->frags[wnd_idx]);
                         }
                 } else {
                         /* in non-LSO too fragmented packet should always
@@ -2796,8 +2796,8 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-                mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, frag->size,
-                                           DMA_TO_DEVICE);
+                mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0,
+                                           skb_frag_size(frag), DMA_TO_DEVICE);
                 if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
 
                         DP(NETIF_MSG_TX_QUEUED, "Unable to map page - "
@@ -2821,8 +2821,8 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                 tx_data_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
                 tx_data_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-                tx_data_bd->nbytes = cpu_to_le16(frag->size);
-                le16_add_cpu(&pkt_size, frag->size);
+                tx_data_bd->nbytes = cpu_to_le16(skb_frag_size(frag));
+                le16_add_cpu(&pkt_size, skb_frag_size(frag));
                 nbd++;
 
                 DP(NETIF_MSG_TX_QUEUED,
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index fe712f955110..b89027c61937 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -5356,7 +5356,7 @@ static void tg3_tx(struct tg3_napi *tnapi)
 
                         pci_unmap_page(tp->pdev,
                                        dma_unmap_addr(ri, mapping),
-                                       skb_shinfo(skb)->frags[i].size,
+                                       skb_frag_size(&skb_shinfo(skb)->frags[i]),
                                        PCI_DMA_TODEVICE);
 
                         while (ri->fragmented) {
@@ -6510,14 +6510,14 @@ static void tg3_tx_skb_unmap(struct tg3_napi *tnapi, u32 entry, int last)
         }
 
         for (i = 0; i < last; i++) {
-                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+                const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
                 entry = NEXT_TX(entry);
                 txb = &tnapi->tx_buffers[entry];
 
                 pci_unmap_page(tnapi->tp->pdev,
                                dma_unmap_addr(txb, mapping),
-                               frag->size, PCI_DMA_TODEVICE);
+                               skb_frag_size(frag), PCI_DMA_TODEVICE);
 
                 while (txb->fragmented) {
                         txb->fragmented = false;
@@ -6777,7 +6777,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 for (i = 0; i <= last; i++) {
                         skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-                        len = frag->size;
+                        len = skb_frag_size(frag);
                         mapping = skb_frag_dma_map(&tp->pdev->dev, frag, 0,
                                                    len, DMA_TO_DEVICE);