On Tue, Mar 26, 2024 at 11:55:06AM +0100, Hannes Reinecke wrote: > > > Bah. That really is overly complicated. When we attempt a conversion that conversion should be > > > stand-alone, not rely on some other patch modifications later on. > > > We definitely need to work on that to make it easier to review, even > > > without having to read the mail thread. > > > > > > > I don't know understand what you mean by overly complicated. This conversion is standalone and it is > > wrong to use folio_nr_pages after we `put` the folio. This patch just reworks the loop and in the > > next patch I add min order support to readahead. > > > > This patch doesn't depend on the next patch. > > > > Let me rephrase: what does 'ractl->_index' signify? > From my understanding it should be the index of the > first folio/page in ractl, right? > > If so I find it hard to understand how we _could_ increase it by one; _index > should _always_ in units of the minimal pagemap size. I still have not introduced the minimal pagemap size concept here. That comes in the next patch. This patch only reworks the loop and should not have any functional changes. So the minimal pagemap size unit here is 1. And to your next question how could we increase it only by one here: // We come here if we didn't find any folio at index + i ... folio = filemap_alloc_folio(gfp_mask, 0); // order 0 => 1 page if (!folio) break; if (filemap_add_folio(mapping, folio, index + i, gfp_mask) < 0) { folio_put(folio); read_pages(ractl); ractl->_index++; ... If we failed to add a folio of order 0 at (index + i), we put the folio and start a read_pages() on whatever pages we added so far (ractl->index to ractl->index + ractl->nr_pages). read_pages() updates the ractl->index to ractl->index + ractl->nr_pages. ractl->index after read_pages() should point to (index + i). As we had issue adding a folio of order 0, we skip that index by incrementing the ractl->index by 1. Does this clarify? In your original patch, you used folio_nr_pages() here. As I said before, we already know the size of the folio we tried to add was 1, so we could just increment by 1, and we should not use the folio to deduce the size after folio_put() as it is use after free. > And if we don't have it here (as you suggested in the mailthread) > I'd rather move this patch _after_ the minimal pagesize is introduced > to ensure that _index is always incremented by the right amount. > I intended to have it as two atomic changes where there is non-functional change that helps with the functional change that comes later. If it is confusing, I could also combine this with the next patch? Or, I could have it as the first patch before I start adding the concept of folio_min_order. Then it makes it clear that it is intended to be a non-function change? -- Pankaj