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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 7E016C33CB3 for ; Thu, 16 Jan 2020 18:15:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5279C2072B for ; Thu, 16 Jan 2020 18:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579198554; bh=2R4B2/vf3mjrXyH9tuvIXZbFvpPaJG90eTaq68jtLPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oi+EedzH66iExEbms3xCZlmJWElB34NbAVEODu8F/AXpYX5PgPFHNBTZ8pKsWxrT9 GXURk9FQZigFypomcwvMfa2MchNCYlMCo9L1UYPTLxpSuBmMWaXhOUnsa/JoGA9HKa VCrcdS39dX1R7Ny5cyvR8AoklAXggjINULq69TDs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392776AbgAPR3h (ORCPT ); Thu, 16 Jan 2020 12:29:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:41522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392773AbgAPR3h (ORCPT ); Thu, 16 Jan 2020 12:29:37 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 684FC24710; Thu, 16 Jan 2020 17:29:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195777; bh=2R4B2/vf3mjrXyH9tuvIXZbFvpPaJG90eTaq68jtLPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hjksb+TUUuU8hl4i1P4K2hn4oSz/PK4vrnojL0P34mZtpJ17Kdk19n1+Q/H3V3gGn N+KNv1eHMokJVFxCukVepG5yORNX0ivdXGExvI1NC3Q1OHcqYoRgbhZhTMF/nI9Acu UEDduoAU7ucMYAWnTGknhX9zr/8uYF/DJWRa3lB0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filippo Sironi , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 4.14 302/371] iommu/amd: Wait for completion of IOTLB flush in attach_device Date: Thu, 16 Jan 2020 12:22:54 -0500 Message-Id: <20200116172403.18149-245-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Filippo Sironi [ Upstream commit 0b15e02f0cc4fb34a9160de7ba6db3a4013dc1b7 ] To make sure the domain tlb flush completes before the function returns, explicitly wait for its completion. Signed-off-by: Filippo Sironi Fixes: 42a49f965a8d ("amd-iommu: flush domain tlb when attaching a new device") [joro: Added commit message and fixes tag] Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/amd_iommu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index d09c24825734..778f167be2d3 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2160,6 +2160,8 @@ static int attach_device(struct device *dev, */ domain_flush_tlb_pde(domain); + domain_flush_complete(domain); + return ret; } -- 2.20.1