From patchwork Fri Feb 23 23:57:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13570154 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 54B45C54798 for ; Fri, 23 Feb 2024 23:57:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D641F6B0080; Fri, 23 Feb 2024 18:57:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D11B76B0081; Fri, 23 Feb 2024 18:57:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B64E76B0082; Fri, 23 Feb 2024 18:57:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9CAA26B0080 for ; Fri, 23 Feb 2024 18:57:43 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4D910A189F for ; Fri, 23 Feb 2024 23:57:43 +0000 (UTC) X-FDA: 81824733606.21.16708CB Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf17.hostedemail.com (Postfix) with ESMTP id 778154000C for ; Fri, 23 Feb 2024 23:57:41 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=CEVqy5W4; spf=pass (imf17.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.178 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=1708732661; a=rsa-sha256; cv=none; b=5ez/WC7peRUXwjN1P34A5VSOh1+8DGsaPWLGhAX3TRghGSslRongYO0d9l3LJ0Phtv3vVS ZHajO+tsU3A1DtccL+T/Db8L8Oo7fjapmpepF8HV0Lj07dtqPpueD1fN11jLCJd6W8fmhV 2DNXkQNTjC5ZzAQHvosSEJcCx80Vyh0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=CEVqy5W4; spf=pass (imf17.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.178 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=1708732661; 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=Wgy7UuZvicma9Y2PX48aaJ5ZDCArBODZAL7mSlN3pk0=; b=VxKykIz2IDDyC/jgqyb+868NySvN394a7Cilfooqr3TRwl96xmq4aHBhLd+fBlGxB01Wi3 pBuqr/kay3SaWXVAZjkBK5PtVPeccDtwDjihTAngzKksLqhtAut1RggZUD/Rlle/WvRDtg mlOilw5Squ82ZbfrFsDfNHl1qsHcyy8= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1dba177c596so9945825ad.0 for ; Fri, 23 Feb 2024 15:57:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708732660; x=1709337460; 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=Wgy7UuZvicma9Y2PX48aaJ5ZDCArBODZAL7mSlN3pk0=; b=CEVqy5W435RfHUtYxOCib6ENbSu9SGCVqm9+UafHQCz9lPDx0M5gqUexFsKoaydNAC NBJ+PV6IBZsaG3ckOx11SZ3sr205u2I5LDYFe63itnglWqWZMuprgWo8yGo1d7qsYvk8 8lzUwhqzjSIgL1XmcG6Q74fJooAC43djtIXKhTrpljWfdYu+6R0aiw1xxozHYsI0Gx+G FQaxfVH1ZW+zWBlbjvST0Agmc0KlzK2aLPpyStkw4knKtE4+jy2vF0JUdICF+2NvvWGd PM9ImIM+tSrbIrnLy5jhBFGDPUKGy+Vgf6HfE/KqOgnB7tR40RK/eVf0B61hx6em0jl+ ZIdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708732660; x=1709337460; 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=Wgy7UuZvicma9Y2PX48aaJ5ZDCArBODZAL7mSlN3pk0=; b=gP7IXwHRgHZzxnylOx7/6HyghgoC0pT0zS56C7ZBatVoieAuJ950u9jvHXNEY75EIj gcnSWRLAdRkVugGTls1o9AtBGV+bOSWZGoJ2SxarrRM3VJC97aQIrF9Tu47JdgXP/Fir EpCI3KwInf1uV6+g/71wpc8IYTGv843uvwPoLzyfVINjVv383AP6vLAe990/t3jdZ8Ox D7Cxq3e8wx574JqNxIWPJK4ak1vdy0qYf/LFK2ueciFfaTlG0m/NILfRyj6dl+Ri4CNo pB3Rp6hANTQ2CG3Om1KtUDxGDrRVUB3WzaWZWrZmVQm7d4gkyfOuNXgZENKmC0rE3o/Q hDBA== X-Forwarded-Encrypted: i=1; AJvYcCXXx7MuiOKjCVDW3jTtrB3rZ2Ij3iXQfiFBlExcG9Au+TMwpeW1sjg1qqe/7iaBOP3Kvei4IqA4gxv4qdnwpBdvZ+M= X-Gm-Message-State: AOJu0Yzjc/U10C9uGVhnAutqT0nF33unzE1ndcpdfx1j2ANPEPA9B67T shZV5kSD9wXsolIZeQVCtQwjBdKxYZ4kNhwzkOCiaGsGG251A6aR X-Google-Smtp-Source: AGHT+IGELhXnvr3n524zH97gDxBoJwFKXzefQUh+8dOBuQvkiJz95RKjpkB2JqjALLNdOQ3Mm4DyFA== X-Received: by 2002:a17:902:f645:b0:1dc:b64:13cd with SMTP id m5-20020a170902f64500b001dc0b6413cdmr1551144plg.27.1708732660213; Fri, 23 Feb 2024 15:57:40 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::4:45de]) by smtp.gmail.com with ESMTPSA id bc7-20020a170902930700b001dc486f0cb2sm3796745plb.208.2024.02.23.15.57.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 23 Feb 2024 15:57:39 -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 2/3] mm, xen: Separate xen use cases from ioremap. Date: Fri, 23 Feb 2024 15:57:27 -0800 Message-Id: <20240223235728.13981-3-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-Server: rspam08 X-Rspamd-Queue-Id: 778154000C X-Stat-Signature: yhj1de9kehwmq185x7p9j3gn549m6re7 X-Rspam-User: X-HE-Tag: 1708732661-547004 X-HE-Meta: U2FsdGVkX18QrBVzs666LAFBN1kHfIHdKYDKjBkn2RF9y00t05DWVWoknKPRiImAFaZOiUXmv52KjQBgn68vUYNX2uv67vtYAc4Z27X9iOb3K978ZWCszKuy8Yf4tVZPvQgT/g9XsEJwFHnpBAqt2IzkbTeEgr9XLx1Wy6PTOgF8PKY8LVA17ipavrxIh/PnJm+YISMVclZGQ5qIwlwDe58tYGHLK3ZZ1ssv506fQbzTuNqlACuOP8vFiawOfX8g9mFjaRnFMNLvle2jeQhtbXWX8POqH0ON9oXBROX5+E4KKZhm3gU26ObTWMzwaU1MvMRkKZ687skd1mvpOyvOnL2+FYURst2ueuml1Vykbmf3Fa/zlApFLg7yTWu2nXbhDlOfVQASU9pOSu1C71gV7YZZ/csH22SW60JfEWJGCJzNG20MkuJBir6lAHsqp2o+75qa5CAFqIbkG132ZeH8ctJgJDwmyxgS02enYgaCp5VLUOE1kbNZjB7XGXPMYnMQQONZEbjhFAlVClNv5Nex8guhugw/hs2k7lp1vpwXzdo4vSfNw/xz1QSsleLr5Jcdwwn1sFpRFvJskqdqMBI5Wwdsz+JcfhzpnGPIwkpPo9MCzfu/Pqyx+jZtmphAgxy7q9URgtGnSiipYo2iEAzrsGiB1hi56FKDUkZe2V/HDWpF4rE9Sm+AG/FbUIXdNSbyfCzHYTT4sdlWt8RGSdwof5Xt+GgSVJKQB0hyc6X3OAxgXc1cWsNV5bHoVx6BtFIWlQeg2rk7Ru7+TsQLBvu8vQlGLtygsFN/yHiVFl5aAZ6fW4hbvgmYNpSbSlaWfh9FYb1i8Os51tr1by1DJiI3DMF2cR5Pa14OSRHJ7JpLDngK4VMoli7cmrk3XypBqLQezU5ZUGxzjeTC/y5WtJMqf4d4eL/NXip38ctj6GZ0XXwux3s7M7tcgdYdGtZ6kXKYSe+KeyTRVQ2uHpT/nZc 0fb0Yjjx O/x3mb0wc9Fhj7YUaxBtCJlI2+a6N4Tlz/p2kqko8wNTzOrk+0gwN+CPIQ655GKXFKd+F/qSawUslNiWGtxiKK+PRsvEHRPWwLPgLGHeQUDhAlYQ5XWac+PQ0/rDfsMbBiznhZ0HR0OXhSf8uvnc+U65XcRFycmz5+CwJGqrwADcmcO4dK8fR3M/Ge+CU45mCRh8WkOe3nks8q5Vz6D9CO8wYlAmLYCID+YipuFaNW7Yqwl+0ennlR+c3pw87I5n8hXVnIBh0YGmRYFAjI222Xu5xMvWECBzcYQp+1GdWNQNoqvwISp4Mw5CtVEb++Ix4AGYd4VPnYDhz99d2sVFg/Gdq/DGB4jGfKWnsTmm45BZVSrMiXpFfRq3vn9jyzN+Mt8h5L8FOk6NYOW17w/CvCzWqHm4JU4HCJs/sd2lWRnuuPbR8d5KSG8rmxUTUHrY8cTlx5ldVi1EEmqF/UhrkD3M0ij6JTeGAnma34yPWJR1CZ+zCly4/aZ4tJV7btBgJDElVopJptz0/pzxKFEfsVHid5g== 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 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 them from VM_IOREMAP users. xen will not and should not be calling ioremap_page_range() on that range. /proc/vmallocinfo will print such region as "xen" instead of "ioremap" as well. 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..223e51c243bc 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 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..d769a65bddad 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");