From patchwork Thu Feb 29 23:43:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13577760 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A91C3C54E49 for ; Thu, 29 Feb 2024 23:43:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.687469.1070984 (Exim 4.92) (envelope-from ) id 1rfq3n-00035r-In; Thu, 29 Feb 2024 23:43:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 687469.1070984; Thu, 29 Feb 2024 23:43:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rfq3n-00035k-GD; Thu, 29 Feb 2024 23:43:31 +0000 Received: by outflank-mailman (input) for mailman id 687469; Thu, 29 Feb 2024 23:43:29 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rfq3l-00034g-R7 for xen-devel@lists.xenproject.org; Thu, 29 Feb 2024 23:43:29 +0000 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [2607:f8b0:4864:20::631]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5612cf85-d75c-11ee-afd8-a90da7624cb6; Fri, 01 Mar 2024 00:43:28 +0100 (CET) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1dcd6a3da83so11311245ad.3 for ; Thu, 29 Feb 2024 15:43:28 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:8f17]) by smtp.gmail.com with ESMTPSA id e12-20020a17090301cc00b001d90a67e10bsm2081312plh.109.2024.02.29.15.43.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 29 Feb 2024 15:43:24 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5612cf85-d75c-11ee-afd8-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709250207; x=1709855007; darn=lists.xenproject.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=ZYaENkYQ4G5HZw66zLSCBAz4c9QdNSpOW86RMIeSYNk=; b=HbvU+1D2788D3v57L/qKiGhMpnoULiHi2FjuIvjPkv/xH6oSvlJvdcmrwJo2wIKAE9 ANFTbBV+CWnZS94fTdWXmmFPjSZqDQuGpns0hhl3ia6q2REvpm0EFzx1edd9PPCdp8zG DwITDRQOJ3XC5x8V/eTys3D4Y8rSF6Ilq1TLoUCLSi71sUeinHP1WY/SjunUp92KHV2t cHOi1SpGxdxhR0iWuGhK78b/O8yGWyGJ1ZUbIRSdkuks7ic4oZJQY/dfOlhDJU0aiXC+ 4U0F6efzrC69YNx4xGFvHg/R39HnoMynaySNAbl6KObRnVJyyAzQJpEMwNL2gz8oIXdM u0Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709250207; x=1709855007; 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=ZYaENkYQ4G5HZw66zLSCBAz4c9QdNSpOW86RMIeSYNk=; b=k4CL4EaSPCxnYqPIuytArkRV0vmIUlG/aOV6WxIyuWFhXr8ZHVEoE0UTYXrPRER4af XWOiAmKizd5o1z9lbuyhwjmFk+bAVSa+pyC+v7uE5Y3V0ywWk9Kaibd+N65x55DW0viK CuiBvxJrfLNwJQuvctXeaocGpy3kMz+fkc8KkioQ6OgcFCUfGCSYf5+62qiOjlbTkAvq gH0ZUZA1BAhlvWmXHWb43WOn4ax0kpXzr3q37/YKt2tDb8TcmYlOwc34M2fdc3f5yIA0 MZI9Dm6YOAt9/Ka7n832rXQ4O3hvG6ZDJpvkF6LBATQCzYOa6nOtjRq/sA23yDOQ+Gj1 OUEA== X-Forwarded-Encrypted: i=1; AJvYcCWD0sl9aT8m7eHjJq3Eu7Tad5orfvJadv08t36VKU3pmvTU+aHEpAU13L0xEAiK8FohtIi5IEe17hWa+B4rpFGtJN/J7gPsjLRcOX2NMPY= X-Gm-Message-State: AOJu0Yw9YhT6ygvfZrrSUxGR6mbu+zpfONPV+kfZwLU7rjc4dL2VyeC3 YttQxTM/VvLr794T1hNcPC6oxXcz7FoHpe1Lefknwgtz/sejluqH X-Google-Smtp-Source: AGHT+IGkWYefSAJiD6V3UAHJP4h3dcMjAtD7ol2bRxxY1LAVjzWJTomMlC/1P8AOvCsvxgL62Mpd0g== X-Received: by 2002:a17:902:6847:b0:1dc:8790:6824 with SMTP id f7-20020a170902684700b001dc87906824mr50051pln.15.1709250204830; Thu, 29 Feb 2024 15:43:24 -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 v3 bpf-next 1/3] mm: Enforce VM_IOREMAP flag and range in ioremap_page_range. Date: Thu, 29 Feb 2024 15:43:14 -0800 Message-Id: <20240229234316.44409-2-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240229234316.44409-1-alexei.starovoitov@gmail.com> References: <20240229234316.44409-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 From: Alexei Starovoitov There are various users of get_vm_area() + ioremap_page_range() APIs. Enforce that get_vm_area() was requested as VM_IOREMAP type and range passed to ioremap_page_range() matches created vm_area to avoid accidentally ioremap-ing into wrong address range. Reviewed-by: Christoph Hellwig Signed-off-by: Alexei Starovoitov --- mm/vmalloc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d12a17fc0c17..f42f98a127d5 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -307,8 +307,21 @@ static int vmap_range_noflush(unsigned long addr, unsigned long end, int ioremap_page_range(unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot) { + struct vm_struct *area; int err; + area = find_vm_area((void *)addr); + if (!area || !(area->flags & VM_IOREMAP)) { + WARN_ONCE(1, "vm_area at addr %lx is not marked as VM_IOREMAP\n", addr); + return -EINVAL; + } + if (addr != (unsigned long)area->addr || + (void *)end != area->addr + get_vm_area_size(area)) { + WARN_ONCE(1, "ioremap request [%lx,%lx) doesn't match vm_area [%lx, %lx)\n", + addr, end, (long)area->addr, + (long)area->addr + get_vm_area_size(area)); + return -ERANGE; + } err = vmap_range_noflush(addr, end, phys_addr, pgprot_nx(prot), ioremap_max_page_shift); flush_cache_vmap(addr, end); From patchwork Thu Feb 29 23:43:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13577761 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7643C54798 for ; Thu, 29 Feb 2024 23:43:42 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.687470.1070994 (Exim 4.92) (envelope-from ) id 1rfq3q-0003Ms-Pj; Thu, 29 Feb 2024 23:43:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 687470.1070994; Thu, 29 Feb 2024 23:43:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rfq3q-0003Mh-Mn; Thu, 29 Feb 2024 23:43:34 +0000 Received: by outflank-mailman (input) for mailman id 687470; Thu, 29 Feb 2024 23:43:33 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rfq3p-0002pa-JQ for xen-devel@lists.xenproject.org; Thu, 29 Feb 2024 23:43:33 +0000 Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [2607:f8b0:4864:20::d2d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 58391cc9-d75c-11ee-a1ee-f123f15fe8a2; Fri, 01 Mar 2024 00:43:32 +0100 (CET) Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-7c7476a11e0so85423139f.3 for ; Thu, 29 Feb 2024 15:43:31 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:8f17]) by smtp.gmail.com with ESMTPSA id r19-20020aa78453000000b006e4dad633e1sm1850278pfn.177.2024.02.29.15.43.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 29 Feb 2024 15:43:30 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 58391cc9-d75c-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709250210; x=1709855010; darn=lists.xenproject.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=8fSQQtv9Pdd1jRnQzOfB2+LAkUYgIfVtnLn4umtyxEI=; b=NSaokjsAWAl7udivLZ4z2OBEEW7b44fsKBXpvFhP7Y//L9NwnUrHQZK2tTpXSkRWVQ qKYmLhGkCCHCFOJ/2QuP+kDKMPWSw4FjkvFOQsjYjuFUfb3bFaB5FiVqfvino21p7n0x EIswM0HWCVW9RsRAZZFoei2wjfNwQq+1L2wAsn+JrpDiTRfQLWKLsQbmI7zqFybku8dS Qcv+qyDuoeEbMpB8KV6tM4CkVDD2WyoJ9UogJo5mg1cM02SYEeGLyIIM9J0Y/+4lDjxF pjaXOlPwjY78r/3flkdM0/T9smh34vG+6pipdO6Cf5Oj5g7iB5lozkijJKXYeDJkvyQJ SjNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709250210; x=1709855010; 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=8fSQQtv9Pdd1jRnQzOfB2+LAkUYgIfVtnLn4umtyxEI=; b=Tw6FnB5OInUCs7+VDvSxkgaPYdMNV1unmA5Naxi8rHA7WHnxeEZfr8znuuRzKATKUK vM2CrfnKnj23dRtfBbj7l1ThQdJzol/0hvTjnIoTtNosj7KfnWjxgGfTAaczuK/HKH53 fvLjDxQuS6L63P6D7cRUADfio4OPUTFKIwO9B7BIrOsBZ5WcFX9VPZVPUIPK09WSm1Wq hkDx16mKIo5CK3qHlz+0TA6qHcv+mYitXFNX+Ek6u6joNvkPW54hUgc9JAn3ubghKTm1 18eNpkpRWnuImHKUDwB8rn4xQtGNGbSQut0WN1KV82MsPTh4WMTpngxhzEezOHRP8EF7 QDIQ== X-Forwarded-Encrypted: i=1; AJvYcCWWlcfg9U6j7ODRz+8JupM5Kiq5mXvhRbWm63GQ9VehpJz6xcFFXiV6ccnbWR38Ii3bm0skFR5TatHZ7a1ghARr9mx8vFXLIp6ddzJ8aOY= X-Gm-Message-State: AOJu0YxYFMp+WOilbpeNvzH+U+zSOXNfBmfPooUTIXTAKFTBhJVm92KW ikyA3a51tjLGGs5dP/c32MI5r8R/7XPlpEDhFzGlRRv8DQNU+r+U X-Google-Smtp-Source: AGHT+IEjOcNXmJRmdRJJTTrs5fHGw0wy4T92DO/fjxQ1ryFJYxgxzO1wRU4PulyZo16hmDAMpzbQcA== X-Received: by 2002:a05:6e02:148e:b0:365:a6a2:24b with SMTP id n14-20020a056e02148e00b00365a6a2024bmr273922ilk.17.1709250210665; Thu, 29 Feb 2024 15:43:30 -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 v3 bpf-next 2/3] mm, xen: Separate xen use cases from ioremap. Date: Thu, 29 Feb 2024 15:43:15 -0800 Message-Id: <20240229234316.44409-3-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240229234316.44409-1-alexei.starovoitov@gmail.com> References: <20240229234316.44409-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 From: Alexei Starovoitov xen grant table and xenbus ring are not ioremap the way arch specific code is using it, so let's add VM_XEN flag to separate these use cases from VM_IOREMAP users. xen will not and should not be calling ioremap_page_range() on that range. /proc/vmallocinfo will print such regions as "xen" instead of "ioremap". Signed-off-by: Alexei Starovoitov --- arch/x86/xen/grant-table.c | 2 +- drivers/xen/xenbus/xenbus_client.c | 2 +- include/linux/vmalloc.h | 1 + mm/vmalloc.c | 7 +++++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c index 1e681bf62561..b816db0349c4 100644 --- a/arch/x86/xen/grant-table.c +++ b/arch/x86/xen/grant-table.c @@ -104,7 +104,7 @@ static int arch_gnttab_valloc(struct gnttab_vm_area *area, unsigned nr_frames) area->ptes = kmalloc_array(nr_frames, sizeof(*area->ptes), GFP_KERNEL); if (area->ptes == NULL) return -ENOMEM; - area->area = get_vm_area(PAGE_SIZE * nr_frames, VM_IOREMAP); + area->area = get_vm_area(PAGE_SIZE * nr_frames, VM_XEN); if (!area->area) goto out_free_ptes; if (apply_to_page_range(&init_mm, (unsigned long)area->area->addr, diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c index 32835b4b9bc5..b9c81a2d578b 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c @@ -758,7 +758,7 @@ static int xenbus_map_ring_pv(struct xenbus_device *dev, bool leaked = false; int err = -ENOMEM; - area = get_vm_area(XEN_PAGE_SIZE * nr_grefs, VM_IOREMAP); + area = get_vm_area(XEN_PAGE_SIZE * nr_grefs, VM_XEN); if (!area) return -ENOMEM; if (apply_to_page_range(&init_mm, (unsigned long)area->addr, diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index c720be70c8dd..71075ece0ed2 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -28,6 +28,7 @@ struct iov_iter; /* in uio.h */ #define VM_FLUSH_RESET_PERMS 0x00000100 /* reset direct map and flush TLB on unmap, can't be freed in atomic context */ #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 grant table and xenbus use cases */ #if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && \ !defined(CONFIG_KASAN_VMALLOC) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index f42f98a127d5..d53ece3f38ee 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3822,9 +3822,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))) + else if (!(vm && (vm->flags & (VM_IOREMAP | VM_XEN)))) copied = aligned_vread_iter(iter, addr, n); - else /* IOREMAP area is treated as memory hole */ + else /* IOREMAP | XEN area is treated as memory hole */ copied = zero_iter(iter, n); addr += copied; @@ -4415,6 +4415,9 @@ static int s_show(struct seq_file *m, void *p) if (v->flags & VM_IOREMAP) seq_puts(m, " ioremap"); + if (v->flags & VM_XEN) + seq_puts(m, " xen"); + if (v->flags & VM_ALLOC) seq_puts(m, " vmalloc"); From patchwork Thu Feb 29 23:43:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13577762 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91EF0C48BF6 for ; Thu, 29 Feb 2024 23:43:46 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.687471.1071003 (Exim 4.92) (envelope-from ) id 1rfq3v-0003gs-3f; Thu, 29 Feb 2024 23:43:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 687471.1071003; Thu, 29 Feb 2024 23:43:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rfq3v-0003gl-0d; Thu, 29 Feb 2024 23:43:39 +0000 Received: by outflank-mailman (input) for mailman id 687471; Thu, 29 Feb 2024 23:43:37 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rfq3t-0002pa-Qz for xen-devel@lists.xenproject.org; Thu, 29 Feb 2024 23:43:37 +0000 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [2607:f8b0:4864:20::429]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5a97006e-d75c-11ee-a1ee-f123f15fe8a2; Fri, 01 Mar 2024 00:43:36 +0100 (CET) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6e59bbdd8c7so997186b3a.3 for ; Thu, 29 Feb 2024 15:43:36 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:8f17]) by smtp.gmail.com with ESMTPSA id r8-20020aa79ec8000000b006e50cedb59bsm1850608pfq.16.2024.02.29.15.43.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 29 Feb 2024 15:43:33 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5a97006e-d75c-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709250214; x=1709855014; darn=lists.xenproject.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=GGmuzG0BuzfpsyKgKDkTT6Enikl3D6AjMcJQdJLpWcI=; b=l2E3fNaajwujBe9DCGj69BvfC3VHTNVd4Xud9rR9o6BqgGx3OHagpwPaohBqjCWXUg jOUrgiYPAT/nFqF305EjfqbpW7e5Kyp3KsqyW2SAcyoCFs0z5roqhrAMiGUtZS8xBvJp UBpqzf19MUa8AJidNH6jMAEjh7uMVhe+XVm95rPsiVO3ohKxpAOYeH/r5NJQhc8u4WT2 kp0rC7UOeuzLxv9lJQtgclwDTce/xuLY7o3OUionhSs1Xw4o52LyiSm6KBuB+ejf+STJ ZVEgLii/DOLZjwZcmMqTrxLUlhETuubrKPOF1zgjn+z3ZOAcqVOyTSu63tRQEQ6vnJhL 13RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709250214; x=1709855014; 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=GGmuzG0BuzfpsyKgKDkTT6Enikl3D6AjMcJQdJLpWcI=; b=xRNgxi74oTeCqH4klNgHBCoR/7P2biFt4g92j39BT8aq1kCd822iQThaD6ng0Xqei6 2ZJ7lSOUaSODpm/5jnMk5pMBlbtEFzycd5Yo4osrfjlvtgJnVqtkWaSLbv1RplyumgJd fbxKDYykOR8M1odpNyCEM3nuvouG7zAGrQJjn0Vk7p1UKkSF8lqu5nnFyTYZdHfB0EYn lsL3/BBh6k0pJgntbx++YkruDVFO2VbPvx5nI1dmuEVmun32RDu2bka3o2SQbEUTnh0t x/7FmaS6qQsMq5Au580bpiWTaY+Xg8E+CRuKNziM6y1yd1XjNnLesR5bYm2oYJnfUQJp W8hA== X-Forwarded-Encrypted: i=1; AJvYcCVtCKG0FiA1SnBWgZFXOB8Y9b6WSsmpDROZlN2LW/2uGU1BqKiTdlLCzXj6jU484488aFx0P/mBkMttAbHRXIngGNdfk7rvSRvuVrFjZcg= X-Gm-Message-State: AOJu0Yx231nhX0lzkgIPcctbkTy+x/BqiUBO/xKKHAmXPoeccEz7Hhvs MRWyoBUZLtwedQpSO1QlbWKCiEjYT7OzAZfqp6Gz0cax1CCv31jR X-Google-Smtp-Source: AGHT+IHI1rET3Z0/K8864m6GkWZwYbKsdcM+bbhi3ZQPOLm9p/XFzMkvrTJzDnJ+bGJeFJuwnOye6Q== X-Received: by 2002:a05:6a00:92a2:b0:6e4:84db:e30e with SMTP id jw34-20020a056a0092a200b006e484dbe30emr186581pfb.32.1709250214399; Thu, 29 Feb 2024 15:43:34 -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 v3 bpf-next 3/3] mm: Introduce VM_SPARSE kind and vm_area_[un]map_pages(). Date: Thu, 29 Feb 2024 15:43:16 -0800 Message-Id: <20240229234316.44409-4-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240229234316.44409-1-alexei.starovoitov@gmail.com> References: <20240229234316.44409-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 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 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: // request virtual memory region during bpf prog verification area = get_vm_area(area_size, VM_SPARSE); // on demand vm_area_map_pages(area, kaddr, kend, pages); vm_area_unmap_pages(area, kaddr, kend); // after bpf program is detached and unloaded free_vm_area(area); Signed-off-by: Alexei Starovoitov --- include/linux/vmalloc.h | 5 ++++ mm/vmalloc.c | 59 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 71075ece0ed2..dfbcfb9f9a08 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 grant table and xenbus 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,10 @@ static inline bool is_vm_area_hugepages(const void *addr) } #ifdef CONFIG_MMU +int vm_area_map_pages(struct vm_struct *area, unsigned long start, + unsigned long end, struct page **pages); +void vm_area_unmap_pages(struct vm_struct *area, unsigned long start, + unsigned long end); 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 d53ece3f38ee..dae98b1f78a8 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -648,6 +648,58 @@ static int vmap_pages_range(unsigned long addr, unsigned long end, return err; } +static int check_sparse_vm_area(struct vm_struct *area, unsigned long start, + unsigned long end) +{ + 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 ((end - start) >> PAGE_SHIFT > totalram_pages()) + return -E2BIG; + if (start < (unsigned long)area->addr || + (void *)end > area->addr + get_vm_area_size(area)) + return -ERANGE; + return 0; +} + +/** + * vm_area_map_pages - map pages inside given sparse vm_area + * @area: vm_area + * @start: start address inside vm_area + * @end: end address inside vm_area + * @pages: pages to map (always PAGE_SIZE pages) + */ +int vm_area_map_pages(struct vm_struct *area, unsigned long start, + unsigned long end, struct page **pages) +{ + int err; + + err = check_sparse_vm_area(area, start, end); + if (err) + return err; + + return vmap_pages_range(start, end, PAGE_KERNEL, pages, PAGE_SHIFT); +} + +/** + * vm_area_unmap_pages - unmap pages inside given sparse vm_area + * @area: vm_area + * @start: start address inside vm_area + * @end: end address inside vm_area + */ +void vm_area_unmap_pages(struct vm_struct *area, unsigned long start, + unsigned long end) +{ + if (check_sparse_vm_area(area, start, end)) + return; + + vunmap_range(start, end); +} + int is_vmalloc_or_module_addr(const void *x) { /* @@ -3822,9 +3874,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 +4470,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");