From: Matt Helsley This patch simplifies the process events code by factoring many of the common pieces into the task watcher notifier function. This factoring was enabled by switching to task watchers instead of calling process events functions directly. Signed-off-by: Matt Helsley Cc: Guillaume Thouvenin Signed-off-by: Andrew Morton --- drivers/connector/cn_proc.c | 113 ++++++++++------------------------ 1 file changed, 34 insertions(+), 79 deletions(-) diff -puN drivers/connector/cn_proc.c~task-watchers-refactor-process-events drivers/connector/cn_proc.c --- a/drivers/connector/cn_proc.c~task-watchers-refactor-process-events +++ a/drivers/connector/cn_proc.c @@ -47,66 +47,27 @@ static inline void get_seq(__u32 *ts, in put_cpu_var(proc_event_counts); } -static void proc_fork_connector(struct task_struct *task) +static inline void proc_fork_connector(struct task_struct *task, + struct proc_event *ev) { - struct cn_msg *msg; - struct proc_event *ev; - __u8 buffer[CN_PROC_MSG_SIZE]; - - if (atomic_read(&proc_event_num_listeners) < 1) - return; - - msg = (struct cn_msg*)buffer; - ev = (struct proc_event*)msg->data; - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ev->timestamp); /* get high res monotonic timestamp */ 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; ev->event_data.fork.child_pid = task->pid; ev->event_data.fork.child_tgid = task->tgid; - - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); - /* If cn_netlink_send() failed, the data is not sent */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_ATOMIC); } -static void proc_exec_connector(struct task_struct *task) +static inline void proc_exec_connector(struct task_struct *task, + struct proc_event *ev) { - struct cn_msg *msg; - struct proc_event *ev; - __u8 buffer[CN_PROC_MSG_SIZE]; - - if (atomic_read(&proc_event_num_listeners) < 1) - return; - - msg = (struct cn_msg*)buffer; - ev = (struct proc_event*)msg->data; - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ev->timestamp); ev->what = PROC_EVENT_EXEC; ev->event_data.exec.process_pid = task->pid; ev->event_data.exec.process_tgid = task->tgid; - - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); - cn_netlink_send(msg, CN_IDX_PROC, GFP_ATOMIC); } -static void proc_id_connector(struct task_struct *task, int which_id) +static inline void proc_id_connector(struct task_struct *task, int which_id, + struct proc_event *ev) { - struct cn_msg *msg; - struct proc_event *ev; - __u8 buffer[CN_PROC_MSG_SIZE]; - - if (atomic_read(&proc_event_num_listeners) < 1) - return; - - msg = (struct cn_msg*)buffer; - ev = (struct proc_event*)msg->data; ev->what = which_id; ev->event_data.id.process_pid = task->pid; ev->event_data.id.process_tgid = task->tgid; @@ -116,40 +77,18 @@ static void proc_id_connector(struct tas } else if (which_id == PROC_EVENT_GID) { ev->event_data.id.r.rgid = task->gid; ev->event_data.id.e.egid = task->egid; - } else - return; - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ev->timestamp); - - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); - cn_netlink_send(msg, CN_IDX_PROC, GFP_ATOMIC); + } + WARN_ON((which_id != PROC_EVENT_UID) && (which_id != PROC_EVENT_GID)); } -static void proc_exit_connector(struct task_struct *task) +static inline void proc_exit_connector(struct task_struct *task, + struct proc_event *ev) { - struct cn_msg *msg; - struct proc_event *ev; - __u8 buffer[CN_PROC_MSG_SIZE]; - - if (atomic_read(&proc_event_num_listeners) < 1) - return; - - msg = (struct cn_msg*)buffer; - ev = (struct proc_event*)msg->data; - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ev->timestamp); ev->what = PROC_EVENT_EXIT; ev->event_data.exit.process_pid = task->pid; ev->event_data.exit.process_tgid = task->tgid; ev->event_data.exit.exit_code = task->exit_code; ev->event_data.exit.exit_signal = task->exit_signal; - - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); - cn_netlink_send(msg, CN_IDX_PROC, GFP_ATOMIC); } /* @@ -219,29 +158,45 @@ static int cn_proc_watch_task(struct not void *t) { struct task_struct *task = t; + struct cn_msg *msg; + struct proc_event *ev; + __u8 buffer[CN_PROC_MSG_SIZE]; int rc = NOTIFY_OK; + if (atomic_read(&proc_event_num_listeners) < 1) + return rc; + + msg = (struct cn_msg*)buffer; + ev = (struct proc_event*)msg->data; switch (get_watch_event(val)) { case WATCH_TASK_CLONE: - proc_fork_connector(task); + proc_fork_connector(task, ev); break; case WATCH_TASK_EXEC: - proc_exec_connector(task); + proc_exec_connector(task, ev); break; case WATCH_TASK_UID: - proc_id_connector(task, PROC_EVENT_UID); + proc_id_connector(task, PROC_EVENT_UID, ev); break; case WATCH_TASK_GID: - proc_id_connector(task, PROC_EVENT_GID); + proc_id_connector(task, PROC_EVENT_GID, ev); break; case WATCH_TASK_EXIT: - proc_exit_connector(task); + proc_exit_connector(task, ev); break; - default: /* we don't care about WATCH_TASK_INIT|FREE because we - don't keep per-task info */ - rc = NOTIFY_DONE; /* ignore all other notifications */ + default: /* ignore WATCH_TASK_INIT|FREE - we don't keep per-task info */ + rc = NOTIFY_DONE; break; } + if (rc != NOTIFY_OK) + return rc; + get_seq(&msg->seq, &ev->cpu); + ktime_get_ts(&ev->timestamp); /* get high res monotonic timestamp */ + memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); + msg->ack = 0; /* not used */ + msg->len = sizeof(*ev); + cn_netlink_send(msg, CN_IDX_PROC, GFP_ATOMIC); + /* If cn_netlink_send() fails, drop data */ return rc; } _