From 04d09d43ae28a55d5e3a8842a5a93fd31aa9272c Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 11 May 2021 00:11:36 -0700 Subject: [PATCH] LU-14055 lmv: reduce struct lmv_obd size The lmv_obd struct contains lmv_mdt_descs which is large enough to reference 512 * 512 = 262144 targets, but there can be only 65536 OSTs or MDTs in a single filesystem today. Shrink the allocation size to match the current limits, reducing the size of obd_device.u since this is the largest union member. This reduces the size of each obd_device from 6752 to 4568 bytes. Lustre-change: https://review.whamcloud.com/41162 Lustre-commit: e11deeb1e6d114608eac4ee998d4cea22e30b0f5 Signed-off-by: Andreas Dilger Change-Id: I752b021bdb5d02e3ead3bb266121be5dbf3ebbe5 Reviewed-by: James Simmons Reviewed-by: John L. Hammond Reviewed-on: https://review.whamcloud.com/43651 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Li Xi --- lustre/include/lu_object.h | 8 ++++---- lustre/lfsck/lfsck_lib.c | 2 +- lustre/obdclass/lu_tgt_descs.c | 5 ++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h index 791f0d5..080cd84 100644 --- a/lustre/include/lu_object.h +++ b/lustre/include/lu_object.h @@ -1577,10 +1577,10 @@ struct lu_tgt_desc { ltd_connecting:1; /* target is connecting */ }; -/* number of pointers at 1st level */ -#define TGT_PTRS (PAGE_SIZE / sizeof(void *)) /* number of pointers at 2nd level */ #define TGT_PTRS_PER_BLOCK (PAGE_SIZE / sizeof(void *)) +/* number of pointers at 1st level - only need as many as max OST/MDT count */ +#define TGT_PTRS ((LOV_ALL_STRIPES + 1) / TGT_PTRS_PER_BLOCK) struct lu_tgt_desc_idx { struct lu_tgt_desc *ldi_tgt[TGT_PTRS_PER_BLOCK]; @@ -1628,8 +1628,8 @@ struct lu_tgt_descs { }; #define LTD_TGT(ltd, index) \ - (ltd)->ltd_tgt_idx[(index) / \ - TGT_PTRS_PER_BLOCK]->ldi_tgt[(index) % TGT_PTRS_PER_BLOCK] + (ltd)->ltd_tgt_idx[(index) / TGT_PTRS_PER_BLOCK]-> \ + ldi_tgt[(index) % TGT_PTRS_PER_BLOCK] u64 lu_prandom_u64_max(u64 ep_ro); void lu_qos_rr_init(struct lu_qos_rr *lqr); diff --git a/lustre/lfsck/lfsck_lib.c b/lustre/lfsck/lfsck_lib.c index 19f7a4d..b00586b 100644 --- a/lustre/lfsck/lfsck_lib.c +++ b/lustre/lfsck/lfsck_lib.c @@ -158,7 +158,7 @@ static void lfsck_tgt_descs_fini(struct lfsck_tgt_descs *ltds) LASSERTF(ltds->ltd_tgtnr == 0, "tgt count unmatched: %d\n", ltds->ltd_tgtnr); - for (idx = 0; idx < TGT_PTRS; idx++) { + for (idx = 0; idx < ARRAY_SIZE(ltds->ltd_tgts_idx); idx++) { if (ltds->ltd_tgts_idx[idx] != NULL) { OBD_FREE_PTR(ltds->ltd_tgts_idx[idx]); ltds->ltd_tgts_idx[idx] = NULL; diff --git a/lustre/obdclass/lu_tgt_descs.c b/lustre/obdclass/lu_tgt_descs.c index 7756e3d..4012aab 100644 --- a/lustre/obdclass/lu_tgt_descs.c +++ b/lustre/obdclass/lu_tgt_descs.c @@ -309,7 +309,7 @@ void lu_tgt_descs_fini(struct lu_tgt_descs *ltd) int i; bitmap_free(ltd->ltd_tgt_bitmap); - for (i = 0; i < TGT_PTRS; i++) { + for (i = 0; i < ARRAY_SIZE(ltd->ltd_tgt_idx); i++) { if (ltd->ltd_tgt_idx[i]) OBD_FREE_PTR(ltd->ltd_tgt_idx[i]); } @@ -383,6 +383,9 @@ int ltd_add_tgt(struct lu_tgt_descs *ltd, struct lu_tgt_desc *tgt) if (index >= ltd->ltd_tgts_size) { __u32 newsize = 1; + if (index > TGT_PTRS * TGT_PTRS_PER_BLOCK) + RETURN(-ENFILE); + while (newsize < index + 1) newsize = newsize << 1; -- 1.8.3.1