| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20211215075256.33adf3ee@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date: Wed, 15 Dec 2021 08:08:42 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: xiangxia.m.yue@...il.com
Cc: netdev@...r.kernel.org, Jamal Hadi Salim <jhs@...atatu.com>,
Cong Wang <xiyou.wangcong@...il.com>,
Jiri Pirko <jiri@...nulli.us>,
"David S. Miller" <davem@...emloft.net>,
Jonathan Lemon <jonathan.lemon@...il.com>,
Eric Dumazet <edumazet@...gle.com>,
Alexander Lobakin <alobakin@...me>,
Paolo Abeni <pabeni@...hat.com>,
Talal Ahmad <talalahmad@...gle.com>,
Kevin Hao <haokexin@...il.com>,
Ilias Apalodimas <ilias.apalodimas@...aro.org>,
Kees Cook <keescook@...omium.org>,
Kumar Kartikeya Dwivedi <memxor@...il.com>,
Antoine Tenart <atenart@...nel.org>,
Wei Wang <weiwan@...gle.com>, Arnd Bergmann <arnd@...db.de>
Subject: Re: [net-next v3 2/2] net: sched: support hash/classid/cpuid
selecting tx queue
On Fri, 10 Dec 2021 10:36:26 +0800 xiangxia.m.yue@...il.com wrote:
> From: Tonghao Zhang <xiangxia.m.yue@...il.com>
>
> This patch allows users to select queue_mapping, range
> from A to B. And users can use skb-hash, cgroup classid
> and cpuid to select Tx queues. Then we can load balance
> packets from A to B queue. The range is an unsigned 16bit
> value in decimal format.
>
> $ tc filter ... action skbedit queue_mapping hash-type normal A B
>
> "skbedit queue_mapping QUEUE_MAPPING" (from "man 8 tc-skbedit") is
> enhanced with flags:
> * SKBEDIT_F_QUEUE_MAPPING_HASH
> * SKBEDIT_F_QUEUE_MAPPING_CLASSID
> * SKBEDIT_F_QUEUE_MAPPING_CPUID
>
> Use skb->hash, cgroup classid, or cpuid to distribute packets.
> Then same range of tx queues can be shared for different flows,
> cgroups, or CPUs in a variety of scenarios.
>
> For example, flows F1 may share range R1 with flows F2. The best
> way to do that is to set flag to SKBEDIT_F_QUEUE_MAPPING_HASH.
> If cgroup C1 share the R1 with cgroup C2 .. Cn, use the
> SKBEDIT_F_QUEUE_MAPPING_CLASSID. Of course, in some other scenario,
> C1 uses R1, while Cn can use Rn.
> diff --git a/include/net/tc_act/tc_skbedit.h b/include/net/tc_act/tc_skbedit.h
> index 00bfee70609e..ee96e0fa6566 100644
> --- a/include/net/tc_act/tc_skbedit.h
> +++ b/include/net/tc_act/tc_skbedit.h
> @@ -17,6 +17,7 @@ struct tcf_skbedit_params {
> u32 mark;
> u32 mask;
> u16 queue_mapping;
> + u16 mapping_mod;
> u16 ptype;
> struct rcu_head rcu;
> };
> diff --git a/include/uapi/linux/tc_act/tc_skbedit.h b/include/uapi/linux/tc_act/tc_skbedit.h
> index 800e93377218..5642b095d206 100644
> --- a/include/uapi/linux/tc_act/tc_skbedit.h
> +++ b/include/uapi/linux/tc_act/tc_skbedit.h
> @@ -29,6 +29,13 @@
> #define SKBEDIT_F_PTYPE 0x8
> #define SKBEDIT_F_MASK 0x10
> #define SKBEDIT_F_INHERITDSFIELD 0x20
> +#define SKBEDIT_F_QUEUE_MAPPING_HASH 0x40
> +#define SKBEDIT_F_QUEUE_MAPPING_CLASSID 0x80
> +#define SKBEDIT_F_QUEUE_MAPPING_CPUID 0x100
> +
> +#define SKBEDIT_F_QUEUE_MAPPING_HASH_MASK (SKBEDIT_F_QUEUE_MAPPING_HASH | \
> + SKBEDIT_F_QUEUE_MAPPING_CLASSID | \
> + SKBEDIT_F_QUEUE_MAPPING_CPUID)
Any way we can make these defines shorter?
s/QUEUE_MAPPING_/TXQ_/ ?
> struct tc_skbedit {
> tc_gen;
> @@ -45,6 +52,7 @@ enum {
> TCA_SKBEDIT_PTYPE,
> TCA_SKBEDIT_MASK,
> TCA_SKBEDIT_FLAGS,
> + TCA_SKBEDIT_QUEUE_MAPPING_MAX,
> __TCA_SKBEDIT_MAX
> };
> #define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)
> diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
> index 498feedad70a..0b0d65d7112e 100644
> --- a/net/sched/act_skbedit.c
> +++ b/net/sched/act_skbedit.c
> @@ -10,6 +10,7 @@
> #include <linux/kernel.h>
> #include <linux/skbuff.h>
> #include <linux/rtnetlink.h>
> +#include <net/cls_cgroup.h>
> #include <net/netlink.h>
> #include <net/pkt_sched.h>
> #include <net/ip.h>
> @@ -23,6 +24,37 @@
> static unsigned int skbedit_net_id;
> static struct tc_action_ops act_skbedit_ops;
>
> +static u16 tcf_skbedit_hash(struct tcf_skbedit_params *params,
> + struct sk_buff *skb)
> +{
> + u16 queue_mapping = params->queue_mapping;
> + u16 mapping_mod = params->mapping_mod;
> + u32 mapping_hash_type = params->flags &
> + SKBEDIT_F_QUEUE_MAPPING_HASH_MASK;
Don't do inline init if the init doesn't fit on a line.
> + u32 hash = 0;
> +
> + if (!mapping_hash_type)
> + return netdev_cap_txqueue(skb->dev, queue_mapping);
Make it "case 0:" below?
> + switch (mapping_hash_type) {
> + case SKBEDIT_F_QUEUE_MAPPING_CLASSID:
> + hash = jhash_1word(task_get_classid(skb), 0);
> + break;
> + case SKBEDIT_F_QUEUE_MAPPING_HASH:
> + hash = skb_get_hash(skb);
> + break;
> + case SKBEDIT_F_QUEUE_MAPPING_CPUID:
> + hash = raw_smp_processor_id();
> + break;
> + default:
> + net_warn_ratelimited("The type of queue_mapping hash is not supported. 0x%x\n",
> + mapping_hash_type);
> + }
> +
> + queue_mapping = queue_mapping + hash % mapping_mod;
> + return netdev_cap_txqueue(skb->dev, queue_mapping);
> +}
> +
> static int tcf_skbedit_act(struct sk_buff *skb, const struct tc_action *a,
> struct tcf_result *res)
> {
> @@ -57,10 +89,9 @@ static int tcf_skbedit_act(struct sk_buff *skb, const struct tc_action *a,
> break;
> }
> }
> - if (params->flags & SKBEDIT_F_QUEUE_MAPPING &&
> - skb->dev->real_num_tx_queues > params->queue_mapping) {
> + if (params->flags & SKBEDIT_F_QUEUE_MAPPING) {
> netdev_xmit_skip_txqueue();
> - skb_set_queue_mapping(skb, params->queue_mapping);
> + skb_set_queue_mapping(skb, tcf_skbedit_hash(params, skb));
> }
> if (params->flags & SKBEDIT_F_MARK) {
> skb->mark &= ~params->mask;
> @@ -94,6 +125,7 @@ static const struct nla_policy skbedit_policy[TCA_SKBEDIT_MAX + 1] = {
> [TCA_SKBEDIT_PTYPE] = { .len = sizeof(u16) },
> [TCA_SKBEDIT_MASK] = { .len = sizeof(u32) },
> [TCA_SKBEDIT_FLAGS] = { .len = sizeof(u64) },
> + [TCA_SKBEDIT_QUEUE_MAPPING_MAX] = { .len = sizeof(u16) },
.type = NLA_U16 ? I think it's okay to use the modern stuff here.
> };
>
> static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
> @@ -110,6 +142,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
> struct tcf_skbedit *d;
> u32 flags = 0, *priority = NULL, *mark = NULL, *mask = NULL;
> u16 *queue_mapping = NULL, *ptype = NULL;
> + u16 mapping_mod = 0;
> bool exists = false;
> int ret = 0, err;
> u32 index;
> @@ -154,7 +187,30 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
>
> if (tb[TCA_SKBEDIT_FLAGS] != NULL) {
> u64 *pure_flags = nla_data(tb[TCA_SKBEDIT_FLAGS]);
> + u64 mapping_hash_type = *pure_flags &
> + SKBEDIT_F_QUEUE_MAPPING_HASH_MASK;
Again, doing init inline and new line between variables and code
> + if (mapping_hash_type) {
> + u16 *queue_mapping_max;
> +
> + /* Hash types are mutually exclusive. */
> + if (mapping_hash_type & (mapping_hash_type - 1))
> + return -EINVAL;
> +
> + if (!tb[TCA_SKBEDIT_QUEUE_MAPPING_MAX])
> + return -EINVAL;
>
> + if (!tb[TCA_SKBEDIT_QUEUE_MAPPING])
> + return -EINVAL;
Can be merged with the condition above, unless you add extack, which
perhaps you should..
> + queue_mapping_max =
> + nla_data(tb[TCA_SKBEDIT_QUEUE_MAPPING_MAX]);
nla_get_u16()
> + if (*queue_mapping_max < *queue_mapping)
> + return -EINVAL;
> +
> + mapping_mod = *queue_mapping_max - *queue_mapping + 1;
> + flags |= mapping_hash_type;
> + }
> if (*pure_flags & SKBEDIT_F_INHERITDSFIELD)
> flags |= SKBEDIT_F_INHERITDSFIELD;
> }
> @@ -206,8 +262,10 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
> params_new->flags = flags;
> if (flags & SKBEDIT_F_PRIORITY)
> params_new->priority = *priority;
> - if (flags & SKBEDIT_F_QUEUE_MAPPING)
> + if (flags & SKBEDIT_F_QUEUE_MAPPING) {
> params_new->queue_mapping = *queue_mapping;
> + params_new->mapping_mod = mapping_mod;
> + }
> if (flags & SKBEDIT_F_MARK)
> params_new->mark = *mark;
> if (flags & SKBEDIT_F_PTYPE)
> @@ -274,6 +332,14 @@ static int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a,
> goto nla_put_failure;
> if (params->flags & SKBEDIT_F_INHERITDSFIELD)
> pure_flags |= SKBEDIT_F_INHERITDSFIELD;
> + if (params->flags & SKBEDIT_F_QUEUE_MAPPING_HASH_MASK) {
> + if (nla_put_u16(skb, TCA_SKBEDIT_QUEUE_MAPPING_MAX,
> + params->queue_mapping + params->mapping_mod - 1))
> + goto nla_put_failure;
> +
> + pure_flags |= params->flags &
> + SKBEDIT_F_QUEUE_MAPPING_HASH_MASK;
Why "params->flags &" ? Given the if above the flag must be set.
> + }
> if (pure_flags != 0 &&
> nla_put(skb, TCA_SKBEDIT_FLAGS, sizeof(pure_flags), &pure_flags))
> goto nla_put_failure;
Powered by blists - more mailing lists