ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

module/accel/idxd: change name of global lock and expand scope

Browse Source 
Previous lock protected against a channel counter, renamed as it
now protects multiple values associated with configuration and
reconfiguration.

Signed-off-by: paul luse <paul.e.luse@intel.com>
Change-Id: Icfe48aa7df192a7bdf568de418d49c7984d20acf
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3175
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
paul luse 2020-07-02 10:45:28 -04:00 committed by Tomasz Zawadzki
parent ed4b7d12ec
commit cf83cac493
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
module/accel/idxd/accel_engine_idxd.c
View File

@ -110,7 +110,7 @@ struct idxd_task {
spdk_accel_completion_cb cb; spdk_accel_completion_cb cb;
}; };
pthread_mutex_t g_num_channels_lock = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t g_configuration_lock = PTHREAD_MUTEX_INITIALIZER;
static struct spdk_io_channel *idxd_get_io_channel(void); static struct spdk_io_channel *idxd_get_io_channel(void);
@ -458,9 +458,9 @@ _config_max_desc(struct spdk_io_channel_iter *i)
ch = spdk_io_channel_iter_get_channel(i); ch = spdk_io_channel_iter_get_channel(i);
chan = spdk_io_channel_get_ctx(ch); chan = spdk_io_channel_get_ctx(ch);
pthread_mutex_lock(&g_num_channels_lock); pthread_mutex_lock(&g_configuration_lock);
rc = spdk_idxd_reconfigure_chan(chan->chan, chan->dev->num_channels); rc = spdk_idxd_reconfigure_chan(chan->chan, chan->dev->num_channels);
pthread_mutex_unlock(&g_num_channels_lock); pthread_mutex_unlock(&g_configuration_lock);
if (rc == 0) { if (rc == 0) {
chan->state = IDXD_CHANNEL_ACTIVE; chan->state = IDXD_CHANNEL_ACTIVE;
} else { } else {
@ -521,18 +521,19 @@ idxd_create_cb(void *io_device, void *ctx_buf)
* channels. This enables dynamic load balancing for HW * channels. This enables dynamic load balancing for HW
* flow control. * flow control.
*/ */
pthread_mutex_lock(&g_configuration_lock);
rc = spdk_idxd_configure_chan(chan->chan); rc = spdk_idxd_configure_chan(chan->chan);
if (rc) { if (rc) {
SPDK_ERRLOG("Failed to configure new channel rc = %d\n", rc); SPDK_ERRLOG("Failed to configure new channel rc = %d\n", rc);
chan->state = IDXD_CHANNEL_ERROR; chan->state = IDXD_CHANNEL_ERROR;
spdk_poller_unregister(&chan->poller); spdk_poller_unregister(&chan->poller);
pthread_mutex_unlock(&g_configuration_lock);
return rc; return rc;
} }
chan->state = IDXD_CHANNEL_PAUSED; chan->state = IDXD_CHANNEL_PAUSED;
pthread_mutex_lock(&g_num_channels_lock);
chan->dev->num_channels++; chan->dev->num_channels++;
pthread_mutex_unlock(&g_num_channels_lock); pthread_mutex_unlock(&g_configuration_lock);
/* /*
* Pause all channels so that we can set proper flow control * Pause all channels so that we can set proper flow control
@ -558,12 +559,12 @@ idxd_destroy_cb(void *io_device, void *ctx_buf)
{ {
struct idxd_io_channel *chan = ctx_buf; struct idxd_io_channel *chan = ctx_buf;
pthread_mutex_lock(&g_num_channels_lock); pthread_mutex_lock(&g_configuration_lock);
assert(chan->dev->num_channels > 0); assert(chan->dev->num_channels > 0);
chan->dev->num_channels--; chan->dev->num_channels--;
pthread_mutex_unlock(&g_num_channels_lock);
spdk_idxd_reconfigure_chan(chan->chan, 0); spdk_idxd_reconfigure_chan(chan->chan, 0);
pthread_mutex_unlock(&g_configuration_lock);
spdk_poller_unregister(&chan->poller); spdk_poller_unregister(&chan->poller);
spdk_idxd_put_channel(chan->chan); spdk_idxd_put_channel(chan->chan);