On Tue, 1 Jul 2014, Vlastimil Babka wrote:
> On 06/27/2014 07:36 AM, Hugh Dickins wrote:> [Cc Johannes: at the end I have
> a particular question for you]
> > On Thu, 26 Jun 2014, Vlastimil Babka wrote:
> > >
> > > Thanks, I didn't notice that. Do I understand correctly that this could
> > > mean
> > > info leak for the punch hole call, but wouldn't be a problem for madvise?
> > > (In
> > > any case, that means the solution is not general enough for all kernels,
> > > so
> > > I'm asking just to be sure).
> >
> > It's exactly the same issue for the madvise as for the fallocate:
> > data that is promised to have been punched out would still be there.
>
> AFAIK madvise doesn't promise anything. But nevermind.
Good point. I was looking at it from an implementation point of
view, that the implementation is the same for both, so therefore the
same issue for both. But you are right, madvise makes no promise,
so we can therefore excuse it. You'd make a fine lawyer :)
> >
> > So let's all forget that patch, although it does help to highlight my
> > mistake in d0823576bf4b. (Oh, hey, let's all forget my mistake too!)
>
> What patch? What mistake? :)
Yes, which of my increasingly many? :(
>
> > Here's the 3.16-rc2 patch that I've now settled on (which will also
> > require a revert of current git's f00cdc6df7d7; well, not require the
> > revert, but this makes that redundant, and cannot be tested with it in).
> >
> > I've not yet had time to write up the patch description, nor to test
> > it fully; but thought I should get the patch itself into the open for
> > review and testing before then.
>
> It seems to work here (tested 3.16-rc1 which didn't have f00cdc6df7d7 yet).
> Checking for end != -1 is indeed much more elegant solution than i_size.
> Thanks. So you can add my Tested-by.
Thanks a lot for the testing, Vlastimir.
Though I'm happy with the new shmem.c patch, I've thought more about my
truncate.c patch meanwhile, and grown unhappy with it for two reasons.
One was remembering that XFS still uses lend -1 even when punching a
hole: it writes out dirty pages, then throws away the pagecache from
start of hole to end of file; not brilliant (and a violation of mlock),
but that's how it is, and I'm not about to become an XFS hacker to fix
it (I did long ago send a patch I thought fixed it, but it never went
in, and I could easily have overlooked all kinds of XFS subtleties).
So although the end -1 test is more satisfying in tmpfs, and I don't
particularly like making assumptions in truncate_inode_pages_range()
about what i_size will show at that point, XFS would probably push
me back to using your original i_size test in truncate.c.
If we are to stop the endless pincer in truncate.c like in shmem.c.
But the other reason I'm unhappy with it, is really a generalization
of that. Starting from the question I asked Hannes below, I came to
realize that truncate_inode_pages_range() is serving many filesystems,
and I don't know what all their assumptions are; and even if I spent
days researching what each requires of truncate_inode_pages_range(),
chances are that I wouldn't get the right answer on all of them.
Maybe there is a filesystem which now depends upon it to clean out
that hole completely: obviously not before I made the change, but
perhaps in the years since.
So, although I dislike tmpfs behaviour diverging from the others here,
we do have Sasha's assurance that tmpfs was the only one to show the
problem, and no intention of implementing hole-punch on ramfs: so I
think the safest course is for me not to interfere with the other
filesystems, just fix the pessimization I introduced back then.
And now that we have hard evidence that my "fix" there in -rc3
must be reverted, I should move forward with the alternative.
Hugh
>
> > I've checked against v3.1 to see how it works out there: certainly
> > wouldn't apply cleanly (and beware: prior to v3.5's shmem_undo_range,
> > "end" was included in the range, not excluded), but the same
> > principles apply. Haven't checked the intermediates yet, will
> > probably leave those until each stable wants them - but if you've a
> > particular release in mind, please ask, or ask me to check your port.
>
> I will try, thanks.
>
> > I've included the mm/truncate.c part of it here, but that will be a
> > separate (not for -stable) patch when I post the finalized version.
> >
> > Hannes, a question for you please, I just could not make up my mind.
> > In mm/truncate.c truncate_inode_pages_range(), what should be done
> > with a failed clear_exceptional_entry() in the case of hole-punch?
> > Is that case currently depending on the rescan loop (that I'm about
> > to revert) to remove a new page, so I would need to add a retry for
> > that rather like the shmem_free_swap() one? Or is it irrelevant,
> > and can stay unchanged as below? I've veered back and forth,
> > thinking first one and then the other.
> >
> > Thanks,
> > Hugh
> >
> > ---
> >
> > mm/shmem.c | 19 ++++++++++---------
> > mm/truncate.c | 14 +++++---------
> > 2 files changed, 15 insertions(+), 18 deletions(-)
> >
> > --- 3.16-rc2/mm/shmem.c 2014-06-16 00:28:55.124076531 -0700
> > +++ linux/mm/shmem.c 2014-06-26 15:41:52.704362962 -0700
> > @@ -467,23 +467,20 @@ static void shmem_undo_range(struct inod
> > return;
> >
> > index = start;
> > - for ( ; ; ) {
> > + while (index < end) {
> > cond_resched();
> >
> > pvec.nr = find_get_entries(mapping, index,
> > min(end - index, (pgoff_t)PAGEVEC_SIZE),
> > pvec.pages, indices);
> > if (!pvec.nr) {
> > - if (index == start || unfalloc)
> > + /* If all gone or hole-punch or unfalloc, we're done
> > */
> > + if (index == start || end != -1)
> > break;
> > + /* But if truncating, restart to make sure all gone
> > */
> > index = start;
> > continue;
> > }
> > - if ((index == start || unfalloc) && indices[0] >= end) {
> > - pagevec_remove_exceptionals(&pvec);
> > - pagevec_release(&pvec);
> > - break;
> > - }
> > mem_cgroup_uncharge_start();
> > for (i = 0; i < pagevec_count(&pvec); i++) {
> > struct page *page = pvec.pages[i];
> > @@ -495,8 +492,12 @@ static void shmem_undo_range(struct inod
> > if (radix_tree_exceptional_entry(page)) {
> > if (unfalloc)
> > continue;
> > - nr_swaps_freed += !shmem_free_swap(mapping,
> > - index, page);
> > + if (shmem_free_swap(mapping, index, page)) {
> > + /* Swap was replaced by page: retry
> > */
> > + index--;
> > + break;
> > + }
> > + nr_swaps_freed++;
> > continue;
> > }
> >
> > --- 3.16-rc2/mm/truncate.c 2014-06-08 11:19:54.000000000 -0700
> > +++ linux/mm/truncate.c 2014-06-26 16:31:35.932433863 -0700
> > @@ -352,21 +352,17 @@ void truncate_inode_pages_range(struct a
> > return;
> >
> > index = start;
> > - for ( ; ; ) {
> > + while (index < end) {
> > cond_resched();
> > if (!pagevec_lookup_entries(&pvec, mapping, index,
> > - min(end - index, (pgoff_t)PAGEVEC_SIZE),
> > - indices)) {
> > - if (index == start)
> > + min(end - index, (pgoff_t)PAGEVEC_SIZE), indices)) {
> > + /* If all gone or hole-punch, we're done */
> > + if (index == start || end != -1)
> > break;
> > + /* But if truncating, restart to make sure all gone
> > */
> > index = start;
> > continue;
> > }
> > - if (index == start && indices[0] >= end) {
> > - pagevec_remove_exceptionals(&pvec);
> > - pagevec_release(&pvec);
> > - break;
> > - }
> > mem_cgroup_uncharge_start();
> > for (i = 0; i < pagevec_count(&pvec); i++) {
> > struct page *page = pvec.pages[i];
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
