From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.4 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D09BCC3A5A1 for ; Wed, 28 Aug 2019 14:25:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9EB4522CED for ; Wed, 28 Aug 2019 14:25:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SZoiTlBs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9EB4522CED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2ytY-0003e8-KP for qemu-devel@archiver.kernel.org; Wed, 28 Aug 2019 10:25:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54594) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2yrl-0002CH-RR for qemu-devel@nongnu.org; Wed, 28 Aug 2019 10:24:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2yrk-0000Wq-RH for qemu-devel@nongnu.org; Wed, 28 Aug 2019 10:24:05 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:37383) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2yrk-0000WN-M3 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 10:24:04 -0400 Received: by mail-pl1-x643.google.com with SMTP id bj8so66669plb.4 for ; Wed, 28 Aug 2019 07:24:04 -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 :mime-version:content-transfer-encoding; bh=YfW1aH+Wpw10vSj+L0zxMi7E9GI7IXk5GtJx8ieye+k=; b=SZoiTlBsARlRkWmePEB0YRUZKHm8vQQDlmJH5gHYiu/sdu+hv6jlgDj1r8+DNQoi/c 4M1tl4yh/xQzT5Sz/flSgtUX0wHF+ybmR3UkQ+lVINVGr/xSyG1EfuBuajblNNaWnxfK qnCukfXupBGasrzzGg16pa49yWEB7wQrutNrtgeR86J5BwfNRXBnb0vVcBpe5ouH69zj 9eih51sjy+z80+9J0jMbjEwEUoUbDZ/cd9lQenymiY+7jdudm4sGHQ7pfBUS5dQYetRb 0txZNfSvFLtGwaSahPd+ThILckkDodegm6NnoSkQ8Xy6QtcdQagwr0khGB7Z6ebnJwlF afvA== 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:mime-version:content-transfer-encoding; bh=YfW1aH+Wpw10vSj+L0zxMi7E9GI7IXk5GtJx8ieye+k=; b=VPrOxIUjQljh8XSMjwqs8zZAppXoP0IN3jfdF2+O0v76bZVXrJFtt7zRsFIOXAV/3R +gAzXqC35eSUIH+Ap1mDsQrPrV1urrBq63JzHygrDgRi/RpbQSwQzLqs14ew3Y/2x0aI ikrpoCQ8U7kVpZfCcuxP8OHqVEwCbUodXZYuJFdo8lzqsCbb84h6TJ8hF6XIldpZT01S DHgxjKKbhQIERDC/qmQBs1RVgBqsb1lcT6b8KyFrMCvPGNs8yDeWJz5H6l2gEP8SX/TW vwdCCJmEI4Xc31QxdrLVGEWvlS9t4W0f4dQMHwlvsY74g+pWM+sc9hbxkEexN297Osw2 En+w== X-Gm-Message-State: APjAAAVg4Cj4UiebYtMLVIlwGfavN6O+/Z3sQdIrMKO0kgnEBFlfIZuc Gd3neSXQ2hbG3JqL2AkVDeXaug0C X-Google-Smtp-Source: APXvYqy4OM4urpTGoQsfnlcBTVXhIO7v1ed9lwhWvJlBxFRMq0FJOx2RQAQQCN7yUSlpSxyZemLBeA== X-Received: by 2002:a17:902:1e8:: with SMTP id b95mr4658930plb.28.1567002243174; Wed, 28 Aug 2019 07:24:03 -0700 (PDT) Received: from beta.it.iitb.ac.in ([2405:204:2200:9180:9ba0:a3d7:637f:11ad]) by smtp.gmail.com with ESMTPSA id g1sm3180742pgg.27.2019.08.28.07.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 07:24:02 -0700 (PDT) From: Sukrit Bhatnagar To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 19:53:27 +0530 Message-Id: <20190828142328.24561-2-skrtbhtngr@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190828142328.24561-1-skrtbhtngr@gmail.com> References: <20190828142328.24561-1-skrtbhtngr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::643 Subject: [Qemu-devel] [PATCH v1 1/2] hw/pvrdma: make DSR mapping idempotent in load_dsr() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yuval Shaia Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Map to DSR only when there is no mapping done already i.e., when dev->dsr_info.dsr is NULL. This allows the rest of mappings and ring inits to be done by calling load_dsr() when DSR has already been mapped to, somewhere else. Move free_dsr() out of load_dsr() and call it before the latter as and when needed. This aids the case where load_dsr() is called having DSR mapping already done, but the rest of map and init operations are pending, and prevents an unmap of the DSR. Cc: Marcel Apfelbaum Cc: Yuval Shaia Signed-off-by: Sukrit Bhatnagar --- hw/rdma/vmw/pvrdma_main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index adcf79cd63..6c90db96f9 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -172,15 +172,15 @@ static int load_dsr(PVRDMADev *dev) DSRInfo *dsr_info; struct pvrdma_device_shared_region *dsr; - free_dsr(dev); - - /* Map to DSR */ - dev->dsr_info.dsr = rdma_pci_dma_map(pci_dev, dev->dsr_info.dma, - sizeof(struct pvrdma_device_shared_region)); if (!dev->dsr_info.dsr) { - rdma_error_report("Failed to map to DSR"); - rc = -ENOMEM; - goto out; + /* Map to DSR */ + dev->dsr_info.dsr = rdma_pci_dma_map(pci_dev, dev->dsr_info.dma, + sizeof(struct pvrdma_device_shared_region)); + if (!dev->dsr_info.dsr) { + rdma_error_report("Failed to map to DSR"); + rc = -ENOMEM; + goto out; + } } /* Shortcuts */ @@ -402,6 +402,7 @@ static void pvrdma_regs_write(void *opaque, hwaddr addr, uint64_t val, case PVRDMA_REG_DSRHIGH: trace_pvrdma_regs_write(addr, val, "DSRHIGH", ""); dev->dsr_info.dma |= val << 32; + free_dsr(dev); load_dsr(dev); init_dsr_dev_caps(dev); break; -- 2.21.0