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: (39 commits)
  random: Reorder struct entropy_store to remove padding on 64bits
  padata: update API documentation
  padata: Remove padata_get_cpumask
  crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifier
  crypto: pcrypt - Rename pcrypt_instance
  padata: Pass the padata cpumasks to the cpumask_change_notifier chain
  padata: Rearrange set_cpumask functions
  padata: Rename padata_alloc functions
  crypto: pcrypt - Dont calulate a callback cpu on empty callback cpumask
  padata: Check for valid cpumasks
  padata: Allocate cpumask dependend recources in any case
  padata: Fix cpu index counting
  crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
  pcrypt: Added sysfs interface to pcrypt
  padata: Added sysfs primitives to padata subsystem
  padata: Make two separate cpumasks
  padata: update documentation
  padata: simplify serialization mechanism
  padata: make padata_do_parallel to return zero on success
  padata: Handle empty padata cpumasks
  ...

9 files changed, 221 insertions, 64 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 9d9434f08c92..1cd497d7a15a 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -80,6 +80,11 @@ config CRYPTO_RNG2
 
 config CRYPTO_PCOMP
         tristate
+        select CRYPTO_PCOMP2
+        select CRYPTO_ALGAPI
+
+config CRYPTO_PCOMP2
+        tristate
         select CRYPTO_ALGAPI2
 
 config CRYPTO_MANAGER
@@ -94,7 +99,15 @@ config CRYPTO_MANAGER2
         select CRYPTO_AEAD2
         select CRYPTO_HASH2
         select CRYPTO_BLKCIPHER2
-        select CRYPTO_PCOMP
+        select CRYPTO_PCOMP2
+
+config CRYPTO_MANAGER_TESTS
+        bool "Run algolithms' self-tests"
+        default y
+        depends on CRYPTO_MANAGER2
+        help
+          Run cryptomanager's tests for the new crypto algorithms being
+          registered.
 
 config CRYPTO_GF128MUL
         tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
diff --git a/crypto/Makefile b/crypto/Makefile
index d7e6441df7fe..423b7de61f93 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -26,7 +26,7 @@ crypto_hash-objs += ahash.o
 crypto_hash-objs += shash.o
 obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o
 
-obj-$(CONFIG_CRYPTO_PCOMP) += pcompress.o
+obj-$(CONFIG_CRYPTO_PCOMP2) += pcompress.o
 
 cryptomgr-objs := algboss.o testmgr.o
 
@@ -61,7 +61,7 @@ obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o
 obj-$(CONFIG_CRYPTO_DES) += des_generic.o
 obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o
 obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
-obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
+obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o
 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
 obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o
 obj-$(CONFIG_CRYPTO_AES) += aes_generic.o
diff --git a/crypto/algboss.c b/crypto/algboss.c
index c3c196b5823a..40bd391f34d9 100644
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -206,6 +206,7 @@ err:
         return NOTIFY_OK;
 }
 
+#ifdef CONFIG_CRYPTO_MANAGER_TESTS
 static int cryptomgr_test(void *data)
 {
         struct crypto_test_param *param = data;
@@ -266,6 +267,7 @@ err_put_module:
 err:
         return NOTIFY_OK;
 }
+#endif /* CONFIG_CRYPTO_MANAGER_TESTS */
 
 static int cryptomgr_notify(struct notifier_block *this, unsigned long msg,
                             void *data)
@@ -273,8 +275,10 @@ static int cryptomgr_notify(struct notifier_block *this, unsigned long msg,
         switch (msg) {
         case CRYPTO_MSG_ALG_REQUEST:
                 return cryptomgr_schedule_probe(data);
+#ifdef CONFIG_CRYPTO_MANAGER_TESTS
         case CRYPTO_MSG_ALG_REGISTER:
                 return cryptomgr_schedule_test(data);
+#endif
         }
 
         return NOTIFY_DONE;
diff --git a/crypto/authenc.c b/crypto/authenc.c
index b9884ee0adb6..a5a22cfcd07b 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -616,7 +616,7 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
         auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,
                                CRYPTO_ALG_TYPE_AHASH_MASK);
         if (IS_ERR(auth))
-                return ERR_PTR(PTR_ERR(auth));
+                return ERR_CAST(auth);
 
         auth_base = &auth->base;
 
diff --git a/crypto/ctr.c b/crypto/ctr.c
index 6c3bfabb9d1d..4ca7222cfeb6 100644
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -185,7 +185,7 @@ static struct crypto_instance *crypto_ctr_alloc(struct rtattr **tb)
         alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_CIPHER,
                                   CRYPTO_ALG_TYPE_MASK);
         if (IS_ERR(alg))
-                return ERR_PTR(PTR_ERR(alg));
+                return ERR_CAST(alg);
 
         /* Block size must be >= 4 bytes. */
         err = -EINVAL;
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index 247178cb98ec..de3078215fe6 100644
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -24,12 +24,40 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/notifier.h>
+#include <linux/kobject.h>
+#include <linux/cpu.h>
 #include <crypto/pcrypt.h>
 
-static struct padata_instance *pcrypt_enc_padata;
-static struct padata_instance *pcrypt_dec_padata;
-static struct workqueue_struct *encwq;
-static struct workqueue_struct *decwq;
+struct padata_pcrypt {
+        struct padata_instance *pinst;
+        struct workqueue_struct *wq;
+
+        /*
+         * Cpumask for callback CPUs. It should be
+         * equal to serial cpumask of corresponding padata instance,
+         * so it is updated when padata notifies us about serial
+         * cpumask change.
+         *
+         * cb_cpumask is protected by RCU. This fact prevents us from
+         * using cpumask_var_t directly because the actual type of
+         * cpumsak_var_t depends on kernel configuration(particularly on
+         * CONFIG_CPUMASK_OFFSTACK macro). Depending on the configuration
+         * cpumask_var_t may be either a pointer to the struct cpumask
+         * or a variable allocated on the stack. Thus we can not safely use
+         * cpumask_var_t with RCU operations such as rcu_assign_pointer or
+         * rcu_dereference. So cpumask_var_t is wrapped with struct
+         * pcrypt_cpumask which makes possible to use it with RCU.
+         */
+        struct pcrypt_cpumask {
+                cpumask_var_t mask;
+        } *cb_cpumask;
+        struct notifier_block nblock;
+};
+
+static struct padata_pcrypt pencrypt;
+static struct padata_pcrypt pdecrypt;
+static struct kset           *pcrypt_kset;
 
 struct pcrypt_instance_ctx {
         struct crypto_spawn spawn;
@@ -42,25 +70,32 @@ struct pcrypt_aead_ctx {
 };
 
 static int pcrypt_do_parallel(struct padata_priv *padata, unsigned int *cb_cpu,
-                              struct padata_instance *pinst)
+                              struct padata_pcrypt *pcrypt)
 {
         unsigned int cpu_index, cpu, i;
+        struct pcrypt_cpumask *cpumask;
 
         cpu = *cb_cpu;
 
-        if (cpumask_test_cpu(cpu, cpu_active_mask))
+        rcu_read_lock_bh();
+        cpumask = rcu_dereference(pcrypt->cb_cpumask);
+        if (cpumask_test_cpu(cpu, cpumask->mask))
+                        goto out;
+
+        if (!cpumask_weight(cpumask->mask))
                         goto out;
 
-        cpu_index = cpu % cpumask_weight(cpu_active_mask);
+        cpu_index = cpu % cpumask_weight(cpumask->mask);
 
-        cpu = cpumask_first(cpu_active_mask);
+        cpu = cpumask_first(cpumask->mask);
         for (i = 0; i < cpu_index; i++)
-                cpu = cpumask_next(cpu, cpu_active_mask);
+                cpu = cpumask_next(cpu, cpumask->mask);
 
         *cb_cpu = cpu;
 
 out:
-        return padata_do_parallel(pinst, padata, cpu);
+        rcu_read_unlock_bh();
+        return padata_do_parallel(pcrypt->pinst, padata, cpu);
 }
 
 static int pcrypt_aead_setkey(struct crypto_aead *parent,
@@ -142,11 +177,9 @@ static int pcrypt_aead_encrypt(struct aead_request *req)
                                req->cryptlen, req->iv);
         aead_request_set_assoc(creq, req->assoc, req->assoclen);
 
-        err = pcrypt_do_parallel(padata, &ctx->cb_cpu, pcrypt_enc_padata);
-        if (err)
-                return err;
-        else
-                err = crypto_aead_encrypt(creq);
+        err = pcrypt_do_parallel(padata, &ctx->cb_cpu, &pencrypt);
+        if (!err)
+                return -EINPROGRESS;
 
         return err;
 }
@@ -186,11 +219,9 @@ static int pcrypt_aead_decrypt(struct aead_request *req)
                                req->cryptlen, req->iv);
         aead_request_set_assoc(creq, req->assoc, req->assoclen);
 
-        err = pcrypt_do_parallel(padata, &ctx->cb_cpu, pcrypt_dec_padata);
-        if (err)
-                return err;
-        else
-                err = crypto_aead_decrypt(creq);
+        err = pcrypt_do_parallel(padata, &ctx->cb_cpu, &pdecrypt);
+        if (!err)
+                return -EINPROGRESS;
 
         return err;
 }
@@ -232,11 +263,9 @@ static int pcrypt_aead_givencrypt(struct aead_givcrypt_request *req)
         aead_givcrypt_set_assoc(creq, areq->assoc, areq->assoclen);
         aead_givcrypt_set_giv(creq, req->giv, req->seq);
 
-        err = pcrypt_do_parallel(padata, &ctx->cb_cpu, pcrypt_enc_padata);
-        if (err)
-                return err;
-        else
-                err = crypto_aead_givencrypt(creq);
+        err = pcrypt_do_parallel(padata, &ctx->cb_cpu, &pencrypt);
+        if (!err)
+                return -EINPROGRESS;
 
         return err;
 }
@@ -376,6 +405,115 @@ static void pcrypt_free(struct crypto_instance *inst)
         kfree(inst);
 }
 
+static int pcrypt_cpumask_change_notify(struct notifier_block *self,
+                                        unsigned long val, void *data)
+{
+        struct padata_pcrypt *pcrypt;
+        struct pcrypt_cpumask *new_mask, *old_mask;
+        struct padata_cpumask *cpumask = (struct padata_cpumask *)data;
+
+        if (!(val & PADATA_CPU_SERIAL))
+                return 0;
+
+        pcrypt = container_of(self, struct padata_pcrypt, nblock);
+        new_mask = kmalloc(sizeof(*new_mask), GFP_KERNEL);
+        if (!new_mask)
+                return -ENOMEM;
+        if (!alloc_cpumask_var(&new_mask->mask, GFP_KERNEL)) {
+                kfree(new_mask);
+                return -ENOMEM;
+        }
+
+        old_mask = pcrypt->cb_cpumask;
+
+        cpumask_copy(new_mask->mask, cpumask->cbcpu);
+        rcu_assign_pointer(pcrypt->cb_cpumask, new_mask);
+        synchronize_rcu_bh();
+
+        free_cpumask_var(old_mask->mask);
+        kfree(old_mask);
+        return 0;
+}
+
+static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
+{
+        int ret;
+
+        pinst->kobj.kset = pcrypt_kset;
+        ret = kobject_add(&pinst->kobj, NULL, name);
+        if (!ret)
+                kobject_uevent(&pinst->kobj, KOBJ_ADD);
+
+        return ret;
+}
+
+static int pcrypt_init_padata(struct padata_pcrypt *pcrypt,
+                              const char *name)
+{
+        int ret = -ENOMEM;
+        struct pcrypt_cpumask *mask;
+
+        get_online_cpus();
+
+        pcrypt->wq = create_workqueue(name);
+        if (!pcrypt->wq)
+                goto err;
+
+        pcrypt->pinst = padata_alloc_possible(pcrypt->wq);
+        if (!pcrypt->pinst)
+                goto err_destroy_workqueue;
+
+        mask = kmalloc(sizeof(*mask), GFP_KERNEL);
+        if (!mask)
+                goto err_free_padata;
+        if (!alloc_cpumask_var(&mask->mask, GFP_KERNEL)) {
+                kfree(mask);
+                goto err_free_padata;
+        }
+
+        cpumask_and(mask->mask, cpu_possible_mask, cpu_active_mask);
+        rcu_assign_pointer(pcrypt->cb_cpumask, mask);
+
+        pcrypt->nblock.notifier_call = pcrypt_cpumask_change_notify;
+        ret = padata_register_cpumask_notifier(pcrypt->pinst, &pcrypt->nblock);
+        if (ret)
+                goto err_free_cpumask;
+
+        ret = pcrypt_sysfs_add(pcrypt->pinst, name);
+        if (ret)
+                goto err_unregister_notifier;
+
+        put_online_cpus();
+
+        return ret;
+
+err_unregister_notifier:
+        padata_unregister_cpumask_notifier(pcrypt->pinst, &pcrypt->nblock);
+err_free_cpumask:
+        free_cpumask_var(mask->mask);
+        kfree(mask);
+err_free_padata:
+        padata_free(pcrypt->pinst);
+err_destroy_workqueue:
+        destroy_workqueue(pcrypt->wq);
+err:
+        put_online_cpus();
+
+        return ret;
+}
+
+static void pcrypt_fini_padata(struct padata_pcrypt *pcrypt)
+{
+        kobject_put(&pcrypt->pinst->kobj);
+        free_cpumask_var(pcrypt->cb_cpumask->mask);
+        kfree(pcrypt->cb_cpumask);
+
+        padata_stop(pcrypt->pinst);
+        padata_unregister_cpumask_notifier(pcrypt->pinst, &pcrypt->nblock);
+        destroy_workqueue(pcrypt->wq);
+        padata_free(pcrypt->pinst);
+}
+
 static struct crypto_template pcrypt_tmpl = {
         .name = "pcrypt",
         .alloc = pcrypt_alloc,
@@ -385,52 +523,39 @@ static struct crypto_template pcrypt_tmpl = {
 
 static int __init pcrypt_init(void)
 {
-        encwq = create_workqueue("pencrypt");
-        if (!encwq)
-                goto err;
-
-        decwq = create_workqueue("pdecrypt");
-        if (!decwq)
-                goto err_destroy_encwq;
+        int err = -ENOMEM;
 
+        pcrypt_kset = kset_create_and_add("pcrypt", NULL, kernel_kobj);
+        if (!pcrypt_kset)
+                goto err;
 
-        pcrypt_enc_padata = padata_alloc(cpu_possible_mask, encwq);
-        if (!pcrypt_enc_padata)
-                goto err_destroy_decwq;
+        err = pcrypt_init_padata(&pencrypt, "pencrypt");
+        if (err)
+                goto err_unreg_kset;
 
-        pcrypt_dec_padata = padata_alloc(cpu_possible_mask, decwq);
-        if (!pcrypt_dec_padata)
-                goto err_free_padata;
+        err = pcrypt_init_padata(&pdecrypt, "pdecrypt");
+        if (err)
+                goto err_deinit_pencrypt;
 
-        padata_start(pcrypt_enc_padata);
-        padata_start(pcrypt_dec_padata);
+        padata_start(pencrypt.pinst);
+        padata_start(pdecrypt.pinst);
 
         return crypto_register_template(&pcrypt_tmpl);
 
-err_free_padata:
-        padata_free(pcrypt_enc_padata);
-
-err_destroy_decwq:
-        destroy_workqueue(decwq);
-
-err_destroy_encwq:
-        destroy_workqueue(encwq);
-
+err_deinit_pencrypt:
+        pcrypt_fini_padata(&pencrypt);
+err_unreg_kset:
+        kset_unregister(pcrypt_kset);
 err:
-        return -ENOMEM;
+        return err;
 }
 
 static void __exit pcrypt_exit(void)
 {
-        padata_stop(pcrypt_enc_padata);
-        padata_stop(pcrypt_dec_padata);
-
-        destroy_workqueue(encwq);
-        destroy_workqueue(decwq);
-
-        padata_free(pcrypt_enc_padata);
-        padata_free(pcrypt_dec_padata);
+        pcrypt_fini_padata(&pencrypt);
+        pcrypt_fini_padata(&pdecrypt);
 
+        kset_unregister(pcrypt_kset);
         crypto_unregister_template(&pcrypt_tmpl);
 }
 
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 5c8aaa0cb0b9..abd980c729eb 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -22,6 +22,17 @@
 #include <crypto/rng.h>
 
 #include "internal.h"
+
+#ifndef CONFIG_CRYPTO_MANAGER_TESTS
+
+/* a perfect nop */
+int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
+{
+        return 0;
+}
+
+#else
+
 #include "testmgr.h"
 
 /*
@@ -2530,4 +2541,7 @@ notest:
 non_fips_alg:
         return -EINVAL;
 }
+
+#endif /* CONFIG_CRYPTO_MANAGER_TESTS */
+
 EXPORT_SYMBOL_GPL(alg_test);
diff --git a/crypto/twofish.c b/crypto/twofish_generic.c
index dfcda231f87a..1f07b843e07c 100644
--- a/crypto/twofish.c
+++ b/crypto/twofish_generic.c
@@ -212,3 +212,4 @@ module_exit(twofish_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION ("Twofish Cipher Algorithm");
+MODULE_ALIAS("twofish");
diff --git a/crypto/xts.c b/crypto/xts.c
index d87b0f3102c3..555ecaab1e54 100644
--- a/crypto/xts.c
+++ b/crypto/xts.c
@@ -224,7 +224,7 @@ static struct crypto_instance *alloc(struct rtattr **tb)
         alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
                                   CRYPTO_ALG_TYPE_MASK);
         if (IS_ERR(alg))
-                return ERR_PTR(PTR_ERR(alg));
+                return ERR_CAST(alg);
 
         inst = crypto_alloc_instance("xts", alg);
         if (IS_ERR(inst))