ipmr,ipmr6: Define a uniform vif_device
The two implementations have almost identical structures - vif_device and mif_device. As a step toward uniforming the mr_tables, eliminate the mif_device and relocate the vif_device definition into a new common header file. Also, introduce a common initializing function for setting most of the vif_device fields in a new common source file. This requires modifying the ipv{4,6] Kconfig and ipv4 makefile as we're introducing a new common config option - CONFIG_IP_MROUTE_COMMON. Signed-off-by: Yuval Mintz <yuvalm@mellanox.com> Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a25724b05a
commit
6853f21f76
|
@ -9,6 +9,7 @@
|
|||
#include <net/fib_rules.h>
|
||||
#include <net/fib_notifier.h>
|
||||
#include <uapi/linux/mroute.h>
|
||||
#include <linux/mroute_base.h>
|
||||
|
||||
#ifdef CONFIG_IP_MROUTE
|
||||
static inline int ip_mroute_opt(int opt)
|
||||
|
@ -56,18 +57,6 @@ static inline bool ipmr_rule_default(const struct fib_rule *rule)
|
|||
}
|
||||
#endif
|
||||
|
||||
struct vif_device {
|
||||
struct net_device *dev; /* Device we are using */
|
||||
struct netdev_phys_item_id dev_parent_id; /* Device parent ID */
|
||||
unsigned long bytes_in,bytes_out;
|
||||
unsigned long pkt_in,pkt_out; /* Statistics */
|
||||
unsigned long rate_limit; /* Traffic shaping (NI) */
|
||||
unsigned char threshold; /* TTL threshold */
|
||||
unsigned short flags; /* Control flags */
|
||||
__be32 local,remote; /* Addresses(remote for tunnels)*/
|
||||
int link; /* Physical interface index */
|
||||
};
|
||||
|
||||
struct vif_entry_notifier_info {
|
||||
struct fib_notifier_info info;
|
||||
struct net_device *dev;
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#include <linux/skbuff.h> /* for struct sk_buff_head */
|
||||
#include <net/net_namespace.h>
|
||||
#include <uapi/linux/mroute6.h>
|
||||
#include <linux/mroute_base.h>
|
||||
|
||||
#ifdef CONFIG_IPV6_MROUTE
|
||||
static inline int ip6_mroute_opt(int opt)
|
||||
|
@ -62,16 +63,6 @@ static inline void ip6_mr_cleanup(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
struct mif_device {
|
||||
struct net_device *dev; /* Device we are using */
|
||||
unsigned long bytes_in,bytes_out;
|
||||
unsigned long pkt_in,pkt_out; /* Statistics */
|
||||
unsigned long rate_limit; /* Traffic shaping (NI) */
|
||||
unsigned char threshold; /* TTL threshold */
|
||||
unsigned short flags; /* Control flags */
|
||||
int link; /* Physical interface index */
|
||||
};
|
||||
|
||||
#define VIFF_STATIC 0x8000
|
||||
|
||||
struct mfc6_cache {
|
||||
|
|
52
include/linux/mroute_base.h
Normal file
52
include/linux/mroute_base.h
Normal file
|
@ -0,0 +1,52 @@
|
|||
#ifndef __LINUX_MROUTE_BASE_H
|
||||
#define __LINUX_MROUTE_BASE_H
|
||||
|
||||
#include <linux/netdevice.h>
|
||||
|
||||
/**
|
||||
* struct vif_device - interface representor for multicast routing
|
||||
* @dev: network device being used
|
||||
* @bytes_in: statistic; bytes ingressing
|
||||
* @bytes_out: statistic; bytes egresing
|
||||
* @pkt_in: statistic; packets ingressing
|
||||
* @pkt_out: statistic; packets egressing
|
||||
* @rate_limit: Traffic shaping (NI)
|
||||
* @threshold: TTL threshold
|
||||
* @flags: Control flags
|
||||
* @link: Physical interface index
|
||||
* @dev_parent_id: device parent id
|
||||
* @local: Local address
|
||||
* @remote: Remote address for tunnels
|
||||
*/
|
||||
struct vif_device {
|
||||
struct net_device *dev;
|
||||
unsigned long bytes_in, bytes_out;
|
||||
unsigned long pkt_in, pkt_out;
|
||||
unsigned long rate_limit;
|
||||
unsigned char threshold;
|
||||
unsigned short flags;
|
||||
int link;
|
||||
|
||||
/* Currently only used by ipmr */
|
||||
struct netdev_phys_item_id dev_parent_id;
|
||||
__be32 local, remote;
|
||||
};
|
||||
|
||||
#ifdef CONFIG_IP_MROUTE_COMMON
|
||||
void vif_device_init(struct vif_device *v,
|
||||
struct net_device *dev,
|
||||
unsigned long rate_limit,
|
||||
unsigned char threshold,
|
||||
unsigned short flags,
|
||||
unsigned short get_iflink_mask);
|
||||
#else
|
||||
static inline void vif_device_init(struct vif_device *v,
|
||||
struct net_device *dev,
|
||||
unsigned long rate_limit,
|
||||
unsigned char threshold,
|
||||
unsigned short flags,
|
||||
unsigned short get_iflink_mask)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
#endif
|
|
@ -212,9 +212,14 @@ config NET_IPGRE_BROADCAST
|
|||
Network), but can be distributed all over the Internet. If you want
|
||||
to do that, say Y here and to "IP multicast routing" below.
|
||||
|
||||
config IP_MROUTE_COMMON
|
||||
bool
|
||||
depends on IP_MROUTE || IPV6_MROUTE
|
||||
|
||||
config IP_MROUTE
|
||||
bool "IP: multicast routing"
|
||||
depends on IP_MULTICAST
|
||||
select IP_MROUTE_COMMON
|
||||
help
|
||||
This is used if you want your machine to act as a router for IP
|
||||
packets that have several destination addresses. It is needed on the
|
||||
|
|
|
@ -20,6 +20,7 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o
|
|||
obj-$(CONFIG_PROC_FS) += proc.o
|
||||
obj-$(CONFIG_IP_MULTIPLE_TABLES) += fib_rules.o
|
||||
obj-$(CONFIG_IP_MROUTE) += ipmr.o
|
||||
obj-$(CONFIG_IP_MROUTE_COMMON) += ipmr_base.o
|
||||
obj-$(CONFIG_NET_IPIP) += ipip.o
|
||||
gre-y := gre_demux.o
|
||||
obj-$(CONFIG_NET_FOU) += fou.o
|
||||
|
|
|
@ -945,6 +945,10 @@ static int vif_add(struct net *net, struct mr_table *mrt,
|
|||
ip_rt_multicast_event(in_dev);
|
||||
|
||||
/* Fill in the VIF structures */
|
||||
vif_device_init(v, dev, vifc->vifc_rate_limit,
|
||||
vifc->vifc_threshold,
|
||||
vifc->vifc_flags | (!mrtsock ? VIFF_STATIC : 0),
|
||||
(VIFF_TUNNEL | VIFF_REGISTER));
|
||||
|
||||
attr.orig_dev = dev;
|
||||
if (!switchdev_port_attr_get(dev, &attr)) {
|
||||
|
@ -953,20 +957,9 @@ static int vif_add(struct net *net, struct mr_table *mrt,
|
|||
} else {
|
||||
v->dev_parent_id.id_len = 0;
|
||||
}
|
||||
v->rate_limit = vifc->vifc_rate_limit;
|
||||
|
||||
v->local = vifc->vifc_lcl_addr.s_addr;
|
||||
v->remote = vifc->vifc_rmt_addr.s_addr;
|
||||
v->flags = vifc->vifc_flags;
|
||||
if (!mrtsock)
|
||||
v->flags |= VIFF_STATIC;
|
||||
v->threshold = vifc->vifc_threshold;
|
||||
v->bytes_in = 0;
|
||||
v->bytes_out = 0;
|
||||
v->pkt_in = 0;
|
||||
v->pkt_out = 0;
|
||||
v->link = dev->ifindex;
|
||||
if (v->flags & (VIFF_TUNNEL | VIFF_REGISTER))
|
||||
v->link = dev_get_iflink(dev);
|
||||
|
||||
/* And finish update writing critical data */
|
||||
write_lock_bh(&mrt_lock);
|
||||
|
@ -2316,7 +2309,8 @@ static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
|
|||
}
|
||||
|
||||
if (VIF_EXISTS(mrt, c->mfc_parent) &&
|
||||
nla_put_u32(skb, RTA_IIF, mrt->vif_table[c->mfc_parent].dev->ifindex) < 0)
|
||||
nla_put_u32(skb, RTA_IIF,
|
||||
mrt->vif_table[c->mfc_parent].dev->ifindex) < 0)
|
||||
return -EMSGSIZE;
|
||||
|
||||
if (c->mfc_flags & MFC_OFFLOAD)
|
||||
|
@ -2327,6 +2321,8 @@ static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
|
|||
|
||||
for (ct = c->mfc_un.res.minvif; ct < c->mfc_un.res.maxvif; ct++) {
|
||||
if (VIF_EXISTS(mrt, ct) && c->mfc_un.res.ttls[ct] < 255) {
|
||||
struct vif_device *vif;
|
||||
|
||||
if (!(nhp = nla_reserve_nohdr(skb, sizeof(*nhp)))) {
|
||||
nla_nest_cancel(skb, mp_attr);
|
||||
return -EMSGSIZE;
|
||||
|
@ -2334,7 +2330,8 @@ static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
|
|||
|
||||
nhp->rtnh_flags = 0;
|
||||
nhp->rtnh_hops = c->mfc_un.res.ttls[ct];
|
||||
nhp->rtnh_ifindex = mrt->vif_table[ct].dev->ifindex;
|
||||
vif = &mrt->vif_table[ct];
|
||||
nhp->rtnh_ifindex = vif->dev->ifindex;
|
||||
nhp->rtnh_len = sizeof(*nhp);
|
||||
}
|
||||
}
|
||||
|
@ -2954,8 +2951,8 @@ struct ipmr_vif_iter {
|
|||
};
|
||||
|
||||
static struct vif_device *ipmr_vif_seq_idx(struct net *net,
|
||||
struct ipmr_vif_iter *iter,
|
||||
loff_t pos)
|
||||
struct ipmr_vif_iter *iter,
|
||||
loff_t pos)
|
||||
{
|
||||
struct mr_table *mrt = iter->mrt;
|
||||
|
||||
|
@ -3020,7 +3017,8 @@ static int ipmr_vif_seq_show(struct seq_file *seq, void *v)
|
|||
"Interface BytesIn PktsIn BytesOut PktsOut Flags Local Remote\n");
|
||||
} else {
|
||||
const struct vif_device *vif = v;
|
||||
const char *name = vif->dev ? vif->dev->name : "none";
|
||||
const char *name = vif->dev ?
|
||||
vif->dev->name : "none";
|
||||
|
||||
seq_printf(seq,
|
||||
"%2td %-10s %8ld %7ld %8ld %7ld %05X %08X %08X\n",
|
||||
|
|
28
net/ipv4/ipmr_base.c
Normal file
28
net/ipv4/ipmr_base.c
Normal file
|
@ -0,0 +1,28 @@
|
|||
/* Linux multicast routing support
|
||||
* Common logic shared by IPv4 [ipmr] and IPv6 [ip6mr] implementation
|
||||
*/
|
||||
|
||||
#include <linux/mroute_base.h>
|
||||
|
||||
/* Sets everything common except 'dev', since that is done under locking */
|
||||
void vif_device_init(struct vif_device *v,
|
||||
struct net_device *dev,
|
||||
unsigned long rate_limit,
|
||||
unsigned char threshold,
|
||||
unsigned short flags,
|
||||
unsigned short get_iflink_mask)
|
||||
{
|
||||
v->dev = NULL;
|
||||
v->bytes_in = 0;
|
||||
v->bytes_out = 0;
|
||||
v->pkt_in = 0;
|
||||
v->pkt_out = 0;
|
||||
v->rate_limit = rate_limit;
|
||||
v->flags = flags;
|
||||
v->threshold = threshold;
|
||||
if (v->flags & get_iflink_mask)
|
||||
v->link = dev_get_iflink(dev);
|
||||
else
|
||||
v->link = dev->ifindex;
|
||||
}
|
||||
EXPORT_SYMBOL(vif_device_init);
|
|
@ -278,6 +278,7 @@ config IPV6_SUBTREES
|
|||
config IPV6_MROUTE
|
||||
bool "IPv6: multicast routing"
|
||||
depends on IPV6
|
||||
select IP_MROUTE_COMMON
|
||||
---help---
|
||||
Experimental support for IPv6 multicast forwarding.
|
||||
If unsure, say N.
|
||||
|
|
|
@ -62,7 +62,7 @@ struct mr6_table {
|
|||
struct timer_list ipmr_expire_timer;
|
||||
struct list_head mfc6_unres_queue;
|
||||
struct list_head mfc6_cache_array[MFC6_LINES];
|
||||
struct mif_device vif6_table[MAXMIFS];
|
||||
struct vif_device vif6_table[MAXMIFS];
|
||||
int maxvif;
|
||||
atomic_t cache_resolve_queue_len;
|
||||
bool mroute_do_assert;
|
||||
|
@ -384,7 +384,7 @@ struct ipmr_vif_iter {
|
|||
int ct;
|
||||
};
|
||||
|
||||
static struct mif_device *ip6mr_vif_seq_idx(struct net *net,
|
||||
static struct vif_device *ip6mr_vif_seq_idx(struct net *net,
|
||||
struct ipmr_vif_iter *iter,
|
||||
loff_t pos)
|
||||
{
|
||||
|
@ -450,7 +450,7 @@ static int ip6mr_vif_seq_show(struct seq_file *seq, void *v)
|
|||
seq_puts(seq,
|
||||
"Interface BytesIn PktsIn BytesOut PktsOut Flags\n");
|
||||
} else {
|
||||
const struct mif_device *vif = v;
|
||||
const struct vif_device *vif = v;
|
||||
const char *name = vif->dev ? vif->dev->name : "none";
|
||||
|
||||
seq_printf(seq,
|
||||
|
@ -776,7 +776,7 @@ failure:
|
|||
static int mif6_delete(struct mr6_table *mrt, int vifi, int notify,
|
||||
struct list_head *head)
|
||||
{
|
||||
struct mif_device *v;
|
||||
struct vif_device *v;
|
||||
struct net_device *dev;
|
||||
struct inet6_dev *in6_dev;
|
||||
|
||||
|
@ -929,7 +929,7 @@ static int mif6_add(struct net *net, struct mr6_table *mrt,
|
|||
struct mif6ctl *vifc, int mrtsock)
|
||||
{
|
||||
int vifi = vifc->mif6c_mifi;
|
||||
struct mif_device *v = &mrt->vif6_table[vifi];
|
||||
struct vif_device *v = &mrt->vif6_table[vifi];
|
||||
struct net_device *dev;
|
||||
struct inet6_dev *in6_dev;
|
||||
int err;
|
||||
|
@ -980,21 +980,10 @@ static int mif6_add(struct net *net, struct mr6_table *mrt,
|
|||
dev->ifindex, &in6_dev->cnf);
|
||||
}
|
||||
|
||||
/*
|
||||
* Fill in the VIF structures
|
||||
*/
|
||||
v->rate_limit = vifc->vifc_rate_limit;
|
||||
v->flags = vifc->mif6c_flags;
|
||||
if (!mrtsock)
|
||||
v->flags |= VIFF_STATIC;
|
||||
v->threshold = vifc->vifc_threshold;
|
||||
v->bytes_in = 0;
|
||||
v->bytes_out = 0;
|
||||
v->pkt_in = 0;
|
||||
v->pkt_out = 0;
|
||||
v->link = dev->ifindex;
|
||||
if (v->flags & MIFF_REGISTER)
|
||||
v->link = dev_get_iflink(dev);
|
||||
/* Fill in the VIF structures */
|
||||
vif_device_init(v, dev, vifc->vifc_rate_limit, vifc->vifc_threshold,
|
||||
vifc->mif6c_flags | (!mrtsock ? VIFF_STATIC : 0),
|
||||
MIFF_REGISTER);
|
||||
|
||||
/* And finish update writing critical data */
|
||||
write_lock_bh(&mrt_lock);
|
||||
|
@ -1332,7 +1321,7 @@ static int ip6mr_device_event(struct notifier_block *this,
|
|||
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
|
||||
struct net *net = dev_net(dev);
|
||||
struct mr6_table *mrt;
|
||||
struct mif_device *v;
|
||||
struct vif_device *v;
|
||||
int ct;
|
||||
|
||||
if (event != NETDEV_UNREGISTER)
|
||||
|
@ -1873,7 +1862,7 @@ int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg)
|
|||
{
|
||||
struct sioc_sg_req6 sr;
|
||||
struct sioc_mif_req6 vr;
|
||||
struct mif_device *vif;
|
||||
struct vif_device *vif;
|
||||
struct mfc6_cache *c;
|
||||
struct net *net = sock_net(sk);
|
||||
struct mr6_table *mrt;
|
||||
|
@ -1947,7 +1936,7 @@ int ip6mr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)
|
|||
{
|
||||
struct compat_sioc_sg_req6 sr;
|
||||
struct compat_sioc_mif_req6 vr;
|
||||
struct mif_device *vif;
|
||||
struct vif_device *vif;
|
||||
struct mfc6_cache *c;
|
||||
struct net *net = sock_net(sk);
|
||||
struct mr6_table *mrt;
|
||||
|
@ -2018,7 +2007,7 @@ static int ip6mr_forward2(struct net *net, struct mr6_table *mrt,
|
|||
struct sk_buff *skb, struct mfc6_cache *c, int vifi)
|
||||
{
|
||||
struct ipv6hdr *ipv6h;
|
||||
struct mif_device *vif = &mrt->vif6_table[vifi];
|
||||
struct vif_device *vif = &mrt->vif6_table[vifi];
|
||||
struct net_device *dev;
|
||||
struct dst_entry *dst;
|
||||
struct flowi6 fl6;
|
||||
|
|
Loading…
Reference in a new issue