Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
io_uring/zcrx: split common area map/unmap parts
Extract area type depedent parts of io_zcrx_[un]map_area from the
generic path. It'll be helpful once there are more area memory types
and not only user pages.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/50f6e893e2d20f937e628196cbf528d15f81c289.1746097431.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
authored by
Pavel Begunkov
and committed by
Jens Axboe
8a628042
782dfa32
+31
-15
+31
-15
io_uring/zcrx.c
+31
-15
io_uring/zcrx.c
···
82
82
return 0;
83
83
}
84
84
85
+
static void io_zcrx_unmap_umem(struct io_zcrx_ifq *ifq,
86
+
struct io_zcrx_area *area, int nr_mapped)
87
+
{
88
+
int i;
89
+
90
+
for (i = 0; i < nr_mapped; i++) {
91
+
netmem_ref netmem = net_iov_to_netmem(&area->nia.niovs[i]);
92
+
dma_addr_t dma = page_pool_get_dma_addr_netmem(netmem);
93
+
94
+
dma_unmap_page_attrs(ifq->dev, dma, PAGE_SIZE,
95
+
DMA_FROM_DEVICE, IO_DMA_ATTR);
96
+
}
97
+
}
98
+
85
99
static void __io_zcrx_unmap_area(struct io_zcrx_ifq *ifq,
86
100
struct io_zcrx_area *area, int nr_mapped)
87
101
{
88
102
int i;
89
103
90
-
for (i = 0; i < nr_mapped; i++) {
91
-
struct net_iov *niov = &area->nia.niovs[i];
92
-
dma_addr_t dma;
104
+
io_zcrx_unmap_umem(ifq, area, nr_mapped);
93
105
94
-
dma = page_pool_get_dma_addr_netmem(net_iov_to_netmem(niov));
95
-
dma_unmap_page_attrs(ifq->dev, dma, PAGE_SIZE,
96
-
DMA_FROM_DEVICE, IO_DMA_ATTR);
97
-
net_mp_niov_set_dma_addr(niov, 0);
98
-
}
106
+
for (i = 0; i < area->nia.num_niovs; i++)
107
+
net_mp_niov_set_dma_addr(&area->nia.niovs[i], 0);
99
108
}
100
109
101
110
static void io_zcrx_unmap_area(struct io_zcrx_ifq *ifq, struct io_zcrx_area *area)
···
116
107
area->is_mapped = false;
117
108
}
118
109
119
-
static int io_zcrx_map_area(struct io_zcrx_ifq *ifq, struct io_zcrx_area *area)
110
+
static int io_zcrx_map_area_umem(struct io_zcrx_ifq *ifq, struct io_zcrx_area *area)
120
111
{
121
112
int i;
122
-
123
-
guard(mutex)(&ifq->dma_lock);
124
-
if (area->is_mapped)
125
-
return 0;
126
113
127
114
for (i = 0; i < area->nia.num_niovs; i++) {
128
115
struct net_iov *niov = &area->nia.niovs[i];
···
134
129
break;
135
130
}
136
131
}
132
+
return i;
133
+
}
137
134
138
-
if (i != area->nia.num_niovs) {
139
-
__io_zcrx_unmap_area(ifq, area, i);
135
+
static int io_zcrx_map_area(struct io_zcrx_ifq *ifq, struct io_zcrx_area *area)
136
+
{
137
+
unsigned nr;
138
+
139
+
guard(mutex)(&ifq->dma_lock);
140
+
if (area->is_mapped)
141
+
return 0;
142
+
143
+
nr = io_zcrx_map_area_umem(ifq, area);
144
+
if (nr != area->nia.num_niovs) {
145
+
__io_zcrx_unmap_area(ifq, area, nr);
140
146
return -EINVAL;
141
147
}
142
148