From patchwork Tue Dec 15 09:35:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1416350 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=QW1ZFQRu; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=M2P8ZyN2; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CwCph49lZz9s0b for ; Tue, 15 Dec 2020 20:37:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bH2Fy22j+GZdN5lQ6CfMh8fYMZ5Zq1oN+Wr5P6+FfLM=; b=QW1ZFQRuba1ai+wMJX5e9hY0N LG1Wl9Ye1VGowprFYtoRtMGz21igHfzXmCB/WrZ8xWLB6BJ42Qhwg7qfgxRNxBpgsk+Ia3XQnWOCq gMzbciWujMlSD+CIA9VRacld/8LFudZsyXup5BBNlnCQ/3ZtJGsFeKSwTLZ3rJmYQqFoZ35iBO5Ym ZNgx1KsIcl8Qheq1vxuvaVJ1HQim6pkdXirBcLtlcz/fxQ4TPLT3IeI+T2Mm6FRvGOjRDRKsytKaf 22AuNiqOQ/NU2dEWbi8Q1eBXs4zUaOPMYBFZ9pHwRtgIC7NknWeAnOzGvK3ZScWmoAozZTKpcfYEz sjm67YHOg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp6kT-0000g3-8j; Tue, 15 Dec 2020 09:36:01 +0000 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp6k5-0000Xe-55 for openwrt-devel@lists.openwrt.org; Tue, 15 Dec 2020 09:35:42 +0000 Received: by mail-wr1-x434.google.com with SMTP id w5so15405325wrm.11 for ; Tue, 15 Dec 2020 01:35:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZMJ1QiV72pGXK/3gsfIhRuQm/O5gYLpF3p0WWGmXKJg=; b=M2P8ZyN2PerlQG9SC52nRHF3w5zi24Iayyui+oNpbi3cMMdwAGCqaJsKZgEKapqD9j YMz2nifRdnzodKBPbbqSoh6j7LVkEx5SJ3WkOhPEEJ8FH3azgBUFBSuktStl2CjqGXlD 4eNUCcnwIkuMRC63El2M3X8/Lx8V+zfAKjjVASmaUWiIjFvOkOBuHE1PB9LctXZ2lb97 zmzGBwcwwSvtgQl2Vh/YbQ5bAMc3o0bO4wOlK6DH4U3GFt5vxDAm+x7zHC/COK5gKqsh YO1NUOzk77gIuTtMdpTQIVko/rJW9ulbZ6WxGEsBrxxbBY27UNxMSCvu3XPkHJsksfOJ lN8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZMJ1QiV72pGXK/3gsfIhRuQm/O5gYLpF3p0WWGmXKJg=; b=pRbW22ZvVXOzYR7CRyEEj6bPkhVz8qxtvVZgTLrq1io5E2YxjVyxe32OxlUL0WSy0a 8nmHSkkfkdYN7CV+JUONUnykLqGQ7LY3X0b7k1mRHg4FLEgfeuI0mUETvu31XwHLWCOr djwJfWVWoeIFE/1Jbn9EhGUanuGPccx8kSHGL/xXYTo71lHpexh5VrFJ34dBjgXlgkgz TejbB7JfErS9iAfp0pI7G7YwQ/nCF8OVYpF7kUSbhK9+Et76kD01OKEuHx9hIZSr4KvM fMLuwF9e0ix6Z1rMD+J0//bCMNHHyn617T5FZPOJTXDMqfns2Vc4uKJweu+LK4ZxTj46 mHcg== X-Gm-Message-State: AOAM531s0Y1MSRwdgF1U93fHYfPCb/OM3eZbQswPk3vwbEE/xpHfm+6B O/PuKohs9sQ/UM7b9qA+6E4Brz3WDx1DCA== X-Google-Smtp-Source: ABdhPJzuMfPqAXw3xaUGjeP963xmFARi4C2rAuMZTajOR3iil4P4351fTQG41viNYKUy6mgEE1mAHQ== X-Received: by 2002:adf:fd42:: with SMTP id h2mr19021720wrs.142.1608024934114; Tue, 15 Dec 2020 01:35:34 -0800 (PST) Received: from mamamia.internal (a89-182-183-191.net-htp.de. [89.182.183.191]) by smtp.gmail.com with ESMTPSA id i8sm35133423wma.32.2020.12.15.01.35.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Dec 2020 01:35:33 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 01/12] ltq-vdsl-app: shutdown upon sigterm Date: Tue, 15 Dec 2020 10:35:20 +0100 Message-Id: <20201215093531.1763475-2-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201215093531.1763475-1-a.heider@gmail.com> References: <20201215093531.1763475-1-a.heider@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201215_043537_271580_90D31255 X-CRM114-Status: GOOD ( 16.78 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:434 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Schiller Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org procd sends sigterm to stop daemons, hook it up. This speeds up the shutdown sequence and gets rid of the following message: daemon.info procd: Instance dsl_control::instance1 pid 15408 not stopped on SIGTERM, sending SIGKILL instead Signed-off-by: Andre Heider Tested-by: Martin Schiller --- .../config/ltq-vdsl-app/files/dsl_control | 2 -- .../ltq-vdsl-app/patches/201-sigterm.patch | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 package/network/config/ltq-vdsl-app/patches/201-sigterm.patch diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control index 3f3cecbca5..5089d7ac31 100644 --- a/package/network/config/ltq-vdsl-app/files/dsl_control +++ b/package/network/config/ltq-vdsl-app/files/dsl_control @@ -307,8 +307,6 @@ start_service() { } stop_service() { - # do not use dsl_cmd to not block when this is locked up by some other proess - echo quit > /tmp/pipe/dsl_cpe0_cmd DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \ DSL_INTERFACE_STATUS="DOWN" \ /sbin/dsl_notify.sh diff --git a/package/network/config/ltq-vdsl-app/patches/201-sigterm.patch b/package/network/config/ltq-vdsl-app/patches/201-sigterm.patch new file mode 100644 index 0000000000..68a416ce24 --- /dev/null +++ b/package/network/config/ltq-vdsl-app/patches/201-sigterm.patch @@ -0,0 +1,19 @@ +--- a/src/dsl_cpe_control.c ++++ b/src/dsl_cpe_control.c +@@ -6504,7 +6504,7 @@ DSL_CPE_STATIC void DSL_CPE_Termination + /* ignore the signal, we'll handle by ourself */ + signal (sig, SIG_IGN); + +- if (sig == SIGINT) ++ if (sig == SIGINT || sig == SIGTERM) + { + DSL_CCA_DEBUG(DSL_CCA_DBG_MSG, (DSL_CPE_PREFIX "terminated" DSL_CPE_CRLF)); + DSL_CPE_Termination (); +@@ -6756,6 +6756,7 @@ DSL_int_t dsl_cpe_daemon ( + + #ifndef RTEMS + signal (SIGINT, DSL_CPE_TerminationHandler); ++ signal (SIGTERM, DSL_CPE_TerminationHandler); + #endif /* RTEMS*/ + + /* Open DSL_CPE_MAX_DSL_ENTITIES devices*/