From patchwork Tue Nov 13 05:50:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 10679603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C94413B5 for ; Tue, 13 Nov 2018 05:51:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AAAC2A35C for ; Tue, 13 Nov 2018 05:51:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D8642A34B; Tue, 13 Nov 2018 05:51:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 727342A35C for ; Tue, 13 Nov 2018 05:51:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 79CB16B0281; Tue, 13 Nov 2018 00:51:48 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 74C986B0283; Tue, 13 Nov 2018 00:51:48 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 63D3D6B0284; Tue, 13 Nov 2018 00:51:48 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 1EF816B0281 for ; Tue, 13 Nov 2018 00:51:48 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id e89so1534034pfb.17 for ; Mon, 12 Nov 2018 21:51:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=o1YoOJ2KchQObcJY1zCIrIn36jOmER0O+z8BpMipZr0=; b=cRHYE7mNKroupOCbBGdqYtawYQ2uHxgx3n8LXfW2iaVzdbSVVfrb3TOEeIfB9EFOEI 6jcwW/ojATnWAAC+rYHjpIylPUvG4XTqXUipB/GLQovv127p1j6droMI79VFCbQQC4xa naJsMVdVGAYjLkmNiWKx3rce0DYjtf73VI8AGD0Xut0fR2D6O3+EpgdkDu7ZPcGnvGsa osAIvzaFl6urBQheMkDcX3jos9FcbDElcYxDe+IOLz03OmD2+/5VcND+f5iw6q7z2mKl Y1dWsa06bNhwLAqpEK23zUv5xKYtvtUmTnE7Ku2H6cM7Ynh6xHUfIV0SJ2WLynLwwVtO eRYA== X-Gm-Message-State: AGRZ1gINbemH11eRQ9ECRZtn7aBWfQhQ4ChcqZEa1RPnK2IvQAxLrJkC K76Rk1rjvmJNC3J26OZ1uAkfJY3EAj7wJs2P8ySckXWKlOQXFfnWTlDvK3zzaCVWT21C8tPUy8V xnjeI75Llz6/MU4aIBV6f6t09bOpPjJ8ZXq4WzAAZ7FUbVA/er32A2sFq/Sqz2sdMfQ== X-Received: by 2002:a17:902:142:: with SMTP id 60-v6mr3778934plb.108.1542088307786; Mon, 12 Nov 2018 21:51:47 -0800 (PST) X-Google-Smtp-Source: AJdET5cIcpaHAWDOW/SVt6KtsxY3KEOJmnnNnNzWWaZkgj1vhbm69E3fc6klMCmJRlESqRCVDJ8u X-Received: by 2002:a17:902:142:: with SMTP id 60-v6mr3778890plb.108.1542088306742; Mon, 12 Nov 2018 21:51:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542088306; cv=none; d=google.com; s=arc-20160816; b=IjiRkuH0aV45yIeJt/hspLq7nBA2oQ3sMeWePld8GTzOxxeVR6IXJz54/X96Ek0wu1 no/76CVSbd4CslZOzJ9nQmYnqsJLIgYdZ1OW9YlEQt4wngS3IY+nA9AH+AiloG545TDq REYXSfzZjDivkM34ivJdLjlSFViCodpssOj795LW/jnqkp/BgMn7rmJExAkW8QFYP5ek wCUCSkX732kjYD0gyG3E1ZppmenHDfL8KNhAVINujbil+cR3yYrERT/zc+pUY8D/C45z IiW5j5AivqXV2M+jlYQJRBrg+TlSH6Fu9vLhqpSdID9r/4uE5fUnOfGENoYvs/lxfe6h /h4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=o1YoOJ2KchQObcJY1zCIrIn36jOmER0O+z8BpMipZr0=; b=S7YPbf8643VorqPyeiVVgpHh+Eyz+AjFDeU7GFZNIfPPjhAi5DJGQd+CXcXqIYsVlf cHgZ7OSIfXn+RJNPB4ei4dGmdiFsqX3H8OjFBNwiilucBZ0DEtdCfBO/GEw7oEF58FFq PXRRhGxaD+9h+EeoHdb2fFE2UHKu1eBgbI5vQ0nfgZjcFqvmsLUG88fOHt0hCamP02Dt C5d7IcKLRSmIEkgak83DFp2ZkoV41snIFplXH8YGf+bgifqSLc9LoT2/Iy0ytSU7WEP3 qEgD176Hhjwf7ZhyCQW1hlfJjGIDuXpzYLgkC8PeWmib74XPnEsAFRZSQ63d9qLysWj8 GfoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g+DYxkAV; spf=pass (google.com: domain of sashal@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id s4si18320619pga.377.2018.11.12.21.51.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Nov 2018 21:51:46 -0800 (PST) Received-SPF: pass (google.com: domain of sashal@kernel.org designates 198.145.29.99 as permitted sender) client-ip=198.145.29.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g+DYxkAV; spf=pass (google.com: domain of sashal@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 426E022507; Tue, 13 Nov 2018 05:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542088306; bh=zvT9WxixCZyRIox0HPbugmtAY4OJxLd1LR7y8Ru+BHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g+DYxkAVrkj4dorkLGecCqLXTDc61MvFY0HOrVWbbCXkoR3iQLZMHfl9sSNWbUnWW j6SO9g4GSpFZsDEqD3rHn/9YB2zsOLZt72uMQEWWCh/p5/0ChetAhvlBo/NPCVCycF AuJspLysaqxRlz4vAyrPYk/WjAE43y8CueQE3mPA= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andrea Arcangeli , Andrew Morton , Linus Torvalds , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 4.18 37/39] userfaultfd: allow get_mempolicy(MPOL_F_NODE|MPOL_F_ADDR) to trigger userfaults Date: Tue, 13 Nov 2018 00:50:51 -0500 Message-Id: <20181113055053.78352-37-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181113055053.78352-1-sashal@kernel.org> References: <20181113055053.78352-1-sashal@kernel.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Andrea Arcangeli [ Upstream commit 3b9aadf7278d16d7bed4d5d808501065f70898d8 ] get_mempolicy(MPOL_F_NODE|MPOL_F_ADDR) called a get_user_pages that would not be waiting for userfaults before failing and it would hit on a SIGBUS instead. Using get_user_pages_locked/unlocked instead will allow get_mempolicy to allow userfaults to resolve the fault and fill the hole, before grabbing the node id of the page. If the user calls get_mempolicy() with MPOL_F_ADDR | MPOL_F_NODE for an address inside an area managed by uffd and there is no page at that address, the page allocation from within get_mempolicy() will fail because get_user_pages() does not allow for page fault retry required for uffd; the user will get SIGBUS. With this patch, the page fault will be resolved by the uffd and the get_mempolicy() will continue normally. Background: Via code review, previously the syscall would have returned -EFAULT (vm_fault_to_errno), now it will block and wait for an userfault (if it's waken before the fault is resolved it'll still -EFAULT). This way get_mempolicy will give a chance to an "unaware" app to be compliant with userfaults. The reason this visible change is that becoming "userfault compliant" cannot regress anything: all other syscalls including read(2)/write(2) had to become "userfault compliant" long time ago (that's one of the things userfaultfd can do that PROT_NONE and trapping segfaults can't). So this is just one more syscall that become "userfault compliant" like all other major ones already were. This has been happening on virtio-bridge dpdk process which just called get_mempolicy on the guest space post live migration, but before the memory had a chance to be migrated to destination. I didn't run an strace to be able to show the -EFAULT going away, but I've the confirmation of the below debug aid information (only visible with CONFIG_DEBUG_VM=y) going away with the patch: [20116.371461] FAULT_FLAG_ALLOW_RETRY missing 0 [20116.371464] CPU: 1 PID: 13381 Comm: vhost-events Not tainted 4.17.12-200.fc28.x86_64 #1 [20116.371465] Hardware name: LENOVO 20FAS2BN0A/20FAS2BN0A, BIOS N1CET54W (1.22 ) 02/10/2017 [20116.371466] Call Trace: [20116.371473] dump_stack+0x5c/0x80 [20116.371476] handle_userfault.cold.37+0x1b/0x22 [20116.371479] ? remove_wait_queue+0x20/0x60 [20116.371481] ? poll_freewait+0x45/0xa0 [20116.371483] ? do_sys_poll+0x31c/0x520 [20116.371485] ? radix_tree_lookup_slot+0x1e/0x50 [20116.371488] shmem_getpage_gfp+0xce7/0xe50 [20116.371491] ? page_add_file_rmap+0x1a/0x2c0 [20116.371493] shmem_fault+0x78/0x1e0 [20116.371495] ? filemap_map_pages+0x3a1/0x450 [20116.371498] __do_fault+0x1f/0xc0 [20116.371500] __handle_mm_fault+0xe2e/0x12f0 [20116.371502] handle_mm_fault+0xda/0x200 [20116.371504] __get_user_pages+0x238/0x790 [20116.371506] get_user_pages+0x3e/0x50 [20116.371510] kernel_get_mempolicy+0x40b/0x700 [20116.371512] ? vfs_write+0x170/0x1a0 [20116.371515] __x64_sys_get_mempolicy+0x21/0x30 [20116.371517] do_syscall_64+0x5b/0x160 [20116.371520] entry_SYSCALL_64_after_hwframe+0x44/0xa9 The above harmless debug message (not a kernel crash, just a dump_stack()) is shown with CONFIG_DEBUG_VM=y to more quickly identify and improve kernel spots that may have to become "userfaultfd compliant" like this one (without having to run an strace and search for syscall misbehavior). Spots like the above are more closer to a kernel bug for the non-cooperative usages that Mike focuses on, than for for dpdk qemu-cooperative usages that reproduced it, but it's still nicer to get this fixed for dpdk too. The part of the patch that caused me to think is only the implementation issue of mpol_get, but it looks like it should work safe no matter the kind of mempolicy structure that is (the default static policy also starts at 1 so it'll go to 2 and back to 1 without crashing everything at 0). [rppt@linux.vnet.ibm.com: changelog addition] http://lkml.kernel.org/r/20180904073718.GA26916@rapoport-lnx Link: http://lkml.kernel.org/r/20180831214848.23676-1-aarcange@redhat.com Signed-off-by: Andrea Arcangeli Reported-by: Maxime Coquelin Tested-by: Dr. David Alan Gilbert Reviewed-by: Mike Rapoport Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/mempolicy.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 01f1a14facc4..a7f7f5415936 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -797,16 +797,19 @@ static void get_policy_nodemask(struct mempolicy *p, nodemask_t *nodes) } } -static int lookup_node(unsigned long addr) +static int lookup_node(struct mm_struct *mm, unsigned long addr) { struct page *p; int err; - err = get_user_pages(addr & PAGE_MASK, 1, 0, &p, NULL); + int locked = 1; + err = get_user_pages_locked(addr & PAGE_MASK, 1, 0, &p, &locked); if (err >= 0) { err = page_to_nid(p); put_page(p); } + if (locked) + up_read(&mm->mmap_sem); return err; } @@ -817,7 +820,7 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask, int err; struct mm_struct *mm = current->mm; struct vm_area_struct *vma = NULL; - struct mempolicy *pol = current->mempolicy; + struct mempolicy *pol = current->mempolicy, *pol_refcount = NULL; if (flags & ~(unsigned long)(MPOL_F_NODE|MPOL_F_ADDR|MPOL_F_MEMS_ALLOWED)) @@ -857,7 +860,16 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask, if (flags & MPOL_F_NODE) { if (flags & MPOL_F_ADDR) { - err = lookup_node(addr); + /* + * Take a refcount on the mpol, lookup_node() + * wil drop the mmap_sem, so after calling + * lookup_node() only "pol" remains valid, "vma" + * is stale. + */ + pol_refcount = pol; + vma = NULL; + mpol_get(pol); + err = lookup_node(mm, addr); if (err < 0) goto out; *policy = err; @@ -892,7 +904,9 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask, out: mpol_cond_put(pol); if (vma) - up_read(¤t->mm->mmap_sem); + up_read(&mm->mmap_sem); + if (pol_refcount) + mpol_put(pol_refcount); return err; }