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. Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6ca04afbf9
commit
7240b60c98
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue