From patchwork Mon Jan 23 22:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 13113077 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17ACDC05027 for ; Mon, 23 Jan 2023 22:05:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A9E3A6B0083; Mon, 23 Jan 2023 17:05:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D8ED6B0085; Mon, 23 Jan 2023 17:05:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89D586B0087; Mon, 23 Jan 2023 17:05:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 78C306B0083 for ; Mon, 23 Jan 2023 17:05:32 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5742C405D8 for ; Mon, 23 Jan 2023 22:05:32 +0000 (UTC) X-FDA: 80387446104.24.F4A3311 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf22.hostedemail.com (Postfix) with ESMTP id D8D48C0019 for ; Mon, 23 Jan 2023 22:05:29 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kVO1s17x; spf=none (imf22.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.24) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674511530; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=S9DsTRd50dZdn1Uk8iWIuFqBLWLxK9qmStCBqOt6qmk=; b=5EZ49WV81FCeHFYBUD6bw44f5l9ZLmTIoyjsI6TiATpRHN+oeRRAa1tYfFlz5GSQufsYe5 9HJa0ADcXNdfHvuuusVFNkTSBUhlhB2QwkWqfQ+2B+Ecw4HpepPSOqTCqIMqgvH0Ytwqgk 1wGzHdgWIpn08uqunb+ktUYk4zm+/uQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kVO1s17x; spf=none (imf22.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.24) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674511530; a=rsa-sha256; cv=none; b=t9mMzxaYj3ZCBzsuGCrzhhE1vnUM6qdWM02evjZBw7cdul29Q6ESlz96VEopPTLy+j2nF0 EizDmMnfN9ln8vxPagwA0GaM0nExBIFSNQfnf6RVcJ2qVfa+0DiJ7KTxPyx4xrd+FsQoJX YbYJc0YdFlti+iW7vHhDeKkZxvtRiVw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674511530; x=1706047530; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=q6cZBJye+9S/4/Mk+1QQktyLKF2mTMV32eIG7PWZWnw=; b=kVO1s17x67arD3CDOWz1SIP49Od5AHR07qNGCwi2eaMgo9JL9BcMSxQ2 TgP9QIj0RQ0kfsXsX+WyesLqVyBv50nsjOluwRlmeAW5PN4bayGMcYr4X EC5Ie8gu1HJR2dbkpGfE57veVpId0MvCWngZk6LtEOR/y+eWpVoox0M9w TDCplpZNLOOaXf7VA66u/H5Taxq43AWG9tLWTjgh3q/OpcToyvRKwg9OP 1U1LEpwD3jrmsTrHVRgT66hb8n3pK4Y/uh+wp+Hc7WGlHFibjjUnn7z1w VLjVawzr4i1H9aRhky/Q3Vcri23XYxMNQrugY1CaBqvRgtWSQLd8KsK/J g==; X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="327421973" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="327421973" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 14:05:24 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="661878116" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="661878116" Received: from ssauty-mobl1.ger.corp.intel.com (HELO box.shutemov.name) ([10.249.46.171]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 14:05:17 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id 8502610947B; Tue, 24 Jan 2023 01:05:03 +0300 (+03) From: "Kirill A. Shutemov" To: Dave Hansen , Andy Lutomirski , Peter Zijlstra Cc: x86@kernel.org, Kostya Serebryany , Andrey Ryabinin , Andrey Konovalov , Alexander Potapenko , Taras Madan , Dmitry Vyukov , "H . J . Lu" , Andi Kleen , Rick Edgecombe , Bharata B Rao , Jacob Pan , Ashok Raj , Linus Torvalds , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv15 10/17] iommu/sva: Replace pasid_valid() helper with mm_valid_pasid() Date: Tue, 24 Jan 2023 01:04:53 +0300 Message-Id: <20230123220500.21077-11-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230123220500.21077-1-kirill.shutemov@linux.intel.com> References: <20230123220500.21077-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Stat-Signature: uh783acrdf6rpifdopd91kkamch1gjxn X-Rspam-User: X-Rspamd-Queue-Id: D8D48C0019 X-Rspamd-Server: rspam06 X-HE-Tag: 1674511529-615403 X-HE-Meta: U2FsdGVkX19Wmx01/occxpCqaUkF3ajmMCBdF7D8IcUP2wiLOPNA3KTwId4X6NOJgq8Z5dHepS9IjvtAv6XCydGrTnPh9hXXOlkR/fWAmyHnjgO/HqA/xs6uZc/PSF1CLYhC73lrFzQTWeiTwUFY+kgieozD7GANBm+1xmrTRyGpog8bEH531MxRVrTjSU1lyaaoGwn/6XfWS+8LfJ89FlL/Y8zIGyNRgg6E89WhAkrmmkAYgjB2BBS/prvJRyn0eX6jpIFUB8CLIclCw9vDDFmx0hR9HWNIACTPC97KHFi6/oHD6P0YWnFjujgtjxzIfNvzgTRMGlGdhQGlRdxWZ5tHLR18Y7NYPDpOL+W41dkwtSL0jFjXitAy3GSKQJ64RB9Za9mCVye91oqyOEk9KTYTx5xJhLwgbUU8Cg7ennuCxMnL1U5/LynSdKBEq2uTswFuCoBYH13rttImEFt9mdTSfrxAqtUdn1HYMH+7+yO77zWe+IHkyki89dtioGJYkPHT3HzSGkkGPR9FqwmEEEWE2QpYQzN9V/fNcQObOKQOwTnn6f2CMxnc0nSH2R+dTif+1NotcGYePIvM9sGBQShWNjzvPuM4S7ay+J4PiLptaUmjJbiSA4yf/CLArUceFE8FXs5pgw3nUSKfxgjOXYO/wc6WkhmyhW+gvTjpsy4zTENqEz45k0cVPHNr9Gzi8hFnzDAjyOhSPVSc+nbHpKDca/kuJSsw5YDxRGbAPVY7oVnl8PP7+b+MmDL9Cj25vzBvBL7LEUYwAhWhVQpNd+rRwTAGrdY2zn02tFXliyXu/Jt0LZFoFOQ34c6rIjIQePP/3ncFciHKSSXIG18RBXHbdYHn5UwJPMM5pC1TtRyEsOdfEZ/4RKzJf2XA2/WXOk6B4ZBLK8vpIptHMGjuvqwR0oCbruqlLC+bnOJU/7x5aPaOA1Ieva5YTWS8vjv8aV5vqCJ99VBlZWXMzcm J0gLo7Sz ss96bZKj+5yBL4bkoaKmzje0taWtX8EA7ImG3S2IXWAKy5Hu5tdmNtnTUeGdbrxeUdh3UWUbPwVPAeyO3U1O5Tn+584qXD2KjIKB2lU3pDmCXuZsWaHwCSl24BUpBtlSVb4NtMjoeCKXODLXRYHvkDb7vYGEXGGktSHw2WLeUVOo2tlImrSA2GFd/Xlr2fyTovCyKg0zLXt1iIbiYKsJsghFNbN+1bO4vMMEP//Sdk4MDRD8Z2ahb+q1NSXd+j9VzcatTvPSndSKVmaCq3oww9p8kChu/+1lXBxYSiEz29oZhv8JLzWjkk7Ms69lYHqc2C87uTiVdBqyWgT4xGSMJ2JKjPQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Kernel has few users of pasid_valid() and all but one checks if the process has PASID allocated. The helper takes ioasid_t as the input. Replace the helper with mm_valid_pasid() that takes mm_struct as the argument. The only call that checks PASID that is not tied to mm_struct is open-codded now. This is preparatory patch. It helps avoid ifdeffery: no need to dereference mm->pasid in generic code to check if the process has PASID. Signed-off-by: Kirill A. Shutemov Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/traps.c | 6 +++--- drivers/iommu/iommu-sva.c | 4 ++-- include/linux/ioasid.h | 9 --------- include/linux/sched/mm.h | 8 +++++++- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index d317dc3d06a3..8b83d8fbce71 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -671,15 +671,15 @@ static bool try_fixup_enqcmd_gp(void) if (!cpu_feature_enabled(X86_FEATURE_ENQCMD)) return false; - pasid = current->mm->pasid; - /* * If the mm has not been allocated a * PASID, the #GP can not be fixed up. */ - if (!pasid_valid(pasid)) + if (!mm_valid_pasid(current->mm)) return false; + pasid = current->mm->pasid; + /* * Did this thread already have its PASID activated? * If so, the #GP must be from something else. diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index 24bf9b2b58aa..4ee2929f0d7a 100644 --- a/drivers/iommu/iommu-sva.c +++ b/drivers/iommu/iommu-sva.c @@ -34,14 +34,14 @@ int iommu_sva_alloc_pasid(struct mm_struct *mm, ioasid_t min, ioasid_t max) mutex_lock(&iommu_sva_lock); /* Is a PASID already associated with this mm? */ - if (pasid_valid(mm->pasid)) { + if (mm_valid_pasid(mm)) { if (mm->pasid < min || mm->pasid >= max) ret = -EOVERFLOW; goto out; } pasid = ioasid_alloc(&iommu_sva_pasid, min, max, mm); - if (!pasid_valid(pasid)) + if (pasid == INVALID_IOASID) ret = -ENOMEM; else mm_pasid_set(mm, pasid); diff --git a/include/linux/ioasid.h b/include/linux/ioasid.h index af1c9d62e642..836ae09e92c2 100644 --- a/include/linux/ioasid.h +++ b/include/linux/ioasid.h @@ -40,10 +40,6 @@ void *ioasid_find(struct ioasid_set *set, ioasid_t ioasid, int ioasid_register_allocator(struct ioasid_allocator_ops *allocator); void ioasid_unregister_allocator(struct ioasid_allocator_ops *allocator); int ioasid_set_data(ioasid_t ioasid, void *data); -static inline bool pasid_valid(ioasid_t ioasid) -{ - return ioasid != INVALID_IOASID; -} #else /* !CONFIG_IOASID */ static inline ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min, @@ -74,10 +70,5 @@ static inline int ioasid_set_data(ioasid_t ioasid, void *data) return -ENOTSUPP; } -static inline bool pasid_valid(ioasid_t ioasid) -{ - return false; -} - #endif /* CONFIG_IOASID */ #endif /* __LINUX_IOASID_H */ diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h index 2a243616f222..b69fe7e8c0ac 100644 --- a/include/linux/sched/mm.h +++ b/include/linux/sched/mm.h @@ -457,6 +457,11 @@ static inline void mm_pasid_init(struct mm_struct *mm) mm->pasid = INVALID_IOASID; } +static inline bool mm_valid_pasid(struct mm_struct *mm) +{ + return mm->pasid != INVALID_IOASID; +} + /* Associate a PASID with an mm_struct: */ static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid) { @@ -465,13 +470,14 @@ static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid) static inline void mm_pasid_drop(struct mm_struct *mm) { - if (pasid_valid(mm->pasid)) { + if (mm_valid_pasid(mm)) { ioasid_free(mm->pasid); mm->pasid = INVALID_IOASID; } } #else static inline void mm_pasid_init(struct mm_struct *mm) {} +static inline bool mm_valid_pasid(struct mm_struct *mm) { return false; } static inline void mm_pasid_set(struct mm_struct *mm, u32 pasid) {} static inline void mm_pasid_drop(struct mm_struct *mm) {} #endif