From: Simon Horman <horms@verge.net.au>
To: Anton Blanchard <anton@samba.org>
Cc: kexec@lists.infradead.org, haren@us.ibm.com
Subject: Re: [PATCH] kexec/fs2dt: Fix sorting of device tree
Date: Thu, 13 Nov 2014 10:00:29 +0900 [thread overview]
Message-ID: <20141113010029.GI14971@verge.net.au> (raw)
In-Reply-To: <1415838858-3225-1-git-send-email-anton@samba.org>
On Thu, Nov 13, 2014 at 11:34:18AM +1100, Anton Blanchard wrote:
> Commit b02d735bf252 ('ppc64 kdump device_tree sort') added code to
> sort device tree properties, but it had a few issues.
>
> A compare routine needs to return -1 and 1. The special case for
> sorting properties with unit addresses only returned 1 and ignored
> the opposite case, which screwed up the sorting.
>
> We were missing a few more things:
>
> - Need to check both basenames are the same length
> - Need to check both basenames match
>
> I noticed this when looking at the NUMA topology after a kexec, and
> it had shifted.
>
> Signed-off-by: Anton Blanchard <anton@samba.org>
Thanks Anton, applied.
> ---
> kexec/fs2dt.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c
> index 1e5f074..304f6cb 100644
> --- a/kexec/fs2dt.c
> +++ b/kexec/fs2dt.c
> @@ -479,6 +479,8 @@ static int comparefunc(const struct dirent **dentry1,
> {
> char *str1 = (*(struct dirent **)dentry1)->d_name;
> char *str2 = (*(struct dirent **)dentry2)->d_name;
> + char *sep1 = strchr(str1, '@');
> + char *sep2 = strchr(str2, '@');
>
> /*
> * strcmp scans from left to right and fails to idetify for some
> @@ -486,9 +488,20 @@ static int comparefunc(const struct dirent **dentry1,
> * Therefore, we get the wrong sorted order like memory@10000000 and
> * memory@f000000.
> */
> - if (strchr(str1, '@') && strchr(str2, '@') &&
> - (strlen(str1) > strlen(str2)))
> - return 1;
> + if (sep1 && sep2) {
> + int baselen1 = sep1 - str1;
> + int baselen2 = sep2 - str2;
> + int len1 = strlen(str1);
> + int len2 = strlen(str2);
> +
> + /*
> + * Check the base name matches, and the properties are
> + * different lengths.
> + */
> + if ((baselen1 == baselen2) && (len1 != len2) &&
> + !strncmp(str1, str2, baselen2))
> + return (len1 > len2) - (len1 < len2);
> + }
>
> return strcmp(str1, str2);
> }
> --
> 1.9.1
>
>
> _______________________________________________
> kexec mailing list
> kexec@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec
>
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
prev parent reply other threads:[~2014-11-13 1:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-13 0:34 [PATCH] kexec/fs2dt: Fix sorting of device tree Anton Blanchard
2014-11-13 1:00 ` Simon Horman [this message]
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=20141113010029.GI14971@verge.net.au \
--to=horms@verge.net.au \
--cc=anton@samba.org \
--cc=haren@us.ibm.com \
--cc=kexec@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox