From: boris.ostrovsky@oracle.com To: Dan Williams <dan.j.williams@intel.com>, akpm@linux-foundation.org Cc: "Paul Mackerras" <paulus@ozlabs.org>, "Michael Ellerman" <mpe@ellerman.id.au>, "Benjamin Herrenschmidt" <benh@kernel.crashing.org>, "Ben Skeggs" <bskeggs@redhat.com>, "David Airlie" <airlied@linux.ie>, "Daniel Vetter" <daniel@ffwll.ch>, "Bjorn Helgaas" <bhelgaas@google.com>, "Juergen Gross" <jgross@suse.com>, "Stefano Stabellini" <sstabellini@kernel.org>, "Jérôme Glisse" <jglisse@redhat.com>, dave.hansen@linux.intel.com, linux-mm@kvack.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 10/17] mm/memremap_pages: convert to 'struct range' Date: Mon, 28 Sep 2020 15:12:32 -0400 [thread overview] Message-ID: <6186fa28-d123-12db-6171-a75cb6e615a5@oracle.com> (raw) In-Reply-To: <160106115761.30709.13539840236873663620.stgit@dwillia2-desk3.amr.corp.intel.com> On 9/25/20 3:12 PM, Dan Williams wrote: > > diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-alloc.c > index 3b98dc921426..091b8669eca3 100644 > --- a/drivers/xen/unpopulated-alloc.c > +++ b/drivers/xen/unpopulated-alloc.c > @@ -18,27 +18,37 @@ static unsigned int list_count; > static int fill_list(unsigned int nr_pages) > { > struct dev_pagemap *pgmap; > + struct resource *res; > void *vaddr; > unsigned int i, alloc_pages = round_up(nr_pages, PAGES_PER_SECTION); > - int ret; > + int ret = -ENOMEM; > + > + res = kzalloc(sizeof(*res), GFP_KERNEL); > + if (!res) > + return -ENOMEM; > > pgmap = kzalloc(sizeof(*pgmap), GFP_KERNEL); > if (!pgmap) > - return -ENOMEM; > + goto err_pgmap; > > pgmap->type = MEMORY_DEVICE_GENERIC; Can you move these last 5 lines ... > - pgmap->res.name = "Xen scratch"; > - pgmap->res.flags = IORESOURCE_MEM | IORESOURCE_BUSY; > + res->name = "Xen scratch"; > + res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; > > - ret = allocate_resource(&iomem_resource, &pgmap->res, > + ret = allocate_resource(&iomem_resource, res, > alloc_pages * PAGE_SIZE, 0, -1, > PAGES_PER_SECTION * PAGE_SIZE, NULL, NULL); > if (ret < 0) { > pr_err("Cannot allocate new IOMEM resource\n"); > - kfree(pgmap); > - return ret; > + goto err_resource; > } > ... here, so that we deal with pgmap in the same place? The diff will be slightly larger but the code will read better I think. -boris > + pgmap->range = (struct range) { > + .start = res->start, > + .end = res->end, > + }; > + pgmap->owner = res; > + > #ifdef CONFIG_XEN_HAVE_PVMMU > /* > * memremap will build page tables for the new memory so _______________________________________________ Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
WARNING: multiple messages have this Message-ID (diff)
From: boris.ostrovsky@oracle.com To: Dan Williams <dan.j.williams@intel.com>, akpm@linux-foundation.org Cc: "Paul Mackerras" <paulus@ozlabs.org>, "Michael Ellerman" <mpe@ellerman.id.au>, "Benjamin Herrenschmidt" <benh@kernel.crashing.org>, "Vishal Verma" <vishal.l.verma@intel.com>, "Vivek Goyal" <vgoyal@redhat.com>, "Dave Jiang" <dave.jiang@intel.com>, "Ben Skeggs" <bskeggs@redhat.com>, "David Airlie" <airlied@linux.ie>, "Daniel Vetter" <daniel@ffwll.ch>, "Ira Weiny" <ira.weiny@intel.com>, "Bjorn Helgaas" <bhelgaas@google.com>, "Juergen Gross" <jgross@suse.com>, "Stefano Stabellini" <sstabellini@kernel.org>, "Jérôme Glisse" <jglisse@redhat.com>, dave.hansen@linux.intel.com, linux-mm@kvack.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 10/17] mm/memremap_pages: convert to 'struct range' Date: Mon, 28 Sep 2020 15:12:32 -0400 [thread overview] Message-ID: <6186fa28-d123-12db-6171-a75cb6e615a5@oracle.com> (raw) In-Reply-To: <160106115761.30709.13539840236873663620.stgit@dwillia2-desk3.amr.corp.intel.com> On 9/25/20 3:12 PM, Dan Williams wrote: > > diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-alloc.c > index 3b98dc921426..091b8669eca3 100644 > --- a/drivers/xen/unpopulated-alloc.c > +++ b/drivers/xen/unpopulated-alloc.c > @@ -18,27 +18,37 @@ static unsigned int list_count; > static int fill_list(unsigned int nr_pages) > { > struct dev_pagemap *pgmap; > + struct resource *res; > void *vaddr; > unsigned int i, alloc_pages = round_up(nr_pages, PAGES_PER_SECTION); > - int ret; > + int ret = -ENOMEM; > + > + res = kzalloc(sizeof(*res), GFP_KERNEL); > + if (!res) > + return -ENOMEM; > > pgmap = kzalloc(sizeof(*pgmap), GFP_KERNEL); > if (!pgmap) > - return -ENOMEM; > + goto err_pgmap; > > pgmap->type = MEMORY_DEVICE_GENERIC; Can you move these last 5 lines ... > - pgmap->res.name = "Xen scratch"; > - pgmap->res.flags = IORESOURCE_MEM | IORESOURCE_BUSY; > + res->name = "Xen scratch"; > + res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; > > - ret = allocate_resource(&iomem_resource, &pgmap->res, > + ret = allocate_resource(&iomem_resource, res, > alloc_pages * PAGE_SIZE, 0, -1, > PAGES_PER_SECTION * PAGE_SIZE, NULL, NULL); > if (ret < 0) { > pr_err("Cannot allocate new IOMEM resource\n"); > - kfree(pgmap); > - return ret; > + goto err_resource; > } > ... here, so that we deal with pgmap in the same place? The diff will be slightly larger but the code will read better I think. -boris > + pgmap->range = (struct range) { > + .start = res->start, > + .end = res->end, > + }; > + pgmap->owner = res; > + > #ifdef CONFIG_XEN_HAVE_PVMMU > /* > * memremap will build page tables for the new memory so
next prev parent reply other threads:[~2020-09-28 19:13 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-25 19:11 [PATCH v5 00/17] device-dax: support sub-dividing soft-reserved ranges Dan Williams 2020-09-25 19:11 ` Dan Williams 2020-09-25 19:11 ` [PATCH v5 01/17] device-dax: make pgmap optional for instance creation Dan Williams 2020-09-25 19:11 ` Dan Williams 2020-10-01 8:41 ` David Hildenbrand 2020-10-01 8:41 ` David Hildenbrand 2020-10-01 16:54 ` Dan Williams 2020-10-01 16:54 ` Dan Williams 2020-10-01 16:54 ` Dan Williams 2020-10-01 17:39 ` David Hildenbrand 2020-10-01 17:39 ` David Hildenbrand 2020-10-01 19:12 ` Dan Williams 2020-10-01 19:12 ` Dan Williams 2020-10-01 19:12 ` Dan Williams 2020-09-25 19:11 ` [PATCH v5 02/17] device-dax/kmem: introduce dax_kmem_range() Dan Williams 2020-09-25 19:11 ` Dan Williams 2020-09-30 16:14 ` David Hildenbrand 2020-09-30 16:14 ` David Hildenbrand 2020-09-25 19:11 ` [PATCH v5 03/17] device-dax/kmem: move resource name tracking to drvdata Dan Williams 2020-09-25 19:11 ` Dan Williams 2020-09-30 16:19 ` David Hildenbrand 2020-09-30 16:19 ` David Hildenbrand 2020-09-25 19:12 ` [PATCH v5 04/17] device-dax/kmem: replace release_resource() with release_mem_region() Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-30 16:23 ` David Hildenbrand 2020-09-30 16:23 ` David Hildenbrand 2020-09-30 17:28 ` Dan Williams 2020-09-30 17:28 ` Dan Williams 2020-09-30 17:28 ` Dan Williams 2020-09-25 19:12 ` [PATCH v5 05/17] device-dax: add an allocation interface for device-dax instances Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-25 19:12 ` [PATCH v5 06/17] device-dax: introduce 'struct dev_dax' typed-driver operations Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-25 19:12 ` [PATCH v5 07/17] device-dax: introduce 'seed' devices Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-25 19:12 ` [PATCH v5 08/17] drivers/base: make device_find_child_by_name() compatible with sysfs inputs Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-25 19:12 ` [PATCH v5 09/17] device-dax: add resize support Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-25 19:12 ` [PATCH v5 10/17] mm/memremap_pages: convert to 'struct range' Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-28 19:12 ` boris.ostrovsky [this message] 2020-09-28 19:12 ` boris.ostrovsky 2020-09-25 19:12 ` [PATCH v5 11/17] mm/memremap_pages: support multiple ranges per invocation Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-25 19:12 ` [PATCH v5 12/17] device-dax: add dis-contiguous resource support Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-25 19:12 ` [PATCH v5 13/17] device-dax: introduce 'mapping' devices Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-25 19:12 ` [PATCH v5 14/17] device-dax: make align a per-device property Dan Williams 2020-09-25 19:12 ` Dan Williams 2020-09-25 19:13 ` [PATCH v5 15/17] device-dax: add an 'align' attribute Dan Williams 2020-09-25 19:13 ` Dan Williams 2020-09-26 2:22 ` Andrew Morton 2020-09-26 2:22 ` Andrew Morton 2020-09-26 3:31 ` Dan Williams 2020-09-26 3:31 ` Dan Williams 2020-09-26 3:31 ` Dan Williams 2020-09-25 19:13 ` [PATCH v5 16/17] dax/hmem: introduce dax_hmem.region_idle parameter Dan Williams 2020-09-25 19:13 ` Dan Williams 2020-09-25 19:13 ` [PATCH v5 17/17] device-dax: add a range mapping allocation attribute Dan Williams 2020-09-25 19:13 ` Dan Williams 2020-09-25 20:51 ` [PATCH v5 00/17] device-dax: support sub-dividing soft-reserved ranges Joao Martins 2020-09-25 20:51 ` Joao Martins 2020-09-25 21:01 ` Dan Williams 2020-09-25 21:01 ` Dan Williams 2020-09-25 21:05 ` Joao Martins 2020-09-25 21:05 ` Joao Martins
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=6186fa28-d123-12db-6171-a75cb6e615a5@oracle.com \ --to=boris.ostrovsky@oracle.com \ --cc=airlied@linux.ie \ --cc=akpm@linux-foundation.org \ --cc=benh@kernel.crashing.org \ --cc=bhelgaas@google.com \ --cc=bskeggs@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=daniel@ffwll.ch \ --cc=dave.hansen@linux.intel.com \ --cc=jglisse@redhat.com \ --cc=jgross@suse.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=mpe@ellerman.id.au \ --cc=paulus@ozlabs.org \ --cc=sstabellini@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.