lib/alloc_tag: fix RCU imbalance in pgalloc_tag_get()
Suren Baghdasaryan
maintainerPATCH 1/1 lib/alloc_tag: fix RCU imbalance in pgalloc_tag_get()
put_page_tag_ref() should be called only when get_page_tag_ref() returns a valid reference because only in that case get_page_tag_ref() enters RCU read section while put_page_tag_ref() will call rcu_read_unlock() even if the provided reference is NULL. Fix pgalloc_tag_get() which does not follow this rule causing RCU imbalance. Add a warning in put_page_tag_ref() to catch any future mistakes.
--- include/linux/pgalloc_tag.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
include/linux/pgalloc_tag.h +8 -3
@@ -37,6 +37,9 @@ static inline union codetag_ref *get_page_tag_ref(struct page *page)static inline void put_page_tag_ref (union codetag_ref *ref) { +if (WARN_ON (!ref)) +return ; +page_ext_put (page_ext_from_codetag_ref (ref)); }
@@ -102,9 +105,11 @@ static inline struct alloc_tag *pgalloc_tag_get(struct page *page)union codetag_ref *ref =get_page_tag_ref (page);alloc_tag_sub_check (ref); -if (ref && ref->ct) - tag =ct_to_alloc_tag (ref->ct); -put_page_tag_ref (ref); +if (ref) { +if (ref->ct) + tag =ct_to_alloc_tag (ref->ct); +put_page_tag_ref (ref); + } }return tag;
base-commit: 065d3634d60843b8e338d405b844cc7f2e5e1c66
Signature · 1 line
2.45.1.288.g0e0cd299f1-goog
Quoted 7 lines · Suren Baghdasaryan
put_page_tag_ref()should be called only whenget_page_tag_ref()returns a valid reference because only in that caseget_page_tag_ref()enters RCU read section whileput_page_tag_ref()will callrcu_read_unlock()even if the provided reference is NULL. Fixpgalloc_tag_get()which does not follow this rule causing RCU imbalance. Add a warning input_page_tag_ref()to catch any future mistakes.
Quoted 5 lines
Fixes cc92eba1c88b ("mm: fix non-compound multi-order memory accounting in __free_pages")Reported-by kernel test robot <[email protected]>Signed-off-by Suren Baghdasaryan <[email protected]>Cc Kent Overstreet <[email protected]>
Quoted 35 lines
--- include/linux/pgalloc_tag.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)include/linux/pgalloc_tag.h +8
-3@@ -37,6 +37,9 @@ static inline union codetag_ref *get_page_tag_ref(struct page *page)static inline void put_page_tag_ref (union codetag_ref *ref) { +if (WARN_ON (!ref)) +return ; +page_ext_put (page_ext_from_codetag_ref (ref)); }@@ -102,9 +105,11 @@ static inline struct alloc_tag *pgalloc_tag_get(struct page *page)union codetag_ref *ref =get_page_tag_ref (page);alloc_tag_sub_check (ref); -if (ref && ref->ct) - tag =ct_to_alloc_tag (ref->ct); -put_page_tag_ref (ref); +if (ref) { +if (ref->ct) + tag =ct_to_alloc_tag (ref->ct); +put_page_tag_ref (ref); + } }return tag;base-commit:
065d3634d60843b8e338d405b844cc7f2e5e1c66