From patchwork Fri Feb 23 23:57:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13570155 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17B32C54798 for ; Fri, 23 Feb 2024 23:57:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 991246B0082; Fri, 23 Feb 2024 18:57:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 941516B0083; Fri, 23 Feb 2024 18:57:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 795366B0085; Fri, 23 Feb 2024 18:57:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 640806B0082 for ; Fri, 23 Feb 2024 18:57:47 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3CDCC1A108B for ; Fri, 23 Feb 2024 23:57:47 +0000 (UTC) X-FDA: 81824733774.25.28AEBA2 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf08.hostedemail.com (Postfix) with ESMTP id 64893160005 for ; Fri, 23 Feb 2024 23:57:45 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="Fb4t3/FU"; spf=pass (imf08.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708732665; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4T/JxyeGclar7cIIHLQMvHUD6oGOKffCuXl9nke3dJg=; b=vpOrRLRRhzgQkiBCBvMFPlK9dxj2rC3kmBVC5o5xk1khaTmPpj6W8CKoJeuM6aqfNi0KBB 2m/tMNTisS14eZTn7jBR9Rcta7wfL0ng3H7pMXQfQDqR7Q4kKvtlNjRhcXAr8P2qaffJXO OfdOWArcdqDL3KLv8Eboe+A7CfS2Ytw= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="Fb4t3/FU"; spf=pass (imf08.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708732665; a=rsa-sha256; cv=none; b=OasISChAjJJfdTh0xqqo2Y9QsowspFODZtWiu4uW0Mu5GPMBrbfBYRv7K9R8Yi3ToWyTOx vp2ErHjbAvro59T2AyhkF1ce2MT6/Hrmu0lvjwt79/Hplc50WH0XrK3TRyeKiYq5kZlRFU Zc05Chzz6wdHbIWLqJo4HxUgOkjCl3I= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1dbd32cff0bso7456165ad.0 for ; Fri, 23 Feb 2024 15:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708732664; x=1709337464; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4T/JxyeGclar7cIIHLQMvHUD6oGOKffCuXl9nke3dJg=; b=Fb4t3/FU5y25AX9sI8W2zLZrvJ2xzNSyOIMEBkjisQA8eF/J1/5Um2CXGP5GdUn4mi Vvvf5EmvvMolx9Lsyi1/NOvhm249aZzE73CwZRVZH9WyHoYkc7qpE+0JWUUes8yWBL2D gsPyQil3hsLNPluCPxtvQj9YvDGvKUxqmnQrgAV9y9MpecwrbKP+mPQmRMfcdGNJtIq+ P+sEvEPXQOcqODsMX6g3mHO1Aj0flEI75YpsmfyA1xwV1qKgKr/uY01NBBaU2x056AJV vzSG1/bcBrjuFOcq+OsHrJUgg+atOw2OvU9xxIGt6WZxubG/NqtWXjr8qYn9gpBpOHK+ 1YRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708732664; x=1709337464; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4T/JxyeGclar7cIIHLQMvHUD6oGOKffCuXl9nke3dJg=; b=j842n3WNhXrPLgxhYHbS9Sx19d/mu9WtQlXxS20G+zrdmiu8o4X70DZs4hLc6HhJ7f g/SnZEp5g6dsr7O7lPGtc0VBb80xZPorzr9hOcrH+oHAbG4qDThoC4ul5eBGJBbK8VlT JE08S+sx8TkC/vE/iW80dWpaP3i0tiRc/Zk4iNM/QnCfUWrIUimoTGKTzaeEChXno0BF ufnZcoCpv4FbwvMPpv3fEHyXdq7gnj9NzVf2/4GsPkzefiE5cK6Aal02y0nmQaoXhP3z GeLKKVjK+z/TRvrV8xnMMeEIU/kQcdKBd90Sb90sAhwdYus+L4tEO7bRn5+zr7eSx1bS nzdA== X-Forwarded-Encrypted: i=1; AJvYcCVS9UnG8m+rgpoQMYBpG4zLvxHaVt++LIZ7yIOVHnroej5xzRetklrWio/FT8nOcgsdc2XzBVKLOysAcgIz8CCSTKQ= X-Gm-Message-State: AOJu0YwskyPKbofRUb4Od4OpjOJfRKAmKomeJpIfU67tJNOI/7FBu3cP N8V5vs8sylukDeCrqDjsXoNhWf7UvtPm2/QfYmOYplzEanqpZQ4H X-Google-Smtp-Source: AGHT+IGrC0E10ADJh+Q28iXnJRIwpr5YwuUUqZaBfkmopbBhR99u1mcgLWatOYemqm7CQuFVwzUw8A== X-Received: by 2002:a17:902:c40d:b0:1d9:d341:b150 with SMTP id k13-20020a170902c40d00b001d9d341b150mr1582992plk.40.1708732664121; Fri, 23 Feb 2024 15:57:44 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::4:45de]) by smtp.gmail.com with ESMTPSA id d11-20020a170902728b00b001dc23e877c1sm6175189pll.265.2024.02.23.15.57.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 23 Feb 2024 15:57:43 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, torvalds@linux-foundation.org, brho@google.com, hannes@cmpxchg.org, lstoakes@gmail.com, akpm@linux-foundation.org, urezki@gmail.com, hch@infradead.org, boris.ostrovsky@oracle.com, sstabellini@kernel.org, jgross@suse.com, linux-mm@kvack.org, xen-devel@lists.xenproject.org, kernel-team@fb.com Subject: [PATCH v2 bpf-next 3/3] mm: Introduce VM_SPARSE kind and vm_area_[un]map_pages(). Date: Fri, 23 Feb 2024 15:57:28 -0800 Message-Id: <20240223235728.13981-4-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240223235728.13981-1-alexei.starovoitov@gmail.com> References: <20240223235728.13981-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 64893160005 X-Rspam-User: X-Stat-Signature: 947stxng4guho8fi9s6ue1e676w9u1ic X-Rspamd-Server: rspam01 X-HE-Tag: 1708732665-364946 X-HE-Meta: U2FsdGVkX1+cWQfuS0nuAQPT/bFvMjfqZEwtbULG3sZ08VlOv8D/W96Dlz0a48/cbkSlhKLyOlhjp6K1y+PcH4Jg0FuoXsVLrkSmLuwNltaaDGdOJHLbvrlTvdmF3Zi/k2eBw3o5KgYw5GamB9yHHmBecoKN6TyqZ6f92NE8gXCDobwq0mctNyz4ywDi9JAtdxYaHv7eGjQ6BTTd3R8iWrtpOIIC/0JFZUFdHyCo0EH+Nv3tX/5xijGKUM6aFUrvXLnxDwE0DiQ3y8kK5Bf80Re3pIwn63ApBFedB9czU9pcspelnMCWPbpEGwWwl7g+Vpk4Sb6kDDWbYH+P5XikNIr5iI43k1Kgydyrm6TlHcWUf3LUmLIOWeZ1QmHA3ryBFzUmigq8Nj/RV7Y1B/hqKOWsw8bBGCPGQHVZvpcwfgRdJd2aRCj4UJmGEL/qQGKVFQM2RvOFM9APtUjXFioz7ehklb1AMivbp2a3Ys364uhf0vyJguJ90tIPXSsKYLKtkQteRLFP1MXv9/vRWIgRy1PQvqiCRDx21DD7vHZtTsUo3NbllWXmXSJh7h+WOYWtZA/3zb0iXrQS3eJYLJ1IGA3uZHh+VeyJsDfmKQS9haP+4SiUhI8ihKfca+PeylBEIBdLJGA/zYQx4KAwN12EbThfKENqnHIAouJieRfK/hfI9FEjQ8HntHhGhlME6kh0lUGm5USuIZW6I2dOhW9O48JAF0+F+JncfUKvOUpeOvcahSCnCIcE5slC7YpI6ee1zN4xdxkyKbplit5iAfnNn/QgyO6Ymgw38+2jWQgN0oSYdGXy17npAPope+DFSUDwi+TNki3tYGkIx7QKeZyQ9VOWNT/IMQnXBzfveJ2aMinJVueMG+704p7qeBa6WFdMZDXABXn4uvjdr9GxTXIXG0ujK0NLXB/iX2gSMmElq+ZNm4BXMOUGaXN2roHPJS6mKXHASWIG1gTn/x427d7 jnfggq+N nLNBPvFDxmPjnt4nR7M/IsK/Jzi9jhVrHuc2VrFuUovtZisgZAQNt2dU0Es9cESmv6AfIB4aEldquL49ECvgkZefKam75Y93mQqEU6qinaV7YMSN1MlrC3gQo83o6F20OlqSIrS1v8qVOlrZd/L9MHpLzDtqtkHwnxn5c4h8ARyddopGJWvb9jFuHRZ26/gKSVq2MWFxCKz/K4TfVPQhmO3MuSrImJyEyOb7IA+iNLqoJt2Nn7vD0G+O419FzIXE4xuYgvU6fn4Sz/3ZmKnN101rNbAoUCPi2HzmrjSC81O34vI2rJWXRPDknpptLn9fesBNHbQVAP1t0TogRcE5MyikvFbT4BTwML5rEJVeLwKL9XZzATy1amLtfbNnFj6h9C+WZs+3QtErgvZByouGOtVML0OrA5IjNFKA9gcaWWHSU+XYvEJcvRoPXs4QOULzT5Kv+vu4hNQccg8DcUEukOdCFdVNPifLA1rVVgU68pVFFUW/yWovUnDJIc8QHiKR31Bi2eVHXC109F1H5GJdbNK7jjuziSx2h48YqfnI+N/LHIrWxObyj/s4AV8LRRwOyj5Ns0oK5iMSKYrFgRvs/LIunM+J6WtAyizpN 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: List-Subscribe: List-Unsubscribe: From: Alexei Starovoitov vmap/vmalloc APIs are used to map a set of pages into contiguous kernel virtual space. get_vm_area() with appropriate flag is used to request an area of kernel address range. It'se used for vmalloc, vmap, ioremap, xen use cases. - vmalloc use case dominates the usage. Such vm areas have VM_ALLOC flag. - the areas created by vmap() function should be tagged with VM_MAP. - ioremap areas are tagged with VM_IOREMAP. - xen use cases are VM_XEN. BPF would like to extend the vmap API to implement a lazily-populated sparse, yet contiguous kernel virtual space. Introduce VM_SPARSE vm_area flag and vm_area_map_pages(area, start_addr, count, pages) API to map a set of pages within a given area. It has the same sanity checks as vmap() does. It also checks that get_vm_area() was created with VM_SPARSE flag which identifies such areas in /proc/vmallocinfo and returns zero pages on read through /proc/kcore. The next commits will introduce bpf_arena which is a sparsely populated shared memory region between bpf program and user space process. It will map privately-managed pages into a sparse vm area with the following steps: area = get_vm_area(area_size, VM_SPARSE); // at bpf prog verification time vm_area_map_pages(area, kaddr, 1, page); // on demand // it will return an error if kaddr is out of range vm_area_unmap_pages(area, kaddr, 1); free_vm_area(area); // after bpf prog is unloaded Signed-off-by: Alexei Starovoitov --- include/linux/vmalloc.h | 4 +++ mm/vmalloc.c | 55 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 223e51c243bc..416bc7b0b4db 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -29,6 +29,7 @@ struct iov_iter; /* in uio.h */ #define VM_MAP_PUT_PAGES 0x00000200 /* put pages and free array in vfree */ #define VM_ALLOW_HUGE_VMAP 0x00000400 /* Allow for huge pages on archs with HAVE_ARCH_HUGE_VMALLOC */ #define VM_XEN 0x00000800 /* xen use cases */ +#define VM_SPARSE 0x00001000 /* sparse vm_area. not all pages are present. */ #if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && \ !defined(CONFIG_KASAN_VMALLOC) @@ -233,6 +234,9 @@ static inline bool is_vm_area_hugepages(const void *addr) } #ifdef CONFIG_MMU +int vm_area_map_pages(struct vm_struct *area, unsigned long addr, unsigned int count, + struct page **pages); +int vm_area_unmap_pages(struct vm_struct *area, unsigned long addr, unsigned int count); void vunmap_range(unsigned long addr, unsigned long end); static inline void set_vm_flush_reset_perms(void *addr) { diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d769a65bddad..a05dfbbacb78 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -648,6 +648,54 @@ static int vmap_pages_range(unsigned long addr, unsigned long end, return err; } +/** + * vm_area_map_pages - map pages inside given vm_area + * @area: vm_area + * @addr: start address inside vm_area + * @count: number of pages + * @pages: pages to map (always PAGE_SIZE pages) + */ +int vm_area_map_pages(struct vm_struct *area, unsigned long addr, unsigned int count, + struct page **pages) +{ + unsigned long size = ((unsigned long)count) * PAGE_SIZE; + unsigned long end = addr + size; + + might_sleep(); + if (WARN_ON_ONCE(area->flags & VM_FLUSH_RESET_PERMS)) + return -EINVAL; + if (WARN_ON_ONCE(area->flags & VM_NO_GUARD)) + return -EINVAL; + if (WARN_ON_ONCE(!(area->flags & VM_SPARSE))) + return -EINVAL; + if (count > totalram_pages()) + return -E2BIG; + if (addr < (unsigned long)area->addr || (void *)end > area->addr + area->size) + return -ERANGE; + + return vmap_pages_range(addr, end, PAGE_KERNEL, pages, PAGE_SHIFT); +} + +/** + * vm_area_unmap_pages - unmap pages inside given vm_area + * @area: vm_area + * @addr: start address inside vm_area + * @count: number of pages to unmap + */ +int vm_area_unmap_pages(struct vm_struct *area, unsigned long addr, unsigned int count) +{ + unsigned long size = ((unsigned long)count) * PAGE_SIZE; + unsigned long end = addr + size; + + if (WARN_ON_ONCE(!(area->flags & VM_SPARSE))) + return -EINVAL; + if (addr < (unsigned long)area->addr || (void *)end > area->addr + area->size) + return -ERANGE; + + vunmap_range(addr, end); + return 0; +} + int is_vmalloc_or_module_addr(const void *x) { /* @@ -3822,9 +3870,9 @@ long vread_iter(struct iov_iter *iter, const char *addr, size_t count) if (flags & VMAP_RAM) copied = vmap_ram_vread_iter(iter, addr, n, flags); - else if (!(vm && (vm->flags & (VM_IOREMAP | VM_XEN)))) + else if (!(vm && (vm->flags & (VM_IOREMAP | VM_XEN | VM_SPARSE)))) copied = aligned_vread_iter(iter, addr, n); - else /* IOREMAP|XEN area is treated as memory hole */ + else /* IOREMAP|XEN|SPARSE area is treated as memory hole */ copied = zero_iter(iter, n); addr += copied; @@ -4418,6 +4466,9 @@ static int s_show(struct seq_file *m, void *p) if (v->flags & VM_XEN) seq_puts(m, " xen"); + if (v->flags & VM_SPARSE) + seq_puts(m, " sparse"); + if (v->flags & VM_ALLOC) seq_puts(m, " vmalloc");