From f6bd4ad198cb5bb86c508e4d18f9eb4bc0c4f77b Mon Sep 17 00:00:00 2001 From: Zbigniew Kempczyński Date: Thu, 26 May 2022 09:28:42 +0200 Subject: lib/intel_allocator: Add flag signalling multiprocess readyness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently when children processes try to communicate to not existing allocator thread they got crash with vague SIGSEGV. Adding readyness flag and detailed explanation in assert should hint the developer to add missing intel_allocator_multiprocess_start|stop) functions. Signed-off-by: Zbigniew Kempczyński Cc: Petri Latvala Reviewed-by: Petri Latvala --- lib/intel_allocator.c | 4 ++++ lib/intel_allocator_msgchannel.c | 2 ++ lib/intel_allocator_msgchannel.h | 1 + 3 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/intel_allocator.c b/lib/intel_allocator.c index 7882e484..717d7fc5 100644 --- a/lib/intel_allocator.c +++ b/lib/intel_allocator.c @@ -737,6 +737,10 @@ static int handle_request(struct alloc_req *req, struct alloc_resp *resp) return 0; } + igt_assert_f(channel->ready, + "Allocator must be called in multiprocess mode, " + "use intel_allocator_multiprocess_(start|stop)()\n"); + ret = send_req_recv_resp(channel, req, resp); if (ret < 0) diff --git a/lib/intel_allocator_msgchannel.c b/lib/intel_allocator_msgchannel.c index 172858d3..cd0f0a5d 100644 --- a/lib/intel_allocator_msgchannel.c +++ b/lib/intel_allocator_msgchannel.c @@ -75,6 +75,7 @@ static void msgqueue_init(struct msg_channel *channel) msgdata->key = key; msgdata->queue = queue; channel->priv = msgdata; + channel->ready = true; } static void msgqueue_deinit(struct msg_channel *channel) @@ -84,6 +85,7 @@ static void msgqueue_deinit(struct msg_channel *channel) igt_debug("Deinit msgqueue\n"); msgctl(msgdata->queue, IPC_RMID, NULL); free(channel->priv); + channel->ready = false; } static int msgqueue_send_req(struct msg_channel *channel, diff --git a/lib/intel_allocator_msgchannel.h b/lib/intel_allocator_msgchannel.h index ef129c30..cefbf4ce 100644 --- a/lib/intel_allocator_msgchannel.h +++ b/lib/intel_allocator_msgchannel.h @@ -140,6 +140,7 @@ struct alloc_resp { }; struct msg_channel { + bool ready; void *priv; void (*init)(struct msg_channel *channel); void (*deinit)(struct msg_channel *channel); -- cgit v1.2.3