Skip to contentSkip to conversation

shmem: convert to using splice instead of sendfile()

DISCUSSION Andrew Morton 3 participants 3 messages Jul 11, 2007 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Review

Quoted 7 lines · On Tue, 10 Jul 2007 23:00:59 GMT Linux Kernel Mailing List…
(quoted diff) +7 -0
+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?

#2 lore raw
Quoted 12 lines · Andrew Morton

Review

Quoted 7 lines · On Tue, 10 Jul 2007 23:00:59 GMT Linux Kernel Mailing List…
(quoted diff) +7 -0
+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

Quoted 8 lines

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?

Signature · 1 line
Jens Axboe
#3 lore raw
Quoted 20 lines · Jens Axboe
Quoted 19 lines · Andrew Morton

Review

Quoted 7 lines · On Tue, 10 Jul 2007 23:00:59 GMT Linux Kernel Mailing List…
(quoted diff) +7 -0
+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;
Quoted 3 lines
Quoted 1 line

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