mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-17 14:28:02 +00:00
Code Issues Releases Wiki Activity

datapath: restore OVS_FLOW_CMD_NEW notifications

Browse Source 
Since commit fb5d1e9e127a ("openvswitch: Build flow cmd netlink reply only if needed."),
the new flows are not notified to the listeners of OVS_FLOW_MCGROUP.

This commit fixes the problem by using the genl function, ie
genl_has_listerners() instead of netlink_has_listeners().

Signed-off-by: Samuel Gauthier <samuel.gauthier@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
This commit is contained in:
Samuel Gauthier
2014-09-20 06:25:23 -07:00
committed by Pravin B Shelar
parent f6a0c895fc
commit 114fce23a7
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@@ -353,6 +353,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_replace4]) OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_replace4])
OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_unfold]) OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_unfold])
OVS_GREP_IFELSE([$KSRC/include/net/genetlink.h], [genl_has_listeners])
OVS_GREP_IFELSE([$KSRC/include/net/genetlink.h], [mcgrp_offset])
OVS_GREP_IFELSE([$KSRC/include/net/genetlink.h], [parallel_ops]) OVS_GREP_IFELSE([$KSRC/include/net/genetlink.h], [parallel_ops])
OVS_GREP_IFELSE([$KSRC/include/net/gre.h], [gre_cisco_register]) OVS_GREP_IFELSE([$KSRC/include/net/gre.h], [gre_cisco_register])
OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_get_be16]) OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_get_be16])

10
datapath/datapath.c
View File

@@ -80,11 +80,12 @@ struct genl_multicast_group ovs_dp_vport_multicast_group = {
/* Check if need to build a reply message. /* Check if need to build a reply message.
* OVS userspace sets the NLM_F_ECHO flag if it needs the reply. */ * OVS userspace sets the NLM_F_ECHO flag if it needs the reply. */
static bool ovs_must_notify(struct genl_info *info, static bool ovs_must_notify(struct genl_family *family, struct genl_info *info,
const struct genl_multicast_group *grp) unsigned int group)
{ {
return info->nlhdr->nlmsg_flags & NLM_F_ECHO || return info->nlhdr->nlmsg_flags & NLM_F_ECHO ||
netlink_has_listeners(genl_info_net(info)->genl_sock, GROUP_ID(grp)); genl_has_listeners(family, genl_info_net(info)->genl_sock,
group);
} }
static void ovs_notify(struct genl_family *family, struct genl_multicast_group *grp, static void ovs_notify(struct genl_family *family, struct genl_multicast_group *grp,
@@ -809,7 +810,8 @@ static struct sk_buff *ovs_flow_cmd_alloc_info(const struct sw_flow_actions *act
{ {
struct sk_buff *skb; struct sk_buff *skb;
if (!always && !ovs_must_notify(info, &ovs_dp_flow_multicast_group)) if (!always && !ovs_must_notify(&dp_flow_genl_family, info,
GROUP_ID(&ovs_dp_flow_multicast_group)))
return NULL; return NULL;
skb = genlmsg_new_unicast(ovs_flow_cmd_msg_size(acts), info, GFP_KERNEL); skb = genlmsg_new_unicast(ovs_flow_cmd_msg_size(acts), info, GFP_KERNEL);

15
datapath/linux/compat/include/net/genetlink.h
View File

@@ -105,4 +105,19 @@ static inline struct sk_buff *genlmsg_new_unicast(size_t payload,
} }
#endif #endif
#ifndef HAVE_GENL_HAS_LISTENERS
static inline int genl_has_listeners(struct genl_family *family,
struct sock *sk, unsigned int group)
{
#ifdef HAVE_MCGRP_OFFSET
if (WARN_ON_ONCE(group >= family->n_mcgrps))
return -EINVAL;
group = family->mcgrp_offset + group;
return netlink_has_listeners(sk, group);
#else
return netlink_has_listeners(sk, group);
#endif
}
#endif
#endif /* genetlink.h */ #endif /* genetlink.h */