da2aeb0c42
A zombie setsid process occurs when adb shell setsid <command> is
issued, however llkd can only detect if it is a result of a kernel
livelock by killing the associated parent, which would be adbd;
resulting in the adb connection(s) being terminated. Will special
case this condition in order to preserve adbd for debugging purposes.
We parse <parent>&<child> in ro.llk.blacklist.parent as this
association, thus adbd&[setsid] covers this special case.
Ampersand was selected because it is never part of a process name,
however a setprop in the shell requires it to be escaped or quoted;
init rc file where this is normally specified does not have issue.
getComm() is effectively pure, so hold on to the return value for
sake of efficiency.
This also reverts commit 599958d114
which granted adbd blanket parent immunity from monitoring on
userdebug builds. The new logic is a more refined means of
preserving the live lock checking associated with adbd and allows
the operation to be performed on user builds.
POC: date ; adb shell setsid sleep 900 ; date
Positive for bug, reports less than 15 minutes, otherwise solved.
Test: llkd_unit_test
Bug: 120983740
Change-Id: I6442463a48499d925a3a074423a24a1622905559
88 lines
3.5 KiB
C++
88 lines
3.5 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef _LLKD_H_
|
|
#define _LLKD_H_
|
|
|
|
#ifndef LOG_TAG
|
|
#define LOG_TAG "livelock"
|
|
#endif
|
|
|
|
#include <stdbool.h>
|
|
#include <sys/cdefs.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
bool llkInit(const char* threadname); /* threadname NULL, not spawned */
|
|
unsigned llkCheckMilliseconds(void);
|
|
|
|
/* clang-format off */
|
|
#define LLK_ENABLE_WRITEABLE_PROPERTY "llk.enable"
|
|
#define LLK_ENABLE_PROPERTY "ro." LLK_ENABLE_WRITEABLE_PROPERTY
|
|
#define LLK_ENABLE_DEFAULT false /* "eng" and userdebug true */
|
|
#define KHT_ENABLE_WRITEABLE_PROPERTY "khungtask.enable"
|
|
#define KHT_ENABLE_PROPERTY "ro." KHT_ENABLE_WRITEABLE_PROPERTY
|
|
#define LLK_ENABLE_SYSRQ_T_PROPERTY "ro.llk.sysrq_t"
|
|
#define LLK_ENABLE_SYSRQ_T_DEFAULT true
|
|
#define LLK_MLOCKALL_PROPERTY "ro.llk.mlockall"
|
|
#define LLK_MLOCKALL_DEFAULT true
|
|
#define LLK_KILLTEST_PROPERTY "ro.llk.killtest"
|
|
#define LLK_KILLTEST_DEFAULT true
|
|
#define LLK_TIMEOUT_MS_PROPERTY "ro.llk.timeout_ms"
|
|
#define KHT_TIMEOUT_PROPERTY "ro.khungtask.timeout"
|
|
#define LLK_D_TIMEOUT_MS_PROPERTY "ro.llk.D.timeout_ms"
|
|
#define LLK_Z_TIMEOUT_MS_PROPERTY "ro.llk.Z.timeout_ms"
|
|
#define LLK_STACK_TIMEOUT_MS_PROPERTY "ro.llk.stack.timeout_ms"
|
|
#define LLK_CHECK_MS_PROPERTY "ro.llk.check_ms"
|
|
/* LLK_CHECK_MS_DEFAULT = actual timeout_ms / LLK_CHECKS_PER_TIMEOUT_DEFAULT */
|
|
#define LLK_CHECKS_PER_TIMEOUT_DEFAULT 5
|
|
#define LLK_CHECK_STACK_PROPERTY "ro.llk.stack"
|
|
#define LLK_CHECK_STACK_DEFAULT \
|
|
"cma_alloc,__get_user_pages,bit_wait_io,wait_on_page_bit_killable"
|
|
#define LLK_BLACKLIST_PROCESS_PROPERTY "ro.llk.blacklist.process"
|
|
#define LLK_BLACKLIST_PROCESS_DEFAULT \
|
|
"0,1,2,init,[kthreadd],[khungtaskd],lmkd,llkd,watchdogd,[watchdogd],[watchdogd/0]"
|
|
#define LLK_BLACKLIST_PARENT_PROPERTY "ro.llk.blacklist.parent"
|
|
#define LLK_BLACKLIST_PARENT_DEFAULT "0,2,[kthreadd],adbd&[setsid]"
|
|
#define LLK_BLACKLIST_UID_PROPERTY "ro.llk.blacklist.uid"
|
|
#define LLK_BLACKLIST_UID_DEFAULT ""
|
|
#define LLK_BLACKLIST_STACK_PROPERTY "ro.llk.blacklist.process.stack"
|
|
#define LLK_BLACKLIST_STACK_DEFAULT "init,lmkd.llkd,llkd,keystore,ueventd,apexd"
|
|
/* clang-format on */
|
|
|
|
__END_DECLS
|
|
|
|
#ifdef __cplusplus
|
|
extern "C++" { /* In case this included wrapped with __BEGIN_DECLS */
|
|
|
|
#include <chrono>
|
|
|
|
__BEGIN_DECLS
|
|
/* C++ code allowed to not specify threadname argument for this C linkage */
|
|
bool llkInit(const char* threadname = nullptr);
|
|
__END_DECLS
|
|
std::chrono::milliseconds llkCheck(bool checkRunning = false);
|
|
|
|
/* clang-format off */
|
|
#define LLK_TIMEOUT_MS_DEFAULT std::chrono::duration_cast<milliseconds>(std::chrono::minutes(10))
|
|
#define LLK_TIMEOUT_MS_MINIMUM std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::seconds(10))
|
|
#define LLK_CHECK_MS_MINIMUM std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::seconds(1))
|
|
/* clang-format on */
|
|
|
|
} /* extern "C++" */
|
|
#endif /* __cplusplus */
|
|
|
|
#endif /* _LLKD_H_ */
|