From patchwork Wed Jun 14 09:12:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1794869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EU8HcmnA; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qh07g1hvnz20Wy for ; Wed, 14 Jun 2023 19:12:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 792B7611C3; Wed, 14 Jun 2023 09:12:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 792B7611C3 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EU8HcmnA X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7XSIJOql22Od; Wed, 14 Jun 2023 09:12:44 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id A093F61105; Wed, 14 Jun 2023 09:12:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A093F61105 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5FED8C007A; Wed, 14 Jun 2023 09:12:43 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id DE5B8C0029 for ; Wed, 14 Jun 2023 09:12:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A17E841885 for ; Wed, 14 Jun 2023 09:12:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A17E841885 Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EU8HcmnA X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VZRn_RcCPQy1 for ; Wed, 14 Jun 2023 09:12:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A5A3741868 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id A5A3741868 for ; Wed, 14 Jun 2023 09:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686733959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=drRR1SjLSq/FfBjRbx/3TetxalY8XxLTsFG/BzfNNo0=; b=EU8HcmnA51IeOpWfFsnqDc+4/PBPzgt4fr++FWIpd2DI9kUtPyi7bpsdATKsMnb56yayk+ ydXKgDZ5a/m501SAaSkkUuVMAXKUKWz6axCc34GSUTeRswWQZT7/U7ok1BzX64gP07eWEg kqosZyJI1npwW9gjNMn4YhGW1Q/c3I0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-60-pldxM7u7MVWbG8zaD2o8gg-1; Wed, 14 Jun 2023 05:12:35 -0400 X-MC-Unique: pldxM7u7MVWbG8zaD2o8gg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7EBB0805BC3; Wed, 14 Jun 2023 09:12:34 +0000 (UTC) Received: from dceara.remote.csb (unknown [10.39.194.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98E4BC1604C; Wed, 14 Jun 2023 09:12:33 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Wed, 14 Jun 2023 11:12:31 +0200 Message-Id: <20230614091231.463313-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: ivzhukov@sbercloud.ru Subject: [ovs-dev] [PATCH ovn branch-22.03] Revert "call ovsrcu_exit() before exit in ovn-northd and ovn-controller to make valgrind happy" X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This reverts commit 6849811833b5a40137288145dc2c3e4ac22f90fd. The function run_update_worker_pool() doesn't exist on branches <= 22.03 as the parallelization code changed in newer branches. There's no need to complicate things just to make valgrind happy. Fixes: 6849811833b5 ("call ovsrcu_exit() before exit in ovn-northd and ovn-controller to make valgrind happy") Signed-off-by: Dumitru Ceara --- controller/ovn-controller.c | 1 - northd/ovn-northd.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 307d0fcd57..fbd7a780b1 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -4277,7 +4277,6 @@ loop_done: ovs_feature_support_destroy(); free(ovs_remote); service_stop(); - ovsrcu_exit(); exit(retval); } diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 731876cee8..4e18519fad 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -32,7 +32,6 @@ #include "lib/ovn-l7.h" #include "lib/ovn-nb-idl.h" #include "lib/ovn-sb-idl.h" -#include "lib/ovs-rcu.h" #include "openvswitch/poll-loop.h" #include "simap.h" #include "stopwatch.h" @@ -952,8 +951,6 @@ main(int argc, char *argv[]) ovsdb_idl_loop_destroy(&ovnnb_idl_loop); ovsdb_idl_loop_destroy(&ovnsb_idl_loop); service_stop(); - run_update_worker_pool(0); - ovsrcu_exit(); exit(res); }