mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-23 19:11:51 +00:00
Code Issues Releases Wiki Activity

kfifo: pass offset to setup_sgl_buf() instead of a pointer

Browse source 
As a preparatory for dma addresses filling, we need the data offset
instead of virtual pointer in setup_sgl_buf(). So pass the former
instead the latter.

And pointer to fifo is needed in setup_sgl_buf() now too.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: Stefani Seibold <stefani@seibold.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: https://lore.kernel.org/r/20240405060826.2521-7-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE) 2024-04-05 08:08:17 +02:00 committed by Greg Kroah-Hartman
parent ed6d22f5d8
commit fea0dde081
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/kfifo.c
View file

@ -305,9 +305,12 @@ int __kfifo_to_user(struct __kfifo *fifo, void __user *to,
}
EXPORT_SYMBOL(__kfifo_to_user);
static unsigned int setup_sgl_buf(struct scatterlist *sgl, void *buf,
int nents, unsigned int len)
static unsigned int setup_sgl_buf(struct __kfifo *fifo, struct scatterlist *sgl,
unsigned int data_offset, int nents,
unsigned int len)
{
const void *buf = fifo->data + data_offset;
if (!nents || !len)
return 0;
@ -332,8 +335,8 @@ static unsigned int setup_sgl(struct __kfifo *fifo, struct scatterlist *sgl,
}
len_to_end = min(len, size - off);
n = setup_sgl_buf(sgl, fifo->data + off, nents, len_to_end);
n += setup_sgl_buf(sgl + n, fifo->data, nents - n, len - len_to_end);
n = setup_sgl_buf(fifo, sgl, off, nents, len_to_end);
n += setup_sgl_buf(fifo, sgl + n, 0, nents - n, len - len_to_end);
return n;
}