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>

7 files changed, 16 insertions, 16 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 7b54d7246150..cf480b554622 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -2894,10 +2894,10 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
         }
 
         for (f = 0; f < nr_frags; f++) {
-                struct skb_frag_struct *frag;
+                const struct skb_frag_struct *frag;
 
                 frag = &skb_shinfo(skb)->frags[f];
-                len = frag->size;
+                len = skb_frag_size(frag);
                 offset = 0;
 
                 while (len) {
@@ -3183,7 +3183,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
 
         nr_frags = skb_shinfo(skb)->nr_frags;
         for (f = 0; f < nr_frags; f++)
-                count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
+                count += TXD_USE_COUNT(skb_frag_size(&skb_shinfo(skb)->frags[f]),
                                        max_txd_pwr);
         if (adapter->pcix_82544)
                 count += nr_frags;
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 035ce73c388e..680312710a78 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -4673,10 +4673,10 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
         }
 
         for (f = 0; f < nr_frags; f++) {
-                struct skb_frag_struct *frag;
+                const struct skb_frag_struct *frag;
 
                 frag = &skb_shinfo(skb)->frags[f];
-                len = frag->size;
+                len = skb_frag_size(frag);
                 offset = 0;
 
                 while (len) {
@@ -4943,7 +4943,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
 
         nr_frags = skb_shinfo(skb)->nr_frags;
         for (f = 0; f < nr_frags; f++)
-                count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
+                count += TXD_USE_COUNT(skb_frag_size(&skb_shinfo(skb)->frags[f]),
                                        max_txd_pwr);
 
         if (adapter->hw.mac.tx_pkt_filtering)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 837adbbce772..f9b818267de8 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -4268,7 +4268,7 @@ static void igb_tx_map(struct igb_ring *tx_ring,
                         i = 0;
                 }
 
-                size = frag->size;
+                size = skb_frag_size(frag);
                 data_len -= size;
 
                 dma = skb_frag_dma_map(tx_ring->dev, frag, 0,
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 23cc40f22d6f..1bd9abddcc59 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2045,7 +2045,7 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
 
 
         for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
-                struct skb_frag_struct *frag;
+                const struct skb_frag_struct *frag;
 
                 count++;
                 i++;
@@ -2053,7 +2053,7 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
                         i = 0;
 
                 frag = &skb_shinfo(skb)->frags[f];
-                len = frag->size;
+                len = skb_frag_size(frag);
 
                 buffer_info = &tx_ring->buffer_info[i];
                 BUG_ON(len >= IGBVF_MAX_DATA_PER_TXD);
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 88558b1aac07..e21148f8b160 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -1383,10 +1383,10 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
         }
 
         for (f = 0; f < nr_frags; f++) {
-                struct skb_frag_struct *frag;
+                const struct skb_frag_struct *frag;
 
                 frag = &skb_shinfo(skb)->frags[f];
-                len = frag->size;
+                len = skb_frag_size(frag);
                 offset = 0;
 
                 while (len) {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 8075d11b4cde..09b8e88b2999 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6545,9 +6545,9 @@ static void ixgbe_tx_map(struct ixgbe_ring *tx_ring,
 
                 frag = &skb_shinfo(skb)->frags[f];
 #ifdef IXGBE_FCOE
-                size = min_t(unsigned int, data_len, frag->size);
+                size = min_t(unsigned int, data_len, skb_frag_size(frag));
 #else
-                size = frag->size;
+                size = skb_frag_size(frag);
 #endif
                 data_len -= size;
                 f++;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 4930c4605493..5e92cc2079bd 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2912,10 +2912,10 @@ static int ixgbevf_tx_map(struct ixgbevf_adapter *adapter,
         }
 
         for (f = 0; f < nr_frags; f++) {
-                struct skb_frag_struct *frag;
+                const struct skb_frag_struct *frag;
 
                 frag = &skb_shinfo(skb)->frags[f];
-                len = min((unsigned int)frag->size, total);
+                len = min((unsigned int)skb_frag_size(frag), total);
                 offset = 0;
 
                 while (len) {
@@ -3096,7 +3096,7 @@ static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
         count += TXD_USE_COUNT(skb_headlen(skb));
         for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)
-                count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size);
+                count += TXD_USE_COUNT(skb_frag_size(&skb_shinfo(skb)->frags[f]));
 
         if (ixgbevf_maybe_stop_tx(netdev, tx_ring, count)) {
                 adapter->tx_busy++;