From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225KV49g0UHMNRWCw7umbM/4CXE5A2OrhfKNaf+DNsLJDDM8K4+VAY9xhHWtj49K7VaTER5U ARC-Seal: i=1; a=rsa-sha256; t=1517762941; cv=none; d=google.com; s=arc-20160816; b=nMIUl4x8eFSbU3G5jNK/s73SuxW/2BEm0/HU7PWrMrxrSqs+Zzw+Yf4/37Ki4fcFaL fCo1B34/kvPJRE/s3M0W2ItK+CR6wPfg1koJaM5JFJpS4smJgmG4pDRNMaSEQquraib9 qTA0tO4HW90zO3Mz0THBIZYxhSqOB4SUqYDAbVrGlcYqiK5nRnDSfgMb2ngJvbxzEEHk m1mjtS6ZrXkpYsknFXL7qht5CPsMR4IS+PWCpigzkVxdBOIiimsqZGkpHvDCBDaziRcq vX0ThBonRotAXkhSRJveY4HyEGFAmVfA8JUWEU4YhUcZ0tn4fqLj7yybgVq9qXOO59Hy 1FjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:delivered-to:list-id:list-subscribe:list-unsubscribe:list-help :list-post:precedence:mailing-list:arc-authentication-results; bh=l7roqBLRVLzDM4aj81m3Gm/yZfg4xdj1GitJFRaMfJ0=; b=oh8FZ7N4OwipUIVYxm78DsKW2vWdtruF0qGoI0d+w4LZQoka4KVyNjuWGonnsQzPww hK7vpJNx7JpV5vISb+kOkz3u2RIIYjsrl/2zRgYWcs8Z+rT/v7CXNiYufDELM3XxUdlQ 525y++t8Aej2+wny3z58SQ0k2yInFwclEN1mF6D0qNTuofCXpHv+VlHfuWIgyi5d7ji2 jOimAzrvW+1P0GhikViOTYiJjOGv8wu6fxh+8Fywg7zp4z95DMoYXehtzYgFkstmVVqO JPcOPtNkiezI/eG7ZShK22Wqupa/VTmh0nbx/6diaXKmRXuTCtFZRQDDXeQR4mTQgg8x k4pw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of kernel-hardening-return-11575-gregkh=linuxfoundation.org@lists.openwall.com designates 195.42.179.200 as permitted sender) smtp.mailfrom=kernel-hardening-return-11575-gregkh=linuxfoundation.org@lists.openwall.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of kernel-hardening-return-11575-gregkh=linuxfoundation.org@lists.openwall.com designates 195.42.179.200 as permitted sender) smtp.mailfrom=kernel-hardening-return-11575-gregkh=linuxfoundation.org@lists.openwall.com Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm List-Post: List-Help: List-Unsubscribe: List-Subscribe: From: Igor Stoppa To: , , , , , CC: , , , , , Igor Stoppa Subject: [PATCH 3/6] struct page: add field for vm_struct Date: Sun, 4 Feb 2018 18:47:29 +0200 Message-ID: <20180204164732.28241-4-igor.stoppa@huawei.com> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180204164732.28241-1-igor.stoppa@huawei.com> References: <20180204164732.28241-1-igor.stoppa@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.122.225.51] X-CFilter-Loop: Reflected X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1591489793963012538?= X-GMAIL-MSGID: =?utf-8?q?1591489793963012538?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: When a page is used for virtual memory, it is often necessary to obtian a handler to the corresponding vm_struct, which refers to the virtually continuous area generated when invoking vmalloc. The struct page has a "mapping" field, which can be re-used, to store a pointer to the parent area. This will avoid more expensive searches. As example, the function find_vm_area is reimplemented, to take advantage of the newly introduced field. Signed-off-by: Igor Stoppa --- include/linux/mm_types.h | 1 + mm/vmalloc.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index cfd0ac4e5e0e..2abd540b969f 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -56,6 +56,7 @@ struct page { void *s_mem; /* slab first object */ atomic_t compound_mapcount; /* first tail page */ /* page_deferred_list().next -- second tail page */ + struct vm_struct *area; }; /* Second double word */ diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 673942094328..44c5dfcb2fd7 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1466,13 +1466,16 @@ struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags, */ struct vm_struct *find_vm_area(const void *addr) { - struct vmap_area *va; + struct page *page; - va = find_vmap_area((unsigned long)addr); - if (va && va->flags & VM_VM_AREA) - return va->vm; + if (unlikely(!is_vmalloc_addr(addr))) + return NULL; - return NULL; + page = vmalloc_to_page(addr); + if (unlikely(!page)) + return NULL; + + return page->area; } /** @@ -1536,6 +1539,7 @@ static void __vunmap(const void *addr, int deallocate_pages) struct page *page = area->pages[i]; BUG_ON(!page); + page->area = NULL; __free_pages(page, 0); } @@ -1744,6 +1748,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, const void *caller) { struct vm_struct *area; + unsigned int page_counter; void *addr; unsigned long real_size = size; @@ -1769,6 +1774,9 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, kmemleak_vmalloc(area, size, gfp_mask); + for (page_counter = 0; page_counter < area->nr_pages; page_counter++) + area->pages[page_counter]->area = area; + return addr; fail: -- 2.16.0