| Message ID | 20240911090447.751-2-shiju.jose@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | EDAC: Scrub: introduce generic EDAC RAS control feature driver + CXL/ACPI-RAS2 drivers | expand |
On Wed, Sep 11, 2024 at 10:04:30AM +0100, shiju.jose@huawei.com wrote: > +/** > + * edac_dev_feature_init - Init a RAS feature > + * @parent: client device. > + * @dev_data: pointer to the edac_dev_data structure, which contains > + * client device specific info. > + * @feat: pointer to struct edac_dev_feature. > + * @attr_groups: pointer to attribute group's container. > + * > + * Returns number of scrub features attribute groups on success, Not "scrub" - this is an interface initializing a generic feature. > + * error otherwise. > + */ > +static int edac_dev_feat_init(struct device *parent, > + struct edac_dev_data *dev_data, > + const struct edac_dev_feature *ras_feat, > + const struct attribute_group **attr_groups) > +{ > + int num; > + > + switch (ras_feat->ft_type) { > + case RAS_FEAT_SCRUB: > + dev_data->scrub_ops = ras_feat->scrub_ops; > + dev_data->private = ras_feat->ctx; > + return 1; > + case RAS_FEAT_ECS: > + num = ras_feat->ecs_info.num_media_frus; > + dev_data->ecs_ops = ras_feat->ecs_ops; > + dev_data->private = ras_feat->ctx; > + return num; > + case RAS_FEAT_PPR: > + dev_data->ppr_ops = ras_feat->ppr_ops; > + dev_data->private = ras_feat->ctx; > + return 1; > + default: > + return -EINVAL; > + } > +} And why does this function even exist and has kernel-doc comments when all it does is assign a couple of values? And it gets called exactly once? Just merge its body into the call site. There you can reuse the switch-case there too. No need for too much noodling around. > diff --git a/include/linux/edac.h b/include/linux/edac.h > index b4ee8961e623..b337254cf5b8 100644 > --- a/include/linux/edac.h > +++ b/include/linux/edac.h > @@ -661,4 +661,59 @@ static inline struct dimm_info *edac_get_dimm(struct mem_ctl_info *mci, > > return mci->dimms[index]; > } > + > +/* EDAC device features */ > + > +#define EDAC_FEAT_NAME_LEN 128 > + > +/* RAS feature type */ > +enum edac_dev_feat { > + RAS_FEAT_SCRUB, > + RAS_FEAT_ECS, > + RAS_FEAT_PPR, > + RAS_FEAT_MAX I still don't know what ECS or PPR is.
>-----Original Message----- >From: Jonathan Cameron <jonathan.cameron@huawei.com> >Sent: 16 September 2024 11:50 >To: Shiju Jose <shiju.jose@huawei.com> >Cc: Borislav Petkov <bp@alien8.de>; linux-edac@vger.kernel.org; linux- >cxl@vger.kernel.org; linux-acpi@vger.kernel.org; linux-mm@kvack.org; linux- >kernel@vger.kernel.org; tony.luck@intel.com; rafael@kernel.org; >lenb@kernel.org; mchehab@kernel.org; dan.j.williams@intel.com; >dave@stgolabs.net; dave.jiang@intel.com; alison.schofield@intel.com; >vishal.l.verma@intel.com; ira.weiny@intel.com; david@redhat.com; >Vilas.Sridharan@amd.com; leo.duran@amd.com; Yazen.Ghannam@amd.com; >rientjes@google.com; jiaqiyan@google.com; Jon.Grimm@amd.com; >dave.hansen@linux.intel.com; naoya.horiguchi@nec.com; >james.morse@arm.com; jthoughton@google.com; somasundaram.a@hpe.com; >erdemaktas@google.com; pgonda@google.com; duenwen@google.com; >mike.malvestuto@intel.com; gthelen@google.com; >wschwartz@amperecomputing.com; dferguson@amperecomputing.com; >wbs@os.amperecomputing.com; nifan.cxl@gmail.com; jgroves@micron.com; >vsalve@micron.com; tanxiaofei <tanxiaofei@huawei.com>; Zengtao (B) ><prime.zeng@hisilicon.com>; Roberto Sassu <roberto.sassu@huawei.com>; >kangkang.shen@futurewei.com; wanghuiqiang <wanghuiqiang@huawei.com>; >Linuxarm <linuxarm@huawei.com> >Subject: Re: [PATCH v12 01/17] EDAC: Add support for EDAC device features >control > >On Mon, 16 Sep 2024 10:21:58 +0100 >Shiju Jose <shiju.jose@huawei.com> wrote: > >> Thanks for reviewing. >> >> >-----Original Message----- >> >From: Borislav Petkov <bp@alien8.de> >> >Sent: 13 September 2024 17:41 >> >To: Shiju Jose <shiju.jose@huawei.com> >> >Cc: linux-edac@vger.kernel.org; linux-cxl@vger.kernel.org; linux- >> >acpi@vger.kernel.org; linux-mm@kvack.org; >> >linux-kernel@vger.kernel.org; tony.luck@intel.com; rafael@kernel.org; >> >lenb@kernel.org; mchehab@kernel.org; dan.j.williams@intel.com; >> >dave@stgolabs.net; Jonathan Cameron <jonathan.cameron@huawei.com>; >> >dave.jiang@intel.com; alison.schofield@intel.com; >> >vishal.l.verma@intel.com; ira.weiny@intel.com; david@redhat.com; >> >Vilas.Sridharan@amd.com; leo.duran@amd.com; >Yazen.Ghannam@amd.com; >> >rientjes@google.com; jiaqiyan@google.com; Jon.Grimm@amd.com; >> >dave.hansen@linux.intel.com; naoya.horiguchi@nec.com; >> >james.morse@arm.com; jthoughton@google.com; >somasundaram.a@hpe.com; >> >erdemaktas@google.com; pgonda@google.com; duenwen@google.com; >> >mike.malvestuto@intel.com; gthelen@google.com; >> >wschwartz@amperecomputing.com; dferguson@amperecomputing.com; >> >wbs@os.amperecomputing.com; nifan.cxl@gmail.com; jgroves@micron.com; >> >vsalve@micron.com; tanxiaofei <tanxiaofei@huawei.com>; Zengtao (B) >> ><prime.zeng@hisilicon.com>; Roberto Sassu <roberto.sassu@huawei.com>; >> >kangkang.shen@futurewei.com; wanghuiqiang ><wanghuiqiang@huawei.com>; >> >Linuxarm <linuxarm@huawei.com> >> >Subject: Re: [PATCH v12 01/17] EDAC: Add support for EDAC device >> >features control >> > >> >On Wed, Sep 11, 2024 at 10:04:30AM +0100, shiju.jose@huawei.com wrote: >> >> +/** >> >> + * edac_dev_feature_init - Init a RAS feature >> >> + * @parent: client device. >> >> + * @dev_data: pointer to the edac_dev_data structure, which >> >> +contains >> >> + * client device specific info. >> >> + * @feat: pointer to struct edac_dev_feature. >> >> + * @attr_groups: pointer to attribute group's container. >> >> + * >> >> + * Returns number of scrub features attribute groups on success, >> > >> >Not "scrub" - this is an interface initializing a generic feature. >> Will correct. >> > >> >> + * error otherwise. >> >> + */ >> >> +static int edac_dev_feat_init(struct device *parent, >> >> + struct edac_dev_data *dev_data, >> >> + const struct edac_dev_feature *ras_feat, >> >> + const struct attribute_group **attr_groups) { >> >> + int num; >> >> + >> >> + switch (ras_feat->ft_type) { >> >> + case RAS_FEAT_SCRUB: >> >> + dev_data->scrub_ops = ras_feat->scrub_ops; >> >> + dev_data->private = ras_feat->ctx; >> >> + return 1; >> >> + case RAS_FEAT_ECS: >> >> + num = ras_feat->ecs_info.num_media_frus; >> >> + dev_data->ecs_ops = ras_feat->ecs_ops; >> >> + dev_data->private = ras_feat->ctx; >> >> + return num; >> >> + case RAS_FEAT_PPR: >> >> + dev_data->ppr_ops = ras_feat->ppr_ops; >> >> + dev_data->private = ras_feat->ctx; >> >> + return 1; >> >> + default: >> >> + return -EINVAL; >> >> + } >> >> +} >> > >> >And why does this function even exist and has kernel-doc comments >> >when all it does is assign a couple of values? And it gets called exactly once? >> > >> >Just merge its body into the call site. There you can reuse the >> >switch-case there too. No need for too much noodling around. >> edac_dev_feat_init () function is updated with feature specific function call() >etc in subsequent >> EDAC feature specific patches. Thus added a separate function. >> > >> >> diff --git a/include/linux/edac.h b/include/linux/edac.h index >> >> b4ee8961e623..b337254cf5b8 100644 >> >> --- a/include/linux/edac.h >> >> +++ b/include/linux/edac.h >> >> @@ -661,4 +661,59 @@ static inline struct dimm_info >> >> *edac_get_dimm(struct mem_ctl_info *mci, >> >> >> >> return mci->dimms[index]; >> >> } >> >> + >> >> +/* EDAC device features */ >> >> + >> >> +#define EDAC_FEAT_NAME_LEN 128 >> >> + >> >> +/* RAS feature type */ >> >> +enum edac_dev_feat { >> >> + RAS_FEAT_SCRUB, >> >> + RAS_FEAT_ECS, >> >> + RAS_FEAT_PPR, >> >> + RAS_FEAT_MAX >> > >> >I still don't know what ECS or PPR is. >> I will add comment/documentation here with a short explanation of >> features if that make sense? >> Each feature is described in the subsequent EDAC feature specific patches. >Can you bring the enum entries in with those patches? >That way there is no reference to them before we have the information on what >they are. Will do. > >J >> > >> >-- >> >Regards/Gruss, >> > Boris. >> > >> >https://people.kernel.org/tglx/notes-about-netiquette >> Thanks, Shiju
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 621dc2a5d034..e4a5d010ea2d 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -570,3 +570,205 @@ void edac_device_handle_ue_count(struct edac_device_ctl_info *edac_dev, block ? block->name : "N/A", count, msg); } EXPORT_SYMBOL_GPL(edac_device_handle_ue_count); + +/* EDAC device feature */ +static void edac_dev_release(struct device *dev) +{ + struct edac_dev_feat_ctx *ctx = container_of(dev, struct edac_dev_feat_ctx, dev); + + kfree(ctx->ppr); + kfree(ctx->scrub); + kfree(ctx->dev.groups); + kfree(ctx); +} + +const struct device_type edac_dev_type = { + .name = "edac_dev", + .release = edac_dev_release, +}; + +static void edac_dev_unreg(void *data) +{ + device_unregister(data); +} + +/** + * edac_dev_feature_init - Init a RAS feature + * @parent: client device. + * @dev_data: pointer to the edac_dev_data structure, which contains + * client device specific info. + * @feat: pointer to struct edac_dev_feature. + * @attr_groups: pointer to attribute group's container. + * + * Returns number of scrub features attribute groups on success, + * error otherwise. + */ +static int edac_dev_feat_init(struct device *parent, + struct edac_dev_data *dev_data, + const struct edac_dev_feature *ras_feat, + const struct attribute_group **attr_groups) +{ + int num; + + switch (ras_feat->ft_type) { + case RAS_FEAT_SCRUB: + dev_data->scrub_ops = ras_feat->scrub_ops; + dev_data->private = ras_feat->ctx; + return 1; + case RAS_FEAT_ECS: + num = ras_feat->ecs_info.num_media_frus; + dev_data->ecs_ops = ras_feat->ecs_ops; + dev_data->private = ras_feat->ctx; + return num; + case RAS_FEAT_PPR: + dev_data->ppr_ops = ras_feat->ppr_ops; + dev_data->private = ras_feat->ctx; + return 1; + default: + return -EINVAL; + } +} + +/** + * edac_dev_register - register device for RAS features with EDAC + * @parent: client device. + * @name: client device's name. + * @private: parent driver's data to store in the context if any. + * @num_features: number of RAS features to register. + * @ras_features: list of RAS features to register. + * + * Returns 0 on success, error otherwise. + * The new edac_dev_feat_ctx would be freed automatically. + */ +int edac_dev_register(struct device *parent, char *name, + void *private, int num_features, + const struct edac_dev_feature *ras_features) +{ + const struct attribute_group **ras_attr_groups; + struct edac_dev_data *dev_data; + struct edac_dev_feat_ctx *ctx; + int scrub_cnt = 0, scrub_inst = 0; + int ppr_cnt = 0, ppr_inst = 0; + int attr_gcnt = 0; + int ret, feat; + + if (!parent || !name || !num_features || !ras_features) + return -EINVAL; + + /* Double parse to make space for attributes */ + for (feat = 0; feat < num_features; feat++) { + switch (ras_features[feat].ft_type) { + case RAS_FEAT_SCRUB: + attr_gcnt++; + scrub_cnt++; + break; + case RAS_FEAT_PPR: + attr_gcnt++; + ppr_cnt++; + break; + case RAS_FEAT_ECS: + attr_gcnt += ras_features[feat].ecs_info.num_media_frus; + break; + default: + return -EINVAL; + } + } + + ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); + if (!ctx) + return -ENOMEM; + + ctx->dev.parent = parent; + ctx->private = private; + + ras_attr_groups = kcalloc(attr_gcnt + 1, sizeof(*ras_attr_groups), GFP_KERNEL); + if (!ras_attr_groups) { + ret = -ENOMEM; + goto ctx_free; + } + + if (scrub_cnt) { + ctx->scrub = kcalloc(scrub_cnt, sizeof(*(ctx->scrub)), GFP_KERNEL); + if (!ctx->scrub) { + ret = -ENOMEM; + goto groups_free; + } + } + + if (ppr_cnt) { + ctx->ppr = kcalloc(ppr_cnt, sizeof(*(ctx->ppr)), GFP_KERNEL); + if (!ctx->ppr) { + ret = -ENOMEM; + goto groups_free; + } + } + + attr_gcnt = 0; + for (feat = 0; feat < num_features; feat++, ras_features++) { + switch (ras_features->ft_type) { + case RAS_FEAT_SCRUB: + if (!ras_features->scrub_ops) + continue; + if (scrub_inst != ras_features->instance) + goto data_mem_free; + dev_data = &ctx->scrub[scrub_inst]; + dev_data->instance = scrub_inst; + scrub_inst++; + break; + case RAS_FEAT_ECS: + if (!ras_features->ecs_ops) + continue; + dev_data = &ctx->ecs; + break; + case RAS_FEAT_PPR: + if (!ras_features->ppr_ops) + continue; + if (ppr_inst != ras_features->instance) + goto data_mem_free; + dev_data = &ctx->ppr[ppr_inst]; + dev_data->instance = ppr_inst; + ppr_inst++; + break; + default: + ret = -EINVAL; + goto data_mem_free; + } + ret = edac_dev_feat_init(parent, dev_data, ras_features, + &ras_attr_groups[attr_gcnt]); + if (ret < 0) + goto data_mem_free; + + attr_gcnt += ret; + } + + ras_attr_groups[attr_gcnt] = NULL; + ctx->dev.bus = edac_get_sysfs_subsys(); + ctx->dev.type = &edac_dev_type; + ctx->dev.groups = ras_attr_groups; + dev_set_drvdata(&ctx->dev, ctx); + + ret = dev_set_name(&ctx->dev, name); + if (ret) + goto data_mem_free; + + ret = device_register(&ctx->dev); + if (ret) { + put_device(&ctx->dev); + goto data_mem_free; + return ret; + } + + return devm_add_action_or_reset(parent, edac_dev_unreg, &ctx->dev); + +data_mem_free: + if (ppr_cnt) + kfree(ctx->ppr); + if (scrub_cnt) + kfree(ctx->scrub); +groups_free: + kfree(ras_attr_groups); +ctx_free: + kfree(ctx); + return ret; +} +EXPORT_SYMBOL_GPL(edac_dev_register); diff --git a/include/linux/edac.h b/include/linux/edac.h index b4ee8961e623..b337254cf5b8 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -661,4 +661,59 @@ static inline struct dimm_info *edac_get_dimm(struct mem_ctl_info *mci, return mci->dimms[index]; } + +/* EDAC device features */ + +#define EDAC_FEAT_NAME_LEN 128 + +/* RAS feature type */ +enum edac_dev_feat { + RAS_FEAT_SCRUB, + RAS_FEAT_ECS, + RAS_FEAT_PPR, + RAS_FEAT_MAX +}; + +struct edac_ecs_ex_info { + u16 num_media_frus; +}; + +/* + * EDAC device feature information structure + */ +struct edac_dev_data { + union { + const struct edac_scrub_ops *scrub_ops; + const struct edac_ecs_ops *ecs_ops; + const struct edac_ppr_ops *ppr_ops; + }; + u8 instance; + void *private; +}; + +struct device; + +struct edac_dev_feat_ctx { + struct device dev; + void *private; + struct edac_dev_data *scrub; + struct edac_dev_data ecs; + struct edac_dev_data *ppr; +}; + +struct edac_dev_feature { + enum edac_dev_feat ft_type; + u8 instance; + union { + const struct edac_scrub_ops *scrub_ops; + const struct edac_ecs_ops *ecs_ops; + const struct edac_ppr_ops *ppr_ops; + }; + void *ctx; + struct edac_ecs_ex_info ecs_info; +}; + +int edac_dev_register(struct device *parent, char *dev_name, + void *parent_pvt_data, int num_features, + const struct edac_dev_feature *ras_features); #endif /* _LINUX_EDAC_H_ */