From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: virtio-dev-return-6923-cohuck=redhat.com@lists.oasis-open.org Sender: List-Post: List-Help: List-Unsubscribe: List-Subscribe: Received: from lists.oasis-open.org (oasis-open.org [10.110.1.242]) by lists.oasis-open.org (Postfix) with ESMTP id 5E156985FD9 for ; Wed, 11 Mar 2020 17:15:43 +0000 (UTC) From: David Hildenbrand Date: Wed, 11 Mar 2020 18:14:14 +0100 Message-Id: <20200311171422.10484-3-david@redhat.com> In-Reply-To: <20200311171422.10484-1-david@redhat.com> References: <20200311171422.10484-1-david@redhat.com> MIME-Version: 1.0 Subject: [virtio-dev] [PATCH v2 02/10] virtio-mem: Allow to specify an ACPI PXM as nid Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, virtio-dev@lists.oasis-open.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, Michal Hocko , Andrew Morton , "Michael S . Tsirkin" , David Hildenbrand , Michal Hocko , "Rafael J. Wysocki" , Jason Wang , Oscar Salvador , Igor Mammedov , Dave Young , Dan Williams , Pavel Tatashin , Stefan Hajnoczi , Vlastimil Babka , Len Brown , linux-acpi@vger.kernel.org List-ID: We want to allow to specify (similar as for a DIMM), to which node a virtio-mem device (and, therefore, its memory) belongs. Add a new virtio-mem feature flag and export pxm_to_node, so it can be used in kernel module context. Acked-by: Michal Hocko # for the export Acked-by: "Rafael J. Wysocki" # for the export Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Oscar Salvador Cc: Michal Hocko Cc: Igor Mammedov Cc: Dave Young Cc: Andrew Morton Cc: Dan Williams Cc: Pavel Tatashin Cc: Stefan Hajnoczi Cc: Vlastimil Babka Cc: Len Brown Cc: linux-acpi@vger.kernel.org Signed-off-by: David Hildenbrand --- drivers/acpi/numa/srat.c | 1 + drivers/virtio/virtio_mem.c | 37 +++++++++++++++++++++++++++++++-- include/uapi/linux/virtio_mem.h | 10 ++++++++- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 47b4969d9b93..5be5a977da1b 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -35,6 +35,7 @@ int pxm_to_node(int pxm) =09=09return NUMA_NO_NODE; =09return pxm_to_node_map[pxm]; } +EXPORT_SYMBOL(pxm_to_node); =20 int node_to_pxm(int node) { diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 803e1426f80b..d8da656c9145 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -20,6 +20,8 @@ #include #include =20 +#include + enum virtio_mem_mb_state { =09/* Unplugged, not added to Linux. Can be reused later. */ =09VIRTIO_MEM_MB_STATE_UNUSED =3D 0, @@ -71,6 +73,8 @@ struct virtio_mem { =20 =09/* The device block size (for communicating with the device). */ =09uint32_t device_block_size; +=09/* The translated node id. NUMA_NO_NODE in case not specified. */ +=09int nid; =09/* Physical start address of the memory region. */ =09uint64_t addr; =20 @@ -386,7 +390,10 @@ static int virtio_mem_sb_bitmap_prepare_next_mb(struct= virtio_mem *vm) static int virtio_mem_mb_add(struct virtio_mem *vm, unsigned long mb_id) { =09const uint64_t addr =3D virtio_mem_mb_id_to_phys(mb_id); -=09int nid =3D memory_add_physaddr_to_nid(addr); +=09int nid =3D vm->nid; + +=09if (nid =3D=3D NUMA_NO_NODE) +=09=09nid =3D memory_add_physaddr_to_nid(addr); =20 =09dev_dbg(&vm->vdev->dev, "adding memory block: %lu\n", mb_id); =09return add_memory(nid, addr, memory_block_size_bytes()); @@ -404,7 +411,10 @@ static int virtio_mem_mb_add(struct virtio_mem *vm, un= signed long mb_id) static int virtio_mem_mb_remove(struct virtio_mem *vm, unsigned long mb_id= ) { =09const uint64_t addr =3D virtio_mem_mb_id_to_phys(mb_id); -=09int nid =3D memory_add_physaddr_to_nid(addr); +=09int nid =3D vm->nid; + +=09if (nid =3D=3D NUMA_NO_NODE) +=09=09nid =3D memory_add_physaddr_to_nid(addr); =20 =09dev_dbg(&vm->vdev->dev, "removing memory block: %lu\n", mb_id); =09return remove_memory(nid, addr, memory_block_size_bytes()); @@ -423,6 +433,17 @@ static void virtio_mem_retry(struct virtio_mem *vm) =09spin_unlock_irqrestore(&vm->removal_lock, flags); } =20 +static int virtio_mem_translate_node_id(struct virtio_mem *vm, uint16_t no= de_id) +{ +=09int node =3D NUMA_NO_NODE; + +#if defined(CONFIG_ACPI_NUMA) +=09if (virtio_has_feature(vm->vdev, VIRTIO_MEM_F_ACPI_PXM)) +=09=09node =3D pxm_to_node(node_id); +#endif +=09return node; +} + /* * Test if a virtio-mem device overlaps with the given range. Can be calle= d * from (notifier) callbacks lockless. @@ -1266,6 +1287,7 @@ static int virtio_mem_init(struct virtio_mem *vm) { =09const uint64_t phys_limit =3D 1UL << MAX_PHYSMEM_BITS; =09uint64_t region_size; +=09uint16_t node_id; =20 =09if (!vm->vdev->config->get) { =09=09dev_err(&vm->vdev->dev, "config access disabled\n"); @@ -1286,6 +1308,9 @@ static int virtio_mem_init(struct virtio_mem *vm) =09=09 &vm->plugged_size); =09virtio_cread(vm->vdev, struct virtio_mem_config, block_size, =09=09 &vm->device_block_size); +=09virtio_cread(vm->vdev, struct virtio_mem_config, node_id, +=09=09 &node_id); +=09vm->nid =3D virtio_mem_translate_node_id(vm, node_id); =09virtio_cread(vm->vdev, struct virtio_mem_config, addr, &vm->addr); =09virtio_cread(vm->vdev, struct virtio_mem_config, region_size, =09=09 ®ion_size); @@ -1501,12 +1526,20 @@ static int virtio_mem_restore(struct virtio_device = *vdev) } #endif =20 +static unsigned int virtio_mem_features[] =3D { +#if defined(CONFIG_NUMA) && defined(CONFIG_ACPI_NUMA) +=09VIRTIO_MEM_F_ACPI_PXM, +#endif +}; + static struct virtio_device_id virtio_mem_id_table[] =3D { =09{ VIRTIO_ID_MEM, VIRTIO_DEV_ANY_ID }, =09{ 0 }, }; =20 static struct virtio_driver virtio_mem_driver =3D { +=09.feature_table =3D virtio_mem_features, +=09.feature_table_size =3D ARRAY_SIZE(virtio_mem_features), =09.driver.name =3D KBUILD_MODNAME, =09.driver.owner =3D THIS_MODULE, =09.id_table =3D virtio_mem_id_table, diff --git a/include/uapi/linux/virtio_mem.h b/include/uapi/linux/virtio_me= m.h index 1bfade78bdfd..e0a9dc7397c3 100644 --- a/include/uapi/linux/virtio_mem.h +++ b/include/uapi/linux/virtio_mem.h @@ -83,6 +83,12 @@ * device is busy. */ =20 +/* --- virtio-mem: feature bits --- */ + +/* node_id is an ACPI PXM and is valid */ +#define VIRTIO_MEM_F_ACPI_PXM=09=090 + + /* --- virtio-mem: guest -> host requests --- */ =20 /* request to plug memory blocks */ @@ -177,7 +183,9 @@ struct virtio_mem_resp { struct virtio_mem_config { =09/* Block size and alignment. Cannot change. */ =09__u32 block_size; -=09__u32 padding; +=09/* Valid with VIRTIO_MEM_F_ACPI_PXM. Cannot change. */ +=09__u16 node_id; +=09__u16 padding; =09/* Start address of the memory region. Cannot change. */ =09__u64 addr; =09/* Region size (maximum). Cannot change. */ --=20 2.24.1 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org