Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bbdfc2f70610bebb841d0874dc901c648308e43a

Authored by Jens Axboe
Committed by David S. Miller
1 parent d10f2150ea
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[SPLICE]: Don't assume regular pages in splice_to_pipe() 

Allow caller to pass in a release function, there might be
other resources that need releasing as well. Needed for
network receive.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 9 additions and 1 deletions Side-by-side Diff

... ... @@ -254,11 +254,16 @@
254 254 }
255 255  
256 256 while (page_nr < spd_pages)
257   - page_cache_release(spd->pages[page_nr++]);
  257 + spd->spd_release(spd, page_nr++);
258 258  
259 259 return ret;
260 260 }
261 261  
  262 +static void spd_release_page(struct splice_pipe_desc *spd, unsigned int i)
  263 +{
  264 + page_cache_release(spd->pages[i]);
  265 +}
  266 +
262 267 static int
263 268 __generic_file_splice_read(struct file *in, loff_t *ppos,
264 269 struct pipe_inode_info *pipe, size_t len,
... ... @@ -277,6 +282,7 @@
277 282 .partial = partial,
278 283 .flags = flags,
279 284 .ops = &page_cache_pipe_buf_ops,
  285 + .spd_release = spd_release_page,
280 286 };
281 287  
282 288 index = *ppos >> PAGE_CACHE_SHIFT;
... ... @@ -1432,6 +1438,7 @@
1432 1438 .partial = partial,
1433 1439 .flags = flags,
1434 1440 .ops = &user_page_pipe_buf_ops,
  1441 + .spd_release = spd_release_page,
1435 1442 };
1436 1443  
1437 1444 pipe = pipe_info(file->f_path.dentry->d_inode);
include/linux/splice.h
Diff comments   View file @ bbdfc2f
... ... @@ -53,6 +53,7 @@
53 53 int nr_pages; /* number of pages in map */
54 54 unsigned int flags; /* splice flags */
55 55 const struct pipe_buf_operations *ops;/* ops associated with output pipe */
  56 + void (*spd_release)(struct splice_pipe_desc *, unsigned int);
56 57 };
57 58  
58 59 typedef int (splice_actor)(struct pipe_inode_info *, struct pipe_buffer *,