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>

2 files changed, 13 insertions, 13 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 37cc9e5c56be..46a0df9afc3c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -135,7 +135,7 @@ static void mlx4_en_init_rx_desc(struct mlx4_en_priv *priv,
 
         /* Set size and memtype fields */
         for (i = 0; i < priv->num_frags; i++) {
-                skb_frags[i].size = priv->frag_info[i].frag_size;
+                skb_frag_size_set(&skb_frags[i], priv->frag_info[i].frag_size);
                 rx_desc->data[i].byte_count =
                         cpu_to_be32(priv->frag_info[i].frag_size);
                 rx_desc->data[i].lkey = cpu_to_be32(priv->mdev->mr.key);
@@ -194,7 +194,7 @@ static void mlx4_en_free_rx_desc(struct mlx4_en_priv *priv,
                 dma = be64_to_cpu(rx_desc->data[nr].addr);
 
                 en_dbg(DRV, priv, "Unmapping buffer at dma:0x%llx\n", (u64) dma);
-                pci_unmap_single(mdev->pdev, dma, skb_frags[nr].size,
+                pci_unmap_single(mdev->pdev, dma, skb_frag_size(&skb_frags[nr]),
                                  PCI_DMA_FROMDEVICE);
                 put_page(skb_frags[nr].page);
         }
@@ -421,7 +421,7 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
 
                 /* Save page reference in skb */
                 skb_frags_rx[nr].page = skb_frags[nr].page;
-                skb_frags_rx[nr].size = skb_frags[nr].size;
+                skb_frag_size_set(&skb_frags_rx[nr], skb_frag_size(&skb_frags[nr]));
                 skb_frags_rx[nr].page_offset = skb_frags[nr].page_offset;
                 dma = be64_to_cpu(rx_desc->data[nr].addr);
 
@@ -430,13 +430,13 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
                         goto fail;
 
                 /* Unmap buffer */
-                pci_unmap_single(mdev->pdev, dma, skb_frags_rx[nr].size,
+                pci_unmap_single(mdev->pdev, dma, skb_frag_size(&skb_frags_rx[nr]),
                                  PCI_DMA_FROMDEVICE);
         }
         /* Adjust size of last fragment to match actual length */
         if (nr > 0)
-                skb_frags_rx[nr - 1].size = length -
-                        priv->frag_info[nr - 1].frag_prefix_size;
+                skb_frag_size_set(&skb_frags_rx[nr - 1],
+                        length - priv->frag_info[nr - 1].frag_prefix_size);
         return nr;
 
 fail:
@@ -506,7 +506,7 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv,
                 skb_shinfo(skb)->frags[0].page_offset += HEADER_COPY_SIZE;
 
                 /* Adjust size of first fragment */
-                skb_shinfo(skb)->frags[0].size -= HEADER_COPY_SIZE;
+                skb_frag_size_sub(&skb_shinfo(skb)->frags[0], HEADER_COPY_SIZE);
                 skb->data_len = length - HEADER_COPY_SIZE;
         }
         return skb;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 6e03de034ac7..2a192c2f207d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -226,7 +226,7 @@ static u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
                                 frag = &skb_shinfo(skb)->frags[i];
                                 pci_unmap_page(mdev->pdev,
                                         (dma_addr_t) be64_to_cpu(data[i].addr),
-                                        frag->size, PCI_DMA_TODEVICE);
+                                        skb_frag_size(frag), PCI_DMA_TODEVICE);
                         }
                 }
                 /* Stamp the freed descriptor */
@@ -256,7 +256,7 @@ static u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
                                 frag = &skb_shinfo(skb)->frags[i];
                                 pci_unmap_page(mdev->pdev,
                                         (dma_addr_t) be64_to_cpu(data->addr),
-                                         frag->size, PCI_DMA_TODEVICE);
+                                         skb_frag_size(frag), PCI_DMA_TODEVICE);
                                 ++data;
                         }
                 }
@@ -550,7 +550,7 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct sk_buff *sk
                 skb_copy_from_linear_data(skb, inl + 1, skb_headlen(skb));
                 if (skb_shinfo(skb)->nr_frags)
                         memcpy(((void *)(inl + 1)) + skb_headlen(skb), fragptr,
-                               skb_shinfo(skb)->frags[0].size);
+                               skb_frag_size(&skb_shinfo(skb)->frags[0]));
 
         } else {
                 inl->byte_count = cpu_to_be32(1 << 31 | spc);
@@ -570,7 +570,7 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct sk_buff *sk
                                         skb_headlen(skb) - spc);
                         if (skb_shinfo(skb)->nr_frags)
                                 memcpy(((void *)(inl + 1)) + skb_headlen(skb) - spc,
-                                        fragptr, skb_shinfo(skb)->frags[0].size);
+                                        fragptr, skb_frag_size(&skb_shinfo(skb)->frags[0]));
                 }
 
                 wmb();
@@ -757,11 +757,11 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
                 for (i = skb_shinfo(skb)->nr_frags - 1; i >= 0; i--) {
                         frag = &skb_shinfo(skb)->frags[i];
                         dma = pci_map_page(mdev->dev->pdev, frag->page, frag->page_offset,
-                                           frag->size, PCI_DMA_TODEVICE);
+                                           skb_frag_size(frag), PCI_DMA_TODEVICE);
                         data->addr = cpu_to_be64(dma);
                         data->lkey = cpu_to_be32(mdev->mr.key);
                         wmb();
-                        data->byte_count = cpu_to_be32(frag->size);
+                        data->byte_count = cpu_to_be32(skb_frag_size(frag));
                         --data;
                 }