mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
netmem, devmem, tcp: access pp fields through @desc in net_iov
Convert all the legacy code directly accessing the pp fields in net_iov to access them through @desc in net_iov. Signed-off-by: Byungchul Park <byungchul@sk.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
db4029859d
commit
df59bb5b9a
@@ -3778,8 +3778,8 @@ static inline dma_addr_t __skb_frag_dma_map(struct device *dev,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
if (skb_frag_is_net_iov(frag)) {
|
||||
return netmem_to_net_iov(frag->netmem)->dma_addr + offset +
|
||||
frag->offset;
|
||||
return netmem_to_net_iov(frag->netmem)->desc.dma_addr +
|
||||
offset + frag->offset;
|
||||
}
|
||||
return dma_map_page(dev, skb_frag_page(frag),
|
||||
skb_frag_off(frag) + offset, size, dir);
|
||||
|
||||
@@ -97,9 +97,9 @@ net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding)
|
||||
index = offset / PAGE_SIZE;
|
||||
niov = &owner->area.niovs[index];
|
||||
|
||||
niov->pp_magic = 0;
|
||||
niov->pp = NULL;
|
||||
atomic_long_set(&niov->pp_ref_count, 0);
|
||||
niov->desc.pp_magic = 0;
|
||||
niov->desc.pp = NULL;
|
||||
atomic_long_set(&niov->desc.pp_ref_count, 0);
|
||||
|
||||
return niov;
|
||||
}
|
||||
|
||||
@@ -2587,7 +2587,7 @@ static int tcp_recvmsg_dmabuf(struct sock *sk, const struct sk_buff *skb,
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
atomic_long_inc(&niov->pp_ref_count);
|
||||
atomic_long_inc(&niov->desc.pp_ref_count);
|
||||
tcp_xa_pool.netmems[tcp_xa_pool.idx++] = skb_frag_netmem(frag);
|
||||
|
||||
sent += copy;
|
||||
|
||||
Reference in New Issue
Block a user