Skip to contentSkip to conversation

UIO: unbreak uio.h userspace compilation

PATCH In review Jiri Slaby 3 participants 6 messages Jul 28, 2009

Subsystems (2)
lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 1/1 UIO: unbreak uio.h userspace compilation

To avoid userspace build failures such as:
.../linux/uio.h:37: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘iov_length’ .../linux/uio.h:47: error: expected declaration specifiers or ‘...’ before ‘size_t’ move one uio declaration inside a __KERNEL__ block and use __kernel_size_t instead of size_t for iov_length (it's inlined and used in userspace already).

---
 include/linux/uio.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
include/linux/uio.h +4 -2
index b7fe138..9b2623c 100644
@@ -42,16 +42,18 @@ struct kvec {
  * segment lengths have been validated.  Because the individual lengths can
  * overflow a size_t when added together.
  */
-static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
+static inline __kernel_size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
 {
 	unsigned long seg;
-	size_t ret = 0;
+	__kernel_size_t ret = 0;
 
 	for (seg = 0; seg < nr_segs; seg++)
 		ret += iov[seg].iov_len;
 	return ret;
 }
 
+#ifdef __KERNEL__
 unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
+#endif
 
 #endif
Signature · 1 line
1.6.3.3
#1 lore raw
Quoted 13 lines · Jiri Slaby
include/linux/uio.h +1 -2
index b7fe138..9b2623c 100644
@@ -42,16 +42,18 @@ struct kvec {
  * segment lengths have been validated.  Because the individual lengths can
  * overflow a size_t when added together.
  */
-static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
+static inline __kernel_size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
 {
 	unsigned long seg;
-	size_t ret = 0;

include/linux/uio.h struct kvec { · line 57

Quoted 10 lines
include/linux/uio.h +3 -0
+	__kernel_size_t ret = 0;
 
 	for (seg = 0; seg < nr_segs; seg++)
 		ret += iov[seg].iov_len;
 	return ret;
 }
 
+#ifdef __KERNEL__
 unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
+#endif

iov_length is kernel internal and should not be exported to userspace.

author
#2 lore raw

PATCH 1/1 UIO: mark uio.h functions __KERNEL__ only

To avoid userspace build failures such as:
.../linux/uio.h:37: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘iov_length’ .../linux/uio.h:47: error: expected declaration specifiers or ‘...’ before ‘size_t’ move uio functions inside a __KERNEL__ block.

---
 include/linux/uio.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/linux/uio.h +2 -0
index b7fe138..693c149 100644
@@ -35,6 +35,7 @@ struct kvec {
 #define UIO_FASTIOV	8
 #define UIO_MAXIOV	1024
 
+#ifdef __KERNEL__
 /*
  * Total number of bytes covered by an iovec.
  *
@@ -53,5 +54,6 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
 }
 
 unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
+#endif
 
 #endif
Signature · 6 lines
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#3 lore raw

Re: [PATCH 1/1] UIO: mark uio.h functions __KERNEL__ only

Quoted 23 lines · Jiri Slaby

To avoid userspace build failures such as:
.../linux/uio.h:37: error: expected ???=???, ???,???, ???;???, ???asm??? or ???__attribute__??? before ???iov_length??? .../linux/uio.h:47: error: expected declaration specifiers or ???...??? before ???size_t???
move uio functions inside a __KERNEL__ block.

---
 include/linux/uio.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/linux/uio.h +1 -0
index b7fe138..693c149 100644
@@ -35,6 +35,7 @@ struct kvec {
 #define UIO_FASTIOV	8
 #define UIO_MAXIOV	1024
 
+#ifdef __KERNEL__
 /*
  * Total number of bytes covered by an iovec.
  *

include/linux/uio.h static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs) · line 59

Quoted 6 lines
include/linux/uio.h +1 -0
@@ -53,5 +54,6 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
 }
 
 unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
+#endif
 
 #endif

Can we get this fixed up so we have a single #ifdef __KERNEL__ block? It would be prettier, and nothing the in non-kernel part would rely on the kernel part so you can put the kernel part in the bottom of the file.

Sam

author
#4 lore raw

PATCH v3 1/1 UIO: mark uio.h functions __KERNEL__ only

To avoid userspace build failures such as:
.../linux/uio.h:37: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘iov_length’ .../linux/uio.h:47: error: expected declaration specifiers or ‘...’ before ‘size_t’ move uio functions inside a __KERNEL__ block.

---
 include/linux/uio.h |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
include/linux/uio.h +8 -9
index b7fe138..98c1143 100644
@@ -19,15 +19,6 @@ struct iovec
 	__kernel_size_t iov_len; /* Must be size_t (1003.1g) */
 };
 
-#ifdef __KERNEL__
-
-struct kvec {
-	void *iov_base; /* and that should *never* hold a userland pointer */
-	size_t iov_len;
-};
-
-#endif
-
 /*
  *	UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
  */
@@ -35,6 +26,13 @@ struct kvec {
 #define UIO_FASTIOV	8
 #define UIO_MAXIOV	1024
 
+#ifdef __KERNEL__
+
+struct kvec {
+	void *iov_base; /* and that should *never* hold a userland pointer */
+	size_t iov_len;
+};
+
 /*
  * Total number of bytes covered by an iovec.
  *
@@ -53,5 +51,6 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
 }
 
 unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
+#endif
 
 #endif
Signature · 6 lines
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Acked-by on v3 1/1
#5 lore raw

Re: [PATCH v3 1/1] UIO: mark uio.h functions __KERNEL__ only

Quoted 6 lines · Jiri Slaby

To avoid userspace build failures such as:
.../linux/uio.h:37: error: expected ???=???, ???,???, ???;???, ???asm??? or ???__attribute__??? before ???iov_length??? .../linux/uio.h:47: error: expected declaration specifiers or ???...??? before ???size_t???
move uio functions inside a __KERNEL__ block.

Diff is larger but result is better - thanks.

Sam