From patchwork Fri Jul 5 06:54:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1957131 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=a9b8Bw7J; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::f3e; helo=mail-qv1-xf3e.google.com; envelope-from=swupdate+bncbcwivbv7sugrbonrt22amgqeiabk2dy@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-qv1-xf3e.google.com (mail-qv1-xf3e.google.com [IPv6:2607:f8b0:4864:20::f3e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WFklw6tmKz1xql for ; Fri, 5 Jul 2024 16:54:52 +1000 (AEST) Received: by mail-qv1-xf3e.google.com with SMTP id 6a1803df08f44-6b5a5e78dd8sf44562256d6.1 for ; Thu, 04 Jul 2024 23:54:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720162490; cv=pass; d=google.com; s=arc-20160816; b=w1rDRsH2z1jeyNoVh7jjSWCUBaQNt5eFYpfl++aTYfdZEg4vmND3o0UoJXZvx8w6Tr HJfpJX4oqXsmTIhDeuqJYBjwHv3v3rpcG00w1Mqf4Ud6c8sMRZZE/leIQMo93PcrWm74 nQPD07Fity0aefkaopygpEHJg4p0jqeSqUQMZpfGJ8cCJIY0VNZGDSpUil0+N1STczBB w5yrKYSY/cq5QnL6bXHKNYiYPD8ucQxfNN22ahasdDSOxBXm5yubZADEkvEgEW3N9rBr 6wqqLB30pUjnFsUWluJfjvSxvAL9szE8GxQ+lVFVVRTFmaSu2qUItcANNUf2PMq25Qvl 9tsw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=mDJ7PKWTBpijkOvAsCwpBg96noy4IOv+kdETCShozGw=; fh=SjmYllQYf+8koPNUzQUwBMWhcZRUotapkeCT2NWsbKM=; b=cazHozFKl39pJ5eA3wx1t2K8gRO0JiLADhDWQr5etrxKmXrjfOqppglO1U+zm7+Kv8 PiVb4eJG6nJCwdkI3zrlLh+8eKrM/S5D6mLHNHIXu8kAKD/zTM0+PPixRjd4f6b48HZR ZZIFdb5TcSJN9/lm2p60hgMo/CMUZTMtDIHZ4iE5BTsp3a+MEoj1zzwpTJdHoISnmCP8 pPuMGx31clS1HwBWGetsnRyrNwbLn8WHIlavM11Ic3GJAMXzFPzarGkOG/6Sk6DC+tO3 1nnY5JWpYHZ8lx3JUMlFQbhrt/wXDqbdjZWEGAYv/PJR9JjsgzG0ft/SWR+dH+fAXO2n 9XRQ==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=qJWET4sw; dkim=pass header.i=@atmark-techno.com header.s=google header.b=CrU2U3ck; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720162490; x=1720767290; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=mDJ7PKWTBpijkOvAsCwpBg96noy4IOv+kdETCShozGw=; b=a9b8Bw7JHLdcuGOJdKzmMCE3T/iz0rr2PBgupHGAxY5houMpTHhiyF+YU2NN/PipRx Ft6XIOaB+J2a1RcbEB2pQtI9f5NKaIWrm208qolUzpxfFj07yMZ7vzGa6pdDYJcwSJcJ 4mg+yDGXy+BE1MeyD01Rny0XjTTdJ7kHNb+Q9O80ufE5zB6anj9SAVe1f6VG9ctZ5N/F FL/p1LlOBN0r0lUdzZ4OjdATvDG9XUGcfIkP6v+0O2q/mMGkvUqqrml5XixjQXvnVnmy boF72e6GYmKNSVofJqEEHpcEkRgZWwK3tMm4mP2JLhtm95CEqjWPIoVwBtBJtY+Ralk+ qv8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720162490; x=1720767290; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=mDJ7PKWTBpijkOvAsCwpBg96noy4IOv+kdETCShozGw=; b=ETdBTje/wmsBWD984Si/nZYtBeaCrMsmduLJpxauON19MkQMeje9m39rm/rc3KzKJu 7Yqt20ahNPB7Fv4ZquIbQ6ZT5uad/ERqu58733r3Ify2JJgczimxQcUNTnVV7SO9jzQO qo2JQqm+ETctKsGqAJwOlLG31L3K9SzCqEuQOUkeQnuDZoTFa7bfxdCSSk7+pZ1OYw4Z A9wAo5bMf/eOYp303TN0exdZjapvTMWPLCOV5pNVHwUshDJHrH/FGO3YmiLEVnxmCBJP nVKqOH+F2I8ar962aDEVzHfIEgXmFAwGv3wZd+Lmq44x8QUCNeuV03jDUuvo7XCRapcy soNQ== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUS0aJs0ipZyk0yLbK8mwHcJxMnYkqqWfK28BRWuNb735NxFDk68ZUwPNcRp0lMwKEyDeIryyQNTQ5ra+nXW/33n1zY2MU6BXF5OZtCvw== X-Gm-Message-State: AOJu0Yx6qZpWsicfhGkQzNCrUNqVJv1ODkhR7VCrx8BakGuG4Emraq71 mqqyy6iBAYKwEeEyvUfJdl+xXXVnToPnkWmRKafjwc34hrUWXAOD X-Google-Smtp-Source: AGHT+IGqz3q7zzx8qUFUR8xFevfLFg8v2cVVG6c5KIzFikhovgq9ItmgmAbglGczTo2/6LiHC8L5Yg== X-Received: by 2002:ad4:5ae6:0:b0:6b5:dfc2:669a with SMTP id 6a1803df08f44-6b5ee53051bmr69294716d6.2.1720162490106; Thu, 04 Jul 2024 23:54:50 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6214:5289:b0:6b2:a43b:dc38 with SMTP id 6a1803df08f44-6b5e9f9f793ls31450826d6.0.-pod-prod-00-us; Thu, 04 Jul 2024 23:54:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJfYVmbMU63vkOMewnQYhR0dRYfbyRLtuicpfe+mlmE+XyvmIQzUlzeGOSSE+QthKuvijYxnRORcc+RzpWt+j2QSWt4ZEPdwrM X-Received: by 2002:a05:620a:55b4:b0:795:462b:6e70 with SMTP id af79cd13be357-79eef297ebbmr552047785a.2.1720162489011; Thu, 04 Jul 2024 23:54:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720162488; cv=none; d=google.com; s=arc-20160816; b=yHu6JejSv66l3lSIMbeLf7fQDoru8eIxeQvUS0qdXH0u9grGmgZe6/EDPfmjwhdUIm Zj/DEWUzpRr5EleV+ftidqdL1t1wtpVS4KRZX+SYdUkWFPUTZLw6wFS9V9v/pBVRHSvN onxTf6NkmBRqr1w0mhp2Jhzv8iv9EiC8lWgNY3sFOgwbP+TQy+z+fC8cIXsRabzLAbNv FY1P61KgFEcsNZqAZo/rH0Xi2Z338gaypk8moeCD5lQiyITU5CGc2aims2J2v62+IVkg WHec3A91NXbs5DhRjS3f7icqMSm0pZil6jIsyjXMdifHhOvLTpGPiXe8qEd7yV/ev0DY wAUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=FV4tS4MmNmTKMMGRabTC9cxE8KsvtWk6vDFFkOYQ4L8=; fh=s4Cqsn5tyRey1KQLISQb07AMkCffPIICYls4SO+XWVo=; b=ogsyhQdrTt6O4Y0E6E4nR8brxEsDvtvipRa6BJtO59KbyPOmUFEs/qYsjRf6Cr4M7j 0UzznD2NxTXpcRTYz6DbxwWQR4iJVatx4OyIRRihlxrP0Xfq+sV8K3zb0L9+/52KAFt3 fsTuWfgQw0nDG4KLep+BF2OFzM9277TOFEyaOhADXjm6+bXOY2gh6vrXA6Z/MOO4qsao NNTzz4LnPReXccFpAZ/z42SnPNZ5PZYsvhNVBgAhhF29RKwiBE2fMqDxF3cEGDzljG4h dZEOT7hjDDTrDJ7bHF1ECUKJ0pnKOZUlMg72J7gl1FRfyhGVRtBsGGuUewYW1UQnMSmk 8qJw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=qJWET4sw; dkim=pass header.i=@atmark-techno.com header.s=google header.b=CrU2U3ck; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTPS id af79cd13be357-79d6932c62esi68646985a.6.2024.07.04.23.54.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 23:54:48 -0700 (PDT) Received-SPF: pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) client-ip=35.74.137.57; Received: from gw2.atmark-techno.com (localhost [127.0.0.1]) by gw2.atmark-techno.com (Postfix) with ESMTP id 82BDDA6E for ; Fri, 5 Jul 2024 15:54:46 +0900 (JST) Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by gw2.atmark-techno.com (Postfix) with ESMTPS id 7B72C5D8 for ; Fri, 5 Jul 2024 15:54:45 +0900 (JST) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-2c30144b103so1149609a91.0 for ; Thu, 04 Jul 2024 23:54:45 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCU5LAm0J4sPbyy+P15Mwk3HHn0jmO2VUrQxKz0qJ1TVsdm1ffMDzyeE2FmilIZL6YnYbN58u/qqzZH5S1zcKpWam4FgwOfzDDGH X-Received: by 2002:a17:90a:ca11:b0:2c9:a831:3b7d with SMTP id 98e67ed59e1d1-2c9a8313ca6mr3634120a91.18.1720162484447; Thu, 04 Jul 2024 23:54:44 -0700 (PDT) X-Received: by 2002:a17:90a:ca11:b0:2c9:a831:3b7d with SMTP id 98e67ed59e1d1-2c9a8313ca6mr3634106a91.18.1720162483956; Thu, 04 Jul 2024 23:54:43 -0700 (PDT) Received: from pc-0182.atmarktech (103.131.189.35.bc.googleusercontent.com. [35.189.131.103]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b10293cc9sm450522b3a.21.2024.07.04.23.54.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2024 23:54:43 -0700 (PDT) Received: from [::1] (helo=pc-0182.atmark.tech) by pc-0182.atmarktech with esmtp (Exim 4.96) (envelope-from ) id 1sPcqA-00F8cO-2D; Fri, 05 Jul 2024 15:54:42 +0900 From: Dominique Martinet To: stefano.babic@swupdate.org, swupdate@googlegroups.com Cc: Dominique Martinet Subject: [swupdate] [PATCH 5/5] network_thread DEBUG_IPC: move off the msglock section Date: Fri, 5 Jul 2024 15:54:34 +0900 Message-Id: <20240705065434.3608030-6-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240705065434.3608030-1-dominique.martinet@atmark-techno.com> References: <20240705065434.3608030-1-dominique.martinet@atmark-techno.com> MIME-Version: 1.0 X-Original-Sender: dominique.martinet@atmark-techno.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=qJWET4sw; dkim=pass header.i=@atmark-techno.com header.s=google header.b=CrU2U3ck; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , logging something can call into network_notifier() through notify(), which will dead lock on msglock if logging while that lock is held That probably isn't used by anyone so we could just remove it, but if we're keeping it it should at least work... Signed-off-by: Dominique Martinet --- That log wasn't even very useful to me -- I'd suggest removing the two small ifdef DEBUG_IPC sections instead if you prefer. core/network_thread.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/network_thread.c b/core/network_thread.c index d7b713fb2154..f664b267d4c5 100644 --- a/core/network_thread.c +++ b/core/network_thread.c @@ -513,13 +513,14 @@ void *network_thread (void *data) nrmsgs--; strncpy(msg.data.status.desc, notification->msg, sizeof(msg.data.status.desc) - 1); -#ifdef DEBUG_IPC - DEBUG("GET STATUS: %s\n", msg.data.status.desc); -#endif msg.data.status.current = notification->status; msg.data.status.error = notification->error; } pthread_mutex_unlock(&msglock); +#ifdef DEBUG_IPC + if (notification) + DEBUG("GET STATUS: %s\n", msg.data.status.desc); +#endif break; case NOTIFY_STREAM: