From: Michal Hocko <mhocko@kernel.org> To: zijun_hu <zijun_hu@zoho.com> Cc: Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, zijun_hu@htc.com, tj@kernel.org, mingo@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, mgorman@techsingularity.net Subject: Re: [PATCH 1/1] lib/ioremap.c: avoid endless loop under ioremapping page unaligned ranges Date: Thu, 22 Sep 2016 14:47:36 +0200 [thread overview] Message-ID: <20160922124735.GB11204@dhcp22.suse.cz> (raw) In-Reply-To: <57E20A69.5010206@zoho.com> On Wed 21-09-16 12:19:53, zijun_hu wrote: > From: zijun_hu <zijun_hu@htc.com> > > endless loop maybe happen if either of parameter addr and end is not > page aligned for kernel API function ioremap_page_range() Does this happen in practise or this you found it by reading the code? > in order to fix this issue and alert improper range parameters to user > WARN_ON() checkup and rounding down range lower boundary are performed > firstly, loop end condition within ioremap_pte_range() is optimized due > to lack of relevant macro pte_addr_end() > > Signed-off-by: zijun_hu <zijun_hu@htc.com> > --- > lib/ioremap.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/lib/ioremap.c b/lib/ioremap.c > index 86c8911..911bdca 100644 > --- a/lib/ioremap.c > +++ b/lib/ioremap.c > @@ -64,7 +64,7 @@ static int ioremap_pte_range(pmd_t *pmd, unsigned long addr, > BUG_ON(!pte_none(*pte)); > set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); > pfn++; > - } while (pte++, addr += PAGE_SIZE, addr != end); > + } while (pte++, addr += PAGE_SIZE, addr < end && addr >= PAGE_SIZE); > return 0; > } Ble, this just overcomplicate things. Can we just make sure that the proper alignment is done in ioremap_page_range which is the only caller of this (and add VM_BUG_ON in ioremap_pud_range to make sure no new caller will forget about that). > > @@ -129,7 +129,9 @@ int ioremap_page_range(unsigned long addr, > int err; > > BUG_ON(addr >= end); > + WARN_ON(!PAGE_ALIGNED(addr) || !PAGE_ALIGNED(end)); maybe WARN_ON_ONCE would be sufficient to prevent from swamping logs if something just happens to do this too often in some pathological path. > > + addr = round_down(addr, PAGE_SIZE); end = round_up(end, PAGE_SIZE); wouldn't work? > start = addr; > phys_addr -= addr; > pgd = pgd_offset_k(addr); > -- > 1.9.1 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> -- Michal Hocko SUSE Labs
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org> To: zijun_hu <zijun_hu@zoho.com> Cc: Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, zijun_hu@htc.com, tj@kernel.org, mingo@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, mgorman@techsingularity.net Subject: Re: [PATCH 1/1] lib/ioremap.c: avoid endless loop under ioremapping page unaligned ranges Date: Thu, 22 Sep 2016 14:47:36 +0200 [thread overview] Message-ID: <20160922124735.GB11204@dhcp22.suse.cz> (raw) In-Reply-To: <57E20A69.5010206@zoho.com> On Wed 21-09-16 12:19:53, zijun_hu wrote: > From: zijun_hu <zijun_hu@htc.com> > > endless loop maybe happen if either of parameter addr and end is not > page aligned for kernel API function ioremap_page_range() Does this happen in practise or this you found it by reading the code? > in order to fix this issue and alert improper range parameters to user > WARN_ON() checkup and rounding down range lower boundary are performed > firstly, loop end condition within ioremap_pte_range() is optimized due > to lack of relevant macro pte_addr_end() > > Signed-off-by: zijun_hu <zijun_hu@htc.com> > --- > lib/ioremap.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/lib/ioremap.c b/lib/ioremap.c > index 86c8911..911bdca 100644 > --- a/lib/ioremap.c > +++ b/lib/ioremap.c > @@ -64,7 +64,7 @@ static int ioremap_pte_range(pmd_t *pmd, unsigned long addr, > BUG_ON(!pte_none(*pte)); > set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); > pfn++; > - } while (pte++, addr += PAGE_SIZE, addr != end); > + } while (pte++, addr += PAGE_SIZE, addr < end && addr >= PAGE_SIZE); > return 0; > } Ble, this just overcomplicate things. Can we just make sure that the proper alignment is done in ioremap_page_range which is the only caller of this (and add VM_BUG_ON in ioremap_pud_range to make sure no new caller will forget about that). > > @@ -129,7 +129,9 @@ int ioremap_page_range(unsigned long addr, > int err; > > BUG_ON(addr >= end); > + WARN_ON(!PAGE_ALIGNED(addr) || !PAGE_ALIGNED(end)); maybe WARN_ON_ONCE would be sufficient to prevent from swamping logs if something just happens to do this too often in some pathological path. > > + addr = round_down(addr, PAGE_SIZE); end = round_up(end, PAGE_SIZE); wouldn't work? > start = addr; > phys_addr -= addr; > pgd = pgd_offset_k(addr); > -- > 1.9.1 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-09-22 12:47 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-09-21 4:19 [PATCH 1/1] lib/ioremap.c: avoid endless loop under ioremapping page unaligned ranges zijun_hu 2016-09-21 4:19 ` zijun_hu 2016-09-22 12:47 ` Michal Hocko [this message] 2016-09-22 12:47 ` Michal Hocko 2016-09-22 15:13 ` zijun_hu 2016-09-22 15:13 ` zijun_hu 2016-09-23 8:45 ` Michal Hocko 2016-09-23 8:45 ` Michal Hocko 2016-09-23 12:29 ` zijun_hu 2016-09-23 12:29 ` zijun_hu 2016-09-23 12:42 ` Michal Hocko 2016-09-23 12:42 ` Michal Hocko 2016-09-23 13:00 ` zijun_hu 2016-09-23 13:00 ` zijun_hu 2016-09-23 13:33 ` Michal Hocko 2016-09-23 13:33 ` Michal Hocko 2016-09-23 14:14 ` zijun_hu 2016-09-23 14:14 ` zijun_hu 2016-09-23 14:27 ` Michal Hocko 2016-09-23 14:27 ` Michal Hocko 2016-09-23 14:58 ` zijun_hu 2016-09-23 14:58 ` zijun_hu 2016-09-23 5:53 ` [PATCH v2 " zijun_hu 2016-09-23 5:53 ` zijun_hu 2016-09-23 14:42 ` [PATCH " Tejun Heo 2016-09-23 14:42 ` Tejun Heo 2016-09-23 15:41 ` zijun_hu 2016-09-23 15:41 ` zijun_hu 2016-09-23 16:23 ` Tejun Heo 2016-09-23 16:23 ` Tejun Heo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160922124735.GB11204@dhcp22.suse.cz \ --to=mhocko@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=iamjoonsoo.kim@lge.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@techsingularity.net \ --cc=mingo@kernel.org \ --cc=rientjes@google.com \ --cc=tj@kernel.org \ --cc=zijun_hu@htc.com \ --cc=zijun_hu@zoho.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.