Commit 3af4cdd6 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Paolo Abeni
Browse files

openvswitch: Move ovs_frag_data_storage into the struct ovs_pcpu_storage 



ovs_frag_data_storage is a per-CPU variable and relies on disabled BH for its
locking. Without per-CPU locking in local_bh_disable() on PREEMPT_RT
this data structure requires explicit locking.

Move ovs_frag_data_storage into the struct ovs_pcpu_storage which already
provides locking for the structure.

Cc: Aaron Conole <aconole@redhat.com>
Cc: Eelco Chaudron <echaudro@redhat.com>
Cc: Ilya Maximets <i.maximets@ovn.org>
Cc: dev@openvswitch.org
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: default avatarAaron Conole <aconole@redhat.com>
Link: https://patch.msgid.link/20250512092736.229935-10-bigeasy@linutronix.de


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 67231833

net/openvswitch/actions.c

+2 −18
Original line number Diff line number Diff line
@@ -39,22 +39,6 @@ 
#include "flow_netlink.h"

#include "openvswitch_trace.h"



#define MAX_L2_LEN	(VLAN_ETH_HLEN + 3 * MPLS_HLEN)

struct ovs_frag_data {

	unsigned long dst;

	struct vport *vport;

	struct ovs_skb_cb cb;

	__be16 inner_protocol;

	u16 network_offset;	/* valid only for MPLS */

	u16 vlan_tci;

	__be16 vlan_proto;

	unsigned int l2_len;

	u8 mac_proto;

	u8 l2_data[MAX_L2_LEN];

};



static DEFINE_PER_CPU(struct ovs_frag_data, ovs_frag_data_storage);



DEFINE_PER_CPU(struct ovs_pcpu_storage, ovs_pcpu_storage) = {

	.bh_lock = INIT_LOCAL_LOCK(bh_lock),

};
@@ -771,7 +755,7 @@ static int set_sctp(struct sk_buff *skb, struct sw_flow_key *flow_key, 
static int ovs_vport_output(struct net *net, struct sock *sk,

			    struct sk_buff *skb)

{

	struct ovs_frag_data *data = this_cpu_ptr(&ovs_frag_data_storage);

	struct ovs_frag_data *data = this_cpu_ptr(&ovs_pcpu_storage.frag_data);

	struct vport *vport = data->vport;



	if (skb_cow_head(skb, data->l2_len) < 0) {
@@ -823,7 +807,7 @@ static void prepare_frag(struct vport *vport, struct sk_buff *skb, 
	unsigned int hlen = skb_network_offset(skb);

	struct ovs_frag_data *data;



	data = this_cpu_ptr(&ovs_frag_data_storage);

	data = this_cpu_ptr(&ovs_pcpu_storage.frag_data);

	data->dst = skb->_skb_refdst;

	data->vport = vport;

	data->cb = *OVS_CB(skb);

net/openvswitch/datapath.h

+16 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/skbuff.h>

#include <linux/u64_stats_sync.h>

#include <net/ip_tunnels.h>

#include <net/mpls.h>



#include "conntrack.h"

#include "flow.h"
@@ -173,6 +174,20 @@ struct ovs_net { 
	bool xt_label;

};



#define MAX_L2_LEN	(VLAN_ETH_HLEN + 3 * MPLS_HLEN)

struct ovs_frag_data {

	unsigned long dst;

	struct vport *vport;

	struct ovs_skb_cb cb;

	__be16 inner_protocol;

	u16 network_offset;	/* valid only for MPLS */

	u16 vlan_tci;

	__be16 vlan_proto;

	unsigned int l2_len;

	u8 mac_proto;

	u8 l2_data[MAX_L2_LEN];

};



struct deferred_action {

	struct sk_buff *skb;

	const struct nlattr *actions;
@@ -200,6 +215,7 @@ struct action_flow_keys { 
struct ovs_pcpu_storage {

	struct action_fifo action_fifos;

	struct action_flow_keys flow_keys;

	struct ovs_frag_data frag_data;

	int exec_level;

	struct task_struct *owner;

	local_lock_t bh_lock;