Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1029445ybl; Wed, 4 Dec 2019 15:29:03 -0800 (PST) X-Google-Smtp-Source: APXvYqwyflAopLfWXhIVt9BBfRJP3U6Zqf/Q1mSm/YdVswTHbKY4W8Dr1+lPQhTjRy2xVKMd8IyQ X-Received: by 2002:aca:815:: with SMTP id 21mr4979552oii.52.1575502143565; Wed, 04 Dec 2019 15:29:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575502143; cv=none; d=google.com; s=arc-20160816; b=htV2o+QpbQAzIAPPFgm5WE1RJ/3L22m5BPRM/17DU0xr90jkDnupiDG/BKwYzXH46R D2sCpYYiTo/CllCbxkFeNL7IYF59u14Ouy6SFHrLmg3ew1qPl0ziBnd8SkGibLNw2kp3 aX/yxixTAtrgGSZ/CbP56Y0KGBiZAfaHeEt1oaVCV5/AB9Nhjmliim5sQQqLYGqeGZfk 9tuYwCPgxVMrF3Ph7bPGM+sKzhWKuskUaQgBImihR5Pbf0YrS9KXbQxtLJ8WcCsAzfO2 IaqxLyBK6x7hogLaQhhtC6v3Z5ATPDnE5ir8zQocaqWFm5M1BnstfZCk+kiON3Qad3Ce rFIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:dkim-signature; bh=KnZoHBXFVRHNSaPqiDHNhvaOhX8uk2RjtLzlrEN0A1o=; b=i/2Ux8uGCbIm49V9ao5kbdzdNocs2+5NueyWZEo9/x2S708MQsH7oxdIVcgJC0rh7/ 2D9D/43yYLHXxazM7JVkiSLeK7cGVluQ9aVF4liRcRj9fILXlD1eie4UpIOE4azPIG2V Bc+QJua1JB2nWNbkLj08E75HRDOlvdWsU+esqDq59fF8teCkyxqJP7jlEBGNAso5vlvA s92inPdU7c/sbktsGWXQG1etShpDrXJTU+ujwmqLDsRmdFCYmgL/hbipoWkKhKVwPkaC mPCJfkvAwq0ohAch++TdH7YznhPOYe9Xs3m+iAPXRUivAO1c66VSkSCWnADgZI8p6sWs L1uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@axtens.net header.s=google header.b="cy/5prub"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h18si4384606otj.114.2019.12.04.15.28.50; Wed, 04 Dec 2019 15:29:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@axtens.net header.s=google header.b="cy/5prub"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728121AbfLDX2X (ORCPT + 99 others); Wed, 4 Dec 2019 18:28:23 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:43006 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727116AbfLDX2X (ORCPT ); Wed, 4 Dec 2019 18:28:23 -0500 Received: by mail-pl1-f193.google.com with SMTP id x13so379250plr.9 for ; Wed, 04 Dec 2019 15:28:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=KnZoHBXFVRHNSaPqiDHNhvaOhX8uk2RjtLzlrEN0A1o=; b=cy/5prubQanNAwOeTi/ZyFwbDLXD64Uorlm4rJLaGwEBB/o9sL2+ImgszzXnI5/C93 M4rV/sjpPW9dKqV14G7qVmLPewQ0XopRqM7Qi6LpRjnaUxgXLEhQ79GmN+ixJ0d1yC/0 KnKTPjGN9+XCP/vYkDxGmqDvrErHWzTfbVf+k= 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:in-reply-to:references:date :message-id:mime-version; bh=KnZoHBXFVRHNSaPqiDHNhvaOhX8uk2RjtLzlrEN0A1o=; b=fMPtvI19YkG1Wc6L9x972jt82VQK7nH/ifv2d3Yu7ZrLCT0KyhgTWpAcK4Fp1VotDJ vLCSNvSQREBBDJqjGdulDjKBbISEWcb9koGy5Xhpgyd6lk6aPTZq9pCSu1RBtMX7FtxZ 0LOgH7yBYQ4PP6yGvKbcvBxbk6gmvNfIRE8WzNqU+4SQPAHXYZe+1VhW0Gl7woUQmAmq T2nMyuhzUKVAetC8OyHRvkoHxwhRYl5WH8n+toAbhWFaW87CtJf+e6tUETZucomJhUm7 +gn8g8clKpoSfm1wBfmuk2znGC6RmfLisb8T7iPWh+xwG1OxPYT2uMyWFVVXW1qxgOyX qHAA== X-Gm-Message-State: APjAAAUPGiic4a6YJdsofi/dcqGOKwLcteWYU9VoYpr3nmLa7yntQudW lDVceM3NnxAzAWamy0qQ8d9LYQ== X-Received: by 2002:a17:90a:8901:: with SMTP id u1mr5995266pjn.64.1575502102372; Wed, 04 Dec 2019 15:28:22 -0800 (PST) Received: from localhost (2001-44b8-1113-6700-7daa-d2ea-7edb-cfe8.static.ipv6.internode.on.net. [2001:44b8:1113:6700:7daa:d2ea:7edb:cfe8]) by smtp.gmail.com with ESMTPSA id v29sm8375949pgl.88.2019.12.04.15.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Dec 2019 15:28:21 -0800 (PST) From: Daniel Axtens To: Andrey Ryabinin , Andrew Morton Cc: Alexander Potapenko , Dmitry Vyukov , kasan-dev@googlegroups.com, Qian Cai , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Ryabinin Subject: Re: [PATCH 2/2] kasan: Don't allocate page tables in kasan_release_vmalloc() In-Reply-To: <20191204204534.32202-2-aryabinin@virtuozzo.com> References: <20191204204534.32202-1-aryabinin@virtuozzo.com> <20191204204534.32202-2-aryabinin@virtuozzo.com> Date: Thu, 05 Dec 2019 10:28:18 +1100 Message-ID: <87eexjekml.fsf@dja-thinkpad.axtens.net> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Andrey Ryabinin writes: Ah you beat me by a few hours, I was going to send a similar but slightly simpler patch - we should be able to use apply_to_page_range for the 'inner' part of the range and just walk the page table for the possible pages on the edges of the range. That means we could avoid a full, loop-driven page table walker. But I'd also be very open to generalising apply_to_page_range(); I think I'd add apply_to_existing_pages() and add an argument to the static walker functions. Let me try that out and we'll see what it looks like. Regards, Daniel > The purpose of kasan_release_vmalloc() is to unmap and deallocate shadow > memory. The usage of apply_to_page_range() isn't suitable in that scenario > because it allocates pages to fill missing page tables entries. > This also cause sleep in atomic bug: > > BUG: sleeping function called from invalid context at mm/page_alloc.c:4681 > in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 15087, name: > > Call Trace: > __dump_stack lib/dump_stack.c:77 [inline] > dump_stack+0x199/0x216 lib/dump_stack.c:118 > ___might_sleep.cold.97+0x1f5/0x238 kernel/sched/core.c:6800 > __might_sleep+0x95/0x190 kernel/sched/core.c:6753 > prepare_alloc_pages mm/page_alloc.c:4681 [inline] > __alloc_pages_nodemask+0x3cd/0x890 mm/page_alloc.c:4730 > alloc_pages_current+0x10c/0x210 mm/mempolicy.c:2211 > alloc_pages include/linux/gfp.h:532 [inline] > __get_free_pages+0xc/0x40 mm/page_alloc.c:4786 > __pte_alloc_one_kernel include/asm-generic/pgalloc.h:21 [inline] > pte_alloc_one_kernel include/asm-generic/pgalloc.h:33 [inline] > __pte_alloc_kernel+0x1d/0x200 mm/memory.c:459 > apply_to_pte_range mm/memory.c:2031 [inline] > apply_to_pmd_range mm/memory.c:2068 [inline] > apply_to_pud_range mm/memory.c:2088 [inline] > apply_to_p4d_range mm/memory.c:2108 [inline] > apply_to_page_range+0x77d/0xa00 mm/memory.c:2133 > kasan_release_vmalloc+0xa7/0xc0 mm/kasan/common.c:970 > __purge_vmap_area_lazy+0xcbb/0x1f30 mm/vmalloc.c:1313 > try_purge_vmap_area_lazy mm/vmalloc.c:1332 [inline] > free_vmap_area_noflush+0x2ca/0x390 mm/vmalloc.c:1368 > free_unmap_vmap_area mm/vmalloc.c:1381 [inline] > remove_vm_area+0x1cc/0x230 mm/vmalloc.c:2209 > vm_remove_mappings mm/vmalloc.c:2236 [inline] > __vunmap+0x223/0xa20 mm/vmalloc.c:2299 > __vfree+0x3f/0xd0 mm/vmalloc.c:2356 > __vmalloc_area_node mm/vmalloc.c:2507 [inline] > __vmalloc_node_range+0x5d5/0x810 mm/vmalloc.c:2547 > __vmalloc_node mm/vmalloc.c:2607 [inline] > __vmalloc_node_flags mm/vmalloc.c:2621 [inline] > vzalloc+0x6f/0x80 mm/vmalloc.c:2666 > alloc_one_pg_vec_page net/packet/af_packet.c:4233 [inline] > alloc_pg_vec net/packet/af_packet.c:4258 [inline] > packet_set_ring+0xbc0/0x1b50 net/packet/af_packet.c:4342 > packet_setsockopt+0xed7/0x2d90 net/packet/af_packet.c:3695 > __sys_setsockopt+0x29b/0x4d0 net/socket.c:2117 > __do_sys_setsockopt net/socket.c:2133 [inline] > __se_sys_setsockopt net/socket.c:2130 [inline] > __x64_sys_setsockopt+0xbe/0x150 net/socket.c:2130 > do_syscall_64+0xfa/0x780 arch/x86/entry/common.c:294 > entry_SYSCALL_64_after_hwframe+0x49/0xbe > > Add kasan_unmap_page_range() which skips empty page table entries instead > of allocating them. > > Fixes: 3c5c3cfb9ef4 ("kasan: support backing vmalloc space with real shadow memory") > Reported-by: Dmitry Vyukov > Signed-off-by: Andrey Ryabinin > --- > mm/kasan/common.c | 82 +++++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 68 insertions(+), 14 deletions(-) > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index a1e6273be8c3..e9ba7d8ad324 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -857,22 +857,77 @@ void kasan_unpoison_vmalloc(const void *start, unsigned long size) > kasan_unpoison_shadow(start, size); > } > > -static int kasan_depopulate_vmalloc_pte(pte_t *ptep, unsigned long addr, > - void *unused) > +static void kasan_unmap_pte_range(pmd_t *pmd, unsigned long addr, > + unsigned long end) > { > - unsigned long page; > + pte_t *pte; > > - page = (unsigned long)__va(pte_pfn(*ptep) << PAGE_SHIFT); > + pte = pte_offset_kernel(pmd, addr); > + do { > + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte); > > - spin_lock(&init_mm.page_table_lock); > + if (!pte_none(ptent)) > + __free_page(pte_page(ptent)); > + } while (pte++, addr += PAGE_SIZE, addr != end); > +} > > - if (likely(!pte_none(*ptep))) { > - pte_clear(&init_mm, addr, ptep); > - free_page(page); > - } > - spin_unlock(&init_mm.page_table_lock); > +static void kasan_unmap_pmd_range(pud_t *pud, unsigned long addr, > + unsigned long end) > +{ > + pmd_t *pmd; > + unsigned long next; > > - return 0; > + pmd = pmd_offset(pud, addr); > + do { > + next = pmd_addr_end(addr, end); > + if (pmd_none_or_clear_bad(pmd)) > + continue; > + kasan_unmap_pte_range(pmd, addr, next); > + } while (pmd++, addr = next, addr != end); > +} > + > +static void kasan_unmap_pud_range(p4d_t *p4d, unsigned long addr, > + unsigned long end) > +{ > + pud_t *pud; > + unsigned long next; > + > + pud = pud_offset(p4d, addr); > + do { > + next = pud_addr_end(addr, end); > + if (pud_none_or_clear_bad(pud)) > + continue; > + kasan_unmap_pmd_range(pud, addr, next); > + } while (pud++, addr = next, addr != end); > +} > + > +static void kasan_unmap_p4d_range(pgd_t *pgd, unsigned long addr, > + unsigned long end) > +{ > + p4d_t *p4d; > + unsigned long next; > + > + p4d = p4d_offset(pgd, addr); > + do { > + next = p4d_addr_end(addr, end); > + if (p4d_none_or_clear_bad(p4d)) > + continue; > + kasan_unmap_pud_range(p4d, addr, next); > + } while (p4d++, addr = next, addr != end); > +} > + > +static void kasan_unmap_page_range(unsigned long addr, unsigned long end) > +{ > + pgd_t *pgd; > + unsigned long next; > + > + pgd = pgd_offset_k(addr); > + do { > + next = pgd_addr_end(addr, end); > + if (pgd_none_or_clear_bad(pgd)) > + continue; > + kasan_unmap_p4d_range(pgd, addr, next); > + } while (pgd++, addr = next, addr != end); > } > > /* > @@ -978,9 +1033,8 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end, > shadow_end = kasan_mem_to_shadow((void *)region_end); > > if (shadow_end > shadow_start) { > - apply_to_page_range(&init_mm, (unsigned long)shadow_start, > - (unsigned long)(shadow_end - shadow_start), > - kasan_depopulate_vmalloc_pte, NULL); > + kasan_unmap_page_range((unsigned long)shadow_start, > + (unsigned long)shadow_end); > flush_tlb_kernel_range((unsigned long)shadow_start, > (unsigned long)shadow_end); > } > -- > 2.23.0