OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scsi: cxlflash: Remove adapter file descriptor cache 

The adapter file descriptor was previously cached within the kernel for
a given context in order to support performing a close on behalf of an
application. This is no longer needed as applications are now required
to perform a close on the adapter file descriptor.

Inspired-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Acked-by: Manoj N. Kumar <manoj@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Matthew R. Ochs 2016-08-09 18:40:02 -05:00 committed by Martin K. Petersen
parent cd34af40a0
commit de9f0b0cbb
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/scsi/cxlflash/superpipe.c
View File

@ -788,20 +788,18 @@ err:
* @cfg: Internal structure associated with the host. * @cfg: Internal structure associated with the host.
* @ctx: Previously obtained CXL context reference. * @ctx: Previously obtained CXL context reference.
* @ctxid: Previously obtained process element associated with CXL context. * @ctxid: Previously obtained process element associated with CXL context.
* @adap_fd: Previously obtained adapter fd associated with CXL context.
* @file: Previously obtained file associated with CXL context. * @file: Previously obtained file associated with CXL context.
* @perms: User-specified permissions. * @perms: User-specified permissions.
*/ */
static void init_context(struct ctx_info *ctxi, struct cxlflash_cfg *cfg, static void init_context(struct ctx_info *ctxi, struct cxlflash_cfg *cfg,
struct cxl_context *ctx, int ctxid, int adap_fd, struct cxl_context *ctx, int ctxid, struct file *file,
struct file *file, u32 perms) u32 perms)
{ {
struct afu *afu = cfg->afu; struct afu *afu = cfg->afu;
ctxi->rht_perms = perms; ctxi->rht_perms = perms;
ctxi->ctrl_map = &afu->afu_map->ctrls[ctxid].ctrl; ctxi->ctrl_map = &afu->afu_map->ctrls[ctxid].ctrl;
ctxi->ctxid = ENCODE_CTXID(ctxi, ctxid); ctxi->ctxid = ENCODE_CTXID(ctxi, ctxid);
ctxi->lfd = adap_fd;
ctxi->pid = current->tgid; /* tgid = pid */ ctxi->pid = current->tgid; /* tgid = pid */
ctxi->ctx = ctx; ctxi->ctx = ctx;
ctxi->cfg = cfg; ctxi->cfg = cfg;
@ -1086,8 +1084,7 @@ static int cxlflash_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
goto err; goto err;
} }
dev_dbg(dev, "%s: fault(%d) for context %d\n", dev_dbg(dev, "%s: fault for context %d\n", __func__, ctxid);
__func__, ctxi->lfd, ctxid);
if (likely(!ctxi->err_recovery_active)) { if (likely(!ctxi->err_recovery_active)) {
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
@ -1162,8 +1159,7 @@ static int cxlflash_cxl_mmap(struct file *file, struct vm_area_struct *vma)
goto out; goto out;
} }
dev_dbg(dev, "%s: mmap(%d) for context %d\n", dev_dbg(dev, "%s: mmap for context %d\n", __func__, ctxid);
__func__, ctxi->lfd, ctxid);
rc = cxl_fd_mmap(file, vma); rc = cxl_fd_mmap(file, vma);
if (likely(!rc)) { if (likely(!rc)) {
@ -1406,7 +1402,7 @@ static int cxlflash_disk_attach(struct scsi_device *sdev,
perms = SISL_RHT_PERM(attach->hdr.flags + 1); perms = SISL_RHT_PERM(attach->hdr.flags + 1);
/* Context mutex is locked upon return */ /* Context mutex is locked upon return */
init_context(ctxi, cfg, ctx, ctxid, fd, file, perms); init_context(ctxi, cfg, ctx, ctxid, file, perms);
rc = afu_attach(cfg, ctxi); rc = afu_attach(cfg, ctxi);
if (unlikely(rc)) { if (unlikely(rc)) {
@ -1488,12 +1484,15 @@ err:
* recover_context() - recovers a context in error * recover_context() - recovers a context in error
* @cfg: Internal structure associated with the host. * @cfg: Internal structure associated with the host.
* @ctxi: Context to release. * @ctxi: Context to release.
* @adap_fd: Adapter file descriptor associated with new/recovered context.
* *
* Restablishes the state for a context-in-error. * Restablishes the state for a context-in-error.
* *
* Return: 0 on success, -errno on failure * Return: 0 on success, -errno on failure
*/ */
static int recover_context(struct cxlflash_cfg *cfg, struct ctx_info *ctxi) static int recover_context(struct cxlflash_cfg *cfg,
struct ctx_info *ctxi,
int *adap_fd)
{ {
struct device *dev = &cfg->dev->dev; struct device *dev = &cfg->dev->dev;
int rc = 0; int rc = 0;
@ -1546,7 +1545,6 @@ static int recover_context(struct cxlflash_cfg *cfg, struct ctx_info *ctxi)
* visible to user space and can't be undone safely on this thread. * visible to user space and can't be undone safely on this thread.
*/ */
ctxi->ctxid = ENCODE_CTXID(ctxi, ctxid); ctxi->ctxid = ENCODE_CTXID(ctxi, ctxid);
ctxi->lfd = fd;
ctxi->ctx = ctx; ctxi->ctx = ctx;
ctxi->file = file; ctxi->file = file;
@ -1563,6 +1561,7 @@ static int recover_context(struct cxlflash_cfg *cfg, struct ctx_info *ctxi)
cfg->ctx_tbl[ctxid] = ctxi; cfg->ctx_tbl[ctxid] = ctxi;
mutex_unlock(&cfg->ctx_tbl_list_mutex); mutex_unlock(&cfg->ctx_tbl_list_mutex);
fd_install(fd, file); fd_install(fd, file);
*adap_fd = fd;
out: out:
dev_dbg(dev, "%s: returning ctxid=%d fd=%d rc=%d\n", dev_dbg(dev, "%s: returning ctxid=%d fd=%d rc=%d\n",
__func__, ctxid, fd, rc); __func__, ctxid, fd, rc);
@ -1621,6 +1620,7 @@ static int cxlflash_afu_recover(struct scsi_device *sdev,
rctxid = recover->context_id; rctxid = recover->context_id;
long reg; long reg;
int lretry = 20; /* up to 2 seconds */ int lretry = 20; /* up to 2 seconds */
int new_adap_fd = -1;
int rc = 0; int rc = 0;
atomic_inc(&cfg->recovery_threads); atomic_inc(&cfg->recovery_threads);
@ -1650,7 +1650,7 @@ retry:
if (ctxi->err_recovery_active) { if (ctxi->err_recovery_active) {
retry_recover: retry_recover:
rc = recover_context(cfg, ctxi); rc = recover_context(cfg, ctxi, &new_adap_fd);
if (unlikely(rc)) { if (unlikely(rc)) {
dev_err(dev, "%s: Recovery failed for context %llu (rc=%d)\n", dev_err(dev, "%s: Recovery failed for context %llu (rc=%d)\n",
__func__, ctxid, rc); __func__, ctxid, rc);
@ -1672,7 +1672,7 @@ retry_recover:
ctxi->err_recovery_active = false; ctxi->err_recovery_active = false;
recover->context_id = ctxi->ctxid; recover->context_id = ctxi->ctxid;
recover->adap_fd = ctxi->lfd; recover->adap_fd = new_adap_fd;
recover->mmio_size = sizeof(afu->afu_map->hosts[0].harea); recover->mmio_size = sizeof(afu->afu_map->hosts[0].harea);
recover->hdr.return_flags = DK_CXLFLASH_APP_CLOSE_ADAP_FD | recover->hdr.return_flags = DK_CXLFLASH_APP_CLOSE_ADAP_FD |
DK_CXLFLASH_RECOVER_AFU_CONTEXT_RESET; DK_CXLFLASH_RECOVER_AFU_CONTEXT_RESET;

1
drivers/scsi/cxlflash/superpipe.h
View File

@ -100,7 +100,6 @@ struct ctx_info {
struct cxl_ioctl_start_work work; struct cxl_ioctl_start_work work;
u64 ctxid; u64 ctxid;
int lfd;
pid_t pid; pid_t pid;
bool initialized; bool initialized;
bool unavail; bool unavail;