From patchwork Tue Aug 10 19:01:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Richardson X-Patchwork-Id: 494765 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69DAAC4338F for ; Tue, 10 Aug 2021 19:02:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 501ED60F56 for ; Tue, 10 Aug 2021 19:02:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232210AbhHJTCh (ORCPT ); Tue, 10 Aug 2021 15:02:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbhHJTCa (ORCPT ); Tue, 10 Aug 2021 15:02:30 -0400 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFAA5C0613C1 for ; Tue, 10 Aug 2021 12:02:07 -0700 (PDT) Received: by mail-qk1-x74a.google.com with SMTP id s16-20020a05620a0810b02903d250dfc6a7so3202730qks.5 for ; Tue, 10 Aug 2021 12:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=V7Sgs3nsJ0DQkLJAMtKl+NYqeYDf7l5EnJnzYaV3WwY=; b=vgYfHmzOprCr6/Y8iMnO2sGQiUIB50TbLbQ5Hof3hkoJkQC+O0jy5vhlnDBdILATJM JcwAWDEM4Rh7bC5pwjhIJDKs8yx8duhSjU8M36TIiY1OInrpm2toMm4FopXl5/W4ts9E 6R7QMYM3Bc95hwDcZSZ10jH5/oNYGXMCphK3emg89pyDnn4yrflnG9uZQo+YTB6lFPPH 47ImCOMLi8cbZ5mkcljyXJIt5q44PaxdpV5R1+NeaOE8urCKaHvkigS5eTkvg2WTzCmq HBYsOneES1q/AWpqzu7tn2aa03ACtdKghJWFoeKcRle4PYkksCA4PnSSPSYxBXG9TtT2 TVIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=V7Sgs3nsJ0DQkLJAMtKl+NYqeYDf7l5EnJnzYaV3WwY=; b=CamHjix/VkyD9eyi0DvpeZLhpBk7lLal1SQAKfuoPDq5S3rnuL9Y5fLi6hN4HqO1mr tIjgqtLW0tPMVV4+U3wR+0Uiy++CyLe8aWBNgQraTovKcCYqDht0TCI+sp/Y6Q/+dadh kLRB1pAWpW5/OH9mOxpwHAmKCJh16K/bhO+vHspsfCindSinfHI26hLVnsoc7+heXwE4 +iapbE6iBuhgoU7Zg7r3O9WcDt6zBNUkCG57BaAEP98/Kad4VYe/QFk1iMoReRdcba0u F4DE8IvDojXhsOxIytauA+eHMmEOX2zw8m7C95AUQVnPj617f1lhqPIJ4yEIL+5GzUAm 5b/g== X-Gm-Message-State: AOAM531XJqaz/4nqeEEL7+kFi1LwCWTYOlaBkc4YvILG1JugHTFePjB9 zqiJISYgkEXrxodHYdB5aICkiZIxPtkqVZZ8D5NCFw== X-Google-Smtp-Source: ABdhPJxvw7MG98Kz//EoDUdSzcc6b/D5vC/cEBw/t27aqaXIfQ9RmL8/XVJNF4P+GbeKyZxqfAHuxcjjjRAADsLoc4mbgQ== X-Received: from mustash.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:337b]) (user=richardsonnick job=sendgmr) by 2002:a05:6214:29cb:: with SMTP id gh11mr29980502qvb.55.1628622127104; Tue, 10 Aug 2021 12:02:07 -0700 (PDT) Date: Tue, 10 Aug 2021 19:01:53 +0000 In-Reply-To: <20210810190159.4103778-1-richardsonnick@google.com> Message-Id: <20210810190159.4103778-2-richardsonnick@google.com> Mime-Version: 1.0 References: <20210810190159.4103778-1-richardsonnick@google.com> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog Subject: [PATCH v2 1/3] pktgen: Parse internet mix (imix) input From: Nicholas Richardson To: davem@davemloft.net, kuba@kernel.org Cc: nrrichar@ncsu.edu, promanov@google.com, arunkaly@google.com, Nick Richardson , "Gustavo A. R. Silva" , Leesoo Ahn , Ye Bin , Di Zhu , Yejune Deng , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nick Richardson Adds "imix_weights" command for specifying internet mix distribution. The command is in this format: "imix_weights size_1,weight_1 size_2,weight_2 ... size_n,weight_n" where the probability that packet size_i is picked is: weight_i / (weight_1 + weight_2 + .. + weight_n) The user may provide up to 100 imix entries (size_i,weight_i) in this command. The user specified imix entries will be displayed in the "Params" section of the interface output. Values for clone_skb > 0 is not supported in IMIX mode. Summary of changes: Add flag for enabling internet mix mode. Add command (imix_weights) for internet mix input. Return -ENOTSUPP when clone_skb > 0 in IMIX mode. Display imix_weights in Params. Create data structures to store imix entries and distribution. Signed-off-by: Nick Richardson --- net/core/pktgen.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 7e258d255e90..a7e45eaccef7 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -175,6 +175,8 @@ #define IP_NAME_SZ 32 #define MAX_MPLS_LABELS 16 /* This is the max label stack depth */ #define MPLS_STACK_BOTTOM htonl(0x00000100) +/* Max number of internet mix entries that can be specified in imix_weights. */ +#define MAX_IMIX_ENTRIES 20 #define func_enter() pr_debug("entering %s\n", __func__); @@ -242,6 +244,12 @@ static char *pkt_flag_names[] = { #define VLAN_TAG_SIZE(x) ((x)->vlan_id == 0xffff ? 0 : 4) #define SVLAN_TAG_SIZE(x) ((x)->svlan_id == 0xffff ? 0 : 4) +struct imix_pkt { + u64 size; + u64 weight; + u64 count_so_far; +}; + struct flow_state { __be32 cur_daddr; int count; @@ -343,6 +351,10 @@ struct pktgen_dev { __u8 traffic_class; /* ditto for the (former) Traffic Class in IPv6 (see RFC 3260, sec. 4) */ + /* IMIX */ + unsigned int n_imix_entries; + struct imix_pkt imix_entries[MAX_IMIX_ENTRIES]; + /* MPLS */ unsigned int nr_labels; /* Depth of stack, 0 = no MPLS */ __be32 labels[MAX_MPLS_LABELS]; @@ -552,6 +564,16 @@ static int pktgen_if_show(struct seq_file *seq, void *v) (unsigned long long)pkt_dev->count, pkt_dev->min_pkt_size, pkt_dev->max_pkt_size); + if (pkt_dev->n_imix_entries > 0) { + seq_puts(seq, " imix_weights: "); + for (i = 0; i < pkt_dev->n_imix_entries; i++) { + seq_printf(seq, "%llu,%llu ", + pkt_dev->imix_entries[i].size, + pkt_dev->imix_entries[i].weight); + } + seq_puts(seq, "\n"); + } + seq_printf(seq, " frags: %d delay: %llu clone_skb: %d ifname: %s\n", pkt_dev->nfrags, (unsigned long long) pkt_dev->delay, @@ -792,6 +814,62 @@ static int strn_len(const char __user * user_buffer, unsigned int maxlen) return i; } +/* Parses imix entries from user buffer. + * The user buffer should consist of imix entries separated by spaces + * where each entry consists of size and weight delimited by commas. + * "size1,weight_1 size2,weight_2 ... size_n,weight_n" for example. + */ +static ssize_t get_imix_entries(const char __user *buffer, + struct pktgen_dev *pkt_dev) +{ + const int max_digits = 10; + int i = 0; + long len; + char c; + + pkt_dev->n_imix_entries = 0; + + do { + unsigned long weight; + unsigned long size; + + len = num_arg(&buffer[i], max_digits, &size); + if (len < 0) + return len; + i += len; + if (get_user(c, &buffer[i])) + return -EFAULT; + /* Check for comma between size_i and weight_i */ + if (c != ',') + return -EINVAL; + i++; + + if (size < 14 + 20 + 8) + size = 14 + 20 + 8; + + len = num_arg(&buffer[i], max_digits, &weight); + if (len < 0) + return len; + if (weight <= 0) + return -EINVAL; + + pkt_dev->imix_entries[pkt_dev->n_imix_entries].size = size; + pkt_dev->imix_entries[pkt_dev->n_imix_entries].weight = weight; + + i += len; + if (get_user(c, &buffer[i])) + return -EFAULT; + + i++; + pkt_dev->n_imix_entries++; + + if (pkt_dev->n_imix_entries > MAX_IMIX_ENTRIES) + return -E2BIG; + } while (c == ' '); + + return i; +} + static ssize_t get_labels(const char __user *buffer, struct pktgen_dev *pkt_dev) { unsigned int n = 0; @@ -960,6 +1038,18 @@ static ssize_t pktgen_if_write(struct file *file, return count; } + if (!strcmp(name, "imix_weights")) { + if (pkt_dev->clone_skb > 0) + return -EINVAL; + + len = get_imix_entries(&user_buffer[i], pkt_dev); + if (len < 0) + return len; + + i += len; + return count; + } + if (!strcmp(name, "debug")) { len = num_arg(&user_buffer[i], 10, &value); if (len < 0) @@ -1082,10 +1172,16 @@ static ssize_t pktgen_if_write(struct file *file, len = num_arg(&user_buffer[i], 10, &value); if (len < 0) return len; + /* clone_skb is not supported for netif_receive xmit_mode and + * IMIX mode. + */ if ((value > 0) && ((pkt_dev->xmit_mode == M_NETIF_RECEIVE) || !(pkt_dev->odev->priv_flags & IFF_TX_SKB_SHARING))) return -ENOTSUPP; + if (value > 0 && pkt_dev->n_imix_entries > 0) + return -EINVAL; + i += len; pkt_dev->clone_skb = value; From patchwork Tue Aug 10 19:01:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Richardson X-Patchwork-Id: 494764 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 015C8C432BE for ; Tue, 10 Aug 2021 19:02:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CAB6F60F94 for ; Tue, 10 Aug 2021 19:02:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232245AbhHJTCw (ORCPT ); Tue, 10 Aug 2021 15:02:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232312AbhHJTCm (ORCPT ); Tue, 10 Aug 2021 15:02:42 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89BE5C06179F for ; Tue, 10 Aug 2021 12:02:17 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id r13-20020ac85c8d0000b029028efef0404cso9536046qta.14 for ; Tue, 10 Aug 2021 12:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=LD5EM5kZNOu66+iSv1Q9X75TvjKmtvXyw6oUcsk/oJc=; b=hvL77SsKpxUXlNdVpZW+5fBRnSR5XhA5CxfsiXvB56MNTbW1MNRzVDAeXcZfiQRJVR dY7AO7BLxaSEdmjDseD+Uo89DPBg2Z4j5MBkVEntaCa11BWuczlPevVw1SQbqR6cMpgx 6un5YRvEgW1gIMhEf4ZZugg/XH3efTTc6tijwzDUvbtO1NPK/XMe9OlgHbVZwb+T82u5 oYdNtc/FCiD/uPVUECfzq2XKBGXpKjcO3LXVACivTHucWafUJ21XhDrj5i/kdAPwOf97 jQPWl09xkD+BL4C1h/XMEPEabx4Lu1Yi5Nz2ogFLnEPQnyCcu/hXeRJmhbJ7q1HQHK0p /MVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=LD5EM5kZNOu66+iSv1Q9X75TvjKmtvXyw6oUcsk/oJc=; b=tVCVSN65iowU8J2yEqzPwEnNZh1ZJuJnbB+bpV0yAOrTYm33PSHrXGfHgKNiwOBSyv zWnbk1jrInXtfopgQqfPM01l5buij0MzM/H3rLDBB1vbsAbCqxoVvVvtxCP6rei/nSlN 7yPCBjKcS3XitcH3zH+lD07M4Lq5CXKbKlgEQwyRdNYRmwLHMkZC7fcT2acYbdCc1IFk gtJNt8JvMtlHPGiE0A9job76dnpC8dbI7dC5O8+sbxH3ziWJxxtTCo/jOk6ZnwW0O/e/ aDI/5PMFFVpVUoS7ZC6F6T3GfJbirgt3o6iId70wZGQgtVQLoiOFD9BlcA41XR1+7p8k nqXw== X-Gm-Message-State: AOAM530/Pekfjp6++KxIUBm8q0BYAJ+aTnLc18NxDpJ4EPNRpk1IBCWE 2NaW8ToCidH0RZWhOqyY21lHte1kk/l5F+25P7P5yA== X-Google-Smtp-Source: ABdhPJwN/JfoIDzQQZROMIXWX9NZa2WxHaoL9mBdNWSVMu14p6iwqfDC10WbpeTA14yBfGfbP9j5P9NWtmXN7PY5d+DfaA== X-Received: from mustash.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:337b]) (user=richardsonnick job=sendgmr) by 2002:a05:6214:d05:: with SMTP id 5mr11741968qvh.54.1628622136748; Tue, 10 Aug 2021 12:02:16 -0700 (PDT) Date: Tue, 10 Aug 2021 19:01:55 +0000 In-Reply-To: <20210810190159.4103778-1-richardsonnick@google.com> Message-Id: <20210810190159.4103778-4-richardsonnick@google.com> Mime-Version: 1.0 References: <20210810190159.4103778-1-richardsonnick@google.com> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog Subject: [PATCH v2 3/3] pktgen: Add output for imix results From: Nicholas Richardson To: davem@davemloft.net, kuba@kernel.org Cc: nrrichar@ncsu.edu, promanov@google.com, arunkaly@google.com, Nick Richardson , "Gustavo A. R. Silva" , Leesoo Ahn , Di Zhu , Ye Bin , Yejune Deng , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nick Richardson The bps for imix mode is calculated by: sum(imix_entry.size) / time_elapsed The actual counts of each imix_entry are displayed under the "Current:" section of the interface output in the following format: imix_size_counts: size_1,count_1 size_2,count_2 ... size_n,count_n Example (count = 200000): imix_weights: 256,1 859,3 205,2 imix_size_counts: 256,32082 859,99796 205,68122 Result: OK: 17992362(c17964678+d27684) usec, 200000 (859byte,0frags) 11115pps 47Mb/sec (47977140bps) errors: 0 Summary of changes: Calculate bps based on imix counters when in IMIX mode. Add output for IMIX counters. Signed-off-by: Nick Richardson --- net/core/pktgen.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index ac1de15000e2..7aca175e749b 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -695,6 +695,18 @@ static int pktgen_if_show(struct seq_file *seq, void *v) (unsigned long long)pkt_dev->sofar, (unsigned long long)pkt_dev->errors); + if (pkt_dev->n_imix_entries > 0) { + int i; + + seq_puts(seq, " imix_size_counts: "); + for (i = 0; i < pkt_dev->n_imix_entries; i++) { + seq_printf(seq, "%llu,%llu ", + pkt_dev->imix_entries[i].size, + pkt_dev->imix_entries[i].count_so_far); + } + seq_puts(seq, "\n"); + } + seq_printf(seq, " started: %lluus stopped: %lluus idle: %lluus\n", (unsigned long long) ktime_to_us(pkt_dev->started_at), @@ -3282,7 +3294,19 @@ static void show_results(struct pktgen_dev *pkt_dev, int nr_frags) pps = div64_u64(pkt_dev->sofar * NSEC_PER_SEC, ktime_to_ns(elapsed)); - bps = pps * 8 * pkt_dev->cur_pkt_size; + if (pkt_dev->n_imix_entries > 0) { + int i; + struct imix_pkt *entry; + + bps = 0; + for (i = 0; i < pkt_dev->n_imix_entries; i++) { + entry = &pkt_dev->imix_entries[i]; + bps += entry->size * entry->count_so_far; + } + bps = div64_u64(bps * 8 * NSEC_PER_SEC, ktime_to_ns(elapsed)); + } else { + bps = pps * 8 * pkt_dev->cur_pkt_size; + } mbps = bps; do_div(mbps, 1000000);