mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-25 05:04:09 +08:00
4a5da47d5c
With recent patch set that removed rtnl lock dependency from cls hardware
offload API rtnl lock is only taken when reading action data and can be
released after action-specific data is parsed into intermediate
representation. However, sample action psample group is passed by pointer
without obtaining reference to it first, which makes it possible to
concurrently overwrite the action and deallocate object pointed by
psample_group pointer after rtnl lock is released but before driver
finished using the pointer.
To prevent such race condition, obtain reference to psample group while it
is used by flow_action infra. Extend psample API with function
psample_group_take() that increments psample group reference counter.
Extend struct tc_action_ops with new get_psample_group() API. Implement the
API for action sample using psample_group_take() and already existing
psample_group_put() as a destructor. Use it in tc_setup_flow_action() to
take reference to psample group pointed to by entry->sample.psample_group
and release it in tc_cleanup_flow_action().
Disable bh when taking psample_groups_lock. The lock is now taken while
holding action tcf_lock that is used by data path and requires bh to be
disabled, so doing the same for psample_groups_lock is necessary to
preserve SOFTIRQ-irq-safety.
Fixes: 918190f50e ("net: sched: flower: don't take rtnl lock for cls hw offloads API")
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
39 lines
871 B
C
39 lines
871 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __NET_PSAMPLE_H
|
|
#define __NET_PSAMPLE_H
|
|
|
|
#include <uapi/linux/psample.h>
|
|
#include <linux/list.h>
|
|
|
|
struct psample_group {
|
|
struct list_head list;
|
|
struct net *net;
|
|
u32 group_num;
|
|
u32 refcount;
|
|
u32 seq;
|
|
struct rcu_head rcu;
|
|
};
|
|
|
|
struct psample_group *psample_group_get(struct net *net, u32 group_num);
|
|
void psample_group_take(struct psample_group *group);
|
|
void psample_group_put(struct psample_group *group);
|
|
|
|
#if IS_ENABLED(CONFIG_PSAMPLE)
|
|
|
|
void psample_sample_packet(struct psample_group *group, struct sk_buff *skb,
|
|
u32 trunc_size, int in_ifindex, int out_ifindex,
|
|
u32 sample_rate);
|
|
|
|
#else
|
|
|
|
static inline void psample_sample_packet(struct psample_group *group,
|
|
struct sk_buff *skb, u32 trunc_size,
|
|
int in_ifindex, int out_ifindex,
|
|
u32 sample_rate)
|
|
{
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif /* __NET_PSAMPLE_H */
|