Quoting Dan Smith (danms@xxxxxxxxxx):
> This moves the INET4 address checkpoint and restart routines into
> net/ipv4/devinet.c and introduces a registration method to present
> the checkpoint code with the handler functions.
>
> This makes it easier to add additional address types, and also
> makes the cases where inet4 is absent, inet6 is a module, etc much
> easier. It also elminates the need for a couple of helper functions.
>
> Signed-off-by: Dan Smith <danms@xxxxxxxxxx>
> ---
> include/linux/checkpoint.h | 18 +++++-
> include/linux/checkpoint_hdr.h | 1 +
> net/checkpoint_dev.c | 152 ++++++++++++++++++++++++----------------
> net/ipv4/devinet.c | 75 ++++++++++++++++++++
> 4 files changed, 184 insertions(+), 62 deletions(-)
>
> diff --git a/include/linux/checkpoint.h b/include/linux/checkpoint.h
> index 96693e2..5fdbd01 100644
> --- a/include/linux/checkpoint.h
> +++ b/include/linux/checkpoint.h
> @@ -132,7 +132,8 @@ extern void *restore_netdev(struct ckpt_ctx *ctx);
>
> extern int ckpt_netdev_in_init_netns(struct ckpt_ctx *ctx,
> struct net_device *dev);
> -extern int ckpt_netdev_inet_addrs(struct in_device *indev,
> +extern int ckpt_netdev_inet_addrs(struct ckpt_ctx *ctx,
> + struct net_device *dev,
> struct ckpt_netdev_addr *list[]);
> extern int ckpt_netdev_hwaddr(struct net_device *dev,
> struct ckpt_hdr_netdev *h);
> @@ -513,6 +514,21 @@ extern void _ckpt_msg_complete(struct ckpt_ctx *ctx);
> _do_ckpt_msg(ctx, err, "[E @ %s:%d]" fmt, __func__, __LINE__, ##args); \
> } while (0)
>
> +struct ckpt_netdev_addr_handler {
> + int type;
> + struct module *owner;
> + int (*checkpoint_addr)(struct ckpt_ctx *ctx,
> + struct net_device *dev,
> + int index, int max,
> + struct ckpt_netdev_addr *addrs);
> + int (*restore_addr)(struct ckpt_ctx *ctx,
> + struct net_device *dev,
> + struct net *net,
> + struct ckpt_netdev_addr *addr);
> +};
> +extern int ckpt_netdev_addr_register(struct ckpt_netdev_addr_handler *);
> +extern int ckpt_netdev_addr_unregister(struct ckpt_netdev_addr_handler *);
> +
> #endif /* CONFIG_CHECKPOINT */
> #endif /* __KERNEL__ */
>
> diff --git a/include/linux/checkpoint_hdr.h b/include/linux/checkpoint_hdr.h
> index 36386ad..13bf62c 100644
> --- a/include/linux/checkpoint_hdr.h
> +++ b/include/linux/checkpoint_hdr.h
> @@ -804,6 +804,7 @@ struct ckpt_hdr_netdev {
>
> enum ckpt_netdev_addr_types {
> CKPT_NETDEV_ADDR_IPV4,
> + CKPT_NETDEV_ADDR_MAX
> };
>
> struct ckpt_netdev_addr {
> diff --git a/net/checkpoint_dev.c b/net/checkpoint_dev.c
> index 5a4a95b..4ef06e3 100644
> --- a/net/checkpoint_dev.c
> +++ b/net/checkpoint_dev.c
> @@ -12,11 +12,11 @@
> #include <linux/sched.h>
> #include <linux/if.h>
> #include <linux/if_arp.h>
> -#include <linux/inetdevice.h>
> #include <linux/veth.h>
> #include <linux/checkpoint.h>
> #include <linux/checkpoint_hdr.h>
> #include <linux/deferqueue.h>
> +#include <linux/module.h>
>
> #include <net/net_namespace.h>
> #include <net/sch_generic.h>
> @@ -34,17 +34,64 @@ struct mvl_newlink {
>
> typedef int (*new_link_fn)(struct sk_buff *, void *);
>
> -static int __kern_devinet_ioctl(struct net *net, unsigned int cmd, void *arg)
> +static struct ckpt_netdev_addr_handler *addr_handlers[CKPT_NETDEV_ADDR_MAX];
> +
> +static char *addr_modules[] = {
> + "ipv4", /* CKPT_NETDEV_ADDR_IPV4 */
> + "ipv6", /* CKPT_NETDEV_ADDR_IPV6 */
> +};
Looks good to me, thanks Dan.
Acked-by: Serge Hallyn <serue@xxxxxxxxxx>
Just one comment:
Should ckpt_netdev_addr_types/CKPT_NETDEV_ADDR_MAX somehow be
sanity-checked against the size of array?
-serge
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/containers
