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

scsi: remove LUN I/O channel ref counting

Browse Source 
spdk_bdev_get_io_channel() already handles this.

Change-Id: I6b28fe10b86b00762ff15324fcd0a32aae94e012
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/376267
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Daniel Verkamp 2017-08-29 16:42:37 -07:00 committed by Jim Harris
parent f9958316d8
commit d3828a23ec
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/scsi/lun.c
View File

@ -373,12 +373,8 @@ spdk_scsi_lun_delete(const char *lun_name)
int spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun *lun) int spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun *lun)
{ {
if (lun->io_channel != NULL) { if (lun->io_channel != NULL) {
if (pthread_self() == lun->thread_id) { assert(spdk_io_channel_get_thread(lun->io_channel) == spdk_get_thread());
lun->ref++; return 0;
return 0;
}
SPDK_ERRLOG("io_channel already allocated for lun %s\n", lun->name);
return -1;
} }
lun->lcore = spdk_env_get_current_core(); lun->lcore = spdk_env_get_current_core();
@ -387,19 +383,14 @@ int spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun *lun)
if (lun->io_channel == NULL) { if (lun->io_channel == NULL) {
return -1; return -1;
} }
lun->thread_id = pthread_self();
lun->ref = 1;
return 0; return 0;
} }
void spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun *lun) void spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun *lun)
{ {
if (lun->io_channel != NULL) { if (lun->io_channel != NULL) {
lun->ref--; spdk_put_io_channel(lun->io_channel);
if (lun->ref == 0) { lun->io_channel = NULL;
spdk_put_io_channel(lun->io_channel);
lun->io_channel = NULL;
}
} }
} }

8
lib/scsi/scsi_internal.h
View File

@ -87,14 +87,6 @@ struct spdk_scsi_lun {
/** I/O channel for the bdev associated with this LUN. */ /** I/O channel for the bdev associated with this LUN. */
struct spdk_io_channel *io_channel; struct spdk_io_channel *io_channel;
/** Thread ID for the thread that allocated the I/O channel for this
* LUN. All I/O to this LUN must be performed from this thread.
*/
pthread_t thread_id;
/** The reference number for this LUN, thus we can correctly free the io_channel */
uint32_t ref;
/** Name for this LUN. */ /** Name for this LUN. */
char name[SPDK_SCSI_LUN_MAX_NAME_LENGTH]; char name[SPDK_SCSI_LUN_MAX_NAME_LENGTH];

5
test/unit/lib/scsi/lun.c/lun_ut.c
View File

@ -39,6 +39,8 @@
#include "lun.c" #include "lun.c"
#include "lun_db.c" #include "lun_db.c"
#include "spdk_internal/mock.h"
/* Unit test bdev mockup */ /* Unit test bdev mockup */
struct spdk_bdev { struct spdk_bdev {
int x; int x;
@ -194,6 +196,9 @@ spdk_put_io_channel(struct spdk_io_channel *ch)
{ {
} }
DEFINE_STUB(spdk_io_channel_get_thread, struct spdk_thread *, (struct spdk_io_channel *ch), NULL)
DEFINE_STUB(spdk_get_thread, struct spdk_thread *, (void), NULL)
static _spdk_scsi_lun * static _spdk_scsi_lun *
lun_construct(void) lun_construct(void)
{ {