lkml.org 
[lkml]   [2006]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH] connector: Some fixes for ia64 unaligned access errors
    Hi.  I didn't want to leave this hanging and it stayed in my head so I
    thought I'd better just finish it and test it.

    I tried out this patch and it got rid of all three unaligned acces errors
    I was seeing with process connectors and the patch is indeed much smaller.

    I ran our container daemon program in debug mode to be sure the forks
    and exits still worked right when the patch was applied and all seemed
    well.

    I applied this patch to x86_64 as well as a sanity check and it seems
    working fine.

    Things look good to me. I'm ok if you prefer this patch, or the one
    already in -mm.

    Signed-off-by: Erik Jacobson <erikj@sgi.com>
    ---

    cn_proc.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)
    --- linux.orig/drivers/connector/cn_proc.c 2006-12-12 23:03:31.000000000 -0600
    +++ linux/drivers/connector/cn_proc.c 2006-12-12 23:06:34.243535000 -0600
    @@ -28,6 +28,7 @@
    #include <linux/init.h>
    #include <linux/connector.h>
    #include <asm/atomic.h>
    +#include <asm/unaligned.h>

    #include <linux/cn_proc.h>

    @@ -60,7 +61,7 @@
    ev = (struct proc_event*)msg->data;
    get_seq(&msg->seq, &ev->cpu);
    ktime_get_ts(&ts); /* get high res monotonic timestamp */
    - ev->timestamp_ns = timespec_to_ns(&ts);
    + put_unaligned(timespec_to_ns(&ts), (__u64 *) &ev->timestamp_ns);
    ev->what = PROC_EVENT_FORK;
    ev->event_data.fork.parent_pid = task->real_parent->pid;
    ev->event_data.fork.parent_tgid = task->real_parent->tgid;
    @@ -88,7 +89,7 @@
    ev = (struct proc_event*)msg->data;
    get_seq(&msg->seq, &ev->cpu);
    ktime_get_ts(&ts); /* get high res monotonic timestamp */
    - ev->timestamp_ns = timespec_to_ns(&ts);
    + put_unaligned(timespec_to_ns(&ts), (__u64 *) &ev->timestamp_ns);
    ev->what = PROC_EVENT_EXEC;
    ev->event_data.exec.process_pid = task->pid;
    ev->event_data.exec.process_tgid = task->tgid;
    @@ -124,7 +125,7 @@
    return;
    get_seq(&msg->seq, &ev->cpu);
    ktime_get_ts(&ts); /* get high res monotonic timestamp */
    - ev->timestamp_ns = timespec_to_ns(&ts);
    + put_unaligned(timespec_to_ns(&ts), (__u64 *) &ev->timestamp_ns);

    memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
    msg->ack = 0; /* not used */
    @@ -146,7 +147,7 @@
    ev = (struct proc_event*)msg->data;
    get_seq(&msg->seq, &ev->cpu);
    ktime_get_ts(&ts); /* get high res monotonic timestamp */
    - ev->timestamp_ns = timespec_to_ns(&ts);
    + put_unaligned(timespec_to_ns(&ts), (__u64 *) &ev->timestamp_ns);
    ev->what = PROC_EVENT_EXIT;
    ev->event_data.exit.process_pid = task->pid;
    ev->event_data.exit.process_tgid = task->tgid;
    @@ -181,7 +182,7 @@
    ev = (struct proc_event*)msg->data;
    msg->seq = rcvd_seq;
    ktime_get_ts(&ts); /* get high res monotonic timestamp */
    - ev->timestamp_ns = timespec_to_ns(&ts);
    + put_unaligned(timespec_to_ns(&ts), (__u64 *) &ev->timestamp_ns);
    ev->cpu = -1;
    ev->what = PROC_EVENT_NONE;
    ev->event_data.ack.err = err;
    -
    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/
    \
     
     \ /
      Last update: 2006-12-13 07:21    [W:0.027 / U:29.740 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site