From patchwork Thu Aug 17 12:56:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 9906257 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 648456038C for ; Thu, 17 Aug 2017 12:58:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4629C28A62 for ; Thu, 17 Aug 2017 12:58:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3978C28A94; Thu, 17 Aug 2017 12:58:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0DF128A62 for ; Thu, 17 Aug 2017 12:58:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752614AbdHQM5n (ORCPT ); Thu, 17 Aug 2017 08:57:43 -0400 Received: from 8bytes.org ([81.169.241.247]:43402 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988AbdHQM46 (ORCPT ); Thu, 17 Aug 2017 08:56:58 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 8640B256; Thu, 17 Aug 2017 14:56:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1502974615; bh=CCLOlBBCZxCj4TVDnoiCiPKtWEYBCNXQIerIQ9D33V8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hi/JZSkVgNdBLaWCz9Vtzrv8kYPOZglukkCBKgoz49/z/9TGwmPuvWm7yUsfBDbgO qivg1ZzCFExBlv181dEOtDpDSin2rhO2A5oiZxyyFeVlqxot/W6LCT5LmRZ4y+tnjb QxD42AzZXRdA9V5AhI3N0LdrGYPtL6Emb1AtkJeOu1dt9V7iF/dlf2Hc60qCP2YNpc i64Lk8BZnm3STwQo5PI4tj+B0WmWJ1YjXPIq4xtEkTaexmFIduCK4dmaPuFfzRElDO S1gWiH22YbE9zIKa6CVM5JiWDSWJCTI8gcSBF90s1AJqhpXWP+rRI9U5lZZsv2IAfv MH+sk9UovJb/g== From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, Suravee Suthikulpanit , Joerg Roedel , Christian Benvenuti , Dave Goodell , Doug Ledford , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org Subject: [PATCH 12/13] IB/usnic: Use sychronized interface of the IOMMU-API Date: Thu, 17 Aug 2017 14:56:35 +0200 Message-Id: <1502974596-23835-13-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502974596-23835-1-git-send-email-joro@8bytes.org> References: <1502974596-23835-1-git-send-email-joro@8bytes.org> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Joerg Roedel The map and unmap functions of the IOMMU-API changed their semantics: They do no longer guarantee that the hardware TLBs are synchronized with the page-table updates they made. To make conversion easier, new synchronized functions have been introduced which give these guarantees again until the code is converted to use the new TLB-flush interface of the IOMMU-API, which allows certain optimizations. But for now, just convert this code to use the synchronized functions so that it will behave as before. Cc: Christian Benvenuti Cc: Dave Goodell Cc: Doug Ledford Cc: Sean Hefty Cc: Hal Rosenstock Cc: linux-rdma@vger.kernel.org Signed-off-by: Joerg Roedel --- drivers/infiniband/hw/usnic/usnic_uiom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index c49db7c..e53dc38 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -205,7 +205,7 @@ static void usnic_uiom_unmap_sorted_intervals(struct list_head *intervals, while (size > 0) { /* Workaround for RH 970401 */ usnic_dbg("va 0x%lx size 0x%lx", va, PAGE_SIZE); - iommu_unmap(pd->domain, va, PAGE_SIZE); + iommu_unmap_sync(pd->domain, va, PAGE_SIZE); va += PAGE_SIZE; size -= PAGE_SIZE; } @@ -282,8 +282,8 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, size = pa_end - pa_start + PAGE_SIZE; usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x", va_start, &pa_start, size, flags); - err = iommu_map(pd->domain, va_start, pa_start, - size, flags); + err = iommu_map_sync(pd->domain, va_start, + pa_start, size, flags); if (err) { usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n", va_start, &pa_start, size, err); @@ -299,8 +299,8 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, size = pa - pa_start + PAGE_SIZE; usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n", va_start, &pa_start, size, flags); - err = iommu_map(pd->domain, va_start, pa_start, - size, flags); + err = iommu_map_sync(pd->domain, va_start, + pa_start, size, flags); if (err) { usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n", va_start, &pa_start, size, err);