Finish conversion of skb_frag_t to bio_vec
Subsystems (33)
v2 cover Finish conversion of skb_frag_t to bio_vec
The recent conversion of skb_frag_t to bio_vec did not include skb_frag's page_offset. Add accessor functions for this field, utilize them, and remove the union, restoring the original structure.
v2:
- rename accessors
- follow kdoc conventions
Jonathan Lemon (3):
linux: Add page_offset accessors
net: Use skb_frag_off accessors
linux: Remove bvec page_offset, use bv_offset
drivers/atm/eni.c | 2 +- drivers/hsi/clients/ssi_protocol.c | 2 +- drivers/infiniband/hw/hfi1/vnic_sdma.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- .../ethernet/cavium/thunder/nicvf_queues.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 12 ++-- .../ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- drivers/net/ethernet/jme.c | 4 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- .../net/ethernet/myricom/myri10ge/myri10ge.c | 6 +- drivers/net/ethernet/sfc/tx.c | 2 +- drivers/net/ethernet/sun/cassini.c | 8 +-- drivers/net/ethernet/sun/niu.c | 2 +- drivers/net/ethernet/sun/sunvnet_common.c | 4 +- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/thunderbolt.c | 2 +- drivers/net/usb/usbnet.c | 2 +- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- drivers/net/xen-netback/netback.c | 6 +- drivers/net/xen-netfront.c | 8 +-- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- drivers/scsi/fcoe/fcoe.c | 3 +- drivers/scsi/fcoe/fcoe_transport.c | 2 +- drivers/scsi/qedf/qedf_main.c | 2 +- .../staging/unisys/visornic/visornic_main.c | 2 +- drivers/target/iscsi/cxgbit/cxgbit_target.c | 4 +- include/linux/bvec.h | 5 +- include/linux/skbuff.h | 69 ++++++++++++++++--- net/appletalk/ddp.c | 4 +- net/core/datagram.c | 6 +- net/core/dev.c | 2 +- net/core/pktgen.c | 2 +- net/core/skbuff.c | 54 ++++++++------- net/ipv4/tcp.c | 6 +- net/ipv4/tcp_output.c | 2 +- net/kcm/kcmsock.c | 2 +- net/tls/tls_device.c | 8 +-- net/tls/tls_device_fallback.c | 2 +- net/xfrm/xfrm_ipcomp.c | 2 +- 46 files changed, 161 insertions(+), 111 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/3 linux: Add skb_frag_t page_offset accessors
Add skb_frag_off(), skb_frag_off_add(), skb_frag_off_set(), and skb_frag_off_copy() accessors for page_offset.
--- include/linux/skbuff.h | 67 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 8 deletions(-)
include/linux/skbuff.h +59 -8
@@ -312,7 +312,7 @@ extern int sysctl_max_skb_frags;typedef struct bio_vec skb_frag_t ;/** -* skb_frag_size - Returns the size of a skb fragment +* skb_frag_size() - Returns the size of a skb fragment * @frag: skb fragment */ static inline unsigned int skb_frag_size (const skb_frag_t *frag)
@@ -321,7 +321,7 @@ static inline unsigned int skb_frag_size(const skb_frag_t *frag) }/** -* skb_frag_size_set - Sets the size of a skb fragment +* skb_frag_size_set() - Sets the size of a skb fragment * @frag: skb fragment * @size: size of fragment */
@@ -331,7 +331,7 @@ static inline void skb_frag_size_set(skb_frag_t *frag, unsigned int size) }/** -* skb_frag_size_add - Incrementes the size of a skb fragment by %delta +* skb_frag_size_add() - Increments the size of a skb fragment by @delta * @frag: skb fragment * @delta: value to add */
@@ -341,7 +341,7 @@ static inline void skb_frag_size_add(skb_frag_t *frag, int delta) }/** -* skb_frag_size_sub - Decrements the size of a skb fragment by %delta +* skb_frag_size_sub() - Decrements the size of a skb fragment by @delta * @frag: skb fragment * @delta: value to subtract */
@@ -2857,6 +2857,46 @@ static inline void skb_propagate_pfmemalloc(struct page *page, skb->pfmemalloc = true; } +/** +* skb_frag_off() - Returns the offset of a skb fragment +* @frag: the paged fragment +*/ +static inline unsigned int skb_frag_off (const skb_frag_t *frag) +{ +return frag->page_offset; +} + +/** +* skb_frag_off_add() - Increments the offset of a skb fragment by @delta +* @frag: skb fragment +* @delta: value to add +*/ +static inline void skb_frag_off_add (skb_frag_t *frag,int delta) +{ + frag->page_offset += delta; +} + +/** +* skb_frag_off_set() - Sets the offset of a skb fragment +* @frag: skb fragment +* @offset: offset of fragment +*/ +static inline void skb_frag_off_set (skb_frag_t *frag,unsigned int offset) +{ + frag->page_offset = offset; +} + +/** +* skb_frag_off_copy() - Sets the offset of a skb fragment from another fragment +* @fragto: skb fragment where offset is set +* @fragfrom: skb fragment offset is copied from +*/ +static inline void skb_frag_off_copy (skb_frag_t *fragto, +const skb_frag_t *fragfrom) +{ + fragto->page_offset = fragfrom->page_offset; +} +/** * skb_frag_page - retrieve the page referred to by a paged fragment * @frag: the paged fragment
@@ -2923,7 +2963,7 @@ static inline void skb_frag_unref(struct sk_buff *skb, int f)*/ static inline void *skb_frag_address (const skb_frag_t *frag) { -return page_address (skb_frag_page (frag)) + frag->page_offset; +return page_address (skb_frag_page (frag)) +skb_frag_off (frag); }/**
@@ -2939,7 +2979,18 @@ static inline void *skb_frag_address_safe(const skb_frag_t *frag)if (unlikely (!ptr))return NULL ; -return ptr + frag->page_offset; +return ptr +skb_frag_off (frag); +} + +/** +* skb_frag_page_copy() - sets the page in a fragment from another fragment +* @fragto: skb fragment where page is set +* @fragfrom: skb fragment page is copied from +*/ +static inline void skb_frag_page_copy (skb_frag_t *fragto, +const skb_frag_t *fragfrom) +{ + fragto->bv_page = fragfrom->bv_page; }/**
@@ -2987,7 +3038,7 @@ static inline dma_addr_t skb_frag_dma_map(struct device *dev, enum dma_data_direction dir) {return dma_map_page (dev,skb_frag_page (frag), - frag->page_offset + offset, size, dir); +skb_frag_off (frag) + offset, size, dir); } static inline struct sk_buff *pskb_copy(struct sk_buff *skb,
@@ -3157,7 +3208,7 @@ static inline bool skb_can_coalesce(struct sk_buff *skb, int i,const skb_frag_t *frag = &skb_shinfo (skb)->frags[i -1 ];return page ==skb_frag_page (frag) && - off == frag->page_offset +skb_frag_size (frag); + off ==skb_frag_off (frag) +skb_frag_size (frag); }return false; }
Signature · 1 line
2.17.1
PATCH v2 2/3 net: Use skb_frag_off accessors
In reply to Jonathan LemonUse accessor functions for skb fragment's page_offset instead of direct references, in preparation for bvec conversion.
--- drivers/atm/eni.c | 2 +- drivers/hsi/clients/ssi_protocol.c | 2 +- drivers/infiniband/hw/hfi1/vnic_sdma.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- .../ethernet/cavium/thunder/nicvf_queues.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 12 ++--- .../ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- drivers/net/ethernet/jme.c | 4 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- .../net/ethernet/myricom/myri10ge/myri10ge.c | 6 +-- drivers/net/ethernet/sfc/tx.c | 2 +- drivers/net/ethernet/sun/cassini.c | 8 +-- drivers/net/ethernet/sun/niu.c | 2 +- drivers/net/ethernet/sun/sunvnet_common.c | 4 +- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/thunderbolt.c | 2 +- drivers/net/usb/usbnet.c | 2 +- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- drivers/net/xen-netback/netback.c | 6 +-- drivers/net/xen-netfront.c | 8 +-- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- drivers/scsi/fcoe/fcoe.c | 3 +- drivers/scsi/fcoe/fcoe_transport.c | 2 +- drivers/scsi/qedf/qedf_main.c | 2 +- .../staging/unisys/visornic/visornic_main.c | 2 +- drivers/target/iscsi/cxgbit/cxgbit_target.c | 4 +- net/appletalk/ddp.c | 4 +- net/core/datagram.c | 6 +-- net/core/dev.c | 2 +- net/core/pktgen.c | 2 +- net/core/skbuff.c | 54 ++++++++++--------- net/ipv4/tcp.c | 6 +-- net/ipv4/tcp_output.c | 2 +- net/kcm/kcmsock.c | 2 +- net/tls/tls_device.c | 8 +-- net/tls/tls_device_fallback.c | 2 +- net/xfrm/xfrm_ipcomp.c | 2 +- 44 files changed, 100 insertions(+), 98 deletions(-)
drivers/atm/eni.c +1 -1
@@ -1136,7 +1136,7 @@ DPRINTK("doing direct send\n"); /* @@@ well, this doesn't work anyway */else put_dma (tx->index,eni_dev->dma,&j,(unsigned long )skb_frag_page (&skb_shinfo (skb)->frags[i]) + -skb_shinfo (skb)->frags[i].page_offset, +skb_frag_off (&skb_shinfo (skb)->frags[i]),skb_frag_size (&skb_shinfo (skb)->frags[i])); }if (skb->len &3 ) {
drivers/hsi/clients/ssi_protocol.c +1 -1
@@ -182,7 +182,7 @@ static void ssip_skb_to_msg(struct sk_buff *skb, struct hsi_msg *msg)BUG_ON (!sg); frag = &skb_shinfo (skb)->frags[i];sg_set_page (sg,skb_frag_page (frag),skb_frag_size (frag), - frag->page_offset); +skb_frag_off (frag)); } }
drivers/infiniband/hw/hfi1/vnic_sdma.c +1 -1
@@ -108,7 +108,7 @@ static noinline int build_vnic_ulp_payload(struct sdma_engine *sde, ret =sdma_txadd_page (sde->dd, &tx->txreq,skb_frag_page (frag), - frag->page_offset, +skb_frag_off (frag),skb_frag_size (frag));if (unlikely (ret)) goto bail_txadd;
drivers/infiniband/ulp/ipoib/ipoib_ib.c +2 -1
@@ -293,7 +293,8 @@ int ipoib_dma_map_tx(struct ib_device *ca, struct ipoib_tx_buf *tx_req)const skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; mapping[i + off] =ib_dma_map_page (ca,skb_frag_page (frag), - frag->page_offset,skb_frag_size (frag), +skb_frag_off (frag), +skb_frag_size (frag),DMA_TO_DEVICE );if (unlikely (ib_dma_mapping_error (ca, mapping[i + off]))) goto partial_error;
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -957,7 +957,7 @@ static struct sk_buff *bnxt_rx_page_skb(struct bnxt *bp, frag = &skb_shinfo (skb)->frags[0 ];skb_frag_size_sub (frag, payload); - frag->page_offset += payload; +skb_frag_off_add (frag, payload); skb->data_len -= payload; skb->tail += payload;
drivers/net/ethernet/cavium/thunder/nicvf_queues.c +1 -1
@@ -1594,7 +1594,7 @@ int nicvf_sq_append_skb(struct nicvf *nic, struct snd_queue *sq, size =skb_frag_size (frag); dma_addr =dma_map_page_attrs (&nic->pdev->dev,skb_frag_page (frag), - frag->page_offset, size, +skb_frag_off (frag), size,DMA_TO_DEVICE ,DMA_ATTR_SKIP_CPU_SYNC );if (dma_mapping_error (&nic->pdev->dev, dma_addr)) {
drivers/net/ethernet/chelsio/cxgb3/sge.c +1 -1
@@ -2182,7 +2182,7 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs, rx_frag += nr_frags;__skb_frag_set_page (rx_frag, sd->pg_chunk.page); - rx_frag->page_offset = sd->pg_chunk.offset + offset; +skb_frag_off_set (rx_frag, sd->pg_chunk.offset + offset);skb_frag_size_set (rx_frag, len); skb->len += len;
drivers/net/ethernet/emulex/benet/be_main.c +6 -6
@@ -2346,8 +2346,8 @@ static void skb_fill_rx_data(struct be_rx_obj *rxo, struct sk_buff *skb,memcpy (skb->data, start, hdr_len);skb_shinfo (skb)->nr_frags =1 ;skb_frag_set_page (skb,0 , page_info->page); -skb_shinfo (skb)->frags[0 ].page_offset = - page_info->page_offset + hdr_len; +skb_frag_off_set (&skb_shinfo (skb)->frags[0 ], + page_info->page_offset + hdr_len);skb_frag_size_set (&skb_shinfo (skb)->frags[0 ], curr_frag_len - hdr_len); skb->data_len = curr_frag_len - hdr_len;
@@ -2372,8 +2372,8 @@ static void skb_fill_rx_data(struct be_rx_obj *rxo, struct sk_buff *skb,/* Fresh page */ j++;skb_frag_set_page (skb, j, page_info->page); -skb_shinfo (skb)->frags[j].page_offset = - page_info->page_offset; +skb_frag_off_set (&skb_shinfo (skb)->frags[j], + page_info->page_offset);skb_frag_size_set (&skb_shinfo (skb)->frags[j],0 );skb_shinfo (skb)->nr_frags++; }else {
@@ -2454,8 +2454,8 @@ static void be_rx_compl_process_gro(struct be_rx_obj *rxo,/* First frag or Fresh page */ j++;skb_frag_set_page (skb, j, page_info->page); -skb_shinfo (skb)->frags[j].page_offset = - page_info->page_offset; +skb_frag_off_set (&skb_shinfo (skb)->frags[j], + page_info->page_offset);skb_frag_size_set (&skb_shinfo (skb)->frags[j],0 ); }else {put_page (page_info->page);
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1 -1
@@ -501,7 +501,7 @@ fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) nr_frags =skb_shinfo (skb)->nr_frags; frag =skb_shinfo (skb)->frags;for (i =0 ; i < nr_frags; i++, frag++) { -if (!IS_ALIGNED (frag->page_offset,4 )) { +if (!IS_ALIGNED (skb_frag_off (frag),4 )) { is_aligned =0 ;break ; }
drivers/net/ethernet/ibm/ibmvnic.c +1 -1
@@ -1485,7 +1485,7 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)memcpy (dst + cur,page_address (skb_frag_page (frag)) + - frag->page_offset,skb_frag_size (frag)); +skb_frag_off (frag),skb_frag_size (frag)); cur +=skb_frag_size (frag); } }else {
drivers/net/ethernet/intel/i40e/i40e_txrx.c +1 -1
@@ -3306,7 +3306,7 @@ bool __i40e_chk_linearize(struct sk_buff *skb)* descriptor associated with the fragment. */ if (stale_size >I40E_MAX_DATA_PER_TXD ) { -int align_pad = -(stale->page_offset) & +int align_pad = -(skb_frag_off (stale)) & (I40E_MAX_READ_REQ_SIZE -1 ); sum -= align_pad;
drivers/net/ethernet/intel/iavf/iavf_txrx.c +1 -1
@@ -2205,7 +2205,7 @@ bool __iavf_chk_linearize(struct sk_buff *skb)* descriptor associated with the fragment. */ if (stale_size >IAVF_MAX_DATA_PER_TXD ) { -int align_pad = -(stale->page_offset) & +int align_pad = -(skb_frag_off (stale)) & (IAVF_MAX_READ_REQ_SIZE -1 ); sum -= align_pad;
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -2
@@ -1807,7 +1807,7 @@ static void ixgbe_pull_tail(struct ixgbe_ring *rx_ring,/* update all of the pointers */ skb_frag_size_sub (frag, pull_len); - frag->page_offset += pull_len; +skb_frag_off_add (frag, pull_len); skb->data_len -= pull_len; skb->tail += pull_len; }
@@ -1844,7 +1844,7 @@ static void ixgbe_dma_sync_frag(struct ixgbe_ring *rx_ring,dma_sync_single_range_for_cpu (rx_ring->dev,IXGBE_CB (skb)->dma, - frag->page_offset, +skb_frag_off (frag),skb_frag_size (frag),DMA_FROM_DEVICE ); }
drivers/net/ethernet/jme.c +2 -2
@@ -2040,8 +2040,8 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) ctxbi = txbi + ((idx + i +2 ) & (mask)); ret =jme_fill_tx_map (jme->pdev, ctxdesc, ctxbi, -skb_frag_page (frag), - frag->page_offset,skb_frag_size (frag), hidma); +skb_frag_page (frag),skb_frag_off (frag), +skb_frag_size (frag), hidma);if (ret) {jme_drop_tx_map (jme, idx, i); goto out;
drivers/net/ethernet/marvell/mv643xx_eth.c +1 -1
@@ -659,7 +659,7 @@ static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)for (frag =0 ; frag <skb_shinfo (skb)->nr_frags; frag++) {const skb_frag_t *fragp = &skb_shinfo (skb)->frags[frag]; -if (skb_frag_size (fragp) <=8 && fragp->page_offset &7 ) +if (skb_frag_size (fragp) <=8 &&skb_frag_off (fragp) &7 )return 1 ; }
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +3 -3
@@ -1306,8 +1306,8 @@ myri10ge_vlan_rx(struct net_device *dev, void *addr, struct sk_buff *skb) skb->len -=VLAN_HLEN ; skb->data_len -=VLAN_HLEN ; frag =skb_shinfo (skb)->frags; - frag->page_offset +=VLAN_HLEN ; -skb_frag_size_set (frag,skb_frag_size (frag) -VLAN_HLEN ); +skb_frag_off_add (frag,VLAN_HLEN ); +skb_frag_size_sub (frag,VLAN_HLEN ); } }
@@ -1364,7 +1364,7 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum) }/* remove padding */ - rx_frags[0 ].page_offset +=MXGEFW_PAD ; +skb_frag_off_add (&rx_frags[0 ],MXGEFW_PAD );skb_frag_size_sub (&rx_frags[0 ],MXGEFW_PAD ); len -=MXGEFW_PAD ;
drivers/net/ethernet/sfc/tx.c +1 -1
@@ -274,7 +274,7 @@ static void efx_skb_copy_bits_to_pio(struct efx_nic *efx, struct sk_buff *skb, vaddr =kmap_atomic (skb_frag_page (f)); -efx_memcpy_toio_aligned_cb (efx, piobuf, vaddr + f->page_offset, +efx_memcpy_toio_aligned_cb (efx, piobuf, vaddr +skb_frag_off (f),skb_frag_size (f), copy_buf);kunmap_atomic (vaddr); }
drivers/net/ethernet/sun/cassini.c +4 -4
@@ -2034,7 +2034,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc,__skb_frag_set_page (frag, page->buffer);__skb_frag_ref (frag); - frag->page_offset = off; +skb_frag_off_set (frag, off);skb_frag_size_set (frag, hlen - swivel);/* any more data? */
@@ -2058,7 +2058,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc,__skb_frag_set_page (frag, page->buffer);__skb_frag_ref (frag); - frag->page_offset =0 ; +skb_frag_off_set (frag,0 );skb_frag_size_set (frag, hlen);RX_USED_ADD (page, hlen + cp->crc_size); }
@@ -2816,7 +2816,7 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring, mapping =skb_frag_dma_map (&cp->pdev->dev, fragp,0 , len,DMA_TO_DEVICE ); - tabort =cas_calc_tabort (cp, fragp->page_offset, len); + tabort =cas_calc_tabort (cp,skb_frag_off (fragp), len);if (unlikely (tabort)) {void *addr;
@@ -2827,7 +2827,7 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring, addr =cas_page_map (skb_frag_page (fragp));memcpy (tx_tiny_buf (cp, ring, entry), - addr + fragp->page_offset + len - tabort, + addr +skb_frag_off (fragp) + len - tabort, tabort);cas_page_unmap (addr); mapping =tx_tiny_map (cp, ring, entry, tentry);
drivers/net/ethernet/sun/niu.c +1 -1
@@ -6695,7 +6695,7 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, len =skb_frag_size (frag); mapping = np->ops->map_page (np->device,skb_frag_page (frag), - frag->page_offset, len, +skb_frag_off (frag), len,DMA_TO_DEVICE ); rp->tx_buffs[prod].skb =NULL ;
drivers/net/ethernet/sun/sunvnet_common.c +2 -2
@@ -1088,7 +1088,7 @@ static inline int vnet_skb_map(struct ldc_channel *lp, struct sk_buff *skb, vaddr =kmap_atomic (skb_frag_page (f)); blen =skb_frag_size (f); blen +=8 - (blen &7 ); - err =ldc_map_single (lp, vaddr + f->page_offset, + err =ldc_map_single (lp, vaddr +skb_frag_off (f), blen, cookies + nc, ncookies - nc, map_perm);kunmap_atomic (vaddr);
@@ -1124,7 +1124,7 @@ static inline struct sk_buff *vnet_skb_shape(struct sk_buff *skb, int ncookies)for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) {skb_frag_t *f = &skb_shinfo (skb)->frags[i]; - docopy |= f->page_offset &7 ; + docopy |=skb_frag_off (f) &7 ; } if (((unsigned long)skb->data & 7) != VNET_PACKET_SKIP || skb_tailroom(skb) < pad ||
drivers/net/ethernet/ti/netcp_core.c +1 -1
@@ -1116,7 +1116,7 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp)for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) {skb_frag_t *frag = &skb_shinfo (skb)->frags[i];struct page *page =skb_frag_page (frag); -u32 page_offset = frag->page_offset; +u32 page_offset =skb_frag_off (frag);u32 buf_len =skb_frag_size (frag);dma_addr_t desc_dma;u32 desc_dma_32;
drivers/net/hyperv/netvsc_drv.c +2 -2
@@ -435,7 +435,7 @@ static u32 init_page_array(void *hdr, u32 len, struct sk_buff *skb,skb_frag_t *frag =skb_shinfo (skb)->frags + i; slots_used +=fill_pg_buf (skb_frag_page (frag), - frag->page_offset, +skb_frag_off (frag),skb_frag_size (frag), &pb[slots_used]); }return slots_used;
@@ -449,7 +449,7 @@ static int count_skb_frag_slots(struct sk_buff *skb)for (i =0 ; i < frags; i++) {skb_frag_t *frag =skb_shinfo (skb)->frags + i;unsigned long size =skb_frag_size (frag); -unsigned long offset = frag->page_offset; +unsigned long offset =skb_frag_off (frag);/* Skip unused frames from start of page */ offset &= ~PAGE_MASK ;
drivers/net/thunderbolt.c +1 -1
@@ -1005,7 +1005,7 @@ static void *tbnet_kmap_frag(struct sk_buff *skb, unsigned int frag_num,const skb_frag_t *frag = &skb_shinfo (skb)->frags[frag_num]; *len =skb_frag_size (frag); -return kmap_atomic (skb_frag_page (frag)) + frag->page_offset; +return kmap_atomic (skb_frag_page (frag)) +skb_frag_off (frag); } static netdev_tx_t tbnet_start_xmit(struct sk_buff *skb,
drivers/net/usb/usbnet.c +1 -1
@@ -1328,7 +1328,7 @@ static int build_dma_sg(const struct sk_buff *skb, struct urb *urb) total_len +=skb_frag_size (f);sg_set_page (&urb->sg[i + s],skb_frag_page (f),skb_frag_size (f), - f->page_offset); +skb_frag_off (f)); } urb->transfer_buffer_length = total_len;
drivers/net/vmxnet3/vmxnet3_drv.c +1 -1
@@ -662,7 +662,7 @@ vmxnet3_append_frag(struct sk_buff *skb, struct Vmxnet3_RxCompDesc *rcd,BUG_ON (skb_shinfo (skb)->nr_frags >=MAX_SKB_FRAGS );__skb_frag_set_page (frag, rbi->page); - frag->page_offset =0 ; +skb_frag_off_set (frag,0 );skb_frag_size_set (frag, rcd->len); skb->data_len += rcd->len; skb->truesize +=PAGE_SIZE ;
drivers/net/xen-netback/netback.c +3 -3
@@ -136,12 +136,12 @@ static inline struct xenvif_queue *ubuf_to_queue(const struct ubuf_info *ubuf)static u16 frag_get_pending_idx (skb_frag_t *frag) { -return (u16 )frag->page_offset; +return (u16 )skb_frag_off (frag); }static void frag_set_pending_idx (skb_frag_t *frag,u16 pending_idx) { - frag->page_offset = pending_idx; +skb_frag_off_set (frag, pending_idx); }static inline pending_ring_idx_t pending_index (unsigned i)
@@ -1068,7 +1068,7 @@ static int xenvif_handle_frag_list(struct xenvif_queue *queue, struct sk_buff *s offset += len;__skb_frag_set_page (&frags[i], page); - frags[i].page_offset =0 ; +skb_frag_off_set (&frags[i],0 );skb_frag_size_set (&frags[i], len); }
drivers/net/xen-netfront.c +4 -4
@@ -531,7 +531,7 @@ static int xennet_count_skb_slots(struct sk_buff *skb)for (i =0 ; i < frags; i++) {skb_frag_t *frag =skb_shinfo (skb)->frags + i;unsigned long size =skb_frag_size (frag); -unsigned long offset = frag->page_offset; +unsigned long offset =skb_frag_off (frag);/* Skip unused frames from start of page */ offset &= ~PAGE_MASK ;
@@ -674,8 +674,8 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev/* Requests for all the frags. */ for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) {skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; - tx =xennet_make_txreqs (queue, tx, skb, -skb_frag_page (frag), frag->page_offset, + tx =xennet_make_txreqs (queue, tx, skb,skb_frag_page (frag), +skb_frag_off (frag),skb_frag_size (frag)); }
@@ -1040,7 +1040,7 @@ static int xennet_poll(struct napi_struct *napi, int budget)if (NETFRONT_SKB_CB (skb)->pull_to >RX_COPY_THRESHOLD )NETFRONT_SKB_CB (skb)->pull_to =RX_COPY_THRESHOLD ; -skb_shinfo (skb)->frags[0 ].page_offset = rx->offset; +skb_frag_off_set (&skb_shinfo (skb)->frags[0 ], rx->offset);skb_frag_size_set (&skb_shinfo (skb)->frags[0 ], rx->status); skb->data_len = rx->status; skb->len += rx->status;
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +1 -1
@@ -346,7 +346,7 @@ static int bnx2fc_xmit(struct fc_lport *lport, struct fc_frame *fp)return -ENOMEM ; } frag = &skb_shinfo (skb)->frags[skb_shinfo (skb)->nr_frags -1 ]; - cp =kmap_atomic (skb_frag_page (frag)) + frag->page_offset; + cp =kmap_atomic (skb_frag_page (frag)) +skb_frag_off (frag); }else { cp =skb_put (skb, tlen); }
drivers/scsi/fcoe/fcoe.c +1 -2
@@ -1522,8 +1522,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)return -ENOMEM ; } frag = &skb_shinfo (skb)->frags[skb_shinfo (skb)->nr_frags -1 ]; - cp =kmap_atomic (skb_frag_page (frag)) - + frag->page_offset; + cp =kmap_atomic (skb_frag_page (frag)) +skb_frag_off (frag); }else { cp =skb_put (skb, tlen); }
drivers/scsi/fcoe/fcoe_transport.c +1 -1
@@ -318,7 +318,7 @@ u32 fcoe_fc_crc(struct fc_frame *fp)for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) { frag = &skb_shinfo (skb)->frags[i]; - off = frag->page_offset; + off =skb_frag_off (frag); len =skb_frag_size (frag);while (len >0 ) { clen =min (len,PAGE_SIZE - (off & ~PAGE_MASK ));
drivers/scsi/qedf/qedf_main.c +1 -1
@@ -1077,7 +1077,7 @@ static int qedf_xmit(struct fc_lport *lport, struct fc_frame *fp)return -ENOMEM ; } frag = &skb_shinfo (skb)->frags[skb_shinfo (skb)->nr_frags -1 ]; - cp =kmap_atomic (skb_frag_page (frag)) + frag->page_offset; + cp =kmap_atomic (skb_frag_page (frag)) +skb_frag_off (frag); }else { cp =skb_put (skb, tlen); }
drivers/staging/unisys/visornic/visornic_main.c +1 -1
@@ -284,7 +284,7 @@ static int visor_copy_fragsinfo_from_skb(struct sk_buff *skb,for (frag =0 ; frag < numfrags; frag++) { count =add_physinfo_entries (page_to_pfn (skb_frag_page (&skb_shinfo (skb)->frags[frag])), -skb_shinfo (skb)->frags[frag].page_offset, +skb_frag_off (&skb_shinfo (skb)->frags[frag]),skb_frag_size (&skb_shinfo (skb)->frags[frag]), count, frags_max, frags);/* add_physinfo_entries only returns
drivers/target/iscsi/cxgbit/cxgbit_target.c +2 -2
@@ -900,7 +900,7 @@ cxgbit_handle_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr,sg_init_table (&ccmd->sg,1 );sg_set_page (&ccmd->sg,skb_frag_page (dfrag), -skb_frag_size (dfrag), dfrag->page_offset); +skb_frag_size (dfrag),skb_frag_off (dfrag));get_page (skb_frag_page (dfrag)); cmd->se_cmd.t_data_sg = &ccmd->sg;
@@ -1403,7 +1403,7 @@ static void cxgbit_lro_skb_dump(struct sk_buff *skb) pdu_cb->ddigest, pdu_cb->frags);for (i =0 ; i < ssi->nr_frags; i++)pr_info ("skb 0x%p, frag %d, off %u, sz %u.\n" , - skb, i, ssi->frags[i].page_offset, + skb, i,skb_frag_off (&ssi->frags[i]),skb_frag_size (&ssi->frags[i])); }
net/appletalk/ddp.c +2 -2
@@ -953,8 +953,8 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset,if (copy > len) copy = len; vaddr =kmap_atomic (skb_frag_page (frag)); - sum =atalk_sum_partial (vaddr + frag->page_offset + - offset - start, copy, sum); + sum =atalk_sum_partial (vaddr +skb_frag_off (frag) + + offset - start, copy, sum);kunmap_atomic (vaddr);if (!(len -= copy))
net/core/datagram.c +3 -3
@@ -442,8 +442,8 @@ static int __skb_datagram_iter(const struct sk_buff *skb, int offset,if (copy > len) copy = len; - n =cb (vaddr + frag->page_offset + - offset - start, copy, data, to); + n =cb (vaddr +skb_frag_off (frag) + offset - start, + copy, data, to);kunmap (page); offset += n;if (n != copy)
@@ -573,7 +573,7 @@ int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,if (copy > len) copy = len; copied =copy_page_from_iter (skb_frag_page (frag), - frag->page_offset + offset - start, +skb_frag_off (frag) + offset - start, copy, from);if (copied != copy) goto fault;
net/core/dev.c +1 -1
@@ -5481,7 +5481,7 @@ static void gro_pull_from_frag0(struct sk_buff *skb, int grow) skb->data_len -= grow; skb->tail += grow; - pinfo->frags[0 ].page_offset += grow; +skb_frag_off_add (&pinfo->frags[0 ], grow);skb_frag_size_sub (&pinfo->frags[0 ], grow);if (unlikely (!skb_frag_size (&pinfo->frags[0 ]))) {
net/core/pktgen.c +1 -1
@@ -2652,7 +2652,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb, }get_page (pkt_dev->page);skb_frag_set_page (skb, i, pkt_dev->page); -skb_shinfo (skb)->frags[i].page_offset =0 ; +skb_frag_off_set (&skb_shinfo (skb)->frags[i],0 );/*last fragment, fill rest of data*/ if (i == (frags -1 )) skb_frag_size_set(&skb_shinfo(skb)->frags[i],
net/core/skbuff.c +28 -26
183 lines not on this page · raw message
net/ipv4/tcp.c +3 -3
@@ -1782,12 +1782,12 @@ static int tcp_zerocopy_receive(struct sock *sk, frags++; } } -if (skb_frag_size (frags) !=PAGE_SIZE || frags->page_offset) { +if (skb_frag_size (frags) !=PAGE_SIZE ||skb_frag_off (frags)) {int remaining = zc->recv_skip_hint;int size =skb_frag_size (frags);while (remaining && (size !=PAGE_SIZE || - frags->page_offset)) { +skb_frag_off (frags))) { remaining -= size; frags++; size =skb_frag_size (frags);
@@ -3784,7 +3784,7 @@ int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp,for (i =0 ; i < shi->nr_frags; ++i) {const skb_frag_t *f = &shi->frags[i]; -unsigned int offset = f->page_offset; +unsigned int offset =skb_frag_off (f);struct page *page =skb_frag_page (f) + (offset >>PAGE_SHIFT ); sg_set_page(&sg, page, skb_frag_size(f),
net/ipv4/tcp_output.c +1 -1
@@ -1402,7 +1402,7 @@ static int __pskb_trim_head(struct sk_buff *skb, int len) }else { shinfo->frags[k] = shinfo->frags[i];if (eat) { - shinfo->frags[k].page_offset += eat; +skb_frag_off_add (&shinfo->frags[k], eat);skb_frag_size_sub (&shinfo->frags[k], eat); eat =0 ; }
net/kcm/kcmsock.c +1 -1
@@ -642,7 +642,7 @@ static int kcm_write_msgs(struct kcm_sock *kcm) ret =kernel_sendpage (psock->sk->sk_socket,skb_frag_page (frag), - frag->page_offset + frag_offset, +skb_frag_off (frag) + frag_offset,skb_frag_size (frag) - frag_offset,MSG_DONTWAIT );if (ret <=0 ) {
net/tls/tls_device.c +4 -4
@@ -244,12 +244,12 @@ static void tls_append_frag(struct tls_record_info *record, frag = &record->frags[record->num_frags -1 ];if (skb_frag_page (frag) == pfrag->page && - frag->page_offset +skb_frag_size (frag) == pfrag->offset) { +skb_frag_off (frag) +skb_frag_size (frag) == pfrag->offset) {skb_frag_size_add (frag, size); }else { ++frag;__skb_frag_set_page (frag, pfrag->page); - frag->page_offset = pfrag->offset; +skb_frag_off_set (frag, pfrag->offset);skb_frag_size_set (frag, size); ++record->num_frags;get_page (pfrag->page);
@@ -301,7 +301,7 @@ static int tls_push_record(struct sock *sk, frag = &record->frags[i];sg_unmark_end (&offload_ctx->sg_tx_data[i]);sg_set_page (&offload_ctx->sg_tx_data[i],skb_frag_page (frag), -skb_frag_size (frag), frag->page_offset); +skb_frag_size (frag),skb_frag_off (frag));sk_mem_charge (sk,skb_frag_size (frag));get_page (skb_frag_page (frag)); }
@@ -324,7 +324,7 @@ static int tls_create_new_record(struct tls_offload_context_tx *offload_ctx, frag = &record->frags[0 ];__skb_frag_set_page (frag, pfrag->page); - frag->page_offset = pfrag->offset; +skb_frag_off_set (frag, pfrag->offset);skb_frag_size_set (frag, prepend_size);get_page (pfrag->page);
net/tls/tls_device_fallback.c +1 -1
@@ -273,7 +273,7 @@ static int fill_sg_in(struct scatterlist *sg_in,__skb_frag_ref (frag);sg_set_page (sg_in + i,skb_frag_page (frag), -skb_frag_size (frag), frag->page_offset); +skb_frag_size (frag),skb_frag_off (frag)); remaining -=skb_frag_size (frag);
net/xfrm/xfrm_ipcomp.c +1 -1
@@ -85,7 +85,7 @@ static int ipcomp_decompress(struct xfrm_state *x, struct sk_buff *skb)if (dlen < len) len = dlen; - frag->page_offset =0 ; +skb_frag_off_set (frag,0 );skb_frag_size_set (frag, len);memcpy (skb_frag_address (frag), scratch, len);
Signature · 1 line
2.17.1
PATCH v2 3/3 linux: Remove bvec page_offset, use bv_offset
In reply to Jonathan LemonNow that page_offset is referenced through accessors, remove the union, and use bv_offset.
--- include/linux/bvec.h | 5 +---- include/linux/skbuff.h | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-)
include/linux/bvec.h +1 -4
@@ -18,10 +18,7 @@struct bio_vec {struct page *bv_page;unsigned int bv_len; -union { -__u32 page_offset; -unsigned int bv_offset; - }; +unsigned int bv_offset; };struct bvec_iter {
include/linux/skbuff.h +5 -5
@@ -2078,7 +2078,7 @@ static inline void __skb_fill_page_desc(struct sk_buff *skb, int i,* on page_is_pfmemalloc doing the right thing(tm). */ frag->bv_page = page; - frag->page_offset = off; + frag->bv_offset = off;skb_frag_size_set (frag, size); page =compound_head (page);
@@ -2863,7 +2863,7 @@ static inline void skb_propagate_pfmemalloc(struct page *page,*/ static inline unsigned int skb_frag_off (const skb_frag_t *frag) { -return frag->page_offset; +return frag->bv_offset; }/**
@@ -2873,7 +2873,7 @@ static inline unsigned int skb_frag_off(const skb_frag_t *frag)*/ static inline void skb_frag_off_add (skb_frag_t *frag,int delta) { - frag->page_offset += delta; + frag->bv_offset += delta; }/**
@@ -2883,7 +2883,7 @@ static inline void skb_frag_off_add(skb_frag_t *frag, int delta)*/ static inline void skb_frag_off_set (skb_frag_t *frag,unsigned int offset) { - frag->page_offset = offset; + frag->bv_offset = offset; }/**
@@ -2894,7 +2894,7 @@ static inline void skb_frag_off_set(skb_frag_t *frag, unsigned int offset)static inline void skb_frag_off_copy (skb_frag_t *fragto,const skb_frag_t *fragfrom) { - fragto->page_offset = fragfrom->page_offset; + fragto->bv_offset = fragfrom->bv_offset; }/**
Signature · 1 line
2.17.1
Quoted 3 lines · Jonathan Lemon
The recent conversion of
skb_frag_ttobio_vecdid not include skb_frag'spage_offset. Add accessor functions for this field, utilize them, and remove the union, restoring the original structure.
Thanks!
Quoted 3 lines · Jonathan Lemon
The recent conversion of
skb_frag_ttobio_vecdid not include skb_frag'spage_offset. Add accessor functions for this field, utilize them, and remove the union, restoring the original structure.
You can add:
Pretty appalled to see this abomination:
net: Convert skb_frag_t to bio_vec
There are a lot of users of frag->page_offset, so use a union to avoid converting those users today.
show up in the net tree without even having been posted on a block list...
At least this kills this ugly thing.
Signature · 1 line
Jens Axboe
David Miller
maintainerFrom: Jens Axboe <[email protected]>
Date: Tue, 30 Jul 2019 20:49:09 +0000
Quoted 7 lines
Pretty appalled to see this abomination:
net: Convert
skb_frag_ttobio_vecThere are a lot of users of
frag->page_offset, so use a union to avoid converting those users today.
Quoted 7 lines
Signed-off-by Matthew Wilcox (Oracle) <[email protected]>Signed-off-by David S. Miller <[email protected]>show up in the net tree without even having been posted on a block list...
At least this kills this ugly thing.
Sorry about that Jens, but at least as you say it's gone now.
Quoted 13 lines · David Miller
From: Jens Axboe <[email protected]>
Date: Tue, 30 Jul 2019 20:49:09 +0000Quoted 10 lines
Pretty appalled to see this abomination:
net: Convert
skb_frag_ttobio_vecThere are a lot of users of
frag->page_offset, so use a union to avoid converting those users today.Signed-off-by Matthew Wilcox (Oracle) <[email protected]>Signed-off-by David S. Miller <[email protected]>
Quoted 6 lines
Quoted 4 lines
show up in the net tree without even having been posted on a block list...
At least this kills this ugly thing.
Sorry about that Jens, but at least as you say it's gone now.
Yeah all good now, thanks.
Signature · 1 line
Jens Axboe
David Miller
maintainerFrom: Jonathan Lemon <[email protected]>
Date: Tue, 30 Jul 2019 07:40:31 -0700
Quoted 7 lines
The recent conversion of
skb_frag_ttobio_vecdid not include skb_frag'spage_offset. Add accessor functions for this field, utilize them, and remove the union, restoring the original structure.v2:
- rename accessors
- follow kdoc conventions
Series applied, thanks Jonathan.