From patchwork Wed Jan 11 12:37:29 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: 13096665 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 78616C54EBC for ; Wed, 11 Jan 2023 13:24:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F03994000B; Wed, 11 Jan 2023 08:24:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 318B7940008; Wed, 11 Jan 2023 08:24:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16D5794000B; Wed, 11 Jan 2023 08:24:06 -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 ECBB1940008 for ; Wed, 11 Jan 2023 08:24:05 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B5CF880A07 for ; Wed, 11 Jan 2023 13:24:05 +0000 (UTC) X-FDA: 80342586450.05.E60CCE7 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf29.hostedemail.com (Postfix) with ESMTP id E2B22120003 for ; Wed, 11 Jan 2023 13:24:03 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JJZVVtFY; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf29.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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673443444; 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=Hf0zBGBah8ycgzp3MFrB6k8pn7JLDh9aXDFicj3W5KC30lw+r8ED4lj0SHmKeQ+ELGmWXO hklwqJt29+OS7jkdCQPIb7lxcFehcYD5pTgqdlVJSX+11Jb2mnqP5A6BRndaYx19kfVF7Z WQSReobT8H/VdNCUj+jrRX+aJtXjKsI= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JJZVVtFY; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf29.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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673443444; a=rsa-sha256; cv=none; b=nDH+up+YgeeCxXQo2HhbkG26VwZiKE66xqyGXwyuLElJCdEZ12Cwl8/CpiJC+J797H3H/q MF7AhjEHh9gTQQ/blWOgVKexAriNvb2kRFYpTMWcNJQEk+Eq0CJBgoL0M/Nq/SYxXHUsvp 7fmnKM8skIVtqN/+gKo5zfK6RlrqaDA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673443444; x=1704979444; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Qz3TmQ0EtndSBYuEcqzm7EswKf58sIKEztNONQoPvAY=; b=JJZVVtFYHodndHZxV6lw6xUNPZQhHlGsYrAO2SRYAzKz1+kWvHPto8TN vdz25fcze+yGkzyAVFRiItmVemn37P0ijzZ4TKSV2qWHMWdCo9q4YVAIt VpaHuXaGZAl6Vdzpx/Dz4DfM6xLjTb7Yxe+Ld8vRcLs6yheunvvqzIZzQ 2WIWa3ZbxrFjhLAQHsq1ICRYOjZtJ7V0O1uv8mmkylSlv/UddIHBrpFVf aAn0uA5pTV4PIZry3ZvG/M7On0XlJ1DcgtM6JI67eAJ7sj9RgKPnH7mS7 blWGI885lWYgUqI4MC08Mpd5SyQ79eyZ1ZDsP39/3skYcZpoglnAMEzg/ w==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="324646141" X-IronPort-AV: E=Sophos;i="5.96,317,1665471600"; d="scan'208";a="324646141" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2023 05:23:56 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="720725495" X-IronPort-AV: E=Sophos;i="5.96,317,1665471600"; d="scan'208";a="720725495" Received: from bachaue1-mobl1.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.37.250]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2023 05:23:50 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id 68957109CC7; Wed, 11 Jan 2023 15:37:41 +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: [PATCHv14 10/17] iommu/sva: Replace pasid_valid() helper with mm_valid_pasid() Date: Wed, 11 Jan 2023 15:37:29 +0300 Message-Id: <20230111123736.20025-11-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.38.2 In-Reply-To: <20230111123736.20025-1-kirill.shutemov@linux.intel.com> References: <20230111123736.20025-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: E2B22120003 X-Stat-Signature: yw8z9qdbbnr73f75t5gsc3dhkw34546k X-HE-Tag: 1673443443-957129 X-HE-Meta: U2FsdGVkX18rKVqRL6NiTY+r7Co8IL65R0myKrkFI9eOvH5u+NJZVYA8p3RZOAyqKxMKs8tKiyyhwfF5CwU4+7bWr2Hrxu9EUEd9OBUyLIueUFNWxmE74DRfSAXP78wJMh4NmPUcG6//WzoCb6PUcSlczN/B+wzgca0xjU9UM0NGNHvEa7QYig3+3Pqro3tcodjdkcekVlJlJZoXPxqAcv0QgGSr4HbcjtehzzPBsQT1heYzEx0+rMD3jPo/OUhuYTaN/lbmxDJpS5XkYS/8IxmkVVVS+eALUjO3gvy6Mq1J+dbj2ZTIsOZbmQEokrvQETjnMezhIlyYluKIhAG8SyXT5Ro4NWdAo1j9zKDkKUr6DnWiAYjX6r8JMaGPlEsX5LhXG1zJaNSovXbVu48Osc95a3RcYa/5WTtQmeMTT3q3gTH1KXenCDyU8kalRynKpylVVPOo0BMraNsum+Nd5NktaK3GmpNz6K/816/p1VRr8T/C/lk/akarutjM6iR/QzZ9+kONfGA3H9Dbm1yLSTWTvM0aAYhjU9GfsiXfWu0RptGutHFe/nq8rDSVAxS+n3xAeqyYUErWlKNECyo5ds5HUeWFgRrP/bgo6F413j6JGgS7qAPmhKyUVzAjDk5LkAc+ZeCzy/IXZSvDMSiMNYNSVqJ5vvq83G+g2CZzd7j2jC9YqShjzpVRfrcq2SHX6e1wuLxa+DWD48euFTE6RwS7RZswDUMTLQnuaHM3zt3VYWs6ktI6H09wlOEdN28x0NfvSSjtwHr20aDnNYXyMDOEnj2HDpmEzwfr5OuNDk5tlthhklLGWDRIOGbyvK+bGUpnRtOMnYBud089SksieMbM1KxVr9On+4i6KUKnCiWKLKMrOCo2k9qEUKnrIlin5bvGhRZrysCNrkYOt2IGV1kOFYQwN3kod3QVg4tRbdpfQJ+bDxZ8fscT70/jojWYJH6qxXfm9zhv4x8t8oj X4+3Yh7P sC5mLNC12RCvWUjFimdwQs6SP1X+DbbSQrIeZ 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