mm/list_lru: Optimize memcg_drain_list_lru_node()
Subsystems (2)
PATCH 1/1 mm/list_lru: Optimize memcg_drain_list_lru_node()
Since commit 2c80cd57c743 ("mm/list_lru.c: fix list_lru_count_node() to be race free"), we are tracking the total number of lru entries in a list_lru_node in its nr_items field. In the case of memcg_drain_list_lru_node(), there is nothing to be done if nr_items is 0. We don't even need to take the nlru->lock as no new lru entry could be added by a racing list_lru_add() to the draining src_idx memcg at this point.
--- mm/list_lru.c | 6 ++++++ 1 file changed, 6 insertions(+)
mm/list_lru.c +6 -0
@@ -518,6 +518,12 @@ static void memcg_drain_list_lru_node(struct list_lru *lru, int nid,int dst_idx = dst_memcg->kmemcg_id;struct list_lru_one *src, *dst; +/* +* If there is no lru entry in this nlru, we can skip it immediately. +*/ +if (!READ_ONCE (nlru->nr_items)) +return ; +/* * Since list_lru_{add,del} may be called under an IRQ-safe lock, * we have to use IRQ-safe primitives here to avoid deadlock.
Signature · 1 line
2.27.0
Roman Gushchin
reviewerQuoted 9 lines · Waiman Long
Since commit
2c80cd57c743("mm/list_lru.c: fixlist_lru_count_node()to be race free"), we are tracking the total number of lru entries in alist_lru_nodein itsnr_itemsfield. In the case ofmemcg_drain_list_lru_node(), there is nothing to be done ifnr_itemsis 0. We don't even need to take thenlru->lockas no new lru entry could be added by a racinglist_lru_add()to the drainingsrc_idxmemcg at this point.Signed-off-by Waiman Long <[email protected]>
Hi Waiman!
The patch makes total sense to me, however it needs to be rebased at least on top of "mm: list_lru: rename memcg_drain_all_list_lrus to memcg_reparent_list_lrus".
Thanks!
Quoted 25 lines
--- mm/list_lru.c | 6 ++++++ 1 file changed, 6 insertions(+)mm/list_lru.c +6
-0@@ -518,6 +518,12 @@ static void memcg_drain_list_lru_node(struct list_lru *lru, int nid,int dst_idx = dst_memcg->kmemcg_id;struct list_lru_one *src, *dst; +/* +* If there is no lru entry in this nlru, we can skip it immediately. +*/ +if (!READ_ONCE (nlru->nr_items)) +return ; +/* * Since list_lru_{add,del} may be called under an IRQ-safe lock, * we have to use IRQ-safe primitives here to avoid deadlock. Signature · 1 line
2.27.0
Quoted 9 lines · Roman Gushchin
Quoted 8 lines · Waiman Long
Since commit
2c80cd57c743("mm/list_lru.c: fixlist_lru_count_node()to be race free"), we are tracking the total number of lru entries in alist_lru_nodein itsnr_itemsfield. In the case ofmemcg_drain_list_lru_node(), there is nothing to be done ifnr_itemsis 0. We don't even need to take thenlru->lockas no new lru entry could be added by a racinglist_lru_add()to the drainingsrc_idxmemcg at this point.
Quoted 9 lines
Quoted 1 line
Signed-off-by Waiman Long <[email protected]>Hi Waiman!
The patch makes total sense to me, however it needs to be rebased at least on top of "mm:
list_lru: renamememcg_drain_all_list_lrustomemcg_reparent_list_lrus".Thanks!
This patch was based on the current linux-next tree which includes commit ff221bc26bdd ("mm: list_lru: rename memcg_drain_all_list_lrus to memcg_reparent_list_lrus"). I do remember to double-check linux-next before sending this patch out. In fact, the same patch can be applied to both linux and linux-next tree without problem.
Cheers,
Longman
Roman Gushchin
reviewerQuoted 16 lines · Waiman Long
Quoted 15 lines · Roman Gushchin
Quoted 9 lines · Waiman Long
Since commit
2c80cd57c743("mm/list_lru.c: fixlist_lru_count_node()to be race free"), we are tracking the total number of lru entries in alist_lru_nodein itsnr_itemsfield. In the case ofmemcg_drain_list_lru_node(), there is nothing to be done ifnr_itemsis 0. We don't even need to take thenlru->lockas no new lru entry could be added by a racinglist_lru_add()to the drainingsrc_idxmemcg at this point.Signed-off-by Waiman Long <[email protected]>Hi Waiman!
The patch makes total sense to me, however it needs to be rebased at least on top of "mm:
list_lru: renamememcg_drain_all_list_lrustomemcg_reparent_list_lrus".
Quoted 8 lines
Quoted 3 lines
Thanks!
This patch was based on the current linux-next tree which includes commit
ff221bc26bdd("mm:list_lru: renamememcg_drain_all_list_lrustomemcg_reparent_list_lrus"). I do remember to double-check linux-next before sending this patch out. In fact, the same patch can be applied to both linux and linux-next tree without problem.
I'm looking at the mm tree (https://github.com/hnaz/linux-mm.git) and clearly see that commit "mm: list_lru: rename memcg_drain_all_list_lrus to memcg_reparent_list_lrus" eliminated the function with the name memcg_drain_list_lru_node(), which your patch is touching. Currently the function is located in list_lru.c and is named memcg_reparent_list_lru_node().
linux-next is sometimes a bit behind the mm tree.
Thanks!
Quoted 25 lines · Roman Gushchin
Quoted 16 lines · Waiman Long
Quoted 15 lines · Roman Gushchin
Quoted 9 lines · Waiman Long
Since commit
2c80cd57c743("mm/list_lru.c: fixlist_lru_count_node()to be race free"), we are tracking the total number of lru entries in alist_lru_nodein itsnr_itemsfield. In the case ofmemcg_drain_list_lru_node(), there is nothing to be done ifnr_itemsis 0. We don't even need to take thenlru->lockas no new lru entry could be added by a racinglist_lru_add()to the drainingsrc_idxmemcg at this point.Signed-off-by Waiman Long <[email protected]>Hi Waiman!
The patch makes total sense to me, however it needs to be rebased at least on top of "mm:
list_lru: renamememcg_drain_all_list_lrustomemcg_reparent_list_lrus".Quoted 8 lines
Quoted 3 lines
Thanks!
This patch was based on the current linux-next tree which includes commit
ff221bc26bdd("mm:list_lru: renamememcg_drain_all_list_lrustomemcg_reparent_list_lrus"). I do remember to double-check linux-next before sending this patch out. In fact, the same patch can be applied to both linux and linux-next tree without problem.
Quoted 8 lines
I'm looking at the mm tree (https://github.com/hnaz/linux-mm.git) and clearly see that commit "mm:
list_lru: renamememcg_drain_all_list_lrustomemcg_reparent_list_lrus" eliminated the function with the namememcg_drain_list_lru_node(), which your patch is touching. Currently the function is located inlist_lru.cand is namedmemcg_reparent_list_lru_node().linux-next is sometimes a bit behind the mm tree.
Oh, you are right. I will rebase the patch based on linux-mm.
Thanks for the suggestion.
Cheers,
Longman
Quoted 33 lines · Waiman Long
Quoted 32 lines · Roman Gushchin
Quoted 16 lines · Waiman Long
Quoted 15 lines · Roman Gushchin
Quoted 9 lines · Waiman Long
Since commit
2c80cd57c743("mm/list_lru.c: fixlist_lru_count_node()to be race free"), we are tracking the total number of lru entries in alist_lru_nodein itsnr_itemsfield. In the case ofmemcg_drain_list_lru_node(), there is nothing to be done ifnr_itemsis 0. We don't even need to take thenlru->lockas no new lru entry could be added by a racinglist_lru_add()to the drainingsrc_idxmemcg at this point.Signed-off-by Waiman Long <[email protected]>Hi Waiman!
The patch makes total sense to me, however it needs to be rebased at least on top of "mm:
list_lru: renamememcg_drain_all_list_lrustomemcg_reparent_list_lrus".Quoted 8 lines
Quoted 3 lines
Thanks!
This patch was based on the current linux-next tree which includes commit
ff221bc26bdd("mm:list_lru: renamememcg_drain_all_list_lrustomemcg_reparent_list_lrus"). I do remember to double-check linux-next before sending this patch out. In fact, the same patch can be applied to both linux and linux-next tree without problem.I'm looking at the mm tree (https://github.com/hnaz/linux-mm.git) and clearly see that commit "mm:
list_lru: renamememcg_drain_all_list_lrustomemcg_reparent_list_lrus" eliminated the function with the namememcg_drain_list_lru_node(), which your patch is touching. Currently the function is located inlist_lru.cand is namedmemcg_reparent_list_lru_node().
Quoted 5 lines
Quoted 1 line
linux-next is sometimes a bit behind the mm tree.
Oh, you are right. I will rebase the patch based on linux-mm.
Thanks for the suggestion.
The patch was originally based on the linux tree. Then I applied it onto linux-next without any issue. Unfortunately, I failed to notice that the hunk was applied to memcg_reparent_list_lru_node() without realizing that it is the new name for the old memcg_drain_list_lru_node(). The linux-next tree that I used does have all the necessary patches.
Cheers,
Longman