From patchwork Tue Dec 27 03:08:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 13082050 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 24EF0C4332F for ; Tue, 27 Dec 2022 03:09:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 664068E000D; Mon, 26 Dec 2022 22:08:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EBDF8E000E; Mon, 26 Dec 2022 22:08:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 32FCC8E0005; Mon, 26 Dec 2022 22:08:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0CBE28E000D for ; Mon, 26 Dec 2022 22:08:57 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E3541160587 for ; Tue, 27 Dec 2022 03:08:56 +0000 (UTC) X-FDA: 80286604272.27.7BB908E Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf03.hostedemail.com (Postfix) with ESMTP id 0887820003 for ; Tue, 27 Dec 2022 03:08:54 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=WFqhykeA; spf=none (imf03.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=1672110535; 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=RH27/yMEaIKNSxbdZlEBBsW8S4Z6jdHWiIv/A1SgiNc=; b=LzA62jh3A/O1LVJyWBPaQ4Js3Aaw/B69aNe0Ct6eq54W+H6QLdfIW5BqLqll3H75ZMRSDL yzKTpsrKLTgOSWUcEPuqu0AKK5mLoa3tkRIO8QuUlV2deHqliDE+9eUVr2pprhi1flmRST bSs0IGQGzVpjWaV0K8IPkeQatrTkxOw= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=WFqhykeA; spf=none (imf03.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=1672110535; a=rsa-sha256; cv=none; b=L24AoHrTfgqTmDoejEu4ITlVKvmmjAauXHDDvtK6ppHmuLO8Bf4ZlJthGr8W6d7Byhc1Is 2lRYayCmOn8gNEzAoYE8V4LjBeMoYaKQeO64tzt9K+MlK/xwc7RKQi8QOL0LTVGsRuZDyL WY+hWfd90Pau4HZ+fCBU1sCZPE3rbSA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672110535; x=1703646535; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Qz3TmQ0EtndSBYuEcqzm7EswKf58sIKEztNONQoPvAY=; b=WFqhykeAwUPkCSNunBethLiU4I92aS8AMo1Fpf/83RaPKt84K4/YZvsP W8sCVJFlY5kTGHcIFEn8nXgvspo+Yvx1EnVmfE+oIYWDMLwQNLFn+cH0R iOfzoMLGnPsQbJMWcE0tI0czgU1XhyGlxz7/IiNczVS86v36nt2eytRb0 SYXeyx3f5tqaicCp47NjAmDcZGj9HwNFY526U4JMZuaNm1K8IJfTmrttj TFZ60IDfMhTsLbrXs91GJO2P9xKEZI33hAgRHlsDg7htPGXivcUvKZ6+N VPkzrdCM23sLJN9S/jjOjgqLHaZFJvd4bTaw6G5HVTdTE42yJ4yBhYNdA w==; X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="321869783" X-IronPort-AV: E=Sophos;i="5.96,277,1665471600"; d="scan'208";a="321869783" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2022 19:08:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="652917545" X-IronPort-AV: E=Sophos;i="5.96,277,1665471600"; d="scan'208";a="652917545" Received: from ppogotov-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.62.152]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2022 19:08:47 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id D474E10BBB6; Tue, 27 Dec 2022 06:08:36 +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: [PATCHv13 09/16] iommu/sva: Replace pasid_valid() helper with mm_valid_pasid() Date: Tue, 27 Dec 2022 06:08:22 +0300 Message-Id: <20221227030829.12508-10-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.38.2 In-Reply-To: <20221227030829.12508-1-kirill.shutemov@linux.intel.com> References: <20221227030829.12508-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 0887820003 X-Stat-Signature: kbcowej9hsthsime3x1ii9jj5a43utrx X-HE-Tag: 1672110534-167670 X-HE-Meta: U2FsdGVkX18KwqMV3N5U+BWSKWVH8g4VvQ+GUaX4+Val/qgqKjjZFwuY9M1Y9cIT49glvKpCFjKtR7r3SluIzGYwMVnktFMiHEisN3KLoRk5DNTCjF7YF7rgzreUTDMCcJaWbXJZ1XCCOWdmh0OP7y0cgfI1vfyS+NIDDM+gbjmoZJGP8nbkNYUYle7PQAJi3jrgVoEoLrCqE1fdgJGeFoB6im5nrxvZKVo8dMQPbrYhuHCxqP/zYT15Lu5C13wK0Oy/ltFaUVShRqlst1LElqlp1hX4I9fotoq/G+dp9oggxSh8m8ezzMpB3wTmTJClMvSGIATqJsAQtJfeOpfPo9mkmJ5VAV3TomHrwUz2VFS9fHFMOJqxBQSOwgzJDrvBXKYb9BbnYgA9nDPY/UKaC2F+/nagv+Oms++IULqHpajpshCw/2Y8snkHFTT4SY5u1YXL2JVeQNfhFJhagiukmj8Fe21Bhfa0A80/QRgHhHcMryqZevFV1jMnp/aOC+KWU/HhUabsIKPeMNEu4df7ZHmOcnJp3dJ1TVQ8NRD+a5s8qQPIgnQSdmd7LGOC9rRNXWRO6M9HQO9Y5zprqaq1JYMXG7QHtDFTuQYbZ5FORJo/51IyygKl5UPal3LG0nlRC831nqm3ypvk5RXsRTnao4U+f0DvtuUzVCAa0w3ZgYj333s6CgTc+OIHQc+aMVHhJK/rtSzUONqor70ZYhPb0o3464Otv24naNTBl0VlltfuVWX6So4pzW5LKgo68azAyNaHKguhUOxtAq456QxgwY9TgY8wXslm6KtX9J+/4ExZn3WkrhqfTRdYO7W+cviXnE9u2X1IhtGMce1ywK2oTl4zrEjmpJUwEw0Z/Cc5IurxjjgkGBETQJxKO6wUs0CTZHAZh3YJD5DRGpX63teAu3t4fLLvZ8us0Dgfc55PahwAPwE6u58Ms35vsd9ys/uXC6OKqaNsHPrno2ksmc9 tySzLYmb BnhqEK74q4MlFs+Ste6ZEE/N/5g7rab6mJwiO 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 --- 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