From patchwork Mon Feb 19 11:15:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 203144 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1344957dyc; Mon, 19 Feb 2024 07:10:18 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU8frwS8JkCy4K6+0AZgFi1MEMJa9qPnQgm2FtvMYEhOoo3uKPNuccyefopeGyaOejSEINiwQ1sbE7v0LHnDHkJQgyZwQ== X-Google-Smtp-Source: AGHT+IF0svkK8ISQTW6E+6f1BiQVyzdvvMDv3zhtKLhG1t0WjcdTf8gX98CtNbO0BdMw2ab1lAFG X-Received: by 2002:a05:622a:1101:b0:42c:66ce:bbe1 with SMTP id e1-20020a05622a110100b0042c66cebbe1mr16330505qty.53.1708355413437; Mon, 19 Feb 2024 07:10:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708355413; cv=pass; d=google.com; s=arc-20160816; b=VarTwjiZxkxnZbSUB+1Xaq/KYbgpfFavYPNtAsvG288X2QbhU4HbhFRHDBrycibTJW 9r8cTWdLUhKpRkh/EzgHqazSCE+PVcwHPLyqSq7EiVr696CA87VD6V4w/Zzmm2Zin6RT xArd9dJ6maycoQK1ndtmnZ9cZ51y5S4BvX5R/WZvSh6LjXw2ZG6FnTuJw0aXp29Bpgrt JNd9AvSvalGFQmXXOcEutl4f71PKW7VT77gR5o2MFLOmtXg69656ZGRS7S1hrF9HFtEH v6dFaixp4ZXIdgqSjCYEJ4c+ZcZ98KQ2CY5Jp4YZuCUqW7mWR7z16tdpKAQ26aaOXjl3 qHzQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=NuIXXs9QkboYfRArjwEFl130Y7wclw2WuUSuaCvvTBM=; fh=xIXrYyuim0+qQ0OPX7PXG3ceqpJb0Om6wEk3bRGARVs=; b=sTG2qoFod1BSK1etaozOUytRPCkD61gSGA3dI41o7IhSGKHLZr3LMrD6VbwZEwQz8j m+kMyMm46Nc5SbwKdjRBX/L6aINgmeilK4xXS1XZhbZLywKqVYXWmDIOAv+dZQng/i3m Dvo9PnWicCVQTQNMxdFvOGHFFUSmN1n6RydgZgI2oMCGot0NKKc9nTVLk62xcH6rkzEF ECmZENkt9NAshPcBV0ABDUAuJSC0zzU1nhDg6btBrjPSXGn08fMRq/kU8vaNw5K+Bx3W j5lXziGVA2knvUCHOVrvhlsgKwEy5hNyX0Js/LO48eeGMM6W1eNNQmekm0l+Dg4QEwqY 6grw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GPl5sCRQ; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-71189-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71189-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id w4-20020a05622a134400b0042aaa53f36dsi6990136qtk.573.2024.02.19.07.10.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:10:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71189-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GPl5sCRQ; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-71189-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71189-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id CC85D1C22775 for ; Mon, 19 Feb 2024 11:22:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 155AD2E3EF; Mon, 19 Feb 2024 11:22:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="GPl5sCRQ" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4E962C192 for ; Mon, 19 Feb 2024 11:22:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708341724; cv=none; b=XmQ4QZRdz414eSJzrXRyRyWZkdMqUyxiCpUaD7/fqGjIvxyVvv3HzG+8BGdfUziEltKHYiOUcs8VQaF+m1Tjkwa62yo5dgMPgiG1KH2eips4SZLA2YhzuYqgWehbGwsax0SgLe+rDcyoRxMYiuU9344CMc8KpbNanu9VFVJilvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708341724; c=relaxed/simple; bh=MrZgKSOW1tjC5BJ1Aj4vy1HeG1IeCVgQtjxOHw/lyVA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Up0FeZIxzkAG6YBOmL17aFbCUJHClGBKnfMFJpnXD1FeIV+gRJfMXtj3E4MKPxihnSjsLnoY9GmmgaNCNdGBkcE6aolCRak+qlUL+4FocxnTB4FKBodDjdY+bOorDdgrfDkA3emCnwaAznQUJSCbPMWJ6kPOruV2PQVWDZXoqN8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=GPl5sCRQ; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708341722; x=1739877722; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MrZgKSOW1tjC5BJ1Aj4vy1HeG1IeCVgQtjxOHw/lyVA=; b=GPl5sCRQpuehZoDDCMa03BX4lisoJBZ8YFQm1h4UZQCfCKbTNMHO+8iF gnG09ZOT0prQTNC3WAYWOuEQrDVfcukkTZ/5sU7LrNnO3PE6F7SSjAld+ XOE4TmsL73mhwZ5YtwCkfVQLIThPlpYbFZT77ij93Qmivgtud1zu2aG2Z w07J0tjwC77Q0cezWXrgKAXOX3t0TXltFSzNORvKedRugwgll6vtWsVCI zOI+uPfkNmgmheN6Lb/YV0+V3KcCs36pa0ak8ZSqlMyoifExPrbuxd9Vp tBDih3+6yGlZJMBnyMhtM8rKOAr0cynigS4fgSp8/8Fsp6wvCBC1k2Q2e A==; X-IronPort-AV: E=McAfee;i="6600,9927,10988"; a="13823359" X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="13823359" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2024 03:22:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="4826822" Received: from allen-box.sh.intel.com ([10.239.159.127]) by orviesa006.jf.intel.com with ESMTP; 19 Feb 2024 03:22:00 -0800 From: Lu Baolu To: Joerg Roedel Cc: Yi Liu , Arnd Bergmann , Kevin Tian , Joao Martins , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] iommu/vt-d: Update iotlb in nested domain attach Date: Mon, 19 Feb 2024 19:15:55 +0800 Message-Id: <20240219111601.96405-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240219111601.96405-1-baolu.lu@linux.intel.com> References: <20240219111601.96405-1-baolu.lu@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791340485608871032 X-GMAIL-MSGID: 1791340485608871032 From: Yi Liu Should call domain_update_iotlb() to update the has_iotlb_device flag of the domain after attaching device to nested domain. Without it, this flag is not set properly and would result in missing device TLB flush. Fixes: 9838f2bb6b6b ("iommu/vt-d: Set the nested domain to a device") Signed-off-by: Yi Liu Reviewed-by: Kevin Tian Link: https://lore.kernel.org/r/20240208082307.15759-5-yi.l.liu@intel.com Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.h | 1 + drivers/iommu/intel/iommu.c | 4 +--- drivers/iommu/intel/nested.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 9b27edb73aa9..4145c04cb1c6 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -1066,6 +1066,7 @@ int qi_submit_sync(struct intel_iommu *iommu, struct qi_desc *desc, */ #define QI_OPT_WAIT_DRAIN BIT(0) +void domain_update_iotlb(struct dmar_domain *domain); int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu); void domain_detach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu); void device_block_translation(struct device *dev); diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index e3dbcae95975..711c3e3fe095 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -396,8 +396,6 @@ static int domain_update_device_node(struct dmar_domain *domain) return nid; } -static void domain_update_iotlb(struct dmar_domain *domain); - /* Return the super pagesize bitmap if supported. */ static unsigned long domain_super_pgsize_bitmap(struct dmar_domain *domain) { @@ -1218,7 +1216,7 @@ domain_lookup_dev_info(struct dmar_domain *domain, return NULL; } -static void domain_update_iotlb(struct dmar_domain *domain) +void domain_update_iotlb(struct dmar_domain *domain) { struct dev_pasid_info *dev_pasid; struct device_domain_info *info; diff --git a/drivers/iommu/intel/nested.c b/drivers/iommu/intel/nested.c index 6a75f6eb18f1..d5af5925a31c 100644 --- a/drivers/iommu/intel/nested.c +++ b/drivers/iommu/intel/nested.c @@ -65,6 +65,8 @@ static int intel_nested_attach_dev(struct iommu_domain *domain, list_add(&info->link, &dmar_domain->devices); spin_unlock_irqrestore(&dmar_domain->lock, flags); + domain_update_iotlb(dmar_domain); + return 0; }