fscache: Attach the index key and aux data to the cookie

Attach copies of the index key and auxiliary data to the fscache cookie so
that:

 (1) The callbacks to the netfs for this stuff can be eliminated.  This
     can simplify things in the cache as the information is still
     available, even after the cache has relinquished the cookie.

 (2) Simplifies the locking requirements of accessing the information as we
     don't have to worry about the netfs object going away on us.

 (3) The cache can do lazy updating of the coherency information on disk.
     As long as the cache is flushed before reboot/poweroff, there's no
     need to update the coherency info on disk every time it changes.

 (4) Cookies can be hashed or put in a tree as the index key is easily
     available.  This allows:

     (a) Checks for duplicate cookies can be made at the top fscache layer
     	 rather than down in the bowels of the cache backend.

     (b) Caching can be added to a netfs object that has a cookie if the
     	 cache is brought online after the netfs object is allocated.

A certain amount of space is made in the cookie for inline copies of the
data, but if it won't fit there, extra memory will be allocated for it.

The downside of this is that live cache operation requires more memory.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Anna Schumaker <anna.schumaker@netapp.com>
Tested-by: Steve Dickson <steved@redhat.com>

1 files changed, 24 insertions, 14 deletions

diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
index 405ebc3932c2..3264dcfdc92a 100644
--- a/fs/cachefiles/interface.c
+++ b/fs/cachefiles/interface.c
@@ -32,7 +32,7 @@ static struct fscache_object *cachefiles_alloc_object(
         struct cachefiles_cache *cache;
         struct cachefiles_xattr *auxdata;
         unsigned keylen, auxlen;
-        void *buffer;
+        void *buffer, *p;
         char *key;
 
         cache = container_of(_cache, struct cachefiles_cache, cache);
@@ -65,8 +65,12 @@ static struct fscache_object *cachefiles_alloc_object(
         if (!buffer)
                 goto nomem_buffer;
 
-        keylen = cookie->def->get_key(cookie->netfs_data, buffer + 2, 512);
-        ASSERTCMP(keylen, <, 512);
+        keylen = cookie->key_len;
+        if (keylen <= sizeof(cookie->inline_key))
+                p = cookie->inline_key;
+        else
+                p = cookie->key;
+        memcpy(buffer + 2, p, keylen);
 
         *(uint16_t *)buffer = keylen;
         ((char *)buffer)[keylen + 2] = 0;
@@ -80,15 +84,17 @@ static struct fscache_object *cachefiles_alloc_object(
 
         /* get hold of the auxiliary data and prepend the object type */
         auxdata = buffer;
-        auxlen = 0;
-        if (cookie->def->get_aux) {
-                auxlen = cookie->def->get_aux(cookie->netfs_data,
-                                              auxdata->data, 511);
-                ASSERTCMP(auxlen, <, 511);
+        auxlen = cookie->aux_len;
+        if (auxlen) {
+                if (auxlen <= sizeof(cookie->inline_aux))
+                        p = cookie->inline_aux;
+                else
+                        p = cookie->aux;
+                memcpy(auxdata->data, p, auxlen);
         }
 
         auxdata->len = auxlen + 1;
-        auxdata->type = cookie->def->type;
+        auxdata->type = cookie->type;
 
         lookup_data->auxdata = auxdata;
         lookup_data->key = key;
@@ -206,6 +212,7 @@ static void cachefiles_update_object(struct fscache_object *_object)
         struct cachefiles_cache *cache;
         struct fscache_cookie *cookie;
         const struct cred *saved_cred;
+        const void *aux;
         unsigned auxlen;
 
         _enter("{OBJ%x}", _object->debug_id);
@@ -220,26 +227,29 @@ static void cachefiles_update_object(struct fscache_object *_object)
         }
 
         cookie = object->fscache.cookie;
+        auxlen = cookie->aux_len;
 
-        if (!cookie->def->get_aux) {
+        if (!auxlen) {
                 fscache_unuse_cookie(_object);
                 _leave(" [no aux]");
                 return;
         }
 
-        auxdata = kmalloc(2 + 512 + 3, cachefiles_gfp);
+        auxdata = kmalloc(2 + auxlen + 3, cachefiles_gfp);
         if (!auxdata) {
                 fscache_unuse_cookie(_object);
                 _leave(" [nomem]");
                 return;
         }
 
-        auxlen = cookie->def->get_aux(cookie->netfs_data, auxdata->data, 511);
+        aux = (auxlen <= sizeof(cookie->inline_aux)) ?
+                cookie->inline_aux : cookie->aux;
+
+        memcpy(auxdata->data, aux, auxlen);
         fscache_unuse_cookie(_object);
-        ASSERTCMP(auxlen, <, 511);
 
         auxdata->len = auxlen + 1;
-        auxdata->type = cookie->def->type;
+        auxdata->type = cookie->type;
 
         cachefiles_begin_secure(cache, &saved_cred);
         cachefiles_update_object_xattr(object, auxdata);