From patchwork Mon Dec 20 19:58:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paraschiv, Andra-Irina" X-Patchwork-Id: 12688467 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 12654C433FE for ; Mon, 20 Dec 2021 19:59:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234028AbhLTT7a (ORCPT ); Mon, 20 Dec 2021 14:59:30 -0500 Received: from smtp-fw-6001.amazon.com ([52.95.48.154]:51530 "EHLO smtp-fw-6001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233488AbhLTT72 (ORCPT ); Mon, 20 Dec 2021 14:59:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1640030368; x=1671566368; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=jOhjVqFcYvwPQ1CwHgjiiXzwUoexfw663y2/AqkXMd4=; b=IaB+ru2d9Uehdnd1Fg+K9ZoSFzL/dBC32XD9JLjpq/zhQ8Nq5kgMR7hE vl3ArWIsmSzXcX6IJFsPPCtaM0vx4kTSMYd01mjy6aNISzHgnK9XxZGQ9 nhe2ZW82/br9lB/oz0VdwecQ1kecTgxiFYnbCuYmI/4ATI1fZBPuAfKRh w=; X-IronPort-AV: E=Sophos;i="5.88,221,1635206400"; d="scan'208";a="164824533" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-iad-1d-10222bbc.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-6001.iad6.amazon.com with ESMTP; 20 Dec 2021 19:59:16 +0000 Received: from EX13D16EUB003.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan3.iad.amazon.com [10.40.163.38]) by email-inbound-relay-iad-1d-10222bbc.us-east-1.amazon.com (Postfix) with ESMTPS id B64651A010A; Mon, 20 Dec 2021 19:59:13 +0000 (UTC) Received: from dev-dsk-andraprs-1c-9ffe7195.eu-west-1.amazon.com (10.43.162.159) by EX13D16EUB003.ant.amazon.com (10.43.166.99) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Mon, 20 Dec 2021 19:59:08 +0000 From: Andra Paraschiv To: linux-kernel CC: Alexandru Ciobotaru , Greg KH , Alexandru Vasile , "Marcelo Cerri" , Paolo Bonzini , Stefano Garzarella , Stefan Hajnoczi , Tim Gardner , "Vitaly Kuznetsov" , kvm , ne-devel-upstream , stable , "Andra Paraschiv" Subject: =?utf-8?q?=5BPATCH_v2=C2=A0=5D_nitro=5Fenclaves=3A_Use_get=5Fuser?= =?utf-8?q?=5Fpages=5Funlocked=28=29_call_to_handle_mmap_assert?= Date: Mon, 20 Dec 2021 19:58:56 +0000 Message-ID: <20211220195856.6549-1-andraprs@amazon.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Originating-IP: [10.43.162.159] X-ClientProxiedBy: EX13D40UWC002.ant.amazon.com (10.43.162.191) To EX13D16EUB003.ant.amazon.com (10.43.166.99) Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org After commit 5b78ed24e8ec ("mm/pagemap: add mmap_assert_locked() annotations to find_vma*()"), the call to get_user_pages() will trigger the mmap assert. static inline void mmap_assert_locked(struct mm_struct *mm) { lockdep_assert_held(&mm->mmap_lock); VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_lock), mm); } [ 62.521410] kernel BUG at include/linux/mmap_lock.h:156! ........................................................... [ 62.538938] RIP: 0010:find_vma+0x32/0x80 ........................................................... [ 62.605889] Call Trace: [ 62.608502] [ 62.610956] ? lock_timer_base+0x61/0x80 [ 62.614106] find_extend_vma+0x19/0x80 [ 62.617195] __get_user_pages+0x9b/0x6a0 [ 62.620356] __gup_longterm_locked+0x42d/0x450 [ 62.623721] ? finish_wait+0x41/0x80 [ 62.626748] ? __kmalloc+0x178/0x2f0 [ 62.629768] ne_set_user_memory_region_ioctl.isra.0+0x225/0x6a0 [nitro_enclaves] [ 62.635776] ne_enclave_ioctl+0x1cf/0x6d7 [nitro_enclaves] [ 62.639541] __x64_sys_ioctl+0x82/0xb0 [ 62.642620] do_syscall_64+0x3b/0x90 [ 62.645642] entry_SYSCALL_64_after_hwframe+0x44/0xae Use get_user_pages_unlocked() when setting the enclave memory regions. That's a similar pattern as mmap_read_lock() used together with get_user_pages(). Fixes: 5b78ed24e8ec ("mm/pagemap: add mmap_assert_locked() annotations to find_vma*()") Signed-off-by: Andra Paraschiv Cc: stable@vger.kernel.org --- Changelog v1 -> v2 * Update the commit message to include the reference to the commit that added the mmap_assert_locked() annotations to find_vma*(). * Use get_user_pages_unlocked() instead of get_user_pages(), that has a similar pattern as mmap_read_lock() + get_user_pages(). --- drivers/virt/nitro_enclaves/ne_misc_dev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c index 8939612ee0e0..6894ccb868a6 100644 --- a/drivers/virt/nitro_enclaves/ne_misc_dev.c +++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c @@ -886,8 +886,9 @@ static int ne_set_user_memory_region_ioctl(struct ne_enclave *ne_enclave, goto put_pages; } - gup_rc = get_user_pages(mem_region.userspace_addr + memory_size, 1, FOLL_GET, - ne_mem_region->pages + i, NULL); + gup_rc = get_user_pages_unlocked(mem_region.userspace_addr + memory_size, 1, + ne_mem_region->pages + i, FOLL_GET); + if (gup_rc < 0) { rc = gup_rc;