Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (102 commits)
  crypto: sha-s390 - Fix warnings in import function
  crypto: vmac - New hash algorithm for intel_txt support
  crypto: api - Do not displace newly registered algorithms
  crypto: ansi_cprng - Fix module initialization
  crypto: xcbc - Fix alignment calculation of xcbc_tfm_ctx
  crypto: fips - Depend on ansi_cprng
  crypto: blkcipher - Do not use eseqiv on stream ciphers
  crypto: ctr - Use chainiv on raw counter mode
  Revert crypto: fips - Select CPRNG
  crypto: rng - Fix typo
  crypto: talitos - add support for 36 bit addressing
  crypto: talitos - align locks on cache lines
  crypto: talitos - simplify hmac data size calculation
  crypto: mv_cesa - Add support for Orion5X crypto engine
  crypto: cryptd - Add support to access underlaying shash
  crypto: gcm - Use GHASH digest algorithm
  crypto: ghash - Add GHASH digest algorithm for GCM
  crypto: authenc - Convert to ahash
  crypto: api - Fix aligned ctx helper
  crypto: hmac - Prehash ipad/opad
  ...

diff --combined crypto/algapi.c
index df0863d56995d7ca02c1e9492d3ab74de164ab14,feb77e4bbb48bc45941db103b82137f5fea5f92b..f149b1c8b76d926183acc6c6f64172777aac0e2c
--- 1/crypto/algapi.c
--- 2/crypto/algapi.c
+++ b/crypto/algapi.c
@@@ -81,16 -81,35 +81,35 @@@ static void crypto_destroy_instance(str
        crypto_tmpl_put(tmpl);
  }
  
+ static struct list_head *crypto_more_spawns(struct crypto_alg *alg,
+                                           struct list_head *stack,
+                                           struct list_head *top,
+                                           struct list_head *secondary_spawns)
+ {
+       struct crypto_spawn *spawn, *n;
+ 
+       if (list_empty(stack))
+               return NULL;
+ 
+       spawn = list_first_entry(stack, struct crypto_spawn, list);
+       n = list_entry(spawn->list.next, struct crypto_spawn, list);
+ 
+       if (spawn->alg && &n->list != stack && !n->alg)
+               n->alg = (n->list.next == stack) ? alg :
+                        &list_entry(n->list.next, struct crypto_spawn,
+                                    list)->inst->alg;
+ 
+       list_move(&spawn->list, secondary_spawns);
+ 
+       return &n->list == stack ? top : &n->inst->alg.cra_users;
+ }
+ 
  static void crypto_remove_spawn(struct crypto_spawn *spawn,
-                               struct list_head *list,
-                               struct list_head *secondary_spawns)
+                               struct list_head *list)
  {
        struct crypto_instance *inst = spawn->inst;
        struct crypto_template *tmpl = inst->tmpl;
  
-       list_del_init(&spawn->list);
-       spawn->alg = NULL;
- 
        if (crypto_is_dead(&inst->alg))
                return;
  
@@@ -106,25 -125,55 +125,55 @@@
        hlist_del(&inst->list);
        inst->alg.cra_destroy = crypto_destroy_instance;
  
-       list_splice(&inst->alg.cra_users, secondary_spawns);
+       BUG_ON(!list_empty(&inst->alg.cra_users));
  }
  
- static void crypto_remove_spawns(struct list_head *spawns,
-                                struct list_head *list, u32 new_type)
+ static void crypto_remove_spawns(struct crypto_alg *alg,
+                                struct list_head *list,
+                                struct crypto_alg *nalg)
  {
+       u32 new_type = (nalg ?: alg)->cra_flags;
        struct crypto_spawn *spawn, *n;
        LIST_HEAD(secondary_spawns);
+       struct list_head *spawns;
+       LIST_HEAD(stack);
+       LIST_HEAD(top);
  
+       spawns = &alg->cra_users;
        list_for_each_entry_safe(spawn, n, spawns, list) {
                if ((spawn->alg->cra_flags ^ new_type) & spawn->mask)
                        continue;
  
-               crypto_remove_spawn(spawn, list, &secondary_spawns);
+               list_move(&spawn->list, &top);
        }
  
-       while (!list_empty(&secondary_spawns)) {
-               list_for_each_entry_safe(spawn, n, &secondary_spawns, list)
-                       crypto_remove_spawn(spawn, list, &secondary_spawns);
+       spawns = ⊤
+       do {
+               while (!list_empty(spawns)) {
+                       struct crypto_instance *inst;
+ 
+                       spawn = list_first_entry(spawns, struct crypto_spawn,
+                                                list);
+                       inst = spawn->inst;
+ 
+                       BUG_ON(&inst->alg == alg);
+ 
+                       list_move(&spawn->list, &stack);
+ 
+                       if (&inst->alg == nalg)
+                               break;
+ 
+                       spawn->alg = NULL;
+                       spawns = &inst->alg.cra_users;
+               }
+       } while ((spawns = crypto_more_spawns(alg, &stack, &top,
+                                             &secondary_spawns)));
+ 
+       list_for_each_entry_safe(spawn, n, &secondary_spawns, list) {
+               if (spawn->alg)
+                       list_move(&spawn->list, &spawn->alg->cra_users);
+               else
+                       crypto_remove_spawn(spawn, list);
        }
  }
  
@@@ -258,7 -307,7 +307,7 @@@ found
                    q->cra_priority > alg->cra_priority)
                        continue;
  
-               crypto_remove_spawns(&q->cra_users, &list, alg->cra_flags);
+               crypto_remove_spawns(q, &list, alg);
        }
  
  complete:
@@@ -330,7 -379,7 +379,7 @@@ static int crypto_remove_alg(struct cry
  
        crypto_notify(CRYPTO_MSG_ALG_UNREGISTER, alg);
        list_del_init(&alg->cra_list);
-       crypto_remove_spawns(&alg->cra_users, list, alg->cra_flags);
+       crypto_remove_spawns(alg, list, NULL);
  
        return 0;
  }
@@@ -488,20 -537,38 +537,38 @@@ int crypto_init_spawn(struct crypto_spa
  }
  EXPORT_SYMBOL_GPL(crypto_init_spawn);
  
+ int crypto_init_spawn2(struct crypto_spawn *spawn, struct crypto_alg *alg,
+                      struct crypto_instance *inst,
+                      const struct crypto_type *frontend)
+ {
+       int err = -EINVAL;
+ 
+       if (frontend && (alg->cra_flags ^ frontend->type) & frontend->maskset)
+               goto out;
+ 
+       spawn->frontend = frontend;
+       err = crypto_init_spawn(spawn, alg, inst, frontend->maskset);
+ 
+ out:
+       return err;
+ }
+ EXPORT_SYMBOL_GPL(crypto_init_spawn2);
+ 
  void crypto_drop_spawn(struct crypto_spawn *spawn)
  {
+       if (!spawn->alg)
+               return;
+ 
        down_write(&crypto_alg_sem);
        list_del(&spawn->list);
        up_write(&crypto_alg_sem);
  }
  EXPORT_SYMBOL_GPL(crypto_drop_spawn);
  
- struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type,
-                                   u32 mask)
+ static struct crypto_alg *crypto_spawn_alg(struct crypto_spawn *spawn)
  {
        struct crypto_alg *alg;
        struct crypto_alg *alg2;
-       struct crypto_tfm *tfm;
  
        down_read(&crypto_alg_sem);
        alg = spawn->alg;
@@@ -516,6 -583,19 +583,19 @@@
                return ERR_PTR(-EAGAIN);
        }
  
+       return alg;
+ }
+ 
+ struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type,
+                                   u32 mask)
+ {
+       struct crypto_alg *alg;
+       struct crypto_tfm *tfm;
+ 
+       alg = crypto_spawn_alg(spawn);
+       if (IS_ERR(alg))
+               return ERR_CAST(alg);
+ 
        tfm = ERR_PTR(-EINVAL);
        if (unlikely((alg->cra_flags ^ type) & mask))
                goto out_put_alg;
@@@ -532,6 -612,27 +612,27 @@@ out_put_alg
  }
  EXPORT_SYMBOL_GPL(crypto_spawn_tfm);
  
+ void *crypto_spawn_tfm2(struct crypto_spawn *spawn)
+ {
+       struct crypto_alg *alg;
+       struct crypto_tfm *tfm;
+ 
+       alg = crypto_spawn_alg(spawn);
+       if (IS_ERR(alg))
+               return ERR_CAST(alg);
+ 
+       tfm = crypto_create_tfm(alg, spawn->frontend);
+       if (IS_ERR(tfm))
+               goto out_put_alg;
+ 
+       return tfm;
+ 
+ out_put_alg:
+       crypto_mod_put(alg);
+       return tfm;
+ }
+ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2);
+ 
  int crypto_register_notifier(struct notifier_block *nb)
  {
        return blocking_notifier_chain_register(&crypto_chain, nb);
@@@ -595,7 -696,9 +696,9 @@@ const char *crypto_attr_alg_name(struc
  }
  EXPORT_SYMBOL_GPL(crypto_attr_alg_name);
  
- struct crypto_alg *crypto_attr_alg(struct rtattr *rta, u32 type, u32 mask)
+ struct crypto_alg *crypto_attr_alg2(struct rtattr *rta,
+                                   const struct crypto_type *frontend,
+                                   u32 type, u32 mask)
  {
        const char *name;
        int err;
@@@ -605,9 -708,9 +708,9 @@@
        if (IS_ERR(name))
                return ERR_PTR(err);
  
-       return crypto_alg_mod_lookup(name, type, mask);
+       return crypto_find_alg(name, frontend, type, mask);
  }
- EXPORT_SYMBOL_GPL(crypto_attr_alg);
+ EXPORT_SYMBOL_GPL(crypto_attr_alg2);
  
  int crypto_attr_u32(struct rtattr *rta, u32 *num)
  {
@@@ -627,17 -730,20 +730,20 @@@
  }
  EXPORT_SYMBOL_GPL(crypto_attr_u32);
  
- struct crypto_instance *crypto_alloc_instance(const char *name,
-                                             struct crypto_alg *alg)
+ void *crypto_alloc_instance2(const char *name, struct crypto_alg *alg,
+                            unsigned int head)
  {
        struct crypto_instance *inst;
-       struct crypto_spawn *spawn;
+       char *p;
        int err;
  
-       inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
-       if (!inst)
+       p = kzalloc(head + sizeof(*inst) + sizeof(struct crypto_spawn),
+                   GFP_KERNEL);
+       if (!p)
                return ERR_PTR(-ENOMEM);
  
+       inst = (void *)(p + head);
+ 
        err = -ENAMETOOLONG;
        if (snprintf(inst->alg.cra_name, CRYPTO_MAX_ALG_NAME, "%s(%s)", name,
                     alg->cra_name) >= CRYPTO_MAX_ALG_NAME)
@@@ -647,6 -753,25 +753,25 @@@
                     name, alg->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
                goto err_free_inst;
  
+       return p;
+ 
+ err_free_inst:
+       kfree(p);
+       return ERR_PTR(err);
+ }
+ EXPORT_SYMBOL_GPL(crypto_alloc_instance2);
+ 
+ struct crypto_instance *crypto_alloc_instance(const char *name,
+                                             struct crypto_alg *alg)
+ {
+       struct crypto_instance *inst;
+       struct crypto_spawn *spawn;
+       int err;
+ 
+       inst = crypto_alloc_instance2(name, alg, 0);
+       if (IS_ERR(inst))
+               goto out;
+ 
        spawn = crypto_instance_ctx(inst);
        err = crypto_init_spawn(spawn, alg, inst,
                                CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
@@@ -658,7 -783,10 +783,10 @@@
  
  err_free_inst:
        kfree(inst);
-       return ERR_PTR(err);
+       inst = ERR_PTR(err);
+ 
+ out:
+       return inst;
  }
  EXPORT_SYMBOL_GPL(crypto_alloc_instance);
  
@@@ -692,7 -820,7 +820,7 @@@ out
  }
  EXPORT_SYMBOL_GPL(crypto_enqueue_request);
  
 -struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue)
 +void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset)
  {
        struct list_head *request;
  
@@@ -707,14 -835,7 +835,14 @@@
        request = queue->list.next;
        list_del(request);
  
 -      return list_entry(request, struct crypto_async_request, list);
 +      return (char *)list_entry(request, struct crypto_async_request, list) -
 +             offset;
 +}
 +EXPORT_SYMBOL_GPL(__crypto_dequeue_request);
 +
 +struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue)
 +{
 +      return __crypto_dequeue_request(queue, 0);
  }
  EXPORT_SYMBOL_GPL(crypto_dequeue_request);
  

diff --combined include/crypto/algapi.h
index 5a2bd1cc9656b56e8462c0f8569fb6b1479609f4,3f388146a914f7dbe677343b78549dcebfa41eb3..1ffb53f74d37112c937365bb30b47a8142cda51b
--- 1/include/crypto/algapi.h
--- 2/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@@ -22,11 -22,9 +22,9 @@@ struct seq_file
  
  struct crypto_type {
        unsigned int (*ctxsize)(struct crypto_alg *alg, u32 type, u32 mask);
-       unsigned int (*extsize)(struct crypto_alg *alg,
-                               const struct crypto_type *frontend);
+       unsigned int (*extsize)(struct crypto_alg *alg);
        int (*init)(struct crypto_tfm *tfm, u32 type, u32 mask);
-       int (*init_tfm)(struct crypto_tfm *tfm,
-                       const struct crypto_type *frontend);
+       int (*init_tfm)(struct crypto_tfm *tfm);
        void (*show)(struct seq_file *m, struct crypto_alg *alg);
        struct crypto_alg *(*lookup)(const char *name, u32 type, u32 mask);
  
@@@ -52,6 -50,7 +50,7 @@@ struct crypto_template 
  
        struct crypto_instance *(*alloc)(struct rtattr **tb);
        void (*free)(struct crypto_instance *inst);
+       int (*create)(struct crypto_template *tmpl, struct rtattr **tb);
  
        char name[CRYPTO_MAX_ALG_NAME];
  };
@@@ -60,6 -59,7 +59,7 @@@ struct crypto_spawn 
        struct list_head list;
        struct crypto_alg *alg;
        struct crypto_instance *inst;
+       const struct crypto_type *frontend;
        u32 mask;
  };
  
@@@ -114,11 -114,19 +114,19 @@@ int crypto_register_template(struct cry
  void crypto_unregister_template(struct crypto_template *tmpl);
  struct crypto_template *crypto_lookup_template(const char *name);
  
+ int crypto_register_instance(struct crypto_template *tmpl,
+                            struct crypto_instance *inst);
+ 
  int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
                      struct crypto_instance *inst, u32 mask);
+ int crypto_init_spawn2(struct crypto_spawn *spawn, struct crypto_alg *alg,
+                      struct crypto_instance *inst,
+                      const struct crypto_type *frontend);
+ 
  void crypto_drop_spawn(struct crypto_spawn *spawn);
  struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type,
                                    u32 mask);
+ void *crypto_spawn_tfm2(struct crypto_spawn *spawn);
  
  static inline void crypto_set_spawn(struct crypto_spawn *spawn,
                                    struct crypto_instance *inst)
@@@ -129,15 -137,25 +137,26 @@@
  struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb);
  int crypto_check_attr_type(struct rtattr **tb, u32 type);
  const char *crypto_attr_alg_name(struct rtattr *rta);
- struct crypto_alg *crypto_attr_alg(struct rtattr *rta, u32 type, u32 mask);
+ struct crypto_alg *crypto_attr_alg2(struct rtattr *rta,
+                                   const struct crypto_type *frontend,
+                                   u32 type, u32 mask);
+ 
+ static inline struct crypto_alg *crypto_attr_alg(struct rtattr *rta,
+                                                u32 type, u32 mask)
+ {
+       return crypto_attr_alg2(rta, NULL, type, mask);
+ }
+ 
  int crypto_attr_u32(struct rtattr *rta, u32 *num);
+ void *crypto_alloc_instance2(const char *name, struct crypto_alg *alg,
+                            unsigned int head);
  struct crypto_instance *crypto_alloc_instance(const char *name,
                                              struct crypto_alg *alg);
  
  void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen);
  int crypto_enqueue_request(struct crypto_queue *queue,
                           struct crypto_async_request *request);
 +void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset);
  struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue);
  int crypto_tfm_in_queue(struct crypto_queue *queue, struct crypto_tfm *tfm);
  
@@@ -157,12 -175,8 +176,8 @@@ int blkcipher_walk_virt_block(struct bl
  
  static inline void *crypto_tfm_ctx_aligned(struct crypto_tfm *tfm)
  {
-       unsigned long addr = (unsigned long)crypto_tfm_ctx(tfm);
-       unsigned long align = crypto_tfm_alg_alignmask(tfm);
- 
-       if (align <= crypto_tfm_ctx_alignment())
-               align = 1;
-       return (void *)ALIGN(addr, align);
+       return PTR_ALIGN(crypto_tfm_ctx(tfm),
+                        crypto_tfm_alg_alignmask(tfm) + 1);
  }
  
  static inline struct crypto_instance *crypto_tfm_alg_instance(