From patchwork Wed Mar 14 14:36:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 885826 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.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.b="tAFq60jo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 401Z794lcmz9sVj for ; Thu, 15 Mar 2018 01:37:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751394AbeCNOhC (ORCPT ); Wed, 14 Mar 2018 10:37:02 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35121 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751362AbeCNOhB (ORCPT ); Wed, 14 Mar 2018 10:37:01 -0400 Received: by mail-pf0-f193.google.com with SMTP id y186so1473635pfb.2 for ; Wed, 14 Mar 2018 07:37:01 -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; bh=oNRdcnx2Jpx9gCFoVOYbLgOWy/uQJ6wsp6QT2gAeYQg=; b=tAFq60joIwGMqV7jveeUElvrzbXW/rRJrtNf7FnSydJ7bl1TcKIlOJGrLGOgMCbGnC +iVoEZf+JxBdE118tfE8PhqnrmwPs8ObdsvoCul4DVE5tO7SdHOwf8K1jo/1I0n4jjLD Sf75gaSKjfTbBsVIb8zWPeAQKtJnUjHuxeYdMT6zYMhaNz1Tnua4036/7gn/oa6Y+UGM 1VUiFfsY/eDWfxaVzV7kyzYN3vpZEXWq4EMVi7FvubH3R7j2ozCTq+HChTA5CcU3KlIH 4Uzu2FSJS0+LTRRtyzJqs2ieNo1yWcQKvOgdgT1l8WpLSKXK6lEFaV3oI2r23MYYRrNS 5x3Q== 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; bh=oNRdcnx2Jpx9gCFoVOYbLgOWy/uQJ6wsp6QT2gAeYQg=; b=jNarDQqUtS5UCCT26KMPc5XPgHcZC7pHEIS0Nv3AOlQ0mqo4fgh2pwHaRCyrr66T+R pFiJb7qzlixIEtJEqQgiC4fhvPpuCret4Aom9Wp0OW2F+ZOXQ4eFdhJY7Ij38/I58IJn AxqGRPAQstVu7sZSv0//wVcDQzUjqlx9J8rtOejuLASJmCZy9zlepdHKRXyODQDwyaXa eUA4mdrHiYcM1Gvbb7oaW3frYGCZhKxDkV5nTYFhfqWzsHtfDOdAOQ0WFSNH9T2uPH0t 7ipEPJkA1sPFzTgpOBC3HDrRyehjb+PXKMFvhBRSK+YZJAxq6pCuZMQ7wxH7Iyh5GMjQ lneQ== X-Gm-Message-State: AElRT7FSXNndS9IJyPHg4/clHx44s9Z8igPuhlZFsefMSoMveMCj6OnO zBSCEWIuzSmJmeK+D4EMltKXcQ== X-Google-Smtp-Source: AG47ELsQIq4jIuUOd3LEK56jEqu+7FrbGF2oh0XT18EI6vhcym6HjtxLaWGTUnyWYu+9IpyVtM2llQ== X-Received: by 10.101.92.6 with SMTP id u6mr3910014pgr.440.1521038220727; Wed, 14 Mar 2018 07:37:00 -0700 (PDT) Received: from ap-To-be-filled-by-O-E-M.8.8.8.8 ([125.130.197.10]) by smtp.gmail.com with ESMTPSA id r138sm4779735pgr.63.2018.03.14.07.36.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Mar 2018 07:37:00 -0700 (PDT) From: Taehee Yoo To: pablo@netfilter.org, netfilter-devel@vger.kernel.org Cc: ap420073@gmail.com Subject: [PATCH] netfilter: ebtables: use ADD_COUNTER macro Date: Wed, 14 Mar 2018 23:36:53 +0900 Message-Id: <20180314143653.25786-1-ap420073@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org xtables uses ADD_COUNTER macro to increase packet and byte count. ebtables also can use this. Signed-off-by: Taehee Yoo --- net/bridge/netfilter/ebtables.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 217aa79..9a26d2b 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -223,9 +223,7 @@ unsigned int ebt_do_table(struct sk_buff *skb, return NF_DROP; } - /* increase counter */ - (*(counter_base + i)).pcnt++; - (*(counter_base + i)).bcnt += skb->len; + ADD_COUNTER(*(counter_base + i), 1, skb->len); /* these should only watch: not modify, nor tell us * what to do with the packet @@ -968,10 +966,9 @@ static void get_counters(const struct ebt_counter *oldcounters, if (cpu == 0) continue; counter_base = COUNTER_BASE(oldcounters, nentries, cpu); - for (i = 0; i < nentries; i++) { - counters[i].pcnt += counter_base[i].pcnt; - counters[i].bcnt += counter_base[i].bcnt; - } + for (i = 0; i < nentries; i++) + ADD_COUNTER(counters[i], counter_base[i].pcnt, + counter_base[i].bcnt); } } @@ -1324,10 +1321,8 @@ static int do_update_counters(struct net *net, const char *name, write_lock_bh(&t->lock); /* we add to the counters of the first cpu */ - for (i = 0; i < num_counters; i++) { - t->private->counters[i].pcnt += tmp[i].pcnt; - t->private->counters[i].bcnt += tmp[i].bcnt; - } + for (i = 0; i < num_counters; i++) + ADD_COUNTER(t->private->counters[i], tmp[i].pcnt, tmp[i].bcnt); write_unlock_bh(&t->lock); ret = 0;