From patchwork Wed Sep 23 15:39:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 521744 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CC61E1401AF for ; Thu, 24 Sep 2015 01:36:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=kDrje+l4; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755678AbbIWPgQ (ORCPT ); Wed, 23 Sep 2015 11:36:16 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:33485 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754151AbbIWPgI (ORCPT ); Wed, 23 Sep 2015 11:36:08 -0400 Received: by pacex6 with SMTP id ex6so43637067pac.0 for ; Wed, 23 Sep 2015 08:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u0vemUorSH5x6LgUAqAGrG/w4uIxeY1xUkz8uSj7sNk=; b=kDrje+l4BGjgsTySb0z54n/eCds/s7qEzCWNKeNdmrE4cAJV5HC8lNkG1dDsmH2E7i b9kdQP2c5IjY4DOU6zNNbWcV9zbYDb6moI87+sB+cpjKau6+Kkijra9rdNycukaVkSC1 ECR+louXd6pGa0Ck/I+paJcw2GyhjQBN/BVDFQPCKSC0sR+11zwAW4C8rbiOqpS5vdyt rjPxXJnjY0RfhjDKjCSsQoG3HX9ztRLuH53QZAf+ePXZ4WGF+Hrl8wWNoi4cYw+P7FuJ 3T9u5ACr6to9044zmFv2ZCqInpAVzGqMS5D4AdvO24k3jLeuUDYRS4wdeoRKOke//Of2 0WqQ== X-Received: by 10.66.218.135 with SMTP id pg7mr38078202pac.141.1443022568560; Wed, 23 Sep 2015 08:36:08 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by smtp.gmail.com with ESMTPSA id rw8sm4245565pac.11.2015.09.23.08.36.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Sep 2015 08:36:08 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: davem@davemloft.net, jiri@resnulli.us, siva.mannem.lnx@gmail.com, pjonnala@broadcom.com, stephen@networkplumber.org, roopa@cumulusnetworks.com, andrew@lunn.ch, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com Subject: [PATCH net-next v3 1/7] rocker: track when FDB entry is touched. Date: Wed, 23 Sep 2015 08:39:14 -0700 Message-Id: <1443022760-21301-2-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1443022760-21301-1-git-send-email-sfeldma@gmail.com> References: <1443022760-21301-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman The entry is touched once when created, and touched again for each update. The touched time is used to calculate FDB entry age. Signed-off-by: Scott Feldman Acked-by: Jiri Pirko --- drivers/net/ethernet/rocker/rocker.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index 34ac41a..e517e9c 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -152,6 +152,7 @@ struct rocker_fdb_tbl_entry { struct hlist_node entry; u32 key_crc32; /* key */ bool learned; + unsigned long touched; struct rocker_fdb_tbl_key { u32 pport; u8 addr[ETH_ALEN]; @@ -3629,6 +3630,7 @@ static int rocker_port_fdb(struct rocker_port *rocker_port, return -ENOMEM; fdb->learned = (flags & ROCKER_OP_FLAG_LEARNED); + fdb->touched = jiffies; fdb->key.pport = rocker_port->pport; ether_addr_copy(fdb->key.addr, addr); fdb->key.vlan_id = vlan_id; @@ -3638,13 +3640,17 @@ static int rocker_port_fdb(struct rocker_port *rocker_port, found = rocker_fdb_tbl_find(rocker, fdb); - if (removing && found) { - rocker_port_kfree(trans, fdb); - if (trans != SWITCHDEV_TRANS_PREPARE) - hash_del(&found->entry); - } else if (!removing && !found) { + if (found) { + found->touched = jiffies; + if (removing) { + rocker_port_kfree(trans, fdb); + if (trans != SWITCHDEV_TRANS_PREPARE) + hash_del(&found->entry); + } + } else if (!removing) { if (trans != SWITCHDEV_TRANS_PREPARE) - hash_add(rocker->fdb_tbl, &fdb->entry, fdb->key_crc32); + hash_add(rocker->fdb_tbl, &fdb->entry, + fdb->key_crc32); } spin_unlock_irqrestore(&rocker->fdb_tbl_lock, lock_flags);