Patch-mainline: v6.2-rc7

Git-commit: 3f7b75abf41cc4143aa295f62acbb060a012868d

References: git-fixes

From: Shunsuke Mie <mie@igel.co.jp>

Date: Tue, 10 Jan 2023 12:43:10 +0900

Subject: [PATCH] tools/virtio: fix the vringh test for virtio ring changes

Fix the build caused by missing kmsan_handle_dma() and is_power_of_2() that

are used in drivers/virtio/virtio_ring.c.

Signed-off-by: Shunsuke Mie <mie@igel.co.jp>

Message-Id: <20230110034310.779744-1-mie@igel.co.jp>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Signed-off-by: Juergen Gross <jgross@suse.com>

---

 tools/virtio/linux/bug.h         |  8 +++-----

 tools/virtio/linux/build_bug.h   |  7 +++++++

 tools/virtio/linux/cpumask.h     |  7 +++++++

 tools/virtio/linux/gfp.h         |  7 +++++++

 tools/virtio/linux/kernel.h      |  1 +

 tools/virtio/linux/kmsan.h       | 12 ++++++++++++

 tools/virtio/linux/scatterlist.h |  1 +

 tools/virtio/linux/topology.h    |  7 +++++++

 8 files changed, 45 insertions(+), 5 deletions(-)

 create mode 100644 tools/virtio/linux/build_bug.h

 create mode 100644 tools/virtio/linux/cpumask.h

 create mode 100644 tools/virtio/linux/gfp.h

 create mode 100644 tools/virtio/linux/kmsan.h

 create mode 100644 tools/virtio/linux/topology.h

diff --git a/tools/virtio/linux/bug.h b/tools/virtio/linux/bug.h

index 813baf13f62a..51a919083d9b 100644

--- a/tools/virtio/linux/bug.h

+++ b/tools/virtio/linux/bug.h

@@ -1,13 +1,11 @@

 /* SPDX-License-Identifier: GPL-2.0 */

-#ifndef BUG_H

-#define BUG_H

+#ifndef _LINUX_BUG_H

+#define _LINUX_BUG_H

 #include <asm/bug.h>

 #define BUG_ON(__BUG_ON_cond) assert(!(__BUG_ON_cond))

-#define BUILD_BUG_ON(x)

-

 #define BUG() abort()

-#endif /* BUG_H */

+#endif /* _LINUX_BUG_H */

diff --git a/tools/virtio/linux/build_bug.h b/tools/virtio/linux/build_bug.h

new file mode 100644

index 000000000000..cdbb75e28a60

--- /dev/null

+++ b/tools/virtio/linux/build_bug.h

@@ -0,0 +1,7 @@

+/* SPDX-License-Identifier: GPL-2.0 */

+#ifndef _LINUX_BUILD_BUG_H

+#define _LINUX_BUILD_BUG_H

+

+#define BUILD_BUG_ON(x)

+

+#endif	/* _LINUX_BUILD_BUG_H */

diff --git a/tools/virtio/linux/cpumask.h b/tools/virtio/linux/cpumask.h

new file mode 100644

index 000000000000..307da69d6b26

--- /dev/null

+++ b/tools/virtio/linux/cpumask.h

@@ -0,0 +1,7 @@

+/* SPDX-License-Identifier: GPL-2.0 */

+#ifndef _LINUX_CPUMASK_H

+#define _LINUX_CPUMASK_H

+

+#include <linux/kernel.h>

+

+#endif /* _LINUX_CPUMASK_H */

diff --git a/tools/virtio/linux/gfp.h b/tools/virtio/linux/gfp.h

new file mode 100644

index 000000000000..43d146f236f1

--- /dev/null

+++ b/tools/virtio/linux/gfp.h

@@ -0,0 +1,7 @@

+/* SPDX-License-Identifier: GPL-2.0 */

+#ifndef __LINUX_GFP_H

+#define __LINUX_GFP_H

+

+#include <linux/topology.h>

+

+#endif

diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h

index 21593bf97755..8b877167933d 100644

--- a/tools/virtio/linux/kernel.h

+++ b/tools/virtio/linux/kernel.h

@@ -10,6 +10,7 @@

 #include <stdarg.h>

 #include <linux/compiler.h>

+#include <linux/log2.h>

 #include <linux/types.h>

 #include <linux/overflow.h>

 #include <linux/list.h>

diff --git a/tools/virtio/linux/kmsan.h b/tools/virtio/linux/kmsan.h

new file mode 100644

index 000000000000..272b5aa285d5

--- /dev/null

+++ b/tools/virtio/linux/kmsan.h

@@ -0,0 +1,12 @@

+/* SPDX-License-Identifier: GPL-2.0 */

+#ifndef _LINUX_KMSAN_H

+#define _LINUX_KMSAN_H

+

+#include <linux/gfp.h>

+

+inline void kmsan_handle_dma(struct page *page, size_t offset, size_t size,

+			     enum dma_data_direction dir)

+{

+}

+

+#endif /* _LINUX_KMSAN_H */

diff --git a/tools/virtio/linux/scatterlist.h b/tools/virtio/linux/scatterlist.h

index 369ee308b668..74d9e1825748 100644

--- a/tools/virtio/linux/scatterlist.h

+++ b/tools/virtio/linux/scatterlist.h

@@ -2,6 +2,7 @@

 #ifndef SCATTERLIST_H

 #define SCATTERLIST_H

 #include <linux/kernel.h>

+#include <linux/bug.h>

 struct scatterlist {

 	unsigned long	page_link;

diff --git a/tools/virtio/linux/topology.h b/tools/virtio/linux/topology.h

new file mode 100644

index 000000000000..910794afb993

--- /dev/null

+++ b/tools/virtio/linux/topology.h

@@ -0,0 +1,7 @@

+/* SPDX-License-Identifier: GPL-2.0 */

+#ifndef _LINUX_TOPOLOGY_H

+#define _LINUX_TOPOLOGY_H

+

+#include <linux/cpumask.h>

+

+#endif /* _LINUX_TOPOLOGY_H */

-- 

2.35.3