lkml.org 
[lkml]   [2011]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[RFC][PATCH] extable: Make sure all archs define _sdata
    From
    Date
    Can I get an Acked-by (or comment) from the following Maintainers:

    alpha
    m32r
    m68k
    mips
    parisc

    Ingo has discovered that one of my patches broke the builds of these
    architectures. Although he added a quick fix, this patch supplies the
    proper fix and touches the affected architectures. Please review and Ack
    (or NACK with guidance) this patch.

    -- Steve

    A new utility function is used to determine if a passed in address is
    part of core kernel data or not. It may or may not return true for RO
    data, but this utility must work for RW data. Thus both _sdata and
    _edata must be defined and continuous, without .init sections that may
    later be freed and replaced by volatile memory (memory that can be
    freed).

    This utility function is used to determine if data is safe from ever
    being freed. Thus it should return true for all RW global data that is
    not in a module or has been allocated, or false otherwise.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ----
    arch/alpha/kernel/vmlinux.lds.S | 1 +
    arch/m32r/kernel/vmlinux.lds.S | 1 +
    arch/m68k/kernel/vmlinux-std.lds | 2 ++
    arch/m68k/kernel/vmlinux-sun3.lds | 1 +
    arch/mips/kernel/vmlinux.lds.S | 1 +
    arch/parisc/kernel/vmlinux.lds.S | 3 +++
    kernel/extable.c | 12 +++++++++++-
    7 files changed, 20 insertions(+), 1 deletion(-)

    diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
    index 433be2a..3d890a9 100644
    --- a/arch/alpha/kernel/vmlinux.lds.S
    +++ b/arch/alpha/kernel/vmlinux.lds.S
    @@ -46,6 +46,7 @@ SECTIONS
    __init_end = .;
    /* Freed after init ends here */

    + _sdata = .; /* Start of rw data section */
    _data = .;
    RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

    diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
    index c194d64..cf95aec 100644
    --- a/arch/m32r/kernel/vmlinux.lds.S
    +++ b/arch/m32r/kernel/vmlinux.lds.S
    @@ -44,6 +44,7 @@ SECTIONS
    EXCEPTION_TABLE(16)
    NOTES

    + _sdata = .; /* Start of data section */
    RODATA
    RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
    _edata = .; /* End of data section */
    diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
    index 878be5f..d099359 100644
    --- a/arch/m68k/kernel/vmlinux-std.lds
    +++ b/arch/m68k/kernel/vmlinux-std.lds
    @@ -25,6 +25,8 @@ SECTIONS

    EXCEPTION_TABLE(16)

    + _sdata = .; /* Start of data section */
    +
    RODATA

    RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)
    diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
    index 1ad6b7a..8080469 100644
    --- a/arch/m68k/kernel/vmlinux-sun3.lds
    +++ b/arch/m68k/kernel/vmlinux-sun3.lds
    @@ -25,6 +25,7 @@ SECTIONS
    _etext = .; /* End of text section */

    EXCEPTION_TABLE(16) :data
    + _sdata = .; /* Start of rw data section */
    RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) :data
    /* End of data goes *here* so that freeing init code works properly. */
    _edata = .;
    diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
    index 832afbb..60b8af3 100644
    --- a/arch/mips/kernel/vmlinux.lds.S
    +++ b/arch/mips/kernel/vmlinux.lds.S
    @@ -65,6 +65,7 @@ SECTIONS
    NOTES :text :note
    .dummy : { *(.dummy) } :text

    + _sdata = .; /* Start of data section */
    RODATA

    /* writeable */
    diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
    index 8f1e4ef..2d9a5c7 100644
    --- a/arch/parisc/kernel/vmlinux.lds.S
    +++ b/arch/parisc/kernel/vmlinux.lds.S
    @@ -69,6 +69,9 @@ SECTIONS
    /* End of text section */
    _etext = .;

    + /* Start of data section */
    + _sdata = .;
    +
    RODATA

    /* writeable */
    diff --git a/kernel/extable.c b/kernel/extable.c
    index d44aac0..5339705 100644
    --- a/kernel/extable.c
    +++ b/kernel/extable.c
    @@ -72,9 +72,19 @@ int core_kernel_text(unsigned long addr)
    return 0;
    }

    +/**
    + * core_kernel_data - tell if addr points to kernel data
    + * @addr: address to test
    + *
    + * Returns true if @addr passed in is from the core kernel data
    + * section.
    + *
    + * Note: On some archs it may return true for core RODATA, and false
    + * for others. But will always be true for core RW data.
    + */
    int core_kernel_data(unsigned long addr)
    {
    - if (addr >= (unsigned long)_stext &&
    + if (addr >= (unsigned long)_sdata &&
    addr < (unsigned long)_edata)
    return 1;
    return 0;



    \
     
     \ /
      Last update: 2011-05-20 03:37    [W:0.024 / U:29.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site