Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Rename EMPTY_TASKQ into taskq_empty 

To follow a change in illumos taskq

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com>
Signed-off-by: Jorgen Lundman <lundman@lundman.net>
Closes #12802
This commit is contained in:
Jorgen Lundman 2022-02-10 07:04:26 +09:00 committed by GitHub
parent 4eea717c4f
commit c28d6ab08b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/os/linux/spl/sys/taskq.h
View File

@ -163,6 +163,8 @@ extern taskq_t *taskq_of_curthread(void);
((void) sizeof (dc), \ ((void) sizeof (dc), \
taskq_create(name, nthreads, maxclsyspri, min, max, flags)) taskq_create(name, nthreads, maxclsyspri, min, max, flags))
extern boolean_t taskq_empty(taskq_t *);
int spl_taskq_init(void); int spl_taskq_init(void);
void spl_taskq_fini(void); void spl_taskq_fini(void);

1
include/sys/zfs_context.h
View File

@ -509,6 +509,7 @@ extern taskq_t *taskq_of_curthread(void);
extern int taskq_cancel_id(taskq_t *, taskqid_t); extern int taskq_cancel_id(taskq_t *, taskqid_t);
extern void system_taskq_init(void); extern void system_taskq_init(void);
extern void system_taskq_fini(void); extern void system_taskq_fini(void);
extern boolean_t taskq_empty(taskq_t *);
#define XVA_MAPSIZE 3 #define XVA_MAPSIZE 3
#define XVA_MAGIC 0x78766174 #define XVA_MAGIC 0x78766174

6
lib/libzpool/taskq.c
View File

@ -363,6 +363,12 @@ taskq_cancel_id(taskq_t *tq, taskqid_t id)
return (ENOENT); return (ENOENT);
} }
boolean_t
taskq_empty(taskq_t *tq)
{
return (tq->tq_task.tqent_next == &tq->tq_task || tq->tq_active == 0);
}
void void
system_taskq_init(void) system_taskq_init(void)
{ {

13
module/icp/core/kcf_sched.c
View File

@ -573,15 +573,6 @@ kcf_resubmit_request(kcf_areq_node_t *areq)
return (error); return (error);
} }
static inline int EMPTY_TASKQ(taskq_t *tq)
{
#ifdef _KERNEL
return (tq->tq_lowest_id == tq->tq_next_id);
#else
return (tq->tq_task.tqent_next == &tq->tq_task || tq->tq_active == 0);
#endif
}
/* /*
* Routine called by both ioctl and k-api. The consumer should * Routine called by both ioctl and k-api. The consumer should
* bundle the parameters into a kcf_req_params_t structure. A bunch * bundle the parameters into a kcf_req_params_t structure. A bunch
@ -622,7 +613,7 @@ kcf_submit_request(kcf_provider_desc_t *pd, crypto_ctx_t *ctx,
* request allocation and call the SPI directly. * request allocation and call the SPI directly.
*/ */
if ((pd->pd_flags & CRYPTO_SYNCHRONOUS) && if ((pd->pd_flags & CRYPTO_SYNCHRONOUS) &&
EMPTY_TASKQ(taskq)) { taskq_empty(taskq)) {
KCF_PROV_IREFHOLD(pd); KCF_PROV_IREFHOLD(pd);
if (pd->pd_state == KCF_PROV_READY) { if (pd->pd_state == KCF_PROV_READY) {
error = common_submit_request(pd, ctx, error = common_submit_request(pd, ctx,
@ -657,7 +648,7 @@ kcf_submit_request(kcf_provider_desc_t *pd, crypto_ctx_t *ctx,
* case. This is unlike the asynchronous case where we * case. This is unlike the asynchronous case where we
* must always dispatch to the taskq. * must always dispatch to the taskq.
*/ */
if (EMPTY_TASKQ(taskq) && if (taskq_empty(taskq) &&
pd->pd_state == KCF_PROV_READY) { pd->pd_state == KCF_PROV_READY) {
process_req_hwp(sreq); process_req_hwp(sreq);
} else { } else {

7
module/os/linux/spl/spl-taskq.c
View File

@ -1229,6 +1229,13 @@ taskq_destroy(taskq_t *tq)
} }
EXPORT_SYMBOL(taskq_destroy); EXPORT_SYMBOL(taskq_destroy);
boolean_t
taskq_empty(taskq_t *tq)
{
return (tq->tq_lowest_id == tq->tq_next_id);
}
EXPORT_SYMBOL(taskq_empty);
static unsigned int spl_taskq_kick = 0; static unsigned int spl_taskq_kick = 0;
/* /*