* [PATCH 2/2] tools: virtio: Fix no definition of dma_map_page_attrs
@ 2025-12-06 3:23 Yufeng Wang
2025-12-07 14:28 ` [PATCH v2 " Yufeng Wang
0 siblings, 1 reply; 4+ messages in thread
From: Yufeng Wang @ 2025-12-06 3:23 UTC (permalink / raw)
To: Michael S . Tsirkin, Jason Wang, Xuan Zhuo, Eugenio Pérez,
Yufeng Wang
Cc: virtualization, linux-kernel, Yuedong Wang
Fix tools/virtio compiler error, port over the definition
of dma_map_page_attrs, dma_unmap_page_attrs, dev_WARN_ONCE
Fixes: 447beec8065b ("virtio_ring: switch to use dma_{map|unmap}_page()")
Signed-off-by: Yufeng Wang <r4o5m6e8o@163.com>
Tested-by: Yuedong Wang <wyd20130109@163.com>
---
tools/virtio/linux/dma-mapping.h | 3 +++
tools/virtio/linux/kernel.h | 3 +++
2 files changed, 6 insertions(+)
diff --git a/tools/virtio/linux/dma-mapping.h b/tools/virtio/linux/dma-mapping.h
index 095958461788..de251a1f0c37 100644
--- a/tools/virtio/linux/dma-mapping.h
+++ b/tools/virtio/linux/dma-mapping.h
@@ -22,6 +22,7 @@ enum dma_data_direction {
#define dma_free_coherent(d, s, p, h) kfree(p)
#define dma_map_page(d, p, o, s, dir) (page_to_phys(p) + (o))
+#define dma_map_page_attrs(d, p, o, s, dir, a) (page_to_phys(p) + (o))
#define dma_map_single(d, p, s, dir) (virt_to_phys(p))
#define dma_map_single_attrs(d, p, s, dir, a) (virt_to_phys(p))
@@ -29,6 +30,8 @@ enum dma_data_direction {
#define dma_unmap_single(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0)
#define dma_unmap_page(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0)
+#define dma_unmap_page_attrs(d, a, s, r, t) \
+ do { (void)(d); (void)(a); (void)(s); (void)(r); (void)(t); } while (0)
#define sg_dma_address(sg) (0)
#define sg_dma_len(sg) (0)
diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h
index 6702008f7f5c..88e474f46916 100644
--- a/tools/virtio/linux/kernel.h
+++ b/tools/virtio/linux/kernel.h
@@ -134,6 +134,9 @@ static inline void *krealloc_array(void *p, size_t new_n, size_t new_size, gfp_t
#define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
#define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
#define dev_warn_once(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
+#define dev_WARN_ONCE(dev, condition, format, ...) \
+ do { (void)(dev); (void)(condition); \
+ fprintf(stderr, format, ## __VA_ARGS__); } while (0)
#define min(x, y) ({ \
typeof(x) _min1 = (x); \
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] tools: virtio: Fix no definition of dma_map_page_attrs
2025-12-06 3:23 [PATCH 2/2] tools: virtio: Fix no definition of dma_map_page_attrs Yufeng Wang
@ 2025-12-07 14:28 ` Yufeng Wang
2025-12-10 9:00 ` Michael S. Tsirkin
0 siblings, 1 reply; 4+ messages in thread
From: Yufeng Wang @ 2025-12-07 14:28 UTC (permalink / raw)
To: Michael S . Tsirkin, Jason Wang, Xuan Zhuo, Eugenio Pérez,
Yufeng Wang
Cc: virtualization, linux-kernel, Yuedong Wang
Fix tools/virtio compiler error, port over the definition
of dma_map_page_attrs, dma_unmap_page_attrs, dev_WARN_ONCE
v2: remove do {} while (0).
Fixes: 447beec8065b ("virtio_ring: switch to use dma_{map|unmap}_page()")
Signed-off-by: Yufeng Wang <r4o5m6e8o@163.com>
Tested-by: Yuedong Wang <wyd20130109@163.com>
---
tools/virtio/linux/dma-mapping.h | 3 +++
tools/virtio/linux/kernel.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/tools/virtio/linux/dma-mapping.h b/tools/virtio/linux/dma-mapping.h
index 095958461788..de251a1f0c37 100644
--- a/tools/virtio/linux/dma-mapping.h
+++ b/tools/virtio/linux/dma-mapping.h
@@ -22,6 +22,7 @@ enum dma_data_direction {
#define dma_free_coherent(d, s, p, h) kfree(p)
#define dma_map_page(d, p, o, s, dir) (page_to_phys(p) + (o))
+#define dma_map_page_attrs(d, p, o, s, dir, a) (page_to_phys(p) + (o))
#define dma_map_single(d, p, s, dir) (virt_to_phys(p))
#define dma_map_single_attrs(d, p, s, dir, a) (virt_to_phys(p))
@@ -29,6 +30,8 @@ enum dma_data_direction {
#define dma_unmap_single(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0)
#define dma_unmap_page(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0)
+#define dma_unmap_page_attrs(d, a, s, r, t) \
+ do { (void)(d); (void)(a); (void)(s); (void)(r); (void)(t); } while (0)
#define sg_dma_address(sg) (0)
#define sg_dma_len(sg) (0)
diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h
index 6702008f7f5c..460df937ba9d 100644
--- a/tools/virtio/linux/kernel.h
+++ b/tools/virtio/linux/kernel.h
@@ -134,6 +134,7 @@ static inline void *krealloc_array(void *p, size_t new_n, size_t new_size, gfp_t
#define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
#define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
#define dev_warn_once(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
+#define dev_WARN_ONCE(dev, condition, format, ...) fprintf(stderr, format, ## __VA_ARGS__)
#define min(x, y) ({ \
typeof(x) _min1 = (x); \
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] tools: virtio: Fix no definition of dma_map_page_attrs
2025-12-07 14:28 ` [PATCH v2 " Yufeng Wang
@ 2025-12-10 9:00 ` Michael S. Tsirkin
2025-12-10 15:40 ` r4o5m6e8o
0 siblings, 1 reply; 4+ messages in thread
From: Michael S. Tsirkin @ 2025-12-10 9:00 UTC (permalink / raw)
To: Yufeng Wang
Cc: Jason Wang, Xuan Zhuo, Eugenio Pérez, virtualization,
linux-kernel, Yuedong Wang
On Sun, Dec 07, 2025 at 10:28:07PM +0800, Yufeng Wang wrote:
> Fix tools/virtio compiler error, port over the definition
> of dma_map_page_attrs, dma_unmap_page_attrs, dev_WARN_ONCE
>
> v2: remove do {} while (0).
>
> Fixes: 447beec8065b ("virtio_ring: switch to use dma_{map|unmap}_page()")
> Signed-off-by: Yufeng Wang <r4o5m6e8o@163.com>
> Tested-by: Yuedong Wang <wyd20130109@163.com>
Can you pls check whether
https://lore.kernel.org/all/cover.1764873799.git.mst@redhat.com/
addresses the issues for you?
Thanks!
> ---
> tools/virtio/linux/dma-mapping.h | 3 +++
> tools/virtio/linux/kernel.h | 1 +
> 2 files changed, 4 insertions(+)
>
> diff --git a/tools/virtio/linux/dma-mapping.h b/tools/virtio/linux/dma-mapping.h
> index 095958461788..de251a1f0c37 100644
> --- a/tools/virtio/linux/dma-mapping.h
> +++ b/tools/virtio/linux/dma-mapping.h
> @@ -22,6 +22,7 @@ enum dma_data_direction {
> #define dma_free_coherent(d, s, p, h) kfree(p)
>
> #define dma_map_page(d, p, o, s, dir) (page_to_phys(p) + (o))
> +#define dma_map_page_attrs(d, p, o, s, dir, a) (page_to_phys(p) + (o))
>
> #define dma_map_single(d, p, s, dir) (virt_to_phys(p))
> #define dma_map_single_attrs(d, p, s, dir, a) (virt_to_phys(p))
> @@ -29,6 +30,8 @@ enum dma_data_direction {
>
> #define dma_unmap_single(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0)
> #define dma_unmap_page(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0)
> +#define dma_unmap_page_attrs(d, a, s, r, t) \
> + do { (void)(d); (void)(a); (void)(s); (void)(r); (void)(t); } while (0)
>
> #define sg_dma_address(sg) (0)
> #define sg_dma_len(sg) (0)
> diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h
> index 6702008f7f5c..460df937ba9d 100644
> --- a/tools/virtio/linux/kernel.h
> +++ b/tools/virtio/linux/kernel.h
> @@ -134,6 +134,7 @@ static inline void *krealloc_array(void *p, size_t new_n, size_t new_size, gfp_t
> #define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
> #define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
> #define dev_warn_once(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
> +#define dev_WARN_ONCE(dev, condition, format, ...) fprintf(stderr, format, ## __VA_ARGS__)
>
> #define min(x, y) ({ \
> typeof(x) _min1 = (x); \
> --
> 2.43.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re:Re: [PATCH v2 2/2] tools: virtio: Fix no definition of dma_map_page_attrs
2025-12-10 9:00 ` Michael S. Tsirkin
@ 2025-12-10 15:40 ` r4o5m6e8o
0 siblings, 0 replies; 4+ messages in thread
From: r4o5m6e8o @ 2025-12-10 15:40 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Jason Wang, Xuan Zhuo, Eugenio Pérez, virtualization,
linux-kernel, Yuedong Wang
Yes, it's fix all build errors for tools/virtio,
Thanks.
At 2025-12-10 16:00:40, "Michael S. Tsirkin" <mst@redhat.com> wrote:
>On Sun, Dec 07, 2025 at 10:28:07PM +0800, Yufeng Wang wrote:
>> Fix tools/virtio compiler error, port over the definition
>> of dma_map_page_attrs, dma_unmap_page_attrs, dev_WARN_ONCE
>>
>> v2: remove do {} while (0).
>>
>> Fixes: 447beec8065b ("virtio_ring: switch to use dma_{map|unmap}_page()")
>> Signed-off-by: Yufeng Wang <r4o5m6e8o@163.com>
>> Tested-by: Yuedong Wang <wyd20130109@163.com>
>
>Can you pls check whether
>https://lore.kernel.org/all/cover.1764873799.git.mst@redhat.com/
>addresses the issues for you?
>
>Thanks!
>
>
>> ---
>> tools/virtio/linux/dma-mapping.h | 3 +++
>> tools/virtio/linux/kernel.h | 1 +
>> 2 files changed, 4 insertions(+)
>>
>> diff --git a/tools/virtio/linux/dma-mapping.h b/tools/virtio/linux/dma-mapping.h
>> index 095958461788..de251a1f0c37 100644
>> --- a/tools/virtio/linux/dma-mapping.h
>> +++ b/tools/virtio/linux/dma-mapping.h
>> @@ -22,6 +22,7 @@ enum dma_data_direction {
>> #define dma_free_coherent(d, s, p, h) kfree(p)
>>
>> #define dma_map_page(d, p, o, s, dir) (page_to_phys(p) + (o))
>> +#define dma_map_page_attrs(d, p, o, s, dir, a) (page_to_phys(p) + (o))
>>
>> #define dma_map_single(d, p, s, dir) (virt_to_phys(p))
>> #define dma_map_single_attrs(d, p, s, dir, a) (virt_to_phys(p))
>> @@ -29,6 +30,8 @@ enum dma_data_direction {
>>
>> #define dma_unmap_single(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0)
>> #define dma_unmap_page(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0)
>> +#define dma_unmap_page_attrs(d, a, s, r, t) \
>> + do { (void)(d); (void)(a); (void)(s); (void)(r); (void)(t); } while (0)
>>
>> #define sg_dma_address(sg) (0)
>> #define sg_dma_len(sg) (0)
>> diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h
>> index 6702008f7f5c..460df937ba9d 100644
>> --- a/tools/virtio/linux/kernel.h
>> +++ b/tools/virtio/linux/kernel.h
>> @@ -134,6 +134,7 @@ static inline void *krealloc_array(void *p, size_t new_n, size_t new_size, gfp_t
>> #define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
>> #define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
>> #define dev_warn_once(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
>> +#define dev_WARN_ONCE(dev, condition, format, ...) fprintf(stderr, format, ## __VA_ARGS__)
>>
>> #define min(x, y) ({ \
>> typeof(x) _min1 = (x); \
>> --
>> 2.43.0
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-12-10 15:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-06 3:23 [PATCH 2/2] tools: virtio: Fix no definition of dma_map_page_attrs Yufeng Wang
2025-12-07 14:28 ` [PATCH v2 " Yufeng Wang
2025-12-10 9:00 ` Michael S. Tsirkin
2025-12-10 15:40 ` r4o5m6e8o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).