From 2ed612697e8fde14e9995cc1ac4dd5143ae8e0b7 Mon Sep 17 00:00:00 2001 From: Swapnil Ingle Date: Thu, 26 Aug 2021 14:43:11 +0200 Subject: Fix err path of handle_dma_unmap() (#597) * initial dma_unmap test Signed-off-by: John Levon Signed-off-by: Swapnil Ingle * Fix err path of handle_dma_unmap() Set msg->out_size before successful return. Otherwise in case of error reply path we may endup setting iovecs[1].iov_len with invalid iovecs[1].iov_base in tran_sock_reply() Signed-off-by: Swapnil Ingle Reviewed-by: John Levon --- test/py/libvfio_user.py | 9 ++++++ test/py/test_dma_unmap.py | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 test/py/test_dma_unmap.py (limited to 'test') diff --git a/test/py/libvfio_user.py b/test/py/libvfio_user.py index da7f1fb..c7e3765 100644 --- a/test/py/libvfio_user.py +++ b/test/py/libvfio_user.py @@ -337,6 +337,15 @@ class vfio_user_dma_map(Structure): ("size", c.c_uint64), ] +class vfio_user_dma_unmap(Structure): + _pack_ = 1 + _fields_ = [ + ("argsz", c.c_uint32), + ("flags", c.c_uint32), + ("addr", c.c_uint64), + ("size", c.c_uint64), + ] + class vfu_dma_info_t(Structure): _fields_ = [ ("iova", iovec_t), diff --git a/test/py/test_dma_unmap.py b/test/py/test_dma_unmap.py new file mode 100644 index 0000000..0200c43 --- /dev/null +++ b/test/py/test_dma_unmap.py @@ -0,0 +1,79 @@ +# +# Copyright (c) 2021 Nutanix Inc. All rights reserved. +# +# Authors: John Levon +# Swapnil Ingle +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of Nutanix nor the names of its contributors may be +# used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +# DAMAGE. +# + +import ctypes +import errno +from libvfio_user import * +import tempfile + +ctx = None +sock = None + +def test_dma_unmap_setup(): + global ctx, sock + + ctx = prepare_ctx_for_dma() + assert ctx != None + payload = struct.pack("II", 0, 0) + + sock = connect_client(ctx) + + payload = vfio_user_dma_map(argsz=len(vfio_user_dma_map()), + flags=(VFIO_USER_F_DMA_REGION_READ | + VFIO_USER_F_DMA_REGION_WRITE), + offset=0, addr=0x1000, size=4096) + + msg(ctx, sock, VFIO_USER_DMA_MAP, payload) + +def test_dma_unmap_short_write(): + + payload = struct.pack("II", 0, 0) + + msg(ctx, sock, VFIO_USER_DMA_UNMAP, payload, expect=errno.EINVAL) + +def test_dma_unmap_bad_argsz(): + + payload = vfio_user_dma_unmap(argsz=8, flags=0x2323, addr=0x1000, size=4096) + +def test_dma_unmap_invalid_flags(): + + payload = vfio_user_dma_unmap(argsz=len(vfio_user_dma_unmap()), + flags=0x2323, addr=0x1000, size=4096) + msg(ctx, sock, VFIO_USER_DMA_UNMAP, payload, expect=errno.ENOTSUP) + +def test_dma_unmap(): + + payload = vfio_user_dma_unmap(argsz=len(vfio_user_dma_unmap()), + flags=0, addr=0x1000, size=4096) + msg(ctx, sock, VFIO_USER_DMA_UNMAP, payload) + +def test_dma_unmap_cleanup(): + disconnect_client(ctx, sock) + vfu_destroy_ctx(ctx) -- cgit v1.1