Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c879170 authored by Steffen Klassert's avatar Steffen Klassert Committed by Herbert Xu
Browse files

padata: Check for valid padata instance on start 



This patch introduces the PADATA_INVALID flag which is
checked on padata start. This will be used to mark a padata
instance as invalid, if the padata cpumask does not intersect
with the active cpumask. we change padata_start to return an
error if the PADATA_INVALID is set. Also we adapt the only
padata user, pcrypt to this change.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7e3de7b1

crypto/pcrypt.c

+14 −5
Original line number Original line Diff line number Diff line
@@ -385,6 +385,7 @@ static struct crypto_template pcrypt_tmpl = { 




static int __init pcrypt_init(void)

static int __init pcrypt_init(void)

{

{

	int err = -ENOMEM;

	encwq = create_workqueue("pencrypt");

	encwq = create_workqueue("pencrypt");

	if (!encwq)

	if (!encwq)

		goto err;

		goto err;
@@ -400,14 +401,22 @@ static int __init pcrypt_init(void) 




	pcrypt_dec_padata = padata_alloc(cpu_possible_mask, decwq);

	pcrypt_dec_padata = padata_alloc(cpu_possible_mask, decwq);

	if (!pcrypt_dec_padata)

	if (!pcrypt_dec_padata)

		goto err_free_padata;

		goto err_free_enc_padata;





	padata_start(pcrypt_enc_padata);

	err = padata_start(pcrypt_enc_padata);

	padata_start(pcrypt_dec_padata);

	if (err)

		goto err_free_dec_padata;



	err = padata_start(pcrypt_dec_padata);

	if (err)

		goto err_free_dec_padata;





	return crypto_register_template(&pcrypt_tmpl);

	return crypto_register_template(&pcrypt_tmpl);





err_free_padata:

err_free_dec_padata:

	padata_free(pcrypt_dec_padata);



err_free_enc_padata:

	padata_free(pcrypt_enc_padata);

	padata_free(pcrypt_enc_padata);





err_destroy_decwq:

err_destroy_decwq:
@@ -417,7 +426,7 @@ static int __init pcrypt_init(void) 
	destroy_workqueue(encwq);

	destroy_workqueue(encwq);





err:

err:

	return -ENOMEM;

	return err;

}

}





static void __exit pcrypt_exit(void)

static void __exit pcrypt_exit(void)

include/linux/padata.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -126,6 +126,7 @@ struct padata_instance { 
	u8			flags;

	u8			flags;

#define	PADATA_INIT		1

#define	PADATA_INIT		1

#define	PADATA_RESET		2

#define	PADATA_RESET		2

#define	PADATA_INVALID		4

};

};





extern struct padata_instance *padata_alloc(const struct cpumask *cpumask,

extern struct padata_instance *padata_alloc(const struct cpumask *cpumask,
@@ -138,6 +139,6 @@ extern int padata_set_cpumask(struct padata_instance *pinst, 
			      cpumask_var_t cpumask);

			      cpumask_var_t cpumask);

extern int padata_add_cpu(struct padata_instance *pinst, int cpu);

extern int padata_add_cpu(struct padata_instance *pinst, int cpu);

extern int padata_remove_cpu(struct padata_instance *pinst, int cpu);

extern int padata_remove_cpu(struct padata_instance *pinst, int cpu);

extern void padata_start(struct padata_instance *pinst);

extern int padata_start(struct padata_instance *pinst);

extern void padata_stop(struct padata_instance *pinst);

extern void padata_stop(struct padata_instance *pinst);

#endif
 
#endif

kernel/padata.c

+16 −2
Original line number Original line Diff line number Diff line
@@ -485,6 +485,11 @@ static void padata_flush_queues(struct parallel_data *pd) 
	BUG_ON(atomic_read(&pd->refcnt) != 0);

	BUG_ON(atomic_read(&pd->refcnt) != 0);

}

}





static void __padata_start(struct padata_instance *pinst)

{

	pinst->flags |= PADATA_INIT;

}



/* Replace the internal control stucture with a new one. */

/* Replace the internal control stucture with a new one. */

static void padata_replace(struct padata_instance *pinst,

static void padata_replace(struct padata_instance *pinst,

			   struct parallel_data *pd_new)

			   struct parallel_data *pd_new)
@@ -619,11 +624,20 @@ EXPORT_SYMBOL(padata_remove_cpu); 
 *

 *

 * @pinst: padata instance to start

 * @pinst: padata instance to start

 */

 */

void padata_start(struct padata_instance *pinst)

int padata_start(struct padata_instance *pinst)

{

{

	int err = 0;



	mutex_lock(&pinst->lock);

	mutex_lock(&pinst->lock);

	pinst->flags |= PADATA_INIT;



	if (pinst->flags & PADATA_INVALID)

		err =-EINVAL;



	 __padata_start(pinst);



	mutex_unlock(&pinst->lock);

	mutex_unlock(&pinst->lock);



	return err;

}

}

EXPORT_SYMBOL(padata_start);

EXPORT_SYMBOL(padata_start);