Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: atmel - Avoid flush_scheduled_work() usage

Flushing system-wide workqueues is dangerous and will be forbidden.
Replace system_wq with local atmel_wq.

If CONFIG_CRYPTO_DEV_ATMEL_{I2C,ECC,SHA204A}=y, the ordering in Makefile
guarantees that module_init() for atmel-i2c runs before module_init()
for atmel-ecc and atmel-sha204a runs.

Link: https://lkml.kernel.org/r/49925af7-78a8-a3dd-bce6-cfc02e1a9236@I-love.SAKURA.ne.jp
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Tetsuo Handa and committed by
Herbert Xu
0a2f4b57 59f71498

+27 -3
+1
drivers/crypto/Makefile
··· 3 3 obj-$(CONFIG_CRYPTO_DEV_ATMEL_AES) += atmel-aes.o 4 4 obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA) += atmel-sha.o 5 5 obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o 6 + # __init ordering requires atmel-i2c being before atmel-ecc and atmel-sha204a. 6 7 obj-$(CONFIG_CRYPTO_DEV_ATMEL_I2C) += atmel-i2c.o 7 8 obj-$(CONFIG_CRYPTO_DEV_ATMEL_ECC) += atmel-ecc.o 8 9 obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA204A) += atmel-sha204a.o
+1 -1
drivers/crypto/atmel-ecc.c
··· 398 398 399 399 static void __exit atmel_ecc_exit(void) 400 400 { 401 - flush_scheduled_work(); 401 + atmel_i2c_flush_queue(); 402 402 i2c_del_driver(&atmel_ecc_driver); 403 403 } 404 404
+23 -1
drivers/crypto/atmel-i2c.c
··· 263 263 work_data->cbk(work_data, work_data->areq, status); 264 264 } 265 265 266 + static struct workqueue_struct *atmel_wq; 267 + 266 268 void atmel_i2c_enqueue(struct atmel_i2c_work_data *work_data, 267 269 void (*cbk)(struct atmel_i2c_work_data *work_data, 268 270 void *areq, int status), ··· 274 272 work_data->areq = areq; 275 273 276 274 INIT_WORK(&work_data->work, atmel_i2c_work_handler); 277 - schedule_work(&work_data->work); 275 + queue_work(atmel_wq, &work_data->work); 278 276 } 279 277 EXPORT_SYMBOL(atmel_i2c_enqueue); 278 + 279 + void atmel_i2c_flush_queue(void) 280 + { 281 + flush_workqueue(atmel_wq); 282 + } 283 + EXPORT_SYMBOL(atmel_i2c_flush_queue); 280 284 281 285 static inline size_t atmel_i2c_wake_token_sz(u32 bus_clk_rate) 282 286 { ··· 375 367 return device_sanity_check(client); 376 368 } 377 369 EXPORT_SYMBOL(atmel_i2c_probe); 370 + 371 + static int __init atmel_i2c_init(void) 372 + { 373 + atmel_wq = alloc_workqueue("atmel_wq", 0, 0); 374 + return atmel_wq ? 0 : -ENOMEM; 375 + } 376 + 377 + static void __exit atmel_i2c_exit(void) 378 + { 379 + destroy_workqueue(atmel_wq); 380 + } 381 + 382 + module_init(atmel_i2c_init); 383 + module_exit(atmel_i2c_exit); 378 384 379 385 MODULE_AUTHOR("Tudor Ambarus <tudor.ambarus@microchip.com>"); 380 386 MODULE_DESCRIPTION("Microchip / Atmel ECC (I2C) driver");
+1
drivers/crypto/atmel-i2c.h
··· 173 173 void (*cbk)(struct atmel_i2c_work_data *work_data, 174 174 void *areq, int status), 175 175 void *areq); 176 + void atmel_i2c_flush_queue(void); 176 177 177 178 int atmel_i2c_send_receive(struct i2c_client *client, struct atmel_i2c_cmd *cmd); 178 179
+1 -1
drivers/crypto/atmel-sha204a.c
··· 160 160 161 161 static void __exit atmel_sha204a_exit(void) 162 162 { 163 - flush_scheduled_work(); 163 + atmel_i2c_flush_queue(); 164 164 i2c_del_driver(&atmel_sha204a_driver); 165 165 } 166 166