Changes in 4.9.226 ax25: fix setsockopt(SO_BINDTODEVICE) net: ipip: fix wrong address family in init error path net: revert "net: get rid of an signed integer overflow in ip_idents_reserve()" net sched: fix reporting the first-time use timestamp sctp: Start shutdown on association restart if in SHUTDOWN-SENT state and socket is closed net/mlx5e: Update netdev txq on completions during closure net: qrtr: Fix passing invalid reference to qrtr_local_enqueue() net/mlx5: Add command entry handling completion net: sun: fix missing release regions in cas_init_one(). net/mlx4_core: fix a memory leak bug. uapi: fix linux/if_pppol2tp.h userspace compilation errors IB/cma: Fix reference count leak when no ipv4 addresses are set gpio: tegra: mask GPIO IRQs during IRQ shutdown net: microchip: encx24j600: add missed kthread_stop gfs2: move privileged user check to gfs2_quota_lock_check cachefiles: Fix race between read_waiter and read_copier involving op->to_do usb: gadget: legacy: fix redundant initialization warnings cifs: Fix null pointer check in cifs_read Input: usbtouchscreen - add support for BonXeon TP Input: evdev - call input_flush_device() on release(), not flush() Input: xpad - add custom init packet for Xbox One S controllers Input: i8042 - add ThinkPad S230u to i8042 reset list Input: synaptics-rmi4 - fix error return code in rmi_driver_probe() IB/qib: Call kobject_put() when kobject_init_and_add() fails ARM: dts: imx: Correct B850v3 clock assignment ARM: dts: imx6q-bx50v3: Add internal switch ARM: dts/imx6q-bx50v3: Set display interface clock parents ALSA: hwdep: fix a left shifting 1 by 31 UB bug ALSA: usb-audio: mixer: volume quirk for ESS Technology Asus USB DAC exec: Always set cap_ambient in cap_bprm_set_creds libceph: ignore pool overlay and cache logic on redirects mm: remove VM_BUG_ON(PageSlab()) from page_mapcount() fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info() include/asm-generic/topology.h: guard cpumask_of_node() macro argument iommu: Fix reference count leak in iommu_group_alloc. parisc: Fix kernel panic in mem_init() mac80211: mesh: fix discovery timer re-arming issue / crash x86/dma: Fix max PFN arithmetic overflow on 32 bit systems xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_input xfrm: fix a warning in xfrm_policy_insert_list xfrm: fix a NULL-ptr deref in xfrm_local_error vti4: eliminated some duplicate code. ip_vti: receive ipip packet by calling ip_tunnel_rcv netfilter: nft_reject_bridge: enable reject with bridge vlan netfilter: ipset: Fix subcounter update skip netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code qlcnic: fix missing release in qlcnic_83xx_interrupt_test. bonding: Fix reference count leak in bond_sysfs_slave_add. netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build genirq/generic_pending: Do not lose pending affinity update net: rtnl_configure_link: fix dev flags changes arg to __dev_notify_flags mm/vmalloc.c: don't dereference possible NULL pointer in __vunmap() sc16is7xx: move label 'err_spi' to correct section net: hns: Fixes the missing put_device in positive leg for roce reset scsi: zfcp: fix request object use-after-free in send path causing wrong traces Linux 4.9.226 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I64b95b6296df8de22f3f7ee64b13140f04215478
207 lines
5.9 KiB
C
207 lines
5.9 KiB
C
#ifndef __NET_ACT_API_H
|
|
#define __NET_ACT_API_H
|
|
|
|
/*
|
|
* Public action API for classifiers/qdiscs
|
|
*/
|
|
|
|
#include <net/sch_generic.h>
|
|
#include <net/pkt_sched.h>
|
|
#include <net/net_namespace.h>
|
|
#include <net/netns/generic.h>
|
|
|
|
|
|
struct tcf_hashinfo {
|
|
struct hlist_head *htab;
|
|
unsigned int hmask;
|
|
spinlock_t lock;
|
|
u32 index;
|
|
};
|
|
|
|
struct tc_action_ops;
|
|
|
|
struct tc_action {
|
|
const struct tc_action_ops *ops;
|
|
__u32 type; /* for backward compat(TCA_OLD_COMPAT) */
|
|
__u32 order;
|
|
struct list_head list;
|
|
struct tcf_hashinfo *hinfo;
|
|
|
|
struct hlist_node tcfa_head;
|
|
u32 tcfa_index;
|
|
int tcfa_refcnt;
|
|
int tcfa_bindcnt;
|
|
u32 tcfa_capab;
|
|
int tcfa_action;
|
|
struct tcf_t tcfa_tm;
|
|
struct gnet_stats_basic_packed tcfa_bstats;
|
|
struct gnet_stats_queue tcfa_qstats;
|
|
struct gnet_stats_rate_est64 tcfa_rate_est;
|
|
spinlock_t tcfa_lock;
|
|
struct rcu_head tcfa_rcu;
|
|
struct gnet_stats_basic_cpu __percpu *cpu_bstats;
|
|
struct gnet_stats_queue __percpu *cpu_qstats;
|
|
};
|
|
#define tcf_act common.tcfa_act
|
|
#define tcf_head common.tcfa_head
|
|
#define tcf_index common.tcfa_index
|
|
#define tcf_refcnt common.tcfa_refcnt
|
|
#define tcf_bindcnt common.tcfa_bindcnt
|
|
#define tcf_capab common.tcfa_capab
|
|
#define tcf_action common.tcfa_action
|
|
#define tcf_tm common.tcfa_tm
|
|
#define tcf_bstats common.tcfa_bstats
|
|
#define tcf_qstats common.tcfa_qstats
|
|
#define tcf_rate_est common.tcfa_rate_est
|
|
#define tcf_lock common.tcfa_lock
|
|
#define tcf_rcu common.tcfa_rcu
|
|
|
|
static inline unsigned int tcf_hash(u32 index, unsigned int hmask)
|
|
{
|
|
return index & hmask;
|
|
}
|
|
|
|
static inline int tcf_hashinfo_init(struct tcf_hashinfo *hf, unsigned int mask)
|
|
{
|
|
int i;
|
|
|
|
spin_lock_init(&hf->lock);
|
|
hf->index = 0;
|
|
hf->hmask = mask;
|
|
hf->htab = kzalloc((mask + 1) * sizeof(struct hlist_head),
|
|
GFP_KERNEL);
|
|
if (!hf->htab)
|
|
return -ENOMEM;
|
|
for (i = 0; i < mask + 1; i++)
|
|
INIT_HLIST_HEAD(&hf->htab[i]);
|
|
return 0;
|
|
}
|
|
|
|
/* Update lastuse only if needed, to avoid dirtying a cache line.
|
|
* We use a temp variable to avoid fetching jiffies twice.
|
|
*/
|
|
static inline void tcf_lastuse_update(struct tcf_t *tm)
|
|
{
|
|
unsigned long now = jiffies;
|
|
|
|
if (tm->lastuse != now)
|
|
tm->lastuse = now;
|
|
if (unlikely(!tm->firstuse))
|
|
tm->firstuse = now;
|
|
}
|
|
|
|
static inline void tcf_tm_dump(struct tcf_t *dtm, const struct tcf_t *stm)
|
|
{
|
|
dtm->install = jiffies_to_clock_t(jiffies - stm->install);
|
|
dtm->lastuse = jiffies_to_clock_t(jiffies - stm->lastuse);
|
|
dtm->firstuse = stm->firstuse ?
|
|
jiffies_to_clock_t(jiffies - stm->firstuse) : 0;
|
|
dtm->expires = jiffies_to_clock_t(stm->expires);
|
|
}
|
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
|
|
#define ACT_P_CREATED 1
|
|
#define ACT_P_DELETED 1
|
|
|
|
struct tc_action_ops {
|
|
struct list_head head;
|
|
char kind[IFNAMSIZ];
|
|
__u32 type; /* TBD to match kind */
|
|
size_t size;
|
|
struct module *owner;
|
|
int (*act)(struct sk_buff *, const struct tc_action *,
|
|
struct tcf_result *);
|
|
int (*dump)(struct sk_buff *, struct tc_action *, int, int);
|
|
void (*cleanup)(struct tc_action *, int bind);
|
|
int (*lookup)(struct net *, struct tc_action **, u32);
|
|
int (*init)(struct net *net, struct nlattr *nla,
|
|
struct nlattr *est, struct tc_action **act, int ovr,
|
|
int bind);
|
|
int (*walk)(struct net *, struct sk_buff *,
|
|
struct netlink_callback *, int, const struct tc_action_ops *);
|
|
void (*stats_update)(struct tc_action *, u64, u32, u64);
|
|
};
|
|
|
|
struct tc_action_net {
|
|
struct tcf_hashinfo *hinfo;
|
|
const struct tc_action_ops *ops;
|
|
};
|
|
|
|
static inline
|
|
int tc_action_net_init(struct tc_action_net *tn,
|
|
const struct tc_action_ops *ops, unsigned int mask)
|
|
{
|
|
int err = 0;
|
|
|
|
tn->hinfo = kmalloc(sizeof(*tn->hinfo), GFP_KERNEL);
|
|
if (!tn->hinfo)
|
|
return -ENOMEM;
|
|
tn->ops = ops;
|
|
err = tcf_hashinfo_init(tn->hinfo, mask);
|
|
if (err)
|
|
kfree(tn->hinfo);
|
|
return err;
|
|
}
|
|
|
|
void tcf_hashinfo_destroy(const struct tc_action_ops *ops,
|
|
struct tcf_hashinfo *hinfo);
|
|
|
|
static inline void tc_action_net_exit(struct tc_action_net *tn)
|
|
{
|
|
tcf_hashinfo_destroy(tn->ops, tn->hinfo);
|
|
kfree(tn->hinfo);
|
|
}
|
|
|
|
int tcf_generic_walker(struct tc_action_net *tn, struct sk_buff *skb,
|
|
struct netlink_callback *cb, int type,
|
|
const struct tc_action_ops *ops);
|
|
int tcf_hash_search(struct tc_action_net *tn, struct tc_action **a, u32 index);
|
|
u32 tcf_hash_new_index(struct tc_action_net *tn);
|
|
bool tcf_hash_check(struct tc_action_net *tn, u32 index, struct tc_action **a,
|
|
int bind);
|
|
int tcf_hash_create(struct tc_action_net *tn, u32 index, struct nlattr *est,
|
|
struct tc_action **a, const struct tc_action_ops *ops, int bind,
|
|
bool cpustats);
|
|
void tcf_hash_cleanup(struct tc_action *a, struct nlattr *est);
|
|
void tcf_hash_insert(struct tc_action_net *tn, struct tc_action *a);
|
|
|
|
int __tcf_hash_release(struct tc_action *a, bool bind, bool strict);
|
|
|
|
static inline int tcf_hash_release(struct tc_action *a, bool bind)
|
|
{
|
|
return __tcf_hash_release(a, bind, false);
|
|
}
|
|
|
|
int tcf_register_action(struct tc_action_ops *a, struct pernet_operations *ops);
|
|
int tcf_unregister_action(struct tc_action_ops *a,
|
|
struct pernet_operations *ops);
|
|
int tcf_action_destroy(struct list_head *actions, int bind);
|
|
int tcf_action_exec(struct sk_buff *skb, struct tc_action **actions,
|
|
int nr_actions, struct tcf_result *res);
|
|
int tcf_action_init(struct net *net, struct nlattr *nla,
|
|
struct nlattr *est, char *n, int ovr,
|
|
int bind, struct list_head *);
|
|
struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla,
|
|
struct nlattr *est, char *n, int ovr,
|
|
int bind);
|
|
int tcf_action_dump(struct sk_buff *skb, struct list_head *, int, int);
|
|
int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int, int);
|
|
int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int, int);
|
|
int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int);
|
|
|
|
#endif /* CONFIG_NET_CLS_ACT */
|
|
|
|
static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes,
|
|
u64 packets, u64 lastuse)
|
|
{
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
if (!a->ops->stats_update)
|
|
return;
|
|
|
|
a->ops->stats_update(a, bytes, packets, lastuse);
|
|
#endif
|
|
}
|
|
|
|
#endif
|