Skip to content

nvme/core: add support to control ASQ/ACQ qsize #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minwooim merged 1 commit into from
Jan 22, 2026
Merged

nvme/core: add support to control ASQ/ACQ qsize #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/vfn/nvme/ctrl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ int nvme_configure_sq(struct nvme_ctrl *ctrl, int qid, int qsize,
*
* Create a submission queue instance for the given @qid. This does *not*
* allocate memory — it assumes the buffer is already allocated and mapped.
* The size of the queue will be decided by @mem->len / sizeof(sqe).
*
* The newly created SQ instance can be referred by ``ctrl->sq[qid]``.
*
Expand Down Expand Up @@ -294,6 +295,7 @@ int nvme_configure_cq(struct nvme_ctrl *ctrl, int qid, int qsize, int vector);
*
* Create a completion queue instance for the given @qid. This does *not*
* allocate memory — it assumes the buffer is already allocated and mapped.
* The size of the queue will be decided by @mem->len / sizeof(cqe).
*
* The newly created CQ instance can be referred by ``ctrl->cq[qid]``.
*
Expand Down
16 changes: 9 additions & 7 deletions src/nvme/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ void nvme_discard_sq(struct nvme_ctrl *ctrl, struct nvme_sq *sq)
memset(sq, 0x0, sizeof(*sq));
}

static int __nvme_configure_adminq(struct nvme_ctrl *ctrl)
static int __nvme_configure_adminq(struct nvme_ctrl *ctrl, int sq_size, int cq_size)
{
int aqa;

Expand All @@ -333,8 +333,8 @@ static int __nvme_configure_adminq(struct nvme_ctrl *ctrl)
ctrl->adminq.cq = cq;
ctrl->adminq.sq = sq;

aqa = NVME_AQ_QSIZE - 1;
aqa |= aqa << 16;
aqa = (sq_size - 1);
aqa |= (cq_size - 1) << 16;

mmio_write32(ctrl->regs + NVME_REG_AQA, cpu_to_le32(aqa));
mmio_hl_write64(ctrl->regs + NVME_REG_ASQ, cpu_to_le64(sq->mem.iova));
Expand All @@ -357,7 +357,7 @@ int nvme_configure_adminq(struct nvme_ctrl *ctrl, unsigned long sq_flags)
goto discard_cq;
}

__nvme_configure_adminq(ctrl);
__nvme_configure_adminq(ctrl, NVME_AQ_QSIZE, NVME_AQ_QSIZE);
return 0;

discard_cq:
Expand All @@ -370,18 +370,20 @@ int nvme_configure_adminq_mem(struct nvme_ctrl *ctrl, unsigned long sq_flags,
struct iommu_dmabuf *cq_mem, struct iommu_dmabuf *sq_mem)
{
struct nvme_cq *cq = &ctrl->cq[NVME_AQ];
int cq_size = (int)(cq_mem->len / sizeof(struct nvme_cqe));
int sq_size = (int)(sq_mem->len / sizeof(union nvme_cmd));

if (nvme_configure_cq_mem(ctrl, NVME_AQ, NVME_AQ_QSIZE, 0, cq_mem)) {
if (nvme_configure_cq_mem(ctrl, NVME_AQ, cq_size, 0, cq_mem)) {
log_debug("failed to configure admin completion queue\n");
return -1;
}

if (nvme_configure_sq_mem(ctrl, NVME_AQ, NVME_AQ_QSIZE, cq, sq_flags, sq_mem)) {
if (nvme_configure_sq_mem(ctrl, NVME_AQ, sq_size, cq, sq_flags, sq_mem)) {
log_debug("failed to configure admin submission queue\n");
goto discard_cq;
}

__nvme_configure_adminq(ctrl);
__nvme_configure_adminq(ctrl, sq_size, cq_size);
return 0;

discard_cq:
Expand Down
Loading