| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <3BD9CEE4EBD5E74B98FE2D277EB60E0B38F53CB6@IRSMSX104.ger.corp.intel.com>
Date: Mon, 15 Apr 2019 11:09:35 +0000
From: "Rojewski, Cezary" <cezary.rojewski@...el.com>
To: "stefani@...bold.net" <stefani@...bold.net>
CC: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [RFC] kfifo: Add support for copying to and from IO space.
Behind the scenes kfifo_in and kfifo_out use memcpy explicitly. This is
not suitable when dealing with IO space. Declare simple IO equivalents in
form of kfifo_fromio and kfifo_toio which make use of memcpy_fromio and
memcpy_toio respectively. While doing so, don't forget about their
spinlocked friends.
Additional thoughts:
As one can see, this code is mostly borrowed from kfifo_in and kfifo_out.
Wanted to avoid any duplications at the beginning, yet to do so, function
pointer would have to be provided as function parameter. That is, for some
base, "generic" function that would handle memcpy - given the pointer - from
that point onward. memcpy_fromio / memcpy_toio have different declarations
compared to memcpy, what impacts their caller declaration, thus this idea
quickly cease to exist.
Why no macros? While meta approach is suitable for most kfifos, when it comes
to IO space everyone simply operates on bytes and there is already basic kfifo
struct for that defined in the very kfifo.h header file. Need no more.
Why no esize? Same as for previous one. Since we are dealing with unsigned
chars here, I believe there is no need to complicate kfifo_fromio/ kfifo_toio
implementation with them.
I might be wrong with all or none of above. Feedback is greatly appreciated.
Documentation is missing - will be added later if idea is accepted, in non-RFC
mail.
Signed-off-by: Cezary Rojewski <cezary.rojewski@...el.com>
---
include/linux/kfifo.h | 32 ++++++++++++++++++++
lib/kfifo.c | 68 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 89fc8dc7bf38..db1a1b6a3d8a 100644
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@ -769,6 +769,38 @@ __kfifo_uint_must_check_helper( \
}) \
)
+extern unsigned int kfifo_fromio(struct kfifo *fifo,
+ const void __iomem *addr, unsigned int len);
+
+static inline unsigned int
+kfifo_fromio_spinlocked(struct kfifo *fifo, const void __iomem *addr,
+ unsigned int len, spinlock_t *lock)
+{
+ unsigned long flags;
+ unsigned int ret;
+
+ spin_lock_irqsave(lock, flags);
+ ret = kfifo_fromio(fifo, addr, len);
+ spin_unlock_irqrestore(lock, flags);
+ return ret;
+}
+
+extern unsigned int kfifo_toio(struct kfifo *fifo,
+ void __iomem *addr, unsigned int len);
+
+static inline unsigned int __must_check kfifo_toio_spinlocked(struct
+kfifo *fifo, void __iomem *addr,
+ unsigned int len, spinlock_t *lock)
+{
+ unsigned long flags;
+ unsigned int ret;
+
+ spin_lock_irqsave(lock, flags);
+ ret = kfifo_toio(fifo, addr, len);
+ spin_unlock_irqrestore(lock, flags);
+ return ret;
+}
+
extern int __kfifo_alloc(struct __kfifo *fifo, unsigned int size,
size_t esize, gfp_t gfp_mask);
diff --git a/lib/kfifo.c b/lib/kfifo.c
index 015656aa8182..f7009326adf3 100644
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@ -138,6 +138,74 @@ unsigned int __kfifo_in(struct __kfifo *fifo, } EXPORT_SYMBOL(__kfifo_in);
+static void kfifo_copy_fromio(struct __kfifo *fifo, const void __iomem *src,
+ unsigned int len, unsigned int off)
+{
+ unsigned int size = fifo->mask + 1;
+ unsigned int l;
+
+ off &= fifo->mask;
+ l = min(len, size - off);
+
+ memcpy_fromio(fifo->data + off, src, l);
+ memcpy_fromio(fifo->data, src + l, len - l);
+ /*
+ * make sure that the data in the fifo is up to date before
+ * incrementing the fifo->in index counter
+ */
+ smp_wmb();
+}
+
+unsigned int kfifo_fromio(struct kfifo *fifo,
+ const void __iomem *addr, unsigned int len) {
+ struct __kfifo *__fifo = &fifo->kfifo;
+ unsigned int l;
+
+ l = kfifo_unused(__fifo);
+ if (len > l)
+ len = l;
+
+ kfifo_copy_fromio(__fifo, addr, len, __fifo->in);
+ __fifo->in += len;
+ return len;
+}
+EXPORT_SYMBOL(kfifo_fromio);
+
+static void kfifo_copy_toio(struct __kfifo *fifo, void __iomem *dst,
+ unsigned int len, unsigned int off)
+{
+ unsigned int size = fifo->mask + 1;
+ unsigned int l;
+
+ off &= fifo->mask;
+ l = min(len, size - off);
+
+ memcpy_toio(dst, fifo->data + off, l);
+ memcpy_toio(dst + l, fifo->data, len - l);
+ /*
+ * make sure that the data is copied before
+ * incrementing the fifo->out index counter
+ */
+ smp_wmb();
+}
+
+unsigned int __must_check kfifo_toio(struct kfifo *fifo,
+ void __iomem *addr, unsigned int len) {
+ struct __kfifo *__fifo = &fifo->kfifo;
+ unsigned int l;
+
+ l = __fifo->in - __fifo->out;
+ if (len > l)
+ len = l;
+
+ kfifo_copy_toio(__fifo, addr, len, __fifo->out);
+ __fifo->out += len;
+ return len;
+}
+EXPORT_SYMBOL(kfifo_toio);
+
static void kfifo_copy_out(struct __kfifo *fifo, void *dst,
unsigned int len, unsigned int off)
{
--
2.17.1
Powered by blists - more mailing lists