From patchwork Fri Sep 18 19:55:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 519561 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 EA7051401E7 for ; Sat, 19 Sep 2015 05:53:13 +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=nr9T5Rnf; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753966AbbIRTxJ (ORCPT ); Fri, 18 Sep 2015 15:53:09 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:32989 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753893AbbIRTxH (ORCPT ); Fri, 18 Sep 2015 15:53:07 -0400 Received: by pacex6 with SMTP id ex6so59215494pac.0 for ; Fri, 18 Sep 2015 12:53:07 -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=vWfg6K5bG72WWjrul852NQon23q5EMjj8cTD3Sw0Rbg=; b=nr9T5RnfGLzt5EcxSt29tIpp4CPogqrDLKBtkX/KAGi5exeAn2g9LzYYAayehyZIS1 mVUOKzfcAwOTeFInlJi7oWrzi42zCR+szKJU5n78FLL82IWDECfbwGMBMXGblFyBCGWG oWeCdc7/GLeaD6E1g/qSVbRsEu9pj3q4dkB6fMdaiH/+dCO88zTBbn8K1f+OiG22JcMV 7lsdPihSQ59NDM7HOwXDdaXBdSfIs2doh3vMWsmbvHiH8ijjNGnWOPQJEidNZ2mjfouu th8im3P4XXVcNMVudUwyETCggM3dJBvgIr7nM6VG7HJ+FqXJGLRhkg3e2sDrZ0B6unPV lNrw== X-Received: by 10.66.142.101 with SMTP id rv5mr8845383pab.25.1442605987130; Fri, 18 Sep 2015 12:53:07 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by smtp.gmail.com with ESMTPSA id fx4sm10458910pbb.92.2015.09.18.12.53.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Sep 2015 12:53:06 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: 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 1/7] rocker: track when FDB entry is touched. Date: Fri, 18 Sep 2015 12:55:45 -0700 Message-Id: <1442606151-50429-2-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1442606151-50429-1-git-send-email-sfeldma@gmail.com> References: <1442606151-50429-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);