[lvc-project] [PATCH 5.10 1/2] hugetlbfs: make free_huge_page irq safe

[Fedor Pchelkin]

On Wed, 26. Jun 23:44, Mikhail Ukhin wrote:
> From: Mike Kravetz <mike.kravetz at oracle.com>
> 
> Commit db71ef79b59bb2e78dc4df83d0e4bf6beaa5c82d upstream.

[...]

> Link: https://lkml.kernel.org/r/20210409205254.242291-8-mike.kravetz@oracle.com
> Signed-off-by: Mike Kravetz <mike.kravetz at oracle.com>
> 

Здесь не должно быть пустой строки. Также, повторюсь, должен быть *весь*
список людей, написанных в upstream-патче. Т.е. убирать какой-либо текст из
описания upstream-патча не следует. Вот он:

    Acked-by: Michal Hocko <mhocko at suse.com>
    Reviewed-by: Muchun Song <songmuchun at bytedance.com>
    Reviewed-by: Oscar Salvador <osalvador at suse.de>
    Cc: "Aneesh Kumar K . V" <aneesh.kumar at linux.ibm.com>
    Cc: Barry Song <song.bao.hua at hisilicon.com>
    Cc: David Hildenbrand <david at redhat.com>
    Cc: David Rientjes <rientjes at google.com>
    Cc: Hillf Danton <hdanton at sina.com>
    Cc: HORIGUCHI NAOYA <naoya.horiguchi at nec.com>
    Cc: Joonsoo Kim <iamjoonsoo.kim at lge.com>
    Cc: Matthew Wilcox <willy at infradead.org>
    Cc: Miaohe Lin <linmiaohe at huawei.com>
    Cc: Mina Almasry <almasrymina at google.com>
    Cc: Peter Xu <peterx at redhat.com>
    Cc: Peter Zijlstra <peterz at infradead.org>
    Cc: Roman Gushchin <guro at fb.com>
    Cc: Shakeel Butt <shakeelb at google.com>
    Cc: Waiman Long <longman at redhat.com>
    Cc: Will Deacon <will at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

> [After commit db71ef79b59b ("hugetlb: make free_huge_page irq safe"), the
> subpool lock should be locked with spin_lock_irq() and all call sites was
> modified as such, except for the ones in hugetlbfs_statfs()]
> Signed-off-by: Mikhail Ivanov <iwanov-23 at bk.ru>
> Signed-off-by: Mikhail Ukhin <mish.uxin2012 at yandex.ru>
> ---

Патч не удаётся применить к 5.10.y

    Applying: hugetlbfs: make free_huge_page irq safe
    error: patch failed: mm/hugetlb.c:97
    error: mm/hugetlb.c: patch does not apply
    error: patch failed: mm/hugetlb_cgroup.c:204
    error: mm/hugetlb_cgroup.c: patch does not apply
    Patch failed at 0001 hugetlbfs: make free_huge_page irq safe
    hint: Use 'git am --show-current-patch=diff' to see the failed patch
    When you have resolved this problem, run "git am --continue".
    If you prefer to skip this patch, run "git am --skip" instead.
    To restore the original branch and stop patching, run "git am --abort".

>  mm/hugetlb.c | 155 ++++++++++++++++----------------------------
>  mm/hugetlb_cgroup.c | 8 +--
>  2 files changed, 60 insertions(+), 103 deletions(-)

[...]

> @@ -140,10 +141,12 @@ struct hugepage_subpool *hugepage_new_subpool(struct hstate *h, long max_hpages,
>  
>  void hugepage_put_subpool(struct hugepage_subpool *spool)
>  {
> - spin_lock(&spool->lock);Subject: [PATCH 1/2] hugetlb: make free_huge_page irq safe

Мне кажется, помимо непонятной строчки выше, на протяжении всего патча
наблюдаются проблемы с отступами в тех строках, где осуществлялись правки.
Скорее всего, изменения осуществлялись в текстовом редакторе со своими
настройками, отличными от того, в каком стиле пишется код ядра.

https://www.kernel.org/doc/html/latest/process/coding-style.html#indentation

Перед отправкой патча полезно проверять его применимость к целевой ветке
посредством, например, команды `git am <patch-file>`.