From: Shiju Jose <shiju.jose@huawei.com>
To: <mchehab@kernel.org>, <linux-edac@vger.kernel.org>
Cc: <linuxarm@huawei.com>, Shiju Jose <shiju.jose@huawei.com>
Subject: [PATCH 7/7] rasdaemon: add signal handling for the cleanup
Date: Wed, 16 Oct 2019 17:34:01 +0100 [thread overview]
Message-ID: <20191016163401.16980-8-shiju.jose@huawei.com> (raw)
In-Reply-To: <20191016163401.16980-1-shiju.jose@huawei.com>
Presently rasdaemon would not free allocated memory and
would not do other cleanup when the rasdaemon closed
with ctrl+c or kill etc.
This patch adds handling of the signals SIGINT, SIGTERM, SIGHUP
and SIGQUIT and do necessary clean ups when receive the
specified signals.
Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
---
ras-events.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 46 insertions(+), 4 deletions(-)
diff --git a/ras-events.c b/ras-events.c
index d155caa..511c93d 100644
--- a/ras-events.c
+++ b/ras-events.c
@@ -25,6 +25,8 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/poll.h>
+#include <signal.h>
+#include <sys/signalfd.h>
#include "libtrace/kbuffer.h"
#include "libtrace/event-parse.h"
#include "ras-mc-handler.h"
@@ -350,7 +352,9 @@ static int read_ras_event_all_cpus(struct pthread_data *pdata,
int ready, i, count_nready;
struct kbuffer *kbuf;
void *page;
- struct pollfd fds[n_cpus];
+ struct pollfd fds[n_cpus + 1];
+ struct signalfd_siginfo fdsiginfo;
+ sigset_t mask;
int warnonce[n_cpus];
char pipe_raw[PATH_MAX];
int legacy_kernel = 0;
@@ -373,7 +377,7 @@ static int read_ras_event_all_cpus(struct pthread_data *pdata,
return -ENOMEM;
}
- for (i = 0; i < n_cpus; i++)
+ for (i = 0; i < (n_cpus + 1); i++)
fds[i].fd = -1;
for (i = 0; i < n_cpus; i++) {
@@ -390,15 +394,51 @@ static int read_ras_event_all_cpus(struct pthread_data *pdata,
}
}
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGINT);
+ sigaddset(&mask, SIGTERM);
+ sigaddset(&mask, SIGHUP);
+ sigaddset(&mask, SIGQUIT);
+ if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1)
+ log(TERM, LOG_WARNING, "sigprocmask\n");
+ fds[n_cpus].events = POLLIN;
+ fds[n_cpus].fd = signalfd(-1, &mask, 0);
+ if (fds[n_cpus].fd < 0) {
+ log(TERM, LOG_WARNING, "signalfd\n");
+ goto error;
+ }
+
log(TERM, LOG_INFO, "Listening to events for cpus 0 to %d\n", n_cpus - 1);
if (pdata[0].ras->record_events)
ras_mc_event_opendb(pdata[0].cpu, pdata[0].ras);
do {
- ready = poll(fds, n_cpus, -1);
+ ready = poll(fds, (n_cpus + 1), -1);
if (ready < 0) {
log(TERM, LOG_WARNING, "poll\n");
}
+
+ /* check for the signal */
+ if (fds[n_cpus].revents & POLLIN) {
+ size = read(fds[n_cpus].fd, &fdsiginfo,
+ sizeof(struct signalfd_siginfo));
+ if (size != sizeof(struct signalfd_siginfo))
+ log(TERM, LOG_WARNING, "signalfd read\n");
+
+ if (fdsiginfo.ssi_signo == SIGINT ||
+ fdsiginfo.ssi_signo == SIGTERM ||
+ fdsiginfo.ssi_signo == SIGHUP ||
+ fdsiginfo.ssi_signo == SIGQUIT) {
+ log(TERM, LOG_INFO, "Recevied signal=%d\n",
+ fdsiginfo.ssi_signo);
+ goto cleanup;
+ } else {
+ log(TERM, LOG_INFO,
+ "Received unexpected signal=%d\n",
+ fdsiginfo.ssi_signo);
+ }
+ }
+
count_nready = 0;
for (i = 0; i < n_cpus; i++) {
if (fds[i].revents & POLLERR) {
@@ -462,7 +502,9 @@ cleanup:
error:
kbuffer_free(kbuf);
free(page);
- for (i = 0; i < n_cpus; i++) {
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
+
+ for (i = 0; i < (n_cpus + 1); i++) {
if (fds[i].fd > 0)
close(fds[i].fd);
}
--
2.1.4
next prev parent reply other threads:[~2019-10-16 16:34 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Shiju Jose>
2019-06-17 14:28 ` [PATCH 0/6] rasdaemon:add logging of HiSilicon HIP08 non-standard H/W errors and changes in the error decoding code Shiju Jose
2019-06-17 14:28 ` [PATCH 1/6] rasdaemon:print non-standard error data if not decoded Shiju Jose
2019-06-17 14:28 ` [PATCH 2/6] rasdaemon: rearrange HiSilicon HIP07 decoding function table Shiju Jose
2019-06-17 14:28 ` [PATCH 3/6] rasdaemon: update iteration logic for the non-standard error decoding functions Shiju Jose
2019-06-17 14:28 ` [PATCH 4/6] rasdaemon:add logging HiSilicon HIP08 H/W errors reported in the OEM format1 Shiju Jose
2019-06-17 14:28 ` [PATCH 5/6] rasdaemon:add logging HiSilicon HIP08 H/W errors reported in the OEM format2 Shiju Jose
2019-06-17 14:28 ` [PATCH 6/6] rasdaemon:add logging HiSilicon HIP08 PCIe local errors Shiju Jose
2019-06-21 18:42 ` [PATCH 0/6] rasdaemon:add logging of HiSilicon HIP08 non-standard H/W errors and changes in the error decoding code Mauro Carvalho Chehab
2019-08-12 10:11 ` [PATCH RFC 0/4] ACPI: APEI: Add support to notify the vendor specific HW errors Shiju Jose
2019-08-12 10:11 ` [PATCH RFC 1/4] " Shiju Jose
2019-08-21 17:23 ` James Morse
2019-08-22 16:57 ` Shiju Jose
2019-08-12 10:11 ` [PATCH RFC 2/4] ACPI: APEI: Add ghes_handle_memory_failure to the new notification method Shiju Jose
2019-08-21 17:22 ` James Morse
2019-08-22 16:57 ` Shiju Jose
2019-08-12 10:11 ` [PATCH RFC 3/4] ACPI: APEI: Add ghes_handle_aer " Shiju Jose
2019-08-12 10:11 ` [PATCH RFC 4/4] ACPI: APEI: Add log_arm_hw_error " Shiju Jose
2019-08-21 17:22 ` [PATCH RFC 0/4] ACPI: APEI: Add support to notify the vendor specific HW errors James Morse
2019-08-22 16:56 ` Shiju Jose
2019-10-03 17:21 ` James Morse
2019-10-16 16:33 ` [PATCH 0/7] rasdaemon: add fixes, database closure and signal handling Shiju Jose
2019-10-16 16:33 ` [PATCH 1/7] rasdaemon: fix cleanup issues in ras-events.c:read_ras_event_all_cpus() Shiju Jose
2019-10-16 16:33 ` [PATCH 2/7] rasdaemon: fix memory leak in ras-events.c:handle_ras_events() Shiju Jose
2019-10-16 16:33 ` [PATCH 3/7] rasdaemon: fix missing fclose in ras-events.c:select_tracing_timestamp() Shiju Jose
2019-10-16 16:33 ` [PATCH 4/7] rasdaemon: fix memory leak in ras-events.c:add_event_handler() Shiju Jose
2019-10-16 16:33 ` [PATCH 5/7] rasdaemon: delete multiple definitions of ARRAY_SIZE Shiju Jose
2019-10-16 16:34 ` [PATCH 6/7] rasdaemon: add closure and cleanups for the database Shiju Jose
2019-10-16 16:34 ` Shiju Jose [this message]
2019-11-13 16:38 ` [PATCH 0/7] rasdaemon: add fixes, database closure and signal handling Shiju Jose
2019-11-20 4:37 ` Mauro Carvalho Chehab
2019-11-13 16:31 ` [PATCH rasdaemon 0/2] rasdaemon: add fix for the sql table Shiju Jose
2019-11-13 16:31 ` [PATCH rasdaemon 1/2] rasdaemon: fix for the ras-record.c:ras_mc_prepare_stmt() failure when new fields added to " Shiju Jose
2019-11-13 16:31 ` [PATCH rasdaemon 2/2] rasdaemon: store PCIe dev name and TLP header for the aer event Shiju Jose
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191016163401.16980-8-shiju.jose@huawei.com \
--to=shiju.jose@huawei.com \
--cc=linux-edac@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).