[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH PULL 31/31] pvrdma: check return value from pvrdma_i
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH PULL 31/31] pvrdma: check return value from pvrdma_idx_ring_has_ routines |
Date: |
Sat, 22 Dec 2018 11:50:36 +0200 |
From: Prasad J Pandit <address@hidden>
pvrdma_idx_ring_has_[data/space] routines also return invalid
index PVRDMA_INVALID_IDX[=-1], if ring has no data/space. Check
return value from these routines to avoid plausible infinite loops.
Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Reviewed-by: Yuval Shaia <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/rdma/vmw/pvrdma_dev_ring.c | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/hw/rdma/vmw/pvrdma_dev_ring.c b/hw/rdma/vmw/pvrdma_dev_ring.c
index 01247fc041..e8e5b502f6 100644
--- a/hw/rdma/vmw/pvrdma_dev_ring.c
+++ b/hw/rdma/vmw/pvrdma_dev_ring.c
@@ -73,23 +73,16 @@ out:
void *pvrdma_ring_next_elem_read(PvrdmaRing *ring)
{
+ int e;
unsigned int idx = 0, offset;
- /*
- pr_dbg("%s: t=%d, h=%d\n", ring->name, ring->ring_state->prod_tail,
- ring->ring_state->cons_head);
- */
-
- if (!pvrdma_idx_ring_has_data(ring->ring_state, ring->max_elems, &idx)) {
+ e = pvrdma_idx_ring_has_data(ring->ring_state, ring->max_elems, &idx);
+ if (e <= 0) {
pr_dbg("No more data in ring\n");
return NULL;
}
offset = idx * ring->elem_sz;
- /*
- pr_dbg("idx=%d\n", idx);
- pr_dbg("offset=%d\n", offset);
- */
return ring->pages[offset / TARGET_PAGE_SIZE] + (offset %
TARGET_PAGE_SIZE);
}
@@ -105,20 +98,20 @@ void pvrdma_ring_read_inc(PvrdmaRing *ring)
void *pvrdma_ring_next_elem_write(PvrdmaRing *ring)
{
- unsigned int idx, offset, tail;
+ int idx;
+ unsigned int offset, tail;
- /*
- pr_dbg("%s: t=%d, h=%d\n", ring->name, ring->ring_state->prod_tail,
- ring->ring_state->cons_head);
- */
-
- if (!pvrdma_idx_ring_has_space(ring->ring_state, ring->max_elems, &tail)) {
+ idx = pvrdma_idx_ring_has_space(ring->ring_state, ring->max_elems, &tail);
+ if (idx <= 0) {
pr_dbg("CQ is full\n");
return NULL;
}
idx = pvrdma_idx(&ring->ring_state->prod_tail, ring->max_elems);
- /* TODO: tail == idx */
+ if (idx < 0 || tail != idx) {
+ pr_dbg("invalid idx\n");
+ return NULL;
+ }
offset = idx * ring->elem_sz;
return ring->pages[offset / TARGET_PAGE_SIZE] + (offset %
TARGET_PAGE_SIZE);
--
2.17.1
- [Qemu-devel] [PATCH PULL 15/31] hw/rdma: Initialize node_guid from vmxnet3 mac address, (continued)
- [Qemu-devel] [PATCH PULL 15/31] hw/rdma: Initialize node_guid from vmxnet3 mac address, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 16/31] hw/pvrdma: Make device state depend on Ethernet function state, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 17/31] hw/pvrdma: Fill all CQE fields, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 18/31] hw/pvrdma: Fill error code in command's response, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 19/31] hw/rdma: Remove unneeded code that handles more that one port, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 21/31] hw/pvrdma: Clean device's resource when system is shutdown, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 20/31] vl: Introduce shutdown_notifiers, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 22/31] hw/rdma: Do not use bitmap_zero_extend to free bitmap, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 27/31] pvrdma: add uar_read routine, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 26/31] rdma: check num_sge does not exceed MAX_SGE, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 31/31] pvrdma: check return value from pvrdma_idx_ring_has_ routines,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH PULL 23/31] hw/rdma: Do not call rdma_backend_del_gid on an empty gid, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 25/31] pvrdma: release device resources in case of an error, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 29/31] pvrdma: release ring object in case of an error, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 30/31] rdma: remove unused VENDOR_ERR_NO_SGE macro, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 28/31] pvrdma: check number of pages when creating rings, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 24/31] docs: Update pvrdma device documentation, Marcel Apfelbaum, 2018/12/22
- Re: [Qemu-devel] [PATCH PULL 00/31] RDMA queue, Peter Maydell, 2018/12/22