Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus-6.1-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Just two fixes for the new 'virtio with grants' feature"
* tag 'for-linus-6.1-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/virtio: Convert PAGE_SIZE/PAGE_SHIFT/PFN_UP to Xen counterparts
xen/virtio: Handle cases when page offset > PAGE_SIZE properly
+15
-12
+15
-12
drivers/xen/grant-dma-ops.c
+15
-12
drivers/xen/grant-dma-ops.c
···
31
31
32
32
static inline dma_addr_t grant_to_dma(grant_ref_t grant)
33
33
{
34
-
return XEN_GRANT_DMA_ADDR_OFF | ((dma_addr_t)grant << PAGE_SHIFT);
34
+
return XEN_GRANT_DMA_ADDR_OFF | ((dma_addr_t)grant << XEN_PAGE_SHIFT);
35
35
}
36
36
37
37
static inline grant_ref_t dma_to_grant(dma_addr_t dma)
38
38
{
39
-
return (grant_ref_t)((dma & ~XEN_GRANT_DMA_ADDR_OFF) >> PAGE_SHIFT);
39
+
return (grant_ref_t)((dma & ~XEN_GRANT_DMA_ADDR_OFF) >> XEN_PAGE_SHIFT);
40
40
}
41
41
42
42
static struct xen_grant_dma_data *find_xen_grant_dma_data(struct device *dev)
···
79
79
unsigned long attrs)
80
80
{
81
81
struct xen_grant_dma_data *data;
82
-
unsigned int i, n_pages = PFN_UP(size);
82
+
unsigned int i, n_pages = XEN_PFN_UP(size);
83
83
unsigned long pfn;
84
84
grant_ref_t grant;
85
85
void *ret;
···
91
91
if (unlikely(data->broken))
92
92
return NULL;
93
93
94
-
ret = alloc_pages_exact(n_pages * PAGE_SIZE, gfp);
94
+
ret = alloc_pages_exact(n_pages * XEN_PAGE_SIZE, gfp);
95
95
if (!ret)
96
96
return NULL;
97
97
98
98
pfn = virt_to_pfn(ret);
99
99
100
100
if (gnttab_alloc_grant_reference_seq(n_pages, &grant)) {
101
-
free_pages_exact(ret, n_pages * PAGE_SIZE);
101
+
free_pages_exact(ret, n_pages * XEN_PAGE_SIZE);
102
102
return NULL;
103
103
}
104
104
···
116
116
dma_addr_t dma_handle, unsigned long attrs)
117
117
{
118
118
struct xen_grant_dma_data *data;
119
-
unsigned int i, n_pages = PFN_UP(size);
119
+
unsigned int i, n_pages = XEN_PFN_UP(size);
120
120
grant_ref_t grant;
121
121
122
122
data = find_xen_grant_dma_data(dev);
···
138
138
139
139
gnttab_free_grant_reference_seq(grant, n_pages);
140
140
141
-
free_pages_exact(vaddr, n_pages * PAGE_SIZE);
141
+
free_pages_exact(vaddr, n_pages * XEN_PAGE_SIZE);
142
142
}
143
143
144
144
static struct page *xen_grant_dma_alloc_pages(struct device *dev, size_t size,
···
168
168
unsigned long attrs)
169
169
{
170
170
struct xen_grant_dma_data *data;
171
-
unsigned int i, n_pages = PFN_UP(offset + size);
171
+
unsigned long dma_offset = xen_offset_in_page(offset),
172
+
pfn_offset = XEN_PFN_DOWN(offset);
173
+
unsigned int i, n_pages = XEN_PFN_UP(dma_offset + size);
172
174
grant_ref_t grant;
173
175
dma_addr_t dma_handle;
174
176
···
189
187
190
188
for (i = 0; i < n_pages; i++) {
191
189
gnttab_grant_foreign_access_ref(grant + i, data->backend_domid,
192
-
xen_page_to_gfn(page) + i, dir == DMA_TO_DEVICE);
190
+
pfn_to_gfn(page_to_xen_pfn(page) + i + pfn_offset),
191
+
dir == DMA_TO_DEVICE);
193
192
}
194
193
195
-
dma_handle = grant_to_dma(grant) + offset;
194
+
dma_handle = grant_to_dma(grant) + dma_offset;
196
195
197
196
return dma_handle;
198
197
}
···
203
200
unsigned long attrs)
204
201
{
205
202
struct xen_grant_dma_data *data;
206
-
unsigned long offset = dma_handle & (PAGE_SIZE - 1);
207
-
unsigned int i, n_pages = PFN_UP(offset + size);
203
+
unsigned long dma_offset = xen_offset_in_page(dma_handle);
204
+
unsigned int i, n_pages = XEN_PFN_UP(dma_offset + size);
208
205
grant_ref_t grant;
209
206
210
207
if (WARN_ON(dir == DMA_NONE))