cache: avoid duplicate check on initial dump

The cache pickup does a check for duplicates for some time now.

However, the pickup in nl_cache_refill() explicitely clears the
cache, so the pickup doesn't need to actually do the dupe check,
as uniqueness is already guaranteed be Netlink subsystem.

And avoiding the dup check is beneficitial for performance
reasons, as the current algorithm is O(n^2).

http://lists.infradead.org/pipermail/libnl/2014-October/001680.html

Fixes: 96bb7c9a4cdd10a2665c0f56120943e79e33c560
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>

diff --git a/include/netlink/cache.h b/include/netlink/cache.h
index a2b3dbbd53f2289b4c673e215ea7cc7856012745..71eaceb271c24f36b298dd46264a3a842e56f7e1 100644 (file)
--- a/include/netlink/cache.h
+++ b/include/netlink/cache.h
@@ -78,6 +78,8 @@ extern int                    nl_cache_refill(struct nl_sock *,
                                                struct nl_cache *);
 extern int                     nl_cache_pickup(struct nl_sock *,
                                                struct nl_cache *);
+extern int                     nl_cache_pickup_checkdup(struct nl_sock *,
+                                               struct nl_cache *);
 extern int                     nl_cache_resync(struct nl_sock *,
                                                struct nl_cache *,
                                                change_func_t,

diff --git a/lib/cache.c b/lib/cache.c
index b4f9649c0e4da8b04608fecf1f2b613861a41d73..d68ee1fd253a5f64d5b4f2ae1623a124e538e54e 100644 (file)
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -708,7 +708,7 @@ static int __cache_pickup(struct nl_sock *sk, struct nl_cache *cache,
        return err;
 }
 
-static int pickup_cb(struct nl_object *c, struct nl_parser_param *p)
+static int pickup_checkdup_cb(struct nl_object *c, struct nl_parser_param *p)
 {
        struct nl_cache *cache = (struct nl_cache *)p->pp_arg;
        struct nl_object *old;
@@ -727,6 +727,42 @@ static int pickup_cb(struct nl_object *c, struct nl_parser_param *p)
        return nl_cache_add(cache, c);
 }
 
+static int pickup_cb(struct nl_object *c, struct nl_parser_param *p)
+{
+       struct nl_cache *cache = p->pp_arg;
+
+       return nl_cache_add(cache, c);
+}
+
+static int __nl_cache_pickup(struct nl_sock *sk, struct nl_cache *cache,
+                            int checkdup)
+{
+       struct nl_parser_param p;
+
+       p.pp_cb = checkdup ? pickup_checkdup_cb : pickup_cb;
+       p.pp_arg = cache;
+
+       if (sk->s_proto != cache->c_ops->co_protocol)
+               return -NLE_PROTO_MISMATCH;
+
+       return __cache_pickup(sk, cache, &p);
+}
+
+/**
+ * Pickup a netlink dump response and put it into a cache.
+ * @arg sk             Netlink socket.
+ * @arg cache          Cache to put items into.
+ *
+ * Waits for netlink messages to arrive, parses them and puts them into
+ * the specified cache.
+ *
+ * @return 0 on success or a negative error code.
+ */
+int nl_cache_pickup_checkdup(struct nl_sock *sk, struct nl_cache *cache)
+{
+       return __nl_cache_pickup(sk, cache, 1);
+}
+
 /**
  * Pickup a netlink dump response and put it into a cache.
  * @arg sk             Netlink socket.
@@ -742,15 +778,7 @@ static int pickup_cb(struct nl_object *c, struct nl_parser_param *p)
  */
 int nl_cache_pickup(struct nl_sock *sk, struct nl_cache *cache)
 {
-       struct nl_parser_param p = {
-               .pp_cb = pickup_cb,
-               .pp_arg = cache,
-       };
-
-       if (sk->s_proto != cache->c_ops->co_protocol)
-               return -NLE_PROTO_MISMATCH;
-
-       return __cache_pickup(sk, cache, &p);
+       return __nl_cache_pickup(sk, cache, 0);
 }
 
 static int cache_include(struct nl_cache *cache, struct nl_object *obj,

diff --git a/lib/fib_lookup/lookup.c b/lib/fib_lookup/lookup.c
index 3d073172d46ac35f33f96d69fcc7dd1ab647b36b..9b24635240d21169d9b54aaf89ac62ceec346bea 100644 (file)
--- a/lib/fib_lookup/lookup.c
+++ b/lib/fib_lookup/lookup.c
@@ -270,7 +270,7 @@ int flnl_lookup(struct nl_sock *sk, struct flnl_request *req,
        if (err < 0)
                return err;
 
-       return nl_cache_pickup(sk, cache);
+       return nl_cache_pickup_checkdup(sk, cache);
 }
 
 /** @} */