From d621bc7430360db0d1873e6c5c5163687ef5100e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 23 Sep 2010 22:48:52 +0100 Subject: ethtool: Fix RX n-tuple masks and documentation For fields with unspecified values, explicitly mask all bits. Do not allow specifying a mask without a value. Change usage information to clarify which parameters are optional or required. Signed-off-by: Ben Hutchings --- ethtool.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 90 insertions(+), 25 deletions(-) (limited to 'ethtool.c') diff --git a/ethtool.c b/ethtool.c index 8c5d595..6ec1cac 100644 --- a/ethtool.c +++ b/ethtool.c @@ -99,6 +99,7 @@ static int do_gstats(int fd, struct ifreq *ifr); static int rxflow_str_to_type(const char *str); static int parse_rxfhashopts(char *optstr, u32 *data); static char *unparse_rxfhashopts(u64 opts); +static void parse_rxntupleopts(int argc, char **argp, int first_arg); static int dump_rxfhash(int fhash, u64 val); static int do_srxclass(int fd, struct ifreq *ifr); static int do_grxclass(int fd, struct ifreq *ifr); @@ -239,12 +240,14 @@ static struct option { " equal N | weight W0 W1 ...\n" }, { "-U", "--config-ntuple", MODE_SNTUPLE, "Configure Rx ntuple filters " "and actions", - " [ flow-type tcp4|udp4|sctp4 src-ip " - "src-ip-mask dst-ip dst-ip-mask " - "src-port src-port-mask dst-port " - "dst-port-mask vlan vlan-mask " - "user-def user-def-mask " - "action \n" }, + " flow-type tcp4|udp4|sctp4\n" + " [ src-ip ADDR [src-ip-mask MASK] ]\n" + " [ dst-ip ADDR [dst-ip-mask MASK] ]\n" + " [ src-port PORT [src-port-mask MASK] ]\n" + " [ dst-port PORT [dst-port-mask MASK] ]\n" + " [ vlan VLAN-TAG [vlan-mask MASK] ]\n" + " [ user-def DATA [user-def-mask MASK] ]\n" + " action N\n" }, { "-u", "--show-ntuple", MODE_GNTUPLE, "Get Rx ntuple filters and actions\n" }, { "-h", "--help", MODE_HELP, "Show this help" }, @@ -366,6 +369,18 @@ static int rxfhindir_equal = 0; static char **rxfhindir_weight = NULL; static int sntuple_changed = 0; static struct ethtool_rx_ntuple_flow_spec ntuple_fs; +static int ntuple_ip4src_seen = 0; +static int ntuple_ip4src_mask_seen = 0; +static int ntuple_ip4dst_seen = 0; +static int ntuple_ip4dst_mask_seen = 0; +static int ntuple_psrc_seen = 0; +static int ntuple_psrc_mask_seen = 0; +static int ntuple_pdst_seen = 0; +static int ntuple_pdst_mask_seen = 0; +static int ntuple_vlan_tag_seen = 0; +static int ntuple_vlan_tag_mask_seen = 0; +static int ntuple_user_def_seen = 0; +static int ntuple_user_def_mask_seen = 0; static char *flash_file = NULL; static int flash = -1; static int flash_region = -1; @@ -482,18 +497,30 @@ static struct cmdline_info cmdline_coalesce[] = { }; static struct cmdline_info cmdline_ntuple[] = { - { "src-ip", CMDL_IP4, &ntuple_fs.h_u.tcp_ip4_spec.ip4src, NULL }, - { "src-ip-mask", CMDL_IP4, &ntuple_fs.m_u.tcp_ip4_spec.ip4src, NULL }, - { "dst-ip", CMDL_IP4, &ntuple_fs.h_u.tcp_ip4_spec.ip4dst, NULL }, - { "dst-ip-mask", CMDL_IP4, &ntuple_fs.m_u.tcp_ip4_spec.ip4dst, NULL }, - { "src-port", CMDL_BE16, &ntuple_fs.h_u.tcp_ip4_spec.psrc, NULL }, - { "src-port-mask", CMDL_BE16, &ntuple_fs.m_u.tcp_ip4_spec.psrc, NULL }, - { "dst-port", CMDL_BE16, &ntuple_fs.h_u.tcp_ip4_spec.pdst, NULL }, - { "dst-port-mask", CMDL_BE16, &ntuple_fs.m_u.tcp_ip4_spec.pdst, NULL }, - { "vlan", CMDL_U16, &ntuple_fs.vlan_tag, NULL }, - { "vlan-mask", CMDL_U16, &ntuple_fs.vlan_tag_mask, NULL }, - { "user-def", CMDL_U64, &ntuple_fs.data, NULL }, - { "user-def-mask", CMDL_U64, &ntuple_fs.data_mask, NULL }, + { "src-ip", CMDL_IP4, &ntuple_fs.h_u.tcp_ip4_spec.ip4src, NULL, + 0, &ntuple_ip4src_seen }, + { "src-ip-mask", CMDL_IP4, &ntuple_fs.m_u.tcp_ip4_spec.ip4src, NULL, + 0, &ntuple_ip4src_mask_seen }, + { "dst-ip", CMDL_IP4, &ntuple_fs.h_u.tcp_ip4_spec.ip4dst, NULL, + 0, &ntuple_ip4dst_seen }, + { "dst-ip-mask", CMDL_IP4, &ntuple_fs.m_u.tcp_ip4_spec.ip4dst, NULL, + 0, &ntuple_ip4dst_mask_seen }, + { "src-port", CMDL_BE16, &ntuple_fs.h_u.tcp_ip4_spec.psrc, NULL, + 0, &ntuple_psrc_seen }, + { "src-port-mask", CMDL_BE16, &ntuple_fs.m_u.tcp_ip4_spec.psrc, NULL, + 0, &ntuple_psrc_mask_seen }, + { "dst-port", CMDL_BE16, &ntuple_fs.h_u.tcp_ip4_spec.pdst, NULL, + 0, &ntuple_pdst_seen }, + { "dst-port-mask", CMDL_BE16, &ntuple_fs.m_u.tcp_ip4_spec.pdst, NULL, + 0, &ntuple_pdst_mask_seen }, + { "vlan", CMDL_U16, &ntuple_fs.vlan_tag, NULL, + 0, &ntuple_vlan_tag_seen }, + { "vlan-mask", CMDL_U16, &ntuple_fs.vlan_tag_mask, NULL, + 0, &ntuple_vlan_tag_mask_seen }, + { "user-def", CMDL_U64, &ntuple_fs.data, NULL, + 0, &ntuple_user_def_seen }, + { "user-def-mask", CMDL_U64, &ntuple_fs.data_mask, NULL, + 0, &ntuple_user_def_mask_seen }, { "action", CMDL_S32, &ntuple_fs.action, NULL }, }; @@ -844,13 +871,7 @@ static void parse_cmdline(int argc, char **argp) show_usage(1); break; } - ntuple_fs.flow_type = - rxflow_str_to_type(argp[i]); - i += 1; - parse_generic_cmdline(argc, argp, i, - &sntuple_changed, - cmdline_ntuple, - ARRAY_SIZE(cmdline_ntuple)); + parse_rxntupleopts(argc, argp, i); i = argc; break; } else { @@ -1518,6 +1539,50 @@ static char *unparse_rxfhashopts(u64 opts) return buf; } +static void parse_rxntupleopts(int argc, char **argp, int i) +{ + ntuple_fs.flow_type = rxflow_str_to_type(argp[i]); + + switch (ntuple_fs.flow_type) { + case TCP_V4_FLOW: + case UDP_V4_FLOW: + case SCTP_V4_FLOW: + parse_generic_cmdline(argc, argp, i + 1, + &sntuple_changed, + cmdline_ntuple, + ARRAY_SIZE(cmdline_ntuple)); + if (!ntuple_ip4src_seen) + ntuple_fs.m_u.tcp_ip4_spec.ip4src = 0xffffffff; + if (!ntuple_ip4dst_seen) + ntuple_fs.m_u.tcp_ip4_spec.ip4dst = 0xffffffff; + if (!ntuple_psrc_seen) + ntuple_fs.m_u.tcp_ip4_spec.psrc = 0xffff; + if (!ntuple_pdst_seen) + ntuple_fs.m_u.tcp_ip4_spec.pdst = 0xffff; + ntuple_fs.m_u.tcp_ip4_spec.tos = 0xff; + break; + default: + fprintf(stderr, "Unsupported flow type \"%s\"\n", argp[i]); + exit(106); + break; + } + + if (!ntuple_vlan_tag_seen) + ntuple_fs.vlan_tag_mask = 0xffff; + if (!ntuple_user_def_seen) + ntuple_fs.data_mask = 0xffffffffffffffffULL; + + if ((ntuple_ip4src_mask_seen && !ntuple_ip4src_seen) || + (ntuple_ip4dst_mask_seen && !ntuple_ip4dst_seen) || + (ntuple_psrc_mask_seen && !ntuple_psrc_seen) || + (ntuple_pdst_mask_seen && !ntuple_pdst_seen) || + (ntuple_vlan_tag_mask_seen && !ntuple_vlan_tag_seen) || + (ntuple_user_def_mask_seen && !ntuple_user_def_seen)) { + fprintf(stderr, "Cannot specify mask without value\n"); + exit(107); + } +} + static struct { const char *name; int (*func)(struct ethtool_drvinfo *info, struct ethtool_regs *regs); -- cgit v1.2.1