Skip to content

Commit 708e350

Browse files
Hugh Dickinstorvalds
Hugh Dickins
authored andcommitted
tmpfs: clone shmem_file_splice_read()
Copy __generic_file_splice_read() and generic_file_splice_read() from fs/splice.c to shmem_file_splice_read() in mm/shmem.c. Make page_cache_pipe_buf_ops and spd_release_page() accessible to it. Signed-off-by: Hugh Dickins <[email protected]> Cc: Jens Axboe <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 2efaca9 commit 708e350

File tree

3 files changed

+221
-3
lines changed

3 files changed

+221
-3
lines changed

fs/splice.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static int page_cache_pipe_buf_confirm(struct pipe_inode_info *pipe,
132132
return err;
133133
}
134134

135-
static const struct pipe_buf_operations page_cache_pipe_buf_ops = {
135+
const struct pipe_buf_operations page_cache_pipe_buf_ops = {
136136
.can_merge = 0,
137137
.map = generic_pipe_buf_map,
138138
.unmap = generic_pipe_buf_unmap,
@@ -264,7 +264,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
264264
return ret;
265265
}
266266

267-
static void spd_release_page(struct splice_pipe_desc *spd, unsigned int i)
267+
void spd_release_page(struct splice_pipe_desc *spd, unsigned int i)
268268
{
269269
page_cache_release(spd->pages[i]);
270270
}

include/linux/splice.h

+2
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,7 @@ extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
8888
extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
8989
extern void splice_shrink_spd(struct pipe_inode_info *,
9090
struct splice_pipe_desc *);
91+
extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
9192

93+
extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
9294
#endif

mm/shmem.c

+217-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ static struct vfsmount *shm_mnt;
5151
#include <linux/shmem_fs.h>
5252
#include <linux/writeback.h>
5353
#include <linux/blkdev.h>
54+
#include <linux/splice.h>
5455
#include <linux/security.h>
5556
#include <linux/swapops.h>
5657
#include <linux/mempolicy.h>
@@ -1844,6 +1845,221 @@ static ssize_t shmem_file_aio_read(struct kiocb *iocb,
18441845
return retval;
18451846
}
18461847

1848+
static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,
1849+
struct pipe_inode_info *pipe, size_t len,
1850+
unsigned int flags)
1851+
{
1852+
struct address_space *mapping = in->f_mapping;
1853+
unsigned int loff, nr_pages, req_pages;
1854+
struct page *pages[PIPE_DEF_BUFFERS];
1855+
struct partial_page partial[PIPE_DEF_BUFFERS];
1856+
struct page *page;
1857+
pgoff_t index, end_index;
1858+
loff_t isize, left;
1859+
int error, page_nr;
1860+
struct splice_pipe_desc spd = {
1861+
.pages = pages,
1862+
.partial = partial,
1863+
.flags = flags,
1864+
.ops = &page_cache_pipe_buf_ops,
1865+
.spd_release = spd_release_page,
1866+
};
1867+
1868+
isize = i_size_read(in->f_mapping->host);
1869+
if (unlikely(*ppos >= isize))
1870+
return 0;
1871+
1872+
left = isize - *ppos;
1873+
if (unlikely(left < len))
1874+
len = left;
1875+
1876+
if (splice_grow_spd(pipe, &spd))
1877+
return -ENOMEM;
1878+
1879+
index = *ppos >> PAGE_CACHE_SHIFT;
1880+
loff = *ppos & ~PAGE_CACHE_MASK;
1881+
req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
1882+
nr_pages = min(req_pages, pipe->buffers);
1883+
1884+
/*
1885+
* Lookup the (hopefully) full range of pages we need.
1886+
*/
1887+
spd.nr_pages = find_get_pages_contig(mapping, index,
1888+
nr_pages, spd.pages);
1889+
index += spd.nr_pages;
1890+
1891+
/*
1892+
* If find_get_pages_contig() returned fewer pages than we needed,
1893+
* readahead/allocate the rest and fill in the holes.
1894+
*/
1895+
if (spd.nr_pages < nr_pages)
1896+
page_cache_sync_readahead(mapping, &in->f_ra, in,
1897+
index, req_pages - spd.nr_pages);
1898+
1899+
error = 0;
1900+
while (spd.nr_pages < nr_pages) {
1901+
/*
1902+
* Page could be there, find_get_pages_contig() breaks on
1903+
* the first hole.
1904+
*/
1905+
page = find_get_page(mapping, index);
1906+
if (!page) {
1907+
/*
1908+
* page didn't exist, allocate one.
1909+
*/
1910+
page = page_cache_alloc_cold(mapping);
1911+
if (!page)
1912+
break;
1913+
1914+
error = add_to_page_cache_lru(page, mapping, index,
1915+
GFP_KERNEL);
1916+
if (unlikely(error)) {
1917+
page_cache_release(page);
1918+
if (error == -EEXIST)
1919+
continue;
1920+
break;
1921+
}
1922+
/*
1923+
* add_to_page_cache() locks the page, unlock it
1924+
* to avoid convoluting the logic below even more.
1925+
*/
1926+
unlock_page(page);
1927+
}
1928+
1929+
spd.pages[spd.nr_pages++] = page;
1930+
index++;
1931+
}
1932+
1933+
/*
1934+
* Now loop over the map and see if we need to start IO on any
1935+
* pages, fill in the partial map, etc.
1936+
*/
1937+
index = *ppos >> PAGE_CACHE_SHIFT;
1938+
nr_pages = spd.nr_pages;
1939+
spd.nr_pages = 0;
1940+
for (page_nr = 0; page_nr < nr_pages; page_nr++) {
1941+
unsigned int this_len;
1942+
1943+
if (!len)
1944+
break;
1945+
1946+
/*
1947+
* this_len is the max we'll use from this page
1948+
*/
1949+
this_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff);
1950+
page = spd.pages[page_nr];
1951+
1952+
if (PageReadahead(page))
1953+
page_cache_async_readahead(mapping, &in->f_ra, in,
1954+
page, index, req_pages - page_nr);
1955+
1956+
/*
1957+
* If the page isn't uptodate, we may need to start io on it
1958+
*/
1959+
if (!PageUptodate(page)) {
1960+
lock_page(page);
1961+
1962+
/*
1963+
* Page was truncated, or invalidated by the
1964+
* filesystem. Redo the find/create, but this time the
1965+
* page is kept locked, so there's no chance of another
1966+
* race with truncate/invalidate.
1967+
*/
1968+
if (!page->mapping) {
1969+
unlock_page(page);
1970+
page = find_or_create_page(mapping, index,
1971+
mapping_gfp_mask(mapping));
1972+
1973+
if (!page) {
1974+
error = -ENOMEM;
1975+
break;
1976+
}
1977+
page_cache_release(spd.pages[page_nr]);
1978+
spd.pages[page_nr] = page;
1979+
}
1980+
/*
1981+
* page was already under io and is now done, great
1982+
*/
1983+
if (PageUptodate(page)) {
1984+
unlock_page(page);
1985+
goto fill_it;
1986+
}
1987+
1988+
/*
1989+
* need to read in the page
1990+
*/
1991+
error = mapping->a_ops->readpage(in, page);
1992+
if (unlikely(error)) {
1993+
/*
1994+
* We really should re-lookup the page here,
1995+
* but it complicates things a lot. Instead
1996+
* lets just do what we already stored, and
1997+
* we'll get it the next time we are called.
1998+
*/
1999+
if (error == AOP_TRUNCATED_PAGE)
2000+
error = 0;
2001+
2002+
break;
2003+
}
2004+
}
2005+
fill_it:
2006+
/*
2007+
* i_size must be checked after PageUptodate.
2008+
*/
2009+
isize = i_size_read(mapping->host);
2010+
end_index = (isize - 1) >> PAGE_CACHE_SHIFT;
2011+
if (unlikely(!isize || index > end_index))
2012+
break;
2013+
2014+
/*
2015+
* if this is the last page, see if we need to shrink
2016+
* the length and stop
2017+
*/
2018+
if (end_index == index) {
2019+
unsigned int plen;
2020+
2021+
/*
2022+
* max good bytes in this page
2023+
*/
2024+
plen = ((isize - 1) & ~PAGE_CACHE_MASK) + 1;
2025+
if (plen <= loff)
2026+
break;
2027+
2028+
/*
2029+
* force quit after adding this page
2030+
*/
2031+
this_len = min(this_len, plen - loff);
2032+
len = this_len;
2033+
}
2034+
2035+
spd.partial[page_nr].offset = loff;
2036+
spd.partial[page_nr].len = this_len;
2037+
len -= this_len;
2038+
loff = 0;
2039+
spd.nr_pages++;
2040+
index++;
2041+
}
2042+
2043+
/*
2044+
* Release any pages at the end, if we quit early. 'page_nr' is how far
2045+
* we got, 'nr_pages' is how many pages are in the map.
2046+
*/
2047+
while (page_nr < nr_pages)
2048+
page_cache_release(spd.pages[page_nr++]);
2049+
in->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;
2050+
2051+
if (spd.nr_pages)
2052+
error = splice_to_pipe(pipe, &spd);
2053+
2054+
splice_shrink_spd(pipe, &spd);
2055+
2056+
if (error > 0) {
2057+
*ppos += error;
2058+
file_accessed(in);
2059+
}
2060+
return error;
2061+
}
2062+
18472063
static int shmem_statfs(struct dentry *dentry, struct kstatfs *buf)
18482064
{
18492065
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
@@ -2699,7 +2915,7 @@ static const struct file_operations shmem_file_operations = {
26992915
.aio_read = shmem_file_aio_read,
27002916
.aio_write = generic_file_aio_write,
27012917
.fsync = noop_fsync,
2702-
.splice_read = generic_file_splice_read,
2918+
.splice_read = shmem_file_splice_read,
27032919
.splice_write = generic_file_splice_write,
27042920
#endif
27052921
};

0 commit comments

Comments
 (0)