Re: shmem: convert to using splice instead of sendfile()

[Hugh Dickins]

On Wed, 11 Jul 2007, Jens Axboe wrote:
> On Tue, Jul 10 2007, Andrew Morton wrote:
> > On Tue, 10 Jul 2007 23:00:59 GMT Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx> wrote:
> > 
> > > +static int shmem_readpage(struct file *file, struct page *page)
> > > +{
> > > +	struct inode *inode = page->mapping->host;
> > > +	int error = shmem_getpage(inode, page->index, &page, SGP_CACHE, NULL);
> > > +	unlock_page(page);
> > > +	return error;
> > > +}
> > 
> > Worried.  shmem_getpage() does
> > 
> > done:
> > 	if (*pagep != filepage) {
> > 		unlock_page(filepage);
> > 		*pagep = filepage;
> > 	}
> > 	return 0;
> > 
> > so we end up unlocking an unlocked page?
> 
> It certainly looks like it - Hugh?

No, it's fine.  The relevant comment is up at the entry to shmem_getpage:
	struct page *filepage = *pagep;  /* (moved down, I'm cheating!) */
	/*
	 * Normally, filepage is NULL on entry, and either found
	 * uptodate immediately, or allocated and zeroed, or read
	 * in under swappage, which is then assigned to filepage.
	 * But shmem_readpage and shmem_prepare_write pass in a locked
	 * filepage, which may be found not uptodate by other callers
	 * too, and may need to be copied from the swappage read in.
	 */
So down at the exit from shmem_getpage, in the shmem_readpage case,
filepage _is_ *pagep, and so it skips that unlock_page - the caller
passed in a locked page, it's up to the caller to unlock it; but
the general ->readpage interface then demands that shmem_readpage
unlock the page which was passed in to it with lock held.  

(The *pagep != filepage test is also trying to skip the unlock_page
in the case when shmem_getpage needed to allocate the page itself,
but couldn't: both *pagep and filepage NULL.)

Ironically, the need for shmem_getpage to handle the case of a page
passed into it almost vanished - Nick's upcoming aops ->write_begin
abolishes the shmem_prepare_write case - but now it is needed for
readpage for splice: but I'm hoping perhaps we'll devise a readpage
replacement more like write_begin/write_end, then can eliminate it.

Hugh
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/