From: Bjorn Helgaas <helgaas@kernel.org> To: Lianbo Jiang <lijiang@redhat.com> Cc: Vivek Goyal <vgoyal@redhat.com>, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, akpm@linux-foundation.org, dan.j.williams@intel.com, thomas.lendacky@amd.com, baiyaowei@cmss.chinamobile.com, tiwai@suse.de, bp@suse.de, brijesh.singh@amd.com, dyoung@redhat.com, bhe@redhat.com Subject: [PATCH 2/3] resource: Include resource end in walk_*() interfaces Date: Mon, 24 Sep 2018 17:14:55 -0500 [thread overview] Message-ID: <153782729511.130337.17128646882631701192.stgit@bhelgaas-glaptop.roam.corp.google.com> (raw) In-Reply-To: <153782698067.130337.12079523922130875402.stgit@bhelgaas-glaptop.roam.corp.google.com> From: Bjorn Helgaas <bhelgaas@google.com> find_next_iomem_res() finds an iomem resource that covers part of a range described by "start, end". All callers expect that range to be inclusive, i.e., both start and end are included, but find_next_iomem_res() doesn't handle the end address correctly. If it finds an iomem resource that contains exactly the end address, it skips it, e.g., if "start, end" is [0x0-0x10000] and there happens to be an iomem resource [mem 0x10000-0x10000] (the single byte at 0x10000), we skip it: find_next_iomem_res(...) { start = 0x0; end = 0x10000; for (p = next_resource(...)) { # p->start = 0x10000; # p->end = 0x10000; # we *should* return this resource, but this condition is false: if ((p->end >= start) && (p->start < end)) break; Adjust find_next_iomem_res() so it allows a resource that includes the single byte at the end of the range. This is a corner case that we probably don't see in practice. Fixes: 58c1b5b07907 ("[PATCH] memory hotadd fixes: find_next_system_ram catch range fix") Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- kernel/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/resource.c b/kernel/resource.c index 30e1bc68503b..155ec873ea4d 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -319,7 +319,7 @@ int release_resource(struct resource *old) EXPORT_SYMBOL(release_resource); /* - * Finds the lowest iomem resource existing within [res->start.res->end). + * Finds the lowest iomem resource existing within [res->start..res->end]. * The caller must specify res->start, res->end, res->flags, and optionally * desc. If found, returns 0, res is overwritten, if not found, returns -1. * This function walks the whole tree and not just first level children until @@ -352,7 +352,7 @@ static int find_next_iomem_res(struct resource *res, unsigned long desc, p = NULL; break; } - if ((p->end >= start) && (p->start < end)) + if ((p->end >= start) && (p->start <= end)) break; }
WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Helgaas <helgaas@kernel.org> To: Lianbo Jiang <lijiang@redhat.com> Cc: dan.j.williams@intel.com, brijesh.singh@amd.com, bhe@redhat.com, thomas.lendacky@amd.com, tiwai@suse.de, x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, mingo@redhat.com, baiyaowei@cmss.chinamobile.com, hpa@zytor.com, tglx@linutronix.de, bp@suse.de, dyoung@redhat.com, akpm@linux-foundation.org, Vivek Goyal <vgoyal@redhat.com> Subject: [PATCH 2/3] resource: Include resource end in walk_*() interfaces Date: Mon, 24 Sep 2018 17:14:55 -0500 [thread overview] Message-ID: <153782729511.130337.17128646882631701192.stgit@bhelgaas-glaptop.roam.corp.google.com> (raw) In-Reply-To: <153782698067.130337.12079523922130875402.stgit@bhelgaas-glaptop.roam.corp.google.com> From: Bjorn Helgaas <bhelgaas@google.com> find_next_iomem_res() finds an iomem resource that covers part of a range described by "start, end". All callers expect that range to be inclusive, i.e., both start and end are included, but find_next_iomem_res() doesn't handle the end address correctly. If it finds an iomem resource that contains exactly the end address, it skips it, e.g., if "start, end" is [0x0-0x10000] and there happens to be an iomem resource [mem 0x10000-0x10000] (the single byte at 0x10000), we skip it: find_next_iomem_res(...) { start = 0x0; end = 0x10000; for (p = next_resource(...)) { # p->start = 0x10000; # p->end = 0x10000; # we *should* return this resource, but this condition is false: if ((p->end >= start) && (p->start < end)) break; Adjust find_next_iomem_res() so it allows a resource that includes the single byte at the end of the range. This is a corner case that we probably don't see in practice. Fixes: 58c1b5b07907 ("[PATCH] memory hotadd fixes: find_next_system_ram catch range fix") Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- kernel/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/resource.c b/kernel/resource.c index 30e1bc68503b..155ec873ea4d 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -319,7 +319,7 @@ int release_resource(struct resource *old) EXPORT_SYMBOL(release_resource); /* - * Finds the lowest iomem resource existing within [res->start.res->end). + * Finds the lowest iomem resource existing within [res->start..res->end]. * The caller must specify res->start, res->end, res->flags, and optionally * desc. If found, returns 0, res is overwritten, if not found, returns -1. * This function walks the whole tree and not just first level children until @@ -352,7 +352,7 @@ static int find_next_iomem_res(struct resource *res, unsigned long desc, p = NULL; break; } - if ((p->end >= start) && (p->start < end)) + if ((p->end >= start) && (p->start <= end)) break; } _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2018-09-24 22:15 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-21 7:32 [PATCH 0/3 v3] add reserved e820 ranges to the kdump kernel e820 table Lianbo Jiang 2018-09-21 7:32 ` Lianbo Jiang 2018-09-21 7:32 ` [PATCH 1/3 v3] resource: fix an error which walks through iomem resources Lianbo Jiang 2018-09-21 7:32 ` Lianbo Jiang 2018-09-24 17:52 ` Bjorn Helgaas 2018-09-24 17:52 ` Bjorn Helgaas 2018-09-25 7:08 ` lijiang 2018-09-25 7:08 ` lijiang 2018-09-24 22:14 ` [PATCH 0/3] find_next_iomem_res() fixes Bjorn Helgaas 2018-09-24 22:14 ` Bjorn Helgaas 2018-09-24 22:14 ` [PATCH 1/3] x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error Bjorn Helgaas 2018-09-24 22:14 ` Bjorn Helgaas 2018-09-24 22:14 ` Bjorn Helgaas [this message] 2018-09-24 22:14 ` [PATCH 2/3] resource: Include resource end in walk_*() interfaces Bjorn Helgaas 2018-09-24 22:15 ` [PATCH 3/3] resource: Fix find_next_iomem_res() iteration issue Bjorn Helgaas 2018-09-24 22:15 ` Bjorn Helgaas 2018-09-25 8:58 ` Baoquan He 2018-09-25 8:58 ` Baoquan He 2018-09-25 11:20 ` Baoquan He 2018-09-25 11:20 ` Baoquan He 2018-09-27 5:27 ` lijiang 2018-09-27 5:27 ` lijiang 2018-09-27 14:03 ` Bjorn Helgaas 2018-09-27 14:03 ` Bjorn Helgaas 2018-09-28 5:09 ` lijiang 2018-09-28 5:09 ` lijiang 2018-09-28 13:10 ` Borislav Petkov 2018-09-28 13:10 ` Borislav Petkov 2018-09-26 9:22 ` [PATCH 0/3] find_next_iomem_res() fixes lijiang 2018-09-26 9:22 ` lijiang 2018-09-26 13:36 ` lijiang 2018-09-26 13:36 ` lijiang 2018-09-21 7:32 ` [PATCH 2/3 v3] x86/kexec_file: add e820 entry in case e820 type string matches to io resource name Lianbo Jiang 2018-09-21 7:32 ` Lianbo Jiang 2018-09-21 7:32 ` [PATCH 3/3 v3] x86/kexec_file: add reserved e820 ranges to kdump kernel e820 table Lianbo Jiang 2018-09-21 7:32 ` Lianbo Jiang 2018-10-16 2:56 ` [PATCH 0/3 v3] add reserved e820 ranges to the " Dave Young 2018-10-16 2:56 ` Dave Young 2018-10-16 3:45 ` lijiang 2018-10-16 3:45 ` lijiang 2018-09-27 14:21 [PATCH 0/3] find_next_iomem_res() fixes Bjorn Helgaas 2018-09-27 14:22 ` [PATCH 2/3] resource: Include resource end in walk_*() interfaces Bjorn Helgaas 2018-09-27 14:22 ` Bjorn Helgaas 2018-09-28 13:54 ` Borislav Petkov 2018-09-28 13:54 ` Borislav Petkov
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=153782729511.130337.17128646882631701192.stgit@bhelgaas-glaptop.roam.corp.google.com \ --to=helgaas@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=baiyaowei@cmss.chinamobile.com \ --cc=bhe@redhat.com \ --cc=bp@suse.de \ --cc=brijesh.singh@amd.com \ --cc=dan.j.williams@intel.com \ --cc=dyoung@redhat.com \ --cc=hpa@zytor.com \ --cc=kexec@lists.infradead.org \ --cc=lijiang@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=thomas.lendacky@amd.com \ --cc=tiwai@suse.de \ --cc=vgoyal@redhat.com \ --cc=x86@kernel.org \ /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.