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=-14.2 required=3.0 tests=BAYES_00,DATE_IN_PAST_06_12, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 64488C47082 for ; Tue, 8 Jun 2021 01:55:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4677061289 for ; Tue, 8 Jun 2021 01:55:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231296AbhFHB5Q (ORCPT ); Mon, 7 Jun 2021 21:57:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230209AbhFHB5P (ORCPT ); Mon, 7 Jun 2021 21:57:15 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F1F6C061574 for ; Mon, 7 Jun 2021 18:55:24 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id y12so3442401pgk.6 for ; Mon, 07 Jun 2021 18:55:24 -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=gA93gcDJeBg/RhtboQ/3cmND2A1WryjuLSn85WsFu6g=; b=smr3+6OdXCX0hxcoS3KifFK/dV+LXqWV0dvi3Zm9J0DyNPNH7h2U08dl5QLHIjkWXM UKozM1JMhBxDdFhL1Ce2WCfg9Ig4REet6bVp8J9Bm/pglDJfb5H+m2hSp+fcPB4Ocjfi RTrsMc+gLmd5Pjb36a6ezbUGGDre5VVLY2jR2BRU89KOAUSUPoJUoKkScAJjA3tnwMyw WKTSumESx4sH8LDWKWCY1BXJPkDubzipufR8I3eHaomR3DfugGYS3kuhDsNOM+o/lCme mOPEPV89hmsgtakWyeP+Knl1ZS4/mrrMx3er/HSZWkteycTJrddPXtMmxDWyRKvR3RAT XqFg== 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=gA93gcDJeBg/RhtboQ/3cmND2A1WryjuLSn85WsFu6g=; b=ZaN3OVJM1KQBftgQUZ8Cv4AWt3MW6OGOnJUJm5Cl0Mcb2YI2cfuQZI89Or/7lmWat/ PO2laFagj5SWG6My2tKOBv6/7RW3PO1P5/XKOkvIy5Dmf49UujOcZhPkVpiFz3rzw3hg gHRiIeGJxD3HgO1yziJMC9xSs3znSB4HBWsTxR8CnkHAaXzYkpNR3guvd+f4+jTzLgym tHt/WMYH5uJfhMeH+y4jp3XAUWkgvbQmqk+PIRXPJnUlJQoRPICCkAelw5s/40aa8Jhu tGK6XBBONQNCBgySwOMauypRL3201/IGopgEq4JDrTLOnyfOxO8G7iubMFdH4JSjLIxE x3UA== X-Gm-Message-State: AOAM531GF/LUJK/5nJHfUOTLtRHR099/mM8Hy0M603ZHNY/I9JckdNSW vglMrUt9uGuVRopdsBIbV4U= X-Google-Smtp-Source: ABdhPJxEWq3ejES1pz5zIYlzqOcXjYDrBEEmksqiBOvaj5ucy7+uYMegKQfJMj4S4H4yXtBkArI+ew== X-Received: by 2002:a62:b604:0:b029:2d5:d7b8:b531 with SMTP id j4-20020a62b6040000b02902d5d7b8b531mr19567614pff.31.1623117323356; Mon, 07 Jun 2021 18:55:23 -0700 (PDT) Received: from sc2-haas01-esx0118.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id s24sm9284767pfh.104.2021.06.07.18.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 18:55:22 -0700 (PDT) From: Nadav Amit X-Google-Original-From: Nadav Amit To: Joerg Roedel Cc: Nadav Amit , Will Deacon , Jiajun Cao , Robin Murphy , Lu Baolu , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/6] iommu/amd: Do not use flush-queue when NpCache is on Date: Mon, 7 Jun 2021 11:25:37 -0700 Message-Id: <20210607182541.119756-3-namit@vmware.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210607182541.119756-1-namit@vmware.com> References: <20210607182541.119756-1-namit@vmware.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nadav Amit Do not use flush-queue on virtualized environments, where the NpCache capability of the IOMMU is set. This is required to reduce virtualization overheads. This change follows a similar change to Intel's VT-d and a detailed explanation as for the rationale is described in commit 29b32839725f ("iommu/vt-d: Do not use flush-queue when caching-mode is on"). Cc: Joerg Roedel Cc: Will Deacon Cc: Jiajun Cao Cc: Robin Murphy Cc: Lu Baolu Cc: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Nadav Amit --- drivers/iommu/amd/init.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index d006724f4dc2..ba3b76ed776d 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -1850,8 +1850,13 @@ static int __init iommu_init_pci(struct amd_iommu *iommu) if (ret) return ret; - if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE)) + if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE)) { + if (!amd_iommu_unmap_flush) + pr_warn_once("IOMMU batching is disabled due to virtualization"); + amd_iommu_np_cache = true; + amd_iommu_unmap_flush = true; + } init_iommu_perf_ctr(iommu); -- 2.25.1 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=-12.0 required=3.0 tests=BAYES_00,DATE_IN_PAST_06_12, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 4629BC47095 for ; Tue, 8 Jun 2021 01:55:32 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 09EF261168 for ; Tue, 8 Jun 2021 01:55:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09EF261168 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CBEB26089A; Tue, 8 Jun 2021 01:55:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AmVpFBFJHHSU; Tue, 8 Jun 2021 01:55:28 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTP id 6FFAD608A6; Tue, 8 Jun 2021 01:55:27 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 49FAFC000E; Tue, 8 Jun 2021 01:55:27 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id A71E6C0001 for ; Tue, 8 Jun 2021 01:55:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 87BFA83A8F for ; Tue, 8 Jun 2021 01:55:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ghQB8hn6ztzV for ; Tue, 8 Jun 2021 01:55:24 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by smtp1.osuosl.org (Postfix) with ESMTPS id 109CC83A8B for ; Tue, 8 Jun 2021 01:55:23 +0000 (UTC) Received: by mail-pf1-x42c.google.com with SMTP id s14so13607965pfd.9 for ; Mon, 07 Jun 2021 18:55:23 -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=gA93gcDJeBg/RhtboQ/3cmND2A1WryjuLSn85WsFu6g=; b=smr3+6OdXCX0hxcoS3KifFK/dV+LXqWV0dvi3Zm9J0DyNPNH7h2U08dl5QLHIjkWXM UKozM1JMhBxDdFhL1Ce2WCfg9Ig4REet6bVp8J9Bm/pglDJfb5H+m2hSp+fcPB4Ocjfi RTrsMc+gLmd5Pjb36a6ezbUGGDre5VVLY2jR2BRU89KOAUSUPoJUoKkScAJjA3tnwMyw WKTSumESx4sH8LDWKWCY1BXJPkDubzipufR8I3eHaomR3DfugGYS3kuhDsNOM+o/lCme mOPEPV89hmsgtakWyeP+Knl1ZS4/mrrMx3er/HSZWkteycTJrddPXtMmxDWyRKvR3RAT XqFg== 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=gA93gcDJeBg/RhtboQ/3cmND2A1WryjuLSn85WsFu6g=; b=owVZsjqnRw39oEUFpCqrJRxj6a6IJpTgbRNZwzQ2rZs+YvyY6ixcktiANNJdsqOPDu 3VDD0BnWqE1wdaKk2RMwbIJ6kZng9648XhNBvqBDD/bfPZ6ThGW7fMHV0Pm8np4oQG++ SnAzuZ3zdOCdbf+DDKnHIuh6rmxZRjBBb2uoK5JDPQFuy6LVIuzdCt/t/nUFxP+sq+Eb BLBgSekvqH3D27E+HzWcQwrvp73jcAS/rvPDfD5ZaiJABoCH9l2MA9QYPpG/u/DjcYFR iAoM/UHZV7tPGhROZHY2SwBT5k/BQZKXMTy+XSbccKNztYNF5ujl+IQ0ATxmsb1c2goH /tsw== X-Gm-Message-State: AOAM533K3RgoyWmu/RpQ9hIr4jM9X6F21HbHl/HnWmgQkYPOxwzchTF9 x4qeBNR5RJJUyQ1AKB6aWZw= X-Google-Smtp-Source: ABdhPJxEWq3ejES1pz5zIYlzqOcXjYDrBEEmksqiBOvaj5ucy7+uYMegKQfJMj4S4H4yXtBkArI+ew== X-Received: by 2002:a62:b604:0:b029:2d5:d7b8:b531 with SMTP id j4-20020a62b6040000b02902d5d7b8b531mr19567614pff.31.1623117323356; Mon, 07 Jun 2021 18:55:23 -0700 (PDT) Received: from sc2-haas01-esx0118.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id s24sm9284767pfh.104.2021.06.07.18.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 18:55:22 -0700 (PDT) From: Nadav Amit X-Google-Original-From: Nadav Amit To: Joerg Roedel Subject: [PATCH v3 2/6] iommu/amd: Do not use flush-queue when NpCache is on Date: Mon, 7 Jun 2021 11:25:37 -0700 Message-Id: <20210607182541.119756-3-namit@vmware.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210607182541.119756-1-namit@vmware.com> References: <20210607182541.119756-1-namit@vmware.com> MIME-Version: 1.0 Cc: Robin Murphy , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Nadav Amit , Jiajun Cao , Will Deacon X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" From: Nadav Amit Do not use flush-queue on virtualized environments, where the NpCache capability of the IOMMU is set. This is required to reduce virtualization overheads. This change follows a similar change to Intel's VT-d and a detailed explanation as for the rationale is described in commit 29b32839725f ("iommu/vt-d: Do not use flush-queue when caching-mode is on"). Cc: Joerg Roedel Cc: Will Deacon Cc: Jiajun Cao Cc: Robin Murphy Cc: Lu Baolu Cc: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Nadav Amit --- drivers/iommu/amd/init.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index d006724f4dc2..ba3b76ed776d 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -1850,8 +1850,13 @@ static int __init iommu_init_pci(struct amd_iommu *iommu) if (ret) return ret; - if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE)) + if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE)) { + if (!amd_iommu_unmap_flush) + pr_warn_once("IOMMU batching is disabled due to virtualization"); + amd_iommu_np_cache = true; + amd_iommu_unmap_flush = true; + } init_iommu_perf_ctr(iommu); -- 2.25.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu