lkml.org 
[lkml]   [2022]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/pasid] mm: Change CONFIG option for mm->pasid field
    The following commit has been merged into the x86/pasid branch of tip:

    Commit-ID: 7a853c2d5951419fdf3c1c9d2b6f5a38f6a6857d
    Gitweb: https://git.kernel.org/tip/7a853c2d5951419fdf3c1c9d2b6f5a38f6a6857d
    Author: Fenghua Yu <fenghua.yu@intel.com>
    AuthorDate: Mon, 07 Feb 2022 15:02:45 -08:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Mon, 14 Feb 2022 19:23:50 +01:00

    mm: Change CONFIG option for mm->pasid field

    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 <jacob.jun.pan@linux.intel.com>
    Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Tony Luck <tony.luck@intel.com>
    Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
    Link: https://lore.kernel.org/r/20220207230254.3342514-3-fenghua.yu@intel.com
    ---
    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 5140e5f..c5cbfd7 100644
    --- a/include/linux/mm_types.h
    +++ b/include/linux/mm_types.h
    @@ -631,7 +631,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 d75a528..6ee7551 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
    }
    \
     
     \ /
      Last update: 2022-02-15 11:55    [W:7.902 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site