From patchwork Tue Jan 30 08:08:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 194012 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1144476dyb; Tue, 30 Jan 2024 03:20:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IG5UXHasyuN0X96zTnQpvt/X9BTOKJN8aVNjXjUPWGgpOpALt+d3/D8EJEguTWa5iyCBV8U X-Received: by 2002:a05:6358:52cb:b0:178:688e:fb21 with SMTP id z11-20020a05635852cb00b00178688efb21mr7406415rwz.7.1706613649155; Tue, 30 Jan 2024 03:20:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706613649; cv=pass; d=google.com; s=arc-20160816; b=q8Atm3p7imtzbys7hTOlCiUpwenqGrjHsfsUjxGx04loqS69ejVByvpllr4KlIZ3x4 H6dR8NFSqgU4lnf6qfL+f5MvfDJBSlkP/j1Fi4RBwxdc4336kqqLysLRujIcFcc8gb5B Kf+UNkKO03r5DlN8FWqI/IgQ2GixrDH6Dtnr2zSixdwY/X8lY9d1BP880gslDKF4ByIt LaQp5EZOgxHTd37AXb9nDcWugkgKMxQMJ4vAp4KBYVia/1khE+ETrdgr/bIKiFE2hIB/ Kv2ytuUgY9wKdhMr9AyegyScOGzmUzoIcvFGASCeH86TzdfXMs5GvwLNi7vX8WKuHsuU ymCg== 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=1Ovnw+tKhBMfMscqMiO4LYnCVGxMyJ3RChjG2DF4+bY=; fh=oaHNS1xUSnQss3sOwgE3xgF1EHmYE8WzykuHrV1+rzg=; b=UQTA1wHV9k78xjZuC07qjvZHHzmNhx6NGQxBbFGe1wd0LTD5lQ1v01Na00NUs4o5tH 0+JV/T8WPbN0fG2PmULSRZ7/3uV2zWbjyE8/nwCpzDNGUP12nBYq/doNzSr582tn2KqB sW0dNuKD7htmEFXAeL4Bw3PQIYthOK5+SwvcgWLXudjpTck1w4hYO8zJH0XCn7uhjdG9 K7CuTvKxHOXQeb5ol0fv7h2HgCiCRMi6US3+iardJu+e7L+BIH8D18vekFAFQ24xxeZX p/GlnFcaJiYdY6gYJR2aWk7CWRc08kaOXFnVaKDLioFIv0gTrvhbUs9sjcoNsz9gi0G0 CtxA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RADwCqsS; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-44111-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44111-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id u17-20020a656711000000b005dbd0ff2e5dsi210753pgf.811.2024.01.30.03.20.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 03:20:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-44111-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RADwCqsS; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-44111-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44111-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id D268FB26A6C for ; Tue, 30 Jan 2024 08:18:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2936F664D3; Tue, 30 Jan 2024 08:14:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="RADwCqsS" 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 9841F65BD1; Tue, 30 Jan 2024 08:14:43 +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=1706602485; cv=none; b=oVmT6hKJd9TDMxrFrGrGb/OfVbjWnKVqTAHQRWfpcUv8uT1vhQ4YfpsUoEB6gGFICvLpEspyFBKEL7OsiZbxWlGv/t4m5StEPced5oXzLKiZgeuy4GxJfDHTHk0n6JQ6/OI6EXvqVnWhEIb6gbqF9Cr2zCjHGs3sVqq4SRUnCu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706602485; c=relaxed/simple; bh=/X4TrhX+nZJIzlXo68bwW7s6fFh3t8lvBg+xVPbIT+8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GG8G3ki6bKG/IQpA0JLxNiuPHNysTK4w8/wUpwRoJ5tthKSIujl5GSZX8WkHueYcWyD8tKgYX5ldQGb3a5M31olfM4Yx3asGzMLqOSrVSxfls0q0z2Bxxa4rbMQFrSrYcj5CRk8cQ3jXVzxm89JyJqWiY9d8ld50bUbmGhWUj5A= 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=RADwCqsS; 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=1706602484; x=1738138484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/X4TrhX+nZJIzlXo68bwW7s6fFh3t8lvBg+xVPbIT+8=; b=RADwCqsSJNFRP+NfsmwunjzOl6YOax3p3Bei1pOVt6xut9LJv8d+RH3W Cv+P2VdYUFFx2O/fT7TIiLc/IlIWRFPGuYMYS1s7IjO/Mti5WSI/wo7f3 QADZ2gRaz1o1xvluXPc/xx8EKXaXqGAvtisnYhLmIAXgr/EjdqIIM4+W6 pcTpQS81/C26GqON84kyTGm7HrqxafBxbNV1aX+G+QfKia/nd5xdx4rjj 1y42bg63a1fa0OOXSXRO+0z86jkCEOpdrNYGybRg75A+v1pVXV88gDKtX LOM2weWTFadV1FWyMbHH6NXTqwCYN0SvDsPGdgJZ3DNmf64fFwmiV8i31 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="10588397" X-IronPort-AV: E=Sophos;i="6.05,707,1701158400"; d="scan'208";a="10588397" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2024 00:14:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,707,1701158400"; d="scan'208";a="3633815" Received: from allen-box.sh.intel.com ([10.239.159.127]) by fmviesa003.fm.intel.com with ESMTP; 30 Jan 2024 00:14:39 -0800 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Jean-Philippe Brucker , Nicolin Chen Cc: Yi Liu , Jacob Pan , Longfang Liu , Yan Zhao , Joel Granados , iommu@lists.linux.dev, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu , Jason Gunthorpe Subject: [PATCH v11 08/16] iommu: Prepare for separating SVA and IOPF Date: Tue, 30 Jan 2024 16:08:27 +0800 Message-Id: <20240130080835.58921-9-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240130080835.58921-1-baolu.lu@linux.intel.com> References: <20240130080835.58921-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: 1789514113878361835 X-GMAIL-MSGID: 1789514113878361835 Move iopf_group data structure to iommu.h to make it a minimal set of faults that a domain's page fault handler should handle. Add a new function, iopf_free_group(), to free a fault group after all faults in the group are handled. This function will be made global so that it can be called from other files, such as iommu-sva.c. Move iopf_queue data structure to iommu.h to allow the workqueue to be scheduled out of this file. This will simplify the sequential patches. Signed-off-by: Lu Baolu Reviewed-by: Jason Gunthorpe Reviewed-by: Kevin Tian Reviewed-by: Yi Liu Tested-by: Yan Zhao Tested-by: Longfang Liu --- include/linux/iommu.h | 20 +++++++++++++++++++- drivers/iommu/io-pgfault.c | 37 +++++++++++++------------------------ 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 2320548a90f8..c9d4f175f121 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -41,7 +41,6 @@ struct iommu_dirty_ops; struct notifier_block; struct iommu_sva; struct iommu_dma_cookie; -struct iopf_queue; #define IOMMU_FAULT_PERM_READ (1 << 0) /* read */ #define IOMMU_FAULT_PERM_WRITE (1 << 1) /* write */ @@ -126,6 +125,25 @@ struct iopf_fault { struct list_head list; }; +struct iopf_group { + struct iopf_fault last_fault; + struct list_head faults; + struct work_struct work; + struct device *dev; +}; + +/** + * struct iopf_queue - IO Page Fault queue + * @wq: the fault workqueue + * @devices: devices attached to this queue + * @lock: protects the device list + */ +struct iopf_queue { + struct workqueue_struct *wq; + struct list_head devices; + struct mutex lock; +}; + /* iommu fault flags */ #define IOMMU_FAULT_READ 0x0 #define IOMMU_FAULT_WRITE 0x1 diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c index 10d48eb72608..c7e6bbed5c05 100644 --- a/drivers/iommu/io-pgfault.c +++ b/drivers/iommu/io-pgfault.c @@ -13,24 +13,17 @@ #include "iommu-sva.h" -/** - * struct iopf_queue - IO Page Fault queue - * @wq: the fault workqueue - * @devices: devices attached to this queue - * @lock: protects the device list - */ -struct iopf_queue { - struct workqueue_struct *wq; - struct list_head devices; - struct mutex lock; -}; +static void iopf_free_group(struct iopf_group *group) +{ + struct iopf_fault *iopf, *next; -struct iopf_group { - struct iopf_fault last_fault; - struct list_head faults; - struct work_struct work; - struct device *dev; -}; + list_for_each_entry_safe(iopf, next, &group->faults, list) { + if (!(iopf->fault.prm.flags & IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE)) + kfree(iopf); + } + + kfree(group); +} static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, enum iommu_page_response_code status) @@ -50,9 +43,9 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, static void iopf_handler(struct work_struct *work) { + struct iopf_fault *iopf; struct iopf_group *group; struct iommu_domain *domain; - struct iopf_fault *iopf, *next; enum iommu_page_response_code status = IOMMU_PAGE_RESP_SUCCESS; group = container_of(work, struct iopf_group, work); @@ -61,7 +54,7 @@ static void iopf_handler(struct work_struct *work) if (!domain || !domain->iopf_handler) status = IOMMU_PAGE_RESP_INVALID; - list_for_each_entry_safe(iopf, next, &group->faults, list) { + list_for_each_entry(iopf, &group->faults, list) { /* * For the moment, errors are sticky: don't handle subsequent * faults in the group if there is an error. @@ -69,14 +62,10 @@ static void iopf_handler(struct work_struct *work) if (status == IOMMU_PAGE_RESP_SUCCESS) status = domain->iopf_handler(&iopf->fault, domain->fault_data); - - if (!(iopf->fault.prm.flags & - IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE)) - kfree(iopf); } iopf_complete_group(group->dev, &group->last_fault, status); - kfree(group); + iopf_free_group(group); } /**