From: "Américo Wang" <xiyou.wangcong@gmail.com>
To: Wenji Huang <wenji.huang@oracle.com>
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
Ingo Molnar <mingo@elte.hu>
Subject: Re: [PATCH] Kbuild: clear marker out of modpost
Date: Mon, 16 Nov 2009 14:31:10 +0800 [thread overview]
Message-ID: <2375c9f90911152231u31ec1826j23bc0de80db04a43@mail.gmail.com> (raw)
In-Reply-To: <1258350595-19285-2-git-send-email-wenji.huang@oracle.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 10929 bytes --]
On Mon, Nov 16, 2009 at 1:49 PM, Wenji Huang <wenji.huang@oracle.com> wrote:> Remove the unnecessary functions and variables.>> Signed-off-by: Wenji Huang <wenji.huang@oracle.com>
I am not sure about this removal, Ingo seems to have otheropinions, please check:
http://lkml.org/lkml/2009/9/18/92
Adding Ingo into Cc:.
Thanks.
> --->  scripts/mod/modpost.c |  164 ------------------------------------------------->  scripts/mod/modpost.h |   3 ->  2 files changed, 0 insertions(+), 167 deletions(-)>> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c> index 801a16a..204e3f0 100644> --- a/scripts/mod/modpost.c> +++ b/scripts/mod/modpost.c> @@ -451,8 +451,6 @@ static int parse_elf(struct elf_info *info, const char *filename)>             info->export_unused_gpl_sec = i;>         else if (strcmp(secname, "__ksymtab_gpl_future") == 0)>             info->export_gpl_future_sec = i;> -        else if (strcmp(secname, "__markers_strings") == 0)> -            info->markers_strings_sec = i;>>         if (sechdrs[i].sh_type != SHT_SYMTAB)>             continue;> @@ -1509,62 +1507,6 @@ static void check_sec_ref(struct module *mod, const char *modname,>     }>  }>> -static void get_markers(struct elf_info *info, struct module *mod)> -{> -    const Elf_Shdr *sh = &info->sechdrs[info->markers_strings_sec];> -    const char *strings = (const char *) info->hdr + sh->sh_offset;> -    const Elf_Sym *sym, *first_sym, *last_sym;> -    size_t n;> -> -    if (!info->markers_strings_sec)> -        return;> -> -    /*> -     * First count the strings.  We look for all the symbols defined> -     * in the __markers_strings section named __mstrtab_*.  For> -     * these local names, the compiler puts a random .NNN suffix on,> -     * so the names don't correspond exactly.> -     */> -    first_sym = last_sym = NULL;> -    n = 0;> -    for (sym = info->symtab_start; sym < info->symtab_stop; sym++)> -        if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT &&> -          sym->st_shndx == info->markers_strings_sec &&> -          !strncmp(info->strtab + sym->st_name,> -               "__mstrtab_", sizeof "__mstrtab_" - 1)) {> -            if (first_sym == NULL)> -                first_sym = sym;> -            last_sym = sym;> -            ++n;> -        }> -> -    if (n == 0)> -        return;> -> -    /*> -     * Now collect each name and format into a line for the output.> -     * Lines look like:> -     *    marker_name   vmlinux marker %s format %d> -     * The format string after the second \t can use whitespace.> -     */> -    mod->markers = NOFAIL(malloc(sizeof mod->markers[0] * n));> -    mod->nmarkers = n;> -> -    n = 0;> -    for (sym = first_sym; sym <= last_sym; sym++)> -        if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT &&> -          sym->st_shndx == info->markers_strings_sec &&> -          !strncmp(info->strtab + sym->st_name,> -               "__mstrtab_", sizeof "__mstrtab_" - 1)) {> -            const char *name = strings + sym->st_value;> -            const char *fmt = strchr(name, '\0') + 1;> -            char *line = NULL;> -            asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);> -            NOFAIL(line);> -            mod->markers[n++] = line;> -        }> -}> ->  static void read_symbols(char *modname)>  {>     const char *symname;> @@ -1620,8 +1562,6 @@ static void read_symbols(char *modname)>         get_src_version(modname, mod->srcversion,>                 sizeof(mod->srcversion)-1);>> -    get_markers(&info, mod);> ->     parse_elf_finish(&info);>>     /* Our trick to get versioning for module struct etc. - it's> @@ -1976,96 +1916,6 @@ static void write_dump(const char *fname)>     write_if_changed(&buf, fname);>  }>> -static void add_marker(struct module *mod, const char *name, const char *fmt)> -{> -    char *line = NULL;> -    asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);> -    NOFAIL(line);> -> -    mod->markers = NOFAIL(realloc(mod->markers, ((mod->nmarkers + 1) *> -                           sizeof mod->markers[0])));> -    mod->markers[mod->nmarkers++] = line;> -}> -> -static void read_markers(const char *fname)> -{> -    unsigned long size, pos = 0;> -    void *file = grab_file(fname, &size);> -    char *line;> -> -    if (!file)        /* No old markers, silently ignore */> -        return;> -> -    while ((line = get_next_line(&pos, file, size))) {> -        char *marker, *modname, *fmt;> -        struct module *mod;> -> -        marker = line;> -        modname = strchr(marker, '\t');> -        if (!modname)> -            goto fail;> -        *modname++ = '\0';> -        fmt = strchr(modname, '\t');> -        if (!fmt)> -            goto fail;> -        *fmt++ = '\0';> -        if (*marker == '\0' || *modname == '\0')> -            goto fail;> -> -        mod = find_module(modname);> -        if (!mod) {> -            mod = new_module(modname);> -            mod->skip = 1;> -        }> -        if (is_vmlinux(modname)) {> -            have_vmlinux = 1;> -            mod->skip = 0;> -        }> -> -        if (!mod->skip)> -            add_marker(mod, marker, fmt);> -    }> -    release_file(file, size);> -    return;> -fail:> -    fatal("parse error in markers list file\n");> -}> -> -static int compare_strings(const void *a, const void *b)> -{> -    return strcmp(*(const char **) a, *(const char **) b);> -}> -> -static void write_markers(const char *fname)> -{> -    struct buffer buf = { };> -    struct module *mod;> -    size_t i;> -> -    for (mod = modules; mod; mod = mod->next)> -        if ((!external_module || !mod->skip) && mod->markers != NULL) {> -            /*> -             * Sort the strings so we can skip duplicates when> -             * we write them out.> -             */> -            qsort(mod->markers, mod->nmarkers,> -               sizeof mod->markers[0], &compare_strings);> -            for (i = 0; i < mod->nmarkers; ++i) {> -                char *line = mod->markers[i];> -                buf_write(&buf, line, strlen(line));> -                while (i + 1 < mod->nmarkers &&> -                    !strcmp(mod->markers[i],> -                        mod->markers[i + 1]))> -                    free(mod->markers[i++]);> -                free(mod->markers[i]);> -            }> -            free(mod->markers);> -            mod->markers = NULL;> -        }> -> -    write_if_changed(&buf, fname);> -}> ->  struct ext_sym_list {>     struct ext_sym_list *next;>     const char *file;> @@ -2077,8 +1927,6 @@ int main(int argc, char **argv)>     struct buffer buf = { };>     char *kernel_read = NULL, *module_read = NULL;>     char *dump_write = NULL;> -    char *markers_read = NULL;> -    char *markers_write = NULL;>     int opt;>     int err;>     struct ext_sym_list *extsym_iter;> @@ -2122,12 +1970,6 @@ int main(int argc, char **argv)>         case 'w':>             warn_unresolved = 1;>             break;> -            case 'M':> -                markers_write = optarg;> -                break;> -            case 'K':> -                markers_read = optarg;> -                break;>         default:>             exit(1);>         }> @@ -2182,11 +2024,5 @@ int main(int argc, char **argv)>           "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",>           sec_mismatch_count);>> -    if (markers_read)> -        read_markers(markers_read);> -> -    if (markers_write)> -        write_markers(markers_write);> ->     return err;>  }> diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h> index 09f58e3..be987a4 100644> --- a/scripts/mod/modpost.h> +++ b/scripts/mod/modpost.h> @@ -112,8 +112,6 @@ struct module {>     int has_init;>     int has_cleanup;>     struct buffer dev_table_buf;> -    char **markers;> -    size_t nmarkers;>     char     srcversion[25];>  };>> @@ -128,7 +126,6 @@ struct elf_info {>     Elf_Section  export_gpl_sec;>     Elf_Section  export_unused_gpl_sec;>     Elf_Section  export_gpl_future_sec;> -    Elf_Section  markers_strings_sec;>     const char  *strtab;>     char     *modinfo;>     unsigned int modinfo_len;> --> 1.5.6>> --> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in> the body of a message to majordomo@vger.kernel.org> More majordomo info at  http://vger.kernel.org/majordomo-info.html> Please read the FAQ at  http://www.tux.org/lkml/>ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
next prev parent reply other threads:[~2009-11-16 6:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 5:49 [PATCH] Kbuild: clean up marker Wenji Huang
2009-11-16 5:49 ` [PATCH] Kbuild: clear marker out of modpost Wenji Huang
2009-11-16 6:31 ` Américo Wang [this message]
2009-11-16 6:26 ` [PATCH] Kbuild: clean up marker Américo Wang
2009-11-18 21:20 ` Andrew Morton
2009-11-19 1:02 ` Wenji Huang
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=2375c9f90911152231u31ec1826j23bc0de80db04a43@mail.gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=wenji.huang@oracle.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: 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
all inboxes | Powered by JetHome®