From patchwork Sun Aug 19 20:23:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959681 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bYyjn/zb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDLd687Zz9s9J for ; Mon, 20 Aug 2018 22:55:37 +1000 (AEST) Received: from localhost ([::1]:46929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjiZ-0007r6-Ex for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:55:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYr-0000Cr-3v for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYp-0000kM-JC for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:51781) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYp-0000iv-Az for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:31 -0400 Received: by mail-wm0-x234.google.com with SMTP id y2-v6so14166364wma.1 for ; Mon, 20 Aug 2018 05:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RTv4NJW/VMzJ1knL+RQ90MEku8WW0+FhVI9ff4a6eeY=; b=bYyjn/zbP73Dwd8Tuh28UQLFAYsfGeh+RVzDCyZ+x74q++/42KZoy9b0143PQ/I4HT yHYkL2PAHzrnww6EAcN4M/c9cYa4LrsVshkDH0YFWWlj9NfLCxS/ry2k1lM2WuVo64CD DSnM7FwQlbN9egGxh0qoX0HYKGTA35O6FVOEeTw5apYfp5tPJuU/6klGiwwwiqU3zWHd Z8CQ3ux6ItKe5vJ0+AFN08WdQIqucHa3nfXaH/k+x1zQvcuUwV8kDUqzbqUFSRC607CI 8v5PKFzV3CuGT3Al6mN26G3ic9ByAW8DM0CED1BfAQf9Cp3B2qefFEme5C7LeIiurgS4 VMjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RTv4NJW/VMzJ1knL+RQ90MEku8WW0+FhVI9ff4a6eeY=; b=kXI9H9kJnVh3o7pSo4X3goVY54ZFYNMt857TIdEff6LL+1NzuEWg8A4QB5CanP44+i IFXFA1m1/tuWckVme4y+AWFuq2CXGERbw83tu55QeOOpxdlU4X3GS9AHXBqRd8WIyFIA ikvV2gCFITasFX92xZKBj7CAa+hhwLk7X89FcuzuT674BbUR2ZInrO7P/fN8nqsEncgv x0kx5bEYAB4OHSy5ZlcIFona5R/pDbiSeA6FbpSeYb0RYEQYiccVZuZnmZWFPAayazvs /QdrQpmMSNf1J3iyYkXrevu3+9tcZXTJCHNO66/24fvZLL4zlN7IEUetZP9rCSKd0MmS eUrg== X-Gm-Message-State: AOUpUlEU1Fg3lEDtcRJQCXwoIGUM/sFeRwP76pan7SZn9NW3KfLPZ6cq p9AD82QsBKv61f7GTKa5ezfsVSsk X-Google-Smtp-Source: AA+uWPxSK0/SvF4oAhdZhytiJlutFWd5lVC5EQjnFrBS/Hvctcpq0t0toTCT8jSr8INa9yJKcOOisw== X-Received: by 2002:a1c:8dd1:: with SMTP id p200-v6mr23720540wmd.145.1534769128353; Mon, 20 Aug 2018 05:45:28 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:27 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:23:00 +0300 Message-Id: <20180819202300.10590-16-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::234 Subject: [Qemu-devel] [PATCH PULL 15/15] config: split PVRDMA from RDMA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In some BSD systems RDMA migration is possible while the pvrdma device can't be used because the mremap system call is missing. Reported-by: Rebecca Cran Signed-off-by: Marcel Apfelbaum Message-Id: <20180816151637.24553-1-marcel.apfelbaum@gmail.com> Reviewed-by: Thomas Huth --- configure | 55 ++++++++++++++++++++++++++++++++++++++++++- hw/rdma/Makefile.objs | 2 +- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/configure b/configure index db97930314..7d9a63636c 100755 --- a/configure +++ b/configure @@ -375,6 +375,7 @@ hax="no" hvf="no" whpx="no" rdma="" +pvrdma="" gprof="no" debug_tcg="no" debug="no" @@ -1363,6 +1364,10 @@ for opt do ;; --disable-rdma) rdma="no" ;; + --enable-pvrdma) pvrdma="yes" + ;; + --disable-pvrdma) pvrdma="no" + ;; --with-gtkabi=*) gtkabi="$optarg" ;; --disable-vte) vte="no" @@ -1669,7 +1674,8 @@ disabled with --disable-FEATURE, default is enabled if available: hax HAX acceleration support hvf Hypervisor.framework acceleration support whpx Windows Hypervisor Platform acceleration support - rdma Enable RDMA-based migration and PVRDMA support + rdma Enable RDMA-based migration + pvrdma Enable PVRDMA support vde support for vde network netmap support for netmap network linux-aio Linux AIO support @@ -3064,6 +3070,48 @@ EOF fi fi +########################################## +# PVRDMA detection + +cat > $TMPC < + +int +main(void) +{ + char buf = 0; + void *addr = &buf; + addr = mremap(addr, 0, 1, MREMAP_MAYMOVE | MREMAP_FIXED); + + return 0; +} +EOF + +if test "$rdma" = "yes" ; then + case "$pvrdma" in + "") + if compile_prog "" ""; then + pvrdma="yes" + else + pvrdma="no" + fi + ;; + "yes") + if ! compile_prog "" ""; then + error_exit "PVRDMA is not supported since mremap is not implemented" + fi + pvrdma="yes" + ;; + "no") + pvrdma="no" + ;; + esac +else + if test "$pvrdma" = "yes" ; then + error_exit "PVRDMA requires rdma suppport" + fi + pvrdma="no" +fi ########################################## # VNC SASL detection @@ -5952,6 +6000,7 @@ if test "$tcg" = "yes" ; then fi echo "malloc trim support $malloc_trim" echo "RDMA support $rdma" +echo "PVRDMA support $pvrdma" echo "fdt support $fdt" echo "membarrier $membarrier" echo "preadv support $preadv" @@ -6708,6 +6757,10 @@ if test "$rdma" = "yes" ; then echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak fi +if test "$pvrdma" = "yes" ; then + echo "CONFIG_PVRDMA=y" >> $config_host_mak +fi + if test "$have_rtnetlink" = "yes" ; then echo "CONFIG_RTNETLINK=y" >> $config_host_mak fi diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs index 3504c39d21..bd36cbf51c 100644 --- a/hw/rdma/Makefile.objs +++ b/hw/rdma/Makefile.objs @@ -1,4 +1,4 @@ -ifeq ($(CONFIG_RDMA),y) +ifeq ($(CONFIG_PVRDMA),y) obj-$(CONFIG_PCI) += rdma_utils.o rdma_backend.o rdma_rm.o obj-$(CONFIG_PCI) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \ vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o