From patchwork Tue Jan 30 05:37:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takeru Hayasaka X-Patchwork-Id: 13536897 X-Patchwork-Delegate: mkubecek+ethtool@suse.cz Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 455212E3F3 for ; Tue, 30 Jan 2024 05:37:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706593073; cv=none; b=fBbDhIXgbbJ48ZMG5S90083Xq1mtQsNYx1O7zrIlwn1rmkOq7YBdK6lT3cdGLo/RMXmRszC3lf5Wp9GZFXZ7dKyuyc8pyV7Dz5NjfFm73pByCN54u1AGrtT+nHZqc7oQTEM5rLYQllSr1NGy7JuTTcKpnPeNOG63Qhe15vXfRhg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706593073; c=relaxed/simple; bh=Dvbd4iuWo6eRovfkkIXAckwhxzfdFXOlsATh2Vyxnjk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=YY2uJF9BhUGAe+yTCnmOUUmC4X9UAdvK1VJnDCJs57rY8GirH3nxW9MI+RxjgL1CClSPC5JhmUs0y7A80VHHM7TZgtTppxQqHi8lO+6WzC8s6jFNdRrttadBsOAcNQgfhWRSemWO3tOYU+ClWZ4WME2v9uIB7RT+uX+4HQxccl8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kU6bFpBF; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kU6bFpBF" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d751bc0c15so30829885ad.2 for ; Mon, 29 Jan 2024 21:37:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706593071; x=1707197871; 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=SixIz47LiICt0ihLIvwNZlf1tmACo1iJ18Z/VzM1lJY=; b=kU6bFpBFoAyWidNA7tjJAbZMPbE0oZyKAjwIVLDOYHB0HXNcU2GSC6eYY5Fc2Br2bh s4e+qoDG+C1NZVlnxiy1R3xn/VCkiD7IC1RhlICcI2+g+N/qmFKAWzOk9WImVRkWRL+V oQ2JiTnJ1OUBDo8q2h8XSRLCUAnOZ0NLUUPJzwa6kko8TXlNps2GxA+ZMgr2Ea/2Fu1r zLYt2anAHEV/QLXYQed1zoojXG4+Mhnknmdqqw+JQ2jFfkk3v067BYxcUJ1Fk8Wdt4kz pK9Ce1HUQHah4tjxNcRRLdR6zAnCcQY75rjci4bzeYtZtINKR4jbKecyuMTmVOwfyKST dbQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706593071; x=1707197871; 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=SixIz47LiICt0ihLIvwNZlf1tmACo1iJ18Z/VzM1lJY=; b=mNHL87V9W1+XScue/a1Kcb2PqRiVoIaABXOwyMbuPmga3MvnDpjtmKFZ3gVX8sCxZM PLr4kr8gdpZxbYJ/bQwwSOewy+sEQJNWXgZPQ7M6KQYzup3iBnoQfIE9wEPjVTQwAChn gU3Q4k1xbZUr5dJXvK4ocJM7gqf07Vl2/rF/2rVLV2faXYCo9XK9blq0hU5pQmjqFylE YtE5K88X3fpyLk9y5BDg5gCrW8gKLReVpqNwIDc243VupXla35kKcpNGxzTRS2qANdiB billWE/yaWViafguJbuspmTZ1Z19gXkum0hcrgsMGnBETYK3p+yd6eDoxKS7qQpNZ8tY iIsA== X-Gm-Message-State: AOJu0YwUi0O4oaw5PRWscgtqGiTHcIj8i0gfaUnwSyjgG/tGckC5Pvs5 Ic4ZzrE4xp3woivxM8HDzqPIPmw4FFipaRvy8/ka3MTykIYoWNHYtHb3PLYD X-Google-Smtp-Source: AGHT+IFQtK++8jLDaS29/tvdrGwCgXJjpxBhhGU2jp6Okbp+2ewUiHvavG8I+dbbsEUd4YzpbbqqRw== X-Received: by 2002:a17:902:b409:b0:1d8:ef9c:4350 with SMTP id x9-20020a170902b40900b001d8ef9c4350mr2736125plr.60.1706593071234; Mon, 29 Jan 2024 21:37:51 -0800 (PST) Received: from ocxma-dut.. ([153.126.233.61]) by smtp.gmail.com with ESMTPSA id h18-20020a170902f2d200b001d913992d7asm100544plc.30.2024.01.29.21.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 21:37:50 -0800 (PST) From: Takeru Hayasaka To: netdev@vger.kernel.org Cc: mkubecek@suse.cz, Takeru Hayasaka Subject: [PATCH ethtool-next RESEND v2] ethtool: add support for rx-flow-hash gtp Date: Tue, 30 Jan 2024 05:37:42 +0000 Message-Id: <20240130053742.946517-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-Patchwork-Delegate: mkubecek+ethtool@suse.cz GTP Flow hash was added to the ice driver. By executing "ethtool -N rx-flow-hash gtpu4t sde", RSS can include not only the IP's src/dst but also the TEID of GTP packets. Additionally, options have been support. These allow specification to include TEID in the hash computation. Signed-off-by: Takeru Hayasaka --- update flow_type and typo fixed. ethtool.c | 71 ++++++++++++++++++++++++++++++++++++++++++-- uapi/linux/ethtool.h | 41 +++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/ethtool.c b/ethtool.c index 3ac15a7..05596c1 100644 --- a/ethtool.c +++ b/ethtool.c @@ -360,6 +360,18 @@ 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, "gtpc4")) + flow_type = GTPC_V4_FLOW; + else if (!strcmp(str, "gtpc4t")) + flow_type = GTPC_TEID_V4_FLOW; + else if (!strcmp(str, "gtpu4")) + flow_type = GTPU_V4_FLOW; + else if (!strcmp(str, "gtpu4e")) + flow_type = GTPU_EH_V4_FLOW; + else if (!strcmp(str, "gtpu4u")) + flow_type = GTPU_UL_V4_FLOW; + else if (!strcmp(str, "gtpu4d")) + flow_type = GTPU_DL_V4_FLOW; else if (!strcmp(str, "tcp6")) flow_type = TCP_V6_FLOW; else if (!strcmp(str, "udp6")) @@ -370,6 +382,18 @@ 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, "gtpc6")) + flow_type = GTPC_V6_FLOW; + else if (!strcmp(str, "gtpc6t")) + flow_type = GTPC_TEID_V6_FLOW; + else if (!strcmp(str, "gtpu6")) + flow_type = GTPU_V6_FLOW; + else if (!strcmp(str, "gtpu6e")) + flow_type = GTPU_EH_V6_FLOW; + else if (!strcmp(str, "gtpu6u")) + flow_type = GTPU_UL_V6_FLOW; + else if (!strcmp(str, "gtpu6d")) + flow_type = GTPU_DL_V6_FLOW; return flow_type; } @@ -1010,6 +1034,9 @@ static int parse_rxfhashopts(char *optstr, u32 *data) case 'n': *data |= RXH_L4_B_2_3; break; + case 'e': + *data |= RXH_GTP_TEID; + break; case 'r': *data |= RXH_DISCARD; break; @@ -1042,6 +1069,8 @@ 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_TEID) + strcat(buf, "GTP TEID\n"); } else { sprintf(buf, "None"); } @@ -1559,6 +1588,24 @@ static int dump_rxfhash(int fhash, u64 val) case SCTP_V4_FLOW: fprintf(stdout, "SCTP over IPV4 flows"); break; + case GTPC_V4_FLOW: + fprintf(stdout, "GTP-C over IPV4 flows"); + break; + case GTPC_TEID_V4_FLOW: + fprintf(stdout, "GTP-C (include TEID) over IPV4 flows"); + break; + case GTPU_V4_FLOW: + fprintf(stdout, "GTP-U over IPV4 flows"); + break; + case GTPU_EH_V4_FLOW: + fprintf(stdout, "GTP-U and Extension Header over IPV4 flows"); + break; + case GTPU_UL_V4_FLOW: + fprintf(stdout, "GTP-U PSC Uplink over IPV4 flows"); + break; + case GTPU_DL_V4_FLOW: + fprintf(stdout, "GTP-U PSC Downlink over IPV4 flows"); + break; case AH_ESP_V4_FLOW: case AH_V4_FLOW: case ESP_V4_FLOW: @@ -1573,6 +1620,24 @@ static int dump_rxfhash(int fhash, u64 val) case SCTP_V6_FLOW: fprintf(stdout, "SCTP over IPV6 flows"); break; + case GTPC_V6_FLOW: + fprintf(stdout, "GTP-C over IPV6 flows"); + break; + case GTPC_TEID_V6_FLOW: + fprintf(stdout, "GTP-C (include TEID) over IPV6 flows"); + break; + case GTPU_V6_FLOW: + fprintf(stdout, "GTP-U over IPV6 flows"); + break; + case GTPU_EH_V6_FLOW: + fprintf(stdout, "GTP-U and Extension Header over IPV6 flows"); + break; + case GTPU_UL_V6_FLOW: + fprintf(stdout, "GTP-U PSC Uplink over IPV6 flows"); + break; + case GTPU_DL_V6_FLOW: + fprintf(stdout, "GTP-U PSC Downlink over IPV6 flows"); + break; case AH_ESP_V6_FLOW: case AH_V6_FLOW: case ESP_V6_FLOW: @@ -5834,7 +5899,8 @@ static const struct option args[] = { .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" + "gtpc4|gtpc4t|gtpu4|gtpu4e|gtpu4u|gtpu4d|tcp6|udp6|ah6|esp6|sctp6|" + "gtpc6|gtpc6t|gtpu6|gtpu6e|gtpu6u|gtpu6d [context %d] |\n" " rule %d ]\n" }, { @@ -5842,7 +5908,8 @@ static const struct option args[] = { .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" + "gtpc4|gtpc4t|gtpu4|gtpu4e|gtpu4u|gtpu4d|tcp6|udp6|ah6|esp6|sctp6" + "|gtpc6|gtpc6t|gtpu6|gtpu6e|gtpu6u|gtpu6d m|v|t|s|d|f|n|r|e... [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/uapi/linux/ethtool.h b/uapi/linux/ethtool.h index 70f2b90..d0dfffe 100644 --- a/uapi/linux/ethtool.h +++ b/uapi/linux/ethtool.h @@ -2021,6 +2021,46 @@ 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) */ +/* Used for GTP-U IPv4 and IPv6. + * The format of GTP packets only includes + * elements such as TEID and GTP version. + * It is primarily intended for data communication of the UE. + */ +#define GTPU_V4_FLOW 0x13 /* hash only */ +#define GTPU_V6_FLOW 0x14 /* hash only */ +/* Use for GTP-C IPv4 and v6. + * The format of these GTP packets does not include TEID. + * Primarily expected to be used for communication + * to create sessions for UE data communication, + * commonly referred to as CSR (Create Session Request). + */ +#define GTPC_V4_FLOW 0x15 /* hash only */ +#define GTPC_V6_FLOW 0x16 /* hash only */ +/* Use for GTP-C IPv4 and v6. + * Unlike GTPC_V4_FLOW, the format of these GTP packets includes TEID. + * After session creation, it becomes this packet. + * This is mainly used for requests to realize UE handover. + */ +#define GTPC_TEID_V4_FLOW 0x17 /* hash only */ +#define GTPC_TEID_V6_FLOW 0x18 /* hash only */ +/* Use for GTP-U and extended headers for the PDU session container(PSC). + * The format of these GTP packets includes TEID and QFI. + * In 5G communication using UPF (User Plane Function), + * data communication with this extended header is performed. + */ +#define GTPU_EH_V4_FLOW 0x19 /* hash only */ +#define GTPU_EH_V6_FLOW 0x1a /* hash only */ +/* Use for GTP-U IPv4 and v6 PDU session container(PSC) extended headers. + * The difference from before is distinguishing based on the PSC. + * There are differences in the data included based on Downlink/Uplink, + * and can be used to distinguish packets. + * The functions described so far are useful when you want to + * handle communication from the mobile network in UPF, PGW, etc. + */ +#define GTPU_UL_V4_FLOW 0x1b /* hash only */ +#define GTPU_UL_V6_FLOW 0x1c /* hash only */ +#define GTPU_DL_V4_FLOW 0x1d /* hash only */ +#define GTPU_DL_V6_FLOW 0x1e /* hash only */ /* Flag to enable additional fields in struct ethtool_rx_flow_spec */ #define FLOW_EXT 0x80000000 #define FLOW_MAC_EXT 0x40000000 @@ -2035,6 +2075,7 @@ 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_TEID (1 << 8) /* teid in case of GTP */ #define RXH_DISCARD (1 << 31) #define RX_CLS_FLOW_DISC 0xffffffffffffffffULL