X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_splice.c;h=cd803a70805e29abada097e5933170ce453804ae;hp=ded18ba80fc1d02949cb9931cdc1f5049a929ef7;hb=2459130397d7e7eecc44a5f06a39d65c78257eef;hpb=88dfd89924114cc8948c300cbd6afd3503ec0b23 diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c index ded18ba8..cd803a70 100644 --- a/lib/ringbuffer/ring_buffer_splice.c +++ b/lib/ringbuffer/ring_buffer_splice.c @@ -1,22 +1,23 @@ -/* +/* SPDX-License-Identifier: GPL-2.0-only + * * ring_buffer_splice.c * * Copyright (C) 2002-2005 - Tom Zanussi , IBM Corp * Copyright (C) 1999-2005 - Karim Yaghmour - * Copyright (C) 2008-2010 - Mathieu Desnoyers - * - * Re-using content from kernel/relay.c. + * Copyright (C) 2008-2012 - Mathieu Desnoyers * - * This file is released under the GPL v2. + * Re-using code from kernel/relay.c, which is why it is licensed under + * the GPL-2.0. */ #include #include +#include -#include "../../wrapper/splice.h" -#include "../../wrapper/ringbuffer/backend.h" -#include "../../wrapper/ringbuffer/frontend.h" -#include "../../wrapper/ringbuffer/vfs.h" +#include +#include +#include +#include #if 0 #define printk_dbg(fmt, args...) printk(fmt, args) @@ -24,10 +25,12 @@ #define printk_dbg(fmt, args...) #endif -loff_t lib_ring_buffer_no_llseek(struct file *file, loff_t offset, int origin) +loff_t vfs_lib_ring_buffer_no_llseek(struct file *file, loff_t offset, + int origin) { return -ESPIPE; } +EXPORT_SYMBOL_GPL(vfs_lib_ring_buffer_no_llseek); /* * Release pages from the buffer so splice pipe_to_file can move them. @@ -40,9 +43,13 @@ static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe, } static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = { +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0)) .can_merge = 0, +#endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) .map = generic_pipe_buf_map, .unmap = generic_pipe_buf_unmap, +#endif .confirm = generic_pipe_buf_confirm, .release = lib_ring_buffer_pipe_buf_release, .steal = generic_pipe_buf_steal, @@ -65,11 +72,11 @@ static int subbuf_splice_actor(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, - unsigned int flags) + unsigned int flags, + struct lib_ring_buffer *buf) { - struct lib_ring_buffer *buf = in->private_data; struct channel *chan = buf->backend.chan; - const struct lib_ring_buffer_config *config = chan->backend.config; + const struct lib_ring_buffer_config *config = &chan->backend.config; unsigned int poff, subbuf_pages, nr_pages; struct page *pages[PIPE_DEF_BUFFERS]; struct partial_page partial[PIPE_DEF_BUFFERS]; @@ -77,7 +84,9 @@ static int subbuf_splice_actor(struct file *in, .pages = pages, .nr_pages = 0, .partial = partial, +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) .flags = flags, +#endif .ops = &ring_buffer_pipe_buf_ops, .spd_release = lib_ring_buffer_page_release, }; @@ -108,7 +117,8 @@ static int subbuf_splice_actor(struct file *in, for (; spd.nr_pages < nr_pages; spd.nr_pages++) { unsigned int this_len; - struct page **page, *new_page; + unsigned long *pfnp, new_pfn; + struct page *new_page; void **virt; if (!len) @@ -125,11 +135,11 @@ static int subbuf_splice_actor(struct file *in, GFP_KERNEL | __GFP_ZERO, 0); if (!new_page) break; - + new_pfn = page_to_pfn(new_page); this_len = PAGE_SIZE - poff; - page = lib_ring_buffer_read_get_page(&buf->backend, roffset, &virt); - spd.pages[spd.nr_pages] = *page; - *page = new_page; + pfnp = lib_ring_buffer_read_get_pfn(&buf->backend, roffset, &virt); + spd.pages[spd.nr_pages] = pfn_to_page(*pfnp); + *pfnp = new_pfn; *virt = page_address(new_page); spd.partial[spd.nr_pages].offset = poff; spd.partial[spd.nr_pages].len = this_len; @@ -147,11 +157,11 @@ static int subbuf_splice_actor(struct file *in, ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, - unsigned int flags) + unsigned int flags, + struct lib_ring_buffer *buf) { - struct lib_ring_buffer *buf = in->private_data; struct channel *chan = buf->backend.chan; - const struct lib_ring_buffer_config *config = chan->backend.config; + const struct lib_ring_buffer_config *config = &chan->backend.config; ssize_t spliced; int ret; @@ -176,7 +186,7 @@ ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos, printk_dbg(KERN_DEBUG "SPLICE read len %zu pos %zd\n", len, (ssize_t)*ppos); while (len && !spliced) { - ret = subbuf_splice_actor(in, ppos, pipe, len, flags); + ret = subbuf_splice_actor(in, ppos, pipe, len, flags, buf); printk_dbg(KERN_DEBUG "SPLICE read loop ret %d\n", ret); if (ret < 0) break; @@ -200,3 +210,13 @@ ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos, return ret; } EXPORT_SYMBOL_GPL(lib_ring_buffer_splice_read); + +ssize_t vfs_lib_ring_buffer_splice_read(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) +{ + struct lib_ring_buffer *buf = in->private_data; + + return lib_ring_buffer_splice_read(in, ppos, pipe, len, flags, buf); +} +EXPORT_SYMBOL_GPL(vfs_lib_ring_buffer_splice_read);