From patchwork Wed Mar 22 17:03:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 73547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2460824wrt; Wed, 22 Mar 2023 10:16:24 -0700 (PDT) X-Google-Smtp-Source: AK7set8GtrUpiTB/MqIq8i1dHmHAyTfCy17wrNWxSv7ClNTyiL8sQvobi3UnqnAtyg/wd6rk4MC4 X-Received: by 2002:a05:6402:788:b0:4fd:2aaf:f401 with SMTP id d8-20020a056402078800b004fd2aaff401mr7732051edy.5.1679505384452; Wed, 22 Mar 2023 10:16:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679505384; cv=none; d=google.com; s=arc-20160816; b=u5mS3ncQafSXeIG7zRg8icx50Uo1Ngg0/t3qOkW1EgAjy3PgRiBGIQRXsMNMRGDMPc Q4CkchJlki+8AQ8WJpNNZQvx8NemOtmwUNsiZ5OMbCb7aa4ECNGdZf5StG7lhrDbwxxP ayAn0HGp580KnTWOXRjHuep5Mx2AoQGsF2DGkAKr/831fQQjGbAQn3nSRLw/Jwak/lfa +hdJv2AVP0RtTdMz3uHMncWcMROmGmf6z283ne6uYGpoQq3XOCoZWQwbWrE75e52Vcop q1H+bjCIpNs/OOGW1UzLSIHCGVpFJ6Ex1N4GbbG3N/TH2+dJbTTjnGSSzi/+cH3Ya3WQ XUPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=A3vbjjTd6w880FIrFd3ktS7VWOQqghvEhJ0Trk6NZbg=; b=B54i/xmvbyj6LxwJMmXH1ZmKgwyhHeOq+Qm2IK03fhnVE9RtZHaFDeNz5bi/5ntuuK a2C58yp9Ai1S1IZrXadI9ETL624HjKLlKa1CA/pDW6pBjMSjQFCnWECM+Am6sn4JYAap zUf96CL/Xs96AY1anhjqRELeHmfQV3ofF5iABfyDf4rZ7G/bokg0+ZdWZhgB59BddFjk ygx/HHh+IsIWbNU9mClsaKyIX3HiquDqZLq551aSMBwEXYBZKgZpG+rRx0c+QfSTmh0Y MMmA5YJGyE+GI9AzyMb02QmnGdMVs9RyAKRpXudbFNn6tZLYX5cKPUXGGcaKKsTULM3A JNdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=sxdFYR+E; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c5-20020aa7c745000000b004beeaa6bc04si497871eds.97.2023.03.22.10.16.01; Wed, 22 Mar 2023 10:16:24 -0700 (PDT) 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=@linutronix.de header.s=2020 header.b=sxdFYR+E; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbjCVREl (ORCPT + 99 others); Wed, 22 Mar 2023 13:04:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231396AbjCVREK (ORCPT ); Wed, 22 Mar 2023 13:04:10 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 210226487D; Wed, 22 Mar 2023 10:03:37 -0700 (PDT) Date: Wed, 22 Mar 2023 17:03:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1679504587; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A3vbjjTd6w880FIrFd3ktS7VWOQqghvEhJ0Trk6NZbg=; b=sxdFYR+Ep6qvTE+N/sZvDrkXaHvjlYVx4NaWVk9GkwLQZ5hvmhc+2yOC7ir4lmFN5pSEeV Kh/434rXndO68bkpu5W3n2BY/mnOUFj4CbYSMg27/wb8RBOZAaICGoTbIyTmiVxlxcfZkP FZMz7DfQB5cjqbNC8st/eETVB1PtExjVXbu10s/0FLNJccJv2QLU8XGKrI0gQcU+rXIdXR Ywxmx9JPHjsZ7bFQmcJn6fagGuUxGyGuRXeB7mZoIiF2yBw1SIyKZvDvEU6yBoO0NkS6Kj xxvM+cXA0f/PlsUnm1K8BWMB8ocLfhj3dsD8vtKi5SuzBoGZaP08FzvdgkcsBQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1679504587; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A3vbjjTd6w880FIrFd3ktS7VWOQqghvEhJ0Trk6NZbg=; b=B44Zca6ekZPshu8G7tChoStrAerOX3+2rapFxvKhBUNB4yPJKc1khPtZzrkD/7qjbYPlpm fumJEEnen9qtg/CA== From: "tip-bot2 for Kirill A. Shutemov" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] iommu/sva: Replace pasid_valid() helper with mm_valid_pasid() Cc: "Kirill A. Shutemov" , Dave Hansen , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167950458651.5837.17431637312383085049.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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?1761089037829262000?= X-GMAIL-MSGID: =?utf-8?q?1761089037829262000?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 400b9b93441cd4e2fe824a70140f3d5a2a9c802b Gitweb: https://git.kernel.org/tip/400b9b93441cd4e2fe824a70140f3d5a2a9c802b Author: Kirill A. Shutemov AuthorDate: Sun, 12 Mar 2023 14:26:05 +03:00 Committer: Dave Hansen CommitterDate: Thu, 16 Mar 2023 13:08:40 -07:00 iommu/sva: Replace pasid_valid() helper with mm_valid_pasid() 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 Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/all/20230312112612.31869-11-kirill.shutemov%40linux.intel.com --- 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 d317dc3..8b83d8f 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 24bf9b2..4ee2929 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 af1c9d6..836ae09 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 2a24361..b69fe7e 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