From patchwork Mon Jan 9 01:49:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 40606 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1931759wrt; Sun, 8 Jan 2023 18:00:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXsCWF6BHhxxX8wcDd3JNjcubAbRe85iYWcFo5PQ32D4H8FtbDBQnuWbmqvmpL1M1HigevQ7 X-Received: by 2002:a17:906:2349:b0:837:3ddb:7e97 with SMTP id m9-20020a170906234900b008373ddb7e97mr64532431eja.61.1673229602842; Sun, 08 Jan 2023 18:00:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673229602; cv=none; d=google.com; s=arc-20160816; b=OgzOSiQc5AgrBPOcwWHLuHrd0Ck+/9YcJd9NW62AHg5ShDNP4VxCGlOaBe2271ui+K EG7ypwRuZ2ha3Ys6cf+FByJeMHZZbzblXnVmb2jwE6upET5kiQhaYkttIKrgTYN74SKx Up9I+s7MqZ53dOzE8uvzPDWjYPEeCDnbNfc5oCZL8TioLT8gz3qxvFELI2gvs4vMdZBZ Olz7/irFqghkVwo6cVTt+zCcO7rqD8AbYh45uLlPFTukDbiNJ0u0IZ1nViYdBi2bAwr7 7PKfV6kYxtx2gyTrwEtwrKIarIZQVu6kwFlTS2h5s+nx7SvYVrl+VulJ34vVH1ZT1ZqK 6CwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rO4ijLlxNN5ybmutP/wHgCSOOyOTJ6/GF+JagFk/J5I=; b=NCN+Tzh4b6HlFWXjyyZ7XIJgspq0d4O3nCI7yx3AumGtSDa2LIBVdokYaql9TxRVOo 4BNdkdUH/hPh5CKWXfFyTjfNiKZV0AmeCwAw5tgOd190XoEyqQSknO/SK6JjmROKzQFR lXaQOUvmTq/lVCaJa+MWmUrl6lfHzIV1CWLB6zuuYmpesiYkjdh0JOzlxrIDE7RrFzFz BY9cJD2Fuq7oqhYwUMCbtHEbu7Kpt+DzUgk2EQlir8S/81KRIlV4ti5jMZkenM5k6KGs TJLmBBw/61nIjKWsZ7OlmSIua6AtKrUDV8nQ0ahAppkcND9R6/GvDQ3de1aVvyavYFDe NSKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EL4nQ8Jx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt33-20020a1709072da100b007c4f75345e1si9388605ejc.443.2023.01.08.17.59.40; Sun, 08 Jan 2023 18:00:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EL4nQ8Jx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233986AbjAIB6G (ORCPT + 99 others); Sun, 8 Jan 2023 20:58:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233656AbjAIB6C (ORCPT ); Sun, 8 Jan 2023 20:58:02 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED10D10077 for ; Sun, 8 Jan 2023 17:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673229481; x=1704765481; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=er1mwQFmjpqAn37x8zwY2h6Q9EPKtK229QoVf7N6fXA=; b=EL4nQ8JxOspExqj+/PceTagTlHWW5hFQmvQQd43W4+jbesEBEF+tEO9G LD0dDKs1PtM7A/5IaYJ2e3DPQ1Lyd9/Q6Ql5w81BNM8+1Qq92FqOC68m7 u9U3ZbvGDI23UpEaMEJhH/t+XZDAZ0AlfTvlRHnE1ipeJxuOH0sFBHyhf O5W/x3spm43nVEpx7EYTfLWb9elTo1hoSEAdbBl/S7SJYutdUvPfsG1+g 4MAFD0AXOJpOqAfs/+tkySFsP3Y3NKirSA1PcBmtc7klpo8Hzz3aID4Ka 0+BdSAGBlJlB5GEl11vvu0SwQeelYawUf83IgsfYQ9q/KwNqlQhykOeAX g==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="322848721" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="322848721" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 17:57:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="649867413" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="649867413" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga007.jf.intel.com with ESMTP; 08 Jan 2023 17:57:47 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 1/4] iommu/vt-d: Remove include/linux/intel-svm.h Date: Mon, 9 Jan 2023 09:49:52 +0800 Message-Id: <20230109014955.147068-2-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109014955.147068-1-baolu.lu@linux.intel.com> References: <20230109014955.147068-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754508404234241008?= X-GMAIL-MSGID: =?utf-8?q?1754508404234241008?= There's no need to have a public header for Intel SVA implementation. The device driver should interact with Intel SVA implementation via the IOMMU generic APIs. Signed-off-by: Lu Baolu --- include/linux/intel-svm.h | 16 ---------------- drivers/iommu/intel/iommu.h | 5 +++++ drivers/iommu/intel/iommu.c | 1 - drivers/iommu/intel/svm.c | 1 - MAINTAINERS | 1 - 5 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 include/linux/intel-svm.h diff --git a/include/linux/intel-svm.h b/include/linux/intel-svm.h deleted file mode 100644 index f9a0d44f6fdb..000000000000 --- a/include/linux/intel-svm.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright © 2015 Intel Corporation. - * - * Authors: David Woodhouse - */ - -#ifndef __INTEL_SVM_H__ -#define __INTEL_SVM_H__ - -/* Page Request Queue depth */ -#define PRQ_ORDER 4 -#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20) -#define PRQ_DEPTH ((0x1000 << PRQ_ORDER) >> 5) - -#endif /* __INTEL_SVM_H__ */ diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 06e61e474856..f89f63d7a72a 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -438,6 +438,11 @@ struct q_inval { int free_cnt; }; +/* Page Request Queue depth */ +#define PRQ_ORDER 4 +#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20) +#define PRQ_DEPTH ((0x1000 << PRQ_ORDER) >> 5) + struct dmar_pci_notify_info; #ifdef CONFIG_IRQ_REMAP diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 59df7e42fd53..317af67b6098 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index c76b66263467..d38a54396c23 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/MAINTAINERS b/MAINTAINERS index a36df9ed283d..43fd97f0e1df 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10459,7 +10459,6 @@ L: iommu@lists.linux.dev S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git F: drivers/iommu/intel/ -F: include/linux/intel-svm.h INTEL IPU3 CSI-2 CIO2 DRIVER M: Yong Zhi From patchwork Mon Jan 9 01:49:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 40607 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1931808wrt; Sun, 8 Jan 2023 18:00:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXvPAEoTRgNu6QljJ5Yt0ZOZ5PJZeUfgW9h8qZkzNaM5ozSKlg916ZKWlILiYnUiQ+q15EgV X-Received: by 2002:a17:906:39d8:b0:847:410:ecff with SMTP id i24-20020a17090639d800b008470410ecffmr47663270eje.16.1673229610374; Sun, 08 Jan 2023 18:00:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673229610; cv=none; d=google.com; s=arc-20160816; b=j2H0exhAxIBz9KE+cEJf3ywnNjhCiufJ1Kz8PftqNNUu5BFT5eTcfi15GZzlPwJvg7 q/iCrtSPmFcTvPppxENsUMfATVdss9VS1AE2HVFVn7NYR/d5vzxRlpC1nJXY4qEZ8x4k ygMGdFf30sHui29UtYCDUy473YceiL1/1RtGeXmUQA1XJPyOmAiQrH5sk5VbEmm9rzDI EqPAk1CJW0WIGPmVi13tDMH5E69OiZt8qoe2jksHIXXRODr/gGlJ47EIwJUfBcVUhiVK r/SNlTsv4+2dV+dd57rAWYqDAUj/opo3pSjvIRCSbI7XaZBRhhd+fL7n5eBdIeNl3+Yu 9Xvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/L/ULBMWkypUJj8HK8OD7sFJgXRmBQDcjCNfrXbWeB8=; b=I5j805pePc2ag+sw/TCxYN9TNDNO49wCYqvP5Oo9p8Xxu5xiGWW+jOmos7AvtWNYlO G2B7jZ1WDAmaRINbaV+eIYAvY3E77SNK7okrsfdRhQIc1F+DZTAznIQXIRVKx8dKS6Qb kFx8nbzpIWG4D3oSbuP7poBO2/SzGy7ur7qCdY5jmoanu1yUEoy4sFbjNfgqVig6jjSc ng/FU4UO9TpPl3f0i/kuP1Ly/W1dkdlel8F+7m/cHeiI29FD53DIRVpKbU4D9cUObncj T1NexBVXHnmj6/C+7ZEbQXyEPWMYAGUDURPIR0mA9uTlS+0w3XlK3OXAwfc45GTY375z X8Ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aB7r5kzP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gb36-20020a170907962400b0084d45f91239si2103312ejc.4.2023.01.08.17.59.47; Sun, 08 Jan 2023 18:00:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aB7r5kzP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233865AbjAIB6K (ORCPT + 99 others); Sun, 8 Jan 2023 20:58:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233886AbjAIB6E (ORCPT ); Sun, 8 Jan 2023 20:58:04 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF3E010072 for ; Sun, 8 Jan 2023 17:58:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673229482; x=1704765482; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=puzEiCLaFj6PIN4/Wwibk3XN7n6katY+/NOVoiu348c=; b=aB7r5kzPBbVrdi3uF9g3K5g0YSvKx5pU+53ZFldWqHHvBUSUNwxyq0ta HI9Zvci+mY62TMe/ReHoC0DYFcnKJDt7aCPXnbGq6Yjp7mLmh7TlLI9vm Qr4C8Y9hUZ1/0fDO1BF12tEl4PBtTmpPbdIxc1EGO798QUN6DIkZ+V07H NiIM6L+DfvApLhrPCIDw9j/VfsIhySGZ9JnP3XDPuRmDD41FpPUKCuChA UJflsZoTFJhOnLm6MXp2KD3B/xBfQJBuAtwkZ/38nYTFXdyrEQ6anPCn2 su+u4lNUJnUoDa/unUPlSkIA7HBt2b/GefXYlVc0BRnNjZxJWJU8Sfi7J A==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="322848730" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="322848730" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 17:57:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="649867421" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="649867421" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga007.jf.intel.com with ESMTP; 08 Jan 2023 17:57:50 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 2/4] iommu/vt-d: Remove unused fields in svm structures Date: Mon, 9 Jan 2023 09:49:53 +0800 Message-Id: <20230109014955.147068-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109014955.147068-1-baolu.lu@linux.intel.com> References: <20230109014955.147068-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754508411669162182?= X-GMAIL-MSGID: =?utf-8?q?1754508411669162182?= They aren't used anywhere. Remove them to avoid dead code. Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.h | 4 ---- drivers/iommu/intel/svm.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index f89f63d7a72a..e7c732979364 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -762,18 +762,14 @@ struct intel_svm_dev { struct device *dev; struct intel_iommu *iommu; struct iommu_sva sva; - u32 pasid; int users; u16 did; - u16 dev_iotlb:1; u16 sid, qdep; }; struct intel_svm { struct mmu_notifier notifier; struct mm_struct *mm; - - unsigned int flags; u32 pasid; struct list_head devs; }; diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index d38a54396c23..d1e445f03aa6 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -351,11 +351,9 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, sdev->did = FLPT_DEFAULT_DID; sdev->sid = PCI_DEVID(info->bus, info->devfn); sdev->users = 1; - sdev->pasid = svm->pasid; sdev->sva.dev = dev; init_rcu_head(&sdev->rcu); if (info->ats_enabled) { - sdev->dev_iotlb = 1; sdev->qdep = info->ats_qdep; if (sdev->qdep >= QI_DEV_EIOTLB_MAX_INVS) sdev->qdep = 0; From patchwork Mon Jan 9 01:49:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 40608 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1931852wrt; Sun, 8 Jan 2023 18:00:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXvYESLIQMjsqkucvsJCIO9dcMQJdzkqnxuC/lqVcVB0HDY/XswrgX7uogMZe1DB9h2WT/kW X-Received: by 2002:a17:906:fb18:b0:82d:1d5f:2617 with SMTP id lz24-20020a170906fb1800b0082d1d5f2617mr55223783ejb.69.1673229619092; Sun, 08 Jan 2023 18:00:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673229619; cv=none; d=google.com; s=arc-20160816; b=wLblLRjyanN4HOLi0QzAdRFHNwF53Qw3BAFbu5d93jBeP/vCGd5GmiEvfj87MiCaN6 vu1uUNpAqv107vTslIvGNRWqYoLH+IxdtzXqxkiHdKZQNddQoDIZUOIY4WV59wauGVzq K9nd/pnSzT1EfBV8ww6w+Ymyn8O/2UvuJ87jSalW+fdSyrMM65whmCQQiZhktokuEkLi LZox2cWNHqk3nDN/bHfuEKxQJEp6wQcnob7ohhJI+G/RtNsWO0RTymvE8yuuIpdUMZmE EASVtZ37U9F/3V1QM7U9pSZsEgbhcRHXidD7oJLYtg6QabnHR0i/rl1dReuEko5LhpVh mwew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KLyvqZYrCYtXusrC6hlfrXPIJ8ZtwprCyc3D4izbtoc=; b=J2dqYbti909ErI74u2//rVrN5/CeGm+jwAXIsLKxoOZXYL6BosAlyF/OA1NYylehlR D5A81onjHKOLGmLMW/cKQvydWwwT8LLPuAUhrboZuGV1Aozj+ayTReUqY2SH0dJdCreM 7kidsP/lwsvGBgVmMsaySPeKSNlw/xtDQoXM4brNWy+ZrRS1v+9JL1Hms/b+8knUN9kO s97DZ90HmL/9Jy9mWmChRgeHysvLOtKqtw85n+hQVISMS5C6lUAPEl6W17sWl9xf5EJ0 4oWWW9rsNBq1I807eTmby48Jl/dgkqdpJlaMveQjdvhctRxEs98zK431c7LjqwHwCNrd RofA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=j7qHp4Sr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dd10-20020a1709069b8a00b007c31599251csi8778416ejc.590.2023.01.08.17.59.56; Sun, 08 Jan 2023 18:00:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=j7qHp4Sr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234116AbjAIB6R (ORCPT + 99 others); Sun, 8 Jan 2023 20:58:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233922AbjAIB6E (ORCPT ); Sun, 8 Jan 2023 20:58:04 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C991101DC for ; Sun, 8 Jan 2023 17:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673229484; x=1704765484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GDYJ6Y89oJ5wOsjNTY7g9ajEpmKqwp+GoMmPOL3dWqA=; b=j7qHp4Srfs6buZIe/EC0QuQLO3ZsAiYKVx5u9nPErXp8z3LHKRvjhVxg glqmPFApKNccqHQKCnXge4gBSrZDFleI++Ha2jUOiv7+tIeMbO5/UEWVy wIimRgvaqkZ4BAYdYAGnI/qLIZQh6WoJ9XSsrr8FOAc0IhDrfNmcXcHFy jq1QSgYSnajV6jEggrgv5J00Wj1NMxAhwmAh4+GuAlYXYR0ntD//5iMQ0 +FALEKeJkQODDC/yO3+Zwp+x56U/bVx5bQx9ET8821ziq7rLb6H4CXj8g mMJFgD9h8FblHnzj62X0+Z2wret4MYg5lTL3eKNj4PpxItt1nahACdmM4 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="322848739" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="322848739" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 17:57:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="649867430" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="649867430" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga007.jf.intel.com with ESMTP; 08 Jan 2023 17:57:52 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 3/4] iommu/vt-d: Remove users from intel_svm_dev Date: Mon, 9 Jan 2023 09:49:54 +0800 Message-Id: <20230109014955.147068-4-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109014955.147068-1-baolu.lu@linux.intel.com> References: <20230109014955.147068-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754508421023990608?= X-GMAIL-MSGID: =?utf-8?q?1754508421023990608?= It was used as a reference counter of an existing bond between device and user application memory address. Commit be51b1d6bbff ("iommu/sva: Refactoring iommu_sva_bind/unbind_device()") has added this in iommu core. Remove it to avoid duplicate code. Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.h | 1 - drivers/iommu/intel/svm.c | 62 ++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index e7c732979364..2a1619ff0d79 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -762,7 +762,6 @@ struct intel_svm_dev { struct device *dev; struct intel_iommu *iommu; struct iommu_sva sva; - int users; u16 did; u16 sid, qdep; }; diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index d1e445f03aa6..c7dc53e40c26 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -333,13 +333,6 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, } } - /* Find the matching device in svm list */ - sdev = svm_lookup_device_by_dev(svm, dev); - if (sdev) { - sdev->users++; - goto success; - } - sdev = kzalloc(sizeof(*sdev), GFP_KERNEL); if (!sdev) { ret = -ENOMEM; @@ -350,7 +343,6 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, sdev->iommu = iommu; sdev->did = FLPT_DEFAULT_DID; sdev->sid = PCI_DEVID(info->bus, info->devfn); - sdev->users = 1; sdev->sva.dev = dev; init_rcu_head(&sdev->rcu); if (info->ats_enabled) { @@ -367,7 +359,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, goto free_sdev; list_add_rcu(&sdev->list, &svm->devs); -success: + return &sdev->sva; free_sdev: @@ -401,32 +393,32 @@ static int intel_svm_unbind_mm(struct device *dev, u32 pasid) mm = svm->mm; if (sdev) { - sdev->users--; - if (!sdev->users) { - list_del_rcu(&sdev->list); - /* Flush the PASID cache and IOTLB for this device. - * Note that we do depend on the hardware *not* using - * the PASID any more. Just as we depend on other - * devices never using PASIDs that they have no right - * to use. We have a *shared* PASID table, because it's - * large and has to be physically contiguous. So it's - * hard to be as defensive as we might like. */ - intel_pasid_tear_down_entry(iommu, dev, - svm->pasid, false); - intel_svm_drain_prq(dev, svm->pasid); - kfree_rcu(sdev, rcu); - - if (list_empty(&svm->devs)) { - if (svm->notifier.ops) - mmu_notifier_unregister(&svm->notifier, mm); - pasid_private_remove(svm->pasid); - /* We mandate that no page faults may be outstanding - * for the PASID when intel_svm_unbind_mm() is called. - * If that is not obeyed, subtle errors will happen. - * Let's make them less subtle... */ - memset(svm, 0x6b, sizeof(*svm)); - kfree(svm); - } + list_del_rcu(&sdev->list); + /* + * Flush the PASID cache and IOTLB for this device. + * Note that we do depend on the hardware *not* using + * the PASID any more. Just as we depend on other + * devices never using PASIDs that they have no right + * to use. We have a *shared* PASID table, because it's + * large and has to be physically contiguous. So it's + * hard to be as defensive as we might like. + */ + intel_pasid_tear_down_entry(iommu, dev, svm->pasid, false); + intel_svm_drain_prq(dev, svm->pasid); + kfree_rcu(sdev, rcu); + + if (list_empty(&svm->devs)) { + if (svm->notifier.ops) + mmu_notifier_unregister(&svm->notifier, mm); + pasid_private_remove(svm->pasid); + /* + * We mandate that no page faults may be outstanding + * for the PASID when intel_svm_unbind_mm() is called. + * If that is not obeyed, subtle errors will happen. + * Let's make them less subtle... + */ + memset(svm, 0x6b, sizeof(*svm)); + kfree(svm); } } out: From patchwork Mon Jan 9 01:49:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 40609 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1932550wrt; Sun, 8 Jan 2023 18:02:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXusP2qWPlArlgTsU6ngorKjOCF1+ezU5Pbjl7fKxba9/aJOs0PDj93I7cdB26Ly0xoMklLz X-Received: by 2002:a05:6a20:13a8:b0:b0:a35:b763 with SMTP id w40-20020a056a2013a800b000b00a35b763mr100141662pzh.5.1673229729924; Sun, 08 Jan 2023 18:02:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673229729; cv=none; d=google.com; s=arc-20160816; b=NZcvMS6/5wS/EdX8m/5STZlSn+RH0mcJkaPu3WIXiQHZssPASkJjU8Z+9THUaTA2x8 sGmYS76dSxuyvzNa9CvPHW/2js56khJx/IfiQ+C84gQ7U3ivvEQlYJc8v79QpDoc9UAN j4Rll24Ygh9MZ+Gk+dT4XPXoMSg1CBsqXYMseQfuUfWbtxGgvpJWBp4NArfk3GM9h/VE Tvn8wWpqR5i2atBXYo5gN29pyGLD7i6laCQyPqh7vff9T/WOpGivRBhVDWaRdjay+YfT X8TTMHKastfwxiB8nelhiKjFa7c0DB5+EUwuYvlKCHTAmDb+tr5HqmSnM1YBN/WcfH5v SHAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=P7Kx4wKb1/N7ZT5r42pIsvm4ZP5DsjxPW0iifJFh+kY=; b=Z0XqxlryuLZ2snUiSWH+S3Cpzx/0ZlrHKEFCtgUKO9I0i0P54UGWBm2R4FCWigqSyb tjApMbNIrHVkEUYjqG+r3o8HM2XtTZDQj3omWBKdeNLo4qhGPJEnjRXjkK8gRB5p+OMY kU6FjQNwCOiH/F7lkEIUTZ+wNp2Osezh3Jt2nBQ9rUVtHZzQWEuetNu6eV9rhSf8Egit GE5WGCS5V+DnOKWsNUVhQe5uJLl8K1PY6cNtmK6CekuTxNl6lPbr/n3t+G+hC06oCkVT eYLjCkyGb65zHyqcVE9J9vRG61TA6zyDrZ8sM/h8/avVAGbtqT+6DTc7E+qJAfGM6ZN3 K93A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OZAxV0Rg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v14-20020a63d54e000000b00477d314a66fsi7956032pgi.585.2023.01.08.18.01.56; Sun, 08 Jan 2023 18:02:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OZAxV0Rg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234142AbjAIB6V (ORCPT + 99 others); Sun, 8 Jan 2023 20:58:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233961AbjAIB6F (ORCPT ); Sun, 8 Jan 2023 20:58:05 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AB62101DD for ; Sun, 8 Jan 2023 17:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673229484; x=1704765484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nBq2eOVotOHuuNbaX+AJBZNl0TFASfXTuzkriWWUcT4=; b=OZAxV0RgsEE3PyfJOVwOolCjD8lee4F9jRvEJ4E/VcHJly74mZhbr8vi WUh20d8415JsoO+3wwPYWCOkbqqubJ4VphYL+BDelKcSpiVra08DDWQfY /h6+tTwrGk3Ousw5iumSwlHF+yH4OgRY7j77AgLPP/rIwtMUlUmOukSwG GYOayvaH8Pw/ub1nWpsMTzErqJxWCSf636e7KkHe8B6JorfpHLeyrqDeX 2ZZQ71YFeqHVDH3lcuaM2oJ/5128OJc7q718PUnVYN8KHPnhKM4yhfayM Y3z2kYyTCVuJ92l6jVZNPQNSFk6pXgkPylmaYSvL9x6w3GJMv7+pdfYNJ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="322848746" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="322848746" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 17:57:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="649867438" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="649867438" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga007.jf.intel.com with ESMTP; 08 Jan 2023 17:57:55 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 4/4] iommu/vt-d: Remove sva from intel_svm_dev Date: Mon, 9 Jan 2023 09:49:55 +0800 Message-Id: <20230109014955.147068-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109014955.147068-1-baolu.lu@linux.intel.com> References: <20230109014955.147068-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754508537564556548?= X-GMAIL-MSGID: =?utf-8?q?1754508537564556548?= After commit be51b1d6bbff ("iommu/sva: Refactoring iommu_sva_bind/unbind_device()"), the iommu driver doesn't need to return an iommu_sva pointer anymore. This removes the sva field from intel_svm_dev and cleanups the code accordingly. Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.h | 1 - drivers/iommu/intel/svm.c | 23 +++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 2a1619ff0d79..f0222ad38757 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -761,7 +761,6 @@ struct intel_svm_dev { struct rcu_head rcu; struct device *dev; struct intel_iommu *iommu; - struct iommu_sva sva; u16 did; u16 sid, qdep; }; diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index c7dc53e40c26..e7b9bedebcc0 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -298,9 +298,8 @@ static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid, return 0; } -static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, - struct device *dev, - struct mm_struct *mm) +static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, + struct mm_struct *mm) { struct device_domain_info *info = dev_iommu_priv_get(dev); struct intel_svm_dev *sdev; @@ -312,7 +311,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, if (!svm) { svm = kzalloc(sizeof(*svm), GFP_KERNEL); if (!svm) - return ERR_PTR(-ENOMEM); + return -ENOMEM; svm->pasid = mm->pasid; svm->mm = mm; @@ -322,14 +321,14 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, ret = mmu_notifier_register(&svm->notifier, mm); if (ret) { kfree(svm); - return ERR_PTR(ret); + return ret; } ret = pasid_private_add(svm->pasid, svm); if (ret) { mmu_notifier_unregister(&svm->notifier, mm); kfree(svm); - return ERR_PTR(ret); + return ret; } } @@ -343,7 +342,6 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, sdev->iommu = iommu; sdev->did = FLPT_DEFAULT_DID; sdev->sid = PCI_DEVID(info->bus, info->devfn); - sdev->sva.dev = dev; init_rcu_head(&sdev->rcu); if (info->ats_enabled) { sdev->qdep = info->ats_qdep; @@ -360,7 +358,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, list_add_rcu(&sdev->list, &svm->devs); - return &sdev->sva; + return 0; free_sdev: kfree(sdev); @@ -371,7 +369,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, kfree(svm); } - return ERR_PTR(ret); + return ret; } /* Caller must hold pasid_mutex */ @@ -843,13 +841,10 @@ static int intel_svm_set_dev_pasid(struct iommu_domain *domain, struct device_domain_info *info = dev_iommu_priv_get(dev); struct intel_iommu *iommu = info->iommu; struct mm_struct *mm = domain->mm; - struct iommu_sva *sva; - int ret = 0; + int ret; mutex_lock(&pasid_mutex); - sva = intel_svm_bind_mm(iommu, dev, mm); - if (IS_ERR(sva)) - ret = PTR_ERR(sva); + ret = intel_svm_bind_mm(iommu, dev, mm); mutex_unlock(&pasid_mutex); return ret;