From patchwork Tue Jan 9 13:55:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 857493 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=arista.com header.i=@arista.com header.b="aDrSag+Q"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zGDFg0Ccjz9s75 for ; Wed, 10 Jan 2018 00:56:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758285AbeAIN4N (ORCPT ); Tue, 9 Jan 2018 08:56:13 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34496 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752241AbeAINzn (ORCPT ); Tue, 9 Jan 2018 08:55:43 -0500 Received: by mail-wm0-f66.google.com with SMTP id y82so20410556wmg.1 for ; Tue, 09 Jan 2018 05:55:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+Em2UWc0aWbqqCOjokdvcY2IEpXHvQ+k9g+y8cAhJ1k=; b=aDrSag+QM3dClkw+vu4lgo1nFYlSd4ly59QsF9pNqUWUBt3bTrTv25DOL2PMcrwI5x o36ji9LwTBpYiC66peAmZtuvKh3QfvC/OJJc3k46v6dzOP4kAx01hg0oV6FGy09rHdHi PrimmIMsCXG1QoeaMURNEQGr5Xn9nXEmyJsfw= 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=+Em2UWc0aWbqqCOjokdvcY2IEpXHvQ+k9g+y8cAhJ1k=; b=hJ1Ja2n6YWbAbYNYFAX6RE0h0/yrs132rrKkPmnIjCUBN6TsrT11dfeHGGhfuee4n5 VOhxf0ilCiCQDNgkoHuUKZOvhjVUX+cE/SHOPmws0arUU1Dwc+sfPIrqfP3ZOBNTWz7t DDcx6FaC4SKsmSNi3Y6ao01/MYjPbSs423wvziujrVvO1AIvta6LaIX9GvbcX2qVNy0N m/0P3JKYiVJOMU+eEVQ+q3qGo6WObPQwNRbKh8c3CVtEE335grZS168kSzUt4m9xF1+p 9WellHLHa6rfRZuKLtxjzNKPkrDhYqmdJW/aMRuBSERW5KkCLv74jOCe5O5STZY/Zd4y aEUQ== X-Gm-Message-State: AKGB3mJ9T7KyL5RjDZS4MNnwEG52SkufY9cgEid31N3zHMJR776fLfxx KBp3ghIuQkFtf0dlZWa35LhkFA== X-Google-Smtp-Source: ACJfBoumwW1riHMUsZhHTJAXwBmWprQSMSSaa4rbYKXhJ894EZtfWI0/V3nzEfpWSQVQVWCsFIlTfw== X-Received: by 10.80.164.77 with SMTP id v13mr21436463edb.115.1515506142234; Tue, 09 Jan 2018 05:55:42 -0800 (PST) Received: from dhcp.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id n49sm1161697edd.37.2018.01.09.05.55.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Jan 2018 05:55:41 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: 0x7f454c46@gmail.com, Dmitry Safonov , Arnd Bergmann , "David S. Miller" , David Windsor , Eric Dumazet , Ingo Molnar , Johannes Berg , Mark Rutland , Radu Rendec , "Reshetova, Elena" , netdev@vger.kernel.org Subject: [PATCH 4/5] pktgen: Remove brute-force printing of flags Date: Tue, 9 Jan 2018 13:55:34 +0000 Message-Id: <20180109135535.15237-5-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180109135535.15237-1-dima@arista.com> References: <20180109135535.15237-1-dima@arista.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Like, we can do it using index. Signed-off-by: Dmitry Safonov --- net/core/pktgen.c | 71 ++++++++++--------------------------------------------- 1 file changed, 13 insertions(+), 58 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 51f273319baf..e320f0cbfd62 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -220,6 +220,8 @@ char *pkt_flag_names[] = { }; #undef pf +#define NR_PKT_FLAGS ARRAY_SIZE(pkt_flag_names) + /* Device flag bits */ /* Thread control flag bits */ @@ -553,6 +555,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v) { const struct pktgen_dev *pkt_dev = seq->private; ktime_t stopped; + unsigned int i; u64 idle; seq_printf(seq, @@ -614,7 +617,6 @@ static int pktgen_if_show(struct seq_file *seq, void *v) pkt_dev->src_mac_count, pkt_dev->dst_mac_count); if (pkt_dev->nr_labels) { - unsigned int i; seq_puts(seq, " mpls: "); for (i = 0; i < pkt_dev->nr_labels; i++) seq_printf(seq, "%08x%s", ntohl(pkt_dev->labels[i]), @@ -650,68 +652,21 @@ static int pktgen_if_show(struct seq_file *seq, void *v) seq_puts(seq, " Flags: "); - if (pkt_dev->flags & F_IPV6) - seq_puts(seq, "IPV6 "); - - if (pkt_dev->flags & F_IPSRC_RND) - seq_puts(seq, "IPSRC_RND "); - - if (pkt_dev->flags & F_IPDST_RND) - seq_puts(seq, "IPDST_RND "); - - if (pkt_dev->flags & F_TXSIZE_RND) - seq_puts(seq, "TXSIZE_RND "); - - if (pkt_dev->flags & F_UDPSRC_RND) - seq_puts(seq, "UDPSRC_RND "); - - if (pkt_dev->flags & F_UDPDST_RND) - seq_puts(seq, "UDPDST_RND "); - - if (pkt_dev->flags & F_UDPCSUM) - seq_puts(seq, "UDPCSUM "); - - if (pkt_dev->flags & F_NO_TIMESTAMP) - seq_puts(seq, "NO_TIMESTAMP "); - - if (pkt_dev->flags & F_MPLS_RND) - seq_puts(seq, "MPLS_RND "); - - if (pkt_dev->flags & F_QUEUE_MAP_RND) - seq_puts(seq, "QUEUE_MAP_RND "); - - if (pkt_dev->flags & F_QUEUE_MAP_CPU) - seq_puts(seq, "QUEUE_MAP_CPU "); + for (i = 0; i < NR_PKT_FLAGS; i++) { + if (i == F_FLOW_SEQ) + if (!pkt_dev->cflows) + continue; - if (pkt_dev->cflows) { - if (pkt_dev->flags & F_FLOW_SEQ) - seq_puts(seq, "FLOW_SEQ "); /*in sequence flows*/ - else - seq_puts(seq, "FLOW_RND "); - } + if (pkt_dev->flags & (1 << i)) + seq_printf(seq, "%s ", pkt_flag_names[i]); + else if (i == F_FLOW_SEQ) + seq_puts(seq, "FLOW_RND "); #ifdef CONFIG_XFRM - if (pkt_dev->flags & F_IPSEC) { - seq_puts(seq, "IPSEC "); - if (pkt_dev->spi) + if (i == F_IPSEC && pkt_dev->spi) seq_printf(seq, "spi:%u", pkt_dev->spi); - } #endif - - if (pkt_dev->flags & F_MACSRC_RND) - seq_puts(seq, "MACSRC_RND "); - - if (pkt_dev->flags & F_MACDST_RND) - seq_puts(seq, "MACDST_RND "); - - if (pkt_dev->flags & F_VID_RND) - seq_puts(seq, "VID_RND "); - - if (pkt_dev->flags & F_SVID_RND) - seq_puts(seq, "SVID_RND "); - - if (pkt_dev->flags & F_NODE) - seq_puts(seq, "NODE_ALLOC "); + } seq_puts(seq, "\n");