From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E991C433EF for ; Fri, 28 Jan 2022 20:29:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351242AbiA1U32 (ORCPT ); Fri, 28 Jan 2022 15:29:28 -0500 Received: from mga02.intel.com ([134.134.136.20]:61403 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351182AbiA1U3X (ORCPT ); Fri, 28 Jan 2022 15:29:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643401763; x=1674937763; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oEb1gREPv86uZmCPcmbfKhCL3HC1okYdAANBmm9gm8A=; b=Ma3uKlThBWQR8JV58ycnxZrMPnKY1g9jePnzMPqtOWU0qkQV2EMJTHIr +jahSuqNSdbLMUQOhe9ArqB7jDIhxDDCg7ea/P9hZKCXBDKQ0ebGp/m3q hL1lWSKDrIXwjPMeW94ZsI6uivj8pZ4Qw9PGUwYCakSODJBikosM205mE ebgVUbC7RThmjulJy2gtuH1Eoxf3fKUSBzWLWGb3g98VjDHDk0IMGrLoj kuA82aGk5fmDp4H6b7OJjmYxWt4dcvHbPrWVADb+FGXQ0BsGtwlV0Yihp 9EbcUeg1fcosBBLj/eK0zMCe5I5CLn7unt9pAMX+KImYULnSyJQTSkxKA w==; X-IronPort-AV: E=McAfee;i="6200,9189,10241"; a="234578001" X-IronPort-AV: E=Sophos;i="5.88,324,1635231600"; d="scan'208";a="234578001" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2022 12:29:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,324,1635231600"; d="scan'208";a="618827691" Received: from otcwcpicx3.sc.intel.com ([172.25.55.73]) by FMSMGA003.fm.intel.com with ESMTP; 28 Jan 2022 12:29:21 -0800 From: Fenghua Yu To: "Thomas Gleixner" , "Dave Hansen" , "Ingo Molnar" , "Borislav Petkov" , "Peter Zijlstra" , "Andy Lutomirski" , "Tony Luck" , "Lu Baolu" , "Joerg Roedel" , Josh Poimboeuf , "Jacob Pan" , "Ashok Raj" , "Ravi V Shankar" Cc: iommu@lists.linux-foundation.org, "x86" , "linux-kernel" , Fenghua Yu Subject: [PATCH v3 02/11] mm: Change CONFIG option for mm->pasid field Date: Fri, 28 Jan 2022 12:28:56 -0800 Message-Id: <20220128202905.2274672-3-fenghua.yu@intel.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220128202905.2274672-1-fenghua.yu@intel.com> References: <20220128202905.2274672-1-fenghua.yu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This currently depends on CONFIG_IOMMU_SUPPORT. But it is only needed when CONFIG_IOMMU_SVA option is enabled. Change the CONFIG guards around definition and initialization of mm->pasid field. Suggested-by: Jacob Pan Signed-off-by: Fenghua Yu Reviewed-by: Tony Luck --- v2: - Change condition to more accurate CONFIG_IOMMU_SVA (Jacob and Tony) include/linux/mm_types.h | 2 +- kernel/fork.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 9db36dc5d4cf..c959116abd95 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -630,7 +630,7 @@ struct mm_struct { #endif struct work_struct async_put_work; -#ifdef CONFIG_IOMMU_SUPPORT +#ifdef CONFIG_IOMMU_SVA u32 pasid; #endif } __randomize_layout; diff --git a/kernel/fork.c b/kernel/fork.c index d75a528f7b21..6ee7551d3bd2 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1021,7 +1021,7 @@ static void mm_init_owner(struct mm_struct *mm, struct task_struct *p) static void mm_init_pasid(struct mm_struct *mm) { -#ifdef CONFIG_IOMMU_SUPPORT +#ifdef CONFIG_IOMMU_SVA mm->pasid = INIT_PASID; #endif } -- 2.35.0