PCI: vmd: Add indirection layer to vmd irq lists
Subsystems (4)
PATCH v2 1/1 PCI: vmd: Add indirection layer to vmd irq lists
With CONFIG_MAXSMP and CONFIG_PROVE_LOCKING, the size of an srcu_struct can grow quite large. In one compilation instance it produced a 74KiB data structure. These are embedded in the vmd_irq_list struct, and a N=64 allocation can exceed MAX_ORDER, violating reclaim rules.
struct srcu_struct {
struct srcu_node node[521]; /* 0 75024 */
/* --- cacheline 1172 boundary (75008 bytes) was 16 bytes ago --- */
struct srcu_node * level[4]; /* 75024 32 */
struct mutex srcu_cb_mutex; /* 75056 128 */
/* --- cacheline 1174 boundary (75136 bytes) was 48 bytes ago --- */
spinlock_t lock; /* 75184 56 */
/* --- cacheline 1175 boundary (75200 bytes) was 40 bytes ago --- */
struct mutex srcu_gp_mutex; /* 75240 128 */
/* --- cacheline 1177 boundary (75328 bytes) was 40 bytes ago --- */
unsigned int srcu_idx; /* 75368 4 *//* XXX 4 bytes hole, try to pack */
long unsigned int srcu_gp_seq; /* 75376 8 */
long unsigned int srcu_gp_seq_needed; /* 75384 8 */
/* --- cacheline 1178 boundary (75392 bytes) --- */
long unsigned int srcu_gp_seq_needed_exp; /* 75392 8 */
long unsigned int srcu_last_gp_end; /* 75400 8 */
struct srcu_data * sda; /* 75408 8 */
long unsigned int srcu_barrier_seq; /* 75416 8 */
struct mutex srcu_barrier_mutex; /* 75424 128 */
/* --- cacheline 1180 boundary (75520 bytes) was 32 bytes ago --- */
struct completion srcu_barrier_completion; /* 75552 80 */
/* --- cacheline 1181 boundary (75584 bytes) was 48 bytes ago --- */
atomic_t srcu_barrier_cpu_cnt; /* 75632 4 */
/* XXX 4 bytes hole, try to pack */
struct delayed_work work; /* 75640 152 */
/* XXX last struct has 4 bytes of padding */
/* --- cacheline 1184 boundary (75776 bytes) was 16 bytes ago --- */
struct lockdep_map dep_map; /* 75792 32 */
/* size: 75824, cachelines: 1185, members: 17 */ /* sum members: 75816, holes: 2, sum holes: 8 */ /* paddings: 1, sum paddings: 4 */
/* last cacheline: 48 bytes */
};
With N=64 VMD IRQ lists, this would allocate 4.6MiB in a single call. This violates MAX_ORDER reclaim rules when PAGE_SIZE=4096 and MAX_ORDER_NR_PAGES=1024, and invokes the following warning in mm/page_alloc.c:
/*
* There are several places where we assume that the order value is sane
* so bail out early if the request is out of bound.
*/
if (unlikely(order >= MAX_ORDER)) {
WARN_ON_ONCE(!(gfp_mask & __GFP_NOWARN));
return NULL;
}This patch changes the irq list array into an array of pointers to irq lists to avoid allocation failures with greater msix counts.
This patch also reverts commit b31822277abcd7c83d1c1c0af876da9ccdf3b7d6. The index_from_irqs() helper was added to calculate the irq list index from the array of irqs, in order to shrink vmd_irq_list for performance.
Due to the embedded srcu_struct within the vmd_irq_list struct having a varying size depending on a number of factors, the vmd_irq_list struct no longer guarantees optimal data structure size and granularity.
---
Added Paul to make him aware of srcu_struct size with these options
v1->v2:
Squashed the revert into this commit
changed n=1 kcalloc to kzalloc
drivers/pci/controller/vmd.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-)
drivers/pci/controller/vmd.c +24 -23
@@ -82,6 +82,7 @@ struct vmd_irq_list {struct list_head irq_list;struct srcu_struct srcu;unsigned int count; +unsigned int index; };struct vmd_dev {
@@ -91,7 +92,7 @@ struct vmd_dev {char __iomem *cfgbar;int msix_count; -struct vmd_irq_list *irqs; +struct vmd_irq_list **irqs;struct pci_sysdata sysdata;struct resource resources[3 ];
@@ -108,12 +109,6 @@ static inline struct vmd_dev *vmd_from_bus(struct pci_bus *bus) return container_of(bus->sysdata, struct vmd_dev, sysdata); } -static inline unsigned int index_from_irqs (struct vmd_dev *vmd, -struct vmd_irq_list *irqs) -{ -return irqs - vmd->irqs; -} -/* * Drivers managing a device in a VMD domain allocate their own IRQs as before, * but the MSI entry for the hardware it's driving will be programmed with a
@@ -126,11 +121,10 @@ static void vmd_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) {struct vmd_irq *vmdirq = data->chip_data;struct vmd_irq_list *irq = vmdirq->irq; -struct vmd_dev *vmd =irq_data_get_irq_handler_data (data); msg->address_hi =MSI_ADDR_BASE_HI ; msg->address_lo =MSI_ADDR_BASE_LO | -MSI_ADDR_DEST_ID (index_from_irqs (vmd, irq)); +MSI_ADDR_DEST_ID (irq->index); msg->data =0 ; }
@@ -200,7 +194,7 @@ static struct vmd_irq_list *vmd_next_irq(struct vmd_dev *vmd, struct msi_desc *dunsigned long flags;if (vmd->msix_count ==1 ) -return &vmd->irqs[0 ]; +return vmd->irqs[0 ];/* * White list for fast-interrupt handlers. All others will share the
@@ -210,17 +204,17 @@ static struct vmd_irq_list *vmd_next_irq(struct vmd_dev *vmd, struct msi_desc *dcase PCI_CLASS_STORAGE_EXPRESS :break ;default : -return &vmd->irqs[0 ]; +return vmd->irqs[0 ]; }raw_spin_lock_irqsave (&list_lock, flags);for (i =1 ; i < vmd->msix_count; i++) -if (vmd->irqs[i].count < vmd->irqs[best].count) +if (vmd->irqs[i]->count < vmd->irqs[best]->count) best = i; - vmd->irqs[best].count++; + vmd->irqs[best]->count++;raw_spin_unlock_irqrestore (&list_lock, flags); -return &vmd->irqs[best]; +return vmd->irqs[best]; } static int vmd_msi_init(struct irq_domain *domain, struct msi_domain_info *info,
@@ -230,7 +224,7 @@ static int vmd_msi_init(struct irq_domain *domain, struct msi_domain_info *info,struct msi_desc *desc = arg->desc;struct vmd_dev *vmd =vmd_from_bus (msi_desc_to_pci_dev (desc)->bus);struct vmd_irq *vmdirq =kzalloc (sizeof (*vmdirq),GFP_KERNEL ); -unsigned int index, vector; +unsigned int vector;if (!vmdirq)return -ENOMEM ;
@@ -238,8 +232,7 @@ static int vmd_msi_init(struct irq_domain *domain, struct msi_domain_info *info,INIT_LIST_HEAD (&vmdirq->node); vmdirq->irq =vmd_next_irq (vmd, desc); vmdirq->virq = virq; - index =index_from_irqs (vmd, vmdirq->irq); - vector =pci_irq_vector (vmd->dev, index); + vector =pci_irq_vector (vmd->dev, vmdirq->irq->index);irq_domain_set_info (domain, virq, vector, info->chip, vmdirq, handle_untracked_irq, vmd,NULL );
@@ -771,14 +764,22 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)return -ENOMEM ;for (i =0 ; i < vmd->msix_count; i++) { - err =init_srcu_struct (&vmd->irqs[i].srcu); + vmd->irqs[i] =devm_kzalloc (&dev->dev,sizeof (**vmd->irqs), +GFP_KERNEL ); +if (!vmd->irqs[i]) +return -ENOMEM ; + } + +for (i =0 ; i < vmd->msix_count; i++) { + err =init_srcu_struct (&vmd->irqs[i]->srcu);if (err)return err; -INIT_LIST_HEAD (&vmd->irqs[i].irq_list); +INIT_LIST_HEAD (&vmd->irqs[i]->irq_list); + vmd->irqs[i]->index = i; err =devm_request_irq (&dev->dev,pci_irq_vector (dev, i), vmd_irq,IRQF_NO_THREAD , -"vmd" , &vmd->irqs[i]); +"vmd" , vmd->irqs[i]);if (err)return err; }
@@ -799,7 +800,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)int i;for (i =0 ; i < vmd->msix_count; i++) -cleanup_srcu_struct (&vmd->irqs[i].srcu); +cleanup_srcu_struct (&vmd->irqs[i]->srcu); }static void vmd_remove (struct pci_dev *dev)
@@ -823,7 +824,7 @@ static int vmd_suspend(struct device *dev)int i;for (i =0 ; i < vmd->msix_count; i++) -devm_free_irq (dev,pci_irq_vector (pdev, i), &vmd->irqs[i]); +devm_free_irq (dev,pci_irq_vector (pdev, i), vmd->irqs[i]);pci_save_state (pdev);return 0 ;
@@ -838,7 +839,7 @@ static int vmd_resume(struct device *dev)for (i =0 ; i < vmd->msix_count; i++) { err =devm_request_irq (dev,pci_irq_vector (pdev, i), vmd_irq,IRQF_NO_THREAD , -"vmd" , &vmd->irqs[i]); +"vmd" , vmd->irqs[i]);if (err)return err; }
Signature · 1 line
1.8.3.1
Paul E. McKenney
maintainerQuoted 67 lines · Jon Derrick
With
CONFIG_MAXSMPandCONFIG_PROVE_LOCKING, the size of ansrcu_structcan grow quite large. In one compilation instance it produced a 74KiB data structure. These are embedded in thevmd_irq_liststruct, and a N=64 allocation can exceedMAX_ORDER, violating reclaim rules.struct srcu_struct { struct srcu_node node[521]; /* 0 75024 */ /* --- cacheline 1172 boundary (75008 bytes) was 16 bytes ago --- */ struct srcu_node * level[4]; /* 75024 32 */ struct mutex srcu_cb_mutex; /* 75056 128 */ /* --- cacheline 1174 boundary (75136 bytes) was 48 bytes ago --- */ spinlock_t lock; /* 75184 56 */ /* --- cacheline 1175 boundary (75200 bytes) was 40 bytes ago --- */ struct mutex srcu_gp_mutex; /* 75240 128 */ /* --- cacheline 1177 boundary (75328 bytes) was 40 bytes ago --- */ unsigned int srcu_idx; /* 75368 4 *//* XXX 4 bytes hole, try to pack */
long unsigned int
srcu_gp_seq; /* 75376 8 */
long unsigned intsrcu_gp_seq_needed; /* 75384 8 */
/* --- cacheline 1178 boundary (75392 bytes) --- */
long unsigned intsrcu_gp_seq_needed_exp; /* 75392 8 */
long unsigned intsrcu_last_gp_end; /* 75400 8 */
structsrcu_data* sda; /* 75408 8 */
long unsigned intsrcu_barrier_seq; /* 75416 8 */
struct mutexsrcu_barrier_mutex; /* 75424 128 */
/* --- cacheline 1180 boundary (75520 bytes) was 32 bytes ago --- */
struct completionsrcu_barrier_completion; /* 75552 80 */
/* --- cacheline 1181 boundary (75584 bytes) was 48 bytes ago --- */
atomic_tsrcu_barrier_cpu_cnt; /* 75632 4 *//* XXX 4 bytes hole, try to pack */
struct
delayed_workwork; /* 75640 152 *//* XXX last struct has 4 bytes of padding */
/* --- cacheline 1184 boundary (75776 bytes) was 16 bytes ago --- */
structlockdep_mapdep_map; /* 75792 32 *//* size: 75824, cachelines: 1185, members: 17 */ /* sum members: 75816, holes: 2, sum holes: 8 */ /* paddings: 1, sum paddings: 4 */
/* last cacheline: 48 bytes */
};With N=64 VMD IRQ lists, this would allocate 4.6MiB in a single call. This violates
MAX_ORDERreclaim rules when PAGE_SIZE=4096 and MAX_ORDER_NR_PAGES=1024, and invokes the following warning inmm/page_alloc.c:/* * There are several places where we assume that the order value is sane * so bail out early if the request is out of bound. */ if (unlikely(order >= MAX_ORDER)) { WARN_ON_ONCE(!(gfp_mask & __GFP_NOWARN)); return NULL; }This patch changes the irq list array into an array of pointers to irq lists to avoid allocation failures with greater msix counts.
This patch also reverts commit
b31822277abcd7c83d1c1c0af876da9ccdf3b7d6. Theindex_from_irqs()helper was added to calculate the irq list index from the array of irqs, in order to shrinkvmd_irq_listfor performance.
Quoted 7 lines
Due to the embedded
srcu_structwithin thevmd_irq_liststruct having a varying size depending on a number of factors, thevmd_irq_liststruct no longer guarantees optimal data structure size and granularity.Signed-off-by Jon Derrick <[email protected]>---
Added Paul to make him aware ofsrcu_structsize with these options
There was some discussion of making the srcu_struct structure's ->node[] array be separately allocated, which would allow this array to be rightsize for the system in question. However, I believe they ended up instead separately allocating the srcu_struct structure itself.
Without doing something like that, I am kind of stuck. After all, at compile time, the kernel build system tells SRCU that it needs to be prepared to run on systems with thousands of CPUs. Which requires substantial memory to keep track of all those CPUs. Which are not present on most systems.
Thoughts?
Thanx, Paul
Quoted 160 lines
v1->v2:
Squashed the revert into this commit
changed n=1 kcalloc to kzallocdrivers/pci/controller/vmd.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-)drivers/pci/controller/vmd.c +24
-23@@ -82,6 +82,7 @@ struct vmd_irq_list {struct list_head irq_list;struct srcu_struct srcu;unsigned int count; +unsigned int index; };struct vmd_dev {@@ -91,7 +92,7 @@ struct vmd_dev {char __iomem *cfgbar;int msix_count; -struct vmd_irq_list *irqs; +struct vmd_irq_list **irqs;struct pci_sysdata sysdata;struct resource resources[3 ];@@ -108,12 +109,6 @@ static inline struct vmd_dev *vmd_from_bus(struct pci_bus *bus) return container_of(bus->sysdata, struct vmd_dev, sysdata); } -static inline unsigned int index_from_irqs (struct vmd_dev *vmd, -struct vmd_irq_list *irqs) -{ -return irqs - vmd->irqs; -} -/* * Drivers managing a device in a VMD domain allocate their own IRQs as before, * but the MSI entry for the hardware it's driving will be programmed with a @@ -126,11 +121,10 @@ static void vmd_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) {struct vmd_irq *vmdirq = data->chip_data;struct vmd_irq_list *irq = vmdirq->irq; -struct vmd_dev *vmd =irq_data_get_irq_handler_data (data); msg->address_hi =MSI_ADDR_BASE_HI ; msg->address_lo =MSI_ADDR_BASE_LO | -MSI_ADDR_DEST_ID (index_from_irqs (vmd, irq)); +MSI_ADDR_DEST_ID (irq->index); msg->data =0 ; }@@ -200,7 +194,7 @@ static struct vmd_irq_list *vmd_next_irq(struct vmd_dev *vmd, struct msi_desc *dunsigned long flags;if (vmd->msix_count ==1 ) -return &vmd->irqs[0 ]; +return vmd->irqs[0 ];/* * White list for fast-interrupt handlers. All others will share the @@ -210,17 +204,17 @@ static struct vmd_irq_list *vmd_next_irq(struct vmd_dev *vmd, struct msi_desc *dcase PCI_CLASS_STORAGE_EXPRESS :break ;default : -return &vmd->irqs[0 ]; +return vmd->irqs[0 ]; }raw_spin_lock_irqsave (&list_lock, flags);for (i =1 ; i < vmd->msix_count; i++) -if (vmd->irqs[i].count < vmd->irqs[best].count) +if (vmd->irqs[i]->count < vmd->irqs[best]->count) best = i; - vmd->irqs[best].count++; + vmd->irqs[best]->count++;raw_spin_unlock_irqrestore (&list_lock, flags); -return &vmd->irqs[best]; +return vmd->irqs[best]; } static int vmd_msi_init(struct irq_domain *domain, struct msi_domain_info *info,@@ -230,7 +224,7 @@ static int vmd_msi_init(struct irq_domain *domain, struct msi_domain_info *info,struct msi_desc *desc = arg->desc;struct vmd_dev *vmd =vmd_from_bus (msi_desc_to_pci_dev (desc)->bus);struct vmd_irq *vmdirq =kzalloc (sizeof (*vmdirq),GFP_KERNEL ); -unsigned int index, vector; +unsigned int vector;if (!vmdirq)return -ENOMEM ;@@ -238,8 +232,7 @@ static int vmd_msi_init(struct irq_domain *domain, struct msi_domain_info *info,INIT_LIST_HEAD (&vmdirq->node); vmdirq->irq =vmd_next_irq (vmd, desc); vmdirq->virq = virq; - index =index_from_irqs (vmd, vmdirq->irq); - vector =pci_irq_vector (vmd->dev, index); + vector =pci_irq_vector (vmd->dev, vmdirq->irq->index);irq_domain_set_info (domain, virq, vector, info->chip, vmdirq, handle_untracked_irq, vmd,NULL );@@ -771,14 +764,22 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)return -ENOMEM ;for (i =0 ; i < vmd->msix_count; i++) { - err =init_srcu_struct (&vmd->irqs[i].srcu); + vmd->irqs[i] =devm_kzalloc (&dev->dev,sizeof (**vmd->irqs), +GFP_KERNEL ); +if (!vmd->irqs[i]) +return -ENOMEM ; + } + +for (i =0 ; i < vmd->msix_count; i++) { + err =init_srcu_struct (&vmd->irqs[i]->srcu);if (err)return err; -INIT_LIST_HEAD (&vmd->irqs[i].irq_list); +INIT_LIST_HEAD (&vmd->irqs[i]->irq_list); + vmd->irqs[i]->index = i; err =devm_request_irq (&dev->dev,pci_irq_vector (dev, i), vmd_irq,IRQF_NO_THREAD , -"vmd" , &vmd->irqs[i]); +"vmd" , vmd->irqs[i]);if (err)return err; }@@ -799,7 +800,7 @@ static void vmd_cleanup_srcu(struct vmd_dev *vmd)int i;for (i =0 ; i < vmd->msix_count; i++) -cleanup_srcu_struct (&vmd->irqs[i].srcu); +cleanup_srcu_struct (&vmd->irqs[i]->srcu); }static void vmd_remove (struct pci_dev *dev)@@ -823,7 +824,7 @@ static int vmd_suspend(struct device *dev)int i;for (i =0 ; i < vmd->msix_count; i++) -devm_free_irq (dev,pci_irq_vector (pdev, i), &vmd->irqs[i]); +devm_free_irq (dev,pci_irq_vector (pdev, i), vmd->irqs[i]);pci_save_state (pdev);return 0 ;@@ -838,7 +839,7 @@ static int vmd_resume(struct device *dev)for (i =0 ; i < vmd->msix_count; i++) { err =devm_request_irq (dev,pci_irq_vector (pdev, i), vmd_irq,IRQF_NO_THREAD , -"vmd" , &vmd->irqs[i]); +"vmd" , vmd->irqs[i]);if (err)return err; }Signature · 1 line
1.8.3.1
Quoted 87 lines · Paul E. McKenney
Quoted 67 lines · Jon Derrick
With
CONFIG_MAXSMPandCONFIG_PROVE_LOCKING, the size of ansrcu_structcan grow quite large. In one compilation instance it produced a 74KiB data structure. These are embedded in thevmd_irq_liststruct, and a N=64 allocation can exceedMAX_ORDER, violating reclaim rules.struct srcu_struct { struct srcu_node node[521]; /* 0 75024 */ /* --- cacheline 1172 boundary (75008 bytes) was 16 bytes ago --- */ struct srcu_node * level[4]; /* 75024 32 */ struct mutex srcu_cb_mutex; /* 75056 128 */ /* --- cacheline 1174 boundary (75136 bytes) was 48 bytes ago --- */ spinlock_t lock; /* 75184 56 */ /* --- cacheline 1175 boundary (75200 bytes) was 40 bytes ago --- */ struct mutex srcu_gp_mutex; /* 75240 128 */ /* --- cacheline 1177 boundary (75328 bytes) was 40 bytes ago --- */ unsigned int srcu_idx; /* 75368 4 *//* XXX 4 bytes hole, try to pack */
long unsigned int
srcu_gp_seq; /* 75376 8 */
long unsigned intsrcu_gp_seq_needed; /* 75384 8 */
/* --- cacheline 1178 boundary (75392 bytes) --- */
long unsigned intsrcu_gp_seq_needed_exp; /* 75392 8 */
long unsigned intsrcu_last_gp_end; /* 75400 8 */
structsrcu_data* sda; /* 75408 8 */
long unsigned intsrcu_barrier_seq; /* 75416 8 */
struct mutexsrcu_barrier_mutex; /* 75424 128 */
/* --- cacheline 1180 boundary (75520 bytes) was 32 bytes ago --- */
struct completionsrcu_barrier_completion; /* 75552 80 */
/* --- cacheline 1181 boundary (75584 bytes) was 48 bytes ago --- */
atomic_tsrcu_barrier_cpu_cnt; /* 75632 4 *//* XXX 4 bytes hole, try to pack */
struct
delayed_workwork; /* 75640 152 *//* XXX last struct has 4 bytes of padding */
/* --- cacheline 1184 boundary (75776 bytes) was 16 bytes ago --- */
structlockdep_mapdep_map; /* 75792 32 *//* size: 75824, cachelines: 1185, members: 17 */ /* sum members: 75816, holes: 2, sum holes: 8 */ /* paddings: 1, sum paddings: 4 */
/* last cacheline: 48 bytes */
};With N=64 VMD IRQ lists, this would allocate 4.6MiB in a single call. This violates
MAX_ORDERreclaim rules when PAGE_SIZE=4096 and MAX_ORDER_NR_PAGES=1024, and invokes the following warning inmm/page_alloc.c:/* * There are several places where we assume that the order value is sane * so bail out early if the request is out of bound. */ if (unlikely(order >= MAX_ORDER)) { WARN_ON_ONCE(!(gfp_mask & __GFP_NOWARN)); return NULL; }This patch changes the irq list array into an array of pointers to irq lists to avoid allocation failures with greater msix counts.
This patch also reverts commit
b31822277abcd7c83d1c1c0af876da9ccdf3b7d6. Theindex_from_irqs()helper was added to calculate the irq list index from the array of irqs, in order to shrinkvmd_irq_listfor performance.Quoted 7 lines
Due to the embedded
srcu_structwithin thevmd_irq_liststruct having a varying size depending on a number of factors, thevmd_irq_liststruct no longer guarantees optimal data structure size and granularity.Signed-off-by Jon Derrick <[email protected]>---
Added Paul to make him aware ofsrcu_structsize with these optionsThere was some discussion of making the
srcu_structstructure's ->node[] array be separately allocated, which would allow this array to be rightsize for the system in question. However, I believe they ended up instead separately allocating thesrcu_structstructure itself.Without doing something like that, I am kind of stuck. After all, at compile time, the kernel build system tells SRCU that it needs to be prepared to run on systems with thousands of CPUs. Which requires substantial memory to keep track of all those CPUs. Which are not present on most systems.
Quoted 4 lines
Thoughts?
Thanx, Paul
Yes I haven't seen an elegant solution other than making users aware of the situation.
Thanks for your input
Quoted 90 lines · Jonathan
Quoted 89 lines · Paul E. McKenney
Quoted 67 lines · Jon Derrick
With
CONFIG_MAXSMPandCONFIG_PROVE_LOCKING, the size of ansrcu_structcan grow quite large. In one compilation instance it produced a 74KiB data structure. These are embedded in thevmd_irq_liststruct, and a N=64 allocation can exceedMAX_ORDER, violating reclaim rules.struct srcu_struct { struct srcu_node node[521]; /* 0 75024 */ /* --- cacheline 1172 boundary (75008 bytes) was 16 bytes ago --- */ struct srcu_node * level[4]; /* 75024 32 */ struct mutex srcu_cb_mutex; /* 75056 128 */ /* --- cacheline 1174 boundary (75136 bytes) was 48 bytes ago --- */ spinlock_t lock; /* 75184 56 */ /* --- cacheline 1175 boundary (75200 bytes) was 40 bytes ago --- */ struct mutex srcu_gp_mutex; /* 75240 128 */ /* --- cacheline 1177 boundary (75328 bytes) was 40 bytes ago --- */ unsigned int srcu_idx; /* 75368 4 *//* XXX 4 bytes hole, try to pack */
long unsigned int
srcu_gp_seq; /* 75376 8 */
long unsigned intsrcu_gp_seq_needed; /* 75384 8 */
/* --- cacheline 1178 boundary (75392 bytes) --- */
long unsigned intsrcu_gp_seq_needed_exp; /* 75392 8 */
long unsigned intsrcu_last_gp_end; /* 75400 8 */
structsrcu_data* sda; /* 75408 8 */
long unsigned intsrcu_barrier_seq; /* 75416 8 */
struct mutexsrcu_barrier_mutex; /* 75424 128 */
/* --- cacheline 1180 boundary (75520 bytes) was 32 bytes ago --- */
struct completionsrcu_barrier_completion; /* 75552 80 */
/* --- cacheline 1181 boundary (75584 bytes) was 48 bytes ago --- */
atomic_tsrcu_barrier_cpu_cnt; /* 75632 4 *//* XXX 4 bytes hole, try to pack */
struct
delayed_workwork; /* 75640 152 *//* XXX last struct has 4 bytes of padding */
/* --- cacheline 1184 boundary (75776 bytes) was 16 bytes ago --- */
structlockdep_mapdep_map; /* 75792 32 *//* size: 75824, cachelines: 1185, members: 17 */ /* sum members: 75816, holes: 2, sum holes: 8 */ /* paddings: 1, sum paddings: 4 */
/* last cacheline: 48 bytes */
};With N=64 VMD IRQ lists, this would allocate 4.6MiB in a single call. This violates
MAX_ORDERreclaim rules when PAGE_SIZE=4096 and MAX_ORDER_NR_PAGES=1024, and invokes the following warning inmm/page_alloc.c:/* * There are several places where we assume that the order value is sane * so bail out early if the request is out of bound. */ if (unlikely(order >= MAX_ORDER)) { WARN_ON_ONCE(!(gfp_mask & __GFP_NOWARN)); return NULL; }This patch changes the irq list array into an array of pointers to irq lists to avoid allocation failures with greater msix counts.
This patch also reverts commit
b31822277abcd7c83d1c1c0af876da9ccdf3b7d6. Theindex_from_irqs()helper was added to calculate the irq list index from the array of irqs, in order to shrinkvmd_irq_listfor performance.Quoted 7 lines
Due to the embedded
srcu_structwithin thevmd_irq_liststruct having a varying size depending on a number of factors, thevmd_irq_liststruct no longer guarantees optimal data structure size and granularity.Signed-off-by Jon Derrick <[email protected]>---
Added Paul to make him aware ofsrcu_structsize with these optionsThere was some discussion of making the
srcu_structstructure's ->node[] array be separately allocated, which would allow this array to be rightsize for the system in question. However, I believe they ended up instead separately allocating thesrcu_structstructure itself.Without doing something like that, I am kind of stuck. After all, at compile time, the kernel build system tells SRCU that it needs to be prepared to run on systems with thousands of CPUs. Which requires substantial memory to keep track of all those CPUs. Which are not present on most systems.
Thoughts?
Quoted 7 lines
Quoted 2 lines
Thanx, Paul
Yes I haven't seen an elegant solution other than making users aware of the situation.
Thanks for your input
Jon, Paul,
I don't know if there was any further development in this area in the meantime, should we proceed with this patch ?
Thanks,
Lorenzo
Paul E. McKenney
maintainerQuoted 94 lines · Lorenzo Pieralisi
Quoted 93 lines · Jonathan
Quoted 81 lines · Paul E. McKenney
Quoted 67 lines · Jon Derrick
With
CONFIG_MAXSMPandCONFIG_PROVE_LOCKING, the size of ansrcu_structcan grow quite large. In one compilation instance it produced a 74KiB data structure. These are embedded in thevmd_irq_liststruct, and a N=64 allocation can exceedMAX_ORDER, violating reclaim rules.struct srcu_struct { struct srcu_node node[521]; /* 0 75024 */ /* --- cacheline 1172 boundary (75008 bytes) was 16 bytes ago --- */ struct srcu_node * level[4]; /* 75024 32 */ struct mutex srcu_cb_mutex; /* 75056 128 */ /* --- cacheline 1174 boundary (75136 bytes) was 48 bytes ago --- */ spinlock_t lock; /* 75184 56 */ /* --- cacheline 1175 boundary (75200 bytes) was 40 bytes ago --- */ struct mutex srcu_gp_mutex; /* 75240 128 */ /* --- cacheline 1177 boundary (75328 bytes) was 40 bytes ago --- */ unsigned int srcu_idx; /* 75368 4 *//* XXX 4 bytes hole, try to pack */
long unsigned int
srcu_gp_seq; /* 75376 8 */
long unsigned intsrcu_gp_seq_needed; /* 75384 8 */
/* --- cacheline 1178 boundary (75392 bytes) --- */
long unsigned intsrcu_gp_seq_needed_exp; /* 75392 8 */
long unsigned intsrcu_last_gp_end; /* 75400 8 */
structsrcu_data* sda; /* 75408 8 */
long unsigned intsrcu_barrier_seq; /* 75416 8 */
struct mutexsrcu_barrier_mutex; /* 75424 128 */
/* --- cacheline 1180 boundary (75520 bytes) was 32 bytes ago --- */
struct completionsrcu_barrier_completion; /* 75552 80 */
/* --- cacheline 1181 boundary (75584 bytes) was 48 bytes ago --- */
atomic_tsrcu_barrier_cpu_cnt; /* 75632 4 *//* XXX 4 bytes hole, try to pack */
struct
delayed_workwork; /* 75640 152 *//* XXX last struct has 4 bytes of padding */
/* --- cacheline 1184 boundary (75776 bytes) was 16 bytes ago --- */
structlockdep_mapdep_map; /* 75792 32 *//* size: 75824, cachelines: 1185, members: 17 */ /* sum members: 75816, holes: 2, sum holes: 8 */ /* paddings: 1, sum paddings: 4 */
/* last cacheline: 48 bytes */
};With N=64 VMD IRQ lists, this would allocate 4.6MiB in a single call. This violates
MAX_ORDERreclaim rules when PAGE_SIZE=4096 and MAX_ORDER_NR_PAGES=1024, and invokes the following warning inmm/page_alloc.c:/* * There are several places where we assume that the order value is sane * so bail out early if the request is out of bound. */ if (unlikely(order >= MAX_ORDER)) { WARN_ON_ONCE(!(gfp_mask & __GFP_NOWARN)); return NULL; }This patch changes the irq list array into an array of pointers to irq lists to avoid allocation failures with greater msix counts.
This patch also reverts commit
b31822277abcd7c83d1c1c0af876da9ccdf3b7d6. Theindex_from_irqs()helper was added to calculate the irq list index from the array of irqs, in order to shrinkvmd_irq_listfor performance.Quoted 7 lines
Due to the embedded
srcu_structwithin thevmd_irq_liststruct having a varying size depending on a number of factors, thevmd_irq_liststruct no longer guarantees optimal data structure size and granularity.Signed-off-by Jon Derrick <[email protected]>---
Added Paul to make him aware ofsrcu_structsize with these optionsThere was some discussion of making the
srcu_structstructure's ->node[] array be separately allocated, which would allow this array to be rightsize for the system in question. However, I believe they ended up instead separately allocating thesrcu_structstructure itself.Quoted 7 lines
Without doing something like that, I am kind of stuck. After all, at compile time, the kernel build system tells SRCU that it needs to be prepared to run on systems with thousands of CPUs. Which requires substantial memory to keep track of all those CPUs. Which are not present on most systems.
Thoughts?
Yes I haven't seen an elegant solution other than making users aware of the situation.
Quoted 6 lines
Quoted 1 line
Thanks for your input
Jon, Paul,
I don't know if there was any further development in this area in the meantime, should we proceed with this patch ?
Let me be more explicit. Would it be helpful to you guys if there was a variable-sized ->node[] array that is separately allocated? If so, please do tell me. After all, I cannot read your minds ;-)
An instance of such a variant would not be available via DEFINE_SRCU(), which at compile time would absolutely need to allocate as many elements as Kconfig said to allocate. In addition, instances of srcu_struct taking this approach would not be usable until after init_srcu_struct() was invoked, which would allocate a right-sized ->node array.
Again, would this be helpful?
Thanx, Paul
Quoted 97 lines · Paul E. McKenney
Quoted 96 lines · Lorenzo Pieralisi
Quoted 94 lines · Jonathan
Quoted 81 lines · Paul E. McKenney
Quoted 67 lines · Jon Derrick
With
CONFIG_MAXSMPandCONFIG_PROVE_LOCKING, the size of ansrcu_structcan grow quite large. In one compilation instance it produced a 74KiB data structure. These are embedded in thevmd_irq_liststruct, and a N=64 allocation can exceedMAX_ORDER, violating reclaim rules.struct srcu_struct { struct srcu_node node[521]; /* 0 75024 */ /* --- cacheline 1172 boundary (75008 bytes) was 16 bytes ago --- */ struct srcu_node * level[4]; /* 75024 32 */ struct mutex srcu_cb_mutex; /* 75056 128 */ /* --- cacheline 1174 boundary (75136 bytes) was 48 bytes ago --- */ spinlock_t lock; /* 75184 56 */ /* --- cacheline 1175 boundary (75200 bytes) was 40 bytes ago --- */ struct mutex srcu_gp_mutex; /* 75240 128 */ /* --- cacheline 1177 boundary (75328 bytes) was 40 bytes ago --- */ unsigned int srcu_idx; /* 75368 4 *//* XXX 4 bytes hole, try to pack */
long unsigned int
srcu_gp_seq; /* 75376 8 */
long unsigned intsrcu_gp_seq_needed; /* 75384 8 */
/* --- cacheline 1178 boundary (75392 bytes) --- */
long unsigned intsrcu_gp_seq_needed_exp; /* 75392 8 */
long unsigned intsrcu_last_gp_end; /* 75400 8 */
structsrcu_data* sda; /* 75408 8 */
long unsigned intsrcu_barrier_seq; /* 75416 8 */
struct mutexsrcu_barrier_mutex; /* 75424 128 */
/* --- cacheline 1180 boundary (75520 bytes) was 32 bytes ago --- */
struct completionsrcu_barrier_completion; /* 75552 80 */
/* --- cacheline 1181 boundary (75584 bytes) was 48 bytes ago --- */
atomic_tsrcu_barrier_cpu_cnt; /* 75632 4 *//* XXX 4 bytes hole, try to pack */
struct
delayed_workwork; /* 75640 152 *//* XXX last struct has 4 bytes of padding */
/* --- cacheline 1184 boundary (75776 bytes) was 16 bytes ago --- */
structlockdep_mapdep_map; /* 75792 32 *//* size: 75824, cachelines: 1185, members: 17 */ /* sum members: 75816, holes: 2, sum holes: 8 */ /* paddings: 1, sum paddings: 4 */
/* last cacheline: 48 bytes */
};With N=64 VMD IRQ lists, this would allocate 4.6MiB in a single call. This violates
MAX_ORDERreclaim rules when PAGE_SIZE=4096 and MAX_ORDER_NR_PAGES=1024, and invokes the following warning inmm/page_alloc.c:/* * There are several places where we assume that the order value is sane * so bail out early if the request is out of bound. */ if (unlikely(order >= MAX_ORDER)) { WARN_ON_ONCE(!(gfp_mask & __GFP_NOWARN)); return NULL; }This patch changes the irq list array into an array of pointers to irq lists to avoid allocation failures with greater msix counts.
This patch also reverts commit
b31822277abcd7c83d1c1c0af876da9ccdf3b7d6. Theindex_from_irqs()helper was added to calculate the irq list index from the array of irqs, in order to shrinkvmd_irq_listfor performance.Quoted 7 lines
Due to the embedded
srcu_structwithin thevmd_irq_liststruct having a varying size depending on a number of factors, thevmd_irq_liststruct no longer guarantees optimal data structure size and granularity.Signed-off-by Jon Derrick <[email protected]>---
Added Paul to make him aware ofsrcu_structsize with these optionsThere was some discussion of making the
srcu_structstructure's ->node[] array be separately allocated, which would allow this array to be rightsize for the system in question. However, I believe they ended up instead separately allocating thesrcu_structstructure itself.Quoted 7 lines
Without doing something like that, I am kind of stuck. After all, at compile time, the kernel build system tells SRCU that it needs to be prepared to run on systems with thousands of CPUs. Which requires substantial memory to keep track of all those CPUs. Which are not present on most systems.
Thoughts?
Yes I haven't seen an elegant solution other than making users aware of the situation.
Thanks for your input
Quoted 9 lines
Quoted 4 lines
Jon, Paul,
I don't know if there was any further development in this area in the meantime, should we proceed with this patch ?
Let me be more explicit. Would it be helpful to you guys if there was a variable-sized ->node[] array that is separately allocated? If so, please do tell me. After all, I cannot read your minds ;-)
Frankly I'm not versed enough in RCU to know the implications of this change. How often have you come across the same issue I am facing? Is it worth the effort versus my abstraction? Will it affect performance or will the Sleepable component absorb it?
Quoted 3 lines
An instance of such a variant would not be available via
DEFINE_SRCU(), which at compile time would absolutely need to allocate as many elements asKconfigsaid to allocate.
So the implication is that it needs allocation later via init_srcu_struct?
Quoted 3 lines
In addition, instances of
srcu_struct
taking this approach would not be usable until afterinit_srcu_struct()was invoked, which would allocate a right-sized ->node array.
So similar to other lock init functions. Are there existing users doing RCU before init_srcu_struct is called?
Quoted 4 lines
Again, would this be helpful?
Thanx, Paul
Quoted 4 lines · Jon Derrick
With
CONFIG_MAXSMPandCONFIG_PROVE_LOCKING, the size of ansrcu_structcan grow quite large. In one compilation instance it produced a 74KiB data structure. These are embedded in thevmd_irq_liststruct, and a N=64 allocation can exceedMAX_ORDER, violating reclaim rules.
[snip]
Quoted 9 lines
---
Added Paul to make him aware ofsrcu_structsize with these options
v1->v2:
Squashed the revert into this commit
changed n=1 kcalloc to kzallocdrivers/pci/controller/vmd.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-)
Has there been any progress on this? We're seeing a similar problem in a PREEMPT_RT kernel with MAXSMP.
-Scott
Paul E. McKenney
maintainerQuoted 13 lines · Scott Wood
Quoted 4 lines · Jon Derrick
With
CONFIG_MAXSMPandCONFIG_PROVE_LOCKING, the size of ansrcu_structcan grow quite large. In one compilation instance it produced a 74KiB data structure. These are embedded in thevmd_irq_liststruct, and a N=64 allocation can exceedMAX_ORDER, violating reclaim rules.[snip]
Quoted 7 lines
---
Added Paul to make him aware ofsrcu_structsize with these options
v1->v2:
Squashed the revert into this commit
changed n=1 kcalloc to kzalloc
Quoted 5 lines
Quoted 2 lines
drivers/pci/controller/vmd.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-)Has there been any progress on this? We're seeing a similar problem in a
PREEMPT_RTkernel with MAXSMP.
In case this helps...
I have started working on shrinking the srcu_struct structure. Those possessing intestinal fortitude of mythic proportions might wish to try this very lightly tested -rcu commits out:
1385139340b7 ("srcu: Dynamically allocate srcu_node array")
This will be followed by additional commits that will dispense entirely with the srcu_node array unless or until that particular srcu_struct structure encounters significant update-side contention.
Thoughts?
Thanx, Paul
------------------------------------------------------------------------
commit 1385139340b7a1c8f35cb7a52af221096cdef86e
Author: Paul E. McKenney <[email protected]> Date: Fri Jan 21 16:13:52 2022 -0800
srcu: Dynamically allocate srcu_node array
This commit shrinks the srcu_struct structure by converting its ->node field from a fixed-size compile-time array to a pointer to a dynamically allocated array. In kernels built with large values of NR_CPUS that boot on systems with smaller numbers of CPUs, this can save significant memory.
include/linux/srcutree.h +1 -1
@@ -60,7 +60,7 @@ struct srcu_node {* Per-SRCU-domain structure, similar in function to rcu_state. */ struct srcu_struct { -struct srcu_node node[NUM_RCU_NODES ];/* Combining tree. */ +struct srcu_node *node;/* Combining tree. */ struct srcu_node *level[RCU_NUM_LVLS +1 ];/* First node at each level. */ struct mutex srcu_cb_mutex;/* Serialize CB preparation. */
kernel/rcu/srcutree.c +42 -14
108 lines not on this page · raw message
[resent with Jonathan's current address]
Quoted 4 lines · Jon Derrick
With
CONFIG_MAXSMPandCONFIG_PROVE_LOCKING, the size of ansrcu_structcan grow quite large. In one compilation instance it produced a 74KiB data structure. These are embedded in thevmd_irq_liststruct, and a N=64 allocation can exceedMAX_ORDER, violating reclaim rules.
[snip]
Quoted 9 lines
---
Added Paul to make him aware ofsrcu_structsize with these options
v1->v2:
Squashed the revert into this commit
changed n=1 kcalloc to kzallocdrivers/pci/controller/vmd.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-)
Has there been any progress on this? We're seeing a similar problem in a PREEMPT_RT kernel with MAXSMP.
-Scott