mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
dax: Add a wakeup mode parameter to put_unlocked_entry()
As of now put_unlocked_entry() always wakes up next waiter. In next patches we want to wake up all waiters at one callsite. Hence, add a parameter to the function. This patch does not introduce any change of behavior. Reviewed-by: Greg Kurz <groug@kaod.org> Reviewed-by: Jan Kara <jack@suse.cz> Suggested-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Link: https://lore.kernel.org/r/20210428190314.1865312-3-vgoyal@redhat.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
parent
698ab77aeb
commit
4c3d043d27
1 changed files with 7 additions and 7 deletions
14
fs/dax.c
14
fs/dax.c
|
@ -275,11 +275,11 @@ static void wait_entry_unlocked(struct xa_state *xas, void *entry)
|
||||||
finish_wait(wq, &ewait.wait);
|
finish_wait(wq, &ewait.wait);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void put_unlocked_entry(struct xa_state *xas, void *entry)
|
static void put_unlocked_entry(struct xa_state *xas, void *entry,
|
||||||
|
enum dax_wake_mode mode)
|
||||||
{
|
{
|
||||||
/* If we were the only waiter woken, wake the next one */
|
|
||||||
if (entry && !dax_is_conflict(entry))
|
if (entry && !dax_is_conflict(entry))
|
||||||
dax_wake_entry(xas, entry, WAKE_NEXT);
|
dax_wake_entry(xas, entry, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -633,7 +633,7 @@ struct page *dax_layout_busy_page_range(struct address_space *mapping,
|
||||||
entry = get_unlocked_entry(&xas, 0);
|
entry = get_unlocked_entry(&xas, 0);
|
||||||
if (entry)
|
if (entry)
|
||||||
page = dax_busy_page(entry);
|
page = dax_busy_page(entry);
|
||||||
put_unlocked_entry(&xas, entry);
|
put_unlocked_entry(&xas, entry, WAKE_NEXT);
|
||||||
if (page)
|
if (page)
|
||||||
break;
|
break;
|
||||||
if (++scanned % XA_CHECK_SCHED)
|
if (++scanned % XA_CHECK_SCHED)
|
||||||
|
@ -675,7 +675,7 @@ static int __dax_invalidate_entry(struct address_space *mapping,
|
||||||
mapping->nrexceptional--;
|
mapping->nrexceptional--;
|
||||||
ret = 1;
|
ret = 1;
|
||||||
out:
|
out:
|
||||||
put_unlocked_entry(&xas, entry);
|
put_unlocked_entry(&xas, entry, WAKE_NEXT);
|
||||||
xas_unlock_irq(&xas);
|
xas_unlock_irq(&xas);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -954,7 +954,7 @@ static int dax_writeback_one(struct xa_state *xas, struct dax_device *dax_dev,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
put_unlocked:
|
put_unlocked:
|
||||||
put_unlocked_entry(xas, entry);
|
put_unlocked_entry(xas, entry, WAKE_NEXT);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1695,7 +1695,7 @@ dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn, unsigned int order)
|
||||||
/* Did we race with someone splitting entry or so? */
|
/* Did we race with someone splitting entry or so? */
|
||||||
if (!entry || dax_is_conflict(entry) ||
|
if (!entry || dax_is_conflict(entry) ||
|
||||||
(order == 0 && !dax_is_pte_entry(entry))) {
|
(order == 0 && !dax_is_pte_entry(entry))) {
|
||||||
put_unlocked_entry(&xas, entry);
|
put_unlocked_entry(&xas, entry, WAKE_NEXT);
|
||||||
xas_unlock_irq(&xas);
|
xas_unlock_irq(&xas);
|
||||||
trace_dax_insert_pfn_mkwrite_no_entry(mapping->host, vmf,
|
trace_dax_insert_pfn_mkwrite_no_entry(mapping->host, vmf,
|
||||||
VM_FAULT_NOPAGE);
|
VM_FAULT_NOPAGE);
|
||||||
|
|
Loading…
Reference in a new issue