From patchwork Fri Dec 11 12:05:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414873 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=F2gAbUup; 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=MYHLgu2i; 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 4CsqKG4KZgz9sTX for ; Fri, 11 Dec 2020 23:07:14 +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: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:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4X/nHUHrbRNYNwp5oWcj6HszXX0f1sguOwqYlwEwcWg=; b=F2gAbUup275oHQu2z3jcKJ1v0Y 3KrekAEQiUl5nybCckzYfER16VqQGLbS3d1AeGiRGqNK/NZ0UNm8QQyDKmu4pC1hb2QmZyXuO1J04 pPZ12PtqxOfeii8shjjdUCU/ul2kROqbmWAcgJ4mqTeWc0rzRSDo8YpNyEnzbEGGmRHIFsX6j3339 9jb6A2VkTsNpg8aUY0zeZeTcisFO0TMZL+dbdt6s7m1fglZ1izZqJhNbNsIHXkuxc7XMJY6vtvf7l +OWqzQ8if7pkuZvkzJjkjt6y4OFYhRpWK4udlemSIrnGMxYZG3Zc5FT+9qzBmnccFUqj4ln4y+2r3 ovRebEYg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAo-0005I2-N1; Fri, 11 Dec 2020 12:05:22 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAk-0005Ft-Tn for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:19 +0000 Received: by mail-wr1-x436.google.com with SMTP id c5so5147271wrp.6 for ; Fri, 11 Dec 2020 04:05:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=umPsORUT+rT1Di2E1KLq1ykzz7sN93djxRttVSBOsHc=; b=MYHLgu2iSRr5NM6FFQmoTdIEdhTa0tYcUMD61aPCleD2VHZbzq1bFCglm7FdV/HJwl 4gKK/yDjOAeJmQzwLxw4OXM7v2kdkR1WJgsxtNMkcsr4MH2QvyIf3utDgWxYZRabBP+5 A4fmH12vGCBEOZDHMyFVr8Q2wPwdT9abYQo9qgK6weCyuUQ7tDblR6y/s5aWroXZ76WH JUQqCiAW6ZwQdEh5zOyakMeIfU4VWawK/bHCcIvH3FwlOEIVy5NaVb6BCwYEWNmnQXUu /vJJ7WUP1KKTeswT2FnBv/0qtTsn2R4Pr5+wywHbp8X4VBeM2cMwDEkncFSB31olgN0/ 2P7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=umPsORUT+rT1Di2E1KLq1ykzz7sN93djxRttVSBOsHc=; b=ZDDa9+pysUtOCOgAhOze1JN6wlp7n8ACiRCXU0zehZIJQXDP2qH1Zt2CMcKIgeVBLi bmc6zSDQR87SCKwWPuf4xnbZx7Bj+d5mV9mz87GLad8CBQzRv7zk4ypYDJQFkYPCbxTe /bClww+OO0LPOJdNKV8b/CVnqX8PoUNij21CMUw9jVasO10eOCnnOS2sYNqSAyYxJQKv HBwnMwtnB5FQUuuM82F+wwGERtn3No6PILq22O+Bcr5Ldukj5Wh3K42DymgbPyERijzr VjVmeQRMA8sBoI6eDMGPInzLdmxs8Hy9u0mYXPhEnu/rcnYfNTPg0pPy7MQ60aJrCFMB u5Kg== X-Gm-Message-State: AOAM532JncES/fcmC4S5QNgsETtXJ4MWN5hVIE3b8gThuPY68v5t0aFq iDTRQ15sM9YIiHyXobxIqoY4Ht5ZF8w= X-Google-Smtp-Source: ABdhPJwiupQ7VUYDMEs3y/7E/fxi/HmbwwVweR30xHahcIQwStiUofzZ9rOxbmZhZlOUtSZXohy/Pg== X-Received: by 2002:adf:fa05:: with SMTP id m5mr13778500wrr.26.1607688316014; Fri, 11 Dec 2020 04:05:16 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:15 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 01/13] ltq-vdsl-app: shutdown upon sigterm Date: Fri, 11 Dec 2020 13:05:01 +0100 Message-Id: <20201211120513.1130247-2-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070519_028604_280B420F X-CRM114-Status: GOOD ( 16.53 ) 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:436 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_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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 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: , 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 --- .../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*/