From patchwork Wed Sep 15 12:43:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Ivanov X-Patchwork-Id: 1528345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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 4H8g030Mn1z9s5R for ; Wed, 15 Sep 2021 22:44:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 799A8826D6; Wed, 15 Sep 2021 12:44:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f8hOs3Utmnta; Wed, 15 Sep 2021 12:44:31 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id D4922827AA; Wed, 15 Sep 2021 12:44:30 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id AE915C0011; Wed, 15 Sep 2021 12:44:30 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 35FD3C0011 for ; Wed, 15 Sep 2021 12:44:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 714B282D04 for ; Wed, 15 Sep 2021 12:43:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A_GmMh_TLaCS for ; Wed, 15 Sep 2021 12:43:50 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from www.kot-begemot.co.uk (ivanoab7.miniserver.com [37.128.132.42]) by smtp1.osuosl.org (Postfix) with ESMTPS id CAE4382DE6 for ; Wed, 15 Sep 2021 12:43:48 +0000 (UTC) Received: from tun252.jain.kot-begemot.co.uk ([192.168.18.6] helo=jain.kot-begemot.co.uk) by www.kot-begemot.co.uk with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mQUGP-0000VQ-Gw; Wed, 15 Sep 2021 12:43:45 +0000 Received: from jain.kot-begemot.co.uk ([192.168.3.3]) by jain.kot-begemot.co.uk with esmtp (Exim 4.92) (envelope-from ) id 1mQUGM-0000TO-DQ; Wed, 15 Sep 2021 13:43:44 +0100 From: anton.ivanov@cambridgegreys.com To: ovs-dev@openvswitch.org Date: Wed, 15 Sep 2021 13:43:38 +0100 Message-Id: <20210915124340.1765-1-anton.ivanov@cambridgegreys.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett Cc: i.maximets@ovn.org, Anton Ivanov Subject: [ovs-dev] [OVN Patch v8 1/3] northd: Disable parallel processing for logical_dp_groups 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" From: Anton Ivanov Work on improving processing with dp_groups enabled has discovered that the locking mechanism presently in use is not reliable. Disabling parallel processing if dp_groups are enabled until the root cause is determined and fixed. Signed-off-by: Anton Ivanov Acked-by: Mark Michelson --- northd/ovn-northd.c | 2 +- ovs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index baaddb73e..3113fafc7 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -12974,7 +12974,7 @@ build_lswitch_and_lrouter_flows(struct hmap *datapaths, struct hmap *ports, } } - if (use_parallel_build) { + if (use_parallel_build && (!use_logical_dp_groups)) { struct hmap *lflow_segs; struct lswitch_flow_build_info *lsiv; int index; diff --git a/ovs b/ovs index 748010ff3..50e5523b9 160000 --- a/ovs +++ b/ovs @@ -1 +1 @@ -Subproject commit 748010ff304b7cd2c43f4eb98a554433f0df07f9 +Subproject commit 50e5523b9b2b154e5fafc5acdcdec85e9cc5a330