Changeset 772 for GPL/trunk/include/linux/uio.h

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/linux/uio.h (modified) (3 diffs)

GPL/trunk/include/linux/uio.h

@@ -4 +4 @@
 #define _LINUX_UIO_H
 
-enum {
-        ITER_IOVEC = 0,
-        ITER_KVEC = 2,
-        ITER_BVEC = 4,
+#include <linux/types.h>
+
+enum iter_type {
+        /* iter types */
+        ITER_IOVEC,
+        ITER_KVEC,
+        ITER_BVEC,
+        ITER_XARRAY,
+        ITER_DISCARD,
+        ITER_UBUF,
+};
+
+#define ITER_SOURCE     1       // == WRITE
+#define ITER_DEST       0       // == READ
+
+struct kvec {
+        void *iov_base; /* and that should *never* hold a userland pointer */
+        size_t iov_len;
 };
 
@@ -20 +34 @@
 
 struct iov_iter {
-        int type;
-        size_t iov_offset;
-        size_t count;
+        u8 iter_type;
+        bool copy_mc;
+        bool nofault;
+        bool data_source;
+        bool user_backed;
+        union {
+                /*
+                 * This really should be a const, but we cannot do that without
+                 * also modifying any of the zero-filling iter init functions.
+                 * Leave it non-const for now, but it should be treated as such.
+                 */
+                struct iovec __ubuf_iovec;
+                struct {
+                        union {
+                                /* use iter_iov() to get the current vec */
+                                const struct iovec *__iov;
+                                void __user *ubuf;
+                        };
+                        size_t count;
+                };
+        };
         union {
                 const struct iovec *iov;
@@ -33 +65 @@
 static inline bool iter_is_iovec(const struct iov_iter *i)
 {
-        return !(i->type & (ITER_BVEC | ITER_KVEC));
+        return !(i->iter_type & (ITER_BVEC | ITER_KVEC));
 }
 
+static inline const struct iovec *iter_iov(const struct iov_iter *iter)
+{
+        if (iter->iter_type == ITER_UBUF)
+                return (const struct iovec *) &iter->__ubuf_iovec;
+        return iter->__iov;
+}
+int import_ubuf(int type, void __user *buf, size_t len, struct iov_iter *i);
+
 #endif /* _LINUX_UIO_H */