From patchwork Sat Oct 7 20:12:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takeru Hayasaka X-Patchwork-Id: 13412468 X-Patchwork-Delegate: mkubecek+ethtool@suse.cz Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B7C831A9A for ; Sat, 7 Oct 2023 20:13:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IsKRybrg" Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 996AEBA for ; Sat, 7 Oct 2023 13:13:07 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-68fb85afef4so2614539b3a.1 for ; Sat, 07 Oct 2023 13:13:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696709587; x=1697314387; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9fAkfRv9CZ4vTgRP0KXquUoYAbWMhsIRQZJmWBTBUIo=; b=IsKRybrgkCKbER4pMAiReimF0cMbDO+Lgi+e+bYShXfPbcP9f+0BlGte22q7Xxk/gW oJgBDsJmyQsZTTtbfN6TDl+fEKp0qslGjoF1mpCTHZHDRIk7RHmDXTrHTYqdZ/HPaaTg 61RzKr4gfbLEvTQILhubSWfwTuWIz/8aJmo9w1JVf2gxHW7psoxzuTBtZVrhn1tEMYwP EHLb9URGzAR3422gOf86+CLqJy306k5t9B+n6o6zo1dR3PcD2XZ7G197T+DBgJgflxKb qy7SQz76pfhUJmf+pJzBG0LIusWkBMn7/8E2qonNfqhiFhCi7BJ1MpJP/UVsegaPjxzn 3Kyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696709587; x=1697314387; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9fAkfRv9CZ4vTgRP0KXquUoYAbWMhsIRQZJmWBTBUIo=; b=PXQlTg5DvOFcZAvABfAwShlId4QYDTTMZWdgAoD/yMpqeSJ7lMesmJuBWmhIuldX52 YCTXhy6bJKiPVheGieBT7JcRHygpTDZ2b+V2cT1RJpIVPRb1wJowGN5/EcyBqKe28IbE CZTP9Kf/MWHMkwMgcmZRHEoxOFWtsDEAc9sAPIi+X/KFlFqd4mmEPYmHNK5betpnKB0e uGMzUgdBvch9aK5Zr2ScajV6+SnHr6FK0PmQx+EL3t6Jut5XyxKsnB+YzEQg7wbIchJI UdLmApymTgKxJsB8OZGyRjMBj8Q1tEY3yOwtu+ZKmxbvocIwetPnmEMuWJjY5VYpvXTt 3iWA== X-Gm-Message-State: AOJu0YzB2i0kkdywFrnUFI5d304ySZ2OWpXLJLFQCbUtpNGlCzDsIjyZ uZK1oOm4mL5cuf1IiyhaYNwQ1sRYHYk= X-Google-Smtp-Source: AGHT+IEBNGkBR0J2fB6sdFCsiTFraHAqiP/9Q/QJ20q3i8BKG0EP7GxlsTRYxX5dvAtvewGuJJgEWw== X-Received: by 2002:a05:6a20:138a:b0:159:c918:1016 with SMTP id hn10-20020a056a20138a00b00159c9181016mr9891270pzc.49.1696709586743; Sat, 07 Oct 2023 13:13:06 -0700 (PDT) Received: from takehaya-main.. ([2001:e42:407:1028::1000]) by smtp.gmail.com with ESMTPSA id q16-20020a62ae10000000b0069343e474bcsm3533952pff.104.2023.10.07.13.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 13:13:06 -0700 (PDT) From: Takeru Hayasaka To: netdev@vger.kernel.org Cc: mkubecek@suse.cz, Takeru Hayasaka Subject: [PATCH ethtool-next] ethtool: add support for rx-flow-hash gtp Date: Sun, 8 Oct 2023 05:12:52 +0900 Message-Id: <20231007201252.64870-1-hayatake396@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: mkubecek+ethtool@suse.cz GTP Flow hash was added to the ice driver. By executing "ethtool -N rx-flow-hash gtp4 sd", RSS can include not only the IP's src/dst but also the TEID of GTP packets. Additionally, options [c|e] have been support. These allow specification to include GTPv2-C cases as well as the Extension Header's QFI in the hash computation. Signed-off-by: Takeru Hayasaka --- I forgot to include it in the commit, so I recommitted it and resubmitted it. ethtool.c | 38 ++++++++++++++++++++++++++++++++++---- test-cmdline.c | 2 +- uapi/linux/ethtool.h | 6 ++++++ 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/ethtool.c b/ethtool.c index af51220b63cc..8cb307596ad7 100644 --- a/ethtool.c +++ b/ethtool.c @@ -360,6 +360,8 @@ static int rxflow_str_to_type(const char *str) flow_type = AH_ESP_V4_FLOW; else if (!strcmp(str, "sctp4")) flow_type = SCTP_V4_FLOW; + else if (!strcmp(str, "gtp4")) + flow_type = GTP_V4_FLOW; else if (!strcmp(str, "tcp6")) flow_type = TCP_V6_FLOW; else if (!strcmp(str, "udp6")) @@ -370,6 +372,8 @@ static int rxflow_str_to_type(const char *str) flow_type = SCTP_V6_FLOW; else if (!strcmp(str, "ether")) flow_type = ETHER_FLOW; + else if (!strcmp(str, "gtp6")) + flow_type = GTP_V6_FLOW; return flow_type; } @@ -1010,6 +1014,18 @@ static int parse_rxfhashopts(char *optstr, u32 *data) case 'n': *data |= RXH_L4_B_2_3; break; + case 'c': + *data |= RXH_GTP_V2_C; + break; + case 'e': + *data |= RXH_GTP_EH; + break; + case 'u': + *data |= RXH_GTP_EH_UL; + break; + case 'w': + *data |= RXH_GTP_EH_DWL; + break; case 'r': *data |= RXH_DISCARD; break; @@ -1042,6 +1058,14 @@ static char *unparse_rxfhashopts(u64 opts) strcat(buf, "L4 bytes 0 & 1 [TCP/UDP src port]\n"); if (opts & RXH_L4_B_2_3) strcat(buf, "L4 bytes 2 & 3 [TCP/UDP dst port]\n"); + if (opts & RXH_GTP_V2_C) + strcat(buf, "GTPv2-C Switching Flag [GTP]\n"); + if (opts & RXH_GTP_EH) + strcat(buf, "GTP Extension Header [GTP]\n"); + if (opts & RXH_GTP_EH_UL) + strcat(buf, "GTP Extension Header of Uplink [GTP]\n"); + if (opts & RXH_GTP_EH_DWL) + strcat(buf, "GTP Extension Header of Downlink [GTP]\n"); } else { sprintf(buf, "None"); } @@ -1559,6 +1583,9 @@ static int dump_rxfhash(int fhash, u64 val) case SCTP_V4_FLOW: fprintf(stdout, "SCTP over IPV4 flows"); break; + case GTP_V4_FLOW: + fprintf(stdout, "GTP over IPV4 flows"); + break; case AH_ESP_V4_FLOW: case AH_V4_FLOW: case ESP_V4_FLOW: @@ -1573,6 +1600,9 @@ static int dump_rxfhash(int fhash, u64 val) case SCTP_V6_FLOW: fprintf(stdout, "SCTP over IPV6 flows"); break; + case GTP_V6_FLOW: + fprintf(stdout, "GTP over IPV6 flows"); + break; case AH_ESP_V6_FLOW: case AH_V6_FLOW: case ESP_V6_FLOW: @@ -5832,16 +5862,16 @@ static const struct option args[] = { .opts = "-n|-u|--show-nfc|--show-ntuple", .func = do_grxclass, .help = "Show Rx network flow classification options or rules", - .xhelp = " [ rx-flow-hash tcp4|udp4|ah4|esp4|sctp4|" - "tcp6|udp6|ah6|esp6|sctp6 [context %d] |\n" + .xhelp = " [ rx-flow-hash tcp4|udp4|ah4|esp4|sctp4|gtp4|" + "tcp6|udp6|ah6|esp6|sctp6|gtp6 [context %d] |\n" " rule %d ]\n" }, { .opts = "-N|-U|--config-nfc|--config-ntuple", .func = do_srxclass, .help = "Configure Rx network flow classification options or rules", - .xhelp = " rx-flow-hash tcp4|udp4|ah4|esp4|sctp4|" - "tcp6|udp6|ah6|esp6|sctp6 m|v|t|s|d|f|n|r... [context %d] |\n" + .xhelp = " rx-flow-hash tcp4|udp4|ah4|esp4|sctp4|gtp4|" + "tcp6|udp6|ah6|esp6|sctp6|gtp6 m|v|t|s|d|f|n|r|c|e|u|w... [context %d] |\n" " flow-type ether|ip4|tcp4|udp4|sctp4|ah4|esp4|" "ip6|tcp6|udp6|ah6|esp6|sctp6\n" " [ src %x:%x:%x:%x:%x:%x [m %x:%x:%x:%x:%x:%x] ]\n" diff --git a/test-cmdline.c b/test-cmdline.c index cb803ed1a93d..99d7b40400be 100644 --- a/test-cmdline.c +++ b/test-cmdline.c @@ -168,7 +168,7 @@ static struct test_case { { 1, "-f devname filename 1 foo" }, { 1, "-f" }, /* Argument parsing for -N/-U is specialised */ - { 0, "-N devname rx-flow-hash tcp4 mvtsdfn" }, + { 0, "-N devname rx-flow-hash tcp4 mvtsdfnce" }, { 0, "--config-ntuple devname rx-flow-hash tcp4 r" }, { 1, "-U devname rx-flow-hash tcp4" }, { 1, "--config-nfc devname rx-flow-hash foo" }, diff --git a/uapi/linux/ethtool.h b/uapi/linux/ethtool.h index 1d0731b3d289..e7c49336c77d 100644 --- a/uapi/linux/ethtool.h +++ b/uapi/linux/ethtool.h @@ -2009,6 +2009,8 @@ static __inline__ int ethtool_validate_duplex(__u8 duplex) #define IPV4_FLOW 0x10 /* hash only */ #define IPV6_FLOW 0x11 /* hash only */ #define ETHER_FLOW 0x12 /* spec only (ether_spec) */ +#define GTP_V4_FLOW 0x13 /* hash only */ +#define GTP_V6_FLOW 0x14 /* hash only */ /* Flag to enable additional fields in struct ethtool_rx_flow_spec */ #define FLOW_EXT 0x80000000 #define FLOW_MAC_EXT 0x40000000 @@ -2023,6 +2025,10 @@ static __inline__ int ethtool_validate_duplex(__u8 duplex) #define RXH_IP_DST (1 << 5) #define RXH_L4_B_0_1 (1 << 6) /* src port in case of TCP/UDP/SCTP */ #define RXH_L4_B_2_3 (1 << 7) /* dst port in case of TCP/UDP/SCTP */ +#define RXH_GTP_V2_C (1 << 8) /* type gtpv2-c in case of gtp */ +#define RXH_GTP_EH (1 << 9) /* gtp extension header in case of gtp */ +#define RXH_GTP_EH_UL (1 << 10) /* gtp extension header of uplink in case of gtp */ +#define RXH_GTP_EH_DWL (1 << 11) /* gtp extension header of downlink in case of gtp */ #define RXH_DISCARD (1 << 31) #define RX_CLS_FLOW_DISC 0xffffffffffffffffULL