Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak the NOTE_TRACK event of EVFILT_PROC. When attaching to the child

Browse Source 
process, proc_find can't be used as the child is still in state SIDL.
This commit is contained in:
joerg 2012-11-17 21:55:24 +00:00
parent 81281427af
commit f611942e77
4 changed files with 119 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/sets/lists/tests/mi
View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.504 2012/11/12 09:03:52 njoly Exp $
# $NetBSD: mi,v 1.505 2012/11/17 21:55:24 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@ -321,6 +321,7 @@
./usr/libdata/debug/usr/tests/kernel/kqueue/t_ioctl.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/kqueue/t_proc1.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/kqueue/t_proc2.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/kqueue/t_proc3.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/kqueue/t_sig.debug tests-kernel-tests debug,atf
./usr/libdata/debug/usr/tests/kernel/kqueue/write tests-kernel-tests
./usr/libdata/debug/usr/tests/kernel/kqueue/write/t_fifo.debug tests-kernel-tests debug,atf
@ -2141,6 +2142,7 @@
./usr/tests/kernel/kqueue/t_ioctl tests-kernel-tests atf
./usr/tests/kernel/kqueue/t_proc1 tests-kernel-tests atf
./usr/tests/kernel/kqueue/t_proc2 tests-kernel-tests atf
./usr/tests/kernel/kqueue/t_proc3 tests-kernel-tests atf
./usr/tests/kernel/kqueue/t_sig tests-kernel-tests atf
./usr/tests/kernel/kqueue/write tests-kernel-tests
./usr/tests/kernel/kqueue/write/Atffile tests-kernel-tests atf

18
sys/kern/kern_event.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_event.c,v 1.76 2012/06/02 15:54:02 martin Exp $ */
/* $NetBSD: kern_event.c,v 1.77 2012/11/17 21:55:24 joerg Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.76 2012/06/02 15:54:02 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.77 2012/11/17 21:55:24 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -457,7 +457,19 @@ filt_procattach(struct knote *kn)
curp = curl->l_proc;
mutex_enter(proc_lock);
p = proc_find(kn->kn_id);
if (kn->kn_flags & EV_FLAG1) {
/*
* NOTE_TRACK attaches to the child process too early
* for proc_find, so do a raw look up and check the state
* explicitly.
*/
p = proc_find_raw(kn->kn_id);
if (p != NULL && p->p_stat != SIDL)
p = NULL;
} else {
p = proc_find(kn->kn_id);
}
if (p == NULL) {
mutex_exit(proc_lock);
return ESRCH;

3
tests/kernel/kqueue/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:25 jmmv Exp $
# $NetBSD: Makefile,v 1.3 2012/11/17 21:55:24 joerg Exp $
NOMAN= # defined
@ -12,6 +12,7 @@ TESTS_SUBDIRS+= write
TESTS_C= t_ioctl
TESTS_C+= t_proc1
TESTS_C+= t_proc2
TESTS_C+= t_proc3
TESTS_C+= t_sig
.include <bsd.test.mk>

99
tests/kernel/kqueue/t_proc3.c Normal file
View File

@ -0,0 +1,99 @@
/* $NetBSD: t_proc3.c,v 1.1 2012/11/17 21:55:24 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Joerg Sonnenberger.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: t_proc3.c,v 1.1 2012/11/17 21:55:24 joerg Exp $");
#include <sys/event.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <err.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <atf-c.h>
#include "../../h_macros.h"
ATF_TC(proc3);
ATF_TC_HEAD(proc3, tc)
{
atf_tc_set_md_var(tc, "descr",
"Checks EVFILT_PROC for NOTE_TRACK on self bug ");
}
ATF_TC_BODY(proc3, tc)
{
pid_t pid = 0;
int kq, status;
struct kevent ke;
struct timespec timeout;
RL(kq = kqueue());
EV_SET(&ke, getpid(), EVFILT_PROC, EV_ADD, NOTE_TRACK, 0, 0);
RL(kevent(kq, &ke, 1, NULL, 0, NULL));
RL(pid = fork());
if (pid == 0) {
_exit(EXIT_SUCCESS);
/* NOTREACHED */
}
RL(waitpid(pid, &status, 0));
ATF_REQUIRE(WIFEXITED(status));
ATF_REQUIRE_EQ(WEXITSTATUS(status), EXIT_SUCCESS);
timeout.tv_sec = 0;
timeout.tv_nsec = 0;
ke.ident = 0;
ke.fflags = 0;
ke.flags = EV_ENABLE;
RL(kevent(kq, NULL, 0, &ke, 1, &timeout));
RL(close(kq));
ATF_REQUIRE(ke.fflags & NOTE_CHILD);
ATF_REQUIRE((ke.fflags & NOTE_TRACKERR) == 0);
ATF_REQUIRE_EQ((pid_t)ke.ident, pid);
}
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, proc3);
return atf_no_error();
}