From patchwork Tue Aug 18 10:09:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1346744 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=iiz2sZZD; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BW69p2Vnnz9sTH for ; Tue, 18 Aug 2020 20:10:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A987785785; Tue, 18 Aug 2020 10:10:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oZO0P0QYjU_c; Tue, 18 Aug 2020 10:10:36 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id E2C468575B; Tue, 18 Aug 2020 10:10:35 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C24E4C088B; Tue, 18 Aug 2020 10:10:35 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id B1CBBC0051 for ; Tue, 18 Aug 2020 10:10:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A19FE85F96 for ; Tue, 18 Aug 2020 10:10:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MANWgh4JDV7r for ; Tue, 18 Aug 2020 10:10:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id ACD9C8602E for ; Tue, 18 Aug 2020 10:10:33 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id 62so17674157qkj.7 for ; Tue, 18 Aug 2020 03:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z1hv5X0oAAXymBLyMe/KjRiVnwYWlYEP5dKwt6nuRgU=; b=iiz2sZZDbhClu28YMtPdooOoXgFVhdAPkY4hv4mYaVDhmaMYP8AmPnL4CGmYF/hUHm bQAniB4TDVusHzMena/x5LHyQzPK/uHEU2NF+KM/lLfIN0ZmnGvBh55z3sS/vPdc8S7D PRMCjIip1CHozjrDTID4kSK0bBt9Dxb6kXOc1E6iOMunfDx2uUD5qQGIcMXQNYgUY/uc 3n3fWd5jaqimCN2SxetskxTMX02kjH51LKphiqGu6bvWTrNW6Pk1TNMF/hFg6ZdTy7jx rBzT08VoxFML8nkB0T9r2f+p6mH7eELvImkeRI5SBli1AyAgp10xW4T/JSB+YKRHKvUd vdzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z1hv5X0oAAXymBLyMe/KjRiVnwYWlYEP5dKwt6nuRgU=; b=n0H8Kk+fY0dj826+RpOSgIrSJ9Sf77HsY38CtvMphI8EhSz9oFUJvmu5ZfS9weCGtH 0qeQ25uXWcAdKXWWKyu2C8Iu41mPINxCyGRb3arN1mg/JbtAtrbDxXlmrxeSywI2za6L 31Tv9WtePNf/I05e9gty3PYX/YQR9nlqGIBoUVV6+1Sh0M9gModBfDUQ4KF7e0OLapYE E217AyWlKM0vzFUluhOkbhHTEF0hYzd4r0rnVDtwEwe/YT6iGPi5cr+AVrZc27Yg845h CBnvF9vsaUQ1z3zyMwvWuZYk3hyKCAam1Srv3Bj3dlsJoya/k33xBCFQ5u0HkYFA7jOH ObEw== X-Gm-Message-State: AOAM533Ice+hzESUAPAm1ocJTURi3vkYbd6uK6IcMm/g3Gau/+kZ2KDe e/aayltapQ27Hk0BfU68agbnFbESRhw= X-Google-Smtp-Source: ABdhPJw0uRuNvenq/iueaGopTUFMtIoO3tP4RoJZtWALWvFoYSe5HQ5T6jYG1FDmcwq1X0wDHL7xBQ== X-Received: by 2002:a37:62c6:: with SMTP id w189mr16380187qkb.106.1597745432515; Tue, 18 Aug 2020 03:10:32 -0700 (PDT) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id 20sm20632139qkh.110.2020.08.18.03.10.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Aug 2020 03:10:31 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: dev@openvswitch.org, netdev@vger.kernel.org Date: Tue, 18 Aug 2020 18:09:22 +0800 Message-Id: <20200818100923.46840-3-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20200818100923.46840-1-xiangxia.m.yue@gmail.com> References: <20200818100923.46840-1-xiangxia.m.yue@gmail.com> Subject: [ovs-dev] [PATCH net-next v1 2/3] net: openvswitch: refactor flow free function 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: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Tonghao Zhang Decrease table->count and ufid_count unconditionally, and add BUG_ON in flush flows function. Cc: Pravin B Shelar Signed-off-by: Tonghao Zhang --- net/openvswitch/flow_table.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 4b7ab62d0e1a..f8a21dd80e72 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -459,18 +459,14 @@ static void flow_tbl_destroy_rcu_cb(struct rcu_head *rcu) static void table_instance_flow_free(struct flow_table *table, struct table_instance *ti, struct table_instance *ufid_ti, - struct sw_flow *flow, - bool count) + struct sw_flow *flow) { hlist_del_rcu(&flow->flow_table.node[ti->node_ver]); - if (count) - table->count--; + table->count--; if (ovs_identifier_is_ufid(&flow->id)) { hlist_del_rcu(&flow->ufid_table.node[ufid_ti->node_ver]); - - if (count) - table->ufid_count--; + table->ufid_count--; } flow_mask_remove(table, flow->mask); @@ -495,10 +491,13 @@ void table_instance_flow_flush(struct flow_table *table, flow_table.node[ti->node_ver]) { table_instance_flow_free(table, ti, ufid_ti, - flow, false); + flow); ovs_flow_free(flow, true); } } + + BUG_ON(table->count != 0); + BUG_ON(table->ufid_count != 0); } static void table_instance_destroy(struct table_instance *ti, @@ -635,8 +634,6 @@ int ovs_flow_tbl_flush(struct flow_table *flow_table) rcu_assign_pointer(flow_table->ti, new_ti); rcu_assign_pointer(flow_table->ufid_ti, new_ufid_ti); flow_table->last_rehash = jiffies; - flow_table->count = 0; - flow_table->ufid_count = 0; table_instance_flow_flush(flow_table, old_ti, old_ufid_ti); table_instance_destroy(old_ti, old_ufid_ti); @@ -954,7 +951,7 @@ void ovs_flow_tbl_remove(struct flow_table *table, struct sw_flow *flow) struct table_instance *ufid_ti = ovsl_dereference(table->ufid_ti); BUG_ON(table->count == 0); - table_instance_flow_free(table, ti, ufid_ti, flow, true); + table_instance_flow_free(table, ti, ufid_ti, flow); } static struct sw_flow_mask *mask_alloc(void)