From nobody Tue Nov 26 23:29:22 2024 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91EBE227B9F; Tue, 15 Oct 2024 17:30:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729013454; cv=none; b=XIiVl1ePrYf9GLWffU7FuYo1RI8LyY212GzQWDs4PkIYTA6TulI0AYtZxNGjfycdg1cvWSyu4WhbyrRsqyaYmCi7imFsNRHo5YfI8IvWyK5Z+l32/O83TqNdsmGWd+eBFeH/Qp8FWVKJF/Z9dRhvVWuQyfU7NccyYj5M5TOt/cU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729013454; c=relaxed/simple; bh=APQDemQS56eefPYyWtMSi+A5Br1gdAQXCjD3BOLaSkU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N8Z6j5rHQEW3SA5+RFsDQOgEdUU1vxsUJO0kYzmWoCi2KKde+8jELU5IQyScYqYvdza8rniKP1Wf+aZYP80eFL4BFYEqbmOgd2A5cQlHTVc/Gb5A5ww7g1saf8R2Ezwe65cBhCc6Ck0j8XyeAEGRAPXkmU6pVcDxR23dHEaBaw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=B3yy97WB; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="B3yy97WB" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49FF0b2P016410; Tue, 15 Oct 2024 17:30:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2023-11-20; bh=X0kJX 0/F9izV4eUqWGcdJOCDB8UOUCakjuobP4ifHgA=; b=B3yy97WBZa2u3IQwaHrYq nREuthnBHsEII3AFbTC3/05/GO+RoyC3zdMy5ndxEIMufq//Wa4dWNuXDZFaZiQJ 0Qmeni0xIBU/QrHnfDyqljLezcL3FzdL8K8CZKwBFg0V9o5uH7s151QXRK7jN1Xs JDhEzNBWRk/PS6QNrAMTFP+bRsTEO87dnJgLc1taIt2pnMVrAv3vyfqE+yI2BTc5 wuFEigS76+JcGQeMo6R7OdI0VMkhQP04hDjVAcxlMuJQ7dEMULqcrMAjKNQbLrdt DwAA4KAx3IX4e9IOS2IDZumiKcHIhOoXYLmGPjVVPuzaRenDN0/yZo65TRyex/KL A== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 427hnt9tu7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Oct 2024 17:30:32 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 49FGGBR2019856; Tue, 15 Oct 2024 17:30:31 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 427fj7s8n7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Oct 2024 17:30:31 +0000 Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 49FHUIQm040726; Tue, 15 Oct 2024 17:30:30 GMT Received: from ca-dev112.us.oracle.com (ca-dev112.us.oracle.com [10.129.136.47]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 427fj7s865-4; Tue, 15 Oct 2024 17:30:30 +0000 From: Anjali Kulkarni To: davem@davemloft.net, Liam.Howlett@Oracle.com Cc: edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, jiri@resnulli.us, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, akpm@linux-foundation.org, shuah@kernel.org, linux-kselftest@vger.kernel.org, anjali.k.kulkarni@oracle.com, peili.io@oracle.com Subject: [PATCH net-next v2 3/3] connector/cn_proc: Selftest for threads Date: Tue, 15 Oct 2024 10:30:14 -0700 Message-ID: <20241015173014.1083069-4-anjali.k.kulkarni@oracle.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241015173014.1083069-1-anjali.k.kulkarni@oracle.com> References: <20241015173014.1083069-1-anjali.k.kulkarni@oracle.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_13,2024-10-15_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 phishscore=0 adultscore=0 bulkscore=0 suspectscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2409260000 definitions=main-2410150120 X-Proofpoint-ORIG-GUID: x8m6HVGUhMmphDb4wF3DoB-XHdaH0R5R X-Proofpoint-GUID: x8m6HVGUhMmphDb4wF3DoB-XHdaH0R5R Content-Type: text/plain; charset="utf-8" Test to check if setting PROC_CN_MCAST_NOTIFY in proc connector API, allows a thread's non-zero exit status to be returned to proc_filter. The threads.c program creates 2 child threads. 1st thread handles signal SIGSEGV, and 2nd thread needs to indicate some error condition (value 1) to the kernel, instead of using pthread_exit() with 1. In both cases, child sends notify_netlink_thread_exit(exit_code) to kernel, to let kernel know it has exited abnormally with exit_code. Compile: make thread make proc_filter To see non-zero exit notifications, run: ./proc_filter -f Run threads code in another window: ./threads Note the 2 child thread IDs reported above Send SIGSEGV signal to the child handling SIGSEGV: kill -11 Watch the child 1 tid being notified with exit code 11 to proc_filter Watch child 2 tid being notified with exit code 1 (value defined in code) to proc_filter Signed-off-by: Anjali Kulkarni --- tools/testing/selftests/connector/Makefile | 23 +++- .../testing/selftests/connector/proc_filter.c | 5 + tools/testing/selftests/connector/thread.c | 116 ++++++++++++++++++ .../selftests/connector/thread_filter.c | 96 +++++++++++++++ 4 files changed, 239 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/connector/thread.c create mode 100644 tools/testing/selftests/connector/thread_filter.c diff --git a/tools/testing/selftests/connector/Makefile b/tools/testing/sel= ftests/connector/Makefile index 92188b9bac5c..bf335826bc3b 100644 --- a/tools/testing/selftests/connector/Makefile +++ b/tools/testing/selftests/connector/Makefile @@ -1,5 +1,26 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS +=3D -Wall $(KHDR_INCLUDES) +KERNEL=3D"../../../.." + +CFLAGS +=3D -Wall $(KHDR_INCLUDES) -I $(KERNEL)/include/uapi -I $(KERNEL)/= include + +proc_filter: proc_filter.o + cc proc_filter.o -o proc_filter + +proc_filter.o: proc_filter.c + cc -c proc_filter.c -o proc_filter.o $(CFLAGS) + +thread: thread.o thread_filter.o + cc thread.o thread_filter.o -o thread + +thread.o: thread.c $(DEPS) + cc -c thread.c -o thread.o $(CFLAGS) + +thread_filter.o: thread_filter.c + cc -c thread_filter.c -o thread_filter.o $(CFLAGS) + +define EXTRA_CLEAN + rm *.o thread +endef =20 TEST_GEN_PROGS =3D proc_filter =20 diff --git a/tools/testing/selftests/connector/proc_filter.c b/tools/testin= g/selftests/connector/proc_filter.c index 4a825b997666..6fb4842894f8 100644 --- a/tools/testing/selftests/connector/proc_filter.c +++ b/tools/testing/selftests/connector/proc_filter.c @@ -1,4 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only +/* + * Author: Anjali Kulkarni + * + * Copyright (c) 2024 Oracle and/or its affiliates. + */ =20 #include #include diff --git a/tools/testing/selftests/connector/thread.c b/tools/testing/sel= ftests/connector/thread.c new file mode 100644 index 000000000000..8c9abf6115d6 --- /dev/null +++ b/tools/testing/selftests/connector/thread.c @@ -0,0 +1,116 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Author: Anjali Kulkarni + * + * Copyright (c) 2024 Oracle and/or its affiliates. + */ + +#include +#include +#include +#include +#include + +/* + * This code tests a thread exit notification when thread exits abnormally. + * Normally, when a thread exits abnormally, the kernel is not aware of the + * exit code. This is usually only conveyed from child to parent via the + * pthread_exit() and pthread_join() calls. Sometimes, however, a parent + * process cannot monitor all child processes via pthread_join(), particul= arly + * when there is a huge amount of child processes. In this case, the parent + * has created the child with PTHREAD_CREATE_DETACHED attribute. + * To fix this problem, either when child wants to convey non-zero exit via + * pthread_exit() or in a signal handler, the child can notify the kernel's + * connector module it's exit status via a netlink call with new type + * PROC_CN_MCAST_NOTIFY. (Implemented in the thread_filter.c file). + * This will send the exit code from the child to the kernel, which the ke= rnel + * can later return to proc_filter program when the child actually exits. + * To test this usecase: + * Compile: + * make thread + * make proc_filter + * To see non-zero exit notifications, run: + * ./proc_filter -f + * Start the threads code, creating 2 threads, in another window: + * ./threads + * Note the 2 child thread IDs reported above + * Send SIGSEGV signal to the child handling SIGSEGV: + * kill -11 + * Watch the event being notified with exit code 11 to proc_filter + * Watch child 2 tid being notified with exit code 1 (value defined in cod= e) + * to proc_filter + */ + +extern int notify_netlink_thread_exit(unsigned int exit_code); + +static void sigsegvh(int sig) +{ + unsigned int exit_code =3D (unsigned int) sig; + /* + * Send any non-zero value to get a notification. Here we are + * sending the signal number for SIGSEGV which is 11 + */ + notify_netlink_thread_exit(exit_code); +} + +void *threadc1(void *ptr) +{ + signal(SIGSEGV, sigsegvh); + printf("Child 1 thread id %d, handling SIGSEGV\n", gettid()); + sleep(20); + pthread_exit(NULL); +} + +void *threadc2(void *ptr) +{ + int exit_val =3D 1; + + printf("Child 2 thread id %d, wants to exit with value %d\n", + gettid(), exit_val); + sleep(2); + notify_netlink_thread_exit(exit_val); + pthread_exit(NULL); +} + +int main(int argc, char **argv) +{ + pthread_t thread1, thread2; + pthread_attr_t attr1, attr2; + int ret; + + ret =3D pthread_attr_init(&attr1); + if (ret !=3D 0) { + perror("pthread_attr_init failed"); + exit(ret); + } + ret =3D pthread_attr_setdetachstate(&attr1, PTHREAD_CREATE_DETACHED); + if (ret !=3D 0) { + perror("pthread_attr_setdetachstate failed"); + exit(ret); + } + ret =3D pthread_create(&thread1, &attr1, *threadc1, NULL); + if (ret !=3D 0) { + perror("pthread_create failed"); + exit(ret); + } + + ret =3D pthread_attr_init(&attr2); + if (ret !=3D 0) { + perror("pthread_attr_init failed"); + exit(ret); + } + ret =3D pthread_attr_setdetachstate(&attr2, PTHREAD_CREATE_DETACHED); + if (ret !=3D 0) { + perror("pthread_attr_setdetachstate failed"); + exit(ret); + } + ret =3D pthread_create(&thread2, &attr2, *threadc2, NULL); + if (ret !=3D 0) { + perror("pthread_create failed"); + exit(ret); + } + + /* Wait for children to exit or be killed */ + sleep(30); + exit(0); +} diff --git a/tools/testing/selftests/connector/thread_filter.c b/tools/test= ing/selftests/connector/thread_filter.c new file mode 100644 index 000000000000..3da740aa7537 --- /dev/null +++ b/tools/testing/selftests/connector/thread_filter.c @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Author: Anjali Kulkarni + * + * Copyright (c) 2024 Oracle and/or its affiliates. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#define NL_MESSAGE_SIZE (sizeof(struct nlmsghdr) + sizeof(struct cn_msg) += \ + sizeof(struct proc_input)) + +/* + * Send PROC_CN_MCAST_NOTIFY type notification to the connector code in ke= rnel. + * This will send the exit_code specified by user to the connector layer, = so + * it can send a notification for that event to any listening process + */ +int send_message(int nl_sock, unsigned int exit_code) +{ + char buff[NL_MESSAGE_SIZE]; + struct nlmsghdr *hdr; + struct cn_msg *msg; + + hdr =3D (struct nlmsghdr *)buff; + hdr->nlmsg_len =3D NL_MESSAGE_SIZE; + hdr->nlmsg_type =3D NLMSG_DONE; + hdr->nlmsg_flags =3D 0; + hdr->nlmsg_seq =3D 0; + hdr->nlmsg_pid =3D getpid(); + + msg =3D (struct cn_msg *)NLMSG_DATA(hdr); + msg->id.idx =3D CN_IDX_PROC; + msg->id.val =3D CN_VAL_PROC; + msg->seq =3D 0; + msg->ack =3D 0; + msg->flags =3D 0; + + msg->len =3D sizeof(struct proc_input); + ((struct proc_input *)msg->data)->mcast_op =3D + PROC_CN_MCAST_NOTIFY; + ((struct proc_input *)msg->data)->uexit_code =3D exit_code; + + if (send(nl_sock, hdr, hdr->nlmsg_len, 0) =3D=3D -1) { + perror("send failed"); + return -errno; + } + return 0; +} + +int notify_netlink_thread_exit(unsigned int exit_code) +{ + struct sockaddr_nl sa_nl; + int err =3D 0; + int nl_sock; + + nl_sock =3D socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR); + + if (nl_sock =3D=3D -1) { + perror("socket failed"); + return -errno; + } + + bzero(&sa_nl, sizeof(sa_nl)); + sa_nl.nl_family =3D AF_NETLINK; + sa_nl.nl_groups =3D CN_IDX_PROC; + sa_nl.nl_pid =3D gettid(); + + if (bind(nl_sock, (struct sockaddr *)&sa_nl, sizeof(sa_nl)) =3D=3D -1) { + perror("bind failed"); + close(nl_sock); + return -errno; + } + + err =3D send_message(nl_sock, exit_code); + + close(nl_sock); + + if (err < 0) + return err; + + return 0; +} --=20 2.46.0