From patchwork Thu Aug 12 12:09:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1516261 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=LFHfntTV; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GllqP0c1Dz9t0Z; Thu, 12 Aug 2021 22:09:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mE9We-0005qy-Pu; Thu, 12 Aug 2021 12:09:32 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mE9WY-0005pm-V7 for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:26 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id C9B8D3F22F for ; Thu, 12 Aug 2021 12:09:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770166; bh=e/+L+R5PE+GvZuIMdlVySnsudaEXp7KnqzopqbhtLP8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LFHfntTVwFudnrsg0PAffFUfONOJeAUyDTF0ATci8HV2wKYWLFi+MrREaQMB0Xz4i d7EaITsVpKOSNrqk+3ngFvWJZEVvL1J95bI3RmSQYHLlf7bsjEcXxGzln5pXj3PncA Xu2Ld8wje3pWAqbCWnjWcd7VVpOiOg9F+OjUJLxVatuKS/xgYyf79QBfDKGNKiikMV KtE0aACMua6dNO8hhLz+xwi2olZUit7fgynEdtgj80SIRT0zoALuNmxkpDuSoTeU9B DvFm98U9lAamSxgcWKxJEhTb7Jbdpqe2z/xxcfqn/t9mc0lrF6kJL3mt7msU0WpJ0z EmwzZDixEKWOA== Received: by mail-pj1-f69.google.com with SMTP id 2-20020a17090a1742b0290178de0ca331so4114748pjm.1 for ; Thu, 12 Aug 2021 05:09:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e/+L+R5PE+GvZuIMdlVySnsudaEXp7KnqzopqbhtLP8=; b=Z+uoo6xUUON4Ruhyp2Q9FSGpCcA6R+aS45LpK6RW+n//4xoH2KVLYqlxlEIWqGS40P z2qvaFCt08Nm9L34GXad5hJxJdtZCh4ziAntAgkGM5Jb85iaidPuHUphiSDVCKl+nH4p rOPVGY5q3JICkEtVzdXKoZjwh6lX+X9k/ftFOuafccn76scACEK6cCsyxdAll2pumjRB gKrC/1NgvqPUic+wcVnzXSeYGuh5mz9lI0Tfgv0ciAVdnRSte9R3vqmCze63Q9/cYPD8 j12qfwMC23jk403IBemqvlAisir6GVkRuUIHqq/HxrQQYzYqAbMpTTFFrkLgAVx5igUA EcLQ== X-Gm-Message-State: AOAM531bzew5C5MUe89xc4OBhu2fbzQDwRbQ/CMOD82GTGdbuiGMeCFL tS4eAs49Q8788GqbNq/pi6D0PogipgaZ5zTKMsICTVOghwTURIrlryilDYPBNVvSitVgMtFWqgx cN+z0Z6TFImsAcWhhXbRCK7+wCPFvjsKoVqCaaIjZNA== X-Received: by 2002:a62:b615:0:b029:34a:3920:a7ea with SMTP id j21-20020a62b6150000b029034a3920a7eamr3817779pff.21.1628770164951; Thu, 12 Aug 2021 05:09:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/dJfg+TGsT7b8sq7VAQO0BMOOBaS9LGBzAcSMvHRU3nMnzMcktt13chj6uAIj27/WbpoTjg== X-Received: by 2002:a62:b615:0:b029:34a:3920:a7ea with SMTP id j21-20020a62b6150000b029034a3920a7eamr3817760pff.21.1628770164763; Thu, 12 Aug 2021 05:09:24 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:24 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/8] UBUNTU: SAUCE: ubuntu/sgx: fix a synchronization issue for mmput Date: Thu, 12 Aug 2021 06:09:08 -0600 Message-Id: <20210812120913.9316-4-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives 0977851177d96aa7859adcafef36f1b3ed5c7ab0 Linux Driver: fix a synchronization issue for mmput Signed-off-by: Tim Gardner --- ubuntu/sgx/main.c | 13 +++++++++++++ ubuntu/sgx/reclaim.c | 16 +++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ubuntu/sgx/main.c b/ubuntu/sgx/main.c index 82c7b77e91806..8d28da9e8331c 100644 --- a/ubuntu/sgx/main.c +++ b/ubuntu/sgx/main.c @@ -12,6 +12,7 @@ #include "encls.h" #include +#include #include "version.h" #include "dcap.h" #ifndef MSR_IA32_FEAT_CTL @@ -21,6 +22,9 @@ #ifndef FEAT_CTL_LOCKED #define FEAT_CTL_LOCKED FEATURE_CONTROL_LOCKED #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) ) +void (*k_mmput_async)(struct mm_struct* mm); +#endif struct sgx_epc_section sgx_epc_sections[SGX_MAX_EPC_SECTIONS]; int sgx_nr_epc_sections; @@ -300,6 +304,15 @@ static int __init sgx_init(void) if (!sgx_page_cache_init()) return -EFAULT; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) ) + k_mmput_async = (void*)kallsyms_lookup_name("mmput_async"); + if (!k_mmput_async){ + pr_err("intel_sgx: mmput_async support missing from kernel.\n"); + return -EFAULT; + } +#endif + + if (!sgx_page_reclaimer_init()) goto err_page_cache; diff --git a/ubuntu/sgx/reclaim.c b/ubuntu/sgx/reclaim.c index 1ba0cec6dba4b..747cfbe4ec6a3 100644 --- a/ubuntu/sgx/reclaim.c +++ b/ubuntu/sgx/reclaim.c @@ -14,7 +14,9 @@ #include "driver.h" #include - +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) ) +extern void (*k_mmput_async)(struct mm_struct* mm); +#endif struct task_struct *ksgxswapd_tsk; DECLARE_WAIT_QUEUE_HEAD(ksgxswapd_waitq); LIST_HEAD(sgx_active_page_list); @@ -175,8 +177,8 @@ static bool sgx_reclaimer_age(struct sgx_epc_page *epc_page) ret = !sgx_encl_test_and_clear_young(encl_mm->mm, page); up_read(&encl_mm->mm->mmap_sem); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) || LINUX_VERSION_CODE > KERNEL_VERSION(5, 4, 0) ) - mmput(encl_mm->mm); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) + k_mmput_async(encl_mm->mm); #else mmput_async(encl_mm->mm); #endif @@ -226,8 +228,8 @@ static void sgx_reclaimer_block(struct sgx_epc_page *epc_page) up_read(&encl_mm->mm->mmap_sem); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) || LINUX_VERSION_CODE > KERNEL_VERSION(5, 4, 0) ) - mmput(encl_mm->mm); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) + k_mmput_async(encl_mm->mm); #else mmput_async(encl_mm->mm); #endif @@ -306,8 +308,8 @@ static const cpumask_t *sgx_encl_ewb_cpumask(struct sgx_encl *encl) cpumask_or(cpumask, cpumask, mm_cpumask(encl_mm->mm)); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) || LINUX_VERSION_CODE > KERNEL_VERSION(5, 4, 0) ) - mmput(encl_mm->mm); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) + k_mmput_async(encl_mm->mm); #else mmput_async(encl_mm->mm); #endif