From patchwork Fri Apr 5 17:31:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 161884 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp706892jan; Fri, 5 Apr 2019 10:29:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqydIt2nDTgP0XplLqmCpRTCZyNluNQ78j14Cj2mVjz7s71TaEbJ+5OYZP15R0T1jhRS+C61 X-Received: by 2002:a17:902:d24:: with SMTP id 33mr14576132plu.246.1554485360480; Fri, 05 Apr 2019 10:29:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554485360; cv=none; d=google.com; s=arc-20160816; b=wB7mA1wtMTn9FRGhaIexHCRLphMYiYSZ7+AfS3Mhdx8ZIBUnGmt0Ub5wGaFcG7Hm2k UIhYqv5xAHlqRtwwCM3gEHPcBZUjRzsk3R3gLrYSR5gqmDpUggHCEEzVy8a30XUhk31j Uarh6Q0T0nfS2ou/Xv7Syqz3NMt24IN1Bikc+g2cf8pbbshYJOjNDNOz0DUQmRyZQjcA fnE+LKNkF/VeHIxdKqD6wKnQt/16oDE0leRs35SjM15lirdiCNJBV4DaI3uB3QzrD07C uA19I9DSsh9Glayesa9UfssHqzDpX9YzKIJ3SuLQNJW0a2snek3a+2b/h78PZlkypIie A5Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=QfKLSOWpaNEAmUiFaUOcU4SMCjMPov4tmkM4IrTqZgA=; b=Q7XBaoIrlVBSo+gkt9iSolLPQjt8FQn9pTaRcMbn5pXSrAGFgJFwcq92dLLyf81xq6 ymX8Ty2l5Jsi0KUZJPIhQC+UNdraqS6U7wadb2j2/f/qBGM8agADwT7cmC17JXF6Sc/F YDNGDcYZKJatI3SrWzwhR17n8Pm/K1XuyUS4SJ9SVei+SMIm+ndH27DXhKUcWtHMzkyA KB5tcIvjeBxRRrP3JYyH3GmsZYaQhanykcWYpRGASkyxSQbzoJXk/FIF20z9kZqMX1Ds y7OaXPfTWNrw+EuE/rsBS+kfH4wsRpVrJJYHbOtMUeb/7z2bOGjCVF27W3QurbzxIC8Y HuEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=hTfCem0b; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p9si19145384pff.52.2019.04.05.10.29.20; Fri, 05 Apr 2019 10:29:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=hTfCem0b; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731766AbfDER3N (ORCPT + 31 others); Fri, 5 Apr 2019 13:29:13 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:56332 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731710AbfDER3G (ORCPT ); Fri, 5 Apr 2019 13:29:06 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id x35HT3GV131024; Fri, 5 Apr 2019 12:29:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1554485343; bh=QfKLSOWpaNEAmUiFaUOcU4SMCjMPov4tmkM4IrTqZgA=; h=From:To:Subject:Date:In-Reply-To:References; b=hTfCem0b3sOeedFAhoLkLYnREXd/aBCpn2YHISMasVZAfl62uFSj39CK4XDlorKBE kaU/HPClBvCMo4i0fhksmBOdYQAIu6xSuOxoLLHUjkqsCnSo0ybcfuYUqb7LaU4Hqd z4kep1U9y7Fics/gexiPFHkahOsFjExLEYzt0YBU= Received: from DLEE103.ent.ti.com (dlee103.ent.ti.com [157.170.170.33]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x35HT3pH097042 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 5 Apr 2019 12:29:03 -0500 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 5 Apr 2019 12:29:02 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Fri, 5 Apr 2019 12:29:02 -0500 Received: from uda0868495.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x35HSsub095744; Fri, 5 Apr 2019 12:29:02 -0500 From: Murali Karicheri To: , , , , Subject: [PATCH net 14/14] net: hsr: Fix node prune function for forget time expiry Date: Fri, 5 Apr 2019 13:31:36 -0400 Message-ID: <20190405173136.18050-15-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190405173136.18050-1-m-karicheri2@ti.com> References: <20190405173136.18050-1-m-karicheri2@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aaron Kramer HSR should forget nodes after configured node forget time expiry based on HSR_NODE_FORGET_TIME. As part of hsr_prune_nodes(), code checks to see if entries are to be flushed out if not heard for longer than forget time. But currently hsr_prune_nodes() is called only once during device creation. Restart the timer at the end of hsr_prune_nodes() so that hsr_prune_nodes() gets called periodically and forgotten entries are removed from node table. Signed-off-by: Aaron Kramer Signed-off-by: Murali Karicheri --- net/hsr/hsr_framereg.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.0 diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index a3cc30ac8a5a..9fa9abd83018 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c @@ -405,6 +405,10 @@ void hsr_prune_nodes(struct timer_list *t) } } rcu_read_unlock(); + + /* Restart timer */ + mod_timer(&hsr->prune_timer, + jiffies + msecs_to_jiffies(PRUNE_PERIOD)); } void *hsr_get_next_node(struct hsr_priv *hsr, void *_pos,