| From 819097fd57e6821b65617e7d8d0258e0e1fd93ec Mon Sep 17 00:00:00 2001 |
| From: "Michael S. Tsirkin" <mst@redhat.com> |
| Date: Fri, 8 Dec 2017 17:31:37 +0200 |
| Subject: ptr_ring: fix up after recent ptr_ring changes |
| |
| [ Upstream commit 5790eabc6e7c3ce2d6ca2e3bbf4de467ce2b64b3 ] |
| |
| Add more stubs to make it build. |
| |
| Fixes: 81fbfe8a ("ptr_ring: use kmalloc_array()") |
| Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/virtio/ringtest/ptr_ring.c | 29 +++++++++++++++++++++++------ |
| 1 file changed, 23 insertions(+), 6 deletions(-) |
| |
| diff --git a/tools/virtio/ringtest/ptr_ring.c b/tools/virtio/ringtest/ptr_ring.c |
| index 635b07b4fdd3..b4a2e6af515f 100644 |
| --- a/tools/virtio/ringtest/ptr_ring.c |
| +++ b/tools/virtio/ringtest/ptr_ring.c |
| @@ -15,24 +15,41 @@ |
| #define unlikely(x) (__builtin_expect(!!(x), 0)) |
| #define likely(x) (__builtin_expect(!!(x), 1)) |
| #define ALIGN(x, a) (((x) + (a) - 1) / (a) * (a)) |
| +#define SIZE_MAX (~(size_t)0) |
| + |
| typedef pthread_spinlock_t spinlock_t; |
| |
| typedef int gfp_t; |
| -static void *kmalloc(unsigned size, gfp_t gfp) |
| -{ |
| - return memalign(64, size); |
| -} |
| +#define __GFP_ZERO 0x1 |
| |
| -static void *kzalloc(unsigned size, gfp_t gfp) |
| +static void *kmalloc(unsigned size, gfp_t gfp) |
| { |
| void *p = memalign(64, size); |
| if (!p) |
| return p; |
| - memset(p, 0, size); |
| |
| + if (gfp & __GFP_ZERO) |
| + memset(p, 0, size); |
| return p; |
| } |
| |
| +static inline void *kzalloc(unsigned size, gfp_t flags) |
| +{ |
| + return kmalloc(size, flags | __GFP_ZERO); |
| +} |
| + |
| +static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags) |
| +{ |
| + if (size != 0 && n > SIZE_MAX / size) |
| + return NULL; |
| + return kmalloc(n * size, flags); |
| +} |
| + |
| +static inline void *kcalloc(size_t n, size_t size, gfp_t flags) |
| +{ |
| + return kmalloc_array(n, size, flags | __GFP_ZERO); |
| +} |
| + |
| static void kfree(void *p) |
| { |
| if (p) |
| -- |
| 2.17.1 |
| |